]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuDomainChangeNet: Error when boot index changes in live XML
authorAdam Julis <ajulis@redhat.com>
Fri, 22 Mar 2024 08:12:26 +0000 (09:12 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 22 Mar 2024 09:49:40 +0000 (10:49 +0100)
If the original code detected a missing or null boot index in the
new XML, it automatically added the current value. This
autocompletion was incorrect because it was impossible to
distinguish between user intent and user error - changing the
boot order itself is forbidden and should always be an error.

Resolves: https://issues.redhat.com/browse/RHEL-23416
Fixes: aa3e07caec6179dfa6479deab14a21a493637d53
Signed-off-by: Adam Julis <ajulis@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_hotplug.c

index b9c502613c236e8cdad7d80c6989df18025090ce..62dc879ed483c9f6bea95a5850e2d7062ac6ee02 100644 (file)
@@ -3847,8 +3847,6 @@ qemuDomainChangeNet(virQEMUDriver *driver,
         goto cleanup;
     }
 
-    if (newdev->info.bootIndex == 0)
-        newdev->info.bootIndex = olddev->info.bootIndex;
     if (olddev->info.bootIndex != newdev->info.bootIndex) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("cannot modify network device boot index setting"));