Skip to content
  • Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging · be86c53c
    Peter Maydell authored
    
    
    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: default avatarPeter Maydell <peter.maydell@linaro.org>
    be86c53c