ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/acpi/piix4: Convert reset handler to DeviceReset 

The PIIX4/PM is a PCI device within the PIIX4 chipset, it will be reset
when the PCI bus it stands on is reset.

Convert its reset handler into a proper Device reset method.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191010131527.32513-2-philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-10-10 15:15:20 +02:00 committed by Eduardo Habkost
parent 0533ef5f20
commit 217e8ef9c9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/acpi/piix4.c
View File

@ -27,7 +27,6 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qapi/error.h" #include "qapi/error.h"
@ -344,9 +343,9 @@ static const VMStateDescription vmstate_acpi = {
} }
}; };
static void piix4_reset(void *opaque) static void piix4_pm_reset(DeviceState *dev)
{ {
PIIX4PMState *s = opaque; PIIX4PMState *s = PIIX4_PM(dev);
PCIDevice *d = PCI_DEVICE(s); PCIDevice *d = PCI_DEVICE(s);
uint8_t *pci_conf = d->config; uint8_t *pci_conf = d->config;
@ -542,7 +541,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
s->machine_ready.notify = piix4_pm_machine_ready; s->machine_ready.notify = piix4_pm_machine_ready;
qemu_add_machine_init_done_notifier(&s->machine_ready); qemu_add_machine_init_done_notifier(&s->machine_ready);
qemu_register_reset(piix4_reset, s);
piix4_acpi_system_hot_add_init(pci_address_space_io(dev), piix4_acpi_system_hot_add_init(pci_address_space_io(dev),
pci_get_bus(dev), s); pci_get_bus(dev), s);
@ -692,6 +690,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
k->device_id = PCI_DEVICE_ID_INTEL_82371AB_3; k->device_id = PCI_DEVICE_ID_INTEL_82371AB_3;
k->revision = 0x03; k->revision = 0x03;
k->class_id = PCI_CLASS_BRIDGE_OTHER; k->class_id = PCI_CLASS_BRIDGE_OTHER;
dc->reset = piix4_pm_reset;
dc->desc = "PM"; dc->desc = "PM";
dc->vmsd = &vmstate_acpi; dc->vmsd = &vmstate_acpi;
dc->props = piix4_pm_properties; dc->props = piix4_pm_properties;