[v2] build: disable Xen on ARM

[Qemu-devel] [PATCH v2] build: disable Xen on ARM

Paolo Bonzini posted 1 patch 8 years, 3 months ago

Diff against v1
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170711100049.20513-1-pbonzini@redhat.com

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

configure | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH v2] build: disable Xen on ARM

Posted by Paolo Bonzini 8 years, 3 months ago

While ARM could present the xenpv machine, it does not and trying to enable
it breaks compilation.  Revert to the previous test which only looked at
$target_name, not $cpu.

Fixes: 3b6b75506de44c5070639943c30a0ad5850f5d02
Reported-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 806658c98b..5096cbcf14 100755
--- a/configure
+++ b/configure
@@ -202,9 +202,9 @@ supported_kvm_target() {
 supported_xen_target() {
     test "$xen" = "yes" || return 1
     glob "$1" "*-softmmu" || return 1
-    case "${1%-softmmu}:$cpu" in
-        arm:arm | aarch64:aarch64 | \
-        i386:i386 | i386:x86_64 | x86_64:i386 | x86_64:x86_64)
+    # Only i386 and x86_64 provide the xenpv machine.
+    case "${1%-softmmu}" in
+        i386|x86_64)
             return 0
         ;;
     esac
-- 
2.13.0

Re: [Qemu-devel] [PATCH v2] build: disable Xen on ARM

Posted by Peter Maydell 8 years, 3 months ago

On 11 July 2017 at 11:00, Paolo Bonzini <pbonzini@redhat.com> wrote:
> While ARM could present the xenpv machine, it does not and trying to enable
> it breaks compilation.  Revert to the previous test which only looked at
> $target_name, not $cpu.
>
> Fixes: 3b6b75506de44c5070639943c30a0ad5850f5d02
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  configure | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 806658c98b..5096cbcf14 100755
> --- a/configure
> +++ b/configure
> @@ -202,9 +202,9 @@ supported_kvm_target() {
>  supported_xen_target() {
>      test "$xen" = "yes" || return 1
>      glob "$1" "*-softmmu" || return 1
> -    case "${1%-softmmu}:$cpu" in
> -        arm:arm | aarch64:aarch64 | \
> -        i386:i386 | i386:x86_64 | x86_64:i386 | x86_64:x86_64)
> +    # Only i386 and x86_64 provide the xenpv machine.
> +    case "${1%-softmmu}" in
> +        i386|x86_64)
>              return 0
>          ;;
>      esac

Thanks, applied to master as a build fix.

-- PMM