External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 16:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: blockjob: Split out vshBlockJobSetSpeed from blockJobImpl

Browse Source
This commit is contained in:
Peter Krempa 2015-04-01 16:45:19 +02:00
parent 2f12cb9355
commit 42c9c6fcfc
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/virsh-domain.c
View File

@ -1666,7 +1666,6 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
typedef enum { typedef enum {
VSH_CMD_BLOCK_JOB_ABORT, VSH_CMD_BLOCK_JOB_ABORT,
VSH_CMD_BLOCK_JOB_SPEED,
VSH_CMD_BLOCK_JOB_PULL, VSH_CMD_BLOCK_JOB_PULL,
VSH_CMD_BLOCK_JOB_COMMIT, VSH_CMD_BLOCK_JOB_COMMIT,
} vshCmdBlockJobMode; } vshCmdBlockJobMode;
@ -1701,10 +1700,6 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd,
if (virDomainBlockJobAbort(dom, path, flags) < 0) if (virDomainBlockJobAbort(dom, path, flags) < 0)
goto cleanup; goto cleanup;
break; break;
case VSH_CMD_BLOCK_JOB_SPEED:
if (virDomainBlockJobSetSpeed(dom, path, bandwidth, 0) < 0)
goto cleanup;
break;
case VSH_CMD_BLOCK_JOB_PULL: case VSH_CMD_BLOCK_JOB_PULL:
if (vshCommandOptStringReq(ctl, cmd, "base", &base) < 0) if (vshCommandOptStringReq(ctl, cmd, "base", &base) < 0)
goto cleanup; goto cleanup;
@ -2536,6 +2531,24 @@ vshBlockJobInfo(vshControl *ctl,
} }
static bool
vshBlockJobSetSpeed(vshControl *ctl,
const vshCmd *cmd,
virDomainPtr dom,
const char *path)
{
unsigned long bandwidth;
if (vshCommandOptULWrap(ctl, cmd, "bandwidth", &bandwidth) < 0)
return false;
if (virDomainBlockJobSetSpeed(dom, path, bandwidth, 0) < 0)
return false;
return true;
}
static bool static bool
cmdBlockJob(vshControl *ctl, const vshCmd *cmd) cmdBlockJob(vshControl *ctl, const vshCmd *cmd)
{ {
@ -2568,10 +2581,7 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd)
if (abortMode || pivot || async) if (abortMode || pivot || async)
return blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_ABORT, NULL); return blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_ABORT, NULL);
if (bandwidth)
return blockJobImpl(ctl, cmd, VSH_CMD_BLOCK_JOB_SPEED, NULL);
/* Everything below here is for --info mode */
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
goto cleanup; goto cleanup;
@ -2579,7 +2589,10 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0)
goto cleanup; goto cleanup;
ret = vshBlockJobInfo(ctl, dom, path, raw, bytes); if (bandwidth)
ret = vshBlockJobSetSpeed(ctl, cmd, dom, path);
else
ret = vshBlockJobInfo(ctl, dom, path, raw, bytes);
cleanup: cleanup:
if (dom) if (dom)