[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/17] pci: cleanup failover sanity check
From: |
Michael S. Tsirkin |
Subject: |
[PULL 01/17] pci: cleanup failover sanity check |
Date: |
Tue, 23 Feb 2021 11:03:42 -0500 |
From: Laurent Vivier <lvivier@redhat.com>
Commit a1190ab628 has added a "allow_unplug_during_migration = 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 <lvivier@redhat.com>
Message-Id: <20210212135250.2738750-2-lvivier@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
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 a9ebef8a35..fa97a671d1 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2127,10 +2127,8 @@ static void pci_qdev_realize(DeviceState *qdev, Error
**errp)
pci_qdev_unrealize(DEVICE(pci_dev));
return;
}
- if (!(pci_dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION)
- && (PCI_FUNC(pci_dev->devfn) == 0)) {
- qdev->allow_unplug_during_migration = true;
- } else {
+ if ((pci_dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION)
+ || (PCI_FUNC(pci_dev->devfn) != 0)) {
error_setg(errp, "failover: primary device must be in its own "
"PCI slot");
pci_qdev_unrealize(DEVICE(pci_dev));
--
MST
- [PULL 00/17] pc,virtio,pci: fixes, tests, Michael S. Tsirkin, 2021/02/23
- [PULL 17/17] qtest/acpi/bios-tables-test: update acpi tables, Michael S. Tsirkin, 2021/02/23
- [PULL 10/17] ich9, piix4: add property, smm-compat, to keep compatibility of SMM, Michael S. Tsirkin, 2021/02/23
- [PULL 03/17] failover: really display a warning when the primary device is not found, Michael S. Tsirkin, 2021/02/23
- [PULL 05/17] acpi: Allow pxb DSDT acpi table changes, Michael S. Tsirkin, 2021/02/23
- [PULL 06/17] acpi/gpex: Fix cca attribute check for pxb device, Michael S. Tsirkin, 2021/02/23
- [PULL 07/17] tests/data/acpi/virt/DSDT.pxb: update with _CCA, Michael S. Tsirkin, 2021/02/23
- [PULL 13/17] acpi: add test case for smm unsupported -machine smm=off, Michael S. Tsirkin, 2021/02/23
- [PULL 02/17] virtio-net: add missing object_unref(), Michael S. Tsirkin, 2021/02/23
- [PULL 09/17] qtest: update tests/qtest/bios-tables-test-allowed-diff.h, Michael S. Tsirkin, 2021/02/23
- [PULL 01/17] pci: cleanup failover sanity check,
Michael S. Tsirkin <=
- [PULL 11/17] acpi/core: always set SCI_EN when SMM isn't supported, Michael S. Tsirkin, 2021/02/23
- [PULL 15/17] i386: acpi: Don't build HPET ACPI entry if HPET is disabled, Michael S. Tsirkin, 2021/02/23
- [PULL 04/17] pcie: don't set link state active if the slot is empty, Michael S. Tsirkin, 2021/02/23
- [PULL 16/17] acpi: add test case for -no-hpet, Michael S. Tsirkin, 2021/02/23
- [PULL 12/17] acpi: set fadt.smi_cmd to zero when SMM is not supported, Michael S. Tsirkin, 2021/02/23
- [PULL 14/17] hw/i386: declare ACPI mother board resource for MMCONFIG region, Michael S. Tsirkin, 2021/02/23
- [PULL 08/17] checkpatch: don't emit warning on newly created acpi data files, Michael S. Tsirkin, 2021/02/23
- Re: [PULL 00/17] pc,virtio,pci: fixes, tests, Peter Maydell, 2021/02/25