From nobody Tue Nov 18 21:13:14 2025 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=1612615334; cv=none; d=zohomail.com; s=zohoarc; b=Na8M2Udu1Iw0VKsnb0nt8UaDHuGG2CBPNvrKVEVLR1okHk0jU9gyaq5jlFwEfvIILj0iED+5CW+IhdP6exFg57L/NpFnlBhLS44e5Cf1M9ygsAJXEZ/AmTl6csCu0NUmbmt0ppSuObYpVijtclO+dXA65aabmzyCR8+EIL8GCKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612615334; 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=QI+NqLQCNhrvXrKTBGhcB3XPjJssktvnihAr5eJCO9s=; b=EY9D/JY2YuYhJWfRfiR1DklvvO9FtLtgLPPsbQpglLYKsYcXkjBQwtBhm8T4cbhV+1IrWDJWY2Wzw19ZJSMldNNMwnS7jJZwxfSo3+ojgksn1fgSWN8Bz1zSqwVMwRIJdtypObFx1d/Q1wLbUDDJo9rw0rDiXtgx5vaQJC91KoY= 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 1612615334376381.70757131614414; Sat, 6 Feb 2021 04:42:14 -0800 (PST) Received: from localhost ([::1]:38812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8Muj-0007S0-52 for importer@patchew.org; Sat, 06 Feb 2021 07:42:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8Msm-0005sH-AY for qemu-devel@nongnu.org; Sat, 06 Feb 2021 07:40:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l8Msk-0003u5-2T for qemu-devel@nongnu.org; Sat, 06 Feb 2021 07:40:12 -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-203-P_yACN1xNByOBXwyyTSJeA-1; Sat, 06 Feb 2021 07:40:06 -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 341BFAFA81; Sat, 6 Feb 2021 12:40:05 +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 1A9355D9CC; Sat, 6 Feb 2021 12:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612615208; 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=QI+NqLQCNhrvXrKTBGhcB3XPjJssktvnihAr5eJCO9s=; b=gHcXNPuRW+lXO3TWSQIZ6sLwvdT+AbDLF5xytk8VkLiZiE/BTlPKB65n13ta337/XucUr+ 8IAcjP+tU/Ulu8lAC+i3cXutnb09MFMIAFd8rWyzQVfF5B3TUMihEjWX9WZtNf4n11QeO2 Ud0ZIKtcKtSwFSGCPJla1VBPRGj7VWY= X-MC-Unique: P_yACN1xNByOBXwyyTSJeA-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 1/2] pci: cleanup failover sanity check Date: Sat, 6 Feb 2021 13:39:54 +0100 Message-Id: <20210206123955.2196514-2-lvivier@redhat.com> In-Reply-To: <20210206123955.2196514-1-lvivier@redhat.com> References: <20210206123955.2196514-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.353, 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: qemu-trivial@nongnu.org, jfreimann@redhat.com, Laurent Vivier , quintela@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 --- 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