From: Markus Armbruster <armbru@redhat.com> To: qemu-devel@nongnu.org Cc: "Richard W.M. Jones" <rjones@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>, qemu-block@nongnu.org Subject: [Qemu-devel] [PATCH 02/15] block/ssh: Do not report read/write/flush errors to the user Date: Mon, 8 Apr 2019 10:36:14 +0200 [thread overview] Message-ID: <20190408083627.7479-3-armbru@redhat.com> (raw) In-Reply-To: <20190408083627.7479-1-armbru@redhat.com> Callbacks ssh_co_readv(), ssh_co_writev(), ssh_co_flush() report errors to the user with error_printf(). They shouldn't, it's their caller's job. Replace by a suitable trace point. Perhaps we should convert this part of the block driver interface to Error, so block drivers can pass more detail to their callers. Not today. Cc: "Richard W.M. Jones" <rjones@redhat.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Max Reitz <mreitz@redhat.com> Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> --- block/ssh.c | 36 ++++++++++++------------------------ block/trace-events | 3 +++ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 190ef95300..382fc04fbf 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -159,31 +159,19 @@ sftp_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...) g_free(msg); } -static void GCC_FMT_ATTR(2, 3) -sftp_error_report(BDRVSSHState *s, const char *fs, ...) +static void sftp_error_trace(BDRVSSHState *s, const char *op) { - va_list args; + char *ssh_err; + int ssh_err_code; + unsigned long sftp_err_code; - va_start(args, fs); - error_vprintf(fs, args); - - if ((s)->sftp) { - char *ssh_err; - int ssh_err_code; - unsigned long sftp_err_code; - - /* This is not an errno. See <libssh2.h>. */ - ssh_err_code = libssh2_session_last_error(s->session, + /* This is not an errno. See <libssh2.h>. */ + ssh_err_code = libssh2_session_last_error(s->session, &ssh_err, NULL, 0); - /* See <libssh2_sftp.h>. */ - sftp_err_code = libssh2_sftp_last_error((s)->sftp); + /* See <libssh2_sftp.h>. */ + sftp_err_code = libssh2_sftp_last_error((s)->sftp); - error_printf(": %s (libssh2 error code: %d, sftp error code: %lu)", - ssh_err, ssh_err_code, sftp_err_code); - } - - va_end(args); - error_printf("\n"); + trace_sftp_error(op, ssh_err, ssh_err_code, sftp_err_code); } static int parse_uri(const char *filename, QDict *options, Error **errp) @@ -1035,7 +1023,7 @@ static coroutine_fn int ssh_read(BDRVSSHState *s, BlockDriverState *bs, goto again; } if (r < 0) { - sftp_error_report(s, "read failed"); + sftp_error_trace(s, "read"); s->offset = -1; return -EIO; } @@ -1105,7 +1093,7 @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs, goto again; } if (r < 0) { - sftp_error_report(s, "write failed"); + sftp_error_trace(s, "write"); s->offset = -1; return -EIO; } @@ -1188,7 +1176,7 @@ static coroutine_fn int ssh_flush(BDRVSSHState *s, BlockDriverState *bs) return 0; } if (r < 0) { - sftp_error_report(s, "fsync failed"); + sftp_error_trace(s, "fsync"); return -EIO; } diff --git a/block/trace-events b/block/trace-events index 7335a42540..79ccd8d824 100644 --- a/block/trace-events +++ b/block/trace-events @@ -208,3 +208,6 @@ sheepdog_co_rw_vector_new(uint64_t oid) "new oid 0x%" PRIx64 sheepdog_snapshot_create_info(const char *sn_name, const char *id, const char *name, int64_t size, int is_snapshot) "sn_info: name %s id_str %s s: name %s vm_state_size %" PRId64 " " "is_snapshot %d" sheepdog_snapshot_create(const char *sn_name, const char *id) "%s %s" sheepdog_snapshot_create_inode(const char *name, uint32_t snap, uint32_t vdi) "s->inode: name %s snap_id 0x%" PRIx32 " vdi 0x%" PRIx32 + +# ssh.c +sftp_error(const char *op, const char *ssh_err, int ssh_err_code, unsigned long sftp_err_code) "%s failed: %s (libssh2 error code: %d, sftp error code: %lu)" -- 2.17.2
WARNING: multiple messages have this Message-ID (diff)
From: Markus Armbruster <armbru@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf <kwolf@redhat.com>, "Richard W.M. Jones" <rjones@redhat.com>, qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 02/15] block/ssh: Do not report read/write/flush errors to the user Date: Mon, 8 Apr 2019 10:36:14 +0200 [thread overview] Message-ID: <20190408083627.7479-3-armbru@redhat.com> (raw) Message-ID: <20190408083614.TGTYjuiT32uUlgnKXaXf4MPXV-sQ5kMsGpnQNjv1cks@z> (raw) In-Reply-To: <20190408083627.7479-1-armbru@redhat.com> Callbacks ssh_co_readv(), ssh_co_writev(), ssh_co_flush() report errors to the user with error_printf(). They shouldn't, it's their caller's job. Replace by a suitable trace point. Perhaps we should convert this part of the block driver interface to Error, so block drivers can pass more detail to their callers. Not today. Cc: "Richard W.M. Jones" <rjones@redhat.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Max Reitz <mreitz@redhat.com> Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> --- block/ssh.c | 36 ++++++++++++------------------------ block/trace-events | 3 +++ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 190ef95300..382fc04fbf 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -159,31 +159,19 @@ sftp_error_setg(Error **errp, BDRVSSHState *s, const char *fs, ...) g_free(msg); } -static void GCC_FMT_ATTR(2, 3) -sftp_error_report(BDRVSSHState *s, const char *fs, ...) +static void sftp_error_trace(BDRVSSHState *s, const char *op) { - va_list args; + char *ssh_err; + int ssh_err_code; + unsigned long sftp_err_code; - va_start(args, fs); - error_vprintf(fs, args); - - if ((s)->sftp) { - char *ssh_err; - int ssh_err_code; - unsigned long sftp_err_code; - - /* This is not an errno. See <libssh2.h>. */ - ssh_err_code = libssh2_session_last_error(s->session, + /* This is not an errno. See <libssh2.h>. */ + ssh_err_code = libssh2_session_last_error(s->session, &ssh_err, NULL, 0); - /* See <libssh2_sftp.h>. */ - sftp_err_code = libssh2_sftp_last_error((s)->sftp); + /* See <libssh2_sftp.h>. */ + sftp_err_code = libssh2_sftp_last_error((s)->sftp); - error_printf(": %s (libssh2 error code: %d, sftp error code: %lu)", - ssh_err, ssh_err_code, sftp_err_code); - } - - va_end(args); - error_printf("\n"); + trace_sftp_error(op, ssh_err, ssh_err_code, sftp_err_code); } static int parse_uri(const char *filename, QDict *options, Error **errp) @@ -1035,7 +1023,7 @@ static coroutine_fn int ssh_read(BDRVSSHState *s, BlockDriverState *bs, goto again; } if (r < 0) { - sftp_error_report(s, "read failed"); + sftp_error_trace(s, "read"); s->offset = -1; return -EIO; } @@ -1105,7 +1093,7 @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs, goto again; } if (r < 0) { - sftp_error_report(s, "write failed"); + sftp_error_trace(s, "write"); s->offset = -1; return -EIO; } @@ -1188,7 +1176,7 @@ static coroutine_fn int ssh_flush(BDRVSSHState *s, BlockDriverState *bs) return 0; } if (r < 0) { - sftp_error_report(s, "fsync failed"); + sftp_error_trace(s, "fsync"); return -EIO; } diff --git a/block/trace-events b/block/trace-events index 7335a42540..79ccd8d824 100644 --- a/block/trace-events +++ b/block/trace-events @@ -208,3 +208,6 @@ sheepdog_co_rw_vector_new(uint64_t oid) "new oid 0x%" PRIx64 sheepdog_snapshot_create_info(const char *sn_name, const char *id, const char *name, int64_t size, int is_snapshot) "sn_info: name %s id_str %s s: name %s vm_state_size %" PRId64 " " "is_snapshot %d" sheepdog_snapshot_create(const char *sn_name, const char *id) "%s %s" sheepdog_snapshot_create_inode(const char *name, uint32_t snap, uint32_t vdi) "s->inode: name %s snap_id 0x%" PRIx32 " vdi 0x%" PRIx32 + +# ssh.c +sftp_error(const char *op, const char *ssh_err, int ssh_err_code, unsigned long sftp_err_code) "%s failed: %s (libssh2 error code: %d, sftp error code: %lu)" -- 2.17.2
next prev parent reply other threads:[~2019-04-08 8:36 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-08 8:36 [Qemu-devel] [PATCH 00/15] Clean up use of error_printf() Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 01/15] qemu-img: Use error_vreport() in error_exit() Markus Armbruster 2019-04-08 8:36 ` Markus Armbruster 2019-04-08 18:37 ` Eric Blake 2019-04-08 8:36 ` Markus Armbruster [this message] 2019-04-08 8:36 ` [Qemu-devel] [PATCH 02/15] block/ssh: Do not report read/write/flush errors to the user Markus Armbruster 2019-04-08 17:22 ` [Qemu-devel] Whither qemu's ssh driver? (was: Re: [PATCH 02/15] block/ssh: Do not report read/write/flush errors to the user) Richard W.M. Jones 2019-04-08 17:22 ` Richard W.M. Jones 2019-04-08 18:07 ` [Qemu-devel] Whither qemu's ssh driver? Markus Armbruster 2019-04-08 18:07 ` Markus Armbruster 2019-04-08 18:13 ` Richard W.M. Jones 2019-04-08 18:13 ` Richard W.M. Jones 2019-04-08 18:33 ` [Qemu-devel] Whither qemu's ssh driver? (was: Re: [PATCH 02/15] block/ssh: Do not report read/write/flush errors to the user) Max Reitz 2019-04-08 18:33 ` Max Reitz 2019-04-09 6:05 ` [Qemu-devel] Whither qemu's ssh driver? Markus Armbruster 2019-04-09 6:05 ` Markus Armbruster 2019-04-08 19:13 ` [Qemu-devel] [PATCH 02/15] block/ssh: Do not report read/write/flush errors to the user Eric Blake 2019-04-09 6:09 ` Markus Armbruster 2019-04-09 6:09 ` Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 03/15] char-pty: Drop "char device redirected to" message Markus Armbruster 2019-04-08 9:20 ` Marc-André Lureau 2019-04-08 9:20 ` Marc-André Lureau 2019-04-08 12:31 ` Markus Armbruster 2019-04-09 10:40 ` Philippe Mathieu-Daudé 2019-04-09 11:25 ` Marc-André Lureau 2019-04-09 11:25 ` Marc-André Lureau 2019-04-11 11:47 ` Daniel P. Berrangé 2019-04-11 11:47 ` Daniel P. Berrangé 2019-04-08 8:36 ` [Qemu-devel] [PATCH 04/15] loader-fit: Wean off error_printf() Markus Armbruster 2019-04-08 8:36 ` Markus Armbruster 2019-04-08 10:49 ` Philippe Mathieu-Daudé 2019-04-08 8:36 ` [Qemu-devel] [PATCH 05/15] mips/boston: Report errors with error_report(), not error_printf() Markus Armbruster 2019-04-08 8:36 ` Markus Armbruster 2019-04-08 10:53 ` Philippe Mathieu-Daudé 2019-04-08 8:36 ` [Qemu-devel] [PATCH 06/15] pci: Report fatal " Markus Armbruster 2019-04-08 8:36 ` Markus Armbruster 2019-04-08 8:41 ` Marcel Apfelbaum 2019-04-08 8:36 ` [Qemu-devel] [PATCH 07/15] hpet: Report warnings with warn_report(), " Markus Armbruster 2019-04-08 8:36 ` Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 08/15] vfio: " Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 09/15] s390x/kvm: " Markus Armbruster 2019-04-08 8:39 ` Thomas Huth 2019-04-08 9:04 ` Cornelia Huck 2019-04-08 9:04 ` Cornelia Huck 2019-04-08 12:32 ` Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 10/15] vl: Make -machine $TYPE, help and -accel help print to stdout Markus Armbruster 2019-04-08 8:44 ` Marcel Apfelbaum 2019-04-08 12:33 ` Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 11/15] monitor error: Make printf()-like functions return a value Markus Armbruster 2019-04-08 13:18 ` Markus Armbruster 2019-04-08 16:23 ` Dr. David Alan Gilbert 2019-04-08 8:36 ` [Qemu-devel] [PATCH 12/15] qemu-print: New qemu_printf(), qemu_vprintf() etc Markus Armbruster 2019-04-08 11:00 ` Philippe Mathieu-Daudé 2019-04-09 18:00 ` Dr. David Alan Gilbert 2019-04-10 5:08 ` Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 13/15] blockdev: Make -drive format=help print to stdout Markus Armbruster 2019-04-08 8:36 ` Markus Armbruster 2019-04-08 11:01 ` Philippe Mathieu-Daudé 2019-04-08 8:36 ` [Qemu-devel] [PATCH 14/15] char: Make -chardev help " Markus Armbruster 2019-04-08 9:10 ` Marc-André Lureau 2019-04-08 9:10 ` Marc-André Lureau 2019-04-08 11:02 ` Philippe Mathieu-Daudé 2019-04-08 19:04 ` Eric Blake 2019-04-09 6:10 ` Markus Armbruster 2019-04-09 6:10 ` Markus Armbruster 2019-04-08 8:36 ` [Qemu-devel] [PATCH 15/15] monitor: Simplify how -device/device_add print help Markus Armbruster 2019-04-09 18:41 ` Dr. David Alan Gilbert 2019-04-08 10:51 ` [Qemu-devel] [PATCH 00/15] Clean up use of error_printf() no-reply
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190408083627.7479-3-armbru@redhat.com \ --to=armbru@redhat.com \ --cc=kwolf@redhat.com \ --cc=mreitz@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=rjones@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.