haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix error handling in qemu_read_config_file

Browse source 
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>
This commit is contained in:
Kevin Wolf 2010-05-17 10:36:47 +02:00 committed by Anthony Liguori
parent ebbeb78935
commit 019e78ba6e
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu-config.c
View file

@ -521,14 +521,18 @@ out:
int qemu_read_config_file(const char *filename)
{
FILE *f = fopen(filename, "r");
int ret;
if (f == NULL) {
return -errno;
}
if (qemu_config_parse(f, vm_config_groups, filename) != 0) {
return -EINVAL;
}
ret = qemu_config_parse(f, vm_config_groups, filename);
fclose(f);
return 0;
if (ret == 0) {
return 0;
} else {
return -EINVAL;
}
}

4
vl.c
View file

@ -2662,12 +2662,12 @@ int main(int argc, char **argv, char **envp)
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);
}
}