diff options
| author | Blue Swirl | 2010-08-24 17:22:24 +0200 |
|---|---|---|
| committer | Blue Swirl | 2010-08-24 17:22:24 +0200 |
| commit | 2446333cd5b5c985f6517dee7004e542ecacd21c (patch) | |
| tree | 9646889006f9944dc5d530b73d35a6c3c30c239b /blockdev.h | |
| parent | Merge remote branch 'qemu-kvm/uq/master' into staging (diff) | |
| download | qemu-2446333cd5b5c985f6517dee7004e542ecacd21c.tar.gz qemu-2446333cd5b5c985f6517dee7004e542ecacd21c.tar.xz qemu-2446333cd5b5c985f6517dee7004e542ecacd21c.zip | |
Rearrange block headers
Changing block.h or blockdev.h resulted in recompiling most objects.
Move DriveInfo typedef and BlockInterfaceType enum definitions
to qemu-common.h and rearrange blockdev.h use to decrease churn.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'blockdev.h')
| -rw-r--r-- | blockdev.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/blockdev.h b/blockdev.h index 37f3a017ea..89dcd9a88e 100644 --- a/blockdev.h +++ b/blockdev.h @@ -16,15 +16,9 @@ void blockdev_mark_auto_del(BlockDriverState *bs); void blockdev_auto_del(BlockDriverState *bs); -typedef enum { - IF_NONE, - IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN, - IF_COUNT -} BlockInterfaceType; - #define BLOCK_SERIAL_STRLEN 20 -typedef struct DriveInfo { +struct DriveInfo { BlockDriverState *bdrv; char *id; const char *devaddr; @@ -35,7 +29,7 @@ typedef struct DriveInfo { QemuOpts *opts; char serial[BLOCK_SERIAL_STRLEN + 1]; QTAILQ_ENTRY(DriveInfo) next; -} DriveInfo; +}; #define MAX_IDE_DEVS 2 #define MAX_SCSI_DEVS 7 |