On 07/18/2012 12:40 PM, Daniel P. Berrange wrote: > From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> > > Update the linux bridge driver to use virReportError instead > of the networkReportError custom macro > > Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> > --- > cfg.mk | 1 - > src/network/bridge_driver.c | 344 ++++++++++++++++++++++--------------------- > 2 files changed, 174 insertions(+), 171 deletions(-) > > @@ -849,9 +845,9 @@ networkStartRadvd(virNetworkObjPtr network) > > prefix = virNetworkIpDefPrefix(ipdef); > if (prefix < 0) { > - networkReportError(VIR_ERR_INTERNAL_ERROR, > - _("bridge '%s' has an invalid prefix"), > - network->def->bridge); > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("bridge '%s' has an invalid prefix"), Double space; I pushed a cleanup as a separate patch, so you'll have a merge conflict. ACK. -- Eric Blake eblake@xxxxxxxxxx +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list