From nobody Mon May 6 10:12:18 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; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1626803819; cv=none; d=zohomail.com; s=zohoarc; b=fkBR+r7rR22D2FNSRn63H+xVgGUV4Cr31fGzeHkiPZkI8SfkyHcSRGncWk78vFZ3D/e/kABbs4wsb5s0LASlFAedA9H1EJHXbD+DDyMBUNuo9z15TDC8M2bEJ8ZyJzbUo73nrJGtcgmLkrbu4/j5NGBYumF04qEiKboliIoIcVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626803819; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=tjBCl0fIf7THtbsUHhCs+2J6Sd74Inird2KIJc+MoDo=; b=LTlGiVis6+Kk+MputJxBNwh2EsD88SRNf8gkriddrCAgmc1EFTY7Vb+HTDEWRAmTlzKoSuNzo0ZBDAXBTZTdm+PkIWIacjAs4WApTfCSBWfrrP+i4bPZQwK/Gb9HpgBYckLxwtoqRm/eQyharecch/5B7DmJKU2lo5jnG97hTBU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1626803819047491.4581088045129; Tue, 20 Jul 2021 10:56:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.158935.292428 (Exim 4.92) (envelope-from ) id 1m5tyy-0004Wc-So; Tue, 20 Jul 2021 17:56:40 +0000 Received: by outflank-mailman (output) from mailman id 158935.292428; Tue, 20 Jul 2021 17:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m5tyy-0004WV-Pm; Tue, 20 Jul 2021 17:56:40 +0000 Received: by outflank-mailman (input) for mailman id 158935; Tue, 20 Jul 2021 17:56:40 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m5tyx-0004WP-Uv for xen-devel@lists.xenproject.org; Tue, 20 Jul 2021 17:56:40 +0000 Received: from mail-qt1-x82c.google.com (unknown [2607:f8b0:4864:20::82c]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a2ee84e7-2eb2-4d00-b63e-c21ab1d2dd4e; Tue, 20 Jul 2021 17:56:38 +0000 (UTC) Received: by mail-qt1-x82c.google.com with SMTP id w26so134933qto.9 for ; Tue, 20 Jul 2021 10:56:38 -0700 (PDT) Received: from lagunitas.localdomain (96-95-26-25-static.hfc.comcastbusiness.net. [96.95.26.25]) by smtp.gmail.com with ESMTPSA id 6sm9902073qkv.115.2021.07.20.10.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 10:56:37 -0700 (PDT) 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: a2ee84e7-2eb2-4d00-b63e-c21ab1d2dd4e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tjBCl0fIf7THtbsUHhCs+2J6Sd74Inird2KIJc+MoDo=; b=k9OIfm71PW208nZEBSrdF+NVOM7XCT7MaAbUW+Q+k5TFFXhoi9L310Tq2IgplTms7P u6iDHaUoZxf0w7Qy9z7vHTGbqpclsb3EKEEYafIj01flHx90Y77QOxBy8jOA3eEAaeJX 9zWaid1IGmUqYBL2Do8I+5B1JlY0LdkRIW+wdNYK2n3hv+7U53dSjU5qDQkHlvzxFI1P RR6pr27ZGHrtURzdTPdUbOV2V7K9lBP8WEgVVh10gc9B1GPO6yjskNTdIiz4T76tcHBx klKqW8hnuZtTfc3D6qISEbD7emPvI0acYF681UntJmFFIXGv5wqXdH3Gvc7E4CULViQO G2qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tjBCl0fIf7THtbsUHhCs+2J6Sd74Inird2KIJc+MoDo=; b=kBnwwpCMJbAYIV2uA9FEKsol7L4teDoMBc4dbifGPDbavSk4nNzzDiSP9tA2UvcL58 XcQWpuGNnrcuv5XQNVZzVKtG5uJyYeKFvyR9asctMCKP8hTmCxx7gxr5ejy1e/iCdtvS Q7rIIjRWxgQQE+PjqUsj7StFZlc/9CMThvztddB3NHADIwuwsVshD+8jjOGX+FI+Pjkn l5xUF0k1OhPdFQiIpnnCaXFUUrQy7wNfNSPCew1WqXSOqv/Q3G5cExx2w81+xH4t7Y2u Kn5leqbeulTSAJSMjPGs31EpOoYjczAp2wwUmhr1AW4aO1gTWgeMfLnyGMFPpyyRURNr Ln1Q== X-Gm-Message-State: AOAM533NWMZ7DEoDkDPQd0prwYRZNg74SJKSoS95fQsiBkloPBThzhdX JF826SRqB7yidUSw0IbZw9+k4NJhRN3OeIeJ X-Google-Smtp-Source: ABdhPJyTbp5aRPOsiQY0HrJXeJ4cA06vf9siBIQAlBJAGj8d+rZ4WnK3nsAgLuwOCdwpF/zAmO0SQQ== X-Received: by 2002:aed:30cd:: with SMTP id 71mr27247384qtf.31.1626803798282; Tue, 20 Jul 2021 10:56:38 -0700 (PDT) From: Scott Davis X-Google-Original-From: Scott Davis To: xen-devel@lists.xenproject.org Cc: Scott Davis , Ian Jackson , Wei Liu , George Dunlap , Nick Rosbrook , Anthony PERARD , Juergen Gross Subject: [PATCH] tools/xl: Add stubdomain_cmdline option to xl.cfg Date: Tue, 20 Jul 2021 13:56:34 -0400 Message-Id: <6562806d7430431dc154af2c6e4a5232725fc136.1626800539.git.scott.davis@starlab.io> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1626803821227100001 Content-Type: text/plain; charset="utf-8" This adds an option to the xl domain configuration file syntax for specifyi= ng a kernel command line for device-model stubdomains. It is intended for use = with Linux-based stubdomains. Signed-off-by: Scott Davis Reviewed-by: Jason Andryuk --- docs/man/xl.cfg.5.pod.in | 4 ++++ tools/golang/xenlight/helpers.gen.go | 3 +++ tools/golang/xenlight/types.gen.go | 1 + tools/libs/light/libxl_dm.c | 1 + tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 2 ++ 6 files changed, 12 insertions(+) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 56370a37db..6c777cad5c 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2742,6 +2742,10 @@ In case of B it is expected to= be MiniOS-based stubdomain image, in case of B it is expected to be Linux-based stubdomain kernel. =20 +=3Ditem B + +Append B to the device-model stubdomain kernel command line. + =3Ditem B =20 Override the path to the ramdisk image used as device-model stubdomain. diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/h= elpers.gen.go index db82537b42..bfc1e7f312 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1018,6 +1018,7 @@ return fmt.Errorf("converting field DeviceModelStubdo= main: %v", err) } x.StubdomainMemkb =3D uint64(xc.stubdomain_memkb) x.StubdomainKernel =3D C.GoString(xc.stubdomain_kernel) +x.StubdomainCmdline =3D C.GoString(xc.stubdomain_cmdline) x.StubdomainRamdisk =3D C.GoString(xc.stubdomain_ramdisk) x.DeviceModel =3D C.GoString(xc.device_model) x.DeviceModelSsidref =3D uint32(xc.device_model_ssidref) @@ -1344,6 +1345,8 @@ return fmt.Errorf("converting field DeviceModelStubdo= main: %v", err) xc.stubdomain_memkb =3D C.uint64_t(x.StubdomainMemkb) if x.StubdomainKernel !=3D "" { xc.stubdomain_kernel =3D C.CString(x.StubdomainKernel)} +if x.StubdomainCmdline !=3D "" { +xc.stubdomain_cmdline =3D C.CString(x.StubdomainCmdline)} if x.StubdomainRamdisk !=3D "" { xc.stubdomain_ramdisk =3D C.CString(x.StubdomainRamdisk)} if x.DeviceModel !=3D "" { diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/typ= es.gen.go index a214dd9df6..09a3bb67e2 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -483,6 +483,7 @@ DeviceModelVersion DeviceModelVersion DeviceModelStubdomain Defbool StubdomainMemkb uint64 StubdomainKernel string +StubdomainCmdline string StubdomainRamdisk string DeviceModel string DeviceModelSsidref uint32 diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index dbd3c7f278..2d54596834 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.c @@ -2373,6 +2373,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stu= b_dm_spawn_state *sdss) } =20 stubdom_state->pv_kernel.path =3D guest_config->b_info.stubdomain_kern= el; + stubdom_state->pv_cmdline =3D guest_config->b_info.stubdomain_cmdline; stubdom_state->pv_ramdisk.path =3D guest_config->b_info.stubdomain_ram= disk; =20 /* fixme: this function can leak the stubdom if it fails */ diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_type= s.idl index f45adddab0..e782e15cf2 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -523,6 +523,7 @@ libxl_domain_build_info =3D Struct("domain_build_info",[ ("device_model_stubdomain", libxl_defbool), ("stubdomain_memkb", MemKB), ("stubdomain_kernel", string), + ("stubdomain_cmdline", string), ("stubdomain_ramdisk", string), # if you set device_model you must set device_model_version too ("device_model", string), diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 9fb0791429..17dddb4cd5 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2533,6 +2533,8 @@ skip_usbdev: =20 xlu_cfg_replace_string (config, "stubdomain_kernel", &b_info->stubdomain_kernel, 0); + xlu_cfg_replace_string (config, "stubdomain_cmdline", + &b_info->stubdomain_cmdline, 0); xlu_cfg_replace_string (config, "stubdomain_ramdisk", &b_info->stubdomain_ramdisk, 0); if (!xlu_cfg_get_long (config, "stubdomain_memory", &l, 0)) --=20 2.25.1