aboutsummaryrefslogtreecommitdiff
path: root/savevm.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2009-12-02 12:36:35 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-03 10:04:53 -0600
commit21174c34b6b9ace9ad82e0deb13be752d28a5907 (patch)
tree9a9c59436a56407f2c9139bf4cb6c2bdeebb97ef /savevm.c
parente560125e2692714054b718b51211f32a311538b5 (diff)
downloadqemu-21174c34b6b9ace9ad82e0deb13be752d28a5907.zip
qemu-21174c34b6b9ace9ad82e0deb13be752d28a5907.tar.gz
qemu-21174c34b6b9ace9ad82e0deb13be752d28a5907.tar.bz2
vmstate: Avoid seeking
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 <jan.kiszka@siemens.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'savevm.c')
-rw-r--r--savevm.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/savevm.c b/savevm.c
index d6da050..55a2763 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 = {