From: Jens Freimann <jfreimann@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jasowang@redhat.com,
dgilbert@redhat.com, mst@redhat.com
Subject: [PATCH v3 2/4] net/virtio: return early when failover primary alread added
Date: Wed, 20 Nov 2019 16:49:49 +0100 [thread overview]
Message-ID: <20191120154951.27877-3-jfreimann@redhat.com> (raw)
In-Reply-To: <20191120154951.27877-1-jfreimann@redhat.com>
Bail out when primary device was already added before.
This avoids printing a wrong warning message during reboot.
Fixes: 9711cd0dfc3f ("net/virtio: add failover support")
Signed-off-by: Jens Freimann <jfreimann@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/net/virtio-net.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 946039c0dc..ac4d19109e 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -759,6 +759,10 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
{
Error *err = NULL;
+ if (n->primary_dev) {
+ return;
+ }
+
n->primary_device_opts = qemu_opts_find(qemu_find_opts("device"),
n->primary_device_id);
if (n->primary_device_opts) {
--
2.21.0
next prev parent reply other threads:[~2019-11-20 16:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 15:49 [PATCH v3 0/4] net/virtio: fixes for failover Jens Freimann
2019-11-20 15:49 ` [PATCH v3 1/4] net/virtio: fix dev_unplug_pending Jens Freimann
2019-11-20 15:49 ` Jens Freimann [this message]
2019-11-20 15:55 ` [PATCH v3 2/4] net/virtio: return early when failover primary alread added Michael S. Tsirkin
2019-11-20 15:49 ` [PATCH v3 3/4] net/virtio: fix re-plugging of primary device Jens Freimann
2019-11-20 15:49 ` [PATCH v3 4/4] net/virtio: return error when device_opts arg is NULL Jens Freimann
2019-11-20 15:56 ` [PATCH v3 0/4] net/virtio: fixes for failover Michael S. Tsirkin
2019-11-21 5:18 ` Jason Wang
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=20191120154951.27877-3-jfreimann@redhat.com \
--to=jfreimann@redhat.com \
--cc=dgilbert@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.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).