From patchwork Fri Jul 18 13:31:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 371536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2066B1400D7 for ; Fri, 18 Jul 2014 23:33:08 +1000 (EST) Received: from localhost ([::1]:49855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X88Ha-0005na-8Q for incoming@patchwork.ozlabs.org; Fri, 18 Jul 2014 09:33:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X88Gn-0004Nv-KH for qemu-devel@nongnu.org; Fri, 18 Jul 2014 09:32:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X88Gi-0001AY-KX for qemu-devel@nongnu.org; Fri, 18 Jul 2014 09:32:17 -0400 Received: from mail-qa0-x235.google.com ([2607:f8b0:400d:c00::235]:35054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X88Gi-00019v-HC; Fri, 18 Jul 2014 09:32:12 -0400 Received: by mail-qa0-f53.google.com with SMTP id v10so3005656qac.12 for ; Fri, 18 Jul 2014 06:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+DD1JkboYRtpjtrQAhnb9iUc5pS5kGjXoog5/4CzdiM=; b=V/iv/l4ad+9afBTdaPIS3DbHAPOlLc4opoSQlbsCqv6RlR9do0qkHVgR0RszFTUB/C GJychFs/+P1im/rmGexqr2esTt5d/QDEId68FPVFYlwe7bRsvlZ1AYLjKT7d9U1MPGTY Vkfh0RdURIP9qBqsE+lnuSQUJIeb+aRmdh2u1r66lR6ff9iQ+CJ8aP1bnpmjZK+wtumN JeycE6MEfkoe6nKNtyiwRKjhonXibip8FTGKuqra/SXMUqWrZhLJ/wP7RXOeyZT8wFDa XotD1tI4JQWGs/ux21OC1SgmEvu2yAJfBYJnvM8ww2BxcOztmiV9ArjkEwawWhyFjLtB bX/A== X-Received: by 10.140.92.20 with SMTP id a20mr8149858qge.0.1405690332131; Fri, 18 Jul 2014 06:32:12 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-117-147-76.cust.vodafonedsl.it. [37.117.147.76]) by mx.google.com with ESMTPSA id b19sm9938498qaw.44.2014.07.18.06.32.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jul 2014 06:32:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 18 Jul 2014 15:31:41 +0200 Message-Id: <1405690302-5393-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405690302-5393-1-git-send-email-pbonzini@redhat.com> References: <1405690302-5393-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::235 Cc: mtosatti@redhat.com, agraf@suse.de, qemu-stable@nongnu.org Subject: [Qemu-devel] [PULL 5/6] Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This reverts commit 9b1786829aefb83f37a8f3135e3ea91c56001b56. This patch fixed a hang introduced by commit a096b3a (kvmclock: Ensure time in migration never goes backward, 2014-05-16), but it causes a regression in migration whose cause is not quite clear. Because of this, I'm choosing to revert both patches. This trades a 2.1 regression for a bug that's been there forever. Cc: agraf@suse.de Cc: mtosatti@redhat.com Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/i386/kvm/clock.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 272a88a..feb5fc5 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -17,7 +17,6 @@ #include "qemu/host-utils.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" -#include "sysemu/cpus.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h" @@ -66,7 +65,6 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s) cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time)); - assert(time.tsc_timestamp <= migration_tsc); delta = migration_tsc - time.tsc_timestamp; if (time.tsc_shift < 0) { delta >>= -time.tsc_shift; @@ -125,8 +123,6 @@ static void kvmclock_vm_state_change(void *opaque, int running, if (s->clock_valid) { return; } - - cpu_synchronize_all_states(); ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data); if (ret < 0) { fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));