From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuPgz-0004kw-0c for qemu-devel@nongnu.org; Mon, 06 Feb 2012 09:37:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RuPgx-0004g6-1Q for qemu-devel@nongnu.org; Mon, 06 Feb 2012 09:37:17 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:39657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuPgw-0004g2-RL for qemu-devel@nongnu.org; Mon, 06 Feb 2012 09:37:15 -0500 Received: by dadp14 with SMTP id p14so6493990dad.4 for ; Mon, 06 Feb 2012 06:37:14 -0800 (PST) Message-ID: <4F2FE596.6040705@codemonkey.ws> Date: Mon, 06 Feb 2012 08:37:10 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> <1328342577-25732-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1328342577-25732-24-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 23/27] qdev: inline qdev_prop_set into qdev_prop_set_ptr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org On 02/04/2012 02:02 AM, Paolo Bonzini wrote: > qdev_prop_set is not needed anymore except for hacks, simplify it and > inline it. > > Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > hw/qdev-properties.c | 26 +++++++------------------- > 1 files changed, 7 insertions(+), 19 deletions(-) > > diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c > index 5a11676..b3cd2a8 100644 > --- a/hw/qdev-properties.c > +++ b/hw/qdev-properties.c > @@ -1115,24 +1115,6 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) > return 0; > } > > -static void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type) > -{ > - Property *prop; > - > - prop = qdev_prop_find(dev, name); > - if (!prop) { > - fprintf(stderr, "%s: property \"%s.%s\" not found\n", > - __FUNCTION__, object_get_typename(OBJECT(dev)), name); > - abort(); > - } > - if (prop->info->type != type) { > - fprintf(stderr, "%s: property \"%s.%s\" type mismatch\n", > - __FUNCTION__, object_get_typename(OBJECT(dev)), name); > - abort(); > - } > - qdev_prop_cpy(dev, prop, src); > -} > - > void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) > { > Error *errp = NULL; > @@ -1248,7 +1230,13 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, int value) > > void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) > { > - qdev_prop_set(dev, name,&value, PROP_TYPE_PTR); > + Property *prop; > + void **ptr; > + > + prop = qdev_prop_find(dev, name); > + assert(prop&& prop->info ==&qdev_prop_ptr); > + ptr = qdev_get_prop_ptr(dev, prop); > + *ptr = value; > } > > void qdev_prop_set_defaults(DeviceState *dev, Property *props)