mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-03 11:35:19 +00:00
qemumonitorjsontest: chardev: Remove need to allow unused commands
Don't add the command to the test monitor when we don't expect to invoke it rather than bypassing the test monitor. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
22d5ce0252
commit
e6f837f611
@ -659,9 +659,8 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOption *xmlopt,
|
|||||||
|
|
||||||
fulllabel = g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", label);
|
fulllabel = g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", label);
|
||||||
|
|
||||||
qemuMonitorTestAllowUnusedCommands(test);
|
if (expectargs &&
|
||||||
|
qemuMonitorTestAddItemExpect(test, "chardev-add",
|
||||||
if (qemuMonitorTestAddItemExpect(test, "chardev-add",
|
|
||||||
expectargs, true, jsonreply) < 0)
|
expectargs, true, jsonreply) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
@ -784,10 +783,10 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOption *xmlopt,
|
|||||||
"data':{'type':'vdagent'}}}");
|
"data':{'type':'vdagent'}}}");
|
||||||
|
|
||||||
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_PIPE };
|
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_PIPE };
|
||||||
CHECK("pipe", true, "");
|
CHECK("pipe", true, NULL);
|
||||||
|
|
||||||
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_STDIO };
|
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_STDIO };
|
||||||
CHECK("stdio", true, "");
|
CHECK("stdio", true, NULL);
|
||||||
#undef CHECK
|
#undef CHECK
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user