From nobody Sun Feb 8 21:42:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 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=1584987184; cv=none; d=zohomail.com; s=zohoarc; b=QZSBubR4aLOweNEjE2FWV8mUjw3FYCNORt0u24+31pdCN2VAyH4ff4JvEAxCO5Co/KEu7HAgUn1cgN49nBMDylP6+WEIw102NpG3RxSxp5e/Nz94M25mKUJr2YHhznFZ8Ub8CF3Olw/E1muLxAOr2wn9/eVI0/BzPtkLQ86YlFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584987184; 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=of++eBTammkEvWwzxiZIQhz7qeAV08d6v3FyE5yQILU=; b=f1B95AIiOaTPSBU/Ms0WfShSkLBp0Ioh/ol5ZcEPi09cO1SzkVS5wZHtItxos4r+pBp/6UzLz5O88bCsvpg1eBa8okMEUtu0Po8LkMW8EZqbSg0tiz/b8pg2aqWorZKnN8vlN7WzbmOCd53WV+lAtPAKBQF4tsHSRlymGX1wAWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1584987184103216.54559616223196; Mon, 23 Mar 2020 11:13:04 -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-286--H_UDzq0PoezcoOETm0g_w-1; Mon, 23 Mar 2020 14:12:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 080D71084432; Mon, 23 Mar 2020 18:12:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C766E60C85; Mon, 23 Mar 2020 18:12:32 +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 6A1B5180BACE; Mon, 23 Mar 2020 18:12:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02NICJTt009532 for ; Mon, 23 Mar 2020 14:12:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 34C9191290; Mon, 23 Mar 2020 18:12:19 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFAA58D574 for ; Mon, 23 Mar 2020 18:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584987183; 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=of++eBTammkEvWwzxiZIQhz7qeAV08d6v3FyE5yQILU=; b=Co2dZjIqoWN+VeliWmhP9YhcQQO1i1VQA4C5Smj1nXHz6R5Wn1jsO+2t+bcWY/LM+d+qPK DGc6nCF9t2rGb0bkYws3qHGfvvStpUx469ko/wpX1eS1UkBhYEnH5goPADo6b/imI0trsW ZhfbYwv5M1NfQ9Qfs7xbKBnKWIeIt+0= X-MC-Unique: -H_UDzq0PoezcoOETm0g_w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/14] qemu: block: Extract formatting of cookie string Date: Mon, 23 Mar 2020 19:12:02 +0100 Message-Id: <116f14dc9a6b37c0fb5dadd3cba78435e87812d0.1584986997.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Introduce qemuBlockStorageSourceGetCookieString which does the concatenation so that we can reuse it later. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 25 +++++++++++++++++++++++++ src/qemu/qemu_block.h | 3 +++ src/qemu/qemu_domain.c | 13 +------------ 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 3365ee677b..d9665ec4a0 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3343,3 +3343,28 @@ qemuBlockStorageSourceNeedsStorageSliceLayer(const v= irStorageSource *src) return false; } + + +/** + * qemuBlockStorageSourceGetCookieString: + * @src: storage source + * + * Returns a properly formatted string representing cookies of @src in for= mat + * accepted by qemu. + */ +char * +qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src) +{ + virBuffer buf =3D VIR_BUFFER_INITIALIZER; + size_t i; + + for (i =3D 0; i < src->ncookies; i++) { + virStorageNetCookieDefPtr cookie =3D src->cookies[i]; + + virBufferAsprintf(&buf, "%s=3D%s; ", cookie->name, cookie->value); + } + + virBufferTrim(&buf, "; "); + + return virBufferContentAndReset(&buf); +} diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 9bffe20bfb..8b57ffd8a5 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -258,3 +258,6 @@ qemuBlockReopenReadOnly(virDomainObjPtr vm, bool qemuBlockStorageSourceNeedsStorageSliceLayer(const virStorageSource *src); + +char * +qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9cff36cb77..b55765c8ee 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1747,18 +1747,7 @@ qemuDomainSecretStorageSourcePrepareCookies(qemuDoma= inObjPrivatePtr priv, const char *aliasprotocol) { g_autofree char *secretalias =3D qemuAliasForSecret(aliasprotocol, "ht= tpcookie"); - g_autofree char *cookies =3D NULL; - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - size_t i; - - for (i =3D 0; i < src->ncookies; i++) { - virStorageNetCookieDefPtr cookie =3D src->cookies[i]; - - virBufferAsprintf(&buf, "%s=3D%s; ", cookie->name, cookie->value); - } - - virBufferTrim(&buf, "; "); - cookies =3D virBufferContentAndReset(&buf); + g_autofree char *cookies =3D qemuBlockStorageSourceGetCookieString(src= ); return qemuDomainSecretAESSetup(priv, secretalias, NULL, (uint8_t *) cookies, strlen(cookies)); --=20 2.24.1