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 /hw | |
| 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 'hw')
| -rw-r--r-- | hw/android_arm.c | 1 | ||||
| -rw-r--r-- | hw/goldfish_audio.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/android_arm.c b/hw/android_arm.c index 188051b..c93a4db 100644 --- a/hw/android_arm.c +++ b/hw/android_arm.c @@ -77,7 +77,6 @@ static void android_arm_init_(ram_addr_t ram_size, cpu_model = "arm926"; env = cpu_init(cpu_model); - register_savevm( "cpu", 0, ARM_CPU_SAVE_VERSION, cpu_save, cpu_load, env ); ram_offset = qemu_ram_alloc(NULL,"android_arm",ram_size); cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM); diff --git a/hw/goldfish_audio.c b/hw/goldfish_audio.c index 434522c..60e652c 100644 --- a/hw/goldfish_audio.c +++ b/hw/goldfish_audio.c @@ -263,7 +263,7 @@ static int audio_state_load( QEMUFile* f, void* opaque, int version_id ) goldfish_audio_buff_get( s->out_buff2, f ); goldfish_audio_buff_get (s->in_buff, f); } - return -1; + return ret; } static void enable_audio(struct goldfish_audio_state *s, int enable) |