commit 019e78ba6ec6f402dffc6bc9683f461a11a52c28
author Kevin Wolf <kwolf@redhat.com> Mon May 17 10:36:47 2010 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Mon May 24 15:18:23 2010 -0500
tree a94af7efd41021bd43b7c581fcaedca1e19ad51c
parent ebbeb789351a69d58b0da526fcb77bc82d18da7b

Fix error handling in qemu_read_config_file

We need to close the file even in error case. While at it, make the callers
catch all kind of errors. ENOENT is allowed for default config files, they
are optional.

Reported-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

vl.c

diff --git a/vl.c b/vl.c
index 8c818f0..328395e 100644
--- a/vl.c
+++ b/vl.c
@@ -2662,12 +2662,12 @@
         int ret;
 
         ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf");
-        if (ret == -EINVAL) {
+        if (ret < 0 && ret != -ENOENT) {
             exit(1);
         }
 
         ret = qemu_read_config_file(arch_config_name);
-        if (ret == -EINVAL) {
+        if (ret < 0 && ret != -ENOENT) {
             exit(1);
         }
     }