Message ID | 1365476681-31593-13-git-send-email-mrhines@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
Il 09/04/2013 05:04, mrhines@linux.vnet.ibm.com ha scritto: > index 4e4b819..0b398f4 100644 > --- a/util/oslib-posix.c > +++ b/util/oslib-posix.c > @@ -144,6 +144,8 @@ void qemu_set_block(int fd) > void qemu_set_nonblock(int fd) > { > int f; > + if(fd == -1) > + return; > f = fcntl(fd, F_GETFL); > fcntl(fd, F_SETFL, f | O_NONBLOCK); > } > -- 1.7.10.4 Do you need to remove the assertion in process_incoming_migration, too? I would prefer to touch process_incoming_migration instead, actually, replacing the assertion with an if() there. Paolo
diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 4e4b819..0b398f4 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -144,6 +144,8 @@ void qemu_set_block(int fd) void qemu_set_nonblock(int fd) { int f; + if(fd == -1) + return; f = fcntl(fd, F_GETFL); fcntl(fd, F_SETFL, f | O_NONBLOCK); }