| Message ID | 20220626184536.666647-1-burzalodowa@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] uboot-script-gen: prevent user mistakes due to DOM0_KERNEL becoming optional | expand |
On 26/06/2022 19:45, Xenia Ragiadakou wrote: > Before enabling true dom0less configuration, the script was failing instantly > if DOM0_KERNEL parameter was not specified. This behaviour has changed and > this needs to be communicated to the user. > > Mention in README.md that for dom0less configurations, the parameter > DOM0_KERNEL is optional. > > If DOM0_KERNEL is not set, check that no other dom0 specific parameters are > specified by the user. Fail the script early with an appropriate error > message, if it was invoked with erroneous configuration settings. > > Change message "Dom0 kernel is not specified, continue with dom0less setup." > to "Dom0 kernel is not specified, continue with true dom0less setup." > to refer more accurately to a dom0less setup without dom0. > > Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Ayan Kumar Halder <ayankuma@amd.com> > --- > README.md | 1 + > scripts/uboot-script-gen | 21 ++++++++++++++------- > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/README.md b/README.md > index 17ff206..cb15ca5 100644 > --- a/README.md > +++ b/README.md > @@ -100,6 +100,7 @@ Where: > been specified in XEN_PASSTHROUGH_PATHS. > > - DOM0_KERNEL specifies the Dom0 kernel file to load. > + For dom0less configurations, the parameter is optional. > > - DOM0_MEM specifies the amount of memory for Dom0 VM in MB. The default > is 1024. This is only applicable when XEN_CMD is not specified. > diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen > index e85c6ec..085e29f 100755 > --- a/scripts/uboot-script-gen > +++ b/scripts/uboot-script-gen > @@ -410,6 +410,20 @@ function find_root_dev() > > function xen_config() > { > + if test -z "$DOM0_KERNEL" > + then > + if test "$NUM_DOMUS" -eq "0" > + then > + echo "Neither dom0 or domUs are specified, exiting." > + exit 1 > + elif test "$DOM0_MEM" || test "$DOM0_VCPUS" || test "$DOM0_COLORS" || test "$DOM0_CMD" || test "$DOM0_RAMDISK" || test "$DOM0_ROOTFS" > + then > + echo "For dom0less configuration without dom0, no dom0 specific parameters should be specified, exiting." > + exit 1 > + fi > + echo "Dom0 kernel is not specified, continue with true dom0less setup." > + fi > + > if [ -z "$XEN_CMD" ] > then > if [ -z "$DOM0_MEM" ] > @@ -457,13 +471,6 @@ function xen_config() > fi > if test -z "$DOM0_KERNEL" > then > - if test "$NUM_DOMUS" -eq "0" > - then > - echo "Neither dom0 or domUs are specified, exiting." > - exit 1 > - fi > - echo "Dom0 kernel is not specified, continue with dom0less setup." > - unset DOM0_RAMDISK > # Remove dom0 specific parameters from the XEN command line. > local params=($XEN_CMD) > XEN_CMD="${params[@]/dom0*/}"
On Sun, 26 Jun 2022, Xenia Ragiadakou wrote: > Before enabling true dom0less configuration, the script was failing instantly > if DOM0_KERNEL parameter was not specified. This behaviour has changed and > this needs to be communicated to the user. > > Mention in README.md that for dom0less configurations, the parameter > DOM0_KERNEL is optional. > > If DOM0_KERNEL is not set, check that no other dom0 specific parameters are > specified by the user. Fail the script early with an appropriate error > message, if it was invoked with erroneous configuration settings. > > Change message "Dom0 kernel is not specified, continue with dom0less setup." > to "Dom0 kernel is not specified, continue with true dom0less setup." > to refer more accurately to a dom0less setup without dom0. > > Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > README.md | 1 + > scripts/uboot-script-gen | 21 ++++++++++++++------- > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/README.md b/README.md > index 17ff206..cb15ca5 100644 > --- a/README.md > +++ b/README.md > @@ -100,6 +100,7 @@ Where: > been specified in XEN_PASSTHROUGH_PATHS. > > - DOM0_KERNEL specifies the Dom0 kernel file to load. > + For dom0less configurations, the parameter is optional. > > - DOM0_MEM specifies the amount of memory for Dom0 VM in MB. The default > is 1024. This is only applicable when XEN_CMD is not specified. > diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen > index e85c6ec..085e29f 100755 > --- a/scripts/uboot-script-gen > +++ b/scripts/uboot-script-gen > @@ -410,6 +410,20 @@ function find_root_dev() > > function xen_config() > { > + if test -z "$DOM0_KERNEL" > + then > + if test "$NUM_DOMUS" -eq "0" > + then > + echo "Neither dom0 or domUs are specified, exiting." > + exit 1 > + elif test "$DOM0_MEM" || test "$DOM0_VCPUS" || test "$DOM0_COLORS" || test "$DOM0_CMD" || test "$DOM0_RAMDISK" || test "$DOM0_ROOTFS" > + then > + echo "For dom0less configuration without dom0, no dom0 specific parameters should be specified, exiting." > + exit 1 > + fi > + echo "Dom0 kernel is not specified, continue with true dom0less setup." > + fi > + > if [ -z "$XEN_CMD" ] > then > if [ -z "$DOM0_MEM" ] > @@ -457,13 +471,6 @@ function xen_config() > fi > if test -z "$DOM0_KERNEL" > then > - if test "$NUM_DOMUS" -eq "0" > - then > - echo "Neither dom0 or domUs are specified, exiting." > - exit 1 > - fi > - echo "Dom0 kernel is not specified, continue with dom0less setup." > - unset DOM0_RAMDISK > # Remove dom0 specific parameters from the XEN command line. > local params=($XEN_CMD) > XEN_CMD="${params[@]/dom0*/}" > -- > 2.34.1 >
diff --git a/README.md b/README.md index 17ff206..cb15ca5 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,7 @@ Where: been specified in XEN_PASSTHROUGH_PATHS. - DOM0_KERNEL specifies the Dom0 kernel file to load. + For dom0less configurations, the parameter is optional. - DOM0_MEM specifies the amount of memory for Dom0 VM in MB. The default is 1024. This is only applicable when XEN_CMD is not specified. diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index e85c6ec..085e29f 100755 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -410,6 +410,20 @@ function find_root_dev() function xen_config() { + if test -z "$DOM0_KERNEL" + then + if test "$NUM_DOMUS" -eq "0" + then + echo "Neither dom0 or domUs are specified, exiting." + exit 1 + elif test "$DOM0_MEM" || test "$DOM0_VCPUS" || test "$DOM0_COLORS" || test "$DOM0_CMD" || test "$DOM0_RAMDISK" || test "$DOM0_ROOTFS" + then + echo "For dom0less configuration without dom0, no dom0 specific parameters should be specified, exiting." + exit 1 + fi + echo "Dom0 kernel is not specified, continue with true dom0less setup." + fi + if [ -z "$XEN_CMD" ] then if [ -z "$DOM0_MEM" ] @@ -457,13 +471,6 @@ function xen_config() fi if test -z "$DOM0_KERNEL" then - if test "$NUM_DOMUS" -eq "0" - then - echo "Neither dom0 or domUs are specified, exiting." - exit 1 - fi - echo "Dom0 kernel is not specified, continue with dom0less setup." - unset DOM0_RAMDISK # Remove dom0 specific parameters from the XEN command line. local params=($XEN_CMD) XEN_CMD="${params[@]/dom0*/}"
Before enabling true dom0less configuration, the script was failing instantly if DOM0_KERNEL parameter was not specified. This behaviour has changed and this needs to be communicated to the user. Mention in README.md that for dom0less configurations, the parameter DOM0_KERNEL is optional. If DOM0_KERNEL is not set, check that no other dom0 specific parameters are specified by the user. Fail the script early with an appropriate error message, if it was invoked with erroneous configuration settings. Change message "Dom0 kernel is not specified, continue with dom0less setup." to "Dom0 kernel is not specified, continue with true dom0less setup." to refer more accurately to a dom0less setup without dom0. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> --- README.md | 1 + scripts/uboot-script-gen | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-)