Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
bfd50603
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,发现更多精彩内容 >>
提交
bfd50603
编写于
8月 16, 2006
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make drivers be 'quiet' when opening RW connection. Removed duplicated RO checks
上级
b084f43f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
11 addition
and
20 deletion
+11
-20
ChangeLog
ChangeLog
+7
-0
src/libvirt.c
src/libvirt.c
+4
-20
未找到文件。
ChangeLog
浏览文件 @
bfd50603
Wed Aug 16 11:31:59 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/libvirt.c: Remove some duplicated changes for VIR_DOMAIN_RO
accidentally left in place from last checkin. Tell the drivers to
be 'quiet' when opening a RW connection, to stop XenD driver
complaining when we open the test driver.
Wed Aug 16 17:24:59 CEST 2006 Daniel Veillard <veillard@redhat.com>
Wed Aug 16 17:24:59 CEST 2006 Daniel Veillard <veillard@redhat.com>
* include/libvirt/virterror.h src/libvirt.c src/virterror.c: enforce
* include/libvirt/virterror.h src/libvirt.c src/virterror.c: enforce
...
...
src/libvirt.c
浏览文件 @
bfd50603
...
@@ -240,7 +240,7 @@ virConnectOpen(const char *name)
...
@@ -240,7 +240,7 @@ virConnectOpen(const char *name)
for
(
i
=
0
;
i
<
MAX_DRIVERS
;
i
++
)
{
for
(
i
=
0
;
i
<
MAX_DRIVERS
;
i
++
)
{
if
((
virDriverTab
[
i
]
!=
NULL
)
&&
(
virDriverTab
[
i
]
->
open
!=
NULL
))
{
if
((
virDriverTab
[
i
]
!=
NULL
)
&&
(
virDriverTab
[
i
]
->
open
!=
NULL
))
{
res
=
virDriverTab
[
i
]
->
open
(
ret
,
name
,
0
);
res
=
virDriverTab
[
i
]
->
open
(
ret
,
name
,
VIR_DRV_OPEN_QUIET
);
/*
/*
* For a default connect to Xen make sure we manage to contact
* For a default connect to Xen make sure we manage to contact
* all related drivers.
* all related drivers.
...
@@ -812,10 +812,6 @@ virDomainSuspend(virDomainPtr domain)
...
@@ -812,10 +812,6 @@ virDomainSuspend(virDomainPtr domain)
}
}
conn
=
domain
->
conn
;
conn
=
domain
->
conn
;
#if PEDANTIC
if
(
domain
->
conn
->
flags
&
VIR_CONNECT_RO
)
return
(
-
1
);
#endif
/*
/*
* Go though the driver registered entry points but use the
* Go though the driver registered entry points but use the
...
@@ -868,10 +864,6 @@ virDomainResume(virDomainPtr domain)
...
@@ -868,10 +864,6 @@ virDomainResume(virDomainPtr domain)
}
}
conn
=
domain
->
conn
;
conn
=
domain
->
conn
;
#if PEDANTIC
if
(
domain
->
conn
->
flags
&
VIR_CONNECT_RO
)
return
(
-
1
);
#endif
/*
/*
* Go though the driver registered entry points but use the
* Go though the driver registered entry points but use the
...
@@ -1053,10 +1045,6 @@ virDomainShutdown(virDomainPtr domain)
...
@@ -1053,10 +1045,6 @@ virDomainShutdown(virDomainPtr domain)
}
}
conn
=
domain
->
conn
;
conn
=
domain
->
conn
;
#if PEDANTIC
if
(
domain
->
conn
->
flags
&
VIR_CONNECT_RO
)
return
(
-
1
);
#endif
/* Go though the driver registered entry points */
/* Go though the driver registered entry points */
for
(
i
=
0
;
i
<
conn
->
nb_drivers
;
i
++
)
{
for
(
i
=
0
;
i
<
conn
->
nb_drivers
;
i
++
)
{
...
@@ -1102,10 +1090,6 @@ virDomainReboot(virDomainPtr domain, unsigned int flags)
...
@@ -1102,10 +1090,6 @@ virDomainReboot(virDomainPtr domain, unsigned int flags)
}
}
conn
=
domain
->
conn
;
conn
=
domain
->
conn
;
#if PEDANTIC
if
(
domain
->
conn
->
flags
&
VIR_CONNECT_RO
)
return
(
-
1
);
#endif
/* Go though the driver registered entry points */
/* Go though the driver registered entry points */
for
(
i
=
0
;
i
<
conn
->
nb_drivers
;
i
++
)
{
for
(
i
=
0
;
i
<
conn
->
nb_drivers
;
i
++
)
{
...
@@ -1341,8 +1325,6 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
...
@@ -1341,8 +1325,6 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
return
(
-
1
);
return
(
-
1
);
}
}
conn
=
domain
->
conn
;
conn
=
domain
->
conn
;
if
(
domain
->
conn
->
flags
&
VIR_CONNECT_RO
)
return
(
-
1
);
/*
/*
* in that case instead of trying only though one method try all availble.
* in that case instead of trying only though one method try all availble.
...
@@ -1738,6 +1720,7 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
...
@@ -1738,6 +1720,7 @@ virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
virLibDomainError
(
domain
,
VIR_ERR_OPERATION_DENIED
,
__FUNCTION__
);
virLibDomainError
(
domain
,
VIR_ERR_OPERATION_DENIED
,
__FUNCTION__
);
return
(
-
1
);
return
(
-
1
);
}
}
if
(
nvcpus
<
1
)
{
if
(
nvcpus
<
1
)
{
virLibDomainError
(
domain
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibDomainError
(
domain
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
return
(
-
1
);
...
@@ -1806,6 +1789,7 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
...
@@ -1806,6 +1789,7 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
virLibDomainError
(
domain
,
VIR_ERR_OPERATION_DENIED
,
__FUNCTION__
);
virLibDomainError
(
domain
,
VIR_ERR_OPERATION_DENIED
,
__FUNCTION__
);
return
(
-
1
);
return
(
-
1
);
}
}
if
((
vcpu
>
32000
)
||
(
cpumap
==
NULL
)
||
(
maplen
<
1
))
{
if
((
vcpu
>
32000
)
||
(
cpumap
==
NULL
)
||
(
maplen
<
1
))
{
virLibDomainError
(
domain
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
virLibDomainError
(
domain
,
VIR_ERR_INVALID_ARG
,
__FUNCTION__
);
return
(
-
1
);
return
(
-
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录