From d0e2872813e1d37e8233befdfd13a4d6cb0d7431 Mon Sep 17 00:00:00 2001
From: Vladimir Chtchetkine <vchtchetkine@google.com>
Date: Wed, 5 Oct 2011 14:25:07 -0700
Subject: Fix snapshots

Change-Id: Ib3891704ece2cea0c5a80b468b2514e6c4d13216
---
 hw/android_arm.c    | 1 -
 hw/goldfish_audio.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'hw')

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)
-- 
cgit v1.1