On 29.01.2014 18:48, Daniel P. Berrange wrote: > On Wed, Jan 29, 2014 at 06:44:22PM +0100, Michal Privoznik wrote: >> This reverts commit 2996e6be19a13199ded7c2aa21039cca97318e01 >> and some parts of 2636dc8c4de83cd37bc0680a6fbc3f6d25023bd7. >> >> Conflicts: >> tests/virnetdevbandwidthtest.c: New test has been introduced since >> then. >> > > Be useful if the commit message said why we're reverting it. > > Regards, > Daniel > How about: Revert "networkAllocateActualDevice: Set QoS for bridgeless networks too" This reverts commit 2996e6be19a13199ded7c2aa21039cca97318e01 and some parts of 2636dc8c4de83cd37bc0680a6fbc3f6d25023bd7. The former one tried to implement QoS setting on bridgeless networks. However, as discussed upstream [1], the patch is far away from being useful in even a single case. The whole idea of network QoS is to have aggregated limits over several interfaces. This patch is doing completely the opposite when merging two QoS settings (from the network and the domain interface) into one which is then set at the domain interface itself, not the network. The latter one is the test for the previous one. Now none of them makes sense. 1: https://www.redhat.com/archives/libvir-list/2014-January/msg01441.html Conflicts: tests/virnetdevbandwidthtest.c: New test has been introduced since then. Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list