From nobody Mon Feb 9 07:26:58 2026 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=1697468645; cv=none; d=zohomail.com; s=zohoarc; b=SU0oSRsXDJR92Djeqf875gxxT/CiJM/0pajWxFC42X7Wtjmue7VxwEq/HZAKrPT91cHYi/FbyuFGnonpIk2JLfyBfqfxppgUHRsPvEA2MiH+69c7tM6l+Tg0lVzbtUY19SMlD6KIGA8bZN4EWyHbatMJcYD09AkOUF0qmjsQq2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468645; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=01Eu5KzbWIE521u3k9KzKNLIHFFu5lJPF021pDAiJvk=; b=dSms6OLCGZ0D/SZqHUSjAn+e3VI751R7pCSTHeso055vRcaCoGO0mAKDSKSwKfIhPWCJaO7295mff5uK13VuKtGKLqaZGYx44hRKbfT+LMBmowqBqtSbAQKpCvuvwk2CaGBxFwAPAR8R4Hh2vEXRaKl47J4xJV66OFqUyJokD7s= 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 1697468645649182.16795257972842; Mon, 16 Oct 2023 08:04:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-601-ccvA06DAOdiz9r9SjTEIsg-1; Mon, 16 Oct 2023 11:02:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 495A03857B7D; Mon, 16 Oct 2023 15:02:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30BC120296DB; Mon, 16 Oct 2023 15:02:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 25F9D194658F; Mon, 16 Oct 2023 15:02:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1A3461946587 for ; Mon, 16 Oct 2023 15:02:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F21B640C6F7F; Mon, 16 Oct 2023 15:02:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C2E640C6F79 for ; Mon, 16 Oct 2023 15:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468644; 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=01Eu5KzbWIE521u3k9KzKNLIHFFu5lJPF021pDAiJvk=; b=Xk94QRBfrm6rDKcwv1TE8vJcHcQDoKxoiXZ3yrvSUFuqo0Qlry14xczS23l7xJ/iCgjgMJ kXXC3QK3FhwRIh9RZuBunLVtNE81HoqvN+ugypD1mGLpMZFQ3hz64eVFDkbBHZT0d0lVDg 9zeegh4qHkUhSosxgTd4d1SQJfml+0o= X-MC-Unique: ccvA06DAOdiz9r9SjTEIsg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 23/31] tests: Use 'format' layer nodename accessors in test code Date: Mon, 16 Oct 2023 17:01:50 +0200 Message-ID: <0eeb610b0fd1267f908369cd5c3be445316692f1.1697468414.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1697468646682100006 Content-Type: text/plain; charset="utf-8" The test code cares mostly about the actual layer nodenames thus, appropriate accessors are used. Signed-off-by: Peter Krempa --- tests/qemublocktest.c | 10 +++++----- tests/qemumonitorjsontest.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 9a72a67ce2..addd646071 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -241,7 +241,7 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSource *src) srcpriv->encinfo[0] =3D g_new0(qemuDomainSecretInfo, 1); srcpriv->encinfo[0]->alias =3D g_strdup_printf("%s-encalias", - NULLSTR(src->nodeform= at)); + qemuBlockStorageSourc= eGetFormatNodename(src)); srcpriv->enccount =3D 1; } @@ -653,7 +653,7 @@ testQemuBitmapListPrint(const char *title, for (; next; next =3D next->next) { virStorageSource *src =3D next->data; - virBufferAsprintf(buf, "%s\n", src->nodeformat); + virBufferAsprintf(buf, "%s\n", qemuBlockStorageSourceGetFormatNode= name(src)); } } @@ -668,7 +668,7 @@ testQemuBackupIncrementalBitmapCalculateGetFakeImage(si= ze_t idx) ret->format =3D VIR_STORAGE_FILE_QCOW2; ret->path =3D g_strdup_printf("/image%zu", idx); qemuBlockStorageSourceSetStorageNodename(ret, g_strdup_printf("libvirt-= %zu-storage", idx)); - ret->nodeformat =3D g_strdup_printf("libvirt-%zu-format", idx); + qemuBlockStorageSourceSetFormatNodename(ret, g_strdup_printf("libvirt-%= zu-format", idx)); return ret; } @@ -741,7 +741,7 @@ testQemuBackupIncrementalBitmapCalculate(const void *op= aque) } target =3D virStorageSourceNew(); - target->nodeformat =3D g_strdup_printf("target_node"); + qemuBlockStorageSourceSetFormatNodename(target, g_strdup_printf("targe= t_node")); if (qemuBackupDiskPrepareOneBitmapsChain(data->chain, target, @@ -872,7 +872,7 @@ testQemuBlockBitmapBlockcopy(const void *opaque) g_autoptr(virStorageSource) fakemirror =3D virStorageSourceNew(); g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - fakemirror->nodeformat =3D g_strdup("mirror-format-node"); + qemuBlockStorageSourceSetFormatNodename(fakemirror, g_strdup("mirror-f= ormat-node")); expectpath =3D g_strdup_printf("%s/%s%s-out.json", abs_srcdir, blockcopyPrefix, data->name); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 6b82e3841b..6293b416bd 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2600,7 +2600,7 @@ testQemuMonitorJSONBlockdevReopen(const void *opaque) src->format =3D VIR_STORAGE_FILE_QCOW2; src->readonly =3D true; - src->nodeformat =3D g_strdup("test node"); + qemuBlockStorageSourceSetFormatNodename(src, g_strdup("test node")); qemuBlockStorageSourceSetStorageNodename(src, g_strdup("backing nodena= me")); src->backingStore =3D virStorageSourceNew(); --=20 2.41.0