From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Mar 2014 13:19:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=be86c53c058d75fc3938b1b54f363259f282b3d5;p=qemu.git

Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging

PowerPC queue for 2.0-rc0

* QEMUMachine include cleanup
* SLOF update
* XICS reset fix
* sPAPR PCI host bridge refactorings

# gpg: Signature made Thu 13 Mar 2014 02:50:51 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/ppc-for-2.0:
  spapr-pci: Convert fprintf() to error_report()
  spapr-pci: Convert to QOM realize
  xics-kvm: Fix reset function
  pseries: Update SLOF firmware image to qemu-slof-20140304
  Move QEMUMachine typedef to qemu/typedefs.h
  Revert "KVM: Split QEMUMachine typedef into separate header"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

be86c53c058d75fc3938b1b54f363259f282b3d5
diff --cc hw/ppc/spapr_pci.c
index 3063109e21,3c54399d9d..cbef095935
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@@ -505,11 -506,12 +506,11 @@@ static AddressSpace *spapr_pci_dma_iomm
      return &phb->iommu_as;
  }
  
- static int spapr_phb_init(SysBusDevice *s)
+ static void spapr_phb_realize(DeviceState *dev, Error **errp)
  {
-     DeviceState *dev = DEVICE(s);
+     SysBusDevice *s = SYS_BUS_DEVICE(dev);
      sPAPRPHBState *sphb = SPAPR_PCI_HOST_BRIDGE(s);
      PCIHostState *phb = PCI_HOST_BRIDGE(s);
 -    const char *busname;
      char *namebuf;
      int i;
      PCIBus *bus;
diff --cc include/hw/boards.h
index 6b17397e8d,fd9388c695..7bd2ea7736
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@@ -4,9 -4,7 +4,8 @@@
  #define HW_BOARDS_H
  
  #include "sysemu/blockdev.h"
- #include "sysemu/qemumachine.h"
  #include "hw/qdev.h"
 +#include "qom/object.h"
  
  typedef struct QEMUMachineInitArgs {
      const QEMUMachine *machine;