From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWo32-0007mQ-Pf for qemu-devel@nongnu.org; Thu, 17 Oct 2013 09:55:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VWo2k-0000zs-Hf for qemu-devel@nongnu.org; Thu, 17 Oct 2013 09:55:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWo2k-0000zc-9U for qemu-devel@nongnu.org; Thu, 17 Oct 2013 09:55:14 -0400 From: armbru@redhat.com Date: Thu, 17 Oct 2013 15:55:01 +0200 Message-Id: <1382018101-6102-11-git-send-email-armbru@redhat.com> In-Reply-To: <1382018101-6102-1-git-send-email-armbru@redhat.com> References: <1382018101-6102-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] qdev: Do not let the user try to device_add when it cannot work List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, borntraeger@de.ibm.com, afaerber@suse.de, anthony@codemonkey.ws, peter.maydell@linaro.org From: Markus Armbruster Such devices have always been unavailable and omitted from the list of available devices shown by device_add help. Until commit 18b6dad silently broke the former, setting up nasty traps for unwary users, like this one: $ qemu-system-x86_64 -nodefaults -monitor stdio -display none QEMU 1.6.50 monitor - type 'help' for more information (qemu) device_add apic Segmentation fault (core dumped) I call that a regression. Fix it. Signed-off-by: Markus Armbruster --- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 36f6f09..c538fec 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -477,7 +477,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } } - if (!obj) { + if (!obj || DEVICE_CLASS(obj)->cannot_instantiate_with_device_add_yet) { qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type"); return NULL; } -- 1.8.1.4