Commit af44da87 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging 



Patch queue for ppc - 2014-06-16

This pull request brings a lot of fun things. Among others we have

  - e500: u-boot firmware support
  - sPAPR: magic page enablement
  - sPAPR: add "compat" CPU option to support older guests
  - sPAPR: refactorings in preparation for VFIO
  - POWER8 live migration
  - mac99: expose bus frequency
  - little endian core dump, gdb and disas support
  - new ppc64le-linux-user target
  - DFP emulation
  - bug fixes

# gpg: Signature made Mon 16 Jun 2014 12:28:32 BST using RSA key ID 03FEDC60
# gpg: Can't check signature: public key not found

* remotes/agraf/tags/signed-ppc-for-upstream: (156 commits)
  spapr_pci: Advertise MSI quota
  PPC: KVM: Make pv hcall endian agnostic
  powerpc: use float64 for frsqrte
  spapr: Add kvm-type property
  spapr: Create SPAPRMachine struct
  linux-user: Tell guest about big host page sizes
  spapr_hcall: Add address-translation-mode-on-interrupt resource in H_SET_MODE
  spapr_hcall: Split h_set_mode()
  target-ppc: Enable DABRX SPR and limit it to <=POWER7
  target-ppc: Enable PPR and VRSAVE SPRs migration
  target-ppc: Add POWER8's Event Based Branch (EBB) control SPRs
  KVM: target-ppc: Enable TM state migration
  target-ppc: Add POWER8's TM SPRs
  target-ppc: Add POWER8's MMCR2/MMCRS SPRs
  target-ppc: Enable FSCR facility check for TAR
  target-ppc: Add POWER8's FSCR SPR
  target-ppc: Add POWER8's TIR SPR
  target-ppc: Refactor class init for POWER7/8
  target-ppc: Switch POWER7/8 classes to use correct PMU SPRs
  target-ppc: Make use of gen_spr_power5p_lpar() for POWER7/8
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f2770151 9dbae977

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -28,3 +28,6 @@ 
[submodule "dtc"]

	path = dtc

	url = git://git.qemu-project.org/dtc.git

[submodule "roms/u-boot"]

	path = roms/u-boot

	url = git://git.qemu-project.org/u-boot.git

Makefile.target

+6 −0
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ obj-y += disas.o 
obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o



obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal32.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal64.o

obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal128.o



#########################################################

# Linux user emulator target

configure

+7 −0
Original line number Diff line number Diff line
@@ -4955,6 +4955,12 @@ case "$target_name" in 
    TARGET_ABI_DIR=ppc

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

  ;;

  ppc64le)

    TARGET_ARCH=ppc64

    TARGET_BASE_ARCH=ppc

    TARGET_ABI_DIR=ppc

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

  ;;

  ppc64abi32)

    TARGET_ARCH=ppc64

    TARGET_BASE_ARCH=ppc
@@ -5222,6 +5228,7 @@ for bios_file in \ 
    $source_path/pc-bios/*.dtb \

    $source_path/pc-bios/*.img \

    $source_path/pc-bios/openbios-* \

    $source_path/pc-bios/u-boot.* \

    $source_path/pc-bios/palcode-*

do

    FILES="$FILES pc-bios/`basename $bios_file`"

default-configs/ppc-linux-user.mak

+1 −0
Original line number Diff line number Diff line 
# Default configuration for ppc-linux-user

CONFIG_LIBDECNUMBER=y

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -49,3 +49,4 @@ CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) 
CONFIG_MC146818RTC=y

CONFIG_ETSEC=y

CONFIG_ISA_TESTDEV=y

CONFIG_LIBDECNUMBER=y