Hello community, here is the log from the commit of package qemu checked in at Fri Apr 25 16:41:32 CEST 2008. -------- --- qemu/qemu.changes 2008-03-11 14:03:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/qemu/qemu.changes 2008-04-25 14:10:13.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 25 13:33:40 CEST 2008 - uli@suse.de + +- revert secfix (causes data corruption, no known good patch + available yet) +- support creation of SCSI VMDK images + +------------------------------------------------------------------- Old: ---- bug-362956_qemu-block-rw-rangecheck.patch New: ---- qemu-img-vmdk-scsi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.zD8904/_old 2008-04-25 16:41:17.000000000 +0200 +++ /var/tmp/diff_new_pack.zD8904/_new 2008-04-25 16:41:17.000000000 +0200 @@ -18,7 +18,7 @@ Group: System/Emulators/PC Summary: Universal CPU emulator Version: 0.9.1 -Release: 22 +Release: 35 Source: %name-%version.tar.bz2 #Patch400: qemu-0.7.0-gcc4-dot-syms.patch #Patch401: qemu-0.8.0-gcc4-hacks.patch @@ -59,7 +59,7 @@ Patch82: qemu-cvs-svm2.patch Patch83: qemu-cvs-ppcspe.patch Patch84: qemu-s390dis-license.patch -Patch85: bug-362956_qemu-block-rw-rangecheck.patch +Patch85: qemu-img-vmdk-scsi.patch Source200: kvm_bios.bin Source201: zx-rom.bin Source202: COPYING.zx-rom @@ -316,6 +316,10 @@ %endif %changelog +* Fri Apr 25 2008 uli@suse.de +- revert secfix (causes data corruption, no known good patch + available yet) +- support creation of SCSI VMDK images * Tue Mar 11 2008 uli@suse.de - secfix (unchecked block read/write vulnerability, bug #362956) * Thu Jan 17 2008 uli@suse.de @@ -365,7 +369,7 @@ - disable only SNDRV_SB_CSP_IOCTL_LOAD_CODE for _IOC_SIZEBITS < 14 * Thu Aug 09 2007 olh@suse.de - disable some alsa SB ioctl declarations -* Mon Aug 06 2007 olh@suse.de +* Tue Aug 07 2007 olh@suse.de - remove inclusion of linux/compiler.h * Mon Jul 30 2007 uli@suse.de - fixed for S/390 @@ -394,7 +398,7 @@ * Thu Jun 14 2007 agraf@suse.de - made wine work (set FS register to 0 on init) - suppressed robust_list warnings -* Wed Jun 13 2007 agraf@suse.de +* Thu Jun 14 2007 agraf@suse.de - made flash player 9 work on ppc - fixed FUTEX_WAKE_OP on machines where endianness differs - made mmap on x86_64 use the MAP_32BIT flag @@ -422,7 +426,7 @@ - applied strace patch for debugging (by Stuart R. Anderson) * Wed Apr 04 2007 agraf@suse.de - fixed initrd loading on x86 -* Thu Mar 29 2007 ro@suse.de +* Fri Mar 30 2007 ro@suse.de - added bison to BuildRequires * Tue Feb 20 2007 uli@suse.de - added better fix by Robert Schiele (bug #241950) @@ -475,7 +479,7 @@ * Wed Mar 08 2006 uli@suse.de - split giant patch - added NWFPE glue code fix -* Tue Mar 07 2006 schwab@suse.de +* Wed Mar 08 2006 schwab@suse.de - More fixes for ia64 port. * Tue Mar 07 2006 schwab@suse.de - Remove obsolete hunk from ia64 patch. ++++++ qemu-img-vmdk-scsi.patch ++++++ Index: qemu-0.9.1/block-vmdk.c =================================================================== --- qemu-0.9.1.orig/block-vmdk.c +++ qemu-0.9.1/block-vmdk.c @@ -717,7 +717,7 @@ static int vmdk_create(const char *filen "ddb.geometry.cylinders = \"%lu\"\n" "ddb.geometry.heads = \"16\"\n" "ddb.geometry.sectors = \"63\"\n" - "ddb.adapterType = \"ide\"\n"; + "ddb.adapterType = \"%s\"\n"; char desc[1024]; const char *real_filename, *temp_str; @@ -790,7 +790,9 @@ static int vmdk_create(const char *filen if ((temp_str = strrchr(real_filename, ':')) != NULL) real_filename = temp_str + 1; sprintf(desc, desc_template, time(NULL), (unsigned long)total_size, - real_filename, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), total_size / (63 * 16)); + real_filename, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), + total_size / (63 * 16), + flags & BLOCK_FLAG_SCSI ? "buslogic" : "ide"); /* write the descriptor */ lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); Index: qemu-0.9.1/block_int.h =================================================================== --- qemu-0.9.1.orig/block_int.h +++ qemu-0.9.1/block_int.h @@ -29,6 +29,7 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPRESS 2 #define BLOCK_FLAG_COMPAT6 4 +#define BLOCK_FLAG_SCSI 8 struct BlockDriver { const char *format_name; Index: qemu-0.9.1/qemu-img.c =================================================================== --- qemu-0.9.1.orig/qemu-img.c +++ qemu-0.9.1/qemu-img.c @@ -88,9 +88,9 @@ static void help(void) "QEMU disk image utility\n" "\n" "Command syntax:\n" - " create [-e] [-6] [-b base_image] [-f fmt] filename [size]\n" + " create [-e] [-s] [-6] [-b base_image] [-f fmt] filename [size]\n" " commit [-f fmt] filename\n" - " convert [-c] [-e] [-6] [-f fmt] filename [filename2 [...]] [-O output_fmt] output_filename\n" + " convert [-c] [-e] [-s] [-6] [-f fmt] [-O output_fmt] filename [filename2 [...]] output_filename\n" " info [-f fmt] filename\n" "\n" "Command parameters:\n" @@ -104,6 +104,7 @@ static void help(void) " 'output_fmt' is the destination format\n" " '-c' indicates that target image must be compressed (qcow format only)\n" " '-e' indicates that the target image must be encrypted (qcow format only)\n" + " '-s' indicates that the target image is meant for SCSI (vmdk format only)\n" " '-6' indicates that the target image must use compatibility level 6 (vmdk format only)\n" ); printf("\nSupported format:"); @@ -242,7 +243,7 @@ static int img_create(int argc, char **a flags = 0; for(;;) { - c = getopt(argc, argv, "b:f:he6"); + c = getopt(argc, argv, "b:f:hes6"); if (c == -1) break; switch(c) { @@ -258,6 +259,9 @@ static int img_create(int argc, char **a case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; + case 's': + flags |= BLOCK_FLAG_SCSI; + break; case '6': flags |= BLOCK_FLAG_COMPAT6; break; @@ -293,6 +297,8 @@ static int img_create(int argc, char **a error("Unknown file format '%s'", fmt); printf("Formatting '%s', fmt=%s", filename, fmt); + if (flags & BLOCK_FLAG_SCSI) + printf(", SCSI"); if (flags & BLOCK_FLAG_ENCRYPT) printf(", encrypted"); if (flags & BLOCK_FLAG_COMPAT6) @@ -421,7 +427,7 @@ static int img_convert(int argc, char ** out_fmt = "raw"; flags = 0; for(;;) { - c = getopt(argc, argv, "f:O:hce6"); + c = getopt(argc, argv, "f:O:hces6"); if (c == -1) break; switch(c) { @@ -440,6 +446,9 @@ static int img_convert(int argc, char ** case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; + case 's': + flags |= BLOCK_FLAG_SCSI; + break; case '6': flags |= BLOCK_FLAG_COMPAT6; break; @@ -471,6 +480,8 @@ static int img_convert(int argc, char ** error("Compression not supported for this file format"); if (flags & BLOCK_FLAG_ENCRYPT && drv != &bdrv_qcow && drv != &bdrv_qcow2) error("Encryption not supported for this file format"); + if (flags & BLOCK_FLAG_SCSI && drv != &bdrv_vmdk) + error("SCSI devices not supported for this file format"); if (flags & BLOCK_FLAG_COMPAT6 && drv != &bdrv_vmdk) error("Alternative compatibility level not supported for this file format"); if (flags & BLOCK_FLAG_ENCRYPT && flags & BLOCK_FLAG_COMPRESS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org