From patchwork Wed Feb 10 15:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 8273091 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 00CFFBEEE5 for ; Wed, 10 Feb 2016 15:57:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB87D20394 for ; Wed, 10 Feb 2016 15:57:08 +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 DD2EE2035D for ; Wed, 10 Feb 2016 15:57:07 +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 1aTX6G-0000mP-Ml; Wed, 10 Feb 2016 15:54:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTX6F-0000m8-Sb for xen-devel@lists.xen.org; Wed, 10 Feb 2016 15:54:40 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 48/D1-09708-F3D5BB65; Wed, 10 Feb 2016 15:54:39 +0000 X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1455119677!15025998!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 28842 invoked from network); 10 Feb 2016 15:54:38 -0000 Received: from mx01.buh.bitdefender.com (HELO mx01.buh.bitdefender.com) (91.199.104.161) by server-8.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Feb 2016 15:54:38 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=GLsKL01sDpzr/pW/PXl+BPWP3S0NuUMLEYNE86NAvMxTOGjbueO0yxhrHndq2+IWTuwkN3/EmfMmmf4Zq8Rcm2u7M61llx4Bgk8XlR9lWYtiDzGjVXt4orN5hdHLDXful6VMlbS+lEEE6Q4EhUcrR56+CKPtcIAQAcoKLcD8SVFVOtisB5UKqrWeMCRidigrJ6x4y5XJJx7PhyCCIt4wXUU9bQvJnOUPQtBrawNChshSYz+9BpmmpG1PAdzzQ8KmUmuhr6IsW1g4XPT9chVITNWnQaqC82NOKidTzHMBgZ+VSmuUnrOx2lo1gbDB+FM00+9Oxktf10TEKV0iDT8dWw==; 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=FjwUyq7QY7wLGoIhRq1KNE0tbpQ=; b=CFOuOJj7NvxJ1kj5coq62OGB/ztU nnYHRb73eDpGnZ0KxpFuw9y8ZuGHif5XFzpKNgODvWKDgER+mM7Tku/JXcXc4HXF dg/jzJUR56OBroHNnqwtn4uAUVUllExQQnXRmNWd/zpO7kkhjRUWCmMu+wTpTlZp MteuUSK53FC1lQU1AVBPsS4vGcfn1WInkQURn7BzkijZAZlofWw7d6fZEkeG8ARr 9oldkqUtVTvW/JIdVzKp1PLxw4iSB4vHMSztXDuwCQVow6NaxY0TcRRQCQfhXuX5 Eriyw4Nb7J96ROzqcPD+vKpWQSqTgjWvP/vbN7vQYYWo0udSASYkWRV9XA== Received: (qmail 19435 invoked from network); 10 Feb 2016 17:54:37 +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:54:37 +0200 Received: from smtp01.buh.bitdefender.com (unknown [10.17.80.75]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 268407FBDA for ; Wed, 10 Feb 2016 17:54:37 +0200 (EET) Received: (qmail 30467 invoked from network); 10 Feb 2016 17:54:37 +0200 Received: from 82-137-14-90.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@82.137.14.90) by smtp01.buh.bitdefender.com with AES128-SHA256 encrypted SMTP; 10 Feb 2016 17:54:34 +0200 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 10 Feb 2016 17:54:17 +0200 Message-Id: <1455119657-2494-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 smtp01.buh.bitdefender.com, 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.000011, 0.004968)], BW: [Enabled, t: (0.000008,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.006046), 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.007911)], URL: [Enabled, t: (0.000040)], RTDA: [Enabled, t: (0.018894), Hit: No, Details: v2.3.3; Id: 2m1ghdo.1aaoi9nek.4661p], 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 4/7] Rename monitor_x86.c to monitor.c and monitor_arch.h to monitor.h 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/monitor_x86.c -> arch/x86/monitor.c - asm-{x86,arm}/monitor_arch.h -> asm-{x86,arm}/monitor.h (previous commit explains why these renames were necessary) Signed-off-by: Corneliu ZUZU --- xen/arch/x86/Makefile | 2 +- xen/arch/x86/{monitor_x86.c => monitor.c} | 4 ++-- xen/common/monitor.c | 2 +- xen/include/asm-arm/{monitor_arch.h => monitor.h} | 8 ++++---- xen/include/asm-x86/{monitor_arch.h => monitor.h} | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) rename xen/arch/x86/{monitor_x86.c => monitor.c} (97%) rename xen/include/asm-arm/{monitor_arch.h => monitor.h} (90%) rename xen/include/asm-x86/{monitor_arch.h => monitor.h} (94%) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 6e80cf0..8e6e901 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -36,7 +36,7 @@ obj-y += microcode_intel.o # This must come after the vendor specific files. obj-y += microcode.o obj-y += mm.o x86_64/mm.o -obj-y += monitor_x86.o +obj-y += monitor.o obj-y += mpparse.o obj-y += nmi.o obj-y += numa.o diff --git a/xen/arch/x86/monitor_x86.c b/xen/arch/x86/monitor.c similarity index 97% rename from xen/arch/x86/monitor_x86.c rename to xen/arch/x86/monitor.c index d19fd15..568def2 100644 --- a/xen/arch/x86/monitor_x86.c +++ b/xen/arch/x86/monitor.c @@ -1,5 +1,5 @@ /* - * arch/x86/monitor_x86.c + * arch/x86/monitor.c * * Arch-specific monitor_op domctl handler. * @@ -19,7 +19,7 @@ * License along with this program; If not, see . */ -#include +#include bool_t arch_monitor_domctl_event(struct domain *d, struct xen_domctl_monitor_op *mop, diff --git a/xen/common/monitor.c b/xen/common/monitor.c index a4899c3..03063bb 100644 --- a/xen/common/monitor.c +++ b/xen/common/monitor.c @@ -25,7 +25,7 @@ #include #include -#include /* for monitor_arch_# */ +#include /* for monitor_arch_# */ #if CONFIG_X86 #include /* for VM_EVENT_X86_CR3 */ #include /* for hvm_update_guest_cr, ... */ diff --git a/xen/include/asm-arm/monitor_arch.h b/xen/include/asm-arm/monitor.h similarity index 90% rename from xen/include/asm-arm/monitor_arch.h rename to xen/include/asm-arm/monitor.h index d0df66c..eb770da 100644 --- a/xen/include/asm-arm/monitor_arch.h +++ b/xen/include/asm-arm/monitor.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/monitor_arch.h + * include/asm-arm/monitor.h * * Arch-specific monitor_op domctl handler. * @@ -19,8 +19,8 @@ * License along with this program; If not, see . */ -#ifndef __ASM_ARM_MONITOR_ARCH_H__ -#define __ASM_ARM_MONITOR_ARCH_H__ +#ifndef __ASM_ARM_MONITOR_H__ +#define __ASM_ARM_MONITOR_H__ #include #include @@ -50,4 +50,4 @@ bool_t arch_monitor_domctl_event(struct domain *d, return 0; } -#endif /* __ASM_ARM_MONITOR_ARCH_H__ */ +#endif /* __ASM_ARM_MONITOR_H__ */ diff --git a/xen/include/asm-x86/monitor_arch.h b/xen/include/asm-x86/monitor.h similarity index 94% rename from xen/include/asm-x86/monitor_arch.h rename to xen/include/asm-x86/monitor.h index d9daf65..b12823c 100644 --- a/xen/include/asm-x86/monitor_arch.h +++ b/xen/include/asm-x86/monitor.h @@ -1,5 +1,5 @@ /* - * include/asm-x86/monitor_arch.h + * include/asm-x86/monitor.h * * Arch-specific monitor_op domctl handler. * @@ -19,8 +19,8 @@ * License along with this program; If not, see . */ -#ifndef __ASM_X86_MONITOR_ARCH_H__ -#define __ASM_X86_MONITOR_ARCH_H__ +#ifndef __ASM_X86_MONITOR_H__ +#define __ASM_X86_MONITOR_H__ #include /* for struct domain, is_hvm_domain, ... */ #include /* for XEN_DOMCTL_MONITOR_#, ... */ @@ -71,4 +71,4 @@ bool_t arch_monitor_domctl_event(struct domain *d, struct xen_domctl_monitor_op *mop, int *rc); -#endif /* __ASM_X86_MONITOR_ARCH_H__ */ +#endif /* __ASM_X86_MONITOR_H__ */