From nobody Fri Apr 19 12:24:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1610383667; cv=none; d=zohomail.com; s=zohoarc; b=D6Zr8b9d07kEEvu5xcvYYQUCb5w466HEzj/eBYB3aM2Mpyy7TEY21MblZYFjfx614OrxR84op60BP48EondUCQzPOk02wXk8N9prPkIhWb6kqB6TlCp1syif4JGZdZef3M2eF+jBe228bXh6vb/1n4/uUvfiwa82PTlVorCpAyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610383667; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VIwyZ+ealOyNyng8rMiChEqu72G0dtDx1NttoU2LTNI=; b=N9OyMDThBJK3NE70bdRLQL+NagGKiuvXv3+ybkOuABtGkYmtIKgr/0fRlRWv7RgCH9bwUHUtGh2lwnJNog3hBkXimcFOpwFgpXC9XVXZW5PXjg2wVRAISuFDdbVBJfOkUuoQCrGbwJBMP/HsQusnLS3+/tq5H8NrUfaC4KaTbvs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1610383666885340.60362225031133; Mon, 11 Jan 2021 08:47:46 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.65057.115125 (Exim 4.92) (envelope-from ) id 1kz0Le-00050R-LO; Mon, 11 Jan 2021 16:47:18 +0000 Received: by outflank-mailman (output) from mailman id 65057.115125; Mon, 11 Jan 2021 16:47:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz0Le-00050K-IL; Mon, 11 Jan 2021 16:47:18 +0000 Received: by outflank-mailman (input) for mailman id 65057; Mon, 11 Jan 2021 16:47:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz0Ld-00050F-Jq for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 16:47:17 +0000 Received: from mo4-p01-ob.smtp.rzone.de (unknown [81.169.146.167]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f323040b-29f4-48a6-8ebd-db0d4b2696a3; Mon, 11 Jan 2021 16:47:14 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BGksLsA (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 17:46:54 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f323040b-29f4-48a6-8ebd-db0d4b2696a3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610383633; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:From:Subject:Sender; bh=VIwyZ+ealOyNyng8rMiChEqu72G0dtDx1NttoU2LTNI=; b=nHkNHl/vdw3FWoG8DoilHdMBpcUi5Fg/aOwJ7pKGRycpCZAjIKnQhxAvIBAXYTdHHn eovXKeHxDhuQ3CVhmXzFSOcnCsObQUfv0qzjA0LWTUHxxy+EAgIotNZATNhnWSQixuR1 +ag0GMCI2+0MokRS9RbbAez6f6YTeLIeq/JI5gXSW4cP2gCfmHJ+ZPQJP5YTWNm3bQW1 TBEwlyBr26h0bzPKU4MHMm9qvfjcIOKazVs03SnJy8wrnZP5szufZA7cwGbbsgjDLZo5 5EMfFwPX8FzW9ZMPPuWKnJD0QU62xo0OJk69GPBj0opqZYfdG+T9pDKd9YUTwNgOXmga 99FQ== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Anthony PERARD Subject: [PATCH v2] tools: create libxensaverestore Date: Mon, 11 Jan 2021 17:46:46 +0100 Message-Id: <20210111164646.13543-1-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Move all save/restore related code from libxenguest.so into a separate library libxensaverestore.so. The only consumer is libxl-save-helper. There is no need to have the moved code mapped all the time in binaries where libxenguest.so is used. According to size(1) the change is: text data bss dec hex filename 187183 4304 48 191535 2ec2f guest/libxenguest.so.4.15.0 124106 3376 48 127530 1f22a guest/libxenguest.so.4.15.0 67841 1872 8 69721 11059 saverestore/libxensaverestore.so.4.= 15.0 Signed-off-by: Olaf Hering --- v2: - copy also license header - move xg_nomigrate.c - add size(1) output to commit msg - remove change from libxl_create.c --- .gitignore | 2 + tools/include/xenguest.h | 186 ---------------- tools/include/xensaverestore.h | 208 ++++++++++++++++++ tools/libs/Makefile | 1 + tools/libs/guest/Makefile | 11 - tools/libs/guest/xg_offline_page.c | 1 - tools/libs/light/Makefile | 4 +- tools/libs/light/libxl_internal.h | 1 + tools/libs/light/libxl_save_helper.c | 1 + tools/libs/light/libxl_save_msgs_gen.pl | 2 +- tools/libs/saverestore/Makefile | 38 ++++ .../{guest =3D> saverestore}/xg_nomigrate.c | 0 .../{guest =3D> saverestore}/xg_save_restore.h | 2 - .../{guest =3D> saverestore}/xg_sr_common.c | 0 .../{guest =3D> saverestore}/xg_sr_common.h | 12 + .../{guest =3D> saverestore}/xg_sr_common_x86.c | 0 .../{guest =3D> saverestore}/xg_sr_common_x86.h | 0 .../xg_sr_common_x86_pv.c | 0 .../xg_sr_common_x86_pv.h | 0 .../{guest =3D> saverestore}/xg_sr_restore.c | 0 .../xg_sr_restore_x86_hvm.c | 0 .../xg_sr_restore_x86_pv.c | 0 .../libs/{guest =3D> saverestore}/xg_sr_save.c | 0 .../xg_sr_save_x86_hvm.c | 0 .../xg_sr_save_x86_pv.c | 0 .../xg_sr_stream_format.h | 0 tools/libs/uselibs.mk | 4 +- 27 files changed, 269 insertions(+), 204 deletions(-) create mode 100644 tools/include/xensaverestore.h create mode 100644 tools/libs/saverestore/Makefile rename tools/libs/{guest =3D> saverestore}/xg_nomigrate.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_save_restore.h (98%) rename tools/libs/{guest =3D> saverestore}/xg_sr_common.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_common.h (98%) rename tools/libs/{guest =3D> saverestore}/xg_sr_common_x86.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_common_x86.h (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_common_x86_pv.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_common_x86_pv.h (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_restore.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_restore_x86_hvm.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_restore_x86_pv.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_save.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_save_x86_hvm.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_save_x86_pv.c (100%) rename tools/libs/{guest =3D> saverestore}/xg_sr_stream_format.h (100%) diff --git a/.gitignore b/.gitignore index b169d78ed7..5c23d28f6b 100644 --- a/.gitignore +++ b/.gitignore @@ -144,6 +144,8 @@ tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* tools/libs/light/xenlight.pc +tools/libs/saverestore/libxensaverestore.map +tools/libs/saverestore/xensaverestore.pc tools/libs/stat/_paths.h tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map diff --git a/tools/include/xenguest.h b/tools/include/xenguest.h index 775cf34c04..23a407c56f 100644 --- a/tools/include/xenguest.h +++ b/tools/include/xenguest.h @@ -24,9 +24,6 @@ =20 #define XC_NUMA_NO_NODE (~0U) =20 -#define XCFLAGS_LIVE (1 << 0) -#define XCFLAGS_DEBUG (1 << 1) - #define X86_64_B_SIZE 64=20 #define X86_32_B_SIZE 32 =20 @@ -434,189 +431,6 @@ static inline xen_pfn_t xc_dom_p2m(struct xc_dom_imag= e *dom, xen_pfn_t pfn) */ struct xenevtchn_handle; =20 -/* For save's precopy_policy(). */ -struct precopy_stats -{ - unsigned int iteration; - unsigned long total_written; - long dirty_count; /* -1 if unknown */ -}; - -/* - * A precopy_policy callback may not be running in the same address - * space as libxc an so precopy_stats is passed by value. - */ -typedef int (*precopy_policy_t)(struct precopy_stats, void *); - -/* callbacks provided by xc_domain_save */ -struct save_callbacks { - /* - * Called after expiration of checkpoint interval, - * to suspend the guest. - */ - int (*suspend)(void *data); - - /* - * Called before and after every batch of page data sent during - * the precopy phase of a live migration to ask the caller what - * to do next based on the current state of the precopy migration. - * - * Should return one of the values listed below: - */ -#define XGS_POLICY_ABORT (-1) /* Abandon the migration entirely - * and tidy up. */ -#define XGS_POLICY_CONTINUE_PRECOPY 0 /* Remain in the precopy phase. */ -#define XGS_POLICY_STOP_AND_COPY 1 /* Immediately suspend and transmit= the - * remaining dirty pages. */ - precopy_policy_t precopy_policy; - - /* - * Called after the guest's dirty pages have been - * copied into an output buffer. - * Callback function resumes the guest & the device model, - * returns to xc_domain_save. - * xc_domain_save then flushes the output buffer, while the - * guest continues to run. - */ - int (*postcopy)(void *data); - - /* - * Called after the memory checkpoint has been flushed - * out into the network. Typical actions performed in this - * callback include: - * (a) send the saved device model state (for HVM guests), - * (b) wait for checkpoint ack - * (c) release the network output buffer pertaining to the acked che= ckpoint. - * (c) sleep for the checkpoint interval. - * - * returns: - * 0: terminate checkpointing gracefully - * 1: take another checkpoint - */ - int (*checkpoint)(void *data); - - /* - * Called after the checkpoint callback. - * - * returns: - * 0: terminate checkpointing gracefully - * 1: take another checkpoint - */ - int (*wait_checkpoint)(void *data); - - /* Enable qemu-dm logging dirty pages to xen */ - int (*switch_qemu_logdirty)(uint32_t domid, unsigned enable, void *dat= a); /* HVM only */ - - /* to be provided as the last argument to each callback function */ - void *data; -}; - -/* Type of stream. Plain, or using a continuous replication protocol? */ -typedef enum { - XC_STREAM_PLAIN, - XC_STREAM_REMUS, - XC_STREAM_COLO, -} xc_stream_type_t; - -/** - * This function will save a running domain. - * - * @param xch a handle to an open hypervisor interface - * @param io_fd the file descriptor to save a domain to - * @param dom the id of the domain - * @param flags XCFLAGS_xxx - * @param stream_type XC_STREAM_PLAIN if the far end of the stream - * doesn't use checkpointing - * @param recv_fd Only used for XC_STREAM_COLO. Contains backchannel from - * the destination side. - * @return 0 on success, -1 on failure - */ -int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, - uint32_t flags, struct save_callbacks *callbacks, - xc_stream_type_t stream_type, int recv_fd); - -/* callbacks provided by xc_domain_restore */ -struct restore_callbacks { - /* - * Called once the STATIC_DATA_END record has been received/inferred. - * - * For compatibility with older streams, provides a list of static data - * expected to be found in the stream, which was missing. A higher le= vel - * toolstack is responsible for providing any necessary compatibiltiy. - */ -#define XGR_SDD_MISSING_CPUID (1 << 0) -#define XGR_SDD_MISSING_MSR (1 << 1) - int (*static_data_done)(unsigned int missing, void *data); - - /* Called after a new checkpoint to suspend the guest. */ - int (*suspend)(void *data); - - /* - * Called after the secondary vm is ready to resume. - * Callback function resumes the guest & the device model, - * returns to xc_domain_restore. - */ - int (*postcopy)(void *data); - - /* - * A checkpoint record has been found in the stream. - * returns: - */ -#define XGR_CHECKPOINT_ERROR 0 /* Terminate processing */ -#define XGR_CHECKPOINT_SUCCESS 1 /* Continue reading more data from the s= tream */ -#define XGR_CHECKPOINT_FAILOVER 2 /* Failover and resume VM */ - int (*checkpoint)(void *data); - - /* - * Called after the checkpoint callback. - * - * returns: - * 0: terminate checkpointing gracefully - * 1: take another checkpoint - */ - int (*wait_checkpoint)(void *data); - - /* - * callback to send store gfn and console gfn to xl - * if we want to resume vm before xc_domain_save() - * exits. - */ - void (*restore_results)(xen_pfn_t store_gfn, xen_pfn_t console_gfn, - void *data); - - /* to be provided as the last argument to each callback function */ - void *data; -}; - -/** - * This function will restore a saved domain. - * - * Domain is restored in a suspended state ready to be unpaused. - * - * @param xch a handle to an open hypervisor interface - * @param io_fd the file descriptor to restore a domain from - * @param dom the id of the domain - * @param store_evtchn the xenstore event channel for this domain to use - * @param store_mfn filled with the gfn of the store page - * @param store_domid the backend domain for xenstore - * @param console_evtchn the console event channel for this domain to use - * @param console_mfn filled with the gfn of the console page - * @param console_domid the backend domain for xenconsole - * @param stream_type XC_STREAM_PLAIN if the far end of the stream is using - * checkpointing - * @param callbacks non-NULL to receive a callback to restore toolstack - * specific data - * @param send_back_fd Only used for XC_STREAM_COLO. Contains backchannel= to - * the source side. - * @return 0 on success, -1 on failure - */ -int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, - unsigned int store_evtchn, unsigned long *store_mfn, - uint32_t store_domid, unsigned int console_evtchn, - unsigned long *console_mfn, uint32_t console_domid, - xc_stream_type_t stream_type, - struct restore_callbacks *callbacks, int send_back_f= d); - /** * This function will create a domain for a paravirtualized Linux * using file names pointing to kernel and ramdisk diff --git a/tools/include/xensaverestore.h b/tools/include/xensaverestore.h new file mode 100644 index 0000000000..0410f0469e --- /dev/null +++ b/tools/include/xensaverestore.h @@ -0,0 +1,208 @@ +/*************************************************************************= ***** + * A library for guest domain save/restore/migration in Xen. + * + * Copyright (c) 2003-2004, K A Fraser. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ +#ifndef XENSAVERESTORE_H +#define XENSAVERESTORE_H + +#define XCFLAGS_LIVE (1 << 0) +#define XCFLAGS_DEBUG (1 << 1) + +/* For save's precopy_policy(). */ +struct precopy_stats +{ + unsigned int iteration; + unsigned long total_written; + long dirty_count; /* -1 if unknown */ +}; + +/* + * A precopy_policy callback may not be running in the same address + * space as libxc an so precopy_stats is passed by value. + */ +typedef int (*precopy_policy_t)(struct precopy_stats, void *); + +/* callbacks provided by xc_domain_save */ +struct save_callbacks { + /* + * Called after expiration of checkpoint interval, + * to suspend the guest. + */ + int (*suspend)(void *data); + + /* + * Called before and after every batch of page data sent during + * the precopy phase of a live migration to ask the caller what + * to do next based on the current state of the precopy migration. + * + * Should return one of the values listed below: + */ +#define XGS_POLICY_ABORT (-1) /* Abandon the migration entirely + * and tidy up. */ +#define XGS_POLICY_CONTINUE_PRECOPY 0 /* Remain in the precopy phase. */ +#define XGS_POLICY_STOP_AND_COPY 1 /* Immediately suspend and transmit= the + * remaining dirty pages. */ + precopy_policy_t precopy_policy; + + /* + * Called after the guest's dirty pages have been + * copied into an output buffer. + * Callback function resumes the guest & the device model, + * returns to xc_domain_save. + * xc_domain_save then flushes the output buffer, while the + * guest continues to run. + */ + int (*postcopy)(void *data); + + /* + * Called after the memory checkpoint has been flushed + * out into the network. Typical actions performed in this + * callback include: + * (a) send the saved device model state (for HVM guests), + * (b) wait for checkpoint ack + * (c) release the network output buffer pertaining to the acked che= ckpoint. + * (c) sleep for the checkpoint interval. + * + * returns: + * 0: terminate checkpointing gracefully + * 1: take another checkpoint + */ + int (*checkpoint)(void *data); + + /* + * Called after the checkpoint callback. + * + * returns: + * 0: terminate checkpointing gracefully + * 1: take another checkpoint + */ + int (*wait_checkpoint)(void *data); + + /* Enable qemu-dm logging dirty pages to xen */ + int (*switch_qemu_logdirty)(uint32_t domid, unsigned enable, void *dat= a); /* HVM only */ + + /* to be provided as the last argument to each callback function */ + void *data; +}; + +/* Type of stream. Plain, or using a continuous replication protocol? */ +typedef enum { + XC_STREAM_PLAIN, + XC_STREAM_REMUS, + XC_STREAM_COLO, +} xc_stream_type_t; + +/** + * This function will save a running domain. + * + * @param xch a handle to an open hypervisor interface + * @param io_fd the file descriptor to save a domain to + * @param dom the id of the domain + * @param flags XCFLAGS_xxx + * @param stream_type XC_STREAM_PLAIN if the far end of the stream + * doesn't use checkpointing + * @param recv_fd Only used for XC_STREAM_COLO. Contains backchannel from + * the destination side. + * @return 0 on success, -1 on failure + */ +int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, + uint32_t flags, struct save_callbacks *callbacks, + xc_stream_type_t stream_type, int recv_fd); + +/* callbacks provided by xc_domain_restore */ +struct restore_callbacks { + /* + * Called once the STATIC_DATA_END record has been received/inferred. + * + * For compatibility with older streams, provides a list of static data + * expected to be found in the stream, which was missing. A higher le= vel + * toolstack is responsible for providing any necessary compatibiltiy. + */ +#define XGR_SDD_MISSING_CPUID (1 << 0) +#define XGR_SDD_MISSING_MSR (1 << 1) + int (*static_data_done)(unsigned int missing, void *data); + + /* Called after a new checkpoint to suspend the guest. */ + int (*suspend)(void *data); + + /* + * Called after the secondary vm is ready to resume. + * Callback function resumes the guest & the device model, + * returns to xc_domain_restore. + */ + int (*postcopy)(void *data); + + /* + * A checkpoint record has been found in the stream. + * returns: + */ +#define XGR_CHECKPOINT_ERROR 0 /* Terminate processing */ +#define XGR_CHECKPOINT_SUCCESS 1 /* Continue reading more data from the s= tream */ +#define XGR_CHECKPOINT_FAILOVER 2 /* Failover and resume VM */ + int (*checkpoint)(void *data); + + /* + * Called after the checkpoint callback. + * + * returns: + * 0: terminate checkpointing gracefully + * 1: take another checkpoint + */ + int (*wait_checkpoint)(void *data); + + /* + * callback to send store gfn and console gfn to xl + * if we want to resume vm before xc_domain_save() + * exits. + */ + void (*restore_results)(xen_pfn_t store_gfn, xen_pfn_t console_gfn, + void *data); + + /* to be provided as the last argument to each callback function */ + void *data; +}; + +/** + * This function will restore a saved domain. + * + * Domain is restored in a suspended state ready to be unpaused. + * + * @param xch a handle to an open hypervisor interface + * @param io_fd the file descriptor to restore a domain from + * @param dom the id of the domain + * @param store_evtchn the xenstore event channel for this domain to use + * @param store_mfn filled with the gfn of the store page + * @param store_domid the backend domain for xenstore + * @param console_evtchn the console event channel for this domain to use + * @param console_mfn filled with the gfn of the console page + * @param console_domid the backend domain for xenconsole + * @param stream_type XC_STREAM_PLAIN if the far end of the stream is using + * checkpointing + * @param callbacks non-NULL to receive a callback to restore toolstack + * specific data + * @param send_back_fd Only used for XC_STREAM_COLO. Contains backchannel= to + * the source side. + * @return 0 on success, -1 on failure + */ +int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, + unsigned int store_evtchn, unsigned long *store_mfn, + uint32_t store_domid, unsigned int console_evtchn, + unsigned long *console_mfn, uint32_t console_domid, + xc_stream_type_t stream_type, + struct restore_callbacks *callbacks, int send_back_f= d); + +#endif /* XENSAVERESTORE_H */ diff --git a/tools/libs/Makefile b/tools/libs/Makefile index 1afcd12e2b..ca43c66777 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -12,6 +12,7 @@ SUBDIRS-y +=3D devicemodel SUBDIRS-y +=3D ctrl SUBDIRS-y +=3D guest SUBDIRS-y +=3D hypfs +SUBDIRS-y +=3D saverestore SUBDIRS-y +=3D store SUBDIRS-y +=3D stat SUBDIRS-$(CONFIG_Linux) +=3D vchan diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 1c729040b3..f9ff2fa4d4 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -10,18 +10,7 @@ SRCS-y +=3D xg_private.c SRCS-y +=3D xg_domain.c SRCS-y +=3D xg_suspend.c ifeq ($(CONFIG_MIGRATE),y) -SRCS-y +=3D xg_sr_common.c -SRCS-$(CONFIG_X86) +=3D xg_sr_common_x86.c -SRCS-$(CONFIG_X86) +=3D xg_sr_common_x86_pv.c -SRCS-$(CONFIG_X86) +=3D xg_sr_restore_x86_pv.c -SRCS-$(CONFIG_X86) +=3D xg_sr_restore_x86_hvm.c -SRCS-$(CONFIG_X86) +=3D xg_sr_save_x86_pv.c -SRCS-$(CONFIG_X86) +=3D xg_sr_save_x86_hvm.c -SRCS-y +=3D xg_sr_restore.c -SRCS-y +=3D xg_sr_save.c SRCS-y +=3D xg_offline_page.c -else -SRCS-y +=3D xg_nomigrate.c endif =20 CFLAGS +=3D -I$(XEN_libxenctrl) diff --git a/tools/libs/guest/xg_offline_page.c b/tools/libs/guest/xg_offli= ne_page.c index d4722f0e8c..e49ef55887 100644 --- a/tools/libs/guest/xg_offline_page.c +++ b/tools/libs/guest/xg_offline_page.c @@ -29,7 +29,6 @@ =20 #include "xc_private.h" #include "xg_private.h" -#include "xg_save_restore.h" =20 struct pte_backup_entry { diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 68f6fa315f..07410e246b 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -179,7 +179,7 @@ $(ACPI_OBJS) $(ACPI_PIC_OBJS): CFLAGS +=3D -I. -DLIBACP= I_STDUTILS=3D\"$(CURDIR)/libx $(TEST_PROG_OBJS) _libxl.api-for-check: CFLAGS +=3D $(CFLAGS_libxentoollog= ) $(CFLAGS_libxentoolcore) libxl_dom.o libxl_dom.opic: CFLAGS +=3D -I$(XEN_ROOT)/tools # include lib= acpi/x86.h libxl_x86_acpi.o libxl_x86_acpi.opic: CFLAGS +=3D -I$(XEN_ROOT)/tools -$(SAVE_HELPER_OBJS): CFLAGS +=3D $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtch= n) $(CFLAGS_libxenguest) +$(SAVE_HELPER_OBJS): CFLAGS +=3D $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtch= n) $(CFLAGS_libxensaverestore) =20 testidl.o: CFLAGS +=3D $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight) testidl.c: libxl_types.idl gentest.py $(XEN_INCLUDE)/libxl.h $(AUTOINCS) @@ -241,7 +241,7 @@ test_%: test_%.o test_common.o libxenlight_test.so $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenli= ght)) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) -lyajl $(APPEND_LDFL= AGS) =20 libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxentoollog) $(LDLI= BS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxentoolcore) $(APPEND_LDFL= AGS) + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxentoollog) $(LDLI= BS_libxenctrl) $(LDLIBS_libxensaverestore) $(LDLIBS_libxentoolcore) $(APPEN= D_LDFLAGS) =20 testidl: testidl.o libxenlight.so $(CC) $(LDFLAGS) -o $@ testidl.o $(LDLIBS_libxenlight) $(LDLIBS_libxentoo= llog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index c79523ba92..15cf081905 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -56,6 +56,7 @@ #define XC_WANT_COMPAT_MAP_FOREIGN_API #include #include +#include #include =20 #include diff --git a/tools/libs/light/libxl_save_helper.c b/tools/libs/light/libxl_= save_helper.c index 65dff389bf..896e845a2f 100644 --- a/tools/libs/light/libxl_save_helper.c +++ b/tools/libs/light/libxl_save_helper.c @@ -48,6 +48,7 @@ =20 #include "xenctrl.h" #include "xenguest.h" +#include "xensaverestore.h" #include "_libxl_save_msgs_helper.h" =20 /*----- logger -----*/ diff --git a/tools/libs/light/libxl_save_msgs_gen.pl b/tools/libs/light/lib= xl_save_msgs_gen.pl index 5bfbd4fd10..9bc6c2a574 100755 --- a/tools/libs/light/libxl_save_msgs_gen.pl +++ b/tools/libs/light/libxl_save_msgs_gen.pl @@ -72,7 +72,7 @@ END_BOTH END_CALLOUT =20 #include -#include +#include #include "_libxl_save_msgs_${ah}.h" =20 END_HELPER diff --git a/tools/libs/saverestore/Makefile b/tools/libs/saverestore/Makef= ile new file mode 100644 index 0000000000..07c9ea7b75 --- /dev/null +++ b/tools/libs/saverestore/Makefile @@ -0,0 +1,38 @@ +XEN_ROOT =3D $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +ifeq ($(CONFIG_MIGRATE),y) +SRCS-y +=3D xg_sr_common.c +SRCS-$(CONFIG_X86) +=3D xg_sr_common_x86.c +SRCS-$(CONFIG_X86) +=3D xg_sr_common_x86_pv.c +SRCS-$(CONFIG_X86) +=3D xg_sr_restore_x86_pv.c +SRCS-$(CONFIG_X86) +=3D xg_sr_restore_x86_hvm.c +SRCS-$(CONFIG_X86) +=3D xg_sr_save_x86_pv.c +SRCS-$(CONFIG_X86) +=3D xg_sr_save_x86_hvm.c +SRCS-y +=3D xg_sr_restore.c +SRCS-y +=3D xg_sr_save.c +else +SRCS-y +=3D xg_nomigrate.c +endif + +CFLAGS +=3D -I$(XEN_libxenctrl) +CFLAGS +=3D -I$(XEN_libxenguest) + +-include $(XEN_TARGET_ARCH)/Makefile + +CFLAGS +=3D -Werror -Wmissing-prototypes +CFLAGS +=3D -I. -I./include $(CFLAGS_xeninclude) +CFLAGS +=3D -D__XEN_TOOLS__ +CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h +# Needed for asprintf() +CFLAGS-$(CONFIG_Linux) +=3D -D_GNU_SOURCE + +LIBHEADER :=3D xensaverestore.h + +NO_HEADERS_CHK :=3D y + +include $(XEN_ROOT)/tools/libs/libs.mk + +.PHONY: cleanlocal +cleanlocal: + rm -f libxensaverestore.map diff --git a/tools/libs/guest/xg_nomigrate.c b/tools/libs/saverestore/xg_no= migrate.c similarity index 100% rename from tools/libs/guest/xg_nomigrate.c rename to tools/libs/saverestore/xg_nomigrate.c diff --git a/tools/libs/guest/xg_save_restore.h b/tools/libs/saverestore/xg= _save_restore.h similarity index 98% rename from tools/libs/guest/xg_save_restore.h rename to tools/libs/saverestore/xg_save_restore.h index 3dbbc8dcd2..20bd3d30a5 100644 --- a/tools/libs/guest/xg_save_restore.h +++ b/tools/libs/saverestore/xg_save_restore.h @@ -15,8 +15,6 @@ * License along with this library; If not, see . */ =20 -#include "xc_private.h" - #include #include =20 diff --git a/tools/libs/guest/xg_sr_common.c b/tools/libs/saverestore/xg_sr= _common.c similarity index 100% rename from tools/libs/guest/xg_sr_common.c rename to tools/libs/saverestore/xg_sr_common.c diff --git a/tools/libs/guest/xg_sr_common.h b/tools/libs/saverestore/xg_sr= _common.h similarity index 98% rename from tools/libs/guest/xg_sr_common.h rename to tools/libs/saverestore/xg_sr_common.h index 617dc75add..5e22006504 100644 --- a/tools/libs/guest/xg_sr_common.h +++ b/tools/libs/saverestore/xg_sr_common.h @@ -1,7 +1,19 @@ #ifndef __COMMON__H #define __COMMON__H =20 +#include +#include #include +#include +#include +#include +#include +#include +#include + +#include "xc_private.h" +#include "xenguest.h" +#include "xensaverestore.h" =20 #include "xg_private.h" #include "xg_save_restore.h" diff --git a/tools/libs/guest/xg_sr_common_x86.c b/tools/libs/saverestore/x= g_sr_common_x86.c similarity index 100% rename from tools/libs/guest/xg_sr_common_x86.c rename to tools/libs/saverestore/xg_sr_common_x86.c diff --git a/tools/libs/guest/xg_sr_common_x86.h b/tools/libs/saverestore/x= g_sr_common_x86.h similarity index 100% rename from tools/libs/guest/xg_sr_common_x86.h rename to tools/libs/saverestore/xg_sr_common_x86.h diff --git a/tools/libs/guest/xg_sr_common_x86_pv.c b/tools/libs/saverestor= e/xg_sr_common_x86_pv.c similarity index 100% rename from tools/libs/guest/xg_sr_common_x86_pv.c rename to tools/libs/saverestore/xg_sr_common_x86_pv.c diff --git a/tools/libs/guest/xg_sr_common_x86_pv.h b/tools/libs/saverestor= e/xg_sr_common_x86_pv.h similarity index 100% rename from tools/libs/guest/xg_sr_common_x86_pv.h rename to tools/libs/saverestore/xg_sr_common_x86_pv.h diff --git a/tools/libs/guest/xg_sr_restore.c b/tools/libs/saverestore/xg_s= r_restore.c similarity index 100% rename from tools/libs/guest/xg_sr_restore.c rename to tools/libs/saverestore/xg_sr_restore.c diff --git a/tools/libs/guest/xg_sr_restore_x86_hvm.c b/tools/libs/saverest= ore/xg_sr_restore_x86_hvm.c similarity index 100% rename from tools/libs/guest/xg_sr_restore_x86_hvm.c rename to tools/libs/saverestore/xg_sr_restore_x86_hvm.c diff --git a/tools/libs/guest/xg_sr_restore_x86_pv.c b/tools/libs/saveresto= re/xg_sr_restore_x86_pv.c similarity index 100% rename from tools/libs/guest/xg_sr_restore_x86_pv.c rename to tools/libs/saverestore/xg_sr_restore_x86_pv.c diff --git a/tools/libs/guest/xg_sr_save.c b/tools/libs/saverestore/xg_sr_s= ave.c similarity index 100% rename from tools/libs/guest/xg_sr_save.c rename to tools/libs/saverestore/xg_sr_save.c diff --git a/tools/libs/guest/xg_sr_save_x86_hvm.c b/tools/libs/saverestore= /xg_sr_save_x86_hvm.c similarity index 100% rename from tools/libs/guest/xg_sr_save_x86_hvm.c rename to tools/libs/saverestore/xg_sr_save_x86_hvm.c diff --git a/tools/libs/guest/xg_sr_save_x86_pv.c b/tools/libs/saverestore/= xg_sr_save_x86_pv.c similarity index 100% rename from tools/libs/guest/xg_sr_save_x86_pv.c rename to tools/libs/saverestore/xg_sr_save_x86_pv.c diff --git a/tools/libs/guest/xg_sr_stream_format.h b/tools/libs/saverestor= e/xg_sr_stream_format.h similarity index 100% rename from tools/libs/guest/xg_sr_stream_format.h rename to tools/libs/saverestore/xg_sr_stream_format.h diff --git a/tools/libs/uselibs.mk b/tools/libs/uselibs.mk index efd7a475ba..62a2990b95 100644 --- a/tools/libs/uselibs.mk +++ b/tools/libs/uselibs.mk @@ -20,6 +20,8 @@ LIBS_LIBS +=3D ctrl USELIBS_ctrl :=3D toollog call evtchn gnttab foreignmemory devicemodel LIBS_LIBS +=3D guest USELIBS_guest :=3D evtchn ctrl +LIBS_LIBS +=3D saverestore +USELIBS_saverestore :=3D guest ctrl LIBS_LIBS +=3D store USELIBS_store :=3D toolcore LIBS_LIBS +=3D vchan @@ -27,7 +29,7 @@ USELIBS_vchan :=3D toollog store gnttab evtchn LIBS_LIBS +=3D stat USELIBS_stat :=3D ctrl store LIBS_LIBS +=3D light -USELIBS_light :=3D toollog evtchn toolcore ctrl store hypfs guest +USELIBS_light :=3D toollog evtchn toolcore ctrl store hypfs guest saverest= ore LIBS_LIBS +=3D util USELIBS_util :=3D light FILENAME_util :=3D xlutil