aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2022-07-01 09:35:10 -0400
committerMichael S. Tsirkin <mst@redhat.com>2022-10-09 16:38:45 -0400
commit366047d6251f931eb72049b8d32b0eb7f894cc4c (patch)
tree83c091c974a491c995da38c1ac3dc79a2da5d3c5 /hw
parent5d08517fd723a8d2348a93a5706f6bd3aa659adf (diff)
downloadqemu-366047d6251f931eb72049b8d32b0eb7f894cc4c.zip
qemu-366047d6251f931eb72049b8d32b0eb7f894cc4c.tar.gz
qemu-366047d6251f931eb72049b8d32b0eb7f894cc4c.tar.bz2
x86: pci: acpi: reorder Device's _ADR and _SUN fields
no functional change, align order of fields in empty slot descriptor with a populated slot ordering. Expected diff: - Name (_SUN, 0x0X) // _SUN: Slot User Number Name (_ADR, 0xY) // _ADR: Address ... + Name (_SUN, 0xX) // _SUN: Slot User Number that will eliminate contextual changes (causing test failures) when follow up patches merge code generating populated and empty slots descriptors. Put mandatory _ADR as the 1st field, then ASUN as it can be present for both pupulated and empty slots and only then _SUN which is present only when slot is hotpluggable. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20220701133515.137890-13-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/i386/acpi-build.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index eb92b05..6342467 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -442,8 +442,8 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
break;
}
dev = aml_device("S%.02X", devfn);
- aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
+ aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
aml_append(method,