osdep: Fix runtime failure on older Linux kernels
PATCH 1/1 osdep: Fix runtime failure on older Linux kernels
If QEMU finds newer kernel header files on compilation time, it will use advertised features like pipe2 or SOCK_CLOEXEC by just doing a compile test. If later the executables are executed on an older kernel (<2.6.27, like Xen Dom0 2.6.18), then QEMU will fail on opening sockets and creating pipes and returns the rather unspecific "qemu_init_main_loop failed". This patch fixes this by checking the return values of these calls for EINVAL and ENOSYS and falling back to the older versions automatically.
--- osdep.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)
osdep.c +12 -6
@@ -262,13 +262,15 @@ int qemu_pipe(int pipefd[2])#ifdef CONFIG_PIPE2 ret =pipe2 (pipefd,O_CLOEXEC ); -#else +if (ret !=-1 || errno !=ENOSYS ) { +return ret; + } +#endif ret =pipe (pipefd);if (ret ==0 ) {qemu_set_cloexec (pipefd[0 ]);qemu_set_cloexec (pipefd[1 ]); } -#endif return ret; }
@@ -283,12 +285,14 @@ int qemu_socket(int domain, int type, int protocol)#ifdef SOCK_CLOEXEC ret =socket (domain, type |SOCK_CLOEXEC , protocol); -#else +if (ret !=-1 || errno !=EINVAL ) { +return ret; + } +#endif ret =socket (domain, type, protocol);if (ret >=0 ) {qemu_set_cloexec (ret); } -#endif return ret; }
@@ -302,12 +306,14 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen)#ifdef CONFIG_ACCEPT4 ret =accept4 (s, addr, addrlen,SOCK_CLOEXEC ); -#else +if (ret !=-1 || errno !=EINVAL ) { +return ret; + } +#endif ret =accept (s, addr, addrlen);if (ret >=0 ) {qemu_set_cloexec (ret); } -#endif return ret; }
Signature · 1 line
1.6.4
Quoted 7 lines · Andre Przywara
If QEMU finds newer kernel header files on compilation time, it will use advertised features like pipe2 or
SOCK_CLOEXECby just doing a compile test. If later the executables are executed on an older kernel (<2.6.27, like Xen Dom0 2.6.18), then QEMU will fail on opening sockets and creating pipes and returns the rather unspecific "qemu_init_main_loopfailed". This patch fixes this by checking the return values of these calls for EINVAL and ENOSYS and falling back to the older versions automatically.
Agreed, most other apps that use *_CLOEXEC do this (including glibc itself and gnulib; the notable exception is APR and there were quite some flames about this).
Paolo
Am 18.12.2009 10:45, schrieb Andre Przywara:
Quoted 53 lines
If QEMU finds newer kernel header files on compilation time, it will use advertised features like pipe2 or
SOCK_CLOEXECby just doing a compile test. If later the executables are executed on an older kernel (<2.6.27, like Xen Dom0 2.6.18), then QEMU will fail on opening sockets and creating pipes and returns the rather unspecific "qemu_init_main_loopfailed". This patch fixes this by checking the return values of these calls for EINVAL and ENOSYS and falling back to the older versions automatically.Signed-off-by Andre Przywara <[email protected]>--- osdep.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)osdep.c +8
-4@@ -262,13 +262,15 @@ int qemu_pipe(int pipefd[2])#ifdef CONFIG_PIPE2 ret =pipe2 (pipefd,O_CLOEXEC ); -#else +if (ret !=-1 || errno !=ENOSYS ) { +return ret; + } +#endif ret =pipe (pipefd);if (ret ==0 ) {qemu_set_cloexec (pipefd[0 ]);qemu_set_cloexec (pipefd[1 ]); } -#endif return ret; }@@ -283,12 +285,14 @@ int qemu_socket(int domain, int type, int protocol)#ifdef SOCK_CLOEXEC ret =socket (domain, type |SOCK_CLOEXEC , protocol); -#else +if (ret !=-1 || errno !=EINVAL ) { +return ret; + } +#endif ret =socket (domain, type, protocol);if (ret >=0 ) {qemu_set_cloexec (ret); } -#endif return ret; }
osdep.c int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen) · line 309
Quoted 5 lines
osdep.c +1
-1@@ -302,12 +306,14 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen)#ifdef CONFIG_ACCEPT4 ret =accept4 (s, addr, addrlen,SOCK_CLOEXEC ); -#else +if (ret !=-1 || errno !=EINVAL ) {
Shouldn't this be an ENOSYS?
Kevin
Quoted 9 lines · Kevin Wolf
osdep.c int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen) · line 309
Quoted 7 lines
....
osdep.c +1
-1@@ -302,12 +306,14 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen)#ifdef CONFIG_ACCEPT4 ret =accept4 (s, addr, addrlen,SOCK_CLOEXEC ); -#else +if (ret !=-1 || errno !=EINVAL ) {Shouldn't this be an ENOSYS?
Oh, right you are. This was the untested part, because my glibc didn't have accept4. I only saw the SOCK_CLOEXEC name on this... Fixed patch follows...
Regards,
Andre.
Signature · 3 lines
Andre Przywara AMD-OSRC (Dresden) Tel: x29712
PATCH v2 1/1 osdep: Fix runtime failure on older Linux kernels
In reply to Andre PrzywaraIf QEMU finds newer kernel header files on compilation time, it will use advertised features like pipe2 or SOCK_CLOEXEC by just doing a compile test. If later the executables are executed on an older kernel (<2.6.27, like Xen Dom0 2.6.18), then QEMU will fail on opening sockets and creating pipes and returns the rather unspecific "qemu_init_main_loop failed". This patch fixes this by checking the return values of these calls for EINVAL and ENOSYS and falling back to the older versions automatically.
--- osdep.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)
v2 changed the errno check from EINVAL to ENOSYS for accept4
osdep.c +12 -6
@@ -262,13 +262,15 @@ int qemu_pipe(int pipefd[2])#ifdef CONFIG_PIPE2 ret =pipe2 (pipefd,O_CLOEXEC ); -#else +if (ret !=-1 || errno !=ENOSYS ) { +return ret; + } +#endif ret =pipe (pipefd);if (ret ==0 ) {qemu_set_cloexec (pipefd[0 ]);qemu_set_cloexec (pipefd[1 ]); } -#endif return ret; }
@@ -283,12 +285,14 @@ int qemu_socket(int domain, int type, int protocol)#ifdef SOCK_CLOEXEC ret =socket (domain, type |SOCK_CLOEXEC , protocol); -#else +if (ret !=-1 || errno !=EINVAL ) { +return ret; + } +#endif ret =socket (domain, type, protocol);if (ret >=0 ) {qemu_set_cloexec (ret); } -#endif return ret; }
@@ -302,12 +306,14 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen)#ifdef CONFIG_ACCEPT4 ret =accept4 (s, addr, addrlen,SOCK_CLOEXEC ); -#else +if (ret !=-1 || errno !=ENOSYS ) { +return ret; + } +#endif ret =accept (s, addr, addrlen);if (ret >=0 ) {qemu_set_cloexec (ret); } -#endif return ret; }
Signature · 1 line
1.6.4
Am 18.12.2009 13:37, schrieb Andre Przywara:
Quoted 8 lines
If QEMU finds newer kernel header files on compilation time, it will use advertised features like pipe2 or
SOCK_CLOEXECby just doing a compile test. If later the executables are executed on an older kernel (<2.6.27, like Xen Dom0 2.6.18), then QEMU will fail on opening sockets and creating pipes and returns the rather unspecific "qemu_init_main_loopfailed". This patch fixes this by checking the return values of these calls for EINVAL and ENOSYS and falling back to the older versions automatically.
Quoted 6 lines
Signed-off-by Andre Przywara <[email protected]>--- osdep.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)v2 changed the errno check from EINVAL to ENOSYS for accept4
I think this patch even qualifies for stable, though this might mean 0.12.1 now.
Kevin