From patchwork Wed Sep 8 14:21:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Litke X-Patchwork-Id: 64164 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 C325AB6EEC for ; Thu, 9 Sep 2010 00:53:58 +1000 (EST) Received: from localhost ([127.0.0.1]:42747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtM26-0001LL-Fg for incoming@patchwork.ozlabs.org; Wed, 08 Sep 2010 10:53:54 -0400 Received: from [140.186.70.92] (port=49527 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtLWq-0004Fr-Rm for qemu-devel@nongnu.org; Wed, 08 Sep 2010 10:21:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtLWk-0007Ao-WE for qemu-devel@nongnu.org; Wed, 08 Sep 2010 10:21:36 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:47828) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtLWk-0007Ai-RH for qemu-devel@nongnu.org; Wed, 08 Sep 2010 10:21:30 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e39.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o88EBB5T002041 for ; Wed, 8 Sep 2010 08:11:11 -0600 Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o88ELSo4110464 for ; Wed, 8 Sep 2010 08:21:28 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o88ELRMX016803 for ; Wed, 8 Sep 2010 08:21:28 -0600 Received: from localhost.localdomain (aglitke.rchland.ibm.com [9.10.86.224]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o88ELRk7016747; Wed, 8 Sep 2010 08:21:27 -0600 From: Adam Litke To: Amit Shah , Anthony Liguori Date: Wed, 8 Sep 2010 09:21:25 -0500 Message-Id: <1283955685-25152-1-git-send-email-agl@us.ibm.com> X-Mailer: git-send-email 1.6.1.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Adam Litke , Paolo Bonzini , Luiz Capitulino , qemu list , Markus Armbruster Subject: [Qemu-devel] [PATCH] [For 0.13] Disable virtio-balloon memory stats interface 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 The addition of memory stats reporting to the virtio balloon causes the 'info balloon' command to become asynchronous. This is a regression because in some cases it can hang the user monitor. To fix this regression, the virtio balloon memory stats feature is being disabled in qemu-0.13. Signed-off-by: Adam Litke --- hw/virtio-balloon.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 9fe3886..269bc22 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -190,7 +190,17 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, static uint32_t virtio_balloon_get_features(VirtIODevice *vdev, uint32_t f) { - f |= (1 << VIRTIO_BALLOON_F_STATS_VQ); + /* + * The addition of memory stats reporting to the virtio balloon causes + * the 'info balloon' command to become asynchronous. This is a regression + * because in some cases it can hang the user monitor. + * + * To fix this regression, the virtio balloon memory stats feature is being + * disabled in qemu-0.13. + * + * -aglitke + */ + /* f |= (1 << VIRTIO_BALLOON_F_STATS_VQ); */ return f; }