On 07/07/2011 05:37 PM, Jim Fehlig wrote:
> Jim Fehlig wrote:
>> Kernel cmdline args can be passed to xen pv domains even when a
>> bootloader is specified. The current config-to-sxpr mapping
>> ignores cmdline when bootloader is present.
>>
>> Since the xend sub-driver is used with many xen toolstack versions,
>> this patch takes conservative approach of adding an else block to
>> existing !def->os.bootloader, and only appends sxpr if def->os.cmdline
>> is non-NULL.
>>
>> V2: Fix existing testcase broken by this patch and add new testcases
>>
>
> Hmm, now domainschematest is failing
>
> on these two xml files. If I'm reading domain.rng correctly, kernel must
> be specified?? Can it be optional like initrd and cmdline?
Reading domain_conf.c agrees with that interpretation. I would be fine
with you squashing this in:
diff --git i/docs/schemas/domain.rng w/docs/schemas/domain.rng
index c01801e..b659da9 100644
--- i/docs/schemas/domain.rng
+++ w/docs/schemas/domain.rng
@@ -553,9 +553,11 @@
</define>
<define name="osbootkernel">
<interleave>
- <element name="kernel">
- <ref name="absFilePath"/>
- </element>
+ <optional>
+ <element name="kernel">
+ <ref name="absFilePath"/>
+ </element>
+ </optional>
<optional>
<element name="initrd">
<ref name="absFilePath"/>
ACK, once you fix that and address Matthias' comment about spacing in
the .xml file:
>> + <cmdline> xenfb.video=8,1280,1024 </cmdline>
--
Eric Blake eblake@xxxxxxxxxx +1-801-349-2682
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list