From nobody Mon Feb 9 09:34:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1578594107; cv=none; d=zohomail.com; s=zohoarc; b=PHUe+5yMRCuGbv9e5MH2CpmI0+2JP7hL0FeEbfNygLElCEJ4TvJsJxI5fuvUhMliU9L82vXkioXsy9J9DNjb8rcc3+9TVoUwTiZB4aTxkVMRRMsg2nTEKSk1RXZnDR+9HTV1diGKAA0u+QgqW1BQqv2i3492wgnNBjHPRTAabd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594107; 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=qnYUfQBYa4vFgPDhmCAzTSWXFMOK3RNFMDZrmweOuPM=; b=iiGCPhxFR6ak3sbakWK0JTKqltSk7rQYKfNHM9yhZwrOq3PXvM0yeh3r4iKM6Ug1xpa17cmj0At7w5+4ZZm4sSsZP2mJMufDXNZcge4RTs11ZDNFexfI89cVZV0dXNLdpHKD+D1Hm5j3WX1fcGE2Jne0/1RNNJeN4f12Qvrz9ak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578594107086341.6851468760823; Thu, 9 Jan 2020 10:21:47 -0800 (PST) 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-176-4f2kAibDOOaKFMCdLjXGeg-1; Thu, 09 Jan 2020 13:21:44 -0500 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 BAEC6104ED03; Thu, 9 Jan 2020 18:21:38 +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 923C860FC2; Thu, 9 Jan 2020 18:21:38 +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 4C9E2503C7; Thu, 9 Jan 2020 18:21:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009ILW1l018249 for ; Thu, 9 Jan 2020 13:21:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3C11D7C382; Thu, 9 Jan 2020 18:21:32 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F21B9A84; Thu, 9 Jan 2020 18:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594106; 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=qnYUfQBYa4vFgPDhmCAzTSWXFMOK3RNFMDZrmweOuPM=; b=JM62lldkEvXgehUKdw7fXcOgcnGibPX0Pap8ReZRh629g2ZMFo8WS+QsHBL9ulkmJuQAN+ IrRazLVCd3+an7HEr3JqHBrlAIz+msYRbol3Nn3beVx2hnDhP8bM1wZrV45mgE7WueMhkr 4zkWmSjVpK2l+qtkoPiAWOxiYRET1t4= From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 19:21:09 +0100 Message-Id: <935723b9785c3ce9bc82bc76dfa124ade97c557e.1578593859.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [RFC PATCH 03/16] qemu: checkpoint: rename disk->chkdisk in qemuCheckpointDiscardBitmaps 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-MC-Unique: 4f2kAibDOOaKFMCdLjXGeg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Upcomming patches will also use the domain diks definition. Rename disk to chkdisk for clarity. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_checkpoint.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 9ff3129570..d347b8fc6c 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -124,13 +124,13 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm, return -1; for (i =3D 0; i < chkdef->ndisks; i++) { - virDomainCheckpointDiskDef *disk =3D &chkdef->disks[i]; + virDomainCheckpointDiskDef *chkdisk =3D &chkdef->disks[i]; const char *node; - if (disk->type !=3D VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP) + if (chkdisk->type !=3D VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP) continue; - node =3D qemuDomainDiskNodeFormatLookup(vm, disk->name); + node =3D qemuDomainDiskNodeFormatLookup(vm, chkdisk->name); /* If any ancestor checkpoint has a bitmap for the same * disk, then this bitmap must be merged to the * ancestor. */ @@ -145,7 +145,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm, g_autoptr(virJSONValue) arr =3D NULL; disk2 =3D &parentdef->disks[j]; - if (STRNEQ(disk->name, disk2->name) || + if (STRNEQ(chkdisk->name, disk2->name) || disk2->type !=3D VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP) continue; search_parents =3D false; @@ -153,7 +153,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm, if (!(arr =3D virJSONValueNewArray())) return -1; - if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, = node, disk->bitmap) < 0) + if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, = node, chkdisk->bitmap) < 0) return -1; if (chkcurrent) { @@ -166,7 +166,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm, } } - if (qemuMonitorTransactionBitmapRemove(actions, node, disk->bitmap= ) < 0) + if (qemuMonitorTransactionBitmapRemove(actions, node, chkdisk->bit= map) < 0) return -1; } --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list