From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NIPEF-0008CS-MZ
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:17:27 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NIPEA-00089U-3w
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:17:26 -0500
Received: from [199.232.76.173] (port=58574 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NIPE9-00089K-Su
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:17:21 -0500
Received: from mx1.redhat.com ([209.132.183.28]:56262)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mst@redhat.com>) id 1NIPE9-0004QD-Ks
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:17:21 -0500
Date: Wed, 9 Dec 2009 18:14:35 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20091209161435.GA5690@redhat.com>
References: <1260274314-2906-1-git-send-email-kraxel@redhat.com>
	<1260274314-2906-4-git-send-email-kraxel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1260274314-2906-4-git-send-email-kraxel@redhat.com>
Subject: [Qemu-devel] Re: [FOR 0.12 PATCH v4 03/22] qdev: also match bus
	name for global properties
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: lcapitulino@redhat.com, qemu-devel@nongnu.org, agraf@suse.de

On Tue, Dec 08, 2009 at 01:11:35PM +0100, Gerd Hoffmann wrote:
> i.e. -global PCI.<property>=<value> will set a default property for all
> PCI devices.  Also works for the compat properties used by machine
> types.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Looks like an earlier version of the patches was applied
on staging, and so staging lacks this patch.


> ---
>  hw/qdev-properties.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index fe106bd..fb07279 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -614,7 +614,8 @@ void qdev_prop_set_globals(DeviceState *dev)
>      GlobalProperty *prop;
>  
>      QTAILQ_FOREACH(prop, &global_props, next) {
> -        if (strcmp(dev->info->name, prop->driver) != 0) {
> +        if (strcmp(dev->info->name, prop->driver) != 0 &&
> +            strcmp(dev->info->bus_info->name, prop->driver) != 0) {
>              continue;
>          }
>          if (qdev_prop_parse(dev, prop->property, prop->value) != 0) {
> -- 
> 1.6.5.2
> 
>