Commit 2fa35662 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Michael S. Tsirkin
Browse files

Revert "hw/pci: disable pci-bridge's shpc by default" 



This reverts commit dc0ae767.

Disabling the shpc controller has an undesired side effect.
The PCI bridge remains with no attached devices at boot time,
and the guest operating systems do not allocate any resources
for it, leaving the bridge unusable. Note that the behaviour
is dictated by the pci bridge specification.

Revert the commit and leave the shpc controller even if is not
actually used by any architecture. Slot 0 remains unusable at boot time.

Keep shpc off for QEMU 2.9 machines.

Signed-off-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8b12e489

hw/pci-bridge/pci_bridge_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static Property pci_bridge_dev_properties[] = { 
    DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi,

                            ON_OFF_AUTO_AUTO),

    DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags,

                    PCI_BRIDGE_DEV_F_SHPC_REQ, false),

                    PCI_BRIDGE_DEV_F_SHPC_REQ, true),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/compat.h

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ 
#define HW_COMPAT_H



#define HW_COMPAT_2_9 \

    /* empty */

    {\

        .driver   = "pci-bridge",\

        .property = "shpc",\

        .value    = "off",\

    },



#define HW_COMPAT_2_8 \

    {\