From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgumS-000202-Kf for qemu-devel@nongnu.org; Thu, 23 Feb 2017 09:54:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgumO-0006Xr-2h for qemu-devel@nongnu.org; Thu, 23 Feb 2017 09:54:04 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:58916) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cgumN-0006Wt-R6 for qemu-devel@nongnu.org; Thu, 23 Feb 2017 09:54:00 -0500 From: Paul Durrant Date: Thu, 23 Feb 2017 14:53:52 +0000 Message-ID: <1487861635-17560-3-git-send-email-paul.durrant@citrix.com> In-Reply-To: <1487861635-17560-1-git-send-email-paul.durrant@citrix.com> References: <1487861635-17560-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 2/5] xen: rename xen_modified_memory() to xen_hvm_modified_memory() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Cc: Paul Durrant , Paolo Bonzini , Stefano Stabellini , Anthony Perard This patch is a purely cosmetic change that avoids a name collision in a subsequent patch. Signed-off-by: Paul Durrant --- Cc: Paolo Bonzini Cc: Stefano Stabellini Cc: Anthony Perard --- 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; -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH 2/5] xen: rename xen_modified_memory() to xen_hvm_modified_memory() Date: Thu, 23 Feb 2017 14:53:52 +0000 Message-ID: <1487861635-17560-3-git-send-email-paul.durrant@citrix.com> References: <1487861635-17560-1-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgumP-0001Xe-RV for xen-devel@lists.xenproject.org; Thu, 23 Feb 2017 14:54:01 +0000 In-Reply-To: <1487861635-17560-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Cc: Anthony Perard , Paolo Bonzini , Paul Durrant , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCBpcyBhIHB1cmVseSBjb3NtZXRpYyBjaGFuZ2UgdGhhdCBhdm9pZHMgYSBuYW1l IGNvbGxpc2lvbiBpbgphIHN1YnNlcXVlbnQgcGF0Y2guCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1 cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgotLS0KQ2M6IFBhb2xvIEJvbnppbmkgPHBi b256aW5pQHJlZGhhdC5jb20+CkNjOiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtl cm5lbC5vcmc+CkNjOiBBbnRob255IFBlcmFyZCA8YW50aG9ueS5wZXJhcmRAY2l0cml4LmNvbT4K LS0tCiBpbmNsdWRlL2V4ZWMvcmFtX2FkZHIuaCB8IDQgKystLQogaW5jbHVkZS9ody94ZW4veGVu LmggICAgfCAyICstCiB4ZW4taHZtLXN0dWIuYyAgICAgICAgICB8IDIgKy0KIHhlbi1odm0uYyAg ICAgICAgICAgICAgIHwgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9leGVjL3JhbV9hZGRyLmggYi9pbmNs dWRlL2V4ZWMvcmFtX2FkZHIuaAppbmRleCAzZTc5NDY2Li44NzE1YWY2IDEwMDY0NAotLS0gYS9p bmNsdWRlL2V4ZWMvcmFtX2FkZHIuaAorKysgYi9pbmNsdWRlL2V4ZWMvcmFtX2FkZHIuaApAQCAt MjU5LDcgKzI1OSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBjcHVfcGh5c2ljYWxfbWVtb3J5X3Nl dF9kaXJ0eV9yYW5nZShyYW1fYWRkcl90IHN0YXJ0LAogCiAgICAgcmN1X3JlYWRfdW5sb2NrKCk7 CiAKLSAgICB4ZW5fbW9kaWZpZWRfbWVtb3J5KHN0YXJ0LCBsZW5ndGgpOworICAgIHhlbl9odm1f bW9kaWZpZWRfbWVtb3J5KHN0YXJ0LCBsZW5ndGgpOwogfQogCiAjaWYgIWRlZmluZWQoX1dJTjMy KQpAQCAtMzEzLDcgKzMxMyw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBjcHVfcGh5c2ljYWxfbWVt b3J5X3NldF9kaXJ0eV9sZWJpdG1hcCh1bnNpZ25lZCBsb25nICpiaXRtYXAsCiAKICAgICAgICAg cmN1X3JlYWRfdW5sb2NrKCk7CiAKLSAgICAgICAgeGVuX21vZGlmaWVkX21lbW9yeShzdGFydCwg cGFnZXMgPDwgVEFSR0VUX1BBR0VfQklUUyk7CisgICAgICAgIHhlbl9odm1fbW9kaWZpZWRfbWVt b3J5KHN0YXJ0LCBwYWdlcyA8PCBUQVJHRVRfUEFHRV9CSVRTKTsKICAgICB9IGVsc2UgewogICAg ICAgICB1aW50OF90IGNsaWVudHMgPSB0Y2dfZW5hYmxlZCgpID8gRElSVFlfQ0xJRU5UU19BTEwg OiBESVJUWV9DTElFTlRTX05PQ09ERTsKICAgICAgICAgLyoKZGlmZiAtLWdpdCBhL2luY2x1ZGUv aHcveGVuL3hlbi5oIGIvaW5jbHVkZS9ody94ZW4veGVuLmgKaW5kZXggMDljMmNlNS4uMmIxNzMz YiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ody94ZW4veGVuLmgKKysrIGIvaW5jbHVkZS9ody94ZW4v eGVuLmgKQEAgLTQzLDcgKzQzLDcgQEAgdm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUg KnBjbXMsIE1lbW9yeVJlZ2lvbiAqKnJhbV9tZW1vcnkpOwogCiB2b2lkIHhlbl9yYW1fYWxsb2Mo cmFtX2FkZHJfdCByYW1fYWRkciwgcmFtX2FkZHJfdCBzaXplLAogICAgICAgICAgICAgICAgICAg IHN0cnVjdCBNZW1vcnlSZWdpb24gKm1yLCBFcnJvciAqKmVycnApOwotdm9pZCB4ZW5fbW9kaWZp ZWRfbWVtb3J5KHJhbV9hZGRyX3Qgc3RhcnQsIHJhbV9hZGRyX3QgbGVuZ3RoKTsKK3ZvaWQgeGVu X2h2bV9tb2RpZmllZF9tZW1vcnkocmFtX2FkZHJfdCBzdGFydCwgcmFtX2FkZHJfdCBsZW5ndGgp OwogCiB2b2lkIHhlbl9yZWdpc3Rlcl9mcmFtZWJ1ZmZlcihzdHJ1Y3QgTWVtb3J5UmVnaW9uICpt cik7CiAKZGlmZiAtLWdpdCBhL3hlbi1odm0tc3R1Yi5jIGIveGVuLWh2bS1zdHViLmMKaW5kZXgg YzUwMDMyNS4uM2NhNmM1MSAxMDA2NDQKLS0tIGEveGVuLWh2bS1zdHViLmMKKysrIGIveGVuLWh2 bS1zdHViLmMKQEAgLTUwLDcgKzUwLDcgQEAgdm9pZCB4ZW5fcmVnaXN0ZXJfZnJhbWVidWZmZXIo TWVtb3J5UmVnaW9uICptcikKIHsKIH0KIAotdm9pZCB4ZW5fbW9kaWZpZWRfbWVtb3J5KHJhbV9h ZGRyX3Qgc3RhcnQsIHJhbV9hZGRyX3QgbGVuZ3RoKQordm9pZCB4ZW5faHZtX21vZGlmaWVkX21l bW9yeShyYW1fYWRkcl90IHN0YXJ0LCByYW1fYWRkcl90IGxlbmd0aCkKIHsKIH0KIApkaWZmIC0t Z2l0IGEveGVuLWh2bS5jIGIveGVuLWh2bS5jCmluZGV4IGRiYjhjNjYuLmVkZjQ5ODMgMTAwNjQ0 Ci0tLSBhL3hlbi1odm0uYworKysgYi94ZW4taHZtLmMKQEAgLTEzOTEsNyArMTM5MSw3IEBAIHZv aWQgeGVuX3NodXRkb3duX2ZhdGFsX2Vycm9yKGNvbnN0IGNoYXIgKmZtdCwgLi4uKQogICAgIHFl bXVfc3lzdGVtX3NodXRkb3duX3JlcXVlc3QoKTsKIH0KIAotdm9pZCB4ZW5fbW9kaWZpZWRfbWVt b3J5KHJhbV9hZGRyX3Qgc3RhcnQsIHJhbV9hZGRyX3QgbGVuZ3RoKQordm9pZCB4ZW5faHZtX21v ZGlmaWVkX21lbW9yeShyYW1fYWRkcl90IHN0YXJ0LCByYW1fYWRkcl90IGxlbmd0aCkKIHsKICAg ICBpZiAodW5saWtlbHkoeGVuX2luX21pZ3JhdGlvbikpIHsKICAgICAgICAgaW50IHJjOwotLSAK Mi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpY ZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlz dHMueGVuLm9yZy94ZW4tZGV2ZWwK