From nobody Thu Sep 19 01:02:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1719834452040155.43077941627052; Mon, 1 Jul 2024 04:47:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EC377147C; Mon, 1 Jul 2024 07:47:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 730B51467; Mon, 1 Jul 2024 07:42:31 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B61311472; Mon, 1 Jul 2024 07:42:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 87DF512A2 for ; Mon, 1 Jul 2024 07:42:09 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-183-TUgDT6iROFiDHXIqFB1ipQ-1; Mon, 01 Jul 2024 07:42:05 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 51D03197702B for ; Mon, 1 Jul 2024 11:42:03 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 458B01978C9E for ; Mon, 1 Jul 2024 11:42:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719834127; h=from:from: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; bh=/vQl5Dt3BvENwcyvMF5b/SBpo85GU3i10O+XLUH0JxU=; b=OtBS2klQrMU0IY4DDxryBFh7ntrWsy+iw+6LG8BK8NYNknl19BlwmIQUyAxhWrrfiFFcT9 MGTsNlGpFhUhHzzzMjF+a/STTcspYuAC6ba8ViJp5L5xksxTAX5DEipAWeya0CAXvWX0Et mT+g190ZEHyIo/UO2ewz4DSxaaYhWPs= X-MC-Unique: TUgDT6iROFiDHXIqFB1ipQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 6/9] qemu_capabilities: Drop version check for QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER Date: Mon, 1 Jul 2024 13:41:40 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XVDUY462MOZTR2RWRHSQDAWNPGPGXXKF X-Message-ID-Hash: XVDUY462MOZTR2RWRHSQDAWNPGPGXXKF X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1719834452971100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that the minimal required version of QEMU is 5.2.0 the conditional setting of QEMU_CAPS_ENABLE_FIPS and QEMU_CAPS_NETDEV_USER is effectively a dead code. Drop it. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2c6815934..7301fa4337 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5398,19 +5398,8 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps, * Add all QEMU capabilities based on version of QEMU. */ static void -virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps) +virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps G_GNUC_UNUSED) { - /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU - * should be built with gcrypt to achieve FIPS compliance - * automatically / implicitly - */ - if (qemuCaps->version < 5002000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); - - /* We are not able to detect this for old QEMU. Assume the capability = is - * there. */ - if (qemuCaps->version < 5000000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_USER); } =20 =20 --=20 2.44.2