Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at 2012-05-22 08:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-05-03 10:58:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kvm.new/kvm.changes 2012-05-22 08:16:16.000000000 +0200 @@ -1,0 +2,17 @@ +Mon May 21 18:43:08 UTC 2012 - [email protected] + +- use correct type to avoid gnutls deprecation warnings + +------------------------------------------------------------------- +Mon May 21 11:54:32 UTC 2012 - [email protected] + +- Use BuildRequires: libgnutls-devel instead of gnutls-devel for + Factory in keeping with gnutls package naming changes. + +------------------------------------------------------------------- +Mon May 21 04:41:51 UTC 2012 - [email protected] + +- Update to qemu-kvm v1.1-rc2 + - see http://wiki.qemu.org/ChangeLog/1.1 for details + +------------------------------------------------------------------- Old: ---- kvm-qemu-avoid-zero-length-memset.patch kvm-qemu-preXX-g_thread_init-users-don-t-call-it-if-glib-2.31.patch kvm-qemu-user-space-tool-name.patch qemu-kvm-1.0.1.tar.bz2 qemu-kvm-common-code-fixes-for-s390-build.patch New: ---- kvm-qemu-avoid-deprecated-gnutls-types.patch qemu-kvm-1.1.rc2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -19,8 +19,8 @@ %bcond_without spice -%define package_true_version 1.0.1 -%define package_base_version 1.0.1 +%define package_true_version 1.1.rc2 +%define package_base_version 1.1 %define bios_id seabios-1.7.0 %define pxe_rom_id ipxe-1.0.0 %define vgabios_id vgabios-0.6c @@ -29,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/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/kvmvapic.bin} ExclusiveArch: %ix86 x86_64 ia64 s390x @@ -47,7 +47,11 @@ BuildRequires: alsa BuildRequires: alsa-devel BuildRequires: glib2-devel +%if 0%{?suse_version} > 1210 +BuildRequires: libgnutls-devel +%else BuildRequires: gnutls-devel +%endif BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libcurl-devel @@ -125,9 +129,8 @@ # qemu-kvm patches Patch60: qemu-datadir.diff Patch61: kvm-qemu-default-memsize.patch -Patch62: kvm-qemu-user-space-tool-name.patch -Patch63: kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch -Patch64: kvm-qemu-avoid-zero-length-memset.patch +Patch62: kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch +Patch63: kvm-qemu-avoid-deprecated-gnutls-types.patch # Post-release upstream patches Patch100: kvm-qemu-preXX-dictzip1.patch @@ -136,9 +139,6 @@ Patch103: kvm-qemu-preXX-console.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 Patch200: qemu-img-vmdk-scsi.patch Patch201: kvm-studio-slirp-nooutgoing.patch @@ -222,7 +222,6 @@ %patch61 -p1 %patch62 -p1 %patch63 -p1 -%patch64 -p1 # Post-release patches %patch100 -p1 @@ -231,9 +230,6 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 - -%patch150 -p1 # Studio addons %patch200 -p1 @@ -265,6 +261,7 @@ ./configure \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ + --with-confsuffix=/qemu-kvm \ --extra-cflags="%{optflags}" \ --disable-debug-tcg \ --disable-sparse \ @@ -297,7 +294,6 @@ --disable-fdt \ --disable-bluez \ --enable-kvm \ - --enable-kvm-pit \ --enable-kvm-device-assignment \ --disable-user \ --enable-vde \ @@ -355,11 +351,11 @@ %endif %install -make DESTDIR=%{buildroot} install %{?jobs:-j%jobs} +make DESTDIR=%{buildroot} install %{?jobs:-j%jobs} libexecdir=%_libexecdir mkdir -p %{buildroot}%{_docdir}/kvm cp qemu-doc.html qemu-kvm.html cp qemu-tech.html qemu-kvm-tech.html -install -m 755 kvm/kvm_stat %{buildroot}%{_bindir}/ +install -m 755 scripts/kvm/kvm_stat %{buildroot}%{_bindir}/ %if %{build_fw_from_source} for i in %firmware_files do @@ -415,6 +411,7 @@ %attr(755,root,kvm) %{_bindir}/qemu-ga %attr(755,root,kvm) %{_bindir}/kvm_stat %{_datadir}/qemu-kvm +%_libexecdir/qemu-bridge-helper %dir %attr(0755, root, kvm) %{_sysconfdir}/qemu-kvm/ %config %attr(644,root,kvm) %{_sysconfdir}/qemu-kvm/target-x86_64.conf %config %{_sysconfdir}/udev/rules.d/60-kvm.rules ++++++ kvm-qemu-avoid-deprecated-gnutls-types.patch ++++++ Index: qemu-kvm-1.1.rc2/ui/vnc-tls.c =================================================================== --- qemu-kvm-1.1.rc2.orig/ui/vnc-tls.c +++ qemu-kvm-1.1.rc2/ui/vnc-tls.c @@ -99,9 +99,9 @@ static ssize_t vnc_tls_pull(gnutls_trans } -static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void) +static gnutls_anon_server_credentials_t vnc_tls_initialize_anon_cred(void) { - gnutls_anon_server_credentials anon_cred; + gnutls_anon_server_credentials_t anon_cred; int ret; if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) { @@ -382,7 +382,7 @@ int vnc_tls_client_setup(struct VncState } } else { - gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred(); + gnutls_anon_server_credentials_t anon_cred = vnc_tls_initialize_anon_cred(); if (!anon_cred) { gnutls_deinit(vs->tls.session); vs->tls.session = NULL; ++++++ kvm-qemu-preXX-dictzip1.patch ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -24,10 +24,10 @@ 2 files changed, 502 insertions(+), 1 deletions(-) create mode 100644 block/dictzip.c -Index: qemu-kvm-1.0/block/dictzip.c +Index: qemu-kvm-1.1rc2/block/dictzip.c =================================================================== --- /dev/null -+++ qemu-kvm-1.0/block/dictzip.c ++++ qemu-kvm-1.1rc2/block/dictzip.c @@ -0,0 +1,566 @@ +/* + * DictZip Block driver for dictzip enabled gzip files @@ -595,14 +595,14 @@ +} + +block_init(dictzip_block_init); -Index: qemu-kvm-1.0/Makefile.objs +Index: qemu-kvm-1.1rc2/Makefile.objs =================================================================== ---- 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 +--- qemu-kvm-1.1rc2.orig/Makefile.objs ++++ qemu-kvm-1.1rc2/Makefile.objs +@@ -54,6 +54,7 @@ block-nested-y += qed.o qed-gencb.o qed- block-nested-y += qed-check.o block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o + block-nested-y += stream.o +block-nested-y += dictzip.o block-nested-$(CONFIG_WIN32) += raw-win32.o block-nested-$(CONFIG_POSIX) += raw-posix.o ++++++ kvm-qemu-preXX-dictzip2.patch ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -25,10 +25,10 @@ 2 files changed, 334 insertions(+), 1 deletions(-) create mode 100644 block/tar.c -Index: qemu-kvm-1.0/block/tar.c +Index: qemu-kvm-1.1rc2/block/tar.c =================================================================== --- /dev/null -+++ qemu-kvm-1.0/block/tar.c ++++ qemu-kvm-1.1rc2/block/tar.c @@ -0,0 +1,356 @@ +/* + * Tar block driver @@ -386,14 +386,14 @@ +} + +block_init(tar_block_init); -Index: qemu-kvm-1.0/Makefile.objs +Index: qemu-kvm-1.1rc2/Makefile.objs =================================================================== ---- 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 +--- qemu-kvm-1.1rc2.orig/Makefile.objs ++++ qemu-kvm-1.1rc2/Makefile.objs +@@ -54,7 +54,7 @@ block-nested-y += qed.o qed-gencb.o qed- block-nested-y += qed-check.o block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o + block-nested-y += stream.o -block-nested-y += dictzip.o +block-nested-y += dictzip.o tar.o block-nested-$(CONFIG_WIN32) += raw-win32.o ++++++ kvm-studio-slirp-nooutgoing.patch ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -62,7 +62,7 @@ + return; + } + - fd_nonblock(s); + socket_set_nonblock(s); opt = 1; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)); @@ -427,6 +442,7 @@ tcp_connect(struct socket *inso) ++++++ kvm-studio-vnc.patch ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -1,7 +1,7 @@ -Index: qemu-kvm-1.0/ui/vnc.c +Index: qemu-kvm-1.1rc2/ui/vnc.c =================================================================== ---- qemu-kvm-1.0.orig/ui/vnc.c -+++ qemu-kvm-1.0/ui/vnc.c +--- qemu-kvm-1.1rc2.orig/ui/vnc.c ++++ qemu-kvm-1.1rc2/ui/vnc.c @@ -44,6 +44,7 @@ static const struct timeval VNC_REFRESH_ static VncDisplay *vnc_display; /* needed for info vnc */ @@ -9,8 +9,8 @@ +static int allowed_connections = 0; static int vnc_cursor_define(VncState *vs); - -@@ -1005,6 +1006,7 @@ static void vnc_disconnect_start(VncStat + static void vnc_release_modifiers(VncState *vs); +@@ -1030,6 +1031,7 @@ static void vnc_disconnect_start(VncStat static void vnc_disconnect_finish(VncState *vs) { int i; @@ -18,7 +18,7 @@ vnc_jobs_join(vs); /* Wait encoding jobs */ -@@ -1048,6 +1050,13 @@ static void vnc_disconnect_finish(VncSta +@@ -1077,6 +1079,13 @@ static void vnc_disconnect_finish(VncSta } g_free(vs->lossy_rect); g_free(vs); @@ -32,7 +32,7 @@ } int vnc_client_io_error(VncState *vs, int ret, int last_errno) -@@ -2729,6 +2738,39 @@ char *vnc_display_local_addr(DisplayStat +@@ -2860,6 +2869,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; -@@ -2760,7 +2802,36 @@ int vnc_display_open(DisplayState *ds, c +@@ -2892,7 +2934,36 @@ int vnc_display_open(DisplayState *ds, c while ((options = strchr(options, ','))) { options++; if (strncmp(options, "password", 8) == 0) { @@ -108,4 +108,4 @@ + } } else if (strncmp(options, "reverse", 7) == 0) { reverse = 1; - } else if (strncmp(options, "no-lock-key-sync", 9) == 0) { + } else if (strncmp(options, "no-lock-key-sync", 16) == 0) { ++++++ qemu-datadir.diff ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -1,23 +1,3 @@ -Index: qemu-kvm-1.0/configure -=================================================================== ---- 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" --datadir="\${prefix}/share/qemu" -+datadir="\${prefix}/share/qemu-kvm" - 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-1.0/os-posix.c =================================================================== --- qemu-kvm-1.0.orig/os-posix.c @@ -31,18 +11,3 @@ #define BUILD_SUFFIX "/pc-bios" char *os_find_datadir(const char *argv0) { -Index: qemu-kvm-1.0/Makefile -=================================================================== ---- qemu-kvm-1.0.orig/Makefile -+++ qemu-kvm-1.0/Makefile -@@ -283,8 +283,8 @@ ifdef CONFIG_POSIX - endif - - install-sysconfig: -- $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu" -- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu" -+ $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu-kvm" -+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu-kvm" - - install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ++++++ qemu-img-vmdk-scsi.patch ++++++ --- /var/tmp/diff_new_pack.ZVP5A2/_old 2012-05-22 08:16:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZVP5A2/_new 2012-05-22 08:16:20.000000000 +0200 @@ -13,11 +13,11 @@ qemu-img.c | 8 +++++++- 4 files changed, 18 insertions(+), 4 deletions(-) -Index: qemu-kvm-1.0/block.c +Index: qemu-kvm-1.1rc2/block.c =================================================================== ---- qemu-kvm-1.0.orig/block.c -+++ qemu-kvm-1.0/block.c -@@ -3151,7 +3151,7 @@ int bdrv_img_create(const char *filename +--- qemu-kvm-1.1rc2.orig/block.c ++++ qemu-kvm-1.1rc2/block.c +@@ -4028,7 +4028,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; -@@ -3261,6 +3261,9 @@ int bdrv_img_create(const char *filename +@@ -4143,6 +4143,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-kvm-1.0/block/vmdk.c +Index: qemu-kvm-1.1rc2/block/vmdk.c =================================================================== ---- 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 +--- qemu-kvm-1.1rc2.orig/block/vmdk.c ++++ qemu-kvm-1.1rc2/block/vmdk.c +@@ -1377,7 +1377,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; -@@ -1390,6 +1390,8 @@ static int vmdk_create(const char *filen +@@ -1392,6 +1392,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++; } -@@ -1480,7 +1482,8 @@ static int vmdk_create(const char *filen +@@ -1482,7 +1484,8 @@ static int vmdk_create(const char *filen parent_desc_line, ext_desc_lines, (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), @@ -68,7 +68,7 @@ if (split || flat) { fd = open( filename, -@@ -1583,6 +1586,11 @@ static QEMUOptionParameter vmdk_create_o +@@ -1585,6 +1588,11 @@ static QEMUOptionParameter vmdk_create_o "VMDK flat extent format, can be one of " "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, @@ -80,28 +80,31 @@ { NULL } }; -Index: qemu-kvm-1.0/block_int.h +Index: qemu-kvm-1.1rc2/block_int.h =================================================================== ---- qemu-kvm-1.0.orig/block_int.h -+++ qemu-kvm-1.0/block_int.h -@@ -33,10 +33,12 @@ +--- qemu-kvm-1.1rc2.orig/block_int.h ++++ qemu-kvm-1.1rc2/block_int.h +@@ -33,6 +33,7 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 -+#define BLOCK_FLAG_SCSI 8 ++#define BLOCK_FLAG_SCSI 8 - #define BLOCK_OPT_SIZE "size" - #define BLOCK_OPT_ENCRYPT "encryption" - #define BLOCK_OPT_COMPAT6 "compat6" + #define BLOCK_IO_LIMIT_READ 0 + #define BLOCK_IO_LIMIT_WRITE 1 +@@ -51,6 +52,7 @@ + #define BLOCK_OPT_PREALLOC "preallocation" + #define BLOCK_OPT_SUBFMT "subformat" + #define BLOCK_OPT_COMPAT_LEVEL "compat" +#define BLOCK_OPT_SCSI "scsi" - #define BLOCK_OPT_BACKING_FILE "backing_file" - #define BLOCK_OPT_BACKING_FMT "backing_fmt" - #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" -Index: qemu-kvm-1.0/qemu-img.c + + typedef struct BdrvTrackedRequest BdrvTrackedRequest; + +Index: qemu-kvm-1.1rc2/qemu-img.c =================================================================== ---- 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 ** +--- qemu-kvm-1.1rc2.orig/qemu-img.c ++++ qemu-kvm-1.1rc2/qemu-img.c +@@ -636,7 +636,7 @@ static int img_convert(int argc, char ** const uint8_t *buf1; BlockDriverInfo bdi; QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -110,7 +113,7 @@ char *options = NULL; const char *snapshot_name = NULL; float local_progress; -@@ -852,6 +852,12 @@ static int img_convert(int argc, char ** +@@ -829,6 +829,12 @@ static int img_convert(int argc, char ** } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
