[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/43] qemu_loadvm errors and debug
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v2 11/43] qemu_loadvm errors and debug |
Date: |
Mon, 11 Aug 2014 15:29:27 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Flip many fprintf's to error_report
Add lots of DPRINTF debug in qemu_loadvm*
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
savevm.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/savevm.c b/savevm.c
index 8eebbfd..2c0d61a 100644
--- a/savevm.c
+++ b/savevm.c
@@ -719,6 +719,8 @@ int qemu_savevm_state_iterate(QEMUFile *f)
trace_savevm_section_end(se->idstr, se->section_id);
if (ret < 0) {
+ DPRINTF("%s: setting error state after iterate on id=%d/%s",
+ __func__, se->section_id, se->idstr);
qemu_file_set_error(f, ret);
}
if (ret <= 0) {
@@ -1019,6 +1021,7 @@ int qemu_loadvm_state(QEMUFile *f)
SaveStateEntry *se;
char idstr[256];
+ DPRINTF("qemu_loadvm_state loop: section_type=%d", section_type);
switch (section_type) {
case QEMU_VM_SECTION_START:
case QEMU_VM_SECTION_FULL:
@@ -1032,6 +1035,9 @@ int qemu_loadvm_state(QEMUFile *f)
instance_id = qemu_get_be32(f);
version_id = qemu_get_be32(f);
+ DPRINTF("qemu_loadvm_state loop START/FULL: id=%d(%s)",
+ section_id, idstr);
+
/* Find savevm section */
se = find_se(idstr, instance_id);
if (se == NULL) {
@@ -1059,8 +1065,9 @@ int qemu_loadvm_state(QEMUFile *f)
ret = vmstate_load(f, le->se, le->version_id);
if (ret < 0) {
- fprintf(stderr, "qemu: warning: error while loading state for
instance 0x%x of device '%s'\n",
- instance_id, idstr);
+ error_report("qemu: error while loading state for"
+ "instance 0x%x of device '%s'",
+ instance_id, idstr);
goto out;
}
break;
@@ -1068,23 +1075,25 @@ int qemu_loadvm_state(QEMUFile *f)
case QEMU_VM_SECTION_END:
section_id = qemu_get_be32(f);
+ DPRINTF("QEMU_VM_SECTION_PART/END entry for id=%d", section_id);
QLIST_FOREACH(le, &loadvm_handlers, entry) {
if (le->section_id == section_id) {
break;
}
}
if (le == NULL) {
- fprintf(stderr, "Unknown savevm section %d\n", section_id);
+ error_report("Unknown savevm section %d", section_id);
ret = -EINVAL;
goto out;
}
ret = vmstate_load(f, le->se, le->version_id);
if (ret < 0) {
- fprintf(stderr, "qemu: warning: error while loading state
section id %d\n",
- section_id);
+ error_report("qemu: error while loading state section"
+ " id %d (%s)", section_id, le->se->idstr);
goto out;
}
+ DPRINTF("QEMU_VM_SECTION_PART/END done for id=%d", section_id);
break;
case QEMU_VM_COMMAND:
ret = loadvm_process_command(f);
@@ -1093,11 +1102,12 @@ int qemu_loadvm_state(QEMUFile *f)
}
break;
default:
- fprintf(stderr, "Unknown savevm section type %d\n", section_type);
+ error_report("Unknown savevm section type %d", section_type);
ret = -EINVAL;
goto out;
}
}
+ DPRINTF("qemu_loadvm_state loop: exited loop");
cpu_synchronize_all_post_init();
@@ -1113,6 +1123,7 @@ out:
ret = qemu_file_get_error(f);
}
+ DPRINTF("qemu_loadvm_state out: ret=%d", ret);
return ret;
}
--
1.9.3
- [Qemu-devel] [PATCH v2 02/43] improve DPRINTF macros, add to savevm, (continued)
- [Qemu-devel] [PATCH v2 02/43] improve DPRINTF macros, add to savevm, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 03/43] Add qemu_get_counted_string to read a string prefixed by a count byte, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 04/43] Create MigrationIncomingState, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 05/43] Return path: Open a return path on QEMUFile for sockets, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 07/43] Migration commands, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 06/43] Return path: socket_writev_buffer: Block even on non-blocking fd's, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 08/43] Return path: Control commands, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 09/43] Return path: Send responses from destination to source, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 10/43] Return path: Source handling of return path, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 11/43] qemu_loadvm errors and debug,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v2 12/43] ram_debug_dump_bitmap: Dump a migration bitmap as text, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 13/43] Rework loadvm path for subloops, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 14/43] Add migration-capability boolean for postcopy-ram., Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 15/43] Add wrappers and handlers for sending/receiving the postcopy-ram migration messages., Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 16/43] QEMU_VM_CMD_PACKAGED: Send a packaged chunk of migration stream, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 17/43] migrate_init: Call from savevm, Dr. David Alan Gilbert (git), 2014/08/11
- [Qemu-devel] [PATCH v2 19/43] postcopy: OS support test, Dr. David Alan Gilbert (git), 2014/08/11