[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 21/23] socket_scm_helper: Accept fd directly
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 21/23] socket_scm_helper: Accept fd directly |
Date: |
Thu, 27 Oct 2016 20:09:05 +0200 |
From: Max Reitz <address@hidden>
This gives us more freedom about the fd that is passed to qemu, allowing
us to e.g. pass sockets.
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/socket_scm_helper.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/socket_scm_helper.c
b/tests/qemu-iotests/socket_scm_helper.c
index 80cadf4..eb76d31 100644
--- a/tests/qemu-iotests/socket_scm_helper.c
+++ b/tests/qemu-iotests/socket_scm_helper.c
@@ -60,7 +60,7 @@ static int send_fd(int fd, int fd_to_send)
}
/* 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;
char *err;
@@ -68,12 +68,16 @@ static int get_fd_num(const char *fd_str)
errno = 0;
sock = strtol(fd_str, &err, 10);
if (errno) {
- fprintf(stderr, "Failed in strtol for socket fd, reason: %s\n",
- strerror(errno));
+ if (!silent) {
+ fprintf(stderr, "Failed in strtol for socket fd, reason: %s\n",
+ strerror(errno));
+ }
return -1;
}
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;
}
@@ -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) {
return EXIT_FAILURE;
}
- /* Now only open a file in readonly mode for test purpose. If more 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);
+ fd = get_fd_num(argv[2], true);
if (fd < 0) {
- fprintf(stderr, "Failed to open file '%s'\n", argv[2]);
- return EXIT_FAILURE;
+ /* Now only open a file in readonly mode for test purpose. If more
+ 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);
--
1.8.3.1
- [Qemu-block] [PULL 11/23] block/nbd: Drop trailing "." in error messages, (continued)
- [Qemu-block] [PULL 11/23] block/nbd: Drop trailing "." in error messages, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 12/23] block/nbd: Reject port parameter without host, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 13/23] block/nbd: Default port in nbd_refresh_filename(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 14/23] block/nbd: Use qdict_put(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 16/23] block/nbd: Accept SocketAddress, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 15/23] block/nbd: Add nbd_has_filename_options_conflict(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 17/23] block/nbd: Use SocketAddress options, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 18/23] qapi: Allow blockdev-add for NBD, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 20/23] iotests.py: Allow concurrent qemu instances, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 19/23] iotests.py: Add qemu_nbd function, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 21/23] socket_scm_helper: Accept fd directly,
Kevin Wolf <=
- [Qemu-block] [PULL 23/23] iotests: Add test for NBD's blockdev-add interface, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 22/23] iotests: Add assert_json_filename_equal() method, Kevin Wolf, 2016/10/27
- Re: [Qemu-block] [Qemu-devel] [PULL 00/23] Block layer patches, Peter Maydell, 2016/10/28