All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>,
	Jens Freimann <jfreimann@redhat.com>,
	qemu-devel@nongnu.org
Subject: [PULL 2/4] net/virtio: return early when failover primary alread added
Date: Mon, 25 Nov 2019 23:40:05 +0800	[thread overview]
Message-ID: <1574696407-4188-3-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1574696407-4188-1-git-send-email-jasowang@redhat.com>

From: Jens Freimann <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>
Signed-off-by: Jason Wang <jasowang@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 946039c..ac4d191 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.5.0



  parent reply	other threads:[~2019-11-25 15:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-25 15:40 [PULL 0/4] Net patches Jason Wang
2019-11-25 15:40 ` [PULL 1/4] net/virtio: fix dev_unplug_pending Jason Wang
2019-11-25 15:40 ` Jason Wang [this message]
2019-11-25 15:40 ` [PULL 3/4] net/virtio: fix re-plugging of primary device Jason Wang
2019-11-25 15:40 ` [PULL 4/4] net/virtio: return error when device_opts arg is NULL Jason Wang
2019-11-25 16:08   ` Paolo Bonzini
2019-11-26 12:36 ` [PULL 0/4] Net patches 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=1574696407-4188-3-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=jfreimann@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.