From patchwork Thu Mar 13 13:27:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 329897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 748742C00AB for ; Fri, 14 Mar 2014 00:28:52 +1100 (EST) Received: from localhost ([::1]:38915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO5go-0003Rt-2b for incoming@patchwork.ozlabs.org; Thu, 13 Mar 2014 09:28:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO5gK-0003J7-7C for qemu-devel@nongnu.org; Thu, 13 Mar 2014 09:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO5g8-0007GE-QD for qemu-devel@nongnu.org; Thu, 13 Mar 2014 09:28:20 -0400 Received: from mout.web.de ([212.227.15.3]:57455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO5g8-0007DU-Hh for qemu-devel@nongnu.org; Thu, 13 Mar 2014 09:28:08 -0400 Received: from envy.de ([84.148.47.244]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0MGCm7-1WL18f34Y3-00FACJ; Thu, 13 Mar 2014 14:28:02 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 13 Mar 2014 14:27:59 +0100 Message-Id: <1394717279-23406-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 X-Provags-ID: V03:K0:LYuzHxFzmf3KJTJ4lsHRp/mI+A9FnGRjzMLqQD2MKkDEY2jMS/C gQ/+inMaXtc5+nMC6GuTitEK/phTBp1TdD7oHUc2PsoKeVjrQCeLS5+Qq2CWz+AQ+wR9V8K UsPJXoZuawkb+7Zmko1aQ4+9V0u4TllF/pVUJxK5tYFuo/7qCMFUshezayI8EjCLPnJTGHA G4GTZlbdTB07RV0QN0Chw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.3 Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Fam Zheng , Paolo Bonzini Subject: [Qemu-devel] [PATCH buildfix] oslib-posix: Fix build on FreeBSD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit 10f5bff622cad71645e22c027b77ac31e51008ef (util: Split out exec_dir from os_find_datadir) moved code from os-posix.c to util/oslib-posix.c but forgot to move a FreeBSD #include alongside, needed for CTL_KERN among others. Cc: Fam Zheng Cc: Paolo Bonzini Signed-off-by: Andreas Färber --- os-posix.c | 4 ---- util/oslib-posix.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os-posix.c b/os-posix.c index 6187301..cb2a7f7 100644 --- a/os-posix.c +++ b/os-posix.c @@ -44,10 +44,6 @@ #include #endif -#ifdef __FreeBSD__ -#include -#endif - static struct passwd *user_pwd; static const char *chroot_dir; static int daemonize; diff --git a/util/oslib-posix.c b/util/oslib-posix.c index c2eeb4f..8e9c770 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -63,6 +63,10 @@ extern int daemon(int, int); #include #endif +#ifdef __FreeBSD__ +#include +#endif + int qemu_get_thread_id(void) { #if defined(__linux__)