Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: d0f17aba759ba6a969d811db3f4f509e36467bcd
https://github.com/qemu/qemu/commit/d0f17aba759ba6a969d811db3f4f509e36467bcd
Author: BALATON Zoltan <bala...@eik.bme.hu>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M hw/ide/sii3112.c
Log Message:
-----------
sii3112: Remove unneeded exit function
An exit function was mistakenly left here but it's not needed because
the PCI bars are organised differently in this device. Calling this
exit function during device_del was causing an abort with
memory_region_del_subregion: `Assertion subregion->container == mr' failed.
Reported-by: Thomas Huth <th...@redhat.com>
Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: d7d15a6e34cb6750686c5cdd9bfbd39cad16f567
https://github.com/qemu/qemu/commit/d7d15a6e34cb6750686c5cdd9bfbd39cad16f567
Author: Thomas Huth <th...@redhat.com>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M tests/boot-serial-test.c
Log Message:
-----------
tests/boot-serial: Check the 40p machine, too
The "40p" machine is using the Open Hack'Ware BIOS, just like the "prep"
machine, so we can test it accordingly with the boot-serial tester, too.
While we're at it, also change the strings that we are using for the
"prep" machine, so that this test now also checks some CLI parameters.
Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Hervé Poussineau <hpous...@reactos.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: b891538e81d33e59e1df9ce489e7118b7a1e7857
https://github.com/qemu/qemu/commit/b891538e81d33e59e1df9ce489e7118b7a1e7857
Author: Thomas Huth <th...@redhat.com>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M hw/ppc/prep.c
M hw/scsi/lsi53c895a.c
M include/hw/pci/pci.h
Log Message:
-----------
hw/ppc/prep: Fix implicit creation of "-drive if=scsi" devices
The global hack for creating SCSI devices has recently been removed,
but this apparently broke SCSI devices on some boards that were not
ready for this change yet. For the 40p machine you now get:
$ ppc64-softmmu/qemu-system-ppc64 -M 40p -cdrom x.iso
qemu-system-ppc64: -cdrom x.iso: machine type does not support
if=scsi,bus=0,unit=2
Fix it by providing a lsi53c810_create() function that takes care
of calling scsi_bus_legacy_handle_cmdline() after creating the
corresponding SCSI controller.
Fixes: 1454509726719e0933c800fad00d6999752688ea
Signed-off-by: Thomas Huth <th...@redhat.com>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: 1ca15d85ab0d2a53f86a16b75468633938467cd8
https://github.com/qemu/qemu/commit/1ca15d85ab0d2a53f86a16b75468633938467cd8
Author: Thomas Huth <th...@redhat.com>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M hw/misc/macio/macio.c
Log Message:
-----------
hw/misc/macio: Mark the macio devices with user_creatable = false
The macio devices currently cause a crash when the user tries to
instantiate them on a different machine:
$ ppc64-softmmu/qemu-system-ppc64 -device macio-newworld
Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:222:
qemu-system-ppc64: -device macio-newworld: Device 'serial0' is in use
Aborted (core dumped)
These devices are clearly not intended to be creatable by the user
since they are using serial_hds[] directly in their instance_init
function. So let's mark them with user_creatable = false.
Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: b4a5f24a172a1c35ef369a56e585e851bdb68c90
https://github.com/qemu/qemu/commit/b4a5f24a172a1c35ef369a56e585e851bdb68c90
Author: David Engraf <david.eng...@sysgo.com>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M hw/ppc/e500.c
Log Message:
-----------
PPC e500: Fix gap between u-boot and kernel
This patch moves the gap between u-boot and kernel at the correct location.
Signed-off-by: David Engraf <david.eng...@sysgo.com>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: 3c3a4e7afa742320412063f324b417f653e549cd
https://github.com/qemu/qemu/commit/3c3a4e7afa742320412063f324b417f653e549cd
Author: Thomas Huth <th...@redhat.com>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M hw/ppc/spapr.c
Log Message:
-----------
hw/ppc/spapr: Allow "spapr-vlan" as NIC model name beside "ibmveth"
With the new "--nic" command line parameter option, the "old" way of
specifying a NIC model via the nd_table[] is becoming more prominent
again. But for the pseries "spapr-vlan" device, there is a confusing
discrepancy between the model name that is used for "--device" (i.e.
"spapr-vlan") and the model name that has to be used for "--net nic"
or the new "--nic" parameter (i.e. "ibmveth"). Since "spapr-vlan" is
the "real" name of the device, let's allow "spapr-vlan" to be used
as model name for the nd_table[] entries, too.
Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Greg Kurz <gr...@kaod.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: 21a5a442aef89d617fc8e41d4d35f6aee535b8b2
https://github.com/qemu/qemu/commit/21a5a442aef89d617fc8e41d4d35f6aee535b8b2
Author: BALATON Zoltan <bala...@eik.bme.hu>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M hw/ppc/ppc440_pcix.c
Log Message:
-----------
ppc440_pcix: Change some error_report to qemu_log_mask(LOG_UNIMP, ...)
Using log unimp is more appropriate for these messages and this also
silences them by default so they won't clobber make check output when
tests are added for this board.
Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
Reviewed-by: Thomas Huth <th...@redhat.com>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: 91c60f124e682a78c9a2ef951e8e58ebab6441d0
https://github.com/qemu/qemu/commit/91c60f124e682a78c9a2ef951e8e58ebab6441d0
Author: Cédric Le Goater <c...@kaod.org>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M target/ppc/translate.c
Log Message:
-----------
target/ppc: fix tlbsync to check privilege level depending on GTSE
tlbsync also needs to check the Guest Translation Shootdown Enable
(GTSE) bit in the Logical Partition Control Register (LPCR) to
determine at which privilege level it is running.
See commit c6fd28fd573d ("target/ppc: Update tlbie to check privilege
level based on GTSE")
Signed-off-by: Cédric Le Goater <c...@kaod.org>
Reviewed-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Commit: 870c75b54343581edd1f03ed2035232893138749
https://github.com/qemu/qemu/commit/870c75b54343581edd1f03ed2035232893138749
Author: Peter Maydell <peter.mayd...@linaro.org>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M hw/ide/sii3112.c
M hw/misc/macio/macio.c
M hw/ppc/e500.c
M hw/ppc/ppc440_pcix.c
M hw/ppc/prep.c
M hw/ppc/spapr.c
M hw/scsi/lsi53c895a.c
M include/hw/pci/pci.h
M target/ppc/translate.c
M tests/boot-serial-test.c
Log Message:
-----------
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 <da...@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgib...@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgib...@ozlabs.org>"
# gpg: aka "David Gibson (kernel.org) <d...@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.mayd...@linaro.org>
Compare: https://github.com/qemu/qemu/compare/e1e44a9916b4...870c75b54343
