From d06599430ac907d1a89bbfda4bf3621f909aac8e Mon Sep 17 00:00:00 2001
From: David Turner <digit@android.com>
Date: Fri, 10 Sep 2010 10:42:32 +0200
Subject: upstream: qemu-common.h updates.

---
 sysemu.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'sysemu.h')

diff --git a/sysemu.h b/sysemu.h
index adccb93..0d332c1 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -162,16 +162,11 @@ extern unsigned int nb_prom_envs;
 #endif
 
 typedef enum {
-    IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
-    IF_COUNT
-} BlockInterfaceType;
-
-typedef enum {
     BLOCK_ERR_REPORT, BLOCK_ERR_IGNORE, BLOCK_ERR_STOP_ENOSPC,
     BLOCK_ERR_STOP_ANY
 } BlockInterfaceErrorAction;
 
-typedef struct DriveInfo {
+struct DriveInfo {
     BlockDriverState *bdrv;
     BlockInterfaceType type;
     int bus;
@@ -180,7 +175,7 @@ typedef struct DriveInfo {
     int drive_opt_idx;
     BlockInterfaceErrorAction onerror;
     char serial[21];
-} DriveInfo;
+};
 
 #define MAX_IDE_DEVS	2
 #define MAX_SCSI_DEVS	7
-- 
cgit v1.1