Rearrange block headers

[qemu.git] / hw / xen_disk.c

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 95017a1f5c2788fada3deab77eef36c797cc2e78..134ac3388e9ecd0174f2bfb7ca6ef74a53cd015c 100644 (file)
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -41,6 +41,7 @@
 #include "qemu-char.h"
 #include "xen_blkif.h"
 #include "xen_backend.h"
+#include "blockdev.h"
 
 /* ------------------------------------------------------------- */
 
@@ -575,7 +576,7 @@ static void blk_alloc(struct XenDevice *xendev)
 static int blk_init(struct XenDevice *xendev)
 {
     struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
-    int index, mode, qflags, have_barriers, info = 0;
+    int index, qflags, have_barriers, info = 0;
     char *h;
 
     /* read xenstore entries */
@@ -609,10 +610,8 @@ static int blk_init(struct XenDevice *xendev)
 
     /* read-only ? */
     if (strcmp(blkdev->mode, "w") == 0) {
-       mode   = O_RDWR;
        qflags = BDRV_O_RDWR;
     } else {
-       mode   = O_RDONLY;
        qflags = 0;
        info  |= VDISK_READONLY;
     }