qemumonitorjsontest: Work around deprecation of 'vcpu' argument of 'trace-event-get-state'

'trace-event-get-state' was used for testing schema validation as it had
simple arguments. Now 'vcpu' is optional and deprecated. Fix the test so
that it won't break with upcoming qemu-8.1.

Drop the 'all-attrs' case, as it's not not really testing anything
special and for the 'missing mandatory attr' case use an empty object.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2023-06-06 11:03:39 +02:00
parent debe7f5406
commit 8b11489284

View File

@ -3021,12 +3021,10 @@ mymain(void)
DO_TEST_QAPI_VALIDATE("string", "trace-event-get-state/arg-type", true, DO_TEST_QAPI_VALIDATE("string", "trace-event-get-state/arg-type", true,
"{\"name\":\"test\"}"); "{\"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, DO_TEST_QAPI_VALIDATE("attr type mismatch", "trace-event-get-state/arg-type", false,
"{\"name\":123}"); "{\"name\":123}");
DO_TEST_QAPI_VALIDATE("missing mandatory attr", "trace-event-get-state/arg-type", false, 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, DO_TEST_QAPI_VALIDATE("attr name not present", "trace-event-get-state/arg-type", false,
"{\"name\":\"test\", \"blah\":123}"); "{\"name\":\"test\", \"blah\":123}");
DO_TEST_QAPI_VALIDATE("variant", "blockdev-add/arg-type", true, DO_TEST_QAPI_VALIDATE("variant", "blockdev-add/arg-type", true,