[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v4 2/9] [HACK] tools/libxc: save/restore v2 framework
For testing purposes, the environmental variable "XG_MIGRATION_V2" allows the two save/restore codepaths to coexist, and have a runtime switch. It is indended that once this series is less RFC, the v2 framework will completely replace v1. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- tools/libxc/Makefile | 1 + tools/libxc/saverestore/common.h | 15 +++++++++++++++ tools/libxc/saverestore/restore.c | 23 +++++++++++++++++++++++ tools/libxc/saverestore/save.c | 20 ++++++++++++++++++++ tools/libxc/xc_domain_restore.c | 8 ++++++++ tools/libxc/xc_domain_save.c | 7 +++++++ tools/libxc/xenguest.h | 14 ++++++++++++++ 7 files changed, 88 insertions(+) create mode 100644 tools/libxc/saverestore/common.h create mode 100644 tools/libxc/saverestore/restore.c create mode 100644 tools/libxc/saverestore/save.c diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index a74b19e..52213dc 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -44,6 +44,7 @@ GUEST_SRCS-y := GUEST_SRCS-y += xg_private.c xc_suspend.c ifeq ($(CONFIG_MIGRATE),y) GUEST_SRCS-y += xc_domain_restore.c xc_domain_save.c +GUEST_SRCS-y += $(wildcard saverestore/*.c) GUEST_SRCS-y += xc_offline_page.c xc_compression.c else GUEST_SRCS-y += xc_nomigrate.c diff --git a/tools/libxc/saverestore/common.h b/tools/libxc/saverestore/common.h new file mode 100644 index 0000000..f1aff44 --- /dev/null +++ b/tools/libxc/saverestore/common.h @@ -0,0 +1,15 @@ +#ifndef __COMMON__H +#define __COMMON__H + +#include "../xg_private.h" + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/saverestore/restore.c b/tools/libxc/saverestore/restore.c new file mode 100644 index 0000000..6624baa --- /dev/null +++ b/tools/libxc/saverestore/restore.c @@ -0,0 +1,23 @@ +#include "common.h" + +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) +{ + IPRINTF("In experimental %s", __func__); + return -1; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/saverestore/save.c b/tools/libxc/saverestore/save.c new file mode 100644 index 0000000..c013e62 --- /dev/null +++ b/tools/libxc/saverestore/save.c @@ -0,0 +1,20 @@ +#include "common.h" + +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, + unsigned long vm_generationid_addr) +{ + IPRINTF("In experimental %s", __func__); + return -1; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index bcb0ae0..faa458a 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1468,6 +1468,14 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, struct restore_ctx *ctx = &_ctx; struct domain_info_context *dinfo = &ctx->dinfo; + if ( getenv("XG_MIGRATION_V2") ) + { + return xc_domain_restore2( + xch, io_fd, dom, store_evtchn, store_mfn, + store_domid, console_evtchn, console_mfn, console_domid, + hvm, pae, superpages, checkpointed_stream, callbacks); + } + DPRINTF("%s: starting restore of new domid %u", __func__, dom); pagebuf_init(&pagebuf); diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 71f9b59..c94e3e6 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -895,6 +895,13 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter int completed = 0; + if ( getenv("XG_MIGRATION_V2") ) + { + return xc_domain_save2(xch, io_fd, dom, max_iters, + max_factor, flags, callbacks, hvm, + vm_generationid_addr); + } + DPRINTF("%s: starting save of domid %u", __func__, dom); if ( hvm && !callbacks->switch_qemu_logdirty ) diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 1f216cd..b80df82 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -89,6 +89,11 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter struct save_callbacks* callbacks, int hvm, unsigned long vm_generationid_addr); +/* Domain Save v2 */ +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, + unsigned long vm_generationid_addr); /* callbacks provided by xc_domain_restore */ struct restore_callbacks { @@ -128,6 +133,15 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks); + +/* Domain Restore v2 */ +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); /** * xc_domain_restore writes a file to disk that contains the device * model saved state. -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |