mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 07:13:54 -06:00
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>
This commit is contained in:
parent
ebbeb78935
commit
019e78ba6e
2 changed files with 10 additions and 6 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue