From 2446333cd5b5c985f6517dee7004e542ecacd21c Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Tue, 24 Aug 2010 15:22:24 +0000 Subject: 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 --- blockdev.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'blockdev.h') 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 -- cgit v1.2.1