From patchwork Fri May 13 08:51:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 12848512 X-Patchwork-Delegate: brendanhiggins@google.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F2D6C433F5 for ; Fri, 13 May 2022 08:51:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378268AbiEMIvY (ORCPT ); Fri, 13 May 2022 04:51:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378639AbiEMIvQ (ORCPT ); Fri, 13 May 2022 04:51:16 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 765DF546A1 for ; Fri, 13 May 2022 01:51:15 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2d7eaa730d9so66975147b3.13 for ; Fri, 13 May 2022 01:51:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=Ogkiciib/RsRhAqfGoo2vDrriNiFsttxrZQ5YNjWEI0=; b=bS7n+AukRnAUU513mYC294Cf8qvSX1SGa68AIFAl5nnKbMaGMrmcUWkFzGuq6QJeFk YXDecED/n95KUg1dN68x1KMI1x53SW/LH/ZgWDeajbJritTOGvlNUzurd3lRPsyajMY9 exDSZW3rBh1iyWpuh2HR7GNmoWXUqhP4Z2PpxuhD/oQPGG9WOX3pXoUBjgMo6UUz/KmE CWEnsqnrskHLoY2Pg5xdCVgF/xeDms6Vo18FGIKzqK0wDGxB5fTeQDRR2gs3FliVvP6R bNjdnXN8+7yn6gywt/PlIVqlH35RTwcqAs2A2QVEg27yfTabnZ9JOc7fOmyoAdFWaViA myqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=Ogkiciib/RsRhAqfGoo2vDrriNiFsttxrZQ5YNjWEI0=; b=tdwzTAKoVdPX/UtojSyNtT5sdEoI7KHVkvyLHcSpmUsO3zB+cRh1mLOTLyEHCaSJZe S8ECbG17ojIzH7bxioN4+xFZkZaUf0vyqSntr2wDwo47uUVI0olDG7tKNF1O6tqxyAhs Xl3Z6NS00J/d+dG9MA4VMUkUOCGARZ5X76pjaDgDOH10r+11xPwnU3WSx5cTTtDr0PUU zhM4qqDtMyzwTHEfboA16j0qS0QMcTCJPZ9Qnr9//3vokCcytW3BuNOBM51UGjRzwOVF SGzC5GwJJE4tt5HKOb5Ae7xnlD0fR1eXwuMcP2mi4351lJ2wfCcDNiz2vIHdgE6DtMM2 nF0A== X-Gm-Message-State: AOAM533PQsketTqTueGzaWx/3bzjOkof8lr9Qq1ewj/CVqqNWfJKor/b Gx1C/0tjQcIqsGILrA6BG+GGcIDg4yMK3A== X-Google-Smtp-Source: ABdhPJzp3yI7OZJ/tfM4kGbjDbgboSKe10uoAItfLbvfPEIl5FDcs9Sc0+JzktHJQETpmgVJHY7TnMtLUffYQg== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a81:4bd5:0:b0:2fb:8277:98d8 with SMTP id y204-20020a814bd5000000b002fb827798d8mr4518250ywa.376.1652431874729; Fri, 13 May 2022 01:51:14 -0700 (PDT) Date: Fri, 13 May 2022 16:51:08 +0800 Message-Id: <20220513085108.3567310-1-davidgow@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.550.gb090851708-goog Subject: [PATCH] kunit: tool: Use qemu-system-i386 for i386 runs From: David Gow To: Daniel Latypov , Brendan Higgins , Shuah Khan Cc: David Gow , kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org We're currently using the x86_64 qemu for i386 builds. While this is not incorrect, it's probably more sensible to use the i386 one, which will at least fail properly if we accidentally were to build a 64-bit kernel. Signed-off-by: David Gow Tested-by: Daniel Latypov Reviewed-by: Brendan Higgins --- tools/testing/kunit/qemu_configs/i386.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/kunit/qemu_configs/i386.py b/tools/testing/kunit/qemu_configs/i386.py index 52b80be40e4b..4463ebefd567 100644 --- a/tools/testing/kunit/qemu_configs/i386.py +++ b/tools/testing/kunit/qemu_configs/i386.py @@ -4,7 +4,7 @@ QEMU_ARCH = QemuArchParams(linux_arch='i386', kconfig=''' CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y''', - qemu_arch='x86_64', + qemu_arch='i386', kernel_path='arch/x86/boot/bzImage', kernel_command_line='console=ttyS0', extra_qemu_params=[])