From patchwork Thu Jan 2 02:46:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 306033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E251D2C00A1 for ; Thu, 2 Jan 2014 13:47:37 +1100 (EST) Received: from localhost ([::1]:43122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VyYJr-0002aO-CT for incoming@patchwork.ozlabs.org; Wed, 01 Jan 2014 21:47:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VyYJR-0002aH-Dy for qemu-devel@nongnu.org; Wed, 01 Jan 2014 21:47:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VyYJG-0008Nt-2h for qemu-devel@nongnu.org; Wed, 01 Jan 2014 21:47:09 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:44164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VyYJF-0008Nj-Pb for qemu-devel@nongnu.org; Wed, 01 Jan 2014 21:46:57 -0500 Received: by mail-pa0-f49.google.com with SMTP id kx10so13994714pab.22 for ; Wed, 01 Jan 2014 18:46:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=Y8zavzsWeeKC/L7GFLyDMB2vwvcnk/BI51PJ0q7zNPI=; b=M/8TZcoRGACaMhJhjl1nrWutZwH45faPIPN5iFMIdwejqWa2N1LJaRWJVCbilwaI8S 8kvGXf8Qj2+60N3E6mrtHUJ+a2LuhXe/UPeQyyxDAIIqJP64phtbnbZGN2Gqrhgn/Ii7 22irsadYjIbibbQ2WyGa9nu7H2HzVUyQi4h9rI9ICd11aFgUcLtFm/4OsFmVcMETXVS2 TwmSxoptC90MCzvVdSFS3n0fNvGqf43qehzgAETxwgLqSBXo35FHbc5QSCwTGG1Etasb +FKNwnO16HRt/UhcPsLnaCqKdAiatLaFusJ/L1PENXwng9LUSHREhiT6h6ATBGJRuj4t 723Q== X-Gm-Message-State: ALoCoQlWTSK4jbDdw08yTfP6SR60VCnUiyN0y7aQBPIibDmLNWLMIyFIm50r+lVAMxeABK1gV4py X-Received: by 10.66.121.131 with SMTP id lk3mr84842430pab.61.1388630816833; Wed, 01 Jan 2014 18:46:56 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id sg1sm97961511pbb.16.2014.01.01.18.46.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 01 Jan 2014 18:46:55 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org, lcapitulino@redhat.com Date: Wed, 1 Jan 2014 18:46:24 -0800 Message-Id: X-Mailer: git-send-email 1.8.5.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.49 Cc: imammedo@redhat.com, afaerber@suse.de, armbru@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH qmp v4 0/6] Add error_abort and associated cleanups 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 Following our discussion RE self asserting API calls, here is a spin of my proposal. This series obsoletes the need for _nofail variants for Error ** accepting APIs. Is also greatly reduces the verbosity of calls sites that are currently asserting against errors. Patch 1 is the main event - addition of error_abort. The following patches then cleanup uses of _nofail and assert_no_error(). To give it a smoke test, I introduce a (critical) bug into QOM: prop->set(obj, v, prop->opaque, name, errp); And run QEMU: $ gdb --args ./microblazeel-softmmu/qemu-system-microblazeel -M petalogix-ml605 -nographic Without application of this series, the bug manifests as: qemu-system-microblazeel: Insufficient permission to perform this operation Program received signal SIGABRT, Aborted. (gdb) bt 0 0x00007ffff55f7425 in __GI_raise (sig=) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 1 0x00007ffff55fab8b in __GI_abort () at abort.c:91 2 0x00005555557073da in assert_no_error (err=) at qobject/qerror.c:128 3 0x0000555555615159 in qdev_property_add_static (dev=0x555555e9e6a0, prop=0x5555559ea4c0, errp=0x7fffffffe3c0) at hw/core/qdev.c:666 4 0x0000555555615355 in device_initfn (obj=) at hw/core/qdev.c:744 With this series, we now get a the full backtrace into the QOM API when the assertion occurs (note stack frames 2-4 giving visibility into the broken QOM API): qemu-system-microblazeel: Insufficient permission to perform this operation Program received signal SIGABRT, Aborted. (gdb) bt 0 0x00007ffff55f7425 in __GI_raise (sig=) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 1 0x00007ffff55fab8b in __GI_abort () at abort.c:91 2 0x000055555570c5a4 in error_set (errp=0x555555e1b5f0, err_class=ERROR_CLASS_GENERIC_ERROR, fmt=0x55555571f5c0 "Insufficient permission to perform this operation") at util/error.c:47 3 0x00005555556778e5 in object_property_set_qobject (obj=0x555555e9e6a0, value=, name=0x55555574e7a6 "xlnx.base-vectors", errp=0x555555e1b5f0) at qom/qom-qobject.c:24 4 0x000055555567674d in object_property_set_int (obj=0x555555e9e6a0, value=, name=0x55555574e7a6 "xlnx.base-vectors", errp=0x555555e1b5f0) at qom/object.c:898 5 0x0000555555615192 in qdev_property_add_static (dev=0x555555e9e6a0, prop=0x5555559ea4c0, errp=0x555555e1b5f0) at hw/core/qdev.c:664 6 0x000055555561534f in device_initfn (obj=) at hw/core/qdev.c:741 Changed since v2: Removed new assert_no_error usages in target-arm/cpu.c Changed since v1: Addressed Markus review. Guarded against erroneous setting of error_abort != NULL. Peter Crosthwaite (6): error: Add error_abort hw/core/qdev: Delete dead code hw: Remove assert_no_error usages target-i386: Remove assert_no_error usage qemu-option: Remove qemu_opts_create_nofail qerror: Remove assert_no_error() block/blkdebug.c | 2 +- block/blkverify.c | 2 +- block/curl.c | 2 +- block/gluster.c | 2 +- block/iscsi.c | 2 +- block/nbd.c | 3 ++- block/qcow2.c | 2 +- block/raw-posix.c | 2 +- block/raw-win32.c | 5 +++-- block/rbd.c | 2 +- block/sheepdog.c | 2 +- block/vvfat.c | 2 +- blockdev.c | 6 ++++-- hw/core/qdev-properties-system.c | 8 ++------ hw/core/qdev-properties.c | 40 ++++++++++------------------------------ hw/core/qdev.c | 28 +++++++--------------------- hw/dma/xilinx_axidma.c | 13 ++++--------- hw/net/xilinx_axienet.c | 13 ++++--------- hw/watchdog/watchdog.c | 3 ++- include/hw/xilinx.h | 14 ++++---------- include/qapi/error.h | 6 ++++++ include/qapi/qmp/qerror.h | 1 - include/qemu/option.h | 1 - qdev-monitor.c | 2 +- qemu-img.c | 2 +- qobject/qerror.c | 8 -------- target-arm/cpu.c | 7 ++----- target-i386/cpu.c | 4 +--- util/error.c | 22 +++++++++++++++++++++- util/qemu-config.c | 2 +- util/qemu-option.c | 9 --------- util/qemu-sockets.c | 18 +++++++++--------- vl.c | 15 +++++++++------ 33 files changed, 103 insertions(+), 147 deletions(-) --- a/qom/object.c +++ b/qom/object.c @@ -797,7 +797,7 @@ void object_property_set(Object *obj, Visitor *v, const char *name, return; } - if (!prop->set) { + if (prop->set) { error_set(errp, QERR_PERMISSION_DENIED); } else {