From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42906 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjvg0-0002ZL-4b for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pjvfd-0003Tt-0p for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pjvfc-0003TV-Pt for qemu-devel@nongnu.org; Mon, 31 Jan 2011 10:28:00 -0500 From: Kevin Wolf Date: Mon, 31 Jan 2011 16:29:08 +0100 Message-Id: <1296487756-12553-21-git-send-email-kwolf@redhat.com> In-Reply-To: <1296487756-12553-1-git-send-email-kwolf@redhat.com> References: <1296487756-12553-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 20/28] blockdev: Move BlockInterfaceType from qemu-common.h to blockdev.h List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.h | 6 ++++++ qemu-common.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/blockdev.h b/blockdev.h index 3ed6634..2cbbb87 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 79e1149..c7ff280 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. */ -- 1.7.2.3