From patchwork Wed Jul 26 07:44:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9864367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D677B60382 for ; Wed, 26 Jul 2017 08:18:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4A662871A for ; Wed, 26 Jul 2017 08:18:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B93E628737; Wed, 26 Jul 2017 08:18:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 100812871A for ; Wed, 26 Jul 2017 08:18:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daHUd-0001P1-TC; Wed, 26 Jul 2017 08:16:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daHUd-0001Ou-8k for xen-devel@lists.xenproject.org; Wed, 26 Jul 2017 08:16:31 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 63/27-02962-EDF48795; Wed, 26 Jul 2017 08:16:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHSDve5d/4p IgzcvrCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxXn3vZC45bV/w/1sfUwPhDu4uRk0NCwF9i 95JlbCA2m4CyxM/OXjBbREBPounAc8YuRi4OZoFvjBKnJtxmBEkICzhIzLg5namLkYODRUBVo uWPMYjJK2AhsWh3LMRIeYldbRdZQWxOAUuJxYvbWEBsIaCS/yvWs0HYChId048xgdi8AoISJ2 c+AathFpCQOPjiBfMERt5ZSFKzkKQWMDKtYtQoTi0qSy3SNTTTSyrKTM8oyU3MzNE1NDDTy00 tLk5MT81JTCrWS87P3cQIDB0GINjBeH9jwCFGSQ4mJVHeSaYVkUJ8SfkplRmJxRnxRaU5qcWH GGU4OJQkeDf4AeUEi1LTUyvSMnOAQQyTluDgURLhDQFJ8xYXJOYWZ6ZDpE4x6nK8mvD/G5MQS 15+XqqUOK8JSJEASFFGaR7cCFhEXWKUlRLmZQQ6SoinILUoN7MEVf4VozgHo5IwbxbIFJ7MvB K4Ta+AjmACOmLOjFKQI0oSEVJSDYzqwvEx9Yu4v26fcyx5mRt/iI+JRW2Qe9cs4V98pQfdfr7 3vLSge//HIuVkwYvHuwqUtn97d7DokT/7ieWruXoOtz84rPH1+r5Fpo9uih+61TvHM2xu9JMH W5vuq67sW1Wp3sS33PjmksAkiQXGC6qTFqWvy/jzd6WE4rbXmSI/pp3vc/lZqq6mxFKckWiox VxUnAgAXeYkf6MCAAA= X-Env-Sender: prvs=373b709cc=wei.liu2@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1501056988!68331218!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17596 invoked from network); 26 Jul 2017 08:16:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 26 Jul 2017 08:16:29 -0000 X-IronPort-AV: E=Sophos;i="5.40,414,1496102400"; d="scan'208";a="441342849" From: Wei Liu To: Xen-devel Date: Wed, 26 Jul 2017 08:44:55 +0100 Message-ID: <20170726074456.25511-3-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 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 , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich Subject: [Xen-devel] [PATCH v2 2/3] tools: nuke superpage parameters in code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Also fix manpage because there is no superpages options in xl.cfg. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- docs/man/xl.conf.pod.5 | 3 --- tools/libxc/include/xenguest.h | 3 +-- tools/libxc/xc_nomigrate.c | 2 +- tools/libxc/xc_sr_restore.c | 7 +++---- tools/libxl/libxl_internal.h | 2 +- tools/libxl/libxl_save_callout.c | 4 ++-- tools/libxl/libxl_save_helper.c | 3 +-- tools/libxl/libxl_stream_read.c | 2 +- 8 files changed, 10 insertions(+), 16 deletions(-) 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 on the Xen hypervisor argument and as well on the Linux kernel command line. -Note that the claim call is not attempted if C 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: