From patchwork Wed Apr 3 08:33:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro Suzuki X-Patchwork-Id: 10883029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99AAD1390 for ; Wed, 3 Apr 2019 08:34:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D928287F4 for ; Wed, 3 Apr 2019 08:34:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F383289A7; Wed, 3 Apr 2019 08:34:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 646E4287F4 for ; Wed, 3 Apr 2019 08:34:25 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 26BAA1161; Wed, 3 Apr 2019 08:34:25 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 8569A115F for ; Wed, 3 Apr 2019 08:34:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mo-csw.securemx.jp (mo-csw1516.securemx.jp [210.130.202.155]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D8802E3 for ; Wed, 3 Apr 2019 08:34:22 +0000 (UTC) Received: by mo-csw.securemx.jp (mx-mo-csw1516) id x338YL7k028423; Wed, 3 Apr 2019 17:34:21 +0900 X-Iguazu-Qid: 34tMVTBRM6soKiH7JI X-Iguazu-QSIG: v=2; s=0; t=1554280461; q=34tMVTBRM6soKiH7JI; m=6THeNBa2XVvb3W1Y+oNFrqfZDT0gJVARegcGX0TYG/I= Received: from imx12.toshiba.co.jp (imx12.toshiba.co.jp [61.202.160.132]) by relay.securemx.jp (mx-mr1512) id x338YKgr025442; Wed, 3 Apr 2019 17:34:20 +0900 Received: from enc02.toshiba.co.jp ([61.202.160.51]) by imx12.toshiba.co.jp with ESMTP id x338YJEd027165; Wed, 3 Apr 2019 17:34:19 +0900 (JST) Received: from hop101.toshiba.co.jp ([133.199.85.107]) by enc02.toshiba.co.jp with ESMTP id x338YIZ6010678; Wed, 3 Apr 2019 17:34:18 +0900 From: Akihiro Suzuki To: Jan Kiszka Date: Wed, 3 Apr 2019 17:33:23 +0900 X-TSB-HOP: ON Message-Id: <20190403083323.21613-2-akihiro27.suzuki@toshiba.co.jp> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190403083323.21613-1-akihiro27.suzuki@toshiba.co.jp> References: <12bc282f-e95c-85a6-9919-674beb32fa13@siemens.com> <20190403083323.21613-1-akihiro27.suzuki@toshiba.co.jp> Cc: cip-dev@lists.cip-project.org Subject: [cip-dev] [PATCH] start-qemu.sh: Set console when using qemu-amd64 with nographic X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Akihiro Suzuki --- start-qemu.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..46b7961 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -83,8 +83,15 @@ fi shift 1 +QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} $@" +if [ -n "`echo ${QEMU_EXTRA_ARGS} | grep -- -nographic`" ]; then + if [ ${DISTRO_ARCH} = "amd64" ]; then + KERNEL_CMDLINE="${KERNEL_CMDLINE} console=ttyS0" + fi +fi + ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS}