[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH for-4.16] tools/configure: make iPXE dependent on QEMU traditional


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Date: Tue, 9 Nov 2021 10:47:21 +0100
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3UGp35n62W09+BRbImWVllLPgSe870xztQmojpqzhAM=; b=Amz2jfSr/Tsgyraff7RmUWxINGkm6MRk22r1JBuClALmAKmHZiqTj/Bd51UPy/FJx4MEY75IMy5pMpXEjNLajRUCTAIREPwfqjkdvkUVnBJVOCPTBZK8hsJdwOVw4Ibw+YJgdtT3LmeSG++skZoq5efM/+23KamF3g99ESeOSEj0LJ5raEUtybQhWmF+RLZ3Jbhs0Bm2Wiqg2oK51UGyFMY6tEOHXy0+yo8uAs9Ul61EBnzfbEiyTKkyA1UFI+V4fQhaIsvE8Xz1GoTRO/PG7YKgFqtYDD/c+fbMVD39WVdUTmg+ecFAVsH+8R+EudQT76gUDAEa95vlLpg0q4ye9w==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k4ZfVSN+SPpcUklbez+xALbi9kVFR4oyPivKBybOcJs4+PoEOXNzs2Lk0SveZ/aBiinQzm6IB+F8F0/fX1fxM1l+zIN76PqlGS8UBrKIgNikvgEXxHY1zvZqaFhAeNtPqDK/a5pd5bET3EXOM0SeIdLWJD0CMRwmRa2kE+6UlP43AfYdn41NkIovaUD5pDpmF4rIcyQ8YnID1OZ5jgMTsTvb0xL1f2BA61DD0bbIiPaRzf1+noMcCDMWWwpklHxOH82rtXzWiCBPHYDbfMskDkUGtpHK6z0R4K/NevdV1Rnk/m5Lj4cIOySazypf9BNN+P1NYKFrtkVq8Px3rZCRRQ==
  • Authentication-results: esa6.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
  • Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>
  • Delivery-date: Tue, 09 Nov 2021 09:47:44 +0000
  • Ironport-data: A9a23:Wb0YM6AhfprHHRVW//Dkw5YqxClBgxIJ4kV8jS/XYbTApG920zBWy 2ZMD27VOKuOYTTzeN5/YYnjpkkGusWAx4UyQQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX540UM7wobVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/2hK2v4tc7 c10hKPhEiRxNZbDgOJAXEwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTUO5ji95lNMD2FIgepmth3XfSCvNOrZXrHvqRuIMBjW5YasZmPdDYW s0YYhRVYhH/Z0UIFwwOIsNmg7L97pX4W2IB8w/EzUYt2EDS0w5ZwLXrKMDSeNGBWYNShEnwj n3C13T0BFcdLtP34SqI9Degi/HCmQv/WZkOD/uo+/hymlqRy2cPThoMWjOGTeKR0xDkHYgFc gpNp3Ro/fNaGFGXosfVDjqHgCWpmwYlauUBSM5i4zqC0qyJ7FPMboQbdQJpZNsjvc4wYDUl0 F6Vgt/kbQBSXK2ppWG1renN827rUcQBBSpbPHJfE1NZizX2iNhr1kqnczp1LEKiYjQZ8xnUy ivCkiUxjq57YSUjh/TipgCvb95BS/H0ou8JCuf/Aj3NAuBRPtfNi2mUBb7zt6sowGGxFAjpg ZT8s5LChN3i9LnU/MB3fM0DHauy+9GOOyDGjFhkEvEJrmr2pSXyI9ELu28kfS+F1/ronxezP Sc/XisLtfdu0IaCN/crM+pd9exzlcAM6ugJptiLN4ETM/CdhSeM/T10ZF744oweuBNErE3LA r/CKZzEJS9DUcxPlWPqL89Age5D7n1vngv7GMGkpylLJJLDPRZ5v59eawDQBg34hYvZyDjoH yF3a5HXlk4BCbKmOUE6M+c7dDg3EJTyPrivw+R/fe+fOAt2XmYnDv7a27Q6fIJ52a9Sk4/1E ruVACe0EXLz2i/KLxukcHdmZO+9VJpztytjbyctIUypyz4oZoP2tPUTcJ4+fL8G8u1/zKErE 6lZKpvYWvkfGC7a/zk9bIXmqNAwfhqcmg/TbTGuZyIyfsA8SlWRqMPkZAbm6AIHEjGz6Zklu 7Sl2w6CGcgDSg1uAdz4cvWqy1/t73ERlPgrBxnDI8VJeVWq+49vcnSjgvgyKsAKCBPC2jrFi FrGXUZG/bHA+tZn/sPIiKaIq5aSP9F/RkcKTXPG6buWNDXB+jbxy4F3T+vVLyvWU3n5+fv+a LwNne38KvAOgH1Dr5F4T+Rw1as76tbi++1awwBjECmZZlinEOo9cHyP3M0JvaxR3L5J/wCxX xvXqNVdPLyIPuLjEUIQe1V5PrjSi6lMl2mA9+kxLWX7+DRzreiOXkhlNhWRjDBQceluO4Q/z OZ94MMb5mRTUPbx3gpqWsyMy1mxEw==
  • Ironport-hdrordr: A9a23:NSNnHKuKcHGFEhxVBGNvCmjc7skCv4Aji2hC6mlwRA09TyXGra 6TdaUguiMc1gx8ZJh5o6H6BEGBKUmskKKdkrNhR4tKPTOW9ldASbsJ0WKM+UyYJ8STzJ8/6U 4CSdk+NDSTNykDsS+S2mDReLtAoOVvm5rY4ds2uk0dKz2CHJsQiDuRZDzrcHFedU1jP94UBZ Cc7s1Iq36LYnIMdPm2AXEDQqzqu8DLvIiOW29EOzcXrC21yR+44r/zFBaVmj0EVSlU/Lsk+W /Z1yTk+6SYte2hwBO07R6Q030Woqql9jJwPr3KtiEnEESrtu9uXvU5Z1S2hkFwnAho0idzrD CDmWZ6Ay050QKtQoj8m2qQ5+Cn6kdv11bSjWaCh33tuMr4Qy9/JfZgqOtiA0bkwntlhcp71q 1T2WKfqt5wNjPv2ArAx/WgbWAxqqKTyUBSztL7S0YvDbf2IYUh07A37QdbFowNEzn9751iGO 5yDNvE7PITal+CaWvF11MfiuCETzAwBR+IX0kPusuHlz5LgXt+00wUrfZv6kvo2ahNA6Ws3d 60eZiAVYs+O/M+fOZ4HqMMUMG3AmvCTVbFN3+TO03uEOUCN2jWo5D67b0p7KXyEaZ4gKcaid DEShdVpGQyc0XhBYmH24BK6AnERCG4US72ws9T6pBlsvmlLYCbfhGrWRQriY+tsv8fCsrUV7 K6P49XGebqKS/rFZxS1wPzVpFOIT0VUdETuNw8R1WSy/i7Z7HCp6jearLeNbDtGTErVif2BW YCRiH6IIFa4kWiShbD8VHscmKofla68YN7EaDc8eRWwoAJOopAuhNQk1ij5s2QbT1EqLE/e0 FzZLPr+5nL1VVf1g7znhRU09pmfzBoCZnbIgB3TD4xQjTJmOw4yqqikEhprQm6GiM=
  • Ironport-sdr: t/XEZCLxOoIU/P+8BrG220NJ1VNDdfhJeks9zohWooaxKqH1v93Ay5AazHIveR2Nw53dSW0uQ6 RNGCehqWNXdAfUabvWVdyvBo8KYCNmRssUMsD4SHQonLFOC5AoM1i5VN6NSoozQuC2BwskyNKK x703p8wnRELdyBFjrUi8XQiSyr84H/BFlwcs8TJaiPg09wV9kUexh/hKa3XGCM0HSBhpdw6bC7 3v0TDrUvXbOiKbc25MvKdxhzkcXmtGiaxHnhCCFcAk90Rz6Hspv0HuV0h60L8kgh+ZP6uQkpcn OYFbk0vo9AOkLxb8ETTpF9rw
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

iPXE is only used by QEMU traditional, so make it off by default
unless QEMU traditional is enabled.

Reported-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Fixes: bcf77ce510 ('configure: modify default of building rombios')
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Cc: Ian Jackson <iwj@xxxxxxxxxxxxxx>

Please run autoconf before commit.

Without this patch FreeBSD build is broken, as iPXE won't build. The
main risk would be getting the configure script runes wrong, but I
think that's fairly easy to check as it will either work on not. It's
a change in the defaults, but it basically restores the behavior
previous to disabling qemu-trad on Linux.
---
 tools/configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/configure.ac b/tools/configure.ac
index 03eb7cf146..3ac62626a5 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -130,13 +130,13 @@ AC_SUBST(qemu_traditional)
 
 AC_ARG_ENABLE([ipxe],
     AS_HELP_STRING([--enable-ipxe],
-                   [Enable in-tree IPXE, (DEFAULT is on for x86,
-                    otherwise off, see also --with-system-ipxe)]),,[
-    case "$host_cpu" in
-        i[[3456]]86|x86_64)
-           enable_ipxe="yes";;
-        *) enable_ipxe="no";;
-    esac
+                   [Enable in-tree IPXE,
+                    (DEFAULT is off, see also --with-system-ipxe)]),,[
+    AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
+        enable_ipxe="yes"
+    ], [
+        enable_ipxe="no"
+    ])
 ])
 AS_IF([test "x$enable_ipxe" = "xno"], [ipxe=n], [ipxe=y])
 AC_ARG_WITH([system-ipxe],
-- 
2.33.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.