From nobody Wed May 1 11:52:15 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522006154892107.53300029891204; Sun, 25 Mar 2018 12:29:14 -0700 (PDT) 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 29CDA356C2; Sun, 25 Mar 2018 19:29:13 +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 0C3C05C578; Sun, 25 Mar 2018 19:29:12 +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 D0DC5181B9FB; Sun, 25 Mar 2018 19:29:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2PJT72m026786 for ; Sun, 25 Mar 2018 15:29:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 770DC7C53; Sun, 25 Mar 2018 19:29:07 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-77.brq.redhat.com [10.40.204.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id D39F17C5A for ; Sun, 25 Mar 2018 19:29:06 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Sun, 25 Mar 2018 21:28:59 +0200 Message-Id: <49f05747b20cb44eaa3f443acc85a71eaea34650.1522005826.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] virDomainDeviceAliasIsUserAlias: tolerate NULL 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-Type: text/plain; charset="utf-8" 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.30]); Sun, 25 Mar 2018 19:29:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Do not crash in virDomainDeviceInfoParseXML if someone provides an 'alias' element without a 'name' attribute. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 43725155c..d289ca2d0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6702,7 +6702,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, bool virDomainDeviceAliasIsUserAlias(const char *aliasStr) { - return STRPREFIX(aliasStr, USER_ALIAS_PREFIX); + return aliasStr && STRPREFIX(aliasStr, USER_ALIAS_PREFIX); } =20 =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 1 11:52:15 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152200617624582.76300233937184; Sun, 25 Mar 2018 12:29:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F6F180B22; Sun, 25 Mar 2018 19:29:34 +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 7356617DC0; Sun, 25 Mar 2018 19:29:34 +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 3B55B4CA99; Sun, 25 Mar 2018 19:29:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2PJT8HM026796 for ; Sun, 25 Mar 2018 15:29:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7CFB47C53; Sun, 25 Mar 2018 19:29:08 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-77.brq.redhat.com [10.40.204.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id D972E7C5A for ; Sun, 25 Mar 2018 19:29:07 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Sun, 25 Mar 2018 21:29:00 +0200 Message-Id: <852874b912009d2bb6f4e0c579ab2ee414c7b1dd.1522005826.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: do not drop implicit controllers with non-implicit attributes 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-Type: text/plain; charset="utf-8" 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Sun, 25 Mar 2018 19:29:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 If someone set a user alias or pcihole64 on an implicit controller, we need to format it to migrate the domain properly. Signed-off-by: J=C3=A1n Tomko Reported-by: Joseph Richard --- src/qemu/qemu_domain.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4aaf617da..580e0f830 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6181,7 +6181,8 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, if (ARCH_IS_X86(def->os.arch) && qemuDomainIsI440FX(def) && usb && usb->idx =3D=3D 0 && (usb->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT || - usb->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI)= ) { + usb->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI)= && + !virDomainDeviceAliasIsUserAlias(usb->info.alias)) { VIR_DEBUG("Removing default USB controller from domain '%s'" " for migration compatibility", def->name); toremove++; @@ -6202,7 +6203,9 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, } =20 if (pci && pci->idx =3D=3D 0 && - pci->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { + pci->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && + !virDomainDeviceAliasIsUserAlias(pci->info.alias) && + !pci->opts.pciopts.pcihole64) { VIR_DEBUG("Removing default pci-root from domain '%s'" " for migration compatibility", def->name); toremove++; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list