From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFGmd-0003rN-Sg for qemu-devel@nongnu.org; Tue, 21 Jun 2016 04:11:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFGmX-0008OT-Q5 for qemu-devel@nongnu.org; Tue, 21 Jun 2016 04:11:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFGmX-0008OL-Hh for qemu-devel@nongnu.org; Tue, 21 Jun 2016 04:11:37 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 16AC77264F for ; Tue, 21 Jun 2016 08:11:37 +0000 (UTC) Date: Tue, 21 Jun 2016 10:11:28 +0200 From: Igor Mammedov Message-ID: <20160621101128.6d9a268b@igors-macbook-pro.local> In-Reply-To: <1466437983-27133-5-git-send-email-ehabkost@redhat.com> References: <1466437983-27133-1-git-send-email-ehabkost@redhat.com> <1466437983-27133-5-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 04/10] qdev: GlobalProperty.errp field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , Paolo Bonzini On Mon, 20 Jun 2016 12:52:57 -0300 Eduardo Habkost wrote: > 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. > > While doing it, change the error message from "global %s.%s=%s > ignored" to "can't apply global %s.%s=%s". > > Suggested-by: Paolo Bonzini > Signed-off-by: Eduardo Habkost > --- > Changes v1 -> v2: > * Reword doc comments > * Suggested-by: Markus Armbruster > * Squashed with patch "Use error_prepend() for errors applying > globals" > * Suggested-by: Markus Armbruster > * Moved to the end of struct to not break test-qdev-global-props > --- > hw/core/qdev-properties.c | 11 ++++++++--- > include/hw/qdev-core.h | 4 ++++ > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index 64e17aa..0fe7214 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -1078,9 +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_reportf_err(err, "Warning: global %s.%s=%s > ignored: ", > - prop->driver, prop->property, > prop->value); > + error_prepend(&err, "can't apply global %s.%s=%s: ", > + prop->driver, prop->property, prop->value); > + if (prop->errp) { > + error_propagate(prop->errp, err); > + } else { > + assert(prop->user_provided); > + error_reportf_err(err, "Warning: "); this will never print warning as assert will trigger first, but in 8/10 assert is removed so Reviewed-by: Igor Mammedov > + } > } > } > } > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 24aa0a7..1d1f861 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -259,6 +259,9 @@ struct PropertyInfo { > * @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. > + * @errp: Error destination, used like first argument of error_setg() > + * in case property setting fails later. If @errp is NULL, we > + * print warnings instead of ignoring errors silently. > */ > typedef struct GlobalProperty { > const char *driver; > @@ -266,6 +269,7 @@ typedef struct GlobalProperty { > const char *value; > bool user_provided; > bool used; > + Error **errp; > } GlobalProperty; > > /*** Board API. This should go away once we have a machine config > file. ***/