From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGqcJ-0007bH-Rn for qemu-devel@nongnu.org; Mon, 11 Aug 2014 10:30:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGqcD-0000tB-HU for qemu-devel@nongnu.org; Mon, 11 Aug 2014 10:30:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGqcD-0000sA-0V for qemu-devel@nongnu.org; Mon, 11 Aug 2014 10:30:25 -0400 From: "Dr. David Alan Gilbert (git)" Date: Mon, 11 Aug 2014 15:29:27 +0100 Message-Id: <1407767399-3030-12-git-send-email-dgilbert@redhat.com> In-Reply-To: <1407767399-3030-1-git-send-email-dgilbert@redhat.com> References: <1407767399-3030-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/43] qemu_loadvm errors and debug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, lilei@linux.vnet.ibm.com, quintela@redhat.com From: "Dr. David Alan Gilbert" Flip many fprintf's to error_report Add lots of DPRINTF debug in qemu_loadvm* Signed-off-by: Dr. David Alan Gilbert --- 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