From nobody Fri May 3 09:31:28 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=1574265288; cv=none; d=zoho.com; s=zohoarc; b=EapePhDS/8ealcxTAyFD5j9mqV6M3o4msUV8ONXmkdI+XuwjTi4vDN72XG/smMmzeYIGACwAsOJM/4ihvjjGfnM+N0QVsZjdut9HLe8KgWMyl1Ci+AQX3s/Ys7cXBXZfHwgSXr9xVpcB6UwAQknaxYn3VFeHJzwMpdirC7vg+hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574265288; 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=ngIgR973kGiZYgSR/f5ypn8StKJz8J7PbnLEm1Qx6ERIaZ3fRegQ4K2NPeHfdsquSYO9vOEV/exKoKxq+QOohKHdJgPI4TJ+XB2av1r5+wMa+9cKNsnNwieu/T5TrFLUL94Ec15JsAgpH7rFS9U8UnH83XB+Zy/7F+Sl79cocws= 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 157426528849319.59696787586961; Wed, 20 Nov 2019 07:54:48 -0800 (PST) Received: from localhost ([::1]:59706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSJX-0001GG-Mt for importer@patchew.org; Wed, 20 Nov 2019 10:54:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37738) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSF1-0003uU-PU for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXSEy-0002I5-9v for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:01 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:26376 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 1iXSEy-0002Hz-6x for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:00 -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-9-VWBm6RKlN8qDlKHevqC8Ww-1; Wed, 20 Nov 2019 10:49:58 -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 51DA3184CAA0; Wed, 20 Nov 2019 15:49:57 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF61166D2D; Wed, 20 Nov 2019 15:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574264999; 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=DT5CXk61S4owhxf37bn7oQg8bD/UoVs6yxUl2Hl6TqZQ6GHtTgj3bgVkoqAEiuSnkzBNnX nfPoqRUlaOOX8eOiaau8QHQ2qPaWFHslZgV8eP+m20xhpF/Eb/I+FXJJXRe1fX4n8dR1ZM /cTfyOROXO5FIslq+MU9z/iJvKgo3Ns= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v3 1/4] net/virtio: fix dev_unplug_pending Date: Wed, 20 Nov 2019 16:49:48 +0100 Message-Id: <20191120154951.27877-2-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.16 X-MC-Unique: VWBm6RKlN8qDlKHevqC8Ww-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" .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 Fri May 3 09:31:28 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=1574266196; cv=none; d=zoho.com; s=zohoarc; b=naMRqfLQH/aK3KO9mBpnmfjT4xqhtSlgSHPAnP6IvO/hQys7xu5HULjNhqoaJqjU+xiQGnc87o0gQ0keBXVHbY0Xc6l8wJVDvYd57hrFxpHwMAla3+Dnl8/DiqLijcvFbdvf5DuqzDF9Ff7TuRncEY00gaEFiwGz8LjZwNw0fFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574266196; 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=GlsYg18Kt+ThE+WQnzRP1kN9sSlrIcN0PLwUqr4i/l7K0zGpM5WNAoS1k5ZiU2A6QhDNVpi+R3ijMx6MW9a3Xl0I0HYnMLpWe1+JTzeTOAxzduYsGXiImgBNKcG3zfNpE/nHI60XP/UDld7OzEy1h0fWH9uNt2s6VD4n1pcWJCM= 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 1574266196109966.269929495743; Wed, 20 Nov 2019 08:09:56 -0800 (PST) Received: from localhost ([::1]:59950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSYE-00082g-M7 for importer@patchew.org; Wed, 20 Nov 2019 11:09:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37768) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSF4-0003we-Ew for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXSF3-0002Jv-FJ for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45250 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 1iXSF3-0002Jb-C6 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:05 -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-80-a9j9X46SM42lTfvaVYsYtw-1; Wed, 20 Nov 2019 10:50:02 -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 C36C68024CE; Wed, 20 Nov 2019 15:50:01 +0000 (UTC) Received: from localhost (dhcp-192-217.str.redhat.com [10.33.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB8C4503F1; Wed, 20 Nov 2019 15:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574265004; 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=GTqYQMXum9SPdeuDjobmms65E3GmrRho5uarbkMBMosOwM8vwQubcMsmKVjU4g9Ngcgo+j RqOaqceoSFjJCc79ugvCHKH8LFzSle+H8ajxVnfAkFXZdkYgLVWnajuAnUW2/icOvuXmzh 0pU7B1ea+ruGh8vmSVwIZWVhI0XZkBI= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v3 2/4] net/virtio: return early when failover primary alread added Date: Wed, 20 Nov 2019 16:49:49 +0100 Message-Id: <20191120154951.27877-3-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.12 X-MC-Unique: a9j9X46SM42lTfvaVYsYtw-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 Fri May 3 09:31:28 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=1574265426; cv=none; d=zoho.com; s=zohoarc; b=F/UD3XjIQA9pNUnPm3seIHDQvaWFfobSLCg9likQ1KCG+H6+dtwFGkizc91AiEIUGnLCGcDAYF/gexxWpiXUVpBYEjwOMfsFU9uKZpXFedj8F+Q0DXnT7PQhp6vbbD2Tc0LmrdvzwC/CSOTqbtEBkCTqLdpOisLPOG3ppl4shxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574265426; 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=ZO8Ws26p5uH1damHX0nkcb+HvUqZcEQPexx7u9zUG2U=; b=ZE/p0/t5E0mEu3d0IDlXsO//3geav3lld24LN7svsF65jBVqIuNjY8aVgMG2AepHsBVX5qBOg4/bgIph85JlgIuMgHpvSEFtOYZm0KW9Nfpo2WrQOKS6Rdr4NEwyRWUJs1jFYx8wqulHYrp+cTWEdNiA5CSVu9ZDn/nHm43FTJM= 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 1574265426723880.7797189646319; Wed, 20 Nov 2019 07:57:06 -0800 (PST) Received: from localhost ([::1]:59760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSLp-0005xe-2b for importer@patchew.org; Wed, 20 Nov 2019 10:57:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37795) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXSFC-00049U-Mm 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-0002On-F0 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:50:14 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38507 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 1iXSFB-0002O9-Aa 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-180-KBjgiNPyPwG8SaHAQeDiXA-1; Wed, 20 Nov 2019 10:50:09 -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 A4E5780268A; Wed, 20 Nov 2019 15:50: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 3F0E45195B; Wed, 20 Nov 2019 15:50:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574265012; 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=ZO8Ws26p5uH1damHX0nkcb+HvUqZcEQPexx7u9zUG2U=; b=YWhcJUOOP2lNO9t0AaEk3IallCuhHuC/O83Z9uZyu75ofPy8SoSluc8C0CwYxcUJ98yUpF wPWFTZ4Oc+lcQk/9peE776HF5hRb7JItPkt9buW2ZTIg07jUlXRA4SaNvbgf54nxW9QS+K QKfMqVaKcpqUx6+17LUZ7G9Ysmo3css= From: Jens Freimann To: qemu-devel@nongnu.org Subject: [PATCH v3 3/4] net/virtio: fix re-plugging of primary device Date: Wed, 20 Nov 2019 16:49:50 +0100 Message-Id: <20191120154951.27877-4-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: KBjgiNPyPwG8SaHAQeDiXA-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" failover_replug_primary was returning true on failure which lead to re-plug not working when a migration failed. Fix this by returning success when hotplug worked. This is a bug that was missed in last round of testing but was tested succesfully with this version. Also make sure we don't pass NULL to qdev_set_parent_bus(). 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..565dea0b93 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 Fri May 3 09:31:28 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=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