From 541e9304f67035a641e8949a4453b96056e31d3e Mon Sep 17 00:00:00 2001
From: Junjie Mao <junjie.mao@intel.com>
Date: Thu, 23 Jun 2022 13:22:39 +0800
Subject: [PATCH] config_tools: remove minOccurs from items that have default
 values

With the default population stage today, the `default` and `minOccurs=0`
attributes are typically mutually exclusive:

  * A config item with a `default` attribute is guaranteed to exist after
    populating default values, making the `minOccurs` attribute meaningless.

  * A config item with a `minOccurs=0` attribute allows that item not to be
    present even after default values are populated.

This patch removes the `minOccurs=0` attributes from some config items that have
their default values recently added. This allows the default value populator to
fill in those items as expected if a user does not provide them explicitly.

Tracked-On: #6690
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
---
 misc/config_tools/schema/VMtypes.xsd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd
index e0c825f1d..101f77c87 100644
--- a/misc/config_tools/schema/VMtypes.xsd
+++ b/misc/config_tools/schema/VMtypes.xsd
@@ -133,7 +133,7 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
         <xs:documentation>Select the kernel image type so that the hypervisor can load it correctly.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="kern_mod" type="xs:string" default="Linux_bzImage" minOccurs="0">
+    <xs:element name="kern_mod" type="xs:string" default="Linux_bzImage">
       <xs:annotation acrn:title="Kernel module tag"
                      acrn:widget-options="'placeholder': 'An arbitrary string without white spaces. The same string shall be appended, in grub.conf, to the GRUB module containing the OS kernel.'">
         <xs:documentation>Specify the tag for the kernel image that is used as a multiboot module. The tag's spelling must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentation>
@@ -145,7 +145,7 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
         <xs:documentation>Specify the tag for the RAMdisk image that is used as a multiboot module. The tag's spelling must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="bootargs" type="xs:string" default="rw rootwait root=/dev/nvme0n1p2 console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072" minOccurs="0">
+    <xs:element name="bootargs" type="xs:string" default="rw rootwait root=/dev/nvme0n1p2 console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072">
       <xs:annotation acrn:title="Kernel command-line parameters"
                      acrn:widget-options="'placeholder': '(Optional) The command line options to be passed to the OS kernel.'">
         <xs:documentation>Specify the command-line parameters that will be used to boot the kernel for this VM. See `Linux documentation &lt;https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html&gt;`__ for a list of parameters.</xs:documentation>
@@ -360,13 +360,13 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
 
 <xs:complexType name="VirtioConsoleConfiguration">
   <xs:all>
-    <xs:element name="use_type" type="VirtioConsoleUseType" default="Virtio console" minOccurs="0">
+    <xs:element name="use_type" type="VirtioConsoleUseType" default="Virtio console">
       <xs:annotation acrn:title="Use type">
         <xs:documentation>Specify device type in guest, ether HVC console when user config it as virtio console or /dev/vportXpY
 device file when user config it as virtio serial port, which can be read and written from the user space.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="backend_type" type="VirtioConsoleBackendType" default="stdio" minOccurs="0">
+    <xs:element name="backend_type" type="VirtioConsoleBackendType" default="stdio">
       <xs:annotation acrn:title="Backend type">
         <xs:documentation>Specify backend device type in service VM.</xs:documentation>
       </xs:annotation>