[v2,2/3] tools: nuke superpage parameters in code

Message ID	20170726074456.25511-3-wei.liu2@citrix.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <xen-devel-bounces@lists.xen.org> From: Wei Liu <wei.liu2@citrix.com> To: Xen-devel <xen-devel@lists.xenproject.org> Date: Wed, 26 Jul 2017 08:44:55 +0100 Message-ID: <20170726074456.25511-3-wei.liu2@citrix.com> In-Reply-To: <20170726074456.25511-1-wei.liu2@citrix.com> References: <20170726074456.25511-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Wei Liu <wei.liu2@citrix.com>, George Dunlap <george.dunlap@eu.citrix.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Ian Jackson <Ian.Jackson@eu.citrix.com>, Jan Beulich <JBeulich@suse.com> Subject: [Xen-devel] [PATCH v2 2/3] tools: nuke superpage parameters in code Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>

diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5 index 8f7fd28882..88ab506609 100644 --- a/docs/man/xl.conf.pod.5 +++ b/docs/man/xl.conf.pod.5 @@ -154,9 +154,6 @@ while the guest is populated. Note that to enable tmem type guests, one needs to provide C<tmem> on the Xen hypervisor argument and as well on the Linux kernel command line. -Note that the claim call is not attempted if C<superpages> option is -used in the guest config (see xl.cfg(5)). - Default: C<1> =over 4 diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index 40902ee4c9..5cd8111447 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -157,7 +157,6 @@ struct restore_callbacks { * @parm store_mfn returned with the mfn of the store page * @parm hvm non-zero if this is a HVM restore * @parm pae non-zero if this HVM domain has PAE support enabled - * @parm superpages non-zero to allocate guest memory with superpages * @parm stream_type non-zero if the far end of the stream is using checkpointing * @parm callbacks non-NULL to receive a callback to restore toolstack * specific data @@ -167,7 +166,7 @@ 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, unsigned long *console_mfn, domid_t console_domid, - unsigned int hvm, unsigned int pae, int superpages, + unsigned int hvm, unsigned int pae, xc_migration_stream_t stream_type, struct restore_callbacks *callbacks, int send_back_fd); diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c index 15c838f476..317c8cece6 100644 --- a/tools/libxc/xc_nomigrate.c +++ b/tools/libxc/xc_nomigrate.c @@ -33,7 +33,7 @@ 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, unsigned long *console_mfn, domid_t console_domid, - unsigned int hvm, unsigned int pae, int superpages, + unsigned int hvm, unsigned int pae, xc_migration_stream_t stream_type, struct restore_callbacks *callbacks, int send_back_fd) { diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 3549f0a1ae..a016678332 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -827,7 +827,7 @@ 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, unsigned long *console_gfn, domid_t console_domid, - unsigned int hvm, unsigned int pae, int superpages, + unsigned int hvm, unsigned int pae, xc_migration_stream_t stream_type, struct restore_callbacks *callbacks, int send_back_fd) { @@ -860,9 +860,8 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, callbacks->restore_results); } - DPRINTF("fd %d, dom %u, hvm %u, pae %u, superpages %d" - ", stream_type %d", io_fd, dom, hvm, pae, - superpages, stream_type); + DPRINTF("fd %d, dom %u, hvm %u, pae %u, stream_type %d", + io_fd, dom, hvm, pae, stream_type); if ( xc_domain_getinfo(xch, dom, 1, &ctx.dominfo) != 1 ) { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index afe6652847..724750967c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3760,7 +3760,7 @@ _hidden int libxl__restore_emulator_xenstore_data _hidden void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, libxl__save_helper_state *shs, - int hvm, int pae, int superpages); + int hvm, int pae); /* If rc==0 then retval is the return value from xc_domain_save * and errnoval is the errno value it provided. * If rc!=0, retval and errnoval are undefined. */ diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 46b892c626..891c669d15 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -43,7 +43,7 @@ static void helper_done(libxl__egc *egc, libxl__save_helper_state *shs); void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, libxl__save_helper_state *shs, - int hvm, int pae, int superpages) + int hvm, int pae) { STATE_AO_GC(dcs->ao); @@ -61,7 +61,7 @@ void libxl__xc_domain_restore(libxl__egc *egc, libxl__domain_create_state *dcs, state->store_port, state->store_domid, state->console_port, state->console_domid, - hvm, pae, superpages, + hvm, pae, cbflags, dcs->restore_params.checkpointed_stream, }; diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index d3def6b6fd..1dece2351c 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -280,7 +280,6 @@ int main(int argc, char **argv) domid_t console_domid = strtoul(NEXTARG,0,10); unsigned int hvm = strtoul(NEXTARG,0,10); unsigned int pae = strtoul(NEXTARG,0,10); - int superpages = strtoul(NEXTARG,0,10); unsigned cbflags = strtoul(NEXTARG,0,10); xc_migration_stream_t stream_type = strtoul(NEXTARG,0,10); assert(!*++argv); @@ -295,7 +294,7 @@ int main(int argc, char **argv) r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, - console_domid, hvm, pae, superpages, + console_domid, hvm, pae, stream_type, &helper_restore_callbacks, send_back_fd); helper_stub_restore_results(store_mfn,console_mfn,0); diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 89c2f216e9..483875038c 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -580,7 +580,7 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_LIBXC_CONTEXT: - libxl__xc_domain_restore(egc, dcs, &stream->shs, 0, 0, 0); + libxl__xc_domain_restore(egc, dcs, &stream->shs, 0, 0); break; case REC_TYPE_EMULATOR_XENSTORE_DATA:

[v2,2/3] tools: nuke superpage parameters in code

Commit Message

Patch