* [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2.
@ 2015-07-15 11:43 Ian Campbell
2015-07-15 11:44 ` Andrew Cooper
2015-07-15 11:55 ` Wei Liu
0 siblings, 2 replies; 4+ messages in thread
From: Ian Campbell @ 2015-07-15 11:43 UTC (permalink / raw)
To: ian.jackson, wei.liu2; +Cc: Andrew Cooper, Ian Campbell, xen-devel
Fixes the build on ARM after the switch to migration v2 in
210b4817529d "tools/libxc+libxl+xl: Save v2 streams" and
3a9ace0147d4 "tools/libxc+libxl+xl: Restore v2 streams".
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
tools/libxc/xc_nomigrate.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c
index 76978a036..426aee6 100644
--- a/tools/libxc/xc_nomigrate.c
+++ b/tools/libxc/xc_nomigrate.c
@@ -29,6 +29,14 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
return -1;
}
+int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters,
+ uint32_t max_factor, uint32_t flags,
+ struct save_callbacks* callbacks, int hvm)
+{
+ errno = ENOSYS;
+ return -1;
+}
+
int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
unsigned int store_evtchn, unsigned long *store_mfn,
domid_t store_domid, unsigned int console_evtchn,
@@ -41,6 +49,18 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
return -1;
}
+int xc_domain_restore2(xc_interface *xch, int io_fd, uint32_t dom,
+ unsigned int store_evtchn, unsigned long *store_mfn,
+ domid_t store_domid, unsigned int console_evtchn,
+ unsigned long *console_mfn, domid_t console_domid,
+ unsigned int hvm, unsigned int pae, int superpages,
+ int checkpointed_stream,
+ struct restore_callbacks *callbacks)
+{
+ errno = ENOSYS;
+ return -1;
+}
+
/*
* Local variables:
* mode: C
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2.
2015-07-15 11:43 [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2 Ian Campbell
@ 2015-07-15 11:44 ` Andrew Cooper
2015-07-15 12:00 ` Ian Campbell
2015-07-15 11:55 ` Wei Liu
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Cooper @ 2015-07-15 11:44 UTC (permalink / raw)
To: Ian Campbell, ian.jackson, wei.liu2; +Cc: xen-devel
On 15/07/15 12:43, Ian Campbell wrote:
> Fixes the build on ARM after the switch to migration v2 in
> 210b4817529d "tools/libxc+libxl+xl: Save v2 streams" and
> 3a9ace0147d4 "tools/libxc+libxl+xl: Restore v2 streams".
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Sorry for breaking it!
> ---
> tools/libxc/xc_nomigrate.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c
> index 76978a036..426aee6 100644
> --- a/tools/libxc/xc_nomigrate.c
> +++ b/tools/libxc/xc_nomigrate.c
> @@ -29,6 +29,14 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
> return -1;
> }
>
> +int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters,
> + uint32_t max_factor, uint32_t flags,
> + struct save_callbacks* callbacks, int hvm)
> +{
> + errno = ENOSYS;
> + return -1;
> +}
> +
> int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
> unsigned int store_evtchn, unsigned long *store_mfn,
> domid_t store_domid, unsigned int console_evtchn,
> @@ -41,6 +49,18 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
> return -1;
> }
>
> +int xc_domain_restore2(xc_interface *xch, int io_fd, uint32_t dom,
> + unsigned int store_evtchn, unsigned long *store_mfn,
> + domid_t store_domid, unsigned int console_evtchn,
> + unsigned long *console_mfn, domid_t console_domid,
> + unsigned int hvm, unsigned int pae, int superpages,
> + int checkpointed_stream,
> + struct restore_callbacks *callbacks)
> +{
> + errno = ENOSYS;
> + return -1;
> +}
> +
> /*
> * Local variables:
> * mode: C
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2.
2015-07-15 11:44 ` Andrew Cooper
@ 2015-07-15 12:00 ` Ian Campbell
0 siblings, 0 replies; 4+ messages in thread
From: Ian Campbell @ 2015-07-15 12:00 UTC (permalink / raw)
To: Andrew Cooper; +Cc: wei.liu2, ian.jackson, xen-devel
On Wed, 2015-07-15 at 12:44 +0100, Andrew Cooper wrote:
> On 15/07/15 12:43, Ian Campbell wrote:
> > Fixes the build on ARM after the switch to migration v2 in
> > 210b4817529d "tools/libxc+libxl+xl: Save v2 streams" and
> > 3a9ace0147d4 "tools/libxc+libxl+xl: Restore v2 streams".
> >
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Andrew Cooper <andrew.cooper3@citrix.com>
>
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Thanks, I've pushed with this and Wei's ack.
> Sorry for breaking it!
S'ok...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2.
2015-07-15 11:43 [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2 Ian Campbell
2015-07-15 11:44 ` Andrew Cooper
@ 2015-07-15 11:55 ` Wei Liu
1 sibling, 0 replies; 4+ messages in thread
From: Wei Liu @ 2015-07-15 11:55 UTC (permalink / raw)
To: Ian Campbell; +Cc: wei.liu2, Andrew Cooper, ian.jackson, xen-devel
On Wed, Jul 15, 2015 at 12:43:00PM +0100, Ian Campbell wrote:
> Fixes the build on ARM after the switch to migration v2 in
> 210b4817529d "tools/libxc+libxl+xl: Save v2 streams" and
> 3a9ace0147d4 "tools/libxc+libxl+xl: Restore v2 streams".
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/libxc/xc_nomigrate.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c
> index 76978a036..426aee6 100644
> --- a/tools/libxc/xc_nomigrate.c
> +++ b/tools/libxc/xc_nomigrate.c
> @@ -29,6 +29,14 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter
> return -1;
> }
>
> +int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters,
> + uint32_t max_factor, uint32_t flags,
> + struct save_callbacks* callbacks, int hvm)
> +{
> + errno = ENOSYS;
> + return -1;
> +}
> +
> int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
> unsigned int store_evtchn, unsigned long *store_mfn,
> domid_t store_domid, unsigned int console_evtchn,
> @@ -41,6 +49,18 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
> return -1;
> }
>
> +int xc_domain_restore2(xc_interface *xch, int io_fd, uint32_t dom,
> + unsigned int store_evtchn, unsigned long *store_mfn,
> + domid_t store_domid, unsigned int console_evtchn,
> + unsigned long *console_mfn, domid_t console_domid,
> + unsigned int hvm, unsigned int pae, int superpages,
> + int checkpointed_stream,
> + struct restore_callbacks *callbacks)
> +{
> + errno = ENOSYS;
> + return -1;
> +}
> +
> /*
> * Local variables:
> * mode: C
> --
> 2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-15 12:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-15 11:43 [PATCH] tools: libxc: Add nomigrate stubs for xc_domain_(save|restore)2 Ian Campbell
2015-07-15 11:44 ` Andrew Cooper
2015-07-15 12:00 ` Ian Campbell
2015-07-15 11:55 ` Wei Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.