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

Martin Kletzander mkletzan at redhat.com
Mon Aug 25 16:09:53 UTC 2014


On Mon, Aug 25, 2014 at 09:48:17AM -0600, Eric Blake wrote:
>On 08/22/2014 09:09 AM, Martin Kletzander wrote:
>> Signed-off-by: Martin Kletzander <mkletzan at 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:
>

Yes, but I wanted it to be just ignored if enable="no".  There are, of
course, other options, like keeping it there, but not using it or
leaving what it does on qemu.  I gues I could add "otherwise it gets
ignored" at the end of the sentence.  Should I do that, change the
behaviour or add the checks (and adjust tests of course)?  It needs a
follow-up, though since I already pushed it thanks to Jan's ACK.

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140825/27a7870c/attachment-0001.sig>


More information about the libvir-list mailing list