External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 07:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

QEmu JSON drop timestamp from command object

Browse Source 
It's not needed and is currently ignored, but this is a bug.

It will get fixed soon and QMP will return an error for keys
it doesn't know about, this will break libvirt.

* src/qemu/qemu_monitor_json.c: remove qemuMonitorJSONCommandAddTimestamp()
  and the place where it's invoked in qemuMonitorJSONMakeCommand()
This commit is contained in:
Luiz Capitulino 2010-04-23 18:06:18 +02:00 committed by Daniel Veillard
parent 9db01465e5
commit eb9b653243
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/qemu/qemu_monitor_json.c
View File

@ -356,37 +356,6 @@ qemuMonitorJSONHasError(virJSONValuePtr reply,
return STREQ(klass, thisklass); return STREQ(klass, thisklass);
} }
static int
qemuMonitorJSONCommandAddTimestamp(virJSONValuePtr obj)
{
struct timeval tv;
virJSONValuePtr timestamp = NULL;
if (gettimeofday(&tv, NULL) < 0) {
virReportSystemError(errno, "%s",
_("cannot query time of day"));
return -1;
}
if (!(timestamp = virJSONValueNewObject()))
goto no_memory;
if (virJSONValueObjectAppendNumberLong(timestamp, "seconds", tv.tv_sec) < 0)
goto no_memory;
if (virJSONValueObjectAppendNumberLong(timestamp, "microseconds", tv.tv_usec) < 0)
goto no_memory;
if (virJSONValueObjectAppend(obj, "timestamp", timestamp) < 0)
goto no_memory;
return 0;
no_memory:
virReportOOMError();
virJSONValueFree(timestamp);
return -1;
}
static virJSONValuePtr ATTRIBUTE_SENTINEL static virJSONValuePtr ATTRIBUTE_SENTINEL
qemuMonitorJSONMakeCommand(const char *cmdname, qemuMonitorJSONMakeCommand(const char *cmdname,
...) ...)
@ -404,9 +373,6 @@ qemuMonitorJSONMakeCommand(const char *cmdname,
if (virJSONValueObjectAppendString(obj, "execute", cmdname) < 0) if (virJSONValueObjectAppendString(obj, "execute", cmdname) < 0)
goto no_memory; goto no_memory;
if (qemuMonitorJSONCommandAddTimestamp(obj) < 0)
goto error;
while ((key = va_arg(args, char *)) != NULL) { while ((key = va_arg(args, char *)) != NULL) {
int ret; int ret;
char type; char type;