From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sll0u-0001Ln-KA for qemu-devel@nongnu.org; Mon, 02 Jul 2012 14:06:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sll0p-0001uo-IJ for qemu-devel@nongnu.org; Mon, 02 Jul 2012 14:06:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sll0p-0001tJ-AW for qemu-devel@nongnu.org; Mon, 02 Jul 2012 14:06:15 -0400 From: Eduardo Habkost Date: Mon, 2 Jul 2012 15:06:37 -0300 Message-Id: <1341252398-12268-6-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 5/6] file_ram_alloc(): extract temporary-file creation code to separate function (v2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Bill Gray , Andrea Arcangeli , Andre Przywara , kvm@vger.kernel.org, Bharata B Rao Changes v1 -> v2: - Fix trailing space issue - Rebase against new code using g_strdup_printf() Signed-off-by: Eduardo Habkost --- exec.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/exec.c b/exec.c index 1e98244..456ac73 100644 --- a/exec.c +++ b/exec.c @@ -2356,11 +2356,31 @@ static long gethugepagesize(const char *path) return fs.f_bsize; } +/* Return FD to temporary file inside directory at 'path', + * truncated to size 'length' + */ +static int get_temp_fd(const char *path) +{ + int fd; + gchar *filename; + + filename = g_strdup_printf("%s/qemu_back_mem.XXXXXX", path); + fd = mkstemp(filename); + if (fd < 0) { + perror("unable to create backing store for hugepages"); + g_free(filename); + return -1; + } + unlink(filename); + g_free(filename); + + return fd; +} + static void *file_ram_alloc(RAMBlock *block, size_t length, const char *path) { - gchar *filename; void *area; int fd; #ifdef MAP_POPULATE @@ -2382,15 +2402,10 @@ static void *file_ram_alloc(RAMBlock *block, return NULL; } - filename = g_strdup_printf("%s/qemu_back_mem.XXXXXX", path); - fd = mkstemp(filename); + fd = get_temp_fd(path); if (fd < 0) { - perror("unable to create backing store for hugepages"); - g_free(filename); return NULL; } - unlink(filename); - g_free(filename); length = (length + hpagesize - 1) & ~(hpagesize - 1); -- 1.7.10.4