External/libvirt
1
0
Fork 0
Code

vbox: Drop @iid from UIMachine::LaunchVMProcess()

Browse Source 
The @iid argument of UIMachine::LaunchVMProcess() callback is
unused. Drop it and also its propagation from parent functions.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2023-01-22 12:30:02 +01:00
parent ee383c7126
commit 8bf9fc0032
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vbox/vbox_common.c
View File

@ -2046,7 +2046,7 @@ static int vboxDomainUndefine(virDomainPtr dom)
} }
static int static int
vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid) vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine)
{ {
struct _vboxDriver *data = dom->conn->privateData; struct _vboxDriver *data = dom->conn->privateData;
int vrdpPresent = 0; int vrdpPresent = 0;
@ -2148,7 +2148,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid
VBOX_UTF8_TO_UTF16("vrdp", &sessionType); VBOX_UTF8_TO_UTF16("vrdp", &sessionType);
} }
rc = gVBoxAPI.UIMachine.LaunchVMProcess(data, machine, iid, rc = gVBoxAPI.UIMachine.LaunchVMProcess(data, machine,
sessionType, env, sessionType, env,
&progress); &progress);
@ -2239,7 +2239,7 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
gVBoxAPI.UIMachine.GetState(machine, &state); gVBoxAPI.UIMachine.GetState(machine, &state);
if (gVBoxAPI.machineStateChecker.NotStart(state)) { if (gVBoxAPI.machineStateChecker.NotStart(state)) {
ret = vboxStartMachine(dom, i, machine, &iid); ret = vboxStartMachine(dom, i, machine);
} else { } else {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("machine is not in " _("machine is not in "

1
src/vbox/vbox_tmpl.c
View File

@ -747,7 +747,6 @@ _machineRemoveSharedFolder(IMachine *machine, PRUnichar *name)
static nsresult static nsresult
_machineLaunchVMProcess(struct _vboxDriver *data, _machineLaunchVMProcess(struct _vboxDriver *data,
IMachine *machine, IMachine *machine,
vboxIID *iid G_GNUC_UNUSED,
PRUnichar *sessionType, PRUnichar *env, PRUnichar *sessionType, PRUnichar *env,
IProgress **progress) IProgress **progress)
{ {

1
src/vbox/vbox_uniformed_api.h
View File

@ -182,7 +182,6 @@ typedef struct {
PRBool automount); PRBool automount);
nsresult (*RemoveSharedFolder)(IMachine *machine, PRUnichar *name); nsresult (*RemoveSharedFolder)(IMachine *machine, PRUnichar *name);
nsresult (*LaunchVMProcess)(struct _vboxDriver *driver, IMachine *machine, nsresult (*LaunchVMProcess)(struct _vboxDriver *driver, IMachine *machine,
vboxIID *iid,
PRUnichar *sessionType, PRUnichar *env, PRUnichar *sessionType, PRUnichar *env,
IProgress **progress); IProgress **progress);
nsresult (*Unregister)(IMachine *machine, PRUint32 cleanupMode, nsresult (*Unregister)(IMachine *machine, PRUint32 cleanupMode,