Michael Roth c645d5acee monitor: fix object_del for command-line-created objects ... Currently objects specified on the command-line are only partially cleaned up when 'object_del' is issued in either HMP or QMP: the object itself is fully finalized, but the QemuOpts are not removed. This results in the following behavior: x86_64-softmmu/qemu-system-x86_64 -monitor stdio \ -object memory-backend-ram,id=ram1,size=256M QEMU 2.7.91 monitor - type 'help' for more information (qemu) object_del ram1 (qemu) object_del ram1 object 'ram1' not found (qemu) object_add memory-backend-ram,id=ram1,size=256M Duplicate ID 'ram1' for object Try "help object_add" for more information which can be an issue for use-cases like memory hotplug. This happens on the HMP side because hmp_object_add() attempts to create a temporary QemuOpts entry with ID 'ram1', which ends up conflicting with the command-line-created entry, since it was never cleaned up during the previous hmp_object_del() call. We address this by adding a check in user_creatable_del(), which is called by both qmp_object_del() and hmp_object_del() to handle the actual object cleanup, to determine whether an option group entry matching the object's ID is present and removing it if it is. Note that qmp_object_add() never attempts to create a temporary QemuOpts entry, so it does not encounter the duplicate ID error, which is why this isn't generally visible in libvirt. Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: Markus Armbruster <armbru@redhat.com> Cc: Eric Blake <eblake@redhat.com> Cc: Daniel Berrange <berrange@redhat.com> Cc: qemu-stable@nongnu.org Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1496531612-22166-3-git-send-email-mdroth@linux.vnet.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>		2017-06-06 09:29:46 +02:00
..
acpi-test-data	acpi-test: update expected files	2017-05-29 03:07:57 +03:00
data
docker	docker/dockerfiles/debian-s390-cross: include clang	2017-03-10 15:05:22 +08:00
guest-debug
image-fuzzer
libqos	tests: fix virtio-blk-test leaks	2017-03-01 11:58:57 +04:00
migration
multiboot
qapi-schema	qapi: Reject alternates that can't work with keyval_parse()	2017-05-31 16:04:09 +02:00
qemu-iotests	Block layer patches	2017-05-30 14:15:15 +01:00
rocker
tcg	target/openrisc: Rename the cpu from or32 to or1k	2017-02-14 08:14:58 +11:00
vmstate-static-checker-data
.gitignore	tests: Ignore another built executable (test-hmp)	2017-05-10 10:19:24 +03:00
ac97-test.c
acpi-utils.c	tests: Move reusable ACPI code into a utility file	2017-03-02 07:14:27 +02:00
acpi-utils.h	hw/i386: Use Rev3 FADT (ACPI 2.0) instead of Rev1 to improve guest OS support.	2017-05-03 12:29:40 +02:00
ahci-test.c
atomic_add-bench.c
bios-tables-test.c	pci, virtio, vhost: fixes	2017-05-18 10:01:08 +01:00
boot-order-test.c
boot-sector.c
boot-sector.h
boot-serial-test.c	boot-serial-test: use -no-shutdown	2017-03-24 13:39:50 +00:00
check-block.sh
check-qdict.c	qobject: Use simpler QDict/QList scalar insertion macros	2017-05-09 09:13:51 +02:00
check-qfloat.c
check-qint.c
check-qjson.c	check-qjson: Test errors from qobject_from_json()	2017-03-07 16:07:47 +01:00
check-qlist.c	qobject: Use simpler QDict/QList scalar insertion macros	2017-05-09 09:13:51 +02:00
check-qnull.c	qapi: Drop unused non-strict qobject input visitor	2017-03-05 09:14:19 +01:00
check-qom-interface.c
check-qom-proplist.c	monitor: fix object_del for command-line-created objects	2017-06-06 09:29:46 +02:00
check-qstring.c
crypto-tls-x509-helpers.c
crypto-tls-x509-helpers.h
device-introspect-test.c	qobject: Use simpler QDict/QList scalar insertion macros	2017-05-09 09:13:51 +02:00
display-vga-test.c	qtest: add display-vga-test to ppc64	2017-01-31 10:10:13 +11:00
drive_del-test.c	tests: Use null-co:// instead of /dev/null as the dummy image	2017-05-11 11:08:40 +02:00
ds1338-test.c
e1000-test.c	tests: fix e1000-test leak	2017-03-01 11:51:28 +04:00
e1000e-test.c	tests: fix e1000e leaks	2017-03-01 11:51:28 +04:00
eepro100-test.c	tests: fix eepro100-test leak	2017-03-01 11:51:05 +04:00
endianness-test.c	tests: fix endianness-test leaks	2017-03-01 00:09:28 +04:00
es1370-test.c
fdc-test.c	fdc-test: Avoid deprecated 'change' command	2017-05-09 09:14:40 +02:00
fw_cfg-test.c
hd-geo-test.c	tests: fix hd-geo-test leaks	2017-03-01 11:51:04 +04:00
i440fx-test.c	tests: fix i440fx-test leaks	2017-03-01 11:51:28 +04:00
i82801b11-test.c
ide-test.c	ide-test: check return of fwrite	2017-06-04 18:42:55 +03:00
intel-hda-test.c
io-channel-helpers.c
io-channel-helpers.h
ioh3420-test.c
iothread.c	aio: introduce aio_co_schedule and aio_co_wake	2017-02-21 11:14:07 +00:00
iothread.h	aio: introduce aio_co_schedule and aio_co_wake	2017-02-21 11:14:07 +00:00
ipmi-bt-test.c	tests: fix ipmi-bt-test leak	2017-03-01 11:51:05 +04:00
ipmi-kcs-test.c	tests: fix ipmi-kcs-test leak	2017-03-01 11:51:05 +04:00
ipoctal232-test.c
ivshmem-test.c	qtest: add ivshmem-test for ppc64	2017-01-31 10:10:13 +11:00
libqtest.c	tests/libqtest: Print error instead of aborting when env variable is missing	2017-06-04 18:42:55 +03:00
libqtest.h	libqtest: Add a generic function to run a callback function for every machine	2017-04-26 14:42:31 +01:00
m25p80-test.c	aspeed/smc: extend tests for Command mode	2017-01-20 11:15:08 +00:00
m48t59-test.c
Makefile.include	qapi: Reject alternates that can't work with keyval_parse()	2017-05-31 16:04:09 +02:00
ne2000-test.c
numa-test.c	numa-test: fix query-cpus leaks	2017-05-30 16:09:48 -03:00
nvme-test.c	tests: Use null-co:// instead of /dev/null as the dummy image	2017-05-11 11:08:40 +02:00
pc-cpu-test.c	libqtest: Add a generic function to run a callback function for every machine	2017-04-26 14:42:31 +01:00
pcnet-test.c
pkix_asn1_tab.c
pnv-xscom-test.c	powernv: Don't test POWER9 CPU yet	2017-03-03 11:30:59 +11:00
postcopy-test.c	chardev: move headers to include/chardev	2017-06-02 11:33:52 +04:00
prom-env-test.c	tests/prom-env: Enable the test for the sun4u machine, too	2017-02-28 09:03:39 +03:00
ptimer-test-stubs.c	tests: fix ptimer leaks	2017-03-01 00:09:28 +04:00
ptimer-test.c	tests: fix ptimer leaks	2017-03-01 00:09:28 +04:00
ptimer-test.h
pvpanic-test.c	tests: fix qmp response leak	2017-03-01 00:09:28 +04:00
pxe-test.c
q35-test.c	tests: fix q35-test leaks	2017-03-01 11:50:33 +04:00
qemu-iotests-quick.sh
qht-bench.c
qmp-test.c	qapi: Drop unused non-strict qobject input visitor	2017-03-05 09:14:19 +01:00
qom-test.c	libqtest: Add a generic function to run a callback function for every machine	2017-04-26 14:42:31 +01:00
rcutorture.c
rtas-test.c
rtc-test.c
rtl8139-test.c
spapr-phb-test.c
tco-test.c	tests: fix tco-test leaks	2017-03-01 11:51:25 +04:00
test-aio-multithread.c	cpus: define QEMUTimerListNotifyCB for QEMU system emulation	2017-03-14 13:28:29 +01:00
test-aio.c	cpus: define QEMUTimerListNotifyCB for QEMU system emulation	2017-03-14 13:28:29 +01:00
test-arm-mptimer.c
test-base64.c
test-bitcnt.c
test-bitops.c
test-blockjob-txn.c	blockjob: strengthen a bit test-blockjob-txn	2017-05-24 16:38:51 -04:00
test-blockjob.c	blockjob: introduce block_job_early_fail	2017-05-24 16:38:51 -04:00
test-bufferiszero.c
test-char.c	char: make chr_fe_deinit() optionaly delete backend	2017-06-02 11:33:53 +04:00
test-clone-visitor.c	tests/qapi-schema: Avoid 'str' in alternate test cases	2017-05-31 16:04:05 +02:00
test-coroutine.c
test-crypto-afsplit.c
test-crypto-block.c	crypto: move 'opaque' parameter to (nearly) the end of parameter list	2017-05-09 14:41:47 +01:00
test-crypto-cipher.c
test-crypto-hash.c
test-crypto-hmac.c
test-crypto-ivgen.c
test-crypto-pbkdf.c
test-crypto-secret.c
test-crypto-tlscredsx509.c
test-crypto-tlssession.c
test-crypto-xts.c
test-cutils.c	util/cutils: Change qemu_strtosz*() from int64_t to uint64_t	2017-02-23 20:35:36 +01:00
test-filter-mirror.c	tests: fix qmp response leak	2017-03-01 00:09:28 +04:00
test-filter-redirector.c	tests: fix qmp response leak	2017-03-01 00:09:28 +04:00
test-hbitmap.c	test-hbitmap: Add hbitmap_is_serializable() calls	2017-01-26 10:25:01 +08:00
test-hmp.c	tests: Add a tester for HMP commands	2017-04-26 14:42:31 +01:00
test-int128.c
test-io-channel-buffer.c
test-io-channel-command.c	tests: fix leaks in test-io-channel-command	2017-03-01 00:09:28 +04:00
test-io-channel-file.c
test-io-channel-socket.c	sockets: Limit SocketAddressLegacy to external interfaces	2017-05-09 09:14:40 +02:00
test-io-channel-tls.c	io: change the QIOTask callback signature	2017-01-23 15:32:18 +00:00
test-io-task.c	io: fix possible double free of task error object	2017-01-26 10:26:18 +00:00
test-iov.c
test-keyval.c	qapi: Reject alternates that can't work with keyval_parse()	2017-05-31 16:04:09 +02:00
test-logging.c
test-mul64.c
test-netfilter.c
test-opts-visitor.c	qapi: Fix QemuOpts visitor regression on unvisited input	2017-03-22 19:24:34 +01:00
test-qapi-util.c	qapi: New parse_qapi_name()	2017-03-07 16:07:47 +01:00
test-qdev-global-props.c
test-qdist.c
test-qemu-opts.c	qobject: Use simpler QDict/QList scalar insertion macros	2017-05-09 09:13:51 +02:00
test-qga.c	test-qga: Actually test 0xff sync bytes	2017-05-09 09:14:40 +02:00
test-qht-par.c
test-qht.c
test-qmp-commands.c	qobject: Use simpler QDict/QList scalar insertion macros	2017-05-09 09:13:51 +02:00
test-qmp-event.c	qobject: Use simpler QDict/QList scalar insertion macros	2017-05-09 09:13:51 +02:00
test-qobject-input-visitor.c	tests/qapi-schema: Avoid 'str' in alternate test cases	2017-05-31 16:04:05 +02:00
test-qobject-output-visitor.c	tests/qapi-schema: Avoid 'str' in alternate test cases	2017-05-31 16:04:05 +02:00
test-rcu-list.c
test-replication.c	tests: Disable image lock in test-replication	2017-05-11 11:08:41 +02:00
test-shift128.c	host-utils: Implement unsigned quadword left/right shift and unit tests	2017-01-31 10:10:14 +11:00
test-string-input-visitor.c	qapi: Fix string input visitor regression for empty lists	2017-03-21 10:43:01 +01:00
test-string-output-visitor.c
test-thread-pool.c	test-thread-pool: use generic AioContext infrastructure	2017-02-21 11:14:07 +00:00
test-throttle.c	throttle: make throttle_config(throttle_get_config()) symmetric	2017-04-21 10:36:12 +01:00
test-timed-average.c
test-uuid.c
test-visitor-serialization.c	test-visitor-serialization: Pass &error_abort to qobject_from_json()	2017-03-07 16:07:47 +01:00
test-vmstate.c	migration: Split qemu-file.h	2017-06-01 18:49:22 +02:00
test-write-threshold.c
test-x86-cpuid-compat.c	tests: Add [+-]feature and feature=on|off test cases	2017-05-17 10:37:15 -03:00
test-x86-cpuid.c
test-xbzrle.c	migration: Create migration/xbzrle.h	2017-05-18 18:04:54 +02:00
tmp105-test.c
tpci200-test.c
usb-hcd-ehci-test.c	tests: fix usb-test leaks	2017-03-01 11:51:29 +04:00
usb-hcd-ohci-test.c
usb-hcd-uhci-test.c	tests: Use null-co:// instead of /dev/null as the dummy image	2017-05-11 11:08:40 +02:00
usb-hcd-xhci-test.c	tests: Use null-co:// instead of /dev/null as the dummy image	2017-05-11 11:08:40 +02:00
vhost-user-bridge.c
vhost-user-test.c	char: make chr_fe_deinit() optionaly delete backend	2017-06-02 11:33:53 +04:00
virtio-9p-test.c	tests/virtio-9p-test: Don't call le*_to_cpus on fields of packed struct	2017-03-27 21:15:31 +02:00
virtio-balloon-test.c
virtio-blk-test.c	tests: Use null-co:// instead of /dev/null as the dummy image	2017-05-11 11:08:40 +02:00
virtio-console-test.c
virtio-net-test.c
virtio-rng-test.c
virtio-scsi-test.c	virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk	2017-06-06 08:46:21 +02:00
virtio-serial-test.c
vmxnet3-test.c
wdt_ib700-test.c