From patchwork Fri Mar 3 11:47:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9602605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1AE35604E2 for ; Fri, 3 Mar 2017 11:50:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C03A28616 for ; Fri, 3 Mar 2017 11:50:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00FA728634; Fri, 3 Mar 2017 11:50:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 782F728616 for ; Fri, 3 Mar 2017 11:50:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjlgj-0006cb-L5; Fri, 03 Mar 2017 11:47:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjlgi-0006cD-Ec for xen-devel@lists.xenproject.org; Fri, 03 Mar 2017 11:47:56 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 70/82-23940-BE759B85; Fri, 03 Mar 2017 11:47:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeJIrShJLcpLzFFi42JxWrohUvd1+M4 Ig+/fhSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyPU9QL7ghX7J+9gLmB8axAFyMnh4SAv8Sj Q6dZQWw2AR2JqU8vgdkiArYSs/9OZQaxmQVqJa4vucQOYgsLhEm0/VzOBGKzCKhIPD93kw3E5 hVwl5i4/igbxEw5ifPHfwL1cnBwCnhIzD7gDmIKAZXcmhMIUiEE1Ll+6iyoTkGJkzOfsEBskp A4+OIF8wRG3llIUrOQpBYwMq1i1ChOLSpLLdI1NNFLKspMzyjJTczM0TU0MNbLTS0uTkxPzUl MKtZLzs/dxAgMGwYg2MG4YrvnIUZJDiYlUV6r6B0RQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4 D8wHygkWpaanVqRl5gADGCYtwcGjJMI7ASTNW1yQmFucmQ6ROsWoKCXOK7gAKCEAksgozYNrg 0XNJUZZKWFeRqBDhHgKUotyM0tQ5V8xinMwKgnzyoNM4cnMK4Gb/gpoMRPQ4hcqW0EWlyQipK QaGKeFHFl6Znmc6jvHJ84i9fJ/v4pPTHNTnXXB5saFq7lzrmgdPC/k9r6bZV6H5G6rqh+d23x r/91fKv3q2W1NY69/q7JOOhX6GyadfXG2QXkFx4/ZNq9DGp49ZenkqbPfamdkUtB0pTG5UOZu XU/y7U5R3iNcfi9cZTlCb1+fWTv38aorVr1aO5RYijMSDbWYi4oTATgP/eqVAgAA X-Env-Sender: prvs=228f1c8ea=Paul.Durrant@citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1488541673!80812609!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: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46617 invoked from network); 3 Mar 2017 11:47:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 3 Mar 2017 11:47:55 -0000 X-IronPort-AV: E=Sophos;i="5.35,236,1484006400"; d="scan'208";a="411187404" From: Paul Durrant To: , Date: Fri, 3 Mar 2017 11:47:48 +0000 Message-ID: <1488541671-26740-3-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1488541671-26740-1-git-send-email-paul.durrant@citrix.com> References: <1488541671-26740-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Cc: Paolo Bonzini , Paul Durrant , Stefano Stabellini Subject: [Xen-devel] [PATCH v3 2/5] xen: rename xen_modified_memory() to xen_hvm_modified_memory() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch is a purely cosmetic change that avoids a name collision in a subsequent patch. Signed-off-by: Paul Durrant Reviewed-by: Anthony Perard --- Cc: Paolo Bonzini Cc: Stefano Stabellini --- include/exec/ram_addr.h | 4 ++-- include/hw/xen/xen.h | 2 +- xen-hvm-stub.c | 2 +- xen-hvm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3e79466..8715af6 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -259,7 +259,7 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, rcu_read_unlock(); - xen_modified_memory(start, length); + xen_hvm_modified_memory(start, length); } #if !defined(_WIN32) @@ -313,7 +313,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, rcu_read_unlock(); - xen_modified_memory(start, pages << TARGET_PAGE_BITS); + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; /* diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 09c2ce5..2b1733b 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -43,7 +43,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory); void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr, Error **errp); -void xen_modified_memory(ram_addr_t start, ram_addr_t length); +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); void xen_register_framebuffer(struct MemoryRegion *mr); diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c index c500325..3ca6c51 100644 --- a/xen-hvm-stub.c +++ b/xen-hvm-stub.c @@ -50,7 +50,7 @@ void xen_register_framebuffer(MemoryRegion *mr) { } -void xen_modified_memory(ram_addr_t start, ram_addr_t length) +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) { } diff --git a/xen-hvm.c b/xen-hvm.c index dbb8c66..edf4983 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -1391,7 +1391,7 @@ void xen_shutdown_fatal_error(const char *fmt, ...) qemu_system_shutdown_request(); } -void xen_modified_memory(ram_addr_t start, ram_addr_t length) +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) { if (unlikely(xen_in_migration)) { int rc;