From nobody Sun May 19 10:14:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689864656; cv=none; d=zohomail.com; s=zohoarc; b=VUaBLlUJ7eCGJwJJK9btxmWV5LwcWzFe7+pYIHESwxWlTtgB1ckGLye3snb81JcYnWR899S/ETkmCf5AREs1sKILBq2fBK8GgOo7rV3xMVG51G1Coe8Jm2j7sZUL/ZFIi9VCC+XhcP9xsAxOf9qRPDr614Kt1FSjJ01a8E2mDhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689864656; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7gkZUZh54XimUIKfhCgD8ZF72wCSgWBBCNpXXk5r7Hs=; b=E3rZo8eRWTvTKDNBdMO6jU5reIrrgPDrdPCIOru1MprKRU3oNkRw9jLUUr4ztGYISk89P5qG3zZbuoH8xXbbiRUORQsUKc1v58zckfUCKf3WaVUwH9tbRRATmKTLT+I2TmjnWKIgl5G3hq+JcLSwwlf/RYKmkU7raLs6AKQe/ts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 168986465668071.61317641809705; Thu, 20 Jul 2023 07:50:56 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-68-aYYoVUPBOzWOemwE_6L4Vw-1; Thu, 20 Jul 2023 10:50:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED6638F1870; Thu, 20 Jul 2023 14:50:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5CC12166B25; Thu, 20 Jul 2023 14:50:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6EA1D19452D9; Thu, 20 Jul 2023 14:50:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 969C219452D8 for ; Thu, 20 Jul 2023 14:50:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7A4D5F77AD; Thu, 20 Jul 2023 14:50:14 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id D09D7F6CD8; Thu, 20 Jul 2023 14:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689864655; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7gkZUZh54XimUIKfhCgD8ZF72wCSgWBBCNpXXk5r7Hs=; b=Kjytrj9liVBXJafWebtqUfWVJZ2I6WlwJTcZINP2jTPXTmLHb87/hkuJqsDirm/yUeZZZi sLk+gy4JffM414Stt+Vjx+Lqn4Jdkf99ZXiJ1uwcNfh7P5rW2NSVqikkgY9odda2nYxk+6 nUxyfh56e+HeDPXnzXYPt5V2AzNBfis= X-MC-Unique: aYYoVUPBOzWOemwE_6L4Vw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH RFC 1/4] rpm: boilerplate to pull in qemu-srpm-macros Date: Thu, 20 Jul 2023 15:50:08 +0100 Message-ID: <20230720145011.20402-2-berrange@redhat.com> In-Reply-To: <20230720145011.20402-1-berrange@redhat.com> References: <20230720145011.20402-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689864657704100001 This package provides a few RPM macros that describe the capabilities of the QEMU build in the distro. Signed-off-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1f77cd90b7..73a8faae6e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -6,6 +6,12 @@ %define min_rhel 8 %define min_fedora 33 =20 +%if 0%{?fedora} >=3D 39 || 0%{?rhel} >=3D 10 + %define with_qemu_macros 1 +%else + %define with_qemu_macros 0 +%endif + %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x %if 0%{?rhel} %if 0%{?rhel} > 8 @@ -267,6 +273,9 @@ Requires: libvirt-libs =3D %{version}-%{release} =20 # All build-time requirements. Run-time requirements are # listed against each sub-RPM +%if %{with_qemu_macros} +BuildRequires: qemu-srpm-macros +%endif BuildRequires: python3-docutils BuildRequires: gcc BuildRequires: meson >=3D 0.56.0 --=20 2.41.0 From nobody Sun May 19 10:14:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689864661; cv=none; d=zohomail.com; s=zohoarc; b=e+hMIzf0U4bsufbrdcNEoEVKdtKDmJlvI5SG6v6/xfaz2cW7kj4b4N6nKc2d9wxxeyinYkStDL4/eQx2oH7/p99JbvLuF+nNTj6oDfqlwD6jgkxn0E+Df/avDqYa9eqCnqeGHW7VjtHTdMl7An4+pX+Q2AgOlaeqXlEfsZec6UM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689864661; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xu5Hsd5zMAWeUsRSY7Ome/dAcWere4sXTHzHgoXlymA=; b=hvs5leCNQmgSLn+2Mu0eVR1vhNlUV6O94WfuTeg7lkYxbV+59grwe60P40sWN8wgm2xdfCfZUIdGj1J/O37bv8u8H+3IE2d/Bf1+Xk/HohauTolpWmkeAiGEW118unwfk9lsdfJ+doxaLEvqY/g6iFUUgSREFZAUXQW9i34pn7w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1689864661866973.9705833056538; Thu, 20 Jul 2023 07:51:01 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-147-zM1jqGHPP0m0IhifFP0_ew-1; Thu, 20 Jul 2023 10:50:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 630A03C0E441; Thu, 20 Jul 2023 14:50:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E587F77AD; Thu, 20 Jul 2023 14:50:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 84C0E1946A45; Thu, 20 Jul 2023 14:50:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 378C819452C9 for ; Thu, 20 Jul 2023 14:50:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 248B0F77BD; Thu, 20 Jul 2023 14:50:15 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADB40F6CDC; Thu, 20 Jul 2023 14:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689864660; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xu5Hsd5zMAWeUsRSY7Ome/dAcWere4sXTHzHgoXlymA=; b=NK1cyvf2mexB+UEpp8YSYF/KzlQl2Cz1qET5+BGRskpEZWuTgc+UVIzErzEB+xLUYa5Asz JJzmL4t0RKwKcBS9yf7K8euYrXhIASmJ3r3ESME/IyoThAsNphxpeTKv8ZGyRWO/kX8NkS k05S5BzAFosUZCBePtkZiKzy0Y0VdWY= X-MC-Unique: zM1jqGHPP0m0IhifFP0_ew-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH RFC 2/4] rpm: use %{qemu_sysemu_host_arches} Date: Thu, 20 Jul 2023 15:50:09 +0100 Message-ID: <20230720145011.20402-3-berrange@redhat.com> In-Reply-To: <20230720145011.20402-1-berrange@redhat.com> References: <20230720145011.20402-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689864663539100001 This macros reflects the architectures on which QEMU system emulators are built. Signed-off-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 73a8faae6e..641ff179e7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -12,15 +12,24 @@ %define with_qemu_macros 0 %endif =20 -%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x -%if 0%{?rhel} - %if 0%{?rhel} > 8 - %define arches_qemu_kvm x86_64 aarch64 s390x +%if ! %{with_qemu_macros} + %if 0%{?rhel} + %if 0%{?rhel} > 8 + %define qemu_sysemu_host_arches aarch64 s390x x86_64 + %else + %define qemu_sysemu_host_arches aarch64 s390x %{power64} x86_64 + %endif %else - %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x + %define qemu_sysemu_host_arches aarch64 %{arm} %{ix86} %{mips} %{p= ower64} riscv64 s390x x86_64 %endif %endif =20 +%if 0%{?rhel} + %define arches_qemu_kvm %{qemu_sysemu_host_arches} +%else + %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x +%endif + %define arches_64bit x86_64 %{power64} aarch64 s390x riscv64 %define arches_x86 %{ix86} x86_64 =20 @@ -37,7 +46,11 @@ %define arches_numad %{arches_x86} %{power64} aarch64 =20 # The hypervisor drivers that run in libvirtd +%ifarch %{qemu_sysemu_host_arches} %define with_qemu 0%{!?_without_qemu:1} +%else +%define with_qemu 0 +%endif %define with_lxc 0%{!?_without_lxc:1} %define with_libxl 0%{!?_without_libxl:1} %define with_vbox 0%{!?_without_vbox:1} @@ -55,10 +68,6 @@ %define with_qemu_tcg 0 %endif =20 -%if ! %{with_qemu_tcg} && ! %{with_qemu_kvm} - %define with_qemu 0 -%endif - # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} %define with_vmware 0%{!?_without_vmware:1} --=20 2.41.0 From nobody Sun May 19 10:14:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689864634; cv=none; d=zohomail.com; s=zohoarc; b=V2DisxAXA6dXUoLNXdz7QAqMEUIPdbKZxF4ygtTeI5LZQxY2SZ4h2l9MpwnMwLkO3PPndZqjX+QFxD9BJY1WdP8RH/Wtl5za38R+lcC4JQ/kL/pnYT8a/V023pNCs2Huwmb2VRnMDdDRUgB6UHuKM2pyc4wcA2jMw085q59POo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689864634; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SNiTJIRJ4EIhi0W1VAVzJf7PR2a8agVW/30biBe+AN0=; b=UCiJD70zsRhMzQw243n43ejml5/iSZcjU8ogDvNL3IaIV3kKs9j1U3zDGMHTHAFCqQC9KcTWFrx8KYFTEZWvJbR/scnxp60QoUhcsPnIRAIt67fXhwOeRbbsEnp6kG+2KZW7C1KJU0D64J7cgXzAZBC0+YAOlohp2KPp9rbR/eU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689864634740305.22089541345633; Thu, 20 Jul 2023 07:50:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-482-LAdx_DoCNNKBhHfoeAgaSQ-1; Thu, 20 Jul 2023 10:50:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F38C43C00124; Thu, 20 Jul 2023 14:50:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD9A01121315; Thu, 20 Jul 2023 14:50:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3CB031946A74; Thu, 20 Jul 2023 14:50:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DF5A11946A72 for ; Thu, 20 Jul 2023 14:50:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C1390F6CDC; Thu, 20 Jul 2023 14:50:15 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 578D4F6CD8; Thu, 20 Jul 2023 14:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689864633; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SNiTJIRJ4EIhi0W1VAVzJf7PR2a8agVW/30biBe+AN0=; b=iucSvSISYPye9+gc45Y2dtmaj1MpRdANYg7qHMkji7i01YMw/FSyjl23wpRrp9HuMdmO7q SA/qxTZalfeJLOfaOZT3j508eUv00JtAbw/E2XhKN61JtoSPK9SmkNJvhV+TIjo5AZY7UX g574YXOp0Frcfex4PjiTvVc7cz0sYTA= X-MC-Unique: LAdx_DoCNNKBhHfoeAgaSQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH RFC 3/4] rpm: use %{qemu_sysemu_kvm_arches} Date: Thu, 20 Jul 2023 15:50:10 +0100 Message-ID: <20230720145011.20402-4-berrange@redhat.com> In-Reply-To: <20230720145011.20402-1-berrange@redhat.com> References: <20230720145011.20402-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689864635581100003 This macro reflects the architectures on which KVM is available with the distro QEMU build. Signed-off-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 641ff179e7..e520def44b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -19,17 +19,13 @@ %else %define qemu_sysemu_host_arches aarch64 s390x %{power64} x86_64 %endif + %define qemu_sysemu_kvm_arches %{qemu_sysemu_host_arches} %else %define qemu_sysemu_host_arches aarch64 %{arm} %{ix86} %{mips} %{p= ower64} riscv64 s390x x86_64 + %define qemu_sysemu_kvm_arches aarch64 %{ix86} %{mips} %{power64} = riscv64 s390x x86_64 %endif %endif =20 -%if 0%{?rhel} - %define arches_qemu_kvm %{qemu_sysemu_host_arches} -%else - %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x -%endif - %define arches_64bit x86_64 %{power64} aarch64 s390x riscv64 %define arches_x86 %{ix86} x86_64 =20 @@ -55,7 +51,7 @@ %define with_libxl 0%{!?_without_libxl:1} %define with_vbox 0%{!?_without_vbox:1} =20 -%ifarch %{arches_qemu_kvm} +%ifarch %{qemu_sysemu_kvm_arches} %define with_qemu_kvm %{with_qemu} %else %define with_qemu_kvm 0 @@ -84,7 +80,7 @@ %if 0%{?rhel} > 8 %define with_storage_gluster 0 %else - %ifnarch %{arches_qemu_kvm} + %ifnarch %{qemu_sysemu_kvm_arches} %define with_storage_gluster 0 %endif %endif @@ -164,7 +160,7 @@ %define with_sanlock 0%{!?_without_sanlock:1} %endif %if 0%{?rhel} - %ifarch %{arches_qemu_kvm} + %ifarch %{qemu_sysemu_kvm_arches} %define with_sanlock 0%{!?_without_sanlock:1} %endif %endif --=20 2.41.0 From nobody Sun May 19 10:14:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689864645; cv=none; d=zohomail.com; s=zohoarc; b=Q+uWx30gqqng0HTq/oZnDLd3VwCF3VKFJ0pHH42MluYYq1/I2JocTt4j2YJIaFcDewsgagOBssAMdR3WncIXS+zngTDMa5+U+OTLY+Cz0lWD31rLi41Fsi/HT+DS2AO+mW4Bhidr+U8Odr6xMlMRIPni+/tcdgu+v130SWJv3qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689864645; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2mAJHosCnJKxcscslY2e2IjzUfSocXDB3vX4ZaPfkco=; b=J9c65tmxXbOshTA0EOixbxrYxKbDmulOZyqHtSXS4GCJO00KWbcgtUIMlRA78KWFCCr/pvRlMzrcLtRhiKAHDfEgaVEv8GHVCg15cKV3wc/pTkTJMq1dATyDx38JOYZw6squ8GmP/VEPBtfZTuaqNlGBSYkXWBH5fOlazYXAKxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1689864645266219.20677724331324; Thu, 20 Jul 2023 07:50:45 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-86-MvBouIEaPmyeJju2NcBoDg-1; Thu, 20 Jul 2023 10:50:40 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 781BE88CC49; Thu, 20 Jul 2023 14:50:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E00D140E952; Thu, 20 Jul 2023 14:50:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2D52119465BD; Thu, 20 Jul 2023 14:50:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7DDC919465BA for ; Thu, 20 Jul 2023 14:50:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 66FD8F77B9; Thu, 20 Jul 2023 14:50:16 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2E53F6CDC; Thu, 20 Jul 2023 14:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689864642; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2mAJHosCnJKxcscslY2e2IjzUfSocXDB3vX4ZaPfkco=; b=BSkLvNyxA4cBX3PkcgigkgAi2gRkJcwmgDfcvgm3pADuksf9VeU0mBXFh6L8xhv9piX+mO Xct5p5BE6oXYxV+HsbIC65tJVu3QwYJnBO95YVXyzCNaFvAwixJcgaxJQwD7/SEcnQyUBq Y91XK3iz/pbHQSsUr8J09z3C6mihFyI= X-MC-Unique: MvBouIEaPmyeJju2NcBoDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH RFC 4/4] rpm: use %{qemu_sysemu_tcg_non_native} Date: Thu, 20 Jul 2023 15:50:11 +0100 Message-ID: <20230720145011.20402-5-berrange@redhat.com> In-Reply-To: <20230720145011.20402-1-berrange@redhat.com> References: <20230720145011.20402-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689864645530100001 This macro reflects whether the QEMU build enables TCG for non-native architectures. Signed-off-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e520def44b..e1692c7712 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -20,9 +20,11 @@ %define qemu_sysemu_host_arches aarch64 s390x %{power64} x86_64 %endif %define qemu_sysemu_kvm_arches %{qemu_sysemu_host_arches} + %define qemu_sysemu_tcg_non_native 0 %else %define qemu_sysemu_host_arches aarch64 %{arm} %{ix86} %{mips} %{p= ower64} riscv64 s390x x86_64 %define qemu_sysemu_kvm_arches aarch64 %{ix86} %{mips} %{power64} = riscv64 s390x x86_64 + %define qemu_sysemu_tcg_non_native 1 %endif %endif =20 @@ -57,11 +59,10 @@ %define with_qemu_kvm 0 %endif =20 -%define with_qemu_tcg %{with_qemu} - -# RHEL disables TCG on all architectures -%if 0%{?rhel} - %define with_qemu_tcg 0 +%if %{qemu_sysemu_tcg_non_native} + %define with_qemu_tcg %{with_qemu} +%else + %define with_qemu_tcg 0 %endif =20 # Then the hypervisor drivers that run outside libvirtd, in libvirt.so --=20 2.41.0