rpms/kvm/devel .cvsignore, 1.39, 1.40 kvm-62-block-rw-range-check.patch, 1.5, 1.6 kvm.spec, 1.78, 1.79 sources, 1.39, 1.40
Glauber Costa
glommer at fedoraproject.org
Wed Nov 12 13:30:48 UTC 2008
Author: glommer
Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7429
Modified Files:
.cvsignore kvm-62-block-rw-range-check.patch kvm.spec sources
Log Message:
- Updated to kvm-79.
- you guess: upstream changed, and kvm-62-block-rw-range-check
had to be chnged too.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 27 Oct 2008 16:48:00 -0000 1.39
+++ .cvsignore 12 Nov 2008 13:30:17 -0000 1.40
@@ -1 +1 @@
-kvm-77.tar.gz
+kvm-79.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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kvm-62-block-rw-range-check.patch 2 Nov 2008 11:37:08 -0000 1.5
+++ kvm-62-block-rw-range-check.patch 12 Nov 2008 13:30:17 -0000 1.6
@@ -1,7 +1,7 @@
-Index: kvm-78/qemu/block-qcow.c
+Index: kvm-79/qemu/block-qcow.c
===================================================================
---- kvm-78.orig/qemu/block-qcow.c
-+++ kvm-78/qemu/block-qcow.c
+--- kvm-79.orig/qemu/block-qcow.c
++++ kvm-79/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-78/qemu/block-qcow2.c
+Index: kvm-79/qemu/block-qcow2.c
===================================================================
---- kvm-78.orig/qemu/block-qcow2.c
-+++ kvm-78/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;
@@ -24,10 +24,10 @@
if (ret < 0)
return ret;
if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-Index: kvm-78/qemu/block-vmdk.c
+Index: kvm-79/qemu/block-vmdk.c
===================================================================
---- kvm-78.orig/qemu/block-vmdk.c
-+++ kvm-78/qemu/block-vmdk.c
+--- kvm-79.orig/qemu/block-vmdk.c
++++ kvm-79/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-78/qemu/block.c
+Index: kvm-79/qemu/block.c
===================================================================
---- kvm-78.orig/qemu/block.c
-+++ kvm-78/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
}
}
@@ -129,25 +129,28 @@
bs->media_changed = 1;
if (bs->change_cb)
bs->change_cb(bs->change_opaque);
-@@ -528,6 +588,8 @@ int bdrv_read(BlockDriverState *bs, int6
+@@ -528,6 +588,9 @@ int bdrv_read(BlockDriverState *bs, int6
if (!drv)
return -ENOMEDIUM;
+ if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
+ return -EDOM;
- if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
- memcpy(buf, bs->boot_sector_data, 512);
- sector_num++;
-@@ -568,6 +630,8 @@ int bdrv_write(BlockDriverState *bs, int
++
+ if (drv->bdrv_pread) {
+ int ret, len;
+ len = nb_sectors * 512;
+@@ -560,6 +623,10 @@ int bdrv_write(BlockDriverState *bs, int
return -ENOMEDIUM;
if (bs->read_only)
return -EACCES;
++
+ if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
+ return -EDOM;
- if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
- memcpy(bs->boot_sector_data, buf, 512);
- }
-@@ -693,6 +757,8 @@ int bdrv_pread(BlockDriverState *bs, int
++
+ if (drv->bdrv_pwrite) {
+ int ret, len;
+ len = nb_sectors * 512;
+@@ -682,6 +749,8 @@ int bdrv_pread(BlockDriverState *bs, int
return -ENOMEDIUM;
if (!drv->bdrv_pread)
return bdrv_pread_em(bs, offset, buf1, count1);
@@ -156,7 +159,7 @@
return drv->bdrv_pread(bs, offset, buf1, count1);
}
-@@ -708,6 +774,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
+@@ -697,6 +766,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
return -ENOMEDIUM;
if (!drv->bdrv_pwrite)
return bdrv_pwrite_em(bs, offset, buf1, count1);
@@ -165,7 +168,7 @@
return drv->bdrv_pwrite(bs, offset, buf1, count1);
}
-@@ -1143,6 +1211,8 @@ int bdrv_write_compressed(BlockDriverSta
+@@ -1122,6 +1193,8 @@ int bdrv_write_compressed(BlockDriverSta
return -ENOMEDIUM;
if (!drv->bdrv_write_compressed)
return -ENOTSUP;
@@ -174,28 +177,29 @@
return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
}
-@@ -1289,6 +1359,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
+@@ -1268,6 +1341,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
if (!drv)
return NULL;
+ if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
+ return NULL;
- /* XXX: we assume that nb_sectors == 0 is suppored by the async read */
- if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-@@ -1320,6 +1392,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
- return NULL;
+ ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);
+
+@@ -1292,6 +1367,9 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
if (bs->read_only)
return NULL;
-+ if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
+
++ if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
+ return NULL;
- if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
- memcpy(bs->boot_sector_data, buf, 512);
- }
-Index: kvm-78/qemu/block.h
++
+ ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);
+
+ if (ret) {
+Index: kvm-79/qemu/block.h
===================================================================
---- kvm-78.orig/qemu/block.h
-+++ kvm-78/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 */
@@ -204,10 +208,10 @@
#define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB)
-Index: kvm-78/qemu/block_int.h
+Index: kvm-79/qemu/block_int.h
===================================================================
---- kvm-78.orig/qemu/block_int.h
-+++ kvm-78/qemu/block_int.h
+--- kvm-79.orig/qemu/block_int.h
++++ kvm-79/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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kvm.spec 3 Nov 2008 15:01:05 -0000 1.78
+++ kvm.spec 12 Nov 2008 13:30:17 -0000 1.79
@@ -1,7 +1,7 @@
Summary: Kernel-based Virtual Machine
Name: kvm
-Version: 78
-Release: 4%{?dist}
+Version: 79
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: Development/Tools
URL: http://%{name}.sf.net
@@ -139,6 +139,11 @@
%changelog
+* 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
+ had to be chnged too.
+
* Mon Nov 03 2008 Glauber Costa <glommer at redhat.com> - 78-3
- Add kvmtrace and kvmtrace_format binaries.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 2 Nov 2008 11:44:56 -0000 1.39
+++ sources 12 Nov 2008 13:30:17 -0000 1.40
@@ -1 +1 @@
-54b062575aeeaa424fa0d5aa46c284a9 kvm-78.tar.gz
+6a59a481201ed91a92105a9b1b339547 kvm-79.tar.gz
More information about the fedora-extras-commits
mailing list