mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-06 09:55:46 +00:00
daeace5c5d
... and consolidate the cmdline/extra/root parsing to facilitate doing
so.
The logic is the same as xl's parse_cmdline from the current xen.git master
branch (e6f0e099d2c17de47fd86e817b1998db903cab61).
On the formatting side switch to producing cmdline= instead of extra=.
Update a few tests and add serveral more.
- test-cmdline is added to test the exclusive use of cmdline.
- test-fullvirt-direct-kernel-boot.cfg is updated due to the switch
on the formatting side and now tests the exclusive use of cmdline=.
- Tests are added for both paravirt and fullvirt where the .cfg uses
extra= and (paravirt only) root=. These are format (xl->xml) only
since the inverse will generate cmdline= hence is not a round trip
(which was already true if using root=, which used to generate
extra= on the way back).
- Tests are added for both paravirt and fullvirt where the .cfg
declares cmdline= as well as bogus extra= and (paravirt only) root=
entries which should be ignored. Again these are format only tests
since the inverse won't include the bogus lines.
The last two bullets here required splitting the DO_TEST macro into
two halves, as is done in the xmconfigtest.c case.
In order to introduce a use of VIR_WARN for logging I had to add
virerror.h and VIR_LOG_INIT.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
33 lines
987 B
XML
33 lines
987 B
XML
<domain type='xen'>
|
|
<name>XenGuest2</name>
|
|
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
|
|
<memory unit='KiB'>592896</memory>
|
|
<currentMemory unit='KiB'>403456</currentMemory>
|
|
<vcpu placement='static'>1</vcpu>
|
|
<os>
|
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
|
<kernel>/tmp/vmlinuz</kernel>
|
|
<initrd>/tmp/initrd</initrd>
|
|
<cmdline>root=/dev/xvda1 console=hvc0</cmdline>
|
|
</os>
|
|
<clock offset='utc' adjustment='reset'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>restart</on_crash>
|
|
<devices>
|
|
<disk type='file' device='disk'>
|
|
<driver name='qemu' type='raw'/>
|
|
<source file='/dev/HostVG/XenGuest2'/>
|
|
<target dev='xvda' bus='xen'/>
|
|
</disk>
|
|
<interface type='bridge'>
|
|
<mac address='00:16:3e:66:92:9c'/>
|
|
<source bridge='xenbr1'/>
|
|
<script path='vif-bridge'/>
|
|
</interface>
|
|
<console type='pty'>
|
|
<target type='xen' port='0'/>
|
|
</console>
|
|
</devices>
|
|
</domain>
|