From nobody Thu Sep 19 01:02:34 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 1719834392079738.096871670554; Mon, 1 Jul 2024 04:46:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EDBB1142E; Mon, 1 Jul 2024 07:46:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EFA961456; Mon, 1 Jul 2024 07:42:20 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0957912B0; Mon, 1 Jul 2024 07:42:16 -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 C8AFF14BD for ; Mon, 1 Jul 2024 07:42:06 -0400 (EDT) Received: from mx-prod-mc-02.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-540-H7bwht7NNieWDYsupG-3jA-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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E1451944D69 for ; Mon, 1 Jul 2024 11:42:04 +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 77D2F1978F63 for ; Mon, 1 Jul 2024 11:42:03 +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=1719834126; 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=pLcM80xKQEk47GM9fL0KcAPCqBRcpI3aUvlYuIEsWJ4=; b=E4g4I4ZRct0+cl7I+Anbntos6EevtWv5L8FQugo6vCtYtPKRrq/lkAsqrzUFzZL1h/hLYZ SQw97iMcsrOpeKWqAeRQZ6T+Zlv0CPGy8G2lz4JtM1hofWVsvQyE4XXFejW7ei5ZO4UF/b kWCCYIb319Vvfuw8atkxKUyKey6zZec= X-MC-Unique: H7bwht7NNieWDYsupG-3jA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 7/9] qemu_capabilities: Retire QEMU_CAPS_ENABLE_FIPS Date: Mon, 1 Jul 2024 13:41:41 +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: JOILMAZ6J7244NAFFCXZSZ55DNUD53YA X-Message-ID-Hash: JOILMAZ6J7244NAFFCXZSZ55DNUD53YA 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: 1719834392697100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The capability is no longer used. Retire it. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 15 --------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7301fa4337..92004634da 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -290,7 +290,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "pvpanic", /* QEMU_CAPS_DEVICE_PANIC */ =20 /* 160 */ - "enable-fips", /* QEMU_CAPS_ENABLE_FIPS */ + "enable-fips", /* X_QEMU_CAPS_ENABLE_FIPS */ "spice-file-xfer-disable", /* X_QEMU_CAPS_SPICE_FILE_XFER_DI= SABLE */ "spiceport", /* X_QEMU_CAPS_CHARDEV_SPICEPORT */ "usb-kbd", /* QEMU_CAPS_DEVICE_USB_KBD */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c65ba7d138..cbd1e73289 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -268,7 +268,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */ =20 /* 160 */ - QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ + X_QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ X_QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer= */ X_QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */ QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ec1e9cbef..684de3f701 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10512,21 +10512,6 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildPflashBlockdevCommandLine(cmd, vm) < 0) return NULL; =20 - /* QEMU 1.2 and later have a binary flag -enable-fips that must be - * used for VNC auth to obey FIPS settings; but the flag only - * exists on Linux, and with no way to probe for it via QMP. Our - * solution: if FIPS mode is required, then unconditionally use the fl= ag. - * - * In QEMU 5.2.0, use of -enable-fips was deprecated. In scenarios - * where FIPS is required, QEMU must be built against libgcrypt - * which automatically enforces FIPS compliance. - * - * Note this is the only use of driver->hostFips. - */ - if (driver->hostFips && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ENABLE_FIPS)) - virCommandAddArg(cmd, "-enable-fips"); - if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) return NULL; =20 --=20 2.44.2