[Qemu-devel] [PULL 0/3] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit fe8ee082db5038a05dbd8872e946049e9a9c550e:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-22' into staging (2017-02-24 15:00:51 +0000)
3
Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)
4
4
5
are available in the git repository at:
5
are available in the Git repository at:
6
6
7
https://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
7
https://gitlab.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to 1d393bdeae22fde2cb83c1ea719675747c85c40e:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
RBD: Add support readv,writev for rbd (2017-02-24 12:43:01 -0500)
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Block patches for 2.9
14
Pull request
15
16
Philippe found cases where the 0x%d format string was used, leading to
17
misleading output. The patches look harmless and could save people time, so I
18
think it's worth including them in 7.0.
19
15
----------------------------------------------------------------
20
----------------------------------------------------------------
16
21
17
Peter Lieven (2):
22
Philippe Mathieu-Daudé (2):
18
block/nfs: convert to preadv / pwritev
23
block: Fix misleading hexadecimal format
19
block/nfs: try to avoid the bounce buffer in pwritev
24
hw: Fix misleading hexadecimal format
20
25
21
tianqing (1):
26
block/parallels-ext.c | 2 +-
22
RBD: Add support readv,writev for rbd
27
hw/i386/sgx.c | 2 +-
23
28
hw/i386/trace-events | 6 +++---
24
block/nfs.c | 62 +++++++++++++++++++++++++----------------------
29
hw/misc/trace-events | 4 ++--
25
block/rbd.c | 80 ++++++++++++++++++++++++++++++++++++++++++-------------------
30
hw/scsi/trace-events | 4 ++--
26
2 files changed, 90 insertions(+), 52 deletions(-)
31
5 files changed, 9 insertions(+), 9 deletions(-)
27
32
28
--
33
--
29
2.9.3
34
2.35.1
30
35
31
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/3] block/nfs: convert to preadv / pwritev
Deleted patch
1
From: Peter Lieven <pl@kamp.de>
2
1
3
Signed-off-by: Peter Lieven <pl@kamp.de>
4
Reviewed-by: Jeff Cody <jcody@redhat.com>
5
Message-id: 1487349541-10201-2-git-send-email-pl@kamp.de
6
Signed-off-by: Jeff Cody <jcody@redhat.com>
7
---
8
block/nfs.c | 33 +++++++++++++++------------------
9
1 file changed, 15 insertions(+), 18 deletions(-)
10
11
diff --git a/block/nfs.c b/block/nfs.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/nfs.c
14
+++ b/block/nfs.c
15
@@ -XXX,XX +XXX,XX @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
16
nfs_co_generic_bh_cb, task);
17
}
18
19
-static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
20
- int64_t sector_num, int nb_sectors,
21
- QEMUIOVector *iov)
22
+static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
23
+ uint64_t bytes, QEMUIOVector *iov,
24
+ int flags)
25
{
26
NFSClient *client = bs->opaque;
27
NFSRPC task;
28
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
29
task.iov = iov;
30
31
if (nfs_pread_async(client->context, client->fh,
32
- sector_num * BDRV_SECTOR_SIZE,
33
- nb_sectors * BDRV_SECTOR_SIZE,
34
- nfs_co_generic_cb, &task) != 0) {
35
+ offset, bytes, nfs_co_generic_cb, &task) != 0) {
36
return -ENOMEM;
37
}
38
39
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
40
return 0;
41
}
42
43
-static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
44
- int64_t sector_num, int nb_sectors,
45
- QEMUIOVector *iov)
46
+static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
47
+ uint64_t bytes, QEMUIOVector *iov,
48
+ int flags)
49
{
50
NFSClient *client = bs->opaque;
51
NFSRPC task;
52
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
53
54
nfs_co_init_task(bs, &task);
55
56
- buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE);
57
- if (nb_sectors && buf == NULL) {
58
+ buf = g_try_malloc(bytes);
59
+ if (bytes && buf == NULL) {
60
return -ENOMEM;
61
}
62
63
- qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
64
+ qemu_iovec_to_buf(iov, 0, buf, bytes);
65
66
if (nfs_pwrite_async(client->context, client->fh,
67
- sector_num * BDRV_SECTOR_SIZE,
68
- nb_sectors * BDRV_SECTOR_SIZE,
69
- buf, nfs_co_generic_cb, &task) != 0) {
70
+ offset, bytes, buf,
71
+ nfs_co_generic_cb, &task) != 0) {
72
g_free(buf);
73
return -ENOMEM;
74
}
75
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
76
77
g_free(buf);
78
79
- if (task.ret != nb_sectors * BDRV_SECTOR_SIZE) {
80
+ if (task.ret != bytes) {
81
return task.ret < 0 ? task.ret : -EIO;
82
}
83
84
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_nfs = {
85
.bdrv_create = nfs_file_create,
86
.bdrv_reopen_prepare = nfs_reopen_prepare,
87
88
- .bdrv_co_readv = nfs_co_readv,
89
- .bdrv_co_writev = nfs_co_writev,
90
+ .bdrv_co_preadv = nfs_co_preadv,
91
+ .bdrv_co_pwritev = nfs_co_pwritev,
92
.bdrv_co_flush_to_disk = nfs_co_flush,
93
94
.bdrv_detach_aio_context = nfs_detach_aio_context,
95
--
96
2.9.3
97
98
diff view generated by jsdifflib
[Qemu-devel] [PULL 3/3] RBD: Add support readv,writev for rbd
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: tianqing <tianqing@unitedstack.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
Rbd can do readv and writev directly, so wo do not need to transform
3
"0x%u" format is very misleading, replace by "0x%x".
4
iov to buf or vice versa any more.
5
4
6
Signed-off-by: tianqing <tianqing@unitedstack.com>
5
Found running:
7
Reviewed-by: Jeff Cody <jcody@redhat.com>
6
8
Signed-off-by: Jeff Cody <jcody@redhat.com>
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
8
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
11
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
12
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
13
Reviewed-by: Denis V. Lunev <den@openvz.org>
14
Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.com
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
---
16
---
10
block/rbd.c | 80 ++++++++++++++++++++++++++++++++++++++++++-------------------
17
block/parallels-ext.c | 2 +-
11
1 file changed, 56 insertions(+), 24 deletions(-)
18
1 file changed, 1 insertion(+), 1 deletion(-)
12
19
13
diff --git a/block/rbd.c b/block/rbd.c
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
14
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
15
--- a/block/rbd.c
22
--- a/block/parallels-ext.c
16
+++ b/block/rbd.c
23
+++ b/block/parallels-ext.c
17
@@ -XXX,XX +XXX,XX @@
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
18
#define RBD_MAX_SNAP_NAME_SIZE 128
25
break;
19
#define RBD_MAX_SNAPS 100
26
20
27
default:
21
+/* The LIBRBD_SUPPORTS_IOVEC is defined in librbd.h */
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
22
+#ifdef LIBRBD_SUPPORTS_IOVEC
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
23
+#define LIBRBD_USE_IOVEC 1
30
goto fail;
24
+#else
25
+#define LIBRBD_USE_IOVEC 0
26
+#endif
27
+
28
typedef enum {
29
RBD_AIO_READ,
30
RBD_AIO_WRITE,
31
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_set_conf(rados_t cluster, const char *conf,
32
return ret;
33
}
34
35
+static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs)
36
+{
37
+ if (LIBRBD_USE_IOVEC) {
38
+ RBDAIOCB *acb = rcb->acb;
39
+ iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0,
40
+ acb->qiov->size - offs);
41
+ } else {
42
+ memset(rcb->buf + offs, 0, rcb->size - offs);
43
+ }
44
+}
45
+
46
static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
47
{
48
Error *local_err = NULL;
49
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
50
}
31
}
51
} else {
32
52
if (r < 0) {
53
- memset(rcb->buf, 0, rcb->size);
54
+ qemu_rbd_memset(rcb, 0);
55
acb->ret = r;
56
acb->error = 1;
57
} else if (r < rcb->size) {
58
- memset(rcb->buf + r, 0, rcb->size - r);
59
+ qemu_rbd_memset(rcb, r);
60
if (!acb->error) {
61
acb->ret = rcb->size;
62
}
63
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_complete_aio(RADOSCB *rcb)
64
65
g_free(rcb);
66
67
- if (acb->cmd == RBD_AIO_READ) {
68
- qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
69
+ if (!LIBRBD_USE_IOVEC) {
70
+ if (acb->cmd == RBD_AIO_READ) {
71
+ qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
72
+ }
73
+ qemu_vfree(acb->bounce);
74
}
75
- qemu_vfree(acb->bounce);
76
+
77
acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret));
78
79
qemu_aio_unref(acb);
80
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
81
RBDAIOCB *acb;
82
RADOSCB *rcb = NULL;
83
rbd_completion_t c;
84
- char *buf;
85
int r;
86
87
BDRVRBDState *s = bs->opaque;
88
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
89
acb->cmd = cmd;
90
acb->qiov = qiov;
91
assert(!qiov || qiov->size == size);
92
- if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
93
- acb->bounce = NULL;
94
- } else {
95
- acb->bounce = qemu_try_blockalign(bs, qiov->size);
96
- if (acb->bounce == NULL) {
97
- goto failed;
98
+
99
+ rcb = g_new(RADOSCB, 1);
100
+
101
+ if (!LIBRBD_USE_IOVEC) {
102
+ if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) {
103
+ acb->bounce = NULL;
104
+ } else {
105
+ acb->bounce = qemu_try_blockalign(bs, qiov->size);
106
+ if (acb->bounce == NULL) {
107
+ goto failed;
108
+ }
109
}
110
+ if (cmd == RBD_AIO_WRITE) {
111
+ qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
112
+ }
113
+ rcb->buf = acb->bounce;
114
}
115
+
116
acb->ret = 0;
117
acb->error = 0;
118
acb->s = s;
119
120
- if (cmd == RBD_AIO_WRITE) {
121
- qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
122
- }
123
-
124
- buf = acb->bounce;
125
-
126
- rcb = g_new(RADOSCB, 1);
127
rcb->acb = acb;
128
- rcb->buf = buf;
129
rcb->s = acb->s;
130
rcb->size = size;
131
r = rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c);
132
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
133
134
switch (cmd) {
135
case RBD_AIO_WRITE:
136
- r = rbd_aio_write(s->image, off, size, buf, c);
137
+#ifdef LIBRBD_SUPPORTS_IOVEC
138
+ r = rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c);
139
+#else
140
+ r = rbd_aio_write(s->image, off, size, rcb->buf, c);
141
+#endif
142
break;
143
case RBD_AIO_READ:
144
- r = rbd_aio_read(s->image, off, size, buf, c);
145
+#ifdef LIBRBD_SUPPORTS_IOVEC
146
+ r = rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c);
147
+#else
148
+ r = rbd_aio_read(s->image, off, size, rcb->buf, c);
149
+#endif
150
break;
151
case RBD_AIO_DISCARD:
152
r = rbd_aio_discard_wrapper(s->image, off, size, c);
153
@@ -XXX,XX +XXX,XX @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs,
154
if (r < 0) {
155
goto failed_completion;
156
}
157
-
158
return &acb->common;
159
160
failed_completion:
161
rbd_aio_release(c);
162
failed:
163
g_free(rcb);
164
- qemu_vfree(acb->bounce);
165
+ if (!LIBRBD_USE_IOVEC) {
166
+ qemu_vfree(acb->bounce);
167
+ }
168
+
169
qemu_aio_unref(acb);
170
return NULL;
171
}
172
--
33
--
173
2.9.3
34
2.35.1
174
35
175
36
diff view generated by jsdifflib
[Qemu-devel] [PULL 2/3] block/nfs: try to avoid the bounce buffer in pwritev
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
From: Peter Lieven <pl@kamp.de>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
if the passed qiov contains exactly one iov we can
3
"0x%u" format is very misleading, replace by "0x%x".
4
pass the buffer directly.
5
4
6
Signed-off-by: Peter Lieven <pl@kamp.de>
5
Found running:
7
Reviewed-by: Jeff Cody <jcody@redhat.com>
6
8
Message-id: 1487349541-10201-3-git-send-email-pl@kamp.de
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
9
Signed-off-by: Jeff Cody <jcody@redhat.com>
8
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
10
---
14
---
11
block/nfs.c | 35 ++++++++++++++++++++++-------------
15
hw/i386/sgx.c | 2 +-
12
1 file changed, 22 insertions(+), 13 deletions(-)
16
hw/i386/trace-events | 6 +++---
17
hw/misc/trace-events | 4 ++--
18
hw/scsi/trace-events | 4 ++--
19
4 files changed, 8 insertions(+), 8 deletions(-)
13
20
14
diff --git a/block/nfs.c b/block/nfs.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
15
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
16
--- a/block/nfs.c
23
--- a/hw/i386/sgx.c
17
+++ b/block/nfs.c
24
+++ b/hw/i386/sgx.c
18
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
19
NFSClient *client = bs->opaque;
20
NFSRPC task;
21
char *buf = NULL;
22
+ bool my_buffer = false;
23
24
nfs_co_init_task(bs, &task);
25
26
- buf = g_try_malloc(bytes);
27
- if (bytes && buf == NULL) {
28
- return -ENOMEM;
29
+ if (iov->niov != 1) {
30
+ buf = g_try_malloc(bytes);
31
+ if (bytes && buf == NULL) {
32
+ return -ENOMEM;
33
+ }
34
+ qemu_iovec_to_buf(iov, 0, buf, bytes);
35
+ my_buffer = true;
36
+ } else {
37
+ buf = iov->iov[0].iov_base;
38
}
26
}
39
27
40
- qemu_iovec_to_buf(iov, 0, buf, bytes);
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
41
-
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
42
if (nfs_pwrite_async(client->context, client->fh,
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
43
offset, bytes, buf,
31
sgx_epc->size);
44
nfs_co_generic_cb, &task) != 0) {
32
exit(EXIT_FAILURE);
45
+ if (my_buffer) {
46
+ g_free(buf);
47
+ }
48
+ return -ENOMEM;
49
+ }
50
+
51
+ nfs_set_events(client);
52
+ while (!task.complete) {
53
+ qemu_coroutine_yield();
54
+ }
55
+
56
+ if (my_buffer) {
57
g_free(buf);
58
- return -ENOMEM;
59
}
33
}
60
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
61
- nfs_set_events(client);
35
index XXXXXXX..XXXXXXX 100644
62
- while (!task.complete) {
36
--- a/hw/i386/trace-events
63
- qemu_coroutine_yield();
37
+++ b/hw/i386/trace-events
64
- }
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
65
-
39
vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64
66
- g_free(buf);
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
67
-
41
vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64
68
if (task.ret != bytes) {
42
-vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
69
return task.ret < 0 ? task.ret : -EIO;
43
+vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
70
}
44
vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64
45
vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
46
vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read"
47
vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
48
vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
49
vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64
50
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
51
-vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
52
+vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
53
+vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
54
vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
55
vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
56
vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
57
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
58
index XXXXXXX..XXXXXXX 100644
59
--- a/hw/misc/trace-events
60
+++ b/hw/misc/trace-events
61
@@ -XXX,XX +XXX,XX @@
62
# See docs/devel/tracing.rst for syntax documentation.
63
64
# allwinner-cpucfg.c
65
-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
66
+allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
67
allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
68
allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
69
70
@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
71
72
# mos6522.c
73
mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
74
-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
75
+mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
76
mos6522_set_sr_int(void) "set sr_int"
77
mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
78
mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
79
diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
80
index XXXXXXX..XXXXXXX 100644
81
--- a/hw/scsi/trace-events
82
+++ b/hw/scsi/trace-events
83
@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
84
lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
85
lsi_do_dma_unavailable(void) "DMA no data available"
86
lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
87
-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
88
+lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
89
lsi_add_msg_byte_error(void) "MSG IN data too long"
90
lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
91
lsi_reselect(int id) "Reselected target %d"
92
@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
93
lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
94
lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
95
lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
96
-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
97
+lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
98
lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
99
lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
100
lsi_do_msgout_select(int id) "Select LUN %d"
71
--
101
--
72
2.9.3
102
2.35.1
73
103
74
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.