From nobody Sun May 5 19:23:19 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558081396; cv=none; d=zoho.com; s=zohoarc; b=kLA++wJWsfws06B+J7sq5olcedSeEA1jDQzqSfioj8izWeznUFnPq7i+CU7S+hmjo89zxExO/vGsKhz0vYsPyJNYf5nlW4IxiFQqJuiHBLXOvDqZpe3i5xWL0U1jaE/D6Pkrq8SvY1kRMHxTZZ/wkVxSTVLKCEtn8SIGi86d0MU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558081396; h=Content-Type:Content-Transfer-Encoding:Cc: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=Ik5WORpHYjoGpYvRIwtktsza9vdoIDYKQ1PLuiLnKtY=; b=N+rjl7mteL4xCRKhISX4M6IPnAMgOUUCbu4nOjhnPT5/Lgg4yPn/XY9udIYrmA8j3zwLaVrU/P5YOsJk6ewKZCGNSQpud/MEJaLqZ18ljI+kO0d03F/fCfvXVCKki4ddQHhGP4SxVWu00qnB/gJY7lTDPvD1QiGsheBRNZ6zu0s= 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=pass 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 1558081396767615.2777877521727; Fri, 17 May 2019 01:23:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47CD3149A2; Fri, 17 May 2019 08:23:07 +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 F20BE473C6; Fri, 17 May 2019 08:23:02 +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 3FED41806B11; Fri, 17 May 2019 08:23:00 +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 x4H8MwFB000997 for ; Fri, 17 May 2019 04:22:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1413F1712F; Fri, 17 May 2019 08:22:58 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44F355D705; Fri, 17 May 2019 08:22:54 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 17 May 2019 10:22:16 +0200 Message-Id: <4ff22a6a5658d7999a11294dbf7913e3d2569789.1558081336.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa , Thomas Stein Subject: [libvirt] [PATCH] qemu: blockjob: Fix saving of inactive XML after completed legacy blockjob 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: , 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 17 May 2019 08:23:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Commit 0ba9afc6b28 introduced a logic bug where we will never save the inactive XML after a blockjob as the variable which was determining whether to do so is cleared right before. Thus even if we correctly modify the inactive state it will be rolled back when libvirtd is restarted. Reported-by: Thomas Stein Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_blockjob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index fa7e4c8625..f105632a09 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -363,7 +363,7 @@ qemuBlockJobEventProcessLegacy(virQEMUDriverPtr driver, if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap= s) < 0) VIR_WARN("Unable to save status on vm %s after block job", vm->def= ->name); - if (job->newstate =3D=3D VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef)= { + if (job->state =3D=3D VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef) { 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); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list