[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/12] vmstate: Avoid seeking
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 01/12] vmstate: Avoid seeking |
Date: |
Wed, 2 Dec 2009 12:36:35 +0100 |
From: Jan Kiszka <address@hidden>
Seeking on vmstate save/load does not work if the underlying file is a
stream. We could try to make all QEMUFile* forward-seek-aware, but first
attempts in this direction indicated that it's saner to convert the few
qemu_fseek-on-vmstates users to plain reads/writes.
This fixes various subtle vmstate corruptions where unused fields were
involved.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
savevm.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/savevm.c b/savevm.c
index 18c2e54..833bf3c 100644
--- a/savevm.c
+++ b/savevm.c
@@ -959,13 +959,27 @@ const VMStateInfo vmstate_info_buffer = {
static int get_unused_buffer(QEMUFile *f, void *pv, size_t size)
{
- qemu_fseek(f, size, SEEK_CUR);
- return 0;
+ uint8_t buf[1024];
+ int block_len;
+
+ while (size > 0) {
+ block_len = MIN(sizeof(buf), size);
+ size -= block_len;
+ qemu_get_buffer(f, buf, block_len);
+ }
+ return 0;
}
static void put_unused_buffer(QEMUFile *f, void *pv, size_t size)
{
- qemu_fseek(f, size, SEEK_CUR);
+ static const uint8_t buf[1024];
+ int block_len;
+
+ while (size > 0) {
+ block_len = MIN(sizeof(buf), size);
+ size -= block_len;
+ qemu_put_buffer(f, buf, block_len);
+ }
}
const VMStateInfo vmstate_info_unused_buffer = {
--
1.6.5.2
- [Qemu-devel] [PATCH 00/12] vmstate cleanups and fixes, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 01/12] vmstate: Avoid seeking,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/12] vmstate: Fix info field of VMSTATE_MACADDR, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 03/12] vmstate: fix missing ARRAY_OF_POINTERS support on save state, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 04/12] vmstate: Add support for VBUFFERS, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 05/12] vmstate: Introduce VMSTATE_STRUCT_TEST, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 06/12] vmstate: Introduce VMSTATE_STRUCT_POINTER_TEST, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 07/12] vmstate: Introduce UINT16_TEST support, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 11/12] qdev: enable vmstate_unregister() support, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 10/12] pci: vmstate_register() already assign consecutive numbers starting at 0, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 09/12] vmstate: Add support for multiplying size for a constant, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 08/12] vmstate: remove usused VMSTATE_STRUCT_ARRAY_SIZE_UINT8, Juan Quintela, 2009/12/02