[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [RESEND] qemu_monitor_json: Drop timestamp from command object



On Fri, Apr 23, 2010 at 12:18:11PM -0300, Luiz Capitulino wrote:
> 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.
> 
> Signed-off-by: Luiz Capitulino <lcapitulino redhat com>
> ---
>  src/qemu/qemu_monitor_json.c |   34 ----------------------------------
>  1 files changed, 0 insertions(+), 34 deletions(-)
> 
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 96f246f..7c8387d 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -356,37 +356,6 @@ qemuMonitorJSONHasError(virJSONValuePtr reply,
>      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
>  qemuMonitorJSONMakeCommand(const char *cmdname,
>                             ...)
> @@ -404,9 +373,6 @@ qemuMonitorJSONMakeCommand(const char *cmdname,
>      if (virJSONValueObjectAppendString(obj, "execute", cmdname) < 0)
>          goto no_memory;
>  
> -    if (qemuMonitorJSONCommandAddTimestamp(obj) < 0)
> -        goto error;
> -
>      while ((key = va_arg(args, char *)) != NULL) {
>          int ret;
>          char type;

ACK


Daniel
-- 
|: Red Hat, Engineering, London    -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :|
|: http://autobuild.org        -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]