From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbSO8-0006GW-D9 for qemu-devel@nongnu.org; Wed, 30 Oct 2013 05:48:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbSO2-0002On-Ds for qemu-devel@nongnu.org; Wed, 30 Oct 2013 05:48:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbSO2-0002Og-5g for qemu-devel@nongnu.org; Wed, 30 Oct 2013 05:48:26 -0400 Message-ID: <1383126330.4734.16.camel@localhost.localdomain> From: Marcel Apfelbaum Date: Wed, 30 Oct 2013 11:45:30 +0200 In-Reply-To: <1383062897-30084-11-git-send-email-armbru@redhat.com> References: <1383062897-30084-1-git-send-email-armbru@redhat.com> <1383062897-30084-11-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 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: armbru@redhat.com Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org, borntraeger@de.ibm.com, anthony@codemonkey.ws, afaerber@suse.de On Tue, 2013-10-29 at 17:08 +0100, armbru@redhat.com wrote: > 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; > } Minor comment, if you move the if statement after k = DEVICE_CLASS(obj); you don't need the cast anymore. Seems OK to me. Reviewed-by: Marcel Apfelbaum