--- qemu-kvm-0.11.0.orig/debian/TODO +++ qemu-kvm-0.11.0/debian/TODO @@ -0,0 +1,5 @@ +* sysctl.d file should be prefixed with a number + +* install target should install to debian/tmp + +* binary-arch should almost only use dh_install to install --- qemu-kvm-0.11.0.orig/debian/watch +++ qemu-kvm-0.11.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/kvm/qemu-kvm-([0-9].*)\.tar\.gz \ + debian uupdate --- qemu-kvm-0.11.0.orig/debian/links +++ qemu-kvm-0.11.0/debian/links @@ -0,0 +1,45 @@ +etc/qemu-kvm etc/kvm +usr/bin/qemu-ifdown etc/qemu-ifdown +usr/bin/qemu-ifup etc/qemu-ifup +usr/bin/qemu-img usr/bin/kvm-img +usr/bin/qemu-nbd usr/bin/kvm-nbd +usr/bin/qemu-system-x86_64 usr/bin/kvm +usr/share/qemu usr/share/qemu-kvm +usr/share/qemu usr/share/kvm +usr/share/doc/qemu usr/share/doc/kvm +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-alpha.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-cris.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-arm.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-armeb.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-i386.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-m68k.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-mips.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-mipsel.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-ppc.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-ppc64.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-ppc64abi32.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sh4.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sh4eb.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sparc.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sparc32plus.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sparc64.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-x86_64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-arm.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-cris.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-i386.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-m68k.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mips.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mips64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mips64el.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mipsel.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-ppc.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-ppc64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-ppcemb.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sh4.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sh4eb.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sparc.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sparc64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-x86_64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/kvm.1 +usr/share/man/man1/qemu-img.1 usr/share/man/man1/kvm-img.1 +usr/share/man/man1/qemu-nbd.1 usr/share/man/man1/kvm-nbd.1 --- qemu-kvm-0.11.0.orig/debian/qemu-kvm.udev +++ qemu-kvm-0.11.0/debian/qemu-kvm.udev @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" --- qemu-kvm-0.11.0.orig/debian/qemu-arm-static.postinst +++ qemu-kvm-0.11.0/debian/qemu-arm-static.postinst @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ] && which update-binfmts >/dev/null; then + update-binfmts --import arm +fi + +if [ "$1" = configure ]; then + sysctl -p /etc/sysctl.d/qemu-arm-static.sysctl.conf +fi + +#DEBHELPER# + +exit 0 --- qemu-kvm-0.11.0.orig/debian/changelog.kvm +++ qemu-kvm-0.11.0/debian/changelog.kvm @@ -0,0 +1,1126 @@ +kvm (1:84+dfsg-0ubuntu14) karmic; urgency=low + + * debian/source_kvm.py: collect kvm*, and qemu* + + -- Dustin Kirkland Mon, 01 Jun 2009 10:05:27 -0500 + +kvm (1:84+dfsg-0ubuntu13) karmic; urgency=low + + * debian/source_kvm.py: only collect packages related to kvm for apport, + LP: #382077 + + -- Dustin Kirkland Mon, 01 Jun 2009 07:17:46 -0500 + +kvm (1:84+dfsg-0ubuntu12) jaunty-proposed; urgency=low + + * Apply patch series from upstream to fix segfaults when cancelling + DMA operations in virtual machines. (LP: #359447) + + -- Soren Hansen Sun, 03 May 2009 09:39:47 +0200 + +kvm (1:84+dfsg-0ubuntu11) jaunty; urgency=low + + * debian/patches/add-all-virtio-drives.patch: Fix bugs where the caller + does not specify a perfectly defined list of virtio drives starting at + index=0 and having no gaps in indices; LP: #360832, #360825 + * debian/patches/fix-qcow-corruption: Cherry-pick from kvm stable git + branch, fixes at least one cause of qcow2 image corruption; no reports + yet of this in Ubuntu, but I'm being proactive about this one; + LP: #361938 + * debian/source_kvm.py: dpkg -l was a little too heavy, compress this + output considerably + + -- Dustin Kirkland Fri, 17 Apr 2009 09:59:58 -0500 + +kvm (1:84+dfsg-0ubuntu10) jaunty; urgency=low + + * debian/patches/virtio-net_disable_gso.patch: hardy guest kernels + do not have working gso support. Disable it for everyone until + we have a work around, LP: #331128. + + -- Dustin Kirkland Thu, 02 Apr 2009 11:08:34 -0500 + +kvm (1:84+dfsg-0ubuntu9) jaunty; urgency=low + + * debian/source_kvm.py: add a basic apparmor hook for kvm, retrieving + a listing of all packages installed, and the kvm command line used + + -- Dustin Kirkland Fri, 27 Mar 2009 15:56:24 -0500 + +kvm (1:84+dfsg-0ubuntu8) jaunty; urgency=low + + * debian/patches/dkmsify.patch: handle i686 arch properly, LP: #333632 + * debian/control: kvm-source needs kernel headers + * debian/kvm-source.postinst: check if necessary headers are installed; + if not, print a handy error message with instructions, LP: #341159 + * debian/kvm.init: use proper lsb begin/end message logging for cleaner + usplash interaction, LP: #275009 + * debian/rules, debian/control: Enable pulseaudio audio driver, LP: #304649 + + -- Dustin Kirkland Thu, 12 Mar 2009 00:17:04 -0500 + +kvm (1:84+dfsg-0ubuntu7) jaunty; urgency=low + + * debian/control: revert libvdeplug2-dev build-dependency as this package + is in Universe + + -- Dustin Kirkland Mon, 02 Mar 2009 23:11:02 -0600 + +kvm (1:84+dfsg-0ubuntu6) jaunty; urgency=low + + [ Emmet Hikory ] + * debian/rules, debian/control: Enable build for lpia & ia64 + (thanks to TJ) LP: #277517 + + -- Dustin Kirkland Mon, 02 Mar 2009 15:35:26 -0600 + +kvm (1:84+dfsg-0ubuntu5) jaunty; urgency=low + + * debian/patches/fix_screen_corruption: patch from upstream SVN (should + be dropped in next merge), fixes LP: #336712, #333920 + * debian/patches: permanently removed all dropped patches + + -- Dustin Kirkland Mon, 02 Mar 2009 09:15:26 -0600 + +kvm (1:84+dfsg-0ubuntu4) jaunty; urgency=low + + [ TJ ] + * debian/control: add build-depends on libvdeplug2-dev which will cause + qemu's configure script to enable vde support, LP: #253230 + + [ Dustin Kirkland ] + * debian/kvm-source.postinst: remove dkms module before installing new + one, LP: #334177 + + -- Dustin Kirkland Thu, 26 Feb 2009 16:07:57 -0600 + +kvm (1:84+dfsg-0ubuntu3) jaunty; urgency=low + + [ Reviewed Ubuntu patches with KVM/QEMU upstream, Anthony Liguori ] + * debian/patches/03_bios_no_ssp.patch: DROPPED, included upstream + * debian/patches/06_no_system_linux_kvm_h.patch: DROPPED, no longer + necessary, kvm kernel header file is now generally available + * debian/patches/from-debian-qemu/22_net_tuntap_stall.patch: DROPPED, + no longer necessary; this patch was to work around a bug in + 2.6.11-rc1; this patch could be causing network packet drop issues; + definitely WRONG at this point with modern QEMU + * debian/patches/from-debian-qemu/62_linux_boot_nasm.patch: DROPPED, + dead code in modern QEMU; completely rewritten to not require an + external assembler; now built dynamically in pc.c + * debian/patches/SECURITY_CVE-2007-1321+1322+1366+2893.patch: DROPPED + * CVE-2007-1321: Fixed upstream + - QEMU svn commit: r3019 + * CVE-2007-1322: Fixed upstream + - QEMU svn commit: r5921 + * CVE-2007-1366: Fixed upstream + - QEMU svn commit: r3012 + * CVE-2007-2893: Not related to QEMU + * dma.c: Non-CVE fix, r3917 + * block.c: Incorrect patch (negative offset IS allowed, switches + between block and byte offset) + * Remainder of the patch was split into: net-socket.patch + (should be sent upstream) + * debian/patches/series: updated accordingly + * debian/patches/do-not-install-bios.patch: DROPPED + added --disable-blobs to configure in debian/rules + * debian/patches/reenable_audio_drivers.patch: DROPPED + added --audio-drv-list="oss alsa sdl" to debian/rules + * debian/patches/anon_inodes_fix.patch: DROPPED, this is already + upstream + * debian/patches/ppc-build.patch: DROPPED, not necessary + * debian/rules: remove references to non-existant linux_boot.bin + + [ Remaining Patches ] + * debian/patches/01_use_bios_files_in_usr_share_kvm.patch -p0 + debian/patches/04_use_etc_kvm_kvm-ifup.patch -p0 + debian/patches/07_change_qemu_docdir.patch + |-----> merged to a single patch, rename_qemu_kvm.patch + * debian/patches/CVE-2008-0928.patch: upstream work in progress + * debian/patches/evdev_keycode_map.patch: upstream work in progress + * debian/patches/02_fix_kernel_Makefile.patch: merged into dkmsify.patch + * debian/patches/dkmsify.patch: Ubuntu-specific (should validate if + still necessary...) + * debian/patches/net-socket.patch: to be sent upstream + + [ Other Changes ] + * scripts/qemu-ifup: bridge device determination was broken, required + br0 to be present for this script to operate properly, LP: #125302 + + -- Dustin Kirkland Fri, 20 Feb 2009 16:11:06 -0600 + +kvm (1:84+dfsg-0ubuntu2) jaunty; urgency=low + + * debian/patches/reenable_audio_drivers.patch: drop the explicit list + of sound card drivers configured; upstream handles this properly now + + -- Dustin Kirkland Wed, 18 Feb 2009 12:00:53 -0600 + +kvm (1:84+dfsg-0ubuntu1) jaunty; urgency=low + + * New upstream release + * debian/patches/CVE-2008-0928.patch: updated to apply cleanly + * debian/patches/SECURITY_CVE-2007-1321+1322+1366+2893.patch: updated to + apply cleanly + * debian/patches/reenable_audio_drivers.patch: add es1370 to the soundcard + list + * debian/patches/ppc-build.patch: required for the new qemu to build on + non-ppc platforms (bug upstream, should be fixed by next release) + * debian/rules: the clean target now depends on config.status (variable + definition needed by 'make clean'); the source's clean target seems + to clean out qemu/$(BUILD_CPU)-softmmu now, commenting out; reordered + calling of source's clean targets to ensure that the clean can + succeed + + -- Dustin Kirkland Tue, 17 Feb 2009 19:42:43 -0600 + +kvm (1:83+dfsg-0ubuntu1) jaunty; urgency=low + + * New upstream release, fixes LP: #320320 + + -- Dustin Kirkland Fri, 23 Jan 2009 09:01:03 -0500 + +kvm (1:82+dfsg-0ubuntu1) jaunty; urgency=low + + * New upstream release, LP: #316521 + * debian/patches/04_use_etc_kvm_kvm-ifup.patch: reworked to patch + qemu/net.h + * debian/patches/CVE-2008-0928.patch: updated + * debian/patches/do-not-install-bios.patch: updated, Makefile now supports + a variable (perhaps we should set this with configure?) + * debian/patches/reenable_audio_drivers.patch: updated + * debian/patches/anon_inodes_fix.patch: updated + * debian/patches/SECURITY_CVE-2007-1321+1322+1366+2893.patch: updated + * debian/rules: clean up a bit better after the build; allows for + subsequent binary and source builds and rebuilds + + -- Dustin Kirkland Tue, 20 Jan 2009 21:47:54 -0500 + +kvm (1:79+dfsg-0ubuntu5) jaunty; urgency=low + + * Bump debhelper version for updated udev rules path, add Breaks to ensure + we use the right version of udev. + + -- Scott James Remnant Mon, 12 Jan 2009 19:44:11 +0000 + +kvm (1:79+dfsg-0ubuntu4) jaunty; urgency=low + + * Correctly rename kvm-nbd man page to match the binary's name. + * Make "debian/rules clean" do a better job at cleaning up after the build. + + -- Soren Hansen Tue, 25 Nov 2008 10:51:55 +0100 + +kvm (1:79+dfsg-0ubuntu3) jaunty; urgency=low + + * Rename kvm-nbd man page to match the binary's name. + + -- Soren Hansen Mon, 24 Nov 2008 00:04:36 +0100 + +kvm (1:79+dfsg-0ubuntu2) jaunty; urgency=low + + * Fix kernel module build. + + -- Soren Hansen Tue, 18 Nov 2008 22:04:35 +0100 + +kvm (1:79+dfsg-0ubuntu1) jaunty; urgency=low + + * New upstream release + * Dropped the following patch sets, as they're now upstream: + + qemu_vnc_ext_key_event + + i2c_bus_load_fix + * Updated the following patches to match kvm-79: + + SECURITY_CVE-2007-1321+1322+1366+2893 + + CVE-2008-0928 + + 22_net_tuntap_stall + * Make kvm-source autoinstall (meaning that it'll compile itself not just + for the kernel running at install time, but also for kernels that are + installed later on). + + -- Soren Hansen Tue, 18 Nov 2008 21:37:56 +0100 + +kvm (72+dfsg-2) unstable; urgency=medium + + * Merge changes from NMU, thanks to Thomas Viehmann + * Use a sane method for creating the kvm group, thanks to Josh Tripplet + (closes: #502299) + + -- Jan Lübbe Thu, 16 Oct 2008 18:22:41 +0200 + +kvm (1:72+dfsg-1ubuntu6) intrepid; urgency=low + + * debian/patches/evdev_keycode_map.patch, debian/patches/series: ported the + gtk-vnc patch that fixes evdev keycode mapping (LP: #258389) + * debian/control: explicitly depend on libx11-dev + + -- Dustin Kirkland Wed, 24 Sep 2008 17:25:20 -0500 + +kvm (1:72+dfsg-1ubuntu5) intrepid; urgency=low + + [ Dustin Kirkland ] + * Add debian/10-kvm.fdi, debian/org.freedesktop.hal.kvm.policy: hal object + descriptor and policy file for kvm/virt-hardware + * debian/kvm.install; Put the hal/PolicyKit configuration in the correct + place (LP: #273764) + + [ Martin Pitt ] + * Simplify Dustin's dh_install handling a bit (don't use debian/rules any + more, install straight with dh_install). + + -- Dustin Kirkland Wed, 24 Sep 2008 14:00:16 +0200 + +kvm (1:72+dfsg-1ubuntu4) intrepid; urgency=low + + * debian/kvm-ok: simple script to determine of the cpu supports kvm + acceleration (LP: #188878) + * debian/rules: install the kvm-ok binary into /usr/bin/kvm-ok + + -- Dustin Kirkland Mon, 22 Sep 2008 12:09:47 -0500 + +kvm (1:72+dfsg-1ubuntu3) intrepid; urgency=low + + * debian/control: Trivial update to description, to note that KVM works on + both x86 and x86_64 hardware (LP: #225260). + + -- Dustin Kirkland Mon, 22 Sep 2008 10:51:23 -0500 + +kvm (1:72+dfsg-1ubuntu2) intrepid; urgency=low + + * Switch KVM to use dkms. This makes kernel and userspace match each other + and saves us the trouble of possible ABI bumps when updating kvm. + + -- Soren Hansen Thu, 28 Aug 2008 14:47:26 +0200 + +kvm (1:72+dfsg-1ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable. Remaining changes: + - Add dh_installudev rule. + - Add ppc_rom.bin to needed_bios_files for powerpc target. + - Build-Depend on "sysv-rc (>= 2.86.ds1-14.1ubuntu2)" to accomodate + TearDown. + - Suggest ubuntu-vm-builder instead of debootstrap. + - Change kvm-data conflict/replaces version to 68+dfsg-1, to properly + conflict with the Ubuntu kvm-data package. + - Suggest kvm-pxe to enable PXE booting. + + -- Soren Hansen Thu, 14 Aug 2008 11:00:29 +0200 + +kvm (72+dfsg-1) unstable; urgency=low + + * New upstream release (closes: #493536) + * Cherry-pick a commit from qemu which fixes migration + * Cherry-pick a commit from kvm which fixes the external module with 2.6.26 + * Reenable audio drivers and cards (closes: #491676) + + -- Jan Lübbe Mon, 11 Aug 2008 19:51:51 +0200 + +kvm (1:71+dfsg-1ubuntu2) intrepid; urgency=low + + * Readd dh_installudev rule. + + -- Soren Hansen Mon, 11 Aug 2008 18:34:23 +0200 + +kvm (1:71+dfsg-1ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable. Remaining changes: + - Add ppc_rom.bin to needed_bios_files for powerpc target. + - Comment out PXE rom builds (etherboot is not in main at this point). + - Build-Depend on "sysv-rc (>= 2.86.ds1-14.1ubuntu2)" to accomodate + TearDown. + - Suggest ubuntu-vm-builder instead of debootstrap. + - Change kvm-data conflict/replaces version to 68+dfsg-1, to properly + conflict with the Ubuntu kvm-data package. + * Suggest kvm-pxe to enable PXE booting. + + -- Soren Hansen Wed, 23 Jul 2008 16:23:17 +0200 + +kvm (71+dfsg-1) unstable; urgency=low + + * New upstream release + + -- Jan Lübbe Sat, 19 Jul 2008 15:52:45 +0200 + +kvm (70+dfsg-1) unstable; urgency=low + + * New upstream release + * Merge changes from Ubuntu in debian/control + - Only Build-Depend on device-tree-compiler on PowerPC + - Change linux-{image,headers,source}-2.6 to just + linux-{image,headers,source} + - Don't suggest sudo + * Reenable CPU emulation + * Update to policy 3.8.0.0 + - Add debian/README.source + + -- Jan Lübbe Tue, 17 Jun 2008 18:55:51 +0200 + +kvm (1:69+dfsg-1ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable. Remaining changes: + - Add ppc_rom.bin to needed_bios_files for powerpc target. + - Comment out PXE rom builds (etherboot is not in main at this point). + - DebianMaintainerField. + - Only Build-Depend on device-tree-compiler on PowerPC. + - Don't Build-Depend on etherboot. + - Build-Depend on "sysv-rc (>= 2.86.ds1-14.1ubuntu2)" to accomodate + TearDown. + - Don't recommend linux-image-2.6, since we only have 2.6 kernels anyway. + - Suggest ubuntu-vm-builder instead of debootstrap. + - Don't suggest sudo. + - Change kvm-data conflict/replaces version to 68+dfsg-1, to properly + conflict with the Ubuntu kvm-data package. + - Change suggests of kvm-source from linux-{headers,source}-2.6 to just + linux-{headers,source}. + + -- Soren Hansen Wed, 28 May 2008 08:46:15 +0200 + +kvm (69+dfsg-1) unstable; urgency=low + + [ Jan Lübbe ] + * New upstream releases (closes: #481989) + - Fixes CVE-2007-1320 (Cirrus LGD-54XX "bitblt" heap overflow) + - Fixes CVE-2008-2004 (format guessing vulnerability, drop the patch) + - Update debian patches + * Update upstream changelog + * Update Vcs-* headers to git.debian.org + * Drop kvm-data again, build and ship only those files relevant to the + target arch + + [ Soren Hansen ] + * 03_bios_no_ssp.patch: + - Pass -fno-stack-protector to gcc when building the bios image. + * qemu_vnc_ext_key_event.diff: + - Implement the Extended KeyEvent extension in kvm's embedded VNC server. + * Add kvm init script that loads the appropriate kernel modules. + * Update package description + - We no longer support cpu emulation, so hardware support is required. + - The standard kernel images provide the kernel modules, so compiling + them yourself from kvm-source is now optional. + - qemu is no longer needed for creating disk images, since we have kvm-img + now. + * Move kvm-source from "Recommends:" of kvm to "Suggests:", since the + modules are in the standard kernel images. + * Update CVE-2008-0928.patch to allow any bdrv request if vm is not + running. This fixes the savevm monitor command. + - This also fixes booting with qcow2 images (closes: #470664) + + -- Jan Lübbe Mon, 26 May 2008 16:55:21 +0200 + +kvm (1:68+dfsg-0ubuntu1) intrepid; urgency=low + + * New upstream release + merge with debian. Remaining changes: + + SECURITY_CVE-2007-1320+1321+1322+1366+2893.patch + - Cirrus LGD-54XX "bitblt" heap overflow. + - NE2000 "mtu" heap overflow. + - QEMU "net socket" heap overflow. + - QEMU NE2000 "receive" integer signedness error. + - Infinite loop in the emulated SB16 device. + - Unprivileged "aam" instruction does not correctly handle the + undocumented divisor operand. + - Unprivileged "icebp" instruction will halt emulation. + + qemu_vnc_ext_key_event.diff: + - Enabled extended key events in embedded VNC server. + + DebianMaintainerField. + + Add init script to automatically load appropriate kernel modules + on boot (TearDown style). Add sysv-rc (>= 2.86.ds1-14.1ubuntu2) + dependency in the process. + + Install kvm.udev as priority 45. + + Add "XS-Debian-" prefix to Debian's VCS headers. + + Demote kvm-source to a Suggests of kvm (from Recommends). + + Update package description to say that the kvm modules are in the + kernel. + + Update kernel package names to match Ubuntu naming. + + -- Soren Hansen Tue, 06 May 2008 10:01:22 +0200 + +kvm (66+dfsg-1.1) unstable; urgency=high + + * Non-maintainer upload by the security team + * Merge the fixes for the security issues in the embedded qemu + version (Closes: #480011) Thanks to Jamie Strandboge + - Add CVE-2007-1320+1321+1322+1366+2893.patch from from qemu 0.9.1-1 + to address the following issues: + - Note: CVE-2007-2893 is the same as CVE-2007-1323 referenced in DSA-1284-1. + - Note: CVE-2007-5729 and CVE-2007-5730 are the same as CVE-2007-1321 + referenced in DSA-1284-1. + - Cirrus LGD-54XX "bitblt" heap overflow. + - NE2000 "mtu" heap overflow. + - QEMU "net socket" heap overflow. + - QEMU NE2000 "receive" integer signedness error. + - Infinite loop in the emulated SB16 device. + - Unprivileged "aam" instruction does not correctly handle the + undocumented divisor operand. + - Unprivileged "icebp" instruction will halt emulation. + * Include patch which defaults to existing behaviour (probing based on file + contents), so it still requires the mgmt app (e.g. libvirt xml) to + pass a new "format=raw" parameter for raw disk images + - Fixes possible privilege escalation, which could allow guest users + to read arbitrary files on the host by modifying the header to identify + a different format (Closes: #481204) Fixes: CVE-2008-2004 + + -- Steffen Joeris Tue, 20 May 2008 13:28:14 +0000 + +kvm (66+dfsg-1) unstable; urgency=low + + * New upstream release + * Update upstream changelog + * Ship the userspace utilities + - Depend on python for the scripts + + -- Jan Lübbe Thu, 17 Apr 2008 22:23:14 +0200 + +kvm (65+dfsg-2) unstable; urgency=low + + * Install PXE boot ROMs only if they exists and Build-Depend on + etherboot only on i386 + - This allows building on amd64 (closes: #469125) + * Disable qemu CPU emulation and drop Build-Depend on gcc-3.4 + (closes: #440430) + * Don't Recommend qemu (we ship qemu-img as kvm-img) + * Move vde2 from Recommends to Suggests + * Suggest samba for the -smb option (closes: #474209) + + -- Jan Lübbe Thu, 10 Apr 2008 22:52:26 +0200 + +kvm (65+dfsg-1) unstable; urgency=low + + * New upstream release + * Update upstream changelog + * Put the link to ../packages/default.sh into /usr/share/modass/overrides/ + as suggested by m-a's HOWTO-DEVEL + - This also avoides a Conflicts/Replaces against older kvm packages + (closes: #473910) + + -- Jan Lübbe Tue, 08 Apr 2008 18:49:34 +0200 + +kvm (64+dfsg-1) unstable; urgency=low + + * New upstream release + * Update upstream changelog + * Build-Depend on device-tree-compiler and build bamboo.dtb from source + * Clean up debian/rules + * Drop patch included upstream (02_snapshot_use_tmpdir.patch) + + -- Jan Lübbe Tue, 01 Apr 2008 17:21:14 +0200 + +kvm (63+dfsg-2) unstable; urgency=low + + * Depend on libncurses5-dev to allow the curses interface in addition + to SDL (closes: #471292) + * Use 02_snapshot_use_tmpdir from debian qemu svn r298 (closes: #470757) + * Correct my name in debian/control + + -- Jan Lübbe Wed, 26 Mar 2008 22:18:43 +0100 + +kvm (63+dfsg-1) unstable; urgency=low + + * New upstream release + * Update upstream changelog (from mailing list) + * Fix CVE-2008-0928 using the patch in the bugreport (closes: #469666) + + -- Jan Lübbe Tue, 11 Mar 2008 10:48:29 +0100 + +kvm (62+dfsg-3) unstable; urgency=low + + * Build a kvm-data package for the files loaded into the VM + (closes: #469125) + + -- Jan Luebbe Fri, 07 Mar 2008 00:15:56 +0100 + +kvm (62+dfsg-2) unstable; urgency=low + + * Use PXE boot ROMs from the Etherboot package + + -- Jan Luebbe Sat, 01 Mar 2008 17:33:00 +0100 + +kvm (62+dfsg-1) unstable; urgency=low + + * New upstream release + - even more resolutions for -std-vga (closes: #463629) + * Update upstream changelog + + -- Jan Luebbe Fri, 29 Feb 2008 21:51:02 +0100 + +kvm (1:62+dfsg-0ubuntu7) hardy; urgency=low + + * Revert sighandler.patch and virtio_hang.patch. Fixes hang in installer and + likely other places, too. (LP: #217815) + + -- Soren Hansen Tue, 22 Apr 2008 19:09:33 +0200 + +kvm (1:62+dfsg-0ubuntu6) hardy; urgency=low + + * vmport_save_regs.patch: + - Only save and restore eax, ebx, ecx, edx, esi, and edi registers in + vmport_ioport_read. + (LP: #219165) + + -- Soren Hansen Sat, 19 Apr 2008 01:47:15 +0200 + +kvm (1:62+dfsg-0ubuntu5) hardy; urgency=low + + * sighandler.patch: + - Fix segfault when trying to suspend domain. (LP: #218204) + + -- Soren Hansen Wed, 16 Apr 2008 15:49:47 +0200 + +kvm (1:62+dfsg-0ubuntu4) hardy; urgency=low + + * virtio_hang.patch: + - Fix a vcpu hang when using virtio-blk in guests. + + -- Soren Hansen Sun, 13 Apr 2008 23:08:47 +0200 + +kvm (1:62+dfsg-0ubuntu3) hardy; urgency=low + + [ Jamie Strandboge ] + * debian/patches/SECURITY_CVE-2007-1320+1321+1322+1366+2893.patch + based on 90_security.patch from qemu 0.9.1-1ubuntu1. Please note that + CVE-2007-2893 is also known as CVE-2007-1323, and CVE-2007-5729 and + CVE-2007-5730 are known as CVE-2007-1321 in Debian. This patch addresses + the following: + - Cirrus LGD-54XX "bitblt" heap overflow. + - NE2000 "mtu" heap overflow. + - QEMU "net socket" heap overflow. + - QEMU NE2000 "receive" integer signedness error. + - Infinite loop in the emulated SB16 device. + - Unprivileged "aam" instruction does not correctly handle the + undocumented divisor operand. + - Unprivileged "icebp" instruction will halt emulation. + * debian/patches/SECURITY_CVE-2008-0928.patch: perform range checks on + block device read and write requests + * References + CVE-2007-1320 + CVE-2007-1321 + CVE-2007-1322 + CVE-2007-1323 + CVE-2007-1366 + CVE-2007-2893 + CVE-2007-5729 + CVE-2007-5730 + CVE-2008-0928 + + [ Soren Hansen ] + * debian/patches/extboot-geometry.patch: + - Apply extboot patch from Anthony Liguori that fixes CHS information + being calculated incorrectly, which seems to upset grub from time to time. + + -- Soren Hansen Thu, 10 Apr 2008 16:35:09 +0000 + +kvm (1:62+dfsg-0ubuntu2) hardy; urgency=low + + * Re-disable unaccelerated execution (thus re-removing gcc-3.4 build- + dependency). + + -- Soren Hansen Wed, 05 Mar 2008 08:48:44 +0100 + +kvm (1:62+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Soren Hansen Tue, 26 Feb 2008 13:10:57 -0500 + +kvm (61+dfsg-1) unstable; urgency=low + + * The "Live from FOSDEM" release + * New upstream release + * Update upstream changelog + * Drop dependency on vgabios + * Switch to git for packaging, update Vcs-* in debian/control + + -- Jan Luebbe Sat, 23 Feb 2008 17:22:29 +0100 + +kvm (60+dfsg-1) unstable; urgency=low + + * New upstream release + * Update upstream changelog + * Drop restore-IO_MEM_ROM-mark.patch (included upstream) + * Build and use the vgabios shipped with kvm (closes: #462434) + * Use install_linux_boot.patch from Ubuntu to fix the -kernel option + (closes: #412022) + + -- Jan Luebbe Fri, 25 Jan 2008 16:12:41 +0100 + +kvm (1:60+dfsg-0ubuntu2) hardy; urgency=low + + * Make installs succeed regardless of the init script's exit code. (LP: + #183663) + * Disable non-accelerated execution. + * Fixed up the clean target in debian/rules to properly clean up after + ourselves. + * Dropped build-dependency on gcc-3.4. + + -- Soren Hansen Wed, 20 Feb 2008 17:41:11 +0100 + +kvm (1:60+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release. + + -- Soren Hansen Wed, 23 Jan 2008 10:38:11 +0100 + +kvm (1:59+dfsg-0ubuntu6) hardy; urgency=low + + * Removed 08_default_tdf.patch. No longer needed. + * Modify init script to not exit with an error when stopping if the module + isn't loaded (LP: #183663). + * Use the correct names for the modules in init script. + + -- Soren Hansen Fri, 18 Jan 2008 19:12:26 +0100 + +kvm (1:59+dfsg-0ubuntu5) hardy; urgency=low + + * Added *updated* patch to support extended key events in qemu's vnc + implementation. + + -- Soren Hansen Sun, 13 Jan 2008 21:13:33 +0100 + +kvm (1:59+dfsg-0ubuntu4) hardy; urgency=low + + * Added patch to support extended key events in qemu's vnc implementation. + * s/log_error_msg/log_failure_msg/ in init script. + * Don't bother calling kvm.init stop/start on upgrade. + + -- Soren Hansen Sun, 13 Jan 2008 20:46:59 +0100 + +kvm (1:59+dfsg-0ubuntu3) hardy; urgency=low + + * Add init script to load kvm modules. (LP: #104297) + * Install linux_boot.bin to enable -kernel option. (LP: #111884) + + -- Soren Hansen Tue, 08 Jan 2008 16:26:05 +0100 + +kvm (1:59+dfsg-0ubuntu2) hardy; urgency=low + + * Cherry pick 6b8bb99a9cde386d72b4b7c22b92f4bdec333dab from git to + probably fix LP: 180105, and certainly fix an issue on Intel hardware + due to incompatible changes to the kernel API. + + -- Soren Hansen Fri, 04 Jan 2008 03:20:57 +0100 + +kvm (1:59+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release + * Build with alsa support (cherry pick from 57+dfsg-2) + + -- Soren Hansen Thu, 03 Jan 2008 10:39:25 +0100 + +kvm (58+dfsg-2) unstable; urgency=low + + * Use patch from kvm-devel list to fix booting with some linux kernels + (closes: #458481) + + -- Jan Luebbe Mon, 21 Jan 2008 11:20:17 +0100 + +kvm (58+dfsg-1) unstable; urgency=low + + * The "Live from 24c3 in Berlin" release + * New upstream release (closes: #452392) + * Update upstream changelog + * Update to policy version 3.7.3 (no changes needed) + + -- Jan Luebbe Sat, 29 Dec 2007 00:00:44 +0100 + +kvm (57+dfsg-2) unstable; urgency=low + + * Build with alsa support (closes: #457536) + + -- Jan Luebbe Sun, 23 Dec 2007 20:15:30 +0100 + +kvm (57+dfsg-1) unstable; urgency=low + + * New upstream release (closes: #457061) + - qemu has been updated to the current cvs version + * Update upstream changelog + + -- Jan Luebbe Thu, 20 Dec 2007 17:14:05 +0100 + +kvm (1:57+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release. + + -- Soren Hansen Tue, 18 Dec 2007 18:15:54 +0100 + +kvm (56+dfsg-1) unstable; urgency=low + + * New upstream release + * Update upstream changelog + + -- Jan Luebbe Wed, 19 Dec 2007 20:27:19 +0100 + +kvm (1:56+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream version. + * Merge changes from 55+dfsg-2. + + -- Soren Hansen Tue, 18 Dec 2007 09:36:20 +0100 + +kvm (55+dfsg-2) unstable; urgency=low + + * Depend on libgnutls for VNC TLS support + * Build BIOS from kvm sources (kvm and qemu patchs are different, thanks to + Carlo Marcelo Arenas Belon for spotting this) + * Fix debian/rules clean + + -- Jan Luebbe Sat, 08 Dec 2007 19:45:45 +0100 + +kvm (1:55+dfsg-1ubuntu1) hardy; urgency=low + + * Merge with Debian. Remaining changes: + - debian/control: + - Demote kvm-source to Suggests + - Mention kvm-source is unnecessary + - Modify Maintainer value to match the DebianMaintainerField + specification. + - Depend on recent bochsbios-qemu. + - Moved Vcs-* to XS-Original-Vcs-*. + - Don't recommend linux-image-2.6 since Ubuntu is Linux 2.6 only anyway. + - Rename suggestions of linux-{headers,source} to Ubuntu's naming scheme. + - Add pkg-config to Build-Depends (fixes warning during build) + - Add 08_default_tdf.patch to make -tdf the default. + + -- Soren Hansen Mon, 10 Dec 2007 13:43:03 +0100 + +kvm (55+dfsg-1) unstable; urgency=low + + * New upstream release + * Include cpu information also for bugs against kvm-source + * Update upstream changelog + * Remove bios.bin from upstream tarball (closes: #452963) and depend on the + current version of bochsbios + + -- Jan Luebbe Fri, 07 Dec 2007 19:22:57 +0100 + +kvm (54+dfsg-1) unstable; urgency=low + + * New upstream release + * Revive get-orig-source to remove other BIOS files (see #452963). + Thanks Soren Hansen. + * Include upstream changelog from the wiki. + * Update README.Debian and mention the kvm modules distributed with + the Linux kernel (closes: #440790) + + -- Jan Luebbe Thu, 29 Nov 2007 14:40:23 +0000 + +kvm (1:54+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release. + + -- Soren Hansen Tue, 04 Dec 2007 09:06:33 +0100 + +kvm (53-1) unstable; urgency=low + + * New upstream release + * Upstream has removed the elpin BIOS files, stop repacking the tarball. + + -- Jan Luebbe Wed, 21 Nov 2007 16:53:51 +0100 + +kvm (1:53+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release + * Properly clean out all the blobs from the tarball in get-orig-source. + * Depend on bochsbios-qemu and vgabios to get the needed blobs from there + instead. + + -- Soren Hansen Mon, 26 Nov 2007 12:09:12 +0100 + +kvm (52+dfsg-1) unstable; urgency=low + + * New upstream release + * Switch to Vcs-Svn and Vcs-Browser in debian/control + + -- Jan Luebbe Thu, 15 Nov 2007 18:47:41 +0100 + +kvm (1:52+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release. + * 08_default_tdf.patch + - Make -tdf the default and add a -no-tdf option. + + -- Soren Hansen Thu, 15 Nov 2007 02:21:55 +0100 + +kvm (1:48+dfsg-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #161790, LP: #149785). + * Remaining Ubuntu changes: + + Add epoch + + debian/preinst: + - Remove code to delete never-in-Ubuntu conf file + + debian/control: + - Demote kvm-source to Suggests + - Mention kvm-source is unnecessary + - Add epoch to Conflicts + + debian/patches/from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch + - USB path /proc/bus/usb => /dev/bus/usb + + debian/rules: + - Call dh_installudev + * New changes: + + debian/control: + - Remove Debian's VCS fields: that's not where the Ubuntu packages are + maintained. + + -- Christopher James Halse Rogers Sat, 10 Nov 2007 17:42:58 +1100 + +kvm (48+dfsg-1) unstable; urgency=low + + * Adopt package with Baruch Even's permission + * New upstream release + + -- Jan Luebbe Thu, 25 Oct 2007 11:15:54 +0200 + +kvm (46+dfsg-0.1) unstable; urgency=low + + * Non-maintainer upload (low threshold nmu) + * New upstream release + * Adapt sf-get-orig-source from gnome-pkg-tools + * Repackage tarball to remove elpin VGA bios (closes: #440472) + * Add debian/watch file + + -- Jan Luebbe Sun, 14 Oct 2007 12:02:54 +0200 + +kvm (36-0.1) unstable; urgency=low + + * Non-maintainer upload (with permission) + * New upstream release (closes: #438412) + * Update patches + * Install documentation from qemu to /usr/share/doc/kvm to avoid conflicts + and refer to it from kvm(1) (closes: #434729) + * Rename conflicting manpages + * Add texi2html as a Build-Dependency + * Make module-assistant a Dependency of kvm-source because it is needed by + it's debian/rules + * debian/conffiles is not necessary for /etc + + -- Jan Luebbe Mon, 27 Aug 2007 18:45:36 +0200 + +kvm (1:28-4ubuntu3) hardy; urgency=low + + * debian/patches/from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch: + + Fixes broken USB device access since /proc/bus/usb/devices was replaced by + /dev/bus/usb/devices. (LP #156085) + + -- TJ Mon, 29 Oct 2007 13:00:00 +0000 + +kvm (1:28-4ubuntu2) gutsy; urgency=low + + * debian/rules: + + Call dh_installudev again (LP #127704). We have a slightly different + udev policy to Debian. + * debian/preinst: + + Remove code to delete old kvm.rules file. The file it references was + never in the Ubuntu packages, and we use dh_installudev now. + * debian/control: + + Demote the Recommends on kvm-source to Suggests. kvm works with the + kernel modules we ship, so the kvm-source package doesn't add much. + + -- Christopher James Halse Rogers Sat, 29 Sep 2007 18:53:27 +1000 + +kvm (1:28-4ubuntu1) gutsy; urgency=low + + * Merge from Debian Unstable (LP: #119254, #122113). + * Remaining Ubuntu Changes: + + Add epoch + + debian/control + - Mention that the kvm-source package is unnecessary. + * Add epoch to the Conflicts + + -- Christopher James Halse Rogers (RAOF) Mon, 25 Jun 2007 22:49:27 +1000 + +kvm (28-4) unstable; urgency=low + + * Divert kernel modules when installing the kvm-source modules + (Closes: #429851) + * kvm-ifup, even if bridge command failed continue to work, this will allow + users who have no bridge setup and intend to setup some other method to + get it to work without messing with the package files. (Closes: #407459) + + -- Baruch Even Thu, 21 Jun 2007 12:37:54 +0100 + +kvm (28-3) unstable; urgency=low + + * Fix infinite loop in kvm-ifup script + + -- Baruch Even Mon, 18 Jun 2007 20:51:50 +0100 + +kvm (28-2) unstable; urgency=low + + * We moved a file from kvm-source to kvm, to be able to properly upgrade we + specify a conflict against older versions (Closes: #417652) + * Fix kvm-ifup script to work in more conditions (Closes: #417151) + * Remove old /etc/udev/kvm.rules since it's not needed (Closes: #414331) + + -- Baruch Even Sun, 17 Jun 2007 21:13:07 +0100 + +kvm (28-1) unstable; urgency=low + + * New upstream release (Closes: #422197) + - Should fix oops (Closes: #418928) + * kqemu is no longer in non-free (Closes: #419152) + + -- Baruch Even Sun, 17 Jun 2007 10:32:40 +0100 + +kvm (18-1) unstable; urgency=low + + * New upstream release (Closes: #416926) + * Move the module-assistant script to the kvm package from kvm-source so all + users will benefit from the integration (Closes: #416122) + * Remove patch to add qemu-ifup and kvm initscript, they are now part of kvm directly. + + -- Baruch Even Sat, 31 Mar 2007 21:00:34 +0300 + +kvm (1:16-1ubuntu2) feisty; urgency=low + + * Revert to kvm-16 to match released kernel. + * Add epoch. + + -- Ben Collins Sun, 15 Apr 2007 17:52:01 -0400 + +kvm (16-1ubuntu1) feisty; urgency=low + + * New upstream. + + -- Ben Collins Wed, 14 Mar 2007 00:33:11 -0400 + +kvm (15-1ubuntu1) feisty; urgency=low + + * New upstream. + + -- Ben Collins Thu, 1 Mar 2007 22:15:02 -0500 + +kvm (14-1) unstable; urgency=medium + + [ Leonard Norrgård ] + * New upstream version. KVM is now based on qemu-0.9.0. + * Suggest etherboot and actually suggest hal (was only mentioning it). + * Update copyright info. + * Add a couple of patches from Debian qemu: 22_net_tuntap_stall.patch, + 04_do_not_print_rtc_freq_if_ok.patch, 62_linux_boot_nasm.patch (62_* + currently only to avoid a buildd FTBS problem). + * Reorder the first two paragraphs in the description for kvm so the + general description is first, the more technical second. + * Moved adduser to Pre-Depends, as we rely on it for installation. + * For a detailed changelog, please see: + svn log -v -r 2227:2383 svn://svn.debian.org/svn/collab-maint/ext-maint/kvm/trunk + + [ Baruch Even ] + * Update the uploader name of Leonard so that lintian won't think it's an + NMU. + * Add XS-Vcs-Browser field + + -- Baruch Even Sat, 24 Feb 2007 17:43:42 +0200 + +kvm (13-1) UNRELEASED; urgency=low + + * New upstream version. + + -- Leonard Norrgård Sat, 10 Feb 2007 07:40:59 +0200 + +kvm (12-1) unstable; urgency=high + + * New upstream version. Most important upstream changes: + - Attempting to reboot Linux guest no longer reboots host on AMD, + actual guest reboot still not possible. + - The option -no-acpi is no longer required to install Windows + (the option is still recommended as the Windows ACPI HAL will + eat a lot of cpu time). + + -- Leonard Norrgard Sun, 23 Jan 2007 18:54:17 +0200 + +kvm (11-2) unstable; urgency=low + + [ Baruch Even ] + * Make the quilt include part conditional so we don't have to have it when + building the kernel module. (Closes: #407447, #407482) + * Do not recommend linux-image-2.6 in kvm-source, and move linux-headers-2.6 + from depends to suggests where it belongs. The package can build from + vanilla kernels as well as Debian kernels. (Closes: #407729) + + [ Leonard Norrgard ] + * Enhance manual page a bit. + + -- Baruch Even Sun, 21 Jan 2007 09:05:38 +0200 + +kvm (11-1) unstable; urgency=high + + * New upstream version. Closes #406800, #406275, #404075. + * This version fixes many stability issues in earlier versions of KVM. + * Automatically create group kvm on installation of package kvm + * Added udev support to automatically set group kvm on /dev/kvm + * Added reportbug script (/usr/share/bug/kvm) so some info that + might be relevant gets included automatically. + * Tell module-assistant about the kvm-source package, so it shows up + in the module selection menu. + * Add information on building the modules using module-assistant. + * Add /etc/kvm/kvm-ifup script (conffile) to bring up the network for + the VM in a simpler way, see the manual page for kvm for description. + This used to be /etc/qemu-ifup, as installed by the qemu package. + * Depend on iproute, bridge-utils, used by kvm-ifup and the upcoming + /etc/init.d script. + * Remove non-x86 bios images - KVM is only meaningful for x86 guests. + * Keep KVM bios files in /usr/share/kvm, rather than sharing them with + other packages as the KVM bios is different (also avoids unexpected + bios updates). + * Don't depend on qemu, as we now keep our own bios. + * Recommend kvm-source, qemu (mostly for qemu-img), vde2 and linux-image-2.6. + * Suggest sudo and debootstrap. + * For kvm-source, depend on linux-headers-2.6 | linux-source-2.6, + recommend linux-image-2.6 and suggest module-assistant and + kernel-package. + * Use quilt to handle patches. + * More detailed package description for kvm, added Homepage:. + + -- Leonard Norrgard Sun, 14 Jan 2007 07:11:03 +0200 + +kvm (7-1) unstable; urgency=low + + * New upstream version + * Install the Intel and AMD modules (Closes: 402820) + + -- Baruch Even Wed, 13 Dec 2006 09:19:44 +0200 + +kvm (5-2) unstable; urgency=low + + * Yet another attempt to fix building on amd64. + + -- Baruch Even Wed, 6 Dec 2006 08:35:04 +0200 + +kvm (5-1) unstable; urgency=low + + * New upstream version + * Really fix building on amd64 (Closes: #400549) + + -- Baruch Even Wed, 6 Dec 2006 07:12:30 +0200 + +kvm (4-2) unstable; urgency=low + + * Allow build on amd64 arch, it really should mean Intel x86 64bit arches, + kvm still doesn't support AMD SVM instructions and requires the Intel + CPUs. (Closes: #400549) + + -- Baruch Even Tue, 28 Nov 2006 22:16:08 +0200 + +kvm (4-1) unstable; urgency=low + + * New upstream version. + + -- Baruch Even Tue, 21 Nov 2006 22:23:26 +0200 + +kvm (3-2) unstable; urgency=low + + * Use KERNEL_DIR variable when building the module to enable building a + module for a kernel that is not being run right now. (Closes: #399603) + * Add manpage that refers the user to qemu(1) where he can find all the + information he needs. + + -- Baruch Even Tue, 21 Nov 2006 09:22:57 +0200 + +kvm (3-1) unstable; urgency=low + + * New upstream version. + * Use upstream versioning of natural numbers. + * First upload to Debian (Closes: #398458) + + -- Baruch Even Wed, 15 Nov 2006 23:58:12 +0200 + +kvm (0.0.2-1) unstable; urgency=low + + * Initial release + + -- Baruch Even Tue, 14 Nov 2006 20:49:57 +0200 --- qemu-kvm-0.11.0.orig/debian/doc +++ qemu-kvm-0.11.0/debian/doc @@ -0,0 +1,2 @@ +qemu-tech.html +qemu-doc.html --- qemu-kvm-0.11.0.orig/debian/init +++ qemu-kvm-0.11.0/debian/init @@ -0,0 +1,69 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: qemu-kvm +# Required-Start: mountkernfs +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: KVM init script +# Description: This script loads the kernel modules needed by kvm +### END INIT INFO + +. /lib/lsb/init-functions + +# Figure out which module we need. +if grep -q ^flags.*\\\ /proc/cpuinfo +then + module=kvm_intel +elif grep -q ^flags.*\\\ /proc/cpuinfo +then + module=kvm_amd +else + module= +fi + +case "$1" in + start) + log_begin_msg "Loading kvm module $module" + if [ -z "$module" ] + then + log_end_msg 1 + exit 0 + fi + if modprobe "$module" + then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + stop) + if [ -z "$module" ] + then + exit 0 + fi + if lsmod | grep -q "$module" + then + log_begin_msg "Unloading kvm module $module" + if rmmod "$module" + then + rmmod kvm + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + fi + ;; + force-reload|restart) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: --- qemu-kvm-0.11.0.orig/debian/build-arm-chroot +++ qemu-kvm-0.11.0/debian/build-arm-chroot @@ -0,0 +1,74 @@ +#!/bin/sh + +# Copyright (c) 2009 Canonical +# Author: Oliver Grawert +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +set -e + +OPTS="--foreign" +SUITE="" +ROOT="" +ARCH="" +BIN="/usr/bin/qemu-arm-static" + +parse_options() +{ + while [ ! -z "$1" ]; do + case $1 in + --arch*) + ARCH="${1#*=}" + case $ARCH in + armel) + BIN="/usr/bin/qemu-arm-static" + ;; + *) + echo "E: unsupported architecture: $ARCH" + exit + ;; + esac + ;; + --*) + OPTS="${OPTS} $1" + ;; + *) + OPTS="${OPTS} $1" + if [ -z "${SUITE}" ]; then + SUITE="$1" + else + if [ -z "${ROOT}" ]; then + ROOT="$1" + fi + fi + ;; + esac + shift + done + if [ -z "${ARCH}" ]; then + ARCH="armel" + fi + OPTS="--arch=$ARCH ${OPTS}" +} + +# find PATH and check ARCH +parse_options "$@" + +# run first stage +sudo debootstrap $OPTS + +# run second stage +sudo cp $BIN $ROOT/usr/bin +sudo chroot $ROOT debootstrap/debootstrap --second-stage --- qemu-kvm-0.11.0.orig/debian/changelog.qemu +++ qemu-kvm-0.11.0/debian/changelog.qemu @@ -0,0 +1,1407 @@ +qemu (0.10.5-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #378556), remaining changes: + - debian/control: + + Recommends on openhackware, openbios-sparc. + + lpia build enablement. + + -- Andres Rodriguez Mon, 25 May 2009 15:02:09 -0500 + +qemu (0.10.5-1) unstable; urgency=low + + * New upstream version. + + -- Aurelien Jarno Sun, 24 May 2009 16:15:35 +0200 + +qemu (0.10.4-1) unstable; urgency=low + + * New upstream version. + * debian/NEWS.Debian: new file, describing the cache policy options + (closes: bug#526832). + * debian/patches/70_versatile_memsize.patch: new patch to set a upper + limit on the memory size of the versatile boards (closes: + bug#527264). + + -- Aurelien Jarno Tue, 12 May 2009 18:31:29 +0200 + +qemu (0.10.3-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #371879), remaining changes: + - debian/control: Recommends on openhackware, openbios-sparc; + lpia build enablement + + -- Andres Rodriguez Thu, 07 May 2009 11:35:18 -0500 + +qemu (0.10.3-1) unstable; urgency=low + + * New upstream version. + * Tighten dependency on bochsbios. + + -- Aurelien Jarno Sat, 02 May 2009 10:14:21 +0200 + +qemu (0.10.2-2) unstable; urgency=low + + * Add missing comma in build-depends (closes: bug#524207). + * Tighten dependency on vgabios. + + -- Aurelien Jarno Wed, 15 Apr 2009 22:30:43 +0200 + +qemu (0.10.2-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream stable release. + + -- Aurelien Jarno Tue, 07 Apr 2009 07:37:15 +0200 + +qemu (0.10.1-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream stable release: + - patches/80_stable-branch.patch: remove. + * debian/control: + - Remove depends on proll. + - Move depends on device-tree-compiler to build-depends. + - Bump Standards-Version to 3.8.1 (no changes). + * patches/82_qemu-img_decimal.patch: new patch from upstream to make + qemu-img accept sizes with decimal values (closes: bug#501400). + + -- Aurelien Jarno Sun, 22 Mar 2009 10:13:17 +0100 + +qemu (0.10.0-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #341237), remaining changes: + - debian/control: depend on bochsbios-qemu | bochsbios; recommend + proll, openhackware, openbios-sparc; lpia build enablement + + -- Dustin Kirkland Thu, 12 Mar 2009 12:35:38 -0500 + +qemu (0.10.0-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream release: + - Fix fr-be keyboard mapping (closes: bug#514462). + - Fix stat64 structure on ppc-linux-user (closes: bug#470231). + - Add a chroot option (closes: bug#415996). + - Add evdev support (closes: bug#513210). + - Fix loop on symlinks in user mode (closes: bug#297572). + - Bump depends on openbios-sparc. + - Depends on openbios-ppc. + - Update 12_signal_powerpc_support.patch. + - Update 21_net_soopts.patch. + - Drop 44_socklen_t_check.patch (merged upstream). + - Drop 49_null_check.patch (merged upstream). + - Update 64_ppc_asm_constraints.patch. + - Drop security/CVE-2008-0928-fedora.patch (merged upstream). + - Drop security/CVE-2007-5730.patch (merged upstream). + * patches/80_stable-branch.patch: add patches from stable branch: + - Fix race condition between signal handler/execution loop (closes: + bug#474386, bug#501731). + * debian/copyright: update. + * Compile and install .dtb files: + - debian/control: build-depends on device-tree-compiler. + - debian/patches/81_compile_dtb.patch: new patch from upstream. + - debian/rules: compile and install bamboo.dtb and mpc8544.dtb. + + -- Aurelien Jarno Sat, 07 Mar 2009 06:20:34 +0100 + +qemu (0.9.1+svn20090104-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + * Disable security/CVE-2008-0928-fedora.patch, it still breaks qcow + format. + + -- Aurelien Jarno Sun, 04 Jan 2009 16:31:40 +0100 + +qemu (0.9.1+svn20081223-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Fix CVE-2008-2382 + * Update patches/48_signal_terminate.patch. + * debian/rules: remove upstream flags from CFLAGS. + + -- Aurelien Jarno Tue, 23 Dec 2008 14:51:25 +0100 + +qemu (0.9.1+svn20081214-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Fix jmp im on x86_64 when executing 32-bit code. Fix grub + installation (Closes: bug#467148). + + -- Aurelien Jarno Sun, 14 Dec 2008 23:26:04 +0100 + +qemu (0.9.1+svn20081207-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Do not depend on gcc-3.4 anymore (Closes: bug#440425, bug#463066). + - Fix broken display introduced by CVE-2007-1320 (Closes: bug#422578). + * debian/control: remove build-dependency on gcc-3.4. + * debian/rules: remove code for dyngen targets. + * Split 90_security.patch into + - security/CVE-2007-5730.patch + - security/leftover.patch + * Replace 91_security.patch by security/CVE-2008-0928-fedora.patch taken + from fedora repository and enable it (Closes: #469649). + + [ Riku Voipio ] + * 2 patches gone, 19 to go: + - 10_signal_jobs.patch: drop, merged upstream + - 11_signal_sigaction.patch: drop, merged upstream + - series: update + + -- Aurelien Jarno Sun, 07 Dec 2008 19:40:09 +0100 + +qemu (0.9.1+svn20081128-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Include documentation for network downscript option (Closes: + bug#506994). + - Drop 00_bios.patch and pass --disable-blobs instead. + - Update 12_signal_powerpc_support.patch. + + [ Riku Voipio ] + * Drop 31_syscalls.patch as it makes no sense using host uselib to + load target code into qemu's host memoryspace. + + -- Aurelien Jarno Sat, 29 Nov 2008 09:04:41 +0100 + +qemu (0.9.1+svn20081112-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: add lpia to the Architectures list; + move proll, openhackware, and openbios-sparc from Depends to Recommends + - debian/patches/91_vmdk_compat6_scsi: add support for scsi disks to + vmdk images + - debian/patches/95_evdev_keycode_map.patch: ported the + gtk-vnc patch that fixes evdev keycode mapping + + -- Soren Hansen Sun, 23 Nov 2008 21:55:46 +0100 + +qemu (0.9.1+svn20081112-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - does not need a disk image anymore (Closes: bug#260935). + - 53_openbios_size.patch: drop (merged upstream). + - 90_security: update. + * debian/control: depend on openbios-sparc (>= 1.0~alpha2+20081109) + (Closes: bug#502411, bug#502414). + + -- Aurelien Jarno Sun, 09 Nov 2008 14:42:37 +0100 + +qemu (0.9.1+svn20081101-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - fix a heap overflow in Cirrus emulation (CVE-2008-4539). + - 50_linuxbios_isa_bios_ram.patch: update. + - 90_security.patch: update. + + -- Aurelien Jarno Sat, 01 Nov 2008 09:26:45 +0100 + +qemu (0.9.1+svn20081023-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - 12_signal_powerpc_support.patch: update. + - 50_linuxbios_isa_bios_ram.patch: update. + + -- Aurelien Jarno Thu, 23 Oct 2008 21:34:26 +0200 + +qemu (0.9.1+svn20081016-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + * patches/31_syscalls.patch: remove parts merged upstream. + * debian/qemu-make-debian-root: + - Fix bug introduced when fixing bug#496394 (Closes: bug#502325). + + -- Aurelien Jarno Mon, 13 Oct 2008 23:11:15 +0200 + +qemu (0.9.1+svn20081012-1) experimental; urgency=low + + [ Riku Voipio ] + * Add a bunch of patches from scratchbox + - 44_socklen_t_check work better with badbehavin net apps + - 48_signal_terminate make qemu binary terminate on signals as expected + - 49_null_checks don't bother some syscalls when null/zero is passed + + [ Aurelien Jarno ] + * New upstream snapshot. + - alpha is now a TCG target. + - comma has been added to sendkey (closes: bug#414342). + * patches/31_syscalls.patch: remove parts merged upstream. + * patches/39_syscall_fadvise64.patch: remove (merged upstream). + * patches/90_security.patch: remove parts merged upstream. + * debian/control: build-depends on libbluetooth-dev. + + -- Aurelien Jarno Sun, 12 Oct 2008 18:46:54 +0200 + +qemu (0.9.1+svn20080905-1) experimental; urgency=low + + * New upstream snapshot. + - SH4 is now a TCG target. + * debian/watch: update URL location. + + -- Aurelien Jarno Tue, 02 Sep 2008 01:43:24 +0200 + +qemu (0.9.1+svn20080826-1) experimental; urgency=low + + * New upstream snapshot. + * debian/qemu-make-debian-root: + - Use mktemp instead of $$ to create temporary directories (Closes: + bug#496394). + * Ship a libqemu-dev package (Closes: bug#451618). + + -- Aurelien Jarno Tue, 26 Aug 2008 09:55:36 +0200 + +qemu (0.9.1+svn20080822-1) experimental; urgency=low + + * New upstream snapshot. + - Focus to monitor to ask password (Closes: bug#473240). + - TCG SPARC host support (Closes: bug#450817). + - Check KQEMU availability before allocating memory (Closes: bug#414566). + - Fix dead keys (Closes: bug#489594). + - Fix ES1370 emulation (Closes: bug#494462). + - New USB UHCI implemnation (Closes: bug#457651). + - Add debian/patches/00_bios.patch. + - Remove debian/patches/02_snapshot_use_tmpdir.patch (merged). + - Remove debian/patches/04_do_not_print_rtc_freq_if_ok.patch (merged). + - Remove patches/05_non-fatal_if_linux_hd_missing.patch (merged). + - Update debian/patches/07_i386_exec_name.patch + - Update debian/patches/12_signal_powerpc_support.patch + - Remove debian/patches/33_syscall_ppc_clone.patch (merged differently). + - Remove debian/patches/41_arm_fpa_sigfpe.patch (merged). + - Remove debian/patches/42_arm_tls.patch (merged differently). + - Update debian/patches/55_unmux_socketcall.patch. + - Remove debian/patches/63_sparc_build.patch (useless). + - Update debian/patches/65_kfreebsd.patch. + - Update debian/patches/66_tls_ld.patch. + - Remove debian/patches/70_manpage.patch (merged). + - Remove debian/patches/71_doc.patch (merged). + - Remove debian/patches/80_ui_curses.patch (merged). + - Remove debian/patches/81_mips32r2_fpu.patch (merged). + - Remove debian/patches/82_mips_abs.patch (merged). + - Remove debian/patches/83_usb-serial.patch (merged). + - Remove debian/patches/84_rtl8139.patch (merged). + - Remove debian/patches/85_vvfat.patch (merged). + - Remove debian/patches/86_df.patch (merged). + - Remove debian/patches/87_eoi.patch (merged). + - Remove debian/patches/88_dma.patch (merged). + - Remove debian/patches/89_braille.patch (merged). + - Remove debian/patches/92_no_shutdown.patch (merged). + - Remove debian/patches/93_tmpfs.patch (merged). + - Remove debian/patches/94_security.patch (merged). + * debian/README.source: new file. + * debian/patches/*: convert to patchlevel 1 (Closes: bug#484963). + * debian/control: + - Add build-depends on libesd0-dev. + - Add build-depends on libpulse-dev. + - Add build-depends on libvdeplug2-dev. + - Add build-depends on etherboot. + - Update list of supported targets (Closes: bug#488339). + - Suggests kqemu-source. + - Bump Standards-Version to 3.8.0. + * debian/links: + - Add missing manpage symlinks. + * debian/rules: + - Enable audio drivers depending on the system. + - Enable DYNGEN targets depending on the system. + - Install PXE bios from etherboot (Closes: bug#412010). + - Don't ignore make clean errors. + - Don't build DYNGEN targets on kfreebsd-amd64 (Closes: bug#494353). + * debian/patches/22_net_tuntap_stall.patch: remove (outdated). + + -- Aurelien Jarno Fri, 22 Aug 2008 01:00:54 +0200 + +qemu (0.9.1-7ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: add lpia to the Architectures list; + move proll, openhackware, and openbios-sparc from Depends to Recommends + - debian/patches/91_vmdk_compat6_scsi: add support for multiple + compatiblity levels and scsi disks to vmdk images + - debian/patches/95_evdev_keycode_map.patch: ported the + gtk-vnc patch that fixes evdev keycode mapping + - debian/patches/96_dirent.patch: fix FTBFS error, including the wrong + dirent.h, matches qemu SVN + + -- Dustin Kirkland Thu, 20 Nov 2008 18:10:36 -0600 + +qemu (0.9.1-5ubuntu3) intrepid; urgency=low + + * debian/patches/95_evdev_keycode_map.patch: ported the + gtk-vnc patch that fixes evdev keycode mapping (LP: #258389) + * debian/patches/96_dirent.patch: fix FTBFS error, including the wrong + dirent.h, matches qemu SVN + * debian/patches/series: added 95_evdev_keycode_map.patch and + 96_dirent.patch + + -- Dustin Kirkland Wed, 24 Sep 2008 20:00:59 -0500 + +qemu (0.9.1-5ubuntu2) intrepid; urgency=low + + * Added lpia to the Architectures list (LP: #232062) + + -- Emmet Hikory Mon, 11 Aug 2008 13:01:16 +0900 + +qemu (0.9.1-5ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + Depend on bochsbios-qemu >= 2.3.5-1ubuntu1 or bochsbios >= + 2.3.6-2ubuntu1 to get the proper BIOS image. + + Move proll, openhackware, and openbios-sparc from Depends to Recommends + + Add support for generating SCSI vmdk images. + * Rename Vcs-* to XS-Debian-Vcs-* + + -- Nicolas Valcárcel Wed, 23 Jul 2008 02:32:58 -0500 + +qemu (0.9.1-5) unstable; urgency=high + + [ Guillem Jover ] + * Add Homepage field. + * Add Vcs-Browser and Vcs-Svn fields. + * Remove packaging repository information from debian/copyright. + * Add former package co-maintainers to debian/copyright. + * Serialize patch and configure steps in debian/rules to support parallel + builds, as we are patching configure. + * Remove myself from Uploaders. + + [ Aurelien Jarno ] + * debian/patches/70_manpage.patch: remove curses documentation, it is already + in debian/patches/80_ui_curses.patch (Closes: bug#477369). + * debian/patches/94_security.patch: add format= to drive options + (CVE-2008-2004). + + -- Aurelien Jarno Mon, 28 Apr 2008 21:54:12 +0200 + +qemu (0.9.1-4) unstable; urgency=high + + * debian/patches/52_ne2000_return.patch: drop, the patch is wrong. + * Backports from upstream: + - Typo in curses_keys.h + - Documentation for the -curses option + - Fix broken absoluteness check for cabs.d.*. + - USB-to-serial device. + - rtl8139: fix endianness on big endian targets + - restore rw support for vvfat + - x86-64: recompute DF after eflags has been modified when emulating + SYSCALL + - ignore reads to the EOI register + - IDE: Improve DMA transfers by increasing the buffer size + - Braille device support + - Add -no-shutdown option (Closes: #326406) + - Ask to use "mount -o remount" instead of "umount" and "mount" + /dev/shm (Closes: #476539). + * debian/qemu.doc-base: fix section. + + -- Aurelien Jarno Sun, 20 Apr 2008 23:29:42 +0200 + +qemu (0.9.1-3) unstable; urgency=low + + [ Aurelien Jarno ] + * debian/patches/42_arm_tls.patch: fix to get qemu-system-arm working + again. (Closes: #471722). + * debian/patches/56_dhcp.patch: fix DHCP server to correctly support + MS-Windows guests. (Closes: #471452). + + -- Aurelien Jarno Wed, 19 Mar 2008 18:58:29 +0100 + +qemu (0.9.1-2) unstable; urgency=low + + [ Aurelien Jarno ] + * debian/patches/80_ui_curses.patch: pull new patch from upstream CVS + (Closes: #442274). + * debian/patches/65_kfreebsd.patch: link with -lfreebsd. (Closes: + #465932). + * debian/patches/81_mips32r2_fpu.patch: patch pulled from upstream + to fix FPU issue on MIPS32R2. + * debian/patches/42_arm_tls.patch: reenable, mistakenly disabled in the + previous upload. (Closes: #469743). + * debian/rules: fix parallel building. (Closes: #469981). + * debian/patches/07_i386_exec_name.patch: install the i386 emulator as + qemu-system-i386, and change qemu into a link pointing to the i386 + version. + * debian/README.Debian: add notes about qemu-system-ppc and video.x + (Closes: #388735). + * debian/patches/70_manpage.patch: describe the -curses option. + (Closes: #433658). + * debian/patches/71_doc.patch: fix the monitor change option. (Closes: + #467106). + * debian/patches/35_syscall_sockaddr.patch: fix sockaddr (Closes: + #469351). + * debian/patches/43_arm_cpustate.patch: disable (Closes: #444171). + + -- Aurelien Jarno Mon, 17 Mar 2008 01:29:03 +0100 + +qemu (0.9.1-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #190681), remaining changes: + - debian/control: + + Depend on bochsbios-qemu >= 2.3.5-1ubuntu1 or bochsbios >= + 2.3.6-2ubuntu1 to get the proper BIOS image. + + Move proll, openhackware, and openbios-sparc from Depends to Recommends. + + Add support for generating SCSI vmdk images. + + DebianMaintainerField. + + -- Soren Hansen Wed, 13 Feb 2008 02:13:56 +0100 + +qemu (0.9.1-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream version. (Closes: #459801) + - Supports s390 host. (Closes: #441119) + - Fix PCI bar allocation. (Closes: #413315) + - Fix typo in keys name. (Closes: #426181) + - Fix segfault of qemu-i386 (Closes: #446868). + - debian/control: bump depends on openbios-sparc to + >= 1.0~alpha2+20080106. + - debian/patches/02_snapshot_use_tmpdir.patch: Refreshed. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/06_exit_segfault.patch: Likewise. + - debian/patches/10_signal_jobs.patch: Likewise. + - debian/patches/11_signal_sigaction.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_soopts.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/41_arm_fpa_sigfpe.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/50_linuxbios_isa_bios_ram.patch: Likewise + - debian/patches/51_linuxbios_piix_ram_size.patch: Likewise + - debian/patches/61_safe_64bit_int.patch: Removed, merged upstream. + - debian/patches/63_sparc_build.patch: Refreshed. + - debian/patches/80_ui_curses.patch: Likewise. + * debian/patches/90_security.patch: fix 64-bit overflow. (Closes: + #425634) + * debian/qemu-make-debian-root: add a -s option to create sparse + image. (Closes: #322325) + * debian/control: bump depends on bochsbios to >= 2.3.5-1. Use + BIOS-qemu-latest instead of BIOS-bochs-latest. (Closes: #402289, + #442822) + * debian/rules: build the non-dyngen part with default gcc. + * debian/rules: support DEB_BUILD_OPTIONS="parallel=n". + * debian/patches/70_manpage.patch: describe the arguments of the + -usbdevice option in the manpage. (Closes: #443801) + * debian/control: now using Standards-Version 3.7.3 (no changes needed). + * debian/control: build-depends on libgnutls-dev to enable TLS support + in VNC. + * debian/patches/01_nostrip.patch: don't strip binaries during make + install. (Closes: #437866) + * debian/patches/53_openbios_size.patch: increase maximum prom size to + support latest openbios. + + -- Aurelien Jarno Mon, 28 Jan 2008 21:24:14 +0100 + +qemu (0.9.0+20070816-1ubuntu3) hardy; urgency=low + + * Updated bios symlink to match new bochsbios-qemu package. + * Added versioned dependency on bochsbios-qemu to make sure the + image has been renamed. + + -- Soren Hansen Mon, 10 Dec 2007 12:35:43 +0100 + +qemu (0.9.0+20070816-1ubuntu2) hardy; urgency=low + + * Use new qemu specific bios from bochsbios. (LP: #123185) + + -- Soren Hansen Fri, 23 Nov 2007 17:27:03 +0100 + +qemu (0.9.0+20070816-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/91_vmdk_compat6_scsi: + + Add support for multiple compatiblity levels and scsi disks to + vmdk images. + - debian/control: + + Move proll and openhackware from Depends to Recommends. + * Move openbios-sparc from Depends to Recommends. + + -- Soren Hansen Mon, 22 Oct 2007 17:07:29 +0200 + +qemu (0.9.0+20070816-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream snapshot. + - Fix hang on ARM during Etch installation. (Closes: #430164) + - Fix data corruption with qcow 2. (Closes: #440296) + - Fix errors with raw images > 4 GiB. (Closes: #425634) + - debian/patches/01_typo_qemu-img.patch: Removed, merged upstream. + - debian/patches/03_machines_list_no_error.patch: Likewise. + - debian/patches/36_syscall_prctl.patch: Likewise. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/38_syscall_semctl.patch: Likewise. + - debian/patches/40_sparc_fp_to_int.patch: Likewise. + - debian/patches/44_arm_eabi_built_on_64bit_arches.patch: Likewise. + - debian/patches/62_linux_boot_nasm.patch: Likewise. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Synced. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/43_arm_cpustate.patch: Likewise. + - debian/patches/51_linuxbios_piix_ram_size.patch: Likewise. + - debian/patches/55_unmux_socketcall.patch: Likewise. + - debian/patches/60_ppc_ld.patch: Likewise. + - debian/patches/65_kfreebsd.patch: Likewise. + - debian/patches/80_ui_curses.patch: Likewise. + - debian/patches/90_security.patch: Likewise. + * Remove Elrond and Guilherme de S. Pastore from Uploaders, with their + permission, and add Aurelien Jarno and Riku Voipio. + * Remove Tag field, this is better maintained outside of the package. + * Add openbios-sparc64 to qemu_bios_files in debian/rules. + + [ Aurelien Jarno ] + * Fix FTBFS on amd64. (Closes: #434296) + - Drop debian/patches/34_syscalls_types.patch + * debian/control: + - Suggest samba. (Closes: #430368) + * Add OpenBIOS for sparc. (Closes: #407076) + - debian/control: depends on openbios-sparc. + - debian/links: provide symlinks in /usr/share/qemu. + + -- Guillem Jover Tue, 04 Sep 2007 04:04:47 +0300 + +qemu (0.9.0-2ubuntu4) gutsy; urgency=low + + * Renamed debian/patches/91_compat6.patch to + debian/patches/91_vmdk_compat6_scsi.patch and added support for creating + SCSI type vmdk images. + + -- Soren Hansen Tue, 25 Sep 2007 11:15:26 +0200 + +qemu (0.9.0-2ubuntu3) gutsy; urgency=low + + * Fix typo in debian/patches/91_compat6.patch that broke qemu-img convert. + + -- Soren Hansen Fri, 21 Sep 2007 19:54:32 +0200 + +qemu (0.9.0-2ubuntu2) gutsy; urgency=low + + * debian/patches/91_compat6.patch: + - Add support for VMWare Workstation 6 virtual disks. + + -- Soren Hansen Fri, 14 Sep 2007 10:44:05 +0200 + +qemu (0.9.0-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Remove 34_syscalls_types.patch from debian/patches/series: add an + unnecessary kernel header breaking compilation of linux-user/syscall.c. + - Move proll and openhackware from Depends to Recommends. + + -- Andrea Veri Mon, 21 May 2007 04:24:55 +0200 + +qemu (0.9.0-2) unstable; urgency=high + + [ Guillem Jover ] + * Fix several security issues. (Closes: #424070) + Thanks to Tavis Ormandy . + - Cirrus LGD-54XX "bitblt" heap overflow. CVE-2007-1320 + - NE2000 "mtu" heap overflow. + - QEMU "net socket" heap overflow. + - QEMU NE2000 "receive" integer signedness error. CVE-2007-1321 + - Infinite loop in the emulated SB16 device. + - Unprivileged "aam" instruction does not correctly handle the + undocumented divisor operand. CVE-2007-1322 + - Unprivileged "icebp" instruction will halt emulation. CVE-2007-1322 + - debian/patches/90_security.patch: New file. + * Enable adlib audio emulation. (Closes: #419170) + * Fix structure padding for target_eabi_flock64 when built for a 64 bit + architecture. (Closes: #414799) + Thanks to Stuart Anderson . + - debian/patches/44_arm_eabi_built_on_64bit_arches.patch: New file. + * Fix qemu to be able to use LinuxBios. (Closes: #412212) + Thanks to Ed Swierk . + - debian/patches/50_linuxbios_isa_bios_ram.patch: New file. + - 51_linuxbios_piix_ram_size.patch: Likewise. + * Fix segfault when booting a Linux kernel w/o a disk image, by exiting but + clarifying the message, as to use '/dev/null'. (Closes: #409817, #411780) + Thanks to Robert Millan . + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Updated. + * Fix segfault by using addrlen instead of target_addrlen in + do_getpeername()/do_getsockname(). (Closes: #411910) + Thanks to Stuart Anderson . + - debian/patches/35_syscall_sockaddr.patch: Updated. + * Fix semctl() for 32 bit targets on 64 bit hosts. (Closes: #414809) + Thanks to Stuart Anderson . + - debian/patches/38_syscall_semctl.patch: New file. + * Remove Elrond from Uploaders with consent, always welcome to join + back anytime. + + -- Guillem Jover Wed, 16 May 2007 08:08:31 +0300 + +qemu (0.9.0-1ubuntu1) gutsy; urgency=low + + * merged from Debian/experimental + * Merge from debian unstable, remaining changes: + - Remove 34_syscalls_types.patch from debian/patches/series: add an + unnecessary kernel header breaking compilation of linux-user/syscall.c. + - Move proll and openhackware from Depends to Recommends. + - set Maintainer field to MOTU + + -- Michael Vogt Wed, 2 May 2007 11:55:16 +0200 + +qemu (0.9.0-1) experimental; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #409989) + - Support for relative paths in backing files for disk images. + (Closes: #390446) + - debian/patches/01_doc_typos.patch: Removed, merged upstream. + - debian/patches/38_syscall_arm_statfs64.patch: Likewise. + - debian/patches/51_serial_small_divider.patch: Likewise. + - debian/patches/67_ppc_ftbfs.patch: Likewise. + - debian/patches/21_net_soopts.patch: Synced. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/39_syscall_fadvise64.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/55_unmux_socketcall.patch: Likewise. + - debian/patches/80_ui_curses.patch: Likewise. + * Update the copyright information. + * The ACPI initialization code has been moved to bochsbios. + - debian/patches/acpi-dsdt.hex: Removed. + - debian/rules: Do not install acpi-dsdt.hex. + * Add more files to the list of roms removed from the tarball needed to + be touched so that upstream 'make install' does not fail. + * Added armeb and armel to Architecture fields and libgpmg1-dev + Build-Depends. + * Recommend vde2 instead of the transitional vde package. (Closes: #407251) + * Fix typo in qemu-img output. (Closes: #408542) + - debian/patches/01_typo_qemu-img.patch: New file. + Thanks to Adam Buchbinder . + * Symlink qemu-user(1) to qemu-m68k(1). + * Reduce redundancy in qemu-user(1) synopsis. + * Fix rounding in sparc floating point to integer conversions. + - debian/patches/40_sparc_fp_to_int.patch: New file. + Thanks to Aurelien Jarno . + + -- Guillem Jover Thu, 8 Feb 2007 01:01:29 +0200 + +qemu (0.8.2+dfsg-0ubuntu1) feisty; urgency=low + + * Bump package version number to +dfsg-0ubuntu1 to get rid of binary blobs + that were left in the orig tarball with 0.8.2-0ubuntu1. + * Merge from debian unstable, remaining changes: + - 90_no_linux_compiler_h.patch: remove unnecessary kernel header + breaking compilation of linux-usb.c. + - Remove 34_syscalls_types.patch from debian/patches/series: add an + unnecessary kernel header breaking compilation of linux-user/syscall.c. + - Move proll and openhackware from Depends to Recommends. + + -- Jeremie Corbier Mon, 22 Jan 2007 17:27:33 -0800 + +qemu (0.8.2-5) unstable; urgency=low + + [ Guillem Jover ] + * Added a missing part to the ARM NPTL support patch, initially lost. + - debian/patches/42_arm_tls.patch: Updated. + + -- Guillem Jover Tue, 16 Jan 2007 11:44:00 +0200 + +qemu (0.8.2-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - 90_no_linux_compiler_h.patch: remove unnecessary kernel header + breaking compilation of linux-usb.c. + - Remove 34_syscalls_types.patch from debian/patches/series: add an + unnecessary kernel header breaking compilation of linux-user/syscall.c. + - Move proll and openhackware from Depends to Recommends. + + -- Jeremie Corbier Fri, 22 Dec 2006 12:06:33 -0800 + +qemu (0.8.2-4) unstable; urgency=medium + + [ Guillem Jover ] + * Disable using iasl for now until it's ported to big-endian systems and + include a locally built acpi-dsdt.hex file. + + -- Guillem Jover Sun, 3 Dec 2006 21:10:23 +0200 + +qemu (0.8.2-3) unstable; urgency=low + + [ Guillem Jover ] + * Hopefully really fix powerpc FTBFS. + + -- Guillem Jover Sun, 5 Nov 2006 17:09:53 +0200 + +qemu (0.8.2-2) unstable; urgency=low + + [ Guillem Jover ] + * Update Tag field to match new debtags vocabulary. + * Clean properly. (Closes: #390166) + - Remove the acpi generated files and the docs. + - Revert the docs regeneration forcing logic. + Thanks to Anderson Lizardo . + * On install use DESTDIR instead of specifying all paths. (Closes: #396139) + Thanks to Anderson Lizardo . + * Port to GNU/kFreeBSD. (Closes: #327622) + - Disable ALSA on non-linux systems. + - Add a Build-Depends on libfreebsd-dev on kfreebsd systems. + - Add kfreebsd-i386 and kfreebsd-amd64 to the Architecture field. + - debian/patches/65_kfreebsd.patch: New file. + Thanks Petr Salinger . + * In qemu-make-debian-root do not explicitely install in aptitude and + libsigc++-1.2-5c102, they are pulled now by default. And do not remove + aptitude afterwards. (Closes: #392481) + Thanks to Ted Percival . + * Add experimental ncurses ui support. (Closes: #369462) + - debian/patches/80_ui_curses.patch: New file. + Thanks to Andrzej Zaborowski . + * Add SO_PEERCRED and SO_SNDTIMEO support, and fix accept syscall when + being passed NULL pointers. + - debian/patches/21_net_sockopts.patch: Renamed to ... + - debian/patches/21_net_soopts.patch: ... here. Modify. + Thanks to Pablo Virolainen. + * Add a fadvise64 syscall stub. + - debian/patches/39_syscall_fadvise64.patch: New file. + Thanks to Pablo Virolainen. + * Add EABI unmuxed socket syscalls. + - debian/patches/55_unmux_socketcall.patch: New file. + Thanks to Riku Voipio. + * Add TLS sections to the ARM and x86 linker scripts so that qemu user + emulators can be linked statically. + - debian/patches/66_tls_ld.patch: New file. + * Move the documentation of the binary blob removals from the original + upstream tarball from README.Debian to debian/copyright. + * Reword the emphasis on "FAST!" from the package description. + * Fix FTBFS on powerpc by adding the missing fp_status variable to the + int32_to_float32 function calls. + - debian/patches/67_ppc_ftbfs.patch: New file. + + -- Guillem Jover Sun, 5 Nov 2006 08:48:27 +0200 + +qemu (0.8.2-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #379461, #385029, #388810) + - Add ACPI BIOS emulation support. (Closes: #372533) + - Fix mouse invisible wall when using Windows XP. (Closes: #384666) + - debian/patches/01_doc_typos.patch: Sync. + - debian/patches/03_machines_list_no_error.patch: Likewise. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/06_exit_segfault.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/36_syscall_prctl.patch: Likewise. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/41_arm_fpa_sigfpe.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/61_safe_64bit_int.patch: Likewise. + - debian/patches/63_sparc_build.patch: Likewise. + - debian/patches/50_missing_keycodes.patch: Removed, integrated upstream. + * Switch to quilt: + - debian/control: Add quilt (>= 0.40) to Build-Depends. + - debian/patches/series: New file. + - debian/patch.mk: Removed. + - debian/rules: Include '/usr/share/quilt/quilt.make' instead of + 'debian/patch.mk'. + * Build the ACPI Source Language files with iasl. + * Add a Tag field to the binary package, using data from debtags. + * Add 2006 to the debian/copyright years. + * Add a Recommends on vde. (Closes: #386780) + * Fix spelling error in package description (peripherials -> peripherals). + (Closes: #388700) + Thanks to Rakesh 'arky' Ambati . + * Fix ne2000_can_receive return code to 0 when the command is STOP. + (Closes: #386209) + - debian/patches/52_ne2000_return.patch: New file. + Thanks to Samuel Thibault . + * Document the binary blob removals from the original upstream tarball in + README.Debian. (Closes: #388740) + + -- Guillem Jover Mon, 25 Sep 2006 04:16:25 +0300 + +qemu (0.8.2-0ubuntu1) edgy; urgency=low + + * Merged with Debian unstable + * New Upstream release + * Dropped debian/patches/12_signal_powerpc_support.patch (broken for qemu + 0.8.2) + * Redid debian/patches/21_net_sockopt.patch + * Redid debian/patches/35_syscall_sockaddr.patch + * Redid debian/patches/42_arm_tls.patch + * Dropped debian/patches/50_missing_keycodes.patch (applied upstream) + * Redid debian/patches/61_safe_64bit_int.patch + * Dropped debian/patches/63_sparc_build.patch (applied upstream) + * Added new patch 65_no-linux_types_h.patch (unnecessary kernel header + breaking compilation of linux-user/syscall.c) + * Added new patch 66_no-linux_compiler_h.patch (unnecessary kernel header + breaking compilation of linux-usb.c) + + -- Rodrigo Parra Novo Fri, 4 Aug 2006 22:50:15 -0300 + +qemu (0.8.1-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #366955, #366637) + - debian/patches/01_doc_typos.patch: Sync. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/36_syscall_prctl.patch: Likewise. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/41_arm_fpa_sigfpe.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/43_arm_cpustate.patch: Likewise. + - debian/patches/50_missing_keycodes.patch: Likewise. + - debian/patches/51_serial_small_divider.patch: Likewise. + - debian/patches/61_safe_64bit_int.patch: Likewise. + - debian/patches/63_sparc_build.patch: Likewise. + - debian/patches/40_arm_nwfpe_cpsr.patch: Removed, integrated upstream. + * Make the patch system apply the patch on the first run. + - debian/patches/64_ppc_asm_constraints.patch: Add DPATCHLEVEL. + * Document how to use the images created with qemu-make-debian-root in the + man page. Thanks to Jacobo . (Closes: #343450) + * Add support for the -snapshot option to use the TMPDIR evironment + variable. (Closes: #353880) + - debian/patches/02_snapshot_use_tmpdir.patch: New file. + * Do not exit with an error when using '-M ?'. (Closes: #365209) + - debian/patches/03_machines_list_no_error.patch: New file. + * Added symlink for system-mipsel emulator man page. + * Build and clean the pc-bios directory. + * Avoid segfaulting by using _exit(2) instead of exit(3) in qemu user + emulators. (Closes: #338289) + - debian/patches/06_exit_segfault.patch: New file. + * Enable ALSA audio support and add libasound2-dev to the Build-Depends. + * Now using Standards-Version 3.7.2 (no changes needed). + + -- Guillem Jover Sun, 28 May 2006 20:51:10 +0300 + +qemu (0.8.0-3ubuntu1) dapper; urgency=low + + * moved proll and openhackware from Depends to Recommends. These are + needed for sparc emulation, so this may be broken in ubuntu. + + -- Reinhard Tartler Fri, 14 Apr 2006 20:30:04 +0200 + +qemu (0.8.0-3) unstable; urgency=low + + [ Josh Triplett ] + * Fix FTBFS on PowerPC caused by asm constraint problem. (Closes: #361727) + - debian/patches/64_ppc_asm_constraints.patch. + + [ Guillem Jover ] + * Clamp addrlen from host to target when using AF_UNIX. This fixes + socket problems when using EABI. + - debian/patches/35_syscall_sockaddr.patch: New file. + * Fix floating point comparison on ARM NWFPE, due to glue code missmatch. + (Closes: #356287) + - debian/patches/40_arm_nwfpe_cpsr.patch: New file. + - debian/patches/40_fpu_arm_sigfpe.patch: Rename to ... + - debian/patches/41_arm_fpa_sigfpe.patch: ... this. Resync. + Thanks to Ulrich Hecht. + * Fix POSIX threads creation on ARM hanging when initializing the cpu + structure being it cyclic. + - debian/patches/43_arm_cpustate.patch: New file. + * Add TLS support for ARM. Stolen from Scratchbox. + - debian/patches/42_arm_tls.patch: New file. + * Fix sysctl endian problem. + - debian/patches/32_syscall_sysctl.patch: Update. + Thanks to Timo Savola . + * Remove now default '--enable-slirp' build option. (Closes: #356284) + Thanks to Anderson Lizardo . + * Remove unused sharedir to 'make install'. (Closes: #356418) + Thanks to Anderson Lizardo . + * Fix package not cleaning properly. (Closes: #356279) + Thanks to Anderson Lizardo for the initial + patch. + * Add needed syscalls to make debootstrap work. (Closes: #356291) + - debian/patches/36_syscall_prctl.patch: New file. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/38_syscall_arm_statfs64.patch: Likewise. + Thanks to Anderson Lizardo . + * Remove obsolete Build-Dependency xlibs-dev. + + -- Guillem Jover Thu, 13 Apr 2006 11:53:00 +0300 + +qemu (0.8.0-2) unstable; urgency=low + + [ Guillem Jover ] + * Switch away from cdbs to plain debhelper. + * Upgrade to debhelper compat level 5. + * Allow overriding CC compiler variable. (Closes: #345772) + * Do not redefine 64 bit types on 64 bit arches. + - debian/patches/61_safe_64bit_int.patch: New file. + * Allow linux_boot.bin to be built on any arch by switching to nasm, + and Build-Depending on it. + - debian/patches/62_linux_boot_nasm.patch: New file. + * The serial hw driver uses a small divider that gets zeroed when shifting + bits to the right. (Closes: #276276, #348098) + - debian/patches/51_serial_small_divider.patch: New file. + Thanks to Samuel Thibault . + * Escaped hyphens in qemu-user manpage, use italics for filenames and + parameters and bold for options. + * Partial build failure fix for Sparc. (Bugs: #317145, #336970) + Thanks to Jurij Smakov . + + -- Guillem Jover Mon, 20 Feb 2006 09:17:46 +0200 + +qemu (0.8.0-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #344339) + - Added support for Virtual FAT. (Closes: #313123) + - Emulate repeated keystrokes when holding a key. (Closes: #298864) + - debian/patches/01_doc_typos.patch: Sync. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/40_fpu_arm_sigfpe.patch: Likewise. + - debian/patches/50_missing_keycodes.patch: Likewise. + * Added mips and mipsel to the lintian overrides for the user emulators + being shlib-with-non-pic-code. + * Added symlinks for mips, mipsel and system-arm emulator manpages. + + -- Guillem Jover Fri, 30 Dec 2005 05:44:53 +0200 + +qemu (0.7.2-2) unstable; urgency=low + + [ Josh Triplett ] + * Add support for signal handling on PowerPC. (Closes: #335509) + - debian/patches/12_signal_powerpc_support.patch: New file. + + [ Guillem Jover ] + * Add Josh Triplett to Uploaders and packaging team. + * Fix PowerPC build failure by reintroducing the ppc linker script and + adding the missing _SDA_BASE_ and _SDA2_BASE_ symbols. (Closes: #336983) + * Remove invalid patch making X11 fail at runtime. + - debian/patches/20_net_socket.patch: Remove. + - debian/patches/32_syscall_sysctl.patch: Sync. + Thanks to Daniel Gimpelevich . + * Avoid the patch system to try until it applies. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Added patch level. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + + -- Guillem Jover Wed, 21 Dec 2005 22:11:34 +0200 + +qemu (0.7.2-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #321232, #327168) + - debian/patches/12_signal_silent.patch: Integrated upstream, remove. + - debian/patches/50_ppc_ldscript.patch: Likewise. + - debian/patches/33_syscall_truncate64.patch: Likewise. + - debian/patches/01_doc_typos.patch: Resync with upstream. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/10_signal_jobs.patch: Likewise. + - debian/patches/11_signal_sigaction.patch: Likewise. + - debian/patches/20_net_socket.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/40_fpu_arm_sigfpe.patch: Likewise. + * Repackaged upstream source to deal with binaries w/o sources. + - pc-bios/video.x: New file removed. + * Create a new qemu-user(1) manpage and link all user emulator manpages + to it. (Closes: #335163) + * Add missing '-' and '=' keycodes for sendkey command. + - debian/patches/50_missing_keycodes.patch: New file. (Closes: #334071) + Thanks to Robert Millan . + * Add manpage link for qemu-system-mips. + * Make sysctl byte-swap the name values. + - debian/patches/32_syscall_sysctl.patch: Merge patch. (Closes: #334458) + Thanks to Josh Triplett . + * Change documentation menu section to "Apps/Emulators". (Closes: #335062) + Thanks to Frans Pop . + * On PowerPC, do not zero registers r7-r31 in do_fork and zero register r3. + Fixing segfaults on programs using the clone syscall. + - debian/patches/33_syscall_ppc_clone.patch: New file. (Closes: #335159) + Thanks to Josh Triplett + and Paul Brook . + * Tighten vgabios and bochsbios versioned Depends. + * Add video.x to the list of roms to touch to make qemu Makefile happy. + * Add lintian overrides for the user emulators being shlib-with-non-pic-code. + * Wrap lines in debian/control fields (knowingly breaking policy). + + [ Guilherme de S. Pastore ] + * debian/control: + - Updated my e-mail address. + * debian/copyright: + - Dropped André from team members list, not a single contribution ever. + + -- Guillem Jover Mon, 31 Oct 2005 05:01:45 +0200 + +qemu (0.7.0-4) unstable; urgency=low + + [ Guillem Jover ] + * Rebuild source with locally deborked dpkg-source. (Closes: #321019) + * Added the location of the Subversion repo used for the packages and + fixed the upstream URL in debian/copyright. + * Lower case title header in qemu-make-debian-root man page. + * Use dd instead of cat to generate the qemu debian root image. + (Closes: #315952) + + -- Guillem Jover Wed, 3 Aug 2005 05:53:30 +0300 + +qemu (0.7.0-3) unstable; urgency=low + + [ Guillem Jover ] + * Update watch file to version 3, use perlre and new upstream site. + * Now using Standards-Version 3.6.2 (no changes needed). + * Fix TUN/TAP network interface stalling the connection. (Closes: #290569) + Thanks to Vitaly Belostotsky . + * Link against librt, needed by the new clock_gettime syscall. + - debian/patches/31_syscalls.patch: Update. (Closes: #315388) + Thanks to Timo Savola for noticing. + * Force Build-Dependency on binutils >= 2.16-1 needed by the amd64 and + powerpc linker scripts. (Closes: #262655) + * Force usage of gcc-3.4. (Closes: #319527) + * Add missing Build-Dependency on zlib1g-dev. + Thanks to Reinhard Tartler . + * Include in syscall.c to avoid the broken headers in + linux-kernel-headers 2.6.12. + - debian/patches/34_syscalls_types.patch: New file. + Thanks to Octavian Cerna . + * Fix powerpc linker script. + - debian/patches/50_ppc_ldscript.patch: New file. + Thanks to Octavian Cerna . + + -- Guillem Jover Mon, 1 Aug 2005 02:48:09 +0300 + +qemu (0.7.0-2) unstable; urgency=low + + [ Guillem Jover ] + * Add alpha, sparc, arm and s390 to Architectures (and to the + libgpmg1-dev Build-Depends). + + * Forward SIGSTOP and SIGCONT sent to QEMU to the emulated application. + - debian/patches/10_signal_jobs.patch: New file. + Thanks to Ulrich Hecht. + * Return EINVAL on emulated sigaction when given invalid signal + parameters SIGKILL and SIGSTOP. + - debian/patches/11_signal_sigaction.patch: New fle. + Thanks to Valtteri Rahkonen. + * Do not print messsages for uncaught signal, thus fixing the case + were some applications want to kill their siblings. + - debian/patches/12_signal_silent.patch: New file. + Thanks to Valtteri Rahkonen + + * Fix Unix sockets by handling correctly AF_UNIX socket address + structure length. + - debian/patches/20_net_socket.patch: New file. + Thanks to Timo Savola. + * Implement SO_LINGER, SO_RCVTIMEO, SO_SNDTIMEO, SO_PEERNAME and + SO_PEERCRED getsockoptions. + - debian/patches/21_net_sockopt.patch: New file. + Thanks to Valtteri Rahkonen. + + * Implement SysV IPC message and semaphore syscalls. + - debian/patches/30_syscall_ipc.patch: New file. + Thanks to Valtteri Rahkonen. + * Implement acct, umount2, uselib, swapon, syslog, ftruncate64, + mincore, madvise, readahead and clock_gettime syscalls. + - debian/patches/31_syscalls.patch: New file. + Thanks to Ulrich Hecht. + * Implement sysctl CTL_KERN/KERN_VERSION + - debian/patches/32_syscall_sysctl.patch: New file. + Thanks to Timo Savola. + * Implement truncate64 syscall. + - debian/patches/33_syscall_truncate64.patch: New file. + Thanks to Valtteri Rahkonen. + + * Implement ARM floating point exeption emulation. + - debian/patches/40_fpu_arm_sigfpe.patch: New file. + Thanks to Ulrich Hecht. + + -- Guillem Jover Sun, 19 Jun 2005 15:05:37 +0300 + +qemu (0.7.0-1) experimental; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #308459, #308494) + * Do not require a disk image when booting a Linux kernel. (Closes: #260935) + Thanks to Jonas Smedegaard . + + [ Guilherme de S. Pastore ] + * Rewrote README.Debian for more clarity + * Add support for amd64 as a host architecture. (Closes: #262655) + - Add build-depend on libgpmg1-dev on amd64. + * Fixed qemu-make-debian-root so that it shows the name by which + it was called on the usage notice, not "%s". (Closes: #303507) + Thanks to Micah Anderson . + + [ Elrond ] + * Clean up more files, so they don't end up in the final .diff.gz + * Switch to external proll and openhackware: + - Instead of patching qemu's Makefile, trick it by giving it empty + files to install and remove them straight after install. + - Don't ship the roms in debian/roms any more! + - Instead add more symlinks. + - Update Depends: apropiately. + + -- Guillem Jover Fri, 27 May 2005 02:06:20 +0300 + +qemu (0.6.1+20050407-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream snapshot. + - Fix -user-net. (Closes: #295019) + - Fix win2k and winxp image booting. (Closes: #285170, #292707) + - Fix installation of outdated documentation. (Closes: #286931) + - Provide qemu-img instead of qemu-mkcow. (Closes: #290713) + - Remove debian/patches/05_fix_openpic_timer_test.patch, integrated + upstream. + - Remove debian/patches/02_selectable_sdl_keyboard.patch, superseded + by new keyboard implementation. (Closes: #284510, #299432) + - Remove debian/patches/01_mkcow_section_and_hyphens.patch. + - Conditionalize qemu -g option for some architectures. (Closes: #298988) + * Added new copyright year to debian/copyright. + * Added initial qemu-make-debian-root man page. (Closes: #286932) + * Fixed typos in qemu documentation. (Closes: #301933) + Thanks to A Costa . + * Added Elrond to Uploaders and packaging team. + * Use the default target list: + - Do not build qemu-fast anymore as it is deprecated upstream anyway. + (Closes: #278602, #281510) + - New targets armeb and system-x86_64. + * Updated ROM images under debian/roms/: + - OpenHackWare 0.4. + - Proll 18 with qemu specific patches. + * Remove uudecoded files from pc-bios/ on clean. + * Fix qemu-make-debian-root to behave correctly even if the needed + Recommends are not installed. + + [ Guilherme de S. Pastore ] + * Create a doc-base entry for the package (Closes: #290669) + * debian/control: + - Add debootstrap to the 'Recommends: ' line, as needed by + qemu-make-debian-root (Closes: #302848) + - Moved sharutils from dependency to recommendation, as it is only + needed by qemu-make-debian-root + * debian/docs: + - Do not include README.distrib in the binary package (Closes: #302853) + + [ Elrond ] + * Replace "libgpmg1-dev | not+linux-gnu" by "libgpmg1-dev [i386 powerpc]" + in Build-Depends. qemu should not need to build-depend on it anyway, the + real problem is described in Bug#267174. When it is solved, we can + remove our dependency. Until then please remember to add any arch, which + we will build on and that has gpm. This change hopefully calms: + + * Add versions to the dependencies on bochsbios and vgabios + (Closes: #288997): + - vgabios: Use the current version from testing/unstable (0.4c+20041014-1), + according to Frans Pop , this fixed those + "blank screen" problems. + - bochsbios: Use the current version from unstable (2.1.1+20041109-3), as + Guillem Jover fixed the networking in that version. + + -- Guillem Jover Thu, 7 Apr 2005 01:26:01 +0300 + +qemu (0.6.1-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #281626) + - Booting from drive b is not supported anymore. (Closes: #275679) + - Fix ne2k network interface that was not working in some situations. + (Closes: #281862) + - Remove debian/patches/06_build_gcc3.4.patch, fixed upstream. + - Remove debian/patches/04_lfs.patch, fixed upstream. + - Remove debian/patches/02_fix_powerpc_FTBFS.patch, fixed upstream. + - Remove debian/patches/00_escape_manpage_hyphens.patch, not needed. + - Sync debian/patches/03_use_external_bios.patch. + * Include uuencoded source for proll 18, some build fixes and its binary + proll.bin on debian/roms/. + * Suggests sudo to be used by the qemu-ifup script. + Thanks to Elrond . + * Make sudo in qemu-ifup explain what the password is for. (Closes: #281380) + * Add an option to select the method to convert keyevent to keycode + in the SDL keyboard handling code. Added support for Right Shift in the + generic handler. (Closes: #282658) + Thanks to Elrond . + * Do not set RTC frequency to 1024 or warn about this if it has already + the correct value. (Closes: #281403) + * Enabled sparc-softmmu support. + + -- Guillem Jover Sat, 27 Nov 2004 23:23:49 +0100 + +qemu (0.6.0.dfsg.2-1) unstable; urgency=low + + [ Guillem Jover ] + * Repackaged upstream source to remove external included files. + - pc-bios/ppc-rom.bin: Removed. + - pc-bios/OpenHackWare_0.3.tar.bz2: Likewise. + - pc-bios/vgabios.bin: Likewise. + - pc-bios/vgabios-cirrus.bin: Likewise. + - pc-bios/vgabios-cvs-2004-06-17.tgz: Likewise. + * Include uuencoded source for OpenHackWare 0.3.1 and its binary + ppc-rom.bin on debian/roms/. Add a Build-Depends on sharutils. + * Update tundev.c. Pass -tun-dev to qemu without the equal sign. + Thanks to Isaac Clerencia . + * Fix README.Debian to point to the renamed qemu-make-debian-root. + * Add Depends on sharutils needed by qemu-make-debian-root. + (Closes: #272130) + * Use and depend on vgabios package, which is in sync with bochsbios + that checks for rom bios checksums. (Closes: #281202) + * Enable LFS globally, thus fixing problems with qemu-mkcow when using + an existing large image. + (Closes: #279925) + * Fix openpic timer write test, catched from a warning about a constant + value larger than the type it was casted to. + * Fix build failure with gcc 3.4. Patch stolen from Gentoo BTS. + + -- Guillem Jover Mon, 15 Nov 2004 10:46:54 +0100 + +qemu (0.6.0.dfsg.1-1) unstable; urgency=high + + [ Guillem Jover ] + * Repackaged upstream source to deal with binaries w/o sources. + (Closes: #268780) + - pc-bios/bios.bin: Removed binary without source. Now using + bochsbios package. + - pc-bios/vgabios.bin: Rebuilt from vgabios cvs 2004-06-17 snapshot, + source included. + - pc-bios/vgabios-cirrus.bin: Likewise. + - pc-bios/ppc-rom.bin: Rebuilt on voltaire, source included. + - pc-bios/linux_boot.bin: Rebuilt from source. + * Move make-debian-root.sh to /usr/sbin/qemu-make-debian-root. + (Closes: #268705) + + -- Guillem Jover Mon, 13 Sep 2004 01:28:54 +0200 + +qemu (0.6.0-2) unstable; urgency=high + + [ Guilherme de S. Pastore ] + * Fixed dangling symlinks under /usr/share/man/man1. (Closes: #264764) + + [ Guillem Jover ] + * Fix FTBFS on powerpc. + - debian/patches/02_fix_powerpc_FTBFS.patch: New file. + + -- Guillem Jover Wed, 18 Aug 2004 15:50:43 +0200 + +qemu (0.6.0-1) unstable; urgency=medium + + * New maintainers. (Closes: #258900) + * New upstream release. (Closes: #258732) + - Installs ppc BIOS ROM file. (Closes: #257492) + - Builds with -fno-strict-aliasing. (Closes: #257123) + + [ Guilherme de S. Pastore ] + * debian/rules: + - Cleaned up. + - Ported to use CDBS. + * 00_escape_manpage_hyphens.patch: + - Correct a little typo and escape hyphens in upstream manpage. + * 01_mkcow_section_and_hyphens.patch: + - Fix section mismatch and escape hyphens in the qemu-mkcow manpage. + * Added simple /etc/qemu-ifup helper script. (Closes: #245281) + Thanks to Martin Michlmayr . + * Cleaned debian/watch. + * UTF-8'ed debian/changelog. + * Updated Standards-Version to 3.6.1.1. + * Removed outdated and unnecessary debian/qemu-i386.sgml. + - Removed build dependency on docbook-to-man. + * Removed "x86" part from the description (hey, qemu is not x86-only + in any way). Deserves a complete rewrite, shall be done soon. + + [ Guillem Jover ] + * Lower-case package short description. + * Added missing CPU emulations to the description. + * Cleaned and updated debian/copyright. + * Removed manually added libx11-6 dependency. + * Only Build-Depends on libgpmg1-dev on GNU/Linux systems. + * Cosmetic unification to debian/changelog. + * debian/rules: + - Remove generated files. + - Give exec perms to qemu-ifup. + + -- Guillem Jover Sun, 8 Aug 2004 17:24:08 +0200 + +qemu (0.5.5-2) unstable; urgency=low + + * Re-enable SDL disabled while I was bugchasing. (Closes: #255014) + * Yes, this is really 0.5.5. (Closes: #254655) + * Enable slirp networking. (Closes: #253573) + * Add Build-Depends on libgpmg1-dev (found by Bastian Blank, probably breaks + Hurd but that's a problem for another day). + + -- Paul Russell Thu, 24 Jun 2004 06:26:42 +0200 + +qemu (0.5.5-1) unstable; urgency=low + + * New upstream release. (Closes: #237556, #237556) + * Applied patch to add options to make_debian_root.sh. (Closes: #238787) + * Applied patch for other archs: hmmm... (Closes: #251420) + * Do umount -d in make_debian_root.sh. (Closes: #251775) + + -- Paul Russell Tue, 1 Jun 2004 03:50:05 +0200 + +qemu (0.5.4-1) unstable; urgency=low + + * New upstream release. (Closes: #246634) + * qemu-mkcow included in upstream. + * Added tundev program source in doc, to see if people find it useful. + + -- Paul Russell Mon, 3 May 2004 08:14:49 +0200 + +qemu (0.5.3-1) unstable; urgency=low + + * New upstream release. (Closes: #237556) + * Use aalib-config --static-libs. (Closes: #243325) + * Document Control-Shift to release mouse pointer. (Closes: #238074) + + -- Paul Russell Tue, 13 Apr 2004 02:58:49 +0200 + +qemu (0.5.2-4) unstable; urgency=low + + * Fix PPC install (Michel Daenzer patch). (Closes: #238431) + * Simplify deps (might be wrong, but it's neater). (Closes: #238430) + + -- Paul Russell Wed, 17 Mar 2004 01:35:47 +0100 + +qemu (0.5.2-3) unstable; urgency=low + + * Make compile on woody. (Closes: #238163) + * Include qemu-doc.html. (Closes: #238076) + * Wrote qemu-i386 man page. (Closes: #238077) + + -- Paul Russell Mon, 15 Mar 2004 23:56:25 +0100 + +qemu (0.5.2-2) unstable; urgency=low + + * Fix build problem so bios.bin etc. can be found. (Closes: #237553) + + -- Paul Russell Fri, 12 Mar 2004 05:43:00 +0100 + +qemu (0.5.2-1) unstable; urgency=low + + * Initial Release. (Closes: #187407) + + -- Paul Russell Wed, 3 Mar 2004 02:18:54 +0100 + --- qemu-kvm-0.11.0.orig/debian/copyright +++ qemu-kvm-0.11.0/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by Dustin Kirkland on +Wed, 17 Jun 2009 22:16:57 -0600. + +It was downloaded from http://www.linux-kvm.org + +Upstream Author: Fabrice Bellard + +Upstream Maintainers: Avi Kivity + Anthony Liguori + +Copyright: Copyright (C) 2006 Qumranet, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Fabrice Bellard + +License: + QEMU as a whole is released under the GNU General Public License version 2. + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in the file /usr/share/common-licenses/GPL-2. + + Parts of QEMU have specific licenses which are compatible with the + GNU General Public License, including BSD and MIT/X11. Hence each + source file contains its own licensing information. + + In particular, the QEMU virtual CPU core library (libqemu.a) is + released under the GNU Lesser General Public License version 2 or later. + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in the file /usr/share/common-licenses/LGPL. + + Some hardware device emulation sources and other QEMU functionality are + released under the BSD license, including: + * aes, bsd-user, sd, slirp, sys-queue + + On Debian systems, the complete text of the BSD license be found in the + file /usr/share/common-licenses/BSD. + + Some hardware device emulation sources and other QEMU functionality are + released under the MIT/X11 (BSD-like) license, including: + * sdl, host-utils, vnc, keymaps, ioport, usb, hw/*, net, acl, block, + kqemu, monitor, curses, readline, vl, savevm, osdep, audio, tcg, + qemu-malloc, qemu-img + + The following points clarify the QEMU license: + 1) QEMU as a whole is released under the GNU General Public License + 2) Parts of QEMU have specific licenses which are compatible with the + GNU General Public License. Hence each source file contains its own + licensing information. + In particular, the QEMU virtual CPU core library (libqemu.a) is + released under the GNU Lesser General Public License. Many hardware + device emulation sources are released under the BSD license. + 3) The Tiny Code Generator (TCG) is released under the BSD license + (see license headers in files). + 4) QEMU is a trademark of Fabrice Bellard. + -- Fabrice Bellard. + +The Ubuntu packaging: + Copyright (C) 2009 Canonical Ltd. + released under the GPL-2. --- qemu-kvm-0.11.0.orig/debian/changelog +++ qemu-kvm-0.11.0/debian/changelog @@ -0,0 +1,385 @@ +qemu-kvm (0.11.0-0ubuntu5) karmic; urgency=low + + [ Dustin Kirkland ] + * debian/patches/10_fix_scsi_hotplug.patch: cherry-pick patch from + upstream to fix scsi hotplug regression, LP: #432154 + * debian/patches/11_fix_virtio-blk_hot_add_after_remove.patch: cherry-pick + patch from upstream to fix virtio hotplug add/remove, LP: #419590 + + [ James Westby ] + * Add transitional kvm and qemu packages, LP: #451508 + - Force the kvm package version to be higher so that it supercedes that + from the kvm source. Thanks to Steve Langasek and Michael Vogt + + -- Dustin Kirkland Wed, 14 Oct 2009 11:35:27 -0500 + +qemu-kvm (0.11.0-0ubuntu4) karmic; urgency=low + + * qemu-arm-static: build-arm-chroot script + - add copyright headers + - parse cmdline to determine the chroot path so debootstrap gets options + handed over properly + - add check if --arch is set to make it easy to re-use it for other arches + in the future + - code cleanup + - drop the success message, debootstrap already notifies us here + + -- Oliver Grawert Wed, 14 Oct 2009 11:44:28 +0200 + +qemu-kvm (0.11.0-0ubuntu3) karmic; urgency=low + + * debian/patches/10_qemu-allow-pulseaudio-to-be-the-default.patch: + revert this patch, as the effect is actually contrary to what's + desired and regressed LP: #304649 + + -- Dustin Kirkland Mon, 12 Oct 2009 22:33:13 -0500 + +qemu-kvm (0.11.0-0ubuntu2) karmic; urgency=low + + * debian/patches/09_qemu-fix-qcow2-backing-file-with-virtio.patch: + cherry-pick patch from Fedora, fix virtio/qcow2 issues, LP: #420423 + * debian/patches/10_qemu-allow-pulseaudio-to-be-the-default.patch: + needed to complete the fix for LP: #304649 + * debian/control: improve description of qemu-kvm-extras, LP: #448655 + + -- Dustin Kirkland Sun, 11 Oct 2009 13:16:11 -0500 + +qemu-kvm (0.11.0-0ubuntu1) karmic; urgency=low + + * Merge upstream GA qemu-kvm-0.11 to replace rc2, LP: #438912 + * debian/patches/04_fix-no-kvm-segfault.patch: dropped, included + upstream + + -- Dustin Kirkland Tue, 29 Sep 2009 14:14:35 -0500 + +qemu-kvm (0.11.0~rc2-0ubuntu12) karmic; urgency=low + + * Really disable vm.vdso_enabled in debian/qemu-arm-static.sysctl.amd64. + + -- Loïc Minier Thu, 24 Sep 2009 07:37:19 +0200 + +qemu-kvm (0.11.0~rc2-0ubuntu11) karmic; urgency=low + + * Allow debian/qemu-arm-static.sysctl.$(DEB_BUILD_ARCH) to override + debian/qemu-arm-static.sysctl and add an amd64 version which doesn't set + vm.vdso_enabled since that's not available on x86-64. + * Drop useless uses of CURDIR from install target. + * Add debian/TODO list. + + -- Loïc Minier Thu, 24 Sep 2009 07:24:54 +0200 + +qemu-kvm (0.11.0~rc2-0ubuntu10) karmic; urgency=low + + * New patch, 60_armv4l-typo, from upstream + a302c32ded4d458fead907a98d079e8fb15f7b08; fixes a typo in configure (arm4l + instead of armv4l) which breaks the build on armel. + + -- Loïc Minier Wed, 23 Sep 2009 15:23:02 +0200 + +qemu-kvm (0.11.0~rc2-0ubuntu9) karmic; urgency=low + + * Use bamboo.dtb instead of bamboo.dtd in powerpc rules; this seems to be + the correct filename and AFAICT there's no support for generating any .dtd + file in the upstream rules but only support for .dtb files; should help + the powerpc build somewhat. + * Disable qemu-kvm build on armel since there is no kernel support for it + for now; should help the armel build somewhat. + - Use dh_listpackages to check whether we want the qemu-kvm package and + set DO_KVM accordingly. + - Only $(MAKE) install in kvm/libkvm if DO_KVM is enabled. + * On ia64 set TARGET_SYSTEM_TCG = ia64-softmmu and empty TARGET_LINUX_TCG + since ia64 doesn't support CPU emulation mode (syscall wrapping) nor code + generation for ia64, so can only run ia64 code on ia64 in system emulation + mode; should help the ia64 build somewhat. + + -- Loïc Minier Wed, 23 Sep 2009 13:40:38 +0200 + +qemu-kvm (0.11.0~rc2-0ubuntu8) karmic; urgency=low + + * Drop awful binary-static target; binary-arch works fine and binary-static + is not guaranteed to be called (in fact it was only called on the arch: + all buildd, i.e. i386, even if there are no arch: all packages here). + Similarly, merge build-static commands with build-arch commands. + Similarly, merge install-static commands with install commands. + * Replace configure-static with $(STATIC_BUILDDIR)/config.status which + matches config.status; let $(STATIC_BUILDDIR)/config.status depend on + configure. + * Depending on whether we want to build a qemu-%-static package, as reported + by dh_listpackages, set DO_STATIC and MAYBE_STATIC_CONFIG to "yes" and + $(STATIC_BUILDDIR)/config.status (or "no" and empty) and use these vars to + conditionalize the build. + * Drop unexisting targets from .PHONY. + * Let build depend on build-indep and build-arch. + * Use $(MAKE) -C instead of cd && $(MAKE). + * Consistenly use $() for make vars instead of mixing with ${}. + * Drop conditional for quilt.make being present, it's always satisfied per + build-deps, and move the include to the top of rules. + * Remove boilerplate comments from rules. + * Don't overwrite CFLAGS from the environment and honour DEB_BUILD_OPTIONS + in a more condensed manner. + * Use DEB_BUILD_ARCH instead of calling dpkg-architecture repeatedly. + * Let the config.status targets depend on patch instead of configure. + * Rename STATIC_BUILDDIR to debian/build-static to avoid clashes with a + possible qemu-static. + * No need for build-{arch,indep} to depend on patch, actually they should + only depend on the -stamp file which itself should depend on + config.status targets. + * Drop build-arch/build-indep split in favour of a single build target; the + split was unused and not supported properly anyway; let install depend on + build and binary-{indep,arch} depend on install. + * Also pass -k debian/changelog.qemu debian/changelog.kvm to + dh_installchangelogs in binary-arch. + * Drop unused binary-indep commands. + * Drop -s from dh_testdir/dh_testroot. + * Test for config-host.mak before calling $(MAKE) in clean: and drop the + bogus dep on the config.status target. + * Call unpatch explicitly after distclean instead of using a dep as we don't + want to run upstream rules unpatched. + * Rename config.status targets to config-host.mak since it's the actual name + of the file spit by configure. + * Rework copying of sources for static build to filter-out the debian and + potentially the static build dir and hence avoid the || true error + handler. + * Install old Debian changelogs debian/changelog.{kvm,qemu} with + dh_installdocs; drop the dh_installchangelogs hacks, that resurrects the + actual upstream changelog. + * Drop bogus debian/qemu-arm-static.install for now as it installs to the + wrong dir. + * Rework qemu-arm-static.{postint,prerm} to not hardcode the update-binfmts + pathname, not do useless tests, and to drop boilerplate. + * Rework postinst to set -e and to drop boilerplate. + * Add install-stamp to run install only once; install should really be + reworked to install to debian/tmp, moving the copying to binary packages + to binary-%. + * Add watch file. + * Add debian/README.source pointing at the quilt one. + + -- Loïc Minier Wed, 23 Sep 2009 09:18:41 +0200 + +qemu-kvm (0.11.0~rc2-0ubuntu7) karmic; urgency=low + + * Enable qem-arm-static on amd64 and lpia. + + -- Loïc Minier Tue, 22 Sep 2009 14:28:52 +0200 + +qemu-kvm (0.11.0~rc2-0ubuntu6) karmic; urgency=low + + * debian/qemu-kvm.udev: remove NAME="%k", superfluous and breaks kernel + supplied names, LP: #433124 + + -- Dustin Kirkland Sat, 19 Sep 2009 11:16:24 -0500 + +qemu-kvm (0.11.0~rc2-0ubuntu5) karmic; urgency=low + + * debian/patches/06_set_sdl_title.patch: set the sdl title properly + when using -name, LP: #423076 + * debian/patches/07_right_ctrl_grab.patch: support right-ctrl grab + for improved accessibility, LP: #237635 + * debian/08_fix_qemu-ifup.patch: fix positional argument problem in + qemu-ifup script, LP: #237635 + * debian/install, debian/links: install qemu-ifup and qemu-ifdown to + /usr/bin, and symlink them to the (somewhat silly) location where + qemu expects to find an executable script, update the ifdown script + to use the same logic in determining the bridge interface, LP: #430655 + + -- Dustin Kirkland Fri, 18 Sep 2009 10:59:44 -0500 + +qemu-kvm (0.11.0~rc2-0ubuntu4) karmic; urgency=low + + * debian/patches/05_improve-qemu-img-errors.patch: use strerror() + for qemu-img error reporting, LP: #418112 + * fix links + + -- Dustin Kirkland Thu, 10 Sep 2009 22:58:09 -0500 + +qemu-kvm (0.11.0~rc2-0ubuntu3) karmic; urgency=low + + * debian/links: fix broken /usr/share/kvm symlink to point to + /usr/share/qemu, LP: #427127 + + -- Dustin Kirkland Wed, 09 Sep 2009 23:30:38 -0500 + +qemu-kvm (0.11.0~rc2-0ubuntu2) karmic; urgency=low + + [ Dustin Kirkland ] + * debian/control: drop bochsbios build-dep; use binary blobs in this + package since bochs is not in main, LP: #422268 + * debian/install: install qemu-if[up|down] scripts into /etc, where qemu-kvm + expects them, LP: #376387 + * debian/init: kvm needs /proc, require start of mountkernfs, LP: #391121 + + [ Oliver Grawert ] + * qemu-arm-static: drop unneeded cd'ing to $OLDPWD from binary-static (how + did that get there first place?) LP: #425947 + + [ Dominic Evans ] + * debian/qemu-ifdown: add matching ifdown script for bridge configuration, + LP: #376387 + + -- Dustin Kirkland Tue, 08 Sep 2009 16:12:10 -0500 + +qemu-kvm (0.11.0~rc2-0ubuntu1) karmic; urgency=low + + * merge upstream release candidate 2; bug fixes only + * drop 03_fix_checksum_writing_in_signboot.patch, included upstream + + -- Dustin Kirkland Tue, 08 Sep 2009 09:18:43 -0500 + +qemu-kvm (0.11.0~rc1-0ubuntu13) karmic; urgency=low + + * debian/qemu-kvm.udev: add udev file which was dropped during the + packaging, LP: #422225 + * debian/patches/04_fix-no-kvm-segfault.patch: fix segfault when + KVM is not available, by ensuring that kvm_allowed gets set + earlier enough in vl.c; will be sent upstream; LP: #422295 + + -- Dustin Kirkland Mon, 31 Aug 2009 18:50:48 -0500 + +qemu-kvm (0.11.0~rc1-0ubuntu12) karmic; urgency=low + + * debian/init: no need to stop the init script for runlevels 0 and 6 + + -- Dustin Kirkland Tue, 25 Aug 2009 13:09:10 -0500 + +qemu-kvm (0.11.0~rc1-0ubuntu11) karmic; urgency=low + + * debian/qemu-kvm.install: update these install locations too; + missed these in the last upload + + -- Dustin Kirkland Mon, 24 Aug 2009 15:54:00 -0500 + +qemu-kvm (0.11.0~rc1-0ubuntu10) karmic; urgency=low + + * debian/rules: revert one change from last upload; install bios bin + files to /usr/share/qemu, rather than /usr/share/qemu-kvm, as this + broke qemu, LP: #418033 + + -- Dustin Kirkland Mon, 24 Aug 2009 10:11:29 -0500 + +qemu-kvm (0.11.0~rc1-0ubuntu9) karmic; urgency=low + + * debian/install, debian/links: setup some links to help smooth the + migration from kvm -> qemu-kvm, and qemu -> qemu-kvm + * debian/control: suggest qemu-kvm-extas, bump standards + * debian/manpages, debian/qemu-user.1: copy the manpage from + from the qemu package + * debian/links: setup links for manpages + * debian/kvm.1, debian/rules, debian/links: drop the separate manpage + for kvm, use qemu's + + -- Dustin Kirkland Fri, 21 Aug 2009 15:00:32 -0500 + +qemu-kvm (0.11.0~rc1-0ubuntu8) karmic; urgency=low + + * qemu-arm-static.sysctl: switch off vdso as well, else chroot execution + fails + + -- Oliver Grawert Sun, 16 Aug 2009 17:13:42 +0200 + +qemu-kvm (0.11.0~rc1-0ubuntu7) karmic; urgency=low + + * rather use sysctl -p in qemu-arm-static.postinst + * qemu needs to access mmap above 4k, set vm.mmap_min_addr to 4097 + in qemu-arm-static.sysctl instead of the default armel kernel value + + -- Oliver Grawert Sun, 16 Aug 2009 15:15:26 +0200 + +qemu-kvm (0.11.0~rc1-0ubuntu6) karmic; urgency=low + + * make sure we build the -static target in a separate dir to not interfere + with the nonstatic targets + * make qemu-kvm and qemu-kvm-extras ignore qemu-arm-static in dpkg-deb + * add /etc/sysctl.d/qemu-arm-static.sysctl.conf to qemu-arm-static and set + mmap_min_addr to 32768 from postinst since armel uses a lower mmap address + by default + * drop libpcap2-bin dependency from qemu-arm-static (doesnt work properly + yet, we use mmap_min_addr instead) + * drop ${shlibs:Depends} from qemu-arm-static control entry, no shlibs in + static builds + + -- Oliver Grawert Sun, 16 Aug 2009 13:25:58 +0200 + +qemu-kvm (0.11.0~rc1-0ubuntu5) karmic; urgency=low + + * debian/control: add a Suggests on uml-utilities (universe), for + availability of /usr/sbin/tunctl + * debian/patches/03_fix_virtio_boot.patch: dropped; this was a red + herring in solving the problem + * debian/patches/03_fix_checksum_writing_in_signboot.patch: fix + extboot virtio issue, taken from upstream staging git repo + + -- Dustin Kirkland Thu, 06 Aug 2009 17:03:52 +0100 + +qemu-kvm (0.11.0~rc1-0ubuntu4) karmic; urgency=low + + * debian/patches/03_fix_virtio_boot.patch: revert upstream commit + bf011293f, which breaks booting off of virtio disks; this is only + a temporary fix, as we're waiting on upstream to release a real fix + * debian/control: bump debhelper dependency to 7, for dh_prep + + -- Dustin Kirkland Thu, 06 Aug 2009 13:54:20 +0100 + +qemu-kvm (0.11.0~rc1-0ubuntu3) karmic; urgency=low + + * qemu-arm-static: add dependency on libcap2-bin + * qemu-arm-static.postinst set cap_sys_rawio so the difference between the + mmap_min_addr values between armel and i386 don't get in the way when + executing armel binaries on x86 + + -- Oliver Grawert Wed, 05 Aug 2009 18:10:27 +0200 + +qemu-kvm (0.11.0~rc1-0ubuntu2) karmic; urgency=low + + [ Oliver Grawert ] + * Static qemu arm build, LP: #401782 + * add qemu-arm-static package with dependency on binfmt-support to + debian/control + * add binary-static, build-static, configure-static and install-static + targets to debian/rules + * add qemu-arm-static.postinst and qemu-arm-static.prerm + * include build-arm-chroot script for qemu-arm-static + * include binfmt configuration file + + [ Dustin Kirkland ] + * debian/control: drop non-existent qemu-kvm-common dependency + + -- Dustin Kirkland Wed, 05 Aug 2009 14:42:34 +0100 + +qemu-kvm (0.11.0~rc1-0ubuntu1) karmic; urgency=low + + [ Initial packaging of qemu-kvm ] + * This package is a complex merger of the traditional Debian and Ubuntu + qemu and kvm packages. Upstream is in the process of integrating all + kvm-specific code into the qemu project, which is being delivered as a + new package called qemu-kvm. This should provide all of the userspace + required to use kvm. The kvm project, instead, is going to focus on the + kvm kernel module. The qemu-kvm project will deliver a stable, maintained + userspace. This qemu-kvm package replaces both qemu and kvm in Ubuntu. + * debian/changelog.kvm, debian/changelog.qemu: keep these two files around, + as these provide tremendous history and logging about the packaging + * debian/control, debian/10-kvm.fdi, debian/install, + debian/org.freedesktop.hal.kvm.policy: drop hal as it's being deprecated + * debian/reportbug-hook.sh: dropped; use 'ubuntu-bug qemu-kvm' now + * debian/control: + - lower the debhelper dependency, should make backports + easier, newer builds will use the newer debhelper for udev stuff, older + versions just won't + - drop autotools-dev build dependency, no longer needed + - add armel to build architecture + - description updated + - drop the qemu package (for now) + - drop the Pre-depends on adduser + * debian/rules: + - drop double call of dh_installdeb + - install each of the changelogs + - drop zcat of network bins; these have been no-ops for us for a long + time, kept around to minimize diff with Debian + - move common i386 and x86_64 code to common location + - drop pxe rom's, as these are provided by kvm-pxe + - establish some links to help with the merger of kvm/qemu + - move as much as possible to the debhelper install file + - clean up kvm/bios/acpi-ssdt.aml + * debian/patches: all patches dropped, syncing with upstream + * debian/doc: new file, html documentation to be installed + + -- Dustin Kirkland Tue, 04 Aug 2009 12:36:50 +0100 --- qemu-kvm-0.11.0.orig/debian/binfmt-arm +++ qemu-kvm-0.11.0/debian/binfmt-arm @@ -0,0 +1,6 @@ +package qemu-arm-static +interpreter /usr/bin/qemu-arm-static +flags: OC +offset 0 +magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-kvm-0.11.0.orig/debian/qemu-kvm.manpages +++ qemu-kvm-0.11.0/debian/qemu-kvm.manpages @@ -0,0 +1 @@ +debian/qemu-user.1 --- qemu-kvm-0.11.0.orig/debian/kvm-ok +++ qemu-kvm-0.11.0/debian/kvm-ok @@ -0,0 +1,24 @@ +#!/bin/sh -e +# +# kvm-ok - check whether the CPU we're running on supports KVM acceleration +# Copyright (C) 2008 Canonical Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if egrep "flags.*:.*(svm|vmx)" /proc/cpuinfo > /dev/null; then + echo "KVM acceleration can be used" + exit 0 +else + echo "KVM acceleration can NOT be used" + exit 1 +fi --- qemu-kvm-0.11.0.orig/debian/qemu-kvm-extras.dirs +++ qemu-kvm-0.11.0/debian/qemu-kvm-extras.dirs @@ -0,0 +1 @@ +usr/bin --- qemu-kvm-0.11.0.orig/debian/control +++ qemu-kvm-0.11.0/debian/control @@ -0,0 +1,90 @@ +Source: qemu-kvm +Section: misc +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>= 7), pkg-config, quilt (>= 0.40), + bzip2, uuid-dev, zlib1g-dev, libsdl1.2-dev, libasound2-dev, libgnutls-dev, + libncurses5-dev, libpci-dev, libpulse-dev, nasm, texi2html, bcc, iasl, + device-tree-compiler [powerpc], sysv-rc (>= 2.86.ds1-14.1ubuntu2), libx11-dev +Standards-Version: 3.8.3 +Homepage: http://www.linux-kvm.org + +Package: qemu-kvm +Architecture: i386 amd64 powerpc ia64 s390 lpia +Depends: ${shlibs:Depends}, ${misc:Depends}, python, iproute, bridge-utils, adduser +Suggests: ubuntu-vm-builder, kvm-pxe, uml-utilities, qemu-kvm-extras +Provides: kvm, qemu +Conflicts: qemu, kvm, kvm-data +Replaces: qemu, kvm, kvm-data +Breaks: udev (<< 136-1) +Description: Full virtualization on i386 and amd64 hardware + Using KVM, one can run multiple virtual PCs, each running unmodified Linux or + Windows images. Each virtual machine has private virtualized hardware: a + network card, disk, graphics adapter, etc. + . + KVM (for Kernel-based Virtual Machine) is a full virtualization solution for + Linux hosts on x86 (32 and 64-bit) hardware. + . + KVM is intended for systems where the processor has hardware support for + virtualization, see below for details. All combinations of 32-bit and 64-bit + host and guest systems are supported, except 64-bit guests on 32-bit hosts. + . + KVM requires your system to support hardware virtualization, provided by AMD's + SVM capability or Intel's VT. To find out if your processor has the necessary + support: + . + egrep "flags.*:.*(svm|vmx)" /proc/cpuinfo + . + If it prints anything, the processor provides hardware virtualization + support and is suitable for use with KVM. Without hardware support, you can + use qemu emulation instead. + . + KVM consists of two loadable kernel modules (kvm.ko and either kvm-amd.ko or + kvm-intel.ko) and a userspace component. This package contains the userspace + component, and you can get the kernel modules from the standard kernel images. + . + This package contains support for the x86 and x86-64 architectures only. + Support for other architectures is provided by the qemu-kvm-extras package. + +Package: qemu-kvm-extras +Architecture: i386 amd64 powerpc ia64 s390 lpia armel +Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-kvm +Description: fast processor emulator binaries for non-x86 architectures + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MIPS, PowerPC, SH4, SPARc and x86-64 + emulation. By using dynamic translation it achieves reasonable speed + while being easy to port on new host CPUs. QEMU has two operating modes: + . + * User mode emulation: QEMU can launch Linux processes compiled for + one CPU on another CPU. + * Full system emulation: QEMU emulates a full system, including a + processor and various peripherals. It enables easier testing and + debugging of system code. It can also be used to provide virtual + hosting of several virtual PC on a single server. + . + QEMU requires no host kernel patches or CPU extensions to run. + +Package: qemu-arm-static +Architecture: amd64 i386 lpia +Depends: ${misc:Depends}, binfmt-support +Description: static qemu-arm binary that enables to use arm chroots + The static version of teh qemu-arm binary registers automatically with + the binfmt-support setup in the kernel, enabling the execution of armel + binaries on x86 hosts. The package also includes a script to generate armel + chroots. + +Package: kvm +Architecture: any +Depends: qemu-kvm +Section: metapackages +Description: dummy transitional pacakge for qemu-kvm + This transitional package helps users transition to the kvm-qemu package. + Once this package and its dependencies are installed you can safely remove it. + +Package: qemu +Architecture: any +Depends: qemu-kvm +Section: metapackages +Description: dummy transitional pacakge for qemu-kvm + This transitional package helps users transition to the kvm-qemu package. + Once this package and its dependencies are installed you can safely remove it. --- qemu-kvm-0.11.0.orig/debian/compat +++ qemu-kvm-0.11.0/debian/compat @@ -0,0 +1 @@ +5 --- qemu-kvm-0.11.0.orig/debian/qemu-arm-static.sysctl +++ qemu-kvm-0.11.0/debian/qemu-arm-static.sysctl @@ -0,0 +1,2 @@ +vm.vdso_enabled = 0 +vm.mmap_min_addr = 4097 --- qemu-kvm-0.11.0.orig/debian/install +++ qemu-kvm-0.11.0/debian/install @@ -0,0 +1,10 @@ +kvm/scripts/qemu-ifup usr/bin +debian/qemu-ifdown usr/bin +kvm/kvm_stat usr/bin +kvm/user/kvmtrace_format usr/bin +pc-bios/bios.bin usr/share/qemu +pc-bios/vgabios.bin usr/share/qemu +pc-bios/vgabios-cirrus.bin usr/share/qemu +pc-bios/extboot.bin usr/share/qemu +debian/source_qemu-kvm.py usr/share/apport/package-hooks/ +debian/kvm-ok usr/bin --- qemu-kvm-0.11.0.orig/debian/qemu-ifdown +++ qemu-kvm-0.11.0/debian/qemu-ifdown @@ -0,0 +1,9 @@ +#!/bin/sh + +# NOTE: This script is intended to run in conjunction with qemu-ifup +# which uses the same logic to find your bridge/switch + +switch=$(/sbin/ip route list | awk '/^default / { print $5 }') + +/usr/sbin/brctl delif $switch $1 +/sbin/ifconfig $1 0.0.0.0 down --- qemu-kvm-0.11.0.orig/debian/README.source +++ qemu-kvm-0.11.0/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt to manage patches; see: + /usr/share/doc/quilt/README.source --- qemu-kvm-0.11.0.orig/debian/kvm.udev +++ qemu-kvm-0.11.0/debian/kvm.udev @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" --- qemu-kvm-0.11.0.orig/debian/qemu-arm-static.prerm +++ qemu-kvm-0.11.0/debian/qemu-arm-static.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = remove ] && which update-binfmts >/dev/null; then + update-binfmts --package qemu-arm-static \ + --remove arm /usr/bin/qemu-arm-static +fi + +#DEBHELPER# + +exit 0 --- qemu-kvm-0.11.0.orig/debian/qemu-arm-static.sysctl.amd64 +++ qemu-kvm-0.11.0/debian/qemu-arm-static.sysctl.amd64 @@ -0,0 +1 @@ +vm.mmap_min_addr = 4097 --- qemu-kvm-0.11.0.orig/debian/postinst +++ qemu-kvm-0.11.0/debian/postinst @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ]; then + # Add the kvm group unless it's already there + if ! getent group kvm >/dev/null; then + addgroup --quiet --system kvm || true + fi +fi + +#DEBHELPER# + +exit 0 + --- qemu-kvm-0.11.0.orig/debian/qemu-user.1 +++ qemu-kvm-0.11.0/debian/qemu-user.1 @@ -0,0 +1,38 @@ +.\" $Id: qemu-user.1 376 2009-03-03 20:45:06Z aurel32 $ +.TH qemu\-user 1 2007-02-08 "0.9.0" Debian +.SH NAME +qemu\-user \- QEMU User Emulator +.SH SYNOPSIS +.B qemu\-user +.RI [ options ] +.I program +.RI [ program-arguments... ] +.SH DESCRIPTION +The +.B qemu\-user +emulator can run binaries for other architectures but with the same operating +system as the current one. +.SH OPTIONS +.TP +.BR \-h +Print this help. +.TP +.BR \-g +Wait gdb connection to port 1234. +.TP +.BR \-L " \fI\fP" +Set the elf interpreter prefix (default=\fI/usr/gnemul/qemu\-arm\fP). +.TP +.BR \-s " \fI\fP" +Set the stack size in bytes (default=\fI524288\fP). +.TP +.BR \-d " \fI\fP" +Activate log (logfile=\fI/tmp/qemu.log\fP) +.TP +.BR \-p " \fI\fP" +Set the host page size to 'pagesize'. +.SH SEE ALSO +.BR qemu (1), +.BR qemu\-img (1). +.SH AUTHOR +This manual page was written by Guillem Jover . --- qemu-kvm-0.11.0.orig/debian/source_qemu-kvm.py +++ qemu-kvm-0.11.0/debian/source_qemu-kvm.py @@ -0,0 +1,12 @@ +'''apport package hook for qemu-kvm + +(c) 2009 Canonical Ltd. +Author: Dustin Kirkland +''' + +from apport.hookutils import * + +def add_info(report): + attach_hardware(report) + attach_related_packages(report, ['kvm*', '*libvirt*', 'virt-manager', 'qemu*']) + report['KvmCmdLine'] = command_output(['ps', '-C', 'kvm', '-F']) --- qemu-kvm-0.11.0.orig/debian/rules +++ qemu-kvm-0.11.0/debian/rules @@ -0,0 +1,160 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +debsrc_ver := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p' | perl -pe 's/-[^-]+$$//o') +debian_rev := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p' | perl -pe 's/.*-//o') + +TARGET_SYSTEM_TCG = arm-softmmu cris-softmmu i386-softmmu m68k-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu sparc64-softmmu x86_64-softmmu +TARGET_LINUX_TCG = alpha-linux-user arm-linux-user armeb-linux-user cris-linux-user i386-linux-user m68k-linux-user mips-linux-user mipsel-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user sh4-linux-user sh4eb-linux-user sparc-linux-user sparc64-linux-user sparc32plus-linux-user x86_64-linux-user +TARGET_STATIC_TCG = arm-linux-user +STATIC_BUILDDIR = debian/build-static + +QEMU_EXE = qemu-system-x86_64 +pcbios_targets = +qemu_targets = user bios vgabios +needed_bios_files = +ifeq (i386,$(DEB_BUILD_ARCH)) + BUILD_CPU = i386 +endif +ifeq (lpia,$(DEB_BUILD_ARCH)) + BUILD_CPU = i386 +endif +ifeq (amd64,$(DEB_BUILD_ARCH)) + BUILD_CPU = x86_64 +endif +ifeq (ia64,$(DEB_BUILD_ARCH)) + BUILD_CPU = ia64 + TARGET_SYSTEM_TCG = ia64-softmmu + TARGET_LINUX_TCG = +endif +ifeq (powerpc,$(DEB_BUILD_ARCH)) + BUILD_CPU = ppcemb + QEMU_EXE = qemu-system-ppcemb + pcbios_targets = bamboo.dtb + qemu_targets = + needed_bios_files = bamboo.dtb ppc_rom.bin +endif + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +ifeq ($(filter qemu-%-static,$(shell dh_listpackages -s)),) +DO_STATIC := no +MAYBE_STATIC_CONFIG := +else +DO_STATIC := yes +MAYBE_STATIC_CONFIG := $(STATIC_BUILDDIR)/config-host.mak +endif + +ifeq ($(filter qemu-kvm,$(shell dh_listpackages -s)),) +DO_KVM := no +else +DO_KVM := yes +endif + +config-host.mak: patch + dh_testdir + ./configure --prefix=/usr --disable-blobs --audio-drv-list="alsa pa oss sdl" --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" --target-list="$(TARGET_SYSTEM_TCG) $(TARGET_LINUX_TCG)" + +$(STATIC_BUILDDIR)/config-host.mak: patch + dh_testdir + rm -rf $(STATIC_BUILDDIR) + mkdir -p $(STATIC_BUILDDIR) + cp -a $(filter-out debian $(STATIC_BUILDDIR),$(wildcard *)) $(STATIC_BUILDDIR) + cd $(STATIC_BUILDDIR) && \ + ./configure --prefix=/usr --target-list="$(TARGET_STATIC_TCG)" --static + +build: build-stamp +build-stamp: config-host.mak $(MAYBE_STATIC_CONFIG) + dh_testdir + for i in $(qemu_targets); do \ + $(MAKE) -C kvm/$$i; \ + done + for i in $(pcbios_targets); do \ + $(MAKE) -C pc-bios $$i; \ + done +ifeq ($(DO_STATIC),yes) + $(MAKE) -C $(STATIC_BUILDDIR) +endif + touch $@ + +clean: + dh_testdir + rm -f install-stamp build-stamp +ifeq ($(DO_STATIC),yes) + rm -rf $(STATIC_BUILDDIR) +endif + [ ! -f config-host.mak ] || $(MAKE) -C kvm/bios clean bios-clean + [ ! -f config-host.mak ] || $(MAKE) -C kvm/vgabios clean + [ ! -f config-host.mak ] || $(MAKE) -C kvm/extboot clean + [ ! -f config-host.mak ] || $(MAKE) -C pc-bios clean + [ ! -f config-host.mak ] || $(MAKE) distclean + $(MAKE) -f debian/rules unpatch + rm -f pc-bios/*.bin kvm/extboot/*.o kvm/extboot/extboot.img kvm/extboot/extboot.bin kvm/extboot/signrom config.mak kvm/user/config.mak kvm/user/test/lib/.*.d kvm/user/test/lib/*/.*.d kvm/vgabios/*bin kvm/bios/acpi-dsdt.aml kvm/bios/acpi-ssdt.aml qemu-monitor.texi + dh_clean + +install: install-stamp +install-stamp: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # Build & install normally +ifeq ($(DO_KVM),yes) + $(MAKE) -C kvm/libkvm DESTDIR=$(CURDIR)/debian/qemu-kvm install +endif + $(MAKE) DESTDIR=$(CURDIR)/debian/qemu-kvm install + # copy usable bios into place + cp kvm/bios/BIOS-bochs-latest pc-bios/bios.bin + cp kvm/vgabios/VGABIOS-lgpl-latest.bin pc-bios/vgabios.bin + cp kvm/vgabios/VGABIOS-lgpl-latest.cirrus.bin pc-bios/vgabios-cirrus.bin + # Install relevant files manually + for i in $(needed_bios_files); do \ + install -D -m 0644 pc-bios/$$i debian/qemu-kvm/usr/share/qemu/$$i; \ + done + # Move the extras binaries into place + for i in alpha arm armeb cris m68k mips mipsel ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus sparc64 system-arm system-cris system-m68k system-mips system-mips64 system-mips64el system-mipsel system-ppc system-ppc64 system-ppcemb system-sh4 system-sh4eb system-sparc system-sparc64; do \ + mv debian/qemu-kvm/usr/bin/qemu-$$i debian/qemu-kvm-extras/usr/bin/qemu-$$i; \ + done + # Install the userspace utilities + dh_install +ifeq ($(DO_STATIC),yes) + # Wrap this in a for loop if more static arches appear, for now we only have arm + mkdir -p debian/qemu-arm-static/usr/bin + mkdir -p debian/qemu-arm-static/etc/sysctl.d + mkdir -p debian/qemu-arm-static/usr/share/binfmts + cp $(STATIC_BUILDDIR)/arm-linux-user/qemu-arm debian/qemu-arm-static/usr/bin/qemu-arm-static + cp debian/binfmt-arm debian/qemu-arm-static/usr/share/binfmts/arm + cp debian/build-arm-chroot debian/qemu-arm-static/usr/bin/ + f=debian/qemu-arm-static.sysctl; [ ! -f debian/qemu-arm-static.sysctl.$(DEB_BUILD_ARCH) ] || f=debian/qemu-arm-static.sysctl.$(DEB_BUILD_ARCH); cp $$f debian/qemu-arm-static/etc/sysctl.d/qemu-arm-static.sysctl.conf +endif + touch $@ + +binary-indep: + +binary-arch: install + dh_testdir + dh_testroot + dh_installdocs -s debian/changelog.qemu debian/changelog.kvm + dh_installinit -s --no-restart-on-upgrade --error-handler=true + dh_installman -s + dh_installudev -s --priority=45 + dh_installchangelogs -s + dh_strip -s + dh_link -s + dh_compress -s + dh_fixperms -s + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s -Nkvm + dh_gencontrol -pkvm -- -v1:84+dfsg-0ubuntu16+$(debsrc_ver)+$(debian_rev) + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install --- qemu-kvm-0.11.0.orig/debian/patches/05_improve-qemu-img-errors.patch +++ qemu-kvm-0.11.0/debian/patches/05_improve-qemu-img-errors.patch @@ -0,0 +1,20 @@ +qemu-img: improve error reporting + +Use strerror to provide a better error message when qemu-img fails. + +https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/418112 + +Signed-off-by: Dustin Kirkland + +diff -uprN qemu-kvm-0.11.0~rc2/qemu-img.c qemu-kvm-0.11.0~rc2.new/qemu-img.c +--- qemu-kvm-0.11.0~rc2/qemu-img.c 2009-08-30 04:10:59.000000000 -0500 ++++ qemu-kvm-0.11.0~rc2.new/qemu-img.c 2009-09-10 22:30:32.572211443 -0500 +@@ -368,7 +368,7 @@ static int img_create(int argc, char **a + } else if (ret == -EFBIG) { + error("The image size is too large for file format '%s'", fmt); + } else { +- error("Error while formatting"); ++ error("Error while formatting (%s)", strerror(-ret)); + } + } + return 0; --- qemu-kvm-0.11.0.orig/debian/patches/08_fix_qemu-ifup.patch +++ qemu-kvm-0.11.0/debian/patches/08_fix_qemu-ifup.patch @@ -0,0 +1,32 @@ +From bc7e5d806d0ec01cb17cabf7b7c5bb48116c4df6 Mon Sep 17 00:00:00 2001 +From: Dustin Kirkland +Date: Thu, 17 Sep 2009 15:30:36 -0500 +Subject: [PATCH] update qemu-ifup for modern ip route output + +The output from the /sbin/ip utility has changed, adding two +more columns, which breaks the qemu-ifup script, as it was +depending on the last column being the interface name. + +Change this from $NF to $5. + +https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/430652 + +Signed-off-by: Dustin Kirkland +--- + kvm/scripts/qemu-ifup | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/kvm/scripts/qemu-ifup b/kvm/scripts/qemu-ifup +index 3bf8801..284b176 100755 +--- a/kvm/scripts/qemu-ifup ++++ b/kvm/scripts/qemu-ifup +@@ -1,5 +1,5 @@ + #!/bin/sh + +-switch=$(/sbin/ip route list | awk '/^default / { print $NF }') ++switch=$(/sbin/ip route list | awk '/^default / { print $5 }') + /sbin/ifconfig $1 0.0.0.0 up + /usr/sbin/brctl addif ${switch} $1 +-- +1.6.3.3 + --- qemu-kvm-0.11.0.orig/debian/patches/02_extboot_build_fixes.patch +++ qemu-kvm-0.11.0/debian/patches/02_extboot_build_fixes.patch @@ -0,0 +1,36 @@ +From e941daafed39ae5db507af42da8a35b60a8be363 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Thu, 30 Jul 2009 17:17:43 +0100 +Subject: [PATCH] Revert "Don't copy multiboot.bin into pc-bios after built" + +This reverts commit 24d904eab3e806dc4d1ccdabbc3b4dcb64ddf497. + +This ensures: + + a) extboot.bin is copied to pc-bios and installed + + b) the built mutliboot.bin overwrites the multiboot.bin + shipped in the tarball + +Signed-of-by: Mark McLoughlin +Fedora-patch: qemu-fix-optionrom-install.patch +--- + pc-bios/optionrom/Makefile | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 4cc3dae..e06ca72 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -41,6 +41,7 @@ build-all: multiboot.bin extboot.bin + + %.bin: %.raw + $(SRC_PATH)/pc-bios/optionrom/signrom.sh $< $@ ++ cp $@ $(SRC_PATH)/pc-bios/ + + clean: + $(RM) *.o *.img *.bin *~ +-- +1.6.2.5 + + --- qemu-kvm-0.11.0.orig/debian/patches/09_qemu-fix-qcow2-backing-file-with-virtio.patch +++ qemu-kvm-0.11.0/debian/patches/09_qemu-fix-qcow2-backing-file-with-virtio.patch @@ -0,0 +1,140 @@ +From 1df18d4a961a66b9ea28ab83b409f4d9d470f148 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Thu, 8 Oct 2009 15:02:08 +0200 +Subject: [PATCH] qcow2: Bring synchronous read/write back to life + +When the synchronous read and write functions were dropped, they were replaced +by generic emulation functions. Unfortunately, these emulation functions don't +provide the same semantics as the original functions did. + +The original bdrv_read would mean that we read some data synchronously and that +we won't be interrupted during this read. The latter assumption is no longer +true with the emulation function which needs to use qemu_aio_poll and therefore +allows the callback of any other concurrent AIO request to be run during the +read. Which in turn means that (meta)data read earlier could have changed and +be invalid now. qcow2 is not prepared to work in this way and it's just scary +how many places there are where other requests could run. + +I'm not sure yet where exactly it breaks, but you'll see breakage with virtio +on qcow2 with a backing file. Providing synchronous functions again fixes the +problem for me. + +Signed-off-by: Kevin Wolf +Signed-off-by: Mark McLoughlin +Fedora-patch: qemu-fix-qcow2-backing-file-with-virtio.patch +--- + block/qcow2-cluster.c | 6 ++-- + block/qcow2.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++- + block/qcow2.h | 3 ++ + 3 files changed, 55 insertions(+), 5 deletions(-) + +diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c +index d4631c3..4d0ce16 100644 +--- a/block/qcow2-cluster.c ++++ b/block/qcow2-cluster.c +@@ -306,8 +306,8 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, + } + + +-static int qcow_read(BlockDriverState *bs, int64_t sector_num, +- uint8_t *buf, int nb_sectors) ++int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, ++ int nb_sectors) + { + BDRVQcowState *s = bs->opaque; + int ret, index_in_cluster, n, n1; +@@ -358,7 +358,7 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect, + n = n_end - n_start; + if (n <= 0) + return 0; +- ret = qcow_read(bs, start_sect + n_start, s->cluster_data, n); ++ ret = qcow2_read(bs, start_sect + n_start, s->cluster_data, n); + if (ret < 0) + return ret; + if (s->crypt_method) { +diff --git a/block/qcow2.c b/block/qcow2.c +index dd32ea2..ced257e 100644 +--- a/block/qcow2.c ++++ b/block/qcow2.c +@@ -855,6 +855,51 @@ static int qcow_make_empty(BlockDriverState *bs) + return 0; + } + ++static int qcow2_write(BlockDriverState *bs, int64_t sector_num, ++ const uint8_t *buf, int nb_sectors) ++{ ++ BDRVQcowState *s = bs->opaque; ++ int ret, index_in_cluster, n; ++ uint64_t cluster_offset; ++ int n_end; ++ QCowL2Meta l2meta; ++ ++ while (nb_sectors > 0) { ++ memset(&l2meta, 0, sizeof(l2meta)); ++ ++ index_in_cluster = sector_num & (s->cluster_sectors - 1); ++ n_end = index_in_cluster + nb_sectors; ++ if (s->crypt_method && ++ n_end > QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors) ++ n_end = QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors; ++ cluster_offset = qcow2_alloc_cluster_offset(bs, sector_num << 9, ++ index_in_cluster, ++ n_end, &n, &l2meta); ++ if (!cluster_offset) ++ return -1; ++ if (s->crypt_method) { ++ qcow2_encrypt_sectors(s, sector_num, s->cluster_data, buf, n, 1, ++ &s->aes_encrypt_key); ++ ret = bdrv_pwrite(s->hd, cluster_offset + index_in_cluster * 512, ++ s->cluster_data, n * 512); ++ } else { ++ ret = bdrv_pwrite(s->hd, cluster_offset + index_in_cluster * 512, buf, n * 512); ++ } ++ if (ret != n * 512 || qcow2_alloc_cluster_link_l2(bs, cluster_offset, &l2meta) < 0) { ++ qcow2_free_any_clusters(bs, cluster_offset, l2meta.nb_clusters); ++ return -1; ++ } ++ nb_sectors -= n; ++ sector_num += n; ++ buf += n * 512; ++ if (l2meta.nb_clusters != 0) { ++ LIST_REMOVE(&l2meta, next_in_flight); ++ } ++ } ++ s->cluster_cache_offset = -1; /* disable compressed cache */ ++ return 0; ++} ++ + /* XXX: put compressed sectors first, then all the cluster aligned + tables to avoid losing bytes in alignment */ + static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num, +@@ -1037,8 +1082,10 @@ static BlockDriver bdrv_qcow2 = { + .bdrv_set_key = qcow_set_key, + .bdrv_make_empty = qcow_make_empty, + +- .bdrv_aio_readv = qcow_aio_readv, +- .bdrv_aio_writev = qcow_aio_writev, ++ .bdrv_read = qcow2_read, ++ .bdrv_write = qcow2_write, ++ .bdrv_aio_readv = qcow_aio_readv, ++ .bdrv_aio_writev = qcow_aio_writev, + .bdrv_write_compressed = qcow_write_compressed, + + .bdrv_snapshot_create = qcow2_snapshot_create, +diff --git a/block/qcow2.h b/block/qcow2.h +index 965a2f4..b41aa63 100644 +--- a/block/qcow2.h ++++ b/block/qcow2.h +@@ -202,6 +202,9 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, + int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, uint64_t cluster_offset, + QCowL2Meta *m); + ++int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, ++ int nb_sectors); ++ + /* qcow2-snapshot.c functions */ + int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info); + int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id); +-- +1.6.2.5 + --- qemu-kvm-0.11.0.orig/debian/patches/10_fix_scsi_hotplug.patch +++ qemu-kvm-0.11.0/debian/patches/10_fix_scsi_hotplug.patch @@ -0,0 +1,88 @@ +hotplug: fix scsi hotplug. + +Well, partly just papering over the issues. But without proper scsi bus +infrastructure we hardly can do better. Changes: + + * Avoid auto-attach by setting the bus number to -1. + * Ignore the unit value calculated by drive_init(). + * Explicitly attach the devices to the adapter. + * Add sanity checks. Don't allow attaching scsi drives to your + network device. + * Kill the bus+unit printing. The values are bogus, and we can't + easily figure the correct ones. I doubt this ever worked correctly + with multiple scsi adapters present in the system. + +Should come more close to the expected behavior now ... + +Oh, and pc-bios/bios.bin needs a update too, otherwise pci hotplug +doesn't work at all. + +Signed-off-by: Gerd Hoffmann +--- + hw/pci-hotplug.c | 24 +++++++++++++++++++----- + pc-bios/bios.bin | Bin 131072 -> 131072 bytes + 2 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c +index d0f2911..8bedea2 100644 +--- a/hw/pci-hotplug.c ++++ b/hw/pci-hotplug.c +@@ -52,9 +52,10 @@ void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts) + { + int dom, pci_bus; + unsigned slot; +- int drive_idx, type, bus; ++ int drive_idx, type; + int success = 0; + PCIDevice *dev; ++ char buf[128]; + + if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) { + return; +@@ -74,11 +75,19 @@ void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts) + return; + } + type = drives_table[drive_idx].type; +- bus = drive_get_max_bus (type); + + switch (type) { + case IF_SCSI: ++ if (!dev->qdev.info || strcmp(dev->qdev.info->name, "lsi53c895a") != 0) { ++ monitor_printf(mon, "Device is not a scsi adapter\n"); ++ break; ++ } + success = 1; ++ drives_table[drive_idx].bus = -1; ++ drives_table[drive_idx].unit = -1; ++ if (get_param_value(buf, sizeof(buf), "unit", opts)) { ++ drives_table[drive_idx].unit = atoi(buf); ++ } + lsi_scsi_attach(&dev->qdev, drives_table[drive_idx].bdrv, + drives_table[drive_idx].unit); + break; +@@ -87,9 +96,7 @@ void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts) + } + + if (success) +- monitor_printf(mon, "OK bus %d, unit %d\n", +- drives_table[drive_idx].bus, +- drives_table[drive_idx].unit); ++ monitor_printf(mon, "OK\n"); + return; + } + +@@ -130,7 +137,14 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, + + switch (type) { + case IF_SCSI: ++ drives_table[drive_idx].bus = -1; ++ drives_table[drive_idx].unit = -1; ++ if (get_param_value(buf, sizeof(buf), "unit", opts)) { ++ drives_table[drive_idx].unit = atoi(buf); ++ } + dev = pci_create("lsi53c895a", devaddr); ++ lsi_scsi_attach(&dev->qdev, drives_table[drive_idx].bdrv, ++ drives_table[drive_idx].unit); + break; + case IF_VIRTIO: + dev = pci_create("virtio-blk-pci", devaddr); --- qemu-kvm-0.11.0.orig/debian/patches/07_right_ctrl_grab.patch +++ qemu-kvm-0.11.0/debian/patches/07_right_ctrl_grab.patch @@ -0,0 +1,122 @@ +From 69420a8cc941699e10824f6ef31ee0636fec394f Mon Sep 17 00:00:00 2001 +From: Dustin Kirkland +Date: Thu, 17 Sep 2009 15:16:01 -0500 +Subject: [PATCH] offer right-ctrl as a grab option + +Add support for -ctrl-grab to use the right-ctrl button to grab/release +the mouse in SDL. + +The multi-button ctrl-alt and ctrl-alt-shift grab buttons present an +accessibility problem to users who cannot press more than one button +at a time. + +https://bugs.edge.launchpad.net/qemu/+bug/237635 + +Signed-off-by: Dustin Kirkkland +--- + qemu-options.hx | 10 ++++++++++ + sdl.c | 21 ++++++++++++--------- + sysemu.h | 1 + + vl.c | 4 ++++ + 4 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/qemu-options.hx b/qemu-options.hx +index d3aa55b..19377da 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -478,6 +478,16 @@ Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). + ETEXI + + #ifdef CONFIG_SDL ++DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, ++ "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n") ++#endif ++STEXI ++@item -ctrl-grab ++ ++Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). ++ETEXI ++ ++#ifdef CONFIG_SDL + DEF("no-quit", 0, QEMU_OPTION_no_quit, + "-no-quit disable SDL window close capability\n") + #endif +diff --git a/sdl.c b/sdl.c +index 42b6f37..61e8fdf 100644 +--- a/sdl.c ++++ b/sdl.c +@@ -413,12 +413,13 @@ static void sdl_update_caption(void) + + if (!vm_running) + status = " [Stopped]"; +- else if (gui_grab) { +- if (!alt_grab) +- status = " - Press Ctrl-Alt to exit grab"; +- else ++ else if (gui_grab) ++ if (alt_grab) + status = " - Press Ctrl-Alt-Shift to exit grab"; +- } ++ else if (ctrl_grab) ++ status = " - Press Right-Ctrl to exit grab"; ++ else ++ status = " - Press Ctrl-Alt to exit grab"; + + if (qemu_name) { + snprintf(win_title, sizeof(win_title), "QEMU (%s)%s", qemu_name, status); +@@ -557,12 +558,14 @@ static void sdl_refresh(DisplayState *ds) + case SDL_KEYDOWN: + case SDL_KEYUP: + if (ev->type == SDL_KEYDOWN) { +- if (!alt_grab) { +- mod_state = (SDL_GetModState() & gui_grab_code) == +- gui_grab_code; +- } else { ++ if (alt_grab) { + mod_state = (SDL_GetModState() & (gui_grab_code | KMOD_LSHIFT)) == + (gui_grab_code | KMOD_LSHIFT); ++ } else if (ctrl_grab) { ++ mod_state = (SDL_GetModState() & KMOD_RCTRL) == KMOD_RCTRL; ++ } else { ++ mod_state = (SDL_GetModState() & gui_grab_code) == ++ gui_grab_code; + } + gui_key_modifier_pressed = mod_state; + if (gui_key_modifier_pressed) { +diff --git a/sysemu.h b/sysemu.h +index 644a97d..68b6b0f 100644 +--- a/sysemu.h ++++ b/sysemu.h +@@ -125,6 +125,7 @@ extern const char *keyboard_layout; + extern int win2k_install_hack; + extern int rtc_td_hack; + extern int alt_grab; ++extern int ctrl_grab; + extern int usb_enabled; + extern int smp_cpus; + extern int max_cpus; +diff --git a/vl.c b/vl.c +index eb01da7..1884cf5 100644 +--- a/vl.c ++++ b/vl.c +@@ -242,6 +242,7 @@ int old_param = 0; + #endif + const char *qemu_name; + int alt_grab = 0; ++int ctrl_grab = 0; + #if defined(TARGET_SPARC) || defined(TARGET_PPC) + unsigned int nb_prom_envs = 0; + const char *prom_envs[MAX_PROM_ENVS]; +@@ -5197,6 +5198,9 @@ int main(int argc, char **argv, char **envp) + case QEMU_OPTION_alt_grab: + alt_grab = 1; + break; ++ case QEMU_OPTION_ctrl_grab: ++ ctrl_grab = 1; ++ break; + case QEMU_OPTION_no_quit: + no_quit = 1; + break; +-- +1.6.3.3 + --- qemu-kvm-0.11.0.orig/debian/patches/series +++ qemu-kvm-0.11.0/debian/patches/series @@ -0,0 +1,9 @@ +02_extboot_build_fixes.patch +05_improve-qemu-img-errors.patch +06_set_sdl_title.patch +07_right_ctrl_grab.patch +08_fix_qemu-ifup.patch +60_armv4l-typo.patch +09_qemu-fix-qcow2-backing-file-with-virtio.patch +10_fix_scsi_hotplug.patch +11_fix_virtio-blk_hot_add_after_remove.patch --- qemu-kvm-0.11.0.orig/debian/patches/60_armv4l-typo.patch +++ qemu-kvm-0.11.0/debian/patches/60_armv4l-typo.patch @@ -0,0 +1,30 @@ +From a302c32ded4d458fead907a98d079e8fb15f7b08 Mon Sep 17 00:00:00 2001 +From: Laurent Desnogues +Date: Sat, 18 Jul 2009 14:23:39 +0200 +Subject: [PATCH] this patch fixes a typo where armv4l was incorrectly spelled arm4l, + preventing the correct handling of --cpu=armv4l. + +Laurent + +Signed-off-by: Laurent Desnogues +Signed-off-by: Andrzej Zaborowski +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 4e49348..1504efb 100755 +--- a/configure ++++ b/configure +@@ -1519,7 +1519,7 @@ case "$cpu" in + i386|x86_64|alpha|cris|hppa|ia64|m68k|microbaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64) + ARCH=$cpu + ;; +- armv4b|arm4l) ++ armv4b|armv4l) + ARCH=arm + ;; + *) +-- +1.6.3.3 + --- qemu-kvm-0.11.0.orig/debian/patches/06_set_sdl_title.patch +++ qemu-kvm-0.11.0/debian/patches/06_set_sdl_title.patch @@ -0,0 +1,47 @@ +qemu: improve sdl title information + +Include the `-name XXX` commandline param in the gnome-panel window list +via icon_title. + +https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/423076 + +From: Dominic Evans +Subject: [Qemu-devel] [PATCH] Set SDL icon_title when using `-name XXX` for proper gnome-panel window list integration +Date: Thu, 17 Sep 2009 12:09:51 +0100 + +diff --git a/sdl.c b/sdl.c +index de63c7f..42b6f37 100644 +--- a/sdl.c ++++ b/sdl.c +@@ -407,7 +407,8 @@ static void sdl_process_key(SDL_KeyboardEvent *ev) + + static void sdl_update_caption(void) + { +- char buf[1024]; ++ char win_title[1024]; ++ char icon_title[1024]; + const char *status = ""; + + if (!vm_running) +@@ -419,12 +420,15 @@ static void sdl_update_caption(void) + status = " - Press Ctrl-Alt-Shift to exit grab"; + } + +- if (qemu_name) +- snprintf(buf, sizeof(buf), "QEMU (%s)%s", qemu_name, status); +- else +- snprintf(buf, sizeof(buf), "QEMU%s", status); ++ if (qemu_name) { ++ snprintf(win_title, sizeof(win_title), "QEMU (%s)%s", qemu_name, status); ++ snprintf(icon_title, sizeof(icon_title), "QEMU (%s)", qemu_name); ++ } else { ++ snprintf(win_title, sizeof(win_title), "QEMU%s", status); ++ snprintf(icon_title, sizeof(icon_title), "QEMU"); ++ } + +- SDL_WM_SetCaption(buf, "QEMU"); ++ SDL_WM_SetCaption(win_title, icon_title); + } + + static void sdl_hide_cursor(void) + --- qemu-kvm-0.11.0.orig/debian/patches/11_fix_virtio-blk_hot_add_after_remove.patch +++ qemu-kvm-0.11.0/debian/patches/11_fix_virtio-blk_hot_add_after_remove.patch @@ -0,0 +1,178 @@ +Fix virtio-blk hot add after remove + +qdev_init_bdrv() expects that each drive added is the next logical unit for +the given interface type. However, when dealing with hotplug, there may +be holes in the units. drive_init reclaims holes in units but qdev_init_bdrv() +is not smart enough to do this. + +Fortunately, in master, this has all been rewritten so for stable, let's hack +around this a bit. To fix this, we need to tell qdev that a device has been +removed so that it can keep track of which units are allocated. The only way +we can get a hook for this though is to attach to the pci uninit callback. In +order for virtio-blk to get this, another uninit callback needs to be added to +the virtio layer. + +Suggestions for a less ugly solution are appreciated. + +This fixes https://bugs.launchpad.net/bugs/419590 + +Signed-off-by: Anthony Liguori +--- + hw/qdev.c | 33 ++++++++++++++++++++++++++++++--- + hw/virtio-blk.c | 8 ++++++++ + hw/virtio-pci.c | 19 ++++++++++++++++++- + hw/virtio.h | 1 + + sysemu.h | 2 ++ + 5 files changed, 59 insertions(+), 4 deletions(-) + +diff --git a/hw/qdev.c b/hw/qdev.c +index faecc76..af60e3e 100644 +--- a/hw/qdev.c ++++ b/hw/qdev.c +@@ -181,21 +181,48 @@ void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr) + memcpy(macaddr, dev->nd->macaddr, 6); + } + +-static int next_block_unit[IF_COUNT]; ++typedef struct BlockUnitState ++{ ++ BlockDriverState *bs[32]; ++} BlockUnitState; ++static BlockUnitState next_block_unit[IF_COUNT]; + + /* Get a block device. This should only be used for single-drive devices + (e.g. SD/Floppy/MTD). Multi-disk devices (scsi/ide) should use the + appropriate bus. */ + BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type) + { +- int unit = next_block_unit[type]++; ++ BlockDriverState *bs; ++ int unit; + int index; + ++ unit = 0; ++ while (next_block_unit[type].bs[unit]) { ++ unit++; ++ } ++ + index = drive_get_index(type, 0, unit); + if (index == -1) { + return NULL; + } +- return drives_table[index].bdrv; ++ ++ bs = drives_table[index].bdrv; ++ next_block_unit[type].bs[unit] = bs; ++ ++ return bs; ++} ++ ++void qdev_uninit_bdrv(BlockDriverState *bs, BlockInterfaceType type) ++{ ++ int unit; ++ ++ for (unit = 0; unit < 32; unit++) { ++ if (next_block_unit[type].bs[unit] == bs) { ++ break; ++ } ++ } ++ ++ next_block_unit[type].bs[unit] = NULL; + } + + BusState *qdev_get_child_bus(DeviceState *dev, const char *name) +diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c +index 5036b5b..4bc11e6 100644 +--- a/hw/virtio-blk.c ++++ b/hw/virtio-blk.c +@@ -414,6 +414,13 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id) + return 0; + } + ++static void virtio_blk_uninit(VirtIODevice *vdev) ++{ ++ VirtIOBlock *s = to_virtio_blk(vdev); ++ ++ qdev_uninit_bdrv(s->bs, IF_VIRTIO); ++} ++ + VirtIODevice *virtio_blk_init(DeviceState *dev) + { + VirtIOBlock *s; +@@ -430,6 +437,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev) + s->vdev.get_config = virtio_blk_update_config; + s->vdev.get_features = virtio_blk_get_features; + s->vdev.reset = virtio_blk_reset; ++ s->vdev.uninit = virtio_blk_uninit; + s->bs = bs; + s->rq = NULL; + if (strlen(ps = (char *)drive_get_serial(bs))) +diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c +index 703f4fe..00b3998 100644 +--- a/hw/virtio-pci.c ++++ b/hw/virtio-pci.c +@@ -375,6 +375,22 @@ static const VirtIOBindings virtio_pci_bindings = { + .load_queue = virtio_pci_load_queue, + }; + ++static int virtio_pci_uninit(PCIDevice *pci_dev) ++{ ++ VirtIOPCIProxy *proxy = container_of(pci_dev, VirtIOPCIProxy, pci_dev); ++ VirtIODevice *vdev = proxy->vdev; ++ ++ if (vdev->uninit) { ++ vdev->uninit(vdev); ++ } ++ ++ if (vdev->nvectors) { ++ return msix_uninit(pci_dev); ++ } ++ ++ return 0; ++} ++ + static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, + uint16_t vendor, uint16_t device, + uint16_t class_code, uint8_t pif) +@@ -407,10 +423,11 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, + PCI_ADDRESS_SPACE_MEM, + msix_mmio_map); + proxy->pci_dev.config_write = virtio_write_config; +- proxy->pci_dev.unregister = msix_uninit; + } else + vdev->nvectors = 0; + ++ proxy->pci_dev.unregister = virtio_pci_uninit; ++ + size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) + vdev->config_len; + if (size & (size-1)) + size = 1 << qemu_fls(size); +diff --git a/hw/virtio.h b/hw/virtio.h +index aa55677..330b317 100644 +--- a/hw/virtio.h ++++ b/hw/virtio.h +@@ -103,6 +103,7 @@ struct VirtIODevice + void (*get_config)(VirtIODevice *vdev, uint8_t *config); + void (*set_config)(VirtIODevice *vdev, const uint8_t *config); + void (*reset)(VirtIODevice *vdev); ++ void (*uninit)(VirtIODevice *vdev); + VirtQueue *vq; + const VirtIOBindings *binding; + void *binding_opaque; +diff --git a/sysemu.h b/sysemu.h +index ce25109..18f610b 100644 +--- a/sysemu.h ++++ b/sysemu.h +@@ -193,6 +193,8 @@ extern const char *drive_get_serial(BlockDriverState *bdrv); + extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv); + + BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type); ++void qdev_uninit_bdrv(BlockDriverState *bs, BlockInterfaceType type); ++ + + struct drive_opt { + const char *file; +-- +1.6.2.5 + +