From patchwork Mon Apr 4 10:46:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8739851 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 730A5C0553 for ; Mon, 4 Apr 2016 10:49:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86FE920259 for ; Mon, 4 Apr 2016 10:49:01 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 7BD492024F for ; Mon, 4 Apr 2016 10:49:00 +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 1an22E-0002SB-OT; Mon, 04 Apr 2016 10:47:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1an22D-0002S1-Uz for xen-devel@lists.xenproject.org; Mon, 04 Apr 2016 10:47:06 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 95/6F-20731-92642075; Mon, 04 Apr 2016 10:47:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRWlGSWpSXmKPExsXitHSDva6GG1O 4wdGTVhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bLq9YFSxQq7jcdYm5gvCHZxcjBISHgL7Fh pUQXIycHm4CuxKVpE5lBbF4BQYmTM5+wgNjMAjoSC3Z/YoOw5SW2v50DVeMgcWjxP1YQm0VAR eL97LXsILaIgKLEg5c3WSHq6yXW9m5lBVklLGAk8WubB4jJKeAscaBRFKRCSMBJ4tT0t2CbJA SMJVbf/8gCUiIkoCYxd308RJhb4vbpqcwTGPlnIbltFpLbZiG5bQEj8ypG9eLUorLUIl1LvaS izPSMktzEzBxdQwNTvdzU4uLE9NScxKRiveT83E2MwMBjAIIdjGtbnQ8xSnIwKYnyLrrHGC7E l5SfUpmRWJwRX1Sak1p8iFGPg0Pg3J67xxgF+j5PWMQkxZKXn5eqJMHb4cIULiRYlJqeWpGWm QOME5gGCQ4eJRHeUpA0b3FBYm5xZjpE6hSjopQ4byBIQgAkkVGaB9cGi81LjLJSwryMQKcJ8R SkFuVmlqDKv2IU52BUEub1AJnCk5lXAjf9FdBiJqDF9cJgi0sSEVJSDYzCitwOp6c//cS4bf+ qG19mKz39dr7A49lBQZP4nRt0rtWWvt9+5n/SQXlRI6VlpZF52tlZk3Jd7hr3NbPVBLzKj2R0 WX2F+WnpNZGHyZkOLv2PZpeFF19/+zHjpd/vL9H35mUZvN3hNu3A1Sfq95yUd6v2cv6uUZKes mN742r5kirPL8o8Bz8rsRRnJBpqMRcVJwIAItvS4cgCAAA= X-Env-Sender: prvs=895d09049=Ian.Jackson@citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1459766823!69069!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: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49598 invoked from network); 4 Apr 2016 10:47:04 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 4 Apr 2016 10:47:04 -0000 X-IronPort-AV: E=Sophos;i="5.24,440,1454976000"; d="scan'208";a="351235435" From: Ian Jackson MIME-Version: 1.0 Message-ID: <22274.17952.386335.936490@mariner.uk.xensource.com> Date: Mon, 4 Apr 2016 11:46:56 +0100 To: Wei Liu In-Reply-To: <1459557366-7091-1-git-send-email-wei.liu2@citrix.com> References: <1459557366-7091-1-git-send-email-wei.liu2@citrix.com> X-Mailer: VM 8.1.0 under 23.4.1 (i486-pc-linux-gnu) X-DLP: MIA2 Cc: Xen-devel , Changlong Xie , Wen Congyang Subject: Re: [Xen-devel] [PATCH] libxl: fix compilation on ARM 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Wei Liu writes ("[PATCH] libxl: fix compilation on ARM"): > COLO introduced a few callbacks. The original implementation used > unsigned long for a type which in fact should be xen_pfn_t. That broke > libxl compilation on ARM, because xen_pfn_t is not a synonym for > unsigned long on ARM platform. > > Fixing this requires modifying the perl script. Specifically now we need > to include xenctrl.h in helper header file so that we can use xen_pfn_t > there. > > Reported-by: Olaf Hering > Signed-off-by: Wei Liu Following discussion on irc, here is a v2: * AFAICT all that's needed is to change the ordering of the headers before END_HELPER. _libxl_save_msgs_helper.h isn't a "proper" header: it has no multiple inclusion protection, either. It's for use in only the two places. (_libxl_save_msgs_helper.c and libxl_save_helper.c - both of which already have xenctrl.h) I think I prefer to perhpas-duplicate some #include lines to adding a new facility to the Perl script (which I would like to keep no more complex than necessary). * Better patch title. Thanks, Ian. From ca9654206863224cbf2cc998d8f6a2bd6c1511b3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 Apr 2016 11:41:19 +0100 Subject: [PATCH] libxl: ARM build: fix type of libxl__srm_callout_callback_restore_results COLO introduced a few callbacks. The original implementation used unsigned long for a type which in fact should be xen_pfn_t. That broke libxl compilation on ARM, because xen_pfn_t is not a synonym for unsigned long on ARM platform. Fixing this requires modifying the perl script. Specifically now we need to include xenctrl.h in helper header file so that we can use xen_pfn_t there. Reported-by: Olaf Hering Signed-off-by: Wei Liu Signed-off-by: Ian Jackson --- tools/libxl/libxl_create.c | 4 ++-- tools/libxl/libxl_save_msgs_gen.pl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 6882ff8..4b02de9 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1109,8 +1109,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, domcreate_stream_done(egc, &dcs->srs, rc); } -void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, - unsigned long console_mfn, void *user) +void libxl__srm_callout_callback_restore_results(xen_pfn_t store_mfn, + xen_pfn_t console_mfn, void *user) { libxl__save_helper_state *shs = user; libxl__domain_create_state *dcs = shs->caller_state; diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index c2243f2..3ae7373 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -29,8 +29,8 @@ our @msgs = ( [ 6, 'srcxA', "wait_checkpoint", [] ], [ 7, 'scxA', "switch_qemu_logdirty", [qw(int domid unsigned enable)] ], - [ 8, 'rcx', "restore_results", ['unsigned long', 'store_gfn', - 'unsigned long', 'console_gfn'] ], + [ 8, 'rcx', "restore_results", ['xen_pfn_t', 'store_gfn', + 'xen_pfn_t', 'console_gfn'] ], [ 9, 'srW', "complete", [qw(int retval int errnoval)] ], ); @@ -70,9 +70,9 @@ END_BOTH END_CALLOUT -#include "_libxl_save_msgs_${ah}.h" #include #include +#include "_libxl_save_msgs_${ah}.h" END_HELPER } @@ -141,7 +141,7 @@ static void bytes_put(unsigned char *const buf, int *len, END -foreach my $simpletype (qw(int uint16_t uint32_t unsigned), 'unsigned long') { +foreach my $simpletype (qw(int uint16_t uint32_t unsigned), 'unsigned long', 'xen_pfn_t') { my $typeid = typeid($simpletype); $out_body{'callout'} .= <