From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY5r-0004JQ-7Y for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:04:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY5m-0004CP-MI for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:04:58 -0400 Received: from [199.232.76.173] (port=48248 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY5m-0004CA-FL for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:04:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26064) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY5l-0002kL-To for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:04:54 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A14qEZ019929 for ; Wed, 9 Sep 2009 21:04:53 -0400 From: Juan Quintela Date: Thu, 10 Sep 2009 03:04:22 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 01/26] ram: remove support for loading v1 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- vl.c | 42 ------------------------------------------ 1 files changed, 0 insertions(+), 42 deletions(-) diff --git a/vl.c b/vl.c index c6c6a6b..148a592 100644 --- a/vl.c +++ b/vl.c @@ -2792,45 +2792,6 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque) /***********************************************************/ /* ram save/restore */ -static int ram_get_page(QEMUFile *f, uint8_t *buf, int len) -{ - int v; - - v = qemu_get_byte(f); - switch(v) { - case 0: - if (qemu_get_buffer(f, buf, len) != len) - return -EIO; - break; - case 1: - v = qemu_get_byte(f); - memset(buf, v, len); - break; - default: - return -EINVAL; - } - - if (qemu_file_has_error(f)) - return -EIO; - - return 0; -} - -static int ram_load_v1(QEMUFile *f, void *opaque) -{ - int ret; - ram_addr_t i; - - if (qemu_get_be32(f) != last_ram_offset) - return -EINVAL; - for(i = 0; i < last_ram_offset; i+= TARGET_PAGE_SIZE) { - ret = ram_get_page(f, qemu_get_ram_ptr(i), TARGET_PAGE_SIZE); - if (ret) - return ret; - } - return 0; -} - #define BDRV_HASH_BLOCK_SIZE 1024 #define IOBUF_SIZE 4096 #define RAM_CBLOCK_MAGIC 0xfabe @@ -3065,9 +3026,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ram_addr_t addr; int flags; - if (version_id == 1) - return ram_load_v1(f, opaque); - if (version_id == 2) { if (qemu_get_be32(f) != last_ram_offset) return -EINVAL; -- 1.6.2.5