]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "domain_conf: check device address before attach"
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 11 Apr 2019 13:40:51 +0000 (15:40 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 18 Apr 2019 15:09:40 +0000 (17:09 +0200)
This reverts commit f1d6585300001c7b23b8796a0faa4411c3531996.

Turns out, this caused a regression. There is this (perhaps less
known) semantic of virDomainAttachDevice() where if the device
the API is trying to attach is a CDROM/floppy that is already in
the domain the attach request is handled as 'change the media in
the drive'.

We have a better fix anyways.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
src/conf/domain_conf.c

index 3f2adaa500ba231e6b9cda03aefecc4cc28120d6..63314246354771ace83e0446d1664de46502fa27 100644 (file)
@@ -28814,15 +28814,6 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
     if (oldDev)
         data.oldInfo = virDomainDeviceGetInfo(oldDev);
 
-    if (action == VIR_DOMAIN_DEVICE_ACTION_ATTACH &&
-        data.newInfo &&
-        data.newInfo->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
-        virDomainDefHasDeviceAddress(def, data.newInfo)) {
-        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                       _("Domain already contains a device with the same address"));
-        return -1;
-    }
-
     if (action == VIR_DOMAIN_DEVICE_ACTION_UPDATE &&
         live &&
         (data.newInfo && data.oldInfo &&