[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 1/3] docs, conf: add support for bootmenu timeout



On 08/22/2014 09:09 AM, Martin Kletzander wrote:
> Signed-off-by: Martin Kletzander <mkletzan redhat com>
> ---
>  docs/formatdomain.html.in                          |  7 +++++-
>  docs/schemas/domaincommon.rng                      |  5 ++++
>  src/conf/domain_conf.c                             | 21 ++++++++++++++--
>  src/conf/domain_conf.h                             |  2 ++
>  ...qemuxml2argv-boot-menu-disable-with-timeout.xml | 29 ++++++++++++++++++++++
>  ...2argv-boot-menu-enable-with-timeout-invalid.xml | 29 ++++++++++++++++++++++
>  .../qemuxml2argv-boot-menu-enable-with-timeout.xml | 29 ++++++++++++++++++++++
>  tests/qemuxml2argvtest.c                           |  1 +
>  ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 29 ++++++++++++++++++++++
>  tests/qemuxml2xmltest.c                            |  2 ++
>  10 files changed, 151 insertions(+), 3 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml
>  create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml

> @@ -158,6 +158,11 @@
>        startup. The <code>enable</code> attribute can be either "yes" or "no".
>        If not specified, the hypervisor default is used. <span class="since">
>        Since 0.8.3</span>
> +      Additional attribute <code>timeout</code> takes the number of milliseconds
> +      the boot menu should wait until it times out.  Allowed values are numbers
> +      in range [0, 65535] inclusive and it is valid if and only if the previous
> +      <code>enable</code> is set to "yes".

You know, it is possible to have RelaxNG enforce this restriction:

> +      <span class="since"> Since 1.2.8</span>
>        </dd>
>        <dt><code>smbios</code></dt>
>        <dd>How to populate SMBIOS information visible in the guest.
> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> index 033f2f6..9a89dd8 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -259,6 +259,11 @@
          <element name="bootmenu">
            <attribute name="enable">
              <choice>
                <value>yes</value>
>                  <value>no</value>
>                </choice>
>              </attribute>
> +            <optional>
> +              <attribute name="timeout">
> +                <ref name="unsignedShort"/>
> +              </attribute>
> +            </optional>

would instead be:

<element name="bootmenu">
  <choice>
    <attribute name="enable">
      <value>no</value>
    </attribute>
    <group>
      <attribute name="enable">
        <value>yes</value>
      </attribute>
      <optional>
        <attribute name="timeout">
          <ref name="unsignedShort"/>
        </attribute>
      </optional>
    </group>
  </choice>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]