External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-24 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Use the new chardev backend JSON props generator also in the monitor

Browse Source 
Now that we have a unified generator of chardev backend which is also
validated against the QMP schema we can replace the old generator with
it.

This patch modifies the monitor code to take virJSONValue 'props'
instead of the chardev definition and adds the conversion from the
chardev definition to JSON on higher levels.

The monitor code now also attempts to extract the returned 'pty' if
returned from qemu, so higher level code needs to report the error if
the path is needed and missing.

The current monitor generator is for now abandoned in place and will be
removed later.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-09-13 10:33:47 +02:00
parent d897ad2b89
commit e352a692a7
7 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_block.c
View File

@ -24,6 +24,7 @@
#include "qemu_alias.h"
#include "qemu_security.h"
#include "qemu_process.h"
#include "qemu_chardev.h"
#include "storage_source.h"
#include "viralloc.h"
@ -1682,7 +1683,13 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon,
return -1;
if (data->chardevDef) {
if (qemuMonitorAttachCharDev(mon, data->chardevAlias, data->chardevDef) < 0)
g_autoptr(virJSONValue) props = NULL;
if (qemuChardevGetBackendProps(data->chardevDef, false,
data->chardevAlias, NULL, &props) < 0)
return -1;
if (qemuMonitorAttachCharDev(mon, &props, NULL) < 0)
return -1;
data->chardevAdded = true;

22
src/qemu/qemu_hotplug.c
View File

@ -37,6 +37,7 @@
#include "qemu_block.h"
#include "qemu_snapshot.h"
#include "qemu_virtiofs.h"
#include "qemu_chardev.h"
#include "domain_audit.h"
#include "domain_cgroup.h"
#include "domain_interface.h"
@ -243,6 +244,9 @@ qemuHotplugChardevAttach(qemuMonitor *mon,
const char *alias,
virDomainChrSourceDef *def)
{
g_autoptr(virJSONValue) props = NULL;
g_autofree char *ptypath = NULL;
switch ((virDomainChrType) def->type) {
case VIR_DOMAIN_CHR_TYPE_NULL:
case VIR_DOMAIN_CHR_TYPE_VC:
@ -272,7 +276,23 @@ qemuHotplugChardevAttach(qemuMonitor *mon,
return -1;
}
return qemuMonitorAttachCharDev(mon, alias, def);
if (qemuChardevGetBackendProps(def, false, alias, NULL, &props) < 0)
return -1;
if (qemuMonitorAttachCharDev(mon, &props, &ptypath) < 0)
return -1;
if (def->type == VIR_DOMAIN_CHR_TYPE_PTY) {
if (!ptypath) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("chardev-add reply was missing pty path"));
return -1;
}
def->data.file.path = g_steal_pointer(&ptypath);
}
return 0;
}

8
src/qemu/qemu_monitor.c
View File

@ -3523,14 +3523,12 @@ qemuMonitorGetTPMTypes(qemuMonitor *mon,
int
qemuMonitorAttachCharDev(qemuMonitor *mon,
const char *chrID,
virDomainChrSourceDef *chr)
virJSONValue **props,
char **ptypath)
{
VIR_DEBUG("chrID=%s chr=%p", chrID, chr);
QEMU_CHECK_MONITOR(mon);
return qemuMonitorJSONAttachCharDev(mon, chrID, chr);
return qemuMonitorJSONAttachCharDev(mon, props, ptypath);
}

4
src/qemu/qemu_monitor.h
View File

@ -1212,8 +1212,8 @@ int qemuMonitorGetTPMTypes(qemuMonitor *mon,
char ***tpmtypes);
int qemuMonitorAttachCharDev(qemuMonitor *mon,
const char *chrID,
virDomainChrSourceDef *chr);
virJSONValue **props,
char **ptypath);
int qemuMonitorDetachCharDev(qemuMonitor *mon,
const char *chrID);

32
src/qemu/qemu_monitor_json.c
View File

@ -6342,7 +6342,7 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitor *mon,
}
static virJSONValue *
static G_GNUC_UNUSED virJSONValue *
qemuMonitorJSONAttachCharDevGetProps(const char *chrID,
const virDomainChrSourceDef *chr)
{
@ -6571,41 +6571,29 @@ qemuMonitorJSONAttachCharDevGetProps(const char *chrID,
int
qemuMonitorJSONAttachCharDev(qemuMonitor *mon,
const char *chrID,
virDomainChrSourceDef *chr)
virJSONValue **props,
char **ptypath)
{
g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL;
g_autoptr(virJSONValue) props = NULL;
virJSONValue *data;
if (!(props = qemuMonitorJSONAttachCharDevGetProps(chrID, chr)))
return -1;
if (!(cmd = qemuMonitorJSONMakeCommandInternal("chardev-add", &props)))
if (!(cmd = qemuMonitorJSONMakeCommandInternal("chardev-add", props)))
return -1;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
return -1;
if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) {
virJSONValue *data;
if (!(data = qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_OBJECT)))
return -1;
if (!(data = qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_OBJECT)))
return -1;
if (!(chr->data.file.path = g_strdup(virJSONValueObjectGetString(data, "pty")))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("chardev-add reply was missing pty path"));
return -1;
}
} else {
if (qemuMonitorJSONCheckError(cmd, reply) < 0)
return -1;
}
if (ptypath)
*ptypath = g_strdup(virJSONValueObjectGetString(data, "pty"));
return 0;
}
int
qemuMonitorJSONDetachCharDev(qemuMonitor *mon,
const char *chrID)

4
src/qemu/qemu_monitor_json.h
View File

@ -584,8 +584,8 @@ qemuMonitorJSONGetTPMTypes(qemuMonitor *mon,
int
qemuMonitorJSONAttachCharDev(qemuMonitor *mon,
const char *chrID,
virDomainChrSourceDef *chr);
virJSONValue **props,
char **ptypath);
int
qemuMonitorJSONDetachCharDev(qemuMonitor *mon,
const char *chrID);

17
tests/qemumonitorjsontest.c
View File

@ -28,6 +28,7 @@
#include "qemu/qemu_monitor_json.h"
#include "qemu/qemu_qapi.h"
#include "qemu/qemu_alias.h"
#include "qemu/qemu_chardev.h"
#include "virerror.h"
#include "cpu/cpu.h"
#include "qemu/qemu_monitor.h"
@ -553,6 +554,8 @@ testQemuMonitorJSONAttachChardev(const void *opaque)
{
const struct qemuMonitorJSONTestAttachChardevData *data = opaque;
g_autoptr(qemuMonitorTest) test = qemuMonitorTestNewSchema(data->xmlopt, data->schema);
g_autoptr(virJSONValue) props = NULL;
g_autofree char *ptypath = NULL;
int rc;
if (!test)
@ -575,20 +578,20 @@ testQemuMonitorJSONAttachChardev(const void *opaque)
return -1;
}
if ((rc = qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(test),
"alias", data->chr)) < 0)
if (qemuChardevGetBackendProps(data->chr, false, "alias", NULL, &props) < 0)
return -1;
if ((rc = qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(test), &props, &ptypath)) < 0)
goto cleanup;
if (data->chr->type == VIR_DOMAIN_CHR_TYPE_PTY) {
if (STRNEQ_NULLABLE(data->expectPty, data->chr->data.file.path)) {
if (STRNEQ_NULLABLE(data->expectPty, ptypath)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"expected PTY path: %s got: %s",
NULLSTR(data->expectPty),
NULLSTR(data->chr->data.file.path));
rc = -1;
}
VIR_FREE(data->chr->data.file.path);
}
cleanup:
@ -653,7 +656,9 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOption *xmlopt,
"'data':{'type':'vdagent'}}}");
chr->type = VIR_DOMAIN_CHR_TYPE_PTY;
CHECK("pty missing path", true,
/* Higher level code regards the missing path as error, but we simply
* check here what we've parsed */
CHECK("pty missing path", false,
"{'id':'alias','backend':{'type':'pty','data':{}}}");
if (qemuMonitorJSONTestAttachOneChardev(xmlopt, schema, "pty", chr,
"{'id':'alias',"