diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2010-10-27 19:07:10 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2010-10-27 19:07:10 +0200 |
commit | b907b69dd75415bc28349d1dd1e9a598ddace463 (patch) | |
tree | ac0c20fcaef6e9d675132617e95ca457dc51459e /hw/acpi_piix4.c | |
parent | df2943ba3c73ca21dbda063f15fa3e80064af864 (diff) | |
parent | 804b207170cdccca3672b63caaf82312ad205a7f (diff) |
Merge branch 'pci' into for_anthony
Diffstat (limited to 'hw/acpi_piix4.c')
-rw-r--r-- | hw/acpi_piix4.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index f74f34cbf0..66c7885d62 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -621,6 +621,9 @@ static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state) PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, DO_UPCAST(PCIDevice, qdev, qdev)); + if (!dev->qdev.hotplugged) + return 0; + s->pci0_status.up = 0; s->pci0_status.down = 0; if (state) { |