From nobody Mon Feb 9 09:57:58 2026 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1748332284; cv=none; d=zohomail.com; s=zohoarc; b=ENUAN3Lst7C72ACDXjL2PFfNNgNPHKsHebTO7cY4xnOHH4dIEWw9qmr8c4VJ/QnQDuWproc5a6/IFUBIlaoUS3UCuzLQrIJrbNAHGAyJkHR/D4Oehw59JOOGK6j3zNvXRJFCz7ajzBgIOIU9wa+JMiU6CHTro9rrqrDLZHwoVO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748332284; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=X+3okX4A8D2WErciyez3PrDGe/n5AqT5hJG1v/TYhCM=; b=IwM+5pDeCsewzlBCbp4E93qUPWls7xwv+A6XZc1GFes1iYj6ShgSFPkTMhp6ZwBuzWgZ6oFpY0FtDH4rGRTFJ0kSlqXdSMRwoaamP4wj0Qvu9VCZFURDV33TZsD4pwZIOXNaN97m2zidwUn3XMFzQrWinlNN42dMnlNgFi8X/Sc= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1748332284833494.1458715538662; Tue, 27 May 2025 00:51:24 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D5895147A; Tue, 27 May 2025 03:51:23 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4EFBC143E; Tue, 27 May 2025 03:49:34 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B02C8152E; Tue, 27 May 2025 03:49:29 -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 F04DA1689 for ; Tue, 27 May 2025 03:49:16 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-L_sAVVszMDOjqvd1KH2O4w-1; Tue, 27 May 2025 03:49:14 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1FD061800873 for ; Tue, 27 May 2025 07:49:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.3]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 57BC818003FD for ; Tue, 27 May 2025 07:49:13 +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, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1748332156; 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=h4gjcEFVD284am3ByKEtEMTNwwb06eDOZo9kBtmcJCQ=; b=esqe3VUV4uwoL6LWhoh4dWuti2m7amrJN6NLEXJC7RcO9iFsnLBMsxq3CIq7wwxYJ+gwDp 5gGQT2Zg9p00hOn3hpGw1L77zff6l6e8NX6ADqfGcPNPhc0tYfow5rFMERDyfXlo/27qYp Xjz99RADzhpfIKANO6dq8pDzRUWpJGk= X-MC-Unique: L_sAVVszMDOjqvd1KH2O4w-1 X-Mimecast-MFC-AGG-ID: L_sAVVszMDOjqvd1KH2O4w_1748332154 To: devel@lists.libvirt.org Subject: [PATCH 5/9] qemu: conf: Drop handling of 'vxhs' config options Date: Tue, 27 May 2025 09:49:01 +0200 Message-ID: <8fa274d9f19246c293895c23343892e489486610.1748332058.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ybjeTJRGxMMbqoRM6sNNqF3DVewpJ04wIJUH1eTDTLE_1748332154 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FJOLTTEOHIY2IJ6Y7KLQBHEMNNYBVK4O X-Message-ID-Hash: FJOLTTEOHIY2IJ6Y7KLQBHEMNNYBVK4O X-MailFrom: pkrempa@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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1748332286157116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Remove the config file handling for the config options we no longer use. Signed-off-by: Peter Krempa --- src/qemu/qemu_conf.c | 17 ----------------- src/qemu/qemu_conf.h | 4 ---- tests/qemuxmlconftest.c | 4 ---- tests/testutilsqemu.c | 2 -- 4 files changed, 27 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 8ffbcacaf2..9bf12fc179 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -385,9 +385,6 @@ static void virQEMUDriverConfigDispose(void *obj) g_free(cfg->chardevTLSx509certdir); g_free(cfg->chardevTLSx509secretUUID); - g_free(cfg->vxhsTLSx509certdir); - g_free(cfg->vxhsTLSx509secretUUID); - g_free(cfg->nbdTLSx509certdir); g_free(cfg->nbdTLSx509secretUUID); @@ -553,8 +550,6 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverCo= nfig *cfg, { int rv; - if (virConfGetValueBool(conf, "vxhs_tls", &cfg->vxhsTLS) < 0) - return -1; if (virConfGetValueBool(conf, "nbd_tls", &cfg->nbdTLS) < 0) return -1; if (virConfGetValueBool(conf, "chardev_tls", &cfg->chardevTLS) < 0) @@ -591,8 +586,6 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverCo= nfig *cfg, GET_CONFIG_TLS_CERTINFO_COMMON(backup); GET_CONFIG_TLS_CERTINFO_SERVER(backup); - GET_CONFIG_TLS_CERTINFO_COMMON(vxhs); - GET_CONFIG_TLS_CERTINFO_COMMON(nbd); #undef GET_CONFIG_TLS_CERTINFO_COMMON @@ -1416,14 +1409,6 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) return -1; } - if (cfg->vxhsTLSx509certdir && - !virFileExists(cfg->vxhsTLSx509certdir)) { - virReportError(VIR_ERR_CONF_SYNTAX, - _("vxhs_tls_x509_cert_dir directory '%1$s' does not= exist"), - cfg->vxhsTLSx509certdir); - return -1; - } - if (cfg->nbdTLSx509certdir && !virFileExists(cfg->nbdTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, @@ -1452,7 +1437,6 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfig *c= fg) SET_TLS_SECRET_UUID_DEFAULT(chardev); SET_TLS_SECRET_UUID_DEFAULT(migrate); SET_TLS_SECRET_UUID_DEFAULT(backup); - SET_TLS_SECRET_UUID_DEFAULT(vxhs); SET_TLS_SECRET_UUID_DEFAULT(nbd); #undef SET_TLS_SECRET_UUID_DEFAULT @@ -1481,7 +1465,6 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfig *c= fg) SET_TLS_X509_CERT_DEFAULT(chardev); SET_TLS_X509_CERT_DEFAULT(migrate); SET_TLS_X509_CERT_DEFAULT(backup); - SET_TLS_X509_CERT_DEFAULT(vxhs); SET_TLS_X509_CERT_DEFAULT(nbd); #undef SET_TLS_X509_CERT_DEFAULT diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index f6b13c828d..1ce9dbe4a8 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -159,10 +159,6 @@ struct _virQEMUDriverConfig { bool backupTLSx509verifyPresent; char *backupTLSx509secretUUID; - bool vxhsTLS; - char *vxhsTLSx509certdir; - char *vxhsTLSx509secretUUID; - bool nbdTLS; char *nbdTLSx509certdir; char *nbdTLSx509secretUUID; diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 9a29262d1b..0f1c935267 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1593,16 +1593,12 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-source-curl"); DO_TEST_CAPS_LATEST("disk-network-nfs"); - driver.config->vxhsTLS =3D 1; driver.config->nbdTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-a= 869-7acd6376d8ea"); - driver.config->vxhsTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-= a869-7acd6376d8ea"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname", "6.2= .0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); DO_TEST_CAPS_LATEST("disk-network-http"); VIR_FREE(driver.config->nbdTLSx509secretUUID); - VIR_FREE(driver.config->vxhsTLSx509secretUUID); - driver.config->vxhsTLS =3D 0; DO_TEST_CAPS_LATEST("disk-network-ssh"); DO_TEST_CAPS_LATEST("disk-no-boot"); DO_TEST_CAPS_LATEST("disk-nvme"); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 9038a37869..78ec521266 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -396,8 +396,6 @@ int qemuTestDriverInit(virQEMUDriver *driver) cfg->rdpTLSx509certdir =3D g_strdup("/etc/pki/libvirt-rdp"); VIR_FREE(cfg->chardevTLSx509certdir); cfg->chardevTLSx509certdir =3D g_strdup("/etc/pki/libvirt-chardev"); - VIR_FREE(cfg->vxhsTLSx509certdir); - cfg->vxhsTLSx509certdir =3D g_strdup("/etc/pki/libvirt-vxhs"); VIR_FREE(cfg->nbdTLSx509certdir); cfg->nbdTLSx509certdir =3D g_strdup("/etc/pki/libvirt-nbd"); VIR_FREE(cfg->migrateTLSx509certdir); --=20 2.49.0