From bd58fb063a5d3d8a0adfe5c3c8d92cf7d98f177a Mon Sep 17 00:00:00 2001
Message-Id: <bd58fb063a5d3d8a0adfe5c3c8d92cf7d98f177a.1283957680.git.jdenemar@redhat.com>
From: Eric Blake <eblake@redhat.com>
Date: Wed, 18 Aug 2010 12:10:08 -0600
Subject: [PATCH] nwfilter: use consistent OOM reporting

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=630574

* src/nwfilter/nwfilter_driver.c (nwfilterLog): Delete.
(nwfilterDriverStartup): Use virReportOOMError instead.
(cherry picked from commit 52baf647ca05585af1dab4e80d2c61d82d475e93)
---
 src/nwfilter/nwfilter_driver.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 9dd776b..6483a8c 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -42,9 +42,6 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
-#define nwfilterLog(msg...) fprintf(stderr, msg)
-
-
 static virNWFilterDriverStatePtr driverState;
 
 static int nwfilterDriverShutdown(void);
@@ -95,7 +92,6 @@ nwfilterDriverStartup(int privileged) {
             goto error;
 
         if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) {
-            nwfilterLog("out of memory in virAsprintf");
             VIR_FREE(userdir);
             goto out_of_memory;
         }
@@ -118,7 +114,7 @@ nwfilterDriverStartup(int privileged) {
     return 0;
 
 out_of_memory:
-    nwfilterLog("virNWFilterStartup: out of memory");
+    virReportOOMError();
 
 error:
     VIR_FREE(base);
-- 
1.7.2.2