[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] arch_init: Simplify code for load_xbzrle()
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 1/6] arch_init: Simplify code for load_xbzrle() |
Date: |
Thu, 15 May 2014 03:40:02 +0200 |
From: Chen Gang <address@hidden>
For xbzrle_decode_buffer(), when decoding contents will exceed writing
buffer, it will return -1, so need not check the return value whether
large than writing buffer.
And when failure occurs within load_xbzrle(), it always return -1
without any resources which need release.
So can remove the related checking statements, and also can remove 'rc'
and 'ret' local variables,
Signed-off-by: Chen Gang <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 995f56d..4e8f2c8 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -946,7 +946,6 @@ static uint64_t ram_save_pending(QEMUFile *f, void *opaque,
uint64_t max_size)
static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host)
{
- int ret, rc = 0;
unsigned int xh_len;
int xh_flags;
@@ -971,18 +970,13 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void
*host)
qemu_get_buffer(f, xbzrle_decoded_buf, xh_len);
/* decode RLE */
- ret = xbzrle_decode_buffer(xbzrle_decoded_buf, xh_len, host,
- TARGET_PAGE_SIZE);
- if (ret == -1) {
+ if (xbzrle_decode_buffer(xbzrle_decoded_buf, xh_len, host,
+ TARGET_PAGE_SIZE) == -1) {
fprintf(stderr, "Failed to load XBZRLE page - decode error!\n");
- rc = -1;
- } else if (ret > TARGET_PAGE_SIZE) {
- fprintf(stderr, "Failed to load XBZRLE page - size %d exceeds %d!\n",
- ret, TARGET_PAGE_SIZE);
- abort();
+ return -1;
}
- return rc;
+ return 0;
}
static inline void *host_from_stream_offset(QEMUFile *f,
--
1.9.0
- [Qemu-devel] [PULL 0/6] migration queue, Juan Quintela, 2014/05/14
- [Qemu-devel] [PULL 1/6] arch_init: Simplify code for load_xbzrle(),
Juan Quintela <=
- [Qemu-devel] [PULL 4/6] savevm: Remove all the unneeded version_minimum_id_old (rest), Juan Quintela, 2014/05/14
- [Qemu-devel] [PULL 3/6] savevm: Remove all the unneeded version_minimum_id_old (usb), Juan Quintela, 2014/05/14
- [Qemu-devel] [PULL 6/6] usb: fix up post load checks, Juan Quintela, 2014/05/14
- [Qemu-devel] [PULL 5/6] migration: show average throughput when migration finishes, Juan Quintela, 2014/05/14
- [Qemu-devel] [PULL 2/6] Split ram_save_block, Juan Quintela, 2014/05/14
- Re: [Qemu-devel] [PULL 0/6] migration queue, Peter Maydell, 2014/05/15