From patchwork Fri Dec 16 17:19:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 131873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2FD401007DD for ; Sat, 17 Dec 2011 04:19:38 +1100 (EST) Received: from localhost ([::1]:41782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbbRX-0006EO-Aq for incoming@patchwork.ozlabs.org; Fri, 16 Dec 2011 12:19:35 -0500 Received: from eggs.gnu.org ([140.186.70.92]:44063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbbRM-0006Cu-Pb for qemu-devel@nongnu.org; Fri, 16 Dec 2011 12:19:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbbRK-0001sK-T5 for qemu-devel@nongnu.org; Fri, 16 Dec 2011 12:19:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbbRK-0001sC-MS for qemu-devel@nongnu.org; Fri, 16 Dec 2011 12:19:22 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pBGHJL4b001662 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Dec 2011 12:19:21 -0500 Received: from yakj.usersys.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pBGHJJnD021298; Fri, 16 Dec 2011 12:19:20 -0500 Message-ID: <4EEB7D96.10507@redhat.com> Date: Fri, 16 Dec 2011 18:19:18 +0100 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110930 Thunderbird/7.0.1 MIME-Version: 1.0 To: Anthony Liguori References: <1324054053-20484-1-git-send-email-pbonzini@redhat.com> <1324054053-20484-5-git-send-email-pbonzini@redhat.com> <4EEB7916.5010000@codemonkey.ws> In-Reply-To: <4EEB7916.5010000@codemonkey.ws> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH v2 4/8] qom: interpret the return value when setting legacy properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 12/16/2011 06:00 PM, Anthony Liguori wrote: > > And perhaps it would make more sense to return Error * and make the > function name be a constructor: > > Error *error_from_qdev_prop_err(int ret, DeviceState *dev, > Property *prop, const char *value); That doesn't work too well when calling it from setters. However, error_set_from_qdev_prop_error is definitely an improvement (no matter what a mouthful it is). I need to rush now. I placed this at git://github.com/qemu/bonzini.git qom-props (commit 263e8c5), so you can play on top of it or pull it. I attach the interdiff from v2. Paolo diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index dd41e5a..80115b3 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -644,13 +644,11 @@ static void set_generic(DeviceState *dev, Visitor *v, void *opaque, } if (!*str) { g_free(str); - qdev_prop_error(errp, EINVAL, dev, prop, str); + error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str); return; } ret = prop->info->parse(dev, prop, str); - if (ret != 0) { - qdev_prop_error(errp, ret, dev, prop, str); - } + error_set_from_qdev_prop_error(errp, ret, dev, prop, str); g_free(str); } @@ -973,8 +972,8 @@ int qdev_prop_exists(DeviceState *dev, const char *name) return qdev_prop_find(dev, name) ? true : false; } -void qdev_prop_error(Error **errp, int ret, - DeviceState *dev, Property *prop, const char *value) +void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, + Property *prop, const char *value) { switch (ret) { case -EEXIST: @@ -990,6 +989,10 @@ void qdev_prop_error(Error **errp, int ret, error_set(errp, QERR_PROPERTY_VALUE_NOT_FOUND, dev->info->name, prop->name, value); break; + case 0: + break; + default: + abort(); } } @@ -1012,7 +1015,7 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) ret = prop->info->parse(dev, prop, value); if (ret < 0) { Error *err; - qdev_prop_error(&err, ret, dev, prop, value); + error_set_from_qdev_prop_error(&err, ret, dev, prop, value); qerror_report_err(err); error_free(err); return -1; diff --git a/hw/qdev.c b/hw/qdev.c index 2f7defc..0465632 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -1169,9 +1169,7 @@ static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque, } ret = prop->info->parse(dev, prop, ptr); - if (ret != 0) { - qdev_prop_error(errp, ret, dev, prop, ptr); - } + error_set_from_qdev_prop_error(errp, ret, dev, prop, ptr); g_free(ptr); } @@ -1179,7 +1177,7 @@ static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque, * @qdev_add_legacy_property - adds a legacy property * * Do not use this is new code! Properties added through this interface will - * be given names and types in the "legacy<>" type namespace. + * be given names and types in the "legacy" namespace. * * Legacy properties are always processed as strings. The format of the string * depends on the property type. @@ -1189,7 +1187,7 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, { gchar *name, *type; - name = g_strdup_printf("legacy<%s>", prop->name); + name = g_strdup_printf("legacy-%s", prop->name); type = g_strdup_printf("legacy<%s>", prop->info->legacy_name ?: prop->info->name); diff --git a/hw/qdev.h b/hw/qdev.h index 3410e77..d5896be 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -375,8 +375,8 @@ void qdev_prop_set_defaults(DeviceState *dev, Property *props); void qdev_prop_register_global_list(GlobalProperty *props); void qdev_prop_set_globals(DeviceState *dev); -void qdev_prop_error(Error **errp, int ret, DeviceState *name, - Property *prop, const char *value); +void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, + Property *prop, const char *value); static inline const char *qdev_fw_name(DeviceState *dev) {