mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
conf: Replace writes to def->vcpus with accessor
This commit is contained in:
parent
d1dda68777
commit
957d597330
@ -1289,7 +1289,7 @@ virDomainDefSetVcpusMax(virDomainDefPtr def,
|
||||
unsigned int maxvcpus)
|
||||
{
|
||||
if (maxvcpus < def->vcpus)
|
||||
def->vcpus = maxvcpus;
|
||||
virDomainDefSetVcpus(def, maxvcpus);
|
||||
|
||||
def->maxvcpus = maxvcpus;
|
||||
|
||||
@ -1311,6 +1311,16 @@ virDomainDefGetVcpusMax(const virDomainDef *def)
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virDomainDefSetVcpus(virDomainDefPtr def,
|
||||
unsigned int vcpus)
|
||||
{
|
||||
def->vcpus = vcpus;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
virDomainDiskDefPtr
|
||||
virDomainDiskDefNew(virDomainXMLOptionPtr xmlopt)
|
||||
{
|
||||
@ -14402,6 +14412,7 @@ virDomainVcpuParse(virDomainDefPtr def,
|
||||
int n;
|
||||
char *tmp = NULL;
|
||||
unsigned int maxvcpus;
|
||||
unsigned int vcpus;
|
||||
int ret = -1;
|
||||
|
||||
if ((n = virXPathUInt("string(./vcpu[1])", ctxt, &maxvcpus)) < 0) {
|
||||
@ -14417,16 +14428,19 @@ virDomainVcpuParse(virDomainDefPtr def,
|
||||
if (virDomainDefSetVcpusMax(def, maxvcpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if ((n = virXPathUInt("string(./vcpu[1]/@current)", ctxt, &def->vcpus)) < 0) {
|
||||
if ((n = virXPathUInt("string(./vcpu[1]/@current)", ctxt, &vcpus)) < 0) {
|
||||
if (n == -2) {
|
||||
virReportError(VIR_ERR_XML_ERROR, "%s",
|
||||
_("current vcpus count must be an integer"));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
def->vcpus = maxvcpus;
|
||||
vcpus = maxvcpus;
|
||||
}
|
||||
|
||||
if (virDomainDefSetVcpus(def, vcpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (maxvcpus < def->vcpus) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("maxvcpus must not be less than current vcpus "
|
||||
|
@ -2346,6 +2346,7 @@ struct _virDomainDef {
|
||||
int virDomainDefSetVcpusMax(virDomainDefPtr def, unsigned int vcpus);
|
||||
bool virDomainDefHasVcpusOffline(const virDomainDef *def);
|
||||
unsigned int virDomainDefGetVcpusMax(const virDomainDef *def);
|
||||
int virDomainDefSetVcpus(virDomainDefPtr def, unsigned int vcpus);
|
||||
|
||||
unsigned long long virDomainDefGetMemoryInitial(const virDomainDef *def);
|
||||
void virDomainDefSetMemoryTotal(virDomainDefPtr def, unsigned long long size);
|
||||
|
@ -877,7 +877,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
|
||||
processorSettingData->data->VirtualQuantity) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->vcpus = processorSettingData->data->VirtualQuantity;
|
||||
if (virDomainDefSetVcpus(def,
|
||||
processorSettingData->data->VirtualQuantity) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->os.type = VIR_DOMAIN_OSTYPE_HVM;
|
||||
|
||||
/* FIXME: devices section is totally missing */
|
||||
|
@ -232,6 +232,7 @@ virDomainDefParseString;
|
||||
virDomainDefPostParse;
|
||||
virDomainDefSetMemoryInitial;
|
||||
virDomainDefSetMemoryTotal;
|
||||
virDomainDefSetVcpus;
|
||||
virDomainDefSetVcpusMax;
|
||||
virDomainDeleteConfig;
|
||||
virDomainDeviceAddressIsValid;
|
||||
|
@ -555,7 +555,8 @@ libxlAddDom0(libxlDriverPrivatePtr driver)
|
||||
if (virDomainDefSetVcpusMax(vm->def, d_info.vcpu_max_id + 1))
|
||||
goto cleanup;
|
||||
|
||||
vm->def->vcpus = d_info.vcpu_online;
|
||||
if (virDomainDefSetVcpus(vm->def, d_info.vcpu_online) < 0)
|
||||
goto cleanup;
|
||||
vm->def->mem.cur_balloon = d_info.current_memkb;
|
||||
virDomainDefSetMemoryTotal(vm->def, d_info.max_memkb);
|
||||
|
||||
@ -2191,7 +2192,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_VCPU_CONFIG:
|
||||
def->vcpus = nvcpus;
|
||||
if (virDomainDefSetVcpus(def, nvcpus) < 0)
|
||||
goto cleanup;
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_VCPU_LIVE:
|
||||
@ -2201,7 +2203,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
|
||||
" with libxenlight"), vm->def->id);
|
||||
goto endjob;
|
||||
}
|
||||
vm->def->vcpus = nvcpus;
|
||||
if (virDomainDefSetVcpus(vm->def, nvcpus) < 0)
|
||||
goto endjob;
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG:
|
||||
@ -2211,8 +2214,9 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
|
||||
" with libxenlight"), vm->def->id);
|
||||
goto endjob;
|
||||
}
|
||||
vm->def->vcpus = nvcpus;
|
||||
def->vcpus = nvcpus;
|
||||
if (virDomainDefSetVcpus(vm->def, nvcpus) < 0 ||
|
||||
virDomainDefSetVcpus(def, nvcpus) < 0)
|
||||
goto endjob;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1024,7 +1024,8 @@ lxcParseConfigString(const char *config,
|
||||
if (virDomainDefSetVcpusMax(vmdef, 1) < 0)
|
||||
goto error;
|
||||
|
||||
vmdef->vcpus = 1;
|
||||
if (virDomainDefSetVcpus(vmdef, 1) < 0)
|
||||
goto error;
|
||||
|
||||
vmdef->nfss = 0;
|
||||
vmdef->os.type = VIR_DOMAIN_OSTYPE_EXE;
|
||||
|
@ -585,7 +585,8 @@ int openvzLoadDomains(struct openvz_driver *driver)
|
||||
if (virDomainDefSetVcpusMax(def, vcpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->vcpus = vcpus;
|
||||
if (virDomainDefSetVcpus(def, vcpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* XXX load rest of VM config data .... */
|
||||
|
||||
|
@ -1371,7 +1371,9 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
|
||||
if (virDomainDefSetVcpusMax(vm->def, nvcpus) < 0)
|
||||
return -1;
|
||||
|
||||
vm->def->vcpus = nvcpus;
|
||||
if (virDomainDefSetVcpus(vm->def, nvcpus) < 0)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -3298,7 +3298,8 @@ phypDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
|
||||
if (virDomainDefSetVcpusMax(&def, vcpus) < 0)
|
||||
goto err;
|
||||
|
||||
def.vcpus = vcpus;
|
||||
if (virDomainDefSetVcpus(&def, vcpus) < 0)
|
||||
goto err;
|
||||
|
||||
return virDomainDefFormat(&def,
|
||||
virDomainDefFormatConvertXMLFlags(flags));
|
||||
|
@ -12712,6 +12712,7 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
|
||||
unsigned int cores = 0;
|
||||
unsigned int threads = 0;
|
||||
unsigned int maxcpus = 0;
|
||||
unsigned int vcpus = 0;
|
||||
size_t i;
|
||||
int nkws;
|
||||
char **kws;
|
||||
@ -12726,9 +12727,8 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
|
||||
for (i = 0; i < nkws; i++) {
|
||||
if (vals[i] == NULL) {
|
||||
if (i > 0 ||
|
||||
virStrToLong_i(kws[i], &end, 10, &n) < 0 || *end != '\0')
|
||||
virStrToLong_ui(kws[i], &end, 10, &vcpus) < 0 || *end != '\0')
|
||||
goto syntax;
|
||||
dom->vcpus = n;
|
||||
} else {
|
||||
if (virStrToLong_i(vals[i], &end, 10, &n) < 0 || *end != '\0')
|
||||
goto syntax;
|
||||
@ -12746,11 +12746,14 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
|
||||
}
|
||||
|
||||
if (maxcpus == 0)
|
||||
maxcpus = dom->vcpus;
|
||||
maxcpus = vcpus;
|
||||
|
||||
if (virDomainDefSetVcpusMax(dom, maxcpus) < 0)
|
||||
goto error;
|
||||
|
||||
if (virDomainDefSetVcpus(dom, vcpus) < 0)
|
||||
goto error;
|
||||
|
||||
if (sockets && cores && threads) {
|
||||
virCPUDefPtr cpu;
|
||||
|
||||
@ -12865,7 +12868,8 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
|
||||
virDomainDefSetMemoryTotal(def, def->mem.cur_balloon);
|
||||
if (virDomainDefSetVcpusMax(def, 1) < 0)
|
||||
goto error;
|
||||
def->vcpus = 1;
|
||||
if (virDomainDefSetVcpus(def, 1) < 0)
|
||||
goto error;
|
||||
def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
|
||||
|
||||
def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
|
||||
|
@ -4835,8 +4835,9 @@ qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
|
||||
cleanup:
|
||||
VIR_FREE(cpupids);
|
||||
VIR_FREE(mem_mask);
|
||||
if (virDomainObjIsActive(vm))
|
||||
vm->def->vcpus = vcpus;
|
||||
if (virDomainObjIsActive(vm) &&
|
||||
virDomainDefSetVcpus(vm->def, vcpus) < 0)
|
||||
ret = -1;
|
||||
virDomainAuditVcpu(vm, oldvcpus, nvcpus, "update", rc == 1);
|
||||
if (cgroup_vcpu)
|
||||
virCgroupFree(&cgroup_vcpu);
|
||||
@ -4982,7 +4983,8 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
|
||||
if (virDomainDefSetVcpusMax(persistentDef, nvcpus) < 0)
|
||||
goto endjob;
|
||||
} else {
|
||||
persistentDef->vcpus = nvcpus;
|
||||
if (virDomainDefSetVcpus(persistentDef, nvcpus) < 0)
|
||||
goto endjob;
|
||||
}
|
||||
|
||||
if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
|
||||
|
@ -2375,15 +2375,17 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus,
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (def)
|
||||
def->vcpus = nrCpus;
|
||||
if (def &&
|
||||
virDomainDefSetVcpus(def, nrCpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (persistentDef) {
|
||||
if (flags & VIR_DOMAIN_VCPU_MAXIMUM) {
|
||||
if (virDomainDefSetVcpusMax(persistentDef, nrCpus) < 0)
|
||||
goto cleanup;
|
||||
} else {
|
||||
persistentDef->vcpus = nrCpus;
|
||||
if (virDomainDefSetVcpus(persistentDef, nrCpus) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3910,7 +3910,8 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
|
||||
if (virDomainDefSetVcpusMax(def, CPUCount) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->vcpus = CPUCount;
|
||||
if (virDomainDefSetVcpus(def, CPUCount) < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* Skip cpumasklen, cpumask, onReboot, onPoweroff, onCrash */
|
||||
|
||||
@ -6067,7 +6068,8 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
|
||||
if (virDomainDefSetVcpusMax(def->dom, CPUCount) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->dom->vcpus = CPUCount;
|
||||
if (virDomainDefSetVcpus(def->dom, CPUCount) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (vboxSnapshotGetReadWriteDisks(def, snapshot) < 0)
|
||||
VIR_DEBUG("Could not get read write disks for snapshot");
|
||||
|
@ -1461,7 +1461,8 @@ virVMXParseConfig(virVMXContext *ctx,
|
||||
if (virDomainDefSetVcpusMax(def, numvcpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->vcpus = numvcpus;
|
||||
if (virDomainDefSetVcpus(def, numvcpus) < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* vmx:sched.cpu.affinity -> def:cpumask */
|
||||
/* NOTE: maps to VirtualMachine:config.cpuAffinity.affinitySet */
|
||||
|
@ -1153,7 +1153,8 @@ prlsdkConvertCpuInfo(PRL_HANDLE sdkdom,
|
||||
if (virDomainDefSetVcpusMax(def, cpuCount) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->vcpus = cpuCount;
|
||||
if (virDomainDefSetVcpus(def, cpuCount) < 0)
|
||||
goto cleanup;
|
||||
|
||||
pret = PrlVmCfg_GetCpuMask(sdkdom, NULL, &buflen);
|
||||
prlsdkCheckRetGoto(pret, cleanup);
|
||||
|
@ -708,7 +708,8 @@ xenXMDomainSetVcpusFlags(virConnectPtr conn,
|
||||
if (virDomainDefSetVcpusMax(entry->def, vcpus) < 0)
|
||||
goto cleanup;
|
||||
} else {
|
||||
entry->def->vcpus = vcpus;
|
||||
if (virDomainDefSetVcpus(entry->def, vcpus) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/* If this fails, should we try to undo our changes to the
|
||||
|
@ -1505,7 +1505,8 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
|
||||
if (virDomainDefSetVcpusMax(defPtr, vcpus) < 0)
|
||||
goto error;
|
||||
|
||||
defPtr->vcpus = vcpus;
|
||||
if (virDomainDefSetVcpus(defPtr, vcpus) < 0)
|
||||
goto error;
|
||||
|
||||
enum xen_on_normal_exit action;
|
||||
if (xen_vm_get_actions_after_shutdown(session, &action, vm))
|
||||
|
@ -508,7 +508,10 @@ xenParseCPUFeatures(virConfPtr conf, virDomainDefPtr def)
|
||||
if (xenConfigGetULong(conf, "vcpu_avail", &count, -1) < 0)
|
||||
return -1;
|
||||
|
||||
def->vcpus = MIN(count_one_bits_l(count), virDomainDefGetVcpusMax(def));
|
||||
if (virDomainDefSetVcpus(def, MIN(count_one_bits_l(count),
|
||||
virDomainDefGetVcpusMax(def))) < 0)
|
||||
return -1;
|
||||
|
||||
if (xenConfigGetString(conf, "cpus", &str, NULL) < 0)
|
||||
return -1;
|
||||
|
||||
|
@ -1092,6 +1092,7 @@ xenParseSxpr(const struct sexpr *root,
|
||||
const char *tmp;
|
||||
virDomainDefPtr def;
|
||||
int hvm = 0, vmlocaltime;
|
||||
unsigned int vcpus;
|
||||
|
||||
if (!(def = virDomainDefNew()))
|
||||
goto error;
|
||||
@ -1175,9 +1176,13 @@ xenParseSxpr(const struct sexpr *root,
|
||||
|
||||
if (virDomainDefSetVcpusMax(def, sexpr_int(root, "domain/vcpus")) < 0)
|
||||
goto error;
|
||||
def->vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail"));
|
||||
if (!def->vcpus || virDomainDefGetVcpusMax(def) < def->vcpus)
|
||||
def->vcpus = virDomainDefGetVcpusMax(def);
|
||||
|
||||
vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail"));
|
||||
if (!vcpus || virDomainDefGetVcpusMax(def) < vcpus)
|
||||
vcpus = virDomainDefGetVcpusMax(def);
|
||||
|
||||
if (virDomainDefSetVcpus(def, vcpus) < 0)
|
||||
goto error;
|
||||
|
||||
tmp = sexpr_node(root, "domain/on_poweroff");
|
||||
if (tmp != NULL) {
|
||||
|
Loading…
Reference in New Issue
Block a user