From nobody Fri May 3 19:45:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1559039888; cv=none; d=zoho.com; s=zohoarc; b=gPGmk8LdtYa20b0rc5ZFedR+asASS1BYnSV6kyslHZQ7X1yVC1MY2sKI3EJ2YlBljErbKq9M2ulSBEovGPZADeR4ZCMH6d9qNQKwsoyIiHbTqB/ugWfiAKcv/Ak+jOktPs0jJgf8cVEaeLfC+7+nLVn3tZvannDd/+4a14F2kM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559039888; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Zc4eXcV8EQNPctFBbR1DSj/ZWaWS9OZOE8WSjMFOxIU=; b=ET4LHIDzp6HS8sGEV6oJr6pXbv4rsM4gemUgEmJS9pF487mR/rzrf+Q9DQDr//SBOhYIF73I/SLsJ/BSgbYz6iLyjFZOlDmUn6lqGQfMrORXEzOyKIfYcTODfLApenI1jP6P4dEtre+K1wvAp9NM7t/54gBQVyL9QftqAwygAp0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155903988849921.427120160389222; Tue, 28 May 2019 03:38:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D35130593D8; Tue, 28 May 2019 10:38:05 +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 E75D860638; Tue, 28 May 2019 10:38:03 +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 4581324AFA; Tue, 28 May 2019 10:38:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4SAbxvs023970 for ; Tue, 28 May 2019 06:38:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5FFFD611C4; Tue, 28 May 2019 10:37:59 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B04A614C3 for ; Tue, 28 May 2019 10:37:57 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1646D3087BD2 for ; Tue, 28 May 2019 10:37:50 +0000 (UTC) Received: from [10.94.3.220] (helo=dim-vz7.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hVZUE-0002Ot-Bo for libvir-list@redhat.com; Tue, 28 May 2019 13:37:42 +0300 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Date: Tue, 28 May 2019 13:37:27 +0300 Message-Id: <1559039847-42287-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Greylist: Sender passed SPF test, ACL 242 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 28 May 2019 10:37:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 28 May 2019 10:37:56 +0000 (UTC) for IP:'185.231.240.75' DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru' FROM:'nshirokovskiy@virtuozzo.com' RCPT:'' X-RedHat-Spam-Score: 0 (SPF_HELO_NONE, SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75 relay.sw.ru X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] vz: fixes: snapshot: s/parent/parent_name/ as prep for virObject 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 28 May 2019 10:38:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Apply renaming of 36603bc56 for the vz driver. Signed-off-by: Nikolay Shirokovskiy --- Pushed as build breaker/trivial. src/vz/vz_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index dfd49e7..2286f9a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2460,14 +2460,14 @@ vzDomainSnapshotGetParent(virDomainSnapshotPtr snap= shot, unsigned int flags) if (!(snap =3D vzSnapObjFromSnapshot(snapshots, snapshot))) goto cleanup; =20 - if (!snap->def->parent) { + if (!snap->def->parent_name) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, _("snapshot '%s' does not have a parent"), snap->def->name); goto cleanup; } =20 - parent =3D virGetDomainSnapshot(snapshot->domain, snap->def->parent); + parent =3D virGetDomainSnapshot(snapshot->domain, snap->def->parent_na= me); =20 cleanup: virDomainSnapshotObjListFree(snapshots); --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list