From 15770695d842b4b7140cf3182ae25431698442a4 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 30 Jun 2010 14:14:37 -0400
Subject: [PATCH] qemu: Improve some qemu.conf error reporting

Log some info if we can't find a config file. Make parse failures
fatal, and actually raise an error message.
---
 src/qemu/qemu_conf.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index ce42bd6043..988220b152 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -133,16 +133,21 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
     /* Just check the file is readable before opening it, otherwise
      * libvirt emits an error.
      */
-    if (access (filename, R_OK) == -1) return 0;
+    if (access (filename, R_OK) == -1) {
+        VIR_INFO("Could not read qemu config file %s", filename);
+        return 0;
+    }
 
     conf = virConfReadFile (filename, 0);
-    if (!conf) return 0;
+    if (!conf) {
+        return -1;
+    }
 
 
 #define CHECK_TYPE(name,typ) if (p && p->type != (typ)) {               \
         qemuReportError(VIR_ERR_INTERNAL_ERROR,                         \
-                         "remoteReadConfigFile: %s: %s: expected type " #typ, \
-                         filename, (name));                             \
+                        "%s: %s: expected type " #typ,                  \
+                        filename, (name));                              \
         virConfFree(conf);                                              \
         return -1;                                                      \
     }
-- 
GitLab