diff options
| author | Laurent Vivier | 2021-02-12 14:52:47 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2021-02-23 16:06:55 +0100 |
| commit | b01a49014a867dc75fdac610c436810ca62b335c (patch) | |
| tree | d2b1f5abff878591ac291c3dd067d840d93ba78f /hw/pci | |
| parent | Merge remote-tracking branch 'remotes/edgar/tags/edgar/cris-next-2021-02-22.f... (diff) | |
| download | qemu-b01a49014a867dc75fdac610c436810ca62b335c.tar.gz qemu-b01a49014a867dc75fdac610c436810ca62b335c.tar.xz qemu-b01a49014a867dc75fdac610c436810ca62b335c.zip | |
pci: cleanup failover sanity check
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>
Diffstat (limited to 'hw/pci')
| -rw-r--r-- | hw/pci/pci.c | 6 |
1 files 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)); |