191 lines
5.6 KiB
Diff
191 lines
5.6 KiB
Diff
commit a93f55c53d83ec63fe703db38cb519465b1d2445
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Tue Apr 7 17:15:04 2020 -0600
|
|
|
|
libxl: Add support for max_event_channels
|
|
|
|
Add support for setting event_channels in libxl domain config object and
|
|
include a test to check that it is properly converted from XML to libxl
|
|
domain config.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
Index: libvirt-6.2.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-6.2.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-6.2.0/src/libxl/libxl_conf.c
|
|
@@ -380,13 +380,17 @@ libxlMakeDomBuildInfo(virDomainDefPtr de
|
|
b_info->max_memkb = virDomainDefGetMemoryInitial(def);
|
|
b_info->target_memkb = def->mem.cur_balloon;
|
|
|
|
-#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
|
|
for (i = 0; i < def->ncontrollers; i++) {
|
|
- if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_XENBUS &&
|
|
- def->controllers[i]->opts.xenbusopts.maxGrantFrames > 0)
|
|
- b_info->max_grant_frames = def->controllers[i]->opts.xenbusopts.maxGrantFrames;
|
|
- }
|
|
+ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_XENBUS) {
|
|
+ if (def->controllers[i]->opts.xenbusopts.maxEventChannels > 0)
|
|
+ b_info->event_channels = def->controllers[i]->opts.xenbusopts.maxEventChannels;
|
|
+
|
|
+#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
|
|
+ if (def->controllers[i]->opts.xenbusopts.maxGrantFrames > 0)
|
|
+ b_info->max_grant_frames = def->controllers[i]->opts.xenbusopts.maxGrantFrames;
|
|
#endif
|
|
+ }
|
|
+ }
|
|
|
|
if (hvm || pvh) {
|
|
if (caps &&
|
|
Index: libvirt-6.2.0/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-6.2.0/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
|
|
@@ -0,0 +1,90 @@
|
|
+{
|
|
+ "c_info": {
|
|
+ "type": "hvm",
|
|
+ "name": "test-hvm",
|
|
+ "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b"
|
|
+ },
|
|
+ "b_info": {
|
|
+ "max_vcpus": 4,
|
|
+ "avail_vcpus": [
|
|
+ 0,
|
|
+ 1,
|
|
+ 2,
|
|
+ 3
|
|
+ ],
|
|
+ "max_memkb": 1048576,
|
|
+ "target_memkb": 1048576,
|
|
+ "video_memkb": 8192,
|
|
+ "shadow_memkb": 12288,
|
|
+ "event_channels": 2047,
|
|
+ "device_model_version": "qemu_xen",
|
|
+ "device_model": "/bin/true",
|
|
+ "sched_params": {
|
|
+
|
|
+ },
|
|
+ "type.hvm": {
|
|
+ "pae": "True",
|
|
+ "apic": "True",
|
|
+ "acpi": "True",
|
|
+ "vga": {
|
|
+ "kind": "cirrus"
|
|
+ },
|
|
+ "vnc": {
|
|
+ "enable": "True",
|
|
+ "listen": "0.0.0.0",
|
|
+ "findunused": "False"
|
|
+ },
|
|
+ "sdl": {
|
|
+ "enable": "False"
|
|
+ },
|
|
+ "spice": {
|
|
+
|
|
+ },
|
|
+ "boot": "c",
|
|
+ "rdm": {
|
|
+
|
|
+ }
|
|
+ },
|
|
+ "arch_arm": {
|
|
+
|
|
+ }
|
|
+ },
|
|
+ "disks": [
|
|
+ {
|
|
+ "pdev_path": "/var/lib/xen/images/test-hvm.img",
|
|
+ "vdev": "hda",
|
|
+ "backend": "qdisk",
|
|
+ "format": "raw",
|
|
+ "removable": 1,
|
|
+ "readwrite": 1
|
|
+ }
|
|
+ ],
|
|
+ "nics": [
|
|
+ {
|
|
+ "devid": 0,
|
|
+ "mac": "00:16:3e:66:12:b4",
|
|
+ "bridge": "br0",
|
|
+ "script": "/etc/xen/scripts/vif-bridge",
|
|
+ "nictype": "vif_ioemu"
|
|
+ }
|
|
+ ],
|
|
+ "vfbs": [
|
|
+ {
|
|
+ "devid": -1,
|
|
+ "vnc": {
|
|
+ "enable": "True",
|
|
+ "listen": "0.0.0.0",
|
|
+ "findunused": "False"
|
|
+ },
|
|
+ "sdl": {
|
|
+ "enable": "False"
|
|
+ }
|
|
+ }
|
|
+ ],
|
|
+ "vkbs": [
|
|
+ {
|
|
+ "devid": -1
|
|
+ }
|
|
+ ],
|
|
+ "on_reboot": "restart"
|
|
+}
|
|
Index: libvirt-6.2.0/tests/libxlxml2domconfigdata/max-eventchannels-hvm.xml
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ libvirt-6.2.0/tests/libxlxml2domconfigdata/max-eventchannels-hvm.xml
|
|
@@ -0,0 +1,37 @@
|
|
+<domain type='xen'>
|
|
+ <name>test-hvm</name>
|
|
+ <description>None</description>
|
|
+ <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid>
|
|
+ <memory>1048576</memory>
|
|
+ <currentMemory>1048576</currentMemory>
|
|
+ <vcpu>4</vcpu>
|
|
+ <on_poweroff>destroy</on_poweroff>
|
|
+ <on_reboot>restart</on_reboot>
|
|
+ <on_crash>destroy</on_crash>
|
|
+ <clock offset='utc'/>
|
|
+ <os>
|
|
+ <type>hvm</type>
|
|
+ <loader>/usr/lib/xen/boot/hvmloader</loader>
|
|
+ <boot dev='hd'/>
|
|
+ </os>
|
|
+ <features>
|
|
+ <apic/>
|
|
+ <acpi/>
|
|
+ <pae/>
|
|
+ </features>
|
|
+ <devices>
|
|
+ <emulator>/bin/true</emulator>
|
|
+ <disk type='file' device='disk'>
|
|
+ <driver name='qemu'/>
|
|
+ <source file='/var/lib/xen/images/test-hvm.img'/>
|
|
+ <target dev='hda'/>
|
|
+ </disk>
|
|
+ <controller type='xenbus' maxEventChannels='2047'/>
|
|
+ <interface type='bridge'>
|
|
+ <source bridge='br0'/>
|
|
+ <mac address='00:16:3e:66:12:b4'/>
|
|
+ <script path='/etc/xen/scripts/vif-bridge'/>
|
|
+ </interface>
|
|
+ <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/>
|
|
+ </devices>
|
|
+</domain>
|
|
Index: libvirt-6.2.0/tests/libxlxml2domconfigtest.c
|
|
===================================================================
|
|
--- libvirt-6.2.0.orig/tests/libxlxml2domconfigtest.c
|
|
+++ libvirt-6.2.0/tests/libxlxml2domconfigtest.c
|
|
@@ -202,6 +202,8 @@ mymain(void)
|
|
DO_TEST("max-gntframes-hvm");
|
|
# endif
|
|
|
|
+ DO_TEST("max-eventchannels-hvm");
|
|
+
|
|
unlink("libxl-driver.log");
|
|
|
|
testXLFreeDriver(driver);
|