[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 04/11] Add host_from_stream_offset_versioned func
From: |
Orit Wasserman |
Subject: |
[Qemu-devel] [PATCH v7 04/11] Add host_from_stream_offset_versioned function |
Date: |
Thu, 26 Jan 2012 16:24:50 +0200 |
Signed-off-by: Orit Wasserman <address@hidden>
---
arch_init.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index ac21bc0..0f6037e 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -550,6 +550,18 @@ static inline void *host_from_stream_offset(QEMUFile *f,
return NULL;
}
+static inline void *host_from_stream_offset_versioned(int version_id,
+ QEMUFile *f, ram_addr_t offset, int flags)
+{
+ void *host;
+ if (version_id == 3) {
+ host = qemu_get_ram_ptr(offset);
+ } else {
+ host = host_from_stream_offset(f, offset, flags);
+ }
+ return host;
+}
+
int ram_load(QEMUFile *f, void *opaque, int version_id)
{
ram_addr_t addr;
@@ -605,8 +617,11 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
void *host;
uint8_t ch;
- host = host_from_stream_offset(f, addr, flags);
+ host = host_from_stream_offset_versioned(version_id,
+ f, addr, flags);
if (!host) {
+ fprintf(stderr, "Failed to convert RAM address to host"
+ " for offset " RAM_ADDR_FMT "\n", addr);
return -EINVAL;
}
@@ -621,8 +636,13 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
} else if (flags & RAM_SAVE_FLAG_PAGE) {
void *host;
- host = host_from_stream_offset(f, addr, flags);
-
+ host = host_from_stream_offset_versioned(version_id,
+ f, addr, flags);
+ if (!host) {
+ fprintf(stderr, "Failed to convert RAM address to host"
+ " for offset " RAM_ADDR_FMT "\n", addr);
+ return -EINVAL;
+ }
qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
}
error = qemu_file_get_error(f);
--
1.7.6.5
- [Qemu-devel] [PATCH v7 00/11] XBRLE delta for live migration of large memory app, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 01/11] Add cache handling functions, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 03/11] Add save_block_hdr function, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 04/11] Add host_from_stream_offset_versioned function,
Orit Wasserman <=
- [Qemu-devel] [PATCH v7 02/11] Add uleb encoding/decoding functions, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 07/11] Add XBZRLE parameters to MigrationState, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 06/11] Add MigrationParams structure, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 05/11] Add XBZRLE to ram_save_block and ram_save_live, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 08/11] Add migration capabilties, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 09/11] Add set_cachesize command, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 10/11] Add XBZRLE option to migrate command, Orit Wasserman, 2012/01/26
- [Qemu-devel] [PATCH v7 11/11] Add XBZRLE statstics information, Orit Wasserman, 2012/01/26