Re: [Qemu-devel] [PATCH QEMU-XEN v4 9/9] xen: make it possible to build without the Xen PV domain builder

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-10-21 at 16:23 +0100, Ian Campbell wrote:
> [...]
> v4: Fixed all checkpatch errors.
>     Disabled by default.

I botched this and it is no longer possible to turn it on. (I wonder if
anyone would have noticed in practice...)
> @@ -2113,6 +2117,15 @@ if test "$xen_pci_passthrough" != "no"; then
>    fi
>  fi
>  
> +if test "$xen_pv_domain_build" != "no"; then
> +  if test "$xen_pv_domain_build" = "yes" &&
> +     test "$xen" != "yes"; then
> +      error_exit "User requested Xen PV domain builder support" \
> +		 "which requires Xen support."
> +  fi
> +  xen_pv_domain_build=no
> +fi

This is bogus.

v5 will have this incremental fix in it:

diff --git a/configure b/configure
index b9c5d68..24cfd35 100755
--- a/configure
+++ b/configure
@@ -2117,13 +2117,13 @@ if test "$xen_pci_passthrough" != "no"; then
   fi
 fi
 
-if test "$xen_pv_domain_build" != "no"; then
-  if test "$xen_pv_domain_build" = "yes" &&
-     test "$xen" != "yes"; then
-      error_exit "User requested Xen PV domain builder support" \
-		 "which requires Xen support."
-  fi
-  xen_pv_domain_build=no
+if test "$xen_pv_domain_build" = "yes"; then
+    if test "$xen" != "yes"; then
+	error_exit "User requested Xen PV domain builder support" \
+		   "which requires Xen support."
+    fi
+else
+    xen_pv_domain_build=no
 fi
 
 ##########################################


Which is a bit easier to grok with -b:

diff --git a/configure b/configure
index b9c5d68..24cfd35 100755
--- a/configure
+++ b/configure
@@ -2117,12 +2117,12 @@ if test "$xen_pci_passthrough" != "no"; then
   fi
 fi
 
-if test "$xen_pv_domain_build" != "no"; then
-  if test "$xen_pv_domain_build" = "yes" &&
-     test "$xen" != "yes"; then
+if test "$xen_pv_domain_build" = "yes"; then
+    if test "$xen" != "yes"; then
 	error_exit "User requested Xen PV domain builder support" \
 		   "which requires Xen support."
     fi
+else
     xen_pv_domain_build=no
 fi