mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
qemucapsprobe: Ignore all greetings except the first one
When starting QEMU more than once during a single probing process, qemucapsprobe utility would save QMP greeting several times, which doesn't play well with our test monitor. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
429a7b231c
commit
73078906f3
@ -77,10 +77,14 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
|
||||
char *p;
|
||||
bool skip = false;
|
||||
|
||||
if (first)
|
||||
if (first) {
|
||||
first = false;
|
||||
else
|
||||
} else {
|
||||
/* Ignore QMP greeting if it's not the first one */
|
||||
if (virJSONValueObjectHasKey(value, "QMP"))
|
||||
goto cleanup;
|
||||
putchar('\n');
|
||||
}
|
||||
|
||||
for (p = json; *p; p++) {
|
||||
if (skip && *p == '\n') {
|
||||
@ -92,6 +96,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
|
||||
}
|
||||
}
|
||||
|
||||
cleanup:
|
||||
VIR_FREE(json);
|
||||
virJSONValueFree(value);
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user