Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
5035f75f
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,发现更多精彩内容 >>
提交
5035f75f
编写于
3月 06, 2014
作者:
C
Chunyan Liu
提交者:
Daniel P. Berrange
3月 12, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move virHostdevPrepareHostSCSIDevices to virhostdev.c
上级
c82c2745
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
118 addition
and
111 deletion
+118
-111
src/libvirt_private.syms
src/libvirt_private.syms
+1
-0
src/qemu/qemu_hostdev.c
src/qemu/qemu_hostdev.c
+0
-111
src/util/virhostdev.c
src/util/virhostdev.c
+111
-0
src/util/virhostdev.h
src/util/virhostdev.h
+6
-0
未找到文件。
src/libvirt_private.syms
浏览文件 @
5035f75f
...
@@ -1300,6 +1300,7 @@ virHookPresent;
...
@@ -1300,6 +1300,7 @@ virHookPresent;
#util/virhostdev.h
#util/virhostdev.h
virHostdevManagerGetDefault;
virHostdevManagerGetDefault;
virHostdevPreparePCIDevices;
virHostdevPreparePCIDevices;
virHostdevPrepareSCSIDevices;
virHostdevPrepareUSBDevices;
virHostdevPrepareUSBDevices;
virHostdevReAttachPCIDevices;
virHostdevReAttachPCIDevices;
virHostdevUpdateActivePciHostdevs;
virHostdevUpdateActivePciHostdevs;
...
...
src/qemu/qemu_hostdev.c
浏览文件 @
5035f75f
...
@@ -245,117 +245,6 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
...
@@ -245,117 +245,6 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
hostdevs
,
nhostdevs
,
flags
);
hostdevs
,
nhostdevs
,
flags
);
}
}
static
int
virHostdevPrepareSCSIDevices
(
virHostdevManagerPtr
hostdev_mgr
,
const
char
*
drv_name
,
const
char
*
name
,
virDomainHostdevDefPtr
*
hostdevs
,
int
nhostdevs
)
{
size_t
i
,
j
;
int
count
;
virSCSIDeviceListPtr
list
;
virSCSIDevicePtr
tmp
;
/* To prevent situation where SCSI device is assigned to two domains
* we need to keep a list of currently assigned SCSI devices.
* This is done in several loops which cannot be joined into one big
* loop. See virHostdevPreparePCIDevices()
*/
if
(
!
(
list
=
virSCSIDeviceListNew
()))
goto
cleanup
;
/* Loop 1: build temporary list */
for
(
i
=
0
;
i
<
nhostdevs
;
i
++
)
{
virDomainHostdevDefPtr
hostdev
=
hostdevs
[
i
];
virSCSIDevicePtr
scsi
;
if
(
hostdev
->
mode
!=
VIR_DOMAIN_HOSTDEV_MODE_SUBSYS
||
hostdev
->
source
.
subsys
.
type
!=
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI
)
continue
;
if
(
hostdev
->
managed
)
{
virReportError
(
VIR_ERR_XML_ERROR
,
"%s"
,
_
(
"SCSI host device doesn't support managed mode"
));
goto
cleanup
;
}
if
(
!
(
scsi
=
virSCSIDeviceNew
(
NULL
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
adapter
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
bus
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
target
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
unit
,
hostdev
->
readonly
,
hostdev
->
shareable
)))
goto
cleanup
;
if
(
scsi
&&
virSCSIDeviceListAdd
(
list
,
scsi
)
<
0
)
{
virSCSIDeviceFree
(
scsi
);
goto
cleanup
;
}
}
/* Loop 2: Mark devices in temporary list as used by @name
* and add them to driver list. However, if something goes
* wrong, perform rollback.
*/
virObjectLock
(
hostdev_mgr
->
activeScsiHostdevs
);
count
=
virSCSIDeviceListCount
(
list
);
for
(
i
=
0
;
i
<
count
;
i
++
)
{
virSCSIDevicePtr
scsi
=
virSCSIDeviceListGet
(
list
,
i
);
if
((
tmp
=
virSCSIDeviceListFind
(
hostdev_mgr
->
activeScsiHostdevs
,
scsi
)))
{
bool
scsi_shareable
=
virSCSIDeviceGetShareable
(
scsi
);
bool
tmp_shareable
=
virSCSIDeviceGetShareable
(
tmp
);
if
(
!
(
scsi_shareable
&&
tmp_shareable
))
{
virReportError
(
VIR_ERR_OPERATION_INVALID
,
_
(
"SCSI device %s is already in use by "
"other domain(s) as '%s'"
),
virSCSIDeviceGetName
(
tmp
),
tmp_shareable
?
"shareable"
:
"non-shareable"
);
goto
error
;
}
if
(
virSCSIDeviceSetUsedBy
(
tmp
,
drv_name
,
name
)
<
0
)
goto
error
;
}
else
{
if
(
virSCSIDeviceSetUsedBy
(
scsi
,
drv_name
,
name
)
<
0
)
goto
error
;
VIR_DEBUG
(
"Adding %s to activeScsiHostdevs"
,
virSCSIDeviceGetName
(
scsi
));
if
(
virSCSIDeviceListAdd
(
hostdev_mgr
->
activeScsiHostdevs
,
scsi
)
<
0
)
goto
error
;
}
}
virObjectUnlock
(
hostdev_mgr
->
activeScsiHostdevs
);
/* Loop 3: Temporary list was successfully merged with
* driver list, so steal all items to avoid freeing them
* when freeing temporary list.
*/
while
(
virSCSIDeviceListCount
(
list
)
>
0
)
{
tmp
=
virSCSIDeviceListGet
(
list
,
0
);
virSCSIDeviceListSteal
(
list
,
tmp
);
}
virObjectUnref
(
list
);
return
0
;
error:
for
(
j
=
0
;
j
<
i
;
j
++
)
{
tmp
=
virSCSIDeviceListGet
(
list
,
i
);
virSCSIDeviceListSteal
(
hostdev_mgr
->
activeScsiHostdevs
,
tmp
);
}
virObjectUnlock
(
hostdev_mgr
->
activeScsiHostdevs
);
cleanup:
virObjectUnref
(
list
);
return
-
1
;
}
int
int
qemuPrepareHostdevSCSIDevices
(
virQEMUDriverPtr
driver
,
qemuPrepareHostdevSCSIDevices
(
virQEMUDriverPtr
driver
,
const
char
*
name
,
const
char
*
name
,
...
...
src/util/virhostdev.c
浏览文件 @
5035f75f
...
@@ -1140,3 +1140,114 @@ cleanup:
...
@@ -1140,3 +1140,114 @@ cleanup:
virObjectUnref
(
list
);
virObjectUnref
(
list
);
return
ret
;
return
ret
;
}
}
int
virHostdevPrepareSCSIDevices
(
virHostdevManagerPtr
hostdev_mgr
,
const
char
*
drv_name
,
const
char
*
name
,
virDomainHostdevDefPtr
*
hostdevs
,
int
nhostdevs
)
{
size_t
i
,
j
;
int
count
;
virSCSIDeviceListPtr
list
;
virSCSIDevicePtr
tmp
;
/* To prevent situation where SCSI device is assigned to two domains
* we need to keep a list of currently assigned SCSI devices.
* This is done in several loops which cannot be joined into one big
* loop. See virHostdevPreparePCIDevices()
*/
if
(
!
(
list
=
virSCSIDeviceListNew
()))
goto
cleanup
;
/* Loop 1: build temporary list */
for
(
i
=
0
;
i
<
nhostdevs
;
i
++
)
{
virDomainHostdevDefPtr
hostdev
=
hostdevs
[
i
];
virSCSIDevicePtr
scsi
;
if
(
hostdev
->
mode
!=
VIR_DOMAIN_HOSTDEV_MODE_SUBSYS
||
hostdev
->
source
.
subsys
.
type
!=
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI
)
continue
;
if
(
hostdev
->
managed
)
{
virReportError
(
VIR_ERR_XML_ERROR
,
"%s"
,
_
(
"SCSI host device doesn't support managed mode"
));
goto
cleanup
;
}
if
(
!
(
scsi
=
virSCSIDeviceNew
(
NULL
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
adapter
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
bus
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
target
,
hostdev
->
source
.
subsys
.
u
.
scsi
.
unit
,
hostdev
->
readonly
,
hostdev
->
shareable
)))
goto
cleanup
;
if
(
scsi
&&
virSCSIDeviceListAdd
(
list
,
scsi
)
<
0
)
{
virSCSIDeviceFree
(
scsi
);
goto
cleanup
;
}
}
/* Loop 2: Mark devices in temporary list as used by @name
* and add them to driver list. However, if something goes
* wrong, perform rollback.
*/
virObjectLock
(
hostdev_mgr
->
activeScsiHostdevs
);
count
=
virSCSIDeviceListCount
(
list
);
for
(
i
=
0
;
i
<
count
;
i
++
)
{
virSCSIDevicePtr
scsi
=
virSCSIDeviceListGet
(
list
,
i
);
if
((
tmp
=
virSCSIDeviceListFind
(
hostdev_mgr
->
activeScsiHostdevs
,
scsi
)))
{
bool
scsi_shareable
=
virSCSIDeviceGetShareable
(
scsi
);
bool
tmp_shareable
=
virSCSIDeviceGetShareable
(
tmp
);
if
(
!
(
scsi_shareable
&&
tmp_shareable
))
{
virReportError
(
VIR_ERR_OPERATION_INVALID
,
_
(
"SCSI device %s is already in use by "
"other domain(s) as '%s'"
),
virSCSIDeviceGetName
(
tmp
),
tmp_shareable
?
"shareable"
:
"non-shareable"
);
goto
error
;
}
if
(
virSCSIDeviceSetUsedBy
(
tmp
,
drv_name
,
name
)
<
0
)
goto
error
;
}
else
{
if
(
virSCSIDeviceSetUsedBy
(
scsi
,
drv_name
,
name
)
<
0
)
goto
error
;
VIR_DEBUG
(
"Adding %s to activeScsiHostdevs"
,
virSCSIDeviceGetName
(
scsi
));
if
(
virSCSIDeviceListAdd
(
hostdev_mgr
->
activeScsiHostdevs
,
scsi
)
<
0
)
goto
error
;
}
}
virObjectUnlock
(
hostdev_mgr
->
activeScsiHostdevs
);
/* Loop 3: Temporary list was successfully merged with
* driver list, so steal all items to avoid freeing them
* when freeing temporary list.
*/
while
(
virSCSIDeviceListCount
(
list
)
>
0
)
{
tmp
=
virSCSIDeviceListGet
(
list
,
0
);
virSCSIDeviceListSteal
(
list
,
tmp
);
}
virObjectUnref
(
list
);
return
0
;
error:
for
(
j
=
0
;
j
<
i
;
j
++
)
{
tmp
=
virSCSIDeviceListGet
(
list
,
i
);
virSCSIDeviceListSteal
(
hostdev_mgr
->
activeScsiHostdevs
,
tmp
);
}
virObjectUnlock
(
hostdev_mgr
->
activeScsiHostdevs
);
cleanup:
virObjectUnref
(
list
);
return
-
1
;
}
src/util/virhostdev.h
浏览文件 @
5035f75f
...
@@ -65,6 +65,12 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
...
@@ -65,6 +65,12 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
virDomainHostdevDefPtr
*
hostdevs
,
virDomainHostdevDefPtr
*
hostdevs
,
int
nhostdevs
,
int
nhostdevs
,
unsigned
int
flags
);
unsigned
int
flags
);
int
virHostdevPrepareSCSIDevices
(
virHostdevManagerPtr
hostdev_mgr
,
const
char
*
drv_name
,
const
char
*
name
,
virDomainHostdevDefPtr
*
hostdevs
,
int
nhostdevs
);
void
void
virHostdevReAttachPCIDevices
(
virHostdevManagerPtr
hostdev_mgr
,
virHostdevReAttachPCIDevices
(
virHostdevManagerPtr
hostdev_mgr
,
const
char
*
drv_name
,
const
char
*
drv_name
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录