From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTn4C-0005Ez-RQ for qemu-devel@nongnu.org; Mon, 06 Jun 2011 23:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTn4A-0000S7-Pr for qemu-devel@nongnu.org; Mon, 06 Jun 2011 23:34:56 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:39209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTn4A-0000Rm-FH for qemu-devel@nongnu.org; Mon, 06 Jun 2011 23:34:54 -0400 Received: by qwj8 with SMTP id 8so2375117qwj.4 for ; Mon, 06 Jun 2011 20:34:53 -0700 (PDT) From: Alexandre Raymond Date: Mon, 6 Jun 2011 23:34:10 -0400 Message-Id: <1307417650-12955-1-git-send-email-cerbere@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2] Darwin: Fix compilation warning regarding the deprecated daemon() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, andreas.faerber@web.de, Alexandre Raymond Changes since v1: create a wrapper function named qemu_daemon() in oslib-posix.c instead of putting the OS specific workaround in qemu-nbd.c directly. On OSX >= 10.5, daemon() is deprecated, resulting in the following warning: ----8<---- qemu-nbd.c: In function ‘main’: qemu-nbd.c:371: warning: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:289) ----8<---- The following trick, used in mDNSResponder, takes care of this warning: http://www.opensource.apple.com/source/mDNSResponder/mDNSResponder-258.18/mDNSPosix/PosixDaemon.c On OSX, it temporarily renames the daemon() function before including stdlib.h and declares it manually as an extern function. This way, the compiler does not see the declaration from stdlib.h and thus does not display the warning. Signed-off-by: Alexandre Raymond --- osdep.h | 1 + oslib-posix.c | 15 +++++++++++++++ qemu-nbd.c | 2 +- 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/osdep.h b/osdep.h index 970d767..6eb9a49 100644 --- a/osdep.h +++ b/osdep.h @@ -88,6 +88,7 @@ # define QEMU_GNUC_PREREQ(maj, min) 0 #endif +int qemu_daemon(int nochdir, int noclose); void *qemu_memalign(size_t alignment, size_t size); void *qemu_vmalloc(size_t size); void qemu_vfree(void *ptr); diff --git a/oslib-posix.c b/oslib-posix.c index 7bc5f7c..5392e25 100644 --- a/oslib-posix.c +++ b/oslib-posix.c @@ -26,11 +26,26 @@ * THE SOFTWARE. */ +/* The following block of code temporarily renames the daemon() function so the + compiler does not see the warning associated with it in stdlib.h on OSX */ +#ifdef __APPLE__ +#define daemon qemu_fake_daemon_function +#include +#undef daemon +extern int daemon(int, int); +#endif + #include "config-host.h" #include "sysemu.h" #include "trace.h" #include "qemu_socket.h" + + +int qemu_daemon(int nochdir, int noclose) { + return daemon(nochdir, noclose); +} + void *qemu_oom_check(void *ptr) { if (ptr == NULL) { diff --git a/qemu-nbd.c b/qemu-nbd.c index e858033..e65cc6c 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -359,7 +359,7 @@ int main(int argc, char **argv) if (!verbose) { /* detach client and server */ - if (daemon(0, 0) == -1) { + if (qemu_daemon(0, 0) == -1) { err(EXIT_FAILURE, "Failed to daemonize"); } } -- 1.7.5