External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-19 14:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: do not use deprecated options for new virtiofsd

Browse Source 
Use the to-be-introduced virtiofsd capability to mark whether
new options are safe to use.

Depends on:
https://gitlab.com/virtio-fs/virtiofsd/-/merge_requests/231

https://issues.redhat.com/browse/RHEL-7108

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2024-07-04 15:54:29 +02:00
parent 730eaafaac
commit 8dc04cafec
1 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/qemu/qemu_virtiofs.c
View File

@ -139,36 +139,67 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg,
virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
*fd = -1;
virCommandAddArg(cmd, "-o");
virBufferAddLit(&opts, "source=");
virQEMUBuildBufferEscapeComma(&opts, fs->src->path);
if (fs->cache)
virBufferAsprintf(&opts, ",cache=%s", virDomainFSCacheModeTypeToString(fs->cache));
if (fs->sandbox)
virBufferAsprintf(&opts, ",sandbox=%s", virDomainFSSandboxModeTypeToString(fs->sandbox));
if (virBitmapIsBitSet(fs->caps, QEMU_VHOST_USER_FS_FEATURE_SEPARATE_OPTIONS)) {
/* Note that this option format is used by the Rust version of the daemon
* since v1.0.0, which is way longer than the capability existed.
* The -o style of options can be removed once we bump the minimal
* QEMU version to 8.0.0, which dropped the C virtiofsd daemon */
virCommandAddArg(cmd, "--shared-dir");
virCommandAddArg(cmd, fs->src->path);
if (fs->xattr == VIR_TRISTATE_SWITCH_ON)
virBufferAddLit(&opts, ",xattr");
else if (fs->xattr == VIR_TRISTATE_SWITCH_OFF)
virBufferAddLit(&opts, ",no_xattr");
if (fs->cache) {
virCommandAddArg(cmd, "--cache");
virCommandAddArg(cmd, virDomainFSCacheModeTypeToString(fs->cache));
}
if (fs->sandbox) {
virCommandAddArg(cmd, "--sandbox");
virCommandAddArg(cmd, virDomainFSSandboxModeTypeToString(fs->sandbox));
}
if (fs->flock == VIR_TRISTATE_SWITCH_ON)
virBufferAddLit(&opts, ",flock");
else if (fs->flock == VIR_TRISTATE_SWITCH_OFF)
virBufferAddLit(&opts, ",no_flock");
if (fs->xattr == VIR_TRISTATE_SWITCH_ON)
virCommandAddArg(cmd, "--xattr");
if (fs->posix_lock == VIR_TRISTATE_SWITCH_ON)
virBufferAddLit(&opts, ",posix_lock");
else if (fs->posix_lock == VIR_TRISTATE_SWITCH_OFF)
virBufferAddLit(&opts, ",no_posix_lock");
if (fs->posix_lock != VIR_TRISTATE_SWITCH_ABSENT ||
fs->flock != VIR_TRISTATE_SWITCH_ABSENT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("locking options are not supported by this virtiofsd"));
return NULL;
}
} else {
virCommandAddArg(cmd, "-o");
virBufferAddLit(&opts, "source=");
virQEMUBuildBufferEscapeComma(&opts, fs->src->path);
if (fs->cache)
virBufferAsprintf(&opts, ",cache=%s", virDomainFSCacheModeTypeToString(fs->cache));
if (fs->sandbox)
virBufferAsprintf(&opts, ",sandbox=%s", virDomainFSSandboxModeTypeToString(fs->sandbox));
virCommandAddArgBuffer(cmd, &opts);
if (fs->xattr == VIR_TRISTATE_SWITCH_ON)
virBufferAddLit(&opts, ",xattr");
else if (fs->xattr == VIR_TRISTATE_SWITCH_OFF)
virBufferAddLit(&opts, ",no_xattr");
if (fs->flock == VIR_TRISTATE_SWITCH_ON)
virBufferAddLit(&opts, ",flock");
else if (fs->flock == VIR_TRISTATE_SWITCH_OFF)
virBufferAddLit(&opts, ",no_flock");
if (fs->posix_lock == VIR_TRISTATE_SWITCH_ON)
virBufferAddLit(&opts, ",posix_lock");
else if (fs->posix_lock == VIR_TRISTATE_SWITCH_OFF)
virBufferAddLit(&opts, ",no_posix_lock");
virCommandAddArgBuffer(cmd, &opts);
}
if (fs->thread_pool_size >= 0)
virCommandAddArgFormat(cmd, "--thread-pool-size=%i", fs->thread_pool_size);
if (cfg->virtiofsdDebug)
virCommandAddArg(cmd, "-d");
if (cfg->virtiofsdDebug) {
if (virBitmapIsBitSet(fs->caps, QEMU_VHOST_USER_FS_FEATURE_SEPARATE_OPTIONS))
virCommandAddArgList(cmd, "--log-level", "debug", NULL);
else
virCommandAddArg(cmd, "-d");
}
for (i = 0; i < fs->idmap.nuidmap; i++) {
virCommandAddArgFormat(cmd, "--uid-map=:%u:%u:%u:",