[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/15] virtio-blk: move init function to virtio-b
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 15/15] virtio-blk: move init function to virtio-blk.h |
Date: |
Mon, 2 Jan 2012 18:59:26 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio-blk.h | 7 +++++--
hw/virtio.h | 7 -------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index 518e1cc..70d939a 100644
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -97,11 +97,14 @@ struct virtio_scsi_inhdr
uint32_t residual;
};
-struct VirtIOBlkConf
+typedef struct VirtIOBlkConf
{
BlockConf conf;
char *serial;
-};
+} VirtIOBlkConf;
+
+VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk);
+void virtio_blk_exit(VirtIODevice *vdev);
#ifdef __linux__
#define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \
diff --git a/hw/virtio.h b/hw/virtio.h
index 74576ed..552efbb 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -187,13 +187,6 @@ int virtio_set_features(VirtIODevice *vdev, uint32_t val);
void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding,
void *opaque);
-/* Base devices. */
-typedef struct VirtIOBlkConf VirtIOBlkConf;
-VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk);
-
-
-void virtio_blk_exit(VirtIODevice *vdev);
-
#define DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) \
DEFINE_PROP_BIT("indirect_desc", _state, _field, \
VIRTIO_RING_F_INDIRECT_DESC, true), \
--
1.7.7.1
- [Qemu-devel] [PATCH v2 05/15] virtio-9p: remove PCI dependencies from hw/9pfs/, (continued)
- [Qemu-devel] [PATCH v2 05/15] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 04/15] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 06/15] virtio-9p: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 07/15] virtio-blk: define VirtIOBlkConf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 08/15] virtio-blk: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 09/15] virtio-blk: move BlockConf into VirtIOBlkConf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 11/15] virtio-net: move init function to virtio-net.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virtio-serial.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 13/15] virtio-balloon: move init function to virtio-balloon.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 14/15] virtio-9p: move init function to virtio-9p-device.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 15/15] virtio-blk: move init function to virtio-blk.h,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 10/15] virtio: move conf fields into an anonymous union, Paolo Bonzini, 2012/01/02