From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbYJ8-0005i7-Kp for qemu-devel@nongnu.org; Fri, 16 Dec 2011 08:58:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbYJ2-0002YW-NP for qemu-devel@nongnu.org; Fri, 16 Dec 2011 08:58:42 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:36873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbYJ2-0002YM-KF for qemu-devel@nongnu.org; Fri, 16 Dec 2011 08:58:36 -0500 Received: by iagj37 with SMTP id j37so5018943iag.4 for ; Fri, 16 Dec 2011 05:58:35 -0800 (PST) Message-ID: <4EEB4E87.3010502@codemonkey.ws> Date: Fri, 16 Dec 2011 07:58:31 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1324036918-2405-1-git-send-email-pbonzini@redhat.com> <1324036918-2405-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1324036918-2405-5-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 4/8] qom: push permission checks up into qdev_property_add_legacy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: kwolf@redhat.com, qemu-devel@nongnu.org On 12/16/2011 06:01 AM, Paolo Bonzini wrote: > qdev_property_get and qdev_property_set can generate permission > denied errors themselves. Do not duplicate this functionality in > qdev_get/set_legacy_property, and clean up excessive indentation. > > Signed-off-by: Paolo Bonzini Nice cleanup. Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > hw/qdev.c | 46 +++++++++++++++++++--------------------------- > 1 files changed, 19 insertions(+), 27 deletions(-) > > diff --git a/hw/qdev.c b/hw/qdev.c > index bda8d6c..c020a6f 100644 > --- a/hw/qdev.c > +++ b/hw/qdev.c > @@ -1135,46 +1135,38 @@ static void qdev_get_legacy_property(DeviceState *dev, Visitor *v, void *opaque, > { > Property *prop = opaque; > > - if (prop->info->print) { > - char buffer[1024]; > - char *ptr = buffer; > + char buffer[1024]; > + char *ptr = buffer; > > - prop->info->print(dev, prop, buffer, sizeof(buffer)); > - visit_type_str(v,&ptr, name, errp); > - } else { > - error_set(errp, QERR_PERMISSION_DENIED); > - } > + prop->info->print(dev, prop, buffer, sizeof(buffer)); > + visit_type_str(v,&ptr, name, errp); > } > > static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque, > const char *name, Error **errp) > { > Property *prop = opaque; > + Error *local_err = NULL; > + char *ptr = NULL; > + int ret; > > if (dev->state != DEV_STATE_CREATED) { > error_set(errp, QERR_PERMISSION_DENIED); > return; > } > > - if (prop->info->parse) { > - Error *local_err = NULL; > - char *ptr = NULL; > + visit_type_str(v,&ptr, name,&local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > > - visit_type_str(v,&ptr, name,&local_err); > - if (!local_err) { > - int ret; > - ret = prop->info->parse(dev, prop, ptr); > - if (ret != 0) { > - error_set(errp, QERR_INVALID_PARAMETER_VALUE, > - name, prop->info->name); > - } > - g_free(ptr); > - } else { > - error_propagate(errp, local_err); > - } > - } else { > - error_set(errp, QERR_PERMISSION_DENIED); > + ret = prop->info->parse(dev, prop, ptr); > + if (ret != 0) { > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, > + name, prop->info->name); > } > + g_free(ptr); > } > > /** > @@ -1194,8 +1186,8 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, > type = g_strdup_printf("legacy<%s>", prop->info->name); > > qdev_property_add(dev, prop->name, type, > - qdev_get_legacy_property, > - qdev_set_legacy_property, > + prop->info->print ? qdev_get_legacy_property : NULL, > + prop->info->parse ? qdev_set_legacy_property : NULL, > NULL, > prop, errp); >