Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at 2012-01-17 11:33:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvm (Old) and /work/SRC/openSUSE:Factory/.kvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kvm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kvm/kvm.changes 2011-10-29 08:00:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kvm.new/kvm.changes 2012-01-17 16:10:13.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Jan 11 05:21:04 UTC 2012 - [email protected] + +- fix issue with g_thread_init deprecation now treated as error + +------------------------------------------------------------------- +Tue Dec 13 12:57:10 UTC 2011 - [email protected] + +- Fix dictzip with long file names. + +------------------------------------------------------------------- +Tue Dec 13 05:01:48 UTC 2011 - [email protected] + +- Update to qemu-kvm v1.0 + - see http://wiki.qemu.org/ChangeLog/1.0 for details + +------------------------------------------------------------------- +Tue Nov 29 21:46:36 UTC 2011 - [email protected] + +- change a build dependency from spice-devel to spice-protocol + +------------------------------------------------------------------- +Mon Nov 28 20:28:51 UTC 2011 - [email protected] + +- add missing break. Plugs potential buffer overflow in CCID card + passthru device (bnc#731086) + +------------------------------------------------------------------- Old: ---- kvm-qemu-fix-1mb-memory-assert.patch kvm-qemu-fix-unused-but-set.patch kvm-qemu-preXX-block-curl-Don-t-finish-AIOCBs-too-early.patch kvm-qemu-preXX-block-curl-Implement-a-flush-function-on-the-fd-han.patch kvm-qemu-preXX-e1000-Don-t-set-the-Capabilities-List-bit.patch kvm-qemu-preXX-qemu_vmalloc-align-properly-for-transparent-hugepag.patch kvm-qemu-preXX-vns-tls-don-t-use-depricated-gnutls-functions.patch qemu-kvm-0.15.1.tar.bz2 New: ---- kvm-qemu-preXX-dictzip3.patch kvm-qemu-preXX-g_thread_init-users-don-t-call-it-if-glib-2.31.patch qemu-kvm-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.x1lsTO/_old 2012-01-17 16:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.x1lsTO/_new 2012-01-17 16:10:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kvm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,14 +14,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 -%bcond_with spice -%define package_true_version 0.15.1 -%define package_base_version 0.15.1 +%bcond_without spice + +%define package_true_version 1.0 +%define package_base_version 1.0 %define bios_id seabios-1.6.3 %define pxe_rom_id ipxe-git-aaf7a35 %define vgabios_id vgabios-0.6c @@ -30,7 +29,7 @@ # note that this list doesn't include the ipxe roms since they get handled # individually and not as a group -%define firmware_files {bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin optionrom/extboot.bin optionrom/linuxboot.bin optionrom/multiboot.bin optionrom/vapic.bin} +%define firmware_files {bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin optionrom/linuxboot.bin optionrom/multiboot.bin optionrom/vapic.bin} ExclusiveArch: %ix86 x86_64 ia64 s390x @@ -44,9 +43,21 @@ %define using_buildservice 0%{?opensuse_bs} Name: kvm -BuildRequires: SDL-devel alsa alsa-devel gnutls-devel libaio-devel -BuildRequires: libcurl-devel libpulse-devel ncurses-devel pciutils-devel perl -BuildRequires: glib2-devel libattr-devel python texinfo xfsprogs-devel +BuildRequires: SDL-devel +BuildRequires: alsa +BuildRequires: alsa-devel +BuildRequires: glib2-devel +BuildRequires: gnutls-devel +BuildRequires: libaio-devel +BuildRequires: libattr-devel +BuildRequires: libcurl-devel +BuildRequires: libpulse-devel +BuildRequires: ncurses-devel +BuildRequires: pciutils-devel +BuildRequires: perl +BuildRequires: python +BuildRequires: texinfo +BuildRequires: xfsprogs-devel %if 0%{?suse_version} >= 1130 BuildRequires: brlapi-devel %endif @@ -71,7 +82,8 @@ %if 0%{?suse_version} >= 1130 # Spice support does not currently build with -Werror on 32-bit platforms %ifnarch %ix86 -BuildRequires: libspice-server-devel spice-devel +BuildRequires: libspice-server-devel +BuildRequires: spice-protocol-devel %endif %endif %endif @@ -82,9 +94,9 @@ %if 0%{?suse_version} < 1110 Requires: kvm-kmp %endif -License: BSD3c ; GPLv2 ; GPLv2+ ; LGPLv2.1+ ; MIT -Group: System/Kernel Summary: Kernel-based Virtual Machine +License: BSD-3-Clause ; GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: System/Kernel Url: http://www.linux-kvm.org Version: %{package_true_version} Release: 0 @@ -114,21 +126,16 @@ Patch60: qemu-datadir.diff Patch61: kvm-qemu-default-memsize.patch Patch62: kvm-qemu-user-space-tool-name.patch -Patch63: kvm-qemu-fix-unused-but-set.patch -Patch64: kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch -Patch65: kvm-qemu-fix-1mb-memory-assert.patch +Patch63: kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch # Post-release upstream patches Patch100: kvm-qemu-preXX-dictzip1.patch Patch101: kvm-qemu-preXX-dictzip2.patch Patch102: kvm-qemu-preXX-report-default-mac-used.patch Patch103: kvm-qemu-preXX-console.patch -Patch104: kvm-qemu-preXX-vns-tls-don-t-use-depricated-gnutls-functions.patch -Patch105: kvm-qemu-preXX-qemu_vmalloc-align-properly-for-transparent-hugepag.patch -Patch106: kvm-qemu-madvise-hugepages.patch -Patch107: kvm-qemu-preXX-block-curl-Implement-a-flush-function-on-the-fd-han.patch -Patch108: kvm-qemu-preXX-block-curl-Don-t-finish-AIOCBs-too-early.patch -Patch109: kvm-qemu-preXX-e1000-Don-t-set-the-Capabilities-List-bit.patch +Patch104: kvm-qemu-madvise-hugepages.patch +Patch105: kvm-qemu-preXX-dictzip3.patch +Patch106: kvm-qemu-preXX-g_thread_init-users-don-t-call-it-if-glib-2.31.patch Patch150: qemu-kvm-common-code-fixes-for-s390-build.patch @@ -214,8 +221,6 @@ %patch61 -p1 %patch62 -p1 %patch63 -p1 -%patch64 -p1 -%patch65 -p1 # Post-release patches %patch100 -p1 @@ -225,9 +230,6 @@ %patch104 -p1 %patch105 -p1 %patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 %patch150 -p1 @@ -320,8 +322,7 @@ sed -i 's/CFLAGS =/CFLAGS +=/' roms/vgabios/Makefile # userspace: -make -#make %{?jobs:-j%jobs} +make %{?jobs:-j%jobs} # Firmware %ifarch %ix86 x86_64 ++++++ kvm-qemu-preXX-dictzip1.patch ++++++ --- /var/tmp/diff_new_pack.x1lsTO/_old 2012-01-17 16:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.x1lsTO/_new 2012-01-17 16:10:17.000000000 +0100 @@ -24,10 +24,10 @@ 2 files changed, 502 insertions(+), 1 deletions(-) create mode 100644 block/dictzip.c -Index: qemu-kvm-0.14.0/block/dictzip.c +Index: qemu-kvm-1.0/block/dictzip.c =================================================================== --- /dev/null -+++ qemu-kvm-0.14.0/block/dictzip.c ++++ qemu-kvm-1.0/block/dictzip.c @@ -0,0 +1,566 @@ +/* + * DictZip Block driver for dictzip enabled gzip files @@ -296,7 +296,7 @@ + } + + /* random access data */ -+ s->chunks = qemu_malloc(chunks_len); ++ s->chunks = g_malloc(chunks_len); + if (header_ver == 99) + s->chunks32 = (uint32_t *)s->chunks; + @@ -345,7 +345,7 @@ + } + + /* compute offsets */ -+ s->offsets = qemu_malloc(sizeof( *s->offsets ) * s->chunk_cnt); ++ s->offsets = g_malloc(sizeof( *s->offsets ) * s->chunk_cnt); + + for (offset = headerLength + 1, i = 0; i < s->chunk_cnt; i++) { + s->offsets[i] = offset; @@ -367,7 +367,7 @@ + fprintf(stderr, "DictZip: Error opening file: %s\n", err); + bdrv_delete(s->hd); + if (s->chunks) -+ qemu_free(s->chunks); ++ g_free(s->chunks); + return -EINVAL; +} + @@ -392,7 +392,7 @@ + DictCache *cache; + int r; + -+ buf = qemu_malloc(acb->chunks_len); ++ buf = g_malloc(acb->chunks_len); + + /* uncompress the chunk */ + acb->zStream->next_in = acb->gzipped; @@ -422,13 +422,13 @@ + + cache->len = 0; + if (cache->buf) -+ qemu_free(cache->buf); ++ g_free(cache->buf); + cache->start = acb->gz_start; + cache->buf = buf; + cache->len = acb->chunks_len; + + /* free occupied ressources */ -+ qemu_free(acb->qiov_gz); ++ g_free(acb->qiov_gz); + qemu_aio_release(acb); +} + @@ -517,7 +517,7 @@ + gz_nb_sectors++; + + /* Allocate qiov, iov and buf in one chunk so we only need to free qiov */ -+ qiov_gz = qemu_mallocz(sizeof(QEMUIOVector) + sizeof(struct iovec) + ++ qiov_gz = g_malloc0(sizeof(QEMUIOVector) + sizeof(struct iovec) + + (gz_nb_sectors * SECTOR_SIZE)); + iov = (struct iovec *)(((char *)qiov_gz) + sizeof(QEMUIOVector)); + buf = ((uint8_t *)iov) + sizeof(struct iovec *); @@ -553,7 +553,7 @@ + if (!s->cache[i].len) + continue; + -+ qemu_free(s->cache[i].buf); ++ g_free(s->cache[i].buf); + } + + for (i = 0; i < Z_STREAM_COUNT; i++) { @@ -561,10 +561,10 @@ + } + + if (s->chunks) -+ qemu_free(s->chunks); ++ g_free(s->chunks); + + if (s->offsets) -+ qemu_free(s->offsets); ++ g_free(s->offsets); + + dprintf("Close\n"); +} @@ -595,15 +595,15 @@ +} + +block_init(dictzip_block_init); -Index: qemu-kvm-0.14.0/Makefile.objs +Index: qemu-kvm-1.0/Makefile.objs =================================================================== ---- qemu-kvm-0.14.0.orig/Makefile.objs -+++ qemu-kvm-0.14.0/Makefile.objs -@@ -24,6 +24,7 @@ block-nested-y += qcow2.o qcow2-refcount +--- qemu-kvm-1.0.orig/Makefile.objs ++++ qemu-kvm-1.0/Makefile.objs +@@ -34,6 +34,7 @@ block-nested-y += qcow2.o qcow2-refcount block-nested-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-nested-y += qed-check.o block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o +block-nested-y += dictzip.o block-nested-$(CONFIG_WIN32) += raw-win32.o block-nested-$(CONFIG_POSIX) += raw-posix.o - block-nested-$(CONFIG_CURL) += curl.o + block-nested-$(CONFIG_LIBISCSI) += iscsi.o ++++++ kvm-qemu-preXX-dictzip2.patch ++++++ --- /var/tmp/diff_new_pack.x1lsTO/_old 2012-01-17 16:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.x1lsTO/_new 2012-01-17 16:10:17.000000000 +0100 @@ -25,10 +25,10 @@ 2 files changed, 334 insertions(+), 1 deletions(-) create mode 100644 block/tar.c -Index: qemu-kvm-0.14.0.rc0/block/tar.c +Index: qemu-kvm-1.0/block/tar.c =================================================================== --- /dev/null -+++ qemu-kvm-0.14.0.rc0/block/tar.c ++++ qemu-kvm-1.0/block/tar.c @@ -0,0 +1,356 @@ +/* + * Tar block driver @@ -173,7 +173,7 @@ + + dprintf("Last chunk until %lx new chunk at %lx\n", s->last_end, offs); + -+ s->sparse = qemu_realloc(s->sparse, (s->sparse_num + 1) * sizeof(SparseCache)); ++ s->sparse = g_realloc(s->sparse, (s->sparse_num + 1) * sizeof(SparseCache)); + sparse = &s->sparse[s->sparse_num]; + sparse->start = s->last_end; + sparse->end = offs; @@ -320,11 +320,11 @@ + sec_file -= (sparse->end - sparse->start) / SECTOR_SIZE; + } else if ((sparse->start <= start) && (sparse->end >= end)) { + /* all our sectors are sparse */ -+ char *buf = qemu_mallocz(nb_sectors * SECTOR_SIZE); ++ char *buf = g_malloc0(nb_sectors * SECTOR_SIZE); + + acb = qemu_aio_get(&tar_aio_pool, bs, cb, opaque); + qemu_iovec_from_buffer(qiov, buf, nb_sectors * SECTOR_SIZE); -+ qemu_free(buf); ++ g_free(buf); + acb->bh = qemu_bh_new(tar_sparse_cb, acb); + qemu_bh_schedule(acb->bh); + @@ -333,7 +333,7 @@ + ((sparse->end >= start) && (sparse->end < end))) { + /* we're semi-sparse (worst case) */ + /* let's go synchronous and read all sectors individually */ -+ char *buf = qemu_malloc(nb_sectors * SECTOR_SIZE); ++ char *buf = g_malloc(nb_sectors * SECTOR_SIZE); + uint64_t offs; + + for (offs = 0; offs < (nb_sectors * SECTOR_SIZE); @@ -386,11 +386,11 @@ +} + +block_init(tar_block_init); -Index: qemu-kvm-0.14.0.rc0/Makefile.objs +Index: qemu-kvm-1.0/Makefile.objs =================================================================== ---- qemu-kvm-0.14.0.rc0.orig/Makefile.objs -+++ qemu-kvm-0.14.0.rc0/Makefile.objs -@@ -24,7 +24,7 @@ block-nested-y += qcow2.o qcow2-refcount +--- qemu-kvm-1.0.orig/Makefile.objs ++++ qemu-kvm-1.0/Makefile.objs +@@ -34,7 +34,7 @@ block-nested-y += qcow2.o qcow2-refcount block-nested-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-nested-y += qed-check.o block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o @@ -398,4 +398,4 @@ +block-nested-y += dictzip.o tar.o block-nested-$(CONFIG_WIN32) += raw-win32.o block-nested-$(CONFIG_POSIX) += raw-posix.o - block-nested-$(CONFIG_CURL) += curl.o + block-nested-$(CONFIG_LIBISCSI) += iscsi.o ++++++ kvm-qemu-preXX-dictzip3.patch ++++++ Index: qemu-kvm-0.12.5/block/tar.c =================================================================== --- qemu-kvm-0.12.5.orig/block/tar.c +++ qemu-kvm-0.12.5/block/tar.c @@ -83,7 +83,8 @@ static int str_ends(char *str, const cha return !strncmp(str + str_len - end_len, end, end_len); } -static int is_target_file(BlockDriverState *bs, char *filename) +static int is_target_file(BlockDriverState *bs, char *filename, + char *header) { int retval = 0; @@ -99,10 +100,17 @@ static int is_target_file(BlockDriverSta if (str_ends(filename, ".vmdk")) retval = 1; + if (retval && + (header[OFFS_TYPE] != '0') && + (header[OFFS_TYPE] != 'S')) { + retval = 0; + } + dprintf("does filename %s match? %s\n", filename, retval ? "yes" : "no"); /* make sure we're not using this name again */ filename[0] = '\0'; + return retval; } @@ -201,12 +209,13 @@ static int tar_open(BlockDriverState *bs bdrv_pread(s->hd, header_offs - s->file_len, s->longfile, sizeof(s->longfile)); s->longfile[sizeof(s->longfile)-1] = '\0'; + real_file = header; } else if (s->longfile[0]) { real_file = s->longfile; } else { real_file = header; } - } while(!is_target_file(bs, real_file)); + } while(!is_target_file(bs, real_file, header)); /* We found an image! */ ++++++ kvm-qemu-preXX-g_thread_init-users-don-t-call-it-if-glib-2.31.patch ++++++ >From 42ed3727536ccf80c87942b3f04e7378fe90f107 Mon Sep 17 00:00:00 2001 From: Alon Levy <[email protected]> Date: Tue, 20 Dec 2011 13:41:04 +0200 Subject: [PATCH] g_thread_init users: don't call it if glib >= 2.31 since commit f9b29ca03 included in release 2.31 (docs below say 2.32 but that is not correct) and onwards g_thread_init is deprecated and calling it is not required: http://developer.gnome.org/glib/unstable/glib-Deprecated-Thread-APIs.html#g-thread-init g_thread_init has been deprecated since version 2.32 and should not be used in newly-written code. This function is no longer necessary. The GLib threading system is automatically initialized at the start of your program. Fixes bulid failure when warnings are treated as errors on fedora 17. I only tested the change to vl.c, and copy pasted to the two other locations (couldn't decide if a wrapper for calling g_thread_init is uglier). Signed-off-by: Alon Levy <[email protected]> Signed-off-by: Anthony Liguori <[email protected]> --- coroutine-gthread.c | 5 +++++ trace/simple.c | 5 +++++ vl.c | 5 +++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/coroutine-gthread.c b/coroutine-gthread.c index fdea27a..662801b 100644 --- a/coroutine-gthread.c +++ b/coroutine-gthread.c @@ -36,7 +36,12 @@ static GStaticPrivate coroutine_key = G_STATIC_PRIVATE_INIT; static void __attribute__((constructor)) coroutine_init(void) { if (!g_thread_supported()) { +#if !GLIB_CHECK_VERSION(2, 31, 0) g_thread_init(NULL); +#else + fprintf(stderr, "glib threading failed to initialize.\n"); + exit(1); +#endif } coroutine_cond = g_cond_new(); diff --git a/trace/simple.c b/trace/simple.c index 6339152..bbc9930 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -376,7 +376,12 @@ bool trace_backend_init(const char *events, const char *file) GThread *thread; if (!g_thread_supported()) { +#if !GLIB_CHECK_VERSION(2, 31, 0) g_thread_init(NULL); +#else + fprintf(stderr, "glib threading failed to initialize.\n"); + exit(1); +#endif } trace_available_cond = g_cond_new(); diff --git a/vl.c b/vl.c index 78b790c..c03abb6 100644 --- a/vl.c +++ b/vl.c @@ -2176,7 +2176,12 @@ int main(int argc, char **argv, char **envp) g_mem_set_vtable(&mem_trace); if (!g_thread_supported()) { +#if !GLIB_CHECK_VERSION(2, 31, 0) g_thread_init(NULL); +#else + fprintf(stderr, "glib threading failed to initialize.\n"); + exit(1); +#endif } runstate_init(); -- 1.7.7 ++++++ kvm-studio-vnc.patch ++++++ --- /var/tmp/diff_new_pack.x1lsTO/_old 2012-01-17 16:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.x1lsTO/_new 2012-01-17 16:10:17.000000000 +0100 @@ -1,8 +1,8 @@ -Index: qemu-kvm-0.15.rc0/ui/vnc.c +Index: qemu-kvm-1.0/ui/vnc.c =================================================================== ---- qemu-kvm-0.15.rc0.orig/ui/vnc.c -+++ qemu-kvm-0.15.rc0/ui/vnc.c -@@ -43,6 +43,7 @@ static const struct timeval VNC_REFRESH_ +--- qemu-kvm-1.0.orig/ui/vnc.c ++++ qemu-kvm-1.0/ui/vnc.c +@@ -44,6 +44,7 @@ static const struct timeval VNC_REFRESH_ static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; @@ -10,7 +10,7 @@ static int vnc_cursor_define(VncState *vs); -@@ -974,6 +975,7 @@ static void vnc_disconnect_start(VncStat +@@ -1005,6 +1006,7 @@ static void vnc_disconnect_start(VncStat static void vnc_disconnect_finish(VncState *vs) { int i; @@ -18,13 +18,13 @@ vnc_jobs_join(vs); /* Wait encoding jobs */ -@@ -1017,6 +1019,13 @@ static void vnc_disconnect_finish(VncSta +@@ -1048,6 +1050,13 @@ static void vnc_disconnect_finish(VncSta } - qemu_free(vs->lossy_rect); - qemu_free(vs); + g_free(vs->lossy_rect); + g_free(vs); + + num_disconnects++; -+ if(allowed_connections > 0 && allowed_connections <= num_disconnects) { ++ if (allowed_connections > 0 && allowed_connections <= num_disconnects) { + VNC_DEBUG("Maximum number of disconnects (%d) reached:" + " Session terminating\n", allowed_connections); + exit(0); @@ -32,7 +32,7 @@ } int vnc_client_io_error(VncState *vs, int ret, int last_errno) -@@ -2698,6 +2707,39 @@ char *vnc_display_local_addr(DisplayStat +@@ -2729,6 +2738,39 @@ char *vnc_display_local_addr(DisplayStat return vnc_socket_local_addr("%s:%s", vs->lsock); } @@ -72,7 +72,7 @@ int vnc_display_open(DisplayState *ds, const char *display) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; -@@ -2729,7 +2771,36 @@ int vnc_display_open(DisplayState *ds, c +@@ -2760,7 +2802,36 @@ int vnc_display_open(DisplayState *ds, c while ((options = strchr(options, ','))) { options++; if (strncmp(options, "password", 8) == 0) { @@ -82,7 +82,7 @@ password = 1; /* Require password auth */ + if (start && (!end || (start < end))) { + int len = end ? end-(start+1) : strlen(start+1); -+ char *text = qemu_malloc(len+1); ++ char *text = g_malloc(len+1); + strncpy(text, start+1, len); + text[len] = '\0'; + @@ -100,7 +100,7 @@ + end = strchr(options, ','); + if (start && (!end || (start < end))) { + int len = end ? end-(start+1) : strlen(start+1); -+ char *text = qemu_malloc(len+1); ++ char *text = g_malloc(len+1); + strncpy(text, start+1, len); + text[len] = '\0'; + VNC_DEBUG("Maximum number of disconnects: %s\n", text); ++++++ qemu-datadir.diff ++++++ --- /var/tmp/diff_new_pack.x1lsTO/_old 2012-01-17 16:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.x1lsTO/_new 2012-01-17 16:10:17.000000000 +0100 @@ -1,8 +1,8 @@ -Index: qemu-kvm-0.15.0/configure +Index: qemu-kvm-1.0/configure =================================================================== ---- qemu-kvm-0.15.0.orig/configure -+++ qemu-kvm-0.15.0/configure -@@ -152,12 +152,12 @@ mingw32="no" +--- qemu-kvm-1.0.orig/configure ++++ qemu-kvm-1.0/configure +@@ -155,13 +155,13 @@ mingw32="no" EXESUF="" prefix="/usr/local" mandir="\${prefix}/share/man" @@ -11,16 +11,17 @@ docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" libdir="\${prefix}/lib" + includedir="\${prefix}/include" sysconfdir="\${prefix}/etc" -confsuffix="/qemu" +confsuffix="/qemu-kvm" slirp="yes" fmod_lib="" fmod_inc="" -Index: qemu-kvm-0.15.0/os-posix.c +Index: qemu-kvm-1.0/os-posix.c =================================================================== ---- qemu-kvm-0.15.0.orig/os-posix.c -+++ qemu-kvm-0.15.0/os-posix.c +--- qemu-kvm-1.0.orig/os-posix.c ++++ qemu-kvm-1.0/os-posix.c @@ -83,7 +83,7 @@ void os_setup_signal_handling(void) /* Find a likely location for support files using the location of the binary. For installed binaries this will be "$bindir/../share/qemu". When @@ -30,11 +31,11 @@ #define BUILD_SUFFIX "/pc-bios" char *os_find_datadir(const char *argv0) { -Index: qemu-kvm-0.15.0/Makefile +Index: qemu-kvm-1.0/Makefile =================================================================== ---- qemu-kvm-0.15.0.orig/Makefile -+++ qemu-kvm-0.15.0/Makefile -@@ -263,8 +263,8 @@ ifdef CONFIG_POSIX +--- qemu-kvm-1.0.orig/Makefile ++++ qemu-kvm-1.0/Makefile +@@ -283,8 +283,8 @@ ifdef CONFIG_POSIX endif install-sysconfig: ++++++ qemu-img-vmdk-scsi.patch ++++++ --- /var/tmp/diff_new_pack.x1lsTO/_old 2012-01-17 16:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.x1lsTO/_new 2012-01-17 16:10:17.000000000 +0100 @@ -13,11 +13,11 @@ qemu-img.c | 8 +++++++- 4 files changed, 18 insertions(+), 4 deletions(-) -Index: qemu-0.15.0/block.c +Index: qemu-kvm-1.0/block.c =================================================================== ---- qemu-0.15.0.orig/block.c -+++ qemu-0.15.0/block.c -@@ -2900,7 +2900,7 @@ int bdrv_img_create(const char *filename +--- qemu-kvm-1.0.orig/block.c ++++ qemu-kvm-1.0/block.c +@@ -3151,7 +3151,7 @@ int bdrv_img_create(const char *filename char *options, uint64_t img_size, int flags) { QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -26,7 +26,7 @@ BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; BlockDriver *backing_drv = NULL; -@@ -3010,6 +3010,9 @@ int bdrv_img_create(const char *filename +@@ -3261,6 +3261,9 @@ int bdrv_img_create(const char *filename printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); @@ -36,11 +36,11 @@ puts(""); ret = bdrv_create(drv, filename, param); -Index: qemu-0.15.0/block/vmdk.c +Index: qemu-kvm-1.0/block/vmdk.c =================================================================== ---- qemu-0.15.0.orig/block/vmdk.c -+++ qemu-0.15.0/block/vmdk.c -@@ -1134,7 +1134,7 @@ static int vmdk_create(const char *filen +--- qemu-kvm-1.0.orig/block/vmdk.c ++++ qemu-kvm-1.0/block/vmdk.c +@@ -1375,7 +1375,7 @@ static int vmdk_create(const char *filen "ddb.geometry.cylinders = \"%" PRId64 "\"\n" "ddb.geometry.heads = \"16\"\n" "ddb.geometry.sectors = \"63\"\n" @@ -49,7 +49,7 @@ if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) { return -EINVAL; -@@ -1149,6 +1149,8 @@ static int vmdk_create(const char *filen +@@ -1390,6 +1390,8 @@ static int vmdk_create(const char *filen flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0; } else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) { fmt = options->value.s; @@ -58,7 +58,7 @@ } options++; } -@@ -1238,7 +1240,8 @@ static int vmdk_create(const char *filen +@@ -1480,7 +1482,8 @@ static int vmdk_create(const char *filen parent_desc_line, ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), @@ -68,9 +68,9 @@ if (split || flat) { fd = open( filename, -@@ -1336,6 +1339,11 @@ static QEMUOptionParameter vmdk_create_o +@@ -1583,6 +1586,11 @@ static QEMUOptionParameter vmdk_create_o "VMDK flat extent format, can be one of " - "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat} " + "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, + { + .name = BLOCK_OPT_SCSI, @@ -80,11 +80,11 @@ { NULL } }; -Index: qemu-0.15.0/block_int.h +Index: qemu-kvm-1.0/block_int.h =================================================================== ---- qemu-0.15.0.orig/block_int.h -+++ qemu-0.15.0/block_int.h -@@ -30,10 +30,12 @@ +--- qemu-kvm-1.0.orig/block_int.h ++++ qemu-kvm-1.0/block_int.h +@@ -33,10 +33,12 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 @@ -97,11 +97,11 @@ #define BLOCK_OPT_BACKING_FILE "backing_file" #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" -Index: qemu-0.15.0/qemu-img.c +Index: qemu-kvm-1.0/qemu-img.c =================================================================== ---- qemu-0.15.0.orig/qemu-img.c -+++ qemu-0.15.0/qemu-img.c -@@ -636,7 +636,7 @@ static int img_convert(int argc, char ** +--- qemu-kvm-1.0.orig/qemu-img.c ++++ qemu-kvm-1.0/qemu-img.c +@@ -661,7 +661,7 @@ static int img_convert(int argc, char ** const uint8_t *buf1; BlockDriverInfo bdi; QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -110,7 +110,7 @@ char *options = NULL; const char *snapshot_name = NULL; float local_progress; -@@ -802,6 +802,12 @@ static int img_convert(int argc, char ** +@@ -852,6 +852,12 @@ static int img_convert(int argc, char ** } } ++++++ qemu-kvm-0.15.1.tar.bz2 -> qemu-kvm-1.0.tar.bz2 ++++++ ++++ 169657 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
