Просмотр исходного кода

pci: Delete useless error_propagate()

Cc: Jens Freimann <jfreimann@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20200630090351.1247703-3-armbru@redhat.com>
Markus Armbruster 5 лет назад
Родитель
Сommit
5a79d10c95
1 измененных файлов с 0 добавлено и 3 удалено
  1. 0 3
      hw/pci/pci.c

+ 0 - 3
hw/pci/pci.c

@@ -2123,7 +2123,6 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp)
         if (!pci_bus_is_express(pci_get_bus(pci_dev))) {
         if (!pci_bus_is_express(pci_get_bus(pci_dev))) {
             error_setg(errp, "failover primary device must be on "
             error_setg(errp, "failover primary device must be on "
                              "PCIExpress bus");
                              "PCIExpress bus");
-            error_propagate(errp, local_err);
             pci_qdev_unrealize(DEVICE(pci_dev));
             pci_qdev_unrealize(DEVICE(pci_dev));
             return;
             return;
         }
         }
@@ -2131,7 +2130,6 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp)
         if (class_id != PCI_CLASS_NETWORK_ETHERNET) {
         if (class_id != PCI_CLASS_NETWORK_ETHERNET) {
             error_setg(errp, "failover primary device is not an "
             error_setg(errp, "failover primary device is not an "
                              "Ethernet device");
                              "Ethernet device");
-            error_propagate(errp, local_err);
             pci_qdev_unrealize(DEVICE(pci_dev));
             pci_qdev_unrealize(DEVICE(pci_dev));
             return;
             return;
         }
         }
@@ -2141,7 +2139,6 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp)
         } else {
         } else {
             error_setg(errp, "failover: primary device must be in its own "
             error_setg(errp, "failover: primary device must be in its own "
                               "PCI slot");
                               "PCI slot");
-            error_propagate(errp, local_err);
             pci_qdev_unrealize(DEVICE(pci_dev));
             pci_qdev_unrealize(DEVICE(pci_dev));
             return;
             return;
         }
         }