External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: virtiofs: open a separate connection to virtlogd

Browse Source 
Do not depend on passing a logManager. Create a new connection.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2021-10-06 11:33:08 +02:00
parent 131361f6bc
commit 7add201508
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_extdevice.c
View File

@ -166,7 +166,7 @@ qemuExtDevicesCleanupHost(virQEMUDriver *driver,
int
qemuExtDevicesStart(virQEMUDriver *driver,
virDomainObj *vm,
virLogManager *logManager,
virLogManager *logManager G_GNUC_UNUSED,
bool incomingMigration)
{
virDomainDef *def = vm->def;
@ -197,7 +197,7 @@ qemuExtDevicesStart(virQEMUDriver *driver,
virDomainFSDef *fs = def->fss[i];
if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && !fs->sock) {
if (qemuVirtioFSStart(logManager, driver, vm, fs) < 0)
if (qemuVirtioFSStart(driver, vm, fs) < 0)
return -1;
}
}

8
src/qemu/qemu_virtiofs.c
View File

@ -157,8 +157,7 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg,
}
int
qemuVirtioFSStart(virLogManager *logManager,
virQEMUDriver *driver,
qemuVirtioFSStart(virQEMUDriver *driver,
virDomainObj *vm,
virDomainFSDef *fs)
{
@ -191,6 +190,11 @@ qemuVirtioFSStart(virLogManager *logManager,
logpath = qemuVirtioFSCreateLogFilename(cfg, vm->def, fs->info.alias);
if (cfg->stdioLogD) {
g_autoptr(virLogManager) logManager = virLogManagerNew(driver->privileged);
if (!logManager)
goto cleanup;
if ((logfd = virLogManagerDomainOpenLogFile(logManager,
"qemu",
vm->def->uuid,

3
src/qemu/qemu_virtiofs.h
View File

@ -27,8 +27,7 @@ qemuVirtioFSCreateSocketFilename(virDomainObj *vm,
const char *alias);
int
qemuVirtioFSStart(virLogManager *logManager,
virQEMUDriver *driver,
qemuVirtioFSStart(virQEMUDriver *driver,
virDomainObj *vm,
virDomainFSDef *fs);
void