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: Drop JSON versions of savevm/delvm/loadvm

Browse Source 
qemu did not QAPIfy these and the design and name will most probably
change. The replacements will not be compatible. Drop the JSON stubs and
annotate that there won't be a replacement.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-22 13:46:05 +02:00
parent 10bc01056b
commit 788d6376da
3 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_monitor.c
View File

@ -3218,10 +3218,8 @@ qemuMonitorCreateSnapshot(qemuMonitorPtr mon, const char *name)
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
if (mon->json) /* there won't ever be a direct QMP replacement for this function */
return qemuMonitorJSONCreateSnapshot(mon, name); return qemuMonitorTextCreateSnapshot(mon, name);
else
return qemuMonitorTextCreateSnapshot(mon, name);
} }
int int
@ -3231,10 +3229,8 @@ qemuMonitorLoadSnapshot(qemuMonitorPtr mon, const char *name)
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
if (mon->json) /* there won't ever be a direct QMP replacement for this function */
return qemuMonitorJSONLoadSnapshot(mon, name); return qemuMonitorTextLoadSnapshot(mon, name);
else
return qemuMonitorTextLoadSnapshot(mon, name);
} }
@ -3245,10 +3241,8 @@ qemuMonitorDeleteSnapshot(qemuMonitorPtr mon, const char *name)
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
if (mon->json) /* there won't ever be a direct QMP replacement for this function */
return qemuMonitorJSONDeleteSnapshot(mon, name); return qemuMonitorTextDeleteSnapshot(mon, name);
else
return qemuMonitorTextDeleteSnapshot(mon, name);
} }

21
src/qemu/qemu_monitor_json.c
View File

@ -4090,27 +4090,6 @@ int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon,
return ret; return ret;
} }
int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name)
{
/* XXX Update to use QMP, if QMP ever adds support for savevm */
VIR_DEBUG("savevm command not found, trying HMP");
return qemuMonitorTextCreateSnapshot(mon, name);
}
int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name)
{
/* XXX Update to use QMP, if QMP ever adds support for loadvm */
VIR_DEBUG("loadvm command not found, trying HMP");
return qemuMonitorTextLoadSnapshot(mon, name);
}
int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name)
{
/* XXX Update to use QMP, if QMP ever adds support for delvm */
VIR_DEBUG("delvm command not found, trying HMP");
return qemuMonitorTextDeleteSnapshot(mon, name);
}
int int
qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions,
const char *device, const char *file, const char *device, const char *file,

4
src/qemu/qemu_monitor_json.h
View File

@ -241,10 +241,6 @@ int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon,
const char *alias, const char *alias,
const char *passphrase); const char *passphrase);
int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name);
int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name);
int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name);
int qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, int qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon,
virJSONValuePtr actions, virJSONValuePtr actions,
const char *device, const char *device,