From patchwork Sun Dec 18 16:05:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 132096 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 E60AAB7044 for ; Mon, 19 Dec 2011 03:05:58 +1100 (EST) Received: from localhost ([::1]:35603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcJFC-0002Gh-Ho for incoming@patchwork.ozlabs.org; Sun, 18 Dec 2011 11:05:46 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcJEt-0001bV-Kk for qemu-devel@nongnu.org; Sun, 18 Dec 2011 11:05:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RcJEm-00071w-7H for qemu-devel@nongnu.org; Sun, 18 Dec 2011 11:05:22 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:39149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcJEl-000712-Uw for qemu-devel@nongnu.org; Sun, 18 Dec 2011 11:05:20 -0500 Received: by mail-ee0-f45.google.com with SMTP id b45so5270371eek.4 for ; Sun, 18 Dec 2011 08:05:19 -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=U5Q5TPuyRzGiKKOC/OfAo1cvO6/g91F3HcLE01TJjSw=; b=HOSSWaKQrfL0pjqg2hGhVlk6a8lZ2Sau81q8feWa6khH5LF6tGsQ8yjHFAihkitbgp CoQ7ixDFgpaPPp+VaGmFnbcznu2ti5M4OXO0/IG4Dk7Gsyu15sVHUUNQKnvYAKFVFmQD NR7vn1+KVzeg54/xHofSNq05QkP/YNHop0CT4= Received: by 10.14.11.32 with SMTP id 32mr2749041eew.112.1324224319657; Sun, 18 Dec 2011 08:05:19 -0800 (PST) Received: from localhost.localdomain (93-34-178-147.ip50.fastwebnet.it. [93.34.178.147]) by mx.google.com with ESMTPS id t59sm14059180eeh.10.2011.12.18.08.05.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 18 Dec 2011 08:05:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 18 Dec 2011 17:05:07 +0100 Message-Id: <1324224311-25032-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1324224311-25032-1-git-send-email-pbonzini@redhat.com> References: <1324224311-25032-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.83.45 Subject: [Qemu-devel] [PATCH 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 | 41 ++++++++++++++++++++++++++--------------- hw/qdev.c | 5 +---- hw/qdev.h | 2 ++ 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index f0b811c..de618f2 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -614,6 +614,28 @@ int qdev_prop_exists(DeviceState *dev, const char *name) return qdev_prop_find(dev, name) ? true : false; } +void error_set_from_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; + case 0: + break; + } +} + int qdev_prop_parse(DeviceState *dev, const char *name, const char *value) { Property *prop; @@ -632,21 +654,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; + error_set_from_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..2a146f7 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -1162,10 +1162,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); - } + error_set_from_qdev_prop_error(errp, ret, dev, prop, ptr); g_free(ptr); } diff --git a/hw/qdev.h b/hw/qdev.h index 6e18427..94f5ce9 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 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) {