From nobody Sat May 4 07:41:29 2024 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=1574260824; cv=none; d=zoho.com; s=zohoarc; b=IFY4TgSrKkuUspc22iCKSCUvwneHGHqquSQYkXKBTXNNiLXRhch5bSHHIvKx/kHHlGU7zFpRspCe3vYcF+1I3mH1VX0K6L1nDae+SneoPw61Jry0Ud+szdC2C/OGnBJQbZ3cQZtSunFtuWm2HM0vTN/izaQ2oSHHj294m1Z34Vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574260824; 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=uANpi4ETWCKsezD49h9Xba8iURxarE4ymkAZ2Hp2byo=; b=Ro6WivZOSr11oCyFVFHlzlgJx0vY5jXAa5HHOluveI0AIXt5UKs5ex5S9KSAgTJOn/KVtOiolcVGgLvMbo/w86MzwJtv2upMmQ8atFmd49uCxjfDBt8yklH3Nt5H9ov0x7NIp8rGW7PJN8Dzjfkv/3omaSPS6eoAK0q/xJLSJl8= 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 1574260824671945.2760369894405; Wed, 20 Nov 2019 06:40:24 -0800 (PST) Received: from localhost ([::1]:58774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXR9b-0007ZH-FT for importer@patchew.org; Wed, 20 Nov 2019 09:40:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53216) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXR8S-0006NP-Tm for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXR8R-0007MG-TA for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21481 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 1iXR8R-0007Lz-Ne for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:11 -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-174-nrYGorGwPWSYiuMJil3lEw-1; Wed, 20 Nov 2019 09:39:09 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA43A5F9; Wed, 20 Nov 2019 14:39:08 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C9586013A; Wed, 20 Nov 2019 14:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574260751; 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=uANpi4ETWCKsezD49h9Xba8iURxarE4ymkAZ2Hp2byo=; b=TBEGijM0jmU8xsa+lYkQtqi3/jXNFKUCjiESfT56kvPSF+djiikey3kKBTySwZMTGHTh5g M+l0WxIqqJQ03Y6zzzh3+UjavXV2exAglogbTxI1kje0dOs4yD3BTpgZAaNJiVLaPPuUoy x7DO9BSNmrJPtT/yo293+fO3jpD3wec= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] net/virtio: fix dev_unplug_pending Date: Wed, 20 Nov 2019 15:38:56 +0100 Message-Id: <20191120143859.24584-2-jfreimann@redhat.com> In-Reply-To: <20191120143859.24584-1-jfreimann@redhat.com> References: <20191120143859.24584-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: nrYGorGwPWSYiuMJil3lEw-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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" .dev_unplug_pending is set up by virtio-net code indepent of failover support 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 =3D VIRTIO_DEVICE(dev); VirtIONet *n =3D VIRTIO_NET(vdev); =20 + if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { + return false; + } return n->primary_dev ? n->primary_dev->pending_deleted_event : false; } =20 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 =3D 0; =20 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++; } } --=20 2.21.0 From nobody Sat May 4 07:41:29 2024 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=1574260863; cv=none; d=zoho.com; s=zohoarc; b=WKwtsYFvjl1QYVJ/Z4Rv4GlOzG031GY77/0caD7QWy5tDUyd3JCIlwKtN4BDBPLACqUHN+wIC/zuGR7tYezXwe5/fo1QVksAyDPk/TolrDguvmgVioqCD4aMZPJ6w7PimaqvxKrAdFzGOACfU1qqu4fhy5xTHFblRusnzxMv1lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574260863; 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=qcoZucwgOalaIHzzTbveuBrCPhkujz6bPR/7gpRAwMo=; b=ZTPpkmHeZU4h3sC4cNDiR5fv1i8ha/WrRiUXbha1owPAl8iUqIz9iAsLAMbCADzFqdeECvfK1RBL+mjFGYlHMBpINhMZ+G133fDY5H0OLvI+GeL2TIhHGVmhCaBfabk+YOBWDBoxzujQrVK12KnPn8ac12UXxEcySvGV3VhpPSg= 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 1574260863012588.0260831868276; Wed, 20 Nov 2019 06:41:03 -0800 (PST) Received: from localhost ([::1]:58776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXRAA-0007rj-OD for importer@patchew.org; Wed, 20 Nov 2019 09:40:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53231) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXR8Y-0006TK-O6 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXR8X-0007QL-Nt for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22078 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 1iXR8X-0007QD-KM for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:17 -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-228-92E5i4PAOjym8kE3gfAggg-1; Wed, 20 Nov 2019 09:39:14 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7EF3A801E7E; Wed, 20 Nov 2019 14:39:13 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56A043841; Wed, 20 Nov 2019 14:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574260757; 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=qcoZucwgOalaIHzzTbveuBrCPhkujz6bPR/7gpRAwMo=; b=ISKP5lQLVT/yvKPQ+RrDtrtFbMMvk/Y35ew7PD+mRDq9gfJB41n3iqz5jmDWhjsYkMx/DG +enWOKambxFWtVtSRLqPrIPQcJYQ6ka4Q7ExoTaZyLG4tbl5/+OtUMrwk+zHA4zn9CGq8b KLOZpu7BIqyLBm3o/wIwS5NvQUxj/Vk= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] net/virtio: return early when failover primary alread added Date: Wed, 20 Nov 2019 15:38:57 +0100 Message-Id: <20191120143859.24584-3-jfreimann@redhat.com> In-Reply-To: <20191120143859.24584-1-jfreimann@redhat.com> References: <20191120143859.24584-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: 92E5i4PAOjym8kE3gfAggg-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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 =3D NULL; =20 + if (n->primary_dev) { + return; + } + n->primary_device_opts =3D qemu_opts_find(qemu_find_opts("device"), n->primary_device_id); if (n->primary_device_opts) { --=20 2.21.0 From nobody Sat May 4 07:41:29 2024 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=1574261309; cv=none; d=zoho.com; s=zohoarc; b=UXDvjCBUBkdGsyfgIaUFqdwFMimCsn50HNCQ51zxxODPqmI5arYqP8a5zKJ0l9wpqVpuwWTA6P0q8r+55RpsPbiyCuNK+/2Pv2m+v4y0pJMYbUrOon7weeXl0seYesf2yGYB+q3o8iycGBHTeQ3ttRs47UwY0dTRILl8+IBbOQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261309; 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=dMHW1WAgn70tsh97+exGzsGlsn1i7EXNYS2vp0eYyyY=; b=hEDF534WP00apoGBzbPnSq1T9OHK26YY6MFc62VQori3LZbrbdPo/UmbV/U4DZZo61mwZDPerCxoMpfk9rsfNCd8jpDWj3gXpocxcdCvl1eqVi4VBA7SAhl/ISkAntsW8GKBMFQwhX1QBuWknDrIi5pQjOOBjx6VCO5QKNg4dLY= 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 1574261309663945.4662226095819; Wed, 20 Nov 2019 06:48:29 -0800 (PST) Received: from localhost ([::1]:58868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXRHQ-0006U4-FU for importer@patchew.org; Wed, 20 Nov 2019 09:48:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53242) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXR8Z-0006UZ-R7 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXR8Y-0007Qq-NJ for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:19 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:28049 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 1iXR8Y-0007Qd-Jv for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:18 -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-301-VKCzY_DzNRyN6phr8gvUtg-1; Wed, 20 Nov 2019 09:39:16 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FB95107ACC4; Wed, 20 Nov 2019 14:39:15 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE4DE2A81F; Wed, 20 Nov 2019 14:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574260758; 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=dMHW1WAgn70tsh97+exGzsGlsn1i7EXNYS2vp0eYyyY=; b=OZ5Cn4zvyjhdKltB0iPjKuXLN78z6EjUyCUrko5pMz8lmYkBk/Cqj7SDxmM/LyQyudDOdA FwUDWzGvw2Pw4r73R2J0wapsYcGHryfEJX9Jz7326kg8Y4aXgxoUTXS9SBug8Wtepe4geF +x7/NmwDbpr+Fbpw3gS9bi1maSjzZz0= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] net/virtio: avoid passing NULL to qdev_set_parent_bus Date: Wed, 20 Nov 2019 15:38:58 +0100 Message-Id: <20191120143859.24584-4-jfreimann@redhat.com> In-Reply-To: <20191120143859.24584-1-jfreimann@redhat.com> References: <20191120143859.24584-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: VKCzY_DzNRyN6phr8gvUtg-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" Make sure we don't pass NULL to qdev_set_parent_bus(). Also simplify code a bit and fix a typo. This fixes CID 1407224. Fixes: 9711cd0dfc3f ("net/virtio: add failover support") Signed-off-by: Jens Freimann Reviewed-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ac4d19109e..78f1e4e87c 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2805,25 +2805,33 @@ static bool failover_replug_primary(VirtIONet *n, E= rror **errp) n->primary_device_opts =3D qemu_opts_from_qdict( qemu_find_opts("device"), n->primary_device_dict, errp); - } - if (n->primary_device_opts) { - if (n->primary_dev) { - n->primary_bus =3D n->primary_dev->parent_bus; - } - qdev_set_parent_bus(n->primary_dev, n->primary_bus); - n->primary_should_be_hidden =3D false; - qemu_opt_set_bool(n->primary_device_opts, - "partially_hotplugged", true, errp); - hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); - if (hotplug_ctrl) { - hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, errp); - hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp); + if (!n->primary_device_opts) { + error_setg(errp, "virtio_net: couldn't find primary device opt= s"); + goto out; } - if (!n->primary_dev) { + } + if (!n->primary_dev) { error_setg(errp, "virtio_net: couldn't find primary device"); - } + goto out; } - return *errp !=3D NULL; + + n->primary_bus =3D n->primary_dev->parent_bus; + if (!n->primary_bus) { + error_setg(errp, "virtio_net: couldn't find primary bus"); + goto out; + } + qdev_set_parent_bus(n->primary_dev, n->primary_bus); + n->primary_should_be_hidden =3D false; + qemu_opt_set_bool(n->primary_device_opts, + "partially_hotplugged", true, errp); + hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); + if (hotplug_ctrl) { + hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, errp); + hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp); + } + +out: + return *errp =3D=3D NULL; } =20 static void virtio_net_handle_migration_primary(VirtIONet *n, @@ -2852,7 +2860,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, warn_report("couldn't unplug primary device"); } } else if (migration_has_failed(s)) { - /* We already unplugged the device let's plugged it back */ + /* We already unplugged the device let's plug it back */ if (!failover_replug_primary(n, &err)) { if (err) { error_report_err(err); --=20 2.21.0 From nobody Sat May 4 07:41:29 2024 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=1574260870; cv=none; d=zoho.com; s=zohoarc; b=Rz7Z+hDJ5JfB03lkkJRJW4G5GTVnlO3oo6/jCYskwuiakhRJ+rjGkA2d/7CelIuhrZjJZmmW3xs2hJt1SDTliCzvlFlHExxUNurfs8S3oSa4+jSk1vBSRYBp3YxjWjvQcS3nnFrtrt+lOw4oR26nkV1Yb4dLz6W/Q+acU6VagJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574260870; 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=M9pYRjv3VeuFktCcSUcgMQg1M4EuZ19/lxOc7U4LRLc=; b=Bz/TfvBfWjA43hOigV/GrTlKg2pfyDj4AebT7wliC61DRcYgoBMiykFELq9g7gACPxu6AwlzVDYqCECHmGcpbbtijH+Aa1cg93lZR4D/LFU4eZLyR4QzRCEgtAKbpOPYYm4RPnaxpRFEbIluWu3ekV5K3YNRTET1xML57Uh51GM= 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 1574260870045569.033484632434; Wed, 20 Nov 2019 06:41:10 -0800 (PST) Received: from localhost ([::1]:58778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXRAJ-00089p-NH for importer@patchew.org; Wed, 20 Nov 2019 09:41:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXR8e-0006bN-1j for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXR8c-0007SW-VL for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:23 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:29806 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 1iXR8c-0007SI-Rl for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:39:22 -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-201-DoBA8QhzMlGYNL3LGMLePw-1; Wed, 20 Nov 2019 09:39:20 -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 D1056800A02; Wed, 20 Nov 2019 14:39:19 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BAE1810375F3; Wed, 20 Nov 2019 14:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574260762; 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=M9pYRjv3VeuFktCcSUcgMQg1M4EuZ19/lxOc7U4LRLc=; b=BXYZRkA8e4TWgU5DKy+WeMAxaIGhEZKO7b+F9N6FrkCPyqpmVrX992eg+07KPY51dyvWdJ bThtDeXeu14JwFB5lv8ID6D3/A9iWpZjFWvTm4zReEBqqI7AzaSt0JlQ66/LupVmWLV+G9 +3crxAmYO6ZGQuFW+o0deNVe9mzaLNw= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] net/virtio: return error when device_opts arg is NULL Date: Wed, 20 Nov 2019 15:38:59 +0100 Message-Id: <20191120143859.24584-5-jfreimann@redhat.com> In-Reply-To: <20191120143859.24584-1-jfreimann@redhat.com> References: <20191120143859.24584-1-jfreimann@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: DoBA8QhzMlGYNL3LGMLePw-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.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+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 78f1e4e87c..600c6e164f 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