diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-04 18:11:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-04 18:11:40 +0000 |
| commit | a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c (patch) | |
| tree | 2388c2239d2c860df58c5b8642e86ec848ab8771 /tests/vhost-user-test.c | |
| parent | 61e3aa25b129b48d8a8cb851aae2a787af7ca5e1 (diff) | |
| parent | 0d2cd785ef1282b14687f9f7f4b63ae4a2430be3 (diff) | |
| download | hqemu-a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c.zip hqemu-a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c.tar.gz | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
QOM infrastructure fixes and device conversions
* Documentation update
* qom-test and related fixes
# gpg: Signature made Fri 04 Dec 2015 17:54:55 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-peter:
qom-test: Fix qmp() leaks
tests: Use proper functions types instead of void (*fn)
qom: Update documentation comment of struct Object
tests: Fix check-report-qtest-% target
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/vhost-user-test.c')
| -rw-r--r-- | tests/vhost-user-test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 29de739..991fd85 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -173,8 +173,9 @@ static void wait_for_fds(TestServer *s) g_mutex_unlock(&s->data_mutex); } -static void read_guest_mem(TestServer *s) +static void read_guest_mem(const void *data) { + TestServer *s = (void *)data; uint32_t *guest_mem; int i, j; size_t size; |
