Merge commit '5a4d701acde890a5ca134236424ece45545f70c7' into upstream-merge

Merge commit '5a4d701acde890a5ca134236424ece45545f70c7' into upstream-merge

* commit '5a4d701acde890a5ca134236424ece45545f70c7': (217 commits)
  audio: Make pcspk card selectable again
  win32: provide separate macros for weak decls and definitions
  openpic: Added BRR1 register
  pseries: Update SLOF firmware image
  pseries dma: DMA window params added to PHB and DT population changed
  pseries: Add PCI MSI/MSI-X support
  pseries: Add trace event for PCI irqs
  pseries: Export find_phb() utility function for PCI code
  pseries: added allocator for a block of IRQs
  pseries: Separate PCI RTAS setup from common from emulation specific PCI setup
  pseries: Rework irq assignment to avoid carrying qemu_irqs around
  pseries: Remove extraneous prints
  pseries: Update SLOF
  PPC: spapr: Remove global variable
  PPC: spapr: Rework VGA select logic
  xbzrle: fix compilation on ppc32
  spapr: Add support for -vga option
  Add one new file vga-pci.h and cleanup on all platforms
  Revert "PPC: e500: Use new MPIC dt format"
  ppc: Fix bug in handling of PAPR hypercall exits
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>