Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c5561644
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,发现更多精彩内容 >>
提交
c5561644
编写于
10月 18, 2013
作者:
L
Laine Stump
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: move qemuDomainRemoveNetDevice to avoid forward reference
pure code movement to setup for next patch.
上级
7a600cf7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
61 addition
and
61 deletion
+61
-61
src/qemu/qemu_hotplug.c
src/qemu/qemu_hotplug.c
+61
-61
未找到文件。
src/qemu/qemu_hotplug.c
浏览文件 @
c5561644
...
...
@@ -2453,67 +2453,6 @@ qemuDomainRemoveControllerDevice(virQEMUDriverPtr driver,
}
static
void
qemuDomainRemoveNetDevice
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virDomainNetDefPtr
net
)
{
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
virNetDevVPortProfilePtr
vport
;
virDomainEventPtr
event
;
size_t
i
;
VIR_DEBUG
(
"Removing network interface %s from domain %p %s"
,
net
->
info
.
alias
,
vm
,
vm
->
def
->
name
);
virDomainAuditNet
(
vm
,
net
,
NULL
,
"detach"
,
true
);
event
=
virDomainEventDeviceRemovedNewFromObj
(
vm
,
net
->
info
.
alias
);
if
(
event
)
qemuDomainEventQueue
(
driver
,
event
);
for
(
i
=
0
;
i
<
vm
->
def
->
nnets
;
i
++
)
{
if
(
vm
->
def
->
nets
[
i
]
==
net
)
{
virDomainNetRemove
(
vm
->
def
,
i
);
break
;
}
}
qemuDomainReleaseDeviceAddress
(
vm
,
&
net
->
info
,
NULL
);
virDomainConfNWFilterTeardown
(
net
);
if
(
virDomainNetGetActualType
(
net
)
==
VIR_DOMAIN_NET_TYPE_DIRECT
)
{
ignore_value
(
virNetDevMacVLanDeleteWithVPortProfile
(
net
->
ifname
,
&
net
->
mac
,
virDomainNetGetActualDirectDev
(
net
),
virDomainNetGetActualDirectMode
(
net
),
virDomainNetGetActualVirtPortProfile
(
net
),
cfg
->
stateDir
));
VIR_FREE
(
net
->
ifname
);
}
if
(
cfg
->
macFilter
&&
(
net
->
ifname
!=
NULL
))
{
if
((
errno
=
networkDisallowMacOnPort
(
driver
,
net
->
ifname
,
&
net
->
mac
)))
{
virReportSystemError
(
errno
,
_
(
"failed to remove ebtables rule on '%s'"
),
net
->
ifname
);
}
}
vport
=
virDomainNetGetActualVirtPortProfile
(
net
);
if
(
vport
&&
vport
->
virtPortType
==
VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH
)
ignore_value
(
virNetDevOpenvswitchRemovePort
(
virDomainNetGetActualBridgeName
(
net
),
net
->
ifname
));
networkReleaseActualDevice
(
net
);
virDomainNetDefFree
(
net
);
virObjectUnref
(
cfg
);
}
static
void
qemuDomainRemovePCIHostDevice
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
...
...
@@ -2644,6 +2583,67 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
}
static
void
qemuDomainRemoveNetDevice
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virDomainNetDefPtr
net
)
{
virQEMUDriverConfigPtr
cfg
=
virQEMUDriverGetConfig
(
driver
);
virNetDevVPortProfilePtr
vport
;
virDomainEventPtr
event
;
size_t
i
;
VIR_DEBUG
(
"Removing network interface %s from domain %p %s"
,
net
->
info
.
alias
,
vm
,
vm
->
def
->
name
);
virDomainAuditNet
(
vm
,
net
,
NULL
,
"detach"
,
true
);
event
=
virDomainEventDeviceRemovedNewFromObj
(
vm
,
net
->
info
.
alias
);
if
(
event
)
qemuDomainEventQueue
(
driver
,
event
);
for
(
i
=
0
;
i
<
vm
->
def
->
nnets
;
i
++
)
{
if
(
vm
->
def
->
nets
[
i
]
==
net
)
{
virDomainNetRemove
(
vm
->
def
,
i
);
break
;
}
}
qemuDomainReleaseDeviceAddress
(
vm
,
&
net
->
info
,
NULL
);
virDomainConfNWFilterTeardown
(
net
);
if
(
virDomainNetGetActualType
(
net
)
==
VIR_DOMAIN_NET_TYPE_DIRECT
)
{
ignore_value
(
virNetDevMacVLanDeleteWithVPortProfile
(
net
->
ifname
,
&
net
->
mac
,
virDomainNetGetActualDirectDev
(
net
),
virDomainNetGetActualDirectMode
(
net
),
virDomainNetGetActualVirtPortProfile
(
net
),
cfg
->
stateDir
));
VIR_FREE
(
net
->
ifname
);
}
if
(
cfg
->
macFilter
&&
(
net
->
ifname
!=
NULL
))
{
if
((
errno
=
networkDisallowMacOnPort
(
driver
,
net
->
ifname
,
&
net
->
mac
)))
{
virReportSystemError
(
errno
,
_
(
"failed to remove ebtables rule on '%s'"
),
net
->
ifname
);
}
}
vport
=
virDomainNetGetActualVirtPortProfile
(
net
);
if
(
vport
&&
vport
->
virtPortType
==
VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH
)
ignore_value
(
virNetDevOpenvswitchRemovePort
(
virDomainNetGetActualBridgeName
(
net
),
net
->
ifname
));
networkReleaseActualDevice
(
net
);
virDomainNetDefFree
(
net
);
virObjectUnref
(
cfg
);
}
static
void
qemuDomainRemoveChrDevice
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录