From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB6-0007Ki-Oc for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhmB4-000127-S6 for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:08 -0500 Received: from mail-yw0-f45.google.com ([209.85.213.45]:51180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB4-0000l6-KI for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:06 -0500 Received: by mail-yw0-f45.google.com with SMTP id g71so10818606yhg.4 for ; Mon, 02 Jan 2012 10:00:06 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 2 Jan 2012 18:59:22 +0100 Message-Id: <1325527166-23898-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> References: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/15] virtio-net: move init function to virtio-net.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/virtio-net.h | 3 +++ hw/virtio.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/virtio-net.h b/hw/virtio-net.h index ee55a85..96cd8b1 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -168,6 +168,9 @@ struct virtio_net_ctrl_mac { #define VIRTIO_NET_CTRL_VLAN_ADD 0 #define VIRTIO_NET_CTRL_VLAN_DEL 1 +VirtIODevice *virtio_net_init(DeviceState *dev, struct virtio_net_conf *net); +void virtio_net_exit(VirtIODevice *vdev); + #define DEFINE_VIRTIO_NET_PROPERTIES(_state, _features_field, _conf_field) \ DEFINE_NIC_PROPERTIES(_state, _conf_field.nic), \ DEFINE_VIRTIO_COMMON_FEATURES(_state, _features_field), \ diff --git a/hw/virtio.h b/hw/virtio.h index 1bbfee6..b4ef022 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -193,8 +193,6 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, /* Base devices. */ typedef struct VirtIOBlkConf VirtIOBlkConf; VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); -struct virtio_net_conf; -VirtIODevice *virtio_net_init(DeviceState *dev, 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); @@ -203,7 +201,6 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); #endif -void virtio_net_exit(VirtIODevice *vdev); void virtio_blk_exit(VirtIODevice *vdev); void virtio_serial_exit(VirtIODevice *vdev); void virtio_balloon_exit(VirtIODevice *vdev); -- 1.7.7.1