[Qemu-devel] [PATCH 5/7] vnvram: VNVRAM additional debug support

[Corey Bryant <coreyb@linux.vnet.ibm.com>]

Provides debug support that dumps the disk and in-memory VNVRAM
contents to stderr.

Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
---
 vnvram.c |   94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 deletions(-)

diff --git a/vnvram.c b/vnvram.c
index 357923d..9c4f64f 100644
--- a/vnvram.c
+++ b/vnvram.c
@@ -19,6 +19,7 @@
 
 /*
 #define VNVRAM_DEBUG
+#define VNVRAM_DEBUG_DUMP
 */
 
 #ifdef VNVRAM_DEBUG
@@ -134,6 +135,47 @@ static uint64_t vnvram_get_size_kb(VNVRAM *);
 /* entries.                                                          */
 /*********************************************************************/
 
+#ifdef VNVRAM_DEBUG_DUMP
+static void vnvram_drv_dump(void)
+{
+    int rc, i, num_entries;
+    VNVRAM *vnvram;
+    VNVRAMDrvHdr hdr;
+    VNVRAMDrvEntry *drv_entries = NULL;
+
+    QLIST_FOREACH(vnvram, &vnvrams, list) {
+        rc = vnvram_drv_hdr_read(vnvram, (&hdr));
+        if (rc != 0) {
+            goto err_exit;
+        }
+
+        rc = vnvram_drv_entries_get(vnvram, (&hdr), &drv_entries, &num_entries);
+        if (rc != 0) {
+            goto err_exit;
+        }
+
+        DPRINTF("VNVRAM drv dump:\n");
+        DPRINTF("  version = %"PRIu16"\n", hdr.version);
+        DPRINTF("  magic = %"PRIu32"\n", hdr.magic);
+        DPRINTF("  num_entries = %"PRIu32"\n", hdr.num_entries);
+
+        for (i = 0; i < num_entries; i++) {
+            DPRINTF("    name = %s\n", drv_entries[i].name);
+            DPRINTF("    blob_offset = %"PRIu64"\n",
+                                       drv_entries[i].blob_offset);
+            DPRINTF("    cur_size = %"PRIu32"\n", drv_entries[i].cur_size);
+            DPRINTF("    max_size = %"PRIu32"\n", drv_entries[i].max_size);
+        }
+
+        g_free(drv_entries);
+        drv_entries = NULL;
+    }
+
+err_exit:
+    g_free(drv_entries);
+}
+#endif
+
 /*
  * Big-endian conversions
  */
@@ -526,6 +568,28 @@ static bool vnvram_drv_hdr_is_valid(VNVRAM *vnvram, VNVRAMDrvHdr *hdr)
 /* High-level VNVRAM functions that work with in-memory entries.     */
 /*********************************************************************/
 
+#ifdef VNVRAM_DEBUG_DUMP
+static void vnvram_dump(void)
+{
+    VNVRAM *vnvram;
+    const VNVRAMEntry *entry;
+
+    QLIST_FOREACH(vnvram, &vnvrams, list) {
+        DPRINTF("VNVRAM dump:\n");
+        DPRINTF("  drv_id = %s\n", vnvram->drv_id);
+        DPRINTF("  end_offset = %"PRIu64"\n", vnvram->end_offset);
+        DPRINTF("  bds = %p\n", vnvram->bds);
+
+        QLIST_FOREACH(entry, &vnvram->entries_head, next) {
+            DPRINTF("    name = %s\n", entry->name);
+            DPRINTF("    blob_offset = %"PRIu64"\n", entry->blob_offset);
+            DPRINTF("    cur_size = %"PRIu32"\n", entry->cur_size);
+            DPRINTF("    max_size = %"PRIu32"\n", entry->max_size);
+        }
+    }
+}
+#endif
+
 /*
  * Check if the specified vnvram has been created
  */
@@ -626,6 +690,11 @@ static int vnvram_sync_from_drv(VNVRAM *vnvram, VNVRAMDrvHdr *hdr)
     int rc = 0, num_entries = 0, i;
     VNVRAMDrvEntry *drv_entries = NULL;
 
+#ifdef VNVRAM_DEBUG_DUMP
+    vnvram_dump();
+    vnvram_drv_dump();
+#endif
+
     rc = vnvram_drv_entries_get(vnvram, hdr, &drv_entries, &num_entries);
     if (rc != 0) {
         return rc;
@@ -644,6 +713,11 @@ static int vnvram_sync_from_drv(VNVRAM *vnvram, VNVRAMDrvHdr *hdr)
 
     vnvram->end_offset = vnvram_get_size(vnvram);
 
+#ifdef VNVRAM_DEBUG_DUMP
+    vnvram_dump();
+    vnvram_drv_dump();
+#endif
+
 err_exit:
     g_free(drv_entries);
 
@@ -1007,6 +1081,11 @@ int vnvram_read_entry(VNVRAM *vnvram, const VNVRAMEntryName *entry_name,
     VNVRAMEntry *entry;
     VNVRAMRWRequest *rwr;
 
+#ifdef VNVRAM_DEBUG_DUMP
+    vnvram_dump();
+    vnvram_drv_dump();
+#endif
+
     *blob = NULL;
     *blob_size = 0;
 
@@ -1027,6 +1106,11 @@ int vnvram_read_entry(VNVRAM *vnvram, const VNVRAMEntryName *entry_name,
 
     g_free(rwr);
 
+#ifdef VNVRAM_DEBUG_DUMP
+    vnvram_dump();
+    vnvram_drv_dump();
+#endif
+
     return rc;
 }
 
@@ -1040,6 +1124,11 @@ int vnvram_write_entry(VNVRAM *vnvram, const VNVRAMEntryName *entry_name,
     VNVRAMEntry *entry;
     VNVRAMRWRequest *rwr;
 
+#ifdef VNVRAM_DEBUG_DUMP
+    vnvram_dump();
+    vnvram_drv_dump();
+#endif
+
     if (!vnvram_exists(vnvram)) {
         qerror_report(ERROR_CLASS_GENERIC_ERROR, "VNVRAM has not been created");
         return -EPERM;
@@ -1057,6 +1146,11 @@ int vnvram_write_entry(VNVRAM *vnvram, const VNVRAMEntryName *entry_name,
 
     g_free(rwr);
 
+#ifdef VNVRAM_DEBUG_DUMP
+    vnvram_dump();
+    vnvram_drv_dump();
+#endif
+
     return rc;
 }
 
-- 
1.7.1