mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-12 12:55:46 +00:00
0ed2716531
The prettyfied output may sometimes contain empty lines which would desynchonize the test monitor workers. The skipping code can be much simplified though. Also a extract it so so that it's obvious what it's doing and can be reused. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
110 lines
2.8 KiB
C
110 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2016 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Jiri Denemark <jdenemar@redhat.com>
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <dlfcn.h>
|
|
|
|
#include "internal.h"
|
|
#include "viralloc.h"
|
|
#include "virjson.h"
|
|
#include "qemu/qemu_monitor.h"
|
|
#include "qemu/qemu_monitor_json.h"
|
|
|
|
#define REAL_SYM(realFunc) \
|
|
do { \
|
|
if (!realFunc && !(realFunc = dlsym(RTLD_NEXT, __FUNCTION__))) { \
|
|
fprintf(stderr, "Cannot find real '%s' symbol\n", \
|
|
__FUNCTION__); \
|
|
abort(); \
|
|
} \
|
|
} while (0)
|
|
|
|
|
|
static void
|
|
printLineSkipEmpty(const char *line,
|
|
FILE *fp)
|
|
{
|
|
const char *p;
|
|
|
|
for (p = line; *p; p++) {
|
|
if (p[0] == '\n' && p[1] == '\n')
|
|
continue;
|
|
|
|
fputc(*p, fp);
|
|
}
|
|
}
|
|
|
|
|
|
static int (*realQemuMonitorSend)(qemuMonitorPtr mon,
|
|
qemuMonitorMessagePtr msg);
|
|
|
|
int
|
|
qemuMonitorSend(qemuMonitorPtr mon,
|
|
qemuMonitorMessagePtr msg)
|
|
{
|
|
REAL_SYM(realQemuMonitorSend);
|
|
|
|
fprintf(stderr, "%s", msg->txBuffer);
|
|
|
|
return realQemuMonitorSend(mon, msg);
|
|
}
|
|
|
|
|
|
static int (*realQemuMonitorJSONIOProcessLine)(qemuMonitorPtr mon,
|
|
const char *line,
|
|
qemuMonitorMessagePtr msg);
|
|
|
|
int
|
|
qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
|
|
const char *line,
|
|
qemuMonitorMessagePtr msg)
|
|
{
|
|
static bool first = true;
|
|
virJSONValuePtr value = NULL;
|
|
char *json = NULL;
|
|
int ret;
|
|
|
|
REAL_SYM(realQemuMonitorJSONIOProcessLine);
|
|
|
|
ret = realQemuMonitorJSONIOProcessLine(mon, line, msg);
|
|
|
|
if (ret == 0 &&
|
|
(value = virJSONValueFromString(line)) &&
|
|
(json = virJSONValueToString(value, 1))) {
|
|
|
|
if (first) {
|
|
first = false;
|
|
} else {
|
|
/* Ignore QMP greeting if it's not the first one */
|
|
if (virJSONValueObjectHasKey(value, "QMP"))
|
|
goto cleanup;
|
|
putchar('\n');
|
|
}
|
|
|
|
printLineSkipEmpty(json, stdout);
|
|
}
|
|
|
|
cleanup:
|
|
VIR_FREE(json);
|
|
virJSONValueFree(value);
|
|
return ret;
|
|
}
|