From nobody Thu Nov 14 07:12:04 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=1632310584; cv=none; d=zohomail.com; s=zohoarc; b=U8lHOH4LNs26xBC4cq9D5ksJoDWrs/QxS87D+TRO6UEJa8PKgL0iaVgtKy8qU9NLkI5tZb0fLThF+cPBPhnJHD3LBQnrw9H9wMI6hZx59KWweE23pgEMATXDNR/Pod8Yfcf5cmx7ESveKqtDIFxxDL6kKo9jJc3OrR2EhD0Nqa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632310584; 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=2tLBhzPIYIi3ekMQ56Yh47UK5ZnSxHq2ZPrXXpi5Wh0=; b=Vhsprt6cwegRs1McSO1dP01ByGcyyNOoiprAET74qixpsNiQRG925hyjccih4JALRUi/hpn5OOQrN/Pk40h+YvfdmzkCc8Rvwo9v9tP4dT84h8eDLmycU4YlF+LREVO7QUnm0nFnmGBMB8fT0FOJ8MYs+axPv1+ggUCmq9ybtZ8= 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 1632310584001266.41761610297635; Wed, 22 Sep 2021 04:36:24 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-256-XJjRJxcUNhayOc54xOsdAQ-1; Wed, 22 Sep 2021 07:36:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 297F084A5E4; Wed, 22 Sep 2021 11:36:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 026351037E91; Wed, 22 Sep 2021 11:36:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BFC254EA3E; Wed, 22 Sep 2021 11:36:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MBZlVl006688 for ; Wed, 22 Sep 2021 07:35:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id B587C6060F; Wed, 22 Sep 2021 11:35:47 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 216F660871 for ; Wed, 22 Sep 2021 11:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632310583; 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=2tLBhzPIYIi3ekMQ56Yh47UK5ZnSxHq2ZPrXXpi5Wh0=; b=Yk58sxY2fVZy/0+THeTUVEMaCo37GT9L6DZQh9/3rrreZ63RltEB43BrxZfJggGjaHk3yI d7TZBaJeWoqJDttw80LcJublHK8iKU/RN0I4MD3dPRPqUq1Fs7zfj2eqQ/m0D3c+WC0E19 rV9jPugl7xwA9KTgcBVBctSQrLXKtcI= X-MC-Unique: XJjRJxcUNhayOc54xOsdAQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/12] qemu: command: Remove qemuBuildGeneralSecinfoURI Date: Wed, 22 Sep 2021 13:35:27 +0200 Message-Id: <15a52c3b18a4e5ef3400d88888397493de84fea9.1632310421.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632310584775100006 Content-Type: text/plain; charset="utf-8" After removal of plaintext secrets this function is a noop. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6e8699a3c6..60b47573d5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -748,34 +748,6 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd, } -/* qemuBuildGeneralSecinfoURI: - * @uri: Pointer to the URI structure to add to - * @secinfo: Pointer to the secret info data (if present) - * - * If we have a secinfo, then build the command line options for - * the secret info for the "general" case (somewhat a misnomer since - * an iscsi disk is the only one with a secinfo). - * - * Returns 0 on success or if no secinfo, - * -1 and error message if fail to add secret information - */ -static int -qemuBuildGeneralSecinfoURI(virURI *uri G_GNUC_UNUSED, - qemuDomainSecretInfo *secinfo) -{ - if (!secinfo) - return 0; - - switch ((qemuDomainSecretInfoType) secinfo->type) { - case VIR_DOMAIN_SECRET_INFO_TYPE_AES: - case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: - return -1; - } - - return 0; -} - - /* qemuBuildRBDSecinfoURI: * @uri: Pointer to the URI structure to add to * @secinfo: Pointer to the secret info data (if present) @@ -891,8 +863,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, static char * -qemuBuildNetworkDriveURI(virStorageSource *src, - qemuDomainSecretInfo *secinfo) +qemuBuildNetworkDriveURI(virStorageSource *src) { g_autoptr(virURI) uri =3D NULL; @@ -902,9 +873,6 @@ qemuBuildNetworkDriveURI(virStorageSource *src, if (src->hosts->socket) uri->query =3D g_strdup_printf("socket=3D%s", src->hosts->socket); - if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) - return NULL; - return virURIFormat(uri); } @@ -965,7 +933,7 @@ qemuBuildNetworkDriveStr(virStorageSource *src, return virBufferContentAndReset(&buf); } /* NBD code uses URI formatting scheme as others in some cases= */ - ret =3D qemuBuildNetworkDriveURI(src, secinfo); + ret =3D qemuBuildNetworkDriveURI(src); break; case VIR_STORAGE_NET_PROTOCOL_HTTP: @@ -975,7 +943,7 @@ qemuBuildNetworkDriveStr(virStorageSource *src, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: - ret =3D qemuBuildNetworkDriveURI(src, secinfo); + ret =3D qemuBuildNetworkDriveURI(src); break; case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: --=20 2.31.1