From patchwork Thu Apr 16 09:41:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wieczorkiewicz, Pawel" X-Patchwork-Id: 11492573 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64C1914DD for ; Thu, 16 Apr 2020 09:42:25 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 417BE21BE5 for ; Thu, 16 Apr 2020 09:42:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="FdJNGvyi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 417BE21BE5 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jP122-0005Tt-Pd; Thu, 16 Apr 2020 09:42:02 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jP121-0005To-3l for xen-devel@lists.xen.org; Thu, 16 Apr 2020 09:42:01 +0000 X-Inumbo-ID: 845095eb-7fc6-11ea-8b6d-12813bfff9fa Received: from smtp-fw-9102.amazon.com (unknown [207.171.184.29]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 845095eb-7fc6-11ea-8b6d-12813bfff9fa; Thu, 16 Apr 2020 09:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1587030120; x=1618566120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=UEPw6O3BljFwct47izeBxnxQHVPFN3vhQxafqb4+2o0=; b=FdJNGvyiZtCeHWoHX1X013xozj8fgiAkmZWhfXDp5xpL9V3l7hHdBCL7 7iogntAJcNqeQwtuE/Vhx2fviuoZIpxsINYrX0F9fnW4CLOFZjnFXsOR5 HPinekU4dKxJw6Mroi84kcNWnZGZzHQCmcjQwsynVak5xe1Ej7QLd9vcO I=; IronPort-SDR: awgMYQycTtlz5joRHfcsa6TCbyYnbC4FGLuXeI+yN/YVQg4UmtZOk46pq8uR8pMjgVjQmMzR+p r5roaCCx9irw== X-IronPort-AV: E=Sophos;i="5.72,390,1580774400"; d="scan'208";a="37396512" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-2a-69849ee2.us-west-2.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 16 Apr 2020 09:41:58 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2a-69849ee2.us-west-2.amazon.com (Postfix) with ESMTPS id F102BA2264; Thu, 16 Apr 2020 09:41:56 +0000 (UTC) Received: from EX13D05EUC003.ant.amazon.com (10.43.164.207) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 16 Apr 2020 09:41:56 +0000 Received: from EX13MTAUEA001.ant.amazon.com (10.43.61.82) by EX13D05EUC003.ant.amazon.com (10.43.164.207) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 16 Apr 2020 09:41:55 +0000 Received: from dev-dsk-wipawel-1a-0c4e6d58.eu-west-1.amazon.com (10.4.134.33) by mail-relay.amazon.com (10.43.61.243) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 16 Apr 2020 09:41:54 +0000 From: Pawel Wieczorkiewicz To: Subject: [XTF 1/4] lib: Add XEN_MAJOR() and XEN_MINOR() macros Date: Thu, 16 Apr 2020 09:41:38 +0000 Message-ID: <20200416094141.65120-2-wipawel@amazon.de> X-Mailer: git-send-email 2.16.6 In-Reply-To: <20200416094141.65120-1-wipawel@amazon.de> References: <20200416094141.65120-1-wipawel@amazon.de> MIME-Version: 1.0 Precedence: Bulk X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, paul@xen.org, semelpaul@gmail.com, andrew.cooper3@citrix.com, Pawel Wieczorkiewicz , nmanthey@amazon.de Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" These are just a simple macros obtaining major, minor values as returned by xen_version hypercall. Signed-off-by: Pawel Wieczorkiewicz --- include/xtf/lib.h | 3 +++ tests/xsa-213/main.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/xtf/lib.h b/include/xtf/lib.h index 3348464..40e5731 100644 --- a/include/xtf/lib.h +++ b/include/xtf/lib.h @@ -20,6 +20,9 @@ #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x)) +#define XEN_MAJOR(v) (((v) >> 16) & 0xFFFF) +#define XEN_MINOR(v) ((v) & 0xFFFF) + void __noreturn panic(const char *fmt, ...) __printf(1, 2); #define ASSERT(cond) \ diff --git a/tests/xsa-213/main.c b/tests/xsa-213/main.c index 64e7065..0353168 100644 --- a/tests/xsa-213/main.c +++ b/tests/xsa-213/main.c @@ -121,8 +121,8 @@ void test_main(void) { long rc, xen_version = hypercall_xen_version(XENVER_version, NULL); - printk("Found Xen %ld.%ld\n", - (xen_version >> 16) & 0xffff, xen_version & 0xffff); + printk("Found Xen %ld.%ld\n", XEN_MAJOR(xen_version), + XEN_MINOR(xen_version)); xtf_set_idte(X86_VEC_AVAIL, &idte);