From patchwork Thu Apr 11 22:38:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 235943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 35CFE2C00C8 for ; Fri, 12 Apr 2013 08:39:47 +1000 (EST) Received: from localhost ([::1]:37049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQQ9h-0006VG-8n for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 18:39:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQQ9O-0006Ub-MU for qemu-devel@nongnu.org; Thu, 11 Apr 2013 18:39:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQQ9N-0003KX-7P for qemu-devel@nongnu.org; Thu, 11 Apr 2013 18:39:26 -0400 Received: from greensocs.com ([87.106.252.221]:43859 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQQ9M-0003KD-Qx for qemu-devel@nongnu.org; Thu, 11 Apr 2013 18:39:25 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id DF0D9400091; Thu, 11 Apr 2013 22:39:22 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bx+W5th8hoMN; Fri, 12 Apr 2013 00:39:15 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 3114F40EC60; Fri, 12 Apr 2013 00:39:15 +0200 (CEST) Received: from localhost.localdomain (20.128.171.95.rev.sfr.net [95.171.128.20]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id BAEB2400091; Fri, 12 Apr 2013 00:39:12 +0200 (CEST) From: fred.konrad@greensocs.com To: aliguori@us.ibm.com, qemu-devel@nongnu.org Date: Fri, 12 Apr 2013 00:38:59 +0200 Message-Id: <1365719939-7169-1-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: peter.maydell@linaro.org, mark.burton@greensocs.com, Luiz Capitulino , cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH] virtio-balloon: fix dynamic properties. 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 From: KONRAD Frederic To keep compatibility with the old virtio-balloon-x, add the dynamic properties to virtio-balloon-pci and virtio-balloon-ccw. Cc: Luiz Capitulino Signed-off-by: KONRAD Frederic --- hw/s390x/virtio-ccw.c | 8 ++++++++ hw/virtio/virtio-balloon.c | 16 ++++++++-------- hw/virtio/virtio-pci.c | 8 ++++++++ include/hw/virtio/virtio-balloon.h | 9 +++++++++ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 4dec0cd..ea5ed6d 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -626,6 +626,14 @@ static void virtio_ccw_balloon_instance_init(Object *obj) VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj); object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BALLOON); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); + + object_property_add(obj, "guest-stats", "guest statistics", + balloon_stats_get_all, NULL, NULL, &dev->vdev, NULL); + + object_property_add(obj, "guest-stats-polling-interval", "int", + balloon_stats_get_poll_interval, + balloon_stats_set_poll_interval, + NULL, &dev->vdev, NULL); } static int virtio_ccw_scsi_init(VirtioCcwDevice *ccw_dev) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index c2c446e..2e2ea30 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -105,8 +105,8 @@ static void balloon_stats_poll_cb(void *opaque) virtio_notify(vdev, s->svq); } -static void balloon_stats_get_all(Object *obj, struct Visitor *v, - void *opaque, const char *name, Error **errp) +void balloon_stats_get_all(Object *obj, struct Visitor *v, void *opaque, + const char *name, Error **errp) { VirtIOBalloon *s = opaque; int i; @@ -129,17 +129,17 @@ static void balloon_stats_get_all(Object *obj, struct Visitor *v, visit_end_struct(v, errp); } -static void balloon_stats_get_poll_interval(Object *obj, struct Visitor *v, - void *opaque, const char *name, - Error **errp) +void balloon_stats_get_poll_interval(Object *obj, struct Visitor *v, + void *opaque, const char *name, + Error **errp) { VirtIOBalloon *s = opaque; visit_type_int(v, &s->stats_poll_interval, name, errp); } -static void balloon_stats_set_poll_interval(Object *obj, struct Visitor *v, - void *opaque, const char *name, - Error **errp) +void balloon_stats_set_poll_interval(Object *obj, struct Visitor *v, + void *opaque, const char *name, + Error **errp) { VirtIOBalloon *s = opaque; int64_t value; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 2b22588..9a3d291 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1450,6 +1450,14 @@ static void virtio_balloon_pci_instance_init(Object *obj) VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj); object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BALLOON); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); + + object_property_add(obj, "guest-stats", "guest statistics", + balloon_stats_get_all, NULL, NULL, &dev->vdev, NULL); + + object_property_add(obj, "guest-stats-polling-interval", "int", + balloon_stats_get_poll_interval, + balloon_stats_set_poll_interval, + NULL, &dev->vdev, NULL); } static const TypeInfo virtio_balloon_pci_info = { diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-balloon.h index 3b459bb..023d0f0 100644 --- a/include/hw/virtio/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -69,4 +69,13 @@ typedef struct VirtIOBalloon { int64_t stats_poll_interval; } VirtIOBalloon; +void balloon_stats_get_all(Object *obj, struct Visitor *v, void *opaque, + const char *name, Error **errp); +void balloon_stats_get_poll_interval(Object *obj, struct Visitor *v, + void *opaque, const char *name, + Error **errp); +void balloon_stats_set_poll_interval(Object *obj, struct Visitor *v, + void *opaque, const char *name, + Error **errp); + #endif