| 1 | The following changes since commit 0b5e750bea635b167eb03d86c3d9a09bbd43bc06: | 1 | The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-02-12 10:53:37 +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 42824b4d16da56a50ff4027f6cd22378e0e2666e: | 9 | for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0: |
| 10 | 10 | ||
| 11 | virtio-blk: set correct config size for the host driver (2019-02-13 16:18:17 +0800) | 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 | Fix a virtio-blk migration regression. | 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 | Changpeng Liu (1): | 22 | Philippe Mathieu-Daudé (2): |
| 21 | virtio-blk: set correct config size for the host driver | 23 | block: Fix misleading hexadecimal format |
| 24 | hw: Fix misleading hexadecimal format | ||
| 22 | 25 | ||
| 23 | hw/block/virtio-blk.c | 13 +++++++++---- | 26 | block/parallels-ext.c | 2 +- |
| 24 | 1 file changed, 9 insertions(+), 4 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(-) | ||
| 25 | 32 | ||
| 26 | -- | 33 | -- |
| 27 | 2.20.1 | 34 | 2.35.1 |
| 28 | 35 | ||
| 29 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Philippe Mathieu-Daudé <f4bug@amsat.org> | ||
| 1 | 2 | ||
| 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 |
| 1 | From: Changpeng Liu <changpeng.liu@intel.com> | 1 | From: Philippe Mathieu-Daudé <f4bug@amsat.org> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features | 3 | "0x%u" format is very misleading, replace by "0x%x". |
| 4 | support" added fields to struct virtio_blk_config. This changes | ||
| 5 | the size of the config space and breaks migration from QEMU 3.1 | ||
| 6 | and older: | ||
| 7 | 4 | ||
| 8 | qemu-system-ppc64: get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0 | 5 | Found running: |
| 9 | qemu-system-ppc64: Failed to load PCIDevice:config | ||
| 10 | qemu-system-ppc64: Failed to load virtio-blk:virtio | ||
| 11 | qemu-system-ppc64: error while loading state for instance 0x0 of device 'pci@800000020000000:01.0/virtio-blk' | ||
| 12 | qemu-system-ppc64: load of migration failed: Invalid argument | ||
| 13 | 6 | ||
| 14 | Since virtio-blk doesn't support the "discard" and "write zeroes" | 7 | $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/ |
| 15 | features, it shouldn't even expose the associated fields in the | ||
| 16 | config space actually. Just include all fields up to num_queues to | ||
| 17 | match QEMU 3.1 and older. | ||
| 18 | 8 | ||
| 19 | Signed-off-by: Changpeng Liu <changpeng.liu@intel.com> | 9 | Inspired-by: Richard Henderson <richard.henderson@linaro.org> |
| 20 | Reviewed-by: Michael S. Tsirkin <mst@redhat.com> | 10 | Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> |
| 21 | Message-id: 1550022537-27565-1-git-send-email-changpeng.liu@intel.com | 11 | Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> |
| 22 | Message-Id: <1550022537-27565-1-git-send-email-changpeng.liu@intel.com> | 12 | Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com |
| 23 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 13 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 24 | --- | 14 | --- |
| 25 | hw/block/virtio-blk.c | 13 +++++++++---- | 15 | hw/i386/sgx.c | 2 +- |
| 26 | 1 file changed, 9 insertions(+), 4 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(-) | ||
| 27 | 20 | ||
| 28 | diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c | 21 | diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c |
| 29 | index XXXXXXX..XXXXXXX 100644 | 22 | index XXXXXXX..XXXXXXX 100644 |
| 30 | --- a/hw/block/virtio-blk.c | 23 | --- a/hw/i386/sgx.c |
| 31 | +++ b/hw/block/virtio-blk.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 | ||
| 32 | @@ -XXX,XX +XXX,XX @@ | 61 | @@ -XXX,XX +XXX,XX @@ |
| 33 | #include "hw/virtio/virtio-bus.h" | 62 | # See docs/devel/tracing.rst for syntax documentation. |
| 34 | #include "hw/virtio/virtio-access.h" | 63 | |
| 35 | 64 | # allwinner-cpucfg.c | |
| 36 | +/* We don't support discard yet, hide associated config fields. */ | 65 | -allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32 |
| 37 | +#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \ | 66 | +allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32 |
| 38 | + max_discard_sectors) | 67 | allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 |
| 39 | + | 68 | allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 |
| 40 | static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq, | 69 | |
| 41 | VirtIOBlockReq *req) | 70 | @@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08 |
| 42 | { | 71 | |
| 43 | @@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) | 72 | # mos6522.c |
| 44 | blkcfg.alignment_offset = 0; | 73 | mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d" |
| 45 | blkcfg.wce = blk_enable_write_cache(s->blk); | 74 | -mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64 |
| 46 | virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues); | 75 | +mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64 |
| 47 | - memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); | 76 | mos6522_set_sr_int(void) "set sr_int" |
| 48 | + memcpy(config, &blkcfg, VIRTIO_BLK_CFG_SIZE); | 77 | mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64 |
| 49 | + QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg)); | 78 | mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x" |
| 50 | } | 79 | diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events |
| 51 | 80 | index XXXXXXX..XXXXXXX 100644 | |
| 52 | static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) | 81 | --- a/hw/scsi/trace-events |
| 53 | @@ -XXX,XX +XXX,XX @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) | 82 | +++ b/hw/scsi/trace-events |
| 54 | VirtIOBlock *s = VIRTIO_BLK(vdev); | 83 | @@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt" |
| 55 | struct virtio_blk_config blkcfg; | 84 | lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32 |
| 56 | 85 | lsi_do_dma_unavailable(void) "DMA no data available" | |
| 57 | - memcpy(&blkcfg, config, sizeof(blkcfg)); | 86 | lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d" |
| 58 | + memcpy(&blkcfg, config, VIRTIO_BLK_CFG_SIZE); | 87 | -lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32 |
| 59 | + QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg)); | 88 | +lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32 |
| 60 | 89 | lsi_add_msg_byte_error(void) "MSG IN data too long" | |
| 61 | aio_context_acquire(blk_get_aio_context(s->blk)); | 90 | lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x" |
| 62 | blk_set_enable_write_cache(s->blk, blkcfg.wce != 0); | 91 | lsi_reselect(int id) "Reselected target %d" |
| 63 | @@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) | 92 | @@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation" |
| 64 | return; | 93 | lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)" |
| 65 | } | 94 | lsi_do_msgout_ignored(const char *msg) "%s (ignored)" |
| 66 | 95 | lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x" | |
| 67 | - virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, | 96 | -lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32 |
| 68 | - sizeof(struct virtio_blk_config)); | 97 | +lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32 |
| 69 | + virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, VIRTIO_BLK_CFG_SIZE); | 98 | lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32 |
| 70 | 99 | lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32 | |
| 71 | s->blk = conf->conf.blk; | 100 | lsi_do_msgout_select(int id) "Select LUN %d" |
| 72 | s->rq = NULL; | ||
| 73 | -- | 101 | -- |
| 74 | 2.20.1 | 102 | 2.35.1 |
| 75 | 103 | ||
| 76 | 104 | diff view generated by jsdifflib |