NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove need for qemuDomainParseIOThreadAlias

Browse Source 
Rather than have a separate routine to parse the alias of an iothread
returned from qemu in order to get the iothread_id value, parse the alias
when returning and just return the iothread_id in qemuMonitorIOThreadInfoPtr

This set of patches removes the function, changes the "char *name" to
"unsigned int" and handles all the fallout.
This commit is contained in:
John Ferlan
2015-04-27 14:16:54 -04:00
parent e505591e28
commit 4c2ca5664a
8 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/qemumonitorjsontest.c
View File

@@ -2269,12 +2269,12 @@ testQemuMonitorJSONGetIOThreads(const void *data)
goto cleanup;
}
#define CHECK(i, wantname, wantthread_id) \
#define CHECK(i, wantiothread_id, wantthread_id) \
do { \
if (STRNEQ(info[i]->name, (wantname))) { \
if (info[i]->iothread_id != (wantiothread_id)) { \
virReportError(VIR_ERR_INTERNAL_ERROR, \
"name %s is not %s", \
info[i]->name, (wantname)); \
"iothread_id %u is not %u", \
info[i]->iothread_id, (wantiothread_id)); \
goto cleanup; \
} \
if (info[i]->thread_id != (wantthread_id)) { \
@@ -2285,8 +2285,8 @@ testQemuMonitorJSONGetIOThreads(const void *data)
} \
} while (0)
CHECK(0, "iothread1", 30992);
CHECK(1, "iothread2", 30993);
CHECK(0, 1, 30992);
CHECK(1, 2, 30993);
#undef CHECK