summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-01-28 11:21:38 +0100
committerKevin Wolf <kwolf@redhat.com>2011-01-31 10:24:25 +0100
commit904ebffee5a7e7d246039ad5826195fe51ccf769 (patch)
treefe42ed0db88e9a27fc578b447a8b2962783eb24e
parent13839974d14701626a2f9dcc5f8cf65783d51c11 (diff)
downloadqemu-904ebffee5a7e7d246039ad5826195fe51ccf769.tar.gz
qemu-904ebffee5a7e7d246039ad5826195fe51ccf769.tar.bz2
qemu-904ebffee5a7e7d246039ad5826195fe51ccf769.zip
blockdev: Move BlockInterfaceType from qemu-common.h to blockdev.h
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--blockdev.h6
-rw-r--r--qemu-common.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/blockdev.h b/blockdev.h
index 3ed66348d3..2cbbb87dc7 100644
--- a/blockdev.h
+++ b/blockdev.h
@@ -18,6 +18,12 @@ void blockdev_auto_del(BlockDriverState *bs);
#define BLOCK_SERIAL_STRLEN 20
+typedef enum {
+ IF_NONE,
+ IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
+ IF_COUNT
+} BlockInterfaceType;
+
struct DriveInfo {
BlockDriverState *bdrv;
char *id;
diff --git a/qemu-common.h b/qemu-common.h
index 79e1149ea1..c7ff280b95 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -274,12 +274,6 @@ typedef struct VirtIODevice VirtIODevice;
typedef uint64_t pcibus_t;
-typedef enum {
- IF_NONE,
- IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
- IF_COUNT
-} BlockInterfaceType;
-
void cpu_exec_init_all(unsigned long tb_size);
/* CPU save/load. */