qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 05/14] arm/virt: Fix virt_machine_device_plug_cb() error API violation
Date: Wed, 22 Apr 2020 15:07:10 +0200	[thread overview]
Message-ID: <20200422130719.28225-6-armbru@redhat.com> (raw)
In-Reply-To: <20200422130719.28225-1-armbru@redhat.com>

The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL.  Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.

virt_machine_device_plug_cb() passes @errp to
cryptodev_builtin_sym_close_session() in a loop.  Harmless, because
cryptodev_builtin_sym_close_session() can't actually fail.  Fix by
dropping its Error ** parameter.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/arm/virt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7dc96abf72..cca5316256 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1186,7 +1186,7 @@ static void create_smmu(const VirtMachineState *vms,
     g_free(node);
 }
 
-static void create_virtio_iommu_dt_bindings(VirtMachineState *vms, Error **errp)
+static void create_virtio_iommu_dt_bindings(VirtMachineState *vms)
 {
     const char compat[] = "virtio,pci-iommu";
     uint16_t bdf = vms->virtio_iommu_bdf;
@@ -2118,7 +2118,7 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
 
         vms->iommu = VIRT_IOMMU_VIRTIO;
         vms->virtio_iommu_bdf = pci_get_bdf(pdev);
-        create_virtio_iommu_dt_bindings(vms, errp);
+        create_virtio_iommu_dt_bindings(vms);
     }
 }
 
-- 
2.21.1



  parent reply	other threads:[~2020-04-22 13:10 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-22 13:07 [PATCH v2 00/14] Miscellaneous error handling fixes Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 01/14] cryptodev: Fix cryptodev_builtin_cleanup() error API violation Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 02/14] block/file-posix: Fix check_cache_dropped() error handling Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 03/14] cpus: Fix configure_icount() error API violation Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 04/14] cpus: Proper range-checking for -icount shift=N Markus Armbruster
2020-04-22 13:07 ` Markus Armbruster [this message]
2020-04-22 13:07 ` [PATCH v2 06/14] fdc: Fix fallback=auto error handling Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 07/14] bochs-display: Fix vgamem=SIZE " Markus Armbruster
2020-04-23 11:30   ` Gerd Hoffmann
2020-04-22 13:07 ` [PATCH v2 08/14] virtio-net: Fix duplex=... and speed=... " Markus Armbruster
2020-04-22 14:24   ` Michael S. Tsirkin
2020-04-22 13:07 ` [PATCH v2 09/14] xen/pt: Fix flawed conversion to realize() Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 10/14] io: Fix qio_channel_socket_close() error handling Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 11/14] migration/colo: Fix qmp_xen_colo_do_checkpoint() " Markus Armbruster
2020-04-22 13:07 ` [PATCH v2 12/14] tests/test-logging: Fix test for -dfilter 0..0xffffffffffffffff Markus Armbruster
2020-04-22 13:35   ` Philippe Mathieu-Daudé
2020-04-22 14:49     ` Eric Blake
2020-04-22 16:28       ` Philippe Mathieu-Daudé
2020-04-22 15:19     ` Markus Armbruster
2020-04-22 16:30       ` Philippe Mathieu-Daudé
2020-04-22 13:07 ` [PATCH v2 13/14] qga: Fix qmp_guest_get_memory_blocks() error handling Markus Armbruster
2020-04-22 13:14   ` Eric Blake
2020-04-22 13:07 ` [PATCH v2 14/14] qga: Fix qmp_guest_suspend_{disk, ram}() " Markus Armbruster
2020-04-22 13:19   ` Eric Blake
2020-04-22 13:41   ` Philippe Mathieu-Daudé
2020-04-22 15:17     ` Markus Armbruster
2020-04-22 16:07       ` Philippe Mathieu-Daudé
2020-04-23  8:35         ` Markus Armbruster
2020-04-22 20:21 ` [PATCH v2 00/14] Miscellaneous error handling fixes no-reply
2020-04-29  7:14 ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200422130719.28225-6-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).