From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5Kqx-0007GL-Gb for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:31:39 -0400 Received: from [140.186.70.92] (port=50208 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5Kqv-0007G5-Qg for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:31:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5Kqr-0005nP-CQ for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:31:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44566) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5Kqr-0005nD-48 for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:31:33 -0400 From: Kevin Wolf Date: Fri, 23 Apr 2010 17:30:33 +0200 Message-Id: <1272036658-26776-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1272036658-26776-1-git-send-email-kwolf@redhat.com> References: <1272036658-26776-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 01/26] qemu-config: qemu_read_config_file() reads the normal config file List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@linux.vnet.ibm.com Cc: kwolf@redhat.com, qemu-devel@nongnu.org Introduce a new function qemu_read_config_file which reads the VM configuration from a config file. Unlike qemu_config_parse it doesn't take a open file but a filename and reduces code duplication as a side effect. Signed-off-by: Kevin Wolf --- qemu-config.c | 15 +++++++++++++++ qemu-config.h | 2 ++ vl.c | 35 +++++++++++------------------------ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/qemu-config.c b/qemu-config.c index d4a2f43..8254b35 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -488,3 +488,18 @@ out: loc_pop(&loc); return res; } + +int qemu_read_config_file(const char *filename) +{ + FILE *f = fopen(filename, "r"); + if (f == NULL) { + return -errno; + } + + if (qemu_config_parse(f, filename) != 0) { + return -EINVAL; + } + fclose(f); + + return 0; +} diff --git a/qemu-config.h b/qemu-config.h index f217c58..07a7a27 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -19,4 +19,6 @@ void qemu_add_globals(void); void qemu_config_write(FILE *fp); int qemu_config_parse(FILE *fp, const char *fname); +int qemu_read_config_file(const char *filename); + #endif /* QEMU_CONFIG_H */ diff --git a/vl.c b/vl.c index e58441b..fe2dd6f 100644 --- a/vl.c +++ b/vl.c @@ -2653,25 +2653,16 @@ int main(int argc, char **argv, char **envp) } if (defconfig) { - const char *fname; - FILE *fp; + int ret; - fname = CONFIG_QEMU_CONFDIR "/qemu.conf"; - fp = fopen(fname, "r"); - if (fp) { - if (qemu_config_parse(fp, fname) != 0) { - exit(1); - } - fclose(fp); + ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf"); + if (ret == -EINVAL) { + exit(1); } - fname = arch_config_name; - fp = fopen(fname, "r"); - if (fp) { - if (qemu_config_parse(fp, fname) != 0) { - exit(1); - } - fclose(fp); + ret = qemu_read_config_file(arch_config_name); + if (ret == -EINVAL) { + exit(1); } } cpudef_init(); @@ -3327,16 +3318,12 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_readconfig: { - FILE *fp; - fp = fopen(optarg, "r"); - if (fp == NULL) { - fprintf(stderr, "open %s: %s\n", optarg, strerror(errno)); + int ret = qemu_read_config_file(optarg); + if (ret < 0) { + fprintf(stderr, "read config %s: %s\n", optarg, + strerror(-ret)); exit(1); } - if (qemu_config_parse(fp, optarg) != 0) { - exit(1); - } - fclose(fp); break; } case QEMU_OPTION_writeconfig: -- 1.6.6.1