Commit 5100afb5 authored by Paul Durrant's avatar Paul Durrant Committed by Stefano Stabellini
Browse files

xen: rename xen_modified_memory() to xen_hvm_modified_memory() 



This patch is a purely cosmetic change that avoids a name collision in
a subsequent patch.

Signed-off-by: default avatarPaul Durrant <paul.durrant@citrix.com>
Reviewed-by: default avatarAnthony Perard <anthony.perard@citrix.com>
Reviewed-by: default avatarStefano Stabellini <sstabellini@kernel.org>
parent 260cabed

include/exec/ram_addr.h

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,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)
@@ -314,7 +314,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;

        /*

include/hw/xen/xen.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

xen-hvm-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

}

xen-hvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;