mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 14:15:28 +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>
32 lines
736 B
INI
32 lines
736 B
INI
name = "XenGuest2"
|
|
uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
|
|
maxmem = 579
|
|
memory = 394
|
|
vcpus = 1
|
|
pae = 1
|
|
acpi = 1
|
|
apic = 1
|
|
hap = 0
|
|
viridian = 0
|
|
rtc_timeoffset = 0
|
|
localtime = 0
|
|
on_poweroff = "destroy"
|
|
on_reboot = "restart"
|
|
on_crash = "restart"
|
|
device_model = "/usr/lib/xen/bin/qemu-system-i386"
|
|
sdl = 0
|
|
vnc = 1
|
|
vncunused = 1
|
|
vnclisten = "127.0.0.1"
|
|
vncpasswd = "123poi"
|
|
vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
|
|
parallel = "none"
|
|
serial = "none"
|
|
builder = "hvm"
|
|
kernel = "/tmp/vmlinuz"
|
|
ramdisk = "/tmp/initrd"
|
|
cmdline = "ignore_loglvl"
|
|
extra = "SHOULD BE IGNORED"
|
|
boot = "d"
|
|
disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ]
|