[Xen-changelog] [xen-unstable] ioemu: Fix segfault when creating qcow-backed vbds.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204552445 0
# Node ID d0daf11fb35dab676e5e4ef9b1c02da649e4f9af
# Parent  38bbaa69c06539f7621578882553fec7d1270887
ioemu: Fix segfault when creating qcow-backed vbds.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/ioemu/block-raw.c |    2 --
 tools/ioemu/block.c     |    5 +----
 tools/ioemu/block_int.h |    3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff -r 38bbaa69c065 -r d0daf11fb35d tools/ioemu/block-raw.c
--- a/tools/ioemu/block-raw.c   Mon Mar 03 13:19:44 2008 +0000
+++ b/tools/ioemu/block-raw.c   Mon Mar 03 13:54:05 2008 +0000
@@ -1489,7 +1489,5 @@ BlockDriver bdrv_host_device = {
     .bdrv_pread = raw_pread,
     .bdrv_pwrite = raw_pwrite,
     .bdrv_getlength = raw_getlength,
-
-    .bdrv_flags = BLOCK_DRIVER_FLAG_EXTENDABLE
 };
 #endif /* _WIN32 */
diff -r 38bbaa69c065 -r d0daf11fb35d tools/ioemu/block.c
--- a/tools/ioemu/block.c       Mon Mar 03 13:19:44 2008 +0000
+++ b/tools/ioemu/block.c       Mon Mar 03 13:54:05 2008 +0000
@@ -350,11 +350,8 @@ int bdrv_open2(BlockDriverState *bs, con
     bs->is_temporary = 0;
     bs->encrypted = 0;
 
-    if (flags & BDRV_O_EXTENDABLE) {
-       if (!(drv->bdrv_flags & BLOCK_DRIVER_FLAG_EXTENDABLE))
-           return -ENOSYS;
+    if (flags & BDRV_O_EXTENDABLE)
        bs->extendable = 1;
-    }
 
     if (flags & BDRV_O_SNAPSHOT) {
         BlockDriverState *bs1;
diff -r 38bbaa69c065 -r d0daf11fb35d tools/ioemu/block_int.h
--- a/tools/ioemu/block_int.h   Mon Mar 03 13:19:44 2008 +0000
+++ b/tools/ioemu/block_int.h   Mon Mar 03 13:54:05 2008 +0000
@@ -23,8 +23,6 @@
  */
 #ifndef BLOCK_INT_H
 #define BLOCK_INT_H
-
-#define BLOCK_DRIVER_FLAG_EXTENDABLE  0x0001u
 
 struct BlockDriver {
     const char *format_name;
@@ -78,7 +76,6 @@ struct BlockDriver {
     int (*bdrv_eject)(BlockDriverState *bs, int eject_flag);
     int (*bdrv_set_locked)(BlockDriverState *bs, int locked);
     
-    unsigned bdrv_flags;
     BlockDriverAIOCB *free_aiocb;
     struct BlockDriver *next;
 };

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog