[PULL for-7.0 0/2] Block patches
[PULL v2 00/34] Block patches
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
1
The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1:
2
2
3
Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)
3
Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200812' into staging (2020-08-24 16:39:53 +0100)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
https://gitlab.com/stefanha/qemu.git tags/block-pull-request
7
https://github.com/XanClic/qemu.git tags/pull-block-2020-08-26
8
8
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
9
for you to fetch changes up to a5d3cfa2dc775e5d99f013703b8508f1d989d588:
10
10
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
11
iotests: Add tests for qcow2 images with extended L2 entries (2020-08-26 08:49:51 +0200)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Block patches:
15
15
- qcow2 subclusters (extended L2 entries)
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
16
20
----------------------------------------------------------------
17
----------------------------------------------------------------
18
v2:
19
- Fixed the shebang line in iotest 271
21
20
22
Philippe Mathieu-Daudé (2):
21
----------------------------------------------------------------
23
block: Fix misleading hexadecimal format
22
Alberto Garcia (34):
24
hw: Fix misleading hexadecimal format
23
qcow2: Make Qcow2AioTask store the full host offset
24
qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset()
25
qcow2: Add calculate_l2_meta()
26
qcow2: Split cluster_needs_cow() out of count_cow_clusters()
27
qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied()
28
qcow2: Add get_l2_entry() and set_l2_entry()
29
qcow2: Document the Extended L2 Entries feature
30
qcow2: Add dummy has_subclusters() function
31
qcow2: Add subcluster-related fields to BDRVQcow2State
32
qcow2: Add offset_to_sc_index()
33
qcow2: Add offset_into_subcluster() and size_to_subclusters()
34
qcow2: Add l2_entry_size()
35
qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap()
36
qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type()
37
qcow2: Add qcow2_get_subcluster_range_type()
38
qcow2: Add qcow2_cluster_is_allocated()
39
qcow2: Add cluster type parameter to qcow2_get_host_offset()
40
qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_*
41
qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC
42
qcow2: Add subcluster support to calculate_l2_meta()
43
qcow2: Add subcluster support to qcow2_get_host_offset()
44
qcow2: Add subcluster support to zero_in_l2_slice()
45
qcow2: Add subcluster support to discard_in_l2_slice()
46
qcow2: Add subcluster support to check_refcounts_l2()
47
qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2()
48
qcow2: Clear the L2 bitmap when allocating a compressed cluster
49
qcow2: Add subcluster support to handle_alloc_space()
50
qcow2: Add subcluster support to qcow2_co_pwrite_zeroes()
51
qcow2: Add subcluster support to qcow2_measure()
52
qcow2: Add prealloc field to QCowL2Meta
53
qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit
54
qcow2: Allow preallocation and backing files if extended_l2 is set
55
qcow2: Assert that expand_zero_clusters_in_l1() does not support
56
subclusters
57
iotests: Add tests for qcow2 images with extended L2 entries
25
58
26
block/parallels-ext.c | 2 +-
59
docs/interop/qcow2.txt | 68 ++-
27
hw/i386/sgx.c | 2 +-
60
docs/qcow2-cache.txt | 19 +-
28
hw/i386/trace-events | 6 +++---
61
qapi/block-core.json | 7 +
29
hw/misc/trace-events | 4 ++--
62
block/qcow2.h | 211 ++++++-
30
hw/scsi/trace-events | 4 ++--
63
include/block/block_int.h | 1 +
31
5 files changed, 9 insertions(+), 9 deletions(-)
64
block/qcow2-cluster.c | 906 +++++++++++++++++++++----------
65
block/qcow2-refcount.c | 47 +-
66
block/qcow2.c | 302 +++++++----
67
block/trace-events | 2 +-
68
tests/qemu-iotests/031.out | 8 +-
69
tests/qemu-iotests/036.out | 4 +-
70
tests/qemu-iotests/049.out | 102 ++--
71
tests/qemu-iotests/060.out | 3 +-
72
tests/qemu-iotests/061 | 6 +
73
tests/qemu-iotests/061.out | 25 +-
74
tests/qemu-iotests/065 | 12 +-
75
tests/qemu-iotests/082.out | 39 +-
76
tests/qemu-iotests/085.out | 38 +-
77
tests/qemu-iotests/144.out | 4 +-
78
tests/qemu-iotests/182.out | 2 +-
79
tests/qemu-iotests/185.out | 8 +-
80
tests/qemu-iotests/198 | 2 +
81
tests/qemu-iotests/206.out | 6 +-
82
tests/qemu-iotests/242.out | 5 +
83
tests/qemu-iotests/255.out | 8 +-
84
tests/qemu-iotests/271 | 901 ++++++++++++++++++++++++++++++
85
tests/qemu-iotests/271.out | 726 +++++++++++++++++++++++++
86
tests/qemu-iotests/274.out | 49 +-
87
tests/qemu-iotests/280.out | 2 +-
88
tests/qemu-iotests/291.out | 2 +
89
tests/qemu-iotests/302.out | 1 +
90
tests/qemu-iotests/303.out | 4 +-
91
tests/qemu-iotests/common.filter | 1 +
92
tests/qemu-iotests/group | 1 +
93
34 files changed, 2952 insertions(+), 570 deletions(-)
94
create mode 100755 tests/qemu-iotests/271
95
create mode 100644 tests/qemu-iotests/271.out
32
96
33
--
97
--
34
2.35.1
98
2.26.2
35
99
100
diff view generated by jsdifflib
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
Deleted patch
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
1
3
"0x%u" format is very misleading, replace by "0x%x".
4
5
Found running:
6
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>
16
---
17
block/parallels-ext.c | 2 +-
18
1 file changed, 1 insertion(+), 1 deletion(-)
19
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
21
index XXXXXXX..XXXXXXX 100644
22
--- a/block/parallels-ext.c
23
+++ b/block/parallels-ext.c
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
25
break;
26
27
default:
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
30
goto fail;
31
}
32
33
--
34
2.35.1
35
36
diff view generated by jsdifflib
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
Deleted patch
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
1
3
"0x%u" format is very misleading, replace by "0x%x".
4
5
Found running:
6
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
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>
14
---
15
hw/i386/sgx.c | 2 +-
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(-)
20
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
22
index XXXXXXX..XXXXXXX 100644
23
--- a/hw/i386/sgx.c
24
+++ b/hw/i386/sgx.c
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
26
}
27
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
31
sgx_epc->size);
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"
101
--
102
2.35.1
103
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.