[guest][vmm] Move arch/x86 to arch/x64
At the Garnet layer, x86-64 is referred to as x64.
MAC-143 #done
Test: Ran "linux_guest" on x86.
Change-Id: If087ad32c9cc6d15e3d9c795feee09bb165120ce
diff --git a/bin/guest/scripts/build-blobs.sh b/bin/guest/scripts/build-blobs.sh
index 63ba294..660e51a 100755
--- a/bin/guest/scripts/build-blobs.sh
+++ b/bin/guest/scripts/build-blobs.sh
@@ -39,6 +39,6 @@
done
# Generate ACPI blobs.
-for ASL in garnet/bin/guest/vmm/arch/x86/asl/*.asl; do
+for ASL in garnet/bin/guest/vmm/arch/x64/asl/*.asl; do
iasl -vs -we $ASL
done
diff --git a/bin/guest/vmm/BUILD.gn b/bin/guest/vmm/BUILD.gn
index 70067f3..ddb0969 100644
--- a/bin/guest/vmm/BUILD.gn
+++ b/bin/guest/vmm/BUILD.gn
@@ -66,21 +66,21 @@
]
} else if (current_cpu == "x64") {
sources += [
- "arch/x86/acpi.cc",
- "arch/x86/acpi.h",
- "arch/x86/acpi_priv.h",
- "arch/x86/decode.cc",
- "arch/x86/decode.h",
- "arch/x86/e820.cc",
- "arch/x86/e820.h",
- "arch/x86/i8250.cc",
- "arch/x86/i8250.h",
- "arch/x86/io_apic.cc",
- "arch/x86/io_apic.h",
- "arch/x86/io_port.cc",
- "arch/x86/io_port.h",
- "arch/x86/page_table.cc",
- "arch/x86/page_table.h",
+ "arch/x64/acpi.cc",
+ "arch/x64/acpi.h",
+ "arch/x64/acpi_priv.h",
+ "arch/x64/decode.cc",
+ "arch/x64/decode.h",
+ "arch/x64/e820.cc",
+ "arch/x64/e820.h",
+ "arch/x64/i8250.cc",
+ "arch/x64/i8250.h",
+ "arch/x64/io_apic.cc",
+ "arch/x64/io_apic.h",
+ "arch/x64/io_port.cc",
+ "arch/x64/io_port.h",
+ "arch/x64/page_table.cc",
+ "arch/x64/page_table.h",
]
include_dirs = [ "//zircon/third_party/lib/acpica/source/include" ]
@@ -152,11 +152,11 @@
} else if (target_cpu == "x64") {
resources = [
{
- path = rebase_path("//garnet/bin/guest/vmm/arch/x86/asl/dsdt.aml")
+ path = rebase_path("//garnet/bin/guest/vmm/arch/x64/asl/dsdt.aml")
dest = "dsdt.aml"
},
{
- path = rebase_path("//garnet/bin/guest/vmm/arch/x86/asl/mcfg.aml")
+ path = rebase_path("//garnet/bin/guest/vmm/arch/x64/asl/mcfg.aml")
dest = "mcfg.aml"
},
]
@@ -183,8 +183,8 @@
if (current_cpu == "x64") {
sources += [
- "arch/x86/decode_unittest.cc",
- "arch/x86/page_table_unittest.cc",
+ "arch/x64/decode_unittest.cc",
+ "arch/x64/page_table_unittest.cc",
]
}
diff --git a/bin/guest/vmm/arch/x86/acpi.cc b/bin/guest/vmm/arch/x64/acpi.cc
similarity index 97%
rename from bin/guest/vmm/arch/x86/acpi.cc
rename to bin/guest/vmm/arch/x64/acpi.cc
index 47a5f2e..2a0ffad 100644
--- a/bin/guest/vmm/arch/x86/acpi.cc
+++ b/bin/guest/vmm/arch/x64/acpi.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/acpi.h"
+#include "garnet/bin/guest/vmm/arch/x64/acpi.h"
#include <fcntl.h>
#include <limits.h>
@@ -20,7 +20,7 @@
#include <acpica/actypes.h>
}
-#include "garnet/bin/guest/vmm/arch/x86/io_port.h"
+#include "garnet/bin/guest/vmm/arch/x64/io_port.h"
static uint8_t acpi_checksum(void* table, uint32_t length) {
uint8_t sum = 0;
diff --git a/bin/guest/vmm/arch/x86/acpi.h b/bin/guest/vmm/arch/x64/acpi.h
similarity index 84%
rename from bin/guest/vmm/arch/x86/acpi.h
rename to bin/guest/vmm/arch/x64/acpi.h
index dd9833e..3c70f5e 100644
--- a/bin/guest/vmm/arch/x86/acpi.h
+++ b/bin/guest/vmm/arch/x64/acpi.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_ACPI_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_ACPI_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_ACPI_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_ACPI_H_
#include "garnet/bin/guest/vmm/device/phys_mem.h"
@@ -23,4 +23,4 @@
zx_status_t create_acpi_table(const struct AcpiConfig& cfg,
const PhysMem& phys_mem);
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_ACPI_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_ACPI_H_
diff --git a/bin/guest/vmm/arch/x86/acpi_priv.h b/bin/guest/vmm/arch/x64/acpi_priv.h
similarity index 68%
rename from bin/guest/vmm/arch/x86/acpi_priv.h
rename to bin/guest/vmm/arch/x64/acpi_priv.h
index 6f8daeb..2ca1586 100644
--- a/bin/guest/vmm/arch/x86/acpi_priv.h
+++ b/bin/guest/vmm/arch/x64/acpi_priv.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_ACPI_PRIV_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_ACPI_PRIV_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_ACPI_PRIV_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_ACPI_PRIV_H_
#include <acpica/acpi.h>
#include <acpica/actypes.h>
@@ -12,4 +12,4 @@
#define PM1A_REGISTER_STATUS 0
#define PM1A_REGISTER_ENABLE (ACPI_PM1_REGISTER_WIDTH / 8)
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_ACPI_PRIV_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_ACPI_PRIV_H_
diff --git a/bin/guest/vmm/arch/x86/asl/dsdt.aml b/bin/guest/vmm/arch/x64/asl/dsdt.aml
similarity index 100%
rename from bin/guest/vmm/arch/x86/asl/dsdt.aml
rename to bin/guest/vmm/arch/x64/asl/dsdt.aml
Binary files differ
diff --git a/bin/guest/vmm/arch/x86/asl/dsdt.asl b/bin/guest/vmm/arch/x64/asl/dsdt.asl
similarity index 100%
rename from bin/guest/vmm/arch/x86/asl/dsdt.asl
rename to bin/guest/vmm/arch/x64/asl/dsdt.asl
diff --git a/bin/guest/vmm/arch/x86/asl/mcfg.aml b/bin/guest/vmm/arch/x64/asl/mcfg.aml
similarity index 100%
rename from bin/guest/vmm/arch/x86/asl/mcfg.aml
rename to bin/guest/vmm/arch/x64/asl/mcfg.aml
Binary files differ
diff --git a/bin/guest/vmm/arch/x86/asl/mcfg.asl b/bin/guest/vmm/arch/x64/asl/mcfg.asl
similarity index 100%
rename from bin/guest/vmm/arch/x86/asl/mcfg.asl
rename to bin/guest/vmm/arch/x64/asl/mcfg.asl
diff --git a/bin/guest/vmm/arch/x86/decode.cc b/bin/guest/vmm/arch/x64/decode.cc
similarity index 99%
rename from bin/guest/vmm/arch/x86/decode.cc
rename to bin/guest/vmm/arch/x64/decode.cc
index 1b91883..500f892 100644
--- a/bin/guest/vmm/arch/x86/decode.cc
+++ b/bin/guest/vmm/arch/x64/decode.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/decode.h"
+#include "garnet/bin/guest/vmm/arch/x64/decode.h"
#include <string.h>
diff --git a/bin/guest/vmm/arch/x86/decode.h b/bin/guest/vmm/arch/x64/decode.h
similarity index 95%
rename from bin/guest/vmm/arch/x86/decode.h
rename to bin/guest/vmm/arch/x64/decode.h
index 1dfe84a..739bbc5 100644
--- a/bin/guest/vmm/arch/x86/decode.h
+++ b/bin/guest/vmm/arch/x64/decode.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_DECODE_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_DECODE_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_DECODE_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_DECODE_H_
#include <zircon/types.h>
@@ -104,4 +104,4 @@
#endif // __x86_64__
}
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_DECODE_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_DECODE_H_
diff --git a/bin/guest/vmm/arch/x86/decode_unittest.cc b/bin/guest/vmm/arch/x64/decode_unittest.cc
similarity index 99%
rename from bin/guest/vmm/arch/x86/decode_unittest.cc
rename to bin/guest/vmm/arch/x64/decode_unittest.cc
index d848d7a..4629ac3 100644
--- a/bin/guest/vmm/arch/x86/decode_unittest.cc
+++ b/bin/guest/vmm/arch/x64/decode_unittest.cc
@@ -6,7 +6,7 @@
#include <zircon/errors.h>
#include <zircon/syscalls/hypervisor.h>
-#include "garnet/bin/guest/vmm/arch/x86/decode.h"
+#include "garnet/bin/guest/vmm/arch/x64/decode.h"
namespace {
diff --git a/bin/guest/vmm/arch/x86/e820.cc b/bin/guest/vmm/arch/x64/e820.cc
similarity index 95%
rename from bin/guest/vmm/arch/x86/e820.cc
rename to bin/guest/vmm/arch/x64/e820.cc
index cabcb78..2493d40 100644
--- a/bin/guest/vmm/arch/x86/e820.cc
+++ b/bin/guest/vmm/arch/x64/e820.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/e820.h"
+#include "garnet/bin/guest/vmm/arch/x64/e820.h"
#include <zircon/boot/e820.h>
diff --git a/bin/guest/vmm/arch/x86/e820.h b/bin/guest/vmm/arch/x64/e820.h
similarity index 88%
rename from bin/guest/vmm/arch/x86/e820.h
rename to bin/guest/vmm/arch/x64/e820.h
index 9f6f773..03cf686 100644
--- a/bin/guest/vmm/arch/x86/e820.h
+++ b/bin/guest/vmm/arch/x64/e820.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_E820_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_E820_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_E820_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_E820_H_
#include <vector>
@@ -42,4 +42,4 @@
std::vector<e820entry_t> entries;
};
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_E820_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_E820_H_
diff --git a/bin/guest/vmm/arch/x86/i8250.cc b/bin/guest/vmm/arch/x64/i8250.cc
similarity index 98%
rename from bin/guest/vmm/arch/x86/i8250.cc
rename to bin/guest/vmm/arch/x64/i8250.cc
index f4e07f3..e3544fa 100644
--- a/bin/guest/vmm/arch/x86/i8250.cc
+++ b/bin/guest/vmm/arch/x64/i8250.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/i8250.h"
+#include "garnet/bin/guest/vmm/arch/x64/i8250.h"
#include <stdio.h>
diff --git a/bin/guest/vmm/arch/x86/i8250.h b/bin/guest/vmm/arch/x64/i8250.h
similarity index 89%
rename from bin/guest/vmm/arch/x86/i8250.h
rename to bin/guest/vmm/arch/x64/i8250.h
index 870cf49..a087839 100644
--- a/bin/guest/vmm/arch/x86/i8250.h
+++ b/bin/guest/vmm/arch/x64/i8250.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_I8250_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_I8250_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_I8250_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_I8250_H_
#include <mutex>
@@ -52,4 +52,4 @@
I8250 uarts_[kNumUarts];
};
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_I8250_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_I8250_H_
diff --git a/bin/guest/vmm/arch/x86/io_apic.cc b/bin/guest/vmm/arch/x64/io_apic.cc
similarity index 98%
rename from bin/guest/vmm/arch/x86/io_apic.cc
rename to bin/guest/vmm/arch/x64/io_apic.cc
index 84a0e71..3a685b6 100644
--- a/bin/guest/vmm/arch/x86/io_apic.cc
+++ b/bin/guest/vmm/arch/x64/io_apic.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/io_apic.h"
+#include "garnet/bin/guest/vmm/arch/x64/io_apic.h"
#include <string.h>
diff --git a/bin/guest/vmm/arch/x86/io_apic.h b/bin/guest/vmm/arch/x64/io_apic.h
similarity index 91%
rename from bin/guest/vmm/arch/x86/io_apic.h
rename to bin/guest/vmm/arch/x64/io_apic.h
index 53e3938..7e27f7d 100644
--- a/bin/guest/vmm/arch/x86/io_apic.h
+++ b/bin/guest/vmm/arch/x64/io_apic.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_IO_APIC_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_IO_APIC_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_IO_APIC_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_IO_APIC_H_
#include <mutex>
@@ -55,4 +55,4 @@
zx_status_t WriteRegister(uint32_t select_register, const IoValue& value);
};
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_IO_APIC_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_IO_APIC_H_
diff --git a/bin/guest/vmm/arch/x86/io_port.cc b/bin/guest/vmm/arch/x64/io_port.cc
similarity index 99%
rename from bin/guest/vmm/arch/x86/io_port.cc
rename to bin/guest/vmm/arch/x64/io_port.cc
index 3e9f67b..b58ddb6 100644
--- a/bin/guest/vmm/arch/x86/io_port.cc
+++ b/bin/guest/vmm/arch/x64/io_port.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/io_port.h"
+#include "garnet/bin/guest/vmm/arch/x64/io_port.h"
#include <time.h>
diff --git a/bin/guest/vmm/arch/x86/io_port.h b/bin/guest/vmm/arch/x64/io_port.h
similarity index 94%
rename from bin/guest/vmm/arch/x86/io_port.h
rename to bin/guest/vmm/arch/x64/io_port.h
index 94318c2..983cdc5 100644
--- a/bin/guest/vmm/arch/x86/io_port.h
+++ b/bin/guest/vmm/arch/x64/io_port.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_IO_PORT_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_IO_PORT_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_IO_PORT_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_IO_PORT_H_
#include <mutex>
@@ -110,4 +110,4 @@
ProcessorInterfaceHandler proc_iface_;
};
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_IO_PORT_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_IO_PORT_H_
diff --git a/bin/guest/vmm/arch/x86/page_table.cc b/bin/guest/vmm/arch/x64/page_table.cc
similarity index 98%
rename from bin/guest/vmm/arch/x86/page_table.cc
rename to bin/guest/vmm/arch/x64/page_table.cc
index 7d1db8a..86df3a79 100644
--- a/bin/guest/vmm/arch/x86/page_table.cc
+++ b/bin/guest/vmm/arch/x64/page_table.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/bin/guest/vmm/arch/x86/page_table.h"
+#include "garnet/bin/guest/vmm/arch/x64/page_table.h"
#include <limits.h>
diff --git a/bin/guest/vmm/arch/x86/page_table.h b/bin/guest/vmm/arch/x64/page_table.h
similarity index 75%
rename from bin/guest/vmm/arch/x86/page_table.h
rename to bin/guest/vmm/arch/x64/page_table.h
index 4f98dcd..3270d26 100644
--- a/bin/guest/vmm/arch/x86/page_table.h
+++ b/bin/guest/vmm/arch/x64/page_table.h
@@ -4,8 +4,8 @@
#include <zircon/types.h>
-#ifndef GARNET_BIN_GUEST_VMM_ARCH_X86_PAGE_TABLE_H_
-#define GARNET_BIN_GUEST_VMM_ARCH_X86_PAGE_TABLE_H_
+#ifndef GARNET_BIN_GUEST_VMM_ARCH_X64_PAGE_TABLE_H_
+#define GARNET_BIN_GUEST_VMM_ARCH_X64_PAGE_TABLE_H_
class PhysMem;
@@ -18,4 +18,4 @@
*/
zx_status_t create_page_table(const PhysMem& phys_mem);
-#endif // GARNET_BIN_GUEST_VMM_ARCH_X86_PAGE_TABLE_H_
+#endif // GARNET_BIN_GUEST_VMM_ARCH_X64_PAGE_TABLE_H_
diff --git a/bin/guest/vmm/arch/x86/page_table_unittest.cc b/bin/guest/vmm/arch/x64/page_table_unittest.cc
similarity index 98%
rename from bin/guest/vmm/arch/x86/page_table_unittest.cc
rename to bin/guest/vmm/arch/x64/page_table_unittest.cc
index 1efd621..5cd63bd 100644
--- a/bin/guest/vmm/arch/x86/page_table_unittest.cc
+++ b/bin/guest/vmm/arch/x64/page_table_unittest.cc
@@ -8,7 +8,7 @@
#include <gtest/gtest.h>
-#include "garnet/bin/guest/vmm/arch/x86/page_table.h"
+#include "garnet/bin/guest/vmm/arch/x64/page_table.h"
#include "garnet/bin/guest/vmm/phys_mem_fake.h"
#define ROUNDUP(a, b) (((a) + ((b)-1)) & ~((b)-1))
diff --git a/bin/guest/vmm/interrupt_controller.h b/bin/guest/vmm/interrupt_controller.h
index cd2ea88..01c9d78 100644
--- a/bin/guest/vmm/interrupt_controller.h
+++ b/bin/guest/vmm/interrupt_controller.h
@@ -7,7 +7,7 @@
#if __x86_64__
-#include "garnet/bin/guest/vmm/arch/x86/io_apic.h"
+#include "garnet/bin/guest/vmm/arch/x64/io_apic.h"
using InterruptController = IoApic;
diff --git a/bin/guest/vmm/linux.cc b/bin/guest/vmm/linux.cc
index 9f843a7..c90a135 100644
--- a/bin/guest/vmm/linux.cc
+++ b/bin/guest/vmm/linux.cc
@@ -32,8 +32,8 @@
static constexpr uintptr_t kKernelOffset = 0x2080000;
#elif __x86_64__
static constexpr uintptr_t kKernelOffset = 0x200000;
-#include "garnet/bin/guest/vmm/arch/x86/acpi.h"
-#include "garnet/bin/guest/vmm/arch/x86/e820.h"
+#include "garnet/bin/guest/vmm/arch/x64/acpi.h"
+#include "garnet/bin/guest/vmm/arch/x64/e820.h"
#endif
static constexpr uint8_t kLoaderTypeUnspecified = 0xff; // Unknown bootloader
diff --git a/bin/guest/vmm/main.cc b/bin/guest/vmm/main.cc
index 000c367..75d2c52 100644
--- a/bin/guest/vmm/main.cc
+++ b/bin/guest/vmm/main.cc
@@ -54,9 +54,9 @@
#include "garnet/bin/guest/vmm/arch/arm64/pl031.h"
#elif __x86_64__
-#include "garnet/bin/guest/vmm/arch/x86/acpi.h"
-#include "garnet/bin/guest/vmm/arch/x86/io_port.h"
-#include "garnet/bin/guest/vmm/arch/x86/page_table.h"
+#include "garnet/bin/guest/vmm/arch/x64/acpi.h"
+#include "garnet/bin/guest/vmm/arch/x64/io_port.h"
+#include "garnet/bin/guest/vmm/arch/x64/page_table.h"
static constexpr char kDsdtPath[] = "/pkg/data/dsdt.aml";
static constexpr char kMcfgPath[] = "/pkg/data/mcfg.aml";
diff --git a/bin/guest/vmm/uart.h b/bin/guest/vmm/uart.h
index c2f6308..0add39b 100644
--- a/bin/guest/vmm/uart.h
+++ b/bin/guest/vmm/uart.h
@@ -7,7 +7,7 @@
#if __x86_64__
-#include "garnet/bin/guest/vmm/arch/x86/i8250.h"
+#include "garnet/bin/guest/vmm/arch/x64/i8250.h"
using Uart = I8250Group;
diff --git a/bin/guest/vmm/vcpu.cc b/bin/guest/vmm/vcpu.cc
index e3af9ac..afead0e 100644
--- a/bin/guest/vmm/vcpu.cc
+++ b/bin/guest/vmm/vcpu.cc
@@ -46,7 +46,7 @@
return ZX_OK;
}
#elif __x86_64__
-#include "garnet/bin/guest/vmm/arch/x86/decode.h"
+#include "garnet/bin/guest/vmm/arch/x64/decode.h"
static zx_status_t HandleMemX86(const zx_packet_guest_mem_t& mem,
uint64_t trap_key, const Instruction* inst) {
diff --git a/bin/guest/vmm/zircon.cc b/bin/guest/vmm/zircon.cc
index 0f4d3c8..72e72c2 100644
--- a/bin/guest/vmm/zircon.cc
+++ b/bin/guest/vmm/zircon.cc
@@ -43,8 +43,8 @@
#elif __x86_64__
static constexpr uintptr_t kKernelOffset = 0x100000;
-#include "garnet/bin/guest/vmm/arch/x86/acpi.h"
-#include "garnet/bin/guest/vmm/arch/x86/e820.h"
+#include "garnet/bin/guest/vmm/arch/x64/acpi.h"
+#include "garnet/bin/guest/vmm/arch/x64/e820.h"
#endif
static constexpr uintptr_t kRamdiskOffset = 0x4000000;
