From patchwork Fri Jun 12 02:24:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1307950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jl2M1KN5z9sSS for ; Fri, 12 Jun 2020 12:25:47 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cshbHRMK; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49jl2G6m69zDqrm for ; Fri, 12 Jun 2020 12:25:42 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2a00:1450:4864:20::42d; helo=mail-wr1-x42d.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cshbHRMK; dkim-atps=neutral Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49jl1g0Vh3zDqsw for ; Fri, 12 Jun 2020 12:25:10 +1000 (AEST) Received: by mail-wr1-x42d.google.com with SMTP id h5so8168156wrc.7 for ; Thu, 11 Jun 2020 19:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=to/mqyazN0x4OjYFsvOWNLNfDPEtMizJ2F066SFq8ho=; b=cshbHRMKlY7DgJ0u4zlRqD9REByDqejvK8k94/p1ulR3vybNVO+Wx7L3rgEwLlbUH8 KjnaAvnEup2IyY9B7ZFo3Dn0L0hj3ZXnPdvG5NYT4chWaM/R2nJs28uPDhF9Xd5elKrm 04dz5o6sBAlSb3h/U4br3eUIanr1Nsc9fB3qUwWYCATWQZWsp7Wgww/CoQJ4y/2EvbCI +715nxkwrNae2ddYGq+HIYurskL///wtKO8GFvy1dTgkO80RvHom6etdhL9FLzbCDjPW ipbyM+9MSnmkA7GrpjCR6bkMGdUGb8JkMLYjr0qTfHjALUxvkJU0pPdY38gAkUIJsQHD 3nHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=to/mqyazN0x4OjYFsvOWNLNfDPEtMizJ2F066SFq8ho=; b=ug/foMXwwXJcuyQ3dBkTKEcMBENZ8QdZNcP7Ez1oDCsgXmKnx/OxkGvIEHw6kDi7kM /mcxsXa+vl+fywl5qskWq4omypomQFfJDgvh2dWsFpNV8tl1Ne7pn5nzfJi0ElW1Og40 v5DHuyGJmuZDvw1vw0n7A0JS03MIPmHQkjXUiowcu7RrW1Bi66CTAJu8XHDevqfIdOfC +U8cM3k5QZkULMdC6k07snSaZsGSS/t2t2C9w+T3JsuOhB93cfNN+jcpjZMnsgxUzrVu SZokSIWscNWBYPcXV8kjeQ85CTmxU77WMoD1dCoaslj0GaPKFpRmy/gf7oX3kVDKpJfp J8JA== X-Gm-Message-State: AOAM530E2j/JT2xP1U6sleR8xaPoTUiyGpb2AhAELy3V1OlFZMLKZIOu M5665K/WmIKUCnvsW9C7AglSbm85 X-Google-Smtp-Source: ABdhPJzTQmX/PUXPQ6bmrgtOpQoP4YnWnyZHacpcdwky3n3Go7g/moYsgSfvFgkrYewQBZIIBS/EZw== X-Received: by 2002:adf:a306:: with SMTP id c6mr12442501wrb.122.1591928707218; Thu, 11 Jun 2020 19:25:07 -0700 (PDT) Received: from localhost.ibm.com (123-243-125-185.tpgi.com.au. [123.243.125.185]) by smtp.gmail.com with ESMTPSA id h7sm6756948wml.24.2020.06.11.19.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 19:25:06 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 12 Jun 2020 12:24:38 +1000 Message-Id: <20200612022452.371685-2-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612022452.371685-1-oohall@gmail.com> References: <20200612022452.371685-1-oohall@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 01/15] test/qemu: Update command line arguments X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Modern qemu builds will barf if you specify the BMC / ipmi device on the command line without -nodefaults. So add that in and put in an explicit serial device. Signed-off-by: Oliver O'Halloran --- test/hello_world/run_qemu_hello_world.sh | 3 ++- test/run_qemu_boot_test.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh index 265add84728e..36f7c762b988 100755 --- a/test/hello_world/run_qemu_hello_world.sh +++ b/test/hello_world/run_qemu_hello_world.sh @@ -1,6 +1,7 @@ #!/bin/bash -QEMU_ARGS="-M powernv -nographic -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10" +QEMU_ARGS="-M powernv -nodefaults -device ipmi-bmc-sim,id=bmc0 -serial none" +QEMU_ARGS+=" -device isa-serial,chardev=s1 -chardev stdio,id=s1,signal=off" if [ -z "$QEMU_BIN" ]; then QEMU_BIN="qemu-system-ppc64" diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh index ee3d9da93148..ad28b336f7b9 100755 --- a/test/run_qemu_boot_test.sh +++ b/test/run_qemu_boot_test.sh @@ -1,6 +1,7 @@ #!/bin/bash -QEMU_ARGS="-M powernv -m 3G -nographic -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10" +QEMU_ARGS="-M powernv -nodefaults -device ipmi-bmc-sim,id=bmc0 -serial none" +QEMU_ARGS+=" -device isa-serial,chardev=s1 -chardev stdio,id=s1,signal=off" if [ -z "$QEMU_BIN" ]; then QEMU_BIN="qemu-system-ppc64"