From patchwork Sun May 31 18:34:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 49270 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B814214D3 for ; Sun, 31 May 2015 18:35:21 +0000 (UTC) Received: by lbcak1 with SMTP id ak1sf29639741lbc.2 for ; Sun, 31 May 2015 11:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:content-type:content-disposition:in-reply-to:cc :subject:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=ZZqeEukU6FOgkryZ8XEzrMJ118iyYyj0nV2kdC+WUEc=; b=VUVo7PbHTXhyr1CoWEYG4w6TibmYhYyXmfuyiwTCdqNyic27goZbOYsjUgPvBa6lGx HttCL8Ky9Fft+Rm5mQ2+cKGRgcLCBTNwkDyx5Yr60AUldaygk63AgC5mBy1H6i5LE4F6 WvW2w40uFuwK83kVdnKzmD/Z54DjiAXY9KrGnMQMqqoIOWcUNCqhjoxm8Q82+OVIgkkO qfBhIdlwsiMQpxrRwPPxVWkbAMc8i19AelN9EcUunz3gS95J4dAGCCyV8TVF7FzfmXHU x5QDDIf51CPHc4YRMCpPUdLH8wh+uzW2gSd9O3nF+sPov5WBtQQOz4ivH6L9NT/iFSqS qjfQ== X-Gm-Message-State: ALoCoQnfbzlO9A8CDJWmoGNVYC/c0KXrcq0SXTYmBZ/ZDNRBEYD3TuCU27ae6Vzf8Cf3qRU+T4c6 X-Received: by 10.112.93.203 with SMTP id cw11mr17110274lbb.0.1433097319732; Sun, 31 May 2015 11:35:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.34 with SMTP id p2ls376723lap.32.gmail; Sun, 31 May 2015 11:35:19 -0700 (PDT) X-Received: by 10.152.87.72 with SMTP id v8mr16959953laz.2.1433097319548; Sun, 31 May 2015 11:35:19 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id e7si10323283lbc.62.2015.05.31.11.35.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 May 2015 11:35:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbcmx3 with SMTP id mx3so72840485lbc.1 for ; Sun, 31 May 2015 11:35:19 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr8138015lac.41.1433097319076; Sun, 31 May 2015 11:35:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1790408lbb; Sun, 31 May 2015 11:35:18 -0700 (PDT) X-Received: by 10.140.192.10 with SMTP id n10mr21234754qha.1.1433097317792; Sun, 31 May 2015 11:35:17 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j194si11198956qhc.48.2015.05.31.11.35.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 31 May 2015 11:35:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz84q-00057x-Lw for patch@linaro.org; Sun, 31 May 2015 14:35:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz841-0004U0-SS for qemu-devel@nongnu.org; Sun, 31 May 2015 14:34:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yz841-00046f-2s for qemu-devel@nongnu.org; Sun, 31 May 2015 14:34:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz840-00046b-UT for qemu-devel@nongnu.org; Sun, 31 May 2015 14:34:25 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 681242DC3C2; Sun, 31 May 2015 18:34:24 +0000 (UTC) Received: from redhat.com (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t4VIYLSe016253; Sun, 31 May 2015 14:34:22 -0400 Date: Sun, 31 May 2015 20:34:20 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1433097192-8988-2-git-send-email-mst@redhat.com> References: <1433097192-8988-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1433097192-8988-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Cornelia Huck , Peter Maydell , Paolo Bonzini , Shannon Zhao , Shannon Zhao Subject: [Qemu-devel] [PULL 01/57] hw/virtio/virtio-balloon: move adding property to virtio_balloon_instance_init 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mst@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao This is in preparation for using alias property in virtio-balloon-pci and virtio-balloon-ccw. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Cornelia Huck Reviewed-by: Paolo Bonzini --- hw/virtio/virtio-balloon.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 484c3c3..cfff542 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -396,14 +396,6 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp) register_savevm(dev, "virtio-balloon", -1, 1, virtio_balloon_save, virtio_balloon_load, s); - - object_property_add(OBJECT(dev), "guest-stats", "guest statistics", - balloon_stats_get_all, NULL, NULL, s, NULL); - - object_property_add(OBJECT(dev), "guest-stats-polling-interval", "int", - balloon_stats_get_poll_interval, - balloon_stats_set_poll_interval, - NULL, s, NULL); } static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp) @@ -417,6 +409,19 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp) virtio_cleanup(vdev); } +static void virtio_balloon_instance_init(Object *obj) +{ + VirtIOBalloon *s = VIRTIO_BALLOON(obj); + + object_property_add(obj, "guest-stats", "guest statistics", + balloon_stats_get_all, NULL, NULL, s, NULL); + + object_property_add(obj, "guest-stats-polling-interval", "int", + balloon_stats_get_poll_interval, + balloon_stats_set_poll_interval, + NULL, s, NULL); +} + static Property virtio_balloon_properties[] = { DEFINE_PROP_END_OF_LIST(), }; @@ -441,6 +446,7 @@ static const TypeInfo virtio_balloon_info = { .name = TYPE_VIRTIO_BALLOON, .parent = TYPE_VIRTIO_DEVICE, .instance_size = sizeof(VirtIOBalloon), + .instance_init = virtio_balloon_instance_init, .class_init = virtio_balloon_class_init, };