From patchwork Wed Feb 10 15:58:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 8273121 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 9A5429F1C1 for ; Wed, 10 Feb 2016 16:02:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8F431202B8 for ; Wed, 10 Feb 2016 16:01:56 +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 4147A2012E for ; Wed, 10 Feb 2016 16:01:55 +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 1aTXAV-0001K9-FL; Wed, 10 Feb 2016 15:59:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTXAT-0001Jz-9y for xen-devel@lists.xen.org; Wed, 10 Feb 2016 15:59:01 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 5E/FA-08977-44E5BB65; Wed, 10 Feb 2016 15:59:00 +0000 X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1455119938!15033648!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52232 invoked from network); 10 Feb 2016 15:58:59 -0000 Received: from mx01.buh.bitdefender.com (HELO mx01.buh.bitdefender.com) (91.199.104.161) by server-9.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Feb 2016 15:58:59 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=feyf5xbeSXWp7i4Vpla4ToOzZGJHs9hiMT93HYmLeOtzL0k/XpbplMy6Djg5Z2ubkh2M9BY8yhln9D9odJ8P1nOGZIwph0STBoVgi2shiTfelhn8a3R3iIb8h3zJnRuzaSA8jRY9vJYYCbn9we25apLfgdQ9FLxuy6dHugBzFl2UcLlF7rdP4GmetF+Ebev6anG3VFfxV2Ni87Hcb8Mq1gZP3emQG5ONgQ2Z8iv/t2S3UPW9hcHpG3wXfJpcUUDj93GLVGy8eeKuvwcA+2X6Jsqc0dg2GaQ9gohh7vXDYi1jALjJS5dW1Vg7M5bnEVrgZPKnJroVMovn3gnv2IkBJQ==; 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=7zXYaXduxGckHesJVXqjQ0hFMWY=; b=pxGAPQRn0SLtZPMes9AfuNviJPco M6mKF0LtxybWz/Dz65ZyUCYyylJbEvROGC4OkgUp7nYX595BLyp4SG/kSWF1lFjy sh4DK/bcSR9IKGRGnAu++ruEguuvCdmHwBS6Q6GniIzWRlRzgFj8VXlrR+UUM8WK 1ZtHF7hbuVsKtxWPTvNBuVS1r6TdpRIZ6ixPxtjnSVlk6BtHVYy6BkhiRIlXlMMn dpirIlIxZMtrh7/ZZEEu2XCD2Hp6153/DCDLxdbQu5y6ZnUqBzucTOi+Ly/Mp1Y8 gRFStCHAJ9tS2hmvsX4/QSIlCL2qBX4c4WjIk5YijhJ+Nf0+jK//1u4Nkw== Received: (qmail 20162 invoked from network); 10 Feb 2016 17:58:58 +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; 10 Feb 2016 17:58:58 +0200 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 04FC87FBD8 for ; Wed, 10 Feb 2016 17:58:58 +0200 (EET) Received: (qmail 1104 invoked from network); 10 Feb 2016 17:58:44 +0200 Received: from 82-137-14-90.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@82.137.14.90) by smtp03.buh.bitdefender.org with AES128-SHA256 encrypted SMTP; 10 Feb 2016 17:58:43 +0200 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 10 Feb 2016 17:58:27 +0200 Message-Id: <1455119907-2691-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455119259-2161-1-git-send-email-czuzu@bitdefender.com> References: <1455119259-2161-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.4 on smtp03.buh.bitdefender.org, sigver: 7.64459 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.743, Dats: 414080, Stamp: 3], Multi: [Enabled, t: (0.000009, 0.007194)], BW: [Enabled, t: (0.000006,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.004786), Flags: 2A917CE3; NN_TP_TAG_HTTP; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.008369)], URL: [Enabled, t: (0.000034)], RTDA: [Enabled, t: (0.027041), Hit: No, Details: v2.3.3; Id: 2m1ghaj.1aaoicsp1.3nutq], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Tamas K Lengyel , Keir Fraser , Ian Campbell , Razvan Cojocaru , Andrew Cooper , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH v2 6/7] Rename event_x86.c to event.c and event_arch.h to event.h + minor fixes 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 Rename: - arch/x86/hvm/event_x86.c -> arch/x86/hvm/event.c - asm-{x86,arm}/hvm/event_arch.h -> asm-{x86/arm}/hvm/event.h (previous commit explains why these renames were necessary) Minor fixes: * xen/common/hvm/event.c: fix malformed file header comment * xen/hvm/event.h: fix comment & change hvm_event_crX first param name to a more descriptive one Signed-off-by: Corneliu ZUZU --- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/{event_x86.c => event.c} | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/common/hvm/event.c | 44 +++++++++++------------ xen/include/asm-arm/hvm/{event_arch.h => event.h} | 8 ++--- xen/include/asm-x86/hvm/{event_arch.h => event.h} | 8 ++--- xen/include/xen/hvm/event.h | 6 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) rename xen/arch/x86/hvm/{event_x86.c => event.c} (98%) rename xen/include/asm-arm/hvm/{event_arch.h => event.h} (86%) rename xen/include/asm-x86/hvm/{event_arch.h => event.h} (94%) diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index 15daa09..794e793 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -3,7 +3,7 @@ subdir-y += vmx obj-y += asid.o obj-y += emulate.o -obj-y += event_x86.o +obj-y += event.o obj-y += hpet.o obj-y += hvm.o obj-y += i8254.o diff --git a/xen/arch/x86/hvm/event_x86.c b/xen/arch/x86/hvm/event.c similarity index 98% rename from xen/arch/x86/hvm/event_x86.c rename to xen/arch/x86/hvm/event.c index 7b54f18..3349c34 100644 --- a/xen/arch/x86/hvm/event_x86.c +++ b/xen/arch/x86/hvm/event.c @@ -1,5 +1,5 @@ /* - * arch/x86/hvm/event_x86.c + * arch/x86/hvm/event.c * * Arch-specific hardware virtual machine event abstractions. * diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2dec80e..69e2854 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include /* for cpu_has_tsc_ratio */ #include diff --git a/xen/common/hvm/event.c b/xen/common/hvm/event.c index 604e902..0b532d5 100644 --- a/xen/common/hvm/event.c +++ b/xen/common/hvm/event.c @@ -1,30 +1,30 @@ /* -* xen/common/hvm/event.c -* -* Common hardware virtual machine event abstractions. -* -* Copyright (c) 2004, Intel Corporation. -* Copyright (c) 2005, International Business Machines Corporation. -* Copyright (c) 2008, Citrix Systems, Inc. -* Copyright (c) 2016, Bitdefender S.R.L. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; If not, see . -*/ + * xen/common/hvm/event.c + * + * Common hardware virtual machine event abstractions. + * + * Copyright (c) 2004, Intel Corporation. + * Copyright (c) 2005, International Business Machines Corporation. + * Copyright (c) 2008, Citrix Systems, Inc. + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; If not, see . + */ #include #include /* for vm_event_# calls */ #include -#include /* for hvm_event_arch_# calls */ +#include /* for hvm_event_arch_# calls */ #if CONFIG_X86 #include #endif diff --git a/xen/include/asm-arm/hvm/event_arch.h b/xen/include/asm-arm/hvm/event.h similarity index 86% rename from xen/include/asm-arm/hvm/event_arch.h rename to xen/include/asm-arm/hvm/event.h index beebca2..4aa797b 100644 --- a/xen/include/asm-arm/hvm/event_arch.h +++ b/xen/include/asm-arm/hvm/event.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/hvm/event_arch.h + * include/asm-arm/hvm/event.h * * Arch-specific hardware virtual machine event abstractions. * @@ -18,8 +18,8 @@ * this program; If not, see . */ -#ifndef __ASM_ARM_HVM_EVENT_ARCH_H__ -#define __ASM_ARM_HVM_EVENT_ARCH_H__ +#ifndef __ASM_ARM_HVM_EVENT_H__ +#define __ASM_ARM_HVM_EVENT_H__ static inline void arch_hvm_event_fill_regs(vm_event_request_t *req) @@ -27,7 +27,7 @@ void arch_hvm_event_fill_regs(vm_event_request_t *req) /* Not supported on ARM. */ } -#endif /* __ASM_ARM_HVM_EVENT_ARCH_H__ */ +#endif /* __ASM_ARM_HVM_EVENT_H__ */ /* * Local variables: diff --git a/xen/include/asm-x86/hvm/event_arch.h b/xen/include/asm-x86/hvm/event.h similarity index 94% rename from xen/include/asm-x86/hvm/event_arch.h rename to xen/include/asm-x86/hvm/event.h index b9fb559..88a81f0 100644 --- a/xen/include/asm-x86/hvm/event_arch.h +++ b/xen/include/asm-x86/hvm/event.h @@ -1,5 +1,5 @@ /* - * include/asm-x86/hvm/event_arch.h + * include/asm-x86/hvm/event.h * * Arch-specific hardware virtual machine event abstractions. * @@ -18,8 +18,8 @@ * this program; If not, see . */ -#ifndef __ASM_X86_HVM_EVENT_ARCH_H__ -#define __ASM_X86_HVM_EVENT_ARCH_H__ +#ifndef __ASM_X86_HVM_EVENT_H__ +#define __ASM_X86_HVM_EVENT_H__ #include #include @@ -80,7 +80,7 @@ uint64_t arch_hvm_event_gfn_of_ip(unsigned long ip) void hvm_event_msr(unsigned int msr, uint64_t value); -#endif /* __ASM_X86_HVM_EVENT_ARCH_H__ */ +#endif /* __ASM_X86_HVM_EVENT_H__ */ /* * Local variables: diff --git a/xen/include/xen/hvm/event.h b/xen/include/xen/hvm/event.h index 662278e..4ab42a0 100644 --- a/xen/include/xen/hvm/event.h +++ b/xen/include/xen/hvm/event.h @@ -26,7 +26,7 @@ #if CONFIG_HAS_VM_EVENT_WRITE_CTRLREG /* - * Called for current VCPU on crX/MSR changes by guest. + * Called for current VCPU on control-register changes by guest. * The event might not fire if the client has subscribed to it in onchangeonly * mode, hence the bool_t return type for control register write events. */ @@ -35,8 +35,8 @@ bool_t hvm_event_cr(unsigned int index, unsigned long old); #if CONFIG_X86 -#define hvm_event_crX(what, new, old) \ - hvm_event_cr(VM_EVENT_X86_##what, new, old) +#define hvm_event_crX(cr, new, old) \ + hvm_event_cr(VM_EVENT_X86_##cr, new, old) #endif #endif // HAS_VM_EVENT_WRITE_CTRLREG