From patchwork Fri May 25 19:41:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 161409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 582FEB6EEC for ; Sat, 26 May 2012 06:01:07 +1000 (EST) Received: from localhost ([::1]:44470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OX-0006vv-7M for incoming@patchwork.ozlabs.org; Fri, 25 May 2012 15:41:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0Nw-0005ED-BB for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0Nu-0004Gz-L8 for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0Nu-0004GL-Cs for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:14 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfCI9009873 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 May 2012 15:41:12 -0400 Received: from localhost (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4PJfA07010635; Fri, 25 May 2012 15:41:11 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 16:41:08 -0300 Message-Id: <1337974879-3656-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> References: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, alevy@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 03/14] cutils: introduce qemu_fopen_err() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A fopen() wrapper that takes an Error argument. Signed-off-by: Luiz Capitulino --- cutils.c | 42 ++++++++++++++++++++++++++++++++++++++++++ qemu-common.h | 3 +++ 2 files changed, 45 insertions(+) diff --git a/cutils.c b/cutils.c index af308cd..bdee130 100644 --- a/cutils.c +++ b/cutils.c @@ -26,6 +26,7 @@ #include #include "qemu_socket.h" +#include "error.h" void pstrcpy(char *buf, int buf_size, const char *str) { @@ -549,3 +550,44 @@ int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset) return do_sendv_recvv(sockfd, iov, len, iov_offset, 1); } +static void set_open_err(Error **errp, const char *path, int err_nr) +{ + switch (err_nr) { + case EACCES: + error_set(errp, QERR_INVALID_ACCESS); + return; + case EMFILE: + error_set(errp, QERR_TOO_MANY_FILES_PROC); + return; + case ENFILE: + error_set(errp, QERR_TOO_MANY_FILES_SYS); + return; + case ENAMETOOLONG: + error_set(errp, QERR_NAME_TOO_LONG); + return; + case ENOSPC: + error_set(errp, QERR_NO_SPACE); + return; + case EPERM: + error_set(errp, QERR_PERMISSION_DENIED); + return; + case EROFS: + error_set(errp, QERR_READ_ONLY_FS); + return; + default: + error_set(errp, QERR_OPEN_FILE_FAILED, path); + return; + } +} + +FILE *qemu_fopen_err(const char *path, const char *mode, Error **errp) +{ + FILE *fp; + + fp = fopen(path, mode); + if (!fp) { + set_open_err(errp, path, errno); + } + + return fp; +} diff --git a/qemu-common.h b/qemu-common.h index cccfb42..2cab2a8 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -4,6 +4,7 @@ #include "compiler.h" #include "config-host.h" +#include "error.h" #if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__) #define WORDS_ALIGNED @@ -208,6 +209,8 @@ int qemu_pipe(int pipefd[2]); int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset); int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset); +FILE *qemu_fopen_err(const char *path, const char *mode, Error **errp); + /* Error handling. */ void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);