From patchwork Thu Nov 14 14:16:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 1194858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="gJLhVasd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DNqq6WQgz9s7T for ; Fri, 15 Nov 2019 01:18:15 +1100 (AEDT) Received: from localhost ([::1]:58144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFwq-0005uv-2p for incoming@patchwork.ozlabs.org; Thu, 14 Nov 2019 09:18:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42978) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFvE-0005u6-W2 for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVFvA-0005kt-5Y for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:30 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:48857 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVFv6-0005dk-9q for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573740982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Euag/sJfImZxY9Zxjc7u6UHKw9IIkmbQtq4GVyiwVKU=; b=gJLhVasdw/giSQZ05c4ajZeSHJUbkDNgM3JbkSnbfuyXzW9mMV03lQ80miowfJcHhWd8Sa y2Zv0ebcmbaGVp3oASipO9RhtiZxaE64wyrS/JwhrrahAEIcBF7fyUj/2+gxQhLOLArfRR VA+ylvQbodT+DEEXeCpH1TwPORhc7e8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-abjYyRmBPuW4zpNw08Un_w-1; Thu, 14 Nov 2019 09:16:19 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8757E1802CED; Thu, 14 Nov 2019 14:16:18 +0000 (UTC) Received: from localhost (ovpn-117-54.ams2.redhat.com [10.36.117.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 874806B8E8; Thu, 14 Nov 2019 14:16:15 +0000 (UTC) From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH 1/4] net/virtio: fix dev_unplug_pending Date: Thu, 14 Nov 2019 15:16:10 +0100 Message-Id: <20191114141613.15804-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: abjYyRmBPuW4zpNw08Un_w-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jasowang@redhat.com, dgilbert@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" .dev_unplug_pending is set up by virtio-net code indepent of whether failover=on was set for the device or not. This gives a wrong result when we check for existing primary devices in migration code. Fix this by actually calling dev_unplug_pending() instead of just checking if the function pointer was set. When the feature was not negotiated dev_unplug_pending() will always return false. This prevents us from going into the wait-unplug state when there's no primary device present. Fixes: 9711cd0dfc3f ("net/virtio: add failover support") Signed-off-by: Jens Freimann Reported-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 3 +++ migration/savevm.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 97a5113f7e..946039c0dc 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3124,6 +3124,9 @@ static bool primary_unplug_pending(void *opaque) VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIONet *n = VIRTIO_NET(vdev); + if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { + return false; + } return n->primary_dev ? n->primary_dev->pending_deleted_event : false; } diff --git a/migration/savevm.c b/migration/savevm.c index 966a9c3bdb..a71b930b91 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1119,7 +1119,8 @@ int qemu_savevm_nr_failover_devices(void) int n = 0; QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { - if (se->vmsd && se->vmsd->dev_unplug_pending) { + if (se->vmsd && se->vmsd->dev_unplug_pending && + se->vmsd->dev_unplug_pending(se->opaque)) { n++; } } From patchwork Thu Nov 14 14:16:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 1194860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Fy1Dei1H"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DNsj3lpDz9s7T for ; Fri, 15 Nov 2019 01:19:53 +1100 (AEDT) Received: from localhost ([::1]:58162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFyR-00083T-17 for incoming@patchwork.ozlabs.org; Thu, 14 Nov 2019 09:19:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43002) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFvG-0005uS-77 for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVFvE-0005ou-8s for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21874 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVFv9-0005gJ-VE for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573740985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yXLF/5v/Y0ulB8RgG6831J7A7kzz7pP2YMK7OORF2xs=; b=Fy1Dei1HaeC2W4upL8UelTddHTZ7xW20L13aMUOCzZ6ei+t+Wkne/SPuawtQ2fbhVOUSCC GgAvNc/PXriUowJCuFZzxXPaMM5oW1wGXAh3Vld6PZAbEuqZyj1PxWLJ+5g1NOevaLfmeB Lddefe3HZ+6fUgfkmW2Sgmdp6PjGyHI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-150-1Zgee5QzPzSGV2xggSK86g-1; Thu, 14 Nov 2019 09:16:24 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41CD31802CE5; Thu, 14 Nov 2019 14:16:23 +0000 (UTC) Received: from localhost (ovpn-117-54.ams2.redhat.com [10.36.117.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BDC010375DA; Thu, 14 Nov 2019 14:16:20 +0000 (UTC) From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH 2/4] net/virtio: return early when failover primary alread added Date: Thu, 14 Nov 2019 15:16:11 +0100 Message-Id: <20191114141613.15804-2-jfreimann@redhat.com> In-Reply-To: <20191114141613.15804-1-jfreimann@redhat.com> References: <20191114141613.15804-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 1Zgee5QzPzSGV2xggSK86g-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jasowang@redhat.com, dgilbert@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Michael S. Tsirkin --- 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) { From patchwork Thu Nov 14 14:16:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 1194862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="TpWnLz0P"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DNtC6rvNz9s7T for ; Fri, 15 Nov 2019 01:20:19 +1100 (AEDT) Received: from localhost ([::1]:58168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFyr-0000F2-Kb for incoming@patchwork.ozlabs.org; Thu, 14 Nov 2019 09:20:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43036) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFvJ-0005vO-J5 for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVFvI-0005tK-5L for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:37 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52100 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVFvI-0005rm-14 for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573740995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vp19o7nPJmeYy2waXOwQ6m55HRVX0oHH0OccOrsWHXY=; b=TpWnLz0PPkr+h7uE+Y5A3O0fAHOHMDZaRmt7e4L46KAehmr0DE42eCeZS1s4FIF8EMjEAv gnf4sqcROyXDCkR1lfyz0FD1phDRW3A2FSC33x2l0qEr4frFIh66DQ54AJMPAessD+tUe8 HmXjEgGYaG8qthFxKfRZ6WL4q4aNsgM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-H87gvM6NN5C4mXNOlyGNng-1; Thu, 14 Nov 2019 09:16:29 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 634D7107ACC5; Thu, 14 Nov 2019 14:16:28 +0000 (UTC) Received: from localhost (ovpn-117-54.ams2.redhat.com [10.36.117.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C2165DF3A; Thu, 14 Nov 2019 14:16:24 +0000 (UTC) From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH 3/4] net/virtio: avoid passing NULL to qdev_set_parent_bus Date: Thu, 14 Nov 2019 15:16:12 +0100 Message-Id: <20191114141613.15804-3-jfreimann@redhat.com> In-Reply-To: <20191114141613.15804-1-jfreimann@redhat.com> References: <20191114141613.15804-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: H87gvM6NN5C4mXNOlyGNng-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jasowang@redhat.com, dgilbert@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Make sure no arguments for qdev_set_parent_bus are NULL. This fixes CID 1407224. Fixes: 9711cd0dfc3f ("net/virtio: add failover support") Signed-off-by: Jens Freimann --- hw/net/virtio-net.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ac4d19109e..81650d4dc0 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2809,8 +2809,16 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) if (n->primary_device_opts) { if (n->primary_dev) { n->primary_bus = n->primary_dev->parent_bus; + if (n->primary_bus) { + qdev_set_parent_bus(n->primary_dev, n->primary_bus); + } else { + error_setg(errp, "virtio_net: couldn't set bus for primary"); + goto out; + } + } else { + error_setg(errp, "virtio_net: couldn't find primary device"); + goto out; } - qdev_set_parent_bus(n->primary_dev, n->primary_bus); n->primary_should_be_hidden = false; qemu_opt_set_bool(n->primary_device_opts, "partially_hotplugged", true, errp); @@ -2819,10 +2827,8 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, errp); hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp); } - if (!n->primary_dev) { - error_setg(errp, "virtio_net: couldn't find primary device"); - } } +out: return *errp != NULL; } From patchwork Thu Nov 14 14:16:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 1194861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SO2Mwl7H"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DNsq3sXPz9sPF for ; Fri, 15 Nov 2019 01:19:59 +1100 (AEDT) Received: from localhost ([::1]:58164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFyW-00089N-U8 for incoming@patchwork.ozlabs.org; Thu, 14 Nov 2019 09:19:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43052) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVFvL-0005xD-Cq for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVFvK-0005vT-59 for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:39 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:32245 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVFvK-0005uq-1r for qemu-devel@nongnu.org; Thu, 14 Nov 2019 09:16:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573740997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7otgk21TGtZNlyb00P+iaFfgZ/AszQJdHAIrPr7If2w=; b=SO2Mwl7HlvI0/0uL0rFZCvo2p+wSYvvM0t6TQ4taM3HcCWovCk67Kyob1ExzzvJjqqSHeU WJjPdnAXcLW3t5PQGy27OW7DS2JXiBSlDweMw4g5oeyyQny5394ZZx0nSL5RKhhCug7gfG o+r+zZINXWDme2RM08vGeBYQRat7zYU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-131-0HqWFb3yM_G6lZ7dfKR-FA-1; Thu, 14 Nov 2019 09:16:34 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 727B4107ACC5; Thu, 14 Nov 2019 14:16:33 +0000 (UTC) Received: from localhost (ovpn-117-54.ams2.redhat.com [10.36.117.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FA305F772; Thu, 14 Nov 2019 14:16:30 +0000 (UTC) From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH 4/4] net/virtio: return error when device_opts arg is NULL Date: Thu, 14 Nov 2019 15:16:13 +0100 Message-Id: <20191114141613.15804-4-jfreimann@redhat.com> In-Reply-To: <20191114141613.15804-1-jfreimann@redhat.com> References: <20191114141613.15804-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 0HqWFb3yM_G6lZ7dfKR-FA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jasowang@redhat.com, dgilbert@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" device_opts could be NULL. Make sure we don't pass it to qemu_opts_to_dict. When we made sure it can't be NULL we can also remove it from the if condition. This fixes CID 1407222. Fixes: 9711cd0dfc3f ("net/virtio: add failover support") Signed-off-by: Jens Freimann Reviewed-by: Michael S. Tsirkin --- 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 81650d4dc0..d53aa5796b 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2878,9 +2878,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) { @@ -2888,7 +2891,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;