From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 10 Dec 2012 14:33:11 +0000 (-0600)
Subject: Merge remote-tracking branch 'kraxel/acpi.1' into staging
X-Git-Tag: v1.4.0-rc0~304
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8385b173a0ca4c2345434104e6cc2a7259adc4b9;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'kraxel/acpi.1' into staging

* kraxel/acpi.1:
  acpi: drop debug port
  q35: update lpc pci config space according to configured devices
  apci: switch piix4 pci hotplug to memory api
  acpi: remove acpi_gpe_blk
  apci: switch piix4 gpe to memory api
  acpi: fix piix4 smbus mapping
  acpi: switch smbus to memory api
  acpi: cleanup ich9 memory region
  apci: switch ich9 smi to memory api
  apci: switch ich9 gpe to memory api
  acpi: cleanup vt82c686 memory region
  acpi: cleanup piix4 memory region
  apci: switch evt to memory api
  apci: switch cnt to memory api
  apci: switch timer to memory api
  apci: switch vt82c686 to memory api
  apci: switch ich9 to memory api
  apci: switch piix4 to memory api

Conflicts:
	hw/lpc_ich9.c

Resolved merge conflict due to apm_init adding an argument.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

8385b173a0ca4c2345434104e6cc2a7259adc4b9
diff --cc hw/acpi_piix4.c
index dbddde13ab8,b03454e6c0a..0b5b0d3d3ec
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@@ -438,10 -391,8 +391,8 @@@ static int piix4_pm_initfn(PCIDevice *d
      pci_conf[0x3d] = 0x01; // interrupt pin 1
  
      /* APM */
 -    apm_init(&s->apm, apm_ctrl_changed, s);
 +    apm_init(dev, &s->apm, apm_ctrl_changed, s);
  
-     register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s);
- 
      if (s->kvm_enabled) {
          /* Mark SMM as already inited to prevent SMM from running.  KVM does not
           * support SMM mode. */
diff --cc hw/lpc_ich9.c
index 7de5427a69c,65852361485..878a43e92cd
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@@ -472,7 -497,11 +497,11 @@@ static int ich9_lpc_initfn(PCIDevice *d
      lpc->isa_bus = isa_bus;
  
      ich9_cc_init(lpc);
 -    apm_init(&lpc->apm, ich9_apm_ctrl_changed, lpc);
 +    apm_init(d, &lpc->apm, ich9_apm_ctrl_changed, lpc);
+ 
+     lpc->machine_ready.notify = ich9_lpc_machine_ready;
+     qemu_add_machine_init_done_notifier(&lpc->machine_ready);
+ 
      return 0;
  }
  
diff --cc hw/vt82c686.c
index 7f11dbe7820,5016e954d33..57d16c01341
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@@ -424,15 -351,18 +351,18 @@@ static int vt82c686b_pm_initfn(PCIDevic
      pci_conf[0x90] = s->smb_io_base | 1;
      pci_conf[0x91] = s->smb_io_base >> 8;
      pci_conf[0xd2] = 0x90;
-     register_ioport_write(s->smb_io_base, 0xf, 1, smb_ioport_writeb, &s->smb);
-     register_ioport_read(s->smb_io_base, 0xf, 1, smb_ioport_readb, &s->smb);
+     pm_smbus_init(&s->dev.qdev, &s->smb);
+     memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);
  
 -    apm_init(&s->apm, NULL, s);
 +    apm_init(dev, &s->apm, NULL, s);
  
-     acpi_pm_tmr_init(&s->ar, pm_tmr_timer);
-     acpi_pm1_cnt_init(&s->ar);
+     memory_region_init(&s->io, "vt82c686-pm", 64);
+     memory_region_set_enabled(&s->io, false);
+     memory_region_add_subregion(get_system_io(), 0, &s->io);
  
-     pm_smbus_init(&s->dev.qdev, &s->smb);
+     acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io);
+     acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io);
+     acpi_pm1_cnt_init(&s->ar, &s->io);
  
      return 0;
  }