From nobody Tue Feb 10 06:58:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=jetbrains.com ARC-Seal: i=1; a=rsa-sha256; t=1645809681; cv=none; d=zohomail.com; s=zohoarc; b=ZDrBuXVPH/koi1U4t3AQK/3oodsNPY5QHQPE94cm7kAqfce9l0uwzMRy6WQiPChtr15WgUWVPAX2bie1kvKVl48ixKCbFci4GoE3j+pjwM1/q+sJxpac+JjYygVHhino3YpEX9VU+sBLYClN1nSXQefVnOyEnO9CWGqeYKUZM6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645809681; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2lkje0wbEkwEc5QNfmfxXT7HCv6L3UJDBcjZOzaNrOo=; b=HUsu4ouZkQDd8eOuCpNjLr0O1rbZmMVmvff0yTiSMQpPyIxAASNMKcg4IxwALKi+NMk2NEQTfcwefIKU5RJIDw5ZQ6PXCmDWT2RbPu1yZNpEUWHyvUur1a8ehi6qxnd1UCW+2b+qiIs3SBbSrOxs17CuiGAQhSEyeFieuETmjoQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645809681001168.53523500864424; Fri, 25 Feb 2022 09:21:21 -0800 (PST) Received: from localhost ([::1]:54828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeHP-0003pf-RX for importer@patchew.org; Fri, 25 Feb 2022 12:21:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNdqU-0002Tr-8a for qemu-devel@nongnu.org; Fri, 25 Feb 2022 11:53:30 -0500 Received: from [2a00:1450:4864:20::22f] (port=38544 helo=mail-lj1-x22f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNdqS-00047Y-Af for qemu-devel@nongnu.org; Fri, 25 Feb 2022 11:53:29 -0500 Received: by mail-lj1-x22f.google.com with SMTP id s25so8217353lji.5 for ; Fri, 25 Feb 2022 08:53:27 -0800 (PST) Received: from UNIT-808.lan ([2a02:2698:6c2a:768f:813e:378d:5c94:9b97]) by smtp.gmail.com with ESMTPSA id l11-20020a2e834b000000b00246308690e2sm309683ljh.85.2022.02.25.08.53.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Feb 2022 08:53:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jetbrains.com; s=googleapps; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2lkje0wbEkwEc5QNfmfxXT7HCv6L3UJDBcjZOzaNrOo=; b=Y5UwesPtrf9836qSQBoDzl6Zk8P9cabhcSwBbPl03JAxYBVvik8OSvx0EACiChOSsj SgnRuYdr5SURdr3y/qaty5uYyaOA6rRYRqroKZGcVPTRDTZWh7YZREUsJO1JdG4VO/pF 5EH3KRHjDrxEIso/fmjdr0/1QHXVNrlbdz8As= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2lkje0wbEkwEc5QNfmfxXT7HCv6L3UJDBcjZOzaNrOo=; b=eSl/8oPIcfr3qGIOxBvbaxBIEzwDw1q0fcgT/wNHF9bvOPJrd6mZhGhvcDpGj8rUmP AS9ji1HdTVtz08a/CcZzEOp0XNsuWB/VQe3BQyHte3S0eR87OhBbegCWO5EvxAAgJnty V1Vp0huutEYrVtl8rKGHsb6mdEA+3q+PaL2KCbmfxMH7C8j3rZR2Xu3mKamYX+ua21BC o8MXM5bDttD1JM6KW1sT6pQpP4vHW66kj2djiTRa/oUSvbWx0lF59g464i2Md3+6SUoS OrazKZY09Gi9UaXdOYfXXclSP7uBZmXTFT1z6xokgceWtvhY3ZtPeSeNRwln0w23s/gV UmXQ== X-Gm-Message-State: AOAM533GnWMhUfaI2wEyJWnzpSRgaHW2dEIkf9GxbvxQFSt+yVR/+PJy 9cKehbnci/7GXrfU25KxtJooYi4SmYvcEnOG X-Google-Smtp-Source: ABdhPJw/ylzKCaPcjdkzjvDGglF9trMETulT0Fej6mC5wF6tLhTdE04MpPVkCFlOzOMH6I0p5UNSAQ== X-Received: by 2002:a2e:3c0b:0:b0:245:f5f8:3f4a with SMTP id j11-20020a2e3c0b000000b00245f5f83f4amr5820535lja.483.1645808006178; Fri, 25 Feb 2022 08:53:26 -0800 (PST) From: Vladislav Yaroshchuk X-Google-Original-From: Vladislav Yaroshchuk To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, r.bolshakov@yadro.com, eblake@redhat.com, phillip.ennen@gmail.com, phillip@axleos.com, akihiko.odaki@gmail.com, armbru@redhat.com, hsp.cat7@gmail.com, hello@adns.io, roman@roolebo.dev, peter.maydell@linaro.org, dirty@apple.com, f4bug@amsat.org, agraf@csgraf.de, kraxel@redhat.com, alex.bennee@linaro.org, qemu_oss@crudebyte.com, Vladislav Yaroshchuk Subject: [PATCH v14 1/8] net/vmnet: add vmnet dependency and customizable option Date: Fri, 25 Feb 2022 19:52:31 +0300 Message-Id: <20220225165238.63646-2-Vladislav.Yaroshchuk@jetbrains.com> X-Mailer: git-send-email 2.34.1.vfs.0.0 In-Reply-To: <20220225165238.63646-1-Vladislav.Yaroshchuk@jetbrains.com> References: <20220225165238.63646-1-Vladislav.Yaroshchuk@jetbrains.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::22f (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lj1-x22f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 25 Feb 2022 12:16:17 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @jetbrains.com) X-ZM-MESSAGEID: 1645809682919100001 Content-Type: text/plain; charset="utf-8" vmnet.framework dependency is added with 'vmnet' option to enable or disable it. Default value is 'auto'. vmnet features to be used are available since macOS 11.0, corresponding probe is created into meson.build. Signed-off-by: Vladislav Yaroshchuk --- meson.build | 16 +++++++++++++++- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 8df40bfac4..d3a791e6c4 100644 --- a/meson.build +++ b/meson.build @@ -522,6 +522,18 @@ if cocoa.found() and get_option('gtk').enabled() error('Cocoa and GTK+ cannot be enabled at the same time') endif =20 +vmnet =3D dependency('appleframeworks', modules: 'vmnet', required: get_op= tion('vmnet')) +if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h', + 'VMNET_BRIDGED_MODE', + dependencies: vmnet) + vmnet =3D not_found + if get_option('vmnet').enabled() + error('vmnet.framework API is outdated') + else + warning('vmnet.framework API is outdated, disabling') + endif +endif + seccomp =3D not_found if not get_option('seccomp').auto() or have_system or have_tools seccomp =3D dependency('libseccomp', version: '>=3D2.3.0', @@ -1536,6 +1548,7 @@ config_host_data.set('CONFIG_SNAPPY', snappy.found()) config_host_data.set('CONFIG_TPM', have_tpm) config_host_data.set('CONFIG_USB_LIBUSB', libusb.found()) config_host_data.set('CONFIG_VDE', vde.found()) +config_host_data.set('CONFIG_VMNET', vmnet.found()) config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_s= erver) config_host_data.set('CONFIG_VNC', vnc.found()) config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) @@ -3564,7 +3577,8 @@ summary(summary_info, bool_yn: true, section: 'Crypto= ') # Libraries summary_info =3D {} if targetos =3D=3D 'darwin' - summary_info +=3D {'Cocoa support': cocoa} + summary_info +=3D {'Cocoa support': cocoa} + summary_info +=3D {'vmnet.framework support': vmnet} endif summary_info +=3D {'SDL support': sdl} summary_info +=3D {'SDL image support': sdl_image} diff --git a/meson_options.txt b/meson_options.txt index 52b11cead4..d2c0b6b412 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -175,6 +175,8 @@ option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') option('vde', type : 'feature', value : 'auto', description: 'vde network backend support') +option('vmnet', type : 'feature', value : 'auto', + description: 'vmnet.framework network backend support') option('virglrenderer', type : 'feature', value : 'auto', description: 'virgl rendering support') option('vnc', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 9ee684ef03..7c37f13384 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -116,6 +116,7 @@ meson_options_help() { printf "%s\n" ' usb-redir libusbredir support' printf "%s\n" ' vde vde network backend support' printf "%s\n" ' vdi vdi image format support' + printf "%s\n" ' vmnet vmnet.framework network backend support' printf "%s\n" ' vhost-user-blk-server' printf "%s\n" ' build vhost-user-blk server' printf "%s\n" ' virglrenderer virgl rendering support' @@ -333,8 +334,6 @@ _meson_option_parse() { --disable-usb-redir) printf "%s" -Dusb_redir=3Ddisabled ;; --enable-vde) printf "%s" -Dvde=3Denabled ;; --disable-vde) printf "%s" -Dvde=3Ddisabled ;; - --enable-vdi) printf "%s" -Dvdi=3Denabled ;; - --disable-vdi) printf "%s" -Dvdi=3Ddisabled ;; --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=3D= enabled ;; --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server= =3Ddisabled ;; --enable-virglrenderer) printf "%s" -Dvirglrenderer=3Denabled ;; --=20 2.34.1.vfs.0.0