mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use qemu_opts_create_nofail

Browse Source 
We will use qemu_opts_create_nofail function, it can make code
more readable.

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Dong Xu Wang 2012-12-06 14:47:22 +08:00 committed by Kevin Wolf
parent dd39244978
commit e478b448d7
6 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockdev.c
View File

@ -568,7 +568,7 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
break; break;
case IF_VIRTIO: case IF_VIRTIO:
/* add virtio block device */ /* 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) { if (arch_type == QEMU_ARCH_S390X) {
qemu_opt_set(opts, "driver", "virtio-blk-s390"); qemu_opt_set(opts, "driver", "virtio-blk-s390");
} else { } else {

2
hw/watchdog.c
View File

@ -66,7 +66,7 @@ int select_watchdog(const char *p)
QLIST_FOREACH(model, &watchdog_list, entry) { QLIST_FOREACH(model, &watchdog_list, entry) {
if (strcasecmp(model->wdt_name, p) == 0) { if (strcasecmp(model->wdt_name, p) == 0) {
/* add the device */ /* add the device */
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", p); qemu_opt_set(opts, "driver", p);
return 0; return 0;
} }

4
qemu-config.c
View File

@ -756,7 +756,7 @@ int qemu_global_option(const char *str)
return -1; 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, "driver", driver);
qemu_opt_set(opts, "property", property); qemu_opt_set(opts, "property", property);
qemu_opt_set(opts, "value", str+offset+1); qemu_opt_set(opts, "value", str+offset+1);
@ -843,7 +843,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)
error_free(local_err); error_free(local_err);
goto out; goto out;
} }
opts = qemu_opts_create(list, NULL, 0, NULL); opts = qemu_opts_create_nofail(list);
continue; continue;
} }
if (sscanf(line, " %63s = \"%1023[^\"]\"", arg, value) == 2) { if (sscanf(line, " %63s = \"%1023[^\"]\"", arg, value) == 2) {

2
qemu-img.c
View File

@ -1934,7 +1934,7 @@ static int img_resize(int argc, char **argv)
} }
/* Parse size */ /* 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)) { if (qemu_opt_set(param, BLOCK_OPT_SIZE, size)) {
/* Error message already printed when size parsing fails */ /* Error message already printed when size parsing fails */
ret = -1; ret = -1;

16
qemu-sockets.c
View File

@ -579,7 +579,7 @@ int inet_listen(const char *str, char *ostr, int olen,
addr = inet_parse(str, errp); addr = inet_parse(str, errp);
if (addr != NULL) { if (addr != NULL) {
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
inet_addr_to_opts(opts, addr); inet_addr_to_opts(opts, addr);
qapi_free_InetSocketAddress(addr); qapi_free_InetSocketAddress(addr);
sock = inet_listen_opts(opts, port_offset, errp); sock = inet_listen_opts(opts, port_offset, errp);
@ -618,7 +618,7 @@ int inet_connect(const char *str, Error **errp)
addr = inet_parse(str, errp); addr = inet_parse(str, errp);
if (addr != NULL) { if (addr != NULL) {
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
inet_addr_to_opts(opts, addr); inet_addr_to_opts(opts, addr);
qapi_free_InetSocketAddress(addr); qapi_free_InetSocketAddress(addr);
sock = inet_connect_opts(opts, errp, NULL, NULL); sock = inet_connect_opts(opts, errp, NULL, NULL);
@ -652,7 +652,7 @@ int inet_nonblocking_connect(const char *str,
addr = inet_parse(str, errp); addr = inet_parse(str, errp);
if (addr != NULL) { if (addr != NULL) {
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
inet_addr_to_opts(opts, addr); inet_addr_to_opts(opts, addr);
qapi_free_InetSocketAddress(addr); qapi_free_InetSocketAddress(addr);
sock = inet_connect_opts(opts, errp, callback, opaque); sock = inet_connect_opts(opts, errp, callback, opaque);
@ -795,7 +795,7 @@ int unix_listen(const char *str, char *ostr, int olen, Error **errp)
char *path, *optstr; char *path, *optstr;
int sock, len; int sock, len;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
optstr = strchr(str, ','); optstr = strchr(str, ',');
if (optstr) { if (optstr) {
@ -823,7 +823,7 @@ int unix_connect(const char *path, Error **errp)
QemuOpts *opts; QemuOpts *opts;
int sock; int sock;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
qemu_opt_set(opts, "path", path); qemu_opt_set(opts, "path", path);
sock = unix_connect_opts(opts, errp, NULL, NULL); sock = unix_connect_opts(opts, errp, NULL, NULL);
qemu_opts_del(opts); qemu_opts_del(opts);
@ -840,7 +840,7 @@ int unix_nonblocking_connect(const char *path,
g_assert(callback != NULL); g_assert(callback != NULL);
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
qemu_opt_set(opts, "path", path); qemu_opt_set(opts, "path", path);
sock = unix_connect_opts(opts, errp, callback, opaque); sock = unix_connect_opts(opts, errp, callback, opaque);
qemu_opts_del(opts); qemu_opts_del(opts);
@ -891,7 +891,7 @@ int socket_connect(SocketAddress *addr, Error **errp,
QemuOpts *opts; QemuOpts *opts;
int fd; int fd;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
switch (addr->kind) { switch (addr->kind) {
case SOCKET_ADDRESS_KIND_INET: case SOCKET_ADDRESS_KIND_INET:
inet_addr_to_opts(opts, addr->inet); inet_addr_to_opts(opts, addr->inet);
@ -922,7 +922,7 @@ int socket_listen(SocketAddress *addr, Error **errp)
QemuOpts *opts; QemuOpts *opts;
int fd; int fd;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create_nofail(&dummy_opts);
switch (addr->kind) { switch (addr->kind) {
case SOCKET_ADDRESS_KIND_INET: case SOCKET_ADDRESS_KIND_INET:
inet_addr_to_opts(opts, addr->inet); inet_addr_to_opts(opts, addr->inet);

12
vl.c
View File

@ -1996,7 +1996,7 @@ static int balloon_parse(const char *arg)
return -1; return -1;
} else { } else {
/* create empty opts */ /* 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"); qemu_opt_set(opts, "driver", "virtio-balloon");
return 0; return 0;
@ -2246,14 +2246,14 @@ static int virtcon_parse(const char *devname)
exit(1); exit(1);
} }
bus_opts = qemu_opts_create(device, NULL, 0, NULL); bus_opts = qemu_opts_create_nofail(device);
if (arch_type == QEMU_ARCH_S390X) { if (arch_type == QEMU_ARCH_S390X) {
qemu_opt_set(bus_opts, "driver", "virtio-serial-s390"); qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
} else { } else {
qemu_opt_set(bus_opts, "driver", "virtio-serial-pci"); 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"); qemu_opt_set(dev_opts, "driver", "virtconsole");
snprintf(label, sizeof(label), "virtcon%d", index); snprintf(label, sizeof(label), "virtcon%d", index);
@ -3105,8 +3105,7 @@ int main(int argc, char **argv, char **envp)
qemu_opt_set_bool(fsdev, "readonly", qemu_opt_set_bool(fsdev, "readonly",
qemu_opt_get_bool(opts, "readonly", 0)); qemu_opt_get_bool(opts, "readonly", 0));
device = qemu_opts_create(qemu_find_opts("device"), NULL, 0, device = qemu_opts_create_nofail(qemu_find_opts("device"));
NULL);
qemu_opt_set(device, "driver", "virtio-9p-pci"); qemu_opt_set(device, "driver", "virtio-9p-pci");
qemu_opt_set(device, "fsdev", qemu_opt_set(device, "fsdev",
qemu_opt_get(opts, "mount_tag")); qemu_opt_get(opts, "mount_tag"));
@ -3126,8 +3125,7 @@ int main(int argc, char **argv, char **envp)
} }
qemu_opt_set(fsdev, "fsdriver", "synth"); qemu_opt_set(fsdev, "fsdriver", "synth");
device = qemu_opts_create(qemu_find_opts("device"), NULL, 0, device = qemu_opts_create_nofail(qemu_find_opts("device"));
NULL);
qemu_opt_set(device, "driver", "virtio-9p-pci"); qemu_opt_set(device, "driver", "virtio-9p-pci");
qemu_opt_set(device, "fsdev", "v_synth"); qemu_opt_set(device, "fsdev", "v_synth");
qemu_opt_set(device, "mount_tag", "v_synth"); qemu_opt_set(device, "mount_tag", "v_synth");