From patchwork Thu Oct 25 12:57:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 194170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 773AD2C00B2 for ; Fri, 26 Oct 2012 01:11:45 +1100 (EST) Received: from localhost ([::1]:43329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN26-0000Lf-JE for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2012 08:59:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN0t-0006sG-Gw for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRN0n-0005Oe-PI for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:18 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:55027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN0n-0005GV-J4 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:13 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so1476486oag.4 for ; Thu, 25 Oct 2012 05:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=BsEocwsEe+AU2pfpxFlczSBxloOZR60yMzIFCWKP/Ak=; b=uRHAN/KB0IwTUQ4avi/BAdxRho4amxk3LNI8g93jReDiJfFTaMJ4y5Ddg+MNA/9KrU bO9q51Ezv/TZWeUwh/n/71SwE6IJs16bHiz8YpdtrWc9Da51KkXiNXFjV0HKtD57Ya/y E9qU8rfJMR6YsrmYwRbbMjJSr4ZeTQAfkUrIq+hgqF3G0GpurTHWOskVo6S1hIVfeJ5I N3prH0omp82+ej80Jazv3YVwXmTixqiL+6PC/oDZDU3lM2J0sEoeXNqnaMje6R7BztzW iGdRzfeicUPJ0uPOIWczZRoVSb53qiyKxZrQVEpF1bhIugOLIbP3ZbjmouDJkpgIlVkX gIxA== Received: by 10.60.7.226 with SMTP id m2mr17155118oea.72.1351169893231; Thu, 25 Oct 2012 05:58:13 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id k9sm6019404oeg.6.2012.10.25.05.58.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 05:58:12 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2012 20:57:23 +0800 Message-Id: <1351169848-28223-6-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.219.45 Cc: kwolf@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V4 05/10] use qemu_opts_create_nofail X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We will use qemu_opts_create_nofail function, it can make code more readable. Signed-off-by: Dong Xu Wang --- 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");