diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 17:33:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 17:33:19 +0000 |
| commit | 67ef811ed1452efe9d60c4baa20c8ef6ea0cfe87 (patch) | |
| tree | cf93350db027542b1a64756f8bb0b683d5837173 /tests | |
| parent | 0c6940d086f39bbf725d96104abe46da87429cb6 (diff) | |
| parent | e55eb806dbb97f53794b0c2f86983d34f6696845 (diff) | |
| download | qemu-67ef811ed1452efe9d60c4baa20c8ef6ea0cfe87.zip qemu-67ef811ed1452efe9d60c4baa20c8ef6ea0cfe87.tar.gz qemu-67ef811ed1452efe9d60c4baa20c8ef6ea0cfe87.tar.bz2 | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-02-25-tag' into staging
qemu-ga patch queue for 2.6
* fix w32 build breakage when VSS enabled
* fix up wchar handling in guest-set-user-password
* fix re-install handling for w32 MSI installer
* add w32 support for guest-get-vcpus
* add support for enums in guest-file-seek SEEK params
instead of relying on platform-specific integer values
# gpg: Signature made Thu 25 Feb 2016 16:59:13 GMT using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
* remotes/mdroth/tags/qga-pull-2016-02-25-tag:
qga: fix w32 breakage due to missing osdep.h includes
qga: check utf8-to-utf16 conversion
qga: fix off-by-one length check
qga: use wide-chars constants for wchar_t comparisons
qga: use size_t for wcslen() return value
qga: use more idiomatic qemu-style eol operators
qga: implement the guest-get-vcpus for windows
qemu-ga: Fixed minor version switch issue
qga: Support enum names in guest-file-seek
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-qga.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/test-qga.c b/tests/test-qga.c index 0973b48..72a89de 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -6,7 +6,6 @@ #include <sys/un.h> #include "libqtest.h" -#include "qga/guest-agent-core.h" typedef struct { char *test_dir; @@ -450,8 +449,8 @@ static void test_qga_file_ops(gconstpointer fix) /* seek */ cmd = g_strdup_printf("{'execute': 'guest-file-seek'," " 'arguments': { 'handle': %" PRId64 ", " - " 'offset': %d, 'whence': %d } }", - id, 6, QGA_SEEK_SET); + " 'offset': %d, 'whence': '%s' } }", + id, 6, "set"); ret = qmp_fd(fixture->fd, cmd); qmp_assert_no_error(ret); val = qdict_get_qdict(ret, "return"); @@ -543,8 +542,8 @@ static void test_qga_file_write_read(gconstpointer fix) /* seek to 0 */ cmd = g_strdup_printf("{'execute': 'guest-file-seek'," " 'arguments': { 'handle': %" PRId64 ", " - " 'offset': %d, 'whence': %d } }", - id, 0, QGA_SEEK_SET); + " 'offset': %d, 'whence': '%s' } }", + id, 0, "set"); ret = qmp_fd(fixture->fd, cmd); qmp_assert_no_error(ret); val = qdict_get_qdict(ret, "return"); |