[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] Remove support for version 3 ram_load
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 4/8] Remove support for version 3 ram_load |
Date: |
Wed, 21 Dec 2011 15:34:33 +0200 |
Version 3 ram_load depends on ram_addrs, which are not stable. Version 4
was introduced in 0.13 (and RHEL 6), so this means live migration from 0.12
and earlier to 1.1 or later will not work.
Signed-off-by: Avi Kivity <address@hidden>
---
arch_init.c | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 8a3f052..9b8a1f3 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -366,7 +366,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
int flags;
int error;
- if (version_id < 3 || version_id > 4) {
+ if (version_id < 4 || version_id > 4) {
return -EINVAL;
}
@@ -377,11 +377,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
addr &= TARGET_PAGE_MASK;
if (flags & RAM_SAVE_FLAG_MEM_SIZE) {
- if (version_id == 3) {
- if (addr != ram_bytes_total()) {
- return -EINVAL;
- }
- } else {
+ if (version_id == 4) {
/* Synchronize RAM block list */
char id[256];
ram_addr_t length;
@@ -419,10 +415,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
void *host;
uint8_t ch;
- if (version_id == 3)
- host = qemu_get_ram_ptr(addr);
- else
- host = host_from_stream_offset(f, addr, flags);
+ host = host_from_stream_offset(f, addr, flags);
if (!host) {
return -EINVAL;
}
@@ -438,10 +431,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
} else if (flags & RAM_SAVE_FLAG_PAGE) {
void *host;
- if (version_id == 3)
- host = qemu_get_ram_ptr(addr);
- else
- host = host_from_stream_offset(f, addr, flags);
+ host = host_from_stream_offset(f, addr, flags);
qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
}
--
1.7.7.1
- [Qemu-devel] [PATCH 0/8] Convert live migration to memory API, Avi Kivity, 2011/12/21
- [Qemu-devel] [PATCH 4/8] Remove support for version 3 ram_load,
Avi Kivity <=
- [Qemu-devel] [PATCH 7/8] xen: convert framebuffer dirty tracking to memory API, Avi Kivity, 2011/12/21
- [Qemu-devel] [PATCH 1/8] Store MemoryRegion in RAMBlock, Avi Kivity, 2011/12/21
- [Qemu-devel] [PATCH 6/8] memory: obsolete cpu_physical_memory_[gs]et_dirty_tracking(), Avi Kivity, 2011/12/21
- [Qemu-devel] [PATCH 3/8] Sort RAMBlocks by ID for migration, not by ram_addr, Avi Kivity, 2011/12/21
- [Qemu-devel] [PATCH 2/8] Switch ram_save to the memory API, Avi Kivity, 2011/12/21
- [Qemu-devel] [PATCH 5/8] Convert ram_load() to the memory API, Avi Kivity, 2011/12/21