NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Add 'force' argument for 'block-job-cancel' QMP command

Browse Source 
In certain cases such as when aborting migration we don't really care
for completion of the blockjob. Add 'force' as parameter of
'block-job-cancel'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-20 14:14:51 +02:00
parent 2587f825de
commit 2716d53ee6
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_driver.c
View File

@ -14510,7 +14510,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
if (blockdev) if (blockdev)
ret = qemuMonitorJobCancel(priv->mon, job->name, false); ret = qemuMonitorJobCancel(priv->mon, job->name, false);
else else
ret = qemuMonitorBlockJobCancel(priv->mon, job->name); ret = qemuMonitorBlockJobCancel(priv->mon, job->name, false);
if (qemuDomainObjExitMonitor(driver, vm) < 0) { if (qemuDomainObjExitMonitor(driver, vm) < 0) {
ret = -1; ret = -1;
goto endjob; goto endjob;

2
src/qemu/qemu_migration.c
View File

@ -748,7 +748,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriver *driver,
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
return -1; return -1;
rv = qemuMonitorBlockJobCancel(priv->mon, job->name); rv = qemuMonitorBlockJobCancel(priv->mon, job->name, false);
if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0)
return -1; return -1;

7
src/qemu/qemu_monitor.c
View File

@ -3403,13 +3403,14 @@ qemuMonitorBlockStream(qemuMonitor *mon,
int int
qemuMonitorBlockJobCancel(qemuMonitor *mon, qemuMonitorBlockJobCancel(qemuMonitor *mon,
const char *jobname) const char *jobname,
bool force)
{ {
VIR_DEBUG("jobname=%s", jobname); VIR_DEBUG("jobname=%s force=%d", jobname, force);
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
return qemuMonitorJSONBlockJobCancel(mon, jobname); return qemuMonitorJSONBlockJobCancel(mon, jobname, force);
} }

3
src/qemu/qemu_monitor.h
View File

@ -1081,7 +1081,8 @@ int qemuMonitorBlockStream(qemuMonitor *mon,
ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(2);
int qemuMonitorBlockJobCancel(qemuMonitor *mon, int qemuMonitorBlockJobCancel(qemuMonitor *mon,
const char *jobname) const char *jobname,
bool force)
ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(2);
int qemuMonitorBlockJobSetSpeed(qemuMonitor *mon, int qemuMonitorBlockJobSetSpeed(qemuMonitor *mon,

4
src/qemu/qemu_monitor_json.c
View File

@ -5217,13 +5217,15 @@ qemuMonitorJSONBlockStream(qemuMonitor *mon,
int int
qemuMonitorJSONBlockJobCancel(qemuMonitor *mon, qemuMonitorJSONBlockJobCancel(qemuMonitor *mon,
const char *jobname) const char *jobname,
bool force)
{ {
g_autoptr(virJSONValue) cmd = NULL; g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL; g_autoptr(virJSONValue) reply = NULL;
if (!(cmd = qemuMonitorJSONMakeCommand("block-job-cancel", if (!(cmd = qemuMonitorJSONMakeCommand("block-job-cancel",
"s:device", jobname, "s:device", jobname,
"B:force", force,
NULL))) NULL)))
return -1; return -1;

3
src/qemu/qemu_monitor_json.h
View File

@ -325,7 +325,8 @@ int qemuMonitorJSONBlockStream(qemuMonitor *mon,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuMonitorJSONBlockJobCancel(qemuMonitor *mon, int qemuMonitorJSONBlockJobCancel(qemuMonitor *mon,
const char *jobname) const char *jobname,
bool force)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int int

2
tests/qemumonitorjsontest.c
View File

@ -1218,7 +1218,7 @@ GEN_TEST_FUNC(qemuMonitorJSONBitmapRemove, "foodev", "newnode")
GEN_TEST_FUNC(qemuMonitorJSONJobDismiss, "jobname") GEN_TEST_FUNC(qemuMonitorJSONJobDismiss, "jobname")
GEN_TEST_FUNC(qemuMonitorJSONJobCancel, "jobname", false) GEN_TEST_FUNC(qemuMonitorJSONJobCancel, "jobname", false)
GEN_TEST_FUNC(qemuMonitorJSONJobComplete, "jobname") GEN_TEST_FUNC(qemuMonitorJSONJobComplete, "jobname")
GEN_TEST_FUNC(qemuMonitorJSONBlockJobCancel, "jobname") GEN_TEST_FUNC(qemuMonitorJSONBlockJobCancel, "jobname", true)
static int static int
testQemuMonitorJSONqemuMonitorJSONNBDServerStart(const void *opaque) testQemuMonitorJSONqemuMonitorJSONNBDServerStart(const void *opaque)