qemu: slirp: Call qemuSlirpOpen directly from qemuSlirpStart

No need to ask the callers to call this extra function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 1e54d4ef2c2573d881185e032710f1ffa4db02ce..9ef2a984f545ee2556e612827414d5e48f81d643 100644 (file)
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -130,7 +130,6 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
                           virDomainObj *vm)
 {
     virDomainDef *def = vm->def;
-    size_t i;
 
     if (qemuExtDevicesInitPaths(driver, def) < 0)
         return -1;
@@ -139,14 +138,6 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
         qemuExtTPMPrepareHost(driver, def) < 0)
         return -1;
 
-    for (i = 0; i < def->nnets; i++) {
-        virDomainNetDef *net = def->nets[i];
-        qemuSlirp *slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp;
-
-        if (slirp && qemuSlirpOpen(slirp, driver, def) < 0)
-            return -1;
-    }
-
     return 0;
 }
 

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 9eeba0210fc1c578d9c825b7b4bc78e9d1b98b61..8f5e9715701901cf5bee4dcb159ddad2c826b245 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1313,8 +1313,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
             if (!(slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp))
                 break;
 
-            if (qemuSlirpOpen(slirp, driver, vm->def) < 0 ||
-                qemuSlirpStart(vm, net, NULL) < 0) {
+            if (qemuSlirpStart(vm, net, NULL) < 0) {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                "%s", _("Failed to start slirp"));
                 goto cleanup;

diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c
index e1f06573e3eb7370a5cdecf20da904cdcb00da95..136e4b29d221bd88e3c12dff12b79f74a43c0ff1 100644 (file)
--- a/src/qemu/qemu_slirp.c
+++ b/src/qemu/qemu_slirp.c
@@ -156,7 +156,7 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfig *cfg,
 }
 
 
-int
+static int
 qemuSlirpOpen(qemuSlirp *slirp,
               virQEMUDriver *driver,
               virDomainDef *def)
@@ -272,6 +272,9 @@ qemuSlirpStart(virDomainObj *vm,
                        _("The slirp-helper doesn't support migration"));
     }
 
+    if (qemuSlirpOpen(slirp, driver, vm->def) < 0)
+        return -1;
+
     if (!(pidfile = qemuSlirpCreatePidFilename(cfg, vm->def, net->info.alias)))
         return -1;
 

diff --git a/src/qemu/qemu_slirp.h b/src/qemu/qemu_slirp.h
index 507ea720fa5dd0e4e9fd5fd7bba2fe433fae1524..5a6a24b1784956aa4fab2c2547cb5c08f31a7401 100644 (file)
--- a/src/qemu/qemu_slirp.h
+++ b/src/qemu/qemu_slirp.h
@@ -57,10 +57,6 @@ void qemuSlirpSetFeature(qemuSlirp *slirp,
 bool qemuSlirpHasFeature(const qemuSlirp *slirp,
                          qemuSlirpFeature feature);
 
-int qemuSlirpOpen(qemuSlirp *slirp,
-                  virQEMUDriver *driver,
-                  virDomainDef *def);
-
 int qemuSlirpStart(virDomainObj *vm,
                    virDomainNetDef *net,
                    bool incoming);