[Qemu-devel] [PULL 0/2] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit 41feb5b955f0d7c9d071b2c5adbc404ae2895c7a:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging (2018-06-05 10:38:33 +0100)
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 68acc99f143b60ec4faa2903065b187d4d3c4bf3:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
sheepdog: remove huge BSS object (2018-06-05 10:15:12 -0400)
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Sheepdog 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
Paolo Bonzini (2):
22
Philippe Mathieu-Daudé (2):
18
sheepdog: cleanup repeated expression
23
block: Fix misleading hexadecimal format
19
sheepdog: remove huge BSS object
24
hw: Fix misleading hexadecimal format
20
25
21
block/sheepdog.c | 28 +++++++++++++++-------------
26
block/parallels-ext.c | 2 +-
22
1 file changed, 15 insertions(+), 13 deletions(-)
27
hw/i386/sgx.c | 2 +-
28
hw/i386/trace-events | 6 +++---
29
hw/misc/trace-events | 4 ++--
30
hw/scsi/trace-events | 4 ++--
31
5 files changed, 9 insertions(+), 9 deletions(-)
23
32
24
--
33
--
25
2.13.6
34
2.35.1
26
35
27
diff view generated by jsdifflib
[Qemu-devel] [PULL 2/2] sheepdog: remove huge BSS object
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: Paolo Bonzini <pbonzini@redhat.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
block/sheepdog.o has a 4M static variable that is 90% of QEMU's whole .bss
3
"0x%u" format is very misleading, replace by "0x%x".
4
section. Replace it with a heap-allocated block, and make it smaller too
5
since only the inode header is actually being used.
6
4
7
bss size goes down from 4464280 to 269976.
5
Found running:
8
6
9
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
10
Reviewed-by: Jeff Cody <jcody@redhat.com>
8
11
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
12
Message-Id: <20180523160721.14018-3-pbonzini@redhat.com>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
13
Signed-off-by: Jeff Cody <jcody@redhat.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
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
14
---
16
---
15
block/sheepdog.c | 22 ++++++++++++----------
17
block/parallels-ext.c | 2 +-
16
1 file changed, 12 insertions(+), 10 deletions(-)
18
1 file changed, 1 insertion(+), 1 deletion(-)
17
19
18
diff --git a/block/sheepdog.c b/block/sheepdog.c
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
19
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
20
--- a/block/sheepdog.c
22
--- a/block/parallels-ext.c
21
+++ b/block/sheepdog.c
23
+++ b/block/parallels-ext.c
22
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
23
QEMUSnapshotInfo *sn_tab = NULL;
25
break;
24
unsigned wlen, rlen;
26
25
int found = 0;
27
default:
26
- static SheepdogInode inode;
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
27
+ SheepdogInode *inode;
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
28
unsigned long *vdi_inuse;
30
goto fail;
29
unsigned int start_nr;
30
uint64_t hval;
31
uint32_t vid;
32
33
vdi_inuse = g_malloc(max);
34
+ inode = g_malloc(SD_INODE_HEADER_SIZE);
35
36
fd = connect_to_sdog(s, &local_err);
37
if (fd < 0) {
38
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
39
}
31
}
40
32
41
/* we don't need to read entire object */
42
- ret = read_object(fd, s->bs, (char *)&inode,
43
+ ret = read_object(fd, s->bs, (char *)inode,
44
vid_to_vdi_oid(vid),
45
0, SD_INODE_HEADER_SIZE, 0,
46
s->cache_flags);
47
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
48
continue;
49
}
50
51
- if (!strcmp(inode.name, s->name) && is_snapshot(&inode)) {
52
- sn_tab[found].date_sec = inode.snap_ctime >> 32;
53
- sn_tab[found].date_nsec = inode.snap_ctime & 0xffffffff;
54
- sn_tab[found].vm_state_size = inode.vm_state_size;
55
- sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec;
56
+ if (!strcmp(inode->name, s->name) && is_snapshot(inode)) {
57
+ sn_tab[found].date_sec = inode->snap_ctime >> 32;
58
+ sn_tab[found].date_nsec = inode->snap_ctime & 0xffffffff;
59
+ sn_tab[found].vm_state_size = inode->vm_state_size;
60
+ sn_tab[found].vm_clock_nsec = inode->vm_clock_nsec;
61
62
snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),
63
- "%" PRIu32, inode.snap_id);
64
+ "%" PRIu32, inode->snap_id);
65
pstrcpy(sn_tab[found].name,
66
- MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),
67
- inode.tag);
68
+ MIN(sizeof(sn_tab[found].name), sizeof(inode->tag)),
69
+ inode->tag);
70
found++;
71
}
72
}
73
@@ -XXX,XX +XXX,XX @@ out:
74
*psn_tab = sn_tab;
75
76
g_free(vdi_inuse);
77
+ g_free(inode);
78
79
if (ret < 0) {
80
return ret;
81
--
33
--
82
2.13.6
34
2.35.1
83
35
84
36
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/2] sheepdog: cleanup repeated expression
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
From: Paolo Bonzini <pbonzini@redhat.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
The expression "SD_INODE_SIZE - sizeof(inode.data_vdi_id)" already has a macro
3
"0x%u" format is very misleading, replace by "0x%x".
4
defined for the same value (though with a nicer definition using offsetof).
5
Replace it.
6
4
7
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
5
Found running:
8
Reviewed-by: Fam Zheng <famz@redhat.com>
6
9
Reviewed-by: Jeff Cody <jcody@redhat.com>
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
10
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
8
11
Message-Id: <20180523160721.14018-2-pbonzini@redhat.com>
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
12
Signed-off-by: Jeff Cody <jcody@redhat.com>
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>
13
---
14
---
14
block/sheepdog.c | 6 +++---
15
hw/i386/sgx.c | 2 +-
15
1 file changed, 3 insertions(+), 3 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(-)
16
20
17
diff --git a/block/sheepdog.c b/block/sheepdog.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
18
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
19
--- a/block/sheepdog.c
23
--- a/hw/i386/sgx.c
20
+++ b/block/sheepdog.c
24
+++ b/hw/i386/sgx.c
21
@@ -XXX,XX +XXX,XX @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
22
}
26
}
23
27
24
/* we don't need to update entire object */
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
25
- datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
26
+ datalen = SD_INODE_HEADER_SIZE;
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
27
s->inode.vdi_size = offset;
31
sgx_epc->size);
28
ret = write_object(fd, s->bs, (char *)&s->inode,
32
exit(EXIT_FAILURE);
29
vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
33
}
30
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
31
*/
35
index XXXXXXX..XXXXXXX 100644
32
strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));
36
--- a/hw/i386/trace-events
33
/* we don't need to update entire object */
37
+++ b/hw/i386/trace-events
34
- datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
35
+ datalen = SD_INODE_HEADER_SIZE;
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
36
inode = g_malloc(datalen);
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
37
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
38
/* refresh inode. */
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"
39
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
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"
40
/* we don't need to read entire object */
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
41
ret = read_object(fd, s->bs, (char *)&inode,
45
vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
42
vid_to_vdi_oid(vid),
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"
43
- 0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0,
47
vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
44
+ 0, SD_INODE_HEADER_SIZE, 0,
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)"
45
s->cache_flags);
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
46
50
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
47
if (ret) {
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"
48
--
101
--
49
2.13.6
102
2.35.1
50
103
51
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.