rpms/kvm/devel .cvsignore, 1.40, 1.41 kvm-62-block-rw-range-check.patch, 1.6, 1.7 kvm.spec, 1.79, 1.80 sources, 1.40, 1.41 kvm-fix-pc-bios-make-install-missing-files.patch, 1.2, NONE
Glauber Costa
glommer at fedoraproject.org
Mon Dec 22 16:56:16 UTC 2008
Author: glommer
Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27485
Modified Files:
.cvsignore kvm-62-block-rw-range-check.patch kvm.spec sources
Removed Files:
kvm-fix-pc-bios-make-install-missing-files.patch
Log Message:
- Updated to kvm-81.
- kvm-fix-pc-bios-make-install-missing-files.patch not needed anymore
replaced by disable-blobs option.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 12 Nov 2008 13:30:17 -0000 1.40
+++ .cvsignore 22 Dec 2008 16:55:46 -0000 1.41
@@ -1 +1 @@
-kvm-79.tar.gz
+kvm-81.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kvm-62-block-rw-range-check.patch 12 Nov 2008 13:30:17 -0000 1.6
+++ kvm-62-block-rw-range-check.patch 22 Dec 2008 16:55:46 -0000 1.7
@@ -1,7 +1,7 @@
-Index: kvm-79/qemu/block-qcow.c
+Index: kvm-81/qemu/block-qcow.c
===================================================================
---- kvm-79.orig/qemu/block-qcow.c
-+++ kvm-79/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;
@@ -11,23 +11,23 @@
if (ret < 0)
return ret;
if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-Index: kvm-79/qemu/block-qcow2.c
+Index: kvm-81/qemu/block-qcow2.c
===================================================================
---- kvm-79.orig/qemu/block-qcow2.c
-+++ kvm-79/qemu/block-qcow2.c
-@@ -189,7 +189,7 @@ static int qcow_open(BlockDriverState *b
- int len, i, shift, ret;
- QCowHeader header;
-
+--- 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-79/qemu/block-vmdk.c
+Index: kvm-81/qemu/block-vmdk.c
===================================================================
---- kvm-79.orig/qemu/block-vmdk.c
-+++ kvm-79/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;
@@ -37,11 +37,11 @@
if (ret < 0)
return ret;
if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))
-Index: kvm-79/qemu/block.c
+Index: kvm-81/qemu/block.c
===================================================================
---- kvm-79.orig/qemu/block.c
-+++ kvm-79/qemu/block.c
-@@ -123,6 +123,60 @@ void path_combine(char *dest, int dest_s
+--- kvm-81.orig/qemu/block.c
++++ kvm-81/qemu/block.c
+@@ -128,6 +128,60 @@ void path_combine(char *dest, int dest_s
}
}
@@ -102,7 +102,7 @@
static void bdrv_register(BlockDriver *bdrv)
{
-@@ -335,6 +389,10 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -340,6 +394,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;
-@@ -391,6 +449,7 @@ int bdrv_open2(BlockDriverState *bs, con
+@@ -396,6 +454,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
-@@ -456,6 +515,7 @@ void bdrv_close(BlockDriverState *bs)
+@@ -461,6 +520,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);
-@@ -528,6 +588,9 @@ int bdrv_read(BlockDriverState *bs, int6
+@@ -533,6 +593,9 @@ int bdrv_read(BlockDriverState *bs, int6
if (!drv)
return -ENOMEDIUM;
@@ -139,7 +139,7 @@
if (drv->bdrv_pread) {
int ret, len;
len = nb_sectors * 512;
-@@ -560,6 +623,10 @@ int bdrv_write(BlockDriverState *bs, int
+@@ -565,6 +628,10 @@ int bdrv_write(BlockDriverState *bs, int
return -ENOMEDIUM;
if (bs->read_only)
return -EACCES;
@@ -150,7 +150,7 @@
if (drv->bdrv_pwrite) {
int ret, len;
len = nb_sectors * 512;
-@@ -682,6 +749,8 @@ int bdrv_pread(BlockDriverState *bs, int
+@@ -687,6 +754,8 @@ int bdrv_pread(BlockDriverState *bs, int
return -ENOMEDIUM;
if (!drv->bdrv_pread)
return bdrv_pread_em(bs, offset, buf1, count1);
@@ -159,7 +159,7 @@
return drv->bdrv_pread(bs, offset, buf1, count1);
}
-@@ -697,6 +766,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
+@@ -702,6 +771,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
return -ENOMEDIUM;
if (!drv->bdrv_pwrite)
return bdrv_pwrite_em(bs, offset, buf1, count1);
@@ -168,7 +168,7 @@
return drv->bdrv_pwrite(bs, offset, buf1, count1);
}
-@@ -1122,6 +1193,8 @@ int bdrv_write_compressed(BlockDriverSta
+@@ -1127,6 +1198,8 @@ int bdrv_write_compressed(BlockDriverSta
return -ENOMEDIUM;
if (!drv->bdrv_write_compressed)
return -ENOTSUP;
@@ -177,7 +177,7 @@
return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
}
-@@ -1268,6 +1341,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
+@@ -1273,6 +1346,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
if (!drv)
return NULL;
@@ -186,7 +186,7 @@
ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);
-@@ -1292,6 +1367,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
+@@ -1297,6 +1372,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
if (bs->read_only)
return NULL;
@@ -196,22 +196,10 @@
ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);
if (ret) {
-Index: kvm-79/qemu/block.h
-===================================================================
---- kvm-79.orig/qemu/block.h
-+++ kvm-79/qemu/block.h
-@@ -49,6 +49,7 @@ typedef struct QEMUSnapshotInfo {
- bdrv_file_open()) */
- #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 */
-
- #define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB)
-
-Index: kvm-79/qemu/block_int.h
+Index: kvm-81/qemu/block_int.h
===================================================================
---- kvm-79.orig/qemu/block_int.h
-+++ kvm-79/qemu/block_int.h
+--- kvm-81.orig/qemu/block_int.h
++++ kvm-81/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 */
@@ -220,3 +208,15 @@
/* 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 */
+
+ #define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_CACHE_DEF)
+
Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kvm.spec 12 Nov 2008 13:30:17 -0000 1.79
+++ kvm.spec 22 Dec 2008 16:55:46 -0000 1.80
@@ -1,6 +1,6 @@
Summary: Kernel-based Virtual Machine
Name: kvm
-Version: 79
+Version: 81
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: Development/Tools
@@ -9,7 +9,6 @@
#Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz
Source1: %{name}.modules
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
@@ -41,10 +40,10 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -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/*
+echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
%build
# systems like rhel build system does not have a recent enough linker so
@@ -61,10 +60,11 @@
qemuldflags="";
fi
+
# we need to install the data bits in a different path
sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
./configure --with-patched-kernel --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags=$qemuldflags \
---audio-drv-list=oss,alsa
+--audio-drv-list=oss,alsa --disable-blobs
# build the bios, and fix it's makefile
sed -i 's/gcc -m32/gcc/' bios/Makefile
@@ -123,7 +123,7 @@
%post
# load kvm modules now, so we can make sure no reboot is needed.
# If there's already a kvm module installed, we don't mess with it
-sh ${buildroot}/%{_sysconfdir}/sysconfig/modules/kvm.modules
+sh /%{_sysconfdir}/sysconfig/modules/kvm.modules
%clean
@@ -139,6 +139,11 @@
%changelog
+* Mon Dec 22 2008 Glauber Costa <glommer at redhat.com> - 81-1
+- Updated to kvm-81.
+- kvm-fix-pc-bios-make-install-missing-files.patch not needed anymore
+ replaced by disable-blobs option.
+
* Wed Nov 12 2008 Glauber Costa <glommer at redhat.com> - 79-1
- Updated to kvm-79.
- you guess: upstream changed, and kvm-62-block-rw-range-check
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 12 Nov 2008 13:30:17 -0000 1.40
+++ sources 22 Dec 2008 16:55:46 -0000 1.41
@@ -1 +1 @@
-6a59a481201ed91a92105a9b1b339547 kvm-79.tar.gz
+499f1856d30aa72ef872becaea684f49 kvm-81.tar.gz
--- kvm-fix-pc-bios-make-install-missing-files.patch DELETED ---
More information about the fedora-extras-commits
mailing list