@@ -22,11 +22,11 @@ pub use aarch64::vm::{ArchVm, ArchVmError, VmState};
22
22
pub use aarch64:: {
23
23
ConfigurationError , arch_memory_regions, configure_system_for_boot, get_kernel_start,
24
24
initrd_load_addr, layout:: BOOT_DEVICE_MEM_START , layout:: CMDLINE_MAX_SIZE ,
25
- layout:: GSI_LEGACY_END , layout:: GSI_LEGACY_NUM , layout:: GSI_LEGACY_START , layout :: GSI_MSI_END ,
26
- layout:: GSI_MSI_NUM , layout:: GSI_MSI_START , layout:: MEM_32BIT_DEVICES_SIZE ,
27
- layout:: MEM_32BIT_DEVICES_START , layout:: MEM_64BIT_DEVICES_SIZE ,
28
- layout:: MEM_64BIT_DEVICES_START , layout:: MMIO32_MEM_SIZE , layout:: MMIO32_MEM_START ,
29
- layout:: PCI_MMCONFIG_SIZE , layout:: PCI_MMCONFIG_START ,
25
+ layout:: FIRST_ADDR_PAST_64BITS_MMIO , layout:: GSI_LEGACY_END , layout:: GSI_LEGACY_NUM ,
26
+ layout:: GSI_LEGACY_START , layout:: GSI_MSI_END , layout:: GSI_MSI_NUM , layout :: GSI_MSI_START ,
27
+ layout:: MEM_32BIT_DEVICES_SIZE , layout:: MEM_32BIT_DEVICES_START ,
28
+ layout:: MEM_64BIT_DEVICES_SIZE , layout:: MEM_64BIT_DEVICES_START , layout:: MMIO32_MEM_SIZE ,
29
+ layout:: MMIO32_MEM_START , layout :: PCI_MMCONFIG_SIZE , layout:: PCI_MMCONFIG_START ,
30
30
layout:: PCI_MMIO_CONFIG_SIZE_PER_SEGMENT , layout:: RTC_MEM_START , layout:: SERIAL_MEM_START ,
31
31
layout:: SPI_START , layout:: SYSTEM_MEM_SIZE , layout:: SYSTEM_MEM_START , load_kernel,
32
32
} ;
@@ -46,9 +46,9 @@ pub use x86_64::vm::{ArchVm, ArchVmError, VmState};
46
46
pub use crate :: arch:: x86_64:: {
47
47
ConfigurationError , arch_memory_regions, configure_system_for_boot, get_kernel_start,
48
48
initrd_load_addr, layout:: APIC_ADDR , layout:: BOOT_DEVICE_MEM_START , layout:: CMDLINE_MAX_SIZE ,
49
- layout:: GSI_LEGACY_END , layout:: GSI_LEGACY_NUM , layout:: GSI_LEGACY_START , layout :: GSI_MSI_END ,
50
- layout:: GSI_MSI_NUM , layout:: GSI_MSI_START , layout:: IOAPIC_ADDR ,
51
- layout:: MEM_32BIT_DEVICES_SIZE , layout:: MEM_32BIT_DEVICES_START ,
49
+ layout:: FIRST_ADDR_PAST_64BITS_MMIO , layout:: GSI_LEGACY_END , layout:: GSI_LEGACY_NUM ,
50
+ layout:: GSI_LEGACY_START , layout:: GSI_MSI_END , layout:: GSI_MSI_NUM , layout :: GSI_MSI_START ,
51
+ layout:: IOAPIC_ADDR , layout :: MEM_32BIT_DEVICES_SIZE , layout:: MEM_32BIT_DEVICES_START ,
52
52
layout:: MEM_64BIT_DEVICES_SIZE , layout:: MEM_64BIT_DEVICES_START , layout:: MMIO32_MEM_SIZE ,
53
53
layout:: MMIO32_MEM_START , layout:: PCI_MMCONFIG_SIZE , layout:: PCI_MMCONFIG_START ,
54
54
layout:: PCI_MMIO_CONFIG_SIZE_PER_SEGMENT , layout:: SYSTEM_MEM_SIZE , layout:: SYSTEM_MEM_START ,
0 commit comments