Rename virDomainFSInfoFormat() to qemuAgentFSInfoFormat() to follow the naming scheme in qemu_agent.c. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_driver.c | 2 +- src/hypervisor/qemu_agent.c | 2 +- src/hypervisor/qemu_agent.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index f1ec781173..c46c04f458 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -2359,7 +2359,7 @@ bhyveDomainGetFSInfo(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - ret = virDomainFSInfoFormat(agentinfo, nfs, vm->def, info); + ret = qemuAgentFSInfoFormat(agentinfo, nfs, vm->def, info); endjob: virDomainObjEndJob(vm); diff --git a/src/hypervisor/qemu_agent.c b/src/hypervisor/qemu_agent.c index 927aa5e10e..e549947fbf 100644 --- a/src/hypervisor/qemu_agent.c +++ b/src/hypervisor/qemu_agent.c @@ -2651,7 +2651,7 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfo *agent, * -1 otherwise */ int -virDomainFSInfoFormat(qemuAgentFSInfo **agentinfo, +qemuAgentFSInfoFormat(qemuAgentFSInfo **agentinfo, int nagentinfo, virDomainDef *vmdef, virDomainFSInfoPtr **info) diff --git a/src/hypervisor/qemu_agent.h b/src/hypervisor/qemu_agent.h index 2ed1e040be..3dbc3baec1 100644 --- a/src/hypervisor/qemu_agent.h +++ b/src/hypervisor/qemu_agent.h @@ -197,7 +197,7 @@ int qemuAgentGetLoadAvg(qemuAgent *agent, double *load15m, bool report_unsupported); -int virDomainFSInfoFormat(qemuAgentFSInfo **agentinfo, +int qemuAgentFSInfoFormat(qemuAgentFSInfo **agentinfo, int nagentinfo, virDomainDef *vmdef, virDomainFSInfoPtr **info); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f4c392d893..0aad60fed7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1714,6 +1714,7 @@ qemuAgentArbitraryCommand; qemuAgentClose; qemuAgentDiskInfoFree; qemuAgentFSFreeze; +qemuAgentFSInfoFormat; qemuAgentFSInfoFree; qemuAgentFSThaw; qemuAgentFSTrim; @@ -1740,7 +1741,6 @@ qemuAgentSSHGetAuthorizedKeys; qemuAgentSSHRemoveAuthorizedKeys; qemuAgentSuspend; qemuAgentUpdateCPUInfo; -virDomainFSInfoFormat; # hypervisor/virclosecallbacks.h virCloseCallbacksDomainAdd; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 99c3d9a4ae..58b68a6e2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18794,7 +18794,7 @@ qemuDomainGetFSInfo(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - ret = virDomainFSInfoFormat(agentinfo, nfs, vm->def, info); + ret = qemuAgentFSInfoFormat(agentinfo, nfs, vm->def, info); endjob: virDomainObjEndJob(vm); -- 2.52.0