[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 1/3] qemu: Remove compiled out localhost migration support



On 11/03/2009 04:00 PM, Daniel P. Berrange wrote:
> 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 redhat com>
>> ---
>>  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

I've pushed this patch since it is separate from the rest. I'll post a
more complete patch with the other driver changes you suggested.

Thanks,
Cole


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]