rpms/kvm/devel .cvsignore, 1.38, 1.39 kvm-62-block-rw-range-check.patch, 1.3, 1.4 kvm.spec, 1.72, 1.73 sources, 1.37, 1.38 kvm-74-page-find.patch, 1.1, NONE kvm-74-pxe-boot.patch, 1.1, NONE kvm-bootmenu.patch, 1.2, NONE

Glauber Costa glommer at fedoraproject.org
Mon Oct 27 16:48:31 UTC 2008 

Author: glommer

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

Modified Files:
	.cvsignore kvm-62-block-rw-range-check.patch kvm.spec sources 
Removed Files:
	kvm-74-page-find.patch kvm-74-pxe-boot.patch 
	kvm-bootmenu.patch 
Log Message:
* 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
  different interface now (F12 key)
- dropped kvm-74-page-find.patch - upstream
- dropped kvm-74-pxe-boot.patch - upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	28 Aug 2008 12:38:47 -0000	1.38
+++ .cvsignore	27 Oct 2008 16:48:00 -0000	1.39
@@ -1 +1 @@
-kvm-74.tar.gz
+kvm-77.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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kvm-62-block-rw-range-check.patch	26 Aug 2008 17:01:33 -0000	1.3
+++ kvm-62-block-rw-range-check.patch	27 Oct 2008 16:48:00 -0000	1.4
@@ -1,8 +1,8 @@
-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)
+Index: kvm-77/qemu/block-qcow.c
+===================================================================
+--- kvm-77.orig/qemu/block-qcow.c
++++ kvm-77/qemu/block-qcow.c
+@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
      int len, i, shift, ret;
      QCowHeader header;
  
@@ -11,11 +11,11 @@
      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)
+Index: kvm-77/qemu/block-qcow2.c
+===================================================================
+--- kvm-77.orig/qemu/block-qcow2.c
++++ kvm-77/qemu/block-qcow2.c
+@@ -189,7 +189,7 @@ static int qcow_open(BlockDriverState *b
      int len, i, shift, ret;
      QCowHeader header;
  
@@ -24,11 +24,11 @@
      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)
+Index: kvm-77/qemu/block-vmdk.c
+===================================================================
+--- kvm-77.orig/qemu/block-vmdk.c
++++ kvm-77/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,11 +37,11 @@
      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,
+Index: kvm-77/qemu/block.c
+===================================================================
+--- kvm-77.orig/qemu/block.c
++++ kvm-77/qemu/block.c
+@@ -123,6 +123,60 @@ void path_combine(char *dest, int dest_s
      }
  }
  
@@ -102,7 +102,7 @@
  
  static void bdrv_register(BlockDriver *bdrv)
  {
-@@ -336,6 +390,10 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
+@@ -335,6 +389,10 @@ int bdrv_open2(BlockDriverState *bs, con
      bs->read_only = 0;
      bs->is_temporary = 0;
      bs->encrypted = 0;
@@ -113,7 +113,7 @@
  
      if (flags & BDRV_O_SNAPSHOT) {
          BlockDriverState *bs1;
-@@ -380,6 +438,7 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
+@@ -391,6 +449,7 @@ int bdrv_open2(BlockDriverState *bs, con
      }
      bs->drv = drv;
      bs->opaque = qemu_mallocz(drv->instance_size);
@@ -121,7 +121,7 @@
      if (bs->opaque == NULL && drv->instance_size > 0)
          return -1;
      /* Note: for compatibility, we open disk image files as RDWR, and
-@@ -445,6 +504,7 @@ void bdrv_close(BlockDriverState *bs)
+@@ -456,6 +515,7 @@ void bdrv_close(BlockDriverState *bs)
          bs->drv = NULL;
  
          /* call the change callback */
@@ -129,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, int64_t sector_num,
+@@ -528,6 +588,8 @@ int bdrv_read(BlockDriverState *bs, int6
      if (!drv)
          return -ENOMEDIUM;
  
@@ -138,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, int64_t sector_num,
+@@ -568,6 +630,8 @@ int bdrv_write(BlockDriverState *bs, int
          return -ENOMEDIUM;
      if (bs->read_only)
          return -EACCES;
@@ -147,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, int64_t offset,
+@@ -693,6 +757,8 @@ int bdrv_pread(BlockDriverState *bs, int
          return -ENOMEDIUM;
      if (!drv->bdrv_pread)
          return bdrv_pread_em(bs, offset, buf1, count1);
@@ -156,7 +156,7 @@
      return drv->bdrv_pread(bs, offset, buf1, count1);
  }
  
-@@ -697,6 +763,8 @@ int bdrv_pwrite(BlockDriverState *bs, int64_t offset,
+@@ -708,6 +774,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
          return -ENOMEDIUM;
      if (!drv->bdrv_pwrite)
          return bdrv_pwrite_em(bs, offset, buf1, count1);
@@ -165,7 +165,7 @@
      return drv->bdrv_pwrite(bs, offset, buf1, count1);
  }
  
-@@ -1129,6 +1197,8 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
+@@ -1138,6 +1206,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);
  }
  
-@@ -1275,6 +1345,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num,
+@@ -1284,6 +1354,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) {
-@@ -1306,6 +1378,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num,
+@@ -1315,6 +1387,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);
      }
-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 {
+Index: kvm-77/qemu/block.h
+===================================================================
+--- kvm-77.orig/qemu/block.h
++++ kvm-77/qemu/block.h
+@@ -48,6 +48,7 @@ typedef struct QEMUSnapshotInfo {
                                       it (default for
                                       bdrv_file_open()) */
  #define BDRV_O_DIRECT      0x0020
 +#define BDRV_O_AUTOGROW    0x0040 /* Allow backing file to extend when writing past end of file */
  
- #ifndef QEMU_IMG
  void bdrv_info(void);
-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
+ void bdrv_info_stats(void);
+Index: kvm-77/qemu/block_int.h
+===================================================================
+--- kvm-77.orig/qemu/block_int.h
++++ kvm-77/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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kvm.spec	22 Oct 2008 14:07:17 -0000	1.72
+++ kvm.spec	27 Oct 2008 16:48:00 -0000	1.73
@@ -1,18 +1,15 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 74
-Release: 5%{?dist}
+Version: 77
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
 Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 #Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz
 Source1: %{name}.modules
-Patch0: %{name}-bootmenu.patch
-Patch1: %{name}-62-block-rw-range-check.patch
-Patch2: %{name}-74-pxe-boot.patch
-Patch3: %{name}-74-page-find.patch
-Patch4: %{name}-fix-pc-bios-make-install-missing-files.patch
+Patch0: %{name}-62-block-rw-range-check.patch
+Patch1: %{name}-fix-pc-bios-make-install-missing-files.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
@@ -45,9 +42,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 # we must not use any of the binaries from the qemu/pc-bios/ directory,
 # as they don't have the corresponding sources shipped with them
 rm -f qemu/pc-bios/*
@@ -138,6 +132,13 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* 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
+  different interface now (F12 key)
+- dropped kvm-74-page-find.patch - upstream
+- dropped kvm-74-pxe-boot.patch - upstream
+
 * Tue Oct 22 2008 Glauber Costa <glommer at redhat.com> - 74-5
 - Remove all prebuilt qemu/pc-bios binaries before building
 - Use symlinks to etherboot files for the pxe roms


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	28 Aug 2008 12:38:47 -0000	1.37
+++ sources	27 Oct 2008 16:48:00 -0000	1.38
@@ -1 +1 @@
-f34fac015a06c28eb6b8192ba476eb40  kvm-74.tar.gz
+3ef0858ce2ea6b52c73edb766e464279  kvm-77.tar.gz


--- kvm-74-page-find.patch DELETED ---


--- kvm-74-pxe-boot.patch DELETED ---


--- kvm-bootmenu.patch DELETED ---

More information about the scm-commits mailing list