acpi: Permit OEM ID and OEM table ID fields to be changed
v4 cover acpi: Permit OEM ID and OEM table ID fields to be changed
Qemu's ACPI table generation sets the fields OEM ID and OEM table ID to "BOCHS " and "BXPCxxxx" where "xxxx" is replaced by the ACPI table name.
Some games like Red Dead Redemption 2 seem to check the ACPI OEM ID and OEM table ID for the strings "BOCHS" and "BXPC" and if they are found, the game crashes(this may be an intentional detection mechanism to prevent playing the game in a virtualized environment).
This patch allows you to override these default values.
The feature can be used in this manner:
qemu -machine oem-id=ABCDEF,oem-table-id=GHIJKLMN
The oem-id string can be up to 6 bytes in size, and the oem-table-id string can be up to 8 bytes in size. If the string are smaller than their respective sizes they will be padded with space. If either of these parameters is not set, the current default values will be used for the one missing.
Note that the the OEM Table ID field will not be extended with the name of the table, but will use either the default name or the user provided one.
This does not affect the -acpitable option (for user-defined ACPI tables), which has precedence over -machine option.
v4:
- Added testcases for pc,q35,microvm,aarch64
- Switched to strpadcpy() instead of own function
- Don't touch unrelated fields in tables
- Instead of VIRT_MACHINE(obj)->bar use Foo *vm = VIRT_MACHINE(obj); vm->bar
v3:
- Do not append the sig part to OEM table id
- build_header() always sets the passed in values for oem_id and oem_table_id
- Fixed a call to g_strdup() with a non-terminated string
- Use MachineState structures to hold the OEM fields
- Proper error handling in object setters
- Added description for object setters/getters
- Added support for pc,q35,microvm,aarch64
v2:
- Use machine properties to set the OEM fields values
- Pass the desired values from acpi_build()
Marian Postevca (5):
tests/acpi: allow updates for expected data files
acpi: Permit OEM ID and OEM table ID fields to be changed tests/acpi: add OEM ID and OEM TABLE ID test tests/acpi: update expected data files tests/acpi: disallow updates for expected data files
hw/acpi/hmat.h | 3 +- hw/i386/acpi-common.h | 3 +- include/hw/acpi/acpi-defs.h | 2 +- include/hw/acpi/aml-build.h | 8 +- include/hw/acpi/ghes.h | 3 +- include/hw/acpi/pci.h | 3 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/arm/virt.h | 2 + include/hw/i386/microvm.h | 4 + include/hw/i386/pc.h | 5 +- include/hw/mem/nvdimm.h | 3 +- hw/acpi/aml-build.c | 29 ++--- hw/acpi/ghes.c | 5 +- hw/acpi/hmat.c | 5 +- hw/acpi/nvdimm.c | 18 +-- hw/acpi/pci.c | 5 +- hw/acpi/vmgenid.c | 4 +- hw/arm/virt-acpi-build.c | 40 ++++--- hw/arm/virt.c | 63 ++++++++++ hw/i386/acpi-build.c | 86 +++++++++----- hw/i386/acpi-common.c | 5 +- hw/i386/acpi-microvm.c | 13 +- hw/i386/microvm.c | 66 +++++++++++ hw/i386/pc.c | 64 ++++++++++ tests/qtest/bios-tables-test.c | 170 +++++++++++++++++++++++---- tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes tests/data/acpi/microvm/DSDT | Bin 365 -> 365 bytes tests/data/acpi/microvm/DSDT.ioapic2 | Bin 365 -> 365 bytes tests/data/acpi/microvm/DSDT.pcie | Bin 3031 -> 3031 bytes tests/data/acpi/microvm/DSDT.rtc | Bin 404 -> 404 bytes tests/data/acpi/microvm/DSDT.usb | Bin 414 -> 414 bytes tests/data/acpi/microvm/FACP | Bin 268 -> 268 bytes tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes tests/data/acpi/pc/DSDT | Bin 5065 -> 5065 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6390 -> 6390 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6924 -> 6924 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5529 -> 5529 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6719 -> 6719 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 5026 -> 5026 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3084 -> 3084 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5137 -> 5137 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6424 -> 6424 bytes tests/data/acpi/pc/DSDT.numamem | Bin 5071 -> 5071 bytes tests/data/acpi/pc/DSDT.roothp | Bin 5261 -> 5261 bytes tests/data/acpi/pc/FACP | Bin 116 -> 116 bytes tests/data/acpi/pc/HMAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/pc/HPET | Bin 56 -> 56 bytes tests/data/acpi/pc/NFIT.dimmpxm | Bin 240 -> 240 bytes tests/data/acpi/pc/SLIT.cphp | Bin 48 -> 48 bytes tests/data/acpi/pc/SLIT.memhp | Bin 48 -> 48 bytes tests/data/acpi/pc/SRAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/pc/SRAT.cphp | Bin 304 -> 304 bytes tests/data/acpi/pc/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/pc/SRAT.memhp | Bin 264 -> 264 bytes tests/data/acpi/pc/SRAT.numamem | Bin 224 -> 224 bytes tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 734 bytes tests/data/acpi/pc/WAET | Bin 40 -> 40 bytes tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes tests/data/acpi/q35/DSDT | Bin 7801 -> 7801 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9126 -> 9126 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7819 -> 7819 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8265 -> 8265 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9455 -> 9455 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7876 -> 7876 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9160 -> 9160 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8932 -> 8932 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7807 -> 7807 bytes tests/data/acpi/q35/DSDT.tis | Bin 8407 -> 8407 bytes tests/data/acpi/q35/FACP | Bin 244 -> 244 bytes tests/data/acpi/q35/HMAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/q35/HPET | Bin 56 -> 56 bytes tests/data/acpi/q35/MCFG | Bin 60 -> 60 bytes tests/data/acpi/q35/NFIT.dimmpxm | Bin 240 -> 240 bytes tests/data/acpi/q35/SLIT.cphp | Bin 48 -> 48 bytes tests/data/acpi/q35/SLIT.memhp | Bin 48 -> 48 bytes tests/data/acpi/q35/SRAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/q35/SRAT.cphp | Bin 304 -> 304 bytes tests/data/acpi/q35/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/q35/SRAT.memhp | Bin 264 -> 264 bytes tests/data/acpi/q35/SRAT.mmio64 | Bin 224 -> 224 bytes tests/data/acpi/q35/SRAT.numamem | Bin 224 -> 224 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 734 bytes tests/data/acpi/q35/TPM2.tis | Bin 76 -> 76 bytes tests/data/acpi/q35/WAET | Bin 40 -> 40 bytes tests/data/acpi/virt/APIC | Bin 168 -> 168 bytes tests/data/acpi/virt/APIC.memhp | Bin 168 -> 168 bytes tests/data/acpi/virt/APIC.numamem | Bin 168 -> 168 bytes tests/data/acpi/virt/DSDT | Bin 5204 -> 5204 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6565 -> 6565 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5204 -> 5204 bytes tests/data/acpi/virt/DSDT.pxb | Bin 7689 -> 7689 bytes tests/data/acpi/virt/FACP | Bin 268 -> 268 bytes tests/data/acpi/virt/FACP.memhp | Bin 268 -> 268 bytes tests/data/acpi/virt/FACP.numamem | Bin 268 -> 268 bytes tests/data/acpi/virt/GTDT | Bin 96 -> 96 bytes tests/data/acpi/virt/GTDT.memhp | Bin 96 -> 96 bytes tests/data/acpi/virt/GTDT.numamem | Bin 96 -> 96 bytes tests/data/acpi/virt/MCFG | Bin 60 -> 60 bytes tests/data/acpi/virt/MCFG.memhp | Bin 60 -> 60 bytes tests/data/acpi/virt/MCFG.numamem | Bin 60 -> 60 bytes tests/data/acpi/virt/NFIT.memhp | Bin 224 -> 224 bytes tests/data/acpi/virt/SLIT.memhp | Bin 48 -> 48 bytes tests/data/acpi/virt/SPCR | Bin 80 -> 80 bytes tests/data/acpi/virt/SPCR.memhp | Bin 80 -> 80 bytes tests/data/acpi/virt/SPCR.numamem | Bin 80 -> 80 bytes tests/data/acpi/virt/SRAT.memhp | Bin 226 -> 226 bytes tests/data/acpi/virt/SRAT.numamem | Bin 106 -> 106 bytes tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes 116 files changed, 495 insertions(+), 116 deletions(-)
Signature · 1 line
2.26.2
PATCH v4 1/5 tests/acpi: allow updates for expected data files
--- tests/qtest/bios-tables-test-allowed-diff.h | 94 +++++++++++++++++++++ 1 file changed, 94 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +94 -0
@@ -1 +1,95 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/APIC" , +"tests/data/acpi/virt/FACP" , +"tests/data/acpi/virt/GTDT" , +"tests/data/acpi/virt/MCFG" , +"tests/data/acpi/virt/SPCR" , +"tests/data/acpi/virt/DSDT" , +"tests/data/acpi/virt/APIC.numamem" , +"tests/data/acpi/virt/FACP.numamem" , +"tests/data/acpi/virt/GTDT.numamem" , +"tests/data/acpi/virt/MCFG.numamem" , +"tests/data/acpi/virt/SPCR.numamem" , +"tests/data/acpi/virt/DSDT.numamem" , +"tests/data/acpi/virt/SRAT.numamem" , +"tests/data/acpi/virt/DSDT.memhp" , +"tests/data/acpi/virt/NFIT.memhp" , +"tests/data/acpi/virt/SSDT.memhp" , +"tests/data/acpi/virt/SLIT.memhp" , +"tests/data/acpi/virt/SRAT.memhp" , +"tests/data/acpi/virt/SPCR.memhp" , +"tests/data/acpi/virt/MCFG.memhp" , +"tests/data/acpi/virt/GTDT.memhp" , +"tests/data/acpi/virt/APIC.memhp" , +"tests/data/acpi/virt/FACP.memhp" , +"tests/data/acpi/virt/DSDT.pxb" , + +"tests/data/acpi/pc/SRAT.acpihmat" , +"tests/data/acpi/pc/HPET" , +"tests/data/acpi/pc/DSDT.hpbrroot" , +"tests/data/acpi/pc/SRAT.numamem" , +"tests/data/acpi/pc/DSDT.dimmpxm" , +"tests/data/acpi/pc/DSDT.acpihmat" , +"tests/data/acpi/pc/FACP" , +"tests/data/acpi/pc/SRAT.cphp" , +"tests/data/acpi/pc/DSDT.numamem" , +"tests/data/acpi/pc/DSDT.bridge" , +"tests/data/acpi/pc/HMAT.acpihmat" , +"tests/data/acpi/pc/DSDT.cphp" , +"tests/data/acpi/pc/APIC.dimmpxm" , +"tests/data/acpi/pc/SRAT.memhp" , +"tests/data/acpi/pc/SLIT.cphp" , +"tests/data/acpi/pc/DSDT.hpbridge" , +"tests/data/acpi/pc/NFIT.dimmpxm" , +"tests/data/acpi/pc/APIC.cphp" , +"tests/data/acpi/pc/SSDT.dimmpxm" , +"tests/data/acpi/pc/SRAT.dimmpxm" , +"tests/data/acpi/pc/APIC.acpihmat" , +"tests/data/acpi/pc/DSDT.memhp" , +"tests/data/acpi/pc/DSDT.ipmikcs" , +"tests/data/acpi/pc/SLIT.memhp" , +"tests/data/acpi/pc/WAET" , +"tests/data/acpi/pc/DSDT" , +"tests/data/acpi/pc/APIC" , +"tests/data/acpi/pc/DSDT.roothp" , + +"tests/data/acpi/q35/SRAT.acpihmat" , +"tests/data/acpi/q35/HPET" , +"tests/data/acpi/q35/SRAT.numamem" , +"tests/data/acpi/q35/DSDT.dimmpxm" , +"tests/data/acpi/q35/DSDT.acpihmat" , +"tests/data/acpi/q35/FACP" , +"tests/data/acpi/q35/DSDT.mmio64" , +"tests/data/acpi/q35/SRAT.cphp" , +"tests/data/acpi/q35/DSDT.numamem" , +"tests/data/acpi/q35/DSDT.bridge" , +"tests/data/acpi/q35/HMAT.acpihmat" , +"tests/data/acpi/q35/DSDT.cphp" , +"tests/data/acpi/q35/APIC.dimmpxm" , +"tests/data/acpi/q35/SRAT.memhp" , +"tests/data/acpi/q35/SLIT.cphp" , +"tests/data/acpi/q35/NFIT.dimmpxm" , +"tests/data/acpi/q35/APIC.cphp" , +"tests/data/acpi/q35/SSDT.dimmpxm" , +"tests/data/acpi/q35/SRAT.dimmpxm" , +"tests/data/acpi/q35/APIC.acpihmat" , +"tests/data/acpi/q35/MCFG" , +"tests/data/acpi/q35/DSDT.memhp" , +"tests/data/acpi/q35/SLIT.memhp" , +"tests/data/acpi/q35/WAET" , +"tests/data/acpi/q35/DSDT.ipmibt" , +"tests/data/acpi/q35/DSDT.tis" , +"tests/data/acpi/q35/SRAT.mmio64" , +"tests/data/acpi/q35/TPM2.tis" , +"tests/data/acpi/q35/DSDT" , +"tests/data/acpi/q35/APIC" , + +"tests/data/acpi/microvm/APIC.pcie" , +"tests/data/acpi/microvm/DSDT.pcie" , +"tests/data/acpi/microvm/DSDT.usb" , +"tests/data/acpi/microvm/DSDT.rtc" , +"tests/data/acpi/microvm/FACP" , +"tests/data/acpi/microvm/APIC.ioapic2" , +"tests/data/acpi/microvm/DSDT.ioapic2" , +"tests/data/acpi/microvm/DSDT" , +"tests/data/acpi/microvm/APIC",
Signature · 1 line
2.26.2
PATCH v4 2/5 acpi: Permit OEM ID and OEM table ID fields to be changed
In reply to Marian PostevcaQemu's ACPI table generation sets the fields OEM ID and OEM table ID to "BOCHS " and "BXPCxxxx" where "xxxx" is replaced by the ACPI table name.
Some games like Red Dead Redemption 2 seem to check the ACPI OEM ID and OEM table ID for the strings "BOCHS" and "BXPC" and if they are found, the game crashes(this may be an intentional detection mechanism to prevent playing the game in a virtualized environment).
This patch allows you to override these default values.
The feature can be used in this manner:
qemu -machine oem-id=ABCDEF,oem-table-id=GHIJKLMN
The oem-id string can be up to 6 bytes in size, and the oem-table-id string can be up to 8 bytes in size. If the string are smaller than their respective sizes they will be padded with space. If either of these parameters is not set, the current default values will be used for the one missing.
Note that the the OEM Table ID field will not be extended with the name of the table, but will use either the default name or the user provided one.
This does not affect the -acpitable option (for user-defined ACPI tables), which has precedence over -machine option.
--- hw/acpi/hmat.h | 3 +- hw/i386/acpi-common.h | 3 +- include/hw/acpi/acpi-defs.h | 2 +- include/hw/acpi/aml-build.h | 8 ++-- include/hw/acpi/ghes.h | 3 +- include/hw/acpi/pci.h | 3 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/arm/virt.h | 2 + include/hw/i386/microvm.h | 4 ++ include/hw/i386/pc.h | 5 ++- include/hw/mem/nvdimm.h | 3 +- hw/acpi/aml-build.c | 29 ++++++------- hw/acpi/ghes.c | 5 ++- hw/acpi/hmat.c | 5 ++- hw/acpi/nvdimm.c | 18 +++++--- hw/acpi/pci.c | 5 ++- hw/acpi/vmgenid.c | 4 +- hw/arm/virt-acpi-build.c | 40 +++++++++++------ hw/arm/virt.c | 63 +++++++++++++++++++++++++++ hw/i386/acpi-build.c | 86 +++++++++++++++++++++++++------------ hw/i386/acpi-common.c | 5 ++- hw/i386/acpi-microvm.c | 13 +++--- hw/i386/microvm.c | 66 ++++++++++++++++++++++++++++ hw/i386/pc.c | 64 +++++++++++++++++++++++++++ 24 files changed, 349 insertions(+), 92 deletions(-)
hw/acpi/hmat.h +2 -1
@@ -37,6 +37,7 @@*/ #define HMAT_PROXIMITY_INITIATOR_VALID 0x1 -void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state); +void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state, +const char *oem_id,const char *oem_table_id);#endif
hw/i386/acpi-common.h +2 -1
@@ -9,6 +9,7 @@#define ACPI_BUILD_IOAPIC_ID 0x0void acpi_build_madt (GArray *table_data,BIOSLinker *linker, -X86MachineState *x86ms,AcpiDeviceIf *adev); +X86MachineState *x86ms,AcpiDeviceIf *adev, +const char *oem_id,const char *oem_table_id);#endif
include/hw/acpi/acpi-defs.h +1 -1
@@ -41,7 +41,7 @@ enum { }; typedef struct AcpiRsdpData { - uint8_t oem_id[6] QEMU_NONSTRING; /* OEM identification */ + char *oem_id; /* OEM identification */ uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */ unsigned *rsdt_tbl_offset;
include/hw/acpi/aml-build.h +5 -3
@@ -8,7 +8,7 @@#define ACPI_BUILD_TABLE_MAX_SIZE 0x200000#define ACPI_BUILD_APPNAME6 "BOCHS " -#define ACPI_BUILD_APPNAME4 "BXPC" +#define ACPI_BUILD_APPNAME8 "BXPC "#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
@@ -459,10 +459,12 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags); -void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms); +void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms, +const char *oem_id,const char *oem_table_id);void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id); -void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog); +void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, +const char *oem_id,const char *oem_table_id);#endif
include/hw/acpi/ghes.h +2 -1
@@ -67,7 +67,8 @@ typedef struct AcpiGhesState { } AcpiGhesState;void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker); -void acpi_build_hest (GArray *table_data,BIOSLinker *linker); +void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +const char *oem_id,const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);int acpi_ghes_record_errors (uint8_t notify,uint64_t error_physical_addr);
include/hw/acpi/pci.h +2 -1
@@ -33,5 +33,6 @@ typedef struct AcpiMcfgInfo { uint32_t size; } AcpiMcfgInfo; -void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info); +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info, +const char *oem_id,const char *oem_table_id);#endif
include/hw/acpi/vmgenid.h +1 -1
@@ -31,7 +31,7 @@ static inline Object *find_vmgenid_dev(void) }void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid, -BIOSLinker *linker); +BIOSLinker *linker,const char *oem_id);void vmgenid_add_fw_cfg (VmGenIdState *vms,FWCfgState *s,GArray *guid);#endif
include/hw/arm/virt.h +2 -0
@@ -163,6 +163,8 @@ struct VirtMachineState {DeviceState *acpi_dev;Notifier powerdown_notifier;PCIBus *bus; +char *oem_id; +char *oem_table_id; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
include/hw/i386/microvm.h +4 -0
@@ -76,6 +76,8 @@#define MICROVM_MACHINE_ISA_SERIAL "isa-serial"#define MICROVM_MACHINE_OPTION_ROMS "x-option-roms"#define MICROVM_MACHINE_AUTO_KERNEL_CMDLINE "auto-kernel-cmdline" +#define MICROVM_MACHINE_OEM_ID "oem-id" +#define MICROVM_MACHINE_OEM_TABLE_ID "oem-table-id"struct MicrovmMachineClass {X86MachineClass parent;
@@ -104,6 +106,8 @@ struct MicrovmMachineState {Notifier machine_done;Notifier powerdown_req;struct GPEXConfig gpex; +char *oem_id; +char *oem_table_id; };#define TYPE_MICROVM_MACHINE MACHINE_TYPE_NAME("microvm")
include/hw/i386/pc.h +4 -1
@@ -45,6 +45,8 @@ typedef struct PCMachineState {bool pit_enabled;bool hpet_enabled;uint64_t max_fw_size; +char *oem_id; +char *oem_table_id;/* NUMA information: */ uint64_t numa_nodes;
@@ -62,7 +64,8 @@ typedef struct PCMachineState {#define PC_MACHINE_SATA "sata"#define PC_MACHINE_PIT "pit"#define PC_MACHINE_MAX_FW_SIZE "max-fw-size" - +#define PC_MACHINE_OEM_ID "oem-id" +#define PC_MACHINE_OEM_TABLE_ID "oem-table-id"/** * PCMachineClass: *
include/hw/mem/nvdimm.h +2 -1
@@ -154,7 +154,8 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,void nvdimm_build_srat (GArray *table_data);void nvdimm_build_acpi (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *state, -uint32_t ram_slots); +uint32_t ram_slots,const char *oem_id, +const char *oem_table_id);void nvdimm_plug (NVDIMMState *state);void nvdimm_acpi_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev);#endif
hw/acpi/aml-build.c +12 -17
@@ -30,6 +30,7 @@#include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_bridge.h" +#include "qemu/cutils.h" static GArray *build_alloc_array (void ) {
@@ -1674,21 +1675,12 @@ build_header(BIOSLinker *linker, GArray *table_data, h->length =cpu_to_le32 (len); h->revision = rev; -if (oem_id) { -strncpy ((char *)h->oem_id, oem_id,sizeof h->oem_id); - }else { -memcpy (h->oem_id,ACPI_BUILD_APPNAME6 ,6 ); - } - -if (oem_table_id) { -strncpy ((char *)h->oem_table_id, oem_table_id,sizeof (h->oem_table_id)); - }else { -memcpy (h->oem_table_id,ACPI_BUILD_APPNAME4 ,4 ); -memcpy (h->oem_table_id +4 , sig,4 ); - } +strpadcpy ((char *)h->oem_id,sizeof h->oem_id, oem_id,' ' ); +strpadcpy ((char *)h->oem_table_id,sizeof h->oem_table_id, + oem_table_id,' ' ); h->oem_revision =cpu_to_le32 (1 ); -memcpy (h->asl_compiler_id,ACPI_BUILD_APPNAME4 ,4 ); +memcpy (h->asl_compiler_id,ACPI_BUILD_APPNAME8 ,4 ); h->asl_compiler_revision =cpu_to_le32 (1 );/* Checksum to be filled in by Guest linker */ bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,
@@ -1871,7 +1863,8 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,* ACPI spec 5.2.17 System Locality Distance Information Table * (Revision 2.0 or later) */ -void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms) +void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms, +const char *oem_id,const char *oem_table_id) {int slit_start, i, j; slit_start = table_data->len;
@@ -1892,7 +1885,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms)build_header (linker, table_data, (void *)(table_data->data + slit_start),"SLIT" , - table_data->len - slit_start,1 ,NULL ,NULL ); + table_data->len - slit_start,1 , oem_id, oem_table_id); }/* build rev1/rev3/rev5.1 FADT */
@@ -2024,7 +2017,8 @@ build_hdr:* table 7: TCG Hardware Interface Description Table Format for TPM 2.0 * of TCG ACPI Specification, Family “1.2” and “2.0”, Version 1.2, Rev 8 */ -void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog) +void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, +const char *oem_id,const char *oem_table_id) {uint8_t start_method_params[12 ] = {};unsigned log_addr_offset, tpm2_start;
@@ -2073,7 +2067,8 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) log_addr_offset,8 , ACPI_BUILD_TPMLOG_FILE, 0);build_header (linker, table_data, - tpm2_ptr,"TPM2" , table_data->len - tpm2_start,4 ,NULL ,NULL ); + tpm2_ptr,"TPM2" , table_data->len - tpm2_start,4 , oem_id, + oem_table_id); } Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,
hw/acpi/ghes.c +3 -2
@@ -359,7 +359,8 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker) }/* Build Hardware Error Source Table */ -void acpi_build_hest (GArray *table_data,BIOSLinker *linker) +void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +const char *oem_id,const char *oem_table_id) {uint64_t hest_start = table_data->len;
@@ -372,7 +373,7 @@ void acpi_build_hest(GArray *table_data, BIOSLinker *linker)build_ghes_v2 (table_data,ACPI_HEST_SRC_ID_SEA , linker);build_header (linker, table_data, (void *)(table_data->data + hest_start), -"HEST" , table_data->len - hest_start,1 ,NULL ,NULL ); +"HEST" , table_data->len - hest_start,1 , oem_id, oem_table_id); } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
hw/acpi/hmat.c +3 -2
@@ -253,7 +253,8 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) } } -void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state) +void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state, +const char *oem_id,const char *oem_table_id) {int hmat_start = table_data->len;
@@ -264,5 +265,5 @@ void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *numa_state)build_header (linker, table_data, (void *)(table_data->data + hmat_start), -"HMAT" , table_data->len - hmat_start,2 ,NULL ,NULL ); +"HMAT" , table_data->len - hmat_start,2 , oem_id, oem_table_id); }
hw/acpi/nvdimm.c +11 -7
@@ -402,7 +402,8 @@ void nvdimm_plug(NVDIMMState *state) }static void nvdimm_build_nfit (NVDIMMState *state,GArray *table_offsets, -GArray *table_data,BIOSLinker *linker) +GArray *table_data,BIOSLinker *linker, +const char *oem_id,const char *oem_table_id) {NvdimmFitBuffer *fit_buf = &state->fit_buf;unsigned int header;
@@ -417,7 +418,8 @@ static void nvdimm_build_nfit(NVDIMMState *state, GArray *table_offsets,build_header (linker, table_data, (void *)(table_data->data + header),"NFIT" , -sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 ,NULL ,NULL ); +sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 , oem_id, + oem_table_id); }#define NVDIMM_DSM_MEMORY_SIZE 4096
@@ -1278,7 +1280,7 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)static void nvdimm_build_ssdt (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *nvdimm_state, -uint32_t ram_slots) +uint32_t ram_slots,const char *oem_id) {Aml *ssdt, *sb_scope, *dev;int mem_addr_offset, nvdimm_ssdt;
@@ -1331,7 +1333,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data, NVDIMM_DSM_MEM_FILE, 0);build_header (linker, table_data, (void *)(table_data->data + nvdimm_ssdt), -"SSDT" , table_data->len - nvdimm_ssdt,1 ,NULL ,"NVDIMM" ); +"SSDT" , table_data->len - nvdimm_ssdt,1 , oem_id,"NVDIMM" );free_aml_allocator (); }
@@ -1359,7 +1361,8 @@ void nvdimm_build_srat(GArray *table_data)void nvdimm_build_acpi (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *state, -uint32_t ram_slots) +uint32_t ram_slots,const char *oem_id, +const char *oem_table_id) {GSList *device_list;
@@ -1369,7 +1372,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, }nvdimm_build_ssdt (table_offsets, table_data, linker, state, - ram_slots); + ram_slots, oem_id); device_list =nvdimm_get_device_list ();/* no NVDIMM device is plugged. */
@@ -1377,6 +1380,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,return ; } -nvdimm_build_nfit (state, table_offsets, table_data, linker); +nvdimm_build_nfit (state, table_offsets, table_data, linker, + oem_id, oem_table_id);g_slist_free (device_list); }
hw/acpi/pci.c +3 -2
@@ -28,7 +28,8 @@#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" -void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info, +const char *oem_id,const char *oem_table_id) {int mcfg_start = table_data->len;
@@ -56,6 +57,6 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)build_append_int_noprefix (table_data,0 ,4 );build_header (linker, table_data, (void *)(table_data->data + mcfg_start), -"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); +"MCFG" , table_data->len - mcfg_start,1 , oem_id, oem_table_id); }
hw/acpi/vmgenid.c +2 -2
@@ -24,7 +24,7 @@#include "sysemu/reset.h" void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid, -BIOSLinker *linker) +BIOSLinker *linker,const char *oem_id) {Aml *ssdt, *dev, *scope, *method, *addr, *if_ctx;uint32_t vgia_offset;
@@ -118,7 +118,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,build_header (linker, table_data, (void *)(table_data->data + table_data->len - ssdt->buf->len), -"SSDT" , ssdt->buf->len,1 ,NULL ,"VMGENID" ); +"SSDT" , ssdt->buf->len,1 , oem_id,"VMGENID" );free_aml_allocator (); }
hw/arm/virt-acpi-build.c +26 -14
@@ -341,7 +341,8 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) iort->length =cpu_to_le32 (iort_length);build_header (linker, table_data, (void *)(table_data->data + iort_start), -"IORT" , table_data->len - iort_start,0 ,NULL ,NULL ); +"IORT" , table_data->len - iort_start,0 , vms->oem_id, + vms->oem_table_id); } static void
@@ -375,7 +376,8 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) spcr->pci_vendor_id =0xffff ;/* PCI Vendor ID: not a PCI device */ build_header (linker, table_data, (void *)(table_data->data + spcr_start), -"SPCR" , table_data->len - spcr_start,2 ,NULL ,NULL ); +"SPCR" , table_data->len - spcr_start,2 , vms->oem_id, + vms->oem_table_id); } static void
@@ -427,7 +429,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }build_header (linker, table_data, (void *)(table_data->data + srat_start), -"SRAT" , table_data->len - srat_start,3 ,NULL ,NULL ); +"SRAT" , table_data->len - srat_start,3 , vms->oem_id, + vms->oem_table_id); }/* GTDT */
@@ -462,7 +465,8 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_header (linker, table_data, (void *)(table_data->data + gtdt_start),"GTDT" , - table_data->len - gtdt_start,2 ,NULL ,NULL ); + table_data->len - gtdt_start,2 , vms->oem_id, + vms->oem_table_id); }/* MADT */
@@ -551,7 +555,8 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_header (linker, table_data, (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,3 ,NULL ,NULL ); + table_data->len - madt_start,3 , vms->oem_id, + vms->oem_table_id); }/* FADT */
@@ -581,7 +586,7 @@ static void build_fadt_rev5(GArray *table_data, BIOSLinker *linker,g_assert_not_reached (); } -build_fadt (table_data, linker, &fadt,NULL ,NULL ); +build_fadt (table_data, linker, &fadt, vms->oem_id, vms->oem_table_id); }/* DSDT */
@@ -645,7 +650,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 ,NULL ,NULL ); +"DSDT" , dsdt->buf->len,2 , vms->oem_id, + vms->oem_table_id);free_aml_allocator (); }
@@ -704,7 +710,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) .base = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].base, .size = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].size, }; -build_mcfg (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg, vms->oem_id, + vms->oem_table_id); }acpi_add_table (table_offsets, tables_blob);
@@ -713,7 +720,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (vms->ras) {build_ghes_error_table (tables->hardware_errors, tables->linker);acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->linker); +acpi_build_hest (tables_blob, tables->linker, vms->oem_id, + vms->oem_table_id); }if (ms->numa_state->num_nodes >0 ) {
@@ -721,13 +729,15 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_srat (tables_blob, tables->linker, vms);if (ms->numa_state->have_numa_distance) {acpi_add_table (table_offsets, tables_blob); -build_slit (tables_blob, tables->linker, ms); +build_slit (tables_blob, tables->linker, ms, vms->oem_id, + vms->oem_table_id); } }if (ms->nvdimms_state->is_enabled) {nvdimm_build_acpi (table_offsets, tables_blob, tables->linker, - ms->nvdimms_state, ms->ram_slots); + ms->nvdimms_state, ms->ram_slots, vms->oem_id, + vms->oem_table_id); }if (its_class_name () && !vmc->no_its) {
@@ -737,18 +747,20 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (tpm_get_version (tpm_find ()) ==TPM_VERSION_2_0 ) {acpi_add_table (table_offsets, tables_blob); -build_tpm2 (tables_blob, tables->linker, tables->tcpalog); +build_tpm2 (tables_blob, tables->linker, tables->tcpalog, vms->oem_id, + vms->oem_table_id); }/* XSDT is pointed to by RSDP */ xsdt = tables_blob->len; -build_xsdt (tables_blob, tables->linker, table_offsets,NULL ,NULL ); +build_xsdt (tables_blob, tables->linker, table_offsets, vms->oem_id, + vms->oem_table_id);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = { .revision =2 , - .oem_id =ACPI_BUILD_APPNAME6 , + .oem_id = vms->oem_id, .xsdt_tbl_offset = &xsdt, .rsdt_tbl_offset =NULL , };
hw/arm/virt.c +63 -0
81 lines not on this page · raw message
hw/i386/acpi-build.c +58 -28
228 lines not on this page · raw message
hw/i386/acpi-common.c +3 -2
@@ -72,7 +72,8 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, }void acpi_build_madt (GArray *table_data,BIOSLinker *linker, -X86MachineState *x86ms,AcpiDeviceIf *adev) +X86MachineState *x86ms,AcpiDeviceIf *adev, +const char *oem_id,const char *oem_table_id) {MachineClass *mc =MACHINE_GET_CLASS (x86ms);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (MACHINE (x86ms));
@@ -157,6 +158,6 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,build_header (linker, table_data, (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,1 ,NULL ,NULL ); + table_data->len - madt_start,1 , oem_id, oem_table_id); }
hw/i386/acpi-microvm.c +8 -5
@@ -149,7 +149,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 ,NULL ,NULL ); +"DSDT" , dsdt->buf->len,2 , mms->oem_id, mms->oem_table_id);free_aml_allocator (); }
@@ -201,21 +201,24 @@ static void acpi_build_microvm(AcpiBuildTables *tables, pmfadt.dsdt_tbl_offset = &dsdt; pmfadt.xdsdt_tbl_offset = &dsdt;acpi_add_table (table_offsets, tables_blob); -build_fadt (tables_blob, tables->linker, &pmfadt,NULL ,NULL ); +build_fadt (tables_blob, tables->linker, &pmfadt, mms->oem_id, + mms->oem_table_id);acpi_add_table (table_offsets, tables_blob);acpi_build_madt (tables_blob, tables->linker,X86_MACHINE (machine), -ACPI_DEVICE_IF (x86ms->acpi_dev)); +ACPI_DEVICE_IF (x86ms->acpi_dev), mms->oem_id, + mms->oem_table_id); xsdt = tables_blob->len; -build_xsdt (tables_blob, tables->linker, table_offsets,NULL ,NULL ); +build_xsdt (tables_blob, tables->linker, table_offsets, mms->oem_id, + mms->oem_table_id);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = {/* ACPI 2.0: 5.2.4.3 RSDP Structure */ .revision =2 ,/* xsdt needs v2 */ - .oem_id =ACPI_BUILD_APPNAME6 , + .oem_id = mms->oem_id, .xsdt_tbl_offset = &xsdt, .rsdt_tbl_offset =NULL , };
hw/i386/microvm.c +66 -0
84 lines not on this page · raw message
hw/i386/pc.c +64 -0
82 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 20 lines · Marian Postevca
Qemu's ACPI table generation sets the fields OEM ID and OEM table ID to "BOCHS " and "BXPCxxxx" where "xxxx" is replaced by the ACPI table name.
Some games like Red Dead Redemption 2 seem to check the ACPI OEM ID and OEM table ID for the strings "BOCHS" and "BXPC" and if they are found, the game crashes(this may be an intentional detection mechanism to prevent playing the game in a virtualized environment).
This patch allows you to override these default values.
The feature can be used in this manner:
qemu -machine oem-id=ABCDEF,oem-table-id=GHIJKLMNThe oem-id string can be up to 6 bytes in size, and the oem-table-id string can be up to 8 bytes in size. If the string are smaller than their respective sizes they will be padded with space. If either of these parameters is not set, the current default values will be used for the one missing.
Quoted 8 lines
Note that the the OEM Table ID field will not be extended with the name of the table, but will use either the default name or the user provided one.
This does not affect the -acpitable option (for user-defined ACPI tables), which has precedence over -machine option.
Signed-off-by Marian Postevca <[email protected]>
I queued this but there's a lot of code duplication with this. Further, the use of g_strdup adds unnecessary dynamic memory management where it's not needed.
I'd prefer
- a new struct AcpiBuildOem including the correct strings - use sizeof of fields in above instead of 8/6 - move shared strings and code into a common header
Quoted 1,156 lines
--- hw/acpi/hmat.h | 3 +- hw/i386/acpi-common.h | 3 +- include/hw/acpi/acpi-defs.h | 2 +- include/hw/acpi/aml-build.h | 8 ++-- include/hw/acpi/ghes.h | 3 +- include/hw/acpi/pci.h | 3 +- include/hw/acpi/vmgenid.h | 2 +- include/hw/arm/virt.h | 2 + include/hw/i386/microvm.h | 4 ++ include/hw/i386/pc.h | 5 ++- include/hw/mem/nvdimm.h | 3 +- hw/acpi/aml-build.c | 29 ++++++------- hw/acpi/ghes.c | 5 ++- hw/acpi/hmat.c | 5 ++- hw/acpi/nvdimm.c | 18 +++++--- hw/acpi/pci.c | 5 ++- hw/acpi/vmgenid.c | 4 +- hw/arm/virt-acpi-build.c | 40 +++++++++++------ hw/arm/virt.c | 63 +++++++++++++++++++++++++++ hw/i386/acpi-build.c | 86 +++++++++++++++++++++++++------------ hw/i386/acpi-common.c | 5 ++- hw/i386/acpi-microvm.c | 13 +++--- hw/i386/microvm.c | 66 ++++++++++++++++++++++++++++ hw/i386/pc.c | 64 +++++++++++++++++++++++++++ 24 files changed, 349 insertions(+), 92 deletions(-)hw/acpi/hmat.h +2
-1@@ -37,6 +37,7 @@*/ #define HMAT_PROXIMITY_INITIATOR_VALID 0x1 -void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state); +void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state, +const char *oem_id,const char *oem_table_id);#endif hw/i386/acpi-common.h +2
-1@@ -9,6 +9,7 @@#define ACPI_BUILD_IOAPIC_ID 0x0void acpi_build_madt (GArray *table_data,BIOSLinker *linker, -X86MachineState *x86ms,AcpiDeviceIf *adev); +X86MachineState *x86ms,AcpiDeviceIf *adev, +const char *oem_id,const char *oem_table_id);#endif include/hw/acpi/acpi-defs.h +1
-1@@ -41,7 +41,7 @@ enum { }; typedef struct AcpiRsdpData { - uint8_t oem_id[6] QEMU_NONSTRING; /* OEM identification */ + char *oem_id; /* OEM identification */ uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */ unsigned *rsdt_tbl_offset;include/hw/acpi/aml-build.h +5
-3@@ -8,7 +8,7 @@#define ACPI_BUILD_TABLE_MAX_SIZE 0x200000#define ACPI_BUILD_APPNAME6 "BOCHS " -#define ACPI_BUILD_APPNAME4 "BXPC" +#define ACPI_BUILD_APPNAME8 "BXPC "#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"@@ -459,10 +459,12 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags); -void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms); +void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms, +const char *oem_id,const char *oem_table_id);void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id); -void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog); +void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, +const char *oem_id,const char *oem_table_id);#endif include/hw/acpi/ghes.h +2
-1@@ -67,7 +67,8 @@ typedef struct AcpiGhesState { } AcpiGhesState;void build_ghes_error_table (GArray *hardware_errors,BIOSLinker *linker); -void acpi_build_hest (GArray *table_data,BIOSLinker *linker); +void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +const char *oem_id,const char *oem_table_id);void acpi_ghes_add_fw_cfg (AcpiGhesState *vms,FWCfgState *s,GArray *hardware_errors);int acpi_ghes_record_errors (uint8_t notify,uint64_t error_physical_addr);include/hw/acpi/pci.h +2
-1@@ -33,5 +33,6 @@ typedef struct AcpiMcfgInfo { uint32_t size; } AcpiMcfgInfo; -void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info); +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info, +const char *oem_id,const char *oem_table_id);#endif include/hw/acpi/vmgenid.h +1
-1@@ -31,7 +31,7 @@ static inline Object *find_vmgenid_dev(void) }void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid, -BIOSLinker *linker); +BIOSLinker *linker,const char *oem_id);void vmgenid_add_fw_cfg (VmGenIdState *vms,FWCfgState *s,GArray *guid);#endif include/hw/arm/virt.h +2
-0@@ -163,6 +163,8 @@ struct VirtMachineState {DeviceState *acpi_dev;Notifier powerdown_notifier;PCIBus *bus; +char *oem_id; +char *oem_table_id; };#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)include/hw/i386/microvm.h +4
-0@@ -76,6 +76,8 @@#define MICROVM_MACHINE_ISA_SERIAL "isa-serial"#define MICROVM_MACHINE_OPTION_ROMS "x-option-roms"#define MICROVM_MACHINE_AUTO_KERNEL_CMDLINE "auto-kernel-cmdline" +#define MICROVM_MACHINE_OEM_ID "oem-id" +#define MICROVM_MACHINE_OEM_TABLE_ID "oem-table-id"struct MicrovmMachineClass {X86MachineClass parent;@@ -104,6 +106,8 @@ struct MicrovmMachineState {Notifier machine_done;Notifier powerdown_req;struct GPEXConfig gpex; +char *oem_id; +char *oem_table_id; };#define TYPE_MICROVM_MACHINE MACHINE_TYPE_NAME("microvm")include/hw/i386/pc.h +4
-1@@ -45,6 +45,8 @@ typedef struct PCMachineState {bool pit_enabled;bool hpet_enabled;uint64_t max_fw_size; +char *oem_id; +char *oem_table_id;/* NUMA information: */ uint64_t numa_nodes;@@ -62,7 +64,8 @@ typedef struct PCMachineState {#define PC_MACHINE_SATA "sata"#define PC_MACHINE_PIT "pit"#define PC_MACHINE_MAX_FW_SIZE "max-fw-size" - +#define PC_MACHINE_OEM_ID "oem-id" +#define PC_MACHINE_OEM_TABLE_ID "oem-table-id"/** * PCMachineClass: * include/hw/mem/nvdimm.h +2
-1@@ -154,7 +154,8 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,void nvdimm_build_srat (GArray *table_data);void nvdimm_build_acpi (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *state, -uint32_t ram_slots); +uint32_t ram_slots,const char *oem_id, +const char *oem_table_id);void nvdimm_plug (NVDIMMState *state);void nvdimm_acpi_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev);#endif hw/acpi/aml-build.c +12
-17@@ -30,6 +30,7 @@#include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_bridge.h" +#include "qemu/cutils.h" static GArray *build_alloc_array (void ) {@@ -1674,21 +1675,12 @@ build_header(BIOSLinker *linker, GArray *table_data, h->length =cpu_to_le32 (len); h->revision = rev; -if (oem_id) { -strncpy ((char *)h->oem_id, oem_id,sizeof h->oem_id); - }else { -memcpy (h->oem_id,ACPI_BUILD_APPNAME6 ,6 ); - } - -if (oem_table_id) { -strncpy ((char *)h->oem_table_id, oem_table_id,sizeof (h->oem_table_id)); - }else { -memcpy (h->oem_table_id,ACPI_BUILD_APPNAME4 ,4 ); -memcpy (h->oem_table_id +4 , sig,4 ); - } +strpadcpy ((char *)h->oem_id,sizeof h->oem_id, oem_id,' ' ); +strpadcpy ((char *)h->oem_table_id,sizeof h->oem_table_id, + oem_table_id,' ' ); h->oem_revision =cpu_to_le32 (1 ); -memcpy (h->asl_compiler_id,ACPI_BUILD_APPNAME4 ,4 ); +memcpy (h->asl_compiler_id,ACPI_BUILD_APPNAME8 ,4 ); h->asl_compiler_revision =cpu_to_le32 (1 );/* Checksum to be filled in by Guest linker */ bios_linker_loader_add_checksum(linker, ACPI_BUILD_TABLE_FILE,@@ -1871,7 +1863,8 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,* ACPI spec 5.2.17 System Locality Distance Information Table * (Revision 2.0 or later) */ -void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms) +void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms, +const char *oem_id,const char *oem_table_id) {int slit_start, i, j; slit_start = table_data->len;@@ -1892,7 +1885,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms)build_header (linker, table_data, (void *)(table_data->data + slit_start),"SLIT" , - table_data->len - slit_start,1 ,NULL ,NULL ); + table_data->len - slit_start,1 , oem_id, oem_table_id); }/* build rev1/rev3/rev5.1 FADT */ @@ -2024,7 +2017,8 @@ build_hdr:* table 7: TCG Hardware Interface Description Table Format for TPM 2.0 * of TCG ACPI Specification, Family “1.2” and “2.0”, Version 1.2, Rev 8 */ -void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog) +void build_tpm2 (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, +const char *oem_id,const char *oem_table_id) {uint8_t start_method_params[12 ] = {};unsigned log_addr_offset, tpm2_start;@@ -2073,7 +2067,8 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) log_addr_offset,8 , ACPI_BUILD_TPMLOG_FILE, 0);build_header (linker, table_data, - tpm2_ptr,"TPM2" , table_data->len - tpm2_start,4 ,NULL ,NULL ); + tpm2_ptr,"TPM2" , table_data->len - tpm2_start,4 , oem_id, + oem_table_id); } Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,hw/acpi/ghes.c +3
-2@@ -359,7 +359,8 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker) }/* Build Hardware Error Source Table */ -void acpi_build_hest (GArray *table_data,BIOSLinker *linker) +void acpi_build_hest (GArray *table_data,BIOSLinker *linker, +const char *oem_id,const char *oem_table_id) {uint64_t hest_start = table_data->len;@@ -372,7 +373,7 @@ void acpi_build_hest(GArray *table_data, BIOSLinker *linker)build_ghes_v2 (table_data,ACPI_HEST_SRC_ID_SEA , linker);build_header (linker, table_data, (void *)(table_data->data + hest_start), -"HEST" , table_data->len - hest_start,1 ,NULL ,NULL ); +"HEST" , table_data->len - hest_start,1 , oem_id, oem_table_id); } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,hw/acpi/hmat.c +3
-2@@ -253,7 +253,8 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state) } } -void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state) +void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state, +const char *oem_id,const char *oem_table_id) {int hmat_start = table_data->len;@@ -264,5 +265,5 @@ void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *numa_state)build_header (linker, table_data, (void *)(table_data->data + hmat_start), -"HMAT" , table_data->len - hmat_start,2 ,NULL ,NULL ); +"HMAT" , table_data->len - hmat_start,2 , oem_id, oem_table_id); }hw/acpi/nvdimm.c +11
-7@@ -402,7 +402,8 @@ void nvdimm_plug(NVDIMMState *state) }static void nvdimm_build_nfit (NVDIMMState *state,GArray *table_offsets, -GArray *table_data,BIOSLinker *linker) +GArray *table_data,BIOSLinker *linker, +const char *oem_id,const char *oem_table_id) {NvdimmFitBuffer *fit_buf = &state->fit_buf;unsigned int header;@@ -417,7 +418,8 @@ static void nvdimm_build_nfit(NVDIMMState *state, GArray *table_offsets,build_header (linker, table_data, (void *)(table_data->data + header),"NFIT" , -sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 ,NULL ,NULL ); +sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 , oem_id, + oem_table_id); }#define NVDIMM_DSM_MEMORY_SIZE 4096@@ -1278,7 +1280,7 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)static void nvdimm_build_ssdt (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *nvdimm_state, -uint32_t ram_slots) +uint32_t ram_slots,const char *oem_id) {Aml *ssdt, *sb_scope, *dev;int mem_addr_offset, nvdimm_ssdt;@@ -1331,7 +1333,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data, NVDIMM_DSM_MEM_FILE, 0);build_header (linker, table_data, (void *)(table_data->data + nvdimm_ssdt), -"SSDT" , table_data->len - nvdimm_ssdt,1 ,NULL ,"NVDIMM" ); +"SSDT" , table_data->len - nvdimm_ssdt,1 , oem_id,"NVDIMM" );free_aml_allocator (); }@@ -1359,7 +1361,8 @@ void nvdimm_build_srat(GArray *table_data)void nvdimm_build_acpi (GArray *table_offsets,GArray *table_data,BIOSLinker *linker,NVDIMMState *state, -uint32_t ram_slots) +uint32_t ram_slots,const char *oem_id, +const char *oem_table_id) {GSList *device_list;@@ -1369,7 +1372,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, }nvdimm_build_ssdt (table_offsets, table_data, linker, state, - ram_slots); + ram_slots, oem_id); device_list =nvdimm_get_device_list ();/* no NVDIMM device is plugged. */ @@ -1377,6 +1380,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,return ; } -nvdimm_build_nfit (state, table_offsets, table_data, linker); +nvdimm_build_nfit (state, table_offsets, table_data, linker, + oem_id, oem_table_id);g_slist_free (device_list); }hw/acpi/pci.c +3
-2@@ -28,7 +28,8 @@#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" -void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info) +void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info, +const char *oem_id,const char *oem_table_id) {int mcfg_start = table_data->len;@@ -56,6 +57,6 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)build_append_int_noprefix (table_data,0 ,4 );build_header (linker, table_data, (void *)(table_data->data + mcfg_start), -"MCFG" , table_data->len - mcfg_start,1 ,NULL ,NULL ); +"MCFG" , table_data->len - mcfg_start,1 , oem_id, oem_table_id); }hw/acpi/vmgenid.c +2
-2@@ -24,7 +24,7 @@#include "sysemu/reset.h" void vmgenid_build_acpi (VmGenIdState *vms,GArray *table_data,GArray *guid, -BIOSLinker *linker) +BIOSLinker *linker,const char *oem_id) {Aml *ssdt, *dev, *scope, *method, *addr, *if_ctx;uint32_t vgia_offset;@@ -118,7 +118,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,build_header (linker, table_data, (void *)(table_data->data + table_data->len - ssdt->buf->len), -"SSDT" , ssdt->buf->len,1 ,NULL ,"VMGENID" ); +"SSDT" , ssdt->buf->len,1 , oem_id,"VMGENID" );free_aml_allocator (); }hw/arm/virt-acpi-build.c +26
-14@@ -341,7 +341,8 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) iort->length =cpu_to_le32 (iort_length);build_header (linker, table_data, (void *)(table_data->data + iort_start), -"IORT" , table_data->len - iort_start,0 ,NULL ,NULL ); +"IORT" , table_data->len - iort_start,0 , vms->oem_id, + vms->oem_table_id); } static void@@ -375,7 +376,8 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) spcr->pci_vendor_id =0xffff ;/* PCI Vendor ID: not a PCI device */ build_header (linker, table_data, (void *)(table_data->data + spcr_start), -"SPCR" , table_data->len - spcr_start,2 ,NULL ,NULL ); +"SPCR" , table_data->len - spcr_start,2 , vms->oem_id, + vms->oem_table_id); } static void@@ -427,7 +429,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }build_header (linker, table_data, (void *)(table_data->data + srat_start), -"SRAT" , table_data->len - srat_start,3 ,NULL ,NULL ); +"SRAT" , table_data->len - srat_start,3 , vms->oem_id, + vms->oem_table_id); }/* GTDT */ @@ -462,7 +465,8 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_header (linker, table_data, (void *)(table_data->data + gtdt_start),"GTDT" , - table_data->len - gtdt_start,2 ,NULL ,NULL ); + table_data->len - gtdt_start,2 , vms->oem_id, + vms->oem_table_id); }/* MADT */ @@ -551,7 +555,8 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_header (linker, table_data, (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,3 ,NULL ,NULL ); + table_data->len - madt_start,3 , vms->oem_id, + vms->oem_table_id); }/* FADT */ @@ -581,7 +586,7 @@ static void build_fadt_rev5(GArray *table_data, BIOSLinker *linker,g_assert_not_reached (); } -build_fadt (table_data, linker, &fadt,NULL ,NULL ); +build_fadt (table_data, linker, &fadt, vms->oem_id, vms->oem_table_id); }/* DSDT */ @@ -645,7 +650,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 ,NULL ,NULL ); +"DSDT" , dsdt->buf->len,2 , vms->oem_id, + vms->oem_table_id);free_aml_allocator (); }@@ -704,7 +710,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) .base = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].base, .size = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].size, }; -build_mcfg (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg, vms->oem_id, + vms->oem_table_id); }acpi_add_table (table_offsets, tables_blob);@@ -713,7 +720,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (vms->ras) {build_ghes_error_table (tables->hardware_errors, tables->linker);acpi_add_table (table_offsets, tables_blob); -acpi_build_hest (tables_blob, tables->linker); +acpi_build_hest (tables_blob, tables->linker, vms->oem_id, + vms->oem_table_id); }if (ms->numa_state->num_nodes >0 ) {@@ -721,13 +729,15 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)build_srat (tables_blob, tables->linker, vms);if (ms->numa_state->have_numa_distance) {acpi_add_table (table_offsets, tables_blob); -build_slit (tables_blob, tables->linker, ms); +build_slit (tables_blob, tables->linker, ms, vms->oem_id, + vms->oem_table_id); } }if (ms->nvdimms_state->is_enabled) {nvdimm_build_acpi (table_offsets, tables_blob, tables->linker, - ms->nvdimms_state, ms->ram_slots); + ms->nvdimms_state, ms->ram_slots, vms->oem_id, + vms->oem_table_id); }if (its_class_name () && !vmc->no_its) {@@ -737,18 +747,20 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (tpm_get_version (tpm_find ()) ==TPM_VERSION_2_0 ) {acpi_add_table (table_offsets, tables_blob); -build_tpm2 (tables_blob, tables->linker, tables->tcpalog); +build_tpm2 (tables_blob, tables->linker, tables->tcpalog, vms->oem_id, + vms->oem_table_id); }/* XSDT is pointed to by RSDP */ xsdt = tables_blob->len; -build_xsdt (tables_blob, tables->linker, table_offsets,NULL ,NULL ); +build_xsdt (tables_blob, tables->linker, table_offsets, vms->oem_id, + vms->oem_table_id);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = { .revision =2 , - .oem_id =ACPI_BUILD_APPNAME6 , + .oem_id = vms->oem_id, .xsdt_tbl_offset = &xsdt, .rsdt_tbl_offset =NULL , };hw/arm/virt.c +63
-0@@ -2089,6 +2089,49 @@ static void virt_set_its(Object *obj, bool value, Error **errp) vms->its = value; } +static char *virt_get_oem_id (Object *obj,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +return g_strdup (vms->oem_id); +} + +static void virt_set_oem_id (Object *obj,const char *value,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); +size_t len =strlen (value); + +if (len >6 ) { +error_setg (errp, +"User specified oem-id value is bigger than 6 bytes in size" ); +return ; + } + +strncpy (vms->oem_id, value, len +1 ); +} + +static char *virt_get_oem_table_id (Object *obj,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +return g_strdup (vms->oem_table_id); +} + +static void virt_set_oem_table_id (Object *obj,const char *value, +Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); +size_t len =strlen (value); + +if (len >8 ) { +error_setg (errp, +"User specified oem-table-id value is bigger than 8 bytes in size" ); +return ; + } +strncpy (vms->oem_table_id, value, len +1 ); +} + +bool virt_is_acpi_enabled (VirtMachineState *vms) {if (vms->acpi ==ON_OFF_AUTO_OFF ) {@@ -2538,6 +2581,23 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)"Set on/off to enable/disable " "ITS instantiation"); +object_class_property_add_str (oc,"oem-id" , + virt_get_oem_id, + virt_set_oem_id); +object_class_property_set_description (oc,"oem-id" , +"Override the default value of field OEMID " +"in ACPI table header." +"The string may be up to 6 bytes in size" ); + + +object_class_property_add_str (oc,"oem-table-id" , + virt_get_oem_table_id, + virt_set_oem_table_id); +object_class_property_set_description (oc,"oem-table-id" , +"Override the default value of field OEM Table ID " +"in ACPI table header." +"The string may be up to 8 bytes in size" ); + }static void virt_instance_init (Object *obj)@@ -2579,6 +2639,9 @@ static void virt_instance_init(Object *obj) vms->irqmap = a15irqmap;virt_flash_create (vms); + + vms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); + vms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); }static const TypeInfo virt_machine_info = {hw/i386/acpi-build.c +58
-28@@ -1637,12 +1637,13 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,1 ,NULL ,NULL ); +"DSDT" , dsdt->buf->len,1 , pcms->oem_id, pcms->oem_table_id);free_aml_allocator (); }static void -build_hpet (GArray *table_data,BIOSLinker *linker) +build_hpet (GArray *table_data,BIOSLinker *linker,const char *oem_id, +const char *oem_table_id) {Acpi20Hpet *hpet;@@ -1653,11 +1654,12 @@ build_hpet(GArray *table_data, BIOSLinker *linker) hpet->timer_block_id =cpu_to_le32 (0x8086a201 ); hpet->addr.address =cpu_to_le64 (HPET_BASE );build_header (linker, table_data, - (void *)hpet,"HPET" ,sizeof (*hpet),1 ,NULL ,NULL ); + (void *)hpet,"HPET" ,sizeof (*hpet),1 , oem_id, oem_table_id); }static void -build_tpm_tcpa (GArray *table_data,BIOSLinker *linker,GArray *tcpalog) +build_tpm_tcpa (GArray *table_data,BIOSLinker *linker,GArray *tcpalog, +const char *oem_id,const char *oem_table_id) {Acpi20Tcpa *tcpa =acpi_data_push (table_data,sizeof *tcpa);unsigned log_addr_size =sizeof (tcpa->log_area_start_address);@@ -1677,7 +1679,7 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) ACPI_BUILD_TPMLOG_FILE, 0);build_header (linker, table_data, - (void *)tcpa,"TCPA" ,sizeof (*tcpa),2 ,NULL ,NULL ); + (void *)tcpa,"TCPA" ,sizeof (*tcpa),2 , oem_id, oem_table_id); }#define HOLE_640K_START (640 * KiB)@@ -1812,7 +1814,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)build_header (linker, table_data, (void *)(table_data->data + srat_start),"SRAT" , - table_data->len - srat_start,1 ,NULL ,NULL ); + table_data->len - srat_start,1 , pcms->oem_id, + pcms->oem_table_id); }/* @@ -1820,7 +1823,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)* (version Oct. 2014 or later) */ static void -build_dmar_q35 (GArray *table_data,BIOSLinker *linker) +build_dmar_q35 (GArray *table_data,BIOSLinker *linker,const char *oem_id, +const char *oem_table_id) {int dmar_start = table_data->len;@@ -1870,7 +1874,7 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker) }build_header (linker, table_data, (void *)(table_data->data + dmar_start), -"DMAR" , table_data->len - dmar_start,1 ,NULL ,NULL ); +"DMAR" , table_data->len - dmar_start,1 , oem_id, oem_table_id); }/* @@ -1881,7 +1885,8 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker)* Helpful to speedup Windows guests and ignored by others. */ static void -build_waet (GArray *table_data,BIOSLinker *linker) +build_waet (GArray *table_data,BIOSLinker *linker,const char *oem_id, +const char *oem_table_id) {int waet_start = table_data->len;@@ -1897,7 +1902,7 @@ build_waet(GArray *table_data, BIOSLinker *linker)build_append_int_noprefix (table_data,1 <<1 /* ACPI PM timer good */ ,4 );build_header (linker, table_data, (void *)(table_data->data + waet_start), -"WAET" , table_data->len - waet_start,1 ,NULL ,NULL ); +"WAET" , table_data->len - waet_start,1 , oem_id, oem_table_id); }/* @@ -1999,7 +2004,8 @@ ivrs_host_bridges(Object *obj, void *opaque) }static void -build_amd_iommu (GArray *table_data,BIOSLinker *linker) +build_amd_iommu (GArray *table_data,BIOSLinker *linker,const char *oem_id, +const char *oem_table_id) {int ivhd_table_len =24 ;int iommu_start = table_data->len;@@ -2094,7 +2100,8 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) }build_header (linker, table_data, (void *)(table_data->data + iommu_start), -"IVRS" , table_data->len - iommu_start,1 ,NULL ,NULL ); +"IVRS" , table_data->len - iommu_start,1 , oem_id, + oem_table_id); } typedef@@ -2150,12 +2157,26 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)GArray *tables_blob = tables->table_data;AcpiSlicOem slic_oem = { .id =NULL , .table_id =NULL };Object *vmgenid_dev; +char *oem_id; +char *oem_table_id;acpi_get_pm_info (machine, &pm);acpi_get_misc_info (&misc);acpi_get_pci_holes (&pci_hole, &pci_hole64);acpi_get_slic_oem (&slic_oem); +if (slic_oem.id) { + oem_id = slic_oem.id; + }else { + oem_id = pcms->oem_id; + } + +if (slic_oem.table_id) { + oem_table_id = slic_oem.table_id; + }else { + oem_table_id = pcms->oem_table_id; + } + table_offsets =g_array_new (false, true/* clear */ ,sizeof (uint32_t ));ACPI_BUILD_DPRINTF ("init ACPI tables\n" );@@ -2189,32 +2210,35 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) pm.fadt.facs_tbl_offset = &facs; pm.fadt.dsdt_tbl_offset = &dsdt; pm.fadt.xdsdt_tbl_offset = &dsdt; -build_fadt (tables_blob, tables->linker, &pm.fadt, - slic_oem.id, slic_oem.table_id); +build_fadt (tables_blob, tables->linker, &pm.fadt, oem_id, oem_table_id); aml_len += tables_blob->len - fadt;acpi_add_table (table_offsets, tables_blob);acpi_build_madt (tables_blob, tables->linker, x86ms, -ACPI_DEVICE_IF (x86ms->acpi_dev)); +ACPI_DEVICE_IF (x86ms->acpi_dev), pcms->oem_id, + pcms->oem_table_id); vmgenid_dev =find_vmgenid_dev ();if (vmgenid_dev) {acpi_add_table (table_offsets, tables_blob);vmgenid_build_acpi (VMGENID (vmgenid_dev), tables_blob, - tables->vmgenid, tables->linker); + tables->vmgenid, tables->linker, pcms->oem_id); }if (misc.has_hpet) {acpi_add_table (table_offsets, tables_blob); -build_hpet (tables_blob, tables->linker); +build_hpet (tables_blob, tables->linker, pcms->oem_id, + pcms->oem_table_id); }if (misc.tpm_version !=TPM_VERSION_UNSPEC ) {if (misc.tpm_version ==TPM_VERSION_1_2 ) {acpi_add_table (table_offsets, tables_blob); -build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); +build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog, + pcms->oem_id, pcms->oem_table_id); }else {/* TPM_VERSION_2_0 */ acpi_add_table (table_offsets, tables_blob); -build_tpm2 (tables_blob, tables->linker, tables->tcpalog); +build_tpm2 (tables_blob, tables->linker, tables->tcpalog, + pcms->oem_id, pcms->oem_table_id); } }if (pcms->numa_nodes) {@@ -2222,34 +2246,40 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)build_srat (tables_blob, tables->linker, machine);if (machine->numa_state->have_numa_distance) {acpi_add_table (table_offsets, tables_blob); -build_slit (tables_blob, tables->linker, machine); +build_slit (tables_blob, tables->linker, machine, pcms->oem_id, + pcms->oem_table_id); }if (machine->numa_state->hmat_enabled) {acpi_add_table (table_offsets, tables_blob); -build_hmat (tables_blob, tables->linker, machine->numa_state); +build_hmat (tables_blob, tables->linker, machine->numa_state, + pcms->oem_id, pcms->oem_table_id); } }if (acpi_get_mcfg (&mcfg)) {acpi_add_table (table_offsets, tables_blob); -build_mcfg (tables_blob, tables->linker, &mcfg); +build_mcfg (tables_blob, tables->linker, &mcfg, pcms->oem_id, + pcms->oem_table_id); }if (x86_iommu_get_default ()) {IommuType IOMMUType =x86_iommu_get_type ();if (IOMMUType ==TYPE_AMD ) {acpi_add_table (table_offsets, tables_blob); -build_amd_iommu (tables_blob, tables->linker); +build_amd_iommu (tables_blob, tables->linker, pcms->oem_id, + pcms->oem_table_id); }else if (IOMMUType ==TYPE_INTEL ) {acpi_add_table (table_offsets, tables_blob); -build_dmar_q35 (tables_blob, tables->linker); +build_dmar_q35 (tables_blob, tables->linker, pcms->oem_id, + pcms->oem_table_id); } }if (machine->nvdimms_state->is_enabled) {nvdimm_build_acpi (table_offsets, tables_blob, tables->linker, - machine->nvdimms_state, machine->ram_slots); + machine->nvdimms_state, machine->ram_slots, + pcms->oem_id, pcms->oem_table_id); }acpi_add_table (table_offsets, tables_blob); -build_waet (tables_blob, tables->linker); +build_waet (tables_blob, tables->linker, pcms->oem_id, pcms->oem_table_id);/* Add tables supplied by user (if any) */ for (u =acpi_table_first (); u; u =acpi_table_next (u)) {@@ -2262,13 +2292,13 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)/* RSDT is pointed to by RSDP */ rsdt = tables_blob->len;build_rsdt (tables_blob, tables->linker, table_offsets, - slic_oem.id, slic_oem.table_id); + oem_id, oem_table_id);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = { .revision =0 , - .oem_id =ACPI_BUILD_APPNAME6 , + .oem_id = pcms->oem_id, .xsdt_tbl_offset =NULL , .rsdt_tbl_offset = &rsdt, };hw/i386/acpi-common.c +3
-2@@ -72,7 +72,8 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, }void acpi_build_madt (GArray *table_data,BIOSLinker *linker, -X86MachineState *x86ms,AcpiDeviceIf *adev) +X86MachineState *x86ms,AcpiDeviceIf *adev, +const char *oem_id,const char *oem_table_id) {MachineClass *mc =MACHINE_GET_CLASS (x86ms);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (MACHINE (x86ms));@@ -157,6 +158,6 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,build_header (linker, table_data, (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,1 ,NULL ,NULL ); + table_data->len - madt_start,1 , oem_id, oem_table_id); }hw/i386/acpi-microvm.c +8
-5@@ -149,7 +149,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);build_header (linker, table_data, (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 ,NULL ,NULL ); +"DSDT" , dsdt->buf->len,2 , mms->oem_id, mms->oem_table_id);free_aml_allocator (); }@@ -201,21 +201,24 @@ static void acpi_build_microvm(AcpiBuildTables *tables, pmfadt.dsdt_tbl_offset = &dsdt; pmfadt.xdsdt_tbl_offset = &dsdt;acpi_add_table (table_offsets, tables_blob); -build_fadt (tables_blob, tables->linker, &pmfadt,NULL ,NULL ); +build_fadt (tables_blob, tables->linker, &pmfadt, mms->oem_id, + mms->oem_table_id);acpi_add_table (table_offsets, tables_blob);acpi_build_madt (tables_blob, tables->linker,X86_MACHINE (machine), -ACPI_DEVICE_IF (x86ms->acpi_dev)); +ACPI_DEVICE_IF (x86ms->acpi_dev), mms->oem_id, + mms->oem_table_id); xsdt = tables_blob->len; -build_xsdt (tables_blob, tables->linker, table_offsets,NULL ,NULL ); +build_xsdt (tables_blob, tables->linker, table_offsets, mms->oem_id, + mms->oem_table_id);/* RSDP is in FSEG memory, so allocate it separately */ {AcpiRsdpData rsdp_data = {/* ACPI 2.0: 5.2.4.3 RSDP Structure */ .revision =2 ,/* xsdt needs v2 */ - .oem_id =ACPI_BUILD_APPNAME6 , + .oem_id = mms->oem_id, .xsdt_tbl_offset = &xsdt, .rsdt_tbl_offset =NULL , };hw/i386/microvm.c +66
-0@@ -648,6 +648,51 @@ static void microvm_powerdown_req(Notifier *notifier, void *data) } } +static char *microvm_machine_get_oem_id (Object *obj,Error **errp) +{ +MicrovmMachineState *mms =MICROVM_MACHINE (obj); + +return g_strdup (mms->oem_id); +} + +static void microvm_machine_set_oem_id (Object *obj,const char *value, +Error **errp) +{ +MicrovmMachineState *mms =MICROVM_MACHINE (obj); +size_t len =strlen (value); + +if (len >6 ) { +error_setg (errp, +"User specified " MICROVM_MACHINE_OEM_ID " value is bigger than " +"6 bytes in size" ); +return ; + } + +strncpy (mms->oem_id, value, len +1 ); +} + +static char *microvm_machine_get_oem_table_id (Object *obj,Error **errp) +{ +MicrovmMachineState *mms =MICROVM_MACHINE (obj); + +return g_strdup (mms->oem_table_id); +} + +static void microvm_machine_set_oem_table_id (Object *obj,const char *value, +Error **errp) +{ +MicrovmMachineState *mms =MICROVM_MACHINE (obj); +size_t len =strlen (value); + +if (len >8 ) { +error_setg (errp, +"User specified " MICROVM_MACHINE_OEM_TABLE_ID " value is bigger than " +"8 bytes in size" ); +return ; + } +strncpy (mms->oem_table_id, value, len +1 ); +} +static void microvm_machine_initfn (Object *obj) {MicrovmMachineState *mms =MICROVM_MACHINE (obj);@@ -669,6 +714,9 @@ static void microvm_machine_initfn(Object *obj)qemu_add_machine_init_done_notifier (&mms->machine_done); mms->powerdown_req.notify = microvm_powerdown_req;qemu_register_powerdown_notifier (&mms->powerdown_req); + + mms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); + mms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); }static void microvm_class_init (ObjectClass *oc,void *data)@@ -757,6 +805,24 @@ static void microvm_class_init(ObjectClass *oc, void *data)MICROVM_MACHINE_AUTO_KERNEL_CMDLINE , "Set off to disable adding virtio-mmio devices to the kernel cmdline"); +object_class_property_add_str (oc,MICROVM_MACHINE_OEM_ID , + microvm_machine_get_oem_id, + microvm_machine_set_oem_id); +object_class_property_set_description (oc,MICROVM_MACHINE_OEM_ID , +"Override the default value of field OEMID " +"in ACPI table header." +"The string may be up to 6 bytes in size" ); + + +object_class_property_add_str (oc,MICROVM_MACHINE_OEM_TABLE_ID , + microvm_machine_get_oem_table_id, + microvm_machine_set_oem_table_id); +object_class_property_set_description (oc,MICROVM_MACHINE_OEM_TABLE_ID , +"Override the default value of field OEM Table ID " +"in ACPI table header." +"The string may be up to 8 bytes in size" ); + +machine_class_allow_dynamic_sysbus_dev (mc,TYPE_RAMFB_DEVICE ); }hw/i386/pc.c +64
-0@@ -1611,6 +1611,50 @@ static void pc_machine_set_max_fw_size(Object *obj, Visitor *v, pcms->max_fw_size = value; } +static char *pc_machine_get_oem_id (Object *obj,Error **errp) +{ +PCMachineState *pcms =PC_MACHINE (obj); + +return g_strdup (pcms->oem_id); +} + +static void pc_machine_set_oem_id (Object *obj,const char *value,Error **errp) +{ +PCMachineState *pcms =PC_MACHINE (obj); +size_t len =strlen (value); + +if (len >6 ) { +error_setg (errp, +"User specified " PC_MACHINE_OEM_ID " value is bigger than " +"6 bytes in size" ); +return ; + } + +strncpy (pcms->oem_id, value, len +1 ); +} + +static char *pc_machine_get_oem_table_id (Object *obj,Error **errp) +{ +PCMachineState *pcms =PC_MACHINE (obj); + +return g_strdup (pcms->oem_table_id); +} + +static void pc_machine_set_oem_table_id (Object *obj,const char *value, +Error **errp) +{ +PCMachineState *pcms =PC_MACHINE (obj); +size_t len =strlen (value); + +if (len >8 ) { +error_setg (errp, +"User specified " PC_MACHINE_OEM_TABLE_ID " value is bigger than " +"8 bytes in size" ); +return ; + } +strncpy (pcms->oem_table_id, value, len +1 ); +} +static void pc_machine_initfn (Object *obj) {PCMachineState *pcms =PC_MACHINE (obj);@@ -1623,6 +1667,8 @@ static void pc_machine_initfn(Object *obj) pcms->max_ram_below_4g =0 ;/* use default */ /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled =PC_MACHINE_GET_CLASS (pcms)->has_acpi_build; + pcms->oem_id =g_strndup (ACPI_BUILD_APPNAME6 ,6 ); + pcms->oem_table_id =g_strndup (ACPI_BUILD_APPNAME8 ,8 ); pcms->smbus_enabled = true; pcms->sata_enabled = true; pcms->pit_enabled = true;@@ -1759,6 +1805,24 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) NULL, NULL);object_class_property_set_description (oc,PC_MACHINE_MAX_FW_SIZE ,"Maximum combined firmware size" ); + +object_class_property_add_str (oc,PC_MACHINE_OEM_ID , + pc_machine_get_oem_id, + pc_machine_set_oem_id); +object_class_property_set_description (oc,PC_MACHINE_OEM_ID , +"Override the default value of field OEMID " +"in ACPI table header." +"The string may be up to 6 bytes in size" ); + + +object_class_property_add_str (oc,PC_MACHINE_OEM_TABLE_ID , + pc_machine_get_oem_table_id, + pc_machine_set_oem_table_id); +object_class_property_set_description (oc,PC_MACHINE_OEM_TABLE_ID , +"Override the default value of field OEM Table ID " +"in ACPI table header." +"The string may be up to 8 bytes in size" ); + }static const TypeInfo pc_machine_info = {Signature · 1 line
2.26.2
Review
Quoted 10 lines · Michael S. Tsirkin
I queued this but there's a lot of code duplication with this. Further, the use of
g_strdupadds unnecessary dynamic memory management where it's not needed.
I'd prefer(quoted diff) +0
-3- a new struct AcpiBuildOem including the correct strings - use sizeof of fields in above instead of 8/6 - move shared strings and code into a common header
So how should I approach this since the patches are queued? A new patch with the suggested changes, or resending the original patches?
Quoted 13 lines · Marian Postevca
Review
Quoted 10 lines · Michael S. Tsirkin
I queued this but there's a lot of code duplication with this. Further, the use of
g_strdupadds unnecessary dynamic memory management where it's not needed.
I'd prefer(quoted diff) +0
-3- a new struct AcpiBuildOem including the correct strings - use sizeof of fields in above instead of 8/6 - move shared strings and code into a common header
Quoted 2 lines
So how should I approach this since the patches are queued? A new patch with the suggested changes, or resending the original patches?
A patch on top please. They are merged so really easy, just basing on masted should be good.
Signature · 1 line
MST
PATCH v4 3/5 tests/acpi: add OEM ID and OEM TABLE ID test
In reply to Marian PostevcaAdd support for testing the fields OEM ID and
OEM TABLE ID in all ACPI tables for PC,Q35,MICROVM,AARCH64
Full diff of changed files disassembly:
Table tests/data/acpi/virt/FACP diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/FACP, Mon Jan 18 23:55:00 2021
+ * Disassembly of /tmp/aml-VQIIX0, Mon Jan 18 23:55:00 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : BB +[009h 0009 1] Checksum : 55 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/APIC diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/APIC, Mon Jan 18 23:55:00 2021
+ * Disassembly of /tmp/aml-BQIIX0, Mon Jan 18 23:55:00 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 000000A8 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : B3 +[009h 0009 1] Checksum : 50 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/GTDT diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/GTDT, Mon Jan 18 23:55:00 2021
+ * Disassembly of /tmp/aml-QQIIX0, Mon Jan 18 23:55:00 2021 *
* ACPI Data Table [GTDT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "GTDT" [Generic Timer Description Table] [004h 0004 4] Table Length : 00000060 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : D9 +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCGTDT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/MCFG diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/MCFG, Mon Jan 18 23:55:00 2021
+ * Disassembly of /tmp/aml-OQIIX0, Mon Jan 18 23:55:00 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 4F +[009h 0009 1] Checksum : EC [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SPCR diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SPCR, Mon Jan 18 23:55:00 2021
+ * Disassembly of /tmp/aml-EMIIX0, Mon Jan 18 23:55:00 2021 *
* ACPI Data Table [SPCR]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] [004h 0004 4] Table Length : 00000050 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : 13 +[009h 0009 1] Checksum : CB [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSPCR" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/DSDT diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/virt/DSDT, Mon Jan 18 23:55:00 2021
+ * Disassembly of /tmp/aml-RMIIX0, Mon Jan 18 23:55:00 2021 *
* Original Table Header:
* Signature "DSDT"
* Length 0x00001454 (5204)
* Revision 0x02
- * Checksum 0x60
+ * Checksum 0x0F
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{Table tests/data/acpi/virt/FACP.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/FACP.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-JROMX0, Mon Jan 18 23:55:27 2021
*
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : BB +[009h 0009 1] Checksum : 55 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/APIC.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/APIC.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-2ROMX0, Mon Jan 18 23:55:27 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 000000A8 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : B3 +[009h 0009 1] Checksum : 50 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/GTDT.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/GTDT.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-WROMX0, Mon Jan 18 23:55:27 2021
*
* ACPI Data Table [GTDT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "GTDT" [Generic Timer Description Table] [004h 0004 4] Table Length : 00000060 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : D9 +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCGTDT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/MCFG.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/MCFG.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-YOOMX0, Mon Jan 18 23:55:27 2021
*
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 4F +[009h 0009 1] Checksum : EC [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SPCR.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SPCR.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-TOOMX0, Mon Jan 18 23:55:27 2021
*
* ACPI Data Table [SPCR]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] [004h 0004 4] Table Length : 00000050 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : 13 +[009h 0009 1] Checksum : CB [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSPCR" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SRAT.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SRAT.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-LPOMX0, Mon Jan 18 23:55:27 2021
*
* ACPI Data Table [SRAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SRAT" [System Resource Affinity Table] [004h 0004 4] Table Length : 0000006A [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : AB +[009h 0009 1] Checksum : 65 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSRAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/DSDT.numamem diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/virt/DSDT.numamem, Mon Jan 18 23:55:27 2021
+ * Disassembly of /tmp/aml-HPOMX0, Mon Jan 18 23:55:27 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00001454 (5204)
* Revision 0x02
- * Checksum 0x60
+ * Checksum 0x0F
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{Table tests/data/acpi/virt/FACP.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/FACP.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-OERTX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : BB +[009h 0009 1] Checksum : 55 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/APIC.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/APIC.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-FERTX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 000000A8 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : B3 +[009h 0009 1] Checksum : 50 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/GTDT.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/GTDT.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-BERTX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [GTDT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "GTDT" [Generic Timer Description Table] [004h 0004 4] Table Length : 00000060 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : D9 +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCGTDT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/MCFG.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/MCFG.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-8DRTX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 4F +[009h 0009 1] Checksum : EC [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SPCR.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SPCR.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-IN6NX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [SPCR]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] [004h 0004 4] Table Length : 00000050 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : 13 +[009h 0009 1] Checksum : CB [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSPCR" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SRAT.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SRAT.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-FN6NX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [SRAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SRAT" [System Resource Affinity Table] [004h 0004 4] Table Length : 000000E2 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 5C +[009h 0009 1] Checksum : 16 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSRAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SLIT.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SLIT.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-CN6NX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [SLIT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SLIT" [System Locality Information Table] [004h 0004 4] Table Length : 00000030 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 2C +[009h 0009 1] Checksum : E8 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSLIT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SSDT.memhp diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/virt/SSDT.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-9M6NX0, Mon Jan 18 23:55:41 2021
*
* Original Table Header:
* Signature "SSDT"
* Length 0x000002E0 (736)
* Revision 0x01
- * Checksum 0x3F
+ * Checksum 0xFF
* OEM ID "BOCHS "
- * OEM Table ID "NVDIMM"
+ * OEM Table ID "NVDIMM "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
+DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM ", 0x00000001)
{
Scope (\_SB)
{Table tests/data/acpi/virt/NFIT.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/NFIT.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-6M6NX0, Mon Jan 18 23:55:41 2021
*
* ACPI Data Table [NFIT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "NFIT" [NVDIMM Firmware Interface Table] [004h 0004 4] Table Length : 000000E0 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : D1 +[009h 0009 1] Checksum : 82 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCNFIT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/DSDT.memhp diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/virt/DSDT.memhp, Mon Jan 18 23:55:41 2021
+ * Disassembly of /tmp/aml-3M6NX0, Mon Jan 18 23:55:41 2021
*
* Original Table Header:
* Signature "DSDT" * Length 0x000019A5 (6565) * Revision 0x02 - * Checksum 0x90 + * Checksum 0x3F * OEM ID "BOCHS " - * OEM Table ID "BXPCDSDT" + * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
External (_SB_.NVDR, UnknownObj)
Table tests/data/acpi/virt/FACP.pxb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/FACP, Mon Jan 18 23:55:52 2021
+ * Disassembly of /tmp/aml-206LX0, Mon Jan 18 23:55:52 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : BB +[009h 0009 1] Checksum : 55 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/APIC.pxb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/APIC, Mon Jan 18 23:55:52 2021
+ * Disassembly of /tmp/aml-E16LX0, Mon Jan 18 23:55:52 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 000000A8 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : B3 +[009h 0009 1] Checksum : 50 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/GTDT.pxb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/GTDT, Mon Jan 18 23:55:52 2021
+ * Disassembly of /tmp/aml-J16LX0, Mon Jan 18 23:55:52 2021 *
* ACPI Data Table [GTDT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "GTDT" [Generic Timer Description Table] [004h 0004 4] Table Length : 00000060 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : D9 +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCGTDT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/MCFG.pxb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/MCFG, Mon Jan 18 23:55:52 2021
+ * Disassembly of /tmp/aml-N16LX0, Mon Jan 18 23:55:52 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 4F +[009h 0009 1] Checksum : EC [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/SPCR.pxb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/virt/SPCR, Mon Jan 18 23:55:52 2021
+ * Disassembly of /tmp/aml-B16LX0, Mon Jan 18 23:55:52 2021 *
* ACPI Data Table [SPCR]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] [004h 0004 4] Table Length : 00000050 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : 13 +[009h 0009 1] Checksum : CB [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSPCR" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/virt/DSDT.pxb diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/virt/DSDT.pxb, Mon Jan 18 23:55:52 2021
+ * Disassembly of /tmp/aml-G16LX0, Mon Jan 18 23:55:52 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00001E09 (7689)
* Revision 0x02
- * Checksum 0x30
+ * Checksum 0xDF
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{Table tests/data/acpi/pc/HPET diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/HPET, Mon Jan 18 23:58:53 2021
+ * Disassembly of /tmp/aml-QNVAX0, Mon Jan 18 23:58:53 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/WAET diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/WAET, Mon Jan 18 23:58:53 2021
+ * Disassembly of /tmp/aml-NNVAX0, Mon Jan 18 23:58:53 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/FACP.tis diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-MB7EX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.tis diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-3C7EX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.tis diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-0C7EX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/TPM2.tis diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/TPM2.tis, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-ZC7EX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [TPM2]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "TPM2" [Trusted Platform Module hardware interface table] [004h 0004 4] Table Length : 0000004C [008h 0008 1] Revision : 04 -[009h 0009 1] Checksum : 72 +[009h 0009 1] Checksum : 15 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCTPM2" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.tis diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-XC7EX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.tis diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-VC7EX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.tis diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.tis, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-RC7EX0, Mon Jan 18 23:58:55 2021 *
* Original Table Header:
* Signature "DSDT"
* Length 0x000020D7 (8407)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0xC8
+ * Checksum 0x77
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/q35/FACP.bridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-3N7NX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.bridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-WN7NX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.bridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-DI7NX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.bridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-BI7NX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.bridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-9H7NX0, Mon Jan 18 23:58:55 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.bridge diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.bridge, Mon Jan 18 23:58:55 2021
+ * Disassembly of /tmp/aml-6H7NX0, Mon Jan 18 23:58:55 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00001E8B (7819)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x8F
+ * Checksum 0x3E
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/q35/FACP.mmio64 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-KW0GX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.mmio64 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-HR0GX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.mmio64 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-LR0GX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/SRAT.mmio64 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/SRAT.mmio64, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-OR0GX0, Mon Jan 18 23:58:56 2021
*
* ACPI Data Table [SRAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SRAT" [System Resource Affinity Table] [004h 0004 4] Table Length : 000000E0 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 3B +[009h 0009 1] Checksum : F5 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSRAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.mmio64 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-TR0GX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.mmio64 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-ZR0GX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.mmio64 diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.mmio64, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-7R0GX0, Mon Jan 18 23:58:56 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x000022E4 (8932)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x9D
+ * Checksum 0x4C
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/q35/FACP.ipmibt diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-VVX8W0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.ipmibt diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-GUX8W0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.ipmibt diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-LUX8W0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.ipmibt diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-QUX8W0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.ipmibt diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-VUX8W0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.ipmibt diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.ipmibt, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-3UX8W0, Mon Jan 18 23:58:56 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00001EC4 (7876)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x2A
+ * Checksum 0xD9
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/q35/FACP.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-2HJNX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC.cphp, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-ARJNX0, Mon Jan 18 23:58:56 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 000000A0 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 7B +[009h 0009 1] Checksum : 18 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-ERJNX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/SRAT.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/SRAT.cphp, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-IRJNX0, Mon Jan 18 23:58:56 2021
*
* ACPI Data Table [SRAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SRAT" [System Resource Affinity Table] [004h 0004 4] Table Length : 00000130 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 36 +[009h 0009 1] Checksum : F0 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSRAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/SLIT.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/SLIT.cphp, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-MRJNX0, Mon Jan 18 23:58:56 2021
*
* ACPI Data Table [SLIT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SLIT" [System Locality Information Table] [004h 0004 4] Table Length : 00000030 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 2C +[009h 0009 1] Checksum : E8 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSLIT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:56 2021
+ * Disassembly of /tmp/aml-PRJNX0, Mon Jan 18 23:58:56 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.cphp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:57 2021
+ * Disassembly of /tmp/aml-TRJNX0, Mon Jan 18 23:58:57 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.cphp diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.cphp, Mon Jan 18 23:58:57 2021
+ * Disassembly of /tmp/aml-2RJNX0, Mon Jan 18 23:58:57 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00002049 (8265)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x5A
+ * Checksum 0x09
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/q35/HPET.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:57 2021
+ * Disassembly of /tmp/aml-V1NBX0, Mon Jan 18 23:58:57 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.memhp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:57 2021
+ * Disassembly of /tmp/aml-B2NBX0, Mon Jan 18 23:58:57 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:57 2021
+ * Disassembly of /tmp/aml-BJ6PX0, Mon Jan 18 23:58:57 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.numamem diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:57 2021
+ * Disassembly of /tmp/aml-UH6PX0, Mon Jan 18 23:58:57 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/FACP.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-ITDEX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC.dimmpxm, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-STDEX0, Mon Jan 18 23:58:58 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000090 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : AE +[009h 0009 1] Checksum : 4B [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-WTDEX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/SRAT.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/SRAT.dimmpxm, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-XTJEX0, Mon Jan 18 23:58:58 2021
*
* ACPI Data Table [SRAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SRAT" [System Resource Affinity Table] [004h 0004 4] Table Length : 00000188 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 68 +[009h 0009 1] Checksum : 22 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSRAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-0TDEX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/SSDT.dimmpxm diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/SSDT.dimmpxm, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-8TDEX0, Mon Jan 18 23:58:58 2021
*
* Original Table Header:
* Signature "SSDT"
* Length 0x000002DE (734)
* Revision 0x01
- * Checksum 0x46
+ * Checksum 0x06
* OEM ID "BOCHS "
- * OEM Table ID "NVDIMM"
+ * OEM Table ID "NVDIMM "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
+DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM ", 0x00000001)
{
Scope (\_SB)
{Table tests/data/acpi/q35/NFIT.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/NFIT.dimmpxm, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-9VDEX0, Mon Jan 18 23:58:58 2021
*
* ACPI Data Table [NFIT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "NFIT" [NVDIMM Firmware Interface Table] [004h 0004 4] Table Length : 000000F0 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 24 +[009h 0009 1] Checksum : D5 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCNFIT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.dimmpxm diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-DWDEX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.dimmpxm diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.dimmpxm, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-IWDEX0, Mon Jan 18 23:58:58 2021
*
* Original Table Header:
* Signature "DSDT" * Length 0x000024EF (9455) * Revision 0x01 **** 32-bit table (V1), no 64-bit math support - * Checksum 0x26 + * Checksum 0xD5 * OEM ID "BOCHS " - * OEM Table ID "BXPCDSDT" + * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
External (_SB_.NVDR, UnknownObj)
Table tests/data/acpi/q35/FACP.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-OKSOX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : B9 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/APIC.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/APIC.acpihmat, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-0KSOX0, Mon Jan 18 23:58:58 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000080 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : DA +[009h 0009 1] Checksum : 77 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HPET.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HPET, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-5KSOX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/SRAT.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/SRAT.acpihmat, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-9KSOX0, Mon Jan 18 23:58:58 2021
*
* ACPI Data Table [SRAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "SRAT" [System Resource Affinity Table] [004h 0004 4] Table Length : 00000118 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : C0 +[009h 0009 1] Checksum : 7A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCSRAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/HMAT.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/HMAT.acpihmat, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-ALYOX0, Mon Jan 18 23:58:58 2021
*
* ACPI Data Table [HMAT]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HMAT" [Heterogeneous Memory Attributes Table] [004h 0004 4] Table Length : 00000118 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : 98 +[009h 0009 1] Checksum : 42 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHMAT" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/MCFG.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/MCFG, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-ELSOX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [MCFG]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "MCFG" [Memory Mapped Configuration table] [004h 0004 4] Table Length : 0000003C [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : EF +[009h 0009 1] Checksum : 8C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCMCFG" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/WAET.acpihmat diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/WAET, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-ILSOX0, Mon Jan 18 23:58:58 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/q35/DSDT.acpihmat diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT.acpihmat, Mon Jan 18 23:58:58 2021
+ * Disassembly of /tmp/aml-2JSOX0, Mon Jan 18 23:58:58 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x000023A6 (9126)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0xB3
+ * Checksum 0x62
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/pc/FACP.ipmikcs diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/FACP, Mon Jan 18 23:58:59 2021
+ * Disassembly of /tmp/aml-1HH9W0, Mon Jan 18 23:58:59 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 00000074 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : A1 +[009h 0009 1] Checksum : 3B [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/APIC.ipmikcs diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/APIC, Mon Jan 18 23:58:59 2021
+ * Disassembly of /tmp/aml-GIH9W0, Mon Jan 18 23:58:59 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/HPET.ipmikcs diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/HPET, Mon Jan 18 23:58:59 2021
+ * Disassembly of /tmp/aml-PIH9W0, Mon Jan 18 23:58:59 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/WAET.ipmikcs diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/WAET, Mon Jan 18 23:58:59 2021
+ * Disassembly of /tmp/aml-OIH9W0, Mon Jan 18 23:58:59 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/DSDT.ipmikcs diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/DSDT.ipmikcs, Mon Jan 18 23:58:59 2021
+ * Disassembly of /tmp/aml-9GH9W0, Mon Jan 18 23:58:59 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00001411 (5137)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x33
+ * Checksum 0xE2
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/pc/FACP.roothp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/FACP, Mon Jan 18 23:59:01 2021
+ * Disassembly of /tmp/aml-84PIX0, Mon Jan 18 23:59:01 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 00000074 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : A1 +[009h 0009 1] Checksum : 3B [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/APIC.roothp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/APIC, Mon Jan 18 23:59:01 2021
+ * Disassembly of /tmp/aml-D5PIX0, Mon Jan 18 23:59:01 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/HPET.roothp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/HPET, Mon Jan 18 23:59:01 2021
+ * Disassembly of /tmp/aml-P5PIX0, Mon Jan 18 23:59:01 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/WAET.roothp diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/WAET, Mon Jan 18 23:59:01 2021
+ * Disassembly of /tmp/aml-N5PIX0, Mon Jan 18 23:59:01 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/DSDT.roothp diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/DSDT.roothp, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-83PIX0, Mon Jan 18 23:59:02 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x0000148D (5261)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0xC6
+ * Checksum 0x75
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/pc/FACP.hpbridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/FACP, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-2ZSAX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 00000074 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : A1 +[009h 0009 1] Checksum : 3B [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/APIC.hpbridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/APIC, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-B0SAX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/HPET.hpbridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/HPET, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-G2SAX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/WAET.hpbridge diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/WAET, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-F2SAX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/DSDT.hpbridge diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/DSDT.hpbridge, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-R2SAX0, Mon Jan 18 23:59:02 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x000013A2 (5026)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0xD9
+ * Checksum 0x88
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/pc/FACP.hpbrroot diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/FACP, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-D9COX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 00000074 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : A1 +[009h 0009 1] Checksum : 3B [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/APIC.hpbrroot diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/APIC, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-K9COX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000078 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : ED +[009h 0009 1] Checksum : 8A [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/HPET.hpbrroot diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/HPET, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-L4COX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [HPET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "HPET" [High Precision Event Timer table] [004h 0004 4] Table Length : 00000038 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 03 +[009h 0009 1] Checksum : B4 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCHPET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/WAET.hpbrroot diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/pc/WAET, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-W4COX0, Mon Jan 18 23:59:02 2021 *
* ACPI Data Table [WAET]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "WAET" [Windows ACPI Emulated Devices Table] [004h 0004 4] Table Length : 00000028 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 88 +[009h 0009 1] Checksum : 39 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCWAET" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/pc/DSDT.hpbrroot diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/DSDT.hpbrroot, Mon Jan 18 23:59:02 2021
+ * Disassembly of /tmp/aml-S4COX0, Mon Jan 18 23:59:02 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00000C0C (3084)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x81
+ * Checksum 0x30
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{Table tests/data/acpi/microvm/FACP.usb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/FACP, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-PZ3FX0, Mon Jan 18 23:59:03 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : 7E +[009h 0009 1] Checksum : 18 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/APIC.usb diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/APIC, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-ZZ3FX0, Mon Jan 18 23:59:03 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000046 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : D7 +[009h 0009 1] Checksum : 74 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/DSDT.usb diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/microvm/DSDT.usb, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-XZ3FX0, Mon Jan 18 23:59:03 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x0000019E (414)
* Revision 0x02
- * Checksum 0x72
+ * Checksum 0x21
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (_SB)
{Table tests/data/acpi/microvm/FACP.rtc diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/FACP, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-TX8BX0, Mon Jan 18 23:59:03 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : 7E +[009h 0009 1] Checksum : 18 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/APIC.rtc diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/APIC, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-QS8BX0, Mon Jan 18 23:59:03 2021 *
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000046 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : D7 +[009h 0009 1] Checksum : 74 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/DSDT.rtc diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/microvm/DSDT.rtc, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-4S8BX0, Mon Jan 18 23:59:03 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00000194 (404)
* Revision 0x02
- * Checksum 0x30
+ * Checksum 0xDF
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (_SB)
{Table tests/data/acpi/microvm/FACP.ioapic2 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/FACP, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-ZRMOX0, Mon Jan 18 23:59:03 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : 7E +[009h 0009 1] Checksum : 18 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/APIC.ioapic2 diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/APIC.ioapic2, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-VMMOX0, Mon Jan 18 23:59:03 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 00000052 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : E6 +[009h 0009 1] Checksum : 83 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/DSDT.ioapic2 diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/microvm/DSDT.ioapic2, Mon Jan 18 23:59:03 2021
+ * Disassembly of /tmp/aml-TMMOX0, Mon Jan 18 23:59:03 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x0000016D (365)
* Revision 0x02
- * Checksum 0x1C
+ * Checksum 0xCB
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (_SB)
{Table tests/data/acpi/microvm/FACP.pcie diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/FACP, Tue Jan 19 00:03:13 2021
+ * Disassembly of /tmp/aml-M6CGX0, Tue Jan 19 00:03:13 2021 *
* ACPI Data Table [FACP]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 0000010C [008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : 7E +[009h 0009 1] Checksum : 18 [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCFACP" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/APIC.pcie diff:
@@ -3,7 +3,7 @@
* AML/ASL+ Disassembler version 20200326 (64-bit version)
* Copyright (c) 2000 - 2020 Intel Corporation
*
- * Disassembly of tests/data/acpi/microvm/APIC.pcie, Tue Jan 19 00:03:13 2021
+ * Disassembly of /tmp/aml-V6CGX0, Tue Jan 19 00:03:13 2021
*
* ACPI Data Table [APIC]
*
@@ -13,9 +13,9 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] [004h 0004 4] Table Length : 0000006E [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : DF +[009h 0009 1] Checksum : 7C [00Ah 0010 6] Oem ID : "BOCHS " -[010h 0016 8] Oem Table ID : "BXPCAPIC" +[010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
Table tests/data/acpi/microvm/DSDT.pcie diff:
@@ -5,20 +5,20 @@
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/microvm/DSDT.pcie, Tue Jan 19 00:03:13 2021
+ * Disassembly of /tmp/aml-16CGX0, Tue Jan 19 00:03:13 2021
*
* Original Table Header:
* Signature "DSDT"
* Length 0x00000BD7 (3031)
* Revision 0x02
- * Checksum 0x99
+ * Checksum 0x48
* OEM ID "BOCHS "
- * OEM Table ID "BXPCDSDT"
+ * OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
-DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
+DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (_SB)
{--- tests/qtest/bios-tables-test.c | 170 ++++++++++++++++++++++++++++----- 1 file changed, 146 insertions(+), 24 deletions(-)
tests/qtest/bios-tables-test.c +146 -24
@@ -64,13 +64,17 @@#include "boot-sector.h" #include "tpm-emu.h" #include "hw/acpi/tpm.h" - +#include "qemu/cutils.h" #define MACHINE_PC "pc"#define MACHINE_Q35 "q35"#define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML" +#define OEM_ID "TEST" +#define OEM_TABLE_ID "OEM" +#define OEM_TEST_ARGS "-machine oem-id="OEM_ID",oem-table-id="OEM_TABLE_ID + typedef struct { bool tcg_only; const char *machine;
@@ -654,17 +658,28 @@ static void test_smbios_structs(test_data *data) } } -static void test_acpi_one (const char *params,test_data *data) +static void test_acpi_load_tables (test_data *data,bool use_uefi) { -char *args; -bool use_uefi = data->uefi_fl1 && data->uefi_fl2; - -#ifndef CONFIG_TCG -if (data->tcg_only) { -g_test_skip ("TCG disabled, skipping ACPI tcg_only test" ); -return ; +if (use_uefi) { +g_assert (data->scan_len); + data->rsdp_addr =acpi_find_rsdp_address_uefi (data->qts, + data->ram_start, data->scan_len); + }else { +boot_sector_test (data->qts); + data->rsdp_addr =acpi_find_rsdp_address (data->qts); + g_assert_cmphex(data->rsdp_addr, <, 0x100000); } -#endif /* CONFIG_TCG */ + + data->tables =g_array_new (false, true,sizeof (AcpiSdtTable)); +test_acpi_rsdp_table (data); +test_acpi_rxsdt_table (data); +test_acpi_fadt_table (data); +} + +static char *test_acpi_create_args (test_data *data,const char *params, +bool use_uefi) +{ +char *args;if (use_uefi) {/*
@@ -695,23 +710,24 @@ static void test_acpi_one(const char *params, test_data *data) params ? params :"" , disk, data->blkdev ?: "ide-hd"); } +return args; +} - data->qts =qtest_init (args); +static void test_acpi_one (const char *params,test_data *data) +{ +char *args; +bool use_uefi = data->uefi_fl1 && data->uefi_fl2; -if (use_uefi) { -g_assert (data->scan_len); - data->rsdp_addr =acpi_find_rsdp_address_uefi (data->qts, - data->ram_start, data->scan_len); - }else { -boot_sector_test (data->qts); - data->rsdp_addr =acpi_find_rsdp_address (data->qts); - g_assert_cmphex(data->rsdp_addr, <, 0x100000); +#ifndef CONFIG_TCG +if (data->tcg_only) { +g_test_skip ("TCG disabled, skipping ACPI tcg_only test" ); +return ; } +#endif /* CONFIG_TCG */ - data->tables =g_array_new (false, true,sizeof (AcpiSdtTable)); -test_acpi_rsdp_table (data); -test_acpi_rxsdt_table (data); -test_acpi_fadt_table (data); + args =test_acpi_create_args (data, params, use_uefi); + data->qts =qtest_init (args); +test_acpi_load_tables (data, use_uefi);if (getenv (ACPI_REBUILD_EXPECTED_AML )) {dump_aml_files (data, true);
@@ -1292,6 +1308,109 @@ static void test_acpi_virt_tcg(void)free_test_data (&data); } +static void test_oem_fields (test_data *data) +{ +int i; +char oem_id[6 ]; +char oem_table_id[8 ]; + +strpadcpy (oem_id,sizeof oem_id,OEM_ID ,' ' ); +strpadcpy (oem_table_id,sizeof oem_table_id,OEM_TABLE_ID ,' ' ); +for (i =0 ; i < data->tables->len; ++i) { +AcpiSdtTable *sdt; + + sdt = &g_array_index (data->tables, AcpiSdtTable, i); +/* FACS doesn't have OEMID and OEMTABLEID fields */ +if (compare_signature (sdt,"FACS" )) { +continue ; + } + +g_assert (memcmp (sdt->aml +10 , oem_id,6 ) ==0 ); +g_assert (memcmp (sdt->aml +16 , oem_table_id,8 ) ==0 ); + } +} + +static void test_acpi_oem_fields_pc (void ) +{ +test_data data; +char *args; + +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_PC ; + data.required_struct_types = base_required_struct_types; + data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types); + + args =test_acpi_create_args (&data, +OEM_TEST_ARGS , false); + data.qts =qtest_init (args); +test_acpi_load_tables (&data, false); +test_oem_fields (&data); +qtest_quit (data.qts); +free_test_data (&data); +g_free (args); +} + +static void test_acpi_oem_fields_q35 (void ) +{ +test_data data; +char *args; + +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_Q35 ; + data.required_struct_types = base_required_struct_types; + data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types); + + args =test_acpi_create_args (&data, +OEM_TEST_ARGS , false); + data.qts =qtest_init (args); +test_acpi_load_tables (&data, false); +test_oem_fields (&data); +qtest_quit (data.qts); +free_test_data (&data); +g_free (args); +} + +static void test_acpi_oem_fields_microvm (void ) +{ +test_data data; +char *args; + +test_acpi_microvm_prepare (&data); + + args =test_acpi_create_args (&data, +OEM_TEST_ARGS ",acpi=on" , false); + data.qts =qtest_init (args); +test_acpi_load_tables (&data, false); +test_oem_fields (&data); +qtest_quit (data.qts); +free_test_data (&data); +g_free (args); +} + +static void test_acpi_oem_fields_virt (void ) +{ +test_data data = { + .machine ="virt" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , + .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2" , + .ram_start =0x40000000ULL , + .scan_len =128ULL *1024 *1024 , + }; +char *args; + + args =test_acpi_create_args (&data, +"-cpu cortex-a57 " OEM_TEST_ARGS , true); + data.qts =qtest_init (args); +test_acpi_load_tables (&data, true); +test_oem_fields (&data); +qtest_quit (data.qts); +free_test_data (&data); +g_free (args); +} + +int main (int argc,char *argv[]) {const char *arch =qtest_get_arch ();
@@ -1304,9 +1423,10 @@ int main(int argc, char *argv[])if (ret) {return ret; } - +qtest_add_func ("acpi/q35/oem-fields" , test_acpi_oem_fields_q35);qtest_add_func ("acpi/q35/tpm-tis" , test_acpi_q35_tcg_tpm_tis);qtest_add_func ("acpi/piix4" , test_acpi_piix4_tcg); +qtest_add_func ("acpi/oem-fields" , test_acpi_oem_fields_pc);qtest_add_func ("acpi/piix4/bridge" , test_acpi_piix4_tcg_bridge);qtest_add_func ("acpi/piix4/pci-hotplug/no_root_hotplug" , test_acpi_piix4_no_root_hotplug);
@@ -1333,6 +1453,7 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/microvm/usb" , test_acpi_microvm_usb_tcg);qtest_add_func ("acpi/microvm/rtc" , test_acpi_microvm_rtc_tcg);qtest_add_func ("acpi/microvm/ioapic2" , test_acpi_microvm_ioapic2_tcg); +qtest_add_func ("acpi/microvm/oem-fields" , test_acpi_oem_fields_microvm);if (strcmp (arch,"x86_64" ) ==0 ) {qtest_add_func ("acpi/microvm/pcie" , test_acpi_microvm_pcie_tcg); }
@@ -1341,6 +1462,7 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt/numamem" , test_acpi_virt_tcg_numamem);qtest_add_func ("acpi/virt/memhp" , test_acpi_virt_tcg_memhp);qtest_add_func ("acpi/virt/pxb" , test_acpi_virt_tcg_pxb); +qtest_add_func ("acpi/virt/oem-fields" , test_acpi_oem_fields_virt); } ret =g_test_run ();boot_sector_cleanup (disk);
Signature · 1 line
2.26.2
PATCH v4 4/5 tests/acpi: update expected data files
In reply to Marian Postevca--- tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes tests/data/acpi/microvm/DSDT | Bin 365 -> 365 bytes tests/data/acpi/microvm/DSDT.ioapic2 | Bin 365 -> 365 bytes tests/data/acpi/microvm/DSDT.pcie | Bin 3031 -> 3031 bytes tests/data/acpi/microvm/DSDT.rtc | Bin 404 -> 404 bytes tests/data/acpi/microvm/DSDT.usb | Bin 414 -> 414 bytes tests/data/acpi/microvm/FACP | Bin 268 -> 268 bytes tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes tests/data/acpi/pc/DSDT | Bin 5065 -> 5065 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6390 -> 6390 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6924 -> 6924 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5529 -> 5529 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6719 -> 6719 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 5026 -> 5026 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3084 -> 3084 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5137 -> 5137 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6424 -> 6424 bytes tests/data/acpi/pc/DSDT.numamem | Bin 5071 -> 5071 bytes tests/data/acpi/pc/DSDT.roothp | Bin 5261 -> 5261 bytes tests/data/acpi/pc/FACP | Bin 116 -> 116 bytes tests/data/acpi/pc/HMAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/pc/HPET | Bin 56 -> 56 bytes tests/data/acpi/pc/NFIT.dimmpxm | Bin 240 -> 240 bytes tests/data/acpi/pc/SLIT.cphp | Bin 48 -> 48 bytes tests/data/acpi/pc/SLIT.memhp | Bin 48 -> 48 bytes tests/data/acpi/pc/SRAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/pc/SRAT.cphp | Bin 304 -> 304 bytes tests/data/acpi/pc/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/pc/SRAT.memhp | Bin 264 -> 264 bytes tests/data/acpi/pc/SRAT.numamem | Bin 224 -> 224 bytes tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 734 bytes tests/data/acpi/pc/WAET | Bin 40 -> 40 bytes tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes tests/data/acpi/q35/DSDT | Bin 7801 -> 7801 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9126 -> 9126 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7819 -> 7819 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8265 -> 8265 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9455 -> 9455 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7876 -> 7876 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9160 -> 9160 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8932 -> 8932 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7807 -> 7807 bytes tests/data/acpi/q35/DSDT.tis | Bin 8407 -> 8407 bytes tests/data/acpi/q35/FACP | Bin 244 -> 244 bytes tests/data/acpi/q35/HMAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/q35/HPET | Bin 56 -> 56 bytes tests/data/acpi/q35/MCFG | Bin 60 -> 60 bytes tests/data/acpi/q35/NFIT.dimmpxm | Bin 240 -> 240 bytes tests/data/acpi/q35/SLIT.cphp | Bin 48 -> 48 bytes tests/data/acpi/q35/SLIT.memhp | Bin 48 -> 48 bytes tests/data/acpi/q35/SRAT.acpihmat | Bin 280 -> 280 bytes tests/data/acpi/q35/SRAT.cphp | Bin 304 -> 304 bytes tests/data/acpi/q35/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/q35/SRAT.memhp | Bin 264 -> 264 bytes tests/data/acpi/q35/SRAT.mmio64 | Bin 224 -> 224 bytes tests/data/acpi/q35/SRAT.numamem | Bin 224 -> 224 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 734 bytes tests/data/acpi/q35/TPM2.tis | Bin 76 -> 76 bytes tests/data/acpi/q35/WAET | Bin 40 -> 40 bytes tests/data/acpi/virt/APIC | Bin 168 -> 168 bytes tests/data/acpi/virt/APIC.memhp | Bin 168 -> 168 bytes tests/data/acpi/virt/APIC.numamem | Bin 168 -> 168 bytes tests/data/acpi/virt/DSDT | Bin 5204 -> 5204 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6565 -> 6565 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5204 -> 5204 bytes tests/data/acpi/virt/DSDT.pxb | Bin 7689 -> 7689 bytes tests/data/acpi/virt/FACP | Bin 268 -> 268 bytes tests/data/acpi/virt/FACP.memhp | Bin 268 -> 268 bytes tests/data/acpi/virt/FACP.numamem | Bin 268 -> 268 bytes tests/data/acpi/virt/GTDT | Bin 96 -> 96 bytes tests/data/acpi/virt/GTDT.memhp | Bin 96 -> 96 bytes tests/data/acpi/virt/GTDT.numamem | Bin 96 -> 96 bytes tests/data/acpi/virt/MCFG | Bin 60 -> 60 bytes tests/data/acpi/virt/MCFG.memhp | Bin 60 -> 60 bytes tests/data/acpi/virt/MCFG.numamem | Bin 60 -> 60 bytes tests/data/acpi/virt/NFIT.memhp | Bin 224 -> 224 bytes tests/data/acpi/virt/SLIT.memhp | Bin 48 -> 48 bytes tests/data/acpi/virt/SPCR | Bin 80 -> 80 bytes tests/data/acpi/virt/SPCR.memhp | Bin 80 -> 80 bytes tests/data/acpi/virt/SPCR.numamem | Bin 80 -> 80 bytes tests/data/acpi/virt/SRAT.memhp | Bin 226 -> 226 bytes tests/data/acpi/virt/SRAT.numamem | Bin 106 -> 106 bytes tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes 91 files changed, 0 insertions(+), 0 deletions(-)
tests/data/acpi/microvm/APIC binary +0 -0
tests/data/acpi/microvm/APIC.ioapic2 binary +0 -0
tests/data/acpi/microvm/APIC.pcie binary +0 -0
tests/data/acpi/microvm/DSDT binary +0 -0
tests/data/acpi/microvm/DSDT.ioapic2 binary +0 -0
tests/data/acpi/microvm/DSDT.pcie binary +0 -0
tests/data/acpi/microvm/DSDT.rtc binary +0 -0
tests/data/acpi/microvm/DSDT.usb binary +0 -0
tests/data/acpi/microvm/FACP binary +0 -0
tests/data/acpi/pc/APIC binary +0 -0
tests/data/acpi/pc/APIC.acpihmat binary +0 -0
tests/data/acpi/pc/APIC.cphp binary +0 -0
tests/data/acpi/pc/APIC.dimmpxm binary +0 -0
tests/data/acpi/pc/DSDT binary +0 -0
tests/data/acpi/pc/DSDT.acpihmat binary +0 -0
tests/data/acpi/pc/DSDT.bridge binary +0 -0
tests/data/acpi/pc/DSDT.cphp binary +0 -0
tests/data/acpi/pc/DSDT.dimmpxm binary +0 -0
tests/data/acpi/pc/DSDT.hpbridge binary +0 -0
tests/data/acpi/pc/DSDT.hpbrroot binary +0 -0
tests/data/acpi/pc/DSDT.ipmikcs binary +0 -0
tests/data/acpi/pc/DSDT.memhp binary +0 -0
tests/data/acpi/pc/DSDT.numamem binary +0 -0
tests/data/acpi/pc/DSDT.roothp binary +0 -0
tests/data/acpi/pc/FACP binary +0 -0
tests/data/acpi/pc/HMAT.acpihmat binary +0 -0
tests/data/acpi/pc/HPET binary +0 -0
tests/data/acpi/pc/NFIT.dimmpxm binary +0 -0
tests/data/acpi/pc/SLIT.cphp binary +0 -0
tests/data/acpi/pc/SLIT.memhp binary +0 -0
tests/data/acpi/pc/SRAT.acpihmat binary +0 -0
tests/data/acpi/pc/SRAT.cphp binary +0 -0
tests/data/acpi/pc/SRAT.dimmpxm binary +0 -0
tests/data/acpi/pc/SRAT.memhp binary +0 -0
tests/data/acpi/pc/SRAT.numamem binary +0 -0
tests/data/acpi/pc/SSDT.dimmpxm binary +0 -0
tests/data/acpi/pc/WAET binary +0 -0
tests/data/acpi/q35/APIC binary +0 -0
tests/data/acpi/q35/APIC.acpihmat binary +0 -0
tests/data/acpi/q35/APIC.cphp binary +0 -0
tests/data/acpi/q35/APIC.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.tis binary +0 -0
tests/data/acpi/q35/FACP binary +0 -0
tests/data/acpi/q35/HMAT.acpihmat binary +0 -0
tests/data/acpi/q35/HPET binary +0 -0
tests/data/acpi/q35/MCFG binary +0 -0
tests/data/acpi/q35/NFIT.dimmpxm binary +0 -0
tests/data/acpi/q35/SLIT.cphp binary +0 -0
tests/data/acpi/q35/SLIT.memhp binary +0 -0
tests/data/acpi/q35/SRAT.acpihmat binary +0 -0
tests/data/acpi/q35/SRAT.cphp binary +0 -0
tests/data/acpi/q35/SRAT.dimmpxm binary +0 -0
tests/data/acpi/q35/SRAT.memhp binary +0 -0
tests/data/acpi/q35/SRAT.mmio64 binary +0 -0
tests/data/acpi/q35/SRAT.numamem binary +0 -0
tests/data/acpi/q35/SSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/TPM2.tis binary +0 -0
tests/data/acpi/q35/WAET binary +0 -0
tests/data/acpi/virt/APIC binary +0 -0
tests/data/acpi/virt/APIC.memhp binary +0 -0
tests/data/acpi/virt/APIC.numamem binary +0 -0
tests/data/acpi/virt/DSDT binary +0 -0
tests/data/acpi/virt/DSDT.memhp binary +0 -0
tests/data/acpi/virt/DSDT.numamem binary +0 -0
tests/data/acpi/virt/DSDT.pxb binary +0 -0
tests/data/acpi/virt/FACP binary +0 -0
tests/data/acpi/virt/FACP.memhp binary +0 -0
tests/data/acpi/virt/FACP.numamem binary +0 -0
tests/data/acpi/virt/GTDT binary +0 -0
tests/data/acpi/virt/GTDT.memhp binary +0 -0
tests/data/acpi/virt/GTDT.numamem binary +0 -0
tests/data/acpi/virt/MCFG binary +0 -0
tests/data/acpi/virt/MCFG.memhp binary +0 -0
tests/data/acpi/virt/MCFG.numamem binary +0 -0
tests/data/acpi/virt/NFIT.memhp binary +0 -0
tests/data/acpi/virt/SLIT.memhp binary +0 -0
tests/data/acpi/virt/SPCR binary +0 -0
tests/data/acpi/virt/SPCR.memhp binary +0 -0
tests/data/acpi/virt/SPCR.numamem binary +0 -0
tests/data/acpi/virt/SRAT.memhp binary +0 -0
tests/data/acpi/virt/SRAT.numamem binary +0 -0
tests/data/acpi/virt/SSDT.memhp binary +0 -0
Signature · 1 line
2.26.2
PATCH v4 5/5 tests/acpi: disallow updates for expected data files
In reply to Marian Postevca--- tests/qtest/bios-tables-test-allowed-diff.h | 94 --------------------- 1 file changed, 94 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -94
@@ -1,95 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/APIC" , -"tests/data/acpi/virt/FACP" , -"tests/data/acpi/virt/GTDT" , -"tests/data/acpi/virt/MCFG" , -"tests/data/acpi/virt/SPCR" , -"tests/data/acpi/virt/DSDT" , -"tests/data/acpi/virt/APIC.numamem" , -"tests/data/acpi/virt/FACP.numamem" , -"tests/data/acpi/virt/GTDT.numamem" , -"tests/data/acpi/virt/MCFG.numamem" , -"tests/data/acpi/virt/SPCR.numamem" , -"tests/data/acpi/virt/DSDT.numamem" , -"tests/data/acpi/virt/SRAT.numamem" , -"tests/data/acpi/virt/DSDT.memhp" , -"tests/data/acpi/virt/NFIT.memhp" , -"tests/data/acpi/virt/SSDT.memhp" , -"tests/data/acpi/virt/SLIT.memhp" , -"tests/data/acpi/virt/SRAT.memhp" , -"tests/data/acpi/virt/SPCR.memhp" , -"tests/data/acpi/virt/MCFG.memhp" , -"tests/data/acpi/virt/GTDT.memhp" , -"tests/data/acpi/virt/APIC.memhp" , -"tests/data/acpi/virt/FACP.memhp" , -"tests/data/acpi/virt/DSDT.pxb" , - -"tests/data/acpi/pc/SRAT.acpihmat" , -"tests/data/acpi/pc/HPET" , -"tests/data/acpi/pc/DSDT.hpbrroot" , -"tests/data/acpi/pc/SRAT.numamem" , -"tests/data/acpi/pc/DSDT.dimmpxm" , -"tests/data/acpi/pc/DSDT.acpihmat" , -"tests/data/acpi/pc/FACP" , -"tests/data/acpi/pc/SRAT.cphp" , -"tests/data/acpi/pc/DSDT.numamem" , -"tests/data/acpi/pc/DSDT.bridge" , -"tests/data/acpi/pc/HMAT.acpihmat" , -"tests/data/acpi/pc/DSDT.cphp" , -"tests/data/acpi/pc/APIC.dimmpxm" , -"tests/data/acpi/pc/SRAT.memhp" , -"tests/data/acpi/pc/SLIT.cphp" , -"tests/data/acpi/pc/DSDT.hpbridge" , -"tests/data/acpi/pc/NFIT.dimmpxm" , -"tests/data/acpi/pc/APIC.cphp" , -"tests/data/acpi/pc/SSDT.dimmpxm" , -"tests/data/acpi/pc/SRAT.dimmpxm" , -"tests/data/acpi/pc/APIC.acpihmat" , -"tests/data/acpi/pc/DSDT.memhp" , -"tests/data/acpi/pc/DSDT.ipmikcs" , -"tests/data/acpi/pc/SLIT.memhp" , -"tests/data/acpi/pc/WAET" , -"tests/data/acpi/pc/DSDT" , -"tests/data/acpi/pc/APIC" , -"tests/data/acpi/pc/DSDT.roothp" , - -"tests/data/acpi/q35/SRAT.acpihmat" , -"tests/data/acpi/q35/HPET" , -"tests/data/acpi/q35/SRAT.numamem" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/FACP" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/SRAT.cphp" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/HMAT.acpihmat" , -"tests/data/acpi/q35/DSDT.cphp" , -"tests/data/acpi/q35/APIC.dimmpxm" , -"tests/data/acpi/q35/SRAT.memhp" , -"tests/data/acpi/q35/SLIT.cphp" , -"tests/data/acpi/q35/NFIT.dimmpxm" , -"tests/data/acpi/q35/APIC.cphp" , -"tests/data/acpi/q35/SSDT.dimmpxm" , -"tests/data/acpi/q35/SRAT.dimmpxm" , -"tests/data/acpi/q35/APIC.acpihmat" , -"tests/data/acpi/q35/MCFG" , -"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/SLIT.memhp" , -"tests/data/acpi/q35/WAET" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.tis" , -"tests/data/acpi/q35/SRAT.mmio64" , -"tests/data/acpi/q35/TPM2.tis" , -"tests/data/acpi/q35/DSDT" , -"tests/data/acpi/q35/APIC" , - -"tests/data/acpi/microvm/APIC.pcie" , -"tests/data/acpi/microvm/DSDT.pcie" , -"tests/data/acpi/microvm/DSDT.usb" , -"tests/data/acpi/microvm/DSDT.rtc" , -"tests/data/acpi/microvm/FACP" , -"tests/data/acpi/microvm/APIC.ioapic2" , -"tests/data/acpi/microvm/DSDT.ioapic2" , -"tests/data/acpi/microvm/DSDT" , -"tests/data/acpi/microvm/APIC",
Signature · 1 line
2.26.2