Laurent Vivier (4):

block/ssh: Convert from DPRINTF() macro to trace events

block/curl: Convert from DPRINTF() macro to trace events

block/file-posix: Convert from DPRINTF() macro to trace events

block/sheepdog: Convert from DPRINTF() macro to trace events

diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/147

+++ b/tests/qemu-iotests/147

@@ -XXX,XX +XXX,XX @@ class QemuNBD(NBDBlockdevAddBase):

self.assertEqual(qemu_nbd('-f', imgfmt, test_img, *args), 0)

def test_inet(self):

- self._server_up('-p', str(NBD_PORT))

+ self._server_up('-b', 'localhost', '-p', str(NBD_PORT))

address = { 'type': 'inet',

'data': {

'host': 'localhost',

--

2.20.1

- DPRINTF("s->sock=%d - back", s->sock);

+ trace_ssh_co_yield_back(s->sock);

}

/* SFTP has a function `libssh2_sftp_seek64' which seeks to a position

@@ -XXX,XX +XXX,XX @@ static void ssh_seek(BDRVSSHState *s, int64_t offset, int flags)

bool force = (flags & SSH_SEEK_FORCE) != 0;

if (force || op_read != s->offset_op_read || offset != s->offset) {

- DPRINTF("seeking to offset=%" PRIi64, offset);

+ trace_ssh_seek(offset);

libssh2_sftp_seek64(s->sftp_handle, offset);

s->offset = offset;

s->offset_op_read = op_read;

@@ -XXX,XX +XXX,XX @@ static coroutine_fn int ssh_read(BDRVSSHState *s, BlockDriverState *bs,

char *buf, *end_of_vec;

struct iovec *i;

- DPRINTF("offset=%" PRIi64 " size=%zu", offset, size);

+ trace_ssh_read(offset, size);

ssh_seek(s, offset, SSH_SEEK_READ);

@@ -XXX,XX +XXX,XX @@ static coroutine_fn int ssh_read(BDRVSSHState *s, BlockDriverState *bs,

*/

for (got = 0; got < size; ) {

again:

- DPRINTF("sftp_read buf=%p size=%zu", buf, end_of_vec - buf);

+ trace_ssh_read_buf(buf, end_of_vec - buf);

r = libssh2_sftp_read(s->sftp_handle, buf, end_of_vec - buf);

- DPRINTF("sftp_read returned %zd", r);

+ trace_ssh_read_return(r);

if (r == LIBSSH2_ERROR_EAGAIN || r == LIBSSH2_ERROR_TIMEOUT) {

co_yield(s, bs);

@@ -XXX,XX +XXX,XX @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs,

char *buf, *end_of_vec;

struct iovec *i;

- DPRINTF("offset=%" PRIi64 " size=%zu", offset, size);

+ trace_ssh_write(offset, size);

ssh_seek(s, offset, SSH_SEEK_WRITE);

@@ -XXX,XX +XXX,XX @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs,

for (written = 0; written < size; ) {

again:

- DPRINTF("sftp_write buf=%p size=%zu", buf, end_of_vec - buf);

+ trace_ssh_write_buf(buf, end_of_vec - buf);

r = libssh2_sftp_write(s->sftp_handle, buf, end_of_vec - buf);

- DPRINTF("sftp_write returned %zd", r);

+ trace_ssh_write_return(r);

if (r == LIBSSH2_ERROR_EAGAIN || r == LIBSSH2_ERROR_TIMEOUT) {

co_yield(s, bs);

@@ -XXX,XX +XXX,XX @@ static coroutine_fn int ssh_flush(BDRVSSHState *s, BlockDriverState *bs)

{

int r;

- DPRINTF("fsync");

+ trace_ssh_flush();

again:

r = libssh2_sftp_fsync(s->sftp_handle);

if (r == LIBSSH2_ERROR_EAGAIN || r == LIBSSH2_ERROR_TIMEOUT) {

@@ -XXX,XX +XXX,XX @@ static int64_t ssh_getlength(BlockDriverState *bs)

/* Note we cannot make a libssh2 call here. */

length = (int64_t) s->attrs.filesize;

- DPRINTF("length=%" PRIi64, length);

+ trace_ssh_getlength(length);

return length;

}

diff --git a/block/trace-events b/block/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/block/trace-events

+++ b/block/trace-events

@@ -XXX,XX +XXX,XX @@ iscsi_xcopy(void *src_lun, uint64_t src_off, void *dst_lun, uint64_t dst_off, ui

# block/nbd-client.c

nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s"

nbd_co_request_fail(uint64_t from, uint32_t len, uint64_t handle, uint16_t flags, uint16_t type, const char *name, int ret, const char *err) "Request failed { .from = %" PRIu64", .len = %" PRIu32 ", .handle = %" PRIu64 ", .flags = 0x%" PRIx16 ", .type = %" PRIu16 " (%s) } ret = %d, err: %s"

+

+# block/ssh.c

+ssh_restart_coroutine(void *co) "co=%p"

+ssh_flush(void) "fsync"

+ssh_check_host_key_knownhosts(const char *key) "host key OK: %s"

+ssh_connect_to_ssh(char *path, int flags, int mode) "opening file %s flags=0x%x creat_mode=0%o"

+ssh_co_yield(int sock, void *rd_handler, void *wr_handler) "s->sock=%d rd_handler=%p wr_handler=%p"

+ssh_co_yield_back(int sock) "s->sock=%d - back"

+ssh_getlength(int64_t length) "length=%" PRIi64

+ssh_co_create_opts(uint64_t size) "total_size=%" PRIu64

+ssh_read(int64_t offset, size_t size) "offset=%" PRIi64 " size=%zu"

+ssh_read_buf(void *buf, size_t size) "sftp_read buf=%p size=%zu"

+ssh_read_return(ssize_t ret) "sftp_read returned %zd"

+ssh_write(int64_t offset, size_t size) "offset=%" PRIi64 " size=%zu"

+ssh_write_buf(void *buf, size_t size) "sftp_write buf=%p size=%zu"

+ssh_write_return(ssize_t ret) "sftp_write returned %zd"

+ssh_seek(int64_t offset) "seeking to offset=%" PRIi64