[Xen-devel] [PATCH RFC v1 73/74] xl: pvshim: Provide and document xl config

[Wei Liu <wei.liu2@xxxxxxxxxx>]

From: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

** NOTE: I intend to change the config names from "pvhshim" to "pvshim" **

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 docs/man/xl.cfg.pod.5.in | 28 ++++++++++++++++++++++++++++
 tools/xl/xl_parse.c      | 11 +++++++++++
 2 files changed, 39 insertions(+)

diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in
index b7b91d8627..e9f29c2424 100644
--- a/docs/man/xl.cfg.pod.5.in
+++ b/docs/man/xl.cfg.pod.5.in
@@ -470,6 +470,34 @@ version of pvgrub can be selected.
 Note that xl expects to find the pvgrub32.bin and pvgrub64.bin binaries in
 F<@XENFIRMWAREDIR@>.
 
+=item B<pvhshim=BOOLEAN>
+
+Whether to boot this guest as a PV guest within a PVH container
+(ie, using processor hardware extensions to
+separate its address space.)
+
+Default is false.
+
+=item B<pvhshim_path="PATH">
+
+The PVH shim is a specially-built firmware-like executable
+constructed from the hypervisor source tree.
+This option specifies to use a non-default shim.
+Ignored if pvhsim is false.
+
+=item B<pvhshim_cmdline="STRING">
+
+Command line for the shim.
+Default is "pv-shim console=xen,pv sched=null".
+Ignored if pvhsim is false.
+
+=item B<pvhshim_extra="STRING">
+
+Extra command line arguments for the shim.
+If supplied, appended to the value for pvhshim_cmdline.
+Default is empty.
+Ignored if pvhsim is false.
+
 =back
 
 =head4 HVM guest options
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 9a692d5ae6..bdd3ad8127 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -1402,6 +1402,17 @@ void parse_config_data(const char *config_source,
             exit(1);
         }
 
+        xlu_cfg_get_defbool(config, "pvhshim", &b_info->u.pv.pvhshim, 0);
+        if (!xlu_cfg_get_string(config, "pvhshim_path", &buf, 0))
+            xlu_cfg_replace_string(config, "pvhshim_path",
+                                   &b_info->u.pv.pvhshim_path, 0);
+        if (!xlu_cfg_get_string(config, "pvhshim_cmdline", &buf, 0))
+            xlu_cfg_replace_string(config, "pvhshim_cmdline",
+                                   &b_info->u.pv.pvhshim_cmdline, 0);
+        if (!xlu_cfg_get_string(config, "pvhshim_extra", &buf, 0))
+            xlu_cfg_replace_string(config, "pvhshim_extra",
+                                   &b_info->u.pv.pvhshim_extra, 0);
+
         break;
     }
     default:
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel