External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockPullCommon

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-20 12:23:38 +02:00
parent 01f8c55f22
commit cd3aa2058d
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/qemu/qemu_driver.c
View File

@ -14412,17 +14412,12 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
unsigned int flags)
{
qemuDomainObjPrivate *priv = vm->privateData;
const char *device = NULL;
const char *jobname = NULL;
virDomainDiskDef *disk;
virStorageSource *baseSource = NULL;
g_autofree char *basePath = NULL;
g_autofree char *backingPath = NULL;
unsigned long long speed = bandwidth;
qemuBlockJobData *job = NULL;
bool persistjob = false;
const char *nodebase = NULL;
bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
int ret = -1;
if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE && !base) {
@ -14457,8 +14452,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
if (baseSource) {
if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) {
if (blockdev &&
qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
if (qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
goto endjob;
if (virStorageSourceGetRelativeBackingPath(disk->src->backingStore,
@ -14488,29 +14482,22 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource, flags)))
goto endjob;
if (blockdev) {
jobname = job->name;
persistjob = true;
if (baseSource) {
nodebase = baseSource->nodeformat;
if (!backingPath &&
!(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
goto endjob;
}
device = disk->src->nodeformat;
} else {
device = job->name;
if (baseSource) {
nodebase = baseSource->nodeformat;
if (!backingPath &&
!(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
goto endjob;
}
qemuDomainObjEnterMonitor(vm);
if (!blockdev && baseSource)
basePath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src,
baseSource);
if (blockdev ||
(!baseSource || basePath))
ret = qemuMonitorBlockStream(priv->mon, device, jobname, persistjob, basePath,
nodebase, backingPath, speed);
ret = qemuMonitorBlockStream(priv->mon,
disk->src->nodeformat,
job->name,
true,
NULL,
nodebase,
backingPath,
speed);
qemuDomainObjExitMonitor(vm);
if (ret < 0)