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

qemumonitorjsontest: Add test case for 'blockdev-reopen'

Browse Source 
Export 'qemuBlockReopenFormatMon' and use it in a new test case wich
will validate the arguments against the QMP schema.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-22 17:59:28 +01:00
parent c1d17ca64b
commit 4ea9df4dad
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_block.c
View File

@ -3286,7 +3286,7 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc,
}
static int
int
qemuBlockReopenFormatMon(qemuMonitor *mon,
virStorageSource *src)
{

5
src/qemu/qemu_block.h
View File

@ -265,6 +265,11 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc,
GHashTable *blockNamedNodeData,
virJSONValue **actions);
/* only for use in qemumonitorjsontest */
int
qemuBlockReopenFormatMon(qemuMonitor *mon,
virStorageSource *src);
int
qemuBlockReopenReadWrite(virDomainObj *vm,
virStorageSource *src,

28
tests/qemumonitorjsontest.c
View File

@ -2800,6 +2800,33 @@ testQemuMonitorJSONBlockExportAdd(const void *opaque)
return 0;
}
static int
testQemuMonitorJSONBlockdevReopen(const void *opaque)
{
const testGenericData *data = opaque;
g_autoptr(qemuMonitorTest) test = NULL;
g_autoptr(virStorageSource) src = virStorageSourceNew();
if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema)))
return -1;
src->format = VIR_STORAGE_FILE_QCOW2;
src->readonly = true;
src->nodeformat = g_strdup("test node");
src->nodestorage = g_strdup("backing nodename");
src->backingStore = virStorageSourceNew();
if (qemuMonitorTestAddItem(test, "blockdev-reopen", "{\"return\":{}}") < 0)
return -1;
if (qemuBlockReopenFormatMon(qemuMonitorTestGetMonitor(test), src) < 0)
return -1;
return 0;
}
static int
testQemuMonitorJSONqemuMonitorJSONGetCPUModelComparison(const void *opaque)
{
@ -2997,6 +3024,7 @@ mymain(void)
DO_TEST(GetIOThreads);
DO_TEST(Transaction);
DO_TEST(BlockExportAdd);
DO_TEST(BlockdevReopen);
DO_TEST_SIMPLE("qmp_capabilities", qemuMonitorJSONSetCapabilities);
DO_TEST_SIMPLE("system_powerdown", qemuMonitorJSONSystemPowerdown);
DO_TEST_SIMPLE("system_reset", qemuMonitorJSONSystemReset);