Always set forward-delay on bridge, even if 0

This commit is contained in:
Daniel P. Berrange 2008-08-01 12:56:52 +00:00
parent 3f3345aa85
commit ffc839fb20
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Fri Aug 1 13:54:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_driver.c: Always set forward-delay even if zero because
the kernel defaults to 15 seconds which is too long
Fri Aug 1 13:19:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
Const-correctness fixes in virsh.c

View File

@ -1480,8 +1480,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn,
}
if (network->def->delay &&
(err = brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay))) {
if ((err = brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay))) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("failed to set bridge forward delay to %ld"),
network->def->delay);