qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 4/4] net/virtio: return error when device_opts arg is NULL
Date: Wed, 20 Nov 2019 16:49:51 +0100	[thread overview]
Message-ID: <20191120154951.27877-5-jfreimann@redhat.com> (raw)
In-Reply-To: <20191120154951.27877-1-jfreimann@redhat.com>

This fixes CID 1407222.

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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 565dea0b93..3c31471026 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -2880,9 +2880,12 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
             QemuOpts *device_opts)
 {
     VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
-    bool match_found;
-    bool hide;
+    bool match_found = false;
+    bool hide = false;
 
+    if (!device_opts) {
+        return -1;
+    }
     n->primary_device_dict = qemu_opts_to_qdict(device_opts,
             n->primary_device_dict);
     if (n->primary_device_dict) {
@@ -2890,7 +2893,7 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
         n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,
                     "failover_pair_id"));
     }
-    if (device_opts && g_strcmp0(n->standby_id, n->netclient_name) == 0) {
+    if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {
         match_found = true;
     } else {
         match_found = false;
-- 
2.21.0



  parent reply	other threads:[~2019-11-20 15:54 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 ` [PATCH v3 2/4] net/virtio: return early when failover primary alread added Jens Freimann
2019-11-20 15:55   ` 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 ` Jens Freimann [this message]
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-5-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).