mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 03:12:22 +00:00
qemu: hostdev: Prepare definition bits in qemuDomainPrepareHostdev
qemuBuildHostdevSCSIAttachPrepare is supposed to prepare the data structure used for attaching the hostdev not preparing the hostdev definition itself. Move the corresponding bits to qemuDomainPrepareHostdev Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
9ff3ad9058
commit
609497876c
@ -4992,7 +4992,6 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDefPtr hostdev,
|
||||
|
||||
src = scsisrc->u.host.src;
|
||||
|
||||
src->type = VIR_STORAGE_TYPE_BLOCK;
|
||||
src->path = g_strdup_printf("/dev/%s", devstr);
|
||||
|
||||
break;
|
||||
@ -5007,7 +5006,6 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDefPtr hostdev,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
src->readonly = hostdev->readonly;
|
||||
ret->storageNodeName = src->nodestorage;
|
||||
*backendAlias = src->nodestorage;
|
||||
|
||||
|
@ -10408,6 +10408,9 @@ qemuDomainPrepareHostdev(virDomainHostdevDefPtr hostdev,
|
||||
virObjectUnref(scsisrc->u.host.src);
|
||||
scsisrc->u.host.src = virStorageSourceNew();
|
||||
src = scsisrc->u.host.src;
|
||||
|
||||
src->type = VIR_STORAGE_TYPE_BLOCK;
|
||||
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI:
|
||||
@ -10423,6 +10426,8 @@ qemuDomainPrepareHostdev(virDomainHostdevDefPtr hostdev,
|
||||
if (src) {
|
||||
const char *backendalias = hostdev->info->alias;
|
||||
|
||||
src->readonly = hostdev->readonly;
|
||||
|
||||
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) {
|
||||
src->id = qemuDomainStorageIdNew(priv);
|
||||
src->nodestorage = g_strdup_printf("libvirt-%d-backend", src->id);
|
||||
|
Loading…
x
Reference in New Issue
Block a user