shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

xenconfig: Add support for max_grant_frames

Browse Source 
Add support in the domXML<->native config converter for
max_grant_frames. Include a test for the conversion.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Jim Fehlig 2019-03-08 11:51:57 -07:00
parent ec5a11910d
commit 5a64c202cc
4 changed files with 105 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/xenconfig/xen_xl.c
View File

@ -607,6 +607,34 @@ xenParseXLVnuma(virConfPtr conf,
}
#endif
#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
static int
xenParseXLGntLimits(virConfPtr conf, virDomainDefPtr def)
{
unsigned long max_gntframes;
int ctlr_idx;
virDomainControllerDefPtr xenbus_ctlr;
if (xenConfigGetULong(conf, "max_grant_frames", &max_gntframes, 0) < 0)
return -1;
if (max_gntframes <= 0)
return 0;
ctlr_idx = virDomainControllerFindByType(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS);
if (ctlr_idx == -1)
xenbus_ctlr = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS, -1, -1);
else
xenbus_ctlr = def->controllers[ctlr_idx];
if (xenbus_ctlr == NULL)
return -1;
xenbus_ctlr->opts.xenbusopts.maxGrantFrames = max_gntframes;
return 0;
}
#endif
static int
xenParseXLDiskSrc(virDomainDiskDefPtr disk, char *srcstr)
{
@ -1165,6 +1193,11 @@ xenParseXL(virConfPtr conf,
goto cleanup;
#endif
#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
if (xenParseXLGntLimits(conf, def) < 0)
goto cleanup;
#endif
if (xenParseXLCPUID(conf, def) < 0)
goto cleanup;
@ -1517,6 +1550,24 @@ xenFormatXLDomainVnuma(virConfPtr conf,
}
#endif
#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
static int
xenFormatXLGntLimits(virConfPtr conf, virDomainDefPtr def)
{
size_t i;
for (i = 0; i < def->ncontrollers; i++) {
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_XENBUS &&
def->controllers[i]->opts.xenbusopts.maxGrantFrames > 0) {
if (xenConfigSetInt(conf, "max_grant_frames",
def->controllers[i]->opts.xenbusopts.maxGrantFrames) < 0)
return -1;
}
}
return 0;
}
#endif
static char *
xenFormatXLDiskSrcNet(virStorageSourcePtr src)
{
@ -2166,6 +2217,11 @@ xenFormatXL(virDomainDefPtr def, virConnectPtr conn)
goto cleanup;
#endif
#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
if (xenFormatXLGntLimits(conf, def) < 0)
goto cleanup;
#endif
if (xenFormatXLDomainDisks(conf, def) < 0)
goto cleanup;

13
tests/xlconfigdata/test-max-gntframes.cfg Normal file
View File

@ -0,0 +1,13 @@
name = "XenGuest1"
uuid = "45b60f51-88a9-47a8-a3b3-5e66d71b2283"
maxmem = 512
memory = 512
vcpus = 1
localtime = 0
on_poweroff = "preserve"
on_reboot = "restart"
on_crash = "preserve"
vif = [ "mac=5a:36:0e:be:00:09" ]
bootloader = "/usr/bin/pygrub"
max_grant_frames = 64
disk = [ "format=qcow2,vdev=xvda,access=rw,backendtype=qdisk,target=/var/lib/xen/images/debian/disk.qcow2" ]

32
tests/xlconfigdata/test-max-gntframes.xml Normal file
View File

@ -0,0 +1,32 @@
<domain type='xen'>
<name>XenGuest1</name>
<uuid>45b60f51-88a9-47a8-a3b3-5e66d71b2283</uuid>
<memory unit='KiB'>524288</memory>
<currentMemory unit='KiB'>524288</currentMemory>
<vcpu placement='static'>1</vcpu>
<bootloader>/usr/bin/pygrub</bootloader>
<os>
<type arch='x86_64' machine='xenpv'>linux</type>
</os>
<clock offset='utc' adjustment='reset'/>
<on_poweroff>preserve</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>preserve</on_crash>
<devices>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/var/lib/xen/images/debian/disk.qcow2'/>
<target dev='xvda' bus='xen'/>
</disk>
<controller type='xenbus' index='0' maxGrantFrames='64'/>
<interface type='ethernet'>
<mac address='5a:36:0e:be:00:09'/>
</interface>
<console type='pty'>
<target type='xen' port='0'/>
</console>
<input type='mouse' bus='xen'/>
<input type='keyboard' bus='xen'/>
<memballoon model='xen'/>
</devices>
</domain>

4
tests/xlconfigtest.c
View File

@ -299,6 +299,10 @@ mymain(void)
DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra", false);
DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra", false);
#endif
#ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
DO_TEST("max-gntframes");
#endif
DO_TEST("vif-typename");
DO_TEST("vif-multi-ip");
DO_TEST("usb");