diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2023-12-26 06:06:50 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2023-12-26 06:06:50 -0500 |
| commit | b0839e87afe97da54955e5d6d7fe37cc52f5be01 (patch) | |
| tree | 574324b116d9bb6c5250da2aea5e4b59a5f7b248 | |
| parent | 0d138a9b53730cf2b286b845256aac13c5511496 (diff) | |
| parent | 4918712fb1c34ae43361b402642e426be85a789e (diff) | |
| download | focaccia-qemu-b0839e87afe97da54955e5d6d7fe37cc52f5be01.tar.gz focaccia-qemu-b0839e87afe97da54955e5d6d7fe37cc52f5be01.zip | |
Merge tag 'dirtylimit-dirtyrate-pull-request-20231225' of https://github.com/newfriday/qemu into staging
dirtylimit dirtyrate pull request 20231225 Nitpick about an unused parameter Please apply, thanks, Yong # -----BEGIN PGP SIGNATURE----- # # iQJKBAABCAA0FiEEaF0CINwmSCgVLlfC3/Ij1rP+y5wFAmWJVtkWHHlvbmcuaHVh # bmdAc21hcnR4LmNvbQAKCRDf8iPWs/7LnLexEADjuQ7dtbv2vq1ksqDq6fct++FK # sGPe6P9UAyJrB0qxW3jKRn2P4E/xiPHpmi+BbOOu8PppeZt86NFlzun681vMpkKu # d3oAlwRtX8eklk3oub+yBXzkAfsGr+EHEWms/12ATsd6apItxi47zUUw/2aznujz # TlZR7qOD1kjvPHOVnP07fQ3NYiPIITpzSqVgo3fxE+upmb+dnELIkyGTAvJY2Pjz # Uh4CtG/sQq8OJJwUn1TFmhB1Ujw9oo8v/lOtIpsxfcKtQcAwyvgmyfndOMZ/h6O3 # ri3axypg8PyGyidYEh0JSoR3OVUIt5eoqPNp+sQTNeZsjTIwKjpBGUOLXbIA56nB # Z/ZRbxSKj+JRD9qQZ2NODE1QurgEuT51aWkEeBEsx0OtUINcjZkwWeQmiasJQw1T # 4z4Hez0ipuET9MmeTbWkVh9rO3Bsxi9QxiXEiN6YPNqTqLhwomXU+MIlrCsZQzjB # l4Jij9byeWL9ntx3qwtSWJGHV6Qql16UkPo+c2Co/q2rdx/FqiYrMgCtLee1yo5n # lSCKmrVMLaLyQv7jnLY8txhU7/CXNnwij4YSgfi7nujOgM6L3uwYc9Tp5kcQHE/b # o/Mr6oOi79Z+rdByk4pPUKaJV7FnbWMoUgjsqWPJgedGt0K9StRsXCGR1wYMUVdU # R8Dv0IZyyGuSf6MhNw== # =Y00D # -----END PGP SIGNATURE----- # gpg: Signature made Mon 25 Dec 2023 05:18:01 EST # gpg: using RSA key 685D0220DC264828152E57C2DFF223D6B3FECB9C # gpg: issuer "yong.huang@smartx.com" # gpg: Good signature from "Yong Huang <yong.huang@smartx.com>" [unknown] # gpg: WARNING: The key's User ID is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 685D 0220 DC26 4828 152E 57C2 DFF2 23D6 B3FE CB9C * tag 'dirtylimit-dirtyrate-pull-request-20231225' of https://github.com/newfriday/qemu: migration/dirtyrate: Remove an extra parameter Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | migration/dirtyrate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 036ac017fc..62d86b8be2 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -129,8 +129,7 @@ static DirtyPageRecord *vcpu_dirty_stat_alloc(VcpuStat *stat) return g_new0(DirtyPageRecord, nvcpu); } -static void vcpu_dirty_stat_collect(VcpuStat *stat, - DirtyPageRecord *records, +static void vcpu_dirty_stat_collect(DirtyPageRecord *records, bool start) { CPUState *cpu; @@ -158,7 +157,7 @@ retry: WITH_QEMU_LOCK_GUARD(&qemu_cpu_list_lock) { gen_id = cpu_list_generation_id_get(); records = vcpu_dirty_stat_alloc(stat); - vcpu_dirty_stat_collect(stat, records, true); + vcpu_dirty_stat_collect(records, true); } duration = dirty_stat_wait(calc_time_ms, init_time_ms); @@ -172,7 +171,7 @@ retry: cpu_list_unlock(); goto retry; } - vcpu_dirty_stat_collect(stat, records, false); + vcpu_dirty_stat_collect(records, false); } for (i = 0; i < stat->nvcpu; i++) { |