[Qemu-commits] [qemu/qemu] 9abf56: s390: Fix error handling and condition code of ser...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9abf567d95a4e840df868ca993219175fbef8c22
      
https://github.com/qemu/qemu/commit/9abf567d95a4e840df868ca993219175fbef8c22
  Author: Christian Borntraeger <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M target-s390x/kvm.c
    M target-s390x/op_helper.c

  Log Message:
  -----------
  s390: Fix error handling and condition code of service call

Invalid sccb addresses will cause specification or addressing exception.
Lets add those checks. Furthermore, the good case (cc=0) was incorrect
for KVM, we did not set the CC at all. We now use return codes < 0
as program checks and return codes > 0 as condition code values.

Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 000a1a3800b532f97b939ebb777d5a14418f44a6
      
https://github.com/qemu/qemu/commit/000a1a3800b532f97b939ebb777d5a14418f44a6
  Author: Christian Borntraeger <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M target-s390x/Makefile.objs
    M target-s390x/cpu.h
    A target-s390x/interrupt.c
    M target-s390x/op_helper.c

  Log Message:
  -----------
  s390: provide interface for service interrupt/introduce interrupt.c

This patch creates interrupt.c. The first user is a callback for hw/*
code to trigger an service interrupt for a given sccb value. Several
interrupt types for s390 are floating (can be delivered to all CPUs).
so this code does not belong to a specific CPU.
Other interrupts (like the virtio one) are also floating and can be
moved here later on.

Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 231903bf27c18ba6d4d905601eab368f324159eb
      
https://github.com/qemu/qemu/commit/231903bf27c18ba6d4d905601eab368f324159eb
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr_pci.c
    M hw/spapr_pci.h

  Log Message:
  -----------
  pseries pci: removed redundant busdev

The PCIHostState struct already contains SysBusDevice so
the one in sPAPRPHBState has to go.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: e0fdbd7c1b45c1af034d4070a65067f6635f77b0
      
https://github.com/qemu/qemu/commit/e0fdbd7c1b45c1af034d4070a65067f6635f77b0
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c
    M hw/spapr_pci.c
    M hw/spapr_pci.h

  Log Message:
  -----------
  pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt

spapr_populate_pci_devices() populates the device tree only with bus
properties and has nothing to do with the devices on it as PCI BAR
allocation is done by the system firmware (SLOF).

New name - spapr_populate_pci_dt() - describes the functionality better.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 4a18e7c92a3c23ee742eda1e4442299b56198517
      
https://github.com/qemu/qemu/commit/4a18e7c92a3c23ee742eda1e4442299b56198517
  Author: Scott Wood <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/ppc/Makefile.objs
    A hw/ppc/e500.c
    R hw/ppce500_mpc8544ds.c

  Log Message:
  -----------
  PPC: e500: rename mpc8544ds into generic file

Rename the file (with no changes other than fixing up the header paths)
in preparation for refactoring into a generic e500 platform.  Also move
it into the newly created ppc/ directory.

Signed-off-by: Scott Wood <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
[agraf: conditionalize on CONFIG_FDT]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: b330598137cad915f65562a524b30e32498e44be
      
https://github.com/qemu/qemu/commit/b330598137cad915f65562a524b30e32498e44be
  Author: Scott Wood <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/ppc/e500.c

  Log Message:
  -----------
  PPC: e500: change internal references away from mpc8544ds

No functional changes -- machine is still outwardly mpc8544ds.

The references that are not changed contain mpc8544 hardware details that
need to be parameterized if/when a different e500 platform wants to
change them.

Signed-off-by: Scott Wood <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: e6eaabeb8dfb026da51d178974bddf56f1f06ffe
      
https://github.com/qemu/qemu/commit/e6eaabeb8dfb026da51d178974bddf56f1f06ffe
  Author: Scott Wood <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/ppc/Makefile.objs
    M hw/ppc/e500.c
    A hw/ppc/e500.h
    A hw/ppc/mpc8544ds.c

  Log Message:
  -----------
  PPC: e500: split mpc8544ds machine from generic e500 code

Currently the only mpc8544ds-ism that is factored out is
toplevel compatible and model.  In the future the generic e500
code is expected to become more generic.

Signed-off-by: Scott Wood <address@hidden>
[agraf: conditionalize on CONFIG_FDT]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 4d5c29ca455ed6adb1fb9f8394e4d7badfd0c532
      
https://github.com/qemu/qemu/commit/4d5c29ca455ed6adb1fb9f8394e4d7badfd0c532
  Author: Scott Wood <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/ppc/Makefile.objs
    A hw/ppc/e500plat.c

  Log Message:
  -----------
  PPC: e500: add generic e500 platform

This gives the kernel a paravirtualized machine to target, without
requiring both sides to pretend to be targeting a specific board
that likely has little to do with the host in KVM scenarios.  This
avoids the need to add new boards to QEMU, just to be able to
run KVM on new CPUs.

Signed-off-by: Scott Wood <address@hidden>
[agraf: conditionalize on CONFIG_FDT]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 78e8fde26c032931ca2ae13bfc7c59e38afd17ee
      
https://github.com/qemu/qemu/commit/78e8fde26c032931ca2ae13bfc7c59e38afd17ee
  Author: David Gibson <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M target-ppc/kvm.c

  Log Message:
  -----------
  ppc: Fix bug in handling of PAPR hypercall exits

Currently for powerpc, kvm_arch_handle_exit() always returns 1, meaning
that its caller - kvm_cpu_exec() - will always exit immediately afterwards
to the loop in qemu_kvm_cpu_thread_fn().

There's no need to do this.  Once we've handled the hypercall there's no
reason we can't go straight around and KVM_RUN again, which is what ret = 0
will signal.  The only exception might be for hypercalls which affect the
state of cpu_can_run(), however the only one that might do this is H_CEDE
and for kvm that is always handled in the kernel, not qemu.

Furtherm setting ret = 0 means that when exit_requested is set from a
hypercall, we will enter KVM_RUN once more with a signal which lets the
the kernel do its internal logic to complete the hypercall with out
actually executing any more guest code.  This is important if our hypercall
also triggered a reset, which previously would re-initialize everything
without completing the hypercall.  This caused the kernel to get confused
because it thought the guest was still in the middle of a hypercall when
it has actually been reset.

This patch therefore changes to ret = 0, which is both a bugfix and a small
optimization.

Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 7e99826c350f21cb7d162e802efaa5d1b8689ad0
      
https://github.com/qemu/qemu/commit/7e99826c350f21cb7d162e802efaa5d1b8689ad0
  Author: Alexander Graf <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/ppc/e500.c

  Log Message:
  -----------
  Revert "PPC: e500: Use new MPIC dt format"

This reverts commit 518c7fb44f2182cde943dc64f88cb2fd4e4ff6b5. It breaks
new Linux guests with SMP, because IPIs get mapped to large vectors which
our MPIC emulation does not implement.

Conflicts:

        hw/ppc/e500.c


  Commit: c1195d1677a41f42be712620674d42b39d83bdfe
      
https://github.com/qemu/qemu/commit/c1195d1677a41f42be712620674d42b39d83bdfe
  Author: address@hidden <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/alpha_pci.c
    M hw/cirrus_vga.c
    M hw/mips_malta.c
    M hw/pc.c
    M hw/pc.h
    M hw/ppc_newworld.c
    M hw/ppc_oldworld.c
    M hw/ppc_prep.c
    M hw/sun4u.c
    M hw/vga-pci.c
    A hw/vga-pci.h

  Log Message:
  -----------
  Add one new file vga-pci.h and cleanup on all platforms

Functions pci_vga_init() and pci_cirrus_vga_init() are declared
in pc.h. That prevents other platforms (e.g. sPAPR) to use them.

This patch is to create one new file vga-pci.h and move the
declarations to vga-pci.h, so that they can be shared by
all platforms. This patch also cleans up on all platforms.

Signed-off-by: Li Zhang <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: f28359d8e8fc64192450a72164b89d06cc3f781d
      
https://github.com/qemu/qemu/commit/f28359d8e8fc64192450a72164b89d06cc3f781d
  Author: address@hidden <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c

  Log Message:
  -----------
  spapr: Add support for -vga option

Also instanciate the USB keyboard and mouse when that option is used
(you can still use -device to create individual devices without all
the defaults)

Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: Li Zhang <address@hidden>
[agraf: remove USB bits]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: a5b71725c7067f6805eb30ff8e03dce3b6bf7a53
      
https://github.com/qemu/qemu/commit/a5b71725c7067f6805eb30ff8e03dce3b6bf7a53
  Author: Alexander Graf <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M savevm.c

  Log Message:
  -----------
  xbzrle: fix compilation on ppc32

When compiling the xbzrle code on my ppc32 user space, I hit the following
gcc compiler warning (treated as an error):

  cc1: warnings being treated as errors
  savevm.c: In function ‘xbzrle_encode_buffer’:
  savevm.c:2476: error: overflow in implicit constant conversion

Fix this by making the cast explicit, rather than implicit.

Signed-off-by: Alexander Graf <address@hidden>


  Commit: 8c57b867b5d18b0d916797dfbac465b8aaa5bf5a
      
https://github.com/qemu/qemu/commit/8c57b867b5d18b0d916797dfbac465b8aaa5bf5a
  Author: Alexander Graf <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c

  Log Message:
  -----------
  PPC: spapr: Rework VGA select logic

When selecting our VGA adapter, we want to:

  * fail completely when we can't satisfy the user's request
  * support -nographic where no VGA adapter should be spawned

This patch reworks the logic so we fulfill the two conditions above.

Signed-off-by: Alexander Graf <address@hidden>


  Commit: 3fc5acdeedfcea7c7d86040fa427ae785920b399
      
https://github.com/qemu/qemu/commit/3fc5acdeedfcea7c7d86040fa427ae785920b399
  Author: Alexander Graf <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c
    M hw/spapr.h

  Log Message:
  -----------
  PPC: spapr: Remove global variable

Global variables are bad. Let's move spapr_has_graphics into the
machine state struct.

Signed-off-by: Alexander Graf <address@hidden>


  Commit: 03332579b81ef7f2b0fcb41e45f7764a5bfc1ea4
      
https://github.com/qemu/qemu/commit/03332579b81ef7f2b0fcb41e45f7764a5bfc1ea4
  Author: Benjamin Herrenschmidt <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M pc-bios/README
    M pc-bios/slof.bin
    M roms/SLOF

  Log Message:
  -----------
  pseries: Update SLOF

This patch updates the SLOF version, introducing a number of fixes:
 * add proper graphics support
 * fix bugs with graphical terminal under grub2
 * fix bugs in handling of 64-bit unit addresses
 * fix VSCSI representation to be closer to PowerVM
 * fix bugs which caused grub2 to crash

Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: c9f709d2e7d9dcc6e6ecbee8d499b4b14b11320b
      
https://github.com/qemu/qemu/commit/c9f709d2e7d9dcc6e6ecbee8d499b4b14b11320b
  Author: David Gibson <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c

  Log Message:
  -----------
  pseries: Remove extraneous prints

The pseries machine prints several messages to stderr whenever it starts up
and another whenever the vm is reset.  It's not normal for qemu machines to
do this though, so this patch removes them.  We can put them back
conditional on a DEBUG symbol if we really need them in future.

Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: a307d59434ba78b97544b42b8cfd24a1b62e39a6
      
https://github.com/qemu/qemu/commit/a307d59434ba78b97544b42b8cfd24a1b62e39a6
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c
    M hw/spapr.h
    M hw/spapr_llan.c
    M hw/spapr_pci.c
    M hw/spapr_pci.h
    M hw/spapr_vio.c
    M hw/spapr_vio.h
    M hw/spapr_vty.c
    M hw/xics.c
    M hw/xics.h

  Log Message:
  -----------
  pseries: Rework irq assignment to avoid carrying qemu_irqs around

Currently, the interfaces in the pseries machine code for assignment
and setup of interrupts pass around qemu_irq objects.  That was done
in an attempt not to be too closely linked to the specific XICS
interrupt controller.  However interactions with the device tree setup
made that attempt rather futile, and XICS is part of the PAPR spec
anyway, so this really just meant we had to carry both the qemu_irq
pointers and the XICS irq numbers around.

This mess will just get worse when we add upcoming PCI MSI support,
since that will require tracking a bunch more interrupt.  Therefore,
this patch reworks the spapr code to just use XICS irq numbers
(roughly equivalent to GSIs on x86) and only retrieve the qemu_irq
pointers from the XICS code when we need them (a trivial lookup).

This is a reworked and generalized version of an earlier spapr_pci
specific patch from Alexey Kardashevskiy.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
[agraf: fix checkpath warning]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: fa28f71b4a88cdb796f1e0a308205c6be604d3f3
      
https://github.com/qemu/qemu/commit/fa28f71b4a88cdb796f1e0a308205c6be604d3f3
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c
    M hw/spapr_pci.c
    M hw/spapr_pci.h

  Log Message:
  -----------
  pseries: Separate PCI RTAS setup from common from emulation specific PCI setup

Currently the RTAS functions for handling PCI are registered from the
class init code for the PCI host bridge.  That sort of makes sense
now, but will break in the future when vfio gives us multiple types of
host bridge for pseries (emulated and pass-through, at least).  The
RTAS functions will be common across all host bridge types (and will
call out to different places internally depending on the type).

So, this patch moves the RTAS registration into its own function
called direct from the machine setup code.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: f4b9523ba6388f6f951933de3f9a76e2e9ea2ede
      
https://github.com/qemu/qemu/commit/f4b9523ba6388f6f951933de3f9a76e2e9ea2ede
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c
    M hw/spapr.h

  Log Message:
  -----------
  pseries: added allocator for a block of IRQs

The patch adds a simple helper which allocates a consecutive sequence
of IRQs calling spapr_allocate_irq for each and checks that allocated
IRQs go consequently.

The patch is required for upcoming support of MSI/MSIX on POWER.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 9894c5d4b467d24e281c22f2f5e24822c9b55fb3
      
https://github.com/qemu/qemu/commit/9894c5d4b467d24e281c22f2f5e24822c9b55fb3
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr_pci.c

  Log Message:
  -----------
  pseries: Export find_phb() utility function for PCI code

The pseries PCI code makes use of an internal find_dev() function which
locates a PCIDevice * given a (platform specific) bus ID and device
address.  Internally this needs to first locate the host bridge on which
the device resides based on the bus ID.  This patch exposes that host
bridge lookup as a separate function, which we will need later in the MSI
and VFIO code.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
[agraf: drop trace.h inclusion]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: a2950fb6e795e3e10fed35d347a7aa28a44be2ff
      
https://github.com/qemu/qemu/commit/a2950fb6e795e3e10fed35d347a7aa28a44be2ff
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr_pci.c
    M trace-events

  Log Message:
  -----------
  pseries: Add trace event for PCI irqs

This adds a trace event in the pseries PCI specific set_irq() function to
assist in debugging.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
[agraf: add trace.h include]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 0ee2c058a3fe485b8901186179102e251a33d082
      
https://github.com/qemu/qemu/commit/0ee2c058a3fe485b8901186179102e251a33d082
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.c
    M hw/spapr_pci.c
    M hw/spapr_pci.h
    M trace-events

  Log Message:
  -----------
  pseries: Add PCI MSI/MSI-X support

This patch implements MSI and MSI-X support for the pseries PCI host
bridge.  To do this it adds:

 * A "config_space_address to msi_table" map, since the MSI RTAS calls
take a PCI config space address as an identifier.

 * A MSIX memory region to catch msi_notify()/msix_notiry() from
virtio-pci and pass them to the guest via qemu_irq_pulse().

 * RTAS call "ibm,change-msi" which sets up MSI vectors for a
device. Note that this call may configure and return lesser number of
vectors than requested.

 * RTAS call "ibm,query-interrupt-source-number" which translates MSI
vector to interrupt controller (XICS) IRQ number.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
[agraf: fix error case ndev < 0]
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 5c4cbcf26ca9465a36fc0661b4103d55897e1a19
      
https://github.com/qemu/qemu/commit/5c4cbcf26ca9465a36fc0661b4103d55897e1a19
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/spapr.h
    M hw/spapr_iommu.c
    M hw/spapr_pci.c
    M hw/spapr_pci.h
    M hw/spapr_vio.c

  Log Message:
  -----------
  pseries dma: DMA window params added to PHB and DT population changed

Previously the only PCI bus supported was the emulated PCI bus with
fixed DMA window with start at 0 and size 1GB. As we are going to support
PCI pass through which DMA window properties are set by the host
kernel, we have to support DMA windows with parameters other than default.

This patch adds:

1. DMA window properties to sPAPRPHBState: LIOBN (bus id), start,
size of the window.

2. An additional function spapr_dma_dt() to populate DMA window
properties in the device tree which simply accepts all the parameters
and does not try to guess what kind of IOMMU is given to it.
The original spapr_dma_dt() is renamed to spapr_tcet_dma_dt().

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 4504068723bcf9a3b37f6683d87711b6c5e4c0c3
      
https://github.com/qemu/qemu/commit/4504068723bcf9a3b37f6683d87711b6c5e4c0c3
  Author: David Gibson <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M pc-bios/README
    M pc-bios/slof.bin
    M roms/SLOF

  Log Message:
  -----------
  pseries: Update SLOF firmware image

This updates SLOF to handle the necessary device tree properties for MSI
and MSI-X.

Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 3e77223293bcb9277f7b760b88f694f097f29c33
      
https://github.com/qemu/qemu/commit/3e77223293bcb9277f7b760b88f694f097f29c33
  Author: Bharat Bhushan <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/openpic.c

  Log Message:
  -----------
  openpic: Added BRR1 register

Linux mpic driver uses (changes may be in pipeline to get upstreamed soon)
BRR1. This patch adds the support to emulate readonly FSL BRR1 register.

Currently QEMU does not fully emulate any version on MPIC, so the MPIC
Major number and Minor number are set to 0.

Signed-off-by: Bharat Bhushan <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: 0d16fdd732d1b211842fa96b7c90ddf9e6bde0e4
      
https://github.com/qemu/qemu/commit/0d16fdd732d1b211842fa96b7c90ddf9e6bde0e4
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M hw/alpha_pci.c
    M hw/cirrus_vga.c
    M hw/mips_malta.c
    M hw/openpic.c
    M hw/pc.c
    M hw/pc.h
    M hw/ppc/Makefile.objs
    A hw/ppc/e500.c
    A hw/ppc/e500.h
    A hw/ppc/e500plat.c
    A hw/ppc/mpc8544ds.c
    M hw/ppc_newworld.c
    M hw/ppc_oldworld.c
    M hw/ppc_prep.c
    R hw/ppce500_mpc8544ds.c
    M hw/spapr.c
    M hw/spapr.h
    M hw/spapr_iommu.c
    M hw/spapr_llan.c
    M hw/spapr_pci.c
    M hw/spapr_pci.h
    M hw/spapr_vio.c
    M hw/spapr_vio.h
    M hw/spapr_vty.c
    M hw/sun4u.c
    M hw/vga-pci.c
    A hw/vga-pci.h
    M hw/xics.c
    M hw/xics.h
    M pc-bios/README
    M pc-bios/slof.bin
    M roms/SLOF
    M savevm.c
    M target-ppc/kvm.c
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging

* agraf/ppc-for-upstream: (24 commits)
  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
  PPC: e500: add generic e500 platform
  PPC: e500: split mpc8544ds machine from generic e500 code
  ...


  Commit: 2b97f88c927be3ff3722497980048bc1cb7cc571
      
https://github.com/qemu/qemu/commit/2b97f88c927be3ff3722497980048bc1cb7cc571
  Author: Anthony Liguori <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M target-s390x/Makefile.objs
    M target-s390x/cpu.h
    A target-s390x/interrupt.c
    M target-s390x/kvm.c
    M target-s390x/op_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'agraf/s390-for-upstream' into staging

* agraf/s390-for-upstream:
  s390: provide interface for service interrupt/introduce interrupt.c
  s390: Fix error handling and condition code of service call


Compare: https://github.com/qemu/qemu/compare/76b64a7aa849...2b97f88c927b