hmp: fix regression of HMP device_del auto-completion master
authorMarcel Apfelbaum <marcel.a@redhat.com>
Wed, 26 Nov 2014 11:50:01 +0000 (13:50 +0200)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 27 Nov 2014 14:36:20 +0000 (14:36 +0000)
commit4cae4d5acaea23f3def84c8dc67ef5106323e5cb
tree3e9c57ce04c448aa96f0a23f08786ec84b95a30a
parent490309fcfbed9fa1ed357541f609975016a34628
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:
    <qemu-bin> -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 <marcel.a@redhat.com>
Reported-by: Gal Hammer <ghammer@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 1417002601-20799-1-git-send-email-marcel.a@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/core/qdev.c
include/hw/qdev-core.h
monitor.c