External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Remove unused arguments of qemuMonitorBlockStream

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:39:43 +02:00
parent cd3aa2058d
commit d926d7b4c9
6 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_driver.c
View File

@ -14493,8 +14493,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
ret = qemuMonitorBlockStream(priv->mon, ret = qemuMonitorBlockStream(priv->mon,
disk->src->nodeformat, disk->src->nodeformat,
job->name, job->name,
true,
NULL,
nodebase, nodebase,
backingPath, backingPath,
speed); speed);

15
src/qemu/qemu_monitor.c
View File

@ -2966,26 +2966,17 @@ int
qemuMonitorBlockStream(qemuMonitor *mon, qemuMonitorBlockStream(qemuMonitor *mon,
const char *device, const char *device,
const char *jobname, const char *jobname,
bool persistjob,
const char *base,
const char *baseNode, const char *baseNode,
const char *backingName, const char *backingName,
unsigned long long bandwidth) unsigned long long bandwidth)
{ {
VIR_DEBUG("device=%s, jobname=%s, persistjob=%d, base=%s, baseNode=%s, " VIR_DEBUG("device=%s, jobname=%s, baseNode=%s, backingName=%s, bandwidth=%lluB",
"backingName=%s, bandwidth=%lluB", device, NULLSTR(jobname),
device, NULLSTR(jobname), persistjob, NULLSTR(base),
NULLSTR(baseNode), NULLSTR(backingName), bandwidth); NULLSTR(baseNode), NULLSTR(backingName), bandwidth);
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
if (base && baseNode) { return qemuMonitorJSONBlockStream(mon, device, jobname,
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("'base' and 'baseNode' can't be used together"));
return -1;
}
return qemuMonitorJSONBlockStream(mon, device, jobname, persistjob, base,
baseNode, backingName, bandwidth); baseNode, backingName, bandwidth);
} }

2
src/qemu/qemu_monitor.h
View File

@ -1025,8 +1025,6 @@ int qemuMonitorSendKey(qemuMonitor *mon,
int qemuMonitorBlockStream(qemuMonitor *mon, int qemuMonitorBlockStream(qemuMonitor *mon,
const char *device, const char *device,
const char *jobname, const char *jobname,
bool persistjob,
const char *base,
const char *baseNode, const char *baseNode,
const char *backingName, const char *backingName,
unsigned long long bandwidth) unsigned long long bandwidth)

12
src/qemu/qemu_monitor_json.c
View File

@ -4503,27 +4503,19 @@ int
qemuMonitorJSONBlockStream(qemuMonitor *mon, qemuMonitorJSONBlockStream(qemuMonitor *mon,
const char *device, const char *device,
const char *jobname, const char *jobname,
bool persistjob,
const char *base,
const char *baseNode, const char *baseNode,
const char *backingName, const char *backingName,
unsigned long long speed) unsigned long long speed)
{ {
g_autoptr(virJSONValue) cmd = NULL; g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL; g_autoptr(virJSONValue) reply = NULL;
virTristateBool autofinalize = VIR_TRISTATE_BOOL_ABSENT; virTristateBool autofinalize = VIR_TRISTATE_BOOL_YES;
virTristateBool autodismiss = VIR_TRISTATE_BOOL_ABSENT; virTristateBool autodismiss = VIR_TRISTATE_BOOL_NO;
if (persistjob) {
autofinalize = VIR_TRISTATE_BOOL_YES;
autodismiss = VIR_TRISTATE_BOOL_NO;
}
if (!(cmd = qemuMonitorJSONMakeCommand("block-stream", if (!(cmd = qemuMonitorJSONMakeCommand("block-stream",
"s:device", device, "s:device", device,
"S:job-id", jobname, "S:job-id", jobname,
"Y:speed", speed, "Y:speed", speed,
"S:base", base,
"S:base-node", baseNode, "S:base-node", baseNode,
"S:backing-file", backingName, "S:backing-file", backingName,
"T:auto-finalize", autofinalize, "T:auto-finalize", autofinalize,

2
src/qemu/qemu_monitor_json.h
View File

@ -366,8 +366,6 @@ int
qemuMonitorJSONBlockStream(qemuMonitor *mon, qemuMonitorJSONBlockStream(qemuMonitor *mon,
const char *device, const char *device,
const char *jobname, const char *jobname,
bool persistjob,
const char *base,
const char *baseNode, const char *baseNode,
const char *backingName, const char *backingName,
unsigned long long speed) unsigned long long speed)

2
tests/qemumonitorjsontest.c
View File

@ -1214,7 +1214,7 @@ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0") GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0") GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true) GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/bar1", "backingnode", "backingfilename", 1024) GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", "backingnode", "backingfilename", 1024)
GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024) GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024)
GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb") GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar") GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar")