mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-13 00:46:03 -06:00
vbox: factor a large function
* src/vbox/vbox_tmpl.c (vboxDomainCreateWithFlags): Split... (vboxStartMachine): ...into new helper.
This commit is contained in:
parent
4aaf0bbe60
commit
bee2ad895e
@ -3144,56 +3144,11 @@ cleanup:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
|
||||
|
||||
static int
|
||||
vboxStartMachine(virDomainPtr dom, int i, IMachine *machine, vboxIID *iid)
|
||||
{
|
||||
VBOX_OBJECT_CHECK(dom->conn, int, -1);
|
||||
IMachine **machines = NULL;
|
||||
IProgress *progress = NULL;
|
||||
PRUint32 machineCnt = 0;
|
||||
PRUnichar *env = NULL;
|
||||
PRUnichar *sessionType = NULL;
|
||||
char displayutf8[32] = {0};
|
||||
unsigned char iidl[VIR_UUID_BUFLEN] = {0};
|
||||
nsresult rc;
|
||||
int i = 0;
|
||||
|
||||
virCheckFlags(0, -1);
|
||||
|
||||
if (!dom->name) {
|
||||
vboxError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("Error while reading the domain name"));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines);
|
||||
if (NS_FAILED(rc)) {
|
||||
vboxError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Could not get list of machines, rc=%08x"), (unsigned)rc);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
for (i = 0; i < machineCnt; ++i) {
|
||||
IMachine *machine = machines[i];
|
||||
PRBool isAccessible = PR_FALSE;
|
||||
|
||||
if (!machine)
|
||||
continue;
|
||||
|
||||
machine->vtbl->GetAccessible(machine, &isAccessible);
|
||||
if (isAccessible) {
|
||||
vboxIID *iid = NULL;
|
||||
|
||||
machine->vtbl->GetId(machine, &iid);
|
||||
if (!iid)
|
||||
continue;
|
||||
vboxIIDToUUID(iidl, iid);
|
||||
|
||||
if (memcmp(dom->uuid, iidl, VIR_UUID_BUFLEN) == 0) {
|
||||
PRUint32 state = MachineState_Null;
|
||||
machine->vtbl->GetState(machine, &state);
|
||||
|
||||
if ( (state == MachineState_PoweredOff) ||
|
||||
(state == MachineState_Saved) ||
|
||||
(state == MachineState_Aborted) ) {
|
||||
int vrdpPresent = 0;
|
||||
int sdlPresent = 0;
|
||||
int guiPresent = 0;
|
||||
@ -3205,6 +3160,11 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
|
||||
PRUnichar *keyDislpayUtf16 = NULL;
|
||||
PRUnichar *valueDisplayUtf16 = NULL;
|
||||
char *valueDisplayUtf8 = NULL;
|
||||
IProgress *progress = NULL;
|
||||
char displayutf8[32] = {0};
|
||||
PRUnichar *env = NULL;
|
||||
PRUnichar *sessionType = NULL;
|
||||
nsresult rc;
|
||||
|
||||
VBOX_UTF8_TO_UTF16("FRONTEND/Type", &keyTypeUtf16);
|
||||
machine->vtbl->GetExtraData(machine, keyTypeUtf16, &valueTypeUtf16);
|
||||
@ -3217,7 +3177,8 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
|
||||
if ( STREQ(valueTypeUtf8, "sdl") || STREQ(valueTypeUtf8, "gui") ) {
|
||||
|
||||
VBOX_UTF8_TO_UTF16("FRONTEND/Display", &keyDislpayUtf16);
|
||||
machine->vtbl->GetExtraData(machine, keyDislpayUtf16, &valueDisplayUtf16);
|
||||
machine->vtbl->GetExtraData(machine, keyDislpayUtf16,
|
||||
&valueDisplayUtf16);
|
||||
VBOX_UTF16_FREE(keyDislpayUtf16);
|
||||
|
||||
if (valueDisplayUtf16) {
|
||||
@ -3340,6 +3301,59 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
|
||||
|
||||
data->vboxSession->vtbl->Close(data->vboxSession);
|
||||
|
||||
VBOX_UTF16_FREE(env);
|
||||
VBOX_UTF16_FREE(sessionType);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
|
||||
VBOX_OBJECT_CHECK(dom->conn, int, -1);
|
||||
IMachine **machines = NULL;
|
||||
PRUint32 machineCnt = 0;
|
||||
unsigned char iidl[VIR_UUID_BUFLEN] = {0};
|
||||
nsresult rc;
|
||||
int i = 0;
|
||||
|
||||
virCheckFlags(0, -1);
|
||||
|
||||
if (!dom->name) {
|
||||
vboxError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("Error while reading the domain name"));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
rc = data->vboxObj->vtbl->GetMachines(data->vboxObj, &machineCnt, &machines);
|
||||
if (NS_FAILED(rc)) {
|
||||
vboxError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Could not get list of machines, rc=%08x"), (unsigned)rc);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
for (i = 0; i < machineCnt; ++i) {
|
||||
IMachine *machine = machines[i];
|
||||
PRBool isAccessible = PR_FALSE;
|
||||
|
||||
if (!machine)
|
||||
continue;
|
||||
|
||||
machine->vtbl->GetAccessible(machine, &isAccessible);
|
||||
if (isAccessible) {
|
||||
vboxIID *iid = NULL;
|
||||
|
||||
machine->vtbl->GetId(machine, &iid);
|
||||
if (!iid)
|
||||
continue;
|
||||
vboxIIDToUUID(iidl, iid);
|
||||
|
||||
if (memcmp(dom->uuid, iidl, VIR_UUID_BUFLEN) == 0) {
|
||||
PRUint32 state = MachineState_Null;
|
||||
machine->vtbl->GetState(machine, &state);
|
||||
|
||||
if ( (state == MachineState_PoweredOff) ||
|
||||
(state == MachineState_Saved) ||
|
||||
(state == MachineState_Aborted) ) {
|
||||
ret = vboxStartMachine(dom, i, machine, iid);
|
||||
} else {
|
||||
vboxError(VIR_ERR_OPERATION_FAILED, "%s",
|
||||
_("machine is not in poweroff|saved|"
|
||||
@ -3357,9 +3371,6 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
|
||||
for (i = 0; i < machineCnt; ++i)
|
||||
VBOX_RELEASE(machines[i]);
|
||||
|
||||
VBOX_UTF16_FREE(env);
|
||||
VBOX_UTF16_FREE(sessionType);
|
||||
|
||||
cleanup:
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user