2012-08-20 16:31:29 +04:00
/*
2014-04-05 03:36:25 +04:00
* Copyright ( C ) 2011 - 2014 Red Hat , Inc .
2012-08-20 16:31:29 +04:00
*
* 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
2012-09-21 02:30:55 +04:00
* License along with this library . If not , see
2012-08-20 16:31:29 +04:00
* < http : //www.gnu.org/licenses/>.
*
*/
# include <config.h>
# include "testutils.h"
# include "testutilsqemu.h"
2018-03-22 19:07:43 +03:00
# include "testutilsqemuschema.h"
2012-08-20 16:31:29 +04:00
# include "qemumonitortestutils.h"
2016-05-20 08:21:04 +03:00
# include "qemu/qemu_domain.h"
2017-03-13 14:47:46 +03:00
# include "qemu/qemu_block.h"
2013-06-24 21:51:56 +04:00
# include "qemu/qemu_monitor_json.h"
2018-03-22 19:07:43 +03:00
# include "qemu/qemu_qapi.h"
2012-12-13 19:49:48 +04:00
# include "virthread.h"
2012-12-13 22:21:53 +04:00
# include "virerror.h"
2013-04-26 15:13:05 +04:00
# include "virstring.h"
2013-07-22 15:07:23 +04:00
# include "cpu/cpu.h"
2015-04-28 04:16:13 +03:00
# include "qemu/qemu_monitor.h"
2018-04-05 23:17:26 +03:00
# include "qemu/qemu_migration_params.h"
2018-12-13 17:53:50 +03:00
# define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW
2018-04-05 21:59:07 +03:00
# include "qemu/qemu_migration_paramspriv.h"
2012-08-20 16:31:29 +04:00
# define VIR_FROM_THIS VIR_FROM_NONE
2013-09-18 19:28:31 +04:00
typedef struct _testQemuMonitorJSONSimpleFuncData testQemuMonitorJSONSimpleFuncData ;
typedef testQemuMonitorJSONSimpleFuncData * testQemuMonitorJSONSimpleFuncDataPtr ;
struct _testQemuMonitorJSONSimpleFuncData {
const char * cmd ;
int ( * func ) ( qemuMonitorPtr mon ) ;
virDomainXMLOptionPtr xmlopt ;
const char * reply ;
2018-03-22 21:07:21 +03:00
virHashTablePtr schema ;
2013-09-18 19:28:31 +04:00
} ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
typedef struct _testGenericData testGenericData ;
struct _testGenericData {
virDomainXMLOptionPtr xmlopt ;
virHashTablePtr schema ;
} ;
2013-10-02 20:46:42 +04:00
const char * queryBlockReply =
" { "
" \" return \" : [ "
" { "
" \" io-status \" : \" ok \" , "
" \" device \" : \" drive-virtio-disk0 \" , "
" \" locked \" : false, "
" \" removable \" : false, "
" \" inserted \" : { "
" \" iops_rd \" : 5, "
" \" iops_wr \" : 6, "
" \" ro \" : false, "
" \" backing_file_depth \" : 0, "
" \" drv \" : \" qcow2 \" , "
" \" iops \" : 4, "
" \" bps_wr \" : 3, "
" \" encrypted \" : false, "
" \" bps \" : 1, "
" \" bps_rd \" : 2, "
2014-12-03 16:42:27 +03:00
" \" bps_max \" : 7, "
" \" iops_max \" : 10, "
" \" bps_rd_max \" : 8, "
" \" bps_wr_max \" : 9, "
" \" iops_rd_max \" : 11, "
" \" iops_wr_max \" : 12, "
" \" iops_size \" : 13, "
2016-11-01 00:22:59 +03:00
" \" group \" : \" group14 \" , "
" \" bps_max_length \" : 15, "
" \" bps_rd_max_length \" : 16, "
" \" bps_wr_max_length \" : 17, "
" \" iops_max_length \" : 18, "
" \" iops_rd_max_length \" : 19, "
" \" iops_wr_max_length \" : 20, "
2013-10-02 20:46:42 +04:00
" \" file \" : \" /home/zippy/work/tmp/gentoo.qcow2 \" , "
" \" encryption_key_missing \" : false "
" }, "
" \" type \" : \" unknown \" "
" }, "
" { "
" \" io-status \" : \" ok \" , "
" \" device \" : \" drive-virtio-disk1 \" , "
" \" locked \" : false, "
" \" removable \" : false, "
" \" inserted \" : { "
" \" iops_rd \" : 0, "
" \" iops_wr \" : 0, "
" \" ro \" : false, "
" \" backing_file_depth \" : 0, "
" \" drv \" : \" raw \" , "
" \" iops \" : 0, "
" \" bps_wr \" : 0, "
" \" encrypted \" : false, "
" \" bps \" : 0, "
" \" bps_rd \" : 0, "
" \" file \" : \" /home/zippy/test.bin \" , "
" \" encryption_key_missing \" : false "
" }, "
" \" type \" : \" unknown \" "
" }, "
" { "
" \" io-status \" : \" ok \" , "
" \" device \" : \" drive-ide0-1-0 \" , "
" \" locked \" : true, "
" \" removable \" : true, "
" \" inserted \" : { "
" \" iops_rd \" : 0, "
" \" iops_wr \" : 0, "
" \" ro \" : true, "
" \" backing_file_depth \" : 0, "
" \" drv \" : \" raw \" , "
" \" iops \" : 0, "
" \" bps_wr \" : 0, "
" \" encrypted \" : false, "
" \" bps \" : 0, "
" \" bps_rd \" : 0, "
" \" file \" : \" /home/zippy/tmp/install-amd64-minimal-20121210.iso \" , "
" \" encryption_key_missing \" : false "
" }, "
" \" tray_open \" : false, "
" \" type \" : \" unknown \" "
2016-05-19 15:57:41 +03:00
" }, "
" { "
" \" io-status \" : \" ok \" , "
" \" device \" : \" drive-ide0-1-1 \" , "
" \" locked \" : false, "
" \" removable \" : true, "
" \" tray_open \" : false, "
" \" type \" : \" unknown \" "
2013-10-02 20:46:42 +04:00
" } "
" ], "
" \" id \" : \" libvirt-10 \" "
" } " ;
2012-08-20 16:31:29 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetStatus ( const void * opaque )
2012-08-20 16:31:29 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2012-08-20 16:31:29 +04:00
bool running = false ;
virDomainPausedReason reason = 0 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2012-08-20 16:31:29 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2012-08-20 16:31:29 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-status " ,
" { "
" \" return \" : { "
" \" status \" : \" running \" , "
" \" singlestep \" : false, "
" \" running \" : true "
" } "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
if ( qemuMonitorTestAddItem ( test , " query-status " ,
" { "
" \" return \" : { "
" \" singlestep \" : false, "
" \" running \" : false "
" } "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
if ( qemuMonitorTestAddItem ( test , " query-status " ,
" { "
" \" return \" : { "
" \" status \" : \" inmigrate \" , "
" \" singlestep \" : false, "
" \" running \" : false "
" } "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
if ( qemuMonitorGetStatus ( qemuMonitorTestGetMonitor ( test ) ,
& running , & reason ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
if ( ! running ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Running was not true " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
}
if ( reason ! = VIR_DOMAIN_PAUSED_UNKNOWN ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Reason was unexpectedly set to %d " , reason ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
}
if ( qemuMonitorGetStatus ( qemuMonitorTestGetMonitor ( test ) ,
& running , & reason ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
if ( running ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Running was not false " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
}
if ( reason ! = VIR_DOMAIN_PAUSED_UNKNOWN ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Reason was unexpectedly set to %d " , reason ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
}
if ( qemuMonitorGetStatus ( qemuMonitorTestGetMonitor ( test ) ,
& running , & reason ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
if ( running ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Running was not false " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
}
if ( reason ! = VIR_DOMAIN_PAUSED_MIGRATION ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Reason was unexpectedly set to %d " , reason ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2012-08-20 16:31:29 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2012-08-20 16:31:29 +04:00
}
2012-08-15 18:04:09 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetVersion ( const void * opaque )
2012-08-15 18:04:09 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2012-08-15 18:04:09 +04:00
int ret = - 1 ;
int major ;
int minor ;
int micro ;
2013-02-04 20:17:52 +04:00
char * package = NULL ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2012-08-15 18:04:09 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2012-08-15 18:04:09 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-version " ,
" { "
" \" return \" :{ "
" \" qemu \" :{ "
" \" major \" :1, "
" \" minor \" :2, "
" \" micro \" :3 "
" }, "
" \" package \" : \" \" "
" } "
" } " ) < 0 )
goto cleanup ;
if ( qemuMonitorTestAddItem ( test , " query-version " ,
" { "
" \" return \" :{ "
" \" qemu \" :{ "
" \" major \" :0, "
" \" minor \" :11, "
" \" micro \" :6 "
" }, "
" \" package \" : \" 2.283.el6 \" "
" } "
" } " ) < 0 )
goto cleanup ;
if ( qemuMonitorGetVersion ( qemuMonitorTestGetMonitor ( test ) ,
& major , & minor , & micro ,
& package ) < 0 )
goto cleanup ;
if ( major ! = 1 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Major %d was not 1 " , major ) ;
goto cleanup ;
}
if ( minor ! = 2 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Minor %d was not 2 " , major ) ;
goto cleanup ;
}
if ( micro ! = 3 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Micro %d was not 3 " , major ) ;
goto cleanup ;
}
if ( STRNEQ ( package , " " ) ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Package %s was not '' " , package ) ;
goto cleanup ;
}
2013-02-04 20:17:52 +04:00
VIR_FREE ( package ) ;
2012-08-15 18:04:09 +04:00
if ( qemuMonitorGetVersion ( qemuMonitorTestGetMonitor ( test ) ,
& major , & minor , & micro ,
& package ) < 0 )
goto cleanup ;
if ( major ! = 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Major %d was not 0 " , major ) ;
goto cleanup ;
}
if ( minor ! = 11 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Minor %d was not 11 " , major ) ;
goto cleanup ;
}
if ( micro ! = 6 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Micro %d was not 6 " , major ) ;
goto cleanup ;
}
if ( STRNEQ ( package , " 2.283.el6 " ) ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Package %s was not '2.283.el6' " , package ) ;
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-02-04 20:17:52 +04:00
VIR_FREE ( package ) ;
2012-08-15 18:04:09 +04:00
return ret ;
}
2012-08-15 19:18:41 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetMachines ( const void * opaque )
2012-08-15 19:18:41 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2012-08-15 19:18:41 +04:00
int ret = - 1 ;
qemuMonitorMachineInfoPtr * info ;
2013-02-04 20:17:52 +04:00
int ninfo = 0 ;
2012-08-15 19:18:41 +04:00
const char * null = NULL ;
Convert 'int i' to 'size_t i' in tests/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 18:09:33 +04:00
size_t i ;
2012-08-15 19:18:41 +04:00
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2012-08-15 19:18:41 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-machines " ,
" { "
" \" return \" : [ "
" { "
" \" name \" : \" pc-1.0 \" "
" }, "
" { "
" \" name \" : \" pc-1.1 \" "
" }, "
" { "
" \" name \" : \" pc-1.2 \" , "
" \" is-default \" : true, "
" \" alias \" : \" pc \" "
" } "
" ] "
" } " ) < 0 )
goto cleanup ;
if ( ( ninfo = qemuMonitorGetMachines ( qemuMonitorTestGetMonitor ( test ) ,
& info ) ) < 0 )
goto cleanup ;
if ( ninfo ! = 3 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" ninfo %d is not 3 " , ninfo ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantname, wantisDefault, wantalias) \
do { \
if ( STRNEQ ( info [ i ] - > name , ( wantname ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" name %s is not %s " , \
info [ i ] - > name , ( wantname ) ) ; \
goto cleanup ; \
} \
if ( info [ i ] - > isDefault ! = ( wantisDefault ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" isDefault %d is not %d " , \
info [ i ] - > isDefault , ( wantisDefault ) ) ; \
goto cleanup ; \
} \
if ( STRNEQ_NULLABLE ( info [ i ] - > alias , ( wantalias ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" alias %s is not %s " , \
info [ i ] - > alias , NULLSTR ( wantalias ) ) ; \
goto cleanup ; \
} \
2012-08-15 19:18:41 +04:00
} while ( 0 )
CHECK ( 0 , " pc-1.0 " , false , null ) ;
CHECK ( 1 , " pc-1.1 " , false , null ) ;
CHECK ( 2 , " pc-1.2 " , true , " pc " ) ;
# undef CHECK
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-02-04 20:17:52 +04:00
for ( i = 0 ; i < ninfo ; i + + )
qemuMonitorMachineInfoFree ( info [ i ] ) ;
VIR_FREE ( info ) ;
2012-08-15 19:18:41 +04:00
return ret ;
}
2012-08-20 18:58:20 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetCPUDefinitions ( const void * opaque )
2012-08-20 18:58:20 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2012-08-20 18:58:20 +04:00
int ret = - 1 ;
2016-04-21 13:51:01 +03:00
qemuMonitorCPUDefInfoPtr * cpus = NULL ;
2013-02-04 20:17:52 +04:00
int ncpus = 0 ;
Convert 'int i' to 'size_t i' in tests/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 18:09:33 +04:00
size_t i ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2012-08-20 18:58:20 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2012-08-20 18:58:20 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-cpu-definitions " ,
" { "
" \" return \" : [ "
" { "
" \" name \" : \" qemu64 \" "
" }, "
" { "
2016-04-21 14:08:12 +03:00
" \" name \" : \" Opteron_G4 \" , "
" \" unavailable-features \" : [ \" vme \" ] "
2012-08-20 18:58:20 +04:00
" }, "
" { "
2016-04-21 14:08:12 +03:00
" \" name \" : \" Westmere \" , "
" \" unavailable-features \" : [] "
2012-08-20 18:58:20 +04:00
" } "
" ] "
" } " ) < 0 )
goto cleanup ;
if ( ( ncpus = qemuMonitorGetCPUDefinitions ( qemuMonitorTestGetMonitor ( test ) ,
& cpus ) ) < 0 )
goto cleanup ;
if ( ncpus ! = 3 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" ncpus %d is not 3 " , ncpus ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK_FULL(i, wantname, Usable) \
do { \
if ( STRNEQ ( cpus [ i ] - > name , ( wantname ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" name %s is not %s " , \
cpus [ i ] - > name , ( wantname ) ) ; \
goto cleanup ; \
} \
if ( cpus [ i ] - > usable ! = ( Usable ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" %s: expecting usable flag %d, got %d " , \
cpus [ i ] - > name , Usable , cpus [ i ] - > usable ) ; \
goto cleanup ; \
} \
2012-08-20 18:58:20 +04:00
} while ( 0 )
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantname) \
2016-04-21 14:08:12 +03:00
CHECK_FULL ( i , wantname , VIR_TRISTATE_BOOL_ABSENT )
2017-11-03 15:09:47 +03:00
# define CHECK_USABLE(i, wantname, usable) \
CHECK_FULL ( i , wantname , \
2016-04-21 14:08:12 +03:00
usable ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO )
2012-08-20 18:58:20 +04:00
CHECK ( 0 , " qemu64 " ) ;
2016-04-21 14:08:12 +03:00
CHECK_USABLE ( 1 , " Opteron_G4 " , false ) ;
CHECK_USABLE ( 2 , " Westmere " , true ) ;
2012-08-20 18:58:20 +04:00
# undef CHECK
2016-04-21 14:08:12 +03:00
# undef CHECK_USABLE
# undef CHECK_FULL
2012-08-20 18:58:20 +04:00
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-02-04 20:17:52 +04:00
for ( i = 0 ; i < ncpus ; i + + )
2016-04-21 13:51:01 +03:00
qemuMonitorCPUDefInfoFree ( cpus [ i ] ) ;
2013-02-04 20:17:52 +04:00
VIR_FREE ( cpus ) ;
2012-08-20 18:58:20 +04:00
return ret ;
}
2012-08-22 13:25:20 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetCommands ( const void * opaque )
2012-08-22 13:25:20 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2012-08-22 13:25:20 +04:00
int ret = - 1 ;
char * * commands = NULL ;
2013-02-04 20:17:52 +04:00
int ncommands = 0 ;
Convert 'int i' to 'size_t i' in tests/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 18:09:33 +04:00
size_t i ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2012-08-22 13:25:20 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2012-08-22 13:25:20 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-commands " ,
" { "
" \" return \" : [ "
" { "
" \" name \" : \" system_wakeup \" "
" }, "
" { "
" \" name \" : \" cont \" "
" }, "
" { "
" \" name \" : \" quit \" "
" } "
" ] "
" } " ) < 0 )
goto cleanup ;
if ( ( ncommands = qemuMonitorGetCommands ( qemuMonitorTestGetMonitor ( test ) ,
& commands ) ) < 0 )
goto cleanup ;
if ( ncommands ! = 3 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" ncommands %d is not 3 " , ncommands ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantname) \
do { \
if ( STRNEQ ( commands [ i ] , ( wantname ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" name %s is not %s " , \
commands [ i ] , ( wantname ) ) ; \
goto cleanup ; \
} \
2012-08-22 13:25:20 +04:00
} while ( 0 )
CHECK ( 0 , " system_wakeup " ) ;
CHECK ( 1 , " cont " ) ;
CHECK ( 2 , " quit " ) ;
# undef CHECK
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-02-04 20:17:52 +04:00
for ( i = 0 ; i < ncommands ; i + + )
VIR_FREE ( commands [ i ] ) ;
VIR_FREE ( commands ) ;
2012-08-22 13:25:20 +04:00
return ret ;
}
2013-04-26 15:13:05 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetTPMModels ( const void * opaque )
2013-04-26 15:13:05 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-04-26 15:13:05 +04:00
int ret = - 1 ;
char * * tpmmodels = NULL ;
int ntpmmodels = 0 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-04-26 15:13:05 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-04-26 15:13:05 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-tpm-models " ,
" { "
" \" return \" : [ "
" \" passthrough \" "
" ] "
" } " ) < 0 )
goto cleanup ;
if ( ( ntpmmodels = qemuMonitorGetTPMModels ( qemuMonitorTestGetMonitor ( test ) ,
& tpmmodels ) ) < 0 )
goto cleanup ;
if ( ntpmmodels ! = 1 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" ntpmmodels %d is not 1 " , ntpmmodels ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantname) \
do { \
if ( STRNEQ ( tpmmodels [ i ] , ( wantname ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" name %s is not %s " , \
tpmmodels [ i ] , ( wantname ) ) ; \
goto cleanup ; \
} \
2013-04-26 15:13:05 +04:00
} while ( 0 )
CHECK ( 0 , " passthrough " ) ;
# undef CHECK
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2016-11-25 11:18:35 +03:00
virStringListFree ( tpmmodels ) ;
2013-04-26 15:13:05 +04:00
return ret ;
}
2013-04-26 21:13:45 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetCommandLineOptionParameters ( const void * opaque )
2013-04-26 21:13:45 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-04-26 21:13:45 +04:00
int ret = - 1 ;
char * * params = NULL ;
int nparams = 0 ;
2014-06-17 15:41:16 +04:00
bool found = false ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-04-26 21:13:45 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-04-26 21:13:45 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-command-line-options " ,
" { "
" \" return \" : [ "
" { \" parameters \" : [], \" option \" : \" acpi \" }, "
" { \" parameters \" : [ "
" { \" name \" : \" romfile \" , "
" \" type \" : \" string \" }, "
" { \" name \" : \" bootindex \" , "
" \" type \" : \" number \" }], "
" \" option \" : \" option-rom \" } "
" ] "
" } " ) < 0 )
goto cleanup ;
/* present with params */
if ( ( nparams = qemuMonitorGetCommandLineOptionParameters ( qemuMonitorTestGetMonitor ( test ) ,
" option-rom " ,
2014-06-17 15:41:16 +04:00
& params ,
NULL ) ) < 0 )
2013-04-26 21:13:45 +04:00
goto cleanup ;
if ( nparams ! = 2 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" nparams was %d, expected 2 " , nparams ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantname) \
do { \
if ( STRNEQ ( params [ i ] , ( wantname ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" name was %s, expected %s " , \
params [ i ] , ( wantname ) ) ; \
goto cleanup ; \
} \
2013-04-26 21:13:45 +04:00
} while ( 0 )
CHECK ( 0 , " romfile " ) ;
CHECK ( 1 , " bootindex " ) ;
# undef CHECK
2016-11-25 11:18:35 +03:00
virStringListFree ( params ) ;
2013-04-26 21:13:45 +04:00
params = NULL ;
/* present but empty */
if ( ( nparams = qemuMonitorGetCommandLineOptionParameters ( qemuMonitorTestGetMonitor ( test ) ,
" acpi " ,
2014-06-17 15:41:16 +04:00
& params ,
& found ) ) < 0 )
2013-04-26 21:13:45 +04:00
goto cleanup ;
if ( nparams ! = 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" nparams was %d, expected 0 " , nparams ) ;
goto cleanup ;
}
2014-06-17 15:41:16 +04:00
if ( ! found ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" found was false, expected true " ) ;
goto cleanup ;
}
2013-04-26 21:13:45 +04:00
if ( params & & params [ 0 ] ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" unexpected array contents " ) ;
goto cleanup ;
}
2016-11-25 11:18:35 +03:00
virStringListFree ( params ) ;
2013-04-26 21:13:45 +04:00
params = NULL ;
/* no such option */
if ( ( nparams = qemuMonitorGetCommandLineOptionParameters ( qemuMonitorTestGetMonitor ( test ) ,
" foobar " ,
2014-06-17 15:41:16 +04:00
& params ,
& found ) ) < 0 )
2013-04-26 21:13:45 +04:00
goto cleanup ;
if ( nparams ! = 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" nparams was %d, expected 0 " , nparams ) ;
goto cleanup ;
}
2014-06-17 15:41:16 +04:00
if ( found ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" found was true, expected false " ) ;
goto cleanup ;
}
2013-04-26 21:13:45 +04:00
if ( params & & params [ 0 ] ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" unexpected array contents " ) ;
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2016-11-25 11:18:35 +03:00
virStringListFree ( params ) ;
2013-04-26 21:13:45 +04:00
return ret ;
}
2016-09-27 16:49:05 +03:00
struct qemuMonitorJSONTestAttachChardevData {
qemuMonitorTestPtr test ;
virDomainChrSourceDefPtr chr ;
const char * expectPty ;
bool fail ;
} ;
2013-03-12 22:48:04 +04:00
static int
2016-09-27 16:49:05 +03:00
testQemuMonitorJSONAttachChardev ( const void * opaque )
2013-03-12 22:48:04 +04:00
{
2016-09-27 16:49:05 +03:00
const struct qemuMonitorJSONTestAttachChardevData * data = opaque ;
int rc ;
2013-03-12 22:48:04 +04:00
2016-09-27 16:49:05 +03:00
if ( ( rc = qemuMonitorAttachCharDev ( qemuMonitorTestGetMonitor ( data - > test ) ,
" alias " , data - > chr ) ) < 0 )
goto cleanup ;
if ( data - > chr - > type = = VIR_DOMAIN_CHR_TYPE_PTY ) {
if ( STRNEQ_NULLABLE ( data - > expectPty , data - > chr - > data . file . path ) ) {
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 :
if ( ( rc ! = 0 ) ! = data - > fail )
2013-03-12 22:48:04 +04:00
return - 1 ;
2016-09-27 16:49:05 +03:00
else
return 0 ;
}
2013-03-12 22:48:04 +04:00
2016-09-27 16:49:05 +03:00
static int
qemuMonitorJSONTestAttachOneChardev ( virDomainXMLOptionPtr xmlopt ,
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
virHashTablePtr schema ,
2016-09-27 16:49:05 +03:00
const char * label ,
virDomainChrSourceDefPtr chr ,
2016-09-27 10:52:50 +03:00
const char * expectargs ,
2016-09-27 16:49:05 +03:00
const char * reply ,
const char * expectPty ,
bool fail )
2013-03-12 22:48:04 +04:00
2016-09-27 16:49:05 +03:00
{
2016-10-10 18:08:26 +03:00
struct qemuMonitorJSONTestAttachChardevData data = { 0 } ;
2016-09-27 16:49:05 +03:00
char * jsonreply = NULL ;
char * fulllabel = NULL ;
int ret = - 1 ;
if ( ! reply )
reply = " " ;
if ( virAsprintf ( & jsonreply , " { \" return \" : {%s}} " , reply ) < 0 )
goto cleanup ;
if ( virAsprintf ( & fulllabel , " qemuMonitorJSONTestAttachChardev(%s) " , label ) < 0 )
goto cleanup ;
data . chr = chr ;
data . fail = fail ;
data . expectPty = expectPty ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( data . test = qemuMonitorTestNewSchema ( xmlopt , schema ) ) )
2016-09-27 16:49:05 +03:00
goto cleanup ;
2016-09-27 10:52:50 +03:00
if ( qemuMonitorTestAddItemExpect ( data . test , " chardev-add " ,
expectargs , true , jsonreply ) < 0 )
2016-09-27 16:49:05 +03:00
goto cleanup ;
if ( virTestRun ( fulllabel , & testQemuMonitorJSONAttachChardev , & data ) < 0 )
goto cleanup ;
ret = 0 ;
cleanup :
qemuMonitorTestFree ( data . test ) ;
VIR_FREE ( jsonreply ) ;
VIR_FREE ( fulllabel ) ;
return ret ;
}
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
qemuMonitorJSONTestAttachChardev ( virDomainXMLOptionPtr xmlopt ,
virHashTablePtr schema )
2016-09-27 16:49:05 +03:00
{
virDomainChrSourceDef chr ;
int ret = 0 ;
2017-11-03 15:09:47 +03:00
# define CHECK(label, fail, expectargs) \
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( qemuMonitorJSONTestAttachOneChardev ( xmlopt , schema , label , & chr , \
expectargs , NULL , NULL , fail ) < 0 ) \
2016-09-27 16:49:05 +03:00
ret = - 1
2013-03-12 22:48:04 +04:00
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_NULL } ;
2016-09-27 10:52:50 +03:00
CHECK ( " null " , false ,
" {'id':'alias','backend':{'type':'null','data':{}}} " ) ;
2013-03-12 22:48:04 +04:00
2014-01-20 15:27:29 +04:00
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_VC } ;
2016-09-27 10:52:50 +03:00
CHECK ( " vc " , false ,
" {'id':'alias','backend':{'type':'null','data':{}}} " ) ;
2013-03-12 22:48:04 +04:00
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_PTY } ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( qemuMonitorJSONTestAttachOneChardev ( xmlopt , schema , " pty " , & chr ,
2016-09-27 10:52:50 +03:00
" {'id':'alias', "
" 'backend':{'type':'pty', "
" 'data':{}}} " ,
2016-09-27 16:49:05 +03:00
" \" pty \" : \" /dev/pts/0 \" " ,
" /dev/pts/0 " , false ) < 0 )
2013-03-12 22:48:04 +04:00
ret = - 1 ;
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_PTY } ;
2016-09-27 10:52:50 +03:00
CHECK ( " pty missing path " , true ,
" {'id':'alias','backend':{'type':'pty','data':{}}} " ) ;
memset ( & chr , 0 , sizeof ( chr ) ) ;
chr . type = VIR_DOMAIN_CHR_TYPE_FILE ;
chr . data . file . path = ( char * ) " /test/path " ;
CHECK ( " file " , false ,
" {'id':'alias','backend':{'type':'file','data':{'out':'/test/path'}}} " ) ;
memset ( & chr , 0 , sizeof ( chr ) ) ;
chr . type = VIR_DOMAIN_CHR_TYPE_DEV ;
chr . data . file . path = ( char * ) " /test/path " ;
CHECK ( " device " , false ,
" {'id':'alias','backend':{'type':'serial','data':{'device':'/test/path'}}} " ) ;
memset ( & chr , 0 , sizeof ( chr ) ) ;
chr . type = VIR_DOMAIN_CHR_TYPE_TCP ;
chr . data . tcp . host = ( char * ) " example.com " ;
chr . data . tcp . service = ( char * ) " 1234 " ;
CHECK ( " tcp " , false ,
" {'id':'alias', "
" 'backend':{'type':'socket', "
" 'data':{'addr':{'type':'inet', "
" 'data':{'host':'example.com', "
" 'port':'1234'}}, "
" 'telnet':false, "
" 'server':false}}} " ) ;
memset ( & chr , 0 , sizeof ( chr ) ) ;
chr . type = VIR_DOMAIN_CHR_TYPE_UDP ;
chr . data . udp . connectHost = ( char * ) " example.com " ;
chr . data . udp . connectService = ( char * ) " 1234 " ;
CHECK ( " udp " , false ,
" {'id':'alias', "
2016-09-27 17:01:55 +03:00
" 'backend':{'type':'udp', "
" 'data':{'remote':{'type':'inet', "
" 'data':{'host':'example.com', "
" 'port':'1234'}}}}} " ) ;
chr . data . udp . bindHost = ( char * ) " localhost " ;
chr . data . udp . bindService = ( char * ) " 4321 " ;
CHECK ( " udp " , false ,
" {'id':'alias', "
" 'backend':{'type':'udp', "
" 'data':{'remote':{'type':'inet', "
" 'data':{'host':'example.com', "
" 'port':'1234'}}, "
" 'local':{'type':'inet', "
" 'data':{'host':'localhost', "
" 'port':'4321'}}}}} " ) ;
2016-09-27 10:52:50 +03:00
2017-05-19 13:56:48 +03:00
chr . data . udp . bindHost = NULL ;
chr . data . udp . bindService = ( char * ) " 4321 " ;
CHECK ( " udp " , false ,
" {'id':'alias', "
" 'backend':{'type':'udp', "
" 'data':{'remote':{'type':'inet', "
" 'data':{'host':'example.com', "
" 'port':'1234'}}, "
" 'local':{'type':'inet', "
" 'data':{'host':'', "
" 'port':'4321'}}}}} " ) ;
2016-09-27 10:52:50 +03:00
memset ( & chr , 0 , sizeof ( chr ) ) ;
chr . type = VIR_DOMAIN_CHR_TYPE_UNIX ;
chr . data . nix . path = ( char * ) " /path/to/socket " ;
CHECK ( " unix " , false ,
" {'id':'alias', "
" 'backend':{'type':'socket', "
" 'data':{'addr':{'type':'unix', "
" 'data':{'path':'/path/to/socket'}}, "
" 'server':false}}} " ) ;
2013-03-12 22:48:04 +04:00
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_SPICEVMC } ;
2016-09-27 10:52:50 +03:00
CHECK ( " spicevmc " , false ,
" {'id':'alias','backend':{'type':'spicevmc',' "
" data':{'type':'vdagent'}}} " ) ;
2013-03-12 22:48:04 +04:00
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_PIPE } ;
2016-09-27 10:52:50 +03:00
CHECK ( " pipe " , true , " " ) ;
2013-03-12 22:48:04 +04:00
chr = ( virDomainChrSourceDef ) { . type = VIR_DOMAIN_CHR_TYPE_STDIO } ;
2016-09-27 10:52:50 +03:00
CHECK ( " stdio " , true , " " ) ;
2013-03-12 22:48:04 +04:00
# undef CHECK
return ret ;
}
2013-04-26 21:13:45 +04:00
2016-09-27 16:49:05 +03:00
2013-03-12 22:57:48 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONDetachChardev ( const void * opaque )
2013-03-12 22:57:48 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-03-12 22:57:48 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-03-12 22:57:48 +04:00
if ( qemuMonitorTestAddItem ( test , " chardev-remove " , " { \" return \" : {}} " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-03-12 22:57:48 +04:00
if ( qemuMonitorDetachCharDev ( qemuMonitorTestGetMonitor ( test ) ,
" dummy_chrID " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-03-12 22:57:48 +04:00
2019-06-11 06:01:08 +03:00
return 0 ;
2013-03-12 22:57:48 +04:00
}
2013-06-24 21:51:56 +04:00
/*
* This test will request to return a list of paths for " / " . It should be
* a simple list of 1 real element that being the " machine " . The following
* is the execution and expected return :
*
* { " execute " : " qom-list " , " arguments " : { " path " : " / " } } "
* { " return " : [ { " name " : " machine " , " type " : " child<container> " } , \
* { " name " : " type " , " type " : " string " } ] }
*/
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetListPaths ( const void * opaque )
2013-06-24 21:51:56 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-06-24 21:51:56 +04:00
int ret = - 1 ;
qemuMonitorJSONListPathPtr * paths ;
int npaths = 0 ;
size_t i ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-06-24 21:51:56 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-06-24 21:51:56 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " qom-list " ,
" { "
" \" return \" : [ "
" { \" name \" : \" machine \" , "
" \" type \" : \" child<container> \" }, "
" { \" name \" : \" type \" , "
" \" type \" : \" string \" } "
" ] "
" } " ) < 0 )
goto cleanup ;
/* present with path */
if ( ( npaths = qemuMonitorJSONGetObjectListPaths (
qemuMonitorTestGetMonitor ( test ) ,
" / " ,
& paths ) ) < 0 )
goto cleanup ;
if ( npaths ! = 2 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" npaths was %d, expected 1 " , npaths ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantname, wanttype) \
do { \
if ( STRNEQ ( paths [ i ] - > name , ( wantname ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" name was %s, expected %s " , \
paths [ i ] - > name , ( wantname ) ) ; \
goto cleanup ; \
} \
if ( STRNEQ_NULLABLE ( paths [ i ] - > type , ( wanttype ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" type was %s, expected %s " , \
NULLSTR ( paths [ i ] - > type ) , ( wanttype ) ) ; \
goto cleanup ; \
} \
2013-06-24 21:51:56 +04:00
} while ( 0 )
CHECK ( 0 , " machine " , " child<container> " ) ;
# undef CHECK
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-06-24 21:51:56 +04:00
for ( i = 0 ; i < npaths ; i + + )
qemuMonitorJSONListPathFree ( paths [ i ] ) ;
VIR_FREE ( paths ) ;
return ret ;
}
2013-07-03 22:15:07 +04:00
/*
* This test will use a path to / machine / i440fx which should exist in order
* to ensure that the qom - get property fetch works properly . The following
* is the execution and expected return :
*
*
* { " execute " : " qom-get " , " arguments " : \
* { " path " : " /machine/i440fx " , " property " : " realized " } }
* { " return " : true }
*/
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetObjectProperty ( const void * opaque )
2013-07-03 22:15:07 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-07-03 22:15:07 +04:00
qemuMonitorJSONObjectProperty prop ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-07-03 22:15:07 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-07-03 22:15:07 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " qom-get " ,
" { \" return \" : true } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:15:07 +04:00
/* Present with path and property */
memset ( & prop , 0 , sizeof ( qemuMonitorJSONObjectProperty ) ) ;
prop . type = QEMU_MONITOR_OBJECT_PROPERTY_BOOLEAN ;
if ( qemuMonitorJSONGetObjectProperty ( qemuMonitorTestGetMonitor ( test ) ,
" /machine/i440fx " ,
" realized " ,
& prop ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:15:07 +04:00
if ( ! prop . val . b ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" expected true, but false returned " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:15:07 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2013-07-03 22:15:07 +04:00
}
2013-07-03 22:42:40 +04:00
/*
* This test will use a path to / machine / i440fx which should exist in order
* to ensure that the qom - set property set works properly . The test will
* set a true property to true just as a proof of concept . Setting it to
* false is not a good idea . . .
*/
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONSetObjectProperty ( const void * opaque )
2013-07-03 22:42:40 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-07-03 22:42:40 +04:00
qemuMonitorJSONObjectProperty prop ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-07-03 22:42:40 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-07-03 22:42:40 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " qom-set " ,
" { \" return \" : {} } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:42:40 +04:00
if ( qemuMonitorTestAddItem ( test , " qom-get " ,
" { \" return \" : true } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:42:40 +04:00
/* Let's attempt the setting */
memset ( & prop , 0 , sizeof ( qemuMonitorJSONObjectProperty ) ) ;
prop . type = QEMU_MONITOR_OBJECT_PROPERTY_BOOLEAN ;
prop . val . b = true ;
if ( qemuMonitorJSONSetObjectProperty ( qemuMonitorTestGetMonitor ( test ) ,
" /machine/i440fx " ,
" realized " ,
& prop ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:42:40 +04:00
/* To make sure it worked, fetch the property - if this succeeds then
* we didn ' t hose things
*/
memset ( & prop , 0 , sizeof ( qemuMonitorJSONObjectProperty ) ) ;
prop . type = QEMU_MONITOR_OBJECT_PROPERTY_BOOLEAN ;
if ( qemuMonitorJSONGetObjectProperty ( qemuMonitorTestGetMonitor ( test ) ,
" /machine/i440fx " ,
" realized " ,
& prop ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:42:40 +04:00
if ( ! prop . val . b ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" expected true, but false returned " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-07-03 22:42:40 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2013-07-03 22:42:40 +04:00
}
2013-07-19 17:01:38 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetDeviceAliases ( const void * opaque )
2013-07-19 17:01:38 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-07-19 17:01:38 +04:00
int ret = - 1 ;
char * * aliases = NULL ;
2016-08-16 13:20:56 +03:00
const char * * alias ;
2013-07-19 17:01:38 +04:00
const char * expected [ ] = {
" virtio-disk25 " , " video0 " , " serial0 " , " ide0-0-0 " , " usb " , NULL } ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-07-19 17:01:38 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-07-19 17:01:38 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test ,
" qom-list " ,
" { \" return \" : [ "
" { \" name \" : \" virtio-disk25 \" , "
" \" type \" : \" child<virtio-blk-pci> \" }, "
" { \" name \" : \" video0 \" , "
" \" type \" : \" child<VGA> \" }, "
" { \" name \" : \" serial0 \" , "
" \" type \" : \" child<isa-serial> \" }, "
" { \" name \" : \" ide0-0-0 \" , "
" \" type \" : \" child<ide-cd> \" }, "
" { \" name \" : \" usb \" , "
" \" type \" : \" child<piix3-usb-uhci> \" }, "
" { \" name \" : \" type \" , \" type \" : \" string \" } "
" ]} " ) < 0 )
goto cleanup ;
if ( qemuMonitorJSONGetDeviceAliases ( qemuMonitorTestGetMonitor ( test ) ,
& aliases ) < 0 )
goto cleanup ;
if ( ! aliases ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " , " no aliases returned " ) ;
goto cleanup ;
}
ret = 0 ;
2016-08-16 13:20:56 +03:00
for ( alias = ( const char * * ) aliases ; * alias ; alias + + ) {
2016-11-25 11:18:35 +03:00
if ( ! virStringListHasString ( expected , * alias ) ) {
2013-07-19 17:01:38 +04:00
fprintf ( stderr , " got unexpected device alias '%s' \n " , * alias ) ;
ret = - 1 ;
}
}
2016-08-16 13:20:56 +03:00
for ( alias = expected ; * alias ; alias + + ) {
2016-11-25 11:18:35 +03:00
if ( ! virStringListHasString ( ( const char * * ) aliases , * alias ) ) {
2013-07-19 17:01:38 +04:00
fprintf ( stderr , " missing expected alias '%s' \n " , * alias ) ;
ret = - 1 ;
}
}
2014-03-25 10:53:44 +04:00
cleanup :
2016-11-25 11:18:35 +03:00
virStringListFree ( aliases ) ;
2013-07-19 17:01:38 +04:00
return ret ;
}
2013-09-18 17:11:06 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONCPU ( const void * opaque )
2013-09-18 17:11:06 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-09-18 17:11:06 +04:00
bool running = false ;
virDomainPausedReason reason = 0 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-09-18 17:11:06 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-09-20 15:02:43 +04:00
return - 1 ;
2013-09-18 17:11:06 +04:00
if ( qemuMonitorTestAddItem ( test , " stop " , " { \" return \" : {}} " ) < 0 | |
qemuMonitorTestAddItem ( test , " query-status " ,
" { \" return \" : { "
" \" status \" : \" paused \" , "
" \" singlestep \" : false, "
" \" running \" : false}} " ) < 0 | |
qemuMonitorTestAddItem ( test , " cont " , " { \" return \" : {}} " ) < 0 | |
qemuMonitorTestAddItem ( test , " query-status " ,
" { \" return \" : { "
" \" status \" : \" running \" , "
" \" singlestep \" : false, "
" \" running \" : true}} " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
if ( qemuMonitorJSONStopCPUs ( qemuMonitorTestGetMonitor ( test ) ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
if ( qemuMonitorGetStatus ( qemuMonitorTestGetMonitor ( test ) ,
& running , & reason ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
if ( running ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Running was not false " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
}
2018-02-09 18:40:51 +03:00
if ( qemuMonitorJSONStartCPUs ( qemuMonitorTestGetMonitor ( test ) ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
if ( qemuMonitorGetStatus ( qemuMonitorTestGetMonitor ( test ) ,
& running , & reason ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
if ( ! running ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Running was not true " ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 17:11:06 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2013-09-18 17:11:06 +04:00
}
2013-07-19 17:01:38 +04:00
2013-09-18 19:28:31 +04:00
static int
testQemuMonitorJSONSimpleFunc ( const void * opaque )
{
2013-10-05 05:40:19 +04:00
testQemuMonitorJSONSimpleFuncDataPtr data =
( testQemuMonitorJSONSimpleFuncDataPtr ) opaque ;
2013-09-18 19:28:31 +04:00
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
const char * reply = data - > reply ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-09-18 19:28:31 +04:00
2019-06-11 06:01:08 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-09-20 15:02:43 +04:00
return - 1 ;
2013-09-18 19:28:31 +04:00
if ( ! reply )
reply = " { \" return \" :{}} " ;
if ( qemuMonitorTestAddItem ( test , data - > cmd , reply ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 19:28:31 +04:00
if ( data - > func ( qemuMonitorTestGetMonitor ( test ) ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-09-18 19:28:31 +04:00
2019-06-11 06:01:08 +03:00
return 0 ;
2013-09-18 19:28:31 +04:00
}
2017-11-03 15:09:47 +03:00
# define GEN_TEST_FUNC(funcName, ...) \
static int \
testQemuMonitorJSON # # funcName ( const void * opaque ) \
{ \
const testQemuMonitorJSONSimpleFuncData * data = opaque ; \
virDomainXMLOptionPtr xmlopt = data - > xmlopt ; \
const char * reply = data - > reply ; \
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ; \
2017-11-03 15:09:47 +03:00
\
2019-06-11 06:01:08 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) ) \
2017-11-03 15:09:47 +03:00
return - 1 ; \
\
if ( ! reply ) \
reply = " { \" return \" :{}} " ; \
\
if ( qemuMonitorTestAddItem ( test , data - > cmd , reply ) < 0 ) \
2019-06-11 06:01:08 +03:00
return - 1 ; \
2017-11-03 15:09:47 +03:00
\
if ( funcName ( qemuMonitorTestGetMonitor ( test ) , __VA_ARGS__ ) < 0 ) \
2019-06-11 06:01:08 +03:00
return - 1 ; \
2017-11-03 15:09:47 +03:00
\
2019-06-11 06:01:08 +03:00
return 0 ; \
2013-10-01 18:23:50 +04:00
}
GEN_TEST_FUNC ( qemuMonitorJSONSetLink , " vnet0 " , VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN )
2018-08-07 10:31:04 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONBlockResize , " vda " , " asdf " , 123456 )
2013-10-01 18:23:50 +04:00
GEN_TEST_FUNC ( qemuMonitorJSONSetPassword , " spice " , " secret_password " , " disconnect " )
GEN_TEST_FUNC ( qemuMonitorJSONExpirePassword , " spice " , " 123456 " )
GEN_TEST_FUNC ( qemuMonitorJSONSetBalloon , 1024 )
GEN_TEST_FUNC ( qemuMonitorJSONSetCPU , 1 , true )
GEN_TEST_FUNC ( qemuMonitorJSONEjectMedia , " hdc " , true )
2018-08-16 17:36:41 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONChangeMedia , " hdc " , " /foo/bar " , " formatstr " )
2013-10-01 18:23:50 +04:00
GEN_TEST_FUNC ( qemuMonitorJSONSaveVirtualMemory , 0 , 1024 , " /foo/bar " )
GEN_TEST_FUNC ( qemuMonitorJSONSavePhysicalMemory , 0 , 1024 , " /foo/bar " )
GEN_TEST_FUNC ( qemuMonitorJSONSetMigrationSpeed , 1024 )
GEN_TEST_FUNC ( qemuMonitorJSONSetMigrationDowntime , 1 )
GEN_TEST_FUNC ( qemuMonitorJSONMigrate , QEMU_MONITOR_MIGRATE_BACKGROUND |
QEMU_MONITOR_MIGRATE_NON_SHARED_DISK |
QEMU_MONITOR_MIGRATE_NON_SHARED_INC , " tcp:localhost:12345 " )
2018-03-22 20:39:32 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONDump , " dummy_protocol " , " elf " ,
2017-11-20 23:05:23 +03:00
true )
2013-10-01 18:23:50 +04:00
GEN_TEST_FUNC ( qemuMonitorJSONGraphicsRelocate , VIR_DOMAIN_GRAPHICS_TYPE_SPICE ,
2018-08-16 17:36:41 +03:00
" localhost " , 12345 , 12346 , " certsubjectval " )
2018-03-22 20:39:32 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONAddNetdev , " id=net0,type=test " )
2013-10-01 18:23:50 +04:00
GEN_TEST_FUNC ( qemuMonitorJSONRemoveNetdev , " net0 " )
GEN_TEST_FUNC ( qemuMonitorJSONDelDevice , " ide0 " )
GEN_TEST_FUNC ( qemuMonitorJSONAddDevice , " some_dummy_devicestr " )
2019-05-17 19:13:53 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONDriveMirror , " vdb " , " /foo/bar " , " formatstr " , 1024 , 1234 , 31234 , true , true )
2018-08-16 19:47:20 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONBlockdevMirror , " jobname " , true , " vdb " , " targetnode " , 1024 , 1234 , 31234 , true )
2018-08-15 14:13:53 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONBlockStream , " vdb " , " jobname " , true , " /foo/bar1 " , " backingnode " , " backingfilename " , 1024 )
2018-08-16 19:20:25 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONBlockCommit , " vdb " , " jobname " , true , " /foo/bar1 " , " topnode " , " /foo/bar2 " , " basenode " , " backingfilename " , 1024 )
2015-04-01 11:06:55 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONDrivePivot , " vdb " )
2018-08-16 17:36:41 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONScreendump , " devicename " , 1 , " /foo/bar " )
2013-10-01 18:23:50 +04:00
GEN_TEST_FUNC ( qemuMonitorJSONOpenGraphics , " spice " , " spicefd " , false )
2019-06-06 05:25:05 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONNBDServerAdd , " vda " , " export " , true , " bitmap " )
2013-10-01 18:23:50 +04:00
GEN_TEST_FUNC ( qemuMonitorJSONDetachCharDev , " serial1 " )
2018-07-12 13:11:31 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONBlockdevTrayOpen , " foodev " , true )
GEN_TEST_FUNC ( qemuMonitorJSONBlockdevTrayClose , " foodev " )
GEN_TEST_FUNC ( qemuMonitorJSONBlockdevMediumRemove , " foodev " )
GEN_TEST_FUNC ( qemuMonitorJSONBlockdevMediumInsert , " foodev " , " newnode " )
2019-06-06 05:25:05 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONAddBitmap , " node " , " bitmap " , true )
GEN_TEST_FUNC ( qemuMonitorJSONEnableBitmap , " node " , " bitmap " )
GEN_TEST_FUNC ( qemuMonitorJSONDeleteBitmap , " node " , " bitmap " )
2018-08-16 12:48:41 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONJobDismiss , " jobname " )
2018-08-16 12:48:41 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONJobCancel , " jobname " , false )
2018-08-16 12:48:41 +03:00
GEN_TEST_FUNC ( qemuMonitorJSONJobComplete , " jobname " )
2013-10-01 18:23:50 +04:00
2019-04-10 00:21:38 +03:00
static int
testQemuMonitorJSONqemuMonitorJSONNBDServerStart ( const void * opaque )
{
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
virStorageNetHostDef server_tcp = {
. name = ( char * ) " localhost " ,
. port = 12345 ,
. transport = VIR_STORAGE_NET_HOST_TRANS_TCP ,
} ;
virStorageNetHostDef server_unix = {
. socket = ( char * ) " /tmp/sock " ,
. transport = VIR_STORAGE_NET_HOST_TRANS_UNIX ,
} ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2019-04-10 00:21:38 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " nbd-server-start " ,
" { \" return \" :{}} " ) < 0 )
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " nbd-server-start " ,
" { \" return \" :{}} " ) < 0 )
return - 1 ;
if ( qemuMonitorJSONNBDServerStart ( qemuMonitorTestGetMonitor ( test ) ,
& server_tcp , " test-alias " ) < 0 )
return - 1 ;
if ( qemuMonitorJSONNBDServerStart ( qemuMonitorTestGetMonitor ( test ) ,
& server_unix , " test-alias " ) < 0 )
return - 1 ;
return 0 ;
}
2019-06-06 05:25:05 +03:00
static int
testQemuMonitorJSONqemuMonitorJSONMergeBitmaps ( const void * opaque )
{
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
g_autoptr ( virJSONValue ) arr = NULL ;
2019-06-06 05:25:05 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
return - 1 ;
if ( ! ( arr = virJSONValueNewArray ( ) ) )
return - 1 ;
if ( virJSONValueArrayAppendString ( arr , " b1 " ) < 0 | |
virJSONValueArrayAppendString ( arr , " b2 " ) < 0 )
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " block-dirty-bitmap-merge " ,
" { \" return \" :{}} " ) < 0 )
return - 1 ;
if ( qemuMonitorJSONMergeBitmaps ( qemuMonitorTestGetMonitor ( test ) ,
" node " , " dst " , & arr ) < 0 )
return - 1 ;
if ( arr ) {
2019-06-12 10:19:25 +03:00
VIR_TEST_VERBOSE ( " arr should have been cleared " ) ;
2019-06-06 05:25:05 +03:00
return - 1 ;
}
return 0 ;
}
2016-08-01 14:44:25 +03:00
static bool
testQemuMonitorJSONqemuMonitorJSONQueryCPUsEqual ( struct qemuMonitorQueryCpusEntry * a ,
struct qemuMonitorQueryCpusEntry * b )
{
2016-07-28 11:33:10 +03:00
if ( a - > tid ! = b - > tid | |
STRNEQ_NULLABLE ( a - > qom_path , b - > qom_path ) )
2016-08-01 14:44:25 +03:00
return false ;
return true ;
}
2013-10-02 13:40:33 +04:00
2018-04-04 17:45:04 +03:00
static int
testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper ( qemuMonitorTestPtr test ,
struct qemuMonitorQueryCpusEntry * expect ,
bool fast ,
size_t num )
{
struct qemuMonitorQueryCpusEntry * cpudata = NULL ;
size_t ncpudata = 0 ;
size_t i ;
int ret = - 1 ;
if ( qemuMonitorJSONQueryCPUs ( qemuMonitorTestGetMonitor ( test ) ,
& cpudata , & ncpudata , true , fast ) < 0 )
goto cleanup ;
if ( ncpudata ! = num ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Expecting ncpupids = %zu but got %zu " , num , ncpudata ) ;
goto cleanup ;
}
for ( i = 0 ; i < ncpudata ; i + + ) {
if ( ! testQemuMonitorJSONqemuMonitorJSONQueryCPUsEqual ( cpudata + i ,
expect + i ) ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" vcpu entry %zu does not match expected data " , i ) ;
goto cleanup ;
}
}
ret = 0 ;
cleanup :
qemuMonitorQueryCpusFree ( cpudata , ncpudata ) ;
return ret ;
}
2013-10-02 13:40:33 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONQueryCPUs ( const void * opaque )
2013-10-02 13:40:33 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2018-04-04 17:45:04 +03:00
struct qemuMonitorQueryCpusEntry expect_slow [ ] = {
{ 0 , 17622 , ( char * ) " /machine/unattached/device[0] " , true } ,
{ 1 , 17624 , ( char * ) " /machine/unattached/device[1] " , true } ,
{ 2 , 17626 , ( char * ) " /machine/unattached/device[2] " , true } ,
{ 3 , 17628 , NULL , true } ,
} ;
struct qemuMonitorQueryCpusEntry expect_fast [ ] = {
{ 0 , 17629 , ( char * ) " /machine/unattached/device[0] " , false } ,
{ 1 , 17630 , ( char * ) " /machine/unattached/device[1] " , false } ,
2016-08-01 14:44:25 +03:00
} ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 13:40:33 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 13:40:33 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-cpus " ,
" { "
" \" return \" : [ "
" { "
" \" current \" : true, "
" \" CPU \" : 0, "
2016-07-28 11:33:10 +03:00
" \" qom_path \" : \" /machine/unattached/device[0] \" , "
2013-10-02 13:40:33 +04:00
" \" pc \" : -2130530478, "
" \" halted \" : true, "
" \" thread_id \" : 17622 "
" }, "
" { "
" \" current \" : false, "
" \" CPU \" : 1, "
2016-07-28 11:33:10 +03:00
" \" qom_path \" : \" /machine/unattached/device[1] \" , "
2013-10-02 13:40:33 +04:00
" \" pc \" : -2130530478, "
" \" halted \" : true, "
" \" thread_id \" : 17624 "
" }, "
" { "
" \" current \" : false, "
" \" CPU \" : 2, "
2016-07-28 11:33:10 +03:00
" \" qom_path \" : \" /machine/unattached/device[2] \" , "
2013-10-02 13:40:33 +04:00
" \" pc \" : -2130530478, "
" \" halted \" : true, "
" \" thread_id \" : 17626 "
" }, "
" { "
" \" current \" : false, "
" \" CPU \" : 3, "
" \" pc \" : -2130530478, "
" \" halted \" : true, "
" \" thread_id \" : 17628 "
" } "
" ], "
" \" id \" : \" libvirt-7 \" "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:40:33 +04:00
2018-04-04 17:45:04 +03:00
if ( qemuMonitorTestAddItem ( test , " query-cpus-fast " ,
" { "
" \" return \" : [ "
" { "
" \" cpu-index \" : 0, "
" \" qom-path \" : \" /machine/unattached/device[0] \" , "
" \" thread-id \" : 17629 "
" }, "
" { "
" \" cpu-index \" : 1, "
" \" qom-path \" : \" /machine/unattached/device[1] \" , "
" \" thread-id \" : 17630 "
" } "
" ], "
" \" id \" : \" libvirt-8 \" "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:40:33 +04:00
2018-04-04 17:45:04 +03:00
/* query-cpus */
if ( testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper ( test , expect_slow ,
false , 4 ) )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:40:33 +04:00
2018-04-04 17:45:04 +03:00
/* query-cpus-fast */
if ( testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper ( test , expect_fast ,
true , 2 ) )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:40:33 +04:00
2019-06-11 06:01:08 +03:00
return 0 ;
2013-10-02 13:40:33 +04:00
}
2013-10-02 14:02:53 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo ( const void * opaque )
2013-10-02 14:02:53 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 14:02:53 +04:00
unsigned long long currmem ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 14:02:53 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 14:02:53 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-balloon " ,
" { "
" \" return \" : { "
2018-08-24 14:30:17 +03:00
" \" actual \" : 18446744073709551615 "
2013-10-02 14:02:53 +04:00
" }, "
" \" id \" : \" libvirt-9 \" "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 14:02:53 +04:00
if ( qemuMonitorJSONGetBalloonInfo ( qemuMonitorTestGetMonitor ( test ) , & currmem ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 14:02:53 +04:00
2018-08-24 14:30:17 +03:00
if ( currmem ! = ( 18446744073709551615ULL / 1024 ) ) {
2013-10-02 14:02:53 +04:00
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected currmem value: %llu " , currmem ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 14:02:53 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2013-10-02 14:02:53 +04:00
}
2013-10-02 13:56:43 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetVirtType ( const void * opaque )
2013-10-02 13:56:43 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2015-09-17 11:46:56 +03:00
virDomainVirtType virtType ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 13:56:43 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 13:56:43 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-kvm " ,
" { "
" \" return \" : { "
" \" enabled \" : true, "
" \" present \" : true "
" }, "
" \" id \" : \" libvirt-8 \" "
" } " ) < 0 | |
qemuMonitorTestAddItem ( test , " query-kvm " ,
" { "
" \" return \" : { "
" \" enabled \" : false, "
" \" present \" : true "
" }, "
" \" id \" : \" libvirt-7 \" "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:56:43 +04:00
if ( qemuMonitorJSONGetVirtType ( qemuMonitorTestGetMonitor ( test ) , & virtType ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:56:43 +04:00
if ( virtType ! = VIR_DOMAIN_VIRT_KVM ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected virt type: %d, expecting %d " , virtType , VIR_DOMAIN_VIRT_KVM ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:56:43 +04:00
}
if ( qemuMonitorJSONGetVirtType ( qemuMonitorTestGetMonitor ( test ) , & virtType ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:56:43 +04:00
if ( virtType ! = VIR_DOMAIN_VIRT_QEMU ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected virt type: %d, expecting %d " , virtType , VIR_DOMAIN_VIRT_QEMU ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 13:56:43 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2013-10-02 13:56:43 +04:00
}
2018-08-06 15:35:20 +03:00
static void
testQemuMonitorJSONGetBlockInfoPrint ( const struct qemuDomainDiskInfo * d )
{
VIR_TEST_VERBOSE ( " removable: %d, tray: %d, tray_open: %d, empty: %d, "
2019-05-03 11:45:58 +03:00
" io_status: %d, nodename: '%s' " ,
2018-08-06 15:35:20 +03:00
d - > removable , d - > tray , d - > tray_open , d - > empty ,
d - > io_status , NULLSTR ( d - > nodename ) ) ;
}
2013-10-02 16:39:10 +04:00
static int
testHashEqualQemuDomainDiskInfo ( const void * value1 , const void * value2 )
{
const struct qemuDomainDiskInfo * info1 = value1 , * info2 = value2 ;
2018-08-06 15:35:20 +03:00
int ret ;
if ( ( ret = memcmp ( info1 , info2 , sizeof ( * info1 ) ) ) ! = 0 ) {
testQemuMonitorJSONGetBlockInfoPrint ( info1 ) ;
testQemuMonitorJSONGetBlockInfoPrint ( info2 ) ;
}
2013-10-02 16:39:10 +04:00
2018-08-06 15:35:20 +03:00
return ret ;
2013-10-02 16:39:10 +04:00
}
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetBlockInfo ( const void * opaque )
2013-10-02 16:39:10 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 16:39:10 +04:00
int ret = - 1 ;
virHashTablePtr blockDevices = NULL , expectedBlockDevices = NULL ;
struct qemuDomainDiskInfo * info ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 16:39:10 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 16:39:10 +04:00
return - 1 ;
2014-04-05 03:36:25 +04:00
if ( ! ( blockDevices = virHashCreate ( 32 , virHashValueFree ) ) | |
! ( expectedBlockDevices = virHashCreate ( 32 , virHashValueFree ) ) )
2013-10-02 16:39:10 +04:00
goto cleanup ;
if ( VIR_ALLOC ( info ) < 0 )
goto cleanup ;
if ( virHashAddEntry ( expectedBlockDevices , " virtio-disk0 " , info ) < 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Unable to create expectedBlockDevices hash table " ) ;
goto cleanup ;
}
if ( VIR_ALLOC ( info ) < 0 )
goto cleanup ;
if ( virHashAddEntry ( expectedBlockDevices , " virtio-disk1 " , info ) < 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Unable to create expectedBlockDevices hash table " ) ;
goto cleanup ;
}
if ( VIR_ALLOC ( info ) < 0 )
goto cleanup ;
info - > removable = true ;
2016-05-19 15:57:41 +03:00
info - > tray = true ;
2013-10-02 16:39:10 +04:00
if ( virHashAddEntry ( expectedBlockDevices , " ide0-1-0 " , info ) < 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Unable to create expectedBlockDevices hash table " ) ;
goto cleanup ;
}
2016-05-19 15:57:41 +03:00
if ( VIR_ALLOC ( info ) < 0 )
goto cleanup ;
info - > removable = true ;
info - > tray = true ;
info - > empty = true ;
if ( virHashAddEntry ( expectedBlockDevices , " ide0-1-1 " , info ) < 0 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Unable to create expectedBlockDevices hash table " ) ;
goto cleanup ;
}
2013-10-02 20:46:42 +04:00
if ( qemuMonitorTestAddItem ( test , " query-block " , queryBlockReply ) < 0 )
2013-10-02 16:39:10 +04:00
goto cleanup ;
if ( qemuMonitorJSONGetBlockInfo ( qemuMonitorTestGetMonitor ( test ) , blockDevices ) < 0 )
goto cleanup ;
if ( ! virHashEqual ( blockDevices , expectedBlockDevices , testHashEqualQemuDomainDiskInfo ) ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Hashtable is different to the expected one " ) ;
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-10-02 16:39:10 +04:00
virHashFree ( blockDevices ) ;
virHashFree ( expectedBlockDevices ) ;
return ret ;
}
2013-10-02 17:08:02 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo ( const void * opaque )
2013-10-02 17:08:02 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2015-03-10 19:11:22 +03:00
virHashTablePtr blockstats = NULL ;
qemuBlockStatsPtr stats ;
2013-10-02 17:08:02 +04:00
int ret = - 1 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 17:08:02 +04:00
const char * reply =
" { "
" \" return \" : [ "
" { "
" \" device \" : \" drive-virtio-disk0 \" , "
" \" parent \" : { "
" \" stats \" : { "
" \" flush_total_time_ns \" : 0, "
" \" wr_highest_offset \" : 5256018944, "
" \" wr_total_time_ns \" : 0, "
" \" wr_bytes \" : 0, "
" \" rd_total_time_ns \" : 0, "
" \" flush_operations \" : 0, "
" \" wr_operations \" : 0, "
" \" rd_bytes \" : 0, "
" \" rd_operations \" : 0 "
" } "
" }, "
" \" stats \" : { "
" \" flush_total_time_ns \" : 0, "
" \" wr_highest_offset \" : 10406001664, "
" \" wr_total_time_ns \" : 530699221, "
" \" wr_bytes \" : 2845696, "
" \" rd_total_time_ns \" : 640616474, "
" \" flush_operations \" : 0, "
" \" wr_operations \" : 174, "
" \" rd_bytes \" : 28505088, "
" \" rd_operations \" : 1279 "
" } "
" }, "
" { "
" \" device \" : \" drive-virtio-disk1 \" , "
" \" parent \" : { "
" \" stats \" : { "
" \" flush_total_time_ns \" : 0, "
" \" wr_highest_offset \" : 0, "
" \" wr_total_time_ns \" : 0, "
" \" wr_bytes \" : 0, "
" \" rd_total_time_ns \" : 0, "
" \" flush_operations \" : 0, "
" \" wr_operations \" : 0, "
" \" rd_bytes \" : 0, "
" \" rd_operations \" : 0 "
" } "
" }, "
" \" stats \" : { "
" \" flush_total_time_ns \" : 0, "
" \" wr_highest_offset \" : 0, "
" \" wr_total_time_ns \" : 0, "
" \" wr_bytes \" : 0, "
" \" rd_total_time_ns \" : 8232156, "
" \" flush_operations \" : 0, "
" \" wr_operations \" : 0, "
" \" rd_bytes \" : 348160, "
" \" rd_operations \" : 85 "
" } "
" }, "
" { "
" \" device \" : \" drive-ide0-1-0 \" , "
" \" parent \" : { "
" \" stats \" : { "
" \" flush_total_time_ns \" : 0, "
" \" wr_total_time_ns \" : 0, "
" \" wr_bytes \" : 0, "
" \" rd_total_time_ns \" : 0, "
" \" flush_operations \" : 0, "
" \" wr_operations \" : 0, "
" \" rd_bytes \" : 0, "
" \" rd_operations \" : 0 "
" } "
" }, "
" \" stats \" : { "
" \" flush_total_time_ns \" : 0, "
" \" wr_highest_offset \" : 0, "
" \" wr_total_time_ns \" : 0, "
" \" wr_bytes \" : 0, "
" \" rd_total_time_ns \" : 1004952, "
" \" flush_operations \" : 0, "
" \" wr_operations \" : 0, "
" \" rd_bytes \" : 49250, "
" \" rd_operations \" : 16 "
" } "
" } "
" ], "
" \" id \" : \" libvirt-11 \" "
" } " ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 17:08:02 +04:00
return - 1 ;
2018-06-18 11:24:17 +03:00
if ( ! ( blockstats = virHashCreate ( 10 , virHashValueFree ) ) )
goto cleanup ;
2018-06-18 11:22:18 +03:00
if ( qemuMonitorTestAddItem ( test , " query-blockstats " , reply ) < 0 )
2013-10-02 17:08:02 +04:00
goto cleanup ;
2015-06-23 17:58:07 +03:00
# define CHECK0FULL(var, value, varformat, valformat) \
2015-03-10 19:11:22 +03:00
if ( stats - > var ! = value ) { \
2013-10-02 17:08:02 +04:00
virReportError ( VIR_ERR_INTERNAL_ERROR , \
2015-06-23 17:58:07 +03:00
" Invalid " # var " value: " varformat \
" , expected " valformat , \
2015-03-10 19:11:22 +03:00
stats - > var , value ) ; \
2013-10-02 17:08:02 +04:00
goto cleanup ; \
}
2015-06-23 17:58:07 +03:00
# define CHECK0(var, value) CHECK0FULL(var, value, "%lld", "%d")
2017-11-03 15:09:47 +03:00
# define CHECK(NAME, RD_REQ, RD_BYTES, RD_TOTAL_TIMES, WR_REQ, WR_BYTES, \
WR_TOTAL_TIMES , FLUSH_REQ , FLUSH_TOTAL_TIMES , \
WR_HIGHEST_OFFSET , WR_HIGHEST_OFFSET_VALID ) \
if ( ! ( stats = virHashLookup ( blockstats , NAME ) ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" block stats for device '%s' is missing " , NAME ) ; \
goto cleanup ; \
} \
2013-10-02 17:08:02 +04:00
CHECK0 ( rd_req , RD_REQ ) \
CHECK0 ( rd_bytes , RD_BYTES ) \
CHECK0 ( rd_total_times , RD_TOTAL_TIMES ) \
CHECK0 ( wr_req , WR_REQ ) \
CHECK0 ( wr_bytes , WR_BYTES ) \
CHECK0 ( wr_total_times , WR_TOTAL_TIMES ) \
CHECK0 ( flush_req , FLUSH_REQ ) \
2015-06-23 17:58:07 +03:00
CHECK0 ( flush_total_times , FLUSH_TOTAL_TIMES ) \
CHECK0FULL ( wr_highest_offset , WR_HIGHEST_OFFSET , " %llu " , " %llu " ) \
CHECK0FULL ( wr_highest_offset_valid , WR_HIGHEST_OFFSET_VALID , " %d " , " %d " )
2013-10-02 17:08:02 +04:00
2018-06-18 11:24:17 +03:00
if ( qemuMonitorJSONGetAllBlockStatsInfo ( qemuMonitorTestGetMonitor ( test ) ,
blockstats , false ) < 0 )
2013-10-02 17:08:02 +04:00
goto cleanup ;
2015-03-10 19:11:22 +03:00
if ( ! blockstats ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
2018-06-18 11:24:17 +03:00
" qemuMonitorJSONGetAllBlockStatsInfo didn't return stats " ) ;
2013-10-02 17:08:02 +04:00
goto cleanup ;
}
2015-06-23 17:58:07 +03:00
CHECK ( " virtio-disk0 " , 1279 , 28505088 , 640616474 , 174 , 2845696 , 530699221 , 0 , 0 , 5256018944ULL , true )
CHECK ( " virtio-disk1 " , 85 , 348160 , 8232156 , 0 , 0 , 0 , 0 , 0 , 0ULL , true )
2015-06-26 17:40:29 +03:00
CHECK ( " ide0-1-0 " , 16 , 49250 , 1004952 , 0 , 0 , 0 , 0 , 0 , 0ULL , false )
2015-03-10 19:11:22 +03:00
2013-10-02 17:08:02 +04:00
ret = 0 ;
# undef CHECK
# undef CHECK0
2015-06-23 17:58:07 +03:00
# undef CHECK0FULL
2013-10-02 17:08:02 +04:00
2014-03-25 10:53:44 +04:00
cleanup :
2015-03-10 19:11:22 +03:00
virHashFree ( blockstats ) ;
2013-10-02 17:08:02 +04:00
return ret ;
}
2016-04-14 13:33:50 +03:00
2013-10-02 18:01:46 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize ( const void * opaque )
2013-10-02 18:01:46 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 18:01:46 +04:00
unsigned long long cacheSize ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 18:01:46 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 18:01:46 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-migrate-cache-size " ,
" { "
" \" return \" : 67108864, "
" \" id \" : \" libvirt-12 \" "
" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 18:01:46 +04:00
if ( qemuMonitorJSONGetMigrationCacheSize ( qemuMonitorTestGetMonitor ( test ) ,
& cacheSize ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 18:01:46 +04:00
if ( cacheSize ! = 67108864 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Invalid cacheSize: %llu, expected 67108864 " ,
cacheSize ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 18:01:46 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2013-10-02 18:01:46 +04:00
}
2013-10-02 18:43:35 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetMigrationStats ( const void * opaque )
2013-10-02 18:43:35 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 18:43:35 +04:00
int ret = - 1 ;
2015-11-26 15:23:08 +03:00
qemuMonitorMigrationStats stats , expectedStats ;
2017-10-12 16:19:19 +03:00
char * error = NULL ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 18:43:35 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 18:43:35 +04:00
return - 1 ;
2015-11-26 15:23:08 +03:00
memset ( & expectedStats , 0 , sizeof ( expectedStats ) ) ;
2013-10-02 18:43:35 +04:00
2015-11-26 15:23:08 +03:00
expectedStats . status = QEMU_MONITOR_MIGRATION_STATUS_ACTIVE ;
expectedStats . total_time = 47 ;
expectedStats . ram_total = 1611038720 ;
expectedStats . ram_remaining = 1605013504 ;
expectedStats . ram_transferred = 3625548 ;
2013-10-02 18:43:35 +04:00
if ( qemuMonitorTestAddItem ( test , " query-migrate " ,
" { "
" \" return \" : { "
" \" status \" : \" active \" , "
" \" total-time \" : 47, "
" \" ram \" : { "
" \" total \" : 1611038720, "
" \" remaining \" : 1605013504, "
" \" transferred \" : 3625548 "
" } "
" }, "
" \" id \" : \" libvirt-13 \" "
2017-10-12 16:19:19 +03:00
" } " ) < 0 | |
qemuMonitorTestAddItem ( test , " query-migrate " ,
" { "
" \" return \" : { "
" \" status \" : \" failed \" , "
" \" error-desc \" : \" It's broken \" "
" }, "
" \" id \" : \" libvirt-14 \" "
2013-10-02 18:43:35 +04:00
" } " ) < 0 )
goto cleanup ;
2017-10-12 16:19:19 +03:00
if ( qemuMonitorJSONGetMigrationStats ( qemuMonitorTestGetMonitor ( test ) ,
& stats , & error ) < 0 )
goto cleanup ;
if ( memcmp ( & stats , & expectedStats , sizeof ( stats ) ) ! = 0 | | error ) {
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Invalid migration statistics " ) ;
goto cleanup ;
}
memset ( & stats , 0 , sizeof ( stats ) ) ;
if ( qemuMonitorJSONGetMigrationStats ( qemuMonitorTestGetMonitor ( test ) ,
& stats , & error ) < 0 )
2013-10-02 18:43:35 +04:00
goto cleanup ;
2017-10-12 16:19:19 +03:00
if ( stats . status ! = QEMU_MONITOR_MIGRATION_STATUS_ERROR | |
STRNEQ_NULLABLE ( error , " It's broken " ) ) {
2013-10-02 18:43:35 +04:00
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
2017-10-12 16:19:19 +03:00
" Invalid failed migration status " ) ;
2013-10-02 18:43:35 +04:00
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2017-10-12 16:19:19 +03:00
VIR_FREE ( error ) ;
2013-10-02 18:43:35 +04:00
return ret ;
}
2013-10-02 19:11:30 +04:00
static int
2014-11-13 21:29:14 +03:00
testHashEqualChardevInfo ( const void * value1 , const void * value2 )
2013-10-02 19:11:30 +04:00
{
2014-11-13 21:29:14 +03:00
const qemuMonitorChardevInfo * info1 = value1 ;
const qemuMonitorChardevInfo * info2 = value2 ;
if ( info1 - > state ! = info2 - > state )
goto error ;
if ( STRNEQ_NULLABLE ( info1 - > ptyPath , info2 - > ptyPath ) )
goto error ;
return 0 ;
error :
fprintf ( stderr , " \n "
" info1->state: %d info2->state: %d \n "
" info1->ptyPath: %s info2->ptyPath: %s \n " ,
info1 - > state , info2 - > state , info1 - > ptyPath , info2 - > ptyPath ) ;
return - 1 ;
2013-10-02 19:11:30 +04:00
}
2014-11-13 21:29:14 +03:00
2013-10-02 19:11:30 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetChardevInfo ( const void * opaque )
2013-10-02 19:11:30 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 19:11:30 +04:00
int ret = - 1 ;
2014-11-13 18:17:21 +03:00
virHashTablePtr info = NULL , expectedInfo = NULL ;
2014-11-13 21:29:14 +03:00
qemuMonitorChardevInfo info0 = { NULL , VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT } ;
qemuMonitorChardevInfo info1 = { ( char * ) " /dev/pts/21 " , VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED } ;
qemuMonitorChardevInfo info2 = { ( char * ) " /dev/pts/20 " , VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT } ;
qemuMonitorChardevInfo info3 = { NULL , VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED } ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 19:11:30 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 19:11:30 +04:00
return - 1 ;
2015-04-28 04:16:13 +03:00
if ( ! ( info = virHashCreate ( 32 , qemuMonitorChardevInfoFree ) ) | |
2014-11-13 18:17:21 +03:00
! ( expectedInfo = virHashCreate ( 32 , NULL ) ) )
2013-10-02 19:11:30 +04:00
goto cleanup ;
2014-11-13 21:29:14 +03:00
if ( virHashAddEntry ( expectedInfo , " charserial1 " , & info1 ) < 0 | |
virHashAddEntry ( expectedInfo , " charserial0 " , & info2 ) < 0 | |
virHashAddEntry ( expectedInfo , " charmonitor " , & info0 ) < 0 | |
virHashAddEntry ( expectedInfo , " charserial2 " , & info3 ) < 0 ) {
2013-10-02 19:11:30 +04:00
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
2014-11-13 18:17:21 +03:00
" Unable to create expectedInfo hash table " ) ;
2013-10-02 19:11:30 +04:00
goto cleanup ;
}
if ( qemuMonitorTestAddItem ( test , " query-chardev " ,
" { "
" \" return \" : [ "
" { "
" \" filename \" : \" pty:/dev/pts/21 \" , "
2014-11-13 21:29:14 +03:00
" \" label \" : \" charserial1 \" , "
" \" frontend-open \" : true "
2013-10-02 19:11:30 +04:00
" }, "
" { "
" \" filename \" : \" pty:/dev/pts/20 \" , "
" \" label \" : \" charserial0 \" "
" }, "
" { "
" \" filename \" : \" unix:/var/lib/libvirt/qemu/gentoo.monitor,server \" , "
" \" label \" : \" charmonitor \" "
2014-11-13 21:29:14 +03:00
" }, "
" { "
" \" filename \" : \" unix:/path/to/socket,server \" , "
" \" label \" : \" charserial2 \" , "
" \" frontend-open \" : false "
2013-10-02 19:11:30 +04:00
" } "
" ], "
" \" id \" : \" libvirt-15 \" "
" } " ) < 0 )
goto cleanup ;
2014-11-13 18:17:21 +03:00
if ( qemuMonitorJSONGetChardevInfo ( qemuMonitorTestGetMonitor ( test ) ,
info ) < 0 )
2013-10-02 19:11:30 +04:00
goto cleanup ;
2014-11-13 21:29:14 +03:00
if ( ! virHashEqual ( info , expectedInfo , testHashEqualChardevInfo ) ) {
2013-10-02 19:11:30 +04:00
virReportError ( VIR_ERR_INTERNAL_ERROR , " %s " ,
" Hashtable is different to the expected one " ) ;
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2014-11-13 18:17:21 +03:00
virHashFree ( info ) ;
virHashFree ( expectedInfo ) ;
2013-10-02 19:11:30 +04:00
return ret ;
}
2016-11-01 00:22:59 +03:00
static int
2017-04-03 19:53:31 +03:00
testValidateGetBlockIoThrottle ( const virDomainBlockIoTuneInfo * info ,
const virDomainBlockIoTuneInfo * expectedInfo )
2016-11-01 00:22:59 +03:00
{
# define VALIDATE_IOTUNE(field) \
2017-04-03 19:53:31 +03:00
if ( info - > field ! = expectedInfo - > field ) { \
2016-11-01 00:22:59 +03:00
virReportError ( VIR_ERR_INTERNAL_ERROR , \
2017-11-03 15:09:47 +03:00
" info->%s=%llu != expected=%llu " , \
2017-04-03 19:53:31 +03:00
# field, info->field, expectedInfo->field); \
2016-11-01 00:22:59 +03:00
return - 1 ; \
} \
2017-04-03 19:53:31 +03:00
if ( info - > field # # _max ! = expectedInfo - > field # # _max ) { \
2016-11-01 00:22:59 +03:00
virReportError ( VIR_ERR_INTERNAL_ERROR , \
2017-11-03 15:09:47 +03:00
" info->%s_max=%llu != expected=%llu " , \
2017-04-03 19:53:31 +03:00
# field, info->field##_max, expectedInfo->field##_max); \
2016-11-01 00:22:59 +03:00
return - 1 ; \
} \
2017-04-03 19:53:31 +03:00
if ( info - > field # # _max_length ! = expectedInfo - > field # # _max_length ) { \
2016-11-01 00:22:59 +03:00
virReportError ( VIR_ERR_INTERNAL_ERROR , \
2017-11-03 15:09:47 +03:00
" info->%s_max_length=%llu != expected=%llu " , \
2017-04-03 19:53:31 +03:00
# field, info->field##_max_length, \
expectedInfo - > field # # _max_length ) ; \
2016-11-01 00:22:59 +03:00
return - 1 ; \
}
VALIDATE_IOTUNE ( total_bytes_sec ) ;
VALIDATE_IOTUNE ( read_bytes_sec ) ;
VALIDATE_IOTUNE ( write_bytes_sec ) ;
VALIDATE_IOTUNE ( total_iops_sec ) ;
VALIDATE_IOTUNE ( read_iops_sec ) ;
VALIDATE_IOTUNE ( write_iops_sec ) ;
2017-04-03 19:53:31 +03:00
if ( info - > size_iops_sec ! = expectedInfo - > size_iops_sec ) {
2016-11-01 00:22:59 +03:00
virReportError ( VIR_ERR_INTERNAL_ERROR ,
2017-04-03 19:53:31 +03:00
" info->size_iops_sec=%llu != expected=%llu " ,
info - > size_iops_sec , expectedInfo - > size_iops_sec ) ;
2016-11-01 00:22:59 +03:00
return - 1 ;
}
2017-04-03 19:53:31 +03:00
if ( STRNEQ ( info - > group_name , expectedInfo - > group_name ) ) {
2016-11-01 00:22:59 +03:00
virReportError ( VIR_ERR_INTERNAL_ERROR ,
2017-04-03 19:53:31 +03:00
" info->group_name=%s != expected=%s " ,
info - > group_name , expectedInfo - > group_name ) ;
2016-11-01 00:22:59 +03:00
return - 1 ;
}
# undef VALIDATE_IOTUNE
return 0 ;
}
2013-10-02 20:46:42 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle ( const void * opaque )
2013-10-02 20:46:42 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 20:46:42 +04:00
int ret = - 1 ;
virDomainBlockIoTuneInfo info , expectedInfo ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 20:46:42 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 20:46:42 +04:00
return - 1 ;
2016-11-01 00:22:59 +03:00
expectedInfo = ( virDomainBlockIoTuneInfo ) { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , NULL , 15 , 16 , 17 , 18 , 19 , 20 } ;
if ( VIR_STRDUP ( expectedInfo . group_name , " group14 " ) < 0 )
return - 1 ;
2013-10-02 20:46:42 +04:00
if ( qemuMonitorTestAddItem ( test , " query-block " , queryBlockReply ) < 0 | |
qemuMonitorTestAddItemParams ( test , " block_set_io_throttle " ,
" { \" return \" :{}} " ,
" device " , " \" drive-virtio-disk1 \" " ,
" bps " , " 1 " , " bps_rd " , " 2 " , " bps_wr " , " 3 " ,
" iops " , " 4 " , " iops_rd " , " 5 " , " iops_wr " , " 6 " ,
2014-12-03 16:42:27 +03:00
" bps_max " , " 7 " , " bps_rd_max " , " 8 " ,
" bps_wr_max " , " 9 " ,
" iops_max " , " 10 " , " iops_rd_max " , " 11 " ,
" iops_wr_max " , " 12 " , " iops_size " , " 13 " ,
2016-11-01 00:22:59 +03:00
" group " , " \" group14 \" " ,
" bps_max_length " , " 15 " ,
" bps_rd_max_length " , " 16 " ,
" bps_wr_max_length " , " 17 " ,
" iops_max_length " , " 18 " ,
" iops_rd_max_length " , " 19 " ,
" iops_wr_max_length " , " 20 " ,
2013-10-02 20:46:42 +04:00
NULL , NULL ) < 0 )
goto cleanup ;
if ( qemuMonitorJSONGetBlockIoThrottle ( qemuMonitorTestGetMonitor ( test ) ,
2018-07-25 16:14:43 +03:00
" drive-virtio-disk0 " , NULL , & info ) < 0 )
2013-10-02 20:46:42 +04:00
goto cleanup ;
2017-04-03 19:53:31 +03:00
if ( testValidateGetBlockIoThrottle ( & info , & expectedInfo ) < 0 )
2013-10-02 20:46:42 +04:00
goto cleanup ;
if ( qemuMonitorJSONSetBlockIoThrottle ( qemuMonitorTestGetMonitor ( test ) ,
2018-07-25 16:14:43 +03:00
" drive-virtio-disk1 " , NULL , & info , true ,
2016-11-01 00:22:59 +03:00
true , true ) < 0 )
2013-10-02 20:46:42 +04:00
goto cleanup ;
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2016-11-01 00:22:59 +03:00
VIR_FREE ( info . group_name ) ;
VIR_FREE ( expectedInfo . group_name ) ;
2013-10-02 20:46:42 +04:00
return ret ;
}
2013-10-02 20:55:42 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetTargetArch ( const void * opaque )
2013-10-02 20:55:42 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 20:55:42 +04:00
int ret = - 1 ;
char * arch ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 20:55:42 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 20:55:42 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-target " ,
" { "
" \" return \" : { "
" \" arch \" : \" x86_64 \" "
" }, "
" \" id \" : \" libvirt-21 \" "
" } " ) < 0 )
goto cleanup ;
if ( ! ( arch = qemuMonitorJSONGetTargetArch ( qemuMonitorTestGetMonitor ( test ) ) ) )
goto cleanup ;
if ( STRNEQ ( arch , " x86_64 " ) ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected architecture %s, expecting x86_64 " ,
arch ) ;
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-10-02 20:55:42 +04:00
VIR_FREE ( arch ) ;
return ret ;
}
2013-10-02 21:03:53 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities ( const void * opaque )
2013-10-02 21:03:53 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 21:03:53 +04:00
int ret = - 1 ;
2017-10-17 23:01:01 +03:00
const char * cap ;
char * * caps = NULL ;
2018-03-01 12:51:53 +03:00
virBitmapPtr bitmap = NULL ;
2018-04-05 21:59:07 +03:00
virJSONValuePtr json = NULL ;
2013-10-02 21:03:53 +04:00
const char * reply =
" { "
" \" return \" : [ "
" { "
" \" state \" : false, "
" \" capability \" : \" xbzrle \" "
" } "
" ], "
" \" id \" : \" libvirt-22 \" "
" } " ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 21:03:53 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 21:03:53 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-migrate-capabilities " , reply ) < 0 | |
qemuMonitorTestAddItem ( test , " migrate-set-capabilities " ,
" { \" return \" :{}} " ) < 0 )
goto cleanup ;
2017-10-17 23:01:01 +03:00
if ( qemuMonitorGetMigrationCapabilities ( qemuMonitorTestGetMonitor ( test ) ,
& caps ) < 0 )
goto cleanup ;
2018-04-05 23:17:26 +03:00
cap = qemuMigrationCapabilityTypeToString ( QEMU_MIGRATION_CAP_XBZRLE ) ;
2017-10-17 23:01:01 +03:00
if ( ! virStringListHasString ( ( const char * * ) caps , cap ) ) {
2013-10-02 21:03:53 +04:00
virReportError ( VIR_ERR_INTERNAL_ERROR ,
2017-10-17 23:01:01 +03:00
" Expected capability %s is missing " , cap ) ;
2013-10-02 21:03:53 +04:00
goto cleanup ;
}
2018-04-05 23:17:26 +03:00
bitmap = virBitmapNew ( QEMU_MIGRATION_CAP_LAST ) ;
2018-03-01 12:51:53 +03:00
if ( ! bitmap )
goto cleanup ;
2018-04-05 23:17:26 +03:00
ignore_value ( virBitmapSetBit ( bitmap , QEMU_MIGRATION_CAP_XBZRLE ) ) ;
2018-04-05 21:59:07 +03:00
if ( ! ( json = qemuMigrationCapsToJSON ( bitmap , bitmap ) ) )
2013-10-02 21:03:53 +04:00
goto cleanup ;
2018-04-05 21:59:07 +03:00
ret = qemuMonitorJSONSetMigrationCapabilities ( qemuMonitorTestGetMonitor ( test ) ,
json ) ;
json = NULL ;
2014-03-25 10:53:44 +04:00
cleanup :
2018-04-05 21:59:07 +03:00
virJSONValueFree ( json ) ;
2017-10-17 23:01:01 +03:00
virStringListFree ( caps ) ;
2018-03-01 12:51:53 +03:00
virBitmapFree ( bitmap ) ;
2013-10-02 21:03:53 +04:00
return ret ;
}
2013-10-02 20:23:17 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONSendKey ( const void * opaque )
2013-10-02 20:23:17 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-10-02 20:23:17 +04:00
unsigned int keycodes [ ] = { 43 , 26 , 46 , 32 } ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-10-02 20:23:17 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-10-02 20:23:17 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " send-key " ,
" { \" return \" : {}, \" id \" : \" libvirt-16 \" } " ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 20:23:17 +04:00
if ( qemuMonitorJSONSendKey ( qemuMonitorTestGetMonitor ( test ) ,
2019-10-15 14:55:26 +03:00
0 , keycodes , G_N_ELEMENTS ( keycodes ) ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2013-10-02 20:23:17 +04:00
2019-06-11 06:01:08 +03:00
return 0 ;
2013-10-02 20:23:17 +04:00
}
2014-06-03 13:19:51 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime ( const void * opaque )
2014-06-03 13:19:51 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2014-06-03 13:19:51 +04:00
unsigned int keycodes [ ] = { 43 , 26 , 46 , 32 } ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2014-06-03 13:19:51 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2014-06-03 13:19:51 +04:00
return - 1 ;
if ( qemuMonitorTestAddItemParams ( test , " send-key " ,
" { \" return \" :{}} " ,
" hold-time " , " 31337 " ,
" keys " , " [{ \" type \" : \" number \" , \" data \" :43}, "
" { \" type \" : \" number \" , \" data \" :26}, "
" { \" type \" : \" number \" , \" data \" :46}, "
" { \" type \" : \" number \" , \" data \" :32}] " ,
NULL , NULL ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2014-06-03 13:19:51 +04:00
if ( qemuMonitorJSONSendKey ( qemuMonitorTestGetMonitor ( test ) ,
31337 , keycodes ,
2019-10-15 14:55:26 +03:00
G_N_ELEMENTS ( keycodes ) ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2014-06-03 13:19:51 +04:00
2019-06-11 06:01:08 +03:00
return 0 ;
2014-06-03 13:19:51 +04:00
}
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorSupportsActiveCommit ( const void * opaque )
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
const char * error1 =
" { "
" \" error \" : { "
" \" class \" : \" DeviceNotFound \" , "
" \" desc \" : \" Device 'bogus' not found \" "
" } "
" } " ;
const char * error2 =
" { "
" \" error \" : { "
" \" class \" : \" GenericError \" , "
" \" desc \" : \" Parameter 'top' is missing \" "
" } "
" } " ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
return - 1 ;
if ( qemuMonitorTestAddItemParams ( test , " block-commit " , error1 ,
" device " , " \" bogus \" " ,
NULL , NULL ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
if ( ! qemuMonitorSupportsActiveCommit ( qemuMonitorTestGetMonitor ( test ) ) )
2019-06-11 06:01:08 +03:00
return - 1 ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
if ( qemuMonitorTestAddItemParams ( test , " block-commit " , error2 ,
" device " , " \" bogus \" " ,
NULL , NULL ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
if ( qemuMonitorSupportsActiveCommit ( qemuMonitorTestGetMonitor ( test ) ) )
2019-06-11 06:01:08 +03:00
return - 1 ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
2019-06-11 06:01:08 +03:00
return 0 ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
}
2014-03-23 07:51:13 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability ( const void * opaque )
2014-03-23 07:51:13 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2014-03-23 07:51:13 +04:00
int cap ;
const char * reply =
" { "
" \" return \" : { "
" \" formats \" : [ "
" \" elf \" , "
" \" kdump-zlib \" , "
" \" kdump-lzo \" , "
" \" kdump-snappy \" "
" ] "
" }, "
" \" id \" : \" libvirt-9 \" "
" } " ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2014-03-23 07:51:13 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2014-03-23 07:51:13 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-dump-guest-memory-capability " ,
reply ) < 0 )
2019-06-11 06:01:08 +03:00
return - 1 ;
2014-03-23 07:51:13 +04:00
cap = qemuMonitorJSONGetDumpGuestMemoryCapability (
qemuMonitorTestGetMonitor ( test ) , " elf " ) ;
if ( cap ! = 1 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected capability: %d, expecting 1 " ,
cap ) ;
2019-06-11 06:01:08 +03:00
return - 1 ;
2014-03-23 07:51:13 +04:00
}
2019-06-11 06:01:08 +03:00
return 0 ;
2014-03-23 07:51:13 +04:00
}
2013-07-22 15:07:23 +04:00
struct testCPUData {
const char * name ;
virDomainXMLOptionPtr xmlopt ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
virHashTablePtr schema ;
2013-07-22 15:07:23 +04:00
} ;
static int
testQemuMonitorJSONGetCPUData ( const void * opaque )
{
const struct testCPUData * data = opaque ;
virCPUDataPtr cpuData = NULL ;
char * jsonFile = NULL ;
char * dataFile = NULL ;
char * jsonStr = NULL ;
char * actual = NULL ;
int ret = - 1 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-07-22 15:07:23 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( data - > xmlopt , data - > schema ) ) )
2013-07-22 15:07:23 +04:00
return - 1 ;
if ( virAsprintf ( & jsonFile ,
" %s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json " ,
abs_srcdir , data - > name ) < 0 | |
virAsprintf ( & dataFile ,
" %s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data " ,
abs_srcdir , data - > name ) < 0 )
goto cleanup ;
2016-05-26 18:01:52 +03:00
if ( virTestLoadFile ( jsonFile , & jsonStr ) < 0 )
2013-07-22 15:07:23 +04:00
goto cleanup ;
2013-11-11 19:34:53 +04:00
if ( qemuMonitorTestAddItem ( test , " qom-list " ,
" { "
" \" return \" : [ "
" { "
" \" name \" : \" filtered-features \" , "
" \" type \" : \" X86CPUFeatureWordInfo \" "
" }, "
" { "
" \" name \" : \" feature-words \" , "
" \" type \" : \" X86CPUFeatureWordInfo \" "
" } "
" ], "
" \" id \" : \" libvirt-19 \" "
" } " ) < 0 )
goto cleanup ;
2013-07-22 15:07:23 +04:00
if ( qemuMonitorTestAddItem ( test , " qom-get " , jsonStr ) < 0 )
goto cleanup ;
2019-06-17 17:56:32 +03:00
if ( qemuMonitorJSONGetGuestCPUx86 ( qemuMonitorTestGetMonitor ( test ) ,
& cpuData , NULL ) < 0 )
2013-07-22 15:07:23 +04:00
goto cleanup ;
2016-11-04 17:09:20 +03:00
if ( ! ( actual = virCPUDataFormat ( cpuData ) ) )
2013-07-22 15:07:23 +04:00
goto cleanup ;
2016-05-26 18:01:53 +03:00
if ( virTestCompareToFile ( actual , dataFile ) < 0 )
2013-07-22 15:07:23 +04:00
goto cleanup ;
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2013-07-22 15:07:23 +04:00
VIR_FREE ( jsonFile ) ;
VIR_FREE ( dataFile ) ;
VIR_FREE ( jsonStr ) ;
VIR_FREE ( actual ) ;
2017-02-02 17:37:40 +03:00
virCPUDataFree ( cpuData ) ;
2013-07-22 15:07:23 +04:00
return ret ;
}
2013-11-19 19:30:28 +04:00
static int
testQemuMonitorJSONGetNonExistingCPUData ( const void * opaque )
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2013-11-19 19:30:28 +04:00
virCPUDataPtr cpuData = NULL ;
int rv , ret = - 1 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2013-11-19 19:30:28 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2013-11-19 19:30:28 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " qom-list " ,
" { "
" \" id \" : \" libvirt-7 \" , "
" \" error \" : { "
" \" class \" : \" CommandNotFound \" , "
" \" desc \" : \" The command qom-list has not been found \" "
" } "
" } " ) < 0 )
goto cleanup ;
2019-06-17 17:56:32 +03:00
rv = qemuMonitorJSONGetGuestCPUx86 ( qemuMonitorTestGetMonitor ( test ) ,
& cpuData , NULL ) ;
2013-11-19 19:30:28 +04:00
if ( rv ! = - 2 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected return value %d, expecting -2 " , rv ) ;
goto cleanup ;
}
if ( cpuData ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" Unexpected allocation of data = %p, expecting NULL " ,
cpuData ) ;
goto cleanup ;
}
ret = 0 ;
2014-03-25 10:53:44 +04:00
cleanup :
2017-02-02 17:37:40 +03:00
virCPUDataFree ( cpuData ) ;
2013-11-19 19:30:28 +04:00
return ret ;
}
2013-07-22 15:07:23 +04:00
2014-08-30 00:23:11 +04:00
static int
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
testQemuMonitorJSONGetIOThreads ( const void * opaque )
2014-08-30 00:23:11 +04:00
{
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
const testGenericData * data = opaque ;
virDomainXMLOptionPtr xmlopt = data - > xmlopt ;
2015-03-25 18:59:37 +03:00
qemuMonitorIOThreadInfoPtr * info ;
2014-08-30 00:23:11 +04:00
int ninfo = 0 ;
int ret = - 1 ;
size_t i ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2014-08-30 00:23:11 +04:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( xmlopt , data - > schema ) ) )
2014-08-30 00:23:11 +04:00
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " query-iothreads " ,
" { "
" \" return \" : [ "
" { "
" \" id \" : \" iothread1 \" , "
" \" thread-id \" : 30992 "
" }, "
" { "
" \" id \" : \" iothread2 \" , "
" \" thread-id \" : 30993 "
" } "
" ] "
" } " ) < 0 )
goto cleanup ;
if ( ( ninfo = qemuMonitorGetIOThreads ( qemuMonitorTestGetMonitor ( test ) ,
& info ) ) < 0 )
goto cleanup ;
if ( ninfo ! = 2 ) {
virReportError ( VIR_ERR_INTERNAL_ERROR ,
" ninfo %d is not 2 " , ninfo ) ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define CHECK(i, wantiothread_id, wantthread_id) \
do { \
if ( info [ i ] - > iothread_id ! = ( wantiothread_id ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" iothread_id %u is not %u " , \
info [ i ] - > iothread_id , ( wantiothread_id ) ) ; \
goto cleanup ; \
} \
if ( info [ i ] - > thread_id ! = ( wantthread_id ) ) { \
virReportError ( VIR_ERR_INTERNAL_ERROR , \
" thread_id %d is not %d " , \
info [ i ] - > thread_id , ( wantthread_id ) ) ; \
goto cleanup ; \
} \
2014-08-30 00:23:11 +04:00
} while ( 0 )
2015-04-27 21:16:54 +03:00
CHECK ( 0 , 1 , 30992 ) ;
CHECK ( 1 , 2 , 30993 ) ;
2014-08-30 00:23:11 +04:00
# undef CHECK
ret = 0 ;
cleanup :
for ( i = 0 ; i < ninfo ; i + + )
2015-04-28 13:32:52 +03:00
VIR_FREE ( info [ i ] ) ;
2014-08-30 00:23:11 +04:00
VIR_FREE ( info ) ;
return ret ;
}
2016-07-29 19:08:06 +03:00
struct testCPUInfoData {
const char * name ;
size_t maxvcpus ;
virDomainXMLOptionPtr xmlopt ;
2018-04-04 17:45:04 +03:00
bool fast ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
virHashTablePtr schema ;
2016-07-29 19:08:06 +03:00
} ;
static char *
testQemuMonitorCPUInfoFormat ( qemuMonitorCPUInfoPtr vcpus ,
size_t nvcpus )
{
virBuffer buf = VIR_BUFFER_INITIALIZER ;
qemuMonitorCPUInfoPtr vcpu ;
size_t i ;
for ( i = 0 ; i < nvcpus ; i + + ) {
vcpu = vcpus + i ;
virBufferAsprintf ( & buf , " [vcpu libvirt-id='%zu'] \n " , i ) ;
virBufferAdjustIndent ( & buf , 4 ) ;
2016-09-13 18:52:38 +03:00
virBufferAsprintf ( & buf , " online=%s \n " , vcpu - > online ? " yes " : " no " ) ;
virBufferAsprintf ( & buf , " hotpluggable=%s \n " , vcpu - > hotpluggable ? " yes " : " no " ) ;
2016-07-29 19:08:06 +03:00
if ( vcpu - > tid )
virBufferAsprintf ( & buf , " thread-id='%llu' \n " ,
( unsigned long long ) vcpu - > tid ) ;
if ( vcpu - > id ! = 0 )
2016-11-22 12:21:46 +03:00
virBufferAsprintf ( & buf , " enable-id='%d' \n " , vcpu - > id ) ;
2016-07-29 19:08:06 +03:00
2016-11-22 11:32:11 +03:00
if ( vcpu - > qemu_id ! = - 1 )
virBufferAsprintf ( & buf , " query-cpus-id='%d' \n " , vcpu - > qemu_id ) ;
2016-07-29 19:08:06 +03:00
if ( vcpu - > type )
virBufferAsprintf ( & buf , " type='%s' \n " , vcpu - > type ) ;
if ( vcpu - > alias )
virBufferAsprintf ( & buf , " alias='%s' \n " , vcpu - > alias ) ;
if ( vcpu - > qom_path )
virBufferAsprintf ( & buf , " qom_path='%s' \n " , vcpu - > qom_path ) ;
if ( vcpu - > socket_id ! = - 1 | | vcpu - > core_id ! = - 1 | |
vcpu - > thread_id ! = - 1 | | vcpu - > vcpus ! = 0 ) {
virBufferAddLit ( & buf , " topology: " ) ;
if ( vcpu - > socket_id ! = - 1 )
virBufferAsprintf ( & buf , " socket='%d' " , vcpu - > socket_id ) ;
if ( vcpu - > core_id ! = - 1 )
virBufferAsprintf ( & buf , " core='%d' " , vcpu - > core_id ) ;
if ( vcpu - > thread_id ! = - 1 )
virBufferAsprintf ( & buf , " thread='%d' " , vcpu - > thread_id ) ;
2017-06-27 17:04:38 +03:00
if ( vcpu - > node_id ! = - 1 )
virBufferAsprintf ( & buf , " node='%d' " , vcpu - > node_id ) ;
2016-07-29 19:08:06 +03:00
if ( vcpu - > vcpus ! = 0 )
virBufferAsprintf ( & buf , " vcpus='%u' " , vcpu - > vcpus ) ;
virBufferAddLit ( & buf , " \n " ) ;
}
2018-04-12 18:14:30 +03:00
if ( vcpu - > halted )
virBufferAddLit ( & buf , " halted \n " ) ;
2016-07-29 19:08:06 +03:00
virBufferAdjustIndent ( & buf , - 4 ) ;
}
return virBufferContentAndReset ( & buf ) ;
}
static int
testQemuMonitorCPUInfo ( const void * opaque )
{
const struct testCPUInfoData * data = opaque ;
2018-04-04 17:45:04 +03:00
virDomainObjPtr vm = NULL ;
2016-07-29 19:08:06 +03:00
char * queryCpusFile = NULL ;
char * queryHotpluggableFile = NULL ;
char * dataFile = NULL ;
char * queryCpusStr = NULL ;
char * queryHotpluggableStr = NULL ;
char * actual = NULL ;
2018-04-04 17:45:04 +03:00
const char * queryCpusFunction ;
2016-07-29 19:08:06 +03:00
qemuMonitorCPUInfoPtr vcpus = NULL ;
int rc ;
int ret = - 1 ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
2016-07-29 19:08:06 +03:00
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( data - > xmlopt , data - > schema ) ) )
2016-07-29 19:08:06 +03:00
return - 1 ;
if ( virAsprintf ( & queryCpusFile ,
" %s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.json " ,
abs_srcdir , data - > name ) < 0 | |
virAsprintf ( & queryHotpluggableFile ,
" %s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug.json " ,
abs_srcdir , data - > name ) < 0 | |
virAsprintf ( & dataFile ,
" %s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data " ,
abs_srcdir , data - > name ) < 0 )
goto cleanup ;
if ( virTestLoadFile ( queryCpusFile , & queryCpusStr ) < 0 )
goto cleanup ;
if ( virTestLoadFile ( queryHotpluggableFile , & queryHotpluggableStr ) < 0 )
goto cleanup ;
if ( qemuMonitorTestAddItem ( test , " query-hotpluggable-cpus " ,
queryHotpluggableStr ) < 0 )
goto cleanup ;
2018-04-04 17:45:04 +03:00
if ( data - > fast )
queryCpusFunction = " query-cpus-fast " ;
else
queryCpusFunction = " query-cpus " ;
if ( qemuMonitorTestAddItem ( test , queryCpusFunction , queryCpusStr ) < 0 )
2016-07-29 19:08:06 +03:00
goto cleanup ;
2018-04-04 17:45:04 +03:00
vm = qemuMonitorTestGetDomainObj ( test ) ;
if ( ! vm )
2018-04-18 13:33:42 +03:00
goto cleanup ;
2018-04-04 17:45:04 +03:00
2016-07-29 19:08:06 +03:00
rc = qemuMonitorGetCPUInfo ( qemuMonitorTestGetMonitor ( test ) ,
2018-04-04 17:45:04 +03:00
& vcpus , data - > maxvcpus , true , data - > fast ) ;
2016-07-29 19:08:06 +03:00
if ( rc < 0 )
goto cleanup ;
actual = testQemuMonitorCPUInfoFormat ( vcpus , data - > maxvcpus ) ;
if ( virTestCompareToFile ( actual , dataFile ) < 0 )
goto cleanup ;
ret = 0 ;
cleanup :
VIR_FREE ( queryCpusFile ) ;
VIR_FREE ( queryHotpluggableFile ) ;
VIR_FREE ( dataFile ) ;
VIR_FREE ( queryCpusStr ) ;
VIR_FREE ( queryHotpluggableStr ) ;
VIR_FREE ( actual ) ;
qemuMonitorCPUInfoFree ( vcpus , data - > maxvcpus ) ;
return ret ;
}
2017-07-26 10:42:11 +03:00
static int
testBlockNodeNameDetectFormat ( void * payload ,
const void * name ,
void * opaque )
2017-03-13 14:47:46 +03:00
{
2017-07-26 10:42:11 +03:00
qemuBlockNodeNameBackingChainDataPtr entry = payload ;
const char * diskalias = name ;
virBufferPtr buf = opaque ;
2017-03-13 14:47:46 +03:00
virBufferSetIndent ( buf , 0 ) ;
2017-07-26 10:42:11 +03:00
virBufferAdd ( buf , diskalias , - 1 ) ;
virBufferAddLit ( buf , " \n " ) ;
2017-03-13 14:47:46 +03:00
2017-07-26 10:36:21 +03:00
while ( entry ) {
2017-03-13 14:47:46 +03:00
virBufferAsprintf ( buf , " filename : '%s' \n " , entry - > qemufilename ) ;
virBufferAsprintf ( buf , " format node : '%s' \n " ,
NULLSTR ( entry - > nodeformat ) ) ;
2017-07-25 20:10:27 +03:00
virBufferAsprintf ( buf , " format drv : '%s' \n " , NULLSTR ( entry - > drvformat ) ) ;
2017-03-13 14:47:46 +03:00
virBufferAsprintf ( buf , " storage node: '%s' \n " ,
NULLSTR ( entry - > nodestorage ) ) ;
2017-07-25 20:10:27 +03:00
virBufferAsprintf ( buf , " storage drv : '%s' \n " , NULLSTR ( entry - > drvstorage ) ) ;
2017-03-13 14:47:46 +03:00
virBufferAdjustIndent ( buf , 2 ) ;
2017-07-26 10:36:21 +03:00
entry = entry - > backing ;
2017-03-13 14:47:46 +03:00
}
virBufferSetIndent ( buf , 0 ) ;
virBufferAddLit ( buf , " \n " ) ;
2017-07-26 10:42:11 +03:00
return 0 ;
2017-03-13 14:47:46 +03:00
}
static int
testBlockNodeNameDetect ( const void * opaque )
{
2017-07-26 10:42:11 +03:00
const char * testname = opaque ;
2017-07-25 16:49:00 +03:00
const char * pathprefix = " qemumonitorjsondata/qemumonitorjson-nodename- " ;
2017-03-13 14:47:46 +03:00
char * resultFile = NULL ;
char * actual = NULL ;
2017-07-26 10:30:18 +03:00
virJSONValuePtr namedNodesJson = NULL ;
2017-07-26 10:36:21 +03:00
virJSONValuePtr blockstatsJson = NULL ;
2017-03-13 14:47:46 +03:00
virHashTablePtr nodedata = NULL ;
virBuffer buf = VIR_BUFFER_INITIALIZER ;
int ret = - 1 ;
2017-07-25 16:49:00 +03:00
if ( virAsprintf ( & resultFile , " %s/%s%s.result " ,
2017-07-26 10:42:11 +03:00
abs_srcdir , pathprefix , testname ) < 0 )
2017-03-13 14:47:46 +03:00
goto cleanup ;
2017-07-26 10:42:11 +03:00
if ( ! ( namedNodesJson = virTestLoadFileJSON ( pathprefix , testname ,
2017-07-25 16:49:00 +03:00
" -named-nodes.json " , NULL ) ) )
2017-03-13 14:47:46 +03:00
goto cleanup ;
2017-07-26 10:42:11 +03:00
if ( ! ( blockstatsJson = virTestLoadFileJSON ( pathprefix , testname ,
2017-07-26 10:36:21 +03:00
" -blockstats.json " , NULL ) ) )
goto cleanup ;
if ( ! ( nodedata = qemuBlockNodeNameGetBackingChain ( namedNodesJson ,
blockstatsJson ) ) )
2017-03-13 14:47:46 +03:00
goto cleanup ;
2017-07-26 10:42:11 +03:00
virHashForEach ( nodedata , testBlockNodeNameDetectFormat , & buf ) ;
2017-03-13 14:47:46 +03:00
virBufferTrim ( & buf , " \n " , - 1 ) ;
if ( virBufferCheckError ( & buf ) < 0 )
goto cleanup ;
actual = virBufferContentAndReset ( & buf ) ;
if ( virTestCompareToFile ( actual , resultFile ) < 0 )
goto cleanup ;
ret = 0 ;
cleanup :
VIR_FREE ( resultFile ) ;
VIR_FREE ( actual ) ;
virHashFree ( nodedata ) ;
2017-07-26 10:30:18 +03:00
virJSONValueFree ( namedNodesJson ) ;
2017-07-26 10:36:21 +03:00
virJSONValueFree ( blockstatsJson ) ;
2017-03-13 14:47:46 +03:00
return ret ;
}
2018-03-22 19:07:43 +03:00
struct testQAPISchemaData {
virHashTablePtr schema ;
const char * name ;
const char * query ;
const char * json ;
bool success ;
2019-04-09 14:22:32 +03:00
int rc ;
bool replyobj ;
2018-03-22 19:07:43 +03:00
} ;
2019-04-09 14:22:32 +03:00
static int
testQAPISchemaQuery ( const void * opaque )
{
const struct testQAPISchemaData * data = opaque ;
virJSONValuePtr replyobj = NULL ;
int rc ;
rc = virQEMUQAPISchemaPathGet ( data - > query , data - > schema , & replyobj ) ;
if ( data - > rc ! = rc | | data - > replyobj ! = ! ! replyobj ) {
VIR_TEST_VERBOSE ( " \n success: expected '%d' got '%d', replyobj: expected '%d' got '%d' " ,
data - > rc , rc , data - > replyobj , ! ! replyobj ) ;
return - 1 ;
}
return 0 ;
}
2018-03-22 19:07:43 +03:00
static int
2019-04-09 11:32:33 +03:00
testQAPISchemaValidate ( const void * opaque )
2018-03-22 19:07:43 +03:00
{
const struct testQAPISchemaData * data = opaque ;
virBuffer debug = VIR_BUFFER_INITIALIZER ;
virJSONValuePtr schemaroot ;
virJSONValuePtr json = NULL ;
int ret = - 1 ;
if ( virQEMUQAPISchemaPathGet ( data - > query , data - > schema , & schemaroot ) < 0 )
goto cleanup ;
if ( ! ( json = virJSONValueFromString ( data - > json ) ) )
goto cleanup ;
if ( ( testQEMUSchemaValidate ( json , schemaroot , data - > schema , & debug ) = = 0 ) ! = data - > success ) {
if ( ! data - > success )
2019-05-03 11:45:58 +03:00
VIR_TEST_VERBOSE ( " \n schema validation should have failed " ) ;
2018-03-22 19:07:43 +03:00
} else {
ret = 0 ;
}
2018-07-12 14:36:48 +03:00
if ( virTestGetDebug ( ) > = 3 | |
2018-03-22 19:07:43 +03:00
( ret < 0 & & virTestGetVerbose ( ) ) ) {
char * debugstr = virBufferContentAndReset ( & debug ) ;
fprintf ( stderr , " \n %s \n " , debugstr ) ;
VIR_FREE ( debugstr ) ;
}
cleanup :
virBufferFreeAndReset ( & debug ) ;
virJSONValueFree ( json ) ;
return ret ;
}
2018-12-04 19:58:38 +03:00
static void
testQueryJobsPrintJob ( virBufferPtr buf ,
qemuMonitorJobInfoPtr job )
{
virBufferAddLit ( buf , " [job] \n " ) ;
virBufferAsprintf ( buf , " id=%s \n " , NULLSTR ( job - > id ) ) ;
virBufferAsprintf ( buf , " type=%s \n " , NULLSTR ( qemuMonitorJobTypeToString ( job - > type ) ) ) ;
virBufferAsprintf ( buf , " status=%s \n " , NULLSTR ( qemuMonitorJobStatusTypeToString ( job - > status ) ) ) ;
virBufferAsprintf ( buf , " error=%s \n " , NULLSTR ( job - > error ) ) ;
virBufferAddLit ( buf , " \n " ) ;
}
struct testQueryJobsData {
const char * name ;
virDomainXMLOptionPtr xmlopt ;
} ;
static int
testQueryJobs ( const void * opaque )
{
const struct testQueryJobsData * data = opaque ;
qemuMonitorTestPtr test = qemuMonitorTestNewSimple ( data - > xmlopt ) ;
2019-10-15 16:16:31 +03:00
g_autofree char * filenameJSON = NULL ;
g_autofree char * fileJSON = NULL ;
g_autofree char * filenameResult = NULL ;
g_autofree char * actual = NULL ;
2018-12-04 19:58:38 +03:00
qemuMonitorJobInfoPtr * jobs = NULL ;
virBuffer buf = VIR_BUFFER_INITIALIZER ;
size_t njobs = 0 ;
size_t i ;
int ret = - 1 ;
2019-07-23 15:09:19 +03:00
if ( ! test )
return - 1 ;
2018-12-04 19:58:38 +03:00
if ( virAsprintf ( & filenameJSON ,
abs_srcdir " /qemumonitorjsondata/query-jobs-%s.json " ,
data - > name ) < 0 | |
virAsprintf ( & filenameResult ,
abs_srcdir " /qemumonitorjsondata/query-jobs-%s.result " ,
data - > name ) < 0 )
goto cleanup ;
if ( virTestLoadFile ( filenameJSON , & fileJSON ) < 0 )
goto cleanup ;
if ( qemuMonitorTestAddItem ( test , " query-jobs " , fileJSON ) < 0 )
goto cleanup ;
if ( qemuMonitorJSONGetJobInfo ( qemuMonitorTestGetMonitor ( test ) ,
& jobs , & njobs ) < 0 )
goto cleanup ;
for ( i = 0 ; i < njobs ; i + + )
testQueryJobsPrintJob ( & buf , jobs [ i ] ) ;
virBufferTrim ( & buf , " \n " , - 1 ) ;
if ( virBufferCheckError ( & buf ) < 0 )
goto cleanup ;
actual = virBufferContentAndReset ( & buf ) ;
if ( virTestCompareToFile ( actual , filenameResult ) < 0 )
goto cleanup ;
ret = 0 ;
cleanup :
2019-07-29 15:12:22 +03:00
for ( i = 0 ; i < njobs ; i + + )
qemuMonitorJobInfoFree ( jobs [ i ] ) ;
VIR_FREE ( jobs ) ;
2018-12-04 19:58:38 +03:00
qemuMonitorTestFree ( test ) ;
return ret ;
}
2019-09-26 17:12:20 +03:00
static int
testQemuMonitorJSONTransaction ( const void * opaque )
{
const testGenericData * data = opaque ;
2019-10-15 15:47:50 +03:00
g_autoptr ( qemuMonitorTest ) test = NULL ;
g_autoptr ( virJSONValue ) actions = NULL ;
g_autoptr ( virJSONValue ) mergebitmaps = NULL ;
2019-09-26 17:12:20 +03:00
if ( ! ( test = qemuMonitorTestNewSchema ( data - > xmlopt , data - > schema ) ) )
return - 1 ;
if ( ! ( actions = virJSONValueNewArray ( ) ) | |
! ( mergebitmaps = virJSONValueNewArray ( ) ) )
return - 1 ;
if ( virJSONValueArrayAppendString ( mergebitmaps , " mergemap1 " ) < 0 | |
virJSONValueArrayAppendString ( mergebitmaps , " mergemap2 " ) < 0 )
return - 1 ;
if ( qemuMonitorTransactionBitmapAdd ( actions , " node1 " , " bitmap1 " , true , true ) < 0 | |
qemuMonitorTransactionBitmapRemove ( actions , " node2 " , " bitmap2 " ) < 0 | |
qemuMonitorTransactionBitmapEnable ( actions , " node3 " , " bitmap3 " ) < 0 | |
qemuMonitorTransactionBitmapDisable ( actions , " node4 " , " bitmap4 " ) < 0 | |
qemuMonitorTransactionBitmapMerge ( actions , " node5 " , " bitmap5 " , & mergebitmaps ) < 0 | |
qemuMonitorTransactionSnapshotLegacy ( actions , " dev6 " , " path " , " qcow2 " , true ) < 0 | |
qemuMonitorTransactionSnapshotBlockdev ( actions , " node7 " , " overlay7 " ) < 0 )
return - 1 ;
if ( qemuMonitorTestAddItem ( test , " transaction " , " { \" return \" :{}} " ) < 0 )
return - 1 ;
if ( qemuMonitorJSONTransaction ( qemuMonitorTestGetMonitor ( test ) , & actions ) < 0 )
return - 1 ;
return 0 ;
}
2012-08-20 16:31:29 +04:00
static int
mymain ( void )
{
int ret = 0 ;
tests: Avoid use of virQEMUDriverCreateXMLConf(NULL)
We use the function to create a virDomainXMLOption object that is
required for some functions. However, we don't pass the driver
pointer to the object anywhere - rather than pass NULL. This
causes trouble later when parsing a domain XML and calling post
parse callbacks:
Program received signal SIGSEGV, Segmentation fault.
0x000000000043fa3e in qemuDomainDefPostParse (def=0x7d36c0, caps=0x7caf10, opaque=0x0) at qemu/qemu_domain.c:1043
1043 qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
(gdb) bt
#0 0x000000000043fa3e in qemuDomainDefPostParse (def=0x7d36c0, caps=0x7caf10, opaque=0x0) at qemu/qemu_domain.c:1043
#1 0x00007ffff2928bf9 in virDomainDefPostParse (def=0x7d36c0, caps=0x7caf10, xmlopt=0x7c82c0) at conf/domain_conf.c:4269
#2 0x00007ffff294de04 in virDomainDefParseXML (xml=0x7da8c0, root=0x7dab80, ctxt=0x7da980, caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16400
#3 0x00007ffff294e5b5 in virDomainDefParseNode (xml=0x7da8c0, root=0x7dab80, caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16582
#4 0x00007ffff294e424 in virDomainDefParse (xmlStr=0x0, filename=0x7c7ef0 "/home/zippy/work/libvirt/libvirt.git/tests/securityselinuxlabeldata/disks.xml", caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16529
#5 0x00007ffff294e4b2 in virDomainDefParseFile (filename=0x7c7ef0 "/home/zippy/work/libvirt/libvirt.git/tests/securityselinuxlabeldata/disks.xml", caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16553
#6 0x00000000004303ca in testSELinuxLoadDef (testname=0x53c929 "disks") at securityselinuxlabeltest.c:192
#7 0x00000000004309e8 in testSELinuxLabeling (opaque=0x53c929) at securityselinuxlabeltest.c:313
#8 0x0000000000431207 in virtTestRun (title=0x53c92f "Labelling \"disks\"", body=0x430964 <testSELinuxLabeling>, data=0x53c929) at testutils.c:211
#9 0x0000000000430c5d in mymain () at securityselinuxlabeltest.c:373
#10 0x00000000004325c2 in virtTestMain (argc=1, argv=0x7fffffffd7e8, func=0x430b4a <mymain>) at testutils.c:863
#11 0x0000000000430deb in main (argc=1, argv=0x7fffffffd7e8) at securityselinuxlabeltest.c:381
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-09-22 17:27:57 +03:00
virQEMUDriver driver ;
2013-09-18 19:28:31 +04:00
testQemuMonitorJSONSimpleFuncData simpleFunc ;
2018-03-22 19:07:43 +03:00
struct testQAPISchemaData qapiData ;
2018-07-09 16:44:52 +03:00
virJSONValuePtr metaschema = NULL ;
char * metaschemastr = NULL ;
2012-08-20 16:31:29 +04:00
2018-08-13 14:40:18 +03:00
# if !WITH_YAJL
2018-05-09 17:42:43 +03:00
fputs ( " libvirt not compiled with JSON support, skipping this test \n " , stderr ) ;
2013-02-23 02:28:53 +04:00
return EXIT_AM_SKIP ;
# endif
2019-09-16 19:44:23 +03:00
if ( qemuTestDriverInit ( & driver ) < 0 )
2013-02-23 02:42:39 +04:00
return EXIT_FAILURE ;
2012-08-20 16:31:29 +04:00
virEventRegisterDefaultImpl ( ) ;
2018-03-22 21:07:21 +03:00
if ( ! ( qapiData . schema = testQEMUSchemaLoad ( ) ) ) {
2019-05-03 11:45:58 +03:00
VIR_TEST_VERBOSE ( " failed to load qapi schema " ) ;
2018-03-22 21:07:21 +03:00
ret = - 1 ;
goto cleanup ;
}
2017-11-03 15:09:47 +03:00
# define DO_TEST(name) \
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
do { \
testGenericData data = { driver . xmlopt , qapiData . schema } ; \
if ( virTestRun ( # name , testQemuMonitorJSON # # name , & data ) < 0 ) \
ret = - 1 ; \
} while ( 0 )
2012-08-20 16:31:29 +04:00
2017-11-03 15:09:47 +03:00
# define DO_TEST_SIMPLE(CMD, FNC, ...) \
2013-09-18 19:28:31 +04:00
simpleFunc = ( testQemuMonitorJSONSimpleFuncData ) { . cmd = CMD , . func = FNC , \
2018-07-12 14:40:00 +03:00
. xmlopt = driver . xmlopt , \
. schema = qapiData . schema , \
__VA_ARGS__ } ; \
2017-11-03 15:09:47 +03:00
if ( virTestRun ( # FNC , testQemuMonitorJSONSimpleFunc , & simpleFunc ) < 0 ) \
2013-09-18 19:28:31 +04:00
ret = - 1
2013-10-01 18:23:50 +04:00
# define DO_TEST_GEN(name, ...) \
tests: Avoid use of virQEMUDriverCreateXMLConf(NULL)
We use the function to create a virDomainXMLOption object that is
required for some functions. However, we don't pass the driver
pointer to the object anywhere - rather than pass NULL. This
causes trouble later when parsing a domain XML and calling post
parse callbacks:
Program received signal SIGSEGV, Segmentation fault.
0x000000000043fa3e in qemuDomainDefPostParse (def=0x7d36c0, caps=0x7caf10, opaque=0x0) at qemu/qemu_domain.c:1043
1043 qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
(gdb) bt
#0 0x000000000043fa3e in qemuDomainDefPostParse (def=0x7d36c0, caps=0x7caf10, opaque=0x0) at qemu/qemu_domain.c:1043
#1 0x00007ffff2928bf9 in virDomainDefPostParse (def=0x7d36c0, caps=0x7caf10, xmlopt=0x7c82c0) at conf/domain_conf.c:4269
#2 0x00007ffff294de04 in virDomainDefParseXML (xml=0x7da8c0, root=0x7dab80, ctxt=0x7da980, caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16400
#3 0x00007ffff294e5b5 in virDomainDefParseNode (xml=0x7da8c0, root=0x7dab80, caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16582
#4 0x00007ffff294e424 in virDomainDefParse (xmlStr=0x0, filename=0x7c7ef0 "/home/zippy/work/libvirt/libvirt.git/tests/securityselinuxlabeldata/disks.xml", caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16529
#5 0x00007ffff294e4b2 in virDomainDefParseFile (filename=0x7c7ef0 "/home/zippy/work/libvirt/libvirt.git/tests/securityselinuxlabeldata/disks.xml", caps=0x7caf10, xmlopt=0x7c82c0, flags=0) at conf/domain_conf.c:16553
#6 0x00000000004303ca in testSELinuxLoadDef (testname=0x53c929 "disks") at securityselinuxlabeltest.c:192
#7 0x00000000004309e8 in testSELinuxLabeling (opaque=0x53c929) at securityselinuxlabeltest.c:313
#8 0x0000000000431207 in virtTestRun (title=0x53c92f "Labelling \"disks\"", body=0x430964 <testSELinuxLabeling>, data=0x53c929) at testutils.c:211
#9 0x0000000000430c5d in mymain () at securityselinuxlabeltest.c:373
#10 0x00000000004325c2 in virtTestMain (argc=1, argv=0x7fffffffd7e8, func=0x430b4a <mymain>) at testutils.c:863
#11 0x0000000000430deb in main (argc=1, argv=0x7fffffffd7e8) at securityselinuxlabeltest.c:381
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-09-22 17:27:57 +03:00
simpleFunc = ( testQemuMonitorJSONSimpleFuncData ) { . xmlopt = driver . xmlopt , \
2018-07-12 14:53:25 +03:00
. schema = qapiData . schema \
2017-11-03 15:09:47 +03:00
__VA_ARGS__ } ; \
if ( virTestRun ( # name , testQemuMonitorJSON # # name , & simpleFunc ) < 0 ) \
2013-10-01 18:23:50 +04:00
ret = - 1
2013-07-22 15:07:23 +04:00
# define DO_TEST_CPU_DATA(name) \
2017-11-03 15:09:47 +03:00
do { \
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
struct testCPUData data = { name , driver . xmlopt , qapiData . schema } ; \
2017-11-03 15:09:47 +03:00
const char * label = " GetCPUData( " name " ) " ; \
if ( virTestRun ( label , testQemuMonitorJSONGetCPUData , & data ) < 0 ) \
ret = - 1 ; \
2013-07-22 15:07:23 +04:00
} while ( 0 )
2017-11-03 15:09:47 +03:00
# define DO_TEST_CPU_INFO(name, maxvcpus) \
do { \
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
struct testCPUInfoData data = { name , maxvcpus , driver . xmlopt , false , \
qapiData . schema } ; \
2018-04-04 17:45:04 +03:00
if ( virTestRun ( " GetCPUInfo( " name " ) " , testQemuMonitorCPUInfo , \
& data ) < 0 ) \
ret = - 1 ; \
} while ( 0 )
# define DO_TEST_CPU_INFO_FAST(name, maxvcpus) \
do { \
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
struct testCPUInfoData data = { name , maxvcpus , driver . xmlopt , true , \
qapiData . schema } ; \
2017-11-03 15:09:47 +03:00
if ( virTestRun ( " GetCPUInfo( " name " ) " , testQemuMonitorCPUInfo , \
& data ) < 0 ) \
ret = - 1 ; \
2016-07-29 19:08:06 +03:00
} while ( 0 )
2012-08-20 16:31:29 +04:00
DO_TEST ( GetStatus ) ;
2012-08-15 18:04:09 +04:00
DO_TEST ( GetVersion ) ;
2012-08-15 19:18:41 +04:00
DO_TEST ( GetMachines ) ;
2012-08-20 18:58:20 +04:00
DO_TEST ( GetCPUDefinitions ) ;
2012-08-22 13:25:20 +04:00
DO_TEST ( GetCommands ) ;
2013-04-26 15:13:05 +04:00
DO_TEST ( GetTPMModels ) ;
2013-04-26 21:13:45 +04:00
DO_TEST ( GetCommandLineOptionParameters ) ;
qemumonitorjsontest: Validate more commands against schema
The DO_TEST() macro in qemumonitorjsontest.c was not passing the
schema through, which meant that we were not validating any of those
tests for correct usage according to the schema.
In the process of mechanically altering tests to pass the schema
through, use VIR_AUTOPTR on all of the affected test instances. The
next patch will do some further cleanups that it exposes.
Tested by using this hack, where the test mistakenly passed pre-patch,
but correctly diagnosed the garbage post-patch:
| diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c
| index 53a7de8b77..86d8450814 100644
| --- i/src/qemu/qemu_monitor_json.c
| +++ w/src/qemu/qemu_monitor_json.c
| @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
| if (reason)
| *reason = VIR_DOMAIN_PAUSED_UNKNOWN;
|
| - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL)))
| + if (!(cmd = qemuMonitorJSONMakeCommand("query-status",
| + "s:garbage", "foo", NULL)))
| return -1;
|
| if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
Suggested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
2019-06-12 04:59:11 +03:00
if ( qemuMonitorJSONTestAttachChardev ( driver . xmlopt , qapiData . schema ) < 0 )
2016-09-27 16:49:05 +03:00
ret = - 1 ;
2013-03-12 22:57:48 +04:00
DO_TEST ( DetachChardev ) ;
2013-06-24 21:51:56 +04:00
DO_TEST ( GetListPaths ) ;
2013-07-03 22:15:07 +04:00
DO_TEST ( GetObjectProperty ) ;
2013-07-03 22:42:40 +04:00
DO_TEST ( SetObjectProperty ) ;
2013-07-19 17:01:38 +04:00
DO_TEST ( GetDeviceAliases ) ;
2013-09-18 17:11:06 +04:00
DO_TEST ( CPU ) ;
2013-11-19 19:30:28 +04:00
DO_TEST ( GetNonExistingCPUData ) ;
2014-08-30 00:23:11 +04:00
DO_TEST ( GetIOThreads ) ;
2019-09-26 17:12:20 +03:00
DO_TEST ( Transaction ) ;
2013-09-18 19:28:31 +04:00
DO_TEST_SIMPLE ( " qmp_capabilities " , qemuMonitorJSONSetCapabilities ) ;
2013-10-01 18:28:51 +04:00
DO_TEST_SIMPLE ( " system_powerdown " , qemuMonitorJSONSystemPowerdown ) ;
2013-09-18 19:28:31 +04:00
DO_TEST_SIMPLE ( " system_reset " , qemuMonitorJSONSystemReset ) ;
DO_TEST_SIMPLE ( " migrate_cancel " , qemuMonitorJSONMigrateCancel ) ;
DO_TEST_SIMPLE ( " inject-nmi " , qemuMonitorJSONInjectNMI ) ;
DO_TEST_SIMPLE ( " system_wakeup " , qemuMonitorJSONSystemWakeup ) ;
DO_TEST_SIMPLE ( " nbd-server-stop " , qemuMonitorJSONNBDServerStop ) ;
2014-08-13 16:28:24 +04:00
DO_TEST_SIMPLE ( " rtc-reset-reinjection " , qemuMonitorJSONRTCResetReinjection ) ;
2013-10-01 18:23:50 +04:00
DO_TEST_GEN ( qemuMonitorJSONSetLink ) ;
DO_TEST_GEN ( qemuMonitorJSONBlockResize ) ;
DO_TEST_GEN ( qemuMonitorJSONSetPassword ) ;
DO_TEST_GEN ( qemuMonitorJSONExpirePassword ) ;
DO_TEST_GEN ( qemuMonitorJSONSetBalloon ) ;
DO_TEST_GEN ( qemuMonitorJSONSetCPU ) ;
DO_TEST_GEN ( qemuMonitorJSONEjectMedia ) ;
DO_TEST_GEN ( qemuMonitorJSONChangeMedia ) ;
DO_TEST_GEN ( qemuMonitorJSONSaveVirtualMemory ) ;
DO_TEST_GEN ( qemuMonitorJSONSavePhysicalMemory ) ;
DO_TEST_GEN ( qemuMonitorJSONSetMigrationSpeed ) ;
DO_TEST_GEN ( qemuMonitorJSONSetMigrationDowntime ) ;
DO_TEST_GEN ( qemuMonitorJSONMigrate ) ;
DO_TEST_GEN ( qemuMonitorJSONDump ) ;
DO_TEST_GEN ( qemuMonitorJSONGraphicsRelocate ) ;
DO_TEST_GEN ( qemuMonitorJSONAddNetdev ) ;
DO_TEST_GEN ( qemuMonitorJSONRemoveNetdev ) ;
DO_TEST_GEN ( qemuMonitorJSONDelDevice ) ;
DO_TEST_GEN ( qemuMonitorJSONAddDevice ) ;
DO_TEST_GEN ( qemuMonitorJSONDriveMirror ) ;
2018-08-16 19:42:12 +03:00
DO_TEST_GEN ( qemuMonitorJSONBlockdevMirror ) ;
2018-08-15 16:42:22 +03:00
DO_TEST_GEN ( qemuMonitorJSONBlockStream ) ;
2013-10-01 18:23:50 +04:00
DO_TEST_GEN ( qemuMonitorJSONBlockCommit ) ;
DO_TEST_GEN ( qemuMonitorJSONDrivePivot ) ;
DO_TEST_GEN ( qemuMonitorJSONScreendump ) ;
DO_TEST_GEN ( qemuMonitorJSONOpenGraphics ) ;
DO_TEST_GEN ( qemuMonitorJSONNBDServerAdd ) ;
DO_TEST_GEN ( qemuMonitorJSONDetachCharDev ) ;
2018-07-12 13:11:31 +03:00
DO_TEST_GEN ( qemuMonitorJSONBlockdevTrayOpen ) ;
DO_TEST_GEN ( qemuMonitorJSONBlockdevTrayClose ) ;
DO_TEST_GEN ( qemuMonitorJSONBlockdevMediumRemove ) ;
DO_TEST_GEN ( qemuMonitorJSONBlockdevMediumInsert ) ;
2019-06-06 05:25:05 +03:00
DO_TEST_GEN ( qemuMonitorJSONAddBitmap ) ;
DO_TEST_GEN ( qemuMonitorJSONEnableBitmap ) ;
DO_TEST_GEN ( qemuMonitorJSONDeleteBitmap ) ;
2018-08-16 12:48:41 +03:00
DO_TEST_GEN ( qemuMonitorJSONJobDismiss ) ;
2018-08-16 12:48:41 +03:00
DO_TEST_GEN ( qemuMonitorJSONJobCancel ) ;
2018-08-16 12:48:41 +03:00
DO_TEST_GEN ( qemuMonitorJSONJobComplete ) ;
2013-10-02 14:02:53 +04:00
DO_TEST ( qemuMonitorJSONGetBalloonInfo ) ;
2013-10-02 16:39:10 +04:00
DO_TEST ( qemuMonitorJSONGetBlockInfo ) ;
2018-06-18 11:24:17 +03:00
DO_TEST ( qemuMonitorJSONGetAllBlockStatsInfo ) ;
2013-10-02 18:01:46 +04:00
DO_TEST ( qemuMonitorJSONGetMigrationCacheSize ) ;
2015-11-26 15:23:08 +03:00
DO_TEST ( qemuMonitorJSONGetMigrationStats ) ;
2014-11-13 18:17:21 +03:00
DO_TEST ( qemuMonitorJSONGetChardevInfo ) ;
2013-10-02 20:46:42 +04:00
DO_TEST ( qemuMonitorJSONSetBlockIoThrottle ) ;
2013-10-02 20:55:42 +04:00
DO_TEST ( qemuMonitorJSONGetTargetArch ) ;
2018-03-01 12:51:53 +03:00
DO_TEST ( qemuMonitorJSONGetMigrationCapabilities ) ;
2016-07-08 16:36:27 +03:00
DO_TEST ( qemuMonitorJSONQueryCPUs ) ;
2013-10-02 13:56:43 +04:00
DO_TEST ( qemuMonitorJSONGetVirtType ) ;
2013-10-02 20:23:17 +04:00
DO_TEST ( qemuMonitorJSONSendKey ) ;
2014-03-23 07:51:13 +04:00
DO_TEST ( qemuMonitorJSONGetDumpGuestMemoryCapability ) ;
2014-06-03 13:19:51 +04:00
DO_TEST ( qemuMonitorJSONSendKeyHoldtime ) ;
blockjob: allow omitted arguments to QMP block-commit
We are about to turn on support for active block commit. Although
qemu 2.0 was the first version to mostly support it, that version
mis-handles 0-length files, and doesn't have anything available for
easy probing. But qemu 2.1 fixed bugs, and made life simpler by
letting the 'top' argument be optional. Unless someone begs for
active commit with qemu 2.0, for now we are just going to enable
it only by probing for qemu 2.1 behavior (anyone backporting active
commit can also backport the optional argument behavior). This
requires qemu.git commit 7676e2c597000eff3a7233b40cca768b358f9bc9.
Although all our actual uses of block-commit supply arguments for
both base and top, we can omit both arguments and use a bogus
device string to trigger an interesting behavior in qemu. All QMP
commands first do argument validation, failing with GenericError
if a mandatory argument is missing. Once that passes, the code
in the specific command gets to do further checking, and the qemu
developers made sure that if device is the only supplied argument,
then the block-commit code will look up the device first, with a
failure of DeviceNotFound, before attempting any further argument
validation (most other validations fail with GenericError). Thus,
the category of error class can reliably be used to decipher
whether the top argument was optional, which in turn implies a
working active commit. Since we expect our bogus device string to
trigger an error either way, the code is written to return a
distinct return value without spamming the logs.
* src/qemu/qemu_monitor.h (qemuMonitorSupportsActiveCommit): New
prototype.
* src/qemu/qemu_monitor.c (qemuMonitorSupportsActiveCommit):
Implement it.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Allow NULL for top and base, for probing purposes.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise, implementing the probe.
* tests/qemumonitorjsontest.c (mymain): Enable...
(testQemuMonitorJSONqemuMonitorSupportsActiveCommit): ...a new test.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-17 07:42:49 +04:00
DO_TEST ( qemuMonitorSupportsActiveCommit ) ;
2019-04-10 00:21:38 +03:00
DO_TEST ( qemuMonitorJSONNBDServerStart ) ;
2019-06-06 05:25:05 +03:00
DO_TEST ( qemuMonitorJSONMergeBitmaps ) ;
2012-08-20 16:31:29 +04:00
2013-07-22 15:07:23 +04:00
DO_TEST_CPU_DATA ( " host " ) ;
DO_TEST_CPU_DATA ( " full " ) ;
2016-05-20 12:17:11 +03:00
DO_TEST_CPU_DATA ( " ecx " ) ;
2013-07-22 15:07:23 +04:00
2016-07-29 19:08:06 +03:00
DO_TEST_CPU_INFO ( " x86-basic-pluggable " , 8 ) ;
2016-08-24 00:05:52 +03:00
DO_TEST_CPU_INFO ( " x86-full " , 11 ) ;
2017-06-27 17:04:38 +03:00
DO_TEST_CPU_INFO ( " x86-node-full " , 8 ) ;
2018-04-04 17:45:04 +03:00
DO_TEST_CPU_INFO_FAST ( " x86-full-fast " , 11 ) ;
2016-07-29 19:08:06 +03:00
2016-07-29 20:24:22 +03:00
DO_TEST_CPU_INFO ( " ppc64-basic " , 24 ) ;
DO_TEST_CPU_INFO ( " ppc64-hotplug-1 " , 24 ) ;
DO_TEST_CPU_INFO ( " ppc64-hotplug-2 " , 24 ) ;
2016-07-29 20:44:43 +03:00
DO_TEST_CPU_INFO ( " ppc64-hotplug-4 " , 24 ) ;
2016-07-29 20:55:29 +03:00
DO_TEST_CPU_INFO ( " ppc64-no-threads " , 16 ) ;
2016-07-29 20:24:22 +03:00
2018-04-04 17:45:06 +03:00
DO_TEST_CPU_INFO_FAST ( " s390-fast " , 2 ) ;
2017-11-03 15:09:47 +03:00
# define DO_TEST_BLOCK_NODE_DETECT(testname) \
do { \
if ( virTestRun ( " node-name-detect( " testname " ) " , \
testBlockNodeNameDetect , testname ) < 0 ) \
ret = - 1 ; \
2017-03-13 14:47:46 +03:00
} while ( 0 )
2017-07-26 10:42:11 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " basic " ) ;
2017-07-26 11:27:57 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " same-backing " ) ;
2017-07-26 11:30:18 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " relative " ) ;
2017-07-26 11:30:18 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " gluster " ) ;
2017-07-26 12:06:51 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " blockjob " ) ;
2017-07-27 11:26:41 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " luks " ) ;
2017-05-03 09:45:00 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " iscsi " ) ;
2017-07-26 12:06:51 +03:00
DO_TEST_BLOCK_NODE_DETECT ( " old " ) ;
DO_TEST_BLOCK_NODE_DETECT ( " empty " ) ;
2017-03-13 14:47:46 +03:00
# undef DO_TEST_BLOCK_NODE_DETECT
2019-04-09 14:22:32 +03:00
# define DO_TEST_QAPI_QUERY(nme, qry, scc, rplobj) \
do { \
qapiData . name = nme ; \
qapiData . query = qry ; \
qapiData . rc = scc ; \
qapiData . replyobj = rplobj ; \
if ( virTestRun ( " qapi schema query " nme , testQAPISchemaQuery , & qapiData ) < 0 ) \
ret = - 1 ; \
} while ( 0 )
2019-04-09 15:09:33 +03:00
DO_TEST_QAPI_QUERY ( " command " , " blockdev-add " , 1 , true ) ;
DO_TEST_QAPI_QUERY ( " event " , " RTC_CHANGE " , 1 , true ) ;
DO_TEST_QAPI_QUERY ( " object property " , " screendump/arg-type/device " , 1 , true ) ;
DO_TEST_QAPI_QUERY ( " optional property " , " block-commit/arg-type/*top " , 1 , true ) ;
DO_TEST_QAPI_QUERY ( " variant " , " blockdev-add/arg-type/+file " , 1 , true ) ;
DO_TEST_QAPI_QUERY ( " variant property " , " blockdev-add/arg-type/+file/filename " , 1 , true ) ;
2019-04-11 15:54:41 +03:00
DO_TEST_QAPI_QUERY ( " enum value " , " query-status/ret-type/status/^debug " , 1 , false ) ;
2019-04-11 15:54:41 +03:00
DO_TEST_QAPI_QUERY ( " builtin type " , " query-qmp-schema/ret-type/name/!string " , 1 , false ) ;
2019-04-11 15:54:41 +03:00
DO_TEST_QAPI_QUERY ( " alternate variant 1 " , " blockdev-add/arg-type/+qcow2/backing/!null " , 1 , false ) ;
DO_TEST_QAPI_QUERY ( " alternate variant 2 " , " blockdev-add/arg-type/+qcow2/backing/!string " , 1 , false ) ;
DO_TEST_QAPI_QUERY ( " alternate variant 3 " , " blockdev-add/arg-type/+qcow2/backing/+file/filename " , 1 , true ) ;
2019-04-09 14:22:32 +03:00
DO_TEST_QAPI_QUERY ( " nonexistent command " , " nonexistent " , 0 , false ) ;
DO_TEST_QAPI_QUERY ( " nonexistent attr " , " screendump/arg-type/nonexistent " , 0 , false ) ;
DO_TEST_QAPI_QUERY ( " nonexistent variant " , " blockdev-add/arg-type/+nonexistent " , 0 , false ) ;
2019-04-11 15:54:41 +03:00
DO_TEST_QAPI_QUERY ( " nonexistent enum value " , " query-status/ret-type/status/^nonexistentdebug " , 0 , false ) ;
DO_TEST_QAPI_QUERY ( " broken query for enum value " , " query-status/ret-type/status/^debug/test " , - 1 , false ) ;
2019-04-11 15:54:41 +03:00
DO_TEST_QAPI_QUERY ( " builtin type " , " query-qmp-schema/ret-type/name/!number " , 0 , false ) ;
2019-04-09 14:22:32 +03:00
# undef DO_TEST_QAPI_QUERY
2019-04-09 11:32:33 +03:00
# define DO_TEST_QAPI_VALIDATE(nme, rootquery, scc, jsonstr) \
2018-03-22 19:07:43 +03:00
do { \
qapiData . name = nme ; \
qapiData . query = rootquery ; \
qapiData . success = scc ; \
qapiData . json = jsonstr ; \
2019-04-09 11:32:33 +03:00
if ( virTestRun ( " qapi schema validate " nme , testQAPISchemaValidate , & qapiData ) < 0 ) \
2018-03-22 19:07:43 +03:00
ret = - 1 ; \
} while ( 0 )
2012-08-20 16:31:29 +04:00
2019-04-09 11:32:33 +03:00
DO_TEST_QAPI_VALIDATE ( " string " , " trace-event-get-state/arg-type " , true ,
" { \" name \" : \" test \" } " ) ;
DO_TEST_QAPI_VALIDATE ( " all attrs " , " trace-event-get-state/arg-type " , true ,
" { \" name \" : \" test \" , \" vcpu \" :123} " ) ;
DO_TEST_QAPI_VALIDATE ( " attr type mismatch " , " trace-event-get-state/arg-type " , false ,
" { \" name \" :123} " ) ;
DO_TEST_QAPI_VALIDATE ( " missing mandatory attr " , " trace-event-get-state/arg-type " , false ,
" { \" vcpu \" :123} " ) ;
DO_TEST_QAPI_VALIDATE ( " attr name not present " , " trace-event-get-state/arg-type " , false ,
" { \" name \" : \" test \" , \" blah \" :123} " ) ;
DO_TEST_QAPI_VALIDATE ( " variant " , " blockdev-add/arg-type " , true ,
" { \" driver \" : \" file \" , \" filename \" : \" ble \" } " ) ;
DO_TEST_QAPI_VALIDATE ( " variant wrong " , " blockdev-add/arg-type " , false ,
" { \" driver \" : \" filefilefilefile \" , \" filename \" : \" ble \" } " ) ;
DO_TEST_QAPI_VALIDATE ( " variant missing mandatory " , " blockdev-add/arg-type " , false ,
" { \" driver \" : \" file \" , \" pr-manager \" : \" ble \" } " ) ;
DO_TEST_QAPI_VALIDATE ( " variant missing discriminator " , " blockdev-add/arg-type " , false ,
" { \" node-name \" : \" dfgfdg \" } " ) ;
DO_TEST_QAPI_VALIDATE ( " alternate 1 " , " blockdev-add/arg-type " , true ,
" { \" driver \" : \" qcow2 \" , "
" \" file \" : { \" driver \" : \" file \" , \" filename \" : \" ble \" }} " ) ;
DO_TEST_QAPI_VALIDATE ( " alternate 2 " , " blockdev-add/arg-type " , true ,
" { \" driver \" : \" qcow2 \" , \" file \" : \" somepath \" } " ) ;
DO_TEST_QAPI_VALIDATE ( " alternate 2 " , " blockdev-add/arg-type " , false ,
" { \" driver \" : \" qcow2 \" , \" file \" : 1234} " ) ;
2018-03-22 19:07:43 +03:00
2018-07-09 16:44:52 +03:00
if ( ! ( metaschema = testQEMUSchemaGetLatest ( ) ) | |
! ( metaschemastr = virJSONValueToString ( metaschema , false ) ) ) {
2019-05-03 11:45:58 +03:00
VIR_TEST_VERBOSE ( " failed to load latest qapi schema " ) ;
2018-03-22 19:07:43 +03:00
ret = - 1 ;
goto cleanup ;
}
2019-04-09 11:32:33 +03:00
DO_TEST_QAPI_VALIDATE ( " schema-meta " , " query-qmp-schema/ret-type " , true ,
2018-07-09 16:44:52 +03:00
metaschemastr ) ;
2018-03-22 19:07:43 +03:00
2019-04-09 11:32:33 +03:00
# undef DO_TEST_QAPI_VALIDATE
2018-03-22 19:07:43 +03:00
2018-12-04 19:58:38 +03:00
# define DO_TEST_QUERY_JOBS(name) \
do { \
struct testQueryJobsData data = { name , driver . xmlopt } ; \
if ( virTestRun ( " query-jobs- " name , testQueryJobs , & data ) < 0 ) \
ret = - 1 ; \
} while ( 0 )
DO_TEST_QUERY_JOBS ( " empty " ) ;
DO_TEST_QUERY_JOBS ( " create " ) ;
# undef DO_TEST_QUERY_JOBS
2018-03-22 19:07:43 +03:00
cleanup :
2018-07-09 16:44:52 +03:00
VIR_FREE ( metaschemastr ) ;
virJSONValueFree ( metaschema ) ;
2018-03-22 19:07:43 +03:00
virHashFree ( qapiData . schema ) ;
qemuTestDriverFree ( & driver ) ;
2012-08-20 16:31:29 +04:00
return ( ret = = 0 ) ? EXIT_SUCCESS : EXIT_FAILURE ;
}
2019-08-21 19:13:16 +03:00
VIR_TEST_MAIN_PRELOAD ( mymain , VIR_TEST_MOCK ( " virdeterministichash " ) )