From patchwork Fri Jun 12 12:33:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 483546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E58D140285 for ; Fri, 12 Jun 2015 22:40:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=XfNRHWXJ; dkim-atps=neutral Received: from localhost ([::1]:51088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3OFr-0000J6-K1 for incoming@patchwork.ozlabs.org; Fri, 12 Jun 2015 08:40:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3O9B-0007SK-BB for qemu-devel@nongnu.org; Fri, 12 Jun 2015 08:33:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3O99-0004H7-Gr for qemu-devel@nongnu.org; Fri, 12 Jun 2015 08:33:21 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:36805) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3O99-0004H2-Aa for qemu-devel@nongnu.org; Fri, 12 Jun 2015 08:33:19 -0400 Received: by wigg3 with SMTP id g3so16020939wig.1 for ; Fri, 12 Jun 2015 05:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=nglwK2JrlwbSWKNOsIGkjDvvR2HaxyHRwF3RmmAkIwQ=; b=XfNRHWXJfnBXGV+h8MgX/Hp80XsjEbA2tRfyeE5QO2fTGn+/PXRNsxYRhxVt8EaqX4 oDY6cIgiANqYZuUopiCdzry8bnS46ypZPgxXTs95XX8izOMdx9z3L22w535Xnz4otTir jW7l4yJ/5ntXOX2PB1vbsYulFIzQwzy5X6kOXLQ9Y0mh5+PBt/+loSTQRWsEcAxyValk /1PQ7Z17LDROxobf3YY8WSEKdhdS2l15+UOkQoqR9BQHeSpWo/ALMk9HZ1vCc5Yh3d3N xqBfqCE5K1p5JAAvc+BQ5zD5k9XSlrzNtdbdSjN191R887af4FqFz+kd81cQ/Cm5Jjfu RDFQ== X-Received: by 10.194.123.4 with SMTP id lw4mr25500025wjb.94.1434112398738; Fri, 12 Jun 2015 05:33:18 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (94-21-76-230.pool.digikabel.hu. [94.21.76.230]) by mx.google.com with ESMTPSA id m2sm2569153wiy.7.2015.06.12.05.33.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jun 2015 05:33:18 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Fri, 12 Jun 2015 14:33:10 +0200 Message-Id: <448542f8a42f783ec881430256cc06bb22e16624.1434111578.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::236 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 09/12] opts: do not print separator before first item in qemu_opts_print 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 This allows to print options in a format that the user would actually write it on the command line (foo=bar,baz=asd,etc=def), without prepending a spurious comma at the beginning of the list. Only block.c depended on the old behavior, but it was also updated. Signed-off-by: Kővágó, Zoltán --- block.c | 2 +- util/qemu-option.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 2b9ceae..ef335bc 100644 --- a/block.c +++ b/block.c @@ -3644,7 +3644,7 @@ void bdrv_img_create(const char *filename, const char *fmt, } if (!quiet) { - printf("Formatting '%s', fmt=%s", filename, fmt); + printf("Formatting '%s', fmt=%s ", filename, fmt); qemu_opts_print(opts, " "); puts(""); } diff --git a/util/qemu-option.c b/util/qemu-option.c index 840f5f7..b347d92 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -728,14 +728,16 @@ void qemu_opts_del(QemuOpts *opts) g_free(opts); } -void qemu_opts_print(QemuOpts *opts, const char *sep) +void qemu_opts_print(QemuOpts *opts, const char *d_sep) { QemuOpt *opt; QemuOptDesc *desc = opts->list->desc; + const char *sep = ""; if (desc[0].name == NULL) { QTAILQ_FOREACH(opt, &opts->head, next) { printf("%s%s=\"%s\"", sep, opt->name, opt->str); + sep = d_sep; } return; } @@ -755,6 +757,7 @@ void qemu_opts_print(QemuOpts *opts, const char *sep) } else { printf("%s%s=%s", sep, desc->name, value); } + sep = d_sep; } }