Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.8-20161028' into staging

Enterprise / Virtualization / QEMU - Peter Maydell [linaro.org] - 28 October 2016 10:31 UTC

66a77ea Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.8-20161028' into staging

.gitmodules | 3 +
MAINTAINERS | 1 +
Makefile | 2 +-
configure | 1 +
default-configs/ppc64-softmmu.mak | 1 +
docs/specs/ppc-spapr-hotplug.txt | 55 +-
hw/input/adb.c | 26 +-
hw/intc/xics.c | 99 +++-
hw/intc/xics_kvm.c | 13 +-
hw/intc/xics_spapr.c | 53 +-
hw/nvram/Makefile.objs | 1 +
hw/nvram/chrp_nvram.c | 85 ++++
hw/nvram/mac_nvram.c | 49 +-
hw/nvram/spapr_nvram.c | 6 +
hw/ppc/Makefile.objs | 4 +-
hw/ppc/pnv.c | 819 ++++++++++++++++++++++++++++++
hw/ppc/pnv_core.c | 232 +++++++++
hw/ppc/pnv_lpc.c | 471 +++++++++++++++++
hw/ppc/pnv_xscom.c | 275 ++++++++++
hw/ppc/spapr.c | 791 ++++++++++++++++++-----------
hw/ppc/spapr_cpu_core.c | 2 +-
hw/ppc/spapr_drc.c | 17 +
hw/ppc/spapr_events.c | 279 ++++++++--
hw/ppc/spapr_hcall.c | 70 ++-
hw/ppc/spapr_ovec.c | 242 +++++++++
hw/ppc/spapr_pci.c | 8 +-
hw/ppc/spapr_rtas.c | 91 ++--
hw/ppc/spapr_vio.c | 40 +-
hw/sparc/sun4m.c | 35 +-
hw/sparc64/sun4u.c | 35 +-
include/hw/nvram/chrp_nvram.h | 54 ++
include/hw/nvram/openbios_firmware_abi.h | 75 ---
include/hw/nvram/sun_nvram.h | 34 ++
include/hw/ppc/pnv.h | 129 +++++
include/hw/ppc/pnv_core.h | 50 ++
include/hw/ppc/pnv_lpc.h | 67 +++
include/hw/ppc/pnv_xscom.h | 78 +++
include/hw/ppc/spapr.h | 27 +-
include/hw/ppc/spapr_ovec.h | 67 +++
include/hw/ppc/spapr_vio.h | 6 +-
include/hw/ppc/xics.h | 11 +-
pc-bios/README | 7 +-
pc-bios/skiboot.lid | Bin 0 -> 983893 bytes
pc-bios/slof.bin | Bin 923832 -> 898232 bytes
roms/Makefile | 8 +-
roms/SLOF | 2 +-
roms/skiboot | 1 +
target-ppc/excp_helper.c | 34 +-
target-ppc/fpu_helper.c | 71 ++-
target-ppc/helper.h | 8 +
target-ppc/int_helper.c | 12 +
target-ppc/translate.c | 34 +-
target-ppc/translate/vmx-impl.inc.c | 74 +++
target-ppc/translate/vmx-ops.inc.c | 10 +-
target-ppc/translate/vsx-impl.inc.c | 83 +++
target-ppc/translate/vsx-ops.inc.c | 14 +
tests/Makefile.include | 3 +-
tests/ahci-test.c | 13 +-
tests/e1000e-test.c | 7 +-
tests/ide-test.c | 177 ++++---
tests/ivshmem-test.c | 47 +-
tests/libqos/ahci.c | 4 +-
tests/libqos/ahci.h | 7 +-
tests/libqos/libqos.c | 2 +
tests/libqos/pci-pc.c | 187 ++-----
tests/libqos/pci-spapr.c | 194 ++-----
tests/libqos/pci.c | 194 +++++--
tests/libqos/pci.h | 66 ++-
tests/libqos/usb.c | 6 +-
tests/libqos/usb.h | 2 +-
tests/libqos/virtio-mmio.c | 17 +-
tests/libqos/virtio-pci.c | 146 +++---
tests/libqos/virtio-pci.h | 2 +-
tests/libqos/virtio.c | 78 ++-
tests/libqos/virtio.h | 57 ++-
tests/libqtest.h | 10 -
tests/postcopy-test.c | 8 +-
tests/prom-env-test.c | 20 +-
tests/rtas-test.c | 1 -
tests/rtl8139-test.c | 10 +-
tests/tco-test.c | 80 +--
tests/usb-hcd-ehci-test.c | 5 +-
tests/vhost-user-test.c | 33 +-
tests/virtio-9p-test.c | 73 ++-
tests/virtio-blk-test.c | 342 ++++++-------
tests/virtio-net-test.c | 106 ++--
tests/virtio-rng-test.c | 7 +-
tests/virtio-scsi-test.c | 93 ++--
88 files changed, 5014 insertions(+), 1745 deletions(-)

Upstream: git.qemu.org

  • Share