From patchwork Mon Dec 9 11:53:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 299011 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E44252C0086 for ; Mon, 9 Dec 2013 22:53:12 +1100 (EST) Received: from localhost ([::1]:43077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpzOf-0002fH-RJ for incoming@patchwork.ozlabs.org; Mon, 09 Dec 2013 06:53:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpzOJ-0002f5-UD for qemu-devel@nongnu.org; Mon, 09 Dec 2013 06:52:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpzOE-0003w2-0H for qemu-devel@nongnu.org; Mon, 09 Dec 2013 06:52:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpzOD-0003vx-PH for qemu-devel@nongnu.org; Mon, 09 Dec 2013 06:52:41 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rB9BqdY0020404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Dec 2013 06:52:39 -0500 Received: from dhcp-8-167.nay.redhat.com ([10.66.4.179]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rB9BqadU019800; Mon, 9 Dec 2013 06:52:37 -0500 From: Amos Kong To: qemu-devel@nongnu.org Date: Mon, 9 Dec 2013 19:53:15 +0800 Message-Id: <1386589995-15534-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, mjt@tls.msk.ru, armbru@redhat.com, anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v3] fix -boot strict regressed in commit 6ef4716 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 Commit 6ef4716 cleaned up parsing of -boot option argument, but accidentally dropped parameter strict. It should have been updated exactly like parameter menu. Do that. Signed-off-by: Amos Kong Reviewed-by: Markus Armbruster --- v2: remove bios.bin change, I just used it for testing (mjt) v3: merge two patches together, correct the commitlog (markus) --- vl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index b0399de..ae6d0c6 100644 --- a/vl.c +++ b/vl.c @@ -461,7 +461,7 @@ static QemuOptsList qemu_boot_opts = { .type = QEMU_OPT_STRING, }, { .name = "strict", - .type = QEMU_OPT_STRING, + .type = QEMU_OPT_BOOL, }, { /*End of list */ } }, @@ -4074,6 +4074,7 @@ int main(int argc, char **argv, char **envp) } boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu); + boot_strict = qemu_opt_get_bool(opts, "strict", false); } if (!kernel_cmdline) {