From patchwork Fri Dec 16 16:47:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 131874 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 C6F161007D7 for ; Sat, 17 Dec 2011 04:21:57 +1100 (EST) Received: from localhost ([::1]:53472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rbaxf-0003S5-I0 for incoming@patchwork.ozlabs.org; Fri, 16 Dec 2011 11:48:43 -0500 Received: from eggs.gnu.org ([140.186.70.92]:43633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rbawx-0001WD-Eg for qemu-devel@nongnu.org; Fri, 16 Dec 2011 11:48:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rbawq-0004mF-SX for qemu-devel@nongnu.org; Fri, 16 Dec 2011 11:47:59 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:41573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rbawq-0004kD-PM for qemu-devel@nongnu.org; Fri, 16 Dec 2011 11:47:52 -0500 Received: by mail-iy0-f173.google.com with SMTP id j37so5244361iag.4 for ; Fri, 16 Dec 2011 08:47:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=FIWn80l58Disv1tq0QclibYJUom8ut8A7rdu0C/x7V0=; b=qj1ukGYQSpD0w3jbibKW0NHvIkNhT97SEiyx3UivEA3JI0Gq9QbA572KDCp8cUhEFE 15bq7U96XkvFhEPSZvZxCBhwHEUtkgKmKnKQGXfRociYZ20KYSS38BjODYZCq/HGQxuF EroWiXHWcrMxSDo5MtLSQfWx2qnMgMCRzzmR4= Received: by 10.50.94.170 with SMTP id dd10mr9393973igb.41.1324054072445; Fri, 16 Dec 2011 08:47:52 -0800 (PST) Received: from localhost.localdomain (93-34-178-147.ip50.fastwebnet.it. [93.34.178.147]) by mx.google.com with ESMTPS id py9sm15469890igc.2.2011.12.16.08.47.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Dec 2011 08:47:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 16 Dec 2011 17:47:29 +0100 Message-Id: <1324054053-20484-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1324054053-20484-1-git-send-email-pbonzini@redhat.com> References: <1324054053-20484-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Subject: [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 Signed-off-by: Paolo Bonzini --- hw/qdev-properties.c | 39 ++++++++++++++++++++++++--------------- hw/qdev.c | 3 +-- hw/qdev.h | 2 ++ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index f0b811c..76ecb38 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -614,6 +614,26 @@ 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) +{ + switch (ret) { + case -EEXIST: + error_set(errp, QERR_PROPERTY_VALUE_IN_USE, + dev->info->name, prop->name, value); + break; + default: + case -EINVAL: + error_set(errp, QERR_PROPERTY_VALUE_BAD, + dev->info->name, prop->name, value); + break; + case -ENOENT: + error_set(errp, QERR_PROPERTY_VALUE_NOT_FOUND, + dev->info->name, prop->name, value); + break; + } +} + int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) { Property *prop; @@ -632,21 +652,10 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) } ret = prop->info->parse(dev, prop, value); if (ret < 0) { - switch (ret) { - case -EEXIST: - qerror_report(QERR_PROPERTY_VALUE_IN_USE, - dev->info->name, name, value); - break; - default: - case -EINVAL: - qerror_report(QERR_PROPERTY_VALUE_BAD, - dev->info->name, name, value); - break; - case -ENOENT: - qerror_report(QERR_PROPERTY_VALUE_NOT_FOUND, - dev->info->name, name, value); - break; - } + Error *err; + qdev_prop_error(&err, ret, dev, prop, value); + qerror_report_err(err); + error_free(err); return -1; } return 0; diff --git a/hw/qdev.c b/hw/qdev.c index c020a6f..c8ab7b7 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -1163,8 +1163,7 @@ static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque, ret = prop->info->parse(dev, prop, ptr); if (ret != 0) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, - name, prop->info->name); + qdev_prop_error(errp, ret, dev, prop, ptr); } g_free(ptr); } diff --git a/hw/qdev.h b/hw/qdev.h index 6e18427..828d811 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -370,6 +370,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); static inline const char *qdev_fw_name(DeviceState *dev) {