From patchwork Mon Jan 2 17:59:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 133897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5067DB6F9D for ; Tue, 3 Jan 2012 05:27:07 +1100 (EST) Received: from localhost ([::1]:33143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmBo-0000BX-Lm for incoming@patchwork.ozlabs.org; Mon, 02 Jan 2012 13:00:52 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmBC-0007Z7-EO for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhmB9-00014x-EO for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:14 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:53318) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB9-0000j8-Bb for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:11 -0500 Received: by mail-gx0-f173.google.com with SMTP id k1so11343200ggn.4 for ; Mon, 02 Jan 2012 10:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=NOrO0aQL2zMDdSKv5Y+8PlwhH6WYZHVtxKtO30d7Jzg=; b=QJL5VgobJjP2AvY0IlZicPHQpYnuGrRtbh+ERfM9MinTivoQ1unmRhLh95sSz4Sf7c DJPB4iauLeQa0BKMQBZdMUneEr4KJobWl0jMLL3BfS6lN9BsjyA6x/1Vamfiv43LFWqi 8K4V1kJs0MZ1Mabsrd2ev2LsA5sDO/xZhtjvQ= Received: by 10.101.154.29 with SMTP id g29mr8189421ano.9.1325527210753; Mon, 02 Jan 2012 10:00:10 -0800 (PST) Received: from localhost.localdomain (host167-160-dynamic.2-87-r.retail.telecomitalia.it. [87.2.160.167]) by mx.google.com with ESMTPS id n64sm70043957yhk.4.2012.01.02.10.00.08 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 10:00:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 2 Jan 2012 18:59:24 +0100 Message-Id: <1325527166-23898-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> References: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.173 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH v2 13/15] virtio-balloon: move init function to virtio-balloon.h 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 Signed-off-by: Paolo Bonzini --- hw/virtio-balloon.h | 3 +++ hw/virtio-pci.h | 1 + hw/virtio.h | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/virtio-balloon.h b/hw/virtio-balloon.h index 73300dd..cde2e67 100644 --- a/hw/virtio-balloon.h +++ b/hw/virtio-balloon.h @@ -52,4 +52,7 @@ typedef struct VirtIOBalloonStat { uint64_t val; } QEMU_PACKED VirtIOBalloonStat; +VirtIODevice *virtio_balloon_init(DeviceState *dev); +void virtio_balloon_exit(VirtIODevice *vdev); + #endif diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index 0a9034a..531b883 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -18,6 +18,7 @@ #include "virtio-blk.h" #include "virtio-net.h" #include "virtio-serial.h" +#include "virtio-balloon.h" #include "9pfs/virtio-9p-device.h" /* Performance improves when virtqueue kick processing is decoupled from the diff --git a/hw/virtio.h b/hw/virtio.h index 3cf2e25..6943368 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -193,14 +193,12 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, /* Base devices. */ typedef struct VirtIOBlkConf VirtIOBlkConf; VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); -VirtIODevice *virtio_balloon_init(DeviceState *dev); #ifdef CONFIG_VIRTFS VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); #endif void virtio_blk_exit(VirtIODevice *vdev); -void virtio_balloon_exit(VirtIODevice *vdev); #define DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) \ DEFINE_PROP_BIT("indirect_desc", _state, _field, \