diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-15 20:30:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-15 20:30:24 +0100 |
| commit | 3e40748834923798aa57e3751db13a069e2c617b (patch) | |
| tree | efc71f7be426bde8a0798b6b7d810561171bf587 /tests/tcg/multiarch/linux-test.c | |
| parent | e545512b5e26f1e69fcd4c88df3c12853946dcdb (diff) | |
| parent | 49e258df83e2200847cd4b331f48d8d872fba51c (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-mb-20201014' into staging
Implement rt signal frames for microblaze-linux-user
Adjust linux-user test for musl
# gpg: Signature made Thu 15 Oct 2020 05:50:00 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-mb-20201014:
linux-user/microblaze: Remove non-rt signal frames
linux-user/microblaze: Implement rt signal frames
tests/tcg/linux-test: Adjust getsockname for musl
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/tcg/multiarch/linux-test.c')
| -rw-r--r-- | tests/tcg/multiarch/linux-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index 8a7c15cd31..96bbad5823 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -296,7 +296,7 @@ static void test_socket(void) server_fd = server_socket(); /* find out what port we got */ socklen = sizeof(server_addr); - ret = getsockname(server_fd, &server_addr, &socklen); + ret = getsockname(server_fd, (struct sockaddr *)&server_addr, &socklen); chk_error(ret); server_port = ntohs(server_addr.sin_port); |