From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:32825)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marcel.a@redhat.com>) id 1Vbrbn-0006Jm-LB
	for qemu-devel@nongnu.org; Thu, 31 Oct 2013 08:44:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <marcel.a@redhat.com>) id 1Vbrbh-0004p8-Lg
	for qemu-devel@nongnu.org; Thu, 31 Oct 2013 08:44:19 -0400
Received: from mx1.redhat.com ([209.132.183.28]:48888)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marcel.a@redhat.com>) id 1Vbrbh-0004oi-Dh
	for qemu-devel@nongnu.org; Thu, 31 Oct 2013 08:44:13 -0400
Message-ID: <1383223279.4734.40.camel@localhost.localdomain>
From: Marcel Apfelbaum <marcel.a@redhat.com>
Date: Thu, 31 Oct 2013 14:41:19 +0200
In-Reply-To: <1383150524-16250-11-git-send-email-armbru@redhat.com>
References: <1383150524-16250-1-git-send-email-armbru@redhat.com>
	<1383150524-16250-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 v3 10/10] qdev: Do not let the user try to
 device_add when it cannot work
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: armbru@redhat.com
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org, borntraeger@de.ibm.com, aliguori@amazon.com, afaerber@suse.de

On Wed, 2013-10-30 at 17:28 +0100, armbru@redhat.com wrote:
> From: Markus Armbruster <armbru@redhat.com>
> 
> 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.

Seems OK to me.
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>

> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  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) {