[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 6a1a64: iotests/172: Include "info block" in
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 6a1a64: iotests/172: Include "info block" in test output |
|
Date: |
Thu, 25 Jun 2020 05:45:30 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 6a1a643301417381b1eefc324f6fe9e8cff48840
https://github.com/qemu/qemu/commit/6a1a643301417381b1eefc324f6fe9e8cff48840
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
Log Message:
-----------
iotests/172: Include "info block" in test output
The additional output demonstrates we screw up when -global isa-fdc
clashes with -drive if=floppy or its sugared forms: according to "info
qtree", only the latter backend is attached, but according to "info
block", both are. For instance:
Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2
-global isa-fdc.driveA=none0
dev: isa-fdc, id ""
[...]
driveA = ""
driveB = ""
[...]
bus: floppy-bus.0
type floppy-bus
dev: floppy, id ""
unit = 0 (0x0)
---> drive = "floppy0"
[...]
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
---> Attached to: /machine/unattached/device[15]
Removable device: not locked, tray closed
Cache mode: writeback
none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
---> Attached to: /machine/unattached/device[14]
Cache mode: writeback
/machine/unattached/device[15] is floppy, and
/machine/unattached/device[14] is isa-fdc.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-2-armbru@redhat.com>
Commit: 20171739685c77d84a5694890b4e365dc2159216
https://github.com/qemu/qemu/commit/20171739685c77d84a5694890b4e365dc2159216
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
Log Message:
-----------
iotests/172: Cover empty filename and multiple use of drives
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-3-armbru@redhat.com>
Commit: 02b83f7d7c0828bb03fe0324c0ec8388d7e711d4
https://github.com/qemu/qemu/commit/02b83f7d7c0828bb03fe0324c0ec8388d7e711d4
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
Log Message:
-----------
iotests/172: Cover -global floppy.drive=...
Use of -global to set a default backend for non-singleton devices is a
bad idea. But as long as we permit it, we better test it.
Test output demonstrates we screw up when -global floppy clashes with
-fda or with -device floppy: according to "info qtree", only the
latter backend is attached, but according to "info block", both are.
Here's the clash with -device:
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive
if=none,file=TEST_DIR/t.qcow2.2 -global floppy.drive=none0 -device
floppy,drive=none1,unit=0
dev: isa-fdc, id ""
[...]
driveA = ""
driveB = ""
[...]
bus: floppy-bus.0
type floppy-bus
dev: floppy, id ""
unit = 0 (0x0)
---> drive = "none1"
[...]
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
---> Attached to: /machine/peripheral-anon/device[0]
Cache mode: writeback
none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
---> Attached to: /machine/peripheral-anon/device[0]
Removable device: not locked, tray closed
Cache mode: writeback
/machine/peripheral-anon/device[0] is the floppy created with -device.
Test output further demonstrates the "Drive 'FOO' is already in use
because it has been automatically connected to another device" error
message can be misleading. With '-fda "" -global
floppy.drive=floppy0', it's in use because -global reuses -fda's
backend. There is no other device involved.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-4-armbru@redhat.com>
Commit: 6172e067a4f2a521ace14f7d0d88c6df76e26eab
https://github.com/qemu/qemu/commit/6172e067a4f2a521ace14f7d0d88c6df76e26eab
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/block/fdc.c
M hw/isa/isa-superio.c
M hw/sparc64/sun4u.c
M include/hw/block/fdc.h
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
Log Message:
-----------
fdc: Reject clash between -drive if=floppy and -global isa-fdc
The floppy controller devices desugar their drive properties into
floppy devices (since commit a92bd191a4 "fdc: Move qdev properties to
FloppyDrive", v2.8.0). This involves some bad magic in
fdctrl_connect_drives(), and exists for backward compatibility.
The functions for boards to create floppy controller devices
fdctrl_init_isa(), fdctrl_init_sysbus(), and sun4m_fdctrl_init()
desugar -drive if=floppy to these floppy controller drive properties.
If you use both -drive if=floppy (or its -fda / -fdb sugar) and
-global isa-fdc for the same floppy device, -global silently loses the
conflict, and both backends involved end up with the floppy device
frontend attached, as demonstrated by iotest 172 (see commit before
previous). This is wrong.
Desugar -drive if=floppy straight to floppy devices instead, with
helper fdctrl_init_drives(). The conflict now gets rejected cleanly:
first, fdctrl_connect_drives() creates the floppy for the controller's
property, then fdctrl_init_drives() attempts to create the floppy for
-drive if=floppy, but fails because the unit is already in use.
Output of iotest 172 changes in three ways:
1. The clash gets rejected.
2. In one test case, "info qtree" has the floppy devices swapped, and
"info block" has their QOM paths swapped. This is because the
floppy device for -fda now gets created after the one for -global
isa-fdc.driveB.
3. The error message for -global floppy.drive=floppy0 changes. Before
the patch, we set isa-fdc.driveA to -fda's block backend, then
create the floppy device for it, then move the backend from
isa-fdc.driveA to floppy.drive. Floppy creation fails when
applying -global floppy.drive=floppy0, because floppy0 is still
attached to isa-fdc. After the patch, we create the floppy for
-fda, then set its drive property to floppy0. Now floppy creation
succeeds, but setting the drive property fails, because -global
already set it. Yes, this is exasperatingly complicated.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-5-armbru@redhat.com>
Commit: fed2c1731c3dfdcf2d69a3ba73da01a80950bcfd
https://github.com/qemu/qemu/commit/fed2c1731c3dfdcf2d69a3ba73da01a80950bcfd
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/block/fdc.c
M hw/i386/pc.c
M include/hw/block/fdc.h
Log Message:
-----------
fdc: Open-code fdctrl_init_isa()
Helper function fdctrl_init_isa() is less than helpful: one of three
places creating "isa-fdc" devices use it. Open-code it there, and
drop the function.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-6-armbru@redhat.com>
Commit: 4a27a638e718b445648de6b27c709353551d9b44
https://github.com/qemu/qemu/commit/4a27a638e718b445648de6b27c709353551d9b44
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M docs/qdev-device-use.txt
M docs/system/deprecated.rst
M hw/block/fdc.c
M tests/qemu-iotests/172.out
Log Message:
-----------
fdc: Deprecate configuring floppies with -global isa-fdc
Deprecate
-global isa-fdc.driveA=...
-global isa-fdc.driveB=...
in favour of
-device floppy,unit=0,drive=...
-device floppy,unit=1,drive=...
Same for the other floppy controller devices.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: John Snow <jsnow@redhat.com>
Message-Id: <20200622094227.1271650-7-armbru@redhat.com>
Commit: 63d5dfbe0de3b021f285a471db632381561e1efb
https://github.com/qemu/qemu/commit/63d5dfbe0de3b021f285a471db632381561e1efb
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M docs/qdev-device-use.txt
Log Message:
-----------
docs/qdev-device-use.txt: Update section "Default Devices"
Resynchronize the table of default device suppressions with vl.c's
default_list[].
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-8-armbru@redhat.com>
Commit: a1b40bda089e39b4dfad3cea72a696eb7bdef58e
https://github.com/qemu/qemu/commit/a1b40bda089e39b4dfad3cea72a696eb7bdef58e
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M blockdev.c
M docs/system/deprecated.rst
M include/sysemu/blockdev.h
M softmmu/vl.c
Log Message:
-----------
blockdev: Deprecate -drive with bogus interface type
Drives with interface types other than if=none are for onboard
devices. Unfortunately, any such drives the board doesn't pick up can
still be used with -device, like this:
$ qemu-system-x86_64 -nodefaults -display none -S -drive
if=floppy,id=bogus,unit=7 -device ide-cd,drive=bogus -monitor stdio
QEMU 5.0.50 monitor - type 'help' for more information
(qemu) info block
bogus: [not inserted]
Attached to: /machine/peripheral-anon/device[0]
Removable device: not locked, tray closed
(qemu) info qtree
bus: main-system-bus
type System
[...]
bus: ide.1
type IDE
dev: ide-cd, id ""
---> drive = "bogus"
[...]
unit = 0 (0x0)
[...]
This kind of abuse has always worked. Deprecate it:
qemu-system-x86_64: -drive if=floppy,id=bogus,unit=7: warning: bogus
if=floppy is deprecated, use if=none
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-9-armbru@redhat.com>
Commit: 466c2983f88b75c37d8bab0d68ca1a1ae15949a1
https://github.com/qemu/qemu/commit/466c2983f88b75c37d8bab0d68ca1a1ae15949a1
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/core/qdev-properties-system.c
Log Message:
-----------
qdev: Eliminate get_pointer(), set_pointer()
We stopped using get_pointer() and set_pointer() for netdev in commit
23120b13c6 "net: don't use set/get_pointer() in set/get_netdev()"
(v2.3.0), and for chardev in commit becdfa00cf "char: replace PROP_CHR
with CharBackend" (v2.8.0). With only the drive user left, they're
not helpful anymore. Eliminate.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-10-armbru@redhat.com>
Commit: 1bc133365e39feb2a37747d47de281927ce1b853
https://github.com/qemu/qemu/commit/1bc133365e39feb2a37747d47de281927ce1b853
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/core/qdev-properties-system.c
M hw/core/qdev-properties.c
M include/hw/qdev-properties.h
Log Message:
-----------
qdev: Improve netdev property override error a bit
qdev_prop_set_netdev() fails when the property already has a non-null
value. Seems to go back to commit 30c367ed44
"qdev-properties-system.c: Allow vlan or netdev for -device, not
both", v1.7.0. Board code doesn't expect failure, and crashes:
$ qemu-system-x86_64 --nodefaults -nic user -netdev user,id=nic0 -global
e1000.netdev=nic0
Unexpected error in error_set_from_qdev_prop_error() at
/work/armbru/qemu/hw/core/qdev-properties.c:1101:
qemu-system-x86_64: Property 'e1000.netdev' doesn't take value
'__org.qemu.nic0
'
Aborted (core dumped)
-device and device_add handle the failure:
$ qemu-system-x86_64 -nodefaults -netdev user,id=net0 -netdev user,id=net1
-device e1000,netdev=net0,netdev=net1
qemu-system-x86_64: -device e1000,netdev=net0,netdev=net1: Property
'e1000.netdev' doesn't take value 'net1'
$ qemu-system-x86_64 -nodefaults -S -display none -monitor stdio -netdev
user,id=net0 -netdev user,id=net1 -global e1000.netdev=net0
QEMU 5.0.50 monitor - type 'help' for more information
(qemu) qemu-system-x86_64: warning: netdev net0 has no peer
qemu-system-x86_64: warning: netdev net1 has no peer
device_add e1000,netdev=net1
Error: Property 'e1000.netdev' doesn't take value 'net1'
Perhaps netdev property override could be made to work. Perhaps it
should. I'm not the right guy to figure this out. What I can do is
improve the error message a bit:
(qemu) device_add e1000,netdev=net1
Error: -global e1000.netdev=... conflicts with netdev=net1
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-11-armbru@redhat.com>
Commit: 84b0475ced86d7e0f182f0753b23f5977fdb201e
https://github.com/qemu/qemu/commit/84b0475ced86d7e0f182f0753b23f5977fdb201e
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/core/qdev-properties-system.c
M tests/qemu-iotests/172.out
Log Message:
-----------
qdev: Reject drive property override
qdev_prop_set_drive() screws up when the property already has a
non-null value: it neglects to release the old value. Both the old
and the new backend become attached to the same device.
Example (taken from iotest 172): -fda ... -drive if=none,... -global
floppy.drive=none0.
Special case: attempting to use the same backend both times fails.
Example (also from iotest 172): -fda ... -global floppy.drive=floppy0.
Yet another example: -device with multiple drive=... (but not
device_add, which silently drops all but the last duplicate property).
Perhaps drive property override could be made to work. Perhaps it
should. I can't afford the time to figure this out now. What I can
do is reject usage that leaves backends in unhealthy states. For what
it's worth, we've long done the same for netdev properties.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-12-armbru@redhat.com>
Commit: 9572a787975fa27981cbcea5cecb8f250435dbe6
https://github.com/qemu/qemu/commit/9572a787975fa27981cbcea5cecb8f250435dbe6
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/core/qdev-properties-system.c
Log Message:
-----------
qdev: Reject chardev property override
qdev_prop_set_chr() screws up when the property already has a non-null
value: it neglects to release the old value. Both the old and the new
backend become attached to the same device. Unlike for block devices
(see previous commit), this can't be observed from the monitor (I
think).
Example: -serial null -chardev null,id=chr0 -global isa-serial.chardev=chr0
Special case: attempting to use the same backend both times crashes:
$ qemu-system-x86_64 --nodefaults -serial null -global
isa-serial.chardev=serial0
Unexpected error in qemu_chr_fe_init() at
/work/armbru/qemu/chardev/char-fe.c:220:
qemu-system-x86_64: Device 'serial0' is in use
Aborted (core dumped)
Yet another example: -device with multiple chardev=... (but not
device_add, which silently drops all but the last duplicate property).
Perhaps chardev property override could be made to work. Perhaps it
should. I can't afford the time to figure this out now. What I can
do reject usage that leaves backends in unhealthy states. For what
it's worth, we've long done the same for netdev properties.
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-13-armbru@redhat.com>
Commit: 934df912966683b942840f67b9d1a07c8cfea102
https://github.com/qemu/qemu/commit/934df912966683b942840f67b9d1a07c8cfea102
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/arm/aspeed.c
M hw/arm/cubieboard.c
M hw/arm/exynos4210.c
M hw/arm/imx25_pdk.c
M hw/arm/mcimx6ul-evk.c
M hw/arm/mcimx7d-sabre.c
M hw/arm/msf2-som.c
M hw/arm/nseries.c
M hw/arm/orangepi.c
M hw/arm/raspi.c
M hw/arm/sabrelite.c
M hw/arm/vexpress.c
M hw/arm/xilinx_zynq.c
M hw/arm/xlnx-versal-virt.c
M hw/arm/xlnx-zcu102.c
M hw/block/fdc.c
M hw/block/nand.c
M hw/block/pflash_cfi01.c
M hw/block/pflash_cfi02.c
M hw/core/qdev-properties-system.c
M hw/ide/qdev.c
M hw/m68k/q800.c
M hw/microblaze/petalogix_ml605_mmu.c
M hw/ppc/pnv.c
M hw/ppc/spapr.c
M hw/scsi/scsi-bus.c
M hw/sd/milkymist-memcard.c
M hw/sd/pxa2xx_mmci.c
M hw/sd/sd.c
M hw/sd/ssi-sd.c
M hw/xtensa/xtfpga.c
M include/hw/qdev-properties.h
Log Message:
-----------
qdev: Make qdev_prop_set_drive() match the other helpers
qdev_prop_set_drive() can fail. None of the other qdev_prop_set_FOO()
can; they abort on error.
To clean up this inconsistency, rename qdev_prop_set_drive() to
qdev_prop_set_drive_err(), and create a qdev_prop_set_drive() that
aborts on error.
Coccinelle script to update callers:
@ depends on !(file in "hw/core/qdev-properties-system.c")@
expression dev, name, value;
symbol error_abort;
@@
- qdev_prop_set_drive(dev, name, value, &error_abort);
+ qdev_prop_set_drive(dev, name, value);
@@
expression dev, name, value, errp;
@@
- qdev_prop_set_drive(dev, name, value, errp);
+ qdev_prop_set_drive_err(dev, name, value, errp);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-14-armbru@redhat.com>
Commit: c20b4ccce017bc6ac62617b458367f6a1de9afb5
https://github.com/qemu/qemu/commit/c20b4ccce017bc6ac62617b458367f6a1de9afb5
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/arm/aspeed.c
Log Message:
-----------
arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp
We always pass &error_abort. Drop the parameter, use &error_abort
directly.
Cc: Cédric Le Goater <clg@kaod.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-15-armbru@redhat.com>
Commit: 17d26ac61ee637a38d58b7053fdd1695ea2b7bc9
https://github.com/qemu/qemu/commit/17d26ac61ee637a38d58b7053fdd1695ea2b7bc9
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/sd/pxa2xx_mmci.c
Log Message:
-----------
sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error
On error, pxa2xx_mmci_init() reports to stderr and returns NULL.
Callers don't check for errors. Machines akita, borzoi, mainstone,
spitz, terrier, tosa, and z2 crash shortly after, like this:
$ qemu-system-aarch64 -M akita -drive if=sd,readonly=on
qemu-system-aarch64: failed to init SD card: Cannot use read-only drive as
SD card
Segmentation fault (core dumped)
Machines connex and verdex reach the check for orphaned drives first:
$ aarch64-softmmu/qemu-system-aarch64 -M connex -drive if=sd,readonly=on
-accel qtest
qemu-system-aarch64: failed to init SD card: Cannot use read-only drive as
SD card
qemu-system-aarch64: -drive if=sd,readonly=on: machine type does not
support if=sd,bus=0,unit=0
Make pxa2xx_mmci_init() fail cleanly right away.
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-16-armbru@redhat.com>
Commit: 953cd66139b6e28fdc7cdbf28065a0a98ce7877c
https://github.com/qemu/qemu/commit/953cd66139b6e28fdc7cdbf28065a0a98ce7877c
Author: Markus Armbruster <armbru@redhat.com>
Date: 2020-06-23 (Tue, 23 Jun 2020)
Changed paths:
M hw/sd/milkymist-memcard.c
Log Message:
-----------
sd/milkymist-memcard: Fix error API violation
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
milkymist_memcard_realize() is wrong that way: it passes &err to
qdev_prop_set_drive_err() and qdev_realize_and_unref(). Currently
harmless, because the latter uses it only as first argument of
error_propagate().
Making qdev_prop_set_drive_err() fail involves abuse of -global.
Leave handling that to qdev_prop_set_drive(), like we do elsewhere.
Cc: Michael Walle <michael@walle.cc>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200622094227.1271650-17-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit: 0250c595c9dd61221515221e92737422c75dd38b
https://github.com/qemu/qemu/commit/0250c595c9dd61221515221e92737422c75dd38b
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-06-25 (Thu, 25 Jun 2020)
Changed paths:
M blockdev.c
M docs/qdev-device-use.txt
M docs/system/deprecated.rst
M hw/arm/aspeed.c
M hw/arm/cubieboard.c
M hw/arm/exynos4210.c
M hw/arm/imx25_pdk.c
M hw/arm/mcimx6ul-evk.c
M hw/arm/mcimx7d-sabre.c
M hw/arm/msf2-som.c
M hw/arm/nseries.c
M hw/arm/orangepi.c
M hw/arm/raspi.c
M hw/arm/sabrelite.c
M hw/arm/vexpress.c
M hw/arm/xilinx_zynq.c
M hw/arm/xlnx-versal-virt.c
M hw/arm/xlnx-zcu102.c
M hw/block/fdc.c
M hw/block/nand.c
M hw/block/pflash_cfi01.c
M hw/block/pflash_cfi02.c
M hw/core/qdev-properties-system.c
M hw/core/qdev-properties.c
M hw/i386/pc.c
M hw/ide/qdev.c
M hw/isa/isa-superio.c
M hw/m68k/q800.c
M hw/microblaze/petalogix_ml605_mmu.c
M hw/ppc/pnv.c
M hw/ppc/spapr.c
M hw/scsi/scsi-bus.c
M hw/sd/milkymist-memcard.c
M hw/sd/pxa2xx_mmci.c
M hw/sd/sd.c
M hw/sd/ssi-sd.c
M hw/sparc64/sun4u.c
M hw/xtensa/xtfpga.c
M include/hw/block/fdc.h
M include/hw/qdev-properties.h
M include/sysemu/blockdev.h
M softmmu/vl.c
M tests/qemu-iotests/172
M tests/qemu-iotests/172.out
Log Message:
-----------
Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2020-06-23' into
staging
Qdev patches for 2020-06-23
# gpg: Signature made Tue 23 Jun 2020 15:08:28 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qdev-2020-06-23:
sd/milkymist-memcard: Fix error API violation
sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error
arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp
qdev: Make qdev_prop_set_drive() match the other helpers
qdev: Reject chardev property override
qdev: Reject drive property override
qdev: Improve netdev property override error a bit
qdev: Eliminate get_pointer(), set_pointer()
blockdev: Deprecate -drive with bogus interface type
docs/qdev-device-use.txt: Update section "Default Devices"
fdc: Deprecate configuring floppies with -global isa-fdc
fdc: Open-code fdctrl_init_isa()
fdc: Reject clash between -drive if=floppy and -global isa-fdc
iotests/172: Cover -global floppy.drive=...
iotests/172: Cover empty filename and multiple use of drives
iotests/172: Include "info block" in test output
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/27c77b1f5532...0250c595c9dd
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 6a1a64: iotests/172: Include "info block" in test output,
Peter Maydell <=