From nobody Sun Feb 8 17:04:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1697468587; cv=none; d=zohomail.com; s=zohoarc; b=PZWZM+YY5zOA8mtfmlAy1R0XHh7o9Z3rXkKKucBVbAM9WVp6nLLeEG+nYNfka+Ije9SyPL3JwU+SyRwro9UhThACcTfnEkSr0m91PL2Ir9PpN9DQXQEaBn/IKny80SuwBDyyekuqa+J8vNo+t+uL5wdqvIcFO3lZIslFCaYrE0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468587; 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=YqqltvXN1wLfMseiqCoJYr0LAEZ5cPCdByqg1fh6EW8=; b=btBmdH7wH5+6BVpACEf8PTvVZ1i6XsMxutJ+izq43c1HazjTe3mgOxM718zqO5wqd2pfLJi3QWoEMYjeiRab0cwfC/D/YAbSBXXGsBwpBpPN2IWwhG8lKqnPA1Ybdz81CzqoQM9kbPZASHjL9Sd1QPtZiw3X6XOgdGtdvVCbfUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1697468587290455.9470878411746; Mon, 16 Oct 2023 08:03:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-503-Exg6CYDVNxaa5p22kob--g-1; Mon, 16 Oct 2023 11:02:45 -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 4203A862F80; Mon, 16 Oct 2023 15:02:21 +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 27CA3200A7A2; Mon, 16 Oct 2023 15:02:21 +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 02CA91946589; Mon, 16 Oct 2023 15:02:21 +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 074091946588 for ; Mon, 16 Oct 2023 15:02:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EC4D840C6F7F; Mon, 16 Oct 2023 15:02:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A76840C6CA0 for ; Mon, 16 Oct 2023 15:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468586; 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=YqqltvXN1wLfMseiqCoJYr0LAEZ5cPCdByqg1fh6EW8=; b=QMPrxtEhkbY53KUTSVxg/LDILuY2mK5IHGVm2R1Z0NH8pCzp+ZnDZk6F0tWXM8LpqjXMGF 0qHJCfbqVOGw9G5Ea1CwIk36VxbNCD/Os7J9oyGQRyeEbNdtcx47Cw0L8OVQ5UcEBBUhZa V95HhKizvPH2FSf3eL1mdNkNOKqvYKU= X-MC-Unique: Exg6CYDVNxaa5p22kob--g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/31] qemu: blockjob: Use 'format' nodename accessors for job naming Date: Mon, 16 Oct 2023 17:01:47 +0200 Message-ID: <53e97febfb6fd3bd7cf0697adb37e804569f0a07.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: 1697468588377100005 Content-Type: text/plain; charset="utf-8" Use the effective nodename for naming the job as we use that one now. It doesn't matter too much which one we pick, because it's used just for the name of the job, which we preserve in the status XML. Signed-off-by: Peter Krempa --- src/qemu/qemu_blockjob.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 12f3d59df5..cb9948ae2a 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -252,7 +252,8 @@ qemuBlockJobDiskNewPull(virDomainObj *vm, unsigned int jobflags) { g_autoptr(qemuBlockJobData) job =3D NULL; - g_autofree char *jobname =3D g_strdup_printf("pull-%s-%s", disk->dst, = disk->src->nodeformat); + g_autofree char *jobname =3D g_strdup_printf("pull-%s-%s", disk->dst, + qemuBlockStorageSourceGetEf= fectiveNodename(disk->src)); if (!(job =3D qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_PULL, jobname))) return NULL; @@ -278,7 +279,8 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, unsigned int jobflags) { g_autoptr(qemuBlockJobData) job =3D NULL; - g_autofree char *jobname =3D g_strdup_printf("commit-%s-%s", disk->dst= , top->nodeformat); + g_autofree char *jobname =3D g_strdup_printf("commit-%s-%s", disk->dst, + qemuBlockStorageSourceGetEf= fectiveNodename(top)); qemuBlockJobType jobtype =3D QEMU_BLOCKJOB_TYPE_COMMIT; if (topparent =3D=3D NULL) @@ -309,7 +311,7 @@ qemuBlockJobNewCreate(virDomainObj *vm, { g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *jobname =3D NULL; - const char *nodename =3D src->nodeformat; + const char *nodename =3D qemuBlockStorageSourceGetEffectiveNodename(sr= c); if (storage) nodename =3D qemuBlockStorageSourceGetStorageNodename(src); @@ -340,7 +342,8 @@ qemuBlockJobDiskNewCopy(virDomainObj *vm, unsigned int jobflags) { g_autoptr(qemuBlockJobData) job =3D NULL; - g_autofree char *jobname =3D g_strdup_printf("copy-%s-%s", disk->dst, = disk->src->nodeformat); + g_autofree char *jobname =3D g_strdup_printf("copy-%s-%s", disk->dst, + qemuBlockStorageSourceGetEf= fectiveNodename(disk->src)); if (!(job =3D qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_COPY, jobname))) return NULL; @@ -368,7 +371,8 @@ qemuBlockJobDiskNewBackup(virDomainObj *vm, g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *jobname =3D NULL; - jobname =3D g_strdup_printf("backup-%s-%s", disk->dst, disk->src->node= format); + jobname =3D g_strdup_printf("backup-%s-%s", disk->dst, + qemuBlockStorageSourceGetEffectiveNodename(d= isk->src)); if (!(job =3D qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_BACKUP, jobname))) return NULL; --=20 2.41.0