From patchwork Fri Aug 20 00:48:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 62242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CCD09B70DF for ; Fri, 20 Aug 2010 10:49:57 +1000 (EST) Received: from localhost ([127.0.0.1]:52801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmFnu-00080g-7m for incoming@patchwork.ozlabs.org; Thu, 19 Aug 2010 20:49:54 -0400 Received: from [140.186.70.92] (port=59594 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmFmU-0007Yl-Iq for qemu-devel@nongnu.org; Thu, 19 Aug 2010 20:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmFmT-0004Jf-DR for qemu-devel@nongnu.org; Thu, 19 Aug 2010 20:48:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20029) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmFmT-0004JX-4y for qemu-devel@nongnu.org; Thu, 19 Aug 2010 20:48:25 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7K0mMqh013880 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Aug 2010 20:48:22 -0400 Received: from localhost (ovpn-113-41.phx2.redhat.com [10.3.113.41]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7K0mHab017976; Thu, 19 Aug 2010 20:48:18 -0400 From: Amit Shah To: qemu list Date: Fri, 20 Aug 2010 06:18:11 +0530 Message-Id: <8450ea8e785c9049f0b3edddc01650a8c4b9ffe7.1282265244.git.amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , Paolo Bonzini , Juan Quintela , agl@us.ibm.com Subject: [Qemu-devel] [PATCH V2] balloon: Don't try fetching info if machine is stopped X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the machine is stopped and 'info balloon' is invoked, the monitor process just hangs waiting for info from the guest. Return the most recent balloon data in that case. See https://bugzilla.redhat.com/show_bug.cgi?id=623903 Reported-by: Signed-off-by: Amit Shah Acked-By: Paolo Bonzini --- v2: simplify call to qemu_balloon_status - Paulo balloon.c | 11 +++++++---- balloon.h | 6 ++++-- hw/virtio-balloon.c | 9 +++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/balloon.c b/balloon.c index 8e0b7f1..8b05d20 100644 --- a/balloon.c +++ b/balloon.c @@ -43,17 +43,20 @@ void qemu_add_balloon_handler(QEMUBalloonEvent *func, void *opaque) int qemu_balloon(ram_addr_t target, MonitorCompletion cb, void *opaque) { if (qemu_balloon_event) { - qemu_balloon_event(qemu_balloon_event_opaque, target, cb, opaque); + qemu_balloon_event(qemu_balloon_event_opaque, target, cb, opaque, + false); return 1; } else { return 0; } } -int qemu_balloon_status(MonitorCompletion cb, void *opaque) +int qemu_balloon_status(MonitorCompletion cb, void *opaque, + bool get_cached_data) { if (qemu_balloon_event) { - qemu_balloon_event(qemu_balloon_event_opaque, 0, cb, opaque); + qemu_balloon_event(qemu_balloon_event_opaque, 0, cb, opaque, + get_cached_data); return 1; } else { return 0; @@ -113,7 +116,7 @@ int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque) return -1; } - ret = qemu_balloon_status(cb, opaque); + ret = qemu_balloon_status(cb, opaque, !vm_running); if (!ret) { qerror_report(QERR_DEVICE_NOT_ACTIVE, "balloon"); return -1; diff --git a/balloon.h b/balloon.h index d478e28..729631c 100644 --- a/balloon.h +++ b/balloon.h @@ -17,13 +17,15 @@ #include "monitor.h" typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target, - MonitorCompletion cb, void *cb_data); + MonitorCompletion cb, void *cb_data, + bool get_cached_data); void qemu_add_balloon_handler(QEMUBalloonEvent *func, void *opaque); int qemu_balloon(ram_addr_t target, MonitorCompletion cb, void *opaque); -int qemu_balloon_status(MonitorCompletion cb, void *opaque); +int qemu_balloon_status(MonitorCompletion cb, void *opaque, + bool get_cached_data); void monitor_print_balloon(Monitor *mon, const QObject *data); int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque); diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 9fe3886..68df891 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -195,7 +195,8 @@ static uint32_t virtio_balloon_get_features(VirtIODevice *vdev, uint32_t f) } static void virtio_balloon_to_target(void *opaque, ram_addr_t target, - MonitorCompletion cb, void *cb_data) + MonitorCompletion cb, void *cb_data, + bool get_cached_data) { VirtIOBalloon *dev = opaque; @@ -213,8 +214,12 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target, return; } dev->stats_callback = cb; - dev->stats_opaque_callback_data = cb_data; + dev->stats_opaque_callback_data = cb_data; if (dev->vdev.guest_features & (1 << VIRTIO_BALLOON_F_STATS_VQ)) { + if (get_cached_data) { + complete_stats_request(dev); + return; + } virtqueue_push(dev->svq, &dev->stats_vq_elem, dev->stats_vq_offset); virtio_notify(&dev->vdev, dev->svq); } else {