| Message ID | 1395934536-11888-1-git-send-email-marcel.a@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Mar 27, 2014 at 05:35:36PM +0200, Marcel Apfelbaum wrote: > Commit 8dcf525abc5dff785251a881f9764dd961065c0d appended > description for all occupied non hotpluggable PCI slots. > However the bridge devices are already added to SSDT, > adding them again will create an incorrect SSDT table. > > Fixed by skipping the pci bridge devices, marking them as 'system'. > > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> Applied. I tweaked the commit log and comment a bit. > --- > hw/i386/acpi-build.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 7ecfd70..60abb57 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -841,7 +841,8 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) > pc = PCI_DEVICE_GET_CLASS(pdev); > dc = DEVICE_GET_CLASS(pdev); > > - if (pc->class_id == PCI_CLASS_BRIDGE_ISA) { > + if (pc->class_id == PCI_CLASS_BRIDGE_ISA || > + pc->is_bridge) { /* DSDT or SSDT above */ > set_bit(slot, slot_device_system); > } > > -- > 1.8.3.1
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7ecfd70..60abb57 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -841,7 +841,8 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) pc = PCI_DEVICE_GET_CLASS(pdev); dc = DEVICE_GET_CLASS(pdev); - if (pc->class_id == PCI_CLASS_BRIDGE_ISA) { + if (pc->class_id == PCI_CLASS_BRIDGE_ISA || + pc->is_bridge) { /* DSDT or SSDT above */ set_bit(slot, slot_device_system); }
Commit 8dcf525abc5dff785251a881f9764dd961065c0d appended description for all occupied non hotpluggable PCI slots. However the bridge devices are already added to SSDT, adding them again will create an incorrect SSDT table. Fixed by skipping the pci bridge devices, marking them as 'system'. Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> --- hw/i386/acpi-build.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)