From jforbes at fedoraproject.org Tue Jan 5 15:44:16 2010 From: jforbes at fedoraproject.org (Justin M. Forbes) Date: Tue, 5 Jan 2010 15:44:16 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec, 1.149, 1.150 qemu-add-ksm-support.patch, 1.5, NONE qemu-allow-pulseaudio-to-be-the-default.patch, 1.3, NONE qemu-bios-bigger-roms.patch, 1.12, NONE qemu-correctly-free-nic-info-structure.patch, 1.2, NONE qemu-disable-preadv-support.patch, 1.1, NONE qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch, 1.1, NONE qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch, 1.1, NONE qemu-fix-dropped-packets-with-non-virtio-nics.patch, 1.2, NONE qemu-fix-msr-count-potential-segfault.patch, 1.1, NONE qemu-improve-error-reporting-on-file-access.patch, 1.2, NONE qemu-parallels-image-format-overflow.patch, 1.1, NONE qemu-properly-save-kvm-system-time-registers.patch, 1.1, NONE qemu-slirp-use-after-free.patch, 1.1, NONE Message-ID: <20100105154416.3B82911C00D1@cvs1.fedora.phx.redhat.com> Author: jforbes Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18257 Modified Files: qemu.spec Removed Files: qemu-add-ksm-support.patch qemu-allow-pulseaudio-to-be-the-default.patch qemu-bios-bigger-roms.patch qemu-correctly-free-nic-info-structure.patch qemu-disable-preadv-support.patch qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch qemu-fix-dropped-packets-with-non-virtio-nics.patch qemu-fix-msr-count-potential-segfault.patch qemu-improve-error-reporting-on-file-access.patch qemu-parallels-image-format-overflow.patch qemu-properly-save-kvm-system-time-registers.patch qemu-slirp-use-after-free.patch Log Message: Update to 0.12.1.2 upstream Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -p -r1.149 -r1.150 --- qemu.spec 20 Nov 2009 18:28:20 -0000 1.149 +++ qemu.spec 5 Jan 2010 15:44:16 -0000 1.150 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.11.0 -Release: 12%{?dist} +Version: 0.12.1.2 +Release: 1%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -24,48 +24,8 @@ Source6: ksmtuned.init Source7: ksmtuned Source8: ksmtuned.conf -# Not upstream, why? -Patch01: qemu-bios-bigger-roms.patch - -# Works around broken linux-user build on ppc -Patch02: qemu-fix-linux-user-build-on-ppc.patch - -# Allow the pulseudio backend to be the default -Patch03: qemu-allow-pulseaudio-to-be-the-default.patch - -# Add KSM support - see https://fedoraproject.org/wiki/Features/KSM -Patch04: qemu-add-ksm-support.patch - -# Fix issue causing NIC hotplug confusion when no model is specified (#524022) -Patch05: qemu-correctly-free-nic-info-structure.patch - -# Do not exit during PCI hotplug when an invalid NIC model is passed (#524022) -Patch06: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch -Patch07: qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch - -# Improve error reporting on file access -Patch08: qemu-improve-error-reporting-on-file-access.patch - # Fix fs errors with virtio and qcow2 backing file (#524734) -Patch09: qemu-fix-qcow2-backing-file-with-virtio.patch - -# Fix potential segfault from too small MSR_COUNT (#528901) -Patch10: qemu-fix-msr-count-potential-segfault.patch - -# Properly save kvm time registers (#524229) -Patch11: qemu-properly-save-kvm-system-time-registers.patch - -# Fix dropped packets with non-virtio NICs (#531419) -Patch12: qemu-fix-dropped-packets-with-non-virtio-nics.patch - -# Temporarily disable preadv/pwritev support (#526549) -Patch13: qemu-disable-preadv-support.patch - -# Fix a use-after-free crasher in the slirp code (#539583) -Patch14: qemu-slirp-use-after-free.patch - -# Fix overflow in the parallels image format support (#533573) -Patch15: qemu-parallels-image-format-overflow.patch +Patch01: qemu-fix-qcow2-backing-file-with-virtio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -254,21 +214,7 @@ such as kvmtrace and kvm_stat. %prep %setup -q -n qemu-kvm-%{version} -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 -%patch04 -p1 -%patch05 -p1 -%patch06 -p1 -%patch07 -p1 -%patch08 -p1 -%patch09 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 +# %patch01 -p1 %build # --build-id option is used fedora 8 onwards for giving info to the debug packages. @@ -490,7 +436,9 @@ fi %{_bindir}/qemu %{_bindir}/qemu-system-x86_64 %{_datadir}/%{name}/bios.bin +%{_datadir}/%{name}/linuxboot.bin %{_datadir}/%{name}/multiboot.bin +%{_datadir}/%{name}/vapic.bin %{_datadir}/%{name}/vgabios.bin %{_datadir}/%{name}/vgabios-cirrus.bin %{_datadir}/%{name}/pxe-e1000.bin @@ -550,6 +498,10 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Mon Jan 4 2010 Justin M. Forbes - 2:0.12.1.2-1 +- Update to 0.12.1.2 upstream +- Remove patches included in upstream + * Fri Nov 20 2009 Mark McLoughlin - 2:0.11.0-12 - Fix a use-after-free crasher in the slirp code (#539583) - Fix overflow in the parallels image format support (#533573) --- qemu-add-ksm-support.patch DELETED --- --- qemu-allow-pulseaudio-to-be-the-default.patch DELETED --- --- qemu-bios-bigger-roms.patch DELETED --- --- qemu-correctly-free-nic-info-structure.patch DELETED --- --- qemu-disable-preadv-support.patch DELETED --- --- qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch DELETED --- --- qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch DELETED --- --- qemu-fix-dropped-packets-with-non-virtio-nics.patch DELETED --- --- qemu-fix-msr-count-potential-segfault.patch DELETED --- --- qemu-improve-error-reporting-on-file-access.patch DELETED --- --- qemu-parallels-image-format-overflow.patch DELETED --- --- qemu-properly-save-kvm-system-time-registers.patch DELETED --- --- qemu-slirp-use-after-free.patch DELETED --- From jforbes at fedoraproject.org Tue Jan 5 15:55:58 2010 From: jforbes at fedoraproject.org (Justin M. Forbes) Date: Tue, 5 Jan 2010 15:55:58 +0000 (UTC) Subject: [fedora-virt-maint] File qemu-kvm-0.12.1.2.tar.gz uploaded to lookaside cache by jforbes Message-ID: <20100105155558.CFC7A10F8C3@bastion2.fedora.phx.redhat.com> A file has been added to the lookaside cache for qemu: a5815ce191353751a32db20b7bf15403 qemu-kvm-0.12.1.2.tar.gz From jforbes at fedoraproject.org Tue Jan 5 15:57:30 2010 From: jforbes at fedoraproject.org (Justin M. Forbes) Date: Tue, 5 Jan 2010 15:57:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel .cvsignore, 1.15, 1.16 sources, 1.22, 1.23 Message-ID: <20100105155730.BA7E611C00D1@cvs1.fedora.phx.redhat.com> Author: jforbes Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21296 Modified Files: .cvsignore sources Log Message: Add qemu-kvm-0.12.1.2 to the lookaside Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 27 Apr 2009 14:25:53 -0000 1.15 +++ .cvsignore 5 Jan 2010 15:57:30 -0000 1.16 @@ -1 +1 @@ -qemu-kvm-*.tar.gz +qemu-kvm-0.12.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 28 Sep 2009 07:30:15 -0000 1.22 +++ sources 5 Jan 2010 15:57:30 -0000 1.23 @@ -1 +1 @@ -440837a062967102a68e634d57eaf719 qemu-kvm-0.11.0.tar.gz +a5815ce191353751a32db20b7bf15403 qemu-kvm-0.12.1.2.tar.gz From jforbes at fedoraproject.org Tue Jan 5 16:02:06 2010 From: jforbes at fedoraproject.org (Justin M. Forbes) Date: Tue, 5 Jan 2010 16:02:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.150,1.151 Message-ID: <20100105160206.26AD811C00D1@cvs1.fedora.phx.redhat.com> Author: jforbes Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22318 Modified Files: qemu.spec Log Message: Remove qemu-fix-qcow2-backing-file-with-virtio.patch Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -p -r1.150 -r1.151 --- qemu.spec 5 Jan 2010 15:44:16 -0000 1.150 +++ qemu.spec 5 Jan 2010 16:02:05 -0000 1.151 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.12.1.2 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -24,9 +24,6 @@ Source6: ksmtuned.init Source7: ksmtuned Source8: ksmtuned.conf -# Fix fs errors with virtio and qcow2 backing file (#524734) -Patch01: qemu-fix-qcow2-backing-file-with-virtio.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: rsync dev86 iasl @@ -214,8 +211,6 @@ such as kvmtrace and kvm_stat. %prep %setup -q -n qemu-kvm-%{version} -# %patch01 -p1 - %build # --build-id option is used fedora 8 onwards for giving info to the debug packages. extraldflags="-Wl,--build-id"; @@ -498,6 +493,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Mon Jan 4 2010 Justin M. Forbes - 2:0.12.1.2-2 +- Remove qcow2 virtio backing file patch + * Mon Jan 4 2010 Justin M. Forbes - 2:0.12.1.2-1 - Update to 0.12.1.2 upstream - Remove patches included in upstream From buildsys at fedoraproject.org Thu Jan 7 13:50:44 2010 From: buildsys at fedoraproject.org (buildsys at fedoraproject.org) Date: Thu, 7 Jan 2010 13:50:44 +0000 (UTC) Subject: [fedora-virt-maint] Broken dependencies: libguestfs Message-ID: <20100107135044.C2ABC1B801D@releng2.fedora.phx.redhat.com> libguestfs has broken dependencies in the development tree: On x86_64: 1:libguestfs-1.0.80-10.fc13.x86_64 requires gfs-utils On i386: 1:libguestfs-1.0.80-10.fc13.i686 requires gfs-utils Please resolve this as soon as possible. From rjones at fedoraproject.org Thu Jan 7 14:12:22 2010 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 7 Jan 2010 14:12:22 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch, NONE, 1.1 libguestfs.spec, 1.119, 1.120 Message-ID: <20100107141223.0406511C02BB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4351 Modified Files: libguestfs.spec Added Files: libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch Log Message: * Thu Jan 7 2010 Richard W.M. Jones - 1.0.80-11 - Remove gfs-utils (deprecated and removed from Fedora 13 by the upstream Cluster Suite developers). - Include patch to fix regression in qemu -serial stdio option. libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch: guestfs.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) --- NEW FILE libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch --- >From b4a4db522fed542f48aa60717e65061c5e83c919 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 7 Jan 2010 12:21:42 +0000 Subject: [PATCH] qemu: Upstream regression of -stdio serial option. Best explained by the comment in the code: /* Newer versions of qemu (from around 2009/12) changed the * behaviour of monitors so that an implicit '-monitor stdio' is * assumed if we are in -nographic mode and there is no other * -monitor option. Only a single stdio device is allowed, so * this broke the '-serial stdio' option. There is a new flag * called -nodefaults which gets rid of all this default crud, so * let's use that to avoid this and any future surprises. */ --- src/guestfs.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/guestfs.c b/src/guestfs.c index 7cc09ce..a3d2762 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -1091,15 +1091,28 @@ guestfs__launch (guestfs_h *g) */ g->cmdline[0] = g->qemu; - snprintf (buf, sizeof buf, "%d", g->memsize); - add_cmdline (g, "-m"); - add_cmdline (g, buf); + /* Newer versions of qemu (from around 2009/12) changed the + * behaviour of monitors so that an implicit '-monitor stdio' is + * assumed if we are in -nographic mode and there is no other + * -monitor option. Only a single stdio device is allowed, so + * this broke the '-serial stdio' option. There is a new flag + * called -nodefaults which gets rid of all this default crud, so + * let's use that to avoid this and any future surprises. + */ + if (qemu_supports (g, "-nodefaults")) + add_cmdline (g, "-nodefaults"); - add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */ add_cmdline (g, "-nographic"); add_cmdline (g, "-serial"); add_cmdline (g, "stdio"); + snprintf (buf, sizeof buf, "%d", g->memsize); + add_cmdline (g, "-m"); + add_cmdline (g, buf); + + /* Force exit instead of reboot on panic */ + add_cmdline (g, "-no-reboot"); + /* These options recommended by KVM developers to improve reliability. */ if (qemu_supports (g, "-no-hpet")) add_cmdline (g, "-no-hpet"); -- 1.6.5.2 Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -p -r1.119 -r1.120 --- libguestfs.spec 29 Dec 2009 10:49:50 -0000 1.119 +++ libguestfs.spec 7 Jan 2010 14:12:22 -0000 1.120 @@ -5,7 +5,7 @@ Summary: Access and modify virtual m Name: libguestfs Epoch: 1 Version: 1.0.80 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -18,6 +18,9 @@ Patch0: libguestfs-1.0.79-no-fuse-t # Work around udevsettle command broken in Fedora 13 (RHBZ#548121). Patch1: libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch +# Fix regression in qemu -serial stdio option. +Patch2: libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -41,7 +44,7 @@ BuildRequires: kernel, bash, coreutils, BuildRequires: MAKEDEV, net-tools, augeas-libs, file BuildRequires: module-init-tools, procps, strace, iputils BuildRequires: dosfstools, zerofree, lsof, scrub, libselinux -BuildRequires: parted, btrfs-progs, gfs-utils, gfs2-utils +BuildRequires: parted, btrfs-progs, gfs2-utils BuildRequires: hfsplus-tools, nilfs-utils, reiserfs-utils BuildRequires: jfsutils, xfsprogs %ifarch %{ix86} x86_64 @@ -53,7 +56,7 @@ Requires: kernel, bash, coreutils, Requires: MAKEDEV, net-tools, augeas-libs, file Requires: module-init-tools, procps, strace, iputils Requires: dosfstools, zerofree, lsof, scrub, libselinux -Requires: parted, btrfs-progs, gfs-utils, gfs2-utils +Requires: parted, btrfs-progs, gfs2-utils Requires: hfsplus-tools, nilfs-utils, reiserfs-utils Requires: jfsutils, xfsprogs %ifarch %{ix86} x86_64 @@ -338,6 +341,7 @@ Requires: jpackage-utils %patch0 -p1 %patch1 -p1 +%patch2 -p1 mkdir -p daemon/m4 @@ -612,6 +616,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 7 2010 Richard W.M. Jones - 1.0.80-11 +- Remove gfs-utils (deprecated and removed from Fedora 13 by the + upstream Cluster Suite developers). +- Include patch to fix regression in qemu -serial stdio option. + * Tue Dec 29 2009 Richard W.M. Jones - 1.0.80-10 - Remove some debugging statements which were left in the requires script by accident. From buildsys at fedoraproject.org Fri Jan 8 13:16:30 2010 From: buildsys at fedoraproject.org (buildsys at fedoraproject.org) Date: Fri, 8 Jan 2010 13:16:30 +0000 (UTC) Subject: [fedora-virt-maint] Broken dependencies: libguestfs Message-ID: <20100108131630.147AF1B8025@releng2.fedora.phx.redhat.com> libguestfs has broken dependencies in the development tree: On x86_64: 1:libguestfs-1.0.80-10.fc13.x86_64 requires gfs-utils On i386: 1:libguestfs-1.0.80-10.fc13.i686 requires gfs-utils Please resolve this as soon as possible. From rjones at fedoraproject.org Fri Jan 8 17:49:38 2010 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 8 Jan 2010 17:49:38 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs.spec, 1.120, 1.121 Message-ID: <20100108174938.4AD8111C0095@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21354 Modified Files: libguestfs.spec Log Message: qemu in Rawhide is totally broken (RHBZ#553689). Disable tests. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -p -r1.120 -r1.121 --- libguestfs.spec 7 Jan 2010 14:12:22 -0000 1.120 +++ libguestfs.spec 8 Jan 2010 17:49:37 -0000 1.121 @@ -5,7 +5,7 @@ Summary: Access and modify virtual m Name: libguestfs Epoch: 1 Version: 1.0.80 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -397,9 +397,10 @@ export LIBGUESTFS_DEBUG=1 # 516096 ? F-11 race condition in swapoff/blockdev --rereadpt # 516543 ? F-12 qemu-kvm segfaults when run inside a VM (FIXED) # 548121 all F-13 udevsettle command is broken (WORKAROUND) +# 553689 all F-13 qemu is totally broken %ifarch x86_64 -make check +#make check %endif @@ -616,6 +617,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 8 2010 Richard W.M. Jones - 1.0.80-12 +- qemu in Rawhide is totally broken (RHBZ#553689). Disable tests. + * Thu Jan 7 2010 Richard W.M. Jones - 1.0.80-11 - Remove gfs-utils (deprecated and removed from Fedora 13 by the upstream Cluster Suite developers).