From nobody Sun Nov 24 03:01:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1727873745; cv=none; d=zohomail.com; s=zohoarc; b=Y5mQJ1UuBmZmdwm0J4WDl3RxDTdodupxcPS9jSUErMnq6EarlaldDGHonbE72UsQwtVrmxHTOxmh5bdDOjfq96EKB3Lkq/NasBTRTurWIHEUuWtwMct+6qEBILM+s2qYmNJkQwwR4Hj7AF4P83m4Im+rAshktPsLvZCMQg6f1iQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727873745; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HYo5hBP/Zq8bi9XBlNba0t9uqSK8eqMuP4iJhjvqvLQ=; b=GVDubL39ncGH/u4lrL9FxXfQNHHb2iwPgo5V3ajsFqjbMGdv93rGIRpQd6MxoxwbP0NEHF0OzFN35Er08ZbawUHWPDArmvLzs74XYJHKH5dxzw2l3GK5L3EW94b7lhhvu4wjs7MpCjlEbLMy3CnC77aGNuNBcFVrKs5gj/wolik= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727873745447782.8414155375649; Wed, 2 Oct 2024 05:55:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svyqX-0006dJ-8Z; Wed, 02 Oct 2024 08:52:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svyqS-0006cL-40 for qemu-devel@nongnu.org; Wed, 02 Oct 2024 08:52:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svyqP-0003bm-Ql for qemu-devel@nongnu.org; Wed, 02 Oct 2024 08:52:43 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-147-etPqmXc6MVKglzhcAiVIkQ-1; Wed, 02 Oct 2024 08:52:36 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C3C31955F42; Wed, 2 Oct 2024 12:52:35 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.239]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6605419560A3; Wed, 2 Oct 2024 12:52:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727873559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYo5hBP/Zq8bi9XBlNba0t9uqSK8eqMuP4iJhjvqvLQ=; b=L3gWCDFksOXbxwC6aNhNFrgZKIbfPG0rp5N268IYGMkwpKUcr+qXljNOCIafPsAFJmPM9X FJB+35T4wXXg6GM0Y/yYnPQA0DQISJr5+VxM07MlneK0gvEe+CnMIKK5Ml/NZ/Ob3k8V57 GWgOFKRzJk5lz15TML92Ts1fcwoXy9A= X-MC-Unique: etPqmXc6MVKglzhcAiVIkQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 3/5] Remove the unused sh4eb target Date: Wed, 2 Oct 2024 14:52:24 +0200 Message-ID: <20241002125226.282193-4-thuth@redhat.com> In-Reply-To: <20241002125226.282193-1-thuth@redhat.com> References: <20241002125226.282193-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1727873747427116600 Content-Type: text/plain; charset="utf-8" Since the "shix" machine has been removed, the "r2d" machine is the only machine that is still available for the sh4 and sh4eb targets. However, the "r2d" machine apparently does not work in big endian mode, see here: https://lore.kernel.org/qemu-devel/87a5fwjjew.wl-ysato@users.sourceforge.j= p/ So there is no working machine left in the sh4eb-softmmu target, i.e. it is currently completely useless. Thus remove it from the configuration now. (Note: The linux-user binary is not removed since it might still be used to run sh4 binaries in big endian mode). Message-ID: <20240926105843.81385-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- configs/devices/sh4eb-softmmu/default.mak | 3 --- configs/targets/sh4eb-softmmu.mak | 2 -- qapi/machine.json | 2 +- tests/qtest/endianness-test.c | 1 - tests/qtest/machine-none-test.c | 1 - .gitlab-ci.d/buildtest.yml | 2 +- .gitlab-ci.d/cirrus.yml | 2 +- .gitlab-ci.d/crossbuilds.yml | 2 +- .travis.yml | 2 +- tests/qemu-iotests/testenv.py | 1 - tests/qtest/meson.build | 1 - 11 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 configs/devices/sh4eb-softmmu/default.mak delete mode 100644 configs/targets/sh4eb-softmmu.mak diff --git a/configs/devices/sh4eb-softmmu/default.mak b/configs/devices/sh= 4eb-softmmu/default.mak deleted file mode 100644 index f18d1f6519..0000000000 --- a/configs/devices/sh4eb-softmmu/default.mak +++ /dev/null @@ -1,3 +0,0 @@ -# Default configuration for sh4eb-softmmu - -include ../sh4-softmmu/default.mak diff --git a/configs/targets/sh4eb-softmmu.mak b/configs/targets/sh4eb-soft= mmu.mak deleted file mode 100644 index 226b1fc698..0000000000 --- a/configs/targets/sh4eb-softmmu.mak +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_ARCH=3Dsh4 -TARGET_BIG_ENDIAN=3Dy diff --git a/qapi/machine.json b/qapi/machine.json index a6b8795b09..3cc055b6ff 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -37,7 +37,7 @@ 'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', = 'mips64', 'mips64el', 'mipsel', 'or1k', 'ppc', 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', - 'sh4eb', 'sparc', 'sparc64', 'tricore', + 'sparc', 'sparc64', 'tricore', 'x86_64', 'xtensa', 'xtensaeb' ] } =20 ## diff --git a/tests/qtest/endianness-test.c b/tests/qtest/endianness-test.c index 222d116fae..f4872b0283 100644 --- a/tests/qtest/endianness-test.c +++ b/tests/qtest/endianness-test.c @@ -41,7 +41,6 @@ static const TestCase test_cases[] =3D { { "ppc64", "pseries-2.7", 0x10080000000ULL, .bswap =3D true, .superio =3D "i82378" }, { "sh4", "r2d", 0xfe240000, .superio =3D "i82378" }, - { "sh4eb", "r2d", 0xfe240000, .bswap =3D true, .superio =3D "i82378" }, { "sparc64", "sun4u", 0x1fe02000000LL, .bswap =3D true }, { "x86_64", "pc", -1 }, {} diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-tes= t.c index 159b2a705a..9cf95bea1e 100644 --- a/tests/qtest/machine-none-test.c +++ b/tests/qtest/machine-none-test.c @@ -42,7 +42,6 @@ static struct arch2cpu cpus_map[] =3D { { "ppc64", "power8e_v2.1" }, { "s390x", "qemu" }, { "sh4", "sh7750r" }, - { "sh4eb", "sh7751r" }, { "sparc", "LEON2" }, { "sparc64", "Fujitsu Sparc64" }, { "tricore", "tc1796" }, diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 87848c2ffe..669c980c4b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -72,7 +72,7 @@ build-system-debian: variables: IMAGE: debian CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack - TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4eb-softmmu + TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4-softmmu sparc-softmmu xtensa-softmmu MAKE_CHECK_ARGS: check-build =20 diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 92c97eefc1..e49e1b61f0 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -57,7 +57,7 @@ x64-freebsd-14-build: CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update; pkg upgrade -y INSTALL_COMMAND: pkg install -y - CONFIGURE_ARGS: --target-list-exclude=3Darm-softmmu,i386-softmmu,micro= blaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4e= b-softmmu,xtensa-softmmu + CONFIGURE_ARGS: --target-list-exclude=3Darm-softmmu,i386-softmmu,micro= blaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,xten= sa-softmmu TEST_TARGETS: check =20 aarch64-macos-13-base-build: diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 95dfc39224..178f62869d 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -176,7 +176,7 @@ cross-win64-system: EXTRA_CONFIGURE_OPTS: --enable-fdt=3Dinternal --disable-plugins CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu - or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-soft= mmu + or1k-softmmu rx-softmmu sh4-softmmu sparc64-softmmu tricore-softmmu xtensaeb-softmmu artifacts: when: on_success diff --git a/.travis.yml b/.travis.yml index 8fc1ae0cf2..ad81bc5e1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -223,7 +223,7 @@ jobs: - genisoimage env: - CONFIG=3D"--disable-containers --audio-drv-list=3Dsdl --disable-= user - --target-list=3Darm-softmmu,avr-softmmu,microblaze-softmmu,sh4= eb-softmmu,sparc64-softmmu,xtensaeb-softmmu" + --target-list=3Darm-softmmu,avr-softmmu,microblaze-softmmu,sh4= -softmmu,sparc64-softmmu,xtensaeb-softmmu" =20 - name: "[s390x] GCC (user)" arch: s390x diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 6326e46b7b..8cd620c202 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -245,7 +245,6 @@ def __init__(self, source_dir: str, build_dir: str, ('riscv64', 'virt'), ('rx', 'gdbsim-r5f562n8'), ('sh4', 'r2d'), - ('sh4eb', 'r2d'), ('tricore', 'tricore_testboard') ) for suffix, machine in machine_map: diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 310865e49c..2b90abf000 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -184,7 +184,6 @@ qtests_ppc64 =3D \ qtests_pci + ['migration-test', 'cpu-plug-test', 'drive_del-test'] =20 qtests_sh4 =3D (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endia= nness-test'] : []) -qtests_sh4eb =3D (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['end= ianness-test'] : []) =20 qtests_sparc =3D ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + \ qtests_filter --=20 2.46.1