rpms/kvm/devel kvm-62-block-rw-range-check.patch, 1.2, 1.3 kvm.spec, 1.65, 1.66

Glauber Costa glommer at fedoraproject.org
Tue Aug 26 17:01:33 UTC 2008 

Author: glommer

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

Modified Files:
	kvm-62-block-rw-range-check.patch kvm.spec 
Log Message:
updated patch for kvm-73



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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kvm-62-block-rw-range-check.patch	20 May 2008 20:16:18 -0000	1.2
+++ kvm-62-block-rw-range-check.patch	26 Aug 2008 17:01:33 -0000	1.3
@@ -1,7 +1,47 @@
-diff -Naurp kvm-69.orig/qemu/block.c kvm-69/qemu/block.c
---- kvm-69.orig/qemu/block.c	2008-05-12 08:30:43.000000000 -0300
-+++ kvm-69/qemu/block.c	2008-05-20 15:04:07.000000000 -0300
-@@ -124,6 +124,60 @@ void path_combine(char *dest, int dest_s
+diff --git a/qemu/block-qcow.c b/qemu/block-qcow.c
+index 1fecf30..919dd51 100644
+--- a/qemu/block-qcow.c
++++ b/qemu/block-qcow.c
+@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
+     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))
+diff --git a/qemu/block-qcow2.c b/qemu/block-qcow2.c
+index b9f1688..31e2726 100644
+--- a/qemu/block-qcow2.c
++++ b/qemu/block-qcow2.c
+@@ -193,7 +193,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
+     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))
+diff --git a/qemu/block-vmdk.c b/qemu/block-vmdk.c
+index 305463f..99234c1 100644
+--- a/qemu/block-vmdk.c
++++ b/qemu/block-vmdk.c
+@@ -376,7 +376,7 @@ static int vmdk_open(BlockDriverState *bs, const char *filename, int flags)
+         // 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))
+diff --git a/qemu/block.c b/qemu/block.c
+index f4f9c97..f9f8c2d 100644
+--- a/qemu/block.c
++++ b/qemu/block.c
+@@ -124,6 +124,60 @@ void path_combine(char *dest, int dest_size,
      }
  }
  
@@ -62,7 +102,7 @@
  
  static void bdrv_register(BlockDriver *bdrv)
  {
-@@ -336,6 +390,10 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -336,6 +390,10 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
      bs->read_only = 0;
      bs->is_temporary = 0;
      bs->encrypted = 0;
@@ -73,7 +113,7 @@
  
      if (flags & BDRV_O_SNAPSHOT) {
          BlockDriverState *bs1;
-@@ -380,6 +438,7 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -380,6 +438,7 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
      }
      bs->drv = drv;
      bs->opaque = qemu_mallocz(drv->instance_size);
@@ -89,7 +129,7 @@
          bs->media_changed = 1;
          if (bs->change_cb)
              bs->change_cb(bs->change_opaque);
-@@ -517,6 +577,8 @@ int bdrv_read(BlockDriverState *bs, int6
+@@ -517,6 +577,8 @@ int bdrv_read(BlockDriverState *bs, int64_t sector_num,
      if (!drv)
          return -ENOMEDIUM;
  
@@ -98,7 +138,7 @@
      if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
              memcpy(buf, bs->boot_sector_data, 512);
          sector_num++;
-@@ -557,6 +619,8 @@ int bdrv_write(BlockDriverState *bs, int
+@@ -557,6 +619,8 @@ int bdrv_write(BlockDriverState *bs, int64_t sector_num,
          return -ENOMEDIUM;
      if (bs->read_only)
          return -EACCES;
@@ -107,7 +147,7 @@
      if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
          memcpy(bs->boot_sector_data, buf, 512);
      }
-@@ -682,6 +746,8 @@ int bdrv_pread(BlockDriverState *bs, int
+@@ -682,6 +746,8 @@ int bdrv_pread(BlockDriverState *bs, int64_t offset,
          return -ENOMEDIUM;
      if (!drv->bdrv_pread)
          return bdrv_pread_em(bs, offset, buf1, count1);
@@ -116,7 +156,7 @@
      return drv->bdrv_pread(bs, offset, buf1, count1);
  }
  
-@@ -697,6 +763,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
+@@ -697,6 +763,8 @@ int bdrv_pwrite(BlockDriverState *bs, int64_t offset,
          return -ENOMEDIUM;
      if (!drv->bdrv_pwrite)
          return bdrv_pwrite_em(bs, offset, buf1, count1);
@@ -125,7 +165,7 @@
      return drv->bdrv_pwrite(bs, offset, buf1, count1);
  }
  
-@@ -1102,6 +1170,8 @@ int bdrv_write_compressed(BlockDriverSta
+@@ -1129,6 +1197,8 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
          return -ENOMEDIUM;
      if (!drv->bdrv_write_compressed)
          return -ENOTSUP;
@@ -134,7 +174,7 @@
      return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
  }
  
-@@ -1248,6 +1318,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
+@@ -1275,6 +1345,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num,
  
      if (!drv)
          return NULL;
@@ -143,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) {
-@@ -1279,6 +1351,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
+@@ -1306,6 +1378,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num,
          return NULL;
      if (bs->read_only)
          return NULL;
@@ -152,10 +192,11 @@
      if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
          memcpy(bs->boot_sector_data, buf, 512);
      }
-diff -Naurp kvm-69.orig/qemu/block.h kvm-69/qemu/block.h
---- kvm-69.orig/qemu/block.h	2008-05-12 08:30:43.000000000 -0300
-+++ kvm-69/qemu/block.h	2008-05-20 15:04:07.000000000 -0300
-@@ -45,6 +45,7 @@ typedef struct QEMUSnapshotInfo {
+diff --git a/qemu/block.h b/qemu/block.h
+index 81587ef..b262f9b 100644
+--- a/qemu/block.h
++++ b/qemu/block.h
+@@ -46,6 +46,7 @@ typedef struct QEMUSnapshotInfo {
                                       it (default for
                                       bdrv_file_open()) */
  #define BDRV_O_DIRECT      0x0020
@@ -163,9 +204,10 @@
  
  #ifndef QEMU_IMG
  void bdrv_info(void);
-diff -Naurp kvm-69.orig/qemu/block_int.h kvm-69/qemu/block_int.h
---- kvm-69.orig/qemu/block_int.h	2008-05-12 08:30:43.000000000 -0300
-+++ kvm-69/qemu/block_int.h	2008-05-20 15:04:07.000000000 -0300
+diff --git a/qemu/block_int.h b/qemu/block_int.h
+index 2d70cf1..efd7516 100644
+--- a/qemu/block_int.h
++++ b/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 */
@@ -174,39 +216,3 @@
      /* event callback when inserting/removing */
      void (*change_cb)(void *opaque);
      void *change_opaque;
-diff -Naurp kvm-69.orig/qemu/block-qcow2.c kvm-69/qemu/block-qcow2.c
---- kvm-69.orig/qemu/block-qcow2.c	2008-05-12 08:30:43.000000000 -0300
-+++ kvm-69/qemu/block-qcow2.c	2008-05-20 15:04:07.000000000 -0300
-@@ -191,7 +191,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))
-diff -Naurp kvm-69.orig/qemu/block-qcow.c kvm-69/qemu/block-qcow.c
---- kvm-69.orig/qemu/block-qcow.c	2008-05-12 08:30:43.000000000 -0300
-+++ kvm-69/qemu/block-qcow.c	2008-05-20 15:04:07.000000000 -0300
-@@ -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))
-diff -Naurp kvm-69.orig/qemu/block-vmdk.c kvm-69/qemu/block-vmdk.c
---- kvm-69.orig/qemu/block-vmdk.c	2008-05-12 08:30:43.000000000 -0300
-+++ kvm-69/qemu/block-vmdk.c	2008-05-20 15:04:07.000000000 -0300
-@@ -377,7 +377,7 @@ static int vmdk_open(BlockDriverState *b
-         flags = BDRV_O_RDONLY;
-     fprintf(stderr, "(VMDK) image open: flags=0x%x filename=%s\n", flags, bs->filename);
- 
--    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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kvm.spec	26 Aug 2008 16:02:02 -0000	1.65
+++ kvm.spec	26 Aug 2008 17:01:33 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 73
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -107,6 +107,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Tue Aug 26 2008 Glauber Costa <glommer at redhat.com> - 73-2
+- updated block rw patch
+
 * Thu Aug 21 2008 Glauber Costa <gcosta at redhat.com> - 73-1
 - Update to kvm-73.
 - alsa enablement patch not needed anymore - removed.

More information about the fedora-extras-commits mailing list