qemuDomainAttachHostDevice: Prepare device early and for all types

When attaching a hostdev of a SCSI subsys,
qemuDomainPrepareHostdev() is called. This makes sense because
the function prepares just SCSI hostdevs ignoring others. But
this will soon change. Thefore, move the function call out of
qemuDomainAttachHostSCSIDevice() and into
qemuDomainAttachHostDevice().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2023-04-14 12:43:47 +02:00
parent a0cf5d6e4d
commit 3f7039f9e8

View File

@ -2503,9 +2503,6 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver,
qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1);
if (qemuDomainPrepareHostdev(hostdev, priv) < 0)
goto cleanup;
if (qemuProcessPrepareHostHostdev(hostdev) < 0)
goto cleanup;
@ -2787,6 +2784,9 @@ qemuDomainAttachHostDevice(virQEMUDriver *driver,
return -1;
}
if (qemuDomainPrepareHostdev(hostdev, vm->privateData) < 0)
return -1;
switch (hostdev->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
if (qemuDomainAttachHostPCIDevice(driver, vm,