From patchwork Mon Jan 31 15:29:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 81182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C7CFFB70E9 for ; Tue, 1 Feb 2011 03:59:50 +1100 (EST) Received: from localhost ([127.0.0.1]:60598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjw45-0007GF-Kq for incoming@patchwork.ozlabs.org; Mon, 31 Jan 2011 10:53:17 -0500 Received: from [140.186.70.92] (port=43205 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjvfr-0002ne-Vf for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pjvfk-0003Y6-Kn for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pjvfk-0003XG-DT for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:08 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0VFS6iP027488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 31 Jan 2011 10:28:07 -0500 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p0VFRZ2P012144; Mon, 31 Jan 2011 10:28:06 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 31 Jan 2011 16:29:15 +0100 Message-Id: <1296487756-12553-28-git-send-email-kwolf@redhat.com> In-Reply-To: <1296487756-12553-1-git-send-email-kwolf@redhat.com> References: <1296487756-12553-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 27/28] blockdev: Replace drive_add()'s fmt, ... by optstr parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Let the callers build the optstr. Only one wants to. All the others become simpler, because they don't have to worry about escaping '%'. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.c | 8 +------- blockdev.h | 5 +---- vl.c | 23 +++++++++++++---------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/blockdev.c b/blockdev.c index 3f7b560..4b2145c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -93,17 +93,11 @@ QemuOpts *drive_def(const char *optstr) } QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file, - const char *fmt, ...) + const char *optstr) { - va_list ap; - char optstr[1024]; QemuOpts *opts; char buf[32]; - va_start(ap, fmt); - vsnprintf(optstr, sizeof(optstr), fmt, ap); - va_end(ap); - opts = drive_def(optstr); if (!opts) { return NULL; diff --git a/blockdev.h b/blockdev.h index 18278cc..e5d8c56 100644 --- a/blockdev.h +++ b/blockdev.h @@ -47,10 +47,7 @@ DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); QemuOpts *drive_def(const char *optstr); QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file, - const char *fmt, ...) /*GCC_FMT_ATTR(4, 5)*/; - /* GCC_FMT_ATTR() commented out to avoid the (pretty useless) - * "zero-length gnu_printf format string" warning we insist to - * enable */ + const char *optstr); DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, int *fatal_error); /* device-hotplug */ diff --git a/vl.c b/vl.c index 99f5bfe..f86724f 100644 --- a/vl.c +++ b/vl.c @@ -621,7 +621,6 @@ static int bt_parse(const char *opt) /***********************************************************/ /* QEMU Block devices */ -/* Any % in the following strings must be escaped as %% */ #define HD_OPTS "media=disk" #define CDROM_OPTS "media=cdrom" #define FD_OPTS "" @@ -2050,17 +2049,21 @@ int main(int argc, char **argv, char **envp) initrd_filename = optarg; break; case QEMU_OPTION_hda: - if (cyls == 0) - hda_opts = drive_add(IF_DEFAULT, 0, optarg, HD_OPTS); - else - hda_opts = drive_add(IF_DEFAULT, 0, optarg, HD_OPTS - ",cyls=%d,heads=%d,secs=%d%s", - cyls, heads, secs, - translation == BIOS_ATA_TRANSLATION_LBA ? + { + char buf[256]; + if (cyls == 0) + snprintf(buf, sizeof(buf), "%s", HD_OPTS); + else + snprintf(buf, sizeof(buf), + "%s,cyls=%d,heads=%d,secs=%d%s", + HD_OPTS , cyls, heads, secs, + translation == BIOS_ATA_TRANSLATION_LBA ? ",trans=lba" : - translation == BIOS_ATA_TRANSLATION_NONE ? + translation == BIOS_ATA_TRANSLATION_NONE ? ",trans=none" : ""); - break; + drive_add(IF_DEFAULT, 0, optarg, buf); + break; + } case QEMU_OPTION_hdb: case QEMU_OPTION_hdc: case QEMU_OPTION_hdd: