mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 17:24:53 +00:00
qemuMonitorTestProcessCommandDefaultValidate: Use testQEMUSchemaValidateCommand
Remove the ad-hoc command validation in favor of the new helper. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
23bd18dc75
commit
7f350f5260
@ -537,9 +537,6 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test,
|
|||||||
virJSONValuePtr args)
|
virJSONValuePtr args)
|
||||||
{
|
{
|
||||||
g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
|
g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
|
||||||
virJSONValuePtr schemaroot;
|
|
||||||
g_autoptr(virJSONValue) emptyargs = NULL;
|
|
||||||
g_autofree char *schemapath = NULL;
|
|
||||||
|
|
||||||
if (!test->qapischema)
|
if (!test->qapischema)
|
||||||
return 0;
|
return 0;
|
||||||
@ -555,20 +552,13 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test,
|
|||||||
if (STREQ(cmdname, "device_add"))
|
if (STREQ(cmdname, "device_add"))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
schemapath = g_strdup_printf("%s/arg-type", cmdname);
|
if (testQEMUSchemaValidateCommand(cmdname, args, test->qapischema, &debug) < 0) {
|
||||||
|
|
||||||
if (virQEMUQAPISchemaPathGet(schemapath, test->qapischema, &schemaroot) < 0 ||
|
|
||||||
!schemaroot) {
|
|
||||||
qemuMonitorTestError("command '%s' not found in QAPI schema", cmdname);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!args)
|
|
||||||
args = emptyargs = virJSONValueNewObject();
|
|
||||||
|
|
||||||
if (testQEMUSchemaValidate(args, schemaroot, test->qapischema, &debug) < 0) {
|
|
||||||
if (virTestGetDebug() == 2) {
|
if (virTestGetDebug() == 2) {
|
||||||
g_autofree char *argstr = virJSONValueToString(args, true);
|
g_autofree char *argstr = NULL;
|
||||||
|
|
||||||
|
if (args)
|
||||||
|
argstr = virJSONValueToString(args, true);
|
||||||
|
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"\nfailed to validate arguments of '%s' against QAPI schema\n"
|
"\nfailed to validate arguments of '%s' against QAPI schema\n"
|
||||||
"args:\n%s\nvalidator output:\n %s\n",
|
"args:\n%s\nvalidator output:\n %s\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user