From: Peter Maydell Date: Wed, 27 Sep 2017 17:20:31 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20170927' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1d8934408135ac03b1c753c3b0a819cf7f387d60;p=qemu.git Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20170927' into staging ppc patch queue 2017-09-27 Contains * a number of Mac machine type fixes * a number of embedded machine type fixes (preliminary to adding the Sam460ex board) * a important fix for handling of migration with KVM PR * assorted other minor fixes and cleanups # gpg: Signature made Wed 27 Sep 2017 08:40:48 BST # gpg: using RSA key 0x6C38CACA20D9B392 # gpg: Good signature from "David Gibson " # gpg: aka "David Gibson (Red Hat) " # gpg: aka "David Gibson (ozlabs.org) " # gpg: aka "David Gibson (kernel.org) " # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-2.11-20170927: (26 commits) macio: use object link between MACIO_IDE and MAC_DBDMA object macio: pass channel into MACIOIDEState via qdev property mac_dbdma: remove DBDMA_init() function mac_dbdma: QOMify mac_dbdma: remove unused IO fields from DBDMAState spapr: fix the value of SDR1 in kvmppc_put_books_sregs() ppc/pnv: check for OPAL firmware file presence ppc: remove all unused CPU definitions ppc: remove unused CPU definitions spapr_pci: make index property mandatory macio: convert pmac_ide_ops from old_mmio ppc/pnv: Improve macro parenthesization spapr: introduce helpers to migrate HPT chunks and the end marker ppc/kvm: generalize the use of kvmppc_get_htab_fd() ppc/kvm: change kvmppc_get_htab_fd() to return -errno on error ppc: Fix OpenPIC model ppc/ide/macio: Add missing registers ppc/mac: More rework of the DBDMA emulation ppc/mac: Advertise a high clock frequency for NewWorld Macs ppc: QOMify g3beige machine ... Signed-off-by: Peter Maydell --- 1d8934408135ac03b1c753c3b0a819cf7f387d60