From patchwork Fri Feb 19 10:28:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 8359291 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B8C559F38B for ; Fri, 19 Feb 2016 10:31:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B1272041C for ; Fri, 19 Feb 2016 10:31:07 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 327582041B for ; Fri, 19 Feb 2016 10:31:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWiIb-0001VA-CD; Fri, 19 Feb 2016 10:28:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWiIZ-0001V5-Cf for xen-devel@lists.xenproject.org; Fri, 19 Feb 2016 10:28:31 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id F8/ED-07165-E4EE6C65; Fri, 19 Feb 2016 10:28:30 +0000 X-Env-Sender: prvs=850bb4f4b=roger.pau@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1455877708!25118220!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7951 invoked from network); 19 Feb 2016 10:28:30 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 19 Feb 2016 10:28:30 -0000 X-IronPort-AV: E=Sophos;i="5.22,470,1449532800"; d="scan'208";a="332843264" From: Roger Pau Monne To: Date: Fri, 19 Feb 2016 11:28:24 +0100 Message-ID: <1455877704-44419-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.5.4 (Apple Git-61) MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH] x86/PVHv2: add XEN_ prefix to HVM_START_MAGIC_VALUE X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 Signed-off-by: Roger Pau Monné Reported by: Jan Beulich Reviewed-by: Andrew Cooper --- Cc: Jan Beulich Cc: Andrew Cooper --- tools/libxc/xc_dom_x86.c | 2 +- xen/include/public/xen.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index ac4dae5..e13a4aa 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -1753,7 +1753,7 @@ static int bootlate_hvm(struct xc_dom_image *dom) start_info->nr_modules = 1; } - start_info->magic = HVM_START_MAGIC_VALUE; + start_info->magic = XEN_HVM_START_MAGIC_VALUE; munmap(start_page, start_info_size); } diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index ad00bf9..64ba7ab 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -804,7 +804,7 @@ typedef struct start_info start_info_t; * of the address fields should be treated as not present. * * 0 +----------------+ - * | magic | Contains the magic value HVM_START_MAGIC_VALUE + * | magic | Contains the magic value XEN_HVM_START_MAGIC_VALUE * | | ("xEn3" with the 0x80 bit of the "E" set). * 4 +----------------+ * | version | Version of this structure. Current version is 0. New @@ -839,7 +839,7 @@ typedef struct start_info start_info_t; * The address and size of the modules is a 64bit unsigned integer. However * Xen will always try to place all modules below the 4GiB boundary. */ -#define HVM_START_MAGIC_VALUE 0x336ec578 +#define XEN_HVM_START_MAGIC_VALUE 0x336ec578 /* New console union for dom0 introduced in 0x00030203. */ #if __XEN_INTERFACE_VERSION__ < 0x00030203