Message ID | 1564736786-26495-1-git-send-email-ivanren@tencent.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2] migration: always initial ram_counters for a new migration | expand |
Patchew URL: https://patchew.org/QEMU/1564736786-26495-1-git-send-email-ivanren@tencent.com/ Hi, This series failed build test on s390x host. Please find the details below. === TEST SCRIPT BEGIN === #!/bin/bash # Testing script will be invoked under the git checkout with # HEAD pointing to a commit that has the patches applied on top of "base" # branch set -e echo echo "=== ENV ===" env echo echo "=== PACKAGES ===" rpm -qa echo echo "=== UNAME ===" uname -a CC=$HOME/bin/cc INSTALL=$PWD/install BUILD=$PWD/build mkdir -p $BUILD $INSTALL SRC=$PWD cd $BUILD $SRC/configure --cc=$CC --prefix=$INSTALL make -j4 # XXX: we need reliable clean up # make check -j4 V=1 make install === TEST SCRIPT END === CC migration/channel.o CC migration/savevm.o CC migration/colo.o /var/tmp/patchew-tester-tmp-xf2xxfrc/src/migration/migration.c:3033:8: error: return type defaults to ‘int’ [-Werror=implicit-int] 3033 | static update_iteration_initial_status(MigrationState *s) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /var/tmp/patchew-tester-tmp-xf2xxfrc/src/migration/migration.c: In function ‘update_iteration_initial_status’: /var/tmp/patchew-tester-tmp-xf2xxfrc/src/migration/migration.c:3042:1: error: control reaches end of non-void function [-Werror=return-type] 3042 | } | ^ cc1: all warnings being treated as errors The full log is available at http://patchew.org/logs/1564736786-26495-1-git-send-email-ivanren@tencent.com/testing.s390x/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
Patchew URL: https://patchew.org/QEMU/1564736786-26495-1-git-send-email-ivanren@tencent.com/ Hi, This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally. === TEST SCRIPT BEGIN === #!/bin/bash make docker-image-fedora V=1 NETWORK=1 time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END === AS pc-bios/optionrom/multiboot.o CC qga/commands-posix.o AS pc-bios/optionrom/linuxboot.o /tmp/qemu-test/src/migration/migration.c:3033:8: error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int] static update_iteration_initial_status(MigrationState *s) ~~~~~~ ^ /tmp/qemu-test/src/migration/migration.c:3042:1: error: control reaches end of non-void function [-Werror,-Wreturn-type] } ^ 2 errors generated. The full log is available at http://patchew.org/logs/1564736786-26495-1-git-send-email-ivanren@tencent.com/testing.asan/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
diff --git a/migration/migration.c b/migration/migration.c index 8a607fe1e2..5db62ef9c8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1908,6 +1908,11 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, } migrate_init(s); + /* + * set ram_counters memory to zero for a + * new migration + */ + memset(&ram_counters, 0, sizeof(ram_counters)); return true; } @@ -3025,6 +3030,17 @@ static void migration_calculate_complete(MigrationState *s) } } +static update_iteration_initial_status(MigrationState *s) +{ + /* + * Update these three fields at the same time to avoid mismatch info lead + * wrong speed calculation. + */ + s->iteration_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + s->iteration_initial_bytes = migration_total_bytes(s); + s->iteration_initial_pages = ram_get_total_transferred_pages(); +} + static void migration_update_counters(MigrationState *s, int64_t current_time) { @@ -3060,9 +3076,7 @@ static void migration_update_counters(MigrationState *s, qemu_file_reset_rate_limit(s->to_dst_file); - s->iteration_start_time = current_time; - s->iteration_initial_bytes = current_bytes; - s->iteration_initial_pages = ram_get_total_transferred_pages(); + update_iteration_initial_status(s); trace_migrate_transferred(transferred, time_spent, bandwidth, s->threshold_size); @@ -3186,7 +3200,7 @@ static void *migration_thread(void *opaque) rcu_register_thread(); object_ref(OBJECT(s)); - s->iteration_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + update_iteration_initial_status(s); qemu_savevm_state_header(s->to_dst_file); @@ -3251,8 +3265,7 @@ static void *migration_thread(void *opaque) * the local variables. This is important to avoid * breaking transferred_bytes and bandwidth calculation */ - s->iteration_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); - s->iteration_initial_bytes = 0; + update_iteration_initial_status(s); } current_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); diff --git a/migration/savevm.c b/migration/savevm.c index 79ed44d475..480c511b19 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1424,6 +1424,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) } migrate_init(ms); + memset(&ram_counters, 0, sizeof(ram_counters)); ms->to_dst_file = f; qemu_mutex_unlock_iothread();