rpms/kvm/devel kvm-62-block-rw-range-check.patch, 1.4, 1.5 kvm.spec, 1.73, 1.74

[Glauber Costa]

Author: glommer

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

Modified Files:
	kvm-62-block-rw-range-check.patch kvm.spec 
Log Message:
- Update to kvm-78
- Changed patch kvm-62-block-rw-range-check. Flag value changed
  because upstream added a new flag.



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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kvm-62-block-rw-range-check.patch	27 Oct 2008 16:48:00 -0000	1.4
+++ kvm-62-block-rw-range-check.patch	2 Nov 2008 11:37:08 -0000	1.5
@@ -1,7 +1,7 @@
-Index: kvm-77/qemu/block-qcow.c
+Index: kvm-78/qemu/block-qcow.c
 ===================================================================
---- kvm-77.orig/qemu/block-qcow.c
-+++ kvm-77/qemu/block-qcow.c
+--- kvm-78.orig/qemu/block-qcow.c
++++ kvm-78/qemu/block-qcow.c
 @@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
      int len, i, shift, ret;
      QCowHeader header;
@@ -11,10 +11,10 @@
      if (ret < 0)
          return ret;
      if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-Index: kvm-77/qemu/block-qcow2.c
+Index: kvm-78/qemu/block-qcow2.c
 ===================================================================
---- kvm-77.orig/qemu/block-qcow2.c
-+++ kvm-77/qemu/block-qcow2.c
+--- kvm-78.orig/qemu/block-qcow2.c
++++ kvm-78/qemu/block-qcow2.c
 @@ -189,7 +189,7 @@ static int qcow_open(BlockDriverState *b
      int len, i, shift, ret;
      QCowHeader header;
@@ -24,10 +24,10 @@
      if (ret < 0)
          return ret;
      if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-Index: kvm-77/qemu/block-vmdk.c
+Index: kvm-78/qemu/block-vmdk.c
 ===================================================================
---- kvm-77.orig/qemu/block-vmdk.c
-+++ kvm-77/qemu/block-vmdk.c
+--- kvm-78.orig/qemu/block-vmdk.c
++++ kvm-78/qemu/block-vmdk.c
 @@ -377,7 +377,7 @@ static int vmdk_open(BlockDriverState *b
          // Parent must be opened as RO.
          flags = BDRV_O_RDONLY;
@@ -37,10 +37,10 @@
      if (ret < 0)
          return ret;
      if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))
-Index: kvm-77/qemu/block.c
+Index: kvm-78/qemu/block.c
 ===================================================================
---- kvm-77.orig/qemu/block.c
-+++ kvm-77/qemu/block.c
+--- kvm-78.orig/qemu/block.c
++++ kvm-78/qemu/block.c
 @@ -123,6 +123,60 @@ void path_combine(char *dest, int dest_s
      }
  }
@@ -165,7 +165,7 @@
      return drv->bdrv_pwrite(bs, offset, buf1, count1);
  }
  
-@@ -1138,6 +1206,8 @@ int bdrv_write_compressed(BlockDriverSta
+@@ -1143,6 +1211,8 @@ int bdrv_write_compressed(BlockDriverSta
          return -ENOMEDIUM;
      if (!drv->bdrv_write_compressed)
          return -ENOTSUP;
@@ -174,7 +174,7 @@
      return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
  }
  
-@@ -1284,6 +1354,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
+@@ -1289,6 +1359,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
  
      if (!drv)
          return NULL;
@@ -183,7 +183,7 @@
  
      /* XXX: we assume that nb_sectors == 0 is suppored by the async read */
      if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-@@ -1315,6 +1387,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
+@@ -1320,6 +1392,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
          return NULL;
      if (bs->read_only)
          return NULL;
@@ -192,22 +192,22 @@
      if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
          memcpy(bs->boot_sector_data, buf, 512);
      }
-Index: kvm-77/qemu/block.h
+Index: kvm-78/qemu/block.h
 ===================================================================
---- kvm-77.orig/qemu/block.h
-+++ kvm-77/qemu/block.h
-@@ -48,6 +48,7 @@ typedef struct QEMUSnapshotInfo {
-                                      it (default for
+--- kvm-78.orig/qemu/block.h
++++ kvm-78/qemu/block.h
+@@ -49,6 +49,7 @@ typedef struct QEMUSnapshotInfo {
                                       bdrv_file_open()) */
- #define BDRV_O_DIRECT      0x0020
-+#define BDRV_O_AUTOGROW    0x0040 /* Allow backing file to extend when writing past end of file */
+ #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_AUTOGROW	   0x0080 /* Allow backing file to extend when writing past end of file */
  
- void bdrv_info(void);
- void bdrv_info_stats(void);
-Index: kvm-77/qemu/block_int.h
+ #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB)
+ 
+Index: kvm-78/qemu/block_int.h
 ===================================================================
---- kvm-77.orig/qemu/block_int.h
-+++ kvm-77/qemu/block_int.h
+--- kvm-78.orig/qemu/block_int.h
++++ kvm-78/qemu/block_int.h
 @@ -97,6 +97,7 @@ struct BlockDriverState {
      int locked;    /* if true, the media cannot temporarily be ejected */
      int encrypted; /* if true, the media is encrypted */


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kvm.spec	27 Oct 2008 16:48:00 -0000	1.73
+++ kvm.spec	2 Nov 2008 11:37:08 -0000	1.74
@@ -1,6 +1,6 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 77
+Version: 78
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
@@ -132,6 +132,11 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Mon Nov 02 2008 Glauber Costa <glommer at redhat.com> - 78-1
+- Update to kvm-78
+- Changed patch kvm-62-block-rw-range-check. Flag value changed
+  because upstream added a new flag.
+
 * Mon Oct 27 2008 Glauber Costa <glommer at redhat.com> - 77-1
 - Update to kvm-77
 - dropped kvm-bootmenu.patch - upstream, but uses a slightly