From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com
Subject: [Qemu-devel] [PATCH v2 11/15] virtio-net: move init function to virtio-net.h
Date: Mon, 2 Jan 2012 18:59:22 +0100 [thread overview]
Message-ID: <1325527166-23898-12-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1325527166-23898-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
next prev parent reply other threads:[~2012-01-02 18:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-02 17:59 [Qemu-devel] [PATCH v2 00/15] virtio: device configuration and headers cleanup Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 01/15] virtio-net: move property declarations to header file Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 02/15] virtio-net: move NICConf into virtio_net_conf Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 03/15] virtio-serial: move property declarations to header file Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 04/15] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 05/15] virtio-9p: remove PCI dependencies from hw/9pfs/ Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 06/15] virtio-9p: move property declarations to header file Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 07/15] virtio-blk: define VirtIOBlkConf Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 08/15] virtio-blk: move property declarations to header file Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 09/15] virtio-blk: move BlockConf into VirtIOBlkConf Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 10/15] virtio: move conf fields into an anonymous union Paolo Bonzini
2012-01-02 17:59 ` Paolo Bonzini [this message]
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virtio-serial.h Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 13/15] virtio-balloon: move init function to virtio-balloon.h Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 14/15] virtio-9p: move init function to virtio-9p-device.h Paolo Bonzini
2012-01-02 17:59 ` [Qemu-devel] [PATCH v2 15/15] virtio-blk: move init function to virtio-blk.h Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1325527166-23898-12-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).