1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00

virtiofs: rename member to 'openfiles' for clarity

New element 'openfiles' had confusing name. Since the patch with
this new element wasn't propagate yet, old name ('rlimit_nofile')
was changed.

...
<binary>
  <openfiles max='122333'/>
</binary>
...

Signed-off-by: Adam Julis <ajulis@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Adam Julis 2024-07-23 14:47:58 +02:00 committed by Michal Privoznik
parent ce9c9e315f
commit b53e9f834b
10 changed files with 18 additions and 18 deletions

View File

@ -3734,10 +3734,10 @@ A directory on the host that can be accessed directly from the guest.
The thread pool helps increase the number of requests in flight when used with
storage that has a higher latency. However, it has an overhead, and so for
fast, low latency filesystems, it may be best to turn it off. ( :since:`Since 8.5.0` )
Element ``rlimit_profile`` accepts one attribute ``size`` which defines the
Element ``openfiles`` accepts one attribute ``max`` which defines the
maximum number of file descriptors. Non-positive values are forbidden.
Although numbers greater than 1M are allowed, the virtiofsd documentation
states that in this case its set by virtiofsd to the 1M. ( :since:`Since 10.6.0` )
The upper bound on the number of open files is implementation defined.
( :since:`Since 10.6.0` )
``source``
The resource on the host that is being accessed in the guest. The ``name``
attribute must be used with ``type='template'``, and the ``dir`` attribute

View File

@ -8868,7 +8868,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
g_autofree char *queue_size = virXPathString("string(./driver/@queue)", ctxt);
g_autofree char *binary = virXPathString("string(./binary/@path)", ctxt);
g_autofree char *thread_pool_size = virXPathString("string(./binary/thread_pool/@size)", ctxt);
g_autofree char *rlimit_nofile = virXPathString("string(./binary/rlimit_nofile/@size)", ctxt);
g_autofree char *openfiles = virXPathString("string(./binary/openfiles/@max)", ctxt);
xmlNodePtr binary_node = virXPathNode("./binary", ctxt);
xmlNodePtr binary_lock_node = virXPathNode("./binary/lock", ctxt);
xmlNodePtr binary_cache_node = virXPathNode("./binary/cache", ctxt);
@ -8892,11 +8892,11 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
goto error;
}
if (rlimit_nofile &&
virStrToLong_ull(rlimit_nofile, NULL, 10, &def->rlimit_nofile) < 0) {
if (openfiles &&
virStrToLong_ull(openfiles, NULL, 10, &def->openfiles) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("cannot parse rlimit_nofile '%1$s' for virtiofs"),
rlimit_nofile);
_("cannot parse openfiles '%1$s' for virtiofs"),
openfiles);
goto error;
}
@ -23424,8 +23424,8 @@ virDomainFSDefFormat(virBuffer *buf,
if (def->thread_pool_size >= 0)
virBufferAsprintf(&binaryBuf, "<thread_pool size='%d'/>\n", def->thread_pool_size);
if (def->rlimit_nofile > 0)
virBufferAsprintf(&binaryBuf, "<rlimit_nofile size='%lld'/>\n", def->rlimit_nofile);
if (def->openfiles > 0)
virBufferAsprintf(&binaryBuf, "<openfiles max='%lld'/>\n", def->openfiles);
}

View File

@ -890,7 +890,7 @@ struct _virDomainFSDef {
bool symlinksResolved;
char *binary;
unsigned long long queue_size;
unsigned long long rlimit_nofile;
unsigned long long openfiles;
virTristateSwitch xattr;
virDomainFSCacheMode cache;
virTristateSwitch posix_lock;

View File

@ -3381,9 +3381,9 @@
</element>
</optional>
<optional>
<element name="rlimit_nofile">
<element name="openfiles">
<optional>
<attribute name="size">
<attribute name="max">
<data type="positiveInteger"/>
</attribute>
</optional>

View File

@ -194,8 +194,8 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg,
if (fs->thread_pool_size >= 0)
virCommandAddArgFormat(cmd, "--thread-pool-size=%i", fs->thread_pool_size);
if (fs->rlimit_nofile > 0)
virCommandAddArgFormat(cmd, "--rlimit-nofile=%llu", fs->rlimit_nofile);
if (fs->openfiles > 0)
virCommandAddArgFormat(cmd, "--rlimit-nofile=%llu", fs->openfiles);
if (cfg->virtiofsdDebug) {
if (virBitmapIsBitSet(fs->caps, QEMU_VHOST_USER_FS_FEATURE_SEPARATE_OPTIONS))

View File

@ -0,0 +1 @@
vhost-user-fs-fd-openfiles.xml

View File

@ -32,7 +32,7 @@
<cache mode='always'/>
<sandbox mode='chroot'/>
<thread_pool size='16'/>
<rlimit_nofile size='122333'/>
<openfiles max='122333'/>
</binary>
<idmap>
<uid start='0' target='100000' count='65535'/>

View File

@ -1 +0,0 @@
vhost-user-fs-fd-rlimit.xml

View File

@ -2816,7 +2816,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("launch-security-s390-pv", "s390x");
DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory");
DO_TEST_CAPS_LATEST("vhost-user-fs-fd-rlimit");
DO_TEST_CAPS_LATEST("vhost-user-fs-fd-openfiles");
DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-readonly");