falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

socket_scm_helper: Accept fd directly 

This gives us more freedom about the fd that is passed to qemu, allowing
us to e.g. pass sockets.

Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2016-10-25 15:11:39 +02:00 committed by Kevin Wolf
parent 5fcbdf508a
commit d35172b425
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/qemu-iotests/socket_scm_helper.c
View File

@ -60,7 +60,7 @@ static int send_fd(int fd, int fd_to_send)
} }
/* Convert string to fd number. */ /* Convert string to fd number. */
static int get_fd_num(const char *fd_str) static int get_fd_num(const char *fd_str, bool silent)
{ {
int sock; int sock;
char *err; char *err;
@ -68,12 +68,16 @@ static int get_fd_num(const char *fd_str)
errno = 0; errno = 0;
sock = strtol(fd_str, &err, 10); sock = strtol(fd_str, &err, 10);
if (errno) { if (errno) {
fprintf(stderr, "Failed in strtol for socket fd, reason: %s\n", if (!silent) {
strerror(errno)); fprintf(stderr, "Failed in strtol for socket fd, reason: %s\n",
strerror(errno));
}
return -1; return -1;
} }
if (!*fd_str || *err || sock < 0) { if (!*fd_str || *err || sock < 0) {
fprintf(stderr, "bad numerical value for socket fd '%s'\n", fd_str); if (!silent) {
fprintf(stderr, "bad numerical value for socket fd '%s'\n", fd_str);
}
return -1; return -1;
} }
@ -104,18 +108,21 @@ int main(int argc, char **argv, char **envp)
} }
sock = get_fd_num(argv[1]); sock = get_fd_num(argv[1], false);
if (sock < 0) { if (sock < 0) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* Now only open a file in readonly mode for test purpose. If more precise fd = get_fd_num(argv[2], true);
control is needed, use python script in file operation, which is
supposed to fork and exec this program. */
fd = open(argv[2], O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Failed to open file '%s'\n", argv[2]); /* Now only open a file in readonly mode for test purpose. If more
return EXIT_FAILURE; precise control is needed, use python script in file operation, which
is supposed to fork and exec this program. */
fd = open(argv[2], O_RDONLY);
if (fd < 0) {
fprintf(stderr, "Failed to open file '%s'\n", argv[2]);
return EXIT_FAILURE;
}
} }
ret = send_fd(sock, fd); ret = send_fd(sock, fd);