NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Drop @iid from UISession::OpenExisting()

Browse Source 
The @iid argument of UISession::OpenExisting() 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:49:29 +01:00
parent 22073dfc58
commit d983405ea2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/vbox/vbox_common.c
View File

@ -570,7 +570,7 @@ vboxDomainSave(virDomainPtr dom, const char *path G_GNUC_UNUSED)
if (openSessionForMachine(data, dom->uuid, &iid, &machine) < 0) if (openSessionForMachine(data, dom->uuid, &iid, &machine) < 0)
goto cleanup; goto cleanup;
rc = gVBoxAPI.UISession.OpenExisting(data, &iid, machine); rc = gVBoxAPI.UISession.OpenExisting(data, machine);
if (NS_FAILED(rc)) if (NS_FAILED(rc))
goto cleanup; goto cleanup;
@ -2436,7 +2436,7 @@ static int vboxDomainSuspend(virDomainPtr dom)
if (gVBoxAPI.machineStateChecker.Running(state)) { if (gVBoxAPI.machineStateChecker.Running(state)) {
/* set state pause */ /* set state pause */
gVBoxAPI.UISession.OpenExisting(data, &iid, machine); gVBoxAPI.UISession.OpenExisting(data, machine);
gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
if (console) { if (console) {
gVBoxAPI.UIConsole.Pause(console); gVBoxAPI.UIConsole.Pause(console);
@ -2487,7 +2487,7 @@ static int vboxDomainResume(virDomainPtr dom)
if (gVBoxAPI.machineStateChecker.Paused(state)) { if (gVBoxAPI.machineStateChecker.Paused(state)) {
/* resume the machine here */ /* resume the machine here */
gVBoxAPI.UISession.OpenExisting(data, &iid, machine); gVBoxAPI.UISession.OpenExisting(data, machine);
gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
if (console) { if (console) {
gVBoxAPI.UIConsole.Resume(console); gVBoxAPI.UIConsole.Resume(console);
@ -2548,7 +2548,7 @@ static int vboxDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
goto cleanup; goto cleanup;
} }
gVBoxAPI.UISession.OpenExisting(data, &iid, machine); gVBoxAPI.UISession.OpenExisting(data, machine);
gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
if (console) { if (console) {
gVBoxAPI.UIConsole.PowerButton(console); gVBoxAPI.UIConsole.PowerButton(console);
@ -2596,7 +2596,7 @@ static int vboxDomainReboot(virDomainPtr dom, unsigned int flags)
gVBoxAPI.UIMachine.GetState(machine, &state); gVBoxAPI.UIMachine.GetState(machine, &state);
if (gVBoxAPI.machineStateChecker.Running(state)) { if (gVBoxAPI.machineStateChecker.Running(state)) {
gVBoxAPI.UISession.OpenExisting(data, &iid, machine); gVBoxAPI.UISession.OpenExisting(data, machine);
gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
if (console) { if (console) {
gVBoxAPI.UIConsole.Reset(console); gVBoxAPI.UIConsole.Reset(console);
@ -2649,7 +2649,7 @@ static int vboxDomainDestroyFlags(virDomainPtr dom, unsigned int flags)
goto cleanup; goto cleanup;
} }
gVBoxAPI.UISession.OpenExisting(data, &iid, machine); gVBoxAPI.UISession.OpenExisting(data, machine);
gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
if (console) { if (console) {
gVBoxAPI.UIConsole.PowerDown(console); gVBoxAPI.UIConsole.PowerDown(console);
@ -4234,7 +4234,7 @@ vboxDomainAttachDeviceImpl(virDomainPtr dom,
if (gVBoxAPI.machineStateChecker.Running(state) || if (gVBoxAPI.machineStateChecker.Running(state) ||
gVBoxAPI.machineStateChecker.Paused(state)) { gVBoxAPI.machineStateChecker.Paused(state)) {
rc = gVBoxAPI.UISession.OpenExisting(data, &iid, machine); rc = gVBoxAPI.UISession.OpenExisting(data, machine);
} else { } else {
rc = gVBoxAPI.UISession.Open(data, machine); rc = gVBoxAPI.UISession.Open(data, machine);
} }
@ -4353,7 +4353,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml)
if (gVBoxAPI.machineStateChecker.Running(state) || if (gVBoxAPI.machineStateChecker.Running(state) ||
gVBoxAPI.machineStateChecker.Paused(state)) { gVBoxAPI.machineStateChecker.Paused(state)) {
rc = gVBoxAPI.UISession.OpenExisting(data, &iid, machine); rc = gVBoxAPI.UISession.OpenExisting(data, machine);
} else { } else {
rc = gVBoxAPI.UISession.Open(data, machine); rc = gVBoxAPI.UISession.Open(data, machine);
} }
@ -5404,7 +5404,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom,
} }
if (gVBoxAPI.machineStateChecker.Online(state)) { if (gVBoxAPI.machineStateChecker.Online(state)) {
rc = gVBoxAPI.UISession.OpenExisting(data, &domiid, machine); rc = gVBoxAPI.UISession.OpenExisting(data, machine);
} else { } else {
rc = gVBoxAPI.UISession.Open(data, machine); rc = gVBoxAPI.UISession.Open(data, machine);
} }
@ -7305,7 +7305,7 @@ vboxDomainScreenshot(virDomainPtr dom,
} }
rc = gVBoxAPI.UISession.OpenExisting(data, &iid, machine); rc = gVBoxAPI.UISession.OpenExisting(data, machine);
if (NS_SUCCEEDED(rc)) { if (NS_SUCCEEDED(rc)) {
rc = gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); rc = gVBoxAPI.UISession.GetConsole(data->vboxSession, &console);
if (NS_SUCCEEDED(rc) && console) { if (NS_SUCCEEDED(rc) && console) {
@ -7722,7 +7722,7 @@ vboxDomainSendKey(virDomainPtr dom,
if (openSessionForMachine(data, dom->uuid, &iid, &machine) < 0) if (openSessionForMachine(data, dom->uuid, &iid, &machine) < 0)
goto cleanup; goto cleanup;
rc = gVBoxAPI.UISession.OpenExisting(data, &iid, machine); rc = gVBoxAPI.UISession.OpenExisting(data, machine);
if (NS_FAILED(rc)) { if (NS_FAILED(rc)) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,

2
src/vbox/vbox_tmpl.c
View File

@ -1067,7 +1067,7 @@ _sessionOpen(struct _vboxDriver *data, IMachine *machine)
} }
static nsresult static nsresult
_sessionOpenExisting(struct _vboxDriver *data, vboxIID *iid G_GNUC_UNUSED, IMachine *machine) _sessionOpenExisting(struct _vboxDriver *data, IMachine *machine)
{ {
return machine->vtbl->LockMachine(machine, data->vboxSession, LockType_Shared); return machine->vtbl->LockMachine(machine, data->vboxSession, LockType_Shared);
} }

2
src/vbox/vbox_uniformed_api.h
View File

@ -228,7 +228,7 @@ typedef struct {
/* Functions for ISession */ /* Functions for ISession */
typedef struct { typedef struct {
nsresult (*Open)(struct _vboxDriver *driver, IMachine *machine); nsresult (*Open)(struct _vboxDriver *driver, IMachine *machine);
nsresult (*OpenExisting)(struct _vboxDriver *driver, vboxIID *iid, IMachine *machine); nsresult (*OpenExisting)(struct _vboxDriver *driver, IMachine *machine);
nsresult (*GetConsole)(ISession *session, IConsole **console); nsresult (*GetConsole)(ISession *session, IConsole **console);
nsresult (*GetMachine)(ISession *session, IMachine **machine); nsresult (*GetMachine)(ISession *session, IMachine **machine);
nsresult (*Close)(ISession *session); nsresult (*Close)(ISession *session);