From 4cae4d5acaea23f3def84c8dc67ef5106323e5cb Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Wed, 26 Nov 2014 13:50:01 +0200 Subject: hmp: fix regression of HMP device_del auto-completion The commits: - 6a1fa9f5 (monitor: add del completion for peripheral device) - 66e56b13 (qdev: add qdev_build_hotpluggable_device_list helper) cause a QEMU crash when trying to use HMP device_del auto-completion. It can be easily reproduced by: -enable-kvm ~/images/fedora.qcow2 -monitor stdio -device virtio-net-pci,id=vnet (qemu) device_del /home/mapfelba/git/upstream/qemu/hw/core/qdev.c:941:qdev_build_hotpluggable_device_list: Object 0x7f6ce04e4fe0 is not an instance of type device Aborted (core dumped) The root cause is qdev_build_hotpluggable_device_list going recursively over all peripherals and their children assuming all are devices. It doesn't work since PCI devices have at least on child which is a memory region (bus master). Solved by observing that all devices appear as direct children of /machine/peripheral container. No need of going recursively over all the children. Signed-off-by: Marcel Apfelbaum Reported-by: Gal Hammer Reviewed-by: Igor Mammedov Message-id: 1417002601-20799-1-git-send-email-marcel.a@redhat.com Signed-off-by: Peter Maydell --- include/hw/qdev-core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index d3a29408d4..589bbe7360 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -365,7 +365,7 @@ extern int qdev_hotplug; char *qdev_get_dev_path(DeviceState *dev); -int qdev_build_hotpluggable_device_list(Object *obj, void *opaque); +GSList *qdev_build_hotpluggable_device_list(Object *peripheral); void qbus_set_hotplug_handler(BusState *bus, DeviceState *handler, Error **errp); -- cgit v1.2.1