From nobody Wed Feb 11 01:00:16 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=1647338849; cv=none; d=zohomail.com; s=zohoarc; b=noM6AS3moZT+agA5dX+hNzP0u38qSbewP66Qf30p2K2cg3vGdtvNZ1zxH5yGXblPgeGVUb+v2vNrcPhLYJhW8WoWAWwL/k4rY5NYjpH8dXjyfwqK8Al8+DhzF04bw9b3rEKUoPkfLhvZaYFMMoA5xSApAEQ69qInn7xdK7K9bCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647338849; 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=vARqejL8LnbOLfCnG++vZFyfxvSG5M6FwTrsjDnZZOM=; b=jsbsc9+00BjKkYocSCUgcXCGMoJ74m+sa8StiljHDYy1yMM+Ei4Newe4aGOpnZBzBtQAb105RX3X40Po4Dt6uf486oYOtA0Zna0n4V3sMzoCWRYT3X/xO7SzN6eM+jhGNw7G6pLZa7PaNjyWJS2rSMH5jAInaF+LSvKBSHivvc8= 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 1647338849364218.13438893518583; Tue, 15 Mar 2022 03:07:29 -0700 (PDT) Received: from localhost ([::1]:51976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU45P-0001U7-Sa for importer@patchew.org; Tue, 15 Mar 2022 06:07:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU40u-0007Xx-HZ for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:50 -0400 Received: from [2a00:1450:4864:20::22b] (port=46060 helo=mail-lj1-x22b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40s-00016k-6K for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:47 -0400 Received: by mail-lj1-x22b.google.com with SMTP id y17so8575962ljd.12 for ; Tue, 15 Mar 2022 03:02:45 -0700 (PDT) Received: from UNIT-808.lan ([188.187.49.32]) by smtp.gmail.com with ESMTPSA id y23-20020a2e95d7000000b00247e4e386aasm4339993ljh.121.2022.03.15.03.02.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:43 -0700 (PDT) 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=vARqejL8LnbOLfCnG++vZFyfxvSG5M6FwTrsjDnZZOM=; b=Ogag1sM9hUwGWGOhTYIFSj1QTRtV077Q1rP1dYP66hddjWy9f0vqlz0AAUG8MuZflH q/1WenOLJ7hSg95Q6vIzknKXE8q2M6uNoyChVvA3vFOXaKO2l5v3qlRB9JXL40j6xwG1 TwWa6BDpe+MZFaTgd3kxRpVGrUdR74PIns0uA= 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=vARqejL8LnbOLfCnG++vZFyfxvSG5M6FwTrsjDnZZOM=; b=HOumUY3QrCcLQG8583PB+a32T0W4V3nEZhHQ1ZhGdMky2loA6lTaSBnBBzLPUWyGWS SfssznZOu9atekZLHCtoZP9+VLeRbsf++N1aAAaVDINFodoiJ0blT5isqn86HOHKhfhi HBtfXDPO04RHwAu9TNdDfZXoDaj35BfkadT4jCqeXm47IhS2XZBuAu5xOFGRiugiXJ0H mnejLZAaB9Vadbe0CO8sHQou37SdXsBVXpWUVL42s4MLJ8AgikbDBbvK0yyVlXQQk5B/ mTCTfY8Y8typfOuh54+UfGixMJfBJE7BoxnQoVetJTv+BvkYgsBWTdkbVkYuQBk1ZpaG SbMA== X-Gm-Message-State: AOAM530dvT/HXnUofa9lDEl7pjWwc5H/d4eXJr5Hd/qKZSXij+tfJQJY hdGdnuIegdcAFu9IMk3p+vqtPw7LWMEkF74X X-Google-Smtp-Source: ABdhPJwSbUQy8x/5jRH19iL4H5mD10HzdbmgPHCgzTD93BPZpEXFVaFxLZMwX1H+FQYlhqPdQfO+rg== X-Received: by 2002:a2e:90d6:0:b0:246:e44:bcf6 with SMTP id o22-20020a2e90d6000000b002460e44bcf6mr17071319ljg.501.1647338564022; Tue, 15 Mar 2022 03:02:44 -0700 (PDT) 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 v17 1/7] net/vmnet: add vmnet dependency and customizable option Date: Tue, 15 Mar 2022 13:02:33 +0300 Message-Id: <20220315100239.2914-2-Vladislav.Yaroshchuk@jetbrains.com> X-Mailer: git-send-email 2.34.1.vfs.0.0 In-Reply-To: <20220315100239.2914-1-Vladislav.Yaroshchuk@jetbrains.com> References: <20220315100239.2914-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::22b (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::22b; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lj1-x22b.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-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: 1647338851342100001 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 | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2d6601467f..806f3869f9 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', @@ -1550,6 +1562,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()) @@ -3588,7 +3601,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..30946f3798 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' --=20 2.34.1.vfs.0.0