Commit c5705a77 authored by Avi Kivity's avatar Avi Kivity
Browse files

vmstate, memory: decouple vmstate from memory API 



Currently creating a memory region automatically registers it for
live migration.  This differs from other state (which is enumerated
in a VMStateDescription structure) and ties the live migration code
into the memory core.

Decouple the two by introducing a separate API, vmstate_register_ram(),
for registering a RAM block for migration.  Currently the same
implementation is reused, but later it can be moved into a separate list,
and registrations can be moved to VMStateDescription blocks.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 8991c79b

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ common-obj-$(CONFIG_SD) += sd.o 
common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o

common-obj-y += bt-hci-csr.o

common-obj-y += buffered_file.o migration.o migration-tcp.o

common-obj-y += qemu-char.o savevm.o #aio.o

common-obj-y += qemu-char.o #aio.o

common-obj-y += msmouse.o ps2.o

common-obj-y += qdev.o qdev-properties.o

common-obj-y += block-migration.o iohandler.o

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ obj-$(CONFIG_VHOST_NET) += vhost.o 
obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o

obj-$(CONFIG_KVM) += kvm.o kvm-all.o

obj-$(CONFIG_NO_KVM) += kvm-stub.o

obj-y += memory.o

obj-y += memory.o savevm.o

LIBS+=-lz



QEMU_CFLAGS += $(VNC_TLS_CFLAGS)

cpu-common.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ void qemu_put_ram_ptr(void *addr); 
/* This should not be used by devices.  */

int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr);

ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr);

void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev);



void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,

                            int len, int is_write);

exec-obsolete.h

+2 −4
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ 


#ifndef CONFIG_USER_ONLY



ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,

                                   ram_addr_t size, void *host,

                                   MemoryRegion *mr);

ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size,

ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                   MemoryRegion *mr);

ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);

void qemu_ram_free(ram_addr_t addr);

void qemu_ram_free_from_ptr(ram_addr_t addr);

exec.c

+22 −9
Original line number Diff line number Diff line
@@ -2753,14 +2753,19 @@ static ram_addr_t last_ram_offset(void) 
    return last;

}



ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,

                                   ram_addr_t size, void *host,

                                   MemoryRegion *mr)

void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev)

{

    RAMBlock *new_block, *block;



    size = TARGET_PAGE_ALIGN(size);

    new_block = g_malloc0(sizeof(*new_block));

    new_block = NULL;

    QLIST_FOREACH(block, &ram_list.blocks, next) {

        if (block->offset == addr) {

            new_block = block;

            break;

        }

    }

    assert(new_block);

    assert(!new_block->idstr[0]);



    if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) {

        char *id = dev->parent_bus->info->get_dev_path(dev);
@@ -2772,12 +2777,21 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, 
    pstrcat(new_block->idstr, sizeof(new_block->idstr), name);



    QLIST_FOREACH(block, &ram_list.blocks, next) {

        if (!strcmp(block->idstr, new_block->idstr)) {

        if (block != new_block && !strcmp(block->idstr, new_block->idstr)) {

            fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n",

                    new_block->idstr);

            abort();

        }

    }

}



ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                   MemoryRegion *mr)

{

    RAMBlock *new_block;



    size = TARGET_PAGE_ALIGN(size);

    new_block = g_malloc0(sizeof(*new_block));



    new_block->offset = find_ram_offset(size);

    if (host) {
@@ -2834,10 +2848,9 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, 
    return new_block->offset;

}



ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size,

                          MemoryRegion *mr)

ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr)

{

    return qemu_ram_alloc_from_ptr(dev, name, size, NULL, mr);

    return qemu_ram_alloc_from_ptr(size, NULL, mr);

}



void qemu_ram_free_from_ptr(ram_addr_t addr)