On 07/30/2013 07:05 AM, Peter Krempa wrote: Agreed - absence of whitespace like newlines is inconsequential in strict JSON, but using it to simplify tests is worthwhile; it also makes it easier to see what is sent across a line when tracing debug messages. ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 07/30/2013 07:05 AM, Peter Krempa wrote: Thanks for separating cosmetic from functional changes. ACK. Might be worth splitting this macro long line with \-newline, and relying on C's implicit concatenation of strings separated only by whitespace. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 07/30/2013 07:05 AM, Peter Krempa wrote: ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 07/30/2013 07:05 AM, Peter Krempa wrote: Ah, as long as you are refactoring here, you don't have to tweak the earlier patch in the series where I suggested breaking the long line. But here, you SHOULD break up the long line :) ACK with that fixed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

Refactor the test helpers to allow adding callbacks to verify the monitor responses instead of simple command name checking and clean up various parts to prepare for adding guest agent tests. --- tests/qemumonitortestutils.c | 220 ++++++++++++++++++++++++------------------- 1 file changed, 121 insertions(+), 99 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 1785293..941dfea 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -38,10 +38,14 @@ typedef struct _qemuMonitorTestItem qemuMonitorTestItem; typedef qemuMonitorTestItem *qemuMonitorTestItemPtr; +typedef int (*qemuMonitorTestResponseCallback)(qemuMonitorTestPtr test, + qemuMonitorTestItemPtr item, + const char *message); struct _qemuMonitorTestItem { - char *command_name; - char *response; + qemuMonitorTestResponseCallback cb; + void *opaque; + virFreeCallback freecb; }; struct _qemuMonitorTest { @@ -74,7 +78,17 @@ struct _qemuMonitorTest { }; -static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item); +static void +qemuMonitorTestItemFree(qemuMonitorTestItemPtr item) +{ + if (!item) + return; + + if (item->freecb) + (item->freecb)(item->opaque); + + VIR_FREE(item); +} /* @@ -101,95 +115,40 @@ qemuMonitorTestAddReponse(qemuMonitorTestPtr test, } -/* - * Processes a single line, looking for a matching expected - * item to reply with, else replies with an error - */ static int -qemuMonitorTestProcessCommandJSON(qemuMonitorTestPtr test, - const char *cmdstr) +qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test) { - virJSONValuePtr val; - const char *cmdname; - int ret = -1; - - if (!(val = virJSONValueFromString(cmdstr))) - return -1; - - if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "Missing command name in %s", cmdstr); - goto cleanup; - } - - if (test->nitems == 0 || - STRNEQ(test->items[0]->command_name, cmdname)) { - ret = qemuMonitorTestAddReponse(test, - "{ \"error\": " - " { \"desc\": \"Unexpected command\", " - " \"class\": \"UnexpectedCommand\" } }"); + if (test->json) { + return qemuMonitorTestAddReponse(test, + "{ \"error\": " + " { \"desc\": \"Unexpected command\", " + " \"class\": \"UnexpectedCommand\" } }"); } else { - ret = qemuMonitorTestAddReponse(test, test->items[0]->response); - qemuMonitorTestItemFree(test->items[0]); - if (VIR_DELETE_ELEMENT(test->items, 0, test->nitems) < 0) { - ret = -1; - goto cleanup; - } + return qemuMonitorTestAddReponse(test, "unexpected command"); } - -cleanup: - virJSONValueFree(val); - return ret; } static int -qemuMonitorTestProcessCommandText(qemuMonitorTestPtr test, - const char *cmdstr) +qemuMonitorTestProcessCommand(qemuMonitorTestPtr test, + const char *cmdstr) { - char *tmp; - char *cmdname; - int ret = -1; + int ret; - if (VIR_STRDUP(cmdname, cmdstr) < 0) - return -1; - if (!(tmp = strchr(cmdname, ' '))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "Cannot find command name in '%s'", cmdstr); - goto cleanup; - } - *tmp = '\0'; - - if (test->nitems == 0 || - STRNEQ(test->items[0]->command_name, cmdname)) { - ret = qemuMonitorTestAddReponse(test, - "unexpected command"); + if (test->nitems == 0) { + return qemuMonitorTestAddUnexpectedErrorResponse(test); } else { - ret = qemuMonitorTestAddReponse(test, test->items[0]->response); - qemuMonitorTestItemFree(test->items[0]); - if (VIR_DELETE_ELEMENT(test->items, 0, test->nitems) < 0) { - ret = -1; - goto cleanup; - } + qemuMonitorTestItemPtr item = test->items[0]; + ret = (item->cb)(test, item, cmdstr); + qemuMonitorTestItemFree(item); + if (VIR_DELETE_ELEMENT(test->items, 0, test->nitems) < 0) + return -1; } -cleanup: - VIR_FREE(cmdname); return ret; } -static int -qemuMonitorTestProcessCommand(qemuMonitorTestPtr test, - const char *cmdstr) -{ - if (test->json) - return qemuMonitorTestProcessCommandJSON(test ,cmdstr); - else - return qemuMonitorTestProcessCommandText(test ,cmdstr); -} - - /* * Handles read/write of monitor data on the monitor server side */ @@ -317,19 +276,6 @@ qemuMonitorTestWorker(void *opaque) static void -qemuMonitorTestItemFree(qemuMonitorTestItemPtr item) -{ - if (!item) - return; - - VIR_FREE(item->command_name); - VIR_FREE(item->response); - - VIR_FREE(item); -} - - -static void qemuMonitorTestFreeTimer(int timer ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { @@ -391,19 +337,20 @@ qemuMonitorTestFree(qemuMonitorTestPtr test) } -int -qemuMonitorTestAddItem(qemuMonitorTestPtr test, - const char *command_name, - const char *response) +static int +qemuMonitorTestAddHandler(qemuMonitorTestPtr test, + qemuMonitorTestResponseCallback cb, + void *opaque, + virFreeCallback freecb) { qemuMonitorTestItemPtr item; if (VIR_ALLOC(item) < 0) goto error; - if (VIR_STRDUP(item->command_name, command_name) < 0 || - VIR_STRDUP(item->response, response) < 0) - goto error; + item->cb = cb; + item->freecb = freecb; + item->opaque = opaque; virMutexLock(&test->lock); if (VIR_APPEND_ELEMENT(test->items, test->nitems, item) < 0) { @@ -415,11 +362,86 @@ qemuMonitorTestAddItem(qemuMonitorTestPtr test, return 0; error: - qemuMonitorTestItemFree(item); + if (freecb) + (freecb)(opaque); + VIR_FREE(item); return -1; } +struct qemuMonitorTestDefaultHandlerData { + const char *command_name; + const char *response; +}; + + +static int +qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test, + qemuMonitorTestItemPtr item, + const char *cmdstr) +{ + struct qemuMonitorTestDefaultHandlerData *data = item->opaque; + virJSONValuePtr val = NULL; + char *cmdcopy = NULL; + const char *cmdname; + char *tmp; + int ret = -1; + + if (test->json) { + if (!(val = virJSONValueFromString(cmdstr))) + return -1; + + if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Missing command name in %s", cmdstr); + goto cleanup; + } + } else { + if (VIR_STRDUP(cmdcopy, cmdstr) < 0) + return -1; + + cmdname = cmdcopy; + + if (!(tmp = strchr(cmdcopy, ' '))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Cannot find command name in '%s'", cmdstr); + goto cleanup; + } + *tmp = '\0'; + } + + if (STRNEQ(data->command_name, cmdname)) + ret = qemuMonitorTestAddUnexpectedErrorResponse(test); + else + ret = qemuMonitorTestAddReponse(test, data->response); + +cleanup: + VIR_FREE(cmdcopy); + virJSONValueFree(val); + return ret; +} + + +int +qemuMonitorTestAddItem(qemuMonitorTestPtr test, + const char *command_name, + const char *response) +{ + struct qemuMonitorTestDefaultHandlerData *data; + + if (VIR_ALLOC(data) < 0) + return -1; + + data->command_name = command_name; + data->response = response; + + return qemuMonitorTestAddHandler(test, + qemuMonitorTestProcessCommandDefault, + data, + free); +} + + static void qemuMonitorTestEOFNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm ATTRIBUTE_UNUSED) @@ -434,7 +456,7 @@ qemuMonitorTestErrorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } -static qemuMonitorCallbacks qemuCallbacks = { +static qemuMonitorCallbacks qemuMonitorTestCallbacks = { .eofNotify = qemuMonitorTestEOFNotify, .errorNotify = qemuMonitorTestErrorNotify, }; @@ -512,7 +534,7 @@ qemuMonitorCommonTestInit(qemuMonitorTestPtr test) goto error; if (virNetSocketAddIOCallback(test->client, - VIR_EVENT_HANDLE_WRITABLE, + test->outgoingLength > 0 ? VIR_EVENT_HANDLE_WRITABLE : VIR_EVENT_HANDLE_READABLE, qemuMonitorTestIO, test, NULL) < 0) @@ -554,7 +576,7 @@ qemuMonitorTestNew(bool json, virDomainXMLOptionPtr xmlopt) if (!(test->mon = qemuMonitorOpen(test->vm, &src, json, - &qemuCallbacks))) + &qemuMonitorTestCallbacks))) goto error; virObjectLock(test->mon); -- 1.8.3.2

The normal monitor uses windows line endings, where the agent monitor uses only newlines. Change this to tolerate both approaches and allow to use the utilities for guest agent tests. --- tests/qemumonitortestutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 941dfea..6dc430e 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -207,7 +207,7 @@ qemuMonitorTestIO(virNetSocketPtr sock, * if so, handle that command */ t1 = test->incoming; - while ((t2 = strstr(t1, "\r\n"))) { + while ((t2 = strstr(t1, "\n"))) { *t2 = '\0'; if (qemuMonitorTestProcessCommand(test, t1) < 0) { @@ -215,7 +215,7 @@ qemuMonitorTestIO(virNetSocketPtr sock, goto cleanup; } - t1 = t2 + 2; + t1 = t2 + 1; } used = t1 - test->incoming; memmove(test->incoming, t1, test->incomingLength - used); -- 1.8.3.2

Add helper functions to open guest agent connections and a handler for replying to the "guest-sync" command. --- tests/qemumonitortestutils.c | 133 ++++++++++++++++++++++++++++++++++++++++++- tests/qemumonitortestutils.h | 6 ++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 6dc430e..96cb054 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -28,6 +28,7 @@ #include "virthread.h" #include "qemu/qemu_monitor.h" +#include "qemu/qemu_agent.h" #include "rpc/virnetsocket.h" #include "viralloc.h" #include "virlog.h" @@ -68,6 +69,7 @@ struct _qemuMonitorTest { virNetSocketPtr client; qemuMonitorPtr mon; + qemuAgentPtr agent; char *tmpdir; @@ -118,7 +120,7 @@ qemuMonitorTestAddReponse(qemuMonitorTestPtr test, static int qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test) { - if (test->json) { + if (test->agent || test->json) { return qemuMonitorTestAddReponse(test, "{ \"error\": " " { \"desc\": \"Unexpected command\", " @@ -312,6 +314,11 @@ qemuMonitorTestFree(qemuMonitorTestPtr test) qemuMonitorClose(test->mon); } + if (test->agent) { + virObjectUnlock(test->agent); + qemuAgentClose(test->agent); + } + virObjectUnref(test->vm); if (test->running) @@ -387,7 +394,7 @@ qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test, char *tmp; int ret = -1; - if (test->json) { + if (test->agent || test->json) { if (!(val = virJSONValueFromString(cmdstr))) return -1; @@ -442,6 +449,72 @@ qemuMonitorTestAddItem(qemuMonitorTestPtr test, } +static int +qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, + qemuMonitorTestItemPtr item ATTRIBUTE_UNUSED, + const char *cmdstr) +{ + virJSONValuePtr val = NULL; + virJSONValuePtr args; + unsigned long long id; + const char *cmdname; + char *retmsg = NULL; + int ret = -1; + + if (!(val = virJSONValueFromString(cmdstr))) + return -1; + + if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Missing guest-sync command name"); + goto cleanup; + } + + if (STRNEQ(cmdname, "guest-sync")) { + ret = qemuMonitorTestAddUnexpectedErrorResponse(test); + goto cleanup; + } + + if (!(args = virJSONValueObjectGet(val, "arguments"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Missing arguments for guest-sync"); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(args, "id", &id)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Missing id for guest sync"); + goto cleanup; + } + + if (virAsprintf(&retmsg, "{\"return\":%llu}", id) < 0) + goto cleanup; + + + ret = qemuMonitorTestAddReponse(test, retmsg); + +cleanup: + virJSONValueFree(val); + VIR_FREE(retmsg); + return ret; +} + + +int +qemuMonitorTestAddAgentSyncResponse(qemuMonitorTestPtr test) +{ + if (!test->agent) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "This test is not an agent test"); + return -1; + } + + return qemuMonitorTestAddHandler(test, + qemuMonitorTestProcessGuestAgentSync, + NULL, NULL); +} + + static void qemuMonitorTestEOFNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm ATTRIBUTE_UNUSED) @@ -462,6 +535,24 @@ static qemuMonitorCallbacks qemuMonitorTestCallbacks = { }; +static void +qemuMonitorTestAgentEOFNotify(qemuAgentPtr agent ATTRIBUTE_UNUSED, + virDomainObjPtr vm ATTRIBUTE_UNUSED) +{ +} + +static void +qemuMonitorTestAgentErrorNotify(qemuAgentPtr agent ATTRIBUTE_UNUSED, + virDomainObjPtr vm ATTRIBUTE_UNUSED) +{ +} + +static qemuAgentCallbacks qemuMonitorTestAgentCallbacks = { + .eofNotify = qemuMonitorTestAgentEOFNotify, + .errorNotify = qemuMonitorTestAgentErrorNotify, +}; + + static qemuMonitorTestPtr qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, virDomainChrSourceDefPtr src) @@ -594,12 +685,50 @@ qemuMonitorTestNew(bool json, virDomainXMLOptionPtr xmlopt) return test; error: + virDomainChrSourceDefClear(&src); + qemuMonitorTestFree(test); + return NULL; +} + +qemuMonitorTestPtr +qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt) +{ + qemuMonitorTestPtr test = NULL; + virDomainChrSourceDef src; + + if (!(test = qemuMonitorCommonTestNew(xmlopt, &src))) + goto error; + + if (!(test->agent = qemuAgentOpen(test->vm, + &src, + &qemuMonitorTestAgentCallbacks))) + goto error; + + virObjectLock(test->agent); + + if (qemuMonitorCommonTestInit(test) < 0) + goto error; + + virDomainChrSourceDefClear(&src); + + return test; + +error: + virDomainChrSourceDefClear(&src); qemuMonitorTestFree(test); return NULL; } + qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test) { return test->mon; } + + +qemuAgentPtr +qemuMonitorTestGetAgent(qemuMonitorTestPtr test) +{ + return test->agent; +} diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 9df118f..4307feb 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -22,6 +22,7 @@ # include "domain_conf.h" # include "qemu/qemu_monitor.h" +# include "qemu/qemu_agent.h" typedef struct _qemuMonitorTest qemuMonitorTest; typedef qemuMonitorTest *qemuMonitorTestPtr; @@ -31,12 +32,17 @@ qemuMonitorTestAddItem(qemuMonitorTestPtr test, const char *command_name, const char *response); +int qemuMonitorTestAddAgentSyncResponse(qemuMonitorTestPtr test); + qemuMonitorTestPtr qemuMonitorTestNew(bool json, virDomainXMLOptionPtr xmlopt); +qemuMonitorTestPtr qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt); + void qemuMonitorTestFree(qemuMonitorTestPtr test); qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test); +qemuAgentPtr qemuMonitorTestGetAgent(qemuMonitorTestPtr test); #endif /* __VIR_QEMU_MONITOR_TEST_UTILS_H__ */ -- 1.8.3.2

Use the JSON error messages to report errors back to the caller in addition to erroring out. The error reported from the event loop from the mock function of the monitor was later overwritten by the call to the monitor/agent interaction API. This will also allow testing of error reporting. --- tests/qemumonitortestutils.c | 56 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 96cb054..f421b9e 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -103,6 +103,8 @@ qemuMonitorTestAddReponse(qemuMonitorTestPtr test, size_t want = strlen(response) + 2; size_t have = test->outgoingCapacity - test->outgoingLength; + VIR_DEBUG("Adding response to monitor command: '%s", response); + if (have < want) { size_t need = want - have; if (VIR_EXPAND_N(test->outgoing, test->outgoingCapacity, need) < 0) @@ -132,11 +134,48 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test) static int +qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) +{ + va_list msgargs; + char *msg = NULL; + char *jsonmsg = NULL; + int ret = -1; + + va_start(msgargs, errmsg); + + if (virVasprintf(&msg, errmsg, msgargs) < 0) + goto cleanup; + + if (test->agent || test->json) { + if (virAsprintf(&jsonmsg, "{ \"error\": " + " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", + msg) < 0) + goto cleanup; + } else { + if (virAsprintf(&jsonmsg, "error: '%s'", msg) < 0) + goto cleanup; + } + + ret = qemuMonitorTestAddReponse(test, jsonmsg); + +cleanup: + va_end(msgargs); + VIR_FREE(msg); + VIR_FREE(jsonmsg); + return ret; +} + + + +static int qemuMonitorTestProcessCommand(qemuMonitorTestPtr test, const char *cmdstr) { int ret; + VIR_DEBUG("Processing string from monitor handler: '%s", cmdstr); + if (test->nitems == 0) { return qemuMonitorTestAddUnexpectedErrorResponse(test); } else { @@ -399,8 +438,7 @@ qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test, return -1; if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "Missing command name in %s", cmdstr); + ret = qemuMonitorReportError(test, "Missing command name in %s", cmdstr); goto cleanup; } } else { @@ -410,8 +448,9 @@ qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test, cmdname = cmdcopy; if (!(tmp = strchr(cmdcopy, ' '))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "Cannot find command name in '%s'", cmdstr); + ret = qemuMonitorReportError(test, + "Cannot find command name in '%s'", + cmdstr); goto cleanup; } *tmp = '\0'; @@ -465,8 +504,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, return -1; if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "Missing guest-sync command name"); + ret = qemuMonitorReportError(test, "Missing guest-sync command name"); goto cleanup; } @@ -476,14 +514,12 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, } if (!(args = virJSONValueObjectGet(val, "arguments"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "Missing arguments for guest-sync"); + ret = qemuMonitorReportError(test, "Missing arguments for guest-sync"); goto cleanup; } if (virJSONValueObjectGetNumberUlong(args, "id", &id)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "Missing id for guest sync"); + ret = qemuMonitorReportError(test, "Missing id for guest sync"); goto cleanup; } -- 1.8.3.2

On 07/30/2013 07:05 AM, Peter Krempa wrote: My version of gcc complains: qemumonitortestutils.c: In function 'qemuMonitorReportError': qemumonitortestutils.c:140:5: error: function might be possible candidate for 'gnu_printf' format attribute [-Werror=suggest-attribute=format] if (virVasprintf(&msg, errmsg, msgargs) < 0) ^ You'll need to add ATTRIBUTE_FMT_PRINTF(2, 3) to shut up the warning. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 07/30/2013 07:05 AM, Peter Krempa wrote: Indentation of the comment is off. Might be worth adding an ATTRIBUTE_SENTINEL on the prototype of this function, so that gcc ensures that a caller ends the list with a NULL. ACK with those fixes. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

Add a basic test framework with two simple tests to test guest agent interaction. --- .gitignore | 1 + tests/Makefile.am | 11 +++- tests/qemuagenttest.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 tests/qemuagenttest.c diff --git a/.gitignore b/.gitignore index 4c79de3..738c6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,7 @@ /tests/object-locking-files.txt /tests/object-locking.cm[ix] /tests/openvzutilstest +/tests/qemuagenttest /tests/qemuargv2xmltest /tests/qemuhelptest /tests/qemuhotplugtest diff --git a/tests/Makefile.am b/tests/Makefile.am index 5ea806e..9c578fa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -161,7 +161,8 @@ endif if WITH_QEMU test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ - qemumonitortest qemumonitorjsontest qemuhotplugtest + qemumonitortest qemumonitorjsontest qemuhotplugtest \ + qemuagenttest endif if WITH_LXC @@ -418,6 +419,13 @@ qemumonitorjsontest_SOURCES = \ $(NULL) qemumonitorjsontest_LDADD = $(qemu_LDADDS) libqemumonitortestutils.la +qemuagenttest_SOURCES = \ + qemuagenttest.c \ + testutils.c testutils.h \ + testutilsqemu.c testutilsqemu.h \ + $(NULL) +qemuagenttest_LDADD = $(qemu_LDADDS) libqemumonitortestutils.la + qemuhotplugtest_SOURCES = \ qemuhotplugtest.c \ testutils.c testutils.h \ @@ -434,6 +442,7 @@ EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ qemumonitortest.c testutilsqemu.c testutilsqemu.h \ qemumonitorjsontest.c qemuhotplugtest.c \ + qemuagenttest.c \ $(QEMUMONITORTESTUTILS_SOURCES) endif diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c new file mode 100644 index 0000000..7f22ff0 --- /dev/null +++ b/tests/qemuagenttest.c @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>;. + * + */ + +#include <config.h> + +#include "testutils.h" +#include "testutilsqemu.h" +#include "qemumonitortestutils.h" +#include "qemu/qemu_conf.h" +#include "qemu/qemu_agent.h" +#include "virthread.h" +#include "virerror.h" +#include "virstring.h" + + +#define VIR_FROM_THIS VIR_FROM_NONE + +static int +testQemuAgentFSFreeze(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-fsfreeze-freeze", + "{ \"return\" : 5 }") < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-fsfreeze-freeze", + "{ \"return\" : 7 }") < 0) + goto cleanup; + + if ((ret = qemuAgentFSFreeze(qemuMonitorTestGetAgent(test))) < 0) + goto cleanup; + + if (ret != 5) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 5 frozen filesystems, got %d", ret); + goto cleanup; + } + + if ((ret = qemuAgentFSFreeze(qemuMonitorTestGetAgent(test))) < 0) + goto cleanup; + + if (ret != 7) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 7 frozen filesystems, got %d", ret); + goto cleanup; + } + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} + + +static int +testQemuAgentFSThaw(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-fsfreeze-thaw", + "{ \"return\" : 5 }") < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-fsfreeze-thaw", + "{ \"return\" : 7 }") < 0) + goto cleanup; + + if ((ret = qemuAgentFSThaw(qemuMonitorTestGetAgent(test))) < 0) + goto cleanup; + + if (ret != 5) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 5 thawed filesystems, got %d", ret); + goto cleanup; + } + + if ((ret = qemuAgentFSThaw(qemuMonitorTestGetAgent(test))) < 0) + goto cleanup; + + if (ret != 7) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 7 thawed filesystems, got %d", ret); + goto cleanup; + } + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + virDomainXMLOptionPtr xmlopt; + +#if !WITH_YAJL + fputs("libvirt not compiled with yajl, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + + if (virThreadInitialize() < 0 || + !(xmlopt = virQEMUDriverCreateXMLConf(NULL))) + return EXIT_FAILURE; + + virEventRegisterDefaultImpl(); + +#define DO_TEST(name) \ + if (virtTestRun(# name, 1, testQemuAgent ## name, xmlopt) < 0) \ + ret = -1 + + DO_TEST(FSFreeze); + DO_TEST(FSThaw); + + virObjectUnref(xmlopt); + + return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.8.3.2

--- tests/qemuagenttest.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 7f22ff0..a3b8834 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -132,6 +132,36 @@ cleanup: static int +testQemuAgentFSTrim(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItemParams(test, "guest-fstrim", + "{ \"return\" : {} }", + "minimum", "1337", + NULL) < 0) + goto cleanup; + + if (qemuAgentFSTrim(qemuMonitorTestGetAgent(test), 1337) < 0) + goto cleanup; + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} + + +static int mymain(void) { int ret = 0; @@ -154,6 +184,7 @@ mymain(void) DO_TEST(FSFreeze); DO_TEST(FSThaw); + DO_TEST(FSTrim); virObjectUnref(xmlopt); -- 1.8.3.2

--- tests/qemuagenttest.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index a3b8834..d0b450e 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -162,6 +162,52 @@ cleanup: static int +testQemuAgentSuspend(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + size_t i; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-suspend-ram", + "{ \"return\" : {} }") < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-suspend-disk", + "{ \"return\" : {} }") < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-suspend-hybrid", + "{ \"return\" : {} }") < 0) + goto cleanup; + + /* try the commands - fail if ordering changes */ + for (i = 0; i < VIR_NODE_SUSPEND_TARGET_LAST; i++) { + if (qemuAgentSuspend(qemuMonitorTestGetAgent(test), i) < 0) + goto cleanup; + } + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} + + +static int mymain(void) { int ret = 0; @@ -185,6 +231,7 @@ mymain(void) DO_TEST(FSFreeze); DO_TEST(FSThaw); DO_TEST(FSTrim); + DO_TEST(Suspend); virObjectUnref(xmlopt); -- 1.8.3.2

This patch exports a few utility functions and adds testing of shutdown commands of the guest agent. --- tests/qemuagenttest.c | 119 +++++++++++++++++++++++++++++++++++++++++++ tests/qemumonitortestutils.c | 21 ++++---- tests/qemumonitortestutils.h | 28 ++++++++-- 3 files changed, 153 insertions(+), 15 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index d0b450e..e314bb0 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -207,6 +207,124 @@ cleanup: } +struct qemuAgentShutdownTestData { + const char *mode; + qemuAgentEvent event; +}; + + +static int +qemuAgentShutdownTestMonitorHandler(qemuMonitorTestPtr test, + qemuMonitorTestItemPtr item, + const char *cmdstr) +{ + struct qemuAgentShutdownTestData *data; + virJSONValuePtr val = NULL; + virJSONValuePtr args; + const char *cmdname; + const char *mode; + int ret = -1; + + data = qemuMonitorTestItemGetPrivateData(item); + + if (!(val = virJSONValueFromString(cmdstr))) + return -1; + + if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) { + ret = qemuMonitorReportError(test, "Missing command name in %s", cmdstr); + goto cleanup; + } + + if (STRNEQ(cmdname, "guest-shutdown")) { + ret = qemuMonitorTestAddUnexpectedErrorResponse(test); + goto cleanup; + } + + if (!(args = virJSONValueObjectGet(val, "arguments"))) { + ret = qemuMonitorReportError(test, + "Missing arguments section"); + goto cleanup; + } + + if (!(mode = virJSONValueObjectGetString(args, "mode"))) { + ret = qemuMonitorReportError(test, "Missing shutdown mode"); + goto cleanup; + } + + /* now don't reply but return a qemu agent event */ + qemuAgentNotifyEvent(qemuMonitorTestGetAgent(test), + data->event); + + ret = 0; + +cleanup: + virJSONValueFree(val); + return ret; + +} + + +static int +testQemuAgentShutdown(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + struct qemuAgentShutdownTestData priv; + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + priv.event = QEMU_AGENT_EVENT_SHUTDOWN; + priv.mode = "shutdown"; + + if (qemuMonitorTestAddHandler(test, qemuAgentShutdownTestMonitorHandler, + &priv, NULL) < 0) + goto cleanup; + + if (qemuAgentShutdown(qemuMonitorTestGetAgent(test), + QEMU_AGENT_SHUTDOWN_HALT) < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + priv.event = QEMU_AGENT_EVENT_SHUTDOWN; + priv.mode = "powerdown"; + + if (qemuMonitorTestAddHandler(test, qemuAgentShutdownTestMonitorHandler, + &priv, NULL) < 0) + goto cleanup; + + if (qemuAgentShutdown(qemuMonitorTestGetAgent(test), + QEMU_AGENT_SHUTDOWN_POWERDOWN) < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + priv.event = QEMU_AGENT_EVENT_RESET; + priv.mode = "reboot"; + + if (qemuMonitorTestAddHandler(test, qemuAgentShutdownTestMonitorHandler, + &priv, NULL) < 0) + goto cleanup; + + if (qemuAgentShutdown(qemuMonitorTestGetAgent(test), + QEMU_AGENT_SHUTDOWN_REBOOT) < 0) + goto cleanup; + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} + + static int mymain(void) { @@ -232,6 +350,7 @@ mymain(void) DO_TEST(FSThaw); DO_TEST(FSTrim); DO_TEST(Suspend); + DO_TEST(Shutdown); virObjectUnref(xmlopt); diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index f383915..32217a3 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -37,12 +37,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE -typedef struct _qemuMonitorTestItem qemuMonitorTestItem; -typedef qemuMonitorTestItem *qemuMonitorTestItemPtr; -typedef int (*qemuMonitorTestResponseCallback)(qemuMonitorTestPtr test, - qemuMonitorTestItemPtr item, - const char *message); - struct _qemuMonitorTestItem { qemuMonitorTestResponseCallback cb; void *opaque; @@ -96,7 +90,7 @@ qemuMonitorTestItemFree(qemuMonitorTestItemPtr item) /* * Appends data for a reply to the outgoing buffer */ -static int +int qemuMonitorTestAddReponse(qemuMonitorTestPtr test, const char *response) { @@ -119,7 +113,7 @@ qemuMonitorTestAddReponse(qemuMonitorTestPtr test, } -static int +int qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test) { if (test->agent || test->json) { @@ -133,7 +127,7 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test) } -static int +int qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) { va_list msgargs; @@ -167,7 +161,6 @@ cleanup: } - static int qemuMonitorTestProcessCommand(qemuMonitorTestPtr test, const char *cmdstr) @@ -383,7 +376,7 @@ qemuMonitorTestFree(qemuMonitorTestPtr test) } -static int +int qemuMonitorTestAddHandler(qemuMonitorTestPtr test, qemuMonitorTestResponseCallback cb, void *opaque, @@ -414,6 +407,12 @@ error: return -1; } +void * +qemuMonitorTestItemGetPrivateData(qemuMonitorTestItemPtr item) +{ + return item ? item->opaque : NULL; +} + typedef struct _qemuMonitorTestCommandArgs qemuMonitorTestCommandArgs; typedef qemuMonitorTestCommandArgs *qemuMonitorTestCommandArgsPtr; diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 5ec5707..845f567 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -27,10 +27,30 @@ typedef struct _qemuMonitorTest qemuMonitorTest; typedef qemuMonitorTest *qemuMonitorTestPtr; -int -qemuMonitorTestAddItem(qemuMonitorTestPtr test, - const char *command_name, - const char *response); +typedef struct _qemuMonitorTestItem qemuMonitorTestItem; +typedef qemuMonitorTestItem *qemuMonitorTestItemPtr; +typedef int (*qemuMonitorTestResponseCallback)(qemuMonitorTestPtr test, + qemuMonitorTestItemPtr item, + const char *message); + +int qemuMonitorTestAddHandler(qemuMonitorTestPtr test, + qemuMonitorTestResponseCallback cb, + void *opaque, + virFreeCallback freecb); + +int qemuMonitorTestAddReponse(qemuMonitorTestPtr test, + const char *response); + +int qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test); + +int qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...); + +void *qemuMonitorTestItemGetPrivateData(qemuMonitorTestItemPtr item); + + +int qemuMonitorTestAddItem(qemuMonitorTestPtr test, + const char *command_name, + const char *response); int qemuMonitorTestAddAgentSyncResponse(qemuMonitorTestPtr test); -- 1.8.3.2

Test arbitrary qemu commands and timeouting of the guest agent synchronisation. --- tests/qemuagenttest.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index e314bb0..81c24f2 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -326,6 +326,105 @@ cleanup: static int +qemuAgentTimeoutTestMonitorHandler(qemuMonitorTestPtr test ATTRIBUTE_UNUSED, + qemuMonitorTestItemPtr item ATTRIBUTE_UNUSED, + const char *cmdstr ATTRIBUTE_UNUSED) +{ + return 0; +} + +static const char testQemuAgentArbitraryCommandResponse[] = + "{\"return\":\"bla\"}"; + +static int +testQemuAgentArbitraryCommand(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + char *reply = NULL; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "ble", + testQemuAgentArbitraryCommandResponse) < 0) + goto cleanup; + + if (qemuAgentArbitraryCommand(qemuMonitorTestGetAgent(test), + "{\"execute\":\"ble\"}", + &reply, + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + goto cleanup; + + if (STRNEQ(reply, testQemuAgentArbitraryCommandResponse)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "invalid processing of guest agent reply: " + "got '%s' expected '%s'", + reply, testQemuAgentArbitraryCommandResponse); + goto cleanup; + } + + VIR_FREE(reply); + + /* test timeout */ + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddHandler(test, qemuAgentTimeoutTestMonitorHandler, + NULL, NULL) < 0) + goto cleanup; + + if (qemuAgentArbitraryCommand(qemuMonitorTestGetAgent(test), + "{\"execute\":\"ble\"}", + &reply, + 1) != -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "agent command didn't time out"); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(reply); + qemuMonitorTestFree(test); + return ret; +} + + +static int +testQemuAgentTimeout(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddHandler(test, qemuAgentTimeoutTestMonitorHandler, + NULL, NULL) < 0) + goto cleanup; + + if (qemuAgentFSFreeze(qemuMonitorTestGetAgent(test)) != -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "agent command should have failed"); + goto cleanup; + } + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} + + +static int mymain(void) { int ret = 0; @@ -351,6 +450,8 @@ mymain(void) DO_TEST(FSTrim); DO_TEST(Suspend); DO_TEST(Shutdown); + DO_TEST(ArbitraryCommand); + DO_TEST(Timeout); virObjectUnref(xmlopt); -- 1.8.3.2

--- tests/qemuagenttest.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 81c24f2..33a6d73 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -423,6 +423,124 @@ cleanup: return ret; } +static const char testQemuAgentCPUResponse[] = + "{\"return\": " + " [" + " {\"online\": true," + " \"can-offline\": false," + " \"logical-id\": 0" + " }," + " {\"online\": true," + " \"can-offline\": true," + " \"logical-id\": 1" + " }," + " {\"online\": true," + " \"can-offline\": true," + " \"logical-id\": 2" + " }," + " {\"online\": false," + " \"can-offline\": true," + " \"logical-id\": 3" + " }" + " ]" + "}"; + +static const char testQemuAgentCPUArguments1[] = + "[{\"logical-id\":0,\"online\":true}," + "{\"logical-id\":1,\"online\":false}," + "{\"logical-id\":2,\"online\":true}," + "{\"logical-id\":3,\"online\":false}]"; + +static const char testQemuAgentCPUArguments2[] = + "[{\"logical-id\":0,\"online\":true}," + "{\"logical-id\":1,\"online\":true}," + "{\"logical-id\":2,\"online\":true}," + "{\"logical-id\":3,\"online\":true}]"; + +static int +testQemuAgentCPU(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + qemuAgentCPUInfoPtr cpuinfo = NULL; + int nvcpus; + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-get-vcpus", + testQemuAgentCPUResponse) < 0) + goto cleanup; + + /* get cpus */ + if ((nvcpus = qemuAgentGetVCPUs(qemuMonitorTestGetAgent(test), + &cpuinfo)) < 0) + goto cleanup; + + if (nvcpus != 4) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Expected '4' cpus, got '%d'", nvcpus); + goto cleanup; + } + + /* try to unplug one */ + if (qemuAgentUpdateCPUInfo(2, cpuinfo, nvcpus) < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", + "{ \"return\" : 4 }", + "vcpus", testQemuAgentCPUArguments1, + NULL) < 0) + goto cleanup; + + if ((nvcpus = qemuAgentSetVCPUs(qemuMonitorTestGetAgent(test), + cpuinfo, nvcpus)) < 0) + goto cleanup; + + if (nvcpus != 4) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Expected '4' cpus updated , got '%d'", nvcpus); + goto cleanup; + } + + /* try to hotplug two */ + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", + "{ \"return\" : 4 }", + "vcpus", testQemuAgentCPUArguments2, + NULL) < 0) + goto cleanup; + + if (qemuAgentUpdateCPUInfo(4, cpuinfo, nvcpus) < 0) + goto cleanup; + + if ((nvcpus = qemuAgentSetVCPUs(qemuMonitorTestGetAgent(test), + cpuinfo, nvcpus)) < 0) + goto cleanup; + + if (nvcpus != 4) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Expected '4' cpus updated , got '%d'", nvcpus); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(cpuinfo); + qemuMonitorTestFree(test); + return ret; +} + static int mymain(void) @@ -452,6 +570,7 @@ mymain(void) DO_TEST(Shutdown); DO_TEST(ArbitraryCommand); DO_TEST(Timeout); + DO_TEST(CPU); virObjectUnref(xmlopt); -- 1.8.3.2