ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file-posix: Use error API properly 

Use error_report for situations that affect user operation (i.e.  we're
actually returning error), and warn_report/warn_report_err when some
less critical error happened but the user operation can still carry on.

For raw_normalize_devicepath, add Error parameter to propagate to
its callers.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2018-11-01 14:29:09 +08:00 committed by Kevin Wolf
parent 5704c36d25
commit db0754df88
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
block/file-posix.c
View File

@ -205,7 +205,7 @@ static int cdrom_reopen(BlockDriverState *bs);
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
static int raw_normalize_devicepath(const char **filename) static int raw_normalize_devicepath(const char **filename, Error **errp)
{ {
static char namebuf[PATH_MAX]; static char namebuf[PATH_MAX];
const char *dp, *fname; const char *dp, *fname;
@ -214,8 +214,7 @@ static int raw_normalize_devicepath(const char **filename)
fname = *filename; fname = *filename;
dp = strrchr(fname, '/'); dp = strrchr(fname, '/');
if (lstat(fname, &sb) < 0) { if (lstat(fname, &sb) < 0) {
fprintf(stderr, "%s: stat failed: %s\n", error_setg_errno(errp, errno, "%s: stat failed", fname);
fname, strerror(errno));
return -errno; return -errno;
} }
@ -229,14 +228,13 @@ static int raw_normalize_devicepath(const char **filename)
snprintf(namebuf, PATH_MAX, "%.*s/r%s", snprintf(namebuf, PATH_MAX, "%.*s/r%s",
(int)(dp - fname), fname, dp + 1); (int)(dp - fname), fname, dp + 1);
} }
fprintf(stderr, "%s is a block device", fname);
*filename = namebuf; *filename = namebuf;
fprintf(stderr, ", using %s\n", *filename); warn_report("%s is a block device, using %s", fname, *filename);
return 0; return 0;
} }
#else #else
static int raw_normalize_devicepath(const char **filename) static int raw_normalize_devicepath(const char **filename, Error **errp)
{ {
return 0; return 0;
} }
@ -461,9 +459,8 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
filename = qemu_opt_get(opts, "filename"); filename = qemu_opt_get(opts, "filename");
ret = raw_normalize_devicepath(&filename); ret = raw_normalize_devicepath(&filename, errp);
if (ret != 0) { if (ret != 0) {
error_setg_errno(errp, -ret, "Could not normalize device path");
goto fail; goto fail;
} }
@ -492,11 +489,10 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
case ON_OFF_AUTO_ON: case ON_OFF_AUTO_ON:
s->use_lock = true; s->use_lock = true;
if (!qemu_has_ofd_lock()) { if (!qemu_has_ofd_lock()) {
fprintf(stderr, warn_report("File lock requested but OFD locking syscall is "
"File lock requested but OFD locking syscall is " "unavailable, falling back to POSIX file locks");
"unavailable, falling back to POSIX file locks.\n" error_printf("Due to the implementation, locks can be lost "
"Due to the implementation, locks can be lost " "unexpectedly.\n");
"unexpectedly.\n");
} }
break; break;
case ON_OFF_AUTO_OFF: case ON_OFF_AUTO_OFF:
@ -818,7 +814,7 @@ static int raw_handle_perm_lock(BlockDriverState *bs,
/* Theoretically the above call only unlocks bytes and it cannot /* Theoretically the above call only unlocks bytes and it cannot
* fail. Something weird happened, report it. * fail. Something weird happened, report it.
*/ */
error_report_err(local_err); warn_report_err(local_err);
} }
break; break;
case RAW_PL_COMMIT: case RAW_PL_COMMIT:
@ -828,7 +824,7 @@ static int raw_handle_perm_lock(BlockDriverState *bs,
/* Theoretically the above call only unlocks bytes and it cannot /* Theoretically the above call only unlocks bytes and it cannot
* fail. Something weird happened, report it. * fail. Something weird happened, report it.
*/ */
error_report_err(local_err); warn_report_err(local_err);
} }
break; break;
} }
@ -905,10 +901,8 @@ static int raw_reopen_prepare(BDRVReopenState *state,
/* If we cannot use fcntl, or fcntl failed, fall back to qemu_open() */ /* If we cannot use fcntl, or fcntl failed, fall back to qemu_open() */
if (rs->fd == -1) { if (rs->fd == -1) {
const char *normalized_filename = state->bs->filename; const char *normalized_filename = state->bs->filename;
ret = raw_normalize_devicepath(&normalized_filename); ret = raw_normalize_devicepath(&normalized_filename, errp);
if (ret < 0) { if (ret >= 0) {
error_setg_errno(errp, -ret, "Could not normalize device path");
} else {
assert(!(rs->open_flags & O_CREAT)); assert(!(rs->open_flags & O_CREAT));
rs->fd = qemu_open(normalized_filename, rs->open_flags); rs->fd = qemu_open(normalized_filename, rs->open_flags);
if (rs->fd == -1) { if (rs->fd == -1) {
@ -1788,7 +1782,7 @@ static int aio_worker(void *arg)
ret = handle_aiocb_truncate(aiocb); ret = handle_aiocb_truncate(aiocb);
break; break;
default: default:
fprintf(stderr, "invalid aio request (0x%x)\n", aiocb->aio_type); error_report("invalid aio request (0x%x)", aiocb->aio_type);
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
@ -2276,7 +2270,7 @@ out_unlock:
* not mean the whole creation operation has failed. So * not mean the whole creation operation has failed. So
* report it the user for their convenience, but do not report * report it the user for their convenience, but do not report
* it to the caller. */ * it to the caller. */
error_report_err(local_err); warn_report_err(local_err);
} }
out_close: out_close:
@ -3141,9 +3135,8 @@ static int coroutine_fn hdev_co_create_opts(const char *filename, QemuOpts *opts
(void)has_prefix; (void)has_prefix;
ret = raw_normalize_devicepath(&filename); ret = raw_normalize_devicepath(&filename, errp);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Could not normalize device path");
return ret; return ret;
} }