[PATCH 0/2] target/arm: Fix --disable-tcg build

[PATCH 0/2] target/arm: Fix --disable-tcg build

[Richard Henderson]

Broken during my build tcg once series.
I thought we already had a test for this, but no, so add one.


r~


Richard Henderson (2):
  target/arm: Only include tcg/oversized-guest.h if CONFIG_TCG
  gitlab: Add cross-arm64-kvm-only

 target/arm/ptw.c             | 5 +++--
 .gitlab-ci.d/crossbuilds.yml | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

-- 
2.34.1

[PATCH 1/2] target/arm: Only include tcg/oversized-guest.h if CONFIG_TCG

[Richard Henderson]

Fixes the build for --disable-tcg.

This header is only needed for cross-hosting.  Without CONFIG_TCG,
we know this is an AArch64 host, CONFIG_ATOMIC64 will be set, and
the TCG_OVERSIZED_GUEST block will never be compiled.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/ptw.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index b2dc223525..37bcb17a9e 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -14,8 +14,9 @@
 #include "cpu.h"
 #include "internals.h"
 #include "idau.h"
-#include "tcg/oversized-guest.h"
-
+#ifdef CONFIG_TCG
+# include "tcg/oversized-guest.h"
+#endif
 
 typedef struct S1Translate {
     ARMMMUIdx in_mmu_idx;
-- 
2.34.1

Re: [PATCH 1/2] target/arm: Only include tcg/oversized-guest.h if CONFIG_TCG

[Philippe Mathieu-Daudé]

On 7/6/23 00:46, Richard Henderson wrote:
> Fixes the build for --disable-tcg.
> 
> This header is only needed for cross-hosting.  Without CONFIG_TCG,
> we know this is an AArch64 host, CONFIG_ATOMIC64 will be set, and
> the TCG_OVERSIZED_GUEST block will never be compiled.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/arm/ptw.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 2/2] gitlab: Add cross-arm64-kvm-only

[Richard Henderson]

We are not currently running a --disable-tcg test for arm64,
like we are for mips, ppc and s390x.  We have a job for the
native aarch64 runner, but it is not run by default and it
is not helpful for normal developer testing without access
to qemu's private runner.

Use --without-default-features to eliminate most tests.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 .gitlab-ci.d/crossbuilds.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 61b8ac86ee..1e0e6c7f2c 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -29,6 +29,14 @@ cross-arm64-user:
   variables:
     IMAGE: debian-arm64-cross
 
+cross-arm64-kvm-only:
+  extends: .cross_accel_build_job
+  needs:
+    job: arm64-debian-cross-container
+  variables:
+    IMAGE: debian-arm64-cross
+    EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features
+
 cross-i386-user:
   extends:
     - .cross_user_build_job
-- 
2.34.1

Re: [PATCH 2/2] gitlab: Add cross-arm64-kvm-only

[Thomas Huth]

On 07/06/2023 00.46, Richard Henderson wrote:
> We are not currently running a --disable-tcg test for arm64,
> like we are for mips, ppc and s390x.  We have a job for the
> native aarch64 runner, but it is not run by default and it
> is not helpful for normal developer testing without access
> to qemu's private runner.
> 
> Use --without-default-features to eliminate most tests.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   .gitlab-ci.d/crossbuilds.yml | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> index 61b8ac86ee..1e0e6c7f2c 100644
> --- a/.gitlab-ci.d/crossbuilds.yml
> +++ b/.gitlab-ci.d/crossbuilds.yml
> @@ -29,6 +29,14 @@ cross-arm64-user:
>     variables:
>       IMAGE: debian-arm64-cross
>   
> +cross-arm64-kvm-only:
> +  extends: .cross_accel_build_job
> +  needs:
> +    job: arm64-debian-cross-container
> +  variables:
> +    IMAGE: debian-arm64-cross
> +    EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features
> +
>   cross-i386-user:
>     extends:
>       - .cross_user_build_job

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 2/2] gitlab: Add cross-arm64-kvm-only

[Philippe Mathieu-Daudé]

On 7/6/23 00:46, Richard Henderson wrote:
> We are not currently running a --disable-tcg test for arm64,
> like we are for mips, ppc and s390x.  We have a job for the
> native aarch64 runner, but it is not run by default and it
> is not helpful for normal developer testing without access
> to qemu's private runner.
> 
> Use --without-default-features to eliminate most tests.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   .gitlab-ci.d/crossbuilds.yml | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> index 61b8ac86ee..1e0e6c7f2c 100644
> --- a/.gitlab-ci.d/crossbuilds.yml
> +++ b/.gitlab-ci.d/crossbuilds.yml
> @@ -29,6 +29,14 @@ cross-arm64-user:
>     variables:
>       IMAGE: debian-arm64-cross
>   
> +cross-arm64-kvm-only:
> +  extends: .cross_accel_build_job
> +  needs:
> +    job: arm64-debian-cross-container
> +  variables:
> +    IMAGE: debian-arm64-cross
> +    EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features
> +
>   cross-i386-user:
>     extends:
>       - .cross_user_build_job

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>