[Qemu-devel] [PULL 0/2] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit b05631954d6dfe93340d516660397e2c1a2a5dd6:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180131' into staging (2018-01-31 15:50:29 +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/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 45a79646ea746fa3f32083d0aa70512aae29f6b3:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
iotests: Make 200 run on tmpfs (2018-01-31 22:37:00 -0500)
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Block patches
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
Max Reitz (1):
22
Philippe Mathieu-Daudé (2):
18
iotests: Make 200 run on tmpfs
23
block: Fix misleading hexadecimal format
24
hw: Fix misleading hexadecimal format
19
25
20
Murilo Opsfelder Araujo (1):
26
block/parallels-ext.c | 2 +-
21
block/ssh: fix possible segmentation fault when .desc is not
27
hw/i386/sgx.c | 2 +-
22
null-terminated
28
hw/i386/trace-events | 6 +++---
23
29
hw/misc/trace-events | 4 ++--
24
block/ssh.c | 1 +
30
hw/scsi/trace-events | 4 ++--
25
tests/qemu-iotests/200 | 2 +-
31
5 files changed, 9 insertions(+), 9 deletions(-)
26
2 files changed, 2 insertions(+), 1 deletion(-)
27
32
28
--
33
--
29
2.9.5
34
2.35.1
30
35
31
diff view generated by jsdifflib
[Qemu-devel] [PULL 2/2] iotests: Make 200 run on tmpfs
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: Max Reitz <mreitz@redhat.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
200 currently fails on tmpfs because it sets cache=none. However,
3
"0x%u" format is very misleading, replace by "0x%x".
4
without that (and aio=native), the test still works now and it fails
5
before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6). So
6
we can probably remove the aio=native safely, and replace cache=none by
7
cache=$CACHEMODE.
8
4
9
Signed-off-by: Max Reitz <mreitz@redhat.com>
5
Found running:
10
Reviewed-by: Jeff Cody <jcody@redhat.com>
6
11
Message-id: 20180117135015.15051-1-mreitz@redhat.com
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
12
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: 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>
13
---
16
---
14
tests/qemu-iotests/200 | 2 +-
17
block/parallels-ext.c | 2 +-
15
1 file changed, 1 insertion(+), 1 deletion(-)
18
1 file changed, 1 insertion(+), 1 deletion(-)
16
19
17
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
18
index XXXXXXX..XXXXXXX 100755
21
index XXXXXXX..XXXXXXX 100644
19
--- a/tests/qemu-iotests/200
22
--- a/block/parallels-ext.c
20
+++ b/tests/qemu-iotests/200
23
+++ b/block/parallels-ext.c
21
@@ -XXX,XX +XXX,XX @@ qemu_comm_method="qmp"
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
22
_launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \
25
break;
23
-object iothread,id=iothread0 \
26
24
-device virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \
27
default:
25
- -drive file="${TEST_IMG}",media=disk,if=none,cache=none,id=drive_sysdisk,aio=native,format=$IMGFMT \
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
26
+ -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
27
-device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0
30
goto fail;
28
h1=$QEMU_HANDLE
31
}
29
32
30
--
33
--
31
2.9.5
34
2.35.1
32
35
33
36
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
From: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
This patch prevents a possible segmentation fault when .desc members are checked
3
"0x%u" format is very misleading, replace by "0x%x".
4
against NULL.
5
4
6
The ssh_runtime_opts was added by commit
5
Found running:
7
8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime
8
options").
9
6
10
This fix was inspired by
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
11
http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html.
12
8
13
Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options")
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
14
Cc: Max Reitz <mreitz@redhat.com>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
15
Cc: Eric Blake <eblake@redhat.com>
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
16
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
17
Reviewed-by: Eric Blake <eblake@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
18
Reviewed-by: Jeff Cody <jcody@redhat.com>
19
Signed-off-by: Jeff Cody <jcody@redhat.com>
20
---
14
---
21
block/ssh.c | 1 +
15
hw/i386/sgx.c | 2 +-
22
1 file changed, 1 insertion(+)
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(-)
23
20
24
diff --git a/block/ssh.c b/block/ssh.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
25
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
26
--- a/block/ssh.c
23
--- a/hw/i386/sgx.c
27
+++ b/block/ssh.c
24
+++ b/hw/i386/sgx.c
28
@@ -XXX,XX +XXX,XX @@ static QemuOptsList ssh_runtime_opts = {
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
29
.type = QEMU_OPT_STRING,
26
}
30
.help = "Defines how and what to check the host key against",
27
31
},
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
32
+ { /* end of list */ }
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
33
},
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
34
};
31
sgx_epc->size);
35
32
exit(EXIT_FAILURE);
33
}
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
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"
36
--
101
--
37
2.9.5
102
2.35.1
38
103
39
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.