Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
7721e790
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7721e790
编写于
5月 29, 2015
作者:
P
Peter Krempa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Refactor qemuDomainPinVcpuFlags by reusing virDomainObjGetDefs
上级
8db9610f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
24 deletion
+17
-24
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+17
-24
未找到文件。
src/qemu/qemu_driver.c
浏览文件 @
7721e790
...
...
@@ -5016,7 +5016,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
virDomainDefPtr persistentDef = NULL;
virDomainDefPtr def;
virDomainDefPtr persistentDef;
virCgroupPtr cgroup_vcpu = NULL;
int ret = -1;
qemuDomainObjPrivatePtr priv;
...
...
@@ -5024,7 +5025,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virDomainPinDefPtr *newVcpuPin = NULL;
virBitmapPtr pcpumap = NULL;
virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
virObjectEventPtr event = NULL;
char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] = "";
char *str = NULL;
...
...
@@ -5043,26 +5043,22 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
&persistentDef) < 0)
if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
goto endjob;
priv = vm->privateData;
if (
(flags & VIR_DOMAIN_AFFECT_LIVE) && vcpu >= vm->
def->vcpus) {
if (
def && vcpu >=
def->vcpus) {
virReportError(VIR_ERR_INVALID_ARG,
_("vcpu %d is out of range of live cpu count %d"),
vcpu,
vm->
def->vcpus);
vcpu, def->vcpus);
goto endjob;
}
if (
(flags & VIR_DOMAIN_AFFECT_CONFIG)
&& vcpu >= persistentDef->vcpus) {
if (
persistentDef
&& vcpu >= persistentDef->vcpus) {
virReportError(VIR_ERR_INVALID_ARG,
_("vcpu %d is out of range of persistent cpu count %d"),
vcpu, persistentDef->vcpus);
...
...
@@ -5078,21 +5074,20 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
goto endjob;
}
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
if (def) {
if (priv->vcpupids == NULL) {
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cpu affinity is not supported"));
goto endjob;
}
if (
vm->
def->cputune.vcpupin) {
newVcpuPin = virDomainPinDefCopy(
vm->
def->cputune.vcpupin,
vm->
def->cputune.nvcpupin);
if (def->cputune.vcpupin) {
newVcpuPin = virDomainPinDefCopy(def->cputune.vcpupin,
def->cputune.nvcpupin);
if (!newVcpuPin)
goto endjob;
newVcpuPinNum =
vm->
def->cputune.nvcpupin;
newVcpuPinNum = def->cputune.nvcpupin;
} else {
if (VIR_ALLOC(newVcpuPin) < 0)
goto endjob;
...
...
@@ -5126,12 +5121,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
}
}
if (
vm->
def->cputune.vcpupin)
virDomainPinDefArrayFree(
vm->
def->cputune.vcpupin,
vm->
def->cputune.nvcpupin);
if (def->cputune.vcpupin)
virDomainPinDefArrayFree(def->cputune.vcpupin,
def->cputune.nvcpupin);
vm->
def->cputune.vcpupin = newVcpuPin;
vm->
def->cputune.nvcpupin = newVcpuPinNum;
def->cputune.vcpupin = newVcpuPin;
def->cputune.nvcpupin = newVcpuPinNum;
newVcpuPin = NULL;
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
...
...
@@ -5150,8 +5145,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
}
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
if (persistentDef) {
if (!persistentDef->cputune.vcpupin) {
if (VIR_ALLOC(persistentDef->cputune.vcpupin) < 0)
goto endjob;
...
...
@@ -5187,7 +5181,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
qemuDomainEventQueue(driver, event);
VIR_FREE(str);
virBitmapFree(pcpumap);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录