Fix starting of xen domains without a PVFB console by removing default emulator

This commit is contained in:
Daniel P. Berrange
2008-09-05 11:52:12 +00:00
parent f193e19536
commit 126d3ebeea
12 changed files with 79 additions and 48 deletions

View File

@@ -623,6 +623,8 @@ static int lxcControllerStart(virConnectPtr conn,
int status;
fd_set keepfd;
char appPtyStr[30];
const char *emulator;
lxc_driver_t *driver = conn->privateData;
FD_ZERO(&keepfd);
@@ -650,7 +652,13 @@ static int lxcControllerStart(virConnectPtr conn,
snprintf(appPtyStr, sizeof(appPtyStr), "%d", appPty);
ADD_ARG_LIT(vm->def->emulator);
emulator = vm->def->emulator;
if (!emulator)
emulator = virDomainDefDefaultEmulator(conn, vm->def, driver->caps);
if (!emulator)
return -1;
ADD_ARG_LIT(emulator);
ADD_ARG_LIT("--name");
ADD_ARG_LIT(vm->def->name);
ADD_ARG_LIT("--console");