aboutsummaryrefslogtreecommitdiff
path: root/block/vdi.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-19 09:39:29 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-19 09:39:29 +0000
commit870c75b54343581edd1f03ed2035232893138749 (patch)
treec0b02db1652bda1e758bf54a05d255651a15655c /block/vdi.c
parente1e44a9916b4318e943aecd669e096222cb3eaeb (diff)
parent91c60f124e682a78c9a2ef951e8e58ebab6441d0 (diff)
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180319' into staging
ppc patch queue for 2018-03-19 This pull request supersedes the one for 2018-03-15. The only difference is one patch is removed, since it exposed some code which triggers ubsan warnings. Here's the set of accumulated patches now that we're into soft freeze. I've split new functionality into a ppc-for-2.13 branch, so this only has bugfixes. Well.. and a couple of simple cleanups to make bugfixes easier, some test improvements and a trivial change to make command line options more obvious. I think those are all acceptable for soft freeze. # gpg: Signature made Mon 19 Mar 2018 00:34:56 GMT # gpg: using RSA key 6C38CACA20D9B392 # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" # gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" # gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" # gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>" # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-2.12-20180319: target/ppc: fix tlbsync to check privilege level depending on GTSE ppc440_pcix: Change some error_report to qemu_log_mask(LOG_UNIMP, ...) hw/ppc/spapr: Allow "spapr-vlan" as NIC model name beside "ibmveth" PPC e500: Fix gap between u-boot and kernel hw/misc/macio: Mark the macio devices with user_creatable = false hw/ppc/prep: Fix implicit creation of "-drive if=scsi" devices tests/boot-serial: Check the 40p machine, too sii3112: Remove unneeded exit function Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/vdi.c')
0 files changed, 0 insertions, 0 deletions