OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

contrib: ivshmem client and server build fix for SunOS.

Browse Source 
sun is a macro on these systems, thus renaming the variables on the
client and server.

Signed-off-by: David Carlier <devnexen@gmail.com>
Message-Id: <CA+XhMqzHPG5ezqY-YxbA+tMoadA3VDFWBX8_LaLC5YsQOMrz+A@mail.gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
David CARLIER 2020-07-18 14:20:55 +01:00 committed by Thomas Huth
parent 630d86b7f2
commit 7e47061d93
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/ivshmem-client/ivshmem-client.c
View File

@ -178,7 +178,7 @@ ivshmem_client_init(IvshmemClient *client, const char *unix_sock_path,
int int
ivshmem_client_connect(IvshmemClient *client) ivshmem_client_connect(IvshmemClient *client)
{ {
struct sockaddr_un sun; struct sockaddr_un s_un;
int fd, ret; int fd, ret;
int64_t tmp; int64_t tmp;
@ -192,16 +192,16 @@ ivshmem_client_connect(IvshmemClient *client)
return -1; return -1;
} }
sun.sun_family = AF_UNIX; s_un.sun_family = AF_UNIX;
ret = snprintf(sun.sun_path, sizeof(sun.sun_path), "%s", ret = snprintf(s_un.sun_path, sizeof(s_un.sun_path), "%s",
client->unix_sock_path); client->unix_sock_path);
if (ret < 0 || ret >= sizeof(sun.sun_path)) { if (ret < 0 || ret >= sizeof(s_un.sun_path)) {
IVSHMEM_CLIENT_DEBUG(client, "could not copy unix socket path\n"); IVSHMEM_CLIENT_DEBUG(client, "could not copy unix socket path\n");
goto err_close; goto err_close;
} }
if (connect(client->sock_fd, (struct sockaddr *)&sun, sizeof(sun)) < 0) { if (connect(client->sock_fd, (struct sockaddr *)&s_un, sizeof(s_un)) < 0) {
IVSHMEM_CLIENT_DEBUG(client, "cannot connect to %s: %s\n", sun.sun_path, IVSHMEM_CLIENT_DEBUG(client, "cannot connect to %s: %s\n", s_un.sun_path,
strerror(errno)); strerror(errno));
goto err_close; goto err_close;
} }

12
contrib/ivshmem-server/ivshmem-server.c
View File

@ -288,7 +288,7 @@ ivshmem_server_init(IvshmemServer *server, const char *unix_sock_path,
int int
ivshmem_server_start(IvshmemServer *server) ivshmem_server_start(IvshmemServer *server)
{ {
struct sockaddr_un sun; struct sockaddr_un s_un;
int shm_fd, sock_fd, ret; int shm_fd, sock_fd, ret;
/* open shm file */ /* open shm file */
@ -327,15 +327,15 @@ ivshmem_server_start(IvshmemServer *server)
goto err_close_shm; goto err_close_shm;
} }
sun.sun_family = AF_UNIX; s_un.sun_family = AF_UNIX;
ret = snprintf(sun.sun_path, sizeof(sun.sun_path), "%s", ret = snprintf(s_un.sun_path, sizeof(s_un.sun_path), "%s",
server->unix_sock_path); server->unix_sock_path);
if (ret < 0 || ret >= sizeof(sun.sun_path)) { if (ret < 0 || ret >= sizeof(s_un.sun_path)) {
IVSHMEM_SERVER_DEBUG(server, "could not copy unix socket path\n"); IVSHMEM_SERVER_DEBUG(server, "could not copy unix socket path\n");
goto err_close_sock; goto err_close_sock;
} }
if (bind(sock_fd, (struct sockaddr *)&sun, sizeof(sun)) < 0) { if (bind(sock_fd, (struct sockaddr *)&s_un, sizeof(s_un)) < 0) {
IVSHMEM_SERVER_DEBUG(server, "cannot connect to %s: %s\n", sun.sun_path, IVSHMEM_SERVER_DEBUG(server, "cannot connect to %s: %s\n", s_un.sun_path,
strerror(errno)); strerror(errno));
goto err_close_sock; goto err_close_sock;
} }