From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrk6Z-0005fi-SX for qemu-devel@nongnu.org; Mon, 11 May 2015 05:34:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrk6W-0002fE-MP for qemu-devel@nongnu.org; Mon, 11 May 2015 05:34:31 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrk6W-0002f9-H0 for qemu-devel@nongnu.org; Mon, 11 May 2015 05:34:28 -0400 Received: by pacyx8 with SMTP id yx8so105747871pac.1 for ; Mon, 11 May 2015 02:34:27 -0700 (PDT) From: shannon.zhao@linaro.org Date: Mon, 11 May 2015 17:34:07 +0800 Message-Id: <1431336847-4104-4-git-send-email-shannon.zhao@linaro.org> In-Reply-To: <1431336847-4104-1-git-send-email-shannon.zhao@linaro.org> References: <1431336847-4104-1-git-send-email-shannon.zhao@linaro.org> Subject: [Qemu-devel] [PATCH 3/3] hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org, cornelia.huck@de.ibm.com, mst@redhat.com, pbonzini@redhat.com Cc: hangaohuai@huawei.com, peter.huangpeng@huawei.com, christoffer.dall@linaro.org, zhaoshenglong@huawei.com From: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/s390x/virtio-ccw.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 430cc6f..426a097 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -897,44 +897,17 @@ static void virtio_ccw_balloon_realize(VirtioCcwDevice *ccw_dev, Error **errp) } } -static void balloon_ccw_stats_get_all(Object *obj, struct Visitor *v, - void *opaque, const char *name, - Error **errp) -{ - VirtIOBalloonCcw *dev = opaque; - object_property_get(OBJECT(&dev->vdev), v, "guest-stats", errp); -} - -static void balloon_ccw_stats_get_poll_interval(Object *obj, struct Visitor *v, - void *opaque, const char *name, - Error **errp) -{ - VirtIOBalloonCcw *dev = opaque; - object_property_get(OBJECT(&dev->vdev), v, "guest-stats-polling-interval", - errp); -} - -static void balloon_ccw_stats_set_poll_interval(Object *obj, struct Visitor *v, - void *opaque, const char *name, - Error **errp) -{ - VirtIOBalloonCcw *dev = opaque; - object_property_set(OBJECT(&dev->vdev), v, "guest-stats-polling-interval", - errp); -} - static void virtio_ccw_balloon_instance_init(Object *obj) { VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj); + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BALLOON); - object_property_add(obj, "guest-stats", "guest statistics", - balloon_ccw_stats_get_all, NULL, NULL, dev, NULL); - - object_property_add(obj, "guest-stats-polling-interval", "int", - balloon_ccw_stats_get_poll_interval, - balloon_ccw_stats_set_poll_interval, - NULL, dev, NULL); + object_property_add_alias(obj, "guest-stats", OBJECT(&dev->vdev), + "guest-stats", &error_abort); + object_property_add_alias(obj, "guest-stats-polling-interval", + OBJECT(&dev->vdev), + "guest-stats-polling-interval", &error_abort); } static void virtio_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp) -- 2.1.0