diff options
| author | Peter Maydell | 2016-01-22 16:19:20 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-01-22 16:19:21 +0100 |
| commit | 047e363b05679724d6b784c6ec6310697fe48ba0 (patch) | |
| tree | 17570c0192a633520edf87b8371e4b0befaf82fc /tests/vhost-user-test.c | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | softfloat: fix return type of roundAndPackFloat16 (diff) | |
| download | qemu-047e363b05679724d6b784c6ec6310697fe48ba0.tar.gz qemu-047e363b05679724d6b784c6ec6310697fe48ba0.tar.xz qemu-047e363b05679724d6b784c6ec6310697fe48ba0.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-softfloat-20160122' into staging
softfloat:
* drop confusing softfloat-only types
* fix return type of roundAndPackFloat16
# gpg: Signature made Fri 22 Jan 2016 15:15:17 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-softfloat-20160122:
softfloat: fix return type of roundAndPackFloat16
fpu: Replace uint8 typedef with uint8_t
fpu: Replace int8 typedef with int8_t
fpu: Replace uint32 typedef with uint32_t
fpu: Replace int32 typedef with int32_t
fpu: Replace uint64 typedef with uint64_t
fpu: Replace int64 typedef with int64_t
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 991fd85c7c..95f35af3e5 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -439,7 +439,7 @@ static void wait_for_log_fd(TestServer *s) g_mutex_unlock(&s->data_mutex); } -static void write_guest_mem(TestServer *s, uint32 seed) +static void write_guest_mem(TestServer *s, uint32_t seed) { uint32_t *guest_mem; int i, j; |