mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 09:14:57 +00:00
virnetdevopenvswitch: Fix qos cleaning residual on multi interfaces
Warn these error instead of return when removing qos or queues. This will avoid residual qos clearance on multiple interfaces. Signed-off-by: zhangjl02 <zhangjl02@inspur.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
56723f8846
commit
47437bbe3a
@ -824,6 +824,7 @@ int
|
|||||||
virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname,
|
virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname,
|
||||||
const unsigned char *vmuuid)
|
const unsigned char *vmuuid)
|
||||||
{
|
{
|
||||||
|
int ret = 0;
|
||||||
char vmuuidstr[VIR_UUID_STRING_BUFLEN];
|
char vmuuidstr[VIR_UUID_STRING_BUFLEN];
|
||||||
g_autoptr(virCommand) cmd = NULL;
|
g_autoptr(virCommand) cmd = NULL;
|
||||||
g_autofree char *ifname_ex_id = NULL;
|
g_autofree char *ifname_ex_id = NULL;
|
||||||
@ -871,9 +872,8 @@ virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname,
|
|||||||
cmd = virNetDevOpenvswitchCreateCmd();
|
cmd = virNetDevOpenvswitchCreateCmd();
|
||||||
virCommandAddArgList(cmd, "destroy", "qos", line, NULL);
|
virCommandAddArgList(cmd, "destroy", "qos", line, NULL);
|
||||||
if (virCommandRun(cmd, NULL) < 0) {
|
if (virCommandRun(cmd, NULL) < 0) {
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
VIR_WARN("Unable to destroy qos on port %s", ifname);
|
||||||
_("Unable to destroy qos on port %s"), ifname);
|
ret = -1;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -890,14 +890,13 @@ virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname,
|
|||||||
cmd = virNetDevOpenvswitchCreateCmd();
|
cmd = virNetDevOpenvswitchCreateCmd();
|
||||||
virCommandAddArgList(cmd, "destroy", "queue", line, NULL);
|
virCommandAddArgList(cmd, "destroy", "queue", line, NULL);
|
||||||
if (virCommandRun(cmd, NULL) < 0) {
|
if (virCommandRun(cmd, NULL) < 0) {
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
VIR_WARN("Unable to destroy queue on port %s", ifname);
|
||||||
_("Unable to destroy queue on port %s"), ifname);
|
ret = -1;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -912,7 +911,7 @@ virNetDevOpenvswitchInterfaceClearRxQos(const char *ifname)
|
|||||||
|
|
||||||
if (virCommandRun(cmd, NULL) < 0) {
|
if (virCommandRun(cmd, NULL) < 0) {
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||||
_("Unable to set vlan configuration on port %s"), ifname);
|
_("Unable to reset ingress on port %s"), ifname);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user