From nobody Mon Feb 9 19:10:47 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 From nobody Mon Feb 9 19:10:47 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=1647338853; cv=none; d=zohomail.com; s=zohoarc; b=JVQjISLjgPgbUstxziGFuNPCWADa8r4B5qwUiCjDkiY5HancgJJy4OQy1t9mfeEQMvpv+sCfFLZuwO0e0oTiZVEj0XjO2DiyRn+XbN76rtrHILzGulqG9R4o2L8ZhHbgUGbpjn0hQ+i7WYT0dLunzF7wJX1k5Is7TGRdxFMLpuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647338853; 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=bultV2A3G1FPzqamI7XY3I7WuaUyFWEWEKvR6RlQ07w=; b=DGrh+HWcOaO5oc2+3si6XmgSQOYcIKYCCsOXxyqA7GN94wj0tQE9nlq4U+zDgA3Lg8wrs97i97qMTE6rFJ47pPd82ubK4znbJKBBHa0jslF7Va7kXhE/Pwdf1IcUEtnGQWw1y8hF/h8eqP7CTy17nxQ6RIFh0piHkEb+tjMSluI= 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 1647338853798153.62055034318257; Tue, 15 Mar 2022 03:07:33 -0700 (PDT) Received: from localhost ([::1]:52150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU45U-0001d4-9n for importer@patchew.org; Tue, 15 Mar 2022 06:07:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU40w-0007YZ-G3 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:50 -0400 Received: from [2a00:1450:4864:20::236] (port=46897 helo=mail-lj1-x236.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40t-00016v-Ub for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:50 -0400 Received: by mail-lj1-x236.google.com with SMTP id u7so25638035ljk.13 for ; Tue, 15 Mar 2022 03:02:47 -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.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:44 -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=bultV2A3G1FPzqamI7XY3I7WuaUyFWEWEKvR6RlQ07w=; b=CFs3Wl4jjwjrHhPfujS0x/v60cVKZTGVNPuHkNo/+VIkGYa7M6/7TWmkT3gGnmfjzy AmOXrVs55+fRWWhiJ8UxMh+InNV2Bq/ojwnEwsoUH2t9V4AqVb4pFdFnQH2Gx8q4boUa RWw7gIREnDXtt2IjCPuYmZRyFZt3ErBUy6KrU= 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=bultV2A3G1FPzqamI7XY3I7WuaUyFWEWEKvR6RlQ07w=; b=7ZySpuP8vS8hzwp2j+wWs8em95jjK8BSuYjIFFobPbFBzU6dmMlTc1waALqHt6SXSh CMuXu5gMW2FFa6YTQWQIA6zPKdjX7pJr627p79Ur0XI5VG6I3OBXC6teQqmc2IO5cr0K 87BCQLZhDj/+tOTL4ztRV50rgGSssS/yj/Fk9Zz9lXyzolr7nVway8YZqGUJ3hCIaEOL qDHJO+SNyd4X3NmfGXAKT1xMmw0SsCuaOJGxEMHmSgetOoCLFyL5FkaZpTouCWJbGtWr 91JsrDtDRtzfsy8yy5alL8j9AM1ZnjfPFbw4lgp8JIvhMvcu+mu2glvXvNUVWPmp2urH midA== X-Gm-Message-State: AOAM533s9Sz9/PQluMilRHD15TXgu5sOavB0lt5h6/AraycUPJTQ7NNt hlMxn0Pjdd+FXOal07VQeftd0jHjPBkJx1/e X-Google-Smtp-Source: ABdhPJxvD3LYXVuTr69LNNGF1QUGZCSiNnvPGstisDqvt85Yr3NhQ7epzhyxN/FnJpwb2VUaxTknqg== X-Received: by 2002:a05:651c:b12:b0:247:e2b0:5495 with SMTP id b18-20020a05651c0b1200b00247e2b05495mr16750841ljr.433.1647338564966; 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 2/7] net/vmnet: add vmnet backends to qapi/net Date: Tue, 15 Mar 2022 13:02:34 +0300 Message-Id: <20220315100239.2914-3-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::236 (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::236; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lj1-x236.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: 1647338854520100007 Content-Type: text/plain; charset="utf-8" Create separate netdevs for each vmnet operating mode: - vmnet-host - vmnet-shared - vmnet-bridged Signed-off-by: Vladislav Yaroshchuk --- net/clients.h | 11 ++++ net/meson.build | 7 +++ net/net.c | 10 ++++ net/vmnet-bridged.m | 25 +++++++++ net/vmnet-common.m | 20 +++++++ net/vmnet-host.c | 24 ++++++++ net/vmnet-shared.c | 25 +++++++++ net/vmnet_int.h | 25 +++++++++ qapi/net.json | 133 +++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 278 insertions(+), 2 deletions(-) create mode 100644 net/vmnet-bridged.m create mode 100644 net/vmnet-common.m create mode 100644 net/vmnet-host.c create mode 100644 net/vmnet-shared.c create mode 100644 net/vmnet_int.h diff --git a/net/clients.h b/net/clients.h index 92f9b59aed..c9157789f2 100644 --- a/net/clients.h +++ b/net/clients.h @@ -63,4 +63,15 @@ int net_init_vhost_user(const Netdev *netdev, const char= *name, =20 int net_init_vhost_vdpa(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); +#ifdef CONFIG_VMNET +int net_init_vmnet_host(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp); + +int net_init_vmnet_shared(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp); + +int net_init_vmnet_bridged(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp); +#endif /* CONFIG_VMNET */ + #endif /* QEMU_NET_CLIENTS_H */ diff --git a/net/meson.build b/net/meson.build index 847bc2ac85..00a88c4951 100644 --- a/net/meson.build +++ b/net/meson.build @@ -42,4 +42,11 @@ softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_= posix)) softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c')) softmmu_ss.add(when: 'CONFIG_VHOST_NET_VDPA', if_true: files('vhost-vdpa.c= ')) =20 +vmnet_files =3D files( + 'vmnet-common.m', + 'vmnet-bridged.m', + 'vmnet-host.c', + 'vmnet-shared.c' +) +softmmu_ss.add(when: vmnet, if_true: vmnet_files) subdir('can') diff --git a/net/net.c b/net/net.c index f0d14dbfc1..1dbb64b935 100644 --- a/net/net.c +++ b/net/net.c @@ -1021,6 +1021,11 @@ static int (* const net_client_init_fun[NET_CLIENT_D= RIVER__MAX])( #ifdef CONFIG_L2TPV3 [NET_CLIENT_DRIVER_L2TPV3] =3D net_init_l2tpv3, #endif +#ifdef CONFIG_VMNET + [NET_CLIENT_DRIVER_VMNET_HOST] =3D net_init_vmnet_host, + [NET_CLIENT_DRIVER_VMNET_SHARED] =3D net_init_vmnet_shared, + [NET_CLIENT_DRIVER_VMNET_BRIDGED] =3D net_init_vmnet_bridged, +#endif /* CONFIG_VMNET */ }; =20 =20 @@ -1106,6 +1111,11 @@ void show_netdevs(void) #endif #ifdef CONFIG_VHOST_VDPA "vhost-vdpa", +#endif +#ifdef CONFIG_VMNET + "vmnet-host", + "vmnet-shared", + "vmnet-bridged", #endif }; =20 diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m new file mode 100644 index 0000000000..c735901666 --- /dev/null +++ b/net/vmnet-bridged.m @@ -0,0 +1,25 @@ +/* + * vmnet-bridged.m + * + * Copyright(c) 2021 Vladislav Yaroshchuk + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-types-net.h" +#include "vmnet_int.h" +#include "clients.h" +#include "qemu/error-report.h" +#include "qapi/error.h" + +#include + +int net_init_vmnet_bridged(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp) +{ + error_setg(errp, "vmnet-bridged is not implemented yet"); + return -1; +} diff --git a/net/vmnet-common.m b/net/vmnet-common.m new file mode 100644 index 0000000000..56612c72ce --- /dev/null +++ b/net/vmnet-common.m @@ -0,0 +1,20 @@ +/* + * vmnet-common.m - network client wrapper for Apple vmnet.framework + * + * Copyright(c) 2021 Vladislav Yaroshchuk + * Copyright(c) 2021 Phillip Tennen + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-types-net.h" +#include "vmnet_int.h" +#include "clients.h" +#include "qemu/error-report.h" +#include "qapi/error.h" + +#include + diff --git a/net/vmnet-host.c b/net/vmnet-host.c new file mode 100644 index 0000000000..32dc437037 --- /dev/null +++ b/net/vmnet-host.c @@ -0,0 +1,24 @@ +/* + * vmnet-host.c + * + * Copyright(c) 2021 Vladislav Yaroshchuk + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-types-net.h" +#include "vmnet_int.h" +#include "clients.h" +#include "qemu/error-report.h" +#include "qapi/error.h" + +#include + +int net_init_vmnet_host(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp) { + error_setg(errp, "vmnet-host is not implemented yet"); + return -1; +} diff --git a/net/vmnet-shared.c b/net/vmnet-shared.c new file mode 100644 index 0000000000..f07afaaf21 --- /dev/null +++ b/net/vmnet-shared.c @@ -0,0 +1,25 @@ +/* + * vmnet-shared.c + * + * Copyright(c) 2021 Vladislav Yaroshchuk + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-types-net.h" +#include "vmnet_int.h" +#include "clients.h" +#include "qemu/error-report.h" +#include "qapi/error.h" + +#include + +int net_init_vmnet_shared(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp) +{ + error_setg(errp, "vmnet-shared is not implemented yet"); + return -1; +} diff --git a/net/vmnet_int.h b/net/vmnet_int.h new file mode 100644 index 0000000000..aac4d5af64 --- /dev/null +++ b/net/vmnet_int.h @@ -0,0 +1,25 @@ +/* + * vmnet_int.h + * + * Copyright(c) 2021 Vladislav Yaroshchuk + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ +#ifndef VMNET_INT_H +#define VMNET_INT_H + +#include "qemu/osdep.h" +#include "vmnet_int.h" +#include "clients.h" + +#include + +typedef struct VmnetCommonState { + NetClientState nc; + +} VmnetCommonState; + + +#endif /* VMNET_INT_H */ diff --git a/qapi/net.json b/qapi/net.json index 7fab2e7cd8..4bff1c4e37 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -452,6 +452,120 @@ '*vhostdev': 'str', '*queues': 'int' } } =20 +## +# @NetdevVmnetHostOptions: +# +# vmnet (host mode) network backend. +# +# Allows the vmnet interface to communicate with other vmnet +# interfaces that are in host mode and also with the host. +# +# @start-address: The starting IPv4 address to use for the interface. +# Must be in the private IP range (RFC 1918). Must be +# specified along with @end-address and @subnet-mask. +# This address is used as the gateway address. The +# subsequent address up to and including end-address are +# placed in the DHCP pool. +# +# @end-address: The DHCP IPv4 range end address to use for the +# interface. Must be in the private IP range (RFC 1918). +# Must be specified along with @start-address and +# @subnet-mask. +# +# @subnet-mask: The IPv4 subnet mask to use on the interface. Must +# be specified along with @start-address and @subnet-mask. +# +# @isolated: Enable isolation for this interface. Interface isolation +# ensures that vmnet interface is not able to communicate +# with any other vmnet interfaces. Only communication with +# host is allowed. Requires at least macOS Big Sur 11.0. +# +# @net-uuid: The identifier (UUID) to uniquely identify the isolated +# network vmnet interface should be added to. If +# set, no DHCP service is provided for this interface and +# network communication is allowed only with other interfaces +# added to this network identified by the UUID. Requires +# at least macOS Big Sur 11.0. +# +# Since: 7.1 +## +{ 'struct': 'NetdevVmnetHostOptions', + 'data': { + '*start-address': 'str', + '*end-address': 'str', + '*subnet-mask': 'str', + '*isolated': 'bool', + '*net-uuid': 'str' }, + 'if': 'CONFIG_VMNET' } + +## +# @NetdevVmnetSharedOptions: +# +# vmnet (shared mode) network backend. +# +# Allows traffic originating from the vmnet interface to reach the +# Internet through a network address translator (NAT). +# The vmnet interface can communicate with the host and with +# other shared mode interfaces on the same subnet. If no DHCP +# settings, subnet mask and IPv6 prefix specified, the interface can +# communicate with any of other interfaces in shared mode. +# +# @start-address: The starting IPv4 address to use for the interface. +# Must be in the private IP range (RFC 1918). Must be +# specified along with @end-address and @subnet-mask. +# This address is used as the gateway address. The +# subsequent address up to and including end-address are +# placed in the DHCP pool. +# +# @end-address: The DHCP IPv4 range end address to use for the +# interface. Must be in the private IP range (RFC 1918). +# Must be specified along with @start-address and @subnet-ma= sk. +# +# @subnet-mask: The IPv4 subnet mask to use on the interface. Must +# be specified along with @start-address and @subnet-mask. +# +# @isolated: Enable isolation for this interface. Interface isolation +# ensures that vmnet interface is not able to communicate +# with any other vmnet interfaces. Only communication with +# host is allowed. Requires at least macOS Big Sur 11.0. +# +# @nat66-prefix: The IPv6 prefix to use into guest network. Must be a +# unique local address i.e. start with fd00::/8 and have +# length of 64. +# +# Since: 7.1 +## +{ 'struct': 'NetdevVmnetSharedOptions', + 'data': { + '*start-address': 'str', + '*end-address': 'str', + '*subnet-mask': 'str', + '*isolated': 'bool', + '*nat66-prefix': 'str' }, + 'if': 'CONFIG_VMNET' } + +## +# @NetdevVmnetBridgedOptions: +# +# vmnet (bridged mode) network backend. +# +# Bridges the vmnet interface with a physical network interface. +# +# @ifname: The name of the physical interface to be bridged. +# +# @isolated: Enable isolation for this interface. Interface isolation +# ensures that vmnet interface is not able to communicate +# with any other vmnet interfaces. Only communication with +# host is allowed. Requires at least macOS Big Sur 11.0. +# +# Since: 7.1 +## +{ 'struct': 'NetdevVmnetBridgedOptions', + 'data': { + 'ifname': 'str', + '*isolated': 'bool' }, + 'if': 'CONFIG_VMNET' } + ## # @NetClientDriver: # @@ -460,10 +574,16 @@ # Since: 2.7 # # @vhost-vdpa since 5.1 +# @vmnet-host since 7.1 +# @vmnet-shared since 7.1 +# @vmnet-bridged since 7.1 ## { 'enum': 'NetClientDriver', 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', - 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa' ] } + 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa', + { 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' }, + { 'name': 'vmnet-shared', 'if': 'CONFIG_VMNET' }, + { 'name': 'vmnet-bridged', 'if': 'CONFIG_VMNET' }] } =20 ## # @Netdev: @@ -477,6 +597,9 @@ # Since: 1.2 # # 'l2tpv3' - since 2.1 +# 'vmnet-host' - since 7.1 +# 'vmnet-shared' - since 7.1 +# 'vmnet-bridged' - since 7.1 ## { 'union': 'Netdev', 'base': { 'id': 'str', 'type': 'NetClientDriver' }, @@ -492,7 +615,13 @@ 'hubport': 'NetdevHubPortOptions', 'netmap': 'NetdevNetmapOptions', 'vhost-user': 'NetdevVhostUserOptions', - 'vhost-vdpa': 'NetdevVhostVDPAOptions' } } + 'vhost-vdpa': 'NetdevVhostVDPAOptions', + 'vmnet-host': { 'type': 'NetdevVmnetHostOptions', + 'if': 'CONFIG_VMNET' }, + 'vmnet-shared': { 'type': 'NetdevVmnetSharedOptions', + 'if': 'CONFIG_VMNET' }, + 'vmnet-bridged': { 'type': 'NetdevVmnetBridgedOptions', + 'if': 'CONFIG_VMNET' } } } =20 ## # @RxState: --=20 2.34.1.vfs.0.0 From nobody Mon Feb 9 19:10:47 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=1647341759; cv=none; d=zohomail.com; s=zohoarc; b=cyvMr+im6sdeKOoxSIdQ6K+KxYqQR+S1ny+MFpA3pYx0uFGF8LBaHZQclJJ73pGGmy7t9JphmfFj5zH38HBZpMw7alz0i896vvFrUpz1yTMfMCFxOGu5RhZ+xSqAEhSuIPIqho2MXkEY+tv8YjItHYd+OMXNrcI+y1SpJC9Eq+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647341759; 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=Fznu3R0IgTLwl7rndG1GKBQUStBSiAiJeMwJYBrpktQ=; b=RtH5m3nBp3dt0nIcwRqW5qzryN0MkdZsm1fE/zQh6CC6UOgAMMZeBsuddbti3iVTGsQhXlscMEsnK3H4GEfIFbKEOwyZRikwJWk5jx1rHt6ZkuvkMBUTPeGlQH0zqkbbdO7cZozoyYDKIoaWQupsBR2f4Ho/Nj0GjeuYVasvSiw= 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 1647341759064344.330690824262; Tue, 15 Mar 2022 03:55:59 -0700 (PDT) Received: from localhost ([::1]:35812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU4qN-0007tH-7x for importer@patchew.org; Tue, 15 Mar 2022 06:55:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU410-0007bi-OX for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:55 -0400 Received: from [2a00:1450:4864:20::132] (port=42834 helo=mail-lf1-x132.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40u-00016x-94 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:54 -0400 Received: by mail-lf1-x132.google.com with SMTP id w12so31965213lfr.9 for ; Tue, 15 Mar 2022 03:02:47 -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.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:45 -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=Fznu3R0IgTLwl7rndG1GKBQUStBSiAiJeMwJYBrpktQ=; b=CE5tpTzRufs5wPleeDpCSLxxUlohILb6NkCcOHcf0GVQTJAxmnzoCxlffYF9m+eRZ8 q35BNUn5VBLZXnjgBSMTPvr9ptWMd4D/nB1QEj6odE3lwcvTuJfWy1TXsRyEhJk82xib VM82RqzlAS3aMIrgLdCoro+mDOicaxKMNvpAc= 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=Fznu3R0IgTLwl7rndG1GKBQUStBSiAiJeMwJYBrpktQ=; b=sVlFLgnFmiW7swjfybODcRM9N25cv/obqvciAXKUl0wOoBc4e9+bEiHSnjEW5LAZ5t yQOEXlDyz/nc6XmzSc2lgbDx9oJZ++cJveKmWcBbGsUL2HKJJRjlCkiG16TmO5p8i+Ji 8K+sGvg1e7d8W7ryETn1iZU7ax6na2XlWgZ1g1xt1hV+bASvw2k3u+4rb1v2PlYi7dK5 zwtqYYOG8Ie7ZnnhhyvgHgq9JZvuWYANB9s8rNKGiuXoUTWLfb/IPraQKxw8c+5Ypcbz HJkafE9N/bknvCowVmnW+JJgwrb7Daij1HtihjIorMrDQ007rgJazX9r4QdhoDYGvW5G y4WQ== X-Gm-Message-State: AOAM531R6S5Zk3VuA2YCrALlWqwPzfTOkxEzUc5zpwxJULkbHdQrYpUr O4xmOLte4yqo9IqoxPod8vaUGTuUmsJ5OjOd X-Google-Smtp-Source: ABdhPJxjH4mipXoidDQzpavTWGJUVYg3mUau0seRrtgqAwbqmsHHduMA74+/ff6gJj6VAJ2YK/AhSg== X-Received: by 2002:ac2:4f8f:0:b0:448:5ddb:e52c with SMTP id z15-20020ac24f8f000000b004485ddbe52cmr15741686lfs.323.1647338565962; Tue, 15 Mar 2022 03:02:45 -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 3/7] net/vmnet: implement shared mode (vmnet-shared) Date: Tue, 15 Mar 2022 13:02:35 +0300 Message-Id: <20220315100239.2914-4-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::132 (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::132; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lf1-x132.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: 1647341764744100003 Content-Type: text/plain; charset="utf-8" Interaction with vmnet.framework in different modes differs only on configuration stage, so we can create common `send`, `receive`, etc. procedures and reuse them. Signed-off-by: Phillip Tennen Signed-off-by: Vladislav Yaroshchuk --- net/vmnet-common.m | 359 +++++++++++++++++++++++++++++++++++++++++++++ net/vmnet-shared.c | 94 +++++++++++- net/vmnet_int.h | 41 +++++- 3 files changed, 489 insertions(+), 5 deletions(-) diff --git a/net/vmnet-common.m b/net/vmnet-common.m index 56612c72ce..6af042406b 100644 --- a/net/vmnet-common.m +++ b/net/vmnet-common.m @@ -10,6 +10,8 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/main-loop.h" +#include "qemu/log.h" #include "qapi/qapi-types-net.h" #include "vmnet_int.h" #include "clients.h" @@ -17,4 +19,361 @@ #include "qapi/error.h" =20 #include +#include =20 + +static void vmnet_send_completed(NetClientState *nc, ssize_t len); + + +const char *vmnet_status_map_str(vmnet_return_t status) +{ + switch (status) { + case VMNET_SUCCESS: + return "success"; + case VMNET_FAILURE: + return "general failure (possibly not enough privileges)"; + case VMNET_MEM_FAILURE: + return "memory allocation failure"; + case VMNET_INVALID_ARGUMENT: + return "invalid argument specified"; + case VMNET_SETUP_INCOMPLETE: + return "interface setup is not complete"; + case VMNET_INVALID_ACCESS: + return "invalid access, permission denied"; + case VMNET_PACKET_TOO_BIG: + return "packet size is larger than MTU"; + case VMNET_BUFFER_EXHAUSTED: + return "buffers exhausted in kernel"; + case VMNET_TOO_MANY_PACKETS: + return "packet count exceeds limit"; +#if defined(MAC_OS_VERSION_11_0) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >=3D MAC_OS_VERSION_11_0 + case VMNET_SHARING_SERVICE_BUSY: + return "conflict, sharing service is in use"; +#endif + default: + return "unknown vmnet error"; + } +} + +/** + * Write packets from QEMU to vmnet interface. + * + * vmnet.framework supports iov, but writing more than + * one iov into vmnet interface fails with + * 'VMNET_INVALID_ARGUMENT'. Collecting provided iovs into + * one and passing it to vmnet works fine. That's the + * reason why receive_iov() left unimplemented. But it still + * works with good performance having .receive() only. + */ +ssize_t vmnet_receive_common(NetClientState *nc, + const uint8_t *buf, + size_t size) +{ + VmnetCommonState *s =3D DO_UPCAST(VmnetCommonState, nc, nc); + struct vmpktdesc packet; + struct iovec iov; + int pkt_cnt; + vmnet_return_t if_status; + + if (size > s->max_packet_size) { + warn_report("vmnet: packet is too big, %zu > %" PRIu64, + packet.vm_pkt_size, + s->max_packet_size); + return -1; + } + + iov.iov_base =3D (char *) buf; + iov.iov_len =3D size; + + packet.vm_pkt_iovcnt =3D 1; + packet.vm_flags =3D 0; + packet.vm_pkt_size =3D size; + packet.vm_pkt_iov =3D &iov; + pkt_cnt =3D 1; + + if_status =3D vmnet_write(s->vmnet_if, &packet, &pkt_cnt); + if (if_status !=3D VMNET_SUCCESS) { + error_report("vmnet: write error: %s\n", + vmnet_status_map_str(if_status)); + return -1; + } + + if (pkt_cnt) { + return size; + } + return 0; +} + +/** + * Read packets from vmnet interface and write them + * to temporary buffers in VmnetCommonState. + * + * Returns read packets number (may be 0) if read + * is successful, -1 on error + */ +static int vmnet_read_packets(VmnetCommonState *s) { + assert(s->packets_send_current_pos =3D=3D s->packets_send_end_pos); + + struct vmpktdesc *packets =3D s->packets_buf; + vmnet_return_t status; + int i; + + /* Read as many packets as present */ + s->packets_send_current_pos =3D 0; + s->packets_send_end_pos =3D VMNET_PACKETS_LIMIT; + for (i =3D 0; i < s->packets_send_end_pos; ++i) { + packets[i].vm_pkt_size =3D s->max_packet_size; + packets[i].vm_pkt_iovcnt =3D 1; + packets[i].vm_flags =3D 0; + } + + status =3D vmnet_read(s->vmnet_if, packets, &s->packets_send_end_pos); + if (status !=3D VMNET_SUCCESS) { + error_printf("vmnet: read failed: %s\n", + vmnet_status_map_str(status)); + s->packets_send_current_pos =3D 0; + s->packets_send_end_pos =3D 0; + return -1; + } + + return s->packets_send_end_pos; +} + +/** + * Write packets from temporary buffers in VmnetCommonState + * to QEMU. + */ +static void vmnet_write_packets_to_qemu(VmnetCommonState *s) { + ssize_t size; + + /* + * Packets to send lay in [current_pos..end_pos) + * (including current_pos, excluding end_pos) + */ + while (s->packets_send_current_pos < s->packets_send_end_pos) { + size =3D qemu_send_packet_async(&s->nc, + s->iov_buf[s->packets_send_current_p= os].iov_base, + s->packets_buf[s->packets_send_curre= nt_pos].vm_pkt_size, + vmnet_send_completed); + ++s->packets_send_current_pos; + if (size =3D=3D 0) { + /* QEMU is not ready to consume more packets - + * stop and wait for completion callback call */ + s->send_enabled =3D false; + return; + } + } + s->send_enabled =3D true; +} + + +/** + * Bottom half callback that transfers packets from vmnet interface + * to QEMU. + * + * The process of transferring packets is three-staged: + * 1. Handle vmnet event; + * 2. Read packets from vmnet interface into temporary buffer; + * 3. Write packets from temporary buffer to QEMU. + * + * QEMU may suspend this process on the last stage, returning 0 from + * qemu_send_packet_async function. If this happens, we should + * respectfully wait until it is ready to consume more packets, + * write left ones in temporary buffer and only after this + * continue reading more packets from vmnet interface. + * + * If QEMU is not ready, send_enabled is set to false. + * + * Packets to be transferred are stored into packets_buf, + * in the window [packets_send_current_pos..packets_send_end_pos) + * including current_pos, excluding end_pos. + */ +static void vmnet_send_bh(void *opaque) +{ + NetClientState *nc =3D (NetClientState *) opaque; + VmnetCommonState *s =3D DO_UPCAST(VmnetCommonState, nc, nc); + + /* + * Do nothing if QEMU is not ready - wait + * for completion callback invocation + */ + if (!s->send_enabled) { + return; + } + + /* Read packets from vmnet interface */ + if (vmnet_read_packets(s) > 0) { + /* Send them to QEMU */ + vmnet_write_packets_to_qemu(s); + } +} + +/** + * Completion callback to be invoked by QEMU when it becomes + * ready to consume more packets. + */ +static void vmnet_send_completed(NetClientState *nc, ssize_t len) +{ + VmnetCommonState *s =3D DO_UPCAST(VmnetCommonState, nc, nc); + + /* Complete sending packets left in VmnetCommonState buffers */ + vmnet_write_packets_to_qemu(s); + + /* And read new ones from vmnet interface */ + if (s->send_enabled) { + qemu_bh_schedule(s->send_bh); + } +} + +static void vmnet_bufs_init(VmnetCommonState *s) +{ + struct vmpktdesc *packets =3D s->packets_buf; + struct iovec *iov =3D s->iov_buf; + int i; + + for (i =3D 0; i < VMNET_PACKETS_LIMIT; ++i) { + iov[i].iov_len =3D s->max_packet_size; + iov[i].iov_base =3D g_malloc0(iov[i].iov_len); + packets[i].vm_pkt_iov =3D iov + i; + } +} + + +int vmnet_if_create(NetClientState *nc, + xpc_object_t if_desc, + Error **errp) +{ + VmnetCommonState *s =3D DO_UPCAST(VmnetCommonState, nc, nc); + dispatch_semaphore_t if_created_sem =3D dispatch_semaphore_create(0); + __block vmnet_return_t if_status; + + s->if_queue =3D dispatch_queue_create( + "org.qemu.vmnet.if_queue", + DISPATCH_QUEUE_SERIAL + ); + + xpc_dictionary_set_bool( + if_desc, + vmnet_allocate_mac_address_key, + false + ); + +#ifdef DEBUG + qemu_log("vmnet.start.interface_desc:\n"); + xpc_dictionary_apply(if_desc, + ^bool(const char *k, xpc_object_t v) { + char *desc =3D xpc_copy_description(v); + qemu_log(" %s=3D%s\n", k, desc); + free(desc); + return true; + }); +#endif /* DEBUG */ + + s->vmnet_if =3D vmnet_start_interface( + if_desc, + s->if_queue, + ^(vmnet_return_t status, xpc_object_t interface_param) { + if_status =3D status; + if (status !=3D VMNET_SUCCESS || !interface_param) { + dispatch_semaphore_signal(if_created_sem); + return; + } + +#ifdef DEBUG + qemu_log("vmnet.start.interface_param:\n"); + xpc_dictionary_apply(interface_param, + ^bool(const char *k, xpc_object_t v) { + char *desc =3D xpc_copy_description(v= ); + qemu_log(" %s=3D%s\n", k, desc); + free(desc); + return true; + }); +#endif /* DEBUG */ + + s->mtu =3D xpc_dictionary_get_uint64( + interface_param, + vmnet_mtu_key); + s->max_packet_size =3D xpc_dictionary_get_uint64( + interface_param, + vmnet_max_packet_size_key); + + dispatch_semaphore_signal(if_created_sem); + }); + + if (s->vmnet_if =3D=3D NULL) { + dispatch_release(s->if_queue); + dispatch_release(if_created_sem); + error_setg(errp, + "unable to create interface with requested params"); + return -1; + } + + dispatch_semaphore_wait(if_created_sem, DISPATCH_TIME_FOREVER); + dispatch_release(if_created_sem); + + if (if_status !=3D VMNET_SUCCESS) { + dispatch_release(s->if_queue); + error_setg(errp, + "cannot create vmnet interface: %s", + vmnet_status_map_str(if_status)); + return -1; + } + + s->send_bh =3D aio_bh_new(qemu_get_aio_context(), vmnet_send_bh, nc); + s->send_enabled =3D true; + vmnet_bufs_init(s); + + vmnet_interface_set_event_callback( + s->vmnet_if, + VMNET_INTERFACE_PACKETS_AVAILABLE, + s->if_queue, + ^(interface_event_t event_id, xpc_object_t event) { + assert(event_id =3D=3D VMNET_INTERFACE_PACKETS_AVAILABLE); + /* + * This function is being called from a non qemu thread, so + * we only schedule a BH, and do the rest of the io completion + * handling from vmnet_send_bh() which runs in a qemu context. + */ + qemu_bh_schedule(s->send_bh); + }); + + return 0; +} + + +void vmnet_cleanup_common(NetClientState *nc) +{ + VmnetCommonState *s =3D DO_UPCAST(VmnetCommonState, nc, nc); + dispatch_semaphore_t if_stopped_sem; + + if (s->vmnet_if =3D=3D NULL) { + return; + } + + vmnet_interface_set_event_callback( + s->vmnet_if, + VMNET_INTERFACE_PACKETS_AVAILABLE, + NULL, + NULL); + + qemu_purge_queued_packets(nc); + + if_stopped_sem =3D dispatch_semaphore_create(0); + vmnet_stop_interface( + s->vmnet_if, + s->if_queue, + ^(vmnet_return_t status) { + assert(status =3D=3D VMNET_SUCCESS); + dispatch_semaphore_signal(if_stopped_sem); + }); + dispatch_semaphore_wait(if_stopped_sem, DISPATCH_TIME_FOREVER); + + qemu_bh_delete(s->send_bh); + dispatch_release(if_stopped_sem); + dispatch_release(s->if_queue); + + for (int i =3D 0; i < VMNET_PACKETS_LIMIT; ++i) { + g_free(s->iov_buf[i].iov_base); + } +} diff --git a/net/vmnet-shared.c b/net/vmnet-shared.c index f07afaaf21..e1a7e30acb 100644 --- a/net/vmnet-shared.c +++ b/net/vmnet-shared.c @@ -10,16 +10,102 @@ =20 #include "qemu/osdep.h" #include "qapi/qapi-types-net.h" +#include "qapi/error.h" #include "vmnet_int.h" #include "clients.h" -#include "qemu/error-report.h" -#include "qapi/error.h" =20 #include =20 +typedef struct VmnetSharedState { + VmnetCommonState cs; +} VmnetSharedState; + + +static bool validate_options(const Netdev *netdev, Error **errp) +{ + const NetdevVmnetSharedOptions *options =3D &(netdev->u.vmnet_shared); + +#if !defined(MAC_OS_VERSION_11_0) || \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0 + if (options->has_isolated) { + error_setg(errp, + "vmnet-shared.isolated feature is " + "unavailable: outdated vmnet.framework API"); + return false; + } +#endif + + if ((options->has_start_address || + options->has_end_address || + options->has_subnet_mask) && + !(options->has_start_address && + options->has_end_address && + options->has_subnet_mask)) { + error_setg(errp, + "'start-address', 'end-address', 'subnet-mask' " + "should be provided together" + ); + return false; + } + + return true; +} + +static xpc_object_t build_if_desc(const Netdev *netdev) +{ + const NetdevVmnetSharedOptions *options =3D &(netdev->u.vmnet_shared); + xpc_object_t if_desc =3D xpc_dictionary_create(NULL, NULL, 0); + + xpc_dictionary_set_uint64( + if_desc, + vmnet_operation_mode_key, + VMNET_SHARED_MODE + ); + + if (options->has_nat66_prefix) { + xpc_dictionary_set_string(if_desc, + vmnet_nat66_prefix_key, + options->nat66_prefix); + } + + if (options->has_start_address) { + xpc_dictionary_set_string(if_desc, + vmnet_start_address_key, + options->start_address); + xpc_dictionary_set_string(if_desc, + vmnet_end_address_key, + options->end_address); + xpc_dictionary_set_string(if_desc, + vmnet_subnet_mask_key, + options->subnet_mask); + } + +#if defined(MAC_OS_VERSION_11_0) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >=3D MAC_OS_VERSION_11_0 + xpc_dictionary_set_bool( + if_desc, + vmnet_enable_isolation_key, + options->isolated + ); +#endif + + return if_desc; +} + +static NetClientInfo net_vmnet_shared_info =3D { + .type =3D NET_CLIENT_DRIVER_VMNET_SHARED, + .size =3D sizeof(VmnetSharedState), + .receive =3D vmnet_receive_common, + .cleanup =3D vmnet_cleanup_common, +}; + int net_init_vmnet_shared(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { - error_setg(errp, "vmnet-shared is not implemented yet"); - return -1; + NetClientState *nc =3D qemu_new_net_client(&net_vmnet_shared_info, + peer, "vmnet-shared", name); + if (!validate_options(netdev, errp)) { + return -1; + } + return vmnet_if_create(nc, build_if_desc(netdev), errp); } diff --git a/net/vmnet_int.h b/net/vmnet_int.h index aac4d5af64..8f3321ef3e 100644 --- a/net/vmnet_int.h +++ b/net/vmnet_int.h @@ -15,11 +15,50 @@ #include "clients.h" =20 #include +#include + +/** + * From vmnet.framework documentation + * + * Each read/write call allows up to 200 packets to be + * read or written for a maximum of 256KB. + * + * Each packet written should be a complete + * ethernet frame. + * + * https://developer.apple.com/documentation/vmnet + */ +#define VMNET_PACKETS_LIMIT 200 =20 typedef struct VmnetCommonState { - NetClientState nc; + NetClientState nc; + interface_ref vmnet_if; + + uint64_t mtu; + uint64_t max_packet_size; =20 + dispatch_queue_t if_queue; + + QEMUBH *send_bh; + bool send_enabled; + + struct vmpktdesc packets_buf[VMNET_PACKETS_LIMIT]; + int packets_send_current_pos; + int packets_send_end_pos; + + struct iovec iov_buf[VMNET_PACKETS_LIMIT]; } VmnetCommonState; =20 +const char *vmnet_status_map_str(vmnet_return_t status); + +int vmnet_if_create(NetClientState *nc, + xpc_object_t if_desc, + Error **errp); + +ssize_t vmnet_receive_common(NetClientState *nc, + const uint8_t *buf, + size_t size); + +void vmnet_cleanup_common(NetClientState *nc); =20 #endif /* VMNET_INT_H */ --=20 2.34.1.vfs.0.0 From nobody Mon Feb 9 19:10:47 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=1647338852; cv=none; d=zohomail.com; s=zohoarc; b=Ss2vL5iED54exwiLFSbzMbdYbl7mGNGjKJuKZzF1pSHeniiVrw4blDo5qNjvvoifbHhLhFdGOUAUZMqFcAmbox0BLg7BfgHLN79xCBOHKc5K9M1mm89rqt4i+/TlMrKUbG5gHLAVPHvErRf7l7o67KZoKZN/2DF+gR7d6udDZPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647338852; 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=KOm1kJMGnWnY15aZD15OclZ1jPIc+wWhUU8JyHe2FsE=; b=m+dTmO9CRnD4S468Yfo3B7GhORldcJ6H6P/NwQ0kMMShidMSBGIU6aNgtQnDBHxg6vbIdXNFsT62vtM9SutAmKI4Pmb6+0Zto/P6ub4ebw7DMphuikMz0V8UIGE4KfWNLzhCce0SxzS4K9LJrwEDt4T3+MgOQuW3Cc6bxgldpDg= 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 1647338852236114.08522544361881; Tue, 15 Mar 2022 03:07:32 -0700 (PDT) Received: from localhost ([::1]:52190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU45T-0001ey-0A for importer@patchew.org; Tue, 15 Mar 2022 06:07:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU40x-0007Yo-3Z for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:51 -0400 Received: from [2a00:1450:4864:20::12e] (port=39935 helo=mail-lf1-x12e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40u-000171-U2 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:50 -0400 Received: by mail-lf1-x12e.google.com with SMTP id w7so32011066lfd.6 for ; Tue, 15 Mar 2022 03:02:48 -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.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:46 -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=KOm1kJMGnWnY15aZD15OclZ1jPIc+wWhUU8JyHe2FsE=; b=HWwHm5Y+19Fn48fTmB44gVVKsxSelpQ+uFUk0FsZoCm+jAj9iiGR9g73f/NM1Uyxri 8uG3YibZh1nz8Yh5Pp8P0jxaLLMIZMUc1jYjwb34ZB7wPEqQbSsGCrzuzn9o/usvuB3H 0o5jA6Ev30iwYBssaaa6NWh38gzADvIACF3BM= 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=KOm1kJMGnWnY15aZD15OclZ1jPIc+wWhUU8JyHe2FsE=; b=2QdFoJD+euQ5kIKy0qEdGnAh0IeN340GUTYD/By2Q8FWwifwMhog7FdsZ3AzXmdyUF CPTv8K8Y+A9S8eJ9bNPjhRiR3Kp3YTJHHmvcsmNIPGh71+B+mPm/QLmpIebLeiqT0ucV she3jFGFSeTAL8zod9fn4+ULhp1UOIHuF4Cx8Gzqtl0gdihrJVrzz0T8G5hSvrdB4gfi ZFUocgXkZ3VW3ku2y1n2KMyI05FENa7qCXvFkGk391P+t+/OUQGGKjsgVUCAJhMf2/MY e3baHXfI1kyXT2erLjfLPcJT1Fub11wQm1dFTDfbXOgK4GZvjenJqrDrR+7joJaGLPdp vMTg== X-Gm-Message-State: AOAM530IQGIm1gBBuHIulRaXn1/ZV/BjU+tK7T0siyEEMOpxpmWQjlxX z9URAcTJtspU+upOUmFisRxg1l2Mu9MqzcdA X-Google-Smtp-Source: ABdhPJyyYaqIi6BGzyrcy4SPHBwjtZfk8IczYHpYZ99S71IuQhuD9Ldppo1YX3UtipXCVq2w9PtvLg== X-Received: by 2002:a05:6512:525:b0:448:89d5:2e40 with SMTP id o5-20020a056512052500b0044889d52e40mr8182916lfc.249.1647338566973; Tue, 15 Mar 2022 03:02:46 -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 4/7] net/vmnet: implement host mode (vmnet-host) Date: Tue, 15 Mar 2022 13:02:36 +0300 Message-Id: <20220315100239.2914-5-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::12e (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::12e; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lf1-x12e.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: 1647338852530100005 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladislav Yaroshchuk --- net/vmnet-host.c | 113 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 107 insertions(+), 6 deletions(-) diff --git a/net/vmnet-host.c b/net/vmnet-host.c index 32dc437037..0395458d8d 100644 --- a/net/vmnet-host.c +++ b/net/vmnet-host.c @@ -9,16 +9,117 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/uuid.h" #include "qapi/qapi-types-net.h" -#include "vmnet_int.h" -#include "clients.h" -#include "qemu/error-report.h" #include "qapi/error.h" +#include "clients.h" +#include "vmnet_int.h" =20 #include =20 +typedef struct VmnetHostState { + VmnetCommonState cs; +} VmnetHostState; + +static bool validate_options(const Netdev *netdev, Error **errp) +{ + const NetdevVmnetHostOptions *options =3D &(netdev->u.vmnet_host); + QemuUUID uuid; + +#if defined(MAC_OS_VERSION_11_0) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >=3D MAC_OS_VERSION_11_0 + + if (options->has_net_uuid && + qemu_uuid_parse(options->net_uuid, &uuid) < 0) { + error_setg(errp, "Invalid UUID provided in 'net-uuid'"); + return false; + } +#else + if (options->has_isolated) { + error_setg(errp, + "vmnet-host.isolated feature is " + "unavailable: outdated vmnet.framework API"); + return false; + } + + if (options->has_net_uuid) { + error_setg(errp, + "vmnet-host.net-uuid feature is " + "unavailable: outdated vmnet.framework API"); + return false; + } +#endif + + if ((options->has_start_address || + options->has_end_address || + options->has_subnet_mask) && + !(options->has_start_address && + options->has_end_address && + options->has_subnet_mask)) { + error_setg(errp, + "'start-address', 'end-address', 'subnet-mask' " + "should be provided together"); + return false; + } + + return true; +} + +static xpc_object_t build_if_desc(const Netdev *netdev, + NetClientState *nc) +{ + const NetdevVmnetHostOptions *options =3D &(netdev->u.vmnet_host); + xpc_object_t if_desc =3D xpc_dictionary_create(NULL, NULL, 0); + + xpc_dictionary_set_uint64(if_desc, + vmnet_operation_mode_key, + VMNET_HOST_MODE); + +#if defined(MAC_OS_VERSION_11_0) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >=3D MAC_OS_VERSION_11_0 + + xpc_dictionary_set_bool(if_desc, + vmnet_enable_isolation_key, + options->isolated); + + QemuUUID network_uuid; + if (options->has_net_uuid) { + qemu_uuid_parse(options->net_uuid, &network_uuid); + xpc_dictionary_set_uuid(if_desc, + vmnet_network_identifier_key, + network_uuid.data); + } +#endif + + if (options->has_start_address) { + xpc_dictionary_set_string(if_desc, + vmnet_start_address_key, + options->start_address); + xpc_dictionary_set_string(if_desc, + vmnet_end_address_key, + options->end_address); + xpc_dictionary_set_string(if_desc, + vmnet_subnet_mask_key, + options->subnet_mask); + } + + return if_desc; +} + +static NetClientInfo net_vmnet_host_info =3D { + .type =3D NET_CLIENT_DRIVER_VMNET_HOST, + .size =3D sizeof(VmnetHostState), + .receive =3D vmnet_receive_common, + .cleanup =3D vmnet_cleanup_common, +}; + int net_init_vmnet_host(const Netdev *netdev, const char *name, - NetClientState *peer, Error **errp) { - error_setg(errp, "vmnet-host is not implemented yet"); - return -1; + NetClientState *peer, Error **errp) +{ + NetClientState *nc =3D qemu_new_net_client(&net_vmnet_host_info, + peer, "vmnet-host", name); + if (!validate_options(netdev, errp)) { + return -1; + } + return vmnet_if_create(nc, build_if_desc(netdev, nc), errp); } --=20 2.34.1.vfs.0.0 From nobody Mon Feb 9 19:10:47 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=1647339055; cv=none; d=zohomail.com; s=zohoarc; b=TWLH4d0P2k58TqF2SWDB2zyhW2+ZqI77H7uh25cylNHDxj07vMr26dmy8pb01XnLqlrlPql1Zkw0bew7l9+spsMu6hRthpOIbVlbfJW0MX7UkDli/E9hUagQN2xeSA30i+tWQd6+uRsOYyyPdL9T27YEqv7+MWJlNhJdVehPUEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647339055; 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=4zI36DCG8COVkIPXWvNh7K0kXkne12B7g1pftfi4dSs=; b=CFoszfvwOBUuG3vgOJbCdPfmBXKRc5Rc9Z2XobNcwfVxWu4NR2BP46R85gOyhgKNIkl7aN8oRnwGQ7RQgQqfhiN3taDZCUDqMVu4/zIJDaTLKaSeXcmCO+oiSnohY49StdFILEfG044bAv3VkfMDcsKgKVG9PFbBXYjm0wPHjeg= 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 1647339055705389.6884536784885; Tue, 15 Mar 2022 03:10:55 -0700 (PDT) Received: from localhost ([::1]:58720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU48l-00068C-Fr for importer@patchew.org; Tue, 15 Mar 2022 06:10:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU411-0007c1-C9 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:55 -0400 Received: from [2a00:1450:4864:20::22e] (port=39716 helo=mail-lj1-x22e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40v-00017F-Sn for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:55 -0400 Received: by mail-lj1-x22e.google.com with SMTP id bn33so25685800ljb.6 for ; Tue, 15 Mar 2022 03:02:49 -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.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:47 -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=4zI36DCG8COVkIPXWvNh7K0kXkne12B7g1pftfi4dSs=; b=DzuW+a8gJ9+ATwkrLKGHH3eRRI230CT1kQmk17KJbuuNTRxx5GwiPBSo/MJMS5T1cZ vmEb3aMd01yZ+Qc7qritROoDvPMsR3Ac6I9U+Jg/e5RjvcDZJ3Y5ClSVYUfZM2xHhbxy 2A6svQKD5xEnLP0/Rdkx0PHO8ETdbPIarZ24M= 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=4zI36DCG8COVkIPXWvNh7K0kXkne12B7g1pftfi4dSs=; b=ZQ2d0UBa+6N+GnyS+Qcs4lYQtfOHpE5MOrdzatp8aUUBw2LejHP4KH4don0b2QPf+v 8xY3dx0r3MVjIwXoCx9T4nG+rSUEQxMm3egRITjKrln1I19m/dZVAti40pjQjkQffq0o h8KndiiMwnd7MAVmZ+gok3LG3pecU2dV/l5NR1h3Fj6hxhgy20BKFL8XdhoTNsx/mjxw uclALRrZxaea/JYwNnR9LlGdZBwbCtRrVROgdS8ppNmGMgLpn/4h5DqXnC0ZUk/3LdMC sOQIQmnav0qZCzuFttI85A5fEQkL6FAvsxD9A2qhKX9BTtLOYGVGp5jA/HmOJGqveH9L OMGQ== X-Gm-Message-State: AOAM530HnEqtD0uO7XmpXsVwTt3pOLys54y3nA/yCznnzUVF8TcHza5q e9vq147iFnhuWFd9rozJCsBUcuYcrdBYIX3o X-Google-Smtp-Source: ABdhPJxapte6vRvgbSbJNMzFw4Hn5/XM0OdrxW7oUHQkPl0PJmM/OXIkhHrxTHYYXQb0e1l3+87m4A== X-Received: by 2002:a05:651c:1253:b0:247:f64b:8300 with SMTP id h19-20020a05651c125300b00247f64b8300mr17012655ljh.67.1647338567902; Tue, 15 Mar 2022 03:02:47 -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 5/7] net/vmnet: implement bridged mode (vmnet-bridged) Date: Tue, 15 Mar 2022 13:02:37 +0300 Message-Id: <20220315100239.2914-6-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::22e (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::22e; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lj1-x22e.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: 1647339077820100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladislav Yaroshchuk --- net/vmnet-bridged.m | 133 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 5 deletions(-) diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m index c735901666..4e29546bf2 100644 --- a/net/vmnet-bridged.m +++ b/net/vmnet-bridged.m @@ -10,16 +10,139 @@ =20 #include "qemu/osdep.h" #include "qapi/qapi-types-net.h" -#include "vmnet_int.h" -#include "clients.h" -#include "qemu/error-report.h" #include "qapi/error.h" +#include "clients.h" +#include "vmnet_int.h" =20 #include =20 + +typedef struct VmnetBridgedState { + VmnetCommonState cs; +} VmnetBridgedState; + + +static bool validate_ifname(const char *ifname) +{ + xpc_object_t shared_if_list =3D vmnet_copy_shared_interface_list(); + bool match =3D false; + if (!xpc_array_get_count(shared_if_list)) { + goto done; + } + + match =3D !xpc_array_apply( + shared_if_list, + ^bool(size_t index, xpc_object_t value) { + return strcmp(xpc_string_get_string_ptr(value), ifname) !=3D 0; + }); + +done: + xpc_release(shared_if_list); + return match; +} + + +static bool get_valid_ifnames(char *output_buf) +{ + xpc_object_t shared_if_list =3D vmnet_copy_shared_interface_list(); + __block const char *ifname =3D NULL; + __block int str_offset =3D 0; + bool interfaces_available =3D true; + + if (!xpc_array_get_count(shared_if_list)) { + interfaces_available =3D false; + goto done; + } + + xpc_array_apply( + shared_if_list, + ^bool(size_t index, xpc_object_t value) { + /* build list of strings like "en0 en1 en2 " */ + ifname =3D xpc_string_get_string_ptr(value); + strcpy(output_buf + str_offset, ifname); + strcpy(output_buf + str_offset + strlen(ifname), " "); + str_offset +=3D strlen(ifname) + 1; + return true; + }); + +done: + xpc_release(shared_if_list); + return interfaces_available; +} + + +static bool validate_options(const Netdev *netdev, Error **errp) +{ + const NetdevVmnetBridgedOptions *options =3D &(netdev->u.vmnet_bridged= ); + char ifnames[1024]; + + if (!validate_ifname(options->ifname)) { + if (get_valid_ifnames(ifnames)) { + error_setg(errp, + "unsupported ifname '%s', expected one of [ %s]", + options->ifname, + ifnames); + return false; + } + error_setg(errp, + "unsupported ifname '%s', no supported " + "interfaces available", + options->ifname); + return false; + } + +#if !defined(MAC_OS_VERSION_11_0) || \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0 + if (options->has_isolated) { + error_setg(errp, + "vmnet-bridged.isolated feature is " + "unavailable: outdated vmnet.framework API"); + return false; + } +#endif + return true; +} + + +static xpc_object_t build_if_desc(const Netdev *netdev) +{ + const NetdevVmnetBridgedOptions *options =3D &(netdev->u.vmnet_bridged= ); + xpc_object_t if_desc =3D xpc_dictionary_create(NULL, NULL, 0); + + xpc_dictionary_set_uint64(if_desc, + vmnet_operation_mode_key, + VMNET_BRIDGED_MODE + ); + + xpc_dictionary_set_string(if_desc, + vmnet_shared_interface_name_key, + options->ifname); + +#if defined(MAC_OS_VERSION_11_0) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >=3D MAC_OS_VERSION_11_0 + xpc_dictionary_set_bool(if_desc, + vmnet_enable_isolation_key, + options->isolated); +#endif + return if_desc; +} + + +static NetClientInfo net_vmnet_bridged_info =3D { + .type =3D NET_CLIENT_DRIVER_VMNET_BRIDGED, + .size =3D sizeof(VmnetBridgedState), + .receive =3D vmnet_receive_common, + .cleanup =3D vmnet_cleanup_common, +}; + + int net_init_vmnet_bridged(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { - error_setg(errp, "vmnet-bridged is not implemented yet"); - return -1; + NetClientState *nc =3D qemu_new_net_client(&net_vmnet_bridged_info, + peer, "vmnet-bridged", name); + if (!validate_options(netdev, errp)) { + return -1; + } + return vmnet_if_create(nc, build_if_desc(netdev), errp); } --=20 2.34.1.vfs.0.0 From nobody Mon Feb 9 19:10:47 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=1647341860; cv=none; d=zohomail.com; s=zohoarc; b=YoDHYr4tYrTLU33vAcD6MbqirnW1oJusSGVFTbu05MFA61foilGrhwMVGA8K2tKk2W5VKFuSRJ6KzoTa4Rg06w4lRe1nrMxZ72kfCrSXt+Dvxd5PaxCURye+bbQ+qWoBhLDpH7vtjeWWqQ4izT4QBnFa/kOH84jtknpAO6SDT0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647341860; 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=TocqvUgt8oYqDt7ijO5+PrJ/oIA8D+p+ZMbp4ehOtYs=; b=Nc1/dj7Fso8MkxZaHIPLfi92qFU20rvCpwCD0OkPCUz29P4BsflymDTTaMHB8+ipD8Ut1hSTs5WDciMELFStcDJwA+NoxgDEXmdWPpkb0YH2Gp/9BMNRf0IltkrWTJvI3o+27frlfFa2dqgWcLvkw2RHIJboPiWV7Qmapd/EFPE= 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 1647341860903588.6949047813553; Tue, 15 Mar 2022 03:57:40 -0700 (PDT) Received: from localhost ([::1]:39936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU4rz-0002CK-No for importer@patchew.org; Tue, 15 Mar 2022 06:57:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU412-0007d2-1x for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:56 -0400 Received: from [2a00:1450:4864:20::235] (port=46897 helo=mail-lj1-x235.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40w-00017J-Oq for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:55 -0400 Received: by mail-lj1-x235.google.com with SMTP id u7so25638215ljk.13 for ; Tue, 15 Mar 2022 03:02:50 -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.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:48 -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=TocqvUgt8oYqDt7ijO5+PrJ/oIA8D+p+ZMbp4ehOtYs=; b=PTEdc/pWcjmWItcAwKZlzkhs+sjCd9nf/tVtJ5iwwyu5ggT6DRZVgxM84T+IPysQXX 5Oho4hwpOC/M5AFGpZqfR/120hUDEscILtvHZwCA13mNSl8epHMW/yyz9xbeGf0roSoY MY4rb84Hv+VhcKGdODebZmrHvS28wZduQ3YHA= 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=TocqvUgt8oYqDt7ijO5+PrJ/oIA8D+p+ZMbp4ehOtYs=; b=IZgoAp40KI0RQvm2qOxUGW9/BSJMu+Wk9XZWjN9K0FA/zbJl15EaP4/t3R/U0r1AUj 2qPXmYf/+8mHcrq+CTKGpmK84JWh0w487TXFEQ2XvvURdG1HOt7oYLu0RmQSYrzV3oTA HqCKuuyNbkq+9REK2uFFAfS+6tmng51HWMC82a5rdUAL7oiwXK2P0Q2soZtLi7t+mIFO 6GayzdkrJ64akstkhVvne6Yy+8P8KulJJ/8GN1gKh5azYIyUwThLFlon3pFxFTsdJynj ta15JkmWVjUIC5KStO+cwGvm5MicroEnHaL2Nu67SL563YVQX3L9W9UX+wz0W2PPlCuY qdKA== X-Gm-Message-State: AOAM530tN8jOvs7zfUsVYbCGwrMqML9i4RT4aVTcXbdEinl/fLPyxDS8 leZQ25RsNhvIGtU81FnyHi0dmHVrExQteB5Y X-Google-Smtp-Source: ABdhPJyFRcu+yJFgeuKW946ev8d1aaiZQHxgZJo6itRHOXju6bjD3gE1sRMScVGkyc+q/NF7DJYW8w== X-Received: by 2002:a2e:b5b0:0:b0:248:47d:6abe with SMTP id f16-20020a2eb5b0000000b00248047d6abemr16366856ljn.75.1647338568791; Tue, 15 Mar 2022 03:02:48 -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 6/7] net/vmnet: update qemu-options.hx Date: Tue, 15 Mar 2022 13:02:38 +0300 Message-Id: <20220315100239.2914-7-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::235 (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::235; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lj1-x235.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: 1647341862670100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladislav Yaroshchuk --- qemu-options.hx | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 5ce0ada75e..ea00d0eeb6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2743,6 +2743,25 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #ifdef __linux__ "-netdev vhost-vdpa,id=3Dstr,vhostdev=3D/path/to/dev\n" " configure a vhost-vdpa network,Establish a vhost-vdpa= netdev\n" +#endif +#ifdef CONFIG_VMNET + "-netdev vmnet-host,id=3Dstr[,isolated=3Don|off][,net-uuid=3Duuid]\n" + " [,start-address=3Daddr,end-address=3Daddr,subnet-mask=3Dmask= ]\n" + " configure a vmnet network backend in host mode with I= D 'str',\n" + " isolate this interface from others with 'isolated',\n" + " configure the address range and choose a subnet mask,= \n" + " specify network UUID 'uuid' to disable DHCP and inter= act with\n" + " vmnet-host interfaces within this isolated network\n" + "-netdev vmnet-shared,id=3Dstr[,isolated=3Don|off][,nat66-prefix=3Dadd= r]\n" + " [,start-address=3Daddr,end-address=3Daddr,subnet-mask=3Dmask= ]\n" + " configure a vmnet network backend in shared mode with= ID 'str',\n" + " configure the address range and choose a subnet mask,= \n" + " set IPv6 ULA prefix (of length 64) to use for interna= l network,\n" + " isolate this interface from others with 'isolated'\n" + "-netdev vmnet-bridged,id=3Dstr,ifname=3Dname[,isolated=3Don|off]\n" + " configure a vmnet network backend in bridged mode wit= h ID 'str',\n" + " use 'ifname=3Dname' to select a physical network inte= rface to be bridged,\n" + " isolate this interface from others with 'isolated'\n" #endif "-netdev hubport,id=3Dstr,hubid=3Dn[,netdev=3Dnd]\n" " configure a hub port on the hub with ID 'n'\n", QEMU_= ARCH_ALL) @@ -2762,6 +2781,9 @@ DEF("nic", HAS_ARG, QEMU_OPTION_nic, #endif #ifdef CONFIG_POSIX "vhost-user|" +#endif +#ifdef CONFIG_VMNET + "vmnet-host|vmnet-shared|vmnet-bridged|" #endif "socket][,option][,...][mac=3Dmacaddr]\n" " initialize an on-board / default host NIC (using MAC = address\n" @@ -2784,6 +2806,9 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, #endif #ifdef CONFIG_NETMAP "netmap|" +#endif +#ifdef CONFIG_VMNET + "vmnet-host|vmnet-shared|vmnet-bridged|" #endif "socket][,option][,option][,...]\n" " old way to initialize a host network interface\n" --=20 2.34.1.vfs.0.0 From nobody Mon Feb 9 19:10:47 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=1647341639; cv=none; d=zohomail.com; s=zohoarc; b=b1+7NXvUf9D1qng7KfijBKPI8bsozY9zenouRbk5i4+xAZKAUjuGwvYUyMkfdJDUM/wxLjrfsUNmsqyRAf7Yy6pEGwcLFd1T3N5oOOixuBDHNtA6bX40ncmr1K3Mpujr1SSQcU8KTmCax+KJRqE1vwwCG+Q1Jd2nVbxg/R+DIfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647341639; 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=v0RH9VmCWPcsPrNitBQ5880IrTspVYz6x+t+QgkXXVo=; b=c78gSRgvrRm7l+KgZpUL+N2A9FDCKOJaAx2IB1AH14AYpnIYM0FMxgGKASKD9VY5fS4nzZNplyAadBAitw21fFiLGii5Yl5fvWvDuf7dbGd6UyEGxfzl9CjL6g8GCho2cinf1iSGLF36HwC1aoScRmEfYRhmMk8+nRZJWZpfEzA= 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 1647341639544803.0651844595202; Tue, 15 Mar 2022 03:53:59 -0700 (PDT) Received: from localhost ([::1]:33368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU4oQ-0006B9-FT for importer@patchew.org; Tue, 15 Mar 2022 06:53:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU40z-0007aH-BW for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:53 -0400 Received: from [2a00:1450:4864:20::236] (port=42878 helo=mail-lj1-x236.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nU40x-00017W-J1 for qemu-devel@nongnu.org; Tue, 15 Mar 2022 06:02:52 -0400 Received: by mail-lj1-x236.google.com with SMTP id c15so9101986ljr.9 for ; Tue, 15 Mar 2022 03:02:51 -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.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2022 03:02:49 -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=v0RH9VmCWPcsPrNitBQ5880IrTspVYz6x+t+QgkXXVo=; b=f7ZMwBgGnrYqMV/CDz4Z1KRrAB1CRZQS9I37106W8fBUIpIwEZHvj8SI0ULs2SAMuk YPwbFVWp7hu+7C9/n7QlNs0m+iVD9XJRPQub+3mtD+Q7vW+keifYZcn4Kili16a/DroN +K1Zdv0P3dU7Cu1uxVWG+ZdvddGron/4Egv8A= 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=v0RH9VmCWPcsPrNitBQ5880IrTspVYz6x+t+QgkXXVo=; b=KlDq7tcGl0G7AzbU+TFxMC/gnu/9U+sPI4mBk7YLuiF7GcPY1thFFT1m09E9bMDeKT li68UgLO2cZH2/SbYx81a/qrX/bdFQaWZomvI6joIEmly1Nkw8SewJ19RrO3n9FOlcci bcGWJMZ64L1kt1N6CNZMb1ENSWUN2n21gtaA8B1yU3nr7zDdehZglz3WiVYk421QDonN 7AnijqFTwzuJJIJfNajClbZlQ8RPNLgRjvkReUsC9R2ofsObEGVp0vIONvlsSJp5KrOo H/iRs3FEiNDQKXYylK2kusRs6GBWLTx/qonQ7A3vVASMP+O7/WW9AGCS3puFjwCd/SBG zeOg== X-Gm-Message-State: AOAM5332xeAN0YGeT4IHobqI/mFTwluA8WeAhOmq6G1Llg6QhV69D7Lf ep43B6hJl0lzXFb8g1uHyWPXCVcRBo8Nfd3e X-Google-Smtp-Source: ABdhPJxVQSDBBH+JOJ6iw9JRCm3krcay4mKc5z8lbNOaSJh2Dua2zqZ6sNOxsJWrvefixythGQOpXA== X-Received: by 2002:a2e:3518:0:b0:247:e0be:922f with SMTP id z24-20020a2e3518000000b00247e0be922fmr16859933ljz.303.1647338569766; Tue, 15 Mar 2022 03:02:49 -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 7/7] net/vmnet: update hmp-commands.hx Date: Tue, 15 Mar 2022 13:02:39 +0300 Message-Id: <20220315100239.2914-8-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::236 (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::236; envelope-from=vladislav.yaroshchuk@jetbrains.com; helo=mail-lj1-x236.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: 1647341640815100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladislav Yaroshchuk --- hmp-commands.hx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 8476277aa9..8f3d78f177 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1265,7 +1265,11 @@ ERST { .name =3D "netdev_add", .args_type =3D "netdev:O", - .params =3D "[user|tap|socket|vde|bridge|hubport|netmap|vhost-= user],id=3Dstr[,prop=3Dvalue][,...]", + .params =3D "[user|tap|socket|vde|bridge|hubport|netmap|vhost-= user" +#ifdef CONFIG_VMNET + "|vmnet-host|vmnet-shared|vmnet-bridged" +#endif + "],id=3Dstr[,prop=3Dvalue][,...]", .help =3D "add host network device", .cmd =3D hmp_netdev_add, .command_completion =3D netdev_add_completion, --=20 2.34.1.vfs.0.0