shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-27 07:22:07 +03:00
Code Releases Activity
71a390e0fd
libvirt/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml

52 lines
1.6 KiB
XML
Raw Normal View History

xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<domain type='xen' id='3'>
<name>fvtest</name>
<uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
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 04:48:38 +04:00
<memory unit='KiB'>409600</memory>
<currentMemory unit='KiB'>409600</currentMemory>
numad: Always output 'placement' of <vcpu> <vcpu> is not an optional node. The value for its 'placement' actually always defaults to 'static' in the underlying codes. (Even no 'cpuset' and 'placement' is specified, the domain process will be pinned to all the available pCPUs).
2012-05-08 20:04:36 +04:00
<vcpu placement='static'>1</vcpu>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<os>
<type>hvm</type>
conf: Extend <loader/> and introduce <nvram/> Up to now, users can configure BIOS via the <loader/> element. With the upcoming implementation of UEFI this is not enough as BIOS and UEFI are conceptually different. For instance, while BIOS is ROM, UEFI is programmable flash (although all writes to code section are denied). Therefore we need new attribute @type which will differentiate the two. Then, new attribute @readonly is introduced to reflect the fact that some images are RO. Moreover, the OVMF (which is going to be used mostly), works in two modes: 1) Code and UEFI variable store is mixed in one file. 2) Code and UEFI variable store is separated in two files The latter has advantage of updating the UEFI code without losing the configuration. However, in order to represent the latter case we need yet another XML element: <nvram/>. Currently, it has no additional attributes, it's just a bare element containing path to the variable store file. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Acked-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-08-06 15:18:53 +04:00
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<boot dev='cdrom'/>
</os>
<features>
<acpi/>
</features>
Xen: tests: use latest XEND_CONFIG_VERSION in sexpr2xml tests Change all sexpr2xml tests to use the latest XEND_CONFIG_VERSION (XEND_CONFIG_VERSION_3_1_0 = 4). Fix tests that do not conform to the latest version. Signed-off-by: Jim Fehlig <jfehlig@suse.com>
2015-12-10 07:15:07 +03:00
<clock offset='variable' adjustment='0' basis='utc'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
tests: Xen: use qemu-system-i386 for emulator Many of the old xm and sexpr test files used qemu-dm as the emulator. Modern Xen systems no longer use the old, forked qemu-dm, instead preferring the distro provided qemu or an "upstream" qemu that is built when the Xen tools are built. This qemu is typically installed in /usr/lib/xen/bin/qemu-system-i386. The libxl test files already use /usr/lib/xen/bin/qemu-system-i386. For consistency, change the old test files to use the same emulator Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2018-04-11 19:38:14 +03:00
<emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<disk type='file' device='disk'>
tests: move sexpr2xml tests to WITH_LIBXL In preparation of removing the legacy Xen driver, move the sexpr2xml tests from WITH_XEN to WITH_LIBXL. Even though the legacy driver will be removed, we'll want to maintain the ability to convert sexpr to XML. Requires fixing up the tests to account for different behavior of Xen vs libxl post parse functions. There is some test file fallout due to differences in handling of default values between xend and libxl. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2016-12-28 02:19:43 +03:00
<driver name='file' type='raw'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<source file='/root/foo.img'/>
<target dev='hda' bus='ide'/>
xen: use virDomainDefPostParse for parsing XM/XL/SEXPR cofings This change ensures to call driver specific post-parse code to modify domain definition after parsing hypervisor config the same way we do after parsing XML. Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
2015-11-28 07:33:55 +03:00
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
</disk>
<disk type='file' device='cdrom'>
tests: move sexpr2xml tests to WITH_LIBXL In preparation of removing the legacy Xen driver, move the sexpr2xml tests from WITH_XEN to WITH_LIBXL. Even though the legacy driver will be removed, we'll want to maintain the ability to convert sexpr to XML. Requires fixing up the tests to account for different behavior of Xen vs libxl post parse functions. There is some test file fallout due to differences in handling of default values between xend and libxl. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2016-12-28 02:19:43 +03:00
<driver name='file' type='raw'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<source file='/root/boot.iso'/>
<target dev='hdc' bus='ide'/>
<readonly/>
xen: use virDomainDefPostParse for parsing XM/XL/SEXPR cofings This change ensures to call driver specific post-parse code to modify domain definition after parsing hypervisor config the same way we do after parsing XML. Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
2015-11-28 07:33:55 +03:00
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
</disk>
domain: add implicit controllers from post parse Seems like the natural fit, since we are already adding other XML bits in the PostParse routine. Previously AddImplicitControllers was only called at the end of XML parsing, meaning code that builds a DomainDef by hand had to manually call it. Now those PostParse callers get it for free. There's some test churn here; xen xm and sexpr test suite bits weren't calling this before, but now they are, so you'll see new IDE controllers. I don't think this will cause problems in practice, since the code already needs to handle these implicit controllers like in the case when a user defines their own XML.
2016-01-08 06:49:57 +03:00
<controller type='ide' index='0'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>
<script path='vif-bridge'/>
<target dev='vif3.0'/>
</interface>
<input type='mouse' bus='ps2'/>
conf: Add keyboard input device type There is no keyboard support currently in libvirt. For some platforms (PPC64 QEMU) this makes graphics unusable, since the keyboard is not implicit and it can't be added via libvirt. Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
2014-02-17 14:17:53 +04:00
<input type='keyboard' bus='ps2'/>
graphics: make address attribute for listen type='address' optional We support omitting listen attribute of graphics element so we should also support omitting address attribute of listen element. This patch also updates libvirt to always add a listen element into domain XML except for VNC graphics if socket attribute is specified. Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
2016-05-09 16:50:54 +03:00
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
tests: fix xen-related tests My commit 6879be4 moved the addition of the implicit video device from the XML parser to the PostParse function, but did not regenerate all the tests.
2016-04-12 15:58:43 +03:00
<video>
tests: move sexpr2xml tests to WITH_LIBXL In preparation of removing the legacy Xen driver, move the sexpr2xml tests from WITH_XEN to WITH_LIBXL. Even though the legacy driver will be removed, we'll want to maintain the ability to convert sexpr to XML. Requires fixing up the tests to account for different behavior of Xen vs libxl post parse functions. There is some test file fallout due to differences in handling of default values between xend and libxl. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2016-12-28 02:19:43 +03:00
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
tests: fix xen-related tests My commit 6879be4 moved the addition of the implicit video device from the XML parser to the PostParse function, but did not regenerate all the tests.
2016-04-12 15:58:43 +03:00
</video>
libxl: add support for memballoon device All Xen PV and HVM with PV driver support a memory balloon device, which cannot be disabled through the toolstack. Model the device in the libxl driver, similar to the recently removed xend-based driver. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-04-10 03:15:17 +03:00
<memballoon model='xen'/>
xen_xs: Guard against set but empty kernel argument On xen 4.1 I observed configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an empty <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting.
2011-10-10 20:22:44 +04:00
</devices>
</domain>
Copy Permalink