From nobody Sun Feb 8 23:05:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606911330; cv=none; d=zohomail.com; s=zohoarc; b=P5M3q+pppi22To4VbjfcSI6TjC478Ccn/6o/a1NHy6GrWHaEPAkyggcQabyuxGbALTMg4ez2zjTapp4IKW1fBnxn3njsVwPIneva/gugNRpPbS1tIabXWEOShDOhjdc9F0Hzk5RNP8qRQt8+wPRKElqNYcLNC4j64buCFz4c0II= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606911330; 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=swAQPro/JSKNGvj8ZZ3H8ZIiqhros1I4vV1aCZOJIjE=; b=DHGMDK7sPVqVtWjUcWY8IAe2V0rS+M7Vi3e9WjV/uAn2/uucn3WGEi98TCYgTo1STEyi/0DOk5wux8FDzSY4P+q29psCd6xJ+vm5DDK68GuAfcfaoFJsTVyqtGGAtLzF3t2/XoMNDVi83vnK1sAS2EcHsfxNAVuCa1OCOo3SMIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606911330425876.2998659792146; Wed, 2 Dec 2020 04:15:30 -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-102-FBmwuxKdOQeIJAkTf_2ibw-1; Wed, 02 Dec 2020 07:15:26 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 018C4805BEF; Wed, 2 Dec 2020 12:15:20 +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 D09D560854; Wed, 2 Dec 2020 12:15:19 +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 97B211809CA6; Wed, 2 Dec 2020 12:15:19 +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 0B2CFExV031804 for ; Wed, 2 Dec 2020 07:15:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id D9748189A5; Wed, 2 Dec 2020 12:15:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C80163B8C for ; Wed, 2 Dec 2020 12:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606911329; 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=swAQPro/JSKNGvj8ZZ3H8ZIiqhros1I4vV1aCZOJIjE=; b=RMHQ23EIYhlZaxl4F+zWjWBJ/oe5U87Lxva298Khh/R9i2nyvEai0Gi6BjVn/2BwehIndj pAh9RWJtyMACWvWLcgKCBmJXW5gwOOSN6MBM7/U5bNQlSvffUNNdwXXnh9DZbWUeYg780x LTbjD8m1y5v3CaNALl6D55Hvs1VVVvM= X-MC-Unique: FBmwuxKdOQeIJAkTf_2ibw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/11] virDomainCheckpointAlignDisks: Use 'domdef' for domain definition Date: Wed, 2 Dec 2020 13:14:53 +0100 Message-Id: <615cc74529ecac014d2c5f26420b5b7df579cd53.1606911231.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.13 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) Content-Type: text/plain; charset="utf-8" Extract the pointer and use a local variable throughout the function. Signed-off-by: Peter Krempa --- src/conf/checkpoint_conf.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 914deb41f2..2375c78b92 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -292,25 +292,26 @@ virDomainCheckpointCompareDiskIndex(const void *a, co= nst void *b) int virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr def) { + virDomainDefPtr domdef =3D def->parent.dom; g_autoptr(virBitmap) map =3D NULL; size_t i; int ndisks; int checkpoint_default =3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE; - if (!def->parent.dom) { + if (!domdef) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing domain in checkpoint")); return -1; } - if (def->ndisks > def->parent.dom->ndisks) { + if (def->ndisks > domdef->ndisks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("too many disk checkpoint requests for domain")); return -1; } /* Unlikely to have a guest without disks but technically possible. */ - if (!def->parent.dom->ndisks) { + if (!domdef->ndisks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("domain must have at least one disk to perform ch= eckpoints")); return -1; @@ -321,12 +322,12 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefP= tr def) if (!def->ndisks) checkpoint_default =3D VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP; - map =3D virBitmapNew(def->parent.dom->ndisks); + map =3D virBitmapNew(domdef->ndisks); /* Double check requested disks. */ for (i =3D 0; i < def->ndisks; i++) { virDomainCheckpointDiskDefPtr disk =3D &def->disks[i]; - int idx =3D virDomainDiskIndexByName(def->parent.dom, disk->name, = false); + int idx =3D virDomainDiskIndexByName(domdef, disk->name, false); if (idx < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -340,8 +341,8 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr= def) disk->name); return -1; } - if ((virStorageSourceIsEmpty(def->parent.dom->disks[idx]->src) || - def->parent.dom->disks[idx]->src->readonly) && + if ((virStorageSourceIsEmpty(domdef->disks[idx]->src) || + domdef->disks[idx]->src->readonly) && disk->type !=3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk '%s' is empty or readonly"), @@ -351,30 +352,30 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefP= tr def) ignore_value(virBitmapSetBit(map, idx)); disk->idx =3D idx; - if (STRNEQ(disk->name, def->parent.dom->disks[idx]->dst)) { + if (STRNEQ(disk->name, domdef->disks[idx]->dst)) { VIR_FREE(disk->name); - disk->name =3D g_strdup(def->parent.dom->disks[idx]->dst); + disk->name =3D g_strdup(domdef->disks[idx]->dst); } } /* Provide defaults for all remaining disks. */ ndisks =3D def->ndisks; if (VIR_EXPAND_N(def->disks, def->ndisks, - def->parent.dom->ndisks - def->ndisks) < 0) + domdef->ndisks - def->ndisks) < 0) return -1; - for (i =3D 0; i < def->parent.dom->ndisks; i++) { + for (i =3D 0; i < domdef->ndisks; i++) { virDomainCheckpointDiskDefPtr disk; if (virBitmapIsBitSet(map, i)) continue; disk =3D &def->disks[ndisks++]; - disk->name =3D g_strdup(def->parent.dom->disks[i]->dst); + disk->name =3D g_strdup(domdef->disks[i]->dst); disk->idx =3D i; /* Don't checkpoint empty or readonly drives */ - if (virStorageSourceIsEmpty(def->parent.dom->disks[i]->src) || - def->parent.dom->disks[i]->src->readonly) + if (virStorageSourceIsEmpty(domdef->disks[i]->src) || + domdef->disks[i]->src->readonly) disk->type =3D VIR_DOMAIN_CHECKPOINT_TYPE_NONE; else disk->type =3D checkpoint_default; --=20 2.28.0