From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5q5-000159-3y for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:42:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO5q0-0003Gt-Ut for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:42:57 -0500 From: Markus Armbruster References: <1423128889-18260-1-git-send-email-armbru@redhat.com> <1423128889-18260-3-git-send-email-armbru@redhat.com> Date: Wed, 18 Feb 2015 15:42:44 +0100 In-Reply-To: <1423128889-18260-3-git-send-email-armbru@redhat.com> (Markus Armbruster's message of "Thu, 5 Feb 2015 10:34:48 +0100") Message-ID: <87ioezz3ff.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 2/3] spapr: Clean up misuse of qdev_init() in xics-kvm creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Gibson , qemu-ppc@nongnu.org, afaerber@suse.de, Alexander Graf David, your commit 11ad93f suggests you're highly qualified to review. No good deed shall go unpunished ;) Markus Armbruster writes: > We call try_create_xics() to create a "xics-kvm". If it fails, we > call it again to fall back to plain "xics". > > try_create_xics() uses qdev_init(). qdev_init()'s error handling has > an unwanted side effect: it calls qerror_report_err(), which prints to > stderr. Looks like an error, but isn't. > > In QMP context, it would stash the error in the monitor instead, > making the QMP command fail. Fortunately, it's only called from board > initialization, never in QMP context. > > Clean up by cutting out the qdev_init() middle-man: set property > "realized" directly. > > While there, improve the error message when we can't satisfy an > explicit user request for "xics-kvm", and exit(1) instead of abort(). > Simplify the abort when we can't create "xics". > > Cc: Alexander Graf > Cc: qemu-ppc@nongnu.org > Signed-off-by: Markus Armbruster > --- > hw/ppc/spapr.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index b560459..de6d0bb 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -109,17 +109,20 @@ struct sPAPRMachineState { > sPAPREnvironment *spapr; > > static XICSState *try_create_xics(const char *type, int nr_servers, > - int nr_irqs) > + int nr_irqs, Error **errp) > { > + Error *err; > DeviceState *dev; > > dev = qdev_create(NULL, type); > qdev_prop_set_uint32(dev, "nr_servers", nr_servers); > qdev_prop_set_uint32(dev, "nr_irqs", nr_irqs); > - if (qdev_init(dev) < 0) { > + object_property_set_bool(OBJECT(dev), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + object_unparent(OBJECT(dev)); > return NULL; > } > - > return XICS_COMMON(dev); > } > > @@ -133,23 +136,19 @@ static XICSState *xics_system_init(int nr_servers, int nr_irqs) > "kernel_irqchip", true); > bool irqchip_required = qemu_opt_get_bool(machine_opts, > "kernel_irqchip", false); > + Error *err = NULL; > + > if (irqchip_allowed) { > - icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs); > + icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); > } > - > if (irqchip_required && !icp) { > - perror("Failed to create in-kernel XICS\n"); > - abort(); > + error_report("kernel_irqchip requested but unavailable: %s", > + error_get_pretty(err)); > } > } > > if (!icp) { > - icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs); > - } > - > - if (!icp) { > - perror("Failed to create XICS\n"); > - abort(); > + icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, &error_abort); > } > > return icp;