From patchwork Sun Jun 17 00:56:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keno Fischer X-Patchwork-Id: 10468143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D18B0600F4 for ; Sun, 17 Jun 2018 01:06:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B08FF28AE6 for ; Sun, 17 Jun 2018 01:06:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3BAA28BA1; Sun, 17 Jun 2018 01:06:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D34D28AE6 for ; Sun, 17 Jun 2018 01:06:27 +0000 (UTC) Received: from localhost ([::1]:53399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUM9C-0004B2-3Z for patchwork-qemu-devel@patchwork.kernel.org; Sat, 16 Jun 2018 21:06:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUM0b-0005nn-SA for qemu-devel@nongnu.org; Sat, 16 Jun 2018 20:57:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUM0Y-0003II-Vm for qemu-devel@nongnu.org; Sat, 16 Jun 2018 20:57:33 -0400 Received: from mail-qk0-x235.google.com ([2607:f8b0:400d:c09::235]:42874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUM0Y-0003ID-RL for qemu-devel@nongnu.org; Sat, 16 Jun 2018 20:57:30 -0400 Received: by mail-qk0-x235.google.com with SMTP id j80-v6so7659797qke.9 for ; Sat, 16 Jun 2018 17:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juliacomputing-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=vPFjMCbD3tS6pxUt6OYAE5HtCYWreVnJupsfjL37kd4=; b=D8xFxoc6yAtdYCUmMBkT/+ZtPn1F71nP5GEIk5WMEbit4UNntrEcZdc5KBWCxWUegc EDUiH+qP3uTSQMseiuxqXZOzMebFZHENHElbipOBCqiLh8/x4rwSDcrInHnNoM8XUMTl o1HO/3h/Rxm3mM+ShIR5c4rju90vwd1Eubisx37PmLJuUA2aCQa6jHkfvRC6eh2uqMKF X6CInbWWOZ/kMMRlUND59CX9jJbSMS+Hu1B14wMNuKy50CbqN9DrFnRala6rDHhF6D72 La7VdQswdgPpoM2haOLkqKhf4F9609jTn0o/r/Li2EfEsqju2gVp907d+hMGItQFTSpN znYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=vPFjMCbD3tS6pxUt6OYAE5HtCYWreVnJupsfjL37kd4=; b=MGFD8YZ8yZD8q47SggZjAA9ve06f8SiHPntV3iVdGIy1EJJlA2e9gdeSJSOw1TT5LL 075RbmkbFz2huTCySZCYH9Hz2sE20+Xa9XKsjeZhrU8rnWcNvrWfs8ORgOOR9e7ZySKv jKJMinleWV03Qw25zvQatWhdE7TA1R/MN0b2qTZdC2YumMYyZNKvQTns7I/86G/hHc5Q PzAF/YIYE6PNmn59P97S3ODK89gBUKrSqOuBELM4Uxlw2RDLN4OVIYw2O+O/+lgen4Dg VvxqW4wBhU1psvZi/A5KfLYeLZT2qeSmAyr2ssD+Jnpu6e/xFftL0guW5HZTk62VlZO0 9Q+g== X-Gm-Message-State: APt69E01iZ+bODmmB11yK4gz8EQ+j0xNXKSZrUKBL9m7wkIl3Nj6hefR rvye3WCzOTolUCKE47Sr3lfgbYY0mzw= X-Google-Smtp-Source: ADUXVKKYJrCg/wySzCingW5eJmo8h4XlXZ11nQ++8nZP26aTx9JE1e10WdjXy38jxt5qn2qNxlWHgg== X-Received: by 2002:a37:c31d:: with SMTP id a29-v6mr5953202qkj.213.1529197050011; Sat, 16 Jun 2018 17:57:30 -0700 (PDT) Received: from localhost.localdomain (96-86-104-61-static.hfc.comcastbusiness.net. [96.86.104.61]) by smtp.gmail.com with ESMTPSA id x21-v6sm7302186qto.2.2018.06.16.17.57.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Jun 2018 17:57:29 -0700 (PDT) From: Keno Fischer To: qemu-devel@nongnu.org Date: Sat, 16 Jun 2018 20:56:57 -0400 Message-Id: <6619399bfc7df3fdd4d2f5b78ed28b1e95fce1c9.1529196703.git.keno@juliacomputing.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::235 Subject: [Qemu-devel] [PATCH v3 13/13] 9p: darwin: configure: Allow VirtFS on Darwin X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Keno Fischer , groug@kaod.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Keno Fischer --- Makefile.objs | 1 + configure | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 7a9828d..c968a9a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -104,6 +104,7 @@ common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ +common-obj-$(CONFIG_DARWIN) += fsdev/ common-obj-y += migration/ diff --git a/configure b/configure index 195c9bd..74f593a 100755 --- a/configure +++ b/configure @@ -5568,16 +5568,28 @@ if test "$want_tools" = "yes" ; then fi fi if test "$softmmu" = yes ; then - if test "$linux" = yes; then - if test "$virtfs" != no && test "$cap" = yes && test "$attr" = yes ; then + if test "$virtfs" != no; then + if test "$linux" = yes; then + if test "$cap" = yes && test "$attr" = yes ; then + virtfs=yes + tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" + else + if test "$virtfs" = yes; then + error_exit "VirtFS requires libcap devel and libattr devel under Linux" + fi + virtfs=no + fi + elif test "$darwin" = yes; then virtfs=yes tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" else if test "$virtfs" = yes; then - error_exit "VirtFS requires libcap devel and libattr devel" + error_exit "VirtFS is supported only on Linux and Darwin" fi virtfs=no fi + fi + if test "$linux" = yes; then if test "$mpath" != no && test "$mpathpersist" = yes ; then mpath=yes else @@ -5588,10 +5600,6 @@ if test "$softmmu" = yes ; then fi tools="$tools scsi/qemu-pr-helper\$(EXESUF)" else - if test "$virtfs" = yes; then - error_exit "VirtFS is supported only on Linux" - fi - virtfs=no if test "$mpath" = yes; then error_exit "Multipath is supported only on Linux" fi