From nobody Thu Apr 25 07:58:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=antioche.eu.org ARC-Seal: i=1; a=rsa-sha256; t=1610475554; cv=none; d=zohomail.com; s=zohoarc; b=ayb+DcPzqpTZi61J058U7KfFvSA8qGegJ9bch+eE9R4ggN1ZPPD4Fiu20VLFUila2ve8EikqafAShzIdT/eUIscw7TUMI2s+MwKw9/wO9qR7ZHaMIEwCeCD9Bm0geyoiOcPXgthPt5sf67tgj1j0J7PMQ1AvlCul7pkkpnc4RA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610475554; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rz4AkgqTQODKLBH9iS9+nv4EHdFBlv4SG6pgMfoSCp0=; b=CZ/bK7bKPjTbfkPLG14tkGQuhAEHIkeXUpbFEEWNMIhmbV7jEj8mbJ5KlefH2fD5/XDo399BG1q1jbZg4nd+TjTCaIKjzx7zFwUq5RdNBjMSMwLS3lUE3uSVSxY8K+VNJLMFDB+XjMkOtvLxblKIVRxAGk3RlBxcHvlGJ8TLAmE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1610475554448273.59137481947664; Tue, 12 Jan 2021 10:19:14 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.65854.116702 (Exim 4.92) (envelope-from ) id 1kzOFr-0004TA-V6; Tue, 12 Jan 2021 18:18:55 +0000 Received: by outflank-mailman (output) from mailman id 65854.116702; Tue, 12 Jan 2021 18:18:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOFr-0004So-RY; Tue, 12 Jan 2021 18:18:55 +0000 Received: by outflank-mailman (input) for mailman id 65854; Tue, 12 Jan 2021 18:18:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOCo-0003Yo-1y for xen-devel@lists.xenproject.org; Tue, 12 Jan 2021 18:15:46 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9bb38c76-4004-4cb6-bea8-3807869d03d5; Tue, 12 Jan 2021 18:14: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 10CIE69c001367; Tue, 12 Jan 2021 19:14:06 +0100 (CET) Received: from armandeche.soc.lip6.fr (armandeche [132.227.63.133]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10CIDmSS008028; Tue, 12 Jan 2021 19:13:48 +0100 (MET) Received: by armandeche.soc.lip6.fr (Postfix, from userid 20331) id D9E467218; Tue, 12 Jan 2021 19:13:48 +0100 (MET) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 9bb38c76-4004-4cb6-bea8-3807869d03d5 From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH] libs/light: pass some infos to qemu Date: Tue, 12 Jan 2021 19:12:37 +0100 Message-Id: <20210112181242.1570-17-bouyer@antioche.eu.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210112181242.1570-1-bouyer@antioche.eu.org> References: <20210112181242.1570-1-bouyer@antioche.eu.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Tue, 12 Jan 2021 19:14:06 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Content-Type: text/plain; charset="utf-8" From: Manuel Bouyer 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 Signed-off-by: Manuel Bouyer --- 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..8866c3f5ad 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 =3D 0; char *s; =20 + flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", do= mid)); + 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=3Dtap,id=3Dnet%d,ifname= =3D%s," + "br=3D%s," "script=3D%s,downscript=3D%s", nics[i].devid, ifname, + nics[i].bridge, libxl_tapif_script(gc), libxl_tapif_script(gc))); =20 @@ -1825,6 +1829,8 @@ static int libxl__build_device_model_args_new(libxl__= gc *gc, flexarray_append(dm_args, GCSPRINTF("%"PRId64, ram_size)); =20 if (b_info->type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { + flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", gu= est_domid)); + if (b_info->u.hvm.hdtype =3D=3D LIBXL_HDTYPE_AHCI) flexarray_append_pair(dm_args, "-device", "ahci,id=3Dahci0"); for (i =3D 0; i < num_disks; i++) { --=20 2.29.2