From nobody Fri Nov 8 10:14:01 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 1719834433390818.5583179710503; Mon, 1 Jul 2024 04:47:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5973714D4; Mon, 1 Jul 2024 07:47:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D9CEB14D5; Mon, 1 Jul 2024 07:42:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1FBA513C6; 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.133.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 2D45E13C6 for ; Mon, 1 Jul 2024 07:42:09 -0400 (EDT) Received: from mx-prod-mc-01.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-644-dVcO-Bs6M9GMmQA0e4NGWA-1; Mon, 01 Jul 2024 07:42:07 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8EE13196CDE6 for ; Mon, 1 Jul 2024 11:42:06 +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 C8F1319773F9 for ; Mon, 1 Jul 2024 11:42:05 +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=1719834128; 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=+iPkCJX9d1bZcx/SNsBDG0QDQ3Ubl7q4jYanrzHIxcA=; b=Om/2kau9JljLZXLx11WN0oHYgJppAn0LdwVMXrmJcXs+c9BFWVYrBw8JkdRXEi6IboUjHd TpNGaCrDiOcC0h8wK/JOps+VxiqCkG4i8cEPd8q3LLblOoFPv/B5U0tOQJBsLRRg1fxzmm RczSnHyyx5nyTHV43fOA8K67C2Yo1GY= X-MC-Unique: dVcO-Bs6M9GMmQA0e4NGWA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 9/9] qemu: Drop _virQEMUDriver::hostFips Date: Mon, 1 Jul 2024 13:41:43 +0200 Message-ID: <1040e2298213bc9e78580b9f3e565d49015d9f46.1719834073.git.mprivozn@redhat.com> 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: PLMO6BKJ2FWWWAFRDQUHDDLZMHBWT5SR X-Message-ID-Hash: PLMO6BKJ2FWWWAFRDQUHDDLZMHBWT5SR 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: 1719834434891100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The 'hostFips' member of _virQEMUDriver struct is not used really, due to previous cleanups. Drop it. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_conf.h | 1 - src/qemu/qemu_driver.c | 9 --------- tests/qemuxmlconftest.c | 2 -- 3 files changed, 12 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 36049b4bfa..aa1e1a626c 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -261,7 +261,6 @@ struct _virQEMUDriver { /* Immutable values */ bool privileged; char *embeddedRoot; - bool hostFips; /* FIPS mode is enabled on the host */ =20 /* Immutable pointers. Caller must provide locking */ virStateInhibitCallback inhibitCallback; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fc1704f4fc..cd5ddf2eac 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -732,15 +732,6 @@ qemuStateInitialize(bool privileged, if (qemuMigrationDstErrorInit(qemu_driver) < 0) goto error; =20 - /* qemu-5.1 and older requires use of '-enable-fips' flag when the host - * is in FIPS mode. We store whether FIPS is enabled */ - if (virFileExists("/proc/sys/crypto/fips_enabled")) { - g_autofree char *buf =3D NULL; - - if (virFileReadAll("/proc/sys/crypto/fips_enabled", 10, &buf) > 0) - qemu_driver->hostFips =3D STREQ(buf, "1\n"); - } - if (privileged) { g_autofree char *channeldir =3D NULL; =20 diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index e584e0d9e5..73e9a935d9 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -389,8 +389,6 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, qemuDomainObjPrivate *priv =3D vm->privateData; size_t i; =20 - drv->hostFips =3D flags & FLAG_FIPS_HOST; - if (qemuProcessCreatePretendCmdPrepare(drv, vm, migrateURI, VIR_QEMU_PROCESS_START_COLD) < = 0) return NULL; --=20 2.44.2