mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
syncNicRxFilterMultiMode: Check for helper's retval properly
There are two functions called from syncNicRxFilterMultiMode: virNetDevSetRcvAllMulti() and virNetDevSetRcvMulti(). Both of them return 0 on success and -1 on error. However, currently their return value is checked for != 0 which conflicts with our assumptions on retvals: a positive value is still considered success but with current check it would lead to failure. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
3934beb857
commit
7580c82980
@ -4448,7 +4448,7 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilterPtr guestFilter,
|
|||||||
guestFilter->multicast.mode == VIR_NETDEV_RX_FILTER_MODE_NORMAL)) {
|
guestFilter->multicast.mode == VIR_NETDEV_RX_FILTER_MODE_NORMAL)) {
|
||||||
switch (guestFilter->multicast.mode) {
|
switch (guestFilter->multicast.mode) {
|
||||||
case VIR_NETDEV_RX_FILTER_MODE_ALL:
|
case VIR_NETDEV_RX_FILTER_MODE_ALL:
|
||||||
if (virNetDevSetRcvAllMulti(ifname, true)) {
|
if (virNetDevSetRcvAllMulti(ifname, true) < 0) {
|
||||||
VIR_WARN("Couldn't set allmulticast flag to 'on' for "
|
VIR_WARN("Couldn't set allmulticast flag to 'on' for "
|
||||||
"device %s while responding to "
|
"device %s while responding to "
|
||||||
"NIC_RX_FILTER_CHANGED", ifname);
|
"NIC_RX_FILTER_CHANGED", ifname);
|
||||||
@ -4461,7 +4461,7 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilterPtr guestFilter,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virNetDevSetRcvMulti(ifname, true)) {
|
if (virNetDevSetRcvMulti(ifname, true) < 0) {
|
||||||
VIR_WARN("Couldn't set multicast flag to 'on' for "
|
VIR_WARN("Couldn't set multicast flag to 'on' for "
|
||||||
"device %s while responding to "
|
"device %s while responding to "
|
||||||
"NIC_RX_FILTER_CHANGED", ifname);
|
"NIC_RX_FILTER_CHANGED", ifname);
|
||||||
@ -4478,13 +4478,13 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilterPtr guestFilter,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_NETDEV_RX_FILTER_MODE_NONE:
|
case VIR_NETDEV_RX_FILTER_MODE_NONE:
|
||||||
if (virNetDevSetRcvAllMulti(ifname, false)) {
|
if (virNetDevSetRcvAllMulti(ifname, false) < 0) {
|
||||||
VIR_WARN("Couldn't set allmulticast flag to 'off' for "
|
VIR_WARN("Couldn't set allmulticast flag to 'off' for "
|
||||||
"device %s while responding to "
|
"device %s while responding to "
|
||||||
"NIC_RX_FILTER_CHANGED", ifname);
|
"NIC_RX_FILTER_CHANGED", ifname);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virNetDevSetRcvMulti(ifname, false)) {
|
if (virNetDevSetRcvMulti(ifname, false) < 0) {
|
||||||
VIR_WARN("Couldn't set multicast flag to 'off' for "
|
VIR_WARN("Couldn't set multicast flag to 'off' for "
|
||||||
"device %s while responding to "
|
"device %s while responding to "
|
||||||
"NIC_RX_FILTER_CHANGED",
|
"NIC_RX_FILTER_CHANGED",
|
||||||
|
Loading…
Reference in New Issue
Block a user