From nobody Wed Apr 24 20:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1631280946; cv=none; d=zohomail.com; s=zohoarc; b=MXTxFZh30XEAEFRZuQCTDSBKvVBJXxIQwmTl75d6T1Z3Lx2X5691Z3OvI52rGaWqvX9Nor94VjmtU1ZbVdcMhEmWwpd/oquqGyFhkEsXQczwAPyJECcEv0zcOun1HQiGnl5eMXcq7K4jz3AAAY97wHiRowZ3ps6VB+uVEHrX2W4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631280946; 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; bh=Z9WnguIJ1h+Iu3NWqtYCCOakp0tVZP7MD92B57/+e6c=; b=cKU1tsjkNGWHdJrR76SSiTb8hO20Nm60BwRh7iceo0vc6IM22Jx49Ep2AfXJH1ElQqf4jsOAAEdNZrGcRH20ALdyMJxfwd/Cs7+AQbZ91fvdkLhv0BegbcMhSYjUW5HA1wK8QxMU1jOsmC3B11A2mCIOYMij706amBU9dd/2n0c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1631280946116135.77360498162193; Fri, 10 Sep 2021 06:35:46 -0700 (PDT) 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-543-5BikKKudOqybfuaSoyVXow-1; Fri, 10 Sep 2021 09:35:42 -0400 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 A26CD802B9E; Fri, 10 Sep 2021 13:35:37 +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 2347060C04; Fri, 10 Sep 2021 13:35:37 +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 315D74EA30; Fri, 10 Sep 2021 13:35:36 +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 18ADZYCu023312 for ; Fri, 10 Sep 2021 09:35:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id A259118432; Fri, 10 Sep 2021 13:35:34 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBC3E6B550 for ; Fri, 10 Sep 2021 13:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631280945; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Z9WnguIJ1h+Iu3NWqtYCCOakp0tVZP7MD92B57/+e6c=; b=Qu2urBH86hEueA3y3p7Viv9Wx/1sj4iY0zr29C6jRpb1jOXt6PW9V+4ayDV7XwjOfe7jpA Pbj7iiXfncxEjO6h73uTIVt86h3skIuU9UEcEBRSsbLsW4Dk2j4M6PYPsGHPqhH7Z3lXHx c+vSmQmrukQms2byx0Qtlnu264AkeAo= X-MC-Unique: 5BikKKudOqybfuaSoyVXow-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] qemuDomainChangeDiskLive: Modify 'startupPolicy' before changing source Date: Fri, 10 Sep 2021 15:35:29 +0200 Message-Id: <9eed2c7f47a5c2402441bd189101ade7a63bdd33.1631280929.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 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 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) X-ZM-MESSAGEID: 1631280948056100001 Content-Type: text/plain; charset="utf-8" We don't support all startup policies with all source types so to correctly allow switching from a 'file' based cdrom with 'optional' startup policy to a 'block' based one which doesn't support optional we must update the startup policy field first. Obviously we need to have fallback if the update fails. Reported-by: Vojtech Juranek Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bd41ddbc3c..dfc27572c4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7038,6 +7038,7 @@ qemuDomainChangeDiskLive(virDomainObj *vm, { virDomainDiskDef *disk =3D dev->data.disk; virDomainDiskDef *orig_disk =3D NULL; + virDomainStartupPolicy origStartupPolicy; virDomainDeviceDef oldDev =3D { .type =3D dev->type }; if (!(orig_disk =3D virDomainDiskByTarget(vm->def, disk->dst))) { @@ -7047,6 +7048,7 @@ qemuDomainChangeDiskLive(virDomainObj *vm, } oldDev.data.disk =3D orig_disk; + origStartupPolicy =3D orig_disk->startupPolicy; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, true) < 0) @@ -7065,13 +7067,20 @@ qemuDomainChangeDiskLive(virDomainObj *vm, return -1; } + /* update startup policy first before updating disk image */ + orig_disk->startupPolicy =3D dev->data.disk->startupPolicy; + if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, - dev->data.disk->src, force) < 0) + dev->data.disk->src, force) < 0= ) { + /* revert startup policy before failing */ + orig_disk->startupPolicy =3D origStartupPolicy; return -1; + } dev->data.disk->src =3D NULL; } + /* in case when we aren't updating disk source we update startup polic= y here */ orig_disk->startupPolicy =3D dev->data.disk->startupPolicy; orig_disk->snapshot =3D dev->data.disk->snapshot; --=20 2.31.1