[Qemu-devel] [PATCH 1/2] acpi: remove static pm_state

[Blue Swirl]

Signed-off-by: Blue Swirl <address@hidden>
---
 hw/acpi.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/acpi.c b/hw/acpi.c
index e3b63b7..bb2974e 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -76,8 +76,6 @@ typedef struct PIIX4PMState {
 #define SMBHSTDAT1 0x06
 #define SMBBLKDAT 0x07

-static PIIX4PMState *pm_state;
-
 static uint32_t get_pmtmr(PIIX4PMState *s)
 {
     uint32_t d;
@@ -509,7 +507,6 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn,
uint32_t smb_io_base,
     s = (PIIX4PMState *)pci_register_device(bus,
                                          "PM", sizeof(PIIX4PMState),
                                          devfn, NULL, pm_write_config);
-    pm_state = s;
     pci_conf = s->dev.config;
     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
     pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB_3);
@@ -747,6 +744,7 @@ static void disable_device(struct pci_status *p,
struct gpe_regs *g, int slot)

 static int piix4_device_hotplug(PCIDevice *dev, int state)
 {
+    PIIX4PMState *s = container_of(dev, PIIX4PMState, dev);
     int slot = PCI_SLOT(dev->devfn);

     pci0_status.up = 0;
@@ -756,8 +754,8 @@ static int piix4_device_hotplug(PCIDevice *dev, int state)
     else
         disable_device(&pci0_status, &gpe, slot);
     if (gpe.en & 2) {
-        qemu_set_irq(pm_state->irq, 1);
-        qemu_set_irq(pm_state->irq, 0);
+        qemu_set_irq(s->irq, 1);
+        qemu_set_irq(s->irq, 0);
     }
     return 0;
 }
-- 
1.6.2.4