External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: set boot from disk for CT only when there is no root filesystem

Browse Source 
Before, boot devices information for CTs was always empty and we
didn't indicate that containers can boot from disk.

Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>
This commit is contained in:
Maxim Nestratov 2016-12-05 16:11:15 +03:00
parent 8c9252aa6d
commit 7eda8369fc
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vz/vz_sdk.c
View File

@ -1695,8 +1695,23 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex,
return ret; return ret;
} }
static void
prlsdkConvertBootOrderCt(virDomainDefPtr def)
{
size_t i;
for (i = 0; i < def->nfss; i++) {
if (STREQ(def->fss[i]->dst, "/")) {
def->os.nBootDevs = 0;
return;
}
}
def->os.nBootDevs = 1;
def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK;
}
static int static int
prlsdkConvertBootOrder(PRL_HANDLE sdkdom, virDomainDefPtr def) prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def)
{ {
int ret = -1; int ret = -1;
PRL_RESULT pret; PRL_RESULT pret;
@ -1855,8 +1870,12 @@ prlsdkLoadDomain(vzDriverPtr driver,
goto error; goto error;
/* depends on prlsdkAddDomainHardware */ /* depends on prlsdkAddDomainHardware */
if (prlsdkConvertBootOrder(sdkdom, def) < 0) if (IS_CT(def)) {
goto error; prlsdkConvertBootOrderCt(def);
} else {
if (prlsdkConvertBootOrderVm(sdkdom, def) < 0)
goto error;
}
pret = PrlVmCfg_GetEnvId(sdkdom, &envId); pret = PrlVmCfg_GetEnvId(sdkdom, &envId);
prlsdkCheckRetGoto(pret, error); prlsdkCheckRetGoto(pret, error);