diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-10-05 14:25:07 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-10-05 18:49:22 -0700 |
| commit | d0e2872813e1d37e8233befdfd13a4d6cb0d7431 (patch) | |
| tree | 0ebcdef43b631022360eace1f3ddd878002bc635 /arch_init.c | |
| parent | 7dff581472947cb1b9fa63be0fb8b00c75fad762 (diff) | |
| download | external_qemu-d0e2872813e1d37e8233befdfd13a4d6cb0d7431.zip external_qemu-d0e2872813e1d37e8233befdfd13a4d6cb0d7431.tar.gz external_qemu-d0e2872813e1d37e8233befdfd13a4d6cb0d7431.tar.bz2 | |
Fix snapshots
Change-Id: Ib3891704ece2cea0c5a80b468b2514e6c4d13216
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch_init.c b/arch_init.c index b966d8a..7285d27 100644 --- a/arch_init.c +++ b/arch_init.c @@ -382,7 +382,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 (version_id != 3) { if (addr != ram_bytes_total()) { return -EINVAL; } @@ -418,13 +418,11 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) total_ram_bytes -= length; } } - } - - if (flags & RAM_SAVE_FLAG_COMPRESS) { + } else if (flags & RAM_SAVE_FLAG_COMPRESS) { void *host; uint8_t ch; - if (version_id == 3) + if (version_id != 3) host = qemu_get_ram_ptr(addr); else host = host_from_stream_offset(f, addr, flags); @@ -443,7 +441,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) } else if (flags & RAM_SAVE_FLAG_PAGE) { void *host; - if (version_id == 3) + if (version_id != 3) host = qemu_get_ram_ptr(addr); else host = host_from_stream_offset(f, addr, flags); |