From patchwork Tue Dec 18 20:16:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 207196 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 A1AA22C0092 for ; Wed, 19 Dec 2012 07:17:24 +1100 (EST) Received: from localhost ([::1]:39464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3bL-0003ah-GW for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 15:17:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3bA-0003Yd-1G for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:17:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl3b8-0004cF-IW for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:17:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3b8-0004c6-BV for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:17:06 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBIKH5gL023314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Dec 2012 15:17:05 -0500 Received: from localhost (ovpn-113-93.phx2.redhat.com [10.3.113.93]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBIKH4nJ027746; Tue, 18 Dec 2012 15:17:04 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2012 18:16:54 -0200 Message-Id: <1355861815-2607-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1355861815-2607-1-git-send-email-lcapitulino@redhat.com> References: <1355861815-2607-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aquini@redhat.com, mst@redhat.com, anton.vorontsov@linaro.org, agl@us.ibm.com, amit.shah@redhat.com Subject: [Qemu-devel] [RFC 2/3] virtio-balloon: add virtio_balloon_conf skeleton 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 Next commit wants it. Signed-off-by: Luiz Capitulino --- hw/virtio-balloon.c | 2 +- hw/virtio-balloon.h | 4 ++++ hw/virtio-pci.c | 2 +- hw/virtio-pci.h | 2 ++ hw/virtio.h | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 03248df..97d49b1 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -235,7 +235,7 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) return 0; } -VirtIODevice *virtio_balloon_init(DeviceState *dev) +VirtIODevice *virtio_balloon_init(DeviceState *dev, virtio_balloon_conf *conf) { VirtIOBalloon *s; int ret; diff --git a/hw/virtio-balloon.h b/hw/virtio-balloon.h index 73300dd..9d631d5 100644 --- a/hw/virtio-balloon.h +++ b/hw/virtio-balloon.h @@ -38,6 +38,10 @@ struct virtio_balloon_config uint32_t actual; }; +typedef struct virtio_balloon_conf +{ +} virtio_balloon_conf; + /* Memory Statistics */ #define VIRTIO_BALLOON_S_SWAP_IN 0 /* Amount of memory swapped in */ #define VIRTIO_BALLOON_S_SWAP_OUT 1 /* Amount of memory swapped out */ diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 7684ac9..026222b 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -835,7 +835,7 @@ static int virtio_balloon_init_pci(PCIDevice *pci_dev) proxy->class_code = PCI_CLASS_OTHERS; } - vdev = virtio_balloon_init(&pci_dev->qdev); + vdev = virtio_balloon_init(&pci_dev->qdev, &proxy->balloon); if (!vdev) { return -1; } diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index b58d9a2..3e4ca0d 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -20,6 +20,7 @@ #include "virtio-rng.h" #include "virtio-serial.h" #include "virtio-scsi.h" +#include "virtio-balloon.h" /* Performance improves when virtqueue kick processing is decoupled from the * vcpu thread using ioeventfd for some devices. */ @@ -46,6 +47,7 @@ typedef struct { #endif virtio_serial_conf serial; virtio_net_conf net; + virtio_balloon_conf balloon; VirtIOSCSIConf scsi; VirtIORNGConf rng; bool ioeventfd_disabled; diff --git a/hw/virtio.h b/hw/virtio.h index 7c17f7b..9a85a41 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -201,7 +201,8 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, struct virtio_net_conf *net); typedef struct virtio_serial_conf virtio_serial_conf; VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial); -VirtIODevice *virtio_balloon_init(DeviceState *dev); +typedef struct virtio_balloon_conf virtio_balloon_conf; +VirtIODevice *virtio_balloon_init(DeviceState *dev, virtio_balloon_conf *conf); typedef struct VirtIOSCSIConf VirtIOSCSIConf; VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *conf); typedef struct VirtIORNGConf VirtIORNGConf;