yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From de651299014ae67b110a2abbff4a9e544b215b2b Mon Sep 17 00:00:00 2001
218e99
From: Kevin Wolf <kwolf@redhat.com>
218e99
Date: Wed, 6 Nov 2013 14:41:21 +0100
218e99
Subject: [PATCH 45/81] qdev: Do not let the user try to device_add when it cannot work
218e99
218e99
RH-Author: Kevin Wolf <kwolf@redhat.com>
218e99
Message-id: <1383748882-22831-17-git-send-email-kwolf@redhat.com>
218e99
Patchwork-id: 55542
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 16/17] qdev: Do not let the user try to device_add when it cannot work
218e99
Bugzilla: 1001216
218e99
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
218e99
Such devices have always been unavailable and omitted from the list of
218e99
available devices shown by device_add help.  Until commit 18b6dad
218e99
silently broke the former, setting up nasty traps for unwary users,
218e99
like this one:
218e99
218e99
    $ qemu-system-x86_64 -nodefaults -monitor stdio -display none
218e99
    QEMU 1.6.50 monitor - type 'help' for more information
218e99
    (qemu) device_add apic
218e99
    Segmentation fault (core dumped)
218e99
218e99
I call that a regression.  Fix it.
218e99
(cherry picked from pending upstream submission)
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
---
218e99
 qdev-monitor.c | 6 +++---
218e99
 1 file changed, 3 insertions(+), 3 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 qdev-monitor.c |    6 +++---
218e99
 1 files changed, 3 insertions(+), 3 deletions(-)
218e99
218e99
diff --git a/qdev-monitor.c b/qdev-monitor.c
218e99
index f54cb21..39d030b 100644
218e99
--- a/qdev-monitor.c
218e99
+++ b/qdev-monitor.c
218e99
@@ -477,13 +477,13 @@ DeviceState *qdev_device_add(QemuOpts *opts)
218e99
         }
218e99
     }
218e99
 
218e99
-    if (!obj) {
218e99
+    k = DEVICE_CLASS(obj);
218e99
+
218e99
+    if (!k || k->cannot_instantiate_with_device_add_yet) {
218e99
         qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type");
218e99
         return NULL;
218e99
     }
218e99
 
218e99
-    k = DEVICE_CLASS(obj);
218e99
-
218e99
     /* find bus */
218e99
     path = qemu_opt_get(opts, "bus");
218e99
     if (path != NULL) {
218e99
-- 
218e99
1.7.1
218e99