summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2017-08-17 16:19:16 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-08-31 11:51:16 -0500
commit9b9b4423d7c868309df4b142527310a60584b4d2 (patch)
tree3d9a8874c87cc99a228233ea19a6303298989c52
parent980e8260e6fbbea5fd068781522b241c6df4f127 (diff)
downloadqemu-9b9b4423d7c868309df4b142527310a60584b4d2.tar.gz
hw/ppc/spapr_iommu: Fix crash when removing the "spapr-tce-table" device
QEMU currently aborts unexpectedly when the user tries to add and remove a "spapr-tce-table" device: $ qemu-system-ppc64 -nographic -S -nodefaults -monitor stdio QEMU 2.9.92 monitor - type 'help' for more information (qemu) device_add spapr-tce-table,id=x (qemu) device_del x ** ERROR:qemu/qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl) Aborted (core dumped) The device should not be accessable for the users at all, it's just used internally, so mark it with user_creatable = false. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> (cherry picked from commit 1f98e55385d11da1dc0de6440e66f19d191d2a1b) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--hw/ppc/spapr_iommu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index ae30bbe30f..c818d45dc7 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -618,6 +618,8 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data)
dc->init = spapr_tce_table_realize;
dc->reset = spapr_tce_reset;
dc->unrealize = spapr_tce_table_unrealize;
+ /* Reason: This is just an internal device for handling the hypercalls */
+ dc->user_creatable = false;
QLIST_INIT(&spapr_tce_tables);