39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From d82b2052d61cd57fb2ebf53f633cb0ff272d16c3 Mon Sep 17 00:00:00 2001
|
|
From: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
Date: Sat, 25 Nov 2023 02:53:08 -0800
|
|
Subject: [PATCH] block: use 'unsigned' for in_flight field on driver state
|
|
|
|
cherry picked from commit 1b8f777673985af366de099ad4e41d334b36fb12
|
|
|
|
This patch makes in_flight field 'unsigned' for BDRVNBDState and
|
|
MirrorBlockJob. This matches the definition of this field on BDS
|
|
and is generically correct - we should never get negative value here.
|
|
|
|
Signed-off-by: Denis V. Lunev <den@openvz.org>
|
|
CC: John Snow <jsnow@redhat.com>
|
|
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
CC: Kevin Wolf <kwolf@redhat.com>
|
|
CC: Hanna Reitz <hreitz@redhat.com>
|
|
CC: Eric Blake <eblake@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
Signed-off-by: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
---
|
|
block/mirror.c | 2 +-
|
|
block/nbd.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/block/mirror.c b/block/mirror.c
|
|
index b7f0cba9b9..d1863565c4 100644
|
|
--- a/block/mirror.c
|
|
+++ b/block/mirror.c
|
|
@@ -72,7 +72,7 @@ typedef struct MirrorBlockJob {
|
|
|
|
uint64_t last_pause_ns;
|
|
unsigned long *in_flight_bitmap;
|
|
- int in_flight;
|
|
+ unsigned in_flight;
|
|
int64_t bytes_in_flight;
|
|
QTAILQ_HEAD(, MirrorOp) ops_in_flight;
|
|
int ret;
|
|
diff --git a/block/nbd.c b/block/nbd.c
|
|
index 33adfddc41..a543e68d2f 100644
|
|
--- a/block/nbd.c
|
|
+++ b/block/nbd.c
|
|
@@ -76,7 +76,7 @@ typedef struct BDRVNBDState {
|
|
CoQueue free_sema;
|
|
|
|
CoMutex receive_mutex;
|
|
- int in_flight;
|
|
+ unsigned in_flight;
|
|
NBDClientState state;
|
|
|
|
QEMUTimer *reconnect_delay_timer;
|
|
--
|
|
2.27.0
|
|
|