[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [qemu-xen master] hw/arm/digic: Mark device with user_creatable = false



commit de4ad17a8ed674e672c626c5e4b7e27dc82ca55e
Author:     Thomas Huth <thuth@xxxxxxxxxx>
AuthorDate: Mon Sep 4 15:21:55 2017 +0100
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Fri Sep 22 18:12:26 2017 -0500

    hw/arm/digic: Mark device with user_creatable = false
    
    QEMU currently shows some unexpected behavior when the user trys to
    do a "device_add digic" on an unrelated ARM machine like integratorcp
    in "-nographic" mode (the device_add command does not immediately
    return to the monitor prompt), and trying to "device_del" the device
    later results in a "qemu/qdev-monitor.c:872:qdev_unplug: assertion
    failed: (hotplug_ctrl)" error condition.
    Looking at the realize function of the device, it uses serial_hds
    directly and this means that the device can not be added a second
    time, so let's simply mark it with "user_creatable = false" now.
    
    Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    (cherry picked from commit f58f25599b72c7479e6a1ff67c7f671823aa14da)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/arm/digic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 94f3263..6184020 100644
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -101,6 +101,8 @@ static void digic_class_init(ObjectClass *oc, void *data)
     DeviceClass *dc = DEVICE_CLASS(oc);
 
     dc->realize = digic_realize;
+    /* Reason: Uses serial_hds in the realize function --> not usable twice */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo digic_type_info = {
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.