diff mbox

[1/3] Migration: Don't load vmdesc when xen is enabled

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

Commit Message

Zhang Chen Dec. 1, 2016, 6:06 a.m. UTC 
Xen need't this.

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

Comments

Eric Blake Dec. 1, 2016, 2:54 p.m. UTC | #1 
On 12/01/2016 12:06 AM, Zhang Chen wrote:
> Xen need't this.

Huh? Did you mean:

Xen doesn't need this.

> 
> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> Signed-off-by: Wen Congyang <wency@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.
>
Zhang Chen Dec. 2, 2016, 3 a.m. UTC | #2 
On 12/01/2016 10:54 PM, Eric Blake wrote:
> On 12/01/2016 12:06 AM, Zhang Chen wrote:
>> Xen need't this.
> Huh? Did you mean:
>
> Xen doesn't need this.

Yes, you get the point.
I will fix this comments in next version.

Thanks
Zhang Chen

>
>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>> Signed-off-by: Wen Congyang <wency@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.
>>
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.