From patchwork Wed Mar 14 22:55:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 146761 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 376C1B6EEE for ; Thu, 15 Mar 2012 09:56:37 +1100 (EST) Received: from localhost ([::1]:36662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7x7T-0001Ul-5z for incoming@patchwork.ozlabs.org; Wed, 14 Mar 2012 18:56:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7x6g-0007sO-Pi for qemu-devel@nongnu.org; Wed, 14 Mar 2012 18:55:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7x6M-0005qe-2D for qemu-devel@nongnu.org; Wed, 14 Mar 2012 18:55:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7x6L-0005qK-Q5 for qemu-devel@nongnu.org; Wed, 14 Mar 2012 18:55:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2EMtOLB007975 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Mar 2012 18:55:24 -0400 Received: from garlic.redhat.com (vpn-200-211.tlv.redhat.com [10.35.200.211]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2EMtFUH006339; Wed, 14 Mar 2012 18:55:21 -0400 From: Alon Levy To: qemu-devel@nongnu.org, lcapitulino@redhat.com Date: Thu, 15 Mar 2012 00:55:10 +0200 Message-Id: <1331765714-26209-2-git-send-email-alevy@redhat.com> In-Reply-To: <1331765714-26209-1-git-send-email-alevy@redhat.com> References: <1331765714-26209-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: mlureau@redhat.com Subject: [Qemu-devel] [PATCH v2 1/5] error: add error_set_file_open_failed 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 Signed-off-by: Alon Levy --- cpus.c | 4 ++-- error.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ error.h | 4 ++++ qerror.c | 36 ++++++++++++++++++++++++++++++++++++ qerror.h | 27 +++++++++++++++++++++++++++ qga/commands-posix.c | 2 +- 6 files changed, 114 insertions(+), 3 deletions(-) diff --git a/cpus.c b/cpus.c index 17b055f..c87035f 100644 --- a/cpus.c +++ b/cpus.c @@ -1178,7 +1178,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename, f = fopen(filename, "wb"); if (!f) { - error_set(errp, QERR_OPEN_FILE_FAILED, filename); + error_set_file_open_failed(errp, filename, errno); return; } @@ -1208,7 +1208,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, f = fopen(filename, "wb"); if (!f) { - error_set(errp, QERR_OPEN_FILE_FAILED, filename); + error_set_file_open_failed(errp, filename, errno); return; } diff --git a/error.c b/error.c index 990050f..b32d7f5 100644 --- a/error.c +++ b/error.c @@ -144,3 +144,47 @@ void error_set_qobject(Error **errp, QObject *obj) *errp = err; } + +void error_set_file_open_failed(Error **errp, const char *file_name, int ret) +{ + const char *fmt = NULL; + + switch (ret) { + case EACCES: + fmt = QERR_OPEN_FILE_EACCES; + break; + case EINTR: + fmt = QERR_OPEN_FILE_EINTR; + break; + case EEXIST: + fmt = QERR_OPEN_FILE_EEXIST; + break; + case EMFILE: + fmt = QERR_OPEN_FILE_EMFILE; + break; + case ENOSPC: + fmt = QERR_OPEN_FILE_ENOSPC; + break; + case EPERM: + fmt = QERR_OPEN_FILE_EPERM; + break; + case EROFS: + fmt = QERR_OPEN_FILE_EROFS; + break; + case ENOTDIR: + fmt = QERR_OPEN_FILE_ENOTDIR; + break; + case EFBIG: + fmt = QERR_OPEN_FILE_EFBIG; + break; + default: + /* + * EINVAL and ENOTSUP will result in the default + * + * ENOENT too, it's used by (for instance) bdrv_create_file for + * a different purpose then open (2) so just give a generic error. + */ + fmt = QERR_OPEN_FILE_FAILED; + } + error_set(errp, fmt, file_name); +} diff --git a/error.h b/error.h index 6361f40..f3a80f3 100644 --- a/error.h +++ b/error.h @@ -67,4 +67,8 @@ void error_free(Error *err); */ bool error_is_type(Error *err, const char *fmt); +/** + * Helper to set error for a open (2) style return code. + */ +void error_set_file_open_failed(Error **errp, const char *file_name, int ret); #endif diff --git a/qerror.c b/qerror.c index f55d435..23c260b 100644 --- a/qerror.c +++ b/qerror.c @@ -213,6 +213,42 @@ static const QErrorStringTable qerror_table[] = { .desc = "Could not open '%(filename)'", }, { + .error_fmt = QERR_OPEN_FILE_EINTR, + .desc = "Interrupted open of '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_EACCES, + .desc = "Cannot access '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_EEXIST, + .desc = "File already exists '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_EMFILE, + .desc = "Max open files when opening '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_ENOSPC, + .desc = "No space left opening '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_EPERM, + .desc = "Permission denied (EPERM) for '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_EROFS, + .desc = "Read only filesystem opening '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_ENOTDIR, + .desc = "Directory related error opening '%(filename)'", + }, + { + .error_fmt = QERR_OPEN_FILE_EFBIG, + .desc = "File too big opening '%(filename)'", + }, + { .error_fmt = QERR_PERMISSION_DENIED, .desc = "Insufficient permission to perform this operation", }, diff --git a/qerror.h b/qerror.h index e26c635..6ab9b8d 100644 --- a/qerror.h +++ b/qerror.h @@ -181,6 +181,33 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_OPEN_FILE_FAILED \ "{ 'class': 'OpenFileFailed', 'data': { 'filename': %s } }" +#define QERR_OPEN_FILE_EINTR \ + "{ 'class': 'OpenFileEINTR', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_EACCES \ + "{ 'class': 'OpenFileEACCES', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_EEXIST \ + "{ 'class': 'OpenFileEEXIST', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_EMFILE \ + "{ 'class': 'OpenFileEMFILE', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_ENOSPC \ + "{ 'class': 'OpenFileENOSPC', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_EPERM \ + "{ 'class': 'OpenFileEPERM', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_EROFS \ + "{ 'class': 'OpenFileEROFS', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_ENOTDIR \ + "{ 'class': 'OpenFileENOTDIR', 'data': { 'filename': %s } }" + +#define QERR_OPEN_FILE_EFBIG \ + "{ 'class': 'OpenFileEFBIG', 'data': { 'filename': %s } }" + #define QERR_PERMISSION_DENIED \ "{ 'class': 'PermissionDenied', 'data': {} }" diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 7b2be2f..4e5ef7f 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -134,7 +134,7 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E slog("guest-file-open called, filepath: %s, mode: %s", path, mode); fh = fopen(path, mode); if (!fh) { - error_set(err, QERR_OPEN_FILE_FAILED, path); + error_set_file_open_failed(err, path, errno); return -1; }