From nobody Thu May 2 17:22:13 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519909492193987.96571005252; Thu, 1 Mar 2018 05:04:52 -0800 (PST) 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 856D9C053B02; Thu, 1 Mar 2018 13:04:50 +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 9E1206018B; Thu, 1 Mar 2018 13:04:49 +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 C075418436BF; Thu, 1 Mar 2018 13:04:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w21D4lCk018241 for ; Thu, 1 Mar 2018 08:04:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8596260C96; Thu, 1 Mar 2018 13:04:47 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-117-231.phx2.redhat.com [10.3.117.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC29760C99 for ; Thu, 1 Mar 2018 13:04:32 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Thu, 1 Mar 2018 08:03:38 -0500 Message-Id: <20180301130339.7158-2-jferlan@redhat.com> In-Reply-To: <20180301130339.7158-1-jferlan@redhat.com> References: <20180301130339.7158-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] conf: Fix crash in virDomainDefCompatibleDevice 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.31]); Thu, 01 Mar 2018 13:04:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id 'edae027c' blindly assumed that the passed @oldDev parameter would not be NULL when calling virDomainDeviceGetInfo; however, commit id 'b6a264e8' passed NULL for AttachDevice callers under the premise that there wouldn't be a device to check/update against. Signed-off-by: John Ferlan --- src/conf/domain_conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d96b012b9..fcafc8b2f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27417,9 +27417,12 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, { virDomainCompatibleDeviceData data =3D { .newInfo =3D virDomainDeviceGetInfo(dev), - .oldInfo =3D virDomainDeviceGetInfo(oldDev), + .oldInfo =3D NULL, }; =20 + if (oldDev) + data.oldInfo =3D virDomainDeviceGetInfo(oldDev); + if (!virDomainDefHasUSB(def) && def->os.type !=3D VIR_DOMAIN_OSTYPE_EXE && virDomainDeviceIsUSB(dev)) { --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 17:22:13 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 151990951082449.4614402883858; Thu, 1 Mar 2018 05:05:10 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 16CAC9FFF4; Thu, 1 Mar 2018 13:05:09 +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 DCB285F716; Thu, 1 Mar 2018 13:05:08 +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 8E938184B46B; Thu, 1 Mar 2018 13:05:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w21D57Zx018425 for ; Thu, 1 Mar 2018 08:05:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 757DE60CAD; Thu, 1 Mar 2018 13:05:07 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-117-231.phx2.redhat.com [10.3.117.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1AF460F9C for ; Thu, 1 Mar 2018 13:04:47 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Thu, 1 Mar 2018 08:03:39 -0500 Message-Id: <20180301130339.7158-3-jferlan@redhat.com> In-Reply-To: <20180301130339.7158-1-jferlan@redhat.com> References: <20180301130339.7158-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: Call virDomainDefCompatibleDevice when live add cdrom/floppy 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 01 Mar 2018 13:05:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Prior to calling qemuDomainChangeEjectableMedia when adding the cdrom/floppy to the guest, make a second pass at the virDomainDefCompatibleDevice with the old_disk that's being updated by the call. This is similar to the qemuDomainChangeDiskLive path from qemuDomainUpdateDeviceLive prior to making the same call to qemuDomainChangeEjectableMedia when the cdrom/floppy is updated rather than added. Signed-off-by: John Ferlan --- src/qemu/qemu_hotplug.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e0a5300f0..4fbc0f48c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -697,6 +697,7 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr driver, size_t i; virDomainDiskDefPtr disk =3D dev->data.disk; virDomainDiskDefPtr orig_disk =3D NULL; + virDomainDeviceDef orig_dev =3D { .type =3D dev->type }; int ret =3D -1; =20 if (STRNEQ_NULLABLE(virDomainDiskGetDriver(disk), "qemu")) { @@ -732,6 +733,13 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr driver, goto cleanup; } =20 + /* Although called in qemuDomainAttachDeviceLiveAndConfig, now we + * know the orig_disk/dev so let's make the additional check for + * boot order checking */ + orig_dev.data.disk =3D orig_disk; + if (virDomainDefCompatibleDevice(vm->def, dev, &orig_dev) < 0) + goto cleanup; + if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, disk->src, false) < 0) goto cleanup; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list