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