[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/9] Show length mismatch error is hex
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 4/9] Show length mismatch error is hex |
Date: |
Sat, 9 Aug 2014 00:38:57 +0400 |
From: Alex Bligh <address@hidden>
When live migrate fails due to a section length mismatch we currently
see an error message like:
Length mismatch: 0000:00:03.0/virtio-net-pci.rom: 10000 in != 20000
The section lengths are in fact in hex, so this should read
Length mismatch: 0000:00:03.0/virtio-net-pci.rom: 0x10000 in != 0x20000
Correct the error string to reflect this.
Signed-off-by: Alex Bligh <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
arch_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 8ddaf35..28ece76 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -1072,8 +1072,8 @@ static int ram_load(QEMUFile *f, void *opaque, int
version_id)
QTAILQ_FOREACH(block, &ram_list.blocks, next) {
if (!strncmp(id, block->idstr, sizeof(id))) {
if (block->length != length) {
- error_report("Length mismatch: %s: " RAM_ADDR_FMT
- " in != " RAM_ADDR_FMT, id, length,
+ error_report("Length mismatch: %s: 0x" RAM_ADDR_FMT
+ " in != 0x" RAM_ADDR_FMT, id, length,
block->length);
ret = -EINVAL;
}
--
1.7.10.4
- [Qemu-devel] [PULL 0/9] Trivial patches for 2014-08-09, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 6/9] hw/timer: Move extern declaration from .c to .h file, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 4/9] Show length mismatch error is hex,
Michael Tokarev <=
- [Qemu-devel] [PULL 8/9] po: Add Chinese translation, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 1/9] hw/timer/imx_*: fix TIMER_MAX clash with system symbol, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 7/9] qemu-img: Check getchar() return value in read_password() for WIN32, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 5/9] virtio: Move extern declaration to header file, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 3/9] target-i386/cpu.c: Fix two error output indentation, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 9/9] build-sys: Move qapi-{types, visit, event}.o into util-obj-y, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 2/9] l2tpv3 (configure): it is linux-specific, Michael Tokarev, 2014/08/08
- Re: [Qemu-devel] [PULL 0/9] Trivial patches for 2014-08-09, Peter Maydell, 2014/08/15