From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 2 Nov 2009 18:49:44 +0000 (-0500)
Subject: qemu: Remove compiled out localhost migration support
X-Git-Tag: v0.7.3~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f5115627b0fd63653fca166515cfa4428d75c7c;p=thirdparty%2Flibvirt.git

qemu: Remove compiled out localhost migration support

Pretty sure this would deadlock now that we have proper locking, so
remove the code.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8692676158..5ff7e9405d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6288,20 +6288,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn,
     /* Target domain name, maybe renamed. */
     dname = dname ? dname : def->name;
 
-#if 1
     /* Ensure the name and UUID don't already exist in an active VM */
     vm = virDomainFindByUUID(&driver->domains, def->uuid);
-#else
-    /* For TESTING ONLY you can change #if 1 -> #if 0 above and use
-     * this code which lets you do localhost migrations.  You must still
-     * supply a fresh 'dname' but this code assigns a random UUID.
-     */
-    if (virUUIDGenerate (def->uuid) == -1) {
-        qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-            _("could not generate random UUID"));
-        goto cleanup;
-    }
-#endif
 
     if (!vm) vm = virDomainFindByName(&driver->domains, dname);
     if (vm) {