提交 79306739 编写于 作者: O Osier Yang

qemu: Remove bogus error codes for NUMA memory tuning

This is no code between virSaveLastError and virGetLastError will
set an error, remove the bogus codes.
上级 8e49ade1
...@@ -1251,8 +1251,6 @@ static int ...@@ -1251,8 +1251,6 @@ static int
qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm)
{ {
nodemask_t mask; nodemask_t mask;
virErrorPtr orig_err = NULL;
virErrorPtr err = NULL;
int mode = -1; int mode = -1;
int node = -1; int node = -1;
int ret = -1; int ret = -1;
...@@ -1291,23 +1289,12 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) ...@@ -1291,23 +1289,12 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm)
} }
} }
orig_err = virSaveLastError();
mode = vm->def->numatune.memory.mode; mode = vm->def->numatune.memory.mode;
if (mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { if (mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
numa_set_bind_policy(1); numa_set_bind_policy(1);
numa_set_membind(&mask); numa_set_membind(&mask);
numa_set_bind_policy(0); numa_set_bind_policy(0);
err = virGetLastError();
if ((err && (err->code != orig_err->code)) ||
(err && !orig_err)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to bind memory to specified nodeset: %s"),
err ? err->message : _("unknown error"));
virResetLastError();
goto cleanup;
}
} else if (mode == VIR_DOMAIN_NUMATUNE_MEM_PREFERRED) { } else if (mode == VIR_DOMAIN_NUMATUNE_MEM_PREFERRED) {
int nnodes = 0; int nnodes = 0;
for (i = 0; i < NUMA_NUM_NODES; i++) { for (i = 0; i < NUMA_NUM_NODES; i++) {
...@@ -1326,28 +1313,8 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) ...@@ -1326,28 +1313,8 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm)
numa_set_bind_policy(0); numa_set_bind_policy(0);
numa_set_preferred(node); numa_set_preferred(node);
err = virGetLastError();
if ((err && (err->code != orig_err->code)) ||
(err && !orig_err)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to set memory policy as preferred to specified "
"node: %s"), err ? err->message : _("unknown error"));
virResetLastError();
goto cleanup;
}
} else if (mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE) { } else if (mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE) {
numa_set_interleave_mask(&mask); numa_set_interleave_mask(&mask);
err = virGetLastError();
if ((err && (err->code != orig_err->code)) ||
(err && !orig_err)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to interleave memory to specified nodeset: %s"),
err ? err->message : _("unknown error"));
virResetLastError();
goto cleanup;
}
} else { } else {
/* XXX: Shouldn't go here, as we already do checking when /* XXX: Shouldn't go here, as we already do checking when
* parsing domain XML. * parsing domain XML.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册