Re: [libvirt] [PATCH 11/13] Replace use of virNWFilterReportError with virReportError

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Update the network filter driver to use virReportError instead of the virNWFilterReportError custom macro Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; ---

+++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1097,35 +1093,35 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac, handle = pcap_create(ifname, pcap_errbuf); if (handle == NULL) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_create failed")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_create failed"));

goto cleanup_nohandle; } if (pcap_set_snaplen(handle, PCAP_PBUFSIZE) < 0 || pcap_set_buffer_size(handle, PCAP_BUFFERSIZE) < 0 || pcap_activate(handle) < 0) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("setup of pcap handle failed")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("setup of pcap handle failed"));

+++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2683,8 +2680,8 @@ ebiptablesCreateRuleInstance(enum virDomainNetType nettype ATTRIBUTE_UNUSED, break; case VIR_NWFILTER_RULE_PROTOCOL_LAST: - virNWFilterReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("illegal protocol type")); + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("illegal protocol type"));

+++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -151,17 +148,17 @@ virNWFilterLockIface(const char *ifname) {

if (virStrcpyStatic(ifaceLock->ifname, ifname) == NULL) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, - _("interface name %s does not fit into " - "buffer "), - ifaceLock->ifname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("interface name %s does not fit into " + "buffer "),