From patchwork Mon Feb 8 16:57:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 8252231 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 581ACBEEE5 for ; Mon, 8 Feb 2016 17:01:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E8EC203B8 for ; Mon, 8 Feb 2016 17:01:09 +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 5619B203B7 for ; Mon, 8 Feb 2016 17:01:08 +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 1aSp8o-0005Pu-2U; Mon, 08 Feb 2016 16:58:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSp8m-0005Pa-0m for xen-devel@lists.xen.org; Mon, 08 Feb 2016 16:58:20 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 49/B1-12889-B29C8B65; Mon, 08 Feb 2016 16:58:19 +0000 X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1454950697!22348144!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29802 invoked from network); 8 Feb 2016 16:58:18 -0000 Received: from mx01.buh.bitdefender.com (HELO mx01.buh.bitdefender.com) (91.199.104.161) by server-5.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2016 16:58:18 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=YpLIA/+npF0MzgXnqnMSVPzyfq6YygC8ZGgwSCsFlsiSrgjLuadve4PI8LEAohLb4FvSFTRCS87NbJTlt8WIVl24TjCu5XdxLfCAWlbibL2kCPZQeiEIgEhQW8aqe9XjqOXqpyqHnwAz2L9RSoQMokM0E8iwIZnSfEm2rslEwwrb/RH951LcN+mdtMHugqtA4ZXcplUTkfFiKEzJ0Hn3qDqfN2RLCRyPzAINRtcsrAIoWIsVjTI33ohDjJpzV2WRCJWcUar4qsJGNuyD8FaSjrBZ67ENzqGLYJK7qn4NjxHDYDN088OR6X5BhKKdfq1RPdI+1PmoiUBalfdP2BcxPA==; h=Received:Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-BitDefender-Scanner:X-BitDefender-Spam:X-BitDefender-SpamStamp:X-BitDefender-CF-Stamp; DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bitdefender.com; h=from:to :cc:subject:date:message-id:in-reply-to:references; s=default; bh=sYXcqQFfpyNo992p3LT6VSGOZZ8=; b=FfBxaoDf17exqWEVymJazSQ6snkp JUiyjDJtc7AJe8Q200ygpNn6fmbXVnRXpb7E/mba0N/o2dLpE4RmkBD7d8Z+M3VM 912vnNHGFEmPXnT6/u17hxE9HYInXCwjWbEdROn+Qc5EzP7kcOpt10PEtODMEjyc /44ICYI+B23/Kv77GU4FwgmUobvP1iAXBQNmSAb3V0mmHVrx/xPi0uHZ7S/M4Yyy TPbzxCc6U68kJ9Iy1ByfYMvlU854yhGCev/tVaHL0cvwLg8/Jsq3/AO1ynfmS9B+ fSRaj9EVAk8pHKyDccLS8AyqY0mRhg+cLvugXL+YZOOjxVPx1Qs9Eql5Yw== Received: (qmail 25118 invoked from network); 8 Feb 2016 18:58:17 +0200 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.buh.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2016 18:58:17 +0200 Received: from smtp02.buh.bitdefender.net (unknown [10.17.80.76]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 21DA97FBD9 for ; Mon, 8 Feb 2016 18:58:17 +0200 (EET) Received: (qmail 31542 invoked from network); 8 Feb 2016 18:58:17 +0200 Received: from 82-137-8-119.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@82.137.8.119) by smtp02.buh.bitdefender.net with AES128-SHA256 encrypted SMTP; 8 Feb 2016 18:58:16 +0200 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Mon, 8 Feb 2016 18:57:56 +0200 Message-Id: <1454950682-9459-2-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> References: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.4 on smtp02.buh.bitdefender.net, sigver: 7.64434 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.743, Dats: 413947, Stamp: 3], Multi: [Enabled, t: (0.000009, 0.004197)], BW: [Enabled, t: (0.000007)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.003137), Flags: 2A917CE3; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.010181)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.015727), Hit: No, Details: v2.3.3; Id: 2m1ghak.1aaotdhte.2alvh], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Kevin Tian , Tamas K Lengyel , Keir Fraser , Ian Campbell , Razvan Cojocaru , Jun Nakajima , Andrew Cooper , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH 1/7] arm: move arch/arm/hvm.c to arch/arm/hvm/hvm.c 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: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 X86-side hvm.c is @ arch/x86/hvm/hvm.c. To maintain arm<->x86 symmetry, also move arch/arm/hvm.c to arch/arm/hvm/hvm.c. Signed-off-by: Corneliu ZUZU --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/hvm.c | 67 ----------------------------------------------- xen/arch/arm/hvm/Makefile | 1 + xen/arch/arm/hvm/hvm.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 xen/arch/arm/hvm.c create mode 100644 xen/arch/arm/hvm/Makefile create mode 100644 xen/arch/arm/hvm/hvm.c diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 1783912..22f1c75 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -1,6 +1,7 @@ subdir-$(CONFIG_ARM_32) += arm32 subdir-$(CONFIG_ARM_64) += arm64 subdir-y += platforms +subdir-y += hvm subdir-$(CONFIG_ARM_64) += efi obj-$(EARLY_PRINTK) += early_printk.o @@ -34,7 +35,6 @@ obj-y += vgic.o vgic-v2.o obj-$(CONFIG_ARM_64) += vgic-v3.o obj-y += vtimer.o obj-y += vuart.o -obj-y += hvm.o obj-y += device.o obj-y += decode.o obj-y += processor.o diff --git a/xen/arch/arm/hvm.c b/xen/arch/arm/hvm.c deleted file mode 100644 index 5fd0753..0000000 --- a/xen/arch/arm/hvm.c +++ /dev/null @@ -1,67 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -#include - -long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) - -{ - long rc = 0; - - switch ( op ) - { - case HVMOP_set_param: - case HVMOP_get_param: - { - struct xen_hvm_param a; - struct domain *d; - - if ( copy_from_guest(&a, arg, 1) ) - return -EFAULT; - - if ( a.index >= HVM_NR_PARAMS ) - return -EINVAL; - - d = rcu_lock_domain_by_any_id(a.domid); - if ( d == NULL ) - return -ESRCH; - - rc = xsm_hvm_param(XSM_TARGET, d, op); - if ( rc ) - goto param_fail; - - if ( op == HVMOP_set_param ) - { - d->arch.hvm_domain.params[a.index] = a.value; - } - else - { - a.value = d->arch.hvm_domain.params[a.index]; - rc = copy_to_guest(arg, &a, 1) ? -EFAULT : 0; - } - - param_fail: - rcu_unlock_domain(d); - break; - } - - default: - { - gdprintk(XENLOG_DEBUG, "HVMOP op=%lu: not implemented\n", op); - rc = -ENOSYS; - break; - } - } - - return rc; -} diff --git a/xen/arch/arm/hvm/Makefile b/xen/arch/arm/hvm/Makefile new file mode 100644 index 0000000..6ee4054 --- /dev/null +++ b/xen/arch/arm/hvm/Makefile @@ -0,0 +1 @@ +obj-y += hvm.o diff --git a/xen/arch/arm/hvm/hvm.c b/xen/arch/arm/hvm/hvm.c new file mode 100644 index 0000000..1ae681f --- /dev/null +++ b/xen/arch/arm/hvm/hvm.c @@ -0,0 +1,66 @@ +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + long rc = 0; + + switch ( op ) + { + case HVMOP_set_param: + case HVMOP_get_param: + { + struct xen_hvm_param a; + struct domain *d; + + if ( copy_from_guest(&a, arg, 1) ) + return -EFAULT; + + if ( a.index >= HVM_NR_PARAMS ) + return -EINVAL; + + d = rcu_lock_domain_by_any_id(a.domid); + if ( d == NULL ) + return -ESRCH; + + rc = xsm_hvm_param(XSM_TARGET, d, op); + if ( rc ) + goto param_fail; + + if ( op == HVMOP_set_param ) + { + d->arch.hvm_domain.params[a.index] = a.value; + } + else + { + a.value = d->arch.hvm_domain.params[a.index]; + rc = copy_to_guest(arg, &a, 1) ? -EFAULT : 0; + } + + param_fail: + rcu_unlock_domain(d); + break; + } + + default: + { + gdprintk(XENLOG_DEBUG, "HVMOP op=%lu: not implemented\n", op); + rc = -ENOSYS; + break; + } + } + + return rc; +}