[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] ed8b28: migration: fix bad indentation in err
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] ed8b28: migration: fix bad indentation in error_report() |
|
Date: |
Thu, 07 May 2020 12:00:29 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: ed8b2828ccc9f94b2ea846a2adb6790edab393c3
https://github.com/qemu/qemu/commit/ed8b2828ccc9f94b2ea846a2adb6790edab393c3
Author: Mao Zhongyi <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/migration.c
Log Message:
-----------
migration: fix bad indentation in error_report()
bad indentation conflicts with CODING_STYLE doc.
Signed-off-by: Mao Zhongyi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: 2ee30cf078006f60bb59af8090a238e98dc7cfe5
https://github.com/qemu/qemu/commit/2ee30cf078006f60bb59af8090a238e98dc7cfe5
Author: Mao Zhongyi <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/migration.c
Log Message:
-----------
migration/migration: improve error reporting for migrate parameters
use QERR_INVALID_PARAMETER_VALUE instead of
"Parameter '%s' expects" for consistency.
Signed-off-by: Mao Zhongyi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: f96c6a8736517af2a2d9e1fae3c1368d5b9adc4a
https://github.com/qemu/qemu/commit/f96c6a8736517af2a2d9e1fae3c1368d5b9adc4a
Author: Mao Zhongyi <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M monitor/hmp-cmds.c
Log Message:
-----------
monitor/hmp-cmds: add hmp_handle_error() for hmp_migrate_set_speed()
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: 7ac5529afba7b4e9c4d9d1cbeb2b607208af97c1
https://github.com/qemu/qemu/commit/7ac5529afba7b4e9c4d9d1cbeb2b607208af97c1
Author: Mao Zhongyi <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/migration.c
M monitor/hmp-cmds.c
Log Message:
-----------
migration: move the units of migrate parameters from milliseconds to ms
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: 979da8b357903ee8a43017cbf640f43460d1e2f0
https://github.com/qemu/qemu/commit/979da8b357903ee8a43017cbf640f43460d1e2f0
Author: Marc-André Lureau <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M docs/devel/migration.rst
Log Message:
-----------
docs/devel/migration: start a debugging section
Explain how to use analyze-migration.py, this may help.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: 58602676dfd00f519248d4936b0711b7967cbf62
https://github.com/qemu/qemu/commit/58602676dfd00f519248d4936b0711b7967cbf62
Author: Philippe Mathieu-Daudé <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/colo.c
Log Message:
-----------
migration/colo: Add missing error-propagation code
Running the coccinelle script produced:
$ spatch \
--macro-file scripts/cocci-macro-file.h --include-headers \
--sp-file scripts/coccinelle/find-missing-error_propagate.cocci \
--keep-comments --smpl-spacing --dir .
HANDLING: ./migration/colo.c
[[manual check required: error_propagate() might be missing in
migrate_set_block_enabled() ./migration/colo.c:439:4]]
Add the missing error_propagate() after review.
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: cbbf818224faf5ede75c876e4900c9f8e6b6c0db
https://github.com/qemu/qemu/commit/cbbf818224faf5ede75c876e4900c9f8e6b6c0db
Author: Keqian Zhu <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/migration.c
M migration/ram.c
M monitor/hmp-cmds.c
M qapi/migration.json
Log Message:
-----------
migration/throttle: Add cpu-throttle-tailslow migration parameter
At the tail stage of throttling, the Guest is very sensitive to
CPU percentage while the @cpu-throttle-increment is excessive
usually at tail stage.
If this parameter is true, we will compute the ideal CPU percentage
used by the Guest, which may exactly make the dirty rate match the
dirty rate threshold. Then we will choose a smaller throttle increment
between the one specified by @cpu-throttle-increment and the one
generated by ideal CPU percentage.
Therefore, it is compatible to traditional throttling, meanwhile
the throttle increment won't be excessive at tail stage. This may
make migration time longer, and is disabled by default.
Signed-off-by: Keqian Zhu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: ddf35bdf0ab4282dfc6c326da98b54d84f140a68
https://github.com/qemu/qemu/commit/ddf35bdf0ab4282dfc6c326da98b54d84f140a68
Author: David Hildenbrand <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/ram.c
Log Message:
-----------
migration/ram: Consolidate variable reset after placement in
ram_load_postcopy()
Let's consolidate resetting the variables.
Cc: "Dr. David Alan Gilbert" <address@hidden>
Cc: Juan Quintela <address@hidden>
Cc: Peter Xu <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Fixup for context conflicts with 91ba442
Commit: 59c59c67ee6b0327ae932deb303caa47919aeb1e
https://github.com/qemu/qemu/commit/59c59c67ee6b0327ae932deb303caa47919aeb1e
Author: Pan Nengyuan <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/rdma.c
Log Message:
-----------
migration/rdma: fix a memleak on error path in rdma_start_incoming_migration
'rdma->host' is malloced in qemu_rdma_data_init, but forgot to free on the error
path in rdma_start_incoming_migration(), this patch fix that.
The leak stack:
Direct leak of 2 byte(s) in 1 object(s) allocated from:
#0 0x7fb7add18ae8 in __interceptor_malloc (/lib64/libasan.so.5+0xefae8)
#1 0x7fb7ad0df1d5 in g_malloc (/lib64/libglib-2.0.so.0+0x531d5)
#2 0x7fb7ad0f8b32 in g_strdup (/lib64/libglib-2.0.so.0+0x6cb32)
#3 0x55a0464a0f6f in qemu_rdma_data_init /mnt/sdb/qemu/migration/rdma.c:2647
#4 0x55a0464b0e76 in rdma_start_incoming_migration
/mnt/sdb/qemu/migration/rdma.c:4020
#5 0x55a0463f898a in qemu_start_incoming_migration
/mnt/sdb/qemu/migration/migration.c:365
#6 0x55a0458c75d3 in qemu_init /mnt/sdb/qemu/softmmu/vl.c:4438
#7 0x55a046a3d811 in main /mnt/sdb/qemu/softmmu/main.c:48
#8 0x7fb7a8417872 in __libc_start_main (/lib64/libc.so.6+0x23872)
#9 0x55a04536b26d in _start
(/mnt/sdb/qemu/build/x86_64-softmmu/qemu-system-x86_64+0x286926d)
Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: e460a4b1a4c0e0aeea2c56bfc2407a9a1d1a3ae2
https://github.com/qemu/qemu/commit/e460a4b1a4c0e0aeea2c56bfc2407a9a1d1a3ae2
Author: Wei Wang <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/migration.c
M migration/ram.c
M monitor/hmp-cmds.c
M qapi/migration.json
Log Message:
-----------
migration/xbzrle: add encoding rate
Users may need to check the xbzrle encoding rate to know if the guest
memory is xbzrle encoding-friendly, and dynamically turn off the
encoding if the encoding rate is low.
Signed-off-by: Yi Sun <address@hidden>
Signed-off-by: Wei Wang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: ad31b8af73b8c5df62bd5c82fb543e44aa856cd4
https://github.com/qemu/qemu/commit/ad31b8af73b8c5df62bd5c82fb543e44aa856cd4
Author: Pan Nengyuan <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/multifd.c
Log Message:
-----------
migration/multifd: fix memleaks in multifd_new_send_channel_async
When error happen in multifd_new_send_channel_async, 'sioc' will not be used
to create the multifd_send_thread. Let's free it to avoid a memleak. And also
do error_free after migrate_set_error() to avoid another leak in the same place.
The leak stack:
Direct leak of 2880 byte(s) in 8 object(s) allocated from:
#0 0x7f20b5118ae8 in __interceptor_malloc (/lib64/libasan.so.5+0xefae8)
#1 0x7f20b44df1d5 in g_malloc (/lib64/libglib-2.0.so.0+0x531d5)
#2 0x564133bce18b in object_new_with_type
/mnt/sdb/backup/qemu/qom/object.c:683
#3 0x564133eea950 in qio_channel_socket_new
/mnt/sdb/backup/qemu/io/channel-socket.c:56
#4 0x5641339cfe4f in socket_send_channel_create
/mnt/sdb/backup/qemu/migration/socket.c:37
#5 0x564133a10328 in multifd_save_setup
/mnt/sdb/backup/qemu/migration/multifd.c:772
#6 0x5641339cebed in migrate_fd_connect
/mnt/sdb/backup/qemu/migration/migration.c:3530
#7 0x5641339d15e4 in migration_channel_connect
/mnt/sdb/backup/qemu/migration/channel.c:92
#8 0x5641339cf5b7 in socket_outgoing_migration
/mnt/sdb/backup/qemu/migration/socket.c:108
Direct leak of 384 byte(s) in 8 object(s) allocated from:
#0 0x7f20b5118cf0 in calloc (/lib64/libasan.so.5+0xefcf0)
#1 0x7f20b44df22d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5322d)
#2 0x56413406fc17 in error_setv /mnt/sdb/backup/qemu/util/error.c:61
#3 0x564134070464 in error_setg_errno_internal
/mnt/sdb/backup/qemu/util/error.c:109
#4 0x5641340851be in inet_connect_addr
/mnt/sdb/backup/qemu/util/qemu-sockets.c:379
#5 0x5641340851be in inet_connect_saddr
/mnt/sdb/backup/qemu/util/qemu-sockets.c:458
#6 0x5641340870ab in socket_connect
/mnt/sdb/backup/qemu/util/qemu-sockets.c:1105
#7 0x564133eeaabf in qio_channel_socket_connect_sync
/mnt/sdb/backup/qemu/io/channel-socket.c:145
#8 0x564133eeabf5 in qio_channel_socket_connect_worker
/mnt/sdb/backup/qemu/io/channel-socket.c:168
Indirect leak of 360 byte(s) in 8 object(s) allocated from:
#0 0x7f20b5118ae8 in __interceptor_malloc (/lib64/libasan.so.5+0xefae8)
#1 0x7f20af901817 in __GI___vasprintf_chk (/lib64/libc.so.6+0x10d817)
#2 0x7f20b451fa6c in g_vasprintf (/lib64/libglib-2.0.so.0+0x93a6c)
#3 0x7f20b44f8cd0 in g_strdup_vprintf (/lib64/libglib-2.0.so.0+0x6ccd0)
#4 0x7f20b44f8d8c in g_strdup_printf (/lib64/libglib-2.0.so.0+0x6cd8c)
#5 0x56413406fc86 in error_setv /mnt/sdb/backup/qemu/util/error.c:65
#6 0x564134070464 in error_setg_errno_internal
/mnt/sdb/backup/qemu/util/error.c:109
#7 0x5641340851be in inet_connect_addr
/mnt/sdb/backup/qemu/util/qemu-sockets.c:379
#8 0x5641340851be in inet_connect_saddr
/mnt/sdb/backup/qemu/util/qemu-sockets.c:458
#9 0x5641340870ab in socket_connect
/mnt/sdb/backup/qemu/util/qemu-sockets.c:1105
#10 0x564133eeaabf in qio_channel_socket_connect_sync
/mnt/sdb/backup/qemu/io/channel-socket.c:145
#11 0x564133eeabf5 in qio_channel_socket_connect_worker
/mnt/sdb/backup/qemu/io/channel-socket.c:168
Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: 13f2cb21e5fb33e9f8d7db8eee48edc1c67b812f
https://github.com/qemu/qemu/commit/13f2cb21e5fb33e9f8d7db8eee48edc1c67b812f
Author: Pan Nengyuan <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M migration/multifd.c
Log Message:
-----------
migration/multifd: Do error_free after migrate_set_error to avoid memleaks
When error happen in multifd_send_thread, it use error_copy to set migrate
error in
multifd_send_terminate_threads(). We should call error_free after it.
Similarly, fix another two places in multifd_recv_thread/multifd_save_cleanup.
The leak stack:
Direct leak of 48 byte(s) in 1 object(s) allocated from:
#0 0x7f781af07cf0 in calloc (/lib64/libasan.so.5+0xefcf0)
#1 0x7f781a2ce22d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5322d)
#2 0x55ee1d075c17 in error_setv /mnt/sdb/backup/qemu/util/error.c:61
#3 0x55ee1d076464 in error_setg_errno_internal
/mnt/sdb/backup/qemu/util/error.c:109
#4 0x55ee1cef066e in qio_channel_socket_writev
/mnt/sdb/backup/qemu/io/channel-socket.c:569
#5 0x55ee1cee806b in qio_channel_writev
/mnt/sdb/backup/qemu/io/channel.c:207
#6 0x55ee1cee806b in qio_channel_writev_all
/mnt/sdb/backup/qemu/io/channel.c:171
#7 0x55ee1cee8248 in qio_channel_write_all
/mnt/sdb/backup/qemu/io/channel.c:257
#8 0x55ee1ca12c9a in multifd_send_thread
/mnt/sdb/backup/qemu/migration/multifd.c:657
#9 0x55ee1d0607fc in qemu_thread_start
/mnt/sdb/backup/qemu/util/qemu-thread-posix.c:519
#10 0x7f78159ae2dd in start_thread (/lib64/libpthread.so.0+0x82dd)
#11 0x7f78156df4b2 in __GI___clone (/lib64/libc.so.6+0xfc4b2)
Indirect leak of 52 byte(s) in 1 object(s) allocated from:
#0 0x7f781af07f28 in __interceptor_realloc (/lib64/libasan.so.5+0xeff28)
#1 0x7f78156f07d9 in __GI___vasprintf_chk (/lib64/libc.so.6+0x10d7d9)
#2 0x7f781a30ea6c in g_vasprintf (/lib64/libglib-2.0.so.0+0x93a6c)
#3 0x7f781a2e7cd0 in g_strdup_vprintf (/lib64/libglib-2.0.so.0+0x6ccd0)
#4 0x7f781a2e7d8c in g_strdup_printf (/lib64/libglib-2.0.so.0+0x6cd8c)
#5 0x55ee1d075c86 in error_setv /mnt/sdb/backup/qemu/util/error.c:65
#6 0x55ee1d076464 in error_setg_errno_internal
/mnt/sdb/backup/qemu/util/error.c:109
#7 0x55ee1cef066e in qio_channel_socket_writev
/mnt/sdb/backup/qemu/io/channel-socket.c:569
#8 0x55ee1cee806b in qio_channel_writev
/mnt/sdb/backup/qemu/io/channel.c:207
#9 0x55ee1cee806b in qio_channel_writev_all
/mnt/sdb/backup/qemu/io/channel.c:171
#10 0x55ee1cee8248 in qio_channel_write_all
/mnt/sdb/backup/qemu/io/channel.c:257
#11 0x55ee1ca12c9a in multifd_send_thread
/mnt/sdb/backup/qemu/migration/multifd.c:657
#12 0x55ee1d0607fc in qemu_thread_start
/mnt/sdb/backup/qemu/util/qemu-thread-posix.c:519
#13 0x7f78159ae2dd in start_thread (/lib64/libpthread.so.0+0x82dd)
#14 0x7f78156df4b2 in __GI___clone (/lib64/libc.so.6+0xfc4b2)
Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Commit: 1b8c45899715d292398152ba97ef755ccaf84680
https://github.com/qemu/qemu/commit/1b8c45899715d292398152ba97ef755ccaf84680
Author: Peter Maydell <address@hidden>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M docs/devel/migration.rst
M migration/colo.c
M migration/migration.c
M migration/multifd.c
M migration/ram.c
M migration/rdma.c
M monitor/hmp-cmds.c
M qapi/migration.json
Log Message:
-----------
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200507a'
into staging
Migration pull 2020-05-07
Mostly tidy-ups, but two new features:
cpu-throttle-tailslow for making a gentler throttle
xbzrle encoding rate measurement for getting a feal for xbzrle
performance.
# gpg: Signature made Thu 07 May 2020 18:00:27 BST
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <address@hidden>"
[full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20200507a:
migration/multifd: Do error_free after migrate_set_error to avoid memleaks
migration/multifd: fix memleaks in multifd_new_send_channel_async
migration/xbzrle: add encoding rate
migration/rdma: fix a memleak on error path in rdma_start_incoming_migration
migration/ram: Consolidate variable reset after placement in
ram_load_postcopy()
migration/throttle: Add cpu-throttle-tailslow migration parameter
migration/colo: Add missing error-propagation code
docs/devel/migration: start a debugging section
migration: move the units of migrate parameters from milliseconds to ms
monitor/hmp-cmds: add hmp_handle_error() for hmp_migrate_set_speed()
migration/migration: improve error reporting for migrate parameters
migration: fix bad indentation in error_report()
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/3c7adbc67d9a...1b8c45899715
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] ed8b28: migration: fix bad indentation in error_report(),
Peter Maydell <=