[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 05/10] use qemu_opts_create_nofail
From: |
Dong Xu Wang |
Subject: |
[Qemu-devel] [PATCH V4 05/10] use qemu_opts_create_nofail |
Date: |
Thu, 25 Oct 2012 20:57:23 +0800 |
We will use qemu_opts_create_nofail function, it can make code
more readable.
Signed-off-by: Dong Xu Wang <address@hidden>
---
blockdev.c | 2 +-
qemu-config.c | 4 ++--
qemu-img.c | 2 +-
qemu-sockets.c | 10 +++++-----
vl.c | 12 +++++-------
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 99828ad..1742f40 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -562,7 +562,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi)
break;
case IF_VIRTIO:
/* add virtio block device */
- opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(qemu_find_opts("device"));
if (arch_type == QEMU_ARCH_S390X) {
qemu_opt_set(opts, "driver", "virtio-blk-s390");
} else {
diff --git a/qemu-config.c b/qemu-config.c
index cd1ec21..959a350 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -765,7 +765,7 @@ int qemu_global_option(const char *str)
return -1;
}
- opts = qemu_opts_create(&qemu_global_opts, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(&qemu_global_opts);
qemu_opt_set(opts, "driver", driver);
qemu_opt_set(opts, "property", property);
qemu_opt_set(opts, "value", str+offset+1);
@@ -852,7 +852,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const
char *fname)
error_free(local_err);
goto out;
}
- opts = qemu_opts_create(list, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(list);
continue;
}
if (sscanf(line, " %63s = \"%1023[^\"]\"", arg, value) == 2) {
diff --git a/qemu-img.c b/qemu-img.c
index f17f187..f1c224e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1778,7 +1778,7 @@ static int img_resize(int argc, char **argv)
}
/* Parse size */
- param = qemu_opts_create(&resize_options, NULL, 0, NULL);
+ param = qemu_opts_create_nofail(&resize_options);
if (qemu_opt_set(param, BLOCK_OPT_SIZE, size)) {
/* Error message already printed when size parsing fails */
ret = -1;
diff --git a/qemu-sockets.c b/qemu-sockets.c
index 2b1ed2f..edee875 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -572,7 +572,7 @@ int inet_listen(const char *str, char *ostr, int olen,
char *optstr;
int sock = -1;
- opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(&dummy_opts);
if (inet_parse(opts, str) == 0) {
sock = inet_listen_opts(opts, port_offset, errp);
if (sock != -1 && ostr) {
@@ -609,7 +609,7 @@ int inet_connect(const char *str, Error **errp)
QemuOpts *opts;
int sock = -1;
- opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(&dummy_opts);
if (inet_parse(opts, str) == 0) {
sock = inet_connect_opts(opts, errp, NULL, NULL);
} else {
@@ -641,7 +641,7 @@ int inet_nonblocking_connect(const char *str,
g_assert(callback != NULL);
- opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(&dummy_opts);
if (inet_parse(opts, str) == 0) {
sock = inet_connect_opts(opts, errp, callback, opaque);
} else {
@@ -737,7 +737,7 @@ int unix_listen(const char *str, char *ostr, int olen)
char *path, *optstr;
int sock, len;
- opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(&dummy_opts);
optstr = strchr(str, ',');
if (optstr) {
@@ -765,7 +765,7 @@ int unix_connect(const char *path)
QemuOpts *opts;
int sock;
- opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(&dummy_opts);
qemu_opt_set(opts, "path", path);
sock = unix_connect_opts(opts);
qemu_opts_del(opts);
diff --git a/vl.c b/vl.c
index ee3c43a..c748d57 100644
--- a/vl.c
+++ b/vl.c
@@ -1883,7 +1883,7 @@ static int balloon_parse(const char *arg)
return -1;
} else {
/* create empty opts */
- opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, NULL);
+ opts = qemu_opts_create_nofail(qemu_find_opts("device"));
}
qemu_opt_set(opts, "driver", "virtio-balloon");
return 0;
@@ -2131,14 +2131,14 @@ static int virtcon_parse(const char *devname)
exit(1);
}
- bus_opts = qemu_opts_create(device, NULL, 0, NULL);
+ bus_opts = qemu_opts_create_nofail(device);
if (arch_type == QEMU_ARCH_S390X) {
qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
} else {
qemu_opt_set(bus_opts, "driver", "virtio-serial-pci");
}
- dev_opts = qemu_opts_create(device, NULL, 0, NULL);
+ dev_opts = qemu_opts_create_nofail(device);
qemu_opt_set(dev_opts, "driver", "virtconsole");
snprintf(label, sizeof(label), "virtcon%d", index);
@@ -2944,8 +2944,7 @@ int main(int argc, char **argv, char **envp)
qemu_opt_set_bool(fsdev, "readonly",
qemu_opt_get_bool(opts, "readonly", 0));
- device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
- NULL);
+ device = qemu_opts_create_nofail(qemu_find_opts("device"));
qemu_opt_set(device, "driver", "virtio-9p-pci");
qemu_opt_set(device, "fsdev",
qemu_opt_get(opts, "mount_tag"));
@@ -2965,8 +2964,7 @@ int main(int argc, char **argv, char **envp)
}
qemu_opt_set(fsdev, "fsdriver", "synth");
- device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
- NULL);
+ device = qemu_opts_create_nofail(qemu_find_opts("device"));
qemu_opt_set(device, "driver", "virtio-9p-pci");
qemu_opt_set(device, "fsdev", "v_synth");
qemu_opt_set(device, "mount_tag", "v_synth");
--
1.7.1
- [Qemu-devel] [PATCH V4 00/10] replace QEMUOptionParameter with QemuOpts parser, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 01/10] qemu-option: opt_set(): split it up into more functions, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 02/10] qemu-option: qemu_opts_validate(): fix duplicated code, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 06/10] create new function: qemu_opt_set_number, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 05/10] use qemu_opts_create_nofail,
Dong Xu Wang <=
- [Qemu-devel] [PATCH V4 04/10] introduce qemu_opts_create_nofail function, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 03/10] qemu-option: qemu_opt_set_bool(): fix code duplication, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 07/10] add def_value and use it in qemu_opts_print., Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 08/10] Create four opts list related functions, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 10/10] remove QEMUOptionParameter related functions and struct, Dong Xu Wang, 2012/10/25
- [Qemu-devel] [PATCH V4 09/10] Use QemuOpts support in block layer, Dong Xu Wang, 2012/10/25