From nobody Wed Nov 13 07:24:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1632310585; cv=none; d=zohomail.com; s=zohoarc; b=OULwpjhicpMbNU6CDUMhmWxoD/mxq2LwkdlbvfuRQx8kEC+LtHytLpftggzIRlE0zjC/wQWzeTjwRshiQBRIp9mYDvU6Z1oPyTWZLCAnk/p1bTlbNjQnmtoDkCihb8msfQo/l+LRqS1ev4tp7WxsYlu7ge43v5TP4REbeOf/oTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632310585; 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=sPqf0t7XIRQYKAUXBv4p4GbGfKivkQHcS6blqQjXfNI=; b=N7wVfHSSeeoIQtYjuocLVd8Uw3Ouh/o7MFIyxFbjpIboIBcScVp+F3exYQvc8wsXrPfNWwvwwpGhx9fmXloM+Pg18QsvNq6yo2UCk/jYJuovDC7ZVnqHeHLao3NK6gQIUv7plqkmxoxG8UZD6kIrJKrRs/q2E9kEY0niW4Pz1h8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632310585269694.600947131183; Wed, 22 Sep 2021 04:36:25 -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-173-1ijB23pQMkm23N25lrmjzg-1; Wed, 22 Sep 2021 07:36:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4799E802C94; Wed, 22 Sep 2021 11:36:17 +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 2406619730; Wed, 22 Sep 2021 11:36:17 +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 E89654EA41; Wed, 22 Sep 2021 11:36:16 +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 18MBZqgc006740 for ; Wed, 22 Sep 2021 07:35:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1497F60854; Wed, 22 Sep 2021 11:35:52 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7380060843 for ; Wed, 22 Sep 2021 11:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632310584; 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=sPqf0t7XIRQYKAUXBv4p4GbGfKivkQHcS6blqQjXfNI=; b=ZetFeWjTadsWRcABKsxjtI75xEpln0UnwrykYVWxw7gqbcFAWkMiHbCMTfeBYuF9QyJwCg DzqzyHYs4caA/sF6GNZ8rVrH6EfFTYCBtBMfbMWDaJgBblt3o8124IXn9SeI5/tNX+QPuc pKMC9Z8Mx83V4cQupr9heasguRILGvM= X-MC-Unique: 1ijB23pQMkm23N25lrmjzg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/12] qemu: command: Remove qemuBuildRBDSecinfoURI Date: Wed, 22 Sep 2021 13:35:31 +0200 Message-Id: <4b96584f6ead2ce44415461d75d2a21f9cf99046.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.23 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: 1632310586875100009 Content-Type: text/plain; charset="utf-8" Merge the code into the only caller. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5b738b230e..a051e5a4e8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -748,31 +748,6 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd, } -/* qemuBuildRBDSecinfoURI: - * @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 RBD network storage. Assumption for this - * is both username and secret exist for plaintext - * - * Returns 0 on success or if no secinfo, - * -1 and error message if fail to add secret information - */ -static int -qemuBuildRBDSecinfoURI(virBuffer *buf, - qemuDomainSecretInfo *secinfo) -{ - if (!secinfo) - virBufferAddLit(buf, ":auth_supported=3Dnone"); - else - virBufferEscape(buf, '\\', ":", ":id=3D%s:auth_supported=3Dcephx\\= ;none", - secinfo->username); - - return 0; -} - - /* qemuBuildTLSx509BackendProps: * @tlspath: path to the TLS credentials * @listen: boolean listen for client or server setting @@ -970,8 +945,11 @@ qemuBuildNetworkDriveStr(virStorageSource *src, if (src->snapshot) virBufferEscape(&buf, '\\', ":", "@%s", src->snapshot); - if (qemuBuildRBDSecinfoURI(&buf, secinfo) < 0) - return NULL; + if (!secinfo) + virBufferAddLit(&buf, ":auth_supported=3Dnone"); + else + virBufferEscape(&buf, '\\', ":", ":id=3D%s:auth_supported= =3Dcephx\\;none", + secinfo->username); if (src->nhosts > 0) { virBufferAddLit(&buf, ":mon_host=3D"); --=20 2.31.1