From patchwork Wed Oct 30 16:28:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 287283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BA1A22C03A7 for ; Thu, 31 Oct 2013 03:31:43 +1100 (EST) Received: from localhost ([::1]:53421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbYgH-0003u6-Ne for incoming@patchwork.ozlabs.org; Wed, 30 Oct 2013 12:31:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbYdj-0000PJ-Kk for qemu-devel@nongnu.org; Wed, 30 Oct 2013 12:29:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbYdb-0005iX-G8 for qemu-devel@nongnu.org; Wed, 30 Oct 2013 12:29:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbYdb-0005iH-7j for qemu-devel@nongnu.org; Wed, 30 Oct 2013 12:28:55 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9UGSoLe021215 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 Oct 2013 12:28:50 -0400 Received: from blackfin.pond.sub.org (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9UGSm3X013884 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Oct 2013 12:28:49 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5675F200CD; Wed, 30 Oct 2013 17:28:45 +0100 (CET) From: armbru@redhat.com To: qemu-devel@nongnu.org Date: Wed, 30 Oct 2013 17:28:44 +0100 Message-Id: <1383150524-16250-11-git-send-email-armbru@redhat.com> In-Reply-To: <1383150524-16250-1-git-send-email-armbru@redhat.com> References: <1383150524-16250-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, peter.maydell@linaro.org, marcel.a@redhat.com, borntraeger@de.ibm.com, aliguori@amazon.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v3 10/10] qdev: Do not let the user try to device_add when it cannot work X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 Reviewed-by: Marcel Apfelbaum --- qdev-monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 36f6f09..d3d87a3 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -477,13 +477,13 @@ DeviceState *qdev_device_add(QemuOpts *opts) } } - if (!obj) { + k = DEVICE_CLASS(obj); + + if (!k || k->cannot_instantiate_with_device_add_yet) { qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type"); return NULL; } - k = DEVICE_CLASS(obj); - /* find bus */ path = qemu_opt_get(opts, "bus"); if (path != NULL) {