From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jens Freimann <jfreimann@redhat.com>,
qemu-stable@nongnu.org, "Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 03/28] net/virtio: Fix failover_replug_primary() return value regression
Date: Thu, 2 Jul 2020 13:09:06 +0200 [thread overview]
Message-ID: <20200702110931.2953148-4-armbru@redhat.com> (raw)
In-Reply-To: <20200702110931.2953148-1-armbru@redhat.com>
Commit 150ab54aa6 "net/virtio: fix re-plugging of primary device"
fixed failover_replug_primary() to return false on failure. Commit
5a0948d36c "net/virtio: Fix failover error handling crash bugs" broke
it again for hotplug_handler_plug() failure. Unbreak it.
Commit 5a0948d36c4cbc1c5534afac6fee99de55245d12
Fixes: 5a0948d36c4cbc1c5534afac6fee99de55245d12
Cc: Jens Freimann <jfreimann@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20200630090351.1247703-2-armbru@redhat.com>
---
hw/net/virtio-net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index aff67a92df..9bb5578e5d 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3129,7 +3129,7 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp)
if (err) {
goto out;
}
- hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp);
+ hotplug_handler_plug(hotplug_ctrl, n->primary_dev, &err);
}
out:
--
2.26.2
next prev parent reply other threads:[~2020-07-02 11:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 11:09 [PULL 00/28] Error reporting patches patches for 2020-07-02 Markus Armbruster
2020-07-02 11:09 ` [PULL 01/28] chardev/tcp: Fix error message double free error Markus Armbruster
2020-07-02 11:09 ` [PULL 02/28] hw/virtio/virtio-iommu-pci.c: Fix typo in error message Markus Armbruster
2020-07-02 11:09 ` Markus Armbruster [this message]
2020-07-02 11:09 ` [PULL 04/28] pci: Delete useless error_propagate() Markus Armbruster
2020-07-02 11:09 ` [PULL 05/28] Clean up some calls to ignore Error objects the right way Markus Armbruster
2020-07-02 11:09 ` [PULL 06/28] tests: Use &error_abort where appropriate Markus Armbruster
2020-07-02 11:09 ` [PULL 07/28] tests: Use error_free_or_abort() " Markus Armbruster
2020-07-02 11:09 ` [PULL 08/28] usb/dev-mtp: Fix Error double free after inotify failure Markus Armbruster
2020-07-02 11:09 ` [PULL 09/28] spapr: Plug minor memory leak in spapr_machine_init() Markus Armbruster
2020-07-02 11:09 ` [PULL 10/28] qga: Plug unlikely memory leak in guest-set-memory-blocks Markus Armbruster
2020-07-02 11:09 ` [PULL 11/28] sd/milkymist-memcard: Plug minor memory leak in realize Markus Armbruster
2020-07-02 11:09 ` [PULL 12/28] test-util-filemonitor: Plug unlikely memory leak Markus Armbruster
2020-07-02 11:09 ` [PULL 13/28] vnc: Plug minor memory leak in vnc_display_open() Markus Armbruster
2020-07-02 11:09 ` [PULL 14/28] aspeed: Clean up roundabout error propagation Markus Armbruster
2020-07-02 11:09 ` [PULL 15/28] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp Markus Armbruster
2020-07-02 11:09 ` [PULL 16/28] qdev: Drop qbus_set_hotplug_handler() " Markus Armbruster
2020-07-02 11:09 ` [PULL 17/28] hw: Fix error API violation around object_property_set_link() Markus Armbruster
2020-07-02 11:09 ` [PULL 18/28] hw/arm: Drop useless object_property_set_link() error handling Markus Armbruster
2020-07-02 11:09 ` [PULL 19/28] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations Markus Armbruster
2020-07-02 11:09 ` [PULL 20/28] riscv_hart: Fix riscv_harts_realize() " Markus Armbruster
2020-07-02 11:09 ` [PULL 21/28] mips/cps: Fix mips_cps_realize() " Markus Armbruster
2020-07-02 11:09 ` [PULL 22/28] x86: Fix x86_cpu_new() error handling Markus Armbruster
2020-07-02 11:09 ` [PULL 23/28] amd_iommu: Fix amdvi_realize() error API violation Markus Armbruster
2020-07-02 11:09 ` [PULL 24/28] arm/stm32f205 arm/stm32f405: Fix realize " Markus Armbruster
2020-07-02 11:09 ` [PULL 25/28] aspeed: " Markus Armbruster
2020-07-02 11:09 ` [PULL 26/28] hw/arm/armsse: Fix armsse_realize() " Markus Armbruster
2020-07-02 11:09 ` [PULL 27/28] arm/{bcm2835, fsl-imx25, fsl-imx6}: Fix realize error API violations Markus Armbruster
2020-07-02 11:09 ` [PULL 28/28] migration/rdma: Plug memory leaks in qemu_rdma_registration_stop() Markus Armbruster
2020-07-02 16:00 ` [PULL 00/28] Error reporting patches patches for 2020-07-02 Peter Maydell
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=20200702110931.2953148-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jfreimann@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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).