Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
351ee406
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看板
提交
351ee406
编写于
4月 25, 2016
作者:
P
Pavel Hrdina
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu_hotplug: cleanup error messages in qemuDomainChangeGraphics
Signed-off-by:
N
Pavel Hrdina
<
phrdina@redhat.com
>
上级
39f78671
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
15 deletion
+17
-15
src/qemu/qemu_hotplug.c
src/qemu/qemu_hotplug.c
+17
-15
未找到文件。
src/qemu/qemu_hotplug.c
浏览文件 @
351ee406
...
...
@@ -2607,9 +2607,10 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
virDomainGraphicsDefPtr
dev
)
{
virDomainGraphicsDefPtr
olddev
=
qemuDomainFindGraphics
(
vm
,
dev
);
int
ret
=
-
1
;
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
const
char
*
type
=
virDomainGraphicsTypeToString
(
dev
->
type
);
size_t
i
;
int
ret
=
-
1
;
if
(
!
olddev
)
{
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
...
...
@@ -2618,8 +2619,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
}
if
(
dev
->
nListens
!=
olddev
->
nListens
)
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
_
(
"cannot change the number of listen addresses"
));
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
_
(
"cannot change the number of listen addresses "
"on '%s' graphics"
),
type
);
goto
cleanup
;
}
...
...
@@ -2628,30 +2630,31 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
virDomainGraphicsListenDefPtr
oldlisten
=
&
olddev
->
listens
[
i
];
if
(
newlisten
->
type
!=
oldlisten
->
type
)
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
_
(
"cannot change the type of listen address"
));
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
_
(
"cannot change the type of listen address "
"on '%s' graphics"
),
type
);
goto
cleanup
;
}
switch
(
newlisten
->
type
)
{
case
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS
:
if
(
STRNEQ_NULLABLE
(
newlisten
->
address
,
oldlisten
->
address
))
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
dev
->
type
==
VIR_DOMAIN_GRAPHICS_TYPE_VNC
?
_
(
"cannot change listen address setting on vnc graphics"
)
:
_
(
"cannot change listen address setting on spice graphics"
));
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
_
(
"cannot change listen address setting "
"on '%s' graphics"
),
type
);
goto
cleanup
;
}
break
;
case
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK
:
if
(
STRNEQ_NULLABLE
(
newlisten
->
network
,
oldlisten
->
network
))
{
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
"%s"
,
dev
->
type
==
VIR_DOMAIN_GRAPHICS_TYPE_VNC
?
_
(
"cannot change listen network setting on vnc graphics"
)
:
_
(
"cannot change listen network setting on spice graphics"
));
virReportError
(
VIR_ERR_OPERATION_UNSUPPORTED
,
_
(
"cannot change listen address setting "
"on '%s' graphics"
),
type
);
goto
cleanup
;
}
break
;
case
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE
:
...
...
@@ -2761,8 +2764,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
default:
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"unable to change config on '%s' graphics type"
),
virDomainGraphicsTypeToString
(
dev
->
type
));
_
(
"unable to change config on '%s' graphics type"
),
type
);
break
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录