From nobody Sat May 18 19:24:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1612979943; cv=none; d=zohomail.com; s=zohoarc; b=P+NP9KR0oZvlVkgsMz00euxF9qGO88d+kpwZRnlMy3BDeZDe5Z1B9SAbS0VFLwC1DPEROwl/nkjJuJiZG1O6RQgNF7rEitUBoBW2E4UmOP7JFBD2hR7yW2KHO7enwLNr6JcxZG0VSk6iFklGfMx8abZu3eZ65oO7HFlw2ARwc34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612979943; 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=EuCC9R9FNv7fnX3YMGPqoY3CBva5TdLYrsgneRj3v64=; b=Z73B/QPa56dyx8sIum+duqEM8ByvjHQNT21Jupt8HhfX6vMwSlJ6Kz2TLeedEmBeB6QbLT6aX7uHoIP3lqEAOIPDUP8HCJzEzvZntG9ZmyBZOya88UvWD9o0+KwPNNdaEHae7M5j+Iwrg6ZitTw+4ct5cJb6MWOvP8mB7jKbArE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1612979943157187.20593099090559; Wed, 10 Feb 2021 09:59:03 -0800 (PST) Received: from localhost ([::1]:43974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9tlW-0000pA-5h for importer@patchew.org; Wed, 10 Feb 2021 12:59:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9tYk-0007eP-U0 for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:45:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9tYU-00011E-L5 for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:45:46 -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-517-b2GrgOIjOhmXWQmw1RdWag-1; Wed, 10 Feb 2021 12:45:31 -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 57E91195D565; Wed, 10 Feb 2021 17:45:30 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46D6512D7E; Wed, 10 Feb 2021 17:45:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612979133; 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=EuCC9R9FNv7fnX3YMGPqoY3CBva5TdLYrsgneRj3v64=; b=eZt/nJD2D95bQ6gXeSSeLUJHsq1SkSHuK/AhFoHCMmT18VF1ROy2ly13VzYHnAtVkBUlvl 4YtaVEvxYZmkcem433v1zu+jjxbzp7VF6NUyUBAG5XsrM5HjXSftm8AAxhlMS+bLylWpc5 gYlDbbrAdSn8EA8DAoSyaMnMsscDtpg= X-MC-Unique: b2GrgOIjOhmXWQmw1RdWag-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] pci: cleanup failover sanity check Date: Wed, 10 Feb 2021 18:45:16 +0100 Message-Id: <20210210174518.2493928-2-lvivier@redhat.com> In-Reply-To: <20210210174518.2493928-1-lvivier@redhat.com> References: <20210210174518.2493928-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.568, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Jason Wang , quintela@redhat.com, Michael Tokarev , Laurent Vivier , jfreimann@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" Commit a1190ab628 has added a "allow_unplug_during_migration =3D true" at the end of the main "if" block, so it is not needed to set it anymore in the previous checking. Remove it, to have only sub-ifs that check for needed conditions and exit if one fails. Fixes: 4f5b6a05a4e7 ("pci: add option for net failover") Fixes: a1190ab628c0 ("migration: allow unplug during migration for failover= devices") Cc: jfreimann@redhat.com Signed-off-by: Laurent Vivier Reviewed-by: Jens Freimann Acked-by: Jason Wang --- hw/pci/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 512e9042ffae..ecb7aa31fabd 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2120,10 +2120,8 @@ static void pci_qdev_realize(DeviceState *qdev, Erro= r **errp) pci_qdev_unrealize(DEVICE(pci_dev)); return; } - if (!(pci_dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) - && (PCI_FUNC(pci_dev->devfn) =3D=3D 0)) { - qdev->allow_unplug_during_migration =3D true; - } else { + if ((pci_dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) + || (PCI_FUNC(pci_dev->devfn) !=3D 0)) { error_setg(errp, "failover: primary device must be in its own " "PCI slot"); pci_qdev_unrealize(DEVICE(pci_dev)); --=20 2.29.2 From nobody Sat May 18 19:24:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1612979532; cv=none; d=zohomail.com; s=zohoarc; b=Be5fBMkc5Ikfp9QPPf4C7a9KlfAOw4MNLxuqnxHLV1N0TV420PH/RZV3EtuYCu/NTvERDAyrpEyPeAH11SyD4nqSdAzJNfaSa+bMzTyWjluvAPEz3HKeWEeyCwBQiVlrFtLWy1at/UjPe8S+K8GEfdeEuKnQtlRsruu8Hgc+pyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612979532; 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=jxwgS7NtE/BTP9v07BCS4F0vyWuLu7/Pkc6SRM5BxpU=; b=dNqP3kV3E9ke6Cdz3QF4OolTeG7Ri+NrfVh5fznVc++IN0l23FuuMr/Bpjd4qnL2YMTKHuzyCv1LnKZIeYC05iT3kwhHvR4Ztfmqtdud4sXgapVC0CkGq835ggoczin+IyAGTP6gO6HbfIMi5V0EcvNhPs6JmosmZ55haqK5txg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1612979531673145.27163497541346; Wed, 10 Feb 2021 09:52:11 -0800 (PST) Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9tes-0002G3-7n for importer@patchew.org; Wed, 10 Feb 2021 12:52:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9tYk-0007eJ-RQ for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:45:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9tYW-00012F-AH for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:45:46 -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-408-uAkOiyEpNtGogLNWYYWndg-1; Wed, 10 Feb 2021 12:45:34 -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 BC14A107ACE3; Wed, 10 Feb 2021 17:45:32 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD10219CAD; Wed, 10 Feb 2021 17:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612979135; 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=jxwgS7NtE/BTP9v07BCS4F0vyWuLu7/Pkc6SRM5BxpU=; b=BKwfSlKfJ8kwajL1VD+N4pgQuOsDE6OrPPKm94rujGCGBA4gYnzB30E7VSyv7GYSe5QWy7 9O7XsWe7RFHJqy/CrvK5/UQMeUSGFD0p1Kp5c2jZKVAlcX7pO+CHMMqXBqF6AMs3HUhEKJ Y0/AnIqnEbbtD62Jo127C47pmn4o1Ec= X-MC-Unique: uAkOiyEpNtGogLNWYYWndg-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] virtio-net: add missing object_unref() Date: Wed, 10 Feb 2021 18:45:17 +0100 Message-Id: <20210210174518.2493928-3-lvivier@redhat.com> In-Reply-To: <20210210174518.2493928-1-lvivier@redhat.com> References: <20210210174518.2493928-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.568, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Jason Wang , quintela@redhat.com, Michael Tokarev , Laurent Vivier , jfreimann@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_add_primary() calls qdev_device_add() and doesn't unref the device. Because of that, when the device is unplugged a reference is remaining and prevents the cleanup of the object. This prevents to be able to plugin back the failover primary device, with errors like: (qemu) device_add vfio-pci,host=3D0000:41:00.0,id=3Dhostdev0,bus=3Droot.3= ,failover_pair_id=3Dnet0 (qemu) device_del hostdev0 We can check with "info qtree" and "info pci" that the device has been remo= ved, and then: (qemu) device_add vfio-pci,host=3D0000:41:00.0,id=3Dhostdev1,bus=3Droot.3= ,failover_pair_id=3Dnet0 Error: vfio 0000:41:00.0: device is already attached (qemu) device_add vfio-pci,host=3D0000:41:00.0,id=3Dhostdev0,bus=3Droot.3= ,failover_pair_id=3Dnet0 qemu-kvm: Duplicate ID 'hostdev0' for device Fixes: 21e8709b29cd ("failover: Remove primary_dev member") Cc: quintela@redhat.com Signed-off-by: Laurent Vivier Reviewed-by: Jens Freimann Acked-by: Jason Wang --- hw/net/virtio-net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 5150f295e8c5..1c5af08dc556 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -862,6 +862,8 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) dev =3D qdev_device_add(opts, &err); if (err) { qemu_opts_del(opts); + } else { + object_unref(OBJECT(dev)); } } else { error_setg(errp, "Primary device not found"); --=20 2.29.2 From nobody Sat May 18 19:24:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1612979725; cv=none; d=zohomail.com; s=zohoarc; b=dDrkJ3w8MCt7pU0YfPkNXZRJknqZ3yVmbxEO3/THTasIePASlBZ9pfm71K38kwZIOTgTe2Dcp5Rk51nZUR51D1sllIdIOJWrgDk2e/crqEIBzEr7G+hbXHBDbbztPZ4ycBl/dhihnLOR/sd3LHSDC3YeA/clVcqxU8HXyQ6/UTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612979725; 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=BZxSqmlJG2Scv7NK7OxzylGd6LnBR15diGzo7UDhz9s=; b=BzWM0LRGjeCNo3QZ2y0WUMPXVZ9HS9UcYWjygedMk81zBUEgsTmivL+yHDEJEdlVv7+0dRFudrLKS0ZgH0+BNnHMdsCIFmm+YBc8Z6zffQ3Ueg34EfnXyHflN6jAFR5nhdcJXhi3+ksfDaEXnXIuvPv7oRRv9hmRgfTxnTSUZ9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 161297972535880.19232108289214; Wed, 10 Feb 2021 09:55:25 -0800 (PST) Received: from localhost ([::1]:36536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9ti0-00062x-D7 for importer@patchew.org; Wed, 10 Feb 2021 12:55:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9tYo-0007fk-3j for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:45:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9tYa-00013P-CT for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:45:53 -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-16-5BphYwvMPtWGRPdH0tEewQ-1; Wed, 10 Feb 2021 12:45:36 -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 30517195D561; Wed, 10 Feb 2021 17:45:35 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DEE719809; Wed, 10 Feb 2021 17:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612979138; 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=BZxSqmlJG2Scv7NK7OxzylGd6LnBR15diGzo7UDhz9s=; b=Wup5szjUzTfekFneW5PzFDtJXo8Om3ZLwgziL5IHGO3hlRX4Q15P792dfbkYNmOXBzWCbO Sds5a/4z4LlMjkEPkzJgjFr1lrVuPDRIWZ7htM2hBMXEsbM8iVeMeMcDaQBniUd0GVrBYi TzbR4StB8TZhPtu7hfy+/EWIOwFPYcg= X-MC-Unique: 5BphYwvMPtWGRPdH0tEewQ-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] failover: really display a warning when the primary device is not found Date: Wed, 10 Feb 2021 18:45:18 +0100 Message-Id: <20210210174518.2493928-4-lvivier@redhat.com> In-Reply-To: <20210210174518.2493928-1-lvivier@redhat.com> References: <20210210174518.2493928-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.568, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Jason Wang , quintela@redhat.com, Michael Tokarev , Laurent Vivier , jfreimann@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" In failover_add_primary(), we search the id of the failover device by scanning the list of the devices in the opts list to find a device with a failover_pair_id equals to the id of the virtio-net device. If the failover_pair_id is not found, QEMU ignores the primary device silently (which also means it will not be hidden and it will be enabled directly at boot). After that, we search the id in the opts list to do a qdev_device_add() with it. The device will be always found as otherwise we had exited before, and thus the warning is never displayed. Fix that by moving the error report to the first exit condition. Also add a g_assert() to be sure the compiler will not complain about a possibly NULL pointer. Signed-off-by: Laurent Vivier Acked-by: Jason Wang --- hw/net/virtio-net.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 1c5af08dc556..439f823b190c 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -855,21 +855,19 @@ static void failover_add_primary(VirtIONet *n, Error = **errp) =20 id =3D failover_find_primary_device_id(n); if (!id) { + error_setg(errp, "Primary device not found"); + error_append_hint(errp, "Virtio-net failover will not work. Make " + "sure primary device has parameter" + " failover_pair_id=3D%s\n", n->netclient_name); return; } opts =3D qemu_opts_find(qemu_find_opts("device"), id); - if (opts) { - dev =3D qdev_device_add(opts, &err); - if (err) { - qemu_opts_del(opts); - } else { - object_unref(OBJECT(dev)); - } + g_assert(opts); /* cannot be NULL because id was found using opts list= */ + dev =3D qdev_device_add(opts, &err); + if (err) { + qemu_opts_del(opts); } else { - error_setg(errp, "Primary device not found"); - error_append_hint(errp, "Virtio-net failover will not work. Make " - "sure primary device has parameter" - " failover_pair_id=3D\n"); + object_unref(OBJECT(dev)); } error_propagate(errp, err); } --=20 2.29.2