External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 11:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainValidateStorageSource: Allow masking out blockdev support

Browse Source 
In case of 'sd' cards we'll use pre-blockdev code also if qemu supports
blockdev. In that specific case we'll need to mask out blockdev support
for 'sd' disks. Plumb in a boolean to allow it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-05 17:00:41 +02:00
parent 6cd8234f08
commit 961ba2b969
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_domain.c
View File

@ -5137,11 +5137,15 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net,
int int
qemuDomainValidateStorageSource(virStorageSourcePtr src, qemuDomainValidateStorageSource(virStorageSourcePtr src,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps,
bool maskBlockdev)
{ {
int actualType = virStorageSourceGetActualType(src); int actualType = virStorageSourceGetActualType(src);
bool blockdev = virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV); bool blockdev = virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV);
if (maskBlockdev)
blockdev = false;
if (src->format == VIR_STORAGE_FILE_COW) { if (src->format == VIR_STORAGE_FILE_COW) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("'cow' storage format is not supported")); _("'cow' storage format is not supported"));
@ -8290,7 +8294,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
if (n->format == VIR_STORAGE_FILE_ISO) if (n->format == VIR_STORAGE_FILE_ISO)
n->format = VIR_STORAGE_FILE_RAW; n->format = VIR_STORAGE_FILE_RAW;
if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0) if (qemuDomainValidateStorageSource(n, priv->qemuCaps, false) < 0)
return -1; return -1;
qemuDomainPrepareStorageSourceConfig(n, cfg, priv->qemuCaps); qemuDomainPrepareStorageSourceConfig(n, cfg, priv->qemuCaps);
@ -13133,7 +13137,7 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDefPtr disk,
qemuDomainObjPrivatePtr priv, qemuDomainObjPrivatePtr priv,
virQEMUDriverConfigPtr cfg) virQEMUDriverConfigPtr cfg)
{ {
if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps) < 0) if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) < 0)
return -1; return -1;
qemuDomainPrepareStorageSourceConfig(disk->src, cfg, priv->qemuCaps); qemuDomainPrepareStorageSourceConfig(disk->src, cfg, priv->qemuCaps);
@ -13169,7 +13173,7 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDefPtr disk,
if (qemuBlockStorageSourceNeedsStorageSliceLayer(src)) if (qemuBlockStorageSourceNeedsStorageSliceLayer(src))
src->sliceStorage->nodename = g_strdup_printf("libvirt-%u-slice-sto", src->id); src->sliceStorage->nodename = g_strdup_printf("libvirt-%u-slice-sto", src->id);
if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0)
return -1; return -1;
qemuDomainPrepareStorageSourceConfig(src, cfg, priv->qemuCaps); qemuDomainPrepareStorageSourceConfig(src, cfg, priv->qemuCaps);

3
src/qemu/qemu_domain.h
View File

@ -1237,7 +1237,8 @@ qemuDomainPrepareDiskSourceData(virDomainDiskDefPtr disk,
int int
qemuDomainValidateStorageSource(virStorageSourcePtr src, qemuDomainValidateStorageSource(virStorageSourcePtr src,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps,
bool maskBlockdev);
int int

2
src/qemu/qemu_validate.c
View File

@ -2297,7 +2297,7 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskDef *disk,
} }
for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
if (qemuDomainValidateStorageSource(n, qemuCaps) < 0) if (qemuDomainValidateStorageSource(n, qemuCaps, false) < 0)
return -1; return -1;
} }

4
tests/qemublocktest.c
View File

@ -294,7 +294,7 @@ testQemuDiskXMLToProps(const void *opaque)
if (testQemuDiskXMLToJSONFakeSecrets(n) < 0) if (testQemuDiskXMLToJSONFakeSecrets(n) < 0)
return -1; return -1;
if (qemuDomainValidateStorageSource(n, data->qemuCaps) < 0) if (qemuDomainValidateStorageSource(n, data->qemuCaps, false) < 0)
return -1; return -1;
qemuDomainPrepareDiskSourceData(disk, n); qemuDomainPrepareDiskSourceData(disk, n);
@ -529,7 +529,7 @@ testQemuImageCreate(const void *opaque)
src->capacity = UINT_MAX * 2ULL; src->capacity = UINT_MAX * 2ULL;
src->physical = UINT_MAX + 1ULL; src->physical = UINT_MAX + 1ULL;
if (qemuDomainValidateStorageSource(src, data->qemuCaps) < 0) if (qemuDomainValidateStorageSource(src, data->qemuCaps, false) < 0)
return -1; return -1;
if (qemuBlockStorageSourceCreateGetStorageProps(src, &protocolprops) < 0) if (qemuBlockStorageSourceCreateGetStorageProps(src, &protocolprops) < 0)