From nobody Mon Feb 9 21:38:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574265292; cv=none; d=zoho.com; s=zohoarc; b=BpKtZXtGNQ5iM7auCUeylavHbwjsCfq4FnJV4A1hMvV9aImw7Z+0fXBtjmmuiz006cJCpeDfHOeTMiw9dJuulF+RdT4bOaA/aDBguvXQ5k8yFeIYW0h+cpWeFKxNxVy6H9xOmhGWQ/q91L56xb4cC/PDoX0rS5AMc2xaCvi1ckU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574265292; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S4GebjPiX21nLkyXjWoYg0C+5rWkbSfx0p5LGY4gmms=; b=McbqVggpAAL31Ptlddtf9wQdyCHiXZh8le00u23PxRU6hqNojDebfDQFe6P11w0JLYmbhc340AbC+15PW+17djKXHkvFRhT2HTnHApS0YK71zYRoVIpgwpfrTGMyNYOdS2YmjOw60bBWJiWT+8YDng5WHjeHiU1M4Wnwo+d2Qhk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574265292190188.08580007954424; Wed, 20 Nov 2019 07:54:52 -0800 (PST) Received: from localhost ([::1]:59708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSJb-0001KA-MN for importer@patchew.org; Wed, 20 Nov 2019 10:54:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37793) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSFC-000495-Is for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXSFB-0002Oi-Ea for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:14 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:54455 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 1iXSFB-0002OP-AY for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:13 -0500 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-411-s_5Py7XUPp6YRdu7CDl3Cg-1; Wed, 20 Nov 2019 10:50:11 -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 76FDA800054; Wed, 20 Nov 2019 15:50:10 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FCFB63646; Wed, 20 Nov 2019 15:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574265013; 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=S4GebjPiX21nLkyXjWoYg0C+5rWkbSfx0p5LGY4gmms=; b=PnOovLJJPUHMX010Dd7HTBf+e+uNSxeypP5YJjiUVYcSt7ou2H+6y4vP02lQuwchoW+GNA dXIidqamZKF0Pi4V5dILUhYtWONmAHOHVT+SS6N0Syaot88yEXh4lNMRbhLpYCmYeFXtEH 7FFRWcBAdl8ysvs8r34Aw0INfMoAtAw= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v3 4/4] net/virtio: return error when device_opts arg is NULL Date: Wed, 20 Nov 2019 16:49:51 +0100 Message-Id: <20191120154951.27877-5-jfreimann@redhat.com> In-Reply-To: <20191120154951.27877-1-jfreimann@redhat.com> References: <20191120154951.27877-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: s_5Py7XUPp6YRdu7CDl3Cg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 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(Devic= eListener *listener, QemuOpts *device_opts) { VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); - bool match_found; - bool hide; + bool match_found =3D false; + bool hide =3D false; =20 + if (!device_opts) { + return -1; + } n->primary_device_dict =3D 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(Device= Listener *listener, n->standby_id =3D g_strdup(qdict_get_try_str(n->primary_device_dic= t, "failover_pair_id")); } - if (device_opts && g_strcmp0(n->standby_id, n->netclient_name) =3D=3D = 0) { + if (g_strcmp0(n->standby_id, n->netclient_name) =3D=3D 0) { match_found =3D true; } else { match_found =3D false; --=20 2.21.0