[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/12] virtio-9p: move unrealize/realize after virtio
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 01/12] virtio-9p: move unrealize/realize after virtio_9p_transport definition |
Date: |
Sat, 6 Jan 2018 02:07:28 +0100 |
And drop the now useless forward declaration of virtio_9p_transport.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/9pfs/virtio-9p-device.c | 60 ++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 31 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 62650b0a6b99..c3ae7de3a2d5 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -20,8 +20,6 @@
#include "hw/virtio/virtio-access.h"
#include "qemu/iov.h"
-static const struct V9fsTransport virtio_9p_transport;
-
static void virtio_9p_push_and_notify(V9fsPDU *pdu)
{
V9fsState *s = pdu->s;
@@ -104,35 +102,6 @@ static void virtio_9p_get_config(VirtIODevice *vdev,
uint8_t *config)
g_free(cfg);
}
-static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
-{
- VirtIODevice *vdev = VIRTIO_DEVICE(dev);
- V9fsVirtioState *v = VIRTIO_9P(dev);
- V9fsState *s = &v->state;
-
- if (v9fs_device_realize_common(s, errp)) {
- goto out;
- }
-
- v->config_size = sizeof(struct virtio_9p_config) + strlen(s->fsconf.tag);
- virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P, v->config_size);
- v->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);
- v9fs_register_transport(s, &virtio_9p_transport);
-
-out:
- return;
-}
-
-static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp)
-{
- VirtIODevice *vdev = VIRTIO_DEVICE(dev);
- V9fsVirtioState *v = VIRTIO_9P(dev);
- V9fsState *s = &v->state;
-
- virtio_cleanup(vdev);
- v9fs_device_unrealize_common(s, errp);
-}
-
static void virtio_9p_reset(VirtIODevice *vdev)
{
V9fsVirtioState *v = (V9fsVirtioState *)vdev;
@@ -223,6 +192,35 @@ static const struct V9fsTransport virtio_9p_transport = {
.push_and_notify = virtio_9p_push_and_notify,
};
+static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ V9fsVirtioState *v = VIRTIO_9P(dev);
+ V9fsState *s = &v->state;
+
+ if (v9fs_device_realize_common(s, errp)) {
+ goto out;
+ }
+
+ v->config_size = sizeof(struct virtio_9p_config) + strlen(s->fsconf.tag);
+ virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P, v->config_size);
+ v->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);
+ v9fs_register_transport(s, &virtio_9p_transport);
+
+out:
+ return;
+}
+
+static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ V9fsVirtioState *v = VIRTIO_9P(dev);
+ V9fsState *s = &v->state;
+
+ virtio_cleanup(vdev);
+ v9fs_device_unrealize_common(s, errp);
+}
+
/* virtio-9p device */
static const VMStateDescription vmstate_virtio_9p = {
--
2.13.6
- [Qemu-devel] [PULL 02/12] 9pfs: fix XattrOperations typedef, (continued)
- [Qemu-devel] [PULL 02/12] 9pfs: fix XattrOperations typedef, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 04/12] 9pfs: fix some type definitions, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 05/12] 9pfs: handle: fix type definition, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 09/12] tests: virtio-9p: fix ISR dependence, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 03/12] fsdev: fix some type definitions, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 10/12] tests: virtio-9p: set DRIVER_OK before using the device, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 12/12] fsdev: improve error handling of backend init, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 07/12] 9pfs: fix error path in pdu_submit(), Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 08/12] 9pfs: make pdu_marshal() and pdu_unmarshal() static functions, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 06/12] 9pfs: fix type in *_parse_opts declarations, Greg Kurz, 2018/01/05
- [Qemu-devel] [PULL 01/12] virtio-9p: move unrealize/realize after virtio_9p_transport definition,
Greg Kurz <=
- [Qemu-devel] [PULL 11/12] fsdev: improve error handling of backend opts parsing, Greg Kurz, 2018/01/05
- Re: [Qemu-devel] [PULL 00/12] 9p patches for 2.12 20170106, no-reply, 2018/01/06