From patchwork Thu Sep 20 08:25:20 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [1/1] kvmclock: fix guest stop notification
From: Amit Shah <amit.shah@redhat.com>
X-Patchwork-Id: 185359
Message-Id: <a7267230c907a452a2dbf96daae5332178044741.1348129517.git.amit.shah@redhat.com>
To: qemu list <qemu-devel@nongnu.org>, kvm list <kvm@vger.kernel.org>
Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>,
 Marcelo Tosatti <mtosatti@redhat.com>, Eric B Munson <emunson@mgebm.net>, 
 Amit Shah <amit.shah@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,
 Laszlo Ersek <lersek@redhat.com>,
 =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Thu, 20 Sep 2012 13:55:20 +0530

Commit f349c12c0434e29c79ecde89029320c4002f7253 added the guest stop
notification, but it did it in a way that the stop notification would
never reach the kernel.  The kvm_vm_state_changed() function gets a
value of 0 for the 'running' parameter when the VM is stopped, making
all the code added previously dead code.

This patch reworks the code so that it's called when 'running' is 0,
which indicates the VM was stopped.

CC: Eric B Munson <emunson@mgebm.net>
CC: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
CC: Andreas Färber <afaerber@suse.de>
CC: Marcelo Tosatti <mtosatti@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>

---
hw/kvm/clock.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c
index 824b978..f3427eb 100644
--- a/hw/kvm/clock.c
+++ b/hw/kvm/clock.c
@@ -71,18 +71,19 @@ static void kvmclock_vm_state_change(void *opaque, int running,
 
     if (running) {
         s->clock_valid = false;
+        return;
+    }
 
-        if (!cap_clock_ctrl) {
-            return;
-        }
-        for (penv = first_cpu; penv != NULL; penv = penv->next_cpu) {
-            ret = kvm_vcpu_ioctl(penv, KVM_KVMCLOCK_CTRL, 0);
-            if (ret) {
-                if (ret != -EINVAL) {
-                    fprintf(stderr, "%s: %s\n", __func__, strerror(-ret));
-                }
-                return;
+    if (!cap_clock_ctrl) {
+        return;
+    }
+    for (penv = first_cpu; penv != NULL; penv = penv->next_cpu) {
+        ret = kvm_vcpu_ioctl(penv, KVM_KVMCLOCK_CTRL, 0);
+        if (ret) {
+            if (ret != -EINVAL) {
+                fprintf(stderr, "%s: %s\n", __func__, strerror(-ret));
             }
+            return;
         }
     }
 }