libvirt/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml

<domain type='xen' id='15'>
  <name>pvtest</name>
  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
  <bootloader>/usr/bin/pygrub</bootloader>
  <bootloader_args>-q</bootloader_args>
 <os>
    <type>linux</type>
    <cmdline>xenfb.video=8,1280,1024</cmdline>
  </os>
  <memory unit='KiB'>430080</memory>
  <vcpu>2</vcpu>
  <on_poweroff>destroy</on_poweroff>
  <on_reboot>destroy</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
    <disk type='file' device='disk'>
      <source file='/root/some.img'/>
      <target dev='xvda'/>
    </disk>
    <console tty='/dev/pts/4'/>
  </devices>
</domain>
Do not drop kernel cmdline for xen pv domains 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 2011-07-07 01:17:16 +00:00			`<domain type='xen' id='15'>`
			`<name>pvtest</name>`
			`<uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>`
			`<bootloader>/usr/bin/pygrub</bootloader>`
			`<bootloader_args>-q</bootloader_args>`
			`<os>`
			`<type>linux</type>`
			`<cmdline>xenfb.video=8,1280,1024</cmdline>`
			`</os>`
xml: output memory unit for clarity Make it obvious to 'dumpxml' readers what unit we are using, since our default of KiB for memory (1024) differs from qemu's default of MiB; and differs from our use of bytes for storage. Tests were updated via: $ find tests/data tests/out -name '.xml' \| \ xargs sed -i 's/<\(memory\\|currentMemory\\|hard_limit\\|soft_limit\\|min_guarantee\\|swap_hard_limit\)>/<\1 unit='"'KiB'>/" $ find tests/data tests/out -name '.xml' \| \ xargs sed -i 's/<\(capacity\\|allocation\\|available\)>/<\1 unit='"'bytes'>/" followed by a few fixes for the stragglers. Note that with this patch, the RNG for <memory> still forbids validation of anything except unit='KiB', since the code silently ignores the attribute; a later patch will expand <memory> to allow scaled input in the code and update the RNG to match. * docs/schemas/basictypes.rng (unit): Add 'bytes'. (scaledInteger): New define. * docs/schemas/storagevol.rng (sizing): Use it. * docs/schemas/storagepool.rng (sizing): Likewise. * docs/schemas/domaincommon.rng (memoryKBElement): New define; use for memory elements. * src/conf/storage_conf.c (virStoragePoolDefFormat) (virStorageVolDefFormat): Likewise. * src/conf/domain_conf.h (_virDomainDef): Document unit used internally. * src/conf/storage_conf.h (_virStoragePoolDef, _virStorageVolDef): Likewise. * tests/data/.xml: Update all tests. * tests/out/.xml: Likewise. * tests/define-dev-segfault: Likewise. * tests/openvzutilstest.c (testReadNetworkConf): Likewise. * tests/qemuargv2xmltest.c (blankProblemElements): Likewise. 2012-02-23 00:48:38 +00:00			`<memory unit='KiB'>430080</memory>`
Do not drop kernel cmdline for xen pv domains 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 2011-07-07 01:17:16 +00:00			`<vcpu>2</vcpu>`
			`<on_poweroff>destroy</on_poweroff>`
			`<on_reboot>destroy</on_reboot>`
			`<on_crash>destroy</on_crash>`
			`<devices>`
			`<disk type='file' device='disk'>`
			`<source file='/root/some.img'/>`
			`<target dev='xvda'/>`
			`</disk>`
			`<console tty='/dev/pts/4'/>`
			`</devices>`
			`</domain>`