From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDHUv-0008Sl-BB for qemu-devel@nongnu.org; Wed, 15 Jun 2016 16:33:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDHUu-0005lF-Be for qemu-devel@nongnu.org; Wed, 15 Jun 2016 16:33:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDHUu-0005lA-5d for qemu-devel@nongnu.org; Wed, 15 Jun 2016 16:33:12 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A991980F72 for ; Wed, 15 Jun 2016 20:33:11 +0000 (UTC) From: Eduardo Habkost Date: Wed, 15 Jun 2016 17:32:48 -0300 Message-Id: <1466022773-8965-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1466022773-8965-1-git-send-email-ehabkost@redhat.com> References: <1466022773-8965-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 05/10] qdev: GlobalProperty.errp field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Markus Armbruster Cc: Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov The new field will allow error handling to be configured by qdev_prop_register_global() callers: &error_fatal and &error_abort can be used to make QEMU exit or abort if any errors are reported when applying the properties. Suggested-by: Paolo Bonzini Signed-off-by: Eduardo Habkost --- hw/core/qdev-properties.c | 8 ++++++-- include/hw/qdev-core.h | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index cd19603..0fe7214 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1078,10 +1078,14 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, prop->used = true; object_property_parse(OBJECT(dev), prop->value, prop->property, &err); if (err != NULL) { - assert(prop->user_provided); error_prepend(&err, "can't apply global %s.%s=%s: ", prop->driver, prop->property, prop->value); - error_reportf_err(err, "Warning: "); + if (prop->errp) { + error_propagate(prop->errp, err); + } else { + assert(prop->user_provided); + error_reportf_err(err, "Warning: "); + } } } } diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 24aa0a7..16e7cc0 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -256,6 +256,9 @@ struct PropertyInfo { /** * GlobalProperty: + * @errp: If set, error_propagate() will be called on errors when applying + * the property. &error_abort or &error_fatal may be used to make + * errors automatically abort or exit QEMU. * @user_provided: Set to true if property comes from user-provided config * (command-line or config file). * @used: Set to true if property was used when initializing a device. @@ -264,6 +267,7 @@ typedef struct GlobalProperty { const char *driver; const char *property; const char *value; + Error **errp; bool user_provided; bool used; } GlobalProperty; -- 2.5.5