rpms/kvm/devel .cvsignore, 1.31, 1.32 kvm-62-block-rw-range-check.patch, 1.1, 1.2 kvm-62-e1000-default.patch, 1.1, 1.2 kvm-63-defaults.patch, 1.1, 1.2 kvm.spec, 1.55, 1.56 sources, 1.30, 1.31
Glauber Costa (glommer)
fedora-extras-commits at redhat.com
Tue May 20 20:17:05 UTC 2008
- Previous message (by thread): rpms/python-IPy/EL-5 .cvsignore, 1.1, 1.2 python-IPy.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/python-IPy/EL-4 .cvsignore, 1.1, 1.2 python-IPy.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: glommer
Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31780
Modified Files:
.cvsignore kvm-62-block-rw-range-check.patch
kvm-62-e1000-default.patch kvm-63-defaults.patch kvm.spec
sources
Log Message:
* Tue May 20 2008 Glauber Costa <gcosta at redhat.com> - 69-1
- Update to kvm-69
- Removed Patch4 (Upstreamed)
- Removed virtio-boot patch (Upstreamed)
- Regenerated the other patches
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 5 May 2008 17:55:12 -0000 1.31
+++ .cvsignore 20 May 2008 20:16:18 -0000 1.32
@@ -1 +1,2 @@
kvm-68.tar.gz
+kvm-69.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kvm-62-block-rw-range-check.patch 28 Feb 2008 00:37:13 -0000 1.1
+++ kvm-62-block-rw-range-check.patch 20 May 2008 20:16:18 -0000 1.2
@@ -1,6 +1,6 @@
-diff -rup kvm-62.orig/qemu/block.c kvm-62.new/qemu/block.c
---- kvm-62.orig/qemu/block.c 2008-02-27 19:30:21.000000000 -0500
-+++ kvm-62.new/qemu/block.c 2008-02-27 19:30:46.000000000 -0500
+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
}
}
@@ -62,7 +62,7 @@
static void bdrv_register(BlockDriver *bdrv)
{
-@@ -332,6 +386,10 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -336,6 +390,10 @@ int bdrv_open2(BlockDriverState *bs, con
bs->read_only = 0;
bs->is_temporary = 0;
bs->encrypted = 0;
@@ -73,7 +73,7 @@
if (flags & BDRV_O_SNAPSHOT) {
BlockDriverState *bs1;
-@@ -376,6 +434,7 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -380,6 +438,7 @@ int bdrv_open2(BlockDriverState *bs, con
}
bs->drv = drv;
bs->opaque = qemu_mallocz(drv->instance_size);
@@ -81,7 +81,7 @@
if (bs->opaque == NULL && drv->instance_size > 0)
return -1;
/* Note: for compatibility, we open disk image files as RDWR, and
-@@ -441,6 +500,7 @@ void bdrv_close(BlockDriverState *bs)
+@@ -445,6 +504,7 @@ void bdrv_close(BlockDriverState *bs)
bs->drv = NULL;
/* call the change callback */
@@ -89,7 +89,7 @@
bs->media_changed = 1;
if (bs->change_cb)
bs->change_cb(bs->change_opaque);
-@@ -506,6 +566,8 @@ int bdrv_read(BlockDriverState *bs, int6
+@@ -517,6 +577,8 @@ int bdrv_read(BlockDriverState *bs, int6
if (!drv)
return -ENOMEDIUM;
@@ -98,7 +98,7 @@
if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
memcpy(buf, bs->boot_sector_data, 512);
sector_num++;
-@@ -546,6 +608,8 @@ int bdrv_write(BlockDriverState *bs, int
+@@ -557,6 +619,8 @@ int bdrv_write(BlockDriverState *bs, int
return -ENOMEDIUM;
if (bs->read_only)
return -EACCES;
@@ -107,7 +107,7 @@
if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
memcpy(bs->boot_sector_data, buf, 512);
}
-@@ -671,6 +735,8 @@ int bdrv_pread(BlockDriverState *bs, int
+@@ -682,6 +746,8 @@ int bdrv_pread(BlockDriverState *bs, int
return -ENOMEDIUM;
if (!drv->bdrv_pread)
return bdrv_pread_em(bs, offset, buf1, count1);
@@ -116,7 +116,7 @@
return drv->bdrv_pread(bs, offset, buf1, count1);
}
-@@ -686,6 +752,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
+@@ -697,6 +763,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
return -ENOMEDIUM;
if (!drv->bdrv_pwrite)
return bdrv_pwrite_em(bs, offset, buf1, count1);
@@ -125,7 +125,7 @@
return drv->bdrv_pwrite(bs, offset, buf1, count1);
}
-@@ -1091,6 +1159,8 @@ int bdrv_write_compressed(BlockDriverSta
+@@ -1102,6 +1170,8 @@ int bdrv_write_compressed(BlockDriverSta
return -ENOMEDIUM;
if (!drv->bdrv_write_compressed)
return -ENOTSUP;
@@ -134,7 +134,7 @@
return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
}
-@@ -1237,6 +1307,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
+@@ -1248,6 +1318,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
if (!drv)
return NULL;
@@ -143,7 +143,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) {
-@@ -1268,6 +1340,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
+@@ -1279,6 +1351,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
return NULL;
if (bs->read_only)
return NULL;
@@ -152,9 +152,9 @@
if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
memcpy(bs->boot_sector_data, buf, 512);
}
-diff -rup kvm-62.orig/qemu/block.h kvm-62.new/qemu/block.h
---- kvm-62.orig/qemu/block.h 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62.new/qemu/block.h 2008-02-27 19:30:46.000000000 -0500
+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 {
it (default for
bdrv_file_open()) */
@@ -163,9 +163,9 @@
#ifndef QEMU_IMG
void bdrv_info(void);
-diff -rup kvm-62.orig/qemu/block_int.h kvm-62.new/qemu/block_int.h
---- kvm-62.orig/qemu/block_int.h 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62.new/qemu/block_int.h 2008-02-27 19:30:46.000000000 -0500
+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
@@ -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,9 +174,9 @@
/* event callback when inserting/removing */
void (*change_cb)(void *opaque);
void *change_opaque;
-diff -rup kvm-62.orig/qemu/block-qcow2.c kvm-62.new/qemu/block-qcow2.c
---- kvm-62.orig/qemu/block-qcow2.c 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62.new/qemu/block-qcow2.c 2008-02-27 19:30:46.000000000 -0500
+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;
@@ -186,9 +186,9 @@
if (ret < 0)
return ret;
if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup kvm-62.orig/qemu/block-qcow.c kvm-62.new/qemu/block-qcow.c
---- kvm-62.orig/qemu/block-qcow.c 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62.new/qemu/block-qcow.c 2008-02-27 19:30:46.000000000 -0500
+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;
@@ -198,9 +198,9 @@
if (ret < 0)
return ret;
if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup kvm-62.orig/qemu/block-vmdk.c kvm-62.new/qemu/block-vmdk.c
---- kvm-62.orig/qemu/block-vmdk.c 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62.new/qemu/block-vmdk.c 2008-02-27 19:30:46.000000000 -0500
+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);
kvm-62-e1000-default.patch:
Index: kvm-62-e1000-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm-62-e1000-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kvm-62-e1000-default.patch 4 Mar 2008 22:39:18 -0000 1.1
+++ kvm-62-e1000-default.patch 20 May 2008 20:16:18 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Nur kvm-62.orig/kvm kvm-62/kvm
---- kvm-62.orig/kvm 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62/kvm 2008-03-04 00:11:05.000000000 -0500
-@@ -58,7 +58,7 @@
+diff -Naurp kvm-69.orig/kvm kvm-69/kvm
+--- kvm-69.orig/kvm 2008-05-12 08:30:43.000000000 -0300
++++ kvm-69/kvm 2008-05-20 15:05:32.000000000 -0300
+@@ -58,7 +58,7 @@ optparser.add_option('--no-tap',
optparser.add_option('--nictype',
help = 'use this specific nic type (vendor)',
dest = 'nictype',
@@ -10,10 +10,10 @@
)
optparser.add_option('--mac',
-diff -Nur kvm-62.orig/qemu/hw/pc.c kvm-62/qemu/hw/pc.c
---- kvm-62.orig/qemu/hw/pc.c 2008-02-25 04:30:14.000000000 -0500
-+++ kvm-62/qemu/hw/pc.c 2008-03-04 12:56:50.000000000 -0500
-@@ -1000,7 +1000,7 @@
+diff -Naurp kvm-69.orig/qemu/hw/pc.c kvm-69/qemu/hw/pc.c
+--- kvm-69.orig/qemu/hw/pc.c 2008-05-12 08:30:43.000000000 -0300
++++ kvm-69/qemu/hw/pc.c 2008-05-20 15:05:32.000000000 -0300
+@@ -1034,7 +1034,7 @@ static void pc_init1(ram_addr_t ram_size
nd = &nd_table[i];
if (!nd->model) {
if (pci_enabled) {
@@ -22,10 +22,10 @@
} else {
nd->model = "ne2k_isa";
}
-diff -Nur kvm-62.orig/qemu/vl.c kvm-62/qemu/vl.c
---- kvm-62.orig/qemu/vl.c 2008-03-04 00:08:22.000000000 -0500
-+++ kvm-62/qemu/vl.c 2008-03-04 01:00:36.000000000 -0500
-@@ -9450,7 +9450,7 @@
+diff -Naurp kvm-69.orig/qemu/vl.c kvm-69/qemu/vl.c
+--- kvm-69.orig/qemu/vl.c 2008-05-12 08:30:43.000000000 -0300
++++ kvm-69/qemu/vl.c 2008-05-20 15:05:32.000000000 -0300
+@@ -9076,7 +9076,7 @@ int main(int argc, char **argv)
char buf[1024];
if (net_boot & (1 << i)) {
if (model == NULL)
kvm-63-defaults.patch:
Index: kvm-63-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm-63-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kvm-63-defaults.patch 7 Mar 2008 16:18:54 -0000 1.1
+++ kvm-63-defaults.patch 20 May 2008 20:16:18 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up kvm-63/qemu/vl.c.orig kvm-63/qemu/vl.c
---- kvm-63/qemu/vl.c.orig 2008-03-04 03:50:44.000000000 -0500
-+++ kvm-63/qemu/vl.c 2008-03-07 11:18:10.000000000 -0500
-@@ -191,8 +191,8 @@ NICInfo nd_table[MAX_NICS];
+diff -Naurp kvm-69.orig/qemu/vl.c kvm-69/qemu/vl.c
+--- kvm-69.orig/qemu/vl.c 2008-05-12 08:30:43.000000000 -0300
++++ kvm-69/qemu/vl.c 2008-05-20 15:06:20.000000000 -0300
+@@ -185,8 +185,8 @@ NICInfo nd_table[MAX_NICS];
int vm_running;
static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */
Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kvm.spec 5 May 2008 18:38:56 -0000 1.55
+++ kvm.spec 20 May 2008 20:16:18 -0000 1.56
@@ -1,6 +1,6 @@
Summary: Kernel-based Virtual Machine
Name: kvm
-Version: 68
+Version: 69
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: Development/Tools
@@ -11,7 +11,6 @@
Patch1: %{name}-bootmenu.patch
Patch2: %{name}-62-block-rw-range-check.patch
Patch3: %{name}-62-e1000-default.patch
-Patch4: %{name}-68-pty-rawmode.patch
# patches from upstream qemu
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -45,7 +44,6 @@
%patch1 -p1
%patch2 -p1
#patch3 -p1
-%patch4 -p1
%build
# we need to install the data bits in a different path
@@ -100,6 +98,12 @@
%{_sysconfdir}/sysconfig/modules/%{name}.modules
%changelog
+* Tue May 20 2008 Glauber Costa <gcosta at redhat.com> - 69-1
+- Update to kvm-69
+- Removed Patch4 (Upstreamed)
+- Removed virtio-boot patch (Upstreamed)
+- Regenerated the other patches
+
* Mon May 5 2008 Daniel P. Berrange <berrange at redhat.com> - 68-1
- Update to kvm-68
- Put text console PTY in rawmode
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 5 May 2008 17:55:12 -0000 1.30
+++ sources 20 May 2008 20:16:18 -0000 1.31
@@ -1 +1 @@
-0e13f2b9e210c90779216e085e1e0a5f kvm-68.tar.gz
+acc26d88b6aee5f59f557e8ce211bfc5 kvm-69.tar.gz
- Previous message (by thread): rpms/python-IPy/EL-5 .cvsignore, 1.1, 1.2 python-IPy.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/python-IPy/EL-4 .cvsignore, 1.1, 1.2 python-IPy.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list