From nobody Mon May 6 17:26:44 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; dkim=fail; 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=126.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532588614869430.8229298132692; Thu, 26 Jul 2018 00:03:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E55493001762; Thu, 26 Jul 2018 07:03:32 +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 92F91308BDA3; Thu, 26 Jul 2018 07:03:32 +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 8978618037ED; Thu, 26 Jul 2018 07:03:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6Q73Tw3026349 for ; Thu, 26 Jul 2018 03:03:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A67ACDB15; Thu, 26 Jul 2018 07:03:29 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9318BCDE13 for ; Thu, 26 Jul 2018 07:03:26 +0000 (UTC) Received: from m50-112.126.com (m50-112.126.com [123.125.50.112]) by mx1.redhat.com (Postfix) with ESMTP id 375295F73B for ; Thu, 26 Jul 2018 07:03:23 +0000 (UTC) Received: from localhost.localdomain (unknown [111.202.166.3]) by smtp6 (Coremail) with SMTP id j9KowAD3_7Mrcllb0qZPBg--.35418S4; Thu, 26 Jul 2018 15:03:18 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=9DalcT4qhF84CyXZ/T 0vmpdo6vkDx7lrpTrIFc5g+EI=; b=JZTu92DjHy2FbaFm7XGdQ5XeXEkHpT7XD0 aewZ4r0vv2pc582h4DxVNRna0Su188wKbRCzIEECKfwMH3RX4fwkVsHHmAoWOiqo UnzCEmAws2ywP5c2O8dtJgqilk5ceqNKLqDNeqkwxoKNCmEK4fVWqabICibxX2Gv d5WEW84D8= From: Bobo Du To: libvir-list@redhat.com Date: Thu, 26 Jul 2018 03:03:04 -0400 Message-Id: <1532588584-30937-2-git-send-email-dubo163@126.com> In-Reply-To: <1532588584-30937-1-git-send-email-dubo163@126.com> References: <1532588584-30937-1-git-send-email-dubo163@126.com> X-CM-TRANSID: j9KowAD3_7Mrcllb0qZPBg--.35418S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7AryfWryDZw4fJw1UAw47Jwb_yoW8WrWUpa n8JFy0yr4YgF4UXa1kJa1UuFy3Gw4v9ry2kryUu3WFqF1DC3WxWrn7ArWjqryDtrn3Zry2 9F97G390kFsFyw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkID7UUUUU= X-Originating-IP: [111.202.166.3] X-CM-SenderInfo: 5gxe0iiwt6ij2wof0z/1tbizxePMFpD5m0ADwAAs6 X-Greylist: Sender passed SPF test, ACL 227 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 26 Jul 2018 07:03:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 26 Jul 2018 07:03:25 +0000 (UTC) for IP:'123.125.50.112' DOMAIN:'m50-112.126.com' HELO:'m50-112.126.com' FROM:'dubo163@126.com' RCPT:'' X-RedHat-Spam-Score: 3.959 *** (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_ANBREP_L4, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L4, SPF_PASS) 123.125.50.112 m50-112.126.com 123.125.50.112 m50-112.126.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-loop: libvir-list@redhat.com Cc: Bobo Du , Bobo Du Subject: [libvirt] [PATCH] qemu:Fix snapshot creating with vm xml persistent 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 26 Jul 2018 07:03:33 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" it is a bug when the vm is undefined after started. blockcommit interface also has the bug with above. Signed-off-by: Bobo Du xmlopt, cfg->stateDir, vm, driver->cap= s) < 0) VIR_WARN("Unable to save status on vm %s after block job", vm->def= ->name); =20 - if (status =3D=3D VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef) { + if (status =3D=3D VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef && vm->= persistent) { if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef) = < 0) VIR_WARN("Unable to update persistent definition on vm %s " "after block job", vm->def->name); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fb0d4a8..202c1ba 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15055,7 +15055,8 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, =20 if (ret =3D=3D 0 || !do_transaction) { if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver-= >caps) < 0 || - (persist && virDomainSaveConfig(cfg->configDir, driver->caps, + (vm->persistent && persist && virDomainSaveConfig(cfg->con= figDir, + driver->caps, vm->newDef) < 0)) ret =3D -1; } --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list