rpms/kvm/devel .cvsignore, 1.42, 1.43 kvm-62-block-rw-range-check.patch, 1.8, 1.9 kvm.spec, 1.87, 1.88 sources, 1.42, 1.43

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529

Modified Files:
	.cvsignore kvm-62-block-rw-range-check.patch kvm.spec sources 
Log Message:
* Sun Feb 22 2009 Mark McLoughlin <markmc at redhat.com> - 84-1
- Update to kvm-84



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	15 Jan 2009 17:30:42 -0000	1.42
+++ .cvsignore	22 Feb 2009 11:55:57 -0000	1.43
@@ -1 +1 @@
-kvm-83.tar.gz
+kvm-84.tar.gz

kvm-62-block-rw-range-check.patch:

Index: kvm-62-block-rw-range-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm-62-block-rw-range-check.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kvm-62-block-rw-range-check.patch	11 Feb 2009 13:36:41 -0000	1.8
+++ kvm-62-block-rw-range-check.patch	22 Feb 2009 11:55:57 -0000	1.9
@@ -1,46 +1,6 @@
-Index: kvm-81/qemu/block-qcow.c
-===================================================================
---- kvm-81.orig/qemu/block-qcow.c
-+++ kvm-81/qemu/block-qcow.c
-@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
-     int len, i, shift, ret;
-     QCowHeader header;
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-Index: kvm-81/qemu/block-qcow2.c
-===================================================================
---- kvm-81.orig/qemu/block-qcow2.c
-+++ kvm-81/qemu/block-qcow2.c
-@@ -197,7 +197,7 @@ static int qcow_open(BlockDriverState *b
-         flags |= BDRV_O_CACHE_WB;
-         flags &= ~BDRV_O_CACHE_DEF;
-     }
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-Index: kvm-81/qemu/block-vmdk.c
-===================================================================
---- kvm-81.orig/qemu/block-vmdk.c
-+++ kvm-81/qemu/block-vmdk.c
-@@ -377,7 +377,7 @@ static int vmdk_open(BlockDriverState *b
-         // Parent must be opened as RO.
-         flags = BDRV_O_RDONLY;
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))
-Index: kvm-81/qemu/block.c
-===================================================================
---- kvm-81.orig/qemu/block.c
-+++ kvm-81/qemu/block.c
+diff -up kvm-84/qemu/block.c.block-rw-range-check kvm-84/qemu/block.c
+--- kvm-84/qemu/block.c.block-rw-range-check	2009-02-12 15:19:26.000000000 +0000
++++ kvm-84/qemu/block.c	2009-02-22 11:49:55.000000000 +0000
 @@ -128,6 +128,60 @@ void path_combine(char *dest, int dest_s
      }
  }
@@ -102,7 +62,7 @@
  
  static void bdrv_register(BlockDriver *bdrv)
  {
-@@ -340,6 +394,10 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -338,6 +392,10 @@ int bdrv_open2(BlockDriverState *bs, con
      bs->read_only = 0;
      bs->is_temporary = 0;
      bs->encrypted = 0;
@@ -113,15 +73,15 @@
  
      if (flags & BDRV_O_SNAPSHOT) {
          BlockDriverState *bs1;
-@@ -396,6 +454,7 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -394,6 +452,7 @@ int bdrv_open2(BlockDriverState *bs, con
      }
      bs->drv = drv;
      bs->opaque = qemu_mallocz(drv->instance_size);
 +    bs->total_sectors = 0; /* driver will set if it does not do getlength */
-     if (bs->opaque == NULL && drv->instance_size > 0)
-         return -1;
      /* Note: for compatibility, we open disk image files as RDWR, and
-@@ -461,6 +520,7 @@ void bdrv_close(BlockDriverState *bs)
+        RDONLY as fallback */
+     if (!(flags & BDRV_O_FILE))
+@@ -457,6 +516,7 @@ void bdrv_close(BlockDriverState *bs)
          bs->drv = NULL;
  
          /* call the change callback */
@@ -129,7 +89,7 @@
          bs->media_changed = 1;
          if (bs->change_cb)
              bs->change_cb(bs->change_opaque);
-@@ -533,6 +593,9 @@ int bdrv_read(BlockDriverState *bs, int6
+@@ -529,6 +589,9 @@ int bdrv_read(BlockDriverState *bs, int6
      if (!drv)
          return -ENOMEDIUM;
  
@@ -139,18 +99,16 @@
      if (drv->bdrv_pread) {
          int ret, len;
          len = nb_sectors * 512;
-@@ -565,6 +628,10 @@ int bdrv_write(BlockDriverState *bs, int
+@@ -561,6 +624,8 @@ int bdrv_write(BlockDriverState *bs, int
          return -ENOMEDIUM;
      if (bs->read_only)
          return -EACCES;
-+
 +    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
 +        return -EDOM;
-+
      if (drv->bdrv_pwrite) {
-         int ret, len;
+         int ret, len, count = 0;
          len = nb_sectors * 512;
-@@ -687,6 +754,8 @@ int bdrv_pread(BlockDriverState *bs, int
+@@ -684,6 +749,8 @@ int bdrv_pread(BlockDriverState *bs, int
          return -ENOMEDIUM;
      if (!drv->bdrv_pread)
          return bdrv_pread_em(bs, offset, buf1, count1);
@@ -159,7 +117,7 @@
      return drv->bdrv_pread(bs, offset, buf1, count1);
  }
  
-@@ -702,6 +771,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
+@@ -699,6 +766,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
          return -ENOMEDIUM;
      if (!drv->bdrv_pwrite)
          return bdrv_pwrite_em(bs, offset, buf1, count1);
@@ -168,7 +126,7 @@
      return drv->bdrv_pwrite(bs, offset, buf1, count1);
  }
  
-@@ -1127,6 +1198,8 @@ int bdrv_write_compressed(BlockDriverSta
+@@ -1120,6 +1189,8 @@ int bdrv_write_compressed(BlockDriverSta
          return -ENOMEDIUM;
      if (!drv->bdrv_write_compressed)
          return -ENOTSUP;
@@ -177,7 +135,7 @@
      return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
  }
  
-@@ -1273,6 +1346,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
+@@ -1329,6 +1400,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
  
      if (!drv)
          return NULL;
@@ -186,7 +144,7 @@
  
      ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);
  
-@@ -1297,6 +1372,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
+@@ -1353,6 +1426,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
      if (bs->read_only)
          return NULL;
  
@@ -196,10 +154,20 @@
      ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);
  
      if (ret) {
-Index: kvm-81/qemu/block_int.h
-===================================================================
---- kvm-81.orig/qemu/block_int.h
-+++ kvm-81/qemu/block_int.h
+diff -up kvm-84/qemu/block.h.block-rw-range-check kvm-84/qemu/block.h
+--- kvm-84/qemu/block.h.block-rw-range-check	2009-02-12 15:19:26.000000000 +0000
++++ kvm-84/qemu/block.h	2009-02-22 11:47:19.000000000 +0000
+@@ -53,6 +53,7 @@ typedef struct QEMUSnapshotInfo {
+ #define BDRV_O_NOCACHE     0x0020 /* do not use the host page cache */
+ #define BDRV_O_CACHE_WB    0x0040 /* use write-back caching */
+ #define BDRV_O_CACHE_DEF   0x0080 /* use default caching */
++#define BDRV_O_AUTOGROW	   0x0100 /* Allow backing file to extend when writing past end of file */
+ 
+ #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_CACHE_DEF)
+ 
+diff -up kvm-84/qemu/block_int.h.block-rw-range-check kvm-84/qemu/block_int.h
+--- kvm-84/qemu/block_int.h.block-rw-range-check	2009-02-12 15:19:26.000000000 +0000
++++ kvm-84/qemu/block_int.h	2009-02-22 11:47:19.000000000 +0000
 @@ -97,6 +97,7 @@ struct BlockDriverState {
      int locked;    /* if true, the media cannot temporarily be ejected */
      int encrypted; /* if true, the media is encrypted */
@@ -208,15 +176,39 @@
      /* event callback when inserting/removing */
      void (*change_cb)(void *opaque);
      void *change_opaque;
-Index: kvm-81/qemu/block.h
-===================================================================
---- kvm-81.orig/qemu/block.h
-+++ kvm-81/qemu/block.h
-@@ -50,6 +50,7 @@ typedef struct QEMUSnapshotInfo {
- #define BDRV_O_NOCACHE     0x0020 /* do not use the host page cache */
- #define BDRV_O_CACHE_WB    0x0040 /* use write-back caching */
- #define BDRV_O_CACHE_DEF   0x0080 /* use default caching */
-+#define BDRV_O_AUTOGROW	   0x0100 /* Allow backing file to extend when writing past end of file */
+diff -up kvm-84/qemu/block-qcow2.c.block-rw-range-check kvm-84/qemu/block-qcow2.c
+--- kvm-84/qemu/block-qcow2.c.block-rw-range-check	2009-02-12 15:19:26.000000000 +0000
++++ kvm-84/qemu/block-qcow2.c	2009-02-22 11:47:19.000000000 +0000
+@@ -203,7 +203,7 @@ static int qcow_open(BlockDriverState *b
+         flags |= BDRV_O_CACHE_WB;
+         flags &= ~BDRV_O_CACHE_DEF;
+     }
+-    ret = bdrv_file_open(&s->hd, filename, flags);
++    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
+     if (ret < 0)
+         return ret;
+     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
+diff -up kvm-84/qemu/block-qcow.c.block-rw-range-check kvm-84/qemu/block-qcow.c
+--- kvm-84/qemu/block-qcow.c.block-rw-range-check	2009-02-12 15:19:26.000000000 +0000
++++ kvm-84/qemu/block-qcow.c	2009-02-22 11:47:19.000000000 +0000
+@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
+     int len, i, shift, ret;
+     QCowHeader header;
  
- #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_CACHE_DEF)
+-    ret = bdrv_file_open(&s->hd, filename, flags);
++    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
+     if (ret < 0)
+         return ret;
+     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
+diff -up kvm-84/qemu/block-vmdk.c.block-rw-range-check kvm-84/qemu/block-vmdk.c
+--- kvm-84/qemu/block-vmdk.c.block-rw-range-check	2009-02-12 15:19:26.000000000 +0000
++++ kvm-84/qemu/block-vmdk.c	2009-02-22 11:47:19.000000000 +0000
+@@ -373,7 +373,7 @@ static int vmdk_open(BlockDriverState *b
+         // Parent must be opened as RO.
+         flags = BDRV_O_RDONLY;
  
+-    ret = bdrv_file_open(&s->hd, filename, flags);
++    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
+     if (ret < 0)
+         return ret;
+     if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kvm.spec	11 Feb 2009 16:14:30 -0000	1.87
+++ kvm.spec	22 Feb 2009 11:55:57 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 83
-Release: 5%{?dist}
+Version: 84
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -54,8 +54,8 @@
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .block-rw-range-check
+%patch1 -p1 -b .compile-fixes
 
 # "configure --kerneldir" looks for this
 # FIXME: kvm-84 or later shouldn't need this anymore, see:
@@ -74,13 +74,13 @@
 # to the debug packages.
 
 build_id_available() {
-	echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null
+    echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null
 }
 
 if build_id_available; then
-	qemuldflags="-Wl,--build-id";
+    qemuldflags="-Wl,--build-id";
 else
-	qemuldflags="";
+    qemuldflags="";
 fi
 
 
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Sun Feb 22 2009 Mark McLoughlin <markmc at redhat.com> - 84-1
+- Update to kvm-84
+
 * Wed Feb 11 2009 Eduardo Habkost <ehabkost at redhat.com> - 83-5
 - Compile fixes for newer gcc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	15 Jan 2009 17:24:44 -0000	1.42
+++ sources	22 Feb 2009 11:55:57 -0000	1.43
@@ -1 +1 @@
-dfb3cc36029d84e83c5006c600337754  kvm-83.tar.gz
+39b7206ef400845800f081a5b901f757  kvm-84.tar.gz