From 9f4c04793501e6416187756e4b01550f74dcab3e Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 7 Oct 2008 16:01:23 +0000 Subject: [PATCH] =?UTF-8?q?*=20src/qemu=5Fdriver.c:=20don't=20print=20and?= =?UTF-8?q?=20extra=20OOM=20error=20on=20top=20of=20getpwuid=20error=20(Gu?= =?UTF-8?q?ido=20G=C3=BCnther)=20Daniel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 5 +++++ src/qemu_driver.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index da496a6465..4a769fda86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 7 17:59:59 CEST 2008 Daniel Veillard + + * src/qemu_driver.c: don't print and extra OOM error on top of + getpwuid error (Guido Günther) + Mon Oct 6 15:47:00 EST 2008 Cole Robinson * qemud/remote.c src/hash.c src/internal.h src/lxc_conf.c diff --git a/src/qemu_driver.c b/src/qemu_driver.c index b003b00a24..34d494fdcc 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -201,7 +201,7 @@ qemudStartup(void) { if (!(pw = getpwuid(uid))) { qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s\n"), uid, strerror(errno)); - goto out_of_memory; + goto out_nouid; } if (asprintf(&qemu_driver->logDir, @@ -267,6 +267,7 @@ qemudStartup(void) { out_of_memory: qemudLog (QEMUD_ERR, "%s", _("qemudStartup: out of memory\n")); + out_nouid: VIR_FREE(base); VIR_FREE(qemu_driver); return -1;