Skip to contentSkip to conversation

arch_init/ram_load: add error message for block length mismatch

PATCH In review Alon Levy 2 participants 2 messages May 12, 2013 – May 13, 2013

lore
Share & tools
lore

Alon Levy

author
#0 lore raw

PATCH v3 1/1 arch_init/ram_load: add error message for block length mismatch

Makes it easier to debug situations where the source and target have different ram blocks in a device and migration fails due to that, for instance a BAR size change on a PCI device.

---
v3: use RAM_ADDR_FMT

 arch_init.c | 3 +++
 1 file changed, 3 insertions(+)
arch_init.c +3 -0
index 49c5dc2..cd27fcf 100644
@@ -808,6 +808,9 @@ 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) {
+                                fprintf(stderr, "Length mismatch: %s: %ld "
+                                        "in != " RAM_ADDR_FMT "\n", id, length,
+                                        block->length);
                                 ret =  -EINVAL;
                                 goto done;
                             }
Signature · 1 line
1.8.2.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 11 lines · Alon Levy

Makes it easier to debug situations where the source and target have different ram blocks in a device and migration fails due to that, for instance a BAR size change on a PCI device.

---
v3: use RAM_ADDR_FMT

 arch_init.c | 3 +++
 1 file changed, 3 insertions(+)

will be included in next pull request. thanks.

Quoted 14 lines
arch_init.c +3 -0
index 49c5dc2..cd27fcf 100644
@@ -808,6 +808,9 @@ 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) {
+                                fprintf(stderr, "Length mismatch: %s: %ld "
+                                        "in != " RAM_ADDR_FMT "\n", id, length,
+                                        block->length);
                                 ret =  -EINVAL;
                                 goto done;
                             }