From patchwork Sat Jan 30 23:02:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manuel Bouyer X-Patchwork-Id: 12057387 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EF42C433E6 for ; Sat, 30 Jan 2021 23:03:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EECC64DD9 for ; Sat, 30 Jan 2021 23:03:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EECC64DD9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=netbsd.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.79110.144063 (Exim 4.92) (envelope-from ) id 1l5zGv-00037Q-5O; Sat, 30 Jan 2021 23:03:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 79110.144063; Sat, 30 Jan 2021 23:03:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5zGv-00037J-1f; Sat, 30 Jan 2021 23:03:17 +0000 Received: by outflank-mailman (input) for mailman id 79110; Sat, 30 Jan 2021 23:03:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5zGt-00035q-MF for xen-devel@lists.xenproject.org; Sat, 30 Jan 2021 23:03:15 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9e0859eb-a73a-4296-b0a4-cf7231838fff; Sat, 30 Jan 2021 23:03:12 +0000 (UTC) Received: from asim.lip6.fr (asim.lip6.fr [132.227.86.2]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 10UN38or003514; Sun, 31 Jan 2021 00:03:08 +0100 (CET) Received: from borneo.soc.lip6.fr (borneo [132.227.103.47]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10UN36pn002140; Sun, 31 Jan 2021 00:03:06 +0100 (MET) Received: by borneo.soc.lip6.fr (Postfix, from userid 373) id 624F7A9F9D; Sun, 31 Jan 2021 00:03:06 +0100 (MET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9e0859eb-a73a-4296-b0a4-cf7231838fff From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: =?unknown-8bit?q?Manuel_Bouyer_=3Cbouyer=40netbsd=2Eorg=3E=2C_Ian_Jackso?= =?unknown-8bit?q?n_=3Ciwj=40xenproject=2Eorg=3E=2C_Wei_Liu_=3Cwl=40xen=2Eor?= =?unknown-8bit?q?g=3E=2C_Anthony_PERARD_=3Canthony=2Eperard=40citrix=2Ecom?= =?unknown-8bit?q?=3E=2C_Roger_Pau_Monn=E9__=3Croger=2Epau=40citrix=2Ecom=3E?= Subject: [PATCH v3 1/2] libs/light: pass some infos to qemu Date: Sun, 31 Jan 2021 00:02:59 +0100 Message-Id: <20210130230300.11664-1-bouyer@netbsd.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Sun, 31 Jan 2021 00:03:08 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Pass bridge name to qemu as command line option When starting qemu, set an environnement variable XEN_DOMAIN_ID, to be used by qemu helper scripts The only functional difference of using the br parameter is that the bridge name gets passed to the QEMU script. NetBSD doesn't have the ioctl to rename network interfaces implemented, and thus cannot rename the interface from tapX to vifX.Y-emu. Only qemu knowns the tap interface name, so we need to use the qemu script from qemu itself. Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monné --- tools/libs/light/libxl_dm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index 3da83259c0..13f79ec471 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.c @@ -761,6 +761,8 @@ static int libxl__build_device_model_args_old(libxl__gc *gc, int nr_set_cpus = 0; char *s; + flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", domid)); + if (b_info->kernel) { LOGD(ERROR, domid, "HVM direct kernel boot is not supported by " "qemu-xen-traditional"); @@ -1547,8 +1549,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-netdev"); flexarray_append(dm_args, GCSPRINTF("type=tap,id=net%d,ifname=%s," + "br=%s," "script=%s,downscript=%s", nics[i].devid, ifname, + nics[i].bridge, libxl_tapif_script(gc), libxl_tapif_script(gc))); @@ -1825,6 +1829,8 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, GCSPRINTF("%"PRId64, ram_size)); if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", guest_domid)); + if (b_info->u.hvm.hdtype == LIBXL_HDTYPE_AHCI) flexarray_append_pair(dm_args, "-device", "ahci,id=ahci0"); for (i = 0; i < num_disks; i++) { From patchwork Sat Jan 30 23:03:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manuel Bouyer X-Patchwork-Id: 12057385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F5FDC433DB for ; Sat, 30 Jan 2021 23:03:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1705764DBD for ; Sat, 30 Jan 2021 23:03:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1705764DBD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=netbsd.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.79109.144050 (Exim 4.92) (envelope-from ) id 1l5zGq-000362-TB; Sat, 30 Jan 2021 23:03:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 79109.144050; Sat, 30 Jan 2021 23:03:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5zGq-00035v-Ps; Sat, 30 Jan 2021 23:03:12 +0000 Received: by outflank-mailman (input) for mailman id 79109; Sat, 30 Jan 2021 23:03:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5zGo-00035q-S6 for xen-devel@lists.xenproject.org; Sat, 30 Jan 2021 23:03:10 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 22b9206e-f5a6-4a7a-957f-180819b309b5; Sat, 30 Jan 2021 23:03:09 +0000 (UTC) Received: from asim.lip6.fr (asim.lip6.fr [132.227.86.2]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 10UN38RR026350; Sun, 31 Jan 2021 00:03:08 +0100 (CET) Received: from borneo.soc.lip6.fr (borneo [132.227.103.47]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10UN36T3007150; Sun, 31 Jan 2021 00:03:07 +0100 (MET) Received: by borneo.soc.lip6.fr (Postfix, from userid 373) id 7DC67A9E7D; Sun, 31 Jan 2021 00:03:06 +0100 (MET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 22b9206e-f5a6-4a7a-957f-180819b309b5 From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , Ian Jackson , Wei Liu Subject: [PATCH v3 2/2] Document qemu-ifup on NetBSD Date: Sun, 31 Jan 2021 00:03:00 +0100 Message-Id: <20210130230300.11664-2-bouyer@netbsd.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210130230300.11664-1-bouyer@netbsd.org> References: <20210130230300.11664-1-bouyer@netbsd.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Sun, 31 Jan 2021 00:03:08 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Document that on NetBSD, the tap interface will be configured by the qemu-ifup script. Document the arguments, and XEN_DOMAIN_ID environnement variable. --- docs/man/xl-network-configuration.5.pod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/man/xl-network-configuration.5.pod b/docs/man/xl-network-configuration.5.pod index af058d4d3c..f6eb6c31fc 100644 --- a/docs/man/xl-network-configuration.5.pod +++ b/docs/man/xl-network-configuration.5.pod @@ -172,6 +172,10 @@ add it to the relevant bridge). Defaults to C but can be set to any script. Some example scripts are installed in C. +On NetBSD, HVM guests will always use +C to configure the tap interface. The first argument +is the tap interface, the second is the bridge name. the environnement variable +C contains the domU's ID. =head2 ip