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

qemumonitortestutils: Use consistent header style and line spacing

Browse Source
This commit is contained in:
Peter Krempa 2013-07-18 16:17:31 +02:00
parent 56874f0191
commit d24dbdd0a2
2 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tests/qemumonitortestutils.c
View File

@ -76,11 +76,13 @@ struct _qemuMonitorTest {
static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item); static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item);
/* /*
* Appends data for a reply to the outgoing buffer * Appends data for a reply to the outgoing buffer
*/ */
static int qemuMonitorTestAddReponse(qemuMonitorTestPtr test, static int
const char *response) qemuMonitorTestAddReponse(qemuMonitorTestPtr test,
const char *response)
{ {
size_t want = strlen(response) + 2; size_t want = strlen(response) + 2;
size_t have = test->outgoingCapacity - test->outgoingLength; size_t have = test->outgoingCapacity - test->outgoingLength;
@ -107,8 +109,9 @@ static int qemuMonitorTestAddReponse(qemuMonitorTestPtr test,
* Processes a single line, looking for a matching expected * Processes a single line, looking for a matching expected
* item to reply with, else replies with an error * item to reply with, else replies with an error
*/ */
static int qemuMonitorTestProcessCommandJSON(qemuMonitorTestPtr test, static int
const char *cmdstr) qemuMonitorTestProcessCommandJSON(qemuMonitorTestPtr test,
const char *cmdstr)
{ {
virJSONValuePtr val; virJSONValuePtr val;
const char *cmdname; const char *cmdname;
@ -150,8 +153,9 @@ cleanup:
} }
static int qemuMonitorTestProcessCommandText(qemuMonitorTestPtr test, static int
const char *cmdstr) qemuMonitorTestProcessCommandText(qemuMonitorTestPtr test,
const char *cmdstr)
{ {
char *tmp; char *tmp;
char *cmdname; char *cmdname;
@ -190,8 +194,10 @@ cleanup:
return ret; return ret;
} }
static int qemuMonitorTestProcessCommand(qemuMonitorTestPtr test,
const char *cmdstr) static int
qemuMonitorTestProcessCommand(qemuMonitorTestPtr test,
const char *cmdstr)
{ {
if (test->json) if (test->json)
return qemuMonitorTestProcessCommandJSON(test ,cmdstr); return qemuMonitorTestProcessCommandJSON(test ,cmdstr);
@ -199,12 +205,14 @@ static int qemuMonitorTestProcessCommand(qemuMonitorTestPtr test,
return qemuMonitorTestProcessCommandText(test ,cmdstr); return qemuMonitorTestProcessCommandText(test ,cmdstr);
} }
/* /*
* Handles read/write of monitor data on the monitor server side * Handles read/write of monitor data on the monitor server side
*/ */
static void qemuMonitorTestIO(virNetSocketPtr sock, static void
int events, qemuMonitorTestIO(virNetSocketPtr sock,
void *opaque) int events,
void *opaque)
{ {
qemuMonitorTestPtr test = opaque; qemuMonitorTestPtr test = opaque;
bool err = false; bool err = false;
@ -298,7 +306,8 @@ cleanup:
} }
static void qemuMonitorTestWorker(void *opaque) static void
qemuMonitorTestWorker(void *opaque)
{ {
qemuMonitorTestPtr test = opaque; qemuMonitorTestPtr test = opaque;
@ -322,7 +331,9 @@ static void qemuMonitorTestWorker(void *opaque)
return; return;
} }
static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item)
static void
qemuMonitorTestItemFree(qemuMonitorTestItemPtr item)
{ {
if (!item) if (!item)
return; return;
@ -335,13 +346,15 @@ static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item)
static void static void
qemuMonitorTestFreeTimer(int timer ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) qemuMonitorTestFreeTimer(int timer ATTRIBUTE_UNUSED,
void *opaque ATTRIBUTE_UNUSED)
{ {
/* nothing to be done here */ /* nothing to be done here */
} }
void qemuMonitorTestFree(qemuMonitorTestPtr test) void
qemuMonitorTestFree(qemuMonitorTestPtr test)
{ {
size_t i; size_t i;
int timer = -1; int timer = -1;
@ -424,13 +437,16 @@ error:
} }
static void qemuMonitorTestEOFNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static void
virDomainObjPtr vm ATTRIBUTE_UNUSED) qemuMonitorTestEOFNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm ATTRIBUTE_UNUSED)
{ {
} }
static void qemuMonitorTestErrorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm ATTRIBUTE_UNUSED) static void
qemuMonitorTestErrorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm ATTRIBUTE_UNUSED)
{ {
} }
@ -440,12 +456,14 @@ static qemuMonitorCallbacks qemuCallbacks = {
.errorNotify = qemuMonitorTestErrorNotify, .errorNotify = qemuMonitorTestErrorNotify,
}; };
#define QEMU_JSON_GREETING "{\"QMP\": {\"version\": {\"qemu\": {\"micro\": 1, \"minor\": 0, \"major\": 1}, \"package\": \" (qemu-kvm-1.0.1)\"}, \"capabilities\": []}}" #define QEMU_JSON_GREETING "{\"QMP\": {\"version\": {\"qemu\": {\"micro\": 1, \"minor\": 0, \"major\": 1}, \"package\": \" (qemu-kvm-1.0.1)\"}, \"capabilities\": []}}"
/* We skip the normal handshake reply of "{\"execute\":\"qmp_capabilities\"}" */ /* We skip the normal handshake reply of "{\"execute\":\"qmp_capabilities\"}" */
#define QEMU_TEXT_GREETING "QEMU 1.0,1 monitor - type 'help' for more information" #define QEMU_TEXT_GREETING "QEMU 1.0,1 monitor - type 'help' for more information"
qemuMonitorTestPtr qemuMonitorTestNew(bool json, virDomainXMLOptionPtr xmlopt) qemuMonitorTestPtr
qemuMonitorTestNew(bool json, virDomainXMLOptionPtr xmlopt)
{ {
qemuMonitorTestPtr test = NULL; qemuMonitorTestPtr test = NULL;
virDomainChrSourceDef src; virDomainChrSourceDef src;
@ -541,7 +559,9 @@ error:
goto cleanup; goto cleanup;
} }
qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test)
qemuMonitorPtr
qemuMonitorTestGetMonitor(qemuMonitorTestPtr test)
{ {
return test->mon; return test->mon;
} }

7
tests/qemumonitortestutils.h
View File

@ -26,10 +26,9 @@
typedef struct _qemuMonitorTest qemuMonitorTest; typedef struct _qemuMonitorTest qemuMonitorTest;
typedef qemuMonitorTest *qemuMonitorTestPtr; typedef qemuMonitorTest *qemuMonitorTestPtr;
int int qemuMonitorTestAddItem(qemuMonitorTestPtr test,
qemuMonitorTestAddItem(qemuMonitorTestPtr test, const char *command_name,
const char *command_name, const char *response);
const char *response);
qemuMonitorTestPtr qemuMonitorTestNew(bool json, qemuMonitorTestPtr qemuMonitorTestNew(bool json,
virDomainXMLOptionPtr xmlopt); virDomainXMLOptionPtr xmlopt);