[PATCH] libxc: move migration_stream's definition to xenguest.h

[PATCH] libxc: move migration_stream's definition to xenguest.h

[Wen Congyang]

xc_save_domain()'s parameter use this type, so it should
be public.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
 tools/libxc/include/xenguest.h | 10 ++++++++++
 tools/libxc/xc_sr_common.h     | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
index affc42b..888536e 100644
--- a/tools/libxc/include/xenguest.h
+++ b/tools/libxc/include/xenguest.h
@@ -238,4 +238,9 @@ xen_pfn_t *xc_map_m2p(xc_interface *xch,
                       unsigned long max_mfn,
                       int prot,
                       unsigned long *mfn0);
+
+typedef enum {
+    MIG_STREAM_NONE, /* plain stream */
+    MIG_STREAM_REMUS,
+} migration_stream;
 #endif /* XENGUEST_H */
diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h
index 66f595f..e7568b5 100644
--- a/tools/libxc/xc_sr_common.h
+++ b/tools/libxc/xc_sr_common.h
@@ -180,16 +180,6 @@ struct xc_sr_context
 
     xc_dominfo_t dominfo;
 
-    /*
-     * migration stream
-     * 0: Plain VM
-     * 1: Remus
-     */
-    enum {
-        MIG_STREAM_NONE, /* plain stream */
-        MIG_STREAM_REMUS,
-    } migration_stream;
-
     union /* Common save or restore data. */
     {
         struct /* Save data. */
-- 
2.5.0



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] libxc: move migration_stream's definition to xenguest.h

[Andrew Cooper]

On 08/03/16 05:32, Wen Congyang wrote:
> xc_save_domain()'s parameter use this type, so it should
> be public.

xc_domain_save() currently uses an int, which also needs fixing.

>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>

Does this even compile?  You have removed a variable without any
replacement.

> ---
>  tools/libxc/include/xenguest.h | 10 ++++++++++
>  tools/libxc/xc_sr_common.h     | 10 ----------
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
> index affc42b..888536e 100644
> --- a/tools/libxc/include/xenguest.h
> +++ b/tools/libxc/include/xenguest.h
> @@ -238,4 +238,9 @@ xen_pfn_t *xc_map_m2p(xc_interface *xch,
>                        unsigned long max_mfn,
>                        int prot,
>                        unsigned long *mfn0);
> +
> +typedef enum {
> +    MIG_STREAM_NONE, /* plain stream */
> +    MIG_STREAM_REMUS,
> +} migration_stream;

This typedef should be beside xc_domain_save() as that is where it is
intended to be used.  It also needs xc_ prefixes as it is part of the
public interface, and a typedef wants a _t suffix.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] libxc: move migration_stream's definition to xenguest.h

[Wen Congyang]

On 03/08/2016 06:38 PM, Andrew Cooper wrote:
> On 08/03/16 05:32, Wen Congyang wrote:
>> xc_save_domain()'s parameter use this type, so it should
>> be public.
> 
> xc_domain_save() currently uses an int, which also needs fixing.

OK. Will fix it in the next version.

> 
>>
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> 
> Does this even compile?  You have removed a variable without any
> replacement.

Yes, I compile it. The variable is not used.

> 
>> ---
>>  tools/libxc/include/xenguest.h | 10 ++++++++++
>>  tools/libxc/xc_sr_common.h     | 10 ----------
>>  2 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
>> index affc42b..888536e 100644
>> --- a/tools/libxc/include/xenguest.h
>> +++ b/tools/libxc/include/xenguest.h
>> @@ -238,4 +238,9 @@ xen_pfn_t *xc_map_m2p(xc_interface *xch,
>>                        unsigned long max_mfn,
>>                        int prot,
>>                        unsigned long *mfn0);
>> +
>> +typedef enum {
>> +    MIG_STREAM_NONE, /* plain stream */
>> +    MIG_STREAM_REMUS,
>> +} migration_stream;
> 
> This typedef should be beside xc_domain_save() as that is where it is
> intended to be used.  It also needs xc_ prefixes as it is part of the
> public interface, and a typedef wants a _t suffix.

OK. Will fix it in the next version.

Thanks
Wen Congyang

> 
> ~Andrew
> 
> 
> .
> 




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel