Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
2c71d382
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,发现更多精彩内容 >>
提交
2c71d382
编写于
3月 05, 2014
作者:
C
Chunyan Liu
提交者:
Daniel P. Berrange
3月 12, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu_hostdev: move netconfig file location to virhostdev stateDir
上级
e3c9e3a3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
9 deletion
+20
-9
src/qemu/qemu_hostdev.c
src/qemu/qemu_hostdev.c
+20
-9
未找到文件。
src/qemu/qemu_hostdev.c
浏览文件 @
2c71d382
...
...
@@ -467,10 +467,17 @@ cleanup:
return
ret
;
}
/* @oldStateDir:
* For upgrade purpose:
* To an existing VM on QEMU, the hostdev netconfig file is originally stored
* in cfg->stateDir (/var/run/libvirt/qemu). Switch to new version, it uses new
* location (hostdev_mgr->stateDir) but certainly will not find it. In this
* case, try to find in the old state dir.
*/
static
int
qemuDomainHostdevNetConfigRestore
(
virDomainHostdevDefPtr
hostdev
,
char
*
stateDir
)
char
*
stateDir
,
char
*
oldStateDir
)
{
char
*
linkdev
=
NULL
;
virNetDevVPortProfilePtr
virtPort
;
...
...
@@ -501,12 +508,15 @@ qemuDomainHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
virtPort
=
virDomainNetGetActualVirtPortProfile
(
hostdev
->
parent
.
data
.
net
);
if
(
virtPort
)
if
(
virtPort
)
{
ret
=
qemuDomainHostdevNetConfigVirtPortProfile
(
linkdev
,
vf
,
virtPort
,
&
hostdev
->
parent
.
data
.
net
->
mac
,
NULL
,
port_profile_associate
);
else
}
else
{
ret
=
virNetDevRestoreNetConfig
(
linkdev
,
vf
,
stateDir
);
if
(
ret
<
0
&&
oldStateDir
!=
NULL
)
ret
=
virNetDevRestoreNetConfig
(
linkdev
,
vf
,
oldStateDir
);
}
VIR_FREE
(
linkdev
);
...
...
@@ -660,7 +670,6 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
int
last_processed_hostdev_vf
=
-
1
;
size_t
i
;
int
ret
=
-
1
;
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
virHostdevManagerPtr
hostdev_mgr
=
driver
->
hostdevMgr
;
if
(
!
qemuPrepareHostdevPCICheckSupport
(
hostdevs
,
nhostdevs
,
qemuCaps
))
...
...
@@ -746,7 +755,7 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
if
(
hostdev
->
parent
.
type
==
VIR_DOMAIN_DEVICE_NET
&&
hostdev
->
parent
.
data
.
net
)
{
if
(
qemuDomainHostdevNetConfigReplace
(
hostdev
,
uuid
,
cfg
->
stateDir
)
<
0
)
{
hostdev_mgr
->
stateDir
)
<
0
)
{
goto
resetvfnetconfig
;
}
}
...
...
@@ -830,7 +839,8 @@ inactivedevs:
resetvfnetconfig:
for
(
i
=
0
;
last_processed_hostdev_vf
!=
-
1
&&
i
<
last_processed_hostdev_vf
;
i
++
)
qemuDomainHostdevNetConfigRestore
(
hostdevs
[
i
],
cfg
->
stateDir
);
qemuDomainHostdevNetConfigRestore
(
hostdevs
[
i
],
hostdev_mgr
->
stateDir
,
NULL
);
reattachdevs:
for
(
i
=
0
;
i
<
virPCIDeviceListCount
(
pcidevs
);
i
++
)
{
...
...
@@ -848,7 +858,6 @@ cleanup:
virObjectUnlock
(
hostdev_mgr
->
inactivePciHostdevs
);
virObjectUnref
(
pcidevs
);
out:
virObjectUnref
(
cfg
);
return
ret
;
}
...
...
@@ -1268,6 +1277,7 @@ qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
virPCIDeviceListPtr
pcidevs
;
size_t
i
;
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
char
*
oldStateDir
=
cfg
->
stateDir
;
virHostdevManagerPtr
hostdev_mgr
=
driver
->
hostdevMgr
;
virObjectLock
(
hostdev_mgr
->
activePciHostdevs
);
...
...
@@ -1319,7 +1329,8 @@ qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
* reset and reattach device
*/
for
(
i
=
0
;
i
<
nhostdevs
;
i
++
)
qemuDomainHostdevNetConfigRestore
(
hostdevs
[
i
],
cfg
->
stateDir
);
qemuDomainHostdevNetConfigRestore
(
hostdevs
[
i
],
hostdev_mgr
->
stateDir
,
oldStateDir
);
for
(
i
=
0
;
i
<
virPCIDeviceListCount
(
pcidevs
);
i
++
)
{
virPCIDevicePtr
dev
=
virPCIDeviceListGet
(
pcidevs
,
i
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录