[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/16] qdev: Reject chardev property override
From: |
Markus Armbruster |
Subject: |
[PULL 12/16] qdev: Reject chardev property override |
Date: |
Tue, 23 Jun 2020 16:23:22 +0200 |
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>
---
hw/core/qdev-properties-system.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 6b5fc59901..2561fa09a8 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -244,6 +244,14 @@ static void set_chr(Object *obj, Visitor *v, const char
*name, void *opaque,
return;
}
+ /*
+ * TODO Should this really be an error? If no, the old value
+ * needs to be released before we store the new one.
+ */
+ if (!check_prop_still_unset(dev, name, be->chr, str, errp)) {
+ return;
+ }
+
if (!*str) {
g_free(str);
be->chr = NULL;
--
2.26.2
- [PULL 07/16] docs/qdev-device-use.txt: Update section "Default Devices", (continued)
- [PULL 07/16] docs/qdev-device-use.txt: Update section "Default Devices", Markus Armbruster, 2020/06/23
- [PULL 05/16] fdc: Open-code fdctrl_init_isa(), Markus Armbruster, 2020/06/23
- [PULL 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp, Markus Armbruster, 2020/06/23
- [PULL 10/16] qdev: Improve netdev property override error a bit, Markus Armbruster, 2020/06/23
- [PULL 08/16] blockdev: Deprecate -drive with bogus interface type, Markus Armbruster, 2020/06/23
- [PULL 02/16] iotests/172: Cover empty filename and multiple use of drives, Markus Armbruster, 2020/06/23
- [PULL 15/16] sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error, Markus Armbruster, 2020/06/23
- [PULL 04/16] fdc: Reject clash between -drive if=floppy and -global isa-fdc, Markus Armbruster, 2020/06/23
- [PULL 03/16] iotests/172: Cover -global floppy.drive=..., Markus Armbruster, 2020/06/23
- [PULL 11/16] qdev: Reject drive property override, Markus Armbruster, 2020/06/23
- [PULL 12/16] qdev: Reject chardev property override,
Markus Armbruster <=
- [PULL 16/16] sd/milkymist-memcard: Fix error API violation, Markus Armbruster, 2020/06/23
- [PULL 13/16] qdev: Make qdev_prop_set_drive() match the other helpers, Markus Armbruster, 2020/06/23
- [PULL 06/16] fdc: Deprecate configuring floppies with -global isa-fdc, Markus Armbruster, 2020/06/23
- Re: [PULL 00/16] Qdev patches for 2020-06-23, no-reply, 2020/06/23
- Re: [PULL 00/16] Qdev patches for 2020-06-23, Peter Maydell, 2020/06/25