On 6/12/20 3:18 AM, gongwei@xxxxxxxxxx wrote:
From: gongwei <gongwei@xxxxxxxxxx>
start to failed will not remove the openvswitch port,
the port recycling in this case lets openvswitch handle it by itself
Signed-off-by: gongwei <gongwei@xxxxxxxxxx>
---
Can you please elaborate on the commit message? By the commit title and
the code, I'm assuming that you're saying that we shouldn't remove the
openvswitch port if the QEMU process failed to start, for any other
reason aside from SHUTOFF_FAILED.
The code itself looks ok.
src/qemu/qemu_process.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d36088ba98..439bd5b396 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7482,7 +7482,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
if (vport) {
if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_MIDONET) {
ignore_value(virNetDevMidonetUnbindPort(vport));
- } else if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) {
+ } else if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH &&
+ reason != VIR_DOMAIN_SHUTOFF_FAILED) {
ignore_value(virNetDevOpenvswitchRemovePort(
virDomainNetGetActualBridgeName(net),
net->ifname));
