On Mon, Nov 02, 2009 at 02:52:37PM -0500, Cole Robinson wrote:
> Pretty sure this would deadlock now that we have proper locking, so
> remove the code.
>
> Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
> ---
> src/qemu/qemu_driver.c | 12 ------------
> 1 files changed, 0 insertions(+), 12 deletions(-)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index e8606c8..7eed356 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -6298,20 +6298,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) {
ACK
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list