From nobody Sat May 4 18:37:57 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 1535356220538706.6878131137851; Mon, 27 Aug 2018 00:50:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3657E30842D1; Mon, 27 Aug 2018 07:50:17 +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 3855730912F4; Mon, 27 Aug 2018 07:50:15 +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 3F7B34BB75; Mon, 27 Aug 2018 07:50:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7R7oBBb030561 for ; Mon, 27 Aug 2018 03:50:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 473552166BA1; Mon, 27 Aug 2018 07:50:11 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id D807B2166B41 for ; Mon, 27 Aug 2018 07:50:08 +0000 (UTC) From: Katerina Koukiou To: libvirt-list@redhat.com Date: Mon, 27 Aug 2018 09:50:07 +0200 Message-Id: <20180827075007.22614-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v4] qemu: qemuDomainChangeNet: validity checks should be done before XML autocompletion 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.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 27 Aug 2018 07:50:18 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch ensures that changes in attributes of interfaces will emit errors accept if they are missing from the XML. Previously we were falsely reporting successful updates, because some changed attributes got overwritten before the validity checks. https://bugzilla.redhat.com/show_bug.cgi?id=3D1599513 Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- Changes from v3: Adjusted to Jano's comments in v3; type and address are now checked togethe= r. src/qemu/qemu_hotplug.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b84a503bb..4f290b5648 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3598,16 +3598,19 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } =20 - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: Nothing is allowed to change. First fill the missing newdev->= info + * from olddev and then check for changes. */ - if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)= && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; + /* if pci addr is missing or is invalid we overwrite it from olddev */ + if (newdev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + !virDomainDeviceAddressIsValid(&newdev->info, + newdev->info.type)) { + newdev->info.type =3D olddev->info.type; + newdev->info.addr =3D olddev->info.addr; + } + if (olddev->info.type !=3D newdev->info.type) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device address type")); } if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, &newdev->info.addr.pci)) { @@ -3622,21 +3625,33 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, =20 /* device alias is checked already in virDomainDefCompatibleDevice */ =20 + if (newdev->info.rombar =3D=3D VIR_TRISTATE_BOOL_ABSENT) + newdev->info.rombar =3D olddev->info.rombar; if (olddev->info.rombar !=3D newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom bar setting")); goto cleanup; } + + if (!newdev->info.romfile && + VIR_STRDUP(newdev->info.romfile, olddev->info.romfile) < 0) + goto cleanup; if (STRNEQ_NULLABLE(olddev->info.romfile, newdev->info.romfile)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network rom file")); goto cleanup; } + + if (newdev->info.bootIndex =3D=3D 0) + newdev->info.bootIndex =3D olddev->info.bootIndex; if (olddev->info.bootIndex !=3D newdev->info.bootIndex) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device boot index setting"= )); goto cleanup; } + + if (newdev->info.romenabled =3D=3D VIR_TRISTATE_BOOL_ABSENT) + newdev->info.romenabled =3D olddev->info.romenabled; if (olddev->info.romenabled !=3D newdev->info.romenabled) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom enabled setting= ")); --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list