External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

testQemuAgentCPU: Rewrite using qemuMonitorTestAddItemVerbatim

Browse Source 
Replace qemuMonitorTestAddItemParams by qemuMonitorTestAddItemVerbatim

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-05-22 17:08:27 +02:00
parent f8625248ac
commit 5e7def0b81
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/qemuagenttest.c
View File

@ -552,16 +552,6 @@ static const char testQemuAgentCPUResponse[] =
" ]"
"}";
static const char testQemuAgentCPUArguments1[] =
"[{\"logical-id\":1,\"online\":false}]";
static const char testQemuAgentCPUArguments2[] =
"[{\"logical-id\":1,\"online\":true},"
"{\"logical-id\":3,\"online\":true}]";
static const char testQemuAgentCPUArguments3[] =
"[{\"logical-id\":3,\"online\":true}]";
static int
testQemuAgentCPU(const void *data)
{
@ -595,26 +585,36 @@ testQemuAgentCPU(const void *data)
if (qemuAgentUpdateCPUInfo(2, cpuinfo, nvcpus) < 0)
return -1;
if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus",
"{ \"return\" : 1 }",
"vcpus", testQemuAgentCPUArguments1,
NULL) < 0)
if (qemuMonitorTestAddItemVerbatim(test,
"{\"execute\":\"guest-set-vcpus\","
" \"arguments\": {"
" \"vcpus\":[{\"logical-id\":1,\"online\":false}]"
"}}",
NULL,
"{ \"return\" : 1 }") < 0)
return -1;
if (qemuAgentSetVCPUs(qemuMonitorTestGetAgent(test), cpuinfo, nvcpus) < 0)
return -1;
/* try to hotplug two, second one will fail */
if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus",
"{ \"return\" : 1 }",
"vcpus", testQemuAgentCPUArguments2,
NULL) < 0)
if (qemuMonitorTestAddItemVerbatim(test,
"{\"execute\":\"guest-set-vcpus\","
" \"arguments\": {"
" \"vcpus\":[{\"logical-id\":1,\"online\":true},"
" {\"logical-id\":3,\"online\":true}]"
"}}",
NULL,
"{ \"return\" : 1 }") < 0)
return -1;
if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus",
"{ \"error\" : \"random error\" }",
"vcpus", testQemuAgentCPUArguments3,
NULL) < 0)
if (qemuMonitorTestAddItemVerbatim(test,
"{\"execute\":\"guest-set-vcpus\","
" \"arguments\": {"
" \"vcpus\":[{\"logical-id\":3,\"online\":true}]"
"}}",
NULL,
"{ \"error\" : \"random error\" }") < 0)
return -1;
if (qemuAgentUpdateCPUInfo(4, cpuinfo, nvcpus) < 0)