From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sll0q-000199-BE for qemu-devel@nongnu.org; Mon, 02 Jul 2012 14:06:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sll0k-0001rM-47 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 14:06:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sll0j-0001qS-S1 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 14:06:10 -0400 From: Eduardo Habkost Date: Mon, 2 Jul 2012 15:06:34 -0300 Message-Id: <1341252398-12268-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1341252398-12268-1-git-send-email-ehabkost@redhat.com> References: <1341252398-12268-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] file_ram_alloc(): use g_strdup_printf() instead of asprintf() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andrea Arcangeli , Andre Przywara , kvm@vger.kernel.org, Blue Swirl , Bharata B Rao , Bill Gray Cc: Blue Swirl Signed-off-by: Eduardo Habkost --- exec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/exec.c b/exec.c index c8bfd27..d856325 100644 --- a/exec.c +++ b/exec.c @@ -24,6 +24,9 @@ #include #endif +#include +#include + #include "qemu-common.h" #include "cpu.h" #include "tcg.h" @@ -2357,7 +2360,7 @@ static void *file_ram_alloc(RAMBlock *block, ram_addr_t memory, const char *path) { - char *filename; + gchar *filename; void *area; int fd; #ifdef MAP_POPULATE @@ -2379,18 +2382,15 @@ static void *file_ram_alloc(RAMBlock *block, return NULL; } - if (asprintf(&filename, "%s/qemu_back_mem.XXXXXX", path) == -1) { - return NULL; - } - + filename = g_strdup_printf("%s/qemu_back_mem.XXXXXX", path); fd = mkstemp(filename); if (fd < 0) { perror("unable to create backing store for hugepages"); - free(filename); + g_free(filename); return NULL; } unlink(filename); - free(filename); + g_free(filename); memory = (memory + hpagesize - 1) & ~(hpagesize - 1); -- 1.7.10.4