---
docs/man/xl.cfg.pod.5.in | 23 +++++++++++++++++++----
tools/xl/xl_parse.c | 7 +++++++
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in
index 099a28d..9c8ff31 100644
--- a/docs/man/xl.cfg.pod.5.in
+++ b/docs/man/xl.cfg.pod.5.in
@@ -2636,10 +2636,25 @@ model which they were installed with.
=item B<device_model_override="PATH">
-Override the path to the binary to be used as the device-model. The
-binary provided here MUST be consistent with the
-B<device_model_version> which you have specified. You should not
-normally need to specify this option.
+Override the path to the binary to be used as the device-model running in
+toolstack domain. The binary provided here MUST be consistent with the
+B<device_model_version> which you have specified. You should not normally need
+to specify this option.
+
+=item B<stubdomain_kernel="PATH">
+
+Override the path to the kernel image used as device-model stubdomain.
+The binary provided here MUST be consistent with the
+B<device_model_version> which you have specified.
+In case of B<qemu-xen-traditional> it is expected to be MiniOS-based stubdomain
+image, in case of B<qemu-xen> it is expected to be Linux-based stubdomain
+kernel.
+
+=item B<stubdomain_ramdisk="PATH">
+
+Override the path to the ramdisk image used as device-model stubdomain.
+The binary provided here is to be used by a kernel pointed by B<stubdomain_kernel>.
+It is known to be used only by Linux-based stubdomain kernel.
=item B<device_model_stubdomain_override=BOOLEAN>
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index f9147f6..c99c77b 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -2391,6 +2391,13 @@ skip_usbdev:
xlu_cfg_replace_string(config, "device_model_user",
&b_info->device_model_user, 0);
+ xlu_cfg_replace_string (config, "stubdomain_kernel",
+ &b_info->stubdomain_kernel, 0);
+ xlu_cfg_replace_string (config, "stubdomain_ramdisk",
+ &b_info->stubdomain_ramdisk, 0);
+ if (!xlu_cfg_get_long (config, "stubdomain_memory", &l, 0))
+ b_info->stubdomain_memkb = l * 1024;
+
#define parse_extra_args(type) \
e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \
&b_info->extra##type, 0); \
--
git-series 0.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
docs/man/xl.cfg.pod.5.in | 23 +++++++++++++++++++----
tools/xl/xl_parse.c | 7 +++++++
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in
index 099a28d..9c8ff31 100644
--- a/docs/man/xl.cfg.pod.5.in
+++ b/docs/man/xl.cfg.pod.5.in
@@ -2636,10 +2636,25 @@ model which they were installed with.
=item B<device_model_override="PATH">
-Override the path to the binary to be used as the device-model. The
-binary provided here MUST be consistent with the
-B<device_model_version> which you have specified. You should not
-normally need to specify this option.
+Override the path to the binary to be used as the device-model running in
+toolstack domain. The binary provided here MUST be consistent with the
+B<device_model_version> which you have specified. You should not normally need
+to specify this option.
+
+=item B<stubdomain_kernel="PATH">
+
+Override the path to the kernel image used as device-model stubdomain.
+The binary provided here MUST be consistent with the
+B<device_model_version> which you have specified.
+In case of B<qemu-xen-traditional> it is expected to be MiniOS-based stubdomain
+image, in case of B<qemu-xen> it is expected to be Linux-based stubdomain
+kernel.
+
+=item B<stubdomain_ramdisk="PATH">
+
+Override the path to the ramdisk image used as device-model stubdomain.
+The binary provided here is to be used by a kernel pointed by B<stubdomain_kernel>.
+It is known to be used only by Linux-based stubdomain kernel.
=item B<device_model_stubdomain_override=BOOLEAN>
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index f9147f6..c99c77b 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -2391,6 +2391,13 @@ skip_usbdev:
xlu_cfg_replace_string(config, "device_model_user",
&b_info->device_model_user, 0);
+ xlu_cfg_replace_string (config, "stubdomain_kernel",
+ &b_info->stubdomain_kernel, 0);
+ xlu_cfg_replace_string (config, "stubdomain_ramdisk",
+ &b_info->stubdomain_ramdisk, 0);
+ if (!xlu_cfg_get_long (config, "stubdomain_memory", &l, 0))
+ b_info->stubdomain_memkb = l * 1024;
+
#define parse_extra_args(type) \
e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \
&b_info->extra##type, 0); \
--
git-series 0.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel