diff mbox

[for-2.9,V3,1/3] Migration: Don't load vmdesc when xen is enabled

Message ID 1481263496-8004-2-git-send-email-zhangchen.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Zhang Chen Dec. 9, 2016, 6:04 a.m. UTC
Xen doesn't need this.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
---
 migration/savevm.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Stefano Stabellini Dec. 14, 2016, 1 a.m. UTC | #1
On Fri, 9 Dec 2016, Zhang Chen wrote:
> Xen doesn't need this.

Could you please elaborate a bit more on what is the problem exactly,
and why we don't have any issues with migration with Xen today (COLO
use-case aside)?


> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> ---
>  migration/savevm.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 0363372..bec6c7e 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1973,6 +1973,10 @@ int qemu_loadvm_state(QEMUFile *f)
>          ret = qemu_file_get_error(f);
>      }
>  
> +    if (xen_enabled()) {
> +        return ret;
> +    }
> +
>      /*
>       * Try to read in the VMDESC section as well, so that dumping tools that
>       * intercept our migration stream have the chance to see it.
> -- 
> 2.7.4
> 
> 
> 
>
Zhang Chen Dec. 15, 2016, 6:46 a.m. UTC | #2
On 12/14/2016 09:00 AM, Stefano Stabellini wrote:
> On Fri, 9 Dec 2016, Zhang Chen wrote:
>> Xen doesn't need this.
> Could you please elaborate a bit more on what is the problem exactly,
> and why we don't have any issues with migration with Xen today (COLO
> use-case aside)?
>

I test COLO without this patch, it seems run normally.
And I review the codes not find why we need this too.
So, I cc the original author wency about this.

CC. wency.

Thanks
Zhang Chen

>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>> ---
>>   migration/savevm.c | 4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/migration/savevm.c b/migration/savevm.c
>> index 0363372..bec6c7e 100644
>> --- a/migration/savevm.c
>> +++ b/migration/savevm.c
>> @@ -1973,6 +1973,10 @@ int qemu_loadvm_state(QEMUFile *f)
>>           ret = qemu_file_get_error(f);
>>       }
>>   
>> +    if (xen_enabled()) {
>> +        return ret;
>> +    }
>> +
>>       /*
>>        * Try to read in the VMDESC section as well, so that dumping tools that
>>        * intercept our migration stream have the chance to see it.
>> -- 
>> 2.7.4
>>
>>
>>
>>
>
> .
>
Zhang Chen Dec. 15, 2016, 8:46 a.m. UTC | #3
On 12/15/2016 02:46 PM, Zhang Chen wrote:
>
>
> On 12/14/2016 09:00 AM, Stefano Stabellini wrote:
>> On Fri, 9 Dec 2016, Zhang Chen wrote:
>>> Xen doesn't need this.
>> Could you please elaborate a bit more on what is the problem exactly,
>> and why we don't have any issues with migration with Xen today (COLO
>> use-case aside)?
>>
>
> I test COLO without this patch, it seems run normally.
> And I review the codes not find why we need this too.
> So, I cc the original author wency about this.
>
> CC. wency.
>

I contacted wency, Here we can ignore this patch.
I will remove this patch in next version.

Thanks
Zhang Chen

> Thanks
> Zhang Chen
>
>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>> ---
>>>   migration/savevm.c | 4 ++++
>>>   1 file changed, 4 insertions(+)
>>>
>>> diff --git a/migration/savevm.c b/migration/savevm.c
>>> index 0363372..bec6c7e 100644
>>> --- a/migration/savevm.c
>>> +++ b/migration/savevm.c
>>> @@ -1973,6 +1973,10 @@ int qemu_loadvm_state(QEMUFile *f)
>>>           ret = qemu_file_get_error(f);
>>>       }
>>>   +    if (xen_enabled()) {
>>> +        return ret;
>>> +    }
>>> +
>>>       /*
>>>        * Try to read in the VMDESC section as well, so that dumping 
>>> tools that
>>>        * intercept our migration stream have the chance to see it.
>>> -- 
>>> 2.7.4
>>>
>>>
>>>
>>>
>>
>> .
>>
>
diff mbox

Patch

diff --git a/migration/savevm.c b/migration/savevm.c
index 0363372..bec6c7e 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1973,6 +1973,10 @@  int qemu_loadvm_state(QEMUFile *f)
         ret = qemu_file_get_error(f);
     }
 
+    if (xen_enabled()) {
+        return ret;
+    }
+
     /*
      * Try to read in the VMDESC section as well, so that dumping tools that
      * intercept our migration stream have the chance to see it.