|
 |
9ae3a8 |
From 0a754547775c6fa99d339a18e07fc9bca013b3ca Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 17 Jan 2014 17:07:51 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 01/11] Revert "qdev-monitor: Fix crash when device_add is called with abstract driver"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389978479-30595-2-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56789
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 1/9] Revert "qdev-monitor: Fix crash when device_add is called with abstract driver"
|
|
|
9ae3a8 |
Bugzilla: 669524
|
|
|
9ae3a8 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This reverts commit 3e97a22728afed3c77140486ec3863eba941535b.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reverting because it makes -device nonexistant crash. Incorrect
|
|
|
9ae3a8 |
conflict resolution. I'm going to reapply the upstream commit in a
|
|
|
9ae3a8 |
place where it applies cleanly, and actually works.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qdev-monitor.c | 6 ------
|
|
|
9ae3a8 |
1 file changed, 6 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qdev-monitor.c | 6 ------
|
|
|
9ae3a8 |
1 files changed, 0 insertions(+), 6 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qdev-monitor.c b/qdev-monitor.c
|
|
|
9ae3a8 |
index 979502e..f78ff64 100644
|
|
|
9ae3a8 |
--- a/qdev-monitor.c
|
|
|
9ae3a8 |
+++ b/qdev-monitor.c
|
|
|
9ae3a8 |
@@ -477,12 +477,6 @@ DeviceState *qdev_device_add(QemuOpts *opts)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- if (object_class_is_abstract(obj)) {
|
|
|
9ae3a8 |
- qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver",
|
|
|
9ae3a8 |
- "non-abstract device type");
|
|
|
9ae3a8 |
- return NULL;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
k = DEVICE_CLASS(obj);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (!k || k->cannot_instantiate_with_device_add_yet) {
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|