[Qemu-devel] [PULL for-2.11-rc2 0/5] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit 508ba0f7e2092d3ca56e3f75e894d52d8b94818e:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171109' into staging (2017-11-13 11:41:47 +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
git://github.com/stefanha/qemu.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 0761562687e0d8135310a94b1d3e08376387c027:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
qemu-iotests: Test I/O limits with removable media (2017-11-13 15:46:26 +0000)
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
The following disk I/O throttling fixes solve recent bugs.
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.
17
19
18
----------------------------------------------------------------
20
----------------------------------------------------------------
19
21
20
Alberto Garcia (3):
22
Philippe Mathieu-Daudé (2):
21
block: Check for inserted BlockDriverState in blk_io_limits_disable()
23
block: Fix misleading hexadecimal format
22
block: Leave valid throttle timers when removing a BDS from a backend
24
hw: Fix misleading hexadecimal format
23
qemu-iotests: Test I/O limits with removable media
24
25
25
Stefan Hajnoczi (1):
26
block/parallels-ext.c | 2 +-
26
throttle-groups: drain before detaching ThrottleState
27
hw/i386/sgx.c | 2 +-
27
28
hw/i386/trace-events | 6 +++---
28
Zhengui (1):
29
hw/misc/trace-events | 4 ++--
29
block: all I/O should be completed before removing throttle timers.
30
hw/scsi/trace-events | 4 ++--
30
31
5 files changed, 9 insertions(+), 9 deletions(-)
31
block/block-backend.c | 36 ++++++++++++++++++---------
32
block/throttle-groups.c | 6 +++++
33
tests/qemu-iotests/093 | 62 ++++++++++++++++++++++++++++++++++++++++++++++
34
tests/qemu-iotests/093.out | 4 +--
35
4 files changed, 94 insertions(+), 14 deletions(-)
36
32
37
--
33
--
38
2.13.6
34
2.35.1
39
35
40
diff view generated by jsdifflib
[Qemu-devel] [PULL for-2.11-rc2 1/5] block: all I/O should be completed before removing throttle timers.
Deleted patch
1
From: Zhengui <lizhengui@huawei.com>
2
1
3
In blk_remove_bs, all I/O should be completed before removing throttle
4
timers. If there has inflight I/O, removing throttle timers here will
5
cause the inflight I/O never return.
6
This patch add bdrv_drained_begin before throttle_timers_detach_aio_context
7
to let all I/O completed before removing throttle timers.
8
9
[Moved declaration of bs as suggested by Alberto Garcia
10
<berto@igalia.com>.
11
--Stefan]
12
13
Signed-off-by: Zhengui <lizhengui@huawei.com>
14
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
15
Reviewed-by: Alberto Garcia <berto@igalia.com>
16
Message-id: 1508564040-120700-1-git-send-email-lizhengui@huawei.com
17
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
18
---
19
block/block-backend.c | 4 ++++
20
1 file changed, 4 insertions(+)
21
22
diff --git a/block/block-backend.c b/block/block-backend.c
23
index XXXXXXX..XXXXXXX 100644
24
--- a/block/block-backend.c
25
+++ b/block/block-backend.c
26
@@ -XXX,XX +XXX,XX @@ BlockBackend *blk_by_public(BlockBackendPublic *public)
27
*/
28
void blk_remove_bs(BlockBackend *blk)
29
{
30
+ BlockDriverState *bs;
31
ThrottleTimers *tt;
32
33
notifier_list_notify(&blk->remove_bs_notifiers, blk);
34
if (blk->public.throttle_group_member.throttle_state) {
35
tt = &blk->public.throttle_group_member.throttle_timers;
36
+ bs = blk_bs(blk);
37
+ bdrv_drained_begin(bs);
38
throttle_timers_detach_aio_context(tt);
39
+ bdrv_drained_end(bs);
40
}
41
42
blk_update_root_state(blk);
43
--
44
2.13.6
45
46
diff view generated by jsdifflib
[Qemu-devel] [PULL for-2.11-rc2 2/5] throttle-groups: drain before detaching ThrottleState
Deleted patch
1
I/O requests hang after stop/cont commands at least since QEMU 2.10.0
2
with -drive iops=100:
3
1
4
(guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct count=1000
5
(qemu) stop
6
(qemu) cont
7
...I/O is stuck...
8
9
This happens because blk_set_aio_context() detaches the ThrottleState
10
while requests may still be in flight:
11
12
if (tgm->throttle_state) {
13
throttle_group_detach_aio_context(tgm);
14
throttle_group_attach_aio_context(tgm, new_context);
15
}
16
17
This patch encloses the detach/attach calls in a drained region so no
18
I/O request is left hanging. Also add assertions so we don't make the
19
same mistake again in the future.
20
21
Reported-by: Yongxue Hong <yhong@redhat.com>
22
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
23
Reviewed-by: Alberto Garcia <berto@igalia.com>
24
Message-id: 20171110151934.16883-1-stefanha@redhat.com
25
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
26
---
27
block/block-backend.c | 2 ++
28
block/throttle-groups.c | 6 ++++++
29
2 files changed, 8 insertions(+)
30
31
diff --git a/block/block-backend.c b/block/block-backend.c
32
index XXXXXXX..XXXXXXX 100644
33
--- a/block/block-backend.c
34
+++ b/block/block-backend.c
35
@@ -XXX,XX +XXX,XX @@ void blk_set_aio_context(BlockBackend *blk, AioContext *new_context)
36
37
if (bs) {
38
if (tgm->throttle_state) {
39
+ bdrv_drained_begin(bs);
40
throttle_group_detach_aio_context(tgm);
41
throttle_group_attach_aio_context(tgm, new_context);
42
+ bdrv_drained_end(bs);
43
}
44
bdrv_set_aio_context(bs, new_context);
45
}
46
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
47
index XXXXXXX..XXXXXXX 100644
48
--- a/block/throttle-groups.c
49
+++ b/block/throttle-groups.c
50
@@ -XXX,XX +XXX,XX @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
51
void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
52
{
53
ThrottleTimers *tt = &tgm->throttle_timers;
54
+
55
+ /* Requests must have been drained */
56
+ assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
57
+ assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
58
+ assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
59
+
60
throttle_timers_detach_aio_context(tt);
61
tgm->aio_context = NULL;
62
}
63
--
64
2.13.6
65
66
diff view generated by jsdifflib
[Qemu-devel] [PULL for-2.11-rc2 3/5] block: Check for inserted BlockDriverState in blk_io_limits_disable()
Deleted patch
1
From: Alberto Garcia <berto@igalia.com>
2
1
3
When you set I/O limits using block_set_io_throttle or the command
4
line throttling.* options they are kept in the BlockBackend regardless
5
of whether a BlockDriverState is attached to the backend or not.
6
7
Therefore when removing the limits using blk_io_limits_disable() we
8
need to check if there's a BDS before attempting to drain it, else it
9
will crash QEMU. This can be reproduced very easily using HMP:
10
11
(qemu) drive_add 0 if=none,throttling.iops-total=5000
12
(qemu) drive_del none0
13
14
Reported-by: sochin jiang <sochin.jiang@huawei.com>
15
Signed-off-by: Alberto Garcia <berto@igalia.com>
16
Reviewed-by: Max Reitz <mreitz@redhat.com>
17
Message-id: 0d3a67ce8d948bb33e08672564714dcfb76a3d8c.1510339534.git.berto@igalia.com
18
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
19
---
20
block/block-backend.c | 14 ++++++++++----
21
1 file changed, 10 insertions(+), 4 deletions(-)
22
23
diff --git a/block/block-backend.c b/block/block-backend.c
24
index XXXXXXX..XXXXXXX 100644
25
--- a/block/block-backend.c
26
+++ b/block/block-backend.c
27
@@ -XXX,XX +XXX,XX @@ void blk_set_io_limits(BlockBackend *blk, ThrottleConfig *cfg)
28
29
void blk_io_limits_disable(BlockBackend *blk)
30
{
31
- assert(blk->public.throttle_group_member.throttle_state);
32
- bdrv_drained_begin(blk_bs(blk));
33
- throttle_group_unregister_tgm(&blk->public.throttle_group_member);
34
- bdrv_drained_end(blk_bs(blk));
35
+ BlockDriverState *bs = blk_bs(blk);
36
+ ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
37
+ assert(tgm->throttle_state);
38
+ if (bs) {
39
+ bdrv_drained_begin(bs);
40
+ }
41
+ throttle_group_unregister_tgm(tgm);
42
+ if (bs) {
43
+ bdrv_drained_end(bs);
44
+ }
45
}
46
47
/* should be called before blk_set_io_limits if a limit is set */
48
--
49
2.13.6
50
51
diff view generated by jsdifflib
[Qemu-devel] [PULL for-2.11-rc2 5/5] qemu-iotests: Test I/O limits with removable media
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: Alberto Garcia <berto@igalia.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
This test hotplugs a CD drive to a VM and checks that I/O limits can
3
"0x%u" format is very misleading, replace by "0x%x".
4
be set only when the drive has media inserted and that they are kept
5
when the media is replaced.
6
4
7
This also tests the removal of a device with valid I/O limits set but
5
Found running:
8
no media inserted. This involves deleting and disabling the limits
9
of a BlockBackend without BlockDriverState, a scenario that has been
10
crashing until the fixes from the last couple of patches.
11
6
12
[Python PEP8 fixup: "Don't use spaces are the = sign when used to
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
13
indicate a keyword argument or a default parameter value"
14
--Stefan]
15
8
16
Signed-off-by: Alberto Garcia <berto@igalia.com>
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
17
Reviewed-by: Max Reitz <mreitz@redhat.com>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
18
Message-id: 071eb397118ed207c5a7f01d58766e415ee18d6a.1510339534.git.berto@igalia.com
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
19
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
20
---
16
---
21
tests/qemu-iotests/093 | 62 ++++++++++++++++++++++++++++++++++++++++++++++
17
block/parallels-ext.c | 2 +-
22
tests/qemu-iotests/093.out | 4 +--
18
1 file changed, 1 insertion(+), 1 deletion(-)
23
2 files changed, 64 insertions(+), 2 deletions(-)
24
19
25
diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
26
index XXXXXXX..XXXXXXX 100755
27
--- a/tests/qemu-iotests/093
28
+++ b/tests/qemu-iotests/093
29
@@ -XXX,XX +XXX,XX @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
30
groupname = "group%d" % i
31
self.verify_name(devname, groupname)
32
33
+class ThrottleTestRemovableMedia(iotests.QMPTestCase):
34
+ def setUp(self):
35
+ self.vm = iotests.VM()
36
+ if iotests.qemu_default_machine == 's390-ccw-virtio':
37
+ self.vm.add_device("virtio-scsi-ccw,id=virtio-scsi")
38
+ else:
39
+ self.vm.add_device("virtio-scsi-pci,id=virtio-scsi")
40
+ self.vm.launch()
41
+
42
+ def tearDown(self):
43
+ self.vm.shutdown()
44
+
45
+ def test_removable_media(self):
46
+ # Add a couple of dummy nodes named cd0 and cd1
47
+ result = self.vm.qmp("blockdev-add", driver="null-aio",
48
+ node_name="cd0")
49
+ self.assert_qmp(result, 'return', {})
50
+ result = self.vm.qmp("blockdev-add", driver="null-aio",
51
+ node_name="cd1")
52
+ self.assert_qmp(result, 'return', {})
53
+
54
+ # Attach a CD drive with cd0 inserted
55
+ result = self.vm.qmp("device_add", driver="scsi-cd",
56
+ id="dev0", drive="cd0")
57
+ self.assert_qmp(result, 'return', {})
58
+
59
+ # Set I/O limits
60
+ args = { "id": "dev0", "iops": 100, "iops_rd": 0, "iops_wr": 0,
61
+ "bps": 50, "bps_rd": 0, "bps_wr": 0 }
62
+ result = self.vm.qmp("block_set_io_throttle", conv_keys=False, **args)
63
+ self.assert_qmp(result, 'return', {})
64
+
65
+ # Check that the I/O limits have been set
66
+ result = self.vm.qmp("query-block")
67
+ self.assert_qmp(result, 'return[0]/inserted/iops', 100)
68
+ self.assert_qmp(result, 'return[0]/inserted/bps', 50)
69
+
70
+ # Now eject cd0 and insert cd1
71
+ result = self.vm.qmp("blockdev-open-tray", id='dev0')
72
+ self.assert_qmp(result, 'return', {})
73
+ result = self.vm.qmp("x-blockdev-remove-medium", id='dev0')
74
+ self.assert_qmp(result, 'return', {})
75
+ result = self.vm.qmp("x-blockdev-insert-medium", id='dev0', node_name='cd1')
76
+ self.assert_qmp(result, 'return', {})
77
+
78
+ # Check that the I/O limits are still the same
79
+ result = self.vm.qmp("query-block")
80
+ self.assert_qmp(result, 'return[0]/inserted/iops', 100)
81
+ self.assert_qmp(result, 'return[0]/inserted/bps', 50)
82
+
83
+ # Eject cd1
84
+ result = self.vm.qmp("x-blockdev-remove-medium", id='dev0')
85
+ self.assert_qmp(result, 'return', {})
86
+
87
+ # Check that we can't set limits if the device has no medium
88
+ result = self.vm.qmp("block_set_io_throttle", conv_keys=False, **args)
89
+ self.assert_qmp(result, 'error/class', 'GenericError')
90
+
91
+ # Remove the CD drive
92
+ result = self.vm.qmp("device_del", id='dev0')
93
+ self.assert_qmp(result, 'return', {})
94
+
95
96
if __name__ == '__main__':
97
iotests.main(supported_fmts=["raw"])
98
diff --git a/tests/qemu-iotests/093.out b/tests/qemu-iotests/093.out
99
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
100
--- a/tests/qemu-iotests/093.out
22
--- a/block/parallels-ext.c
101
+++ b/tests/qemu-iotests/093.out
23
+++ b/block/parallels-ext.c
102
@@ -XXX,XX +XXX,XX @@
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
103
-.......
25
break;
104
+........
26
105
----------------------------------------------------------------------
27
default:
106
-Ran 7 tests
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
107
+Ran 8 tests
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
108
30
goto fail;
109
OK
31
}
32
110
--
33
--
111
2.13.6
34
2.35.1
112
35
113
36
diff view generated by jsdifflib
[Qemu-devel] [PULL for-2.11-rc2 4/5] block: Leave valid throttle timers when removing a BDS from a backend
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
From: Alberto Garcia <berto@igalia.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
If a BlockBackend has I/O limits set then its ThrottleGroupMember
3
"0x%u" format is very misleading, replace by "0x%x".
4
structure uses the AioContext from its attached BlockDriverState.
5
Those two contexts must be kept in sync manually. This is not
6
ideal and will be fixed in the future by removing the throttling
7
configuration from the BlockBackend and storing it in an implicit
8
filter node instead, but for now we have to live with this.
9
4
10
When you remove the BlockDriverState from the backend then the
5
Found running:
11
throttle timers are destroyed. If a new BlockDriverState is later
12
inserted then they are created again using the new AioContext.
13
6
14
There are a couple of problems with this:
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
15
8
16
a) The code manipulates the timers directly, leaving the
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
17
ThrottleGroupMember.aio_context field in an inconsisent state.
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
18
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
19
b) If you remove the I/O limits (e.g by destroying the backend)
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
20
when the timers are gone then throttle_group_unregister_tgm()
21
will attempt to destroy them again, crashing QEMU.
22
23
While b) could be fixed easily by allowing the timers to be freed
24
twice, this would result in a situation in which we can no longer
25
guarantee that a valid ThrottleState has a valid AioContext and
26
timers.
27
28
This patch ensures that the timers and AioContext are always valid
29
when I/O limits are set, regardless of whether the BlockBackend has a
30
BlockDriverState inserted or not.
31
32
[Fixed "There'a" typo as suggested by Max Reitz <mreitz@redhat.com>
33
--Stefan]
34
35
Reported-by: sochin jiang <sochin.jiang@huawei.com>
36
Signed-off-by: Alberto Garcia <berto@igalia.com>
37
Reviewed-by: Max Reitz <mreitz@redhat.com>
38
Message-id: e089c66e7c20289b046d782cea4373b765c5bc1d.1510339534.git.berto@igalia.com
39
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
40
---
14
---
41
block/block-backend.c | 16 ++++++++--------
15
hw/i386/sgx.c | 2 +-
42
1 file changed, 8 insertions(+), 8 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(-)
43
20
44
diff --git a/block/block-backend.c b/block/block-backend.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
45
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
46
--- a/block/block-backend.c
23
--- a/hw/i386/sgx.c
47
+++ b/block/block-backend.c
24
+++ b/hw/i386/sgx.c
48
@@ -XXX,XX +XXX,XX @@ BlockBackend *blk_by_public(BlockBackendPublic *public)
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
49
*/
50
void blk_remove_bs(BlockBackend *blk)
51
{
52
+ ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
53
BlockDriverState *bs;
54
- ThrottleTimers *tt;
55
56
notifier_list_notify(&blk->remove_bs_notifiers, blk);
57
- if (blk->public.throttle_group_member.throttle_state) {
58
- tt = &blk->public.throttle_group_member.throttle_timers;
59
+ if (tgm->throttle_state) {
60
bs = blk_bs(blk);
61
bdrv_drained_begin(bs);
62
- throttle_timers_detach_aio_context(tt);
63
+ throttle_group_detach_aio_context(tgm);
64
+ throttle_group_attach_aio_context(tgm, qemu_get_aio_context());
65
bdrv_drained_end(bs);
66
}
26
}
67
27
68
@@ -XXX,XX +XXX,XX @@ void blk_remove_bs(BlockBackend *blk)
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
69
*/
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
70
int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp)
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
71
{
31
sgx_epc->size);
72
+ ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
32
exit(EXIT_FAILURE);
73
blk->root = bdrv_root_attach_child(bs, "root", &child_root,
74
blk->perm, blk->shared_perm, blk, errp);
75
if (blk->root == NULL) {
76
@@ -XXX,XX +XXX,XX @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp)
77
bdrv_ref(bs);
78
79
notifier_list_notify(&blk->insert_bs_notifiers, blk);
80
- if (blk->public.throttle_group_member.throttle_state) {
81
- throttle_timers_attach_aio_context(
82
- &blk->public.throttle_group_member.throttle_timers,
83
- bdrv_get_aio_context(bs));
84
+ if (tgm->throttle_state) {
85
+ throttle_group_detach_aio_context(tgm);
86
+ throttle_group_attach_aio_context(tgm, bdrv_get_aio_context(bs));
87
}
33
}
88
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
89
return 0;
35
index XXXXXXX..XXXXXXX 100644
36
--- a/hw/i386/trace-events
37
+++ b/hw/i386/trace-events
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
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
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
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
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"
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"
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"
90
--
101
--
91
2.13.6
102
2.35.1
92
103
93
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.