From markmc at fedoraproject.org Fri May 1 12:14:28 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 1 May 2009 12:14:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.86,1.87 Message-ID: <20090501121428.9314470133@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18189 Modified Files: qemu.spec Log Message: * Fri May 1 2009 Mark McLoughlin - 2:0.10-16 - Really provide qemu-kvm as a metapackage Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -p -r1.86 -r1.87 --- qemu.spec 28 Apr 2009 00:37:11 -0000 1.86 +++ qemu.spec 1 May 2009 12:13:58 -0000 1.87 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 15%{?dist} +Release: 16%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -377,6 +377,9 @@ fi %files %defattr(-,root,root) +%files kvm +%defattr(-,root,root) + %files common %defattr(-,root,root) %doc %{qemudocdir}/Changelog @@ -475,6 +478,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Fri May 1 2009 Mark McLoughlin - 2:0.10-16 +- Really provide qemu-kvm as a metapackage + * Fri Apr 27 2009 Glauber Costa - 2:0.10-15 - provide qemu-kvm as a metapackage From markmc at fedoraproject.org Fri May 1 12:16:48 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 1 May 2009 12:16:48 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.89,1.90 Message-ID: <20090501121648.706CA7011D@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19263 Modified Files: qemu.spec Log Message: * Fri May 1 2009 Mark McLoughlin - 2:0.10.50-3.kvm85 - Really provide qemu-kvm as a metapackage for comps Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- qemu.spec 28 Apr 2009 06:33:00 -0000 1.89 +++ qemu.spec 1 May 2009 12:16:18 -0000 1.90 @@ -5,7 +5,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.50 -Release: 2.%{kvmvertag}%{?dist} +Release: 3.%{kvmvertag}%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -372,6 +372,9 @@ fi %files %defattr(-,root,root) +%files kvm +%defattr(-,root,root) + %files common %defattr(-,root,root) %doc %{qemudocdir}/Changelog @@ -471,6 +474,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Fri May 1 2009 Mark McLoughlin - 2:0.10.50-3.kvm85 +- Really provide qemu-kvm as a metapackage for comps + * Tue Apr 28 2009 Mark McLoughlin - 2:0.10.50-2.kvm85 - Provide qemu-kvm as a metapackage for comps From rel-eng at fedoraproject.org Fri May 1 13:07:06 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Fri, 01 May 2009 13:07:06 -0000 Subject: [fedora-virt-maint] #1705: Please tag qemu-0.10-16.fc11 Message-ID: <049.f1dd1294cbd1f2f4d04f8f114c10dd85@fedoraproject.org> #1705: Please tag qemu-0.10-16.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- Brown paper bag time When we created the qemu-kvm meta-package, we forgot to include a %files section for it, so the meta-package was never actually created it. This build just fixes that problem. I've tested locally and it's fine. See https://bugzilla.redhat.com/497602 - we need this because comps pulls in the qemu-kvm meta-package. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Fri May 1 13:29:30 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Fri, 01 May 2009 13:29:30 -0000 Subject: [fedora-virt-maint] Re: #1705: Please tag qemu-0.10-16.fc11 In-Reply-To: <049.f1dd1294cbd1f2f4d04f8f114c10dd85@fedoraproject.org> References: <049.f1dd1294cbd1f2f4d04f8f114c10dd85@fedoraproject.org> Message-ID: <058.18a3245d28af3f97864327dcccc95016@fedoraproject.org> #1705: Please tag qemu-0.10-16.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by rdieter): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From berrange at fedoraproject.org Tue May 5 13:01:45 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 5 May 2009 13:01:45 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-shared-readonly-label.patch, NONE, 1.1 libvirt.spec, 1.125, 1.126 Message-ID: <20090505130145.A462370108@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29280 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-shared-readonly-label.patch Log Message: Fix labelling of shared/readonly disks (rhbz #493692) libvirt-0.6.2-shared-readonly-label.patch: --- NEW FILE libvirt-0.6.2-shared-readonly-label.patch --- diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c --- libvirt-0.6.2/src/security_selinux.c 2009-04-03 15:36:56.000000000 +0100 +++ libvirt-0.6.2.new/src/security_selinux.c 2009-05-05 13:39:42.000000000 +0100 @@ -24,11 +24,12 @@ #include "virterror_internal.h" #include "util.h" #include "memory.h" - +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_SECURITY static char default_domain_context[1024]; +static char default_content_context[1024]; static char default_image_context[1024]; #define SECURITY_SELINUX_VOID_DOI "0" #define SECURITY_SELINUX_NAME "selinux" @@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn) close(fd); ptr = strchrnul(default_image_context, '\n'); - *ptr = '\0'; - + if (*ptr == '\n') { + *ptr = '\0'; + strcpy(default_content_context, ptr+1); + ptr = strchrnul(default_content_context, '\n'); + if (*ptr == '\n') + *ptr = '\0'; + } return 0; } @@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co { char ebuf[1024]; + VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); + if(setfilecon(path, tcon) < 0) { virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: unable to set security context " @@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn char *newpath = NULL; const char *path = disk->src; + /* Don't restore labels on readoly/shared disks, because + * other VMs may still be accessing these */ if (disk->readonly || disk->shared) return 0; @@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (secdef->imagelabel) + if (disk->shared) { + return SELinuxSetFilecon(conn, disk->src, default_image_context); + } else if (disk->readonly) { + return SELinuxSetFilecon(conn, disk->src, default_content_context); + } else if (secdef->imagelabel) { return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel); + } return 0; } @@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co if (secdef->imagelabel) { for (i = 0 ; i < vm->def->ndisks ; i++) { - if (vm->def->disks[i]->readonly || - vm->def->disks[i]->shared) continue; - if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0) return -1; } Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -p -r1.125 -r1.126 --- libvirt.spec 28 Apr 2009 10:57:59 -0000 1.125 +++ libvirt.spec 5 May 2009 13:01:15 -0000 1.126 @@ -66,13 +66,15 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream Patch0: libvirt-0.6.2-qemu-drive-format.patch +# Fix shared/readonly disk labelling +Patch1: libvirt-0.6.2-shared-readonly-label.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -228,6 +230,7 @@ of recent versions of Linux (and other O %setup -q %patch0 -p1 +%patch1 -p1 %patch200 -p0 @@ -551,6 +554,9 @@ fi %endif %changelog +* Tue May 5 2009 Daniel P. Berrange - 0.6.2-4.fc11 +- Fix labelling of shared/readonly disks (rhbz #493692) + * Tue Apr 28 2009 Daniel Veillard - 0.6.2-3.fc11 - Fix missing directories in spec (#496945 and gtk-doc) From berrange at fedoraproject.org Tue May 5 13:38:57 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 5 May 2009 13:38:57 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-shared-readonly-label.patch, NONE, 1.1 libvirt.spec, 1.127, 1.128 Message-ID: <20090505133857.2892270108@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1851 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-shared-readonly-label.patch Log Message: Fix readonly/shared disk image labelling (rhbz #493692) libvirt-0.6.3-shared-readonly-label.patch: --- NEW FILE libvirt-0.6.3-shared-readonly-label.patch --- diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c --- libvirt-0.6.2/src/security_selinux.c 2009-04-03 15:36:56.000000000 +0100 +++ libvirt-0.6.2.new/src/security_selinux.c 2009-05-05 13:39:42.000000000 +0100 @@ -24,11 +24,12 @@ #include "virterror_internal.h" #include "util.h" #include "memory.h" - +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_SECURITY static char default_domain_context[1024]; +static char default_content_context[1024]; static char default_image_context[1024]; #define SECURITY_SELINUX_VOID_DOI "0" #define SECURITY_SELINUX_NAME "selinux" @@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn) close(fd); ptr = strchrnul(default_image_context, '\n'); - *ptr = '\0'; - + if (*ptr == '\n') { + *ptr = '\0'; + strcpy(default_content_context, ptr+1); + ptr = strchrnul(default_content_context, '\n'); + if (*ptr == '\n') + *ptr = '\0'; + } return 0; } @@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co { char ebuf[1024]; + VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); + if(setfilecon(path, tcon) < 0) { virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: unable to set security context " @@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn char *newpath = NULL; const char *path = disk->src; + /* Don't restore labels on readoly/shared disks, because + * other VMs may still be accessing these */ if (disk->readonly || disk->shared) return 0; @@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (secdef->imagelabel) + if (disk->shared) { + return SELinuxSetFilecon(conn, disk->src, default_image_context); + } else if (disk->readonly) { + return SELinuxSetFilecon(conn, disk->src, default_content_context); + } else if (secdef->imagelabel) { return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel); + } return 0; } @@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co if (secdef->imagelabel) { for (i = 0 ; i < vm->def->ndisks ; i++) { - if (vm->def->disks[i]->readonly || - vm->def->disks[i]->shared) continue; - if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0) return -1; } Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- libvirt.spec 28 Apr 2009 10:53:22 -0000 1.127 +++ libvirt.spec 5 May 2009 13:38:26 -0000 1.128 @@ -55,13 +55,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream # N/A +Patch1: libvirt-0.6.3-shared-readonly-label.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -215,6 +216,7 @@ of recent versions of Linux (and other O %prep %setup -q +%patch1 -p1 %patch200 -p0 @@ -545,6 +547,9 @@ fi %endif %changelog +* Tue May 5 2009 Daniel Berrange - 0.6.3-4.fc12 +- Fix readonly/shared disk image labelling (rhbz #493692) + * Tue Apr 28 2009 Daniel Veillard - 0.6.3-3.fc12 - was also missing /usr/share/gtk-doc/html/libvirt in -devel From rel-eng at fedoraproject.org Mon May 4 15:37:28 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 04 May 2009 15:37:28 -0000 Subject: [fedora-virt-maint] Re: #1705: Please tag qemu-0.10-16.fc11 In-Reply-To: <049.f1dd1294cbd1f2f4d04f8f114c10dd85@fedoraproject.org> References: <049.f1dd1294cbd1f2f4d04f8f114c10dd85@fedoraproject.org> Message-ID: <058.7c6dd881b38adf64bc05a53185cd497b@fedoraproject.org> #1705: Please tag qemu-0.10-16.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by notting): * status: new => closed * resolution: => fixed Comment: +1, moved, tagged.b -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue May 5 13:30:49 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 05 May 2009 13:30:49 -0000 Subject: [fedora-virt-maint] Re: #1732: F11 tag request: libvirt-0.6.2-4.fc11 In-Reply-To: <051.ffb3dea63d63de298c4b94f6aef38e16@fedoraproject.org> References: <051.ffb3dea63d63de298c4b94f6aef38e16@fedoraproject.org> Message-ID: <060.85c66c334a12d27c224c70bcc9bfdbac@fedoraproject.org> #1732: F11 tag request: libvirt-0.6.2-4.fc11 ------------------------------+--------------------------------------------- Reporter: berrange | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Changes (by markmc): * cc: fedora-virt-maint at redhat.com (added) -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Tue May 5 13:57:18 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Tue, 05 May 2009 13:57:18 -0000 Subject: [fedora-virt-maint] Re: #1732: F11 tag request: libvirt-0.6.2-4.fc11 In-Reply-To: <051.ffb3dea63d63de298c4b94f6aef38e16@fedoraproject.org> References: <051.ffb3dea63d63de298c4b94f6aef38e16@fedoraproject.org> Message-ID: <060.3288db6982b59ff4f74583bc0e9067a7@fedoraproject.org> #1732: F11 tag request: libvirt-0.6.2-4.fc11 ------------------------------+--------------------------------------------- Reporter: berrange | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by jwboyer): * status: new => closed * resolution: => fixed Comment: moved, tagged. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From markmc at fedoraproject.org Wed May 6 15:46:28 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 15:46:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-hostdev-managed.patch, NONE, 1.1 Makefile, 1.2, 1.3 libvirt.spec, 1.128, 1.129 Message-ID: <20090506154628.7D0AA70108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2354 Modified Files: Makefile libvirt.spec Added Files: libvirt-0.6.3-hostdev-managed.patch Log Message: * Wed May 6 2009 Mark McLoughlin - 0.6.3-5.fc12 - Fix handling of (bug #499386) libvirt-0.6.3-hostdev-managed.patch: --- NEW FILE libvirt-0.6.3-hostdev-managed.patch --- >From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 6 May 2009 16:33:28 +0100 Subject: [PATCH] Fix qemu driver's interpretation of This change: Tue Mar 3 08:55:13 GMT 2009 Daniel P. Berrange Don't try to detach & reset PCI devices while running test suite for XML-> ARGV conversion. * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to detach and reset PCI devices. * src/qemu_conf.c: Don't detach & reset PCI devices while building the command line argv accidentally did this: - if (hostdev->managed) { + if (!hostdev->managed) { Which results in managed='yes' not causing the device to be detached when the guest is starting. Signed-off-by: Mark McLoughlin --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5898026..59312c0 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn, if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) continue; - if (!hostdev->managed) { + if (hostdev->managed) { pciDevice *dev = pciGetDevice(conn, hostdev->source.subsys.u.pci.domain, hostdev->source.subsys.u.pci.bus, -- 1.6.0.6 Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- Makefile 15 Oct 2007 19:05:00 -0000 1.2 +++ Makefile 6 May 2009 15:45:57 -0000 1.3 @@ -19,3 +19,7 @@ MAKEFILE_COMMON := $(shell $(checkout-ma endif include $(MAKEFILE_COMMON) + +ifeq ($(BRANCH),devel) +include Makefile.preview +endif Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- libvirt.spec 5 May 2009 13:38:26 -0000 1.128 +++ libvirt.spec 6 May 2009 15:45:57 -0000 1.129 @@ -55,14 +55,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream -# N/A Patch1: libvirt-0.6.3-shared-readonly-label.patch +Patch2: libvirt-0.6.3-hostdev-managed.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -217,6 +217,7 @@ of recent versions of Linux (and other O %prep %setup -q %patch1 -p1 +%patch2 -p1 %patch200 -p0 @@ -547,6 +548,9 @@ fi %endif %changelog +* Wed May 6 2009 Mark McLoughlin - 0.6.3-5.fc12 +- Fix handling of (bug #499386) + * Tue May 5 2009 Daniel Berrange - 0.6.3-4.fc12 - Fix readonly/shared disk image labelling (rhbz #493692) From markmc at fedoraproject.org Wed May 6 15:52:17 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 15:52:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.3-hostdev-managed.patch, NONE, 1.1 libvirt.spec, 1.126, 1.127 Message-ID: <20090506155217.D1CD070108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3157 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-hostdev-managed.patch Log Message: * Wed May 6 2009 Mark McLoughlin - 0.6.2-5.fc11 - Fix handling of (bug #499386) libvirt-0.6.3-hostdev-managed.patch: --- NEW FILE libvirt-0.6.3-hostdev-managed.patch --- >From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 6 May 2009 16:33:28 +0100 Subject: [PATCH] Fix qemu driver's interpretation of This change: Tue Mar 3 08:55:13 GMT 2009 Daniel P. Berrange Don't try to detach & reset PCI devices while running test suite for XML-> ARGV conversion. * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to detach and reset PCI devices. * src/qemu_conf.c: Don't detach & reset PCI devices while building the command line argv accidentally did this: - if (hostdev->managed) { + if (!hostdev->managed) { Which results in managed='yes' not causing the device to be detached when the guest is starting. Signed-off-by: Mark McLoughlin --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5898026..59312c0 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn, if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) continue; - if (!hostdev->managed) { + if (hostdev->managed) { pciDevice *dev = pciGetDevice(conn, hostdev->source.subsys.u.pci.domain, hostdev->source.subsys.u.pci.bus, -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- libvirt.spec 5 May 2009 13:01:15 -0000 1.126 +++ libvirt.spec 6 May 2009 15:51:47 -0000 1.127 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -75,6 +75,8 @@ Source: libvirt-%{version}.tar.gz Patch0: libvirt-0.6.2-qemu-drive-format.patch # Fix shared/readonly disk labelling Patch1: libvirt-0.6.2-shared-readonly-label.patch +# Fix +Patch2: libvirt-0.6.3-hostdev-managed.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -231,6 +233,7 @@ of recent versions of Linux (and other O %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch200 -p0 @@ -554,6 +557,9 @@ fi %endif %changelog +* Wed May 6 2009 Mark McLoughlin - 0.6.2-5.fc11 +- Fix handling of (bug #499386) + * Tue May 5 2009 Daniel P. Berrange - 0.6.2-4.fc11 - Fix labelling of shared/readonly disks (rhbz #493692) From markmc at fedoraproject.org Wed May 6 15:52:38 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 6 May 2009 15:52:38 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel Makefile,1.3,1.4 Message-ID: <20090506155238.B8F3270108@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3186 Modified Files: Makefile Log Message: Revert accidentally committed change Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- Makefile 6 May 2009 15:45:57 -0000 1.3 +++ Makefile 6 May 2009 15:52:08 -0000 1.4 @@ -19,7 +19,3 @@ MAKEFILE_COMMON := $(shell $(checkout-ma endif include $(MAKEFILE_COMMON) - -ifeq ($(BRANCH),devel) -include Makefile.preview -endif From crobinso at fedoraproject.org Wed May 6 16:04:08 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:04:08 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-11 virtinst-0.400.3-fix-pci-assign.patch, NONE, 1.1 python-virtinst.spec, 1.67, 1.68 Message-ID: <20090506160408.7AC0B70108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5296 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-pci-assign.patch Log Message: Fix PCI assignment (bz 499267) virtinst-0.400.3-fix-pci-assign.patch: --- NEW FILE virtinst-0.400.3-fix-pci-assign.patch --- diff -rup virtinst-0.400.3/virtinst/VirtualHostDevice.py new/virtinst/VirtualHostDevice.py --- virtinst-0.400.3/virtinst/VirtualHostDevice.py 2009-05-06 11:58:57.000000000 -0400 +++ new/virtinst/VirtualHostDevice.py 2009-05-06 11:59:20.000000000 -0400 @@ -201,8 +201,9 @@ class VirtualHostDevicePCI(VirtualHostDe try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.dettach() - self._nodedev.reset() + node = conn.nodeDeviceLookupByName(self._nodedev.name) + node.dettach() + node.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- python-virtinst.spec 21 Apr 2009 17:19:02 -0000 1.67 +++ python-virtinst.spec 6 May 2009 16:03:37 -0000 1.68 @@ -31,6 +31,8 @@ Patch6: %{appname}-%{version}-fix-floppy Patch7: %{appname}-%{version}-updated-trans.patch # Only throw warnings if we fail to relabel install media (bz 496340) Patch8: %{appname}-%{version}-selinux-warn.patch +# Fix PCI assignment detach/reset calls (bz 499267) +Patch9: %{appname}-%{version}-fix-pci-assign.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +67,7 @@ and install new VMs) and virt-clone (clo %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build python setup.py build @@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Wed May 06 2009 Cole Robinson - 0.400.3-8.fc11 +- Fix PCI assignment (bz 499267) + * Tue Apr 21 2009 Cole Robinson - 0.400.3-7.fc11 - Only warn if selinux labeling appears to be wrong (bz 496340) From crobinso at fedoraproject.org Wed May 6 16:11:18 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:11:18 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-11 python-virtinst.spec, 1.68, 1.69 Message-ID: <20090506161118.29AB170108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6153 Modified Files: python-virtinst.spec Log Message: Bump spec. Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- python-virtinst.spec 6 May 2009 16:03:37 -0000 1.68 +++ python-virtinst.spec 6 May 2009 16:10:47 -0000 1.69 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 7%{_extra_release} +Release: 8%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch From crobinso at fedoraproject.org Wed May 6 16:12:32 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:12:32 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.3-fix-pci-assign.patch, NONE, 1.1 python-virtinst.spec, 1.67, 1.68 Message-ID: <20090506161232.D83F570108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6435 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-pci-assign.patch Log Message: Fix PCI assignment (bz 499267) virtinst-0.400.3-fix-pci-assign.patch: --- NEW FILE virtinst-0.400.3-fix-pci-assign.patch --- diff -rup virtinst-0.400.3/virtinst/VirtualHostDevice.py new/virtinst/VirtualHostDevice.py --- virtinst-0.400.3/virtinst/VirtualHostDevice.py 2009-05-06 11:58:57.000000000 -0400 +++ new/virtinst/VirtualHostDevice.py 2009-05-06 11:59:20.000000000 -0400 @@ -201,8 +201,9 @@ class VirtualHostDevicePCI(VirtualHostDe try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.dettach() - self._nodedev.reset() + node = conn.nodeDeviceLookupByName(self._nodedev.name) + node.dettach() + node.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- python-virtinst.spec 21 Apr 2009 16:19:26 -0000 1.67 +++ python-virtinst.spec 6 May 2009 16:12:02 -0000 1.68 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 7%{_extra_release} +Release: 8%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch @@ -31,6 +31,8 @@ Patch6: %{appname}-%{version}-fix-floppy Patch7: %{appname}-%{version}-updated-trans.patch # Only throw warnings if we fail to relabel install media (bz 496340) Patch8: %{appname}-%{version}-selinux-warn.patch +# Fix PCI assignment detach/reset calls (bz 499267) +Patch9: %{appname}-%{version}-fix-pci-assign.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +67,7 @@ and install new VMs) and virt-clone (clo %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build python setup.py build @@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Wed May 06 2009 Cole Robinson - 0.400.3-8.fc12 +- Fix PCI assignment (bz 499267) + * Tue Apr 21 2009 Cole Robinson - 0.400.3-7.fc11 - Only warn if selinux labeling appears to be wrong (bz 496340) From crobinso at fedoraproject.org Wed May 6 16:33:04 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:33:04 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.3-refresh-qemu-caps.patch, NONE, 1.1 libvirt.spec, 1.127, 1.128 Message-ID: <20090506163304.78A6470108@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-refresh-qemu-caps.patch Log Message: Refresh qemu caps when getCapabilities is called (bug #460649) libvirt-0.6.3-refresh-qemu-caps.patch: --- NEW FILE libvirt-0.6.3-refresh-qemu-caps.patch --- commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720 Author: Cole Robinson Date: Mon May 4 15:06:03 2009 -0400 Refresh QEMU driver capabilities for each getCapabilities call. Also fix up a couple issues where caps are accessed without locking the driver structure. diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 23ea961..790dac6 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn, static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; - char *xml; + char *xml = NULL; qemuDriverLock(driver); - if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + virCapabilitiesFree(qemu_driver->caps); + if ((qemu_driver->caps = qemudCapsInit()) == NULL || + (xml = virCapabilitiesFormatXML(driver->caps)) == NULL) virReportOOMError(conn); qemuDriverUnlock(driver); @@ -3169,20 +3171,26 @@ cleanup: return ret; } -static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) +static int qemudNodeGetSecurityModel(virConnectPtr conn, + virSecurityModelPtr secmodel) { struct qemud_driver *driver = (struct qemud_driver *)conn->privateData; char *p; + int ret = 0; - if (!driver->securityDriver) - return -2; + qemuDriverLock(driver); + if (!driver->securityDriver) { + ret = -2; + goto cleanup; + } p = driver->caps->host.secModel.model; if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->model, p); @@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->doi, p); - return 0; + +cleanup: + qemuDriverUnlock(driver); + return ret; } /* TODO: check seclabel restore */ Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -r1.127 -r1.128 --- libvirt.spec 6 May 2009 15:51:47 -0000 1.127 +++ libvirt.spec 6 May 2009 16:32:34 -0000 1.128 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -77,6 +77,8 @@ Patch0: libvirt-0.6.2-qemu-drive-format. Patch1: libvirt-0.6.2-shared-readonly-label.patch # Fix Patch2: libvirt-0.6.3-hostdev-managed.patch +# Refresh qemu caps when getCapabilities is called (bz 460649) +Patch3: libvirt-0.6.3-refresh-qemu-caps.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -234,6 +236,7 @@ of recent versions of Linux (and other O %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch200 -p0 @@ -557,6 +560,9 @@ fi %endif %changelog +* Wed May 6 2009 Cole Robinson - 0.6.2-6.fc11 +- Refresh qemu caps when getCapabilities is called (bug #460649) + * Wed May 6 2009 Mark McLoughlin - 0.6.2-5.fc11 - Fix handling of (bug #499386) From crobinso at fedoraproject.org Wed May 6 16:33:46 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 6 May 2009 16:33:46 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-refresh-qemu-caps.patch, NONE, 1.1 libvirt.spec, 1.129, 1.130 Message-ID: <20090506163346.B4CA970131@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9542 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-refresh-qemu-caps.patch Log Message: Refresh qemu caps when getCapabilities is called (bug #460649) libvirt-0.6.3-refresh-qemu-caps.patch: --- NEW FILE libvirt-0.6.3-refresh-qemu-caps.patch --- commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720 Author: Cole Robinson Date: Mon May 4 15:06:03 2009 -0400 Refresh QEMU driver capabilities for each getCapabilities call. Also fix up a couple issues where caps are accessed without locking the driver structure. diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 23ea961..790dac6 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn, static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; - char *xml; + char *xml = NULL; qemuDriverLock(driver); - if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + virCapabilitiesFree(qemu_driver->caps); + if ((qemu_driver->caps = qemudCapsInit()) == NULL || + (xml = virCapabilitiesFormatXML(driver->caps)) == NULL) virReportOOMError(conn); qemuDriverUnlock(driver); @@ -3169,20 +3171,26 @@ cleanup: return ret; } -static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) +static int qemudNodeGetSecurityModel(virConnectPtr conn, + virSecurityModelPtr secmodel) { struct qemud_driver *driver = (struct qemud_driver *)conn->privateData; char *p; + int ret = 0; - if (!driver->securityDriver) - return -2; + qemuDriverLock(driver); + if (!driver->securityDriver) { + ret = -2; + goto cleanup; + } p = driver->caps->host.secModel.model; if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->model, p); @@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - return -1; + ret = -1; + goto cleanup; } strcpy(secmodel->doi, p); - return 0; + +cleanup: + qemuDriverUnlock(driver); + return ret; } /* TODO: check seclabel restore */ Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- libvirt.spec 6 May 2009 15:45:57 -0000 1.129 +++ libvirt.spec 6 May 2009 16:33:16 -0000 1.130 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -63,6 +63,8 @@ Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream Patch1: libvirt-0.6.3-shared-readonly-label.patch Patch2: libvirt-0.6.3-hostdev-managed.patch +# Refresh qemu caps when getCapabilities is called (bz 460649) +Patch3: libvirt-0.6.3-refresh-qemu-caps.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -218,6 +220,7 @@ of recent versions of Linux (and other O %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch200 -p0 @@ -548,6 +551,9 @@ fi %endif %changelog +* Wed May 6 2009 Cole Robinson - 0.6.3-6.fc12 +- Refresh qemu caps when getCapabilities is called (bug #460649) + * Wed May 6 2009 Mark McLoughlin - 0.6.3-5.fc12 - Fix handling of (bug #499386) From rel-eng at fedoraproject.org Wed May 6 20:15:52 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Wed, 06 May 2009 20:15:52 -0000 Subject: [fedora-virt-maint] #1748: Please tag libvirt-0.6.2-6.fc11 Message-ID: <049.3d1893f61228802376ef7eb9bb604b23@fedoraproject.org> #1748: Please tag libvirt-0.6.2-6.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- Two fixes: 1) https://bugzilla.redhat.com/460649 Make libvirtd notice at runtime when e.g. qemu is installed. Patch cherry-picked from upstream. This regularly confuses the heck out of people. 2) https://bugzilla.redhat.com/499386 Trivial one character fix to make KVM PCI device assignment work again. Package will be well tested in tomorrows test day. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Wed May 6 20:21:01 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Wed, 06 May 2009 20:21:01 -0000 Subject: [fedora-virt-maint] #1749: Please tag python-virtinst-0.400.3-8.fc11 Message-ID: <049.13828303934b597d7de0d16c8a700e04@fedoraproject.org> #1749: Please tag python-virtinst-0.400.3-8.fc11 -----------------------------+---------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- https://bugzilla.redhat.com/499267 Contains a single fix for PCI device assignment. A simple enough fix which, at worst, just doesn't fix the bug - i.e. it shouldn't cause any regressions. Package will be well tested by tomorrow's test day. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Wed May 6 20:30:54 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Wed, 06 May 2009 20:30:54 -0000 Subject: [fedora-virt-maint] Re: #1748: Please tag libvirt-0.6.2-6.fc11 In-Reply-To: <049.3d1893f61228802376ef7eb9bb604b23@fedoraproject.org> References: <049.3d1893f61228802376ef7eb9bb604b23@fedoraproject.org> Message-ID: <058.b010c7d87ea03af510f33acd45b084f1@fedoraproject.org> #1748: Please tag libvirt-0.6.2-6.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by spot): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Wed May 6 20:31:08 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Wed, 06 May 2009 20:31:08 -0000 Subject: [fedora-virt-maint] Re: #1749: Please tag python-virtinst-0.400.3-8.fc11 In-Reply-To: <049.13828303934b597d7de0d16c8a700e04@fedoraproject.org> References: <049.13828303934b597d7de0d16c8a700e04@fedoraproject.org> Message-ID: <058.0d940fc0680a13b72593066091676c9a@fedoraproject.org> #1749: Please tag python-virtinst-0.400.3-8.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by spot): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Wed May 6 20:51:06 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Wed, 06 May 2009 20:51:06 -0000 Subject: [fedora-virt-maint] Re: #1749: Please tag python-virtinst-0.400.3-8.fc11 In-Reply-To: <049.13828303934b597d7de0d16c8a700e04@fedoraproject.org> References: <049.13828303934b597d7de0d16c8a700e04@fedoraproject.org> Message-ID: <058.0687fcb5c3c373328a3ba2a995560ef3@fedoraproject.org> #1749: Please tag python-virtinst-0.400.3-8.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by wtogami): * status: new => closed * resolution: => fixed Comment: tagging -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Wed May 6 20:51:10 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Wed, 06 May 2009 20:51:10 -0000 Subject: [fedora-virt-maint] Re: #1748: Please tag libvirt-0.6.2-6.fc11 In-Reply-To: <049.3d1893f61228802376ef7eb9bb604b23@fedoraproject.org> References: <049.3d1893f61228802376ef7eb9bb604b23@fedoraproject.org> Message-ID: <058.a37e97a61f955753faed084e60a6b5fc@fedoraproject.org> #1748: Please tag libvirt-0.6.2-6.fc11 ------------------------------+--------------------------------------------- Reporter: markmc | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by wtogami): * status: new => closed * resolution: => fixed Comment: tagging -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From berrange at fedoraproject.org Thu May 7 11:55:53 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Thu, 7 May 2009 11:55:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-viewer/devel virt-viewer-0.0.3-auth-fixes.patch, NONE, 1.1 virt-viewer-0.0.3-keyboard-grab.patch, NONE, 1.1 virt-viewer.spec, 1.12, 1.13 Message-ID: <20090507115553.4AF5170108@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/virt-viewer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3580 Modified Files: virt-viewer.spec Added Files: virt-viewer-0.0.3-auth-fixes.patch virt-viewer-0.0.3-keyboard-grab.patch Log Message: Fix libvirt auth, VNC credential fetching & keyboard grabs virt-viewer-0.0.3-auth-fixes.patch: --- NEW FILE virt-viewer-0.0.3-auth-fixes.patch --- diff -rup virt-viewer-0.0.3.orig/src/main.c virt-viewer-0.0.3.new/src/main.c --- virt-viewer-0.0.3.orig/src/main.c 2008-03-10 14:49:48.000000000 +0000 +++ virt-viewer-0.0.3.new/src/main.c 2009-05-07 12:29:19.000000000 +0100 @@ -306,7 +306,7 @@ static void viewer_credential(GtkWidget switch (g_value_get_enum(cred)) { case VNC_DISPLAY_CREDENTIAL_USERNAME: case VNC_DISPLAY_CREDENTIAL_PASSWORD: - data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row])); + data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row++])); break; } } @@ -795,7 +795,10 @@ viewer_start (const char *uri, const cha verbose = set_verbose; - conn = virConnectOpenReadOnly(uri); + /* XXX Write a graphical auth prompter */ + conn = virConnectOpenAuth(uri, + virConnectAuthPtrDefault, + VIR_CONNECT_RO); if (!conn) { fprintf(stderr, "unable to connect to libvirt %s\n", uri ? uri : "xen"); virt-viewer-0.0.3-keyboard-grab.patch: --- NEW FILE virt-viewer-0.0.3-keyboard-grab.patch --- Only in virt-viewer-0.0.3.orig/src: .#main.c Only in virt-viewer-0.0.3.orig/src: #main.c# diff -rup virt-viewer-0.0.3.orig/src/main.c virt-viewer-0.0.3.new/src/main.c --- virt-viewer-0.0.3.orig/src/main.c 2009-05-07 12:40:03.000000000 +0100 +++ virt-viewer-0.0.3.new/src/main.c 2009-05-07 12:49:34.000000000 +0100 @@ -81,16 +81,21 @@ struct menuItem { guint menu; GtkWidget *label; const char *ungrabbed_text; - const char *grabbed_text; }; static struct menuItem menuItems[] = { - { FILE_MENU, NULL, "_File", "File" }, - { VIEW_MENU, NULL, "_View", "View" }, - { SEND_KEY_MENU, NULL, "_Send Key", "Send Key" }, - { HELP_MENU, NULL, "_Help", "Help" } + { FILE_MENU, NULL, "_File" }, + { VIEW_MENU, NULL, "_View" }, + { SEND_KEY_MENU, NULL, "_Send Key"}, + { HELP_MENU, NULL, "_Help" }, }; +static gboolean accelEnabled = TRUE; +static GValue accelSetting; +static GSList *accelList = NULL; +static int accelMenuSig[LAST_MENU]; + + static void viewer_set_title(VncDisplay *vnc G_GNUC_UNUSED, GtkWidget *window, gboolean grabbed) { char title[1024]; @@ -109,24 +114,89 @@ static void viewer_set_title(VncDisplay static void viewer_grab(GtkWidget *vnc, GtkWidget *window) { + viewer_set_title(VNC_DISPLAY(vnc), window, TRUE); +} + +static void viewer_ungrab(GtkWidget *vnc, GtkWidget *window) +{ + viewer_set_title(VNC_DISPLAY(vnc), window, FALSE); +} + +static void viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED, + GtkWindow *window G_GNUC_UNUSED) +{ + /* ignore accelerator */ +} + + +static void viewer_disable_modifiers(GtkWindow *window) +{ + GtkSettings *settings = gtk_settings_get_default(); + GValue empty; + GSList *accels; int i; - viewer_set_title(VNC_DISPLAY(vnc), window, TRUE); + if (!accelEnabled) + return; + + /* This stops F10 activating menu bar */ + memset(&empty, 0, sizeof empty); + g_value_init(&empty, G_TYPE_STRING); + g_object_get_property(G_OBJECT(settings), "gtk-menu-bar-accel", &accelSetting); + g_object_set_property(G_OBJECT(settings), "gtk-menu-bar-accel", &empty); + + /* This stops global accelerators like Ctrl+Q == Quit */ + for (accels = accelList ; accels ; accels = accels->next) { + gtk_window_remove_accel_group(GTK_WINDOW(window), accels->data); + } - for (i = 0 ; i < LAST_MENU; i++) { - gtk_label_set_text_with_mnemonic(GTK_LABEL(menuItems[i].label), menuItems[i].grabbed_text); + /* This stops menu bar shortcuts like Alt+F == File */ + for (i = 0 ; i < LAST_MENU ; i++) { + GtkWidget *menu = menuItems[i].label; + accelMenuSig[i] = + g_signal_connect(GTK_OBJECT(menu), "mnemonic-activate", + GTK_SIGNAL_FUNC(viewer_ignore_accel), window); } + + accelEnabled = FALSE; } -static void viewer_ungrab(GtkWidget *vnc, GtkWidget *window) + +static void viewer_enable_modifiers(GtkWindow *window) { + GtkSettings *settings = gtk_settings_get_default(); + GSList *accels; int i; - viewer_set_title(VNC_DISPLAY(vnc), window, FALSE); + if (accelEnabled) + return; + + /* This allows F10 activating menu bar */ + g_object_set_property(G_OBJECT(settings), "gtk-menu-bar-accel", &accelSetting); - for (i = 0 ; i < LAST_MENU; i++) { - gtk_label_set_text_with_mnemonic(GTK_LABEL(menuItems[i].label), menuItems[i].ungrabbed_text); + /* This allows global accelerators like Ctrl+Q == Quit */ + for (accels = accelList ; accels ; accels = accels->next) { + gtk_window_add_accel_group(GTK_WINDOW(window), accels->data); } + + /* This allows menu bar shortcuts like Alt+F == File */ + for (i = 0 ; i < LAST_MENU ; i++) { + GtkWidget *menu = menuItems[i].label; + g_signal_handler_disconnect(GTK_OBJECT(menu), + accelMenuSig[i]); + } + + accelEnabled = TRUE; +} + +static void viewer_key_grab(GtkWidget *vnc G_GNUC_UNUSED, GtkWidget *window) +{ + viewer_disable_modifiers(GTK_WINDOW(window)); +} + +static void viewer_key_ungrab(GtkWidget *vnc G_GNUC_UNUSED, GtkWidget *window) +{ + viewer_enable_modifiers(GTK_WINDOW(window)); } static void viewer_shutdown(GtkWidget *src G_GNUC_UNUSED, void *dummy G_GNUC_UNUSED, GtkWidget *vnc) @@ -528,11 +598,19 @@ static GtkWidget *viewer_build_window(Vn gtk_window_set_resizable(GTK_WINDOW(window), TRUE); if (with_menubar) { + GSList *accels; layout = gtk_vbox_new(FALSE, 3); menubar = viewer_build_menu(vnc, window, gtk_widget_is_composited(window)); gtk_container_add(GTK_CONTAINER(window), layout); gtk_container_add_with_properties(GTK_CONTAINER(layout), menubar, "expand", FALSE, NULL); gtk_container_add_with_properties(GTK_CONTAINER(layout), GTK_WIDGET(vnc), "expand", TRUE, NULL); + + accels = gtk_accel_groups_from_object(G_OBJECT(window)); + for ( ; accels ; accels = accels->next) { + accelList = g_slist_append(accelList, accels->data); + g_object_ref(G_OBJECT(accels->data)); + } + } else gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(vnc)); @@ -541,6 +619,11 @@ static GtkWidget *viewer_build_window(Vn gtk_signal_connect(GTK_OBJECT(vnc), "vnc-pointer-ungrab", GTK_SIGNAL_FUNC(viewer_ungrab), window); + gtk_signal_connect(GTK_OBJECT(vnc), "vnc-keyboard-grab", + GTK_SIGNAL_FUNC(viewer_key_grab), window); + gtk_signal_connect(GTK_OBJECT(vnc), "vnc-keyboard-ungrab", + GTK_SIGNAL_FUNC(viewer_key_ungrab), window); + gtk_signal_connect(GTK_OBJECT(window), "delete-event", GTK_SIGNAL_FUNC(viewer_shutdown), vnc); Index: virt-viewer.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-viewer/devel/virt-viewer.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- virt-viewer.spec 26 Feb 2009 00:36:09 -0000 1.12 +++ virt-viewer.spec 7 May 2009 11:55:21 -0000 1.13 @@ -6,12 +6,14 @@ Name: virt-viewer Version: 0.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Patch1: %{name}-%{version}-auth-fixes.patch +Patch2: %{name}-%{version}-keyboard-grab.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients @@ -50,6 +52,8 @@ browsers. %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %if %{_with_plugin} @@ -84,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu May 7 2009 Daniel P. Berrange - 0.0.3-5.fc12 +- Fix auth against libvirt (rhbz #499594) +- Fix confusion of VNC credentials (rhbz #499595) +- Correct keyboard grab handling (rhbz #499362) + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From berrange at fedoraproject.org Thu May 7 12:05:50 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Thu, 7 May 2009 12:05:50 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-viewer/F-11 virt-viewer-0.0.3-auth-fixes.patch, NONE, 1.1 virt-viewer-0.0.3-keyboard-grab.patch, NONE, 1.1 virt-viewer.spec, 1.12, 1.13 Message-ID: <20090507120550.D669D70100@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/virt-viewer/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4752 Modified Files: virt-viewer.spec Added Files: virt-viewer-0.0.3-auth-fixes.patch virt-viewer-0.0.3-keyboard-grab.patch Log Message: Fix libvirt auth, VNC credential fetching & keyboard grabs virt-viewer-0.0.3-auth-fixes.patch: --- NEW FILE virt-viewer-0.0.3-auth-fixes.patch --- diff -rup virt-viewer-0.0.3.orig/src/main.c virt-viewer-0.0.3.new/src/main.c --- virt-viewer-0.0.3.orig/src/main.c 2008-03-10 14:49:48.000000000 +0000 +++ virt-viewer-0.0.3.new/src/main.c 2009-05-07 12:29:19.000000000 +0100 @@ -306,7 +306,7 @@ static void viewer_credential(GtkWidget switch (g_value_get_enum(cred)) { case VNC_DISPLAY_CREDENTIAL_USERNAME: case VNC_DISPLAY_CREDENTIAL_PASSWORD: - data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row])); + data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row++])); break; } } @@ -795,7 +795,10 @@ viewer_start (const char *uri, const cha verbose = set_verbose; - conn = virConnectOpenReadOnly(uri); + /* XXX Write a graphical auth prompter */ + conn = virConnectOpenAuth(uri, + virConnectAuthPtrDefault, + VIR_CONNECT_RO); if (!conn) { fprintf(stderr, "unable to connect to libvirt %s\n", uri ? uri : "xen"); virt-viewer-0.0.3-keyboard-grab.patch: --- NEW FILE virt-viewer-0.0.3-keyboard-grab.patch --- Only in virt-viewer-0.0.3.orig/src: .#main.c Only in virt-viewer-0.0.3.orig/src: #main.c# diff -rup virt-viewer-0.0.3.orig/src/main.c virt-viewer-0.0.3.new/src/main.c --- virt-viewer-0.0.3.orig/src/main.c 2009-05-07 12:40:03.000000000 +0100 +++ virt-viewer-0.0.3.new/src/main.c 2009-05-07 12:49:34.000000000 +0100 @@ -81,16 +81,21 @@ struct menuItem { guint menu; GtkWidget *label; const char *ungrabbed_text; - const char *grabbed_text; }; static struct menuItem menuItems[] = { - { FILE_MENU, NULL, "_File", "File" }, - { VIEW_MENU, NULL, "_View", "View" }, - { SEND_KEY_MENU, NULL, "_Send Key", "Send Key" }, - { HELP_MENU, NULL, "_Help", "Help" } + { FILE_MENU, NULL, "_File" }, + { VIEW_MENU, NULL, "_View" }, + { SEND_KEY_MENU, NULL, "_Send Key"}, + { HELP_MENU, NULL, "_Help" }, }; +static gboolean accelEnabled = TRUE; +static GValue accelSetting; +static GSList *accelList = NULL; +static int accelMenuSig[LAST_MENU]; + + static void viewer_set_title(VncDisplay *vnc G_GNUC_UNUSED, GtkWidget *window, gboolean grabbed) { char title[1024]; @@ -109,24 +114,89 @@ static void viewer_set_title(VncDisplay static void viewer_grab(GtkWidget *vnc, GtkWidget *window) { + viewer_set_title(VNC_DISPLAY(vnc), window, TRUE); +} + +static void viewer_ungrab(GtkWidget *vnc, GtkWidget *window) +{ + viewer_set_title(VNC_DISPLAY(vnc), window, FALSE); +} + +static void viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED, + GtkWindow *window G_GNUC_UNUSED) +{ + /* ignore accelerator */ +} + + +static void viewer_disable_modifiers(GtkWindow *window) +{ + GtkSettings *settings = gtk_settings_get_default(); + GValue empty; + GSList *accels; int i; - viewer_set_title(VNC_DISPLAY(vnc), window, TRUE); + if (!accelEnabled) + return; + + /* This stops F10 activating menu bar */ + memset(&empty, 0, sizeof empty); + g_value_init(&empty, G_TYPE_STRING); + g_object_get_property(G_OBJECT(settings), "gtk-menu-bar-accel", &accelSetting); + g_object_set_property(G_OBJECT(settings), "gtk-menu-bar-accel", &empty); + + /* This stops global accelerators like Ctrl+Q == Quit */ + for (accels = accelList ; accels ; accels = accels->next) { + gtk_window_remove_accel_group(GTK_WINDOW(window), accels->data); + } - for (i = 0 ; i < LAST_MENU; i++) { - gtk_label_set_text_with_mnemonic(GTK_LABEL(menuItems[i].label), menuItems[i].grabbed_text); + /* This stops menu bar shortcuts like Alt+F == File */ + for (i = 0 ; i < LAST_MENU ; i++) { + GtkWidget *menu = menuItems[i].label; + accelMenuSig[i] = + g_signal_connect(GTK_OBJECT(menu), "mnemonic-activate", + GTK_SIGNAL_FUNC(viewer_ignore_accel), window); } + + accelEnabled = FALSE; } -static void viewer_ungrab(GtkWidget *vnc, GtkWidget *window) + +static void viewer_enable_modifiers(GtkWindow *window) { + GtkSettings *settings = gtk_settings_get_default(); + GSList *accels; int i; - viewer_set_title(VNC_DISPLAY(vnc), window, FALSE); + if (accelEnabled) + return; + + /* This allows F10 activating menu bar */ + g_object_set_property(G_OBJECT(settings), "gtk-menu-bar-accel", &accelSetting); - for (i = 0 ; i < LAST_MENU; i++) { - gtk_label_set_text_with_mnemonic(GTK_LABEL(menuItems[i].label), menuItems[i].ungrabbed_text); + /* This allows global accelerators like Ctrl+Q == Quit */ + for (accels = accelList ; accels ; accels = accels->next) { + gtk_window_add_accel_group(GTK_WINDOW(window), accels->data); } + + /* This allows menu bar shortcuts like Alt+F == File */ + for (i = 0 ; i < LAST_MENU ; i++) { + GtkWidget *menu = menuItems[i].label; + g_signal_handler_disconnect(GTK_OBJECT(menu), + accelMenuSig[i]); + } + + accelEnabled = TRUE; +} + +static void viewer_key_grab(GtkWidget *vnc G_GNUC_UNUSED, GtkWidget *window) +{ + viewer_disable_modifiers(GTK_WINDOW(window)); +} + +static void viewer_key_ungrab(GtkWidget *vnc G_GNUC_UNUSED, GtkWidget *window) +{ + viewer_enable_modifiers(GTK_WINDOW(window)); } static void viewer_shutdown(GtkWidget *src G_GNUC_UNUSED, void *dummy G_GNUC_UNUSED, GtkWidget *vnc) @@ -528,11 +598,19 @@ static GtkWidget *viewer_build_window(Vn gtk_window_set_resizable(GTK_WINDOW(window), TRUE); if (with_menubar) { + GSList *accels; layout = gtk_vbox_new(FALSE, 3); menubar = viewer_build_menu(vnc, window, gtk_widget_is_composited(window)); gtk_container_add(GTK_CONTAINER(window), layout); gtk_container_add_with_properties(GTK_CONTAINER(layout), menubar, "expand", FALSE, NULL); gtk_container_add_with_properties(GTK_CONTAINER(layout), GTK_WIDGET(vnc), "expand", TRUE, NULL); + + accels = gtk_accel_groups_from_object(G_OBJECT(window)); + for ( ; accels ; accels = accels->next) { + accelList = g_slist_append(accelList, accels->data); + g_object_ref(G_OBJECT(accels->data)); + } + } else gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(vnc)); @@ -541,6 +619,11 @@ static GtkWidget *viewer_build_window(Vn gtk_signal_connect(GTK_OBJECT(vnc), "vnc-pointer-ungrab", GTK_SIGNAL_FUNC(viewer_ungrab), window); + gtk_signal_connect(GTK_OBJECT(vnc), "vnc-keyboard-grab", + GTK_SIGNAL_FUNC(viewer_key_grab), window); + gtk_signal_connect(GTK_OBJECT(vnc), "vnc-keyboard-ungrab", + GTK_SIGNAL_FUNC(viewer_key_ungrab), window); + gtk_signal_connect(GTK_OBJECT(window), "delete-event", GTK_SIGNAL_FUNC(viewer_shutdown), vnc); Index: virt-viewer.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-viewer/F-11/virt-viewer.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- virt-viewer.spec 26 Feb 2009 00:36:09 -0000 1.12 +++ virt-viewer.spec 7 May 2009 12:05:18 -0000 1.13 @@ -6,12 +6,14 @@ Name: virt-viewer Version: 0.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Patch1: %{name}-%{version}-auth-fixes.patch +Patch2: %{name}-%{version}-keyboard-grab.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients @@ -50,6 +52,8 @@ browsers. %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %if %{_with_plugin} @@ -84,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu May 7 2009 Daniel P. Berrange - 0.0.3-5.fc11 +- Fix auth against libvirt (rhbz #499594) +- Fix confusion of VNC credentials (rhbz #499595) +- Correct keyboard grab handling (rhbz #499362) + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From pkgdb at fedoraproject.org Thu May 7 12:10:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:10:24 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121024.E8E5A10F852@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:10:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:10:34 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121034.1A54C10F8A0@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 10 was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:10:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:10:36 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121036.0E88910F8A6@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 11 was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:11:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:11:09 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121109.1460010F8B1@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 11 is now owned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:11:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:11:17 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121117.61B8510F8C3@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 11 was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:12:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:12:50 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121250.AD3AC10F8C2@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel is now owned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:13:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:13:50 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121350.C05B110F8C9@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel is now owned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:13:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:13:55 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121355.629E110F8E6@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 10 was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:14:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:14:15 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121415.617CF10F8F3@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel is now owned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:14:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:14:20 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121420.6150210F8BA@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:13:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:13:00 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121300.D5C8210F8D5@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 10 is now owned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 12:13:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 12:13:00 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507121300.2C3D210F89F@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel was orphaned by dwmw2 To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 16:38:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 16:38:31 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507163831.8B3B210F8A6@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 10 is now owned by glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 16:38:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 16:38:49 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507163849.5117710F8AB@bastion2.fedora.phx.redhat.com> Package qemu in Fedora 11 is now owned by glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From pkgdb at fedoraproject.org Thu May 7 17:58:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 07 May 2009 17:58:37 +0000 Subject: [fedora-virt-maint] [pkgdb] qemu ownership updated Message-ID: <20090507175837.1D21F10F8A3@bastion2.fedora.phx.redhat.com> Package qemu in Fedora devel is now owned by glommer To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qemu From markmc at fedoraproject.org Thu May 7 19:09:12 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 7 May 2009 19:09:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-enable-qemu-0-10-migration.patch, NONE, 1.1 libvirt.spec, 1.128, 1.129 Message-ID: <20090507190912.4DF2370100@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15832 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-enable-qemu-0-10-migration.patch Log Message: * Thu May 7 2009 Mark McLoughlin - 0.6.2-7.fc11 - Enable migration for qemu 0.10 (bug #499704) libvirt-0.6.2-enable-qemu-0-10-migration.patch: --- NEW FILE libvirt-0.6.2-enable-qemu-0-10-migration.patch --- From: "Daniel P. Berrange" To: libvir-list at redhat.com Date: Thu, 30 Apr 2009 15:09:05 +0100 Subject: [libvirt] PATCH: Enable migration with QEMU >= 0.10.0 The KVM migration code was added to QEMU for the 0.10.0 release, so we should enable this in libvirt now. Daniel diff -r be7993675e07 src/qemu_conf.c --- a/src/qemu_conf.c Thu Apr 30 14:49:27 2009 +0100 +++ b/src/qemu_conf.c Thu Apr 30 15:08:45 2009 +0100 @@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char * /* * Handling of -incoming arg with varying features - * -incoming tcp (kvm >= 79) - * -incoming exec (kvm >= 80) + * -incoming tcp (kvm >= 79, qemu >= 0.10.0) + * -incoming exec (kvm >= 80, qemu >= 0.10.0) * -incoming stdio (all earlier kvm) * * NB, there was a pre-kvm-79 'tcp' support, but it * was broken, because it blocked the monitor console * while waiting for data, so pretend it doesn't exist - * - * XXX when next QEMU release after 0.9.1 arrives, - * we'll need to add MIGRATE_QEMU_TCP/EXEC here too */ if (kvm_version >= 79) { flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP; @@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char * flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC; } else if (kvm_version > 0) { flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO; + } else if (version >= 10000) { + flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP; + flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC; } if (retversion) -- Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -r1.128 -r1.129 --- libvirt.spec 6 May 2009 16:32:34 -0000 1.128 +++ libvirt.spec 7 May 2009 19:08:42 -0000 1.129 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 6%{?dist}%{?extra_release} +Release: 7%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -79,6 +79,8 @@ Patch1: libvirt-0.6.2-shared-readonly-la Patch2: libvirt-0.6.3-hostdev-managed.patch # Refresh qemu caps when getCapabilities is called (bz 460649) Patch3: libvirt-0.6.3-refresh-qemu-caps.patch +# Enable migration with qemu 0.10 +Patch4: libvirt-0.6.2-enable-qemu-0-10-migration.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -237,6 +239,7 @@ of recent versions of Linux (and other O %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch200 -p0 @@ -560,6 +563,9 @@ fi %endif %changelog +* Thu May 7 2009 Mark McLoughlin - 0.6.2-7.fc11 +- Enable migration for qemu 0.10 (bug #499704) + * Wed May 6 2009 Cole Robinson - 0.6.2-6.fc11 - Refresh qemu caps when getCapabilities is called (bug #460649) From markmc at fedoraproject.org Thu May 7 19:09:30 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 7 May 2009 19:09:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-enable-qemu-0-10-migration.patch, NONE, 1.1 libvirt.spec, 1.130, 1.131 Message-ID: <20090507190930.DEB2070100@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15931 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-enable-qemu-0-10-migration.patch Log Message: * Thu May 7 2009 Mark McLoughlin - 0.6.3-7.fc12 - Enable migration for qemu 0.10 (bug #499704) libvirt-0.6.3-enable-qemu-0-10-migration.patch: --- NEW FILE libvirt-0.6.3-enable-qemu-0-10-migration.patch --- From: "Daniel P. Berrange" To: libvir-list at redhat.com Date: Thu, 30 Apr 2009 15:09:05 +0100 Subject: [libvirt] PATCH: Enable migration with QEMU >= 0.10.0 The KVM migration code was added to QEMU for the 0.10.0 release, so we should enable this in libvirt now. Daniel diff -r be7993675e07 src/qemu_conf.c --- a/src/qemu_conf.c Thu Apr 30 14:49:27 2009 +0100 +++ b/src/qemu_conf.c Thu Apr 30 15:08:45 2009 +0100 @@ -473,16 +473,13 @@ int qemudExtractVersionInfo(const char * /* * Handling of -incoming arg with varying features - * -incoming tcp (kvm >= 79) - * -incoming exec (kvm >= 80) + * -incoming tcp (kvm >= 79, qemu >= 0.10.0) + * -incoming exec (kvm >= 80, qemu >= 0.10.0) * -incoming stdio (all earlier kvm) * * NB, there was a pre-kvm-79 'tcp' support, but it * was broken, because it blocked the monitor console * while waiting for data, so pretend it doesn't exist - * - * XXX when next QEMU release after 0.9.1 arrives, - * we'll need to add MIGRATE_QEMU_TCP/EXEC here too */ if (kvm_version >= 79) { flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP; @@ -490,6 +487,9 @@ int qemudExtractVersionInfo(const char * flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC; } else if (kvm_version > 0) { flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO; + } else if (version >= 10000) { + flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP; + flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC; } if (retversion) -- Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -p -r1.130 -r1.131 --- libvirt.spec 6 May 2009 16:33:16 -0000 1.130 +++ libvirt.spec 7 May 2009 19:09:00 -0000 1.131 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 6%{?dist}%{?extra_release} +Release: 7%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -65,6 +65,8 @@ Patch1: libvirt-0.6.3-shared-readonly-la Patch2: libvirt-0.6.3-hostdev-managed.patch # Refresh qemu caps when getCapabilities is called (bz 460649) Patch3: libvirt-0.6.3-refresh-qemu-caps.patch +# Enable migration with qemu 0.10 +Patch4: libvirt-0.6.3-enable-qemu-0-10-migration.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -221,6 +223,7 @@ of recent versions of Linux (and other O %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch200 -p0 @@ -551,6 +554,9 @@ fi %endif %changelog +* Thu May 7 2009 Mark McLoughlin - 0.6.3-7.fc12 +- Enable migration for qemu 0.10 (bug #499704) + * Wed May 6 2009 Cole Robinson - 0.6.3-6.fc12 - Refresh qemu caps when getCapabilities is called (bug #460649) From crobinso at fedoraproject.org Mon May 11 02:29:35 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 11 May 2009 02:29:35 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.2-fix-nosource-label.patch, NONE, 1.1 libvirt.spec, 1.131, 1.132 Message-ID: <20090511022935.8AC80700D7@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15014 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-fix-nosource-label.patch Log Message: Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569) libvirt-0.6.2-fix-nosource-label.patch: --- NEW FILE libvirt-0.6.2-fix-nosource-label.patch --- diff -rup libvirt-0.6.2/src/security_selinux.c new/src/security_selinux.c --- libvirt-0.6.2/src/security_selinux.c 2009-05-10 22:04:25.000000000 -0400 +++ new/src/security_selinux.c 2009-05-10 22:06:09.000000000 -0400 @@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectP { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + if (!disk->src) + return 0; + if (disk->shared) { return SELinuxSetFilecon(conn, disk->src, default_image_context); } else if (disk->readonly) { Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -p -r1.131 -r1.132 --- libvirt.spec 7 May 2009 19:09:00 -0000 1.131 +++ libvirt.spec 11 May 2009 02:29:05 -0000 1.132 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 7%{?dist}%{?extra_release} +Release: 8%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -67,6 +67,8 @@ Patch2: libvirt-0.6.3-hostdev-managed.pa Patch3: libvirt-0.6.3-refresh-qemu-caps.patch # Enable migration with qemu 0.10 Patch4: libvirt-0.6.3-enable-qemu-0-10-migration.patch +# Don't try to label a disk with no path (e.g. empty cdrom) (bz 499569) +Patch5: libvirt-0.6.2-fix-nosource-label.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -224,6 +226,7 @@ of recent versions of Linux (and other O %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch200 -p0 @@ -554,6 +557,9 @@ fi %endif %changelog +* Sun May 10 2009 Cole Robinson - 0.6.2-8.fc12 +- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569) + * Thu May 7 2009 Mark McLoughlin - 0.6.3-7.fc12 - Enable migration for qemu 0.10 (bug #499704) From crobinso at fedoraproject.org Mon May 11 02:28:53 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 11 May 2009 02:28:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-fix-nosource-label.patch, NONE, 1.1 libvirt.spec, 1.129, 1.130 Message-ID: <20090511022853.DA984700D7@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14954 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-fix-nosource-label.patch Log Message: Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569) libvirt-0.6.2-fix-nosource-label.patch: --- NEW FILE libvirt-0.6.2-fix-nosource-label.patch --- diff -rup libvirt-0.6.2/src/security_selinux.c new/src/security_selinux.c --- libvirt-0.6.2/src/security_selinux.c 2009-05-10 22:04:25.000000000 -0400 +++ new/src/security_selinux.c 2009-05-10 22:06:09.000000000 -0400 @@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectP { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + if (!disk->src) + return 0; + if (disk->shared) { return SELinuxSetFilecon(conn, disk->src, default_image_context); } else if (disk->readonly) { Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -r1.129 -r1.130 --- libvirt.spec 7 May 2009 19:08:42 -0000 1.129 +++ libvirt.spec 11 May 2009 02:28:23 -0000 1.130 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 7%{?dist}%{?extra_release} +Release: 8%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -81,6 +81,8 @@ Patch2: libvirt-0.6.3-hostdev-managed.pa Patch3: libvirt-0.6.3-refresh-qemu-caps.patch # Enable migration with qemu 0.10 Patch4: libvirt-0.6.2-enable-qemu-0-10-migration.patch +# Don't try to label a disk with no path (e.g. empty cdrom) (bz 499569) +Patch5: libvirt-0.6.2-fix-nosource-label.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -240,6 +242,7 @@ of recent versions of Linux (and other O %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch200 -p0 @@ -563,6 +566,9 @@ fi %endif %changelog +* Sun May 10 2009 Cole Robinson - 0.6.2-8.fc11 +- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569) + * Thu May 7 2009 Mark McLoughlin - 0.6.2-7.fc11 - Enable migration for qemu 0.10 (bug #499704) From glommer at fedoraproject.org Tue May 12 13:34:46 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 12 May 2009 13:34:46 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-fix-load-linux.patch, NONE, 1.1 qemu.spec, 1.87, 1.88 Message-ID: <20090512133446.E29CB700EC@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26659 Modified Files: qemu.spec Added Files: qemu-fix-load-linux.patch Log Message: fix boot with -kernel parameter qemu-fix-load-linux.patch: --- NEW FILE qemu-fix-load-linux.patch --- >From d6ecb03610dba922cbfde42acb41603e2c658047 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 8 May 2009 02:22:13 -0300 Subject: [PATCH 2/2] reset state for load_linux The linux loader is just an option rom like any other, just with some special requirements. Right now, our option rom resetting mechanism is not being applied to it. As a result, users using -kernel will not be able to successfully reboot their machines This patch fixes it by saving all the data we generated in the load_linux() function, to be used later by the option rom resetting mechanism. Signed-off-by: Glauber Costa Signed-off-by: Anthony Liguori --- hw/pc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) Index: qemu-kvm-0.10/qemu/hw/pc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/hw/pc.c +++ qemu-kvm-0.10/qemu/hw/pc.c @@ -527,6 +527,7 @@ static void generate_bootsect(uint8_t *o rom[sizeof(rom) - 1] = -sum; memcpy(option_rom, rom, sizeof(rom)); + option_rom_setup_reset(option_rom, sizeof (rom)); } static long get_file_size(FILE *f) @@ -694,6 +695,12 @@ static void load_linux(uint8_t *option_r memset(gpr, 0, sizeof gpr); gpr[4] = cmdline_addr-real_addr-16; /* SP (-16 is paranoia) */ + option_rom_setup_reset(real_addr, setup_size); + option_rom_setup_reset(prot_addr, kernel_size); + option_rom_setup_reset(cmdline_addr, cmdline_size); + if (initrd_filename) + option_rom_setup_reset(initrd_addr, initrd_size); + generate_bootsect(option_rom, gpr, seg, 0); } Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- qemu.spec 1 May 2009 12:13:58 -0000 1.87 +++ qemu.spec 12 May 2009 13:34:16 -0000 1.88 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 16%{?dist} +Release: 17%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -37,6 +37,7 @@ Patch14: qemu-bios-bigger-roms.patch Patch15: qemu-fix-display-breakage.patch Patch16: qemu-fix-qcow2-2TB.patch Patch17: qemu-fix-qcow2-corruption.patch +Patch18: qemu-fix-load-linux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -234,6 +235,7 @@ such as kvmtrace and kvm_stat. %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -478,6 +480,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Tue May 12 2009 Glauber Costa - 2:0.10-17 +- fix reboot with -kernel parameter + * Fri May 1 2009 Mark McLoughlin - 2:0.10-16 - Really provide qemu-kvm as a metapackage From rel-eng at fedoraproject.org Mon May 11 15:39:08 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 11 May 2009 15:39:08 -0000 Subject: [fedora-virt-maint] #1777: Please tag libvirt-0.6.2-8.fc11 Message-ID: <051.c4f3025bc27b0b6b2157bda6295fca6a@fedoraproject.org> #1777: Please tag libvirt-0.6.2-8.fc11 -----------------------------+---------------------------------------------- Reporter: crobinso | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Keywords: | -----------------------------+---------------------------------------------- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=499569 Guests cannot be started if they have an empty cdrom device, and selinux is enabled. This is a pretty big deal since all newly installed (via virt- manager, virt-install) VMs have an empty cdrom device. Patch is very trivial as well. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Mon May 11 15:41:52 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 11 May 2009 15:41:52 -0000 Subject: [fedora-virt-maint] Re: #1777: Please tag libvirt-0.6.2-8.fc11 In-Reply-To: <051.c4f3025bc27b0b6b2157bda6295fca6a@fedoraproject.org> References: <051.c4f3025bc27b0b6b2157bda6295fca6a@fedoraproject.org> Message-ID: <060.6108908b0c9c8efae0104ff78c228e88@fedoraproject.org> #1777: Please tag libvirt-0.6.2-8.fc11 ------------------------------+--------------------------------------------- Reporter: crobinso | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: Fedora 11 Final | Component: koji Resolution: | Keywords: ------------------------------+--------------------------------------------- Comment (by spot): +1 -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Mon May 11 19:24:33 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Mon, 11 May 2009 19:24:33 -0000 Subject: [fedora-virt-maint] Re: #1777: Please tag libvirt-0.6.2-8.fc11 In-Reply-To: <051.c4f3025bc27b0b6b2157bda6295fca6a@fedoraproject.org> References: <051.c4f3025bc27b0b6b2157bda6295fca6a@fedoraproject.org> Message-ID: <060.caa728786290cd79591d2bc973338dfb@fedoraproject.org> #1777: Please tag libvirt-0.6.2-8.fc11 ------------------------------+--------------------------------------------- Reporter: crobinso | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: Fedora 11 Final | Component: koji Resolution: fixed | Keywords: ------------------------------+--------------------------------------------- Changes (by jkeating): * status: new => closed * resolution: => fixed Comment: Moving, tagging, signing. -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From glommer at fedoraproject.org Tue May 12 14:16:22 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 12 May 2009 14:16:22 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-move-option-rom-reset-definition.patch, NONE, 1.1 qemu.spec, 1.88, 1.89 Message-ID: <20090512141622.D4B4E700EC@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3157 Modified Files: qemu.spec Added Files: qemu-move-option-rom-reset-definition.patch Log Message: move definition of option rom reset functions to beginning of file qemu-move-option-rom-reset-definition.patch: --- NEW FILE qemu-move-option-rom-reset-definition.patch --- --- a/qemu/hw/pc.c 2009-05-12 10:53:18.000000000 -0300 +++ b/qemu/hw/pc.c 2009-05-12 10:53:48.000000000 -0300 @@ -58,6 +58,30 @@ #define MAX_IDE_BUS 2 +typedef struct rom_reset_data { + uint8_t *data; + target_phys_addr_t addr; + unsigned size; +} RomResetData; + +static void option_rom_reset(void *_rrd) +{ + RomResetData *rrd = _rrd; + + cpu_physical_memory_write_rom(rrd->addr, rrd->data, rrd->size); +} + +static void option_rom_setup_reset(target_phys_addr_t addr, unsigned size) +{ + RomResetData *rrd = qemu_malloc(sizeof *rrd); + + rrd->data = qemu_malloc(size); + cpu_physical_memory_read(addr, rrd->data, size); + rrd->addr = addr; + rrd->size = size; + qemu_register_reset(option_rom_reset, rrd); +} + extern uint8_t *acpi_tables; extern size_t acpi_tables_len; @@ -767,30 +791,6 @@ static void pc_init_ne2k_isa(NICInfo *nd nb_ne2k++; } -typedef struct rom_reset_data { - uint8_t *data; - target_phys_addr_t addr; - unsigned size; -} RomResetData; - -static void option_rom_reset(void *_rrd) -{ - RomResetData *rrd = _rrd; - - cpu_physical_memory_write_rom(rrd->addr, rrd->data, rrd->size); -} - -static void option_rom_setup_reset(target_phys_addr_t addr, unsigned size) -{ - RomResetData *rrd = qemu_malloc(sizeof *rrd); - - rrd->data = qemu_malloc(size); - cpu_physical_memory_read(addr, rrd->data, size); - rrd->addr = addr; - rrd->size = size; - qemu_register_reset(option_rom_reset, rrd); -} - CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled) { CPUState *env = cpu_init(cpu_model); Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -r1.88 -r1.89 --- qemu.spec 12 May 2009 13:34:16 -0000 1.88 +++ qemu.spec 12 May 2009 14:15:52 -0000 1.89 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 17%{?dist} +Release: 18%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -37,7 +37,8 @@ Patch14: qemu-bios-bigger-roms.patch Patch15: qemu-fix-display-breakage.patch Patch16: qemu-fix-qcow2-2TB.patch Patch17: qemu-fix-qcow2-corruption.patch -Patch18: qemu-fix-load-linux.patch +Patch18: qemu-move-option-rom-reset-definition.patch +Patch19: qemu-fix-load-linux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -236,6 +237,7 @@ such as kvmtrace and kvm_stat. %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -480,6 +482,10 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Tue May 12 2009 Glauber Costa - 2:0.10-18 +- move option rom setup function to the beginning of the file. This + avoids static vs non-static issues, and is the way upstream does + * Tue May 12 2009 Glauber Costa - 2:0.10-17 - fix reboot with -kernel parameter From markmc at fedoraproject.org Tue May 12 15:31:46 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Tue, 12 May 2009 15:31:46 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.89,1.90 Message-ID: <20090512153146.51690700EC@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16629 Modified Files: qemu.spec Log Message: Add a bug number for the -kernel fix Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- qemu.spec 12 May 2009 14:15:52 -0000 1.89 +++ qemu.spec 12 May 2009 15:31:15 -0000 1.90 @@ -487,7 +487,7 @@ fi avoids static vs non-static issues, and is the way upstream does * Tue May 12 2009 Glauber Costa - 2:0.10-17 -- fix reboot with -kernel parameter +- fix reboot with -kernel parameter (#499666) * Fri May 1 2009 Mark McLoughlin - 2:0.10-16 - Really provide qemu-kvm as a metapackage From markmc at fedoraproject.org Wed May 13 08:36:27 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 13 May 2009 08:36:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-kvm-fix-kerneldir-includes.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 01-tls-handshake-fix.patch, 1.1, 1.2 02-vnc-monitor-info.patch, 1.1, 1.2 03-display-keymaps.patch, 1.1, 1.2 04-vnc-struct.patch, 1.1, 1.2 05-vnc-tls-vencrypt.patch, 1.1, 1.2 06-vnc-sasl.patch, 1.1, 1.2 07-vnc-monitor-authinfo.patch, 1.1, 1.2 08-vnc-acl-mgmt.patch, 1.1, 1.2 kvm-upstream-ppc.patch, 1.3, 1.4 qemu-bios-bigger-roms.patch, 1.1, 1.2 qemu-fix-debuginfo.patch, 1.1, 1.2 qemu-fix-gcc.patch, 1.1, 1.2 qemu-roms-more-room-fix-vga-align.patch, 1.1, 1.2 qemu-roms-more-room.patch, 1.1, 1.2 qemu.spec, 1.90, 1.91 sources, 1.14, 1.15 make-release, 1.1, NONE qemu-fix-display-breakage.patch, 1.2, NONE qemu-fix-load-linux.patch, 1.1, NONE qemu-fix-qcow2-2TB.patch, 1.1, NONE qemu-fix-qcow2-corruption.patch, 1.2, NONE qemu-move-option-rom-reset-definition.patch, 1.1, NONE Message-ID: <20090513083627.0464970115@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28559 Modified Files: .cvsignore 01-tls-handshake-fix.patch 02-vnc-monitor-info.patch 03-display-keymaps.patch 04-vnc-struct.patch 05-vnc-tls-vencrypt.patch 06-vnc-sasl.patch 07-vnc-monitor-authinfo.patch 08-vnc-acl-mgmt.patch kvm-upstream-ppc.patch qemu-bios-bigger-roms.patch qemu-fix-debuginfo.patch qemu-fix-gcc.patch qemu-roms-more-room-fix-vga-align.patch qemu-roms-more-room.patch qemu.spec sources Added Files: qemu-kvm-fix-kerneldir-includes.patch Removed Files: make-release qemu-fix-display-breakage.patch qemu-fix-load-linux.patch qemu-fix-qcow2-2TB.patch qemu-fix-qcow2-corruption.patch qemu-move-option-rom-reset-definition.patch Log Message: * Tue May 12 2009 Mark McLoughlin - 2:0.10.4-1 - Update to 0.10.4 - Fix yet more qcow2 corruption (#498405) - AIO cancellation fixes (#497170) - Fix VPC image size overflow (#491981) - Fix oops with 2.6.25 virtio guest (#470386) - Enable pulseaudio driver (#495964, #496627) - Fix cpuid initialization - Fix HPET emulation - Fix storage hotplug error handling - Migration fixes - Block range checking fixes - Make PCI config status register read-only - Handle newer Xorg keymap names - Don't leak memory on NIC hot-unplug - Hook up keypad keys for qemu console emulation - Correctly run on kernels lacking mmu notifiers - Support DDIM option ROMs - Fix PCI NIC error handling - Fix in-kernel LAPIC initialization - Fix broken e1000 PCI config space - Drop some patches which have been upstreamed - Drop the make-release script; we have an official tarball now qemu-kvm-fix-kerneldir-includes.patch: --- NEW FILE qemu-kvm-fix-kerneldir-includes.patch --- >From cff8aa984290fc74c39f39e17fbca0f0feab6bc4 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 13 May 2009 09:29:56 +0100 Subject: [PATCH] kvm: user: include arch specific headers from $(KERNELDIR) Currently we only include $(KERNELDIR)/include in CFLAGS, but we also have $(KERNELDIR)/arch/$(arch)/include or else we'll get mis-matched headers. Signed-off-by: Mark McLoughlin --- kvm/user/config-i386.mak | 1 - kvm/user/config-ia64.mak | 1 + kvm/user/config-powerpc.mak | 1 + kvm/user/config-x86-common.mak | 2 ++ kvm/user/config-x86_64.mak | 1 - 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kvm/user/config-i386.mak b/kvm/user/config-i386.mak index 09175d5..eebb9de 100644 --- a/kvm/user/config-i386.mak +++ b/kvm/user/config-i386.mak @@ -3,7 +3,6 @@ cstart.o = $(TEST_DIR)/cstart.o bits = 32 ldarch = elf32-i386 CFLAGS += -D__i386__ -CFLAGS += -I $(KERNELDIR)/include tests= diff --git a/kvm/user/config-ia64.mak b/kvm/user/config-ia64.mak index c4c639e..e8803a0 100644 --- a/kvm/user/config-ia64.mak +++ b/kvm/user/config-ia64.mak @@ -2,6 +2,7 @@ bits = 64 CFLAGS += -m64 CFLAGS += -D__ia64__ CFLAGS += -I $(KERNELDIR)/include +CFLAGS += -I $(KERNELDIR)/arch/ia64/include all: diff --git a/kvm/user/config-powerpc.mak b/kvm/user/config-powerpc.mak index dd7ef54..589aa61 100644 --- a/kvm/user/config-powerpc.mak +++ b/kvm/user/config-powerpc.mak @@ -1,4 +1,5 @@ CFLAGS += -I $(KERNELDIR)/include +CFLAGS += -I $(KERNELDIR)/arch/powerpc/include CFLAGS += -Wa,-mregnames -I test/lib CFLAGS += -ffreestanding diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak index e789fd4..8d8fadf 100644 --- a/kvm/user/config-x86-common.mak +++ b/kvm/user/config-x86-common.mak @@ -12,6 +12,8 @@ cflatobjs += \ $(libcflat): LDFLAGS += -nostdlib $(libcflat): CFLAGS += -ffreestanding -I test/lib +CFLAGS += -I $(KERNELDIR)/include +CFLAGS += -I $(KERNELDIR)/arch/x86/include CFLAGS += -m$(bits) FLATLIBS = test/lib/libcflat.a $(libgcc) diff --git a/kvm/user/config-x86_64.mak b/kvm/user/config-x86_64.mak index b50b540..d88f54c 100644 --- a/kvm/user/config-x86_64.mak +++ b/kvm/user/config-x86_64.mak @@ -3,7 +3,6 @@ cstart.o = $(TEST_DIR)/cstart64.o bits = 64 ldarch = elf64-x86-64 CFLAGS += -D__x86_64__ -CFLAGS += -I $(KERNELDIR)/include tests = $(TEST_DIR)/access.flat $(TEST_DIR)/irq.flat $(TEST_DIR)/sieve.flat \ $(TEST_DIR)/simple.flat $(TEST_DIR)/stringio.flat \ -- 1.6.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 2 Apr 2009 01:07:39 -0000 1.14 +++ .cvsignore 13 May 2009 08:35:55 -0000 1.15 @@ -1 +1 @@ -qemu-kvm-0.10.tar.gz +qemu-kvm-*.tar.gz 01-tls-handshake-fix.patch: Index: 01-tls-handshake-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/01-tls-handshake-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 01-tls-handshake-fix.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 01-tls-handshake-fix.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== ---- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c +--- qemu-kvm-0.10.4.orig/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth VNC_DEBUG("Failed to complete TLS\n"); return 0; 02-vnc-monitor-info.patch: Index: 02-vnc-monitor-info.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/02-vnc-monitor-info.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 02-vnc-monitor-info.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 02-vnc-monitor-info.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -166,19 +166,136 @@ struct VncState static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; 03-display-keymaps.patch: Index: 03-display-keymaps.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/03-display-keymaps.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 03-display-keymaps.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 03-display-keymaps.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/Makefile +Index: qemu-kvm-0.10.4/Makefile =================================================================== --- qemu-kvm-0.10.orig/qemu/Makefile -+++ qemu-kvm-0.10/qemu/Makefile ++++ qemu-kvm-0.10.4/Makefile @@ -141,6 +141,7 @@ endif AUDIO_OBJS+= wavcapture.o OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) @@ -31,10 +31,10 @@ Index: qemu-kvm-0.10/qemu/Makefile bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -Index: qemu-kvm-0.10/qemu/curses.c +Index: qemu-kvm-0.10.4/curses.c =================================================================== --- qemu-kvm-0.10.orig/qemu/curses.c -+++ qemu-kvm-0.10/qemu/curses.c ++++ qemu-kvm-0.10.4/curses.c @@ -158,7 +158,6 @@ static void curses_cursor_position(Displ /* generic keyboard conversion */ @@ -52,10 +52,10 @@ Index: qemu-kvm-0.10/qemu/curses.c if (!kbd_layout) exit(1); } -Index: qemu-kvm-0.10/qemu/curses_keys.h +Index: qemu-kvm-0.10.4/curses_keys.h =================================================================== --- qemu-kvm-0.10.orig/qemu/curses_keys.h -+++ qemu-kvm-0.10/qemu/curses_keys.h ++++ qemu-kvm-0.10.4/curses_keys.h @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. @@ -79,10 +79,10 @@ Index: qemu-kvm-0.10/qemu/curses_keys.h static const name2keysym_t name2keysym[] = { /* Plain ASCII */ { "space", 0x020 }, -Index: qemu-kvm-0.10/qemu/keymaps.c +Index: qemu-kvm-0.10.4/keymaps.c =================================================================== --- qemu-kvm-0.10.orig/qemu/keymaps.c -+++ qemu-kvm-0.10/qemu/keymaps.c ++++ qemu-kvm-0.10.4/keymaps.c @@ -22,34 +22,20 @@ * THE SOFTWARE. */ @@ -188,10 +188,10 @@ Index: qemu-kvm-0.10/qemu/keymaps.c { kbd_layout_t *k = kbd_layout; struct key_range *kr; -Index: qemu-kvm-0.10/qemu/keymaps.h +Index: qemu-kvm-0.10.4/keymaps.h =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/keymaps.h ++++ qemu-kvm-0.10.4/keymaps.h @@ -0,0 +1,60 @@ +/* + * QEMU keysym to keycode conversion using rdesktop keymaps @@ -253,10 +253,10 @@ Index: qemu-kvm-0.10/qemu/keymaps.h +int keysym_is_numlock(void *kbd_layout, int keysym); + +#endif /* __QEMU_KEYMAPS_H__ */ -Index: qemu-kvm-0.10/qemu/sdl.c +Index: qemu-kvm-0.10.4/sdl.c =================================================================== --- qemu-kvm-0.10.orig/qemu/sdl.c -+++ qemu-kvm-0.10/qemu/sdl.c ++++ qemu-kvm-0.10.4/sdl.c @@ -109,7 +109,6 @@ static void sdl_resize(DisplayState *ds) /* generic keyboard conversion */ @@ -274,10 +274,10 @@ Index: qemu-kvm-0.10/qemu/sdl.c if (!kbd_layout) exit(1); } -Index: qemu-kvm-0.10/qemu/sdl_keysym.h +Index: qemu-kvm-0.10.4/sdl_keysym.h =================================================================== --- qemu-kvm-0.10.orig/qemu/sdl_keysym.h -+++ qemu-kvm-0.10/qemu/sdl_keysym.h ++++ qemu-kvm-0.10.4/sdl_keysym.h @@ -1,7 +1,6 @@ -typedef struct { - const char* name; @@ -289,10 +289,10 @@ Index: qemu-kvm-0.10/qemu/sdl_keysym.h static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -35,7 +35,6 @@ #include "vnc.h" @@ -313,10 +313,10 @@ Index: qemu-kvm-0.10/qemu/vnc.c if (!vs->kbd_layout) exit(1); -Index: qemu-kvm-0.10/qemu/vnc_keysym.h +Index: qemu-kvm-0.10.4/vnc_keysym.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc_keysym.h -+++ qemu-kvm-0.10/qemu/vnc_keysym.h ++++ qemu-kvm-0.10.4/vnc_keysym.h @@ -1,7 +1,6 @@ -typedef struct { - const char* name; 04-vnc-struct.patch: Index: 04-vnc-struct.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/04-vnc-struct.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 04-vnc-struct.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 04-vnc-struct.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Anthony Liguori @@ -141,10 +141,10 @@ Index: qemu-kvm-0.10/qemu/vnc.c static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; -Index: qemu-kvm-0.10/qemu/vnc.h +Index: qemu-kvm-0.10.4/vnc.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.h -+++ qemu-kvm-0.10/qemu/vnc.h ++++ qemu-kvm-0.10.4/vnc.h @@ -1,5 +1,148 @@ -#ifndef __VNCTIGHT_H -#define __VNCTIGHT_H 05-vnc-tls-vencrypt.patch: Index: 05-vnc-tls-vencrypt.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/05-vnc-tls-vencrypt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 05-vnc-tls-vencrypt.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 05-vnc-tls-vencrypt.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/Makefile +Index: qemu-kvm-0.10.4/Makefile =================================================================== --- qemu-kvm-0.10.orig/qemu/Makefile -+++ qemu-kvm-0.10/qemu/Makefile ++++ qemu-kvm-0.10.4/Makefile @@ -149,6 +149,9 @@ ifdef CONFIG_CURSES OBJS+=curses.o endif @@ -30,10 +30,10 @@ Index: qemu-kvm-0.10/qemu/Makefile curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -Index: qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c +Index: qemu-kvm-0.10.4/vnc-auth-vencrypt.c =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c ++++ qemu-kvm-0.10.4/vnc-auth-vencrypt.c @@ -0,0 +1,167 @@ +/* + * QEMU VNC display driver: VeNCrypt authentication setup @@ -202,10 +202,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-vencr + vnc_read_when(vs, protocol_client_vencrypt_init, 2); +} + -Index: qemu-kvm-0.10/qemu/vnc-auth-vencrypt.h +Index: qemu-kvm-0.10.4/vnc-auth-vencrypt.h =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/vnc-auth-vencrypt.h ++++ qemu-kvm-0.10.4/vnc-auth-vencrypt.h @@ -0,0 +1,33 @@ +/* + * QEMU VNC display driver @@ -240,10 +240,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-vencr +void start_auth_vencrypt(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */ -Index: qemu-kvm-0.10/qemu/vnc-tls.c +Index: qemu-kvm-0.10.4/vnc-tls.c =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/vnc-tls.c ++++ qemu-kvm-0.10.4/vnc-tls.c @@ -0,0 +1,414 @@ +/* + * QEMU VNC display driver: TLS helpers @@ -659,10 +659,10 @@ Index: qemu-kvm-0.10/qemu/vnc-tls.c + return -1; +} + -Index: qemu-kvm-0.10/qemu/vnc-tls.h +Index: qemu-kvm-0.10.4/vnc-tls.h =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/vnc-tls.h ++++ qemu-kvm-0.10.4/vnc-tls.h @@ -0,0 +1,70 @@ +/* + * QEMU VNC display driver. TLS helpers @@ -734,10 +734,10 @@ Index: qemu-kvm-0.10/qemu/vnc-tls.h + +#endif /* __QEMU_VNC_TLS_H__ */ + -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -34,21 +34,6 @@ #include "vnc_keysym.h" #include "d3des.h" @@ -1513,10 +1513,10 @@ Index: qemu-kvm-0.10/qemu/vnc.c fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path); qemu_free(path); qemu_free(vs->display); -Index: qemu-kvm-0.10/qemu/vnc.h +Index: qemu-kvm-0.10.4/vnc.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.h -+++ qemu-kvm-0.10/qemu/vnc.h ++++ qemu-kvm-0.10.4/vnc.h @@ -32,13 +32,16 @@ #include "audio/audio.h" #include 06-vnc-sasl.patch: Index: 06-vnc-sasl.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/06-vnc-sasl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 06-vnc-sasl.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 06-vnc-sasl.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/Makefile +Index: qemu-kvm-0.10.4/Makefile =================================================================== --- qemu-kvm-0.10.orig/qemu/Makefile -+++ qemu-kvm-0.10/qemu/Makefile ++++ qemu-kvm-0.10.4/Makefile @@ -152,6 +152,9 @@ OBJS+=vnc.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o @@ -30,10 +30,10 @@ Index: qemu-kvm-0.10/qemu/Makefile curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -Index: qemu-kvm-0.10/qemu/Makefile.target +Index: qemu-kvm-0.10.4/Makefile.target =================================================================== --- qemu-kvm-0.10.orig/qemu/Makefile.target -+++ qemu-kvm-0.10/qemu/Makefile.target ++++ qemu-kvm-0.10.4/Makefile.target @@ -613,6 +613,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) LIBS += $(CONFIG_VNC_TLS_LIBS) endif @@ -46,10 +46,10 @@ Index: qemu-kvm-0.10/qemu/Makefile.targe ifdef CONFIG_BLUEZ LIBS += $(CONFIG_BLUEZ_LIBS) endif -Index: qemu-kvm-0.10/qemu/configure +Index: qemu-kvm-0.10.4/configure =================================================================== --- qemu-kvm-0.10.orig/qemu/configure -+++ qemu-kvm-0.10/qemu/configure ++++ qemu-kvm-0.10.4/configure @@ -164,6 +164,7 @@ fmod_lib="" fmod_inc="" oss_lib="" @@ -126,10 +126,10 @@ Index: qemu-kvm-0.10/qemu/configure qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h -Index: qemu-kvm-0.10/qemu/qemu-doc.texi +Index: qemu-kvm-0.10.4/qemu-doc.texi =================================================================== --- qemu-kvm-0.10.orig/qemu/qemu-doc.texi -+++ qemu-kvm-0.10/qemu/qemu-doc.texi ++++ qemu-kvm-0.10.4/qemu-doc.texi @@ -624,6 +624,21 @@ path following this option specifies whe be loaded from. See the @ref{vnc_security} section for details on generating certificates. @@ -256,10 +256,10 @@ Index: qemu-kvm-0.10/qemu/qemu-doc.texi @node gdb_usage @section GDB usage -Index: qemu-kvm-0.10/qemu/qemu.sasl +Index: qemu-kvm-0.10.4/qemu.sasl =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/qemu.sasl ++++ qemu-kvm-0.10.4/qemu.sasl @@ -0,0 +1,34 @@ +# If you want to use the non-TLS socket, then you *must* include +# the GSSAPI or DIGEST-MD5 mechanisms, because they are the only @@ -295,10 +295,10 @@ Index: qemu-kvm-0.10/qemu/qemu.sasl + +auxprop_plugin: sasldb + -Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.c +Index: qemu-kvm-0.10.4/vnc-auth-sasl.c =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.c ++++ qemu-kvm-0.10.4/vnc-auth-sasl.c @@ -0,0 +1,626 @@ +/* + * QEMU VNC display driver: SASL auth protocol @@ -926,10 +926,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-sasl. +} + + -Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.h +Index: qemu-kvm-0.10.4/vnc-auth-sasl.h =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.h ++++ qemu-kvm-0.10.4/vnc-auth-sasl.h @@ -0,0 +1,67 @@ +/* + * QEMU VNC display driver: SASL auth protocol @@ -998,10 +998,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-sasl. + +#endif /* __QEMU_VNC_AUTH_SASL_H__ */ + -Index: qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c +Index: qemu-kvm-0.10.4/vnc-auth-vencrypt.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-auth-vencrypt.c -+++ qemu-kvm-0.10/qemu/vnc-auth-vencrypt.c ++++ qemu-kvm-0.10.4/vnc-auth-vencrypt.c @@ -43,8 +43,15 @@ static void start_auth_vencrypt_subauth( start_auth_vnc(vs); break; @@ -1029,10 +1029,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-vencr static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -68,7 +68,8 @@ static char *addr_to_string(const char * return addr; } @@ -1442,10 +1442,10 @@ Index: qemu-kvm-0.10/qemu/vnc.c if (reverse) { /* connect to viewer */ if (strncmp(display, "unix:", 5) == 0) -Index: qemu-kvm-0.10/qemu/vnc.h +Index: qemu-kvm-0.10.4/vnc.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.h -+++ qemu-kvm-0.10/qemu/vnc.h ++++ qemu-kvm-0.10.4/vnc.h @@ -79,6 +79,10 @@ typedef struct VncDisplay VncDisplay; #include "vnc-tls.h" #include "vnc-auth-vencrypt.h" 07-vnc-monitor-authinfo.patch: Index: 07-vnc-monitor-authinfo.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/07-vnc-monitor-authinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 07-vnc-monitor-authinfo.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 07-vnc-monitor-authinfo.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/vnc-tls.c +Index: qemu-kvm-0.10.4/vnc-tls.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-tls.c -+++ qemu-kvm-0.10/qemu/vnc-tls.c ++++ qemu-kvm-0.10.4/vnc-tls.c @@ -241,6 +241,22 @@ int vnc_tls_validate_certificate(struct return -1; } @@ -33,10 +33,10 @@ Index: qemu-kvm-0.10/qemu/vnc-tls.c } -Index: qemu-kvm-0.10/qemu/vnc-tls.h +Index: qemu-kvm-0.10.4/vnc-tls.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-tls.h -+++ qemu-kvm-0.10/qemu/vnc-tls.h ++++ qemu-kvm-0.10.4/vnc-tls.h @@ -55,6 +55,9 @@ struct VncStateTLS { /* Whether data is being TLS encrypted yet */ int wiremode; @@ -47,10 +47,10 @@ Index: qemu-kvm-0.10/qemu/vnc-tls.h }; int vnc_tls_client_setup(VncState *vs, int x509Creds); -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState term_puts("Client:\n"); term_puts(clientAddr); 08-vnc-acl-mgmt.patch: Index: 08-vnc-acl-mgmt.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/08-vnc-acl-mgmt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 08-vnc-acl-mgmt.patch 2 Apr 2009 01:07:39 -0000 1.1 +++ 08-vnc-acl-mgmt.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.10/qemu/Makefile +Index: qemu-kvm-0.10.4/Makefile =================================================================== --- qemu-kvm-0.10.orig/qemu/Makefile -+++ qemu-kvm-0.10/qemu/Makefile ++++ qemu-kvm-0.10.4/Makefile @@ -148,7 +148,7 @@ endif ifdef CONFIG_CURSES OBJS+=curses.o @@ -24,10 +24,10 @@ Index: qemu-kvm-0.10/qemu/Makefile vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -Index: qemu-kvm-0.10/qemu/acl.c +Index: qemu-kvm-0.10.4/acl.c =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/acl.c ++++ qemu-kvm-0.10.4/acl.c @@ -0,0 +1,185 @@ +/* + * QEMU access control list management @@ -214,10 +214,10 @@ Index: qemu-kvm-0.10/qemu/acl.c + * tab-width: 8 + * End: + */ -Index: qemu-kvm-0.10/qemu/acl.h +Index: qemu-kvm-0.10.4/acl.h =================================================================== --- /dev/null -+++ qemu-kvm-0.10/qemu/acl.h ++++ qemu-kvm-0.10.4/acl.h @@ -0,0 +1,74 @@ +/* + * QEMU access control list management @@ -293,10 +293,10 @@ Index: qemu-kvm-0.10/qemu/acl.h + * tab-width: 8 + * End: + */ -Index: qemu-kvm-0.10/qemu/configure +Index: qemu-kvm-0.10.4/configure =================================================================== --- qemu-kvm-0.10.orig/qemu/configure -+++ qemu-kvm-0.10/qemu/configure ++++ qemu-kvm-0.10.4/configure @@ -913,6 +913,21 @@ EOF fi @@ -329,10 +329,10 @@ Index: qemu-kvm-0.10/qemu/configure qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h -Index: qemu-kvm-0.10/qemu/monitor.c +Index: qemu-kvm-0.10.4/monitor.c =================================================================== --- qemu-kvm-0.10.orig/qemu/monitor.c -+++ qemu-kvm-0.10/qemu/monitor.c ++++ qemu-kvm-0.10.4/monitor.c @@ -39,6 +39,7 @@ #include "qemu-timer.h" #include "migration.h" @@ -461,10 +461,10 @@ Index: qemu-kvm-0.10/qemu/monitor.c + * tab-width: 8 + * End: + */ -Index: qemu-kvm-0.10/qemu/qemu-doc.texi +Index: qemu-kvm-0.10.4/qemu-doc.texi =================================================================== --- qemu-kvm-0.10.orig/qemu/qemu-doc.texi -+++ qemu-kvm-0.10/qemu/qemu-doc.texi ++++ qemu-kvm-0.10.4/qemu-doc.texi @@ -639,6 +639,19 @@ ensures a data encryption preventing com credentials. See the @ref{vnc_security} section for details on using SASL authentication. @@ -528,10 +528,10 @@ Index: qemu-kvm-0.10/qemu/qemu-doc.texi @item screendump @var{filename} Save screen into PPM image @var{filename}. -Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.c +Index: qemu-kvm-0.10.4/vnc-auth-sasl.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-auth-sasl.c -+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.c ++++ qemu-kvm-0.10.4/vnc-auth-sasl.c @@ -120,22 +120,32 @@ static int vnc_auth_sasl_check_access(Vn { const void *val; @@ -568,10 +568,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-sasl. } static int vnc_auth_sasl_check_ssf(VncState *vs) -Index: qemu-kvm-0.10/qemu/vnc-auth-sasl.h +Index: qemu-kvm-0.10.4/vnc-auth-sasl.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-auth-sasl.h -+++ qemu-kvm-0.10/qemu/vnc-auth-sasl.h ++++ qemu-kvm-0.10.4/vnc-auth-sasl.h @@ -30,6 +30,9 @@ #include @@ -593,10 +593,10 @@ Index: qemu-kvm-0.10/qemu/vnc-auth-sasl. void vnc_sasl_client_cleanup(VncState *vs); long vnc_client_read_sasl(VncState *vs); -Index: qemu-kvm-0.10/qemu/vnc-tls.c +Index: qemu-kvm-0.10.4/vnc-tls.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-tls.c -+++ qemu-kvm-0.10/qemu/vnc-tls.c ++++ qemu-kvm-0.10.4/vnc-tls.c @@ -255,6 +255,25 @@ int vnc_tls_validate_certificate(struct gnutls_strerror (ret)); return -1; @@ -623,10 +623,10 @@ Index: qemu-kvm-0.10/qemu/vnc-tls.c } gnutls_x509_crt_deinit (cert); -Index: qemu-kvm-0.10/qemu/vnc-tls.h +Index: qemu-kvm-0.10.4/vnc-tls.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc-tls.h -+++ qemu-kvm-0.10/qemu/vnc-tls.h ++++ qemu-kvm-0.10.4/vnc-tls.h @@ -31,6 +31,8 @@ #include #include @@ -644,10 +644,10 @@ Index: qemu-kvm-0.10/qemu/vnc-tls.h /* Paths to x509 certs/keys */ char *x509cacert; -Index: qemu-kvm-0.10/qemu/vnc.c +Index: qemu-kvm-0.10.4/vnc.c =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.c -+++ qemu-kvm-0.10/qemu/vnc.c ++++ qemu-kvm-0.10.4/vnc.c @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu_socket.h" @@ -693,10 +693,10 @@ Index: qemu-kvm-0.10/qemu/vnc.c /* * Combinations we support here: * -Index: qemu-kvm-0.10/qemu/vnc.h +Index: qemu-kvm-0.10.4/vnc.h =================================================================== --- qemu-kvm-0.10.orig/qemu/vnc.h -+++ qemu-kvm-0.10/qemu/vnc.h ++++ qemu-kvm-0.10.4/vnc.h @@ -98,6 +98,9 @@ struct VncDisplay int subauth; /* Used by VeNCrypt */ VncDisplayTLS tls; kvm-upstream-ppc.patch: Index: kvm-upstream-ppc.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/kvm-upstream-ppc.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- kvm-upstream-ppc.patch 2 Apr 2009 01:07:39 -0000 1.3 +++ kvm-upstream-ppc.patch 13 May 2009 08:35:55 -0000 1.4 @@ -18,10 +18,10 @@ Signed-off-by: Glauber Costa @@ -54,10 +54,10 @@ Index: qemu-kvm-0.10/qemu/hw/ppce500_mpc #include "config.h" #include "qemu-common.h" #include "net.h" -Index: qemu-kvm-0.10/qemu/target-ppc/helper.c +Index: qemu-kvm-0.10.4/target-ppc/helper.c =================================================================== --- qemu-kvm-0.10.orig/qemu/target-ppc/helper.c -+++ qemu-kvm-0.10/qemu/target-ppc/helper.c ++++ qemu-kvm-0.10.4/target-ppc/helper.c @@ -29,6 +29,7 @@ #include "exec-all.h" #include "helper_regs.h" qemu-bios-bigger-roms.patch: Index: qemu-bios-bigger-roms.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-bios-bigger-roms.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qemu-bios-bigger-roms.patch 2 Apr 2009 03:51:08 -0000 1.1 +++ qemu-bios-bigger-roms.patch 13 May 2009 08:35:55 -0000 1.2 @@ -1,7 +1,7 @@ -diff --git a/bios/rombios.c b/bios/rombios.c +diff --git a/kvm/bios/rombios.c b/kvm/bios/rombios.c index c4f6ccd..c4bfe60 100644 ---- a/bios/rombios.c -+++ b/bios/rombios.c +--- a/kvm/bios/rombios.c ++++ b/kvm/bios/rombios.c @@ -10196,22 +10196,43 @@ no_serial: ret qemu-fix-debuginfo.patch: Index: qemu-fix-debuginfo.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-fix-debuginfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qemu-fix-debuginfo.patch 2 Apr 2009 01:48:34 -0000 1.1 +++ qemu-fix-debuginfo.patch 13 May 2009 08:35:55 -0000 1.2 @@ -15,32 +15,18 @@ Signed-off-by: Riku Voipio > $config_mak +@@ -1334,7 +1339,6 @@ echo "INSTALL=$install" >> $config_mak echo "CC=$cc" >> $config_mak echo "HOST_CC=$host_cc" >> $config_mak echo "AR=$ar" >> $config_mak @@ -73,7 +59,7 @@ Index: qemu-kvm-0.10/qemu/configure # XXX: only use CFLAGS and LDFLAGS ? # XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross # compilation of dyngen tool (useful for win32 build on Linux host) -@@ -1405,6 +1409,9 @@ if test "$sparse" = "yes" ; then +@@ -1421,6 +1425,9 @@ if test "$sparse" = "yes" ; then echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_mak echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak fi @@ -83,3 +69,50 @@ Index: qemu-kvm-0.10/qemu/configure if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> $config_mak echo "#define WORDS_BIGENDIAN 1" >> $config_h +diff -urNp qemu-kvm-0.10.4.orig/configure.orig qemu-kvm-0.10.4/configure.orig +--- qemu-kvm-0.10.4.orig/configure.orig 2009-05-12 21:40:25.000000000 +0100 ++++ qemu-kvm-0.10.4/configure.orig 2009-05-12 21:40:25.000000000 +0100 +@@ -942,6 +942,21 @@ EOF + fi + + ########################################## ++# fnmatch() probe, used for ACL routines ++fnmatch="no" ++cat > $TMPC << EOF ++#include ++int main(void) ++{ ++ fnmatch("foo", "foo", 0); ++ return 0; ++} ++EOF ++if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then ++ fnmatch="yes" ++fi ++ ++########################################## + # vde libraries probe + if test "$vde" = "yes" ; then + cat > $TMPC << EOF +@@ -1517,6 +1532,9 @@ if test "$vnc_sasl" = "yes" ; then + echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak + echo "#define CONFIG_VNC_SASL 1" >> $config_h + fi ++if test "$fnmatch" = "yes" ; then ++ echo "#define HAVE_FNMATCH_H 1" >> $config_h ++fi + qemu_version=`head $source_path/VERSION` + echo "VERSION=$qemu_version" >>$config_mak + echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h +diff -urNp qemu-kvm-0.10.4.orig/Makefile qemu-kvm-0.10.4/Makefile +--- qemu-kvm-0.10.4.orig/Makefile 2009-05-12 21:40:25.000000000 +0100 ++++ qemu-kvm-0.10.4/Makefile 2009-05-12 21:42:34.000000000 +0100 +@@ -256,7 +256,7 @@ endif + install: all $(if $(BUILD_DOCS),install-doc) + mkdir -p "$(DESTDIR)$(bindir)" + ifneq ($(TOOLS),) +- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" + endif + ifneq ($(BLOBS),) + mkdir -p "$(DESTDIR)$(datadir)" qemu-fix-gcc.patch: Index: qemu-fix-gcc.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-fix-gcc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qemu-fix-gcc.patch 2 Apr 2009 01:53:47 -0000 1.1 +++ qemu-fix-gcc.patch 13 May 2009 08:35:55 -0000 1.2 @@ -14,10 +14,10 @@ Signed-off-by: Avi Kivity = 0xe0000000 ) { above_4g_mem_size = ram_size - 0xe0000000; -@@ -900,7 +901,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -907,7 +908,7 @@ static void pc_init1(ram_addr_t ram_size exit(1); } @@ -61,7 +60,7 @@ Index: qemu-kvm-0.10/qemu/hw/pc.c /* VGA BIOS load */ if (cirrus_vga_enabled) { snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME); -@@ -918,12 +919,21 @@ vga_bios_error: +@@ -925,12 +926,21 @@ vga_bios_error: fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf); exit(1); } @@ -84,7 +83,7 @@ Index: qemu-kvm-0.10/qemu/hw/pc.c /* map the last 128KB of the BIOS in ISA space */ isa_bios_size = bios_size; if (isa_bios_size > (128 * 1024)) -@@ -944,14 +954,14 @@ vga_bios_error: +@@ -951,14 +961,14 @@ vga_bios_error: ram_addr_t option_rom_offset; int size, offset; @@ -92,17 +91,17 @@ Index: qemu-kvm-0.10/qemu/hw/pc.c + offset = option_rom_start; if (linux_boot) { option_rom_offset = qemu_ram_alloc(TARGET_PAGE_SIZE); - load_linux(phys_ram_base + option_rom_offset, + load_linux(option_rom_offset, kernel_filename, initrd_filename, kernel_cmdline); - cpu_register_physical_memory(0xd0000, TARGET_PAGE_SIZE, + cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE, - option_rom_offset | IO_MEM_ROM); + option_rom_offset); - offset = TARGET_PAGE_SIZE; -+ offset += TARGET_PAGE_SIZE; ++ offset = +TARGET_PAGE_SIZE; } for (i = 0; i < nb_option_roms; i++) { -@@ -961,13 +971,13 @@ vga_bios_error: +@@ -968,13 +978,13 @@ vga_bios_error: option_rom[i]); exit(1); } @@ -118,7 +117,7 @@ Index: qemu-kvm-0.10/qemu/hw/pc.c exit(1); } size = (size + 4095) & ~4095; -@@ -975,9 +985,8 @@ vga_bios_error: +@@ -982,9 +992,8 @@ vga_bios_error: initialization, and (optionally) marked readonly by the BIOS before INT 19h. See the PNPBIOS specification, appendix B. DDIM support is mandatory for proper PCI expansion ROM support. */ Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -p -r1.90 -r1.91 --- qemu.spec 12 May 2009 15:31:15 -0000 1.90 +++ qemu.spec 13 May 2009 08:35:55 -0000 1.91 @@ -1,23 +1,16 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.10 -Release: 18%{?dist} -# I have mistakenly thought the revision name would be 1.0. -# So 0.10 series get Epoch = 1 +Version: 0.10.4 +Release: 1%{?dist} +# Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ -# To re-create the tarball below: -# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git -# $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git -# $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \ -# $(pwd)/kvm-userspace kvm-84-196-ga01bd3f -Source0: qemu-kvm-%{version}.tar.gz -Source1: make-release -Source2: qemu.init -Source3: kvm.modules +Source0: http://download.sourceforge.net/sourceforge/kvm/qemu-kvm-%{version}.tar.gz +Source1: qemu.init +Source2: kvm.modules Patch1: 01-tls-handshake-fix.patch Patch2: 02-vnc-monitor-info.patch @@ -34,16 +27,13 @@ Patch11: qemu-fix-gcc.patch Patch12: qemu-roms-more-room.patch Patch13: qemu-roms-more-room-fix-vga-align.patch Patch14: qemu-bios-bigger-roms.patch -Patch15: qemu-fix-display-breakage.patch -Patch16: qemu-fix-qcow2-2TB.patch -Patch17: qemu-fix-qcow2-corruption.patch -Patch18: qemu-move-option-rom-reset-definition.patch -Patch19: qemu-fix-load-linux.patch +Patch15: qemu-kvm-fix-kerneldir-includes.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 BuildRequires: pciutils-devel +BuildRequires: pulseaudio-libs-devel Requires: %{name}-user = %{epoch}:%{version}-%{release} Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release} @@ -85,7 +75,6 @@ This is a meta-package that provides a q architectures where kvm can be enabled. For example, in an x86 system, this will install qemu-system-x86 - %package img Summary: QEMU command line tool for manipulating disk images Group: Development/Tools @@ -234,10 +223,6 @@ such as kvmtrace and kvm_stat. %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -257,26 +242,28 @@ else fi %ifarch %{ix86} x86_64 -# sdl outputs to alsa or pulseaudio directly depending on what the system has configured +# sdl outputs to alsa or pulseaudio depending on system config, but it's broken (#495964) # alsa works, but causes huge CPU load due to bugs # oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire ./configure --target-list=x86_64-softmmu \ - --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ - --audio-drv-list=sdl,alsa,oss \ - --with-patched-kernel \ + --prefix=%{_prefix} \ + --audio-drv-list=pa,sdl,alsa,oss \ --disable-strip \ - --qemu-ldflags=$extraldflags \ - --qemu-cflags="$RPM_OPT_FLAGS" + --extra-ldflags=$extraldflags \ + --extra-cflags="$RPM_OPT_FLAGS" make V=1 %{?_smp_mflags} $buildldflags -cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm -cp user/kvmtrace . -cp user/kvmtrace_format . +cp -a x86_64-softmmu/qemu-system-x86_64 qemu-kvm make clean + +make -C kvm/extboot extboot.bin + +cd kvm/user +./configure --prefix=%{_prefix} --kerneldir=$(pwd)/../kernel/ +make kvmtrace +cd ../../ %endif -echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease -cd qemu ./configure \ --target-list="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu \ mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu \ @@ -288,15 +275,13 @@ cd qemu sparc32plus-linux-user" \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ - --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \ - --disable-strip \ + --audio-drv-list=pa,sdl,alsa,oss \ --disable-kvm \ + --disable-strip \ --extra-ldflags=$extraldflags \ - --audio-drv-list=sdl,alsa,oss \ --extra-cflags="$RPM_OPT_FLAGS" - -make %{?_smp_mflags} $buildldflags +make V=1 %{?_smp_mflags} $buildldflags %install rm -rf $RPM_BUILD_ROOT @@ -304,34 +289,34 @@ rm -rf $RPM_BUILD_ROOT %ifarch %{ix86} x86_64 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules -install -m 0755 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ -install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ -install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ - +install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 kvm/extboot/extboot.bin $RPM_BUILD_ROOT%{_datadir}/%{name} +install -m 0755 kvm/user/kvmtrace $RPM_BUILD_ROOT%{_bindir}/ +install -m 0755 kvm/user/kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ +install -m 0755 kvm/kvm_stat $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ %endif -cd qemu make prefix="${RPM_BUILD_ROOT}%{_prefix}" \ bindir="${RPM_BUILD_ROOT}%{_bindir}" \ - sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \ + sharedir="${RPM_BUILD_ROOT}%{_datadir}/%{name}" \ mandir="${RPM_BUILD_ROOT}%{_mandir}" \ docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ - datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install + datadir="${RPM_BUILD_ROOT}%{_datadir}/%{name}" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf -rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin -rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/vgabios*bin -rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/bios.bin -rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/openbios-ppc -rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/openbios-sparc32 -rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/openbios-sparc64 +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/pxe*bin +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/vgabios*bin +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/bios.bin +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/openbios-ppc +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/openbios-sparc32 +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/openbios-sparc64 # the pxe etherboot images will be symlinks to the images on # /usr/share/etherboot, as QEMU doesn't know how to look @@ -345,14 +330,12 @@ pxe_link ne2k_pci ne pxe_link pcnet pcnet32 pxe_link rtl8139 rtl8139 pxe_link virtio virtio-net -ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/%{_prefix}/share/qemu/vgabios.bin -ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/%{_prefix}/share/qemu/vgabios-cirrus.bin -ln -s ../bochs/BIOS-bochs-kvm %{buildroot}/%{_prefix}/share/qemu/bios.bin -ln -s ../openbios/openbios-ppc %{buildroot}/%{_prefix}/share/qemu/openbios-ppc -ln -s ../openbios/openbios-sparc32 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc32 -ln -s ../openbios/openbios-sparc64 %{buildroot}/%{_prefix}/share/qemu/openbios-sparc64 - - +ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/%{_datadir}/%{name}/vgabios.bin +ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/%{_datadir}/%{name}/vgabios-cirrus.bin +ln -s ../bochs/BIOS-bochs-kvm %{buildroot}/%{_datadir}/%{name}/bios.bin +ln -s ../openbios/openbios-ppc %{buildroot}/%{_datadir}/%{name}/openbios-ppc +ln -s ../openbios/openbios-sparc32 %{buildroot}/%{_datadir}/%{name}/openbios-sparc32 +ln -s ../openbios/openbios-sparc64 %{buildroot}/%{_datadir}/%{name}/openbios-sparc64 %clean rm -rf $RPM_BUILD_ROOT @@ -394,8 +377,8 @@ fi %doc %{qemudocdir}/COPYING %doc %{qemudocdir}/COPYING.LIB %doc %{qemudocdir}/LICENSE -%dir %{_prefix}/share/qemu/ -%{_prefix}/share/qemu/keymaps/ +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/keymaps/ %{_mandir}/man1/qemu.1* %{_mandir}/man8/qemu-nbd.8* %{_bindir}/qemu-nbd @@ -424,16 +407,16 @@ fi %defattr(-,root,root) %{_bindir}/qemu %{_bindir}/qemu-system-x86_64 -%{_prefix}/share/qemu/bios.bin -%{_prefix}/share/qemu/vgabios.bin -%{_prefix}/share/qemu/vgabios-cirrus.bin -%{_prefix}/share/qemu/pxe-e1000.bin -%{_prefix}/share/qemu/pxe-virtio.bin -%{_prefix}/share/qemu/pxe-pcnet.bin -%{_prefix}/share/qemu/pxe-rtl8139.bin -%{_prefix}/share/qemu/pxe-ne2k_pci.bin +%{_datadir}/%{name}/bios.bin +%{_datadir}/%{name}/vgabios.bin +%{_datadir}/%{name}/vgabios-cirrus.bin +%{_datadir}/%{name}/pxe-e1000.bin +%{_datadir}/%{name}/pxe-virtio.bin +%{_datadir}/%{name}/pxe-pcnet.bin +%{_datadir}/%{name}/pxe-rtl8139.bin +%{_datadir}/%{name}/pxe-ne2k_pci.bin %ifarch %{ix86} x86_64 -%{_prefix}/share/qemu/extboot.bin +%{_datadir}/%{name}/extboot.bin %{_bindir}/qemu-kvm %{_sysconfdir}/sysconfig/modules/kvm.modules %files kvm-tools @@ -445,8 +428,8 @@ fi %files system-sparc %defattr(-,root,root) %{_bindir}/qemu-system-sparc -%{_prefix}/share/qemu/openbios-sparc32 -%{_prefix}/share/qemu/openbios-sparc64 +%{_datadir}/%{name}/openbios-sparc32 +%{_datadir}/%{name}/openbios-sparc64 %files system-arm %defattr(-,root,root) %{_bindir}/qemu-system-arm @@ -461,10 +444,10 @@ fi %{_bindir}/qemu-system-ppc %{_bindir}/qemu-system-ppc64 %{_bindir}/qemu-system-ppcemb -%{_prefix}/share/qemu/openbios-ppc -%{_prefix}/share/qemu/video.x -%{_prefix}/share/qemu/bamboo.dtb -%{_prefix}/share/qemu/ppc_rom.bin +%{_datadir}/%{name}/openbios-ppc +%{_datadir}/%{name}/video.x +%{_datadir}/%{name}/bamboo.dtb +%{_datadir}/%{name}/ppc_rom.bin %files system-cris %defattr(-,root,root) %{_bindir}/qemu-system-cris @@ -482,6 +465,30 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Tue May 12 2009 Mark McLoughlin - 2:0.10.4-1 +- Update to 0.10.4 +- Fix yet more qcow2 corruption (#498405) +- AIO cancellation fixes (#497170) +- Fix VPC image size overflow (#491981) +- Fix oops with 2.6.25 virtio guest (#470386) +- Enable pulseaudio driver (#495964, #496627) +- Fix cpuid initialization +- Fix HPET emulation +- Fix storage hotplug error handling +- Migration fixes +- Block range checking fixes +- Make PCI config status register read-only +- Handle newer Xorg keymap names +- Don't leak memory on NIC hot-unplug +- Hook up keypad keys for qemu console emulation +- Correctly run on kernels lacking mmu notifiers +- Support DDIM option ROMs +- Fix PCI NIC error handling +- Fix in-kernel LAPIC initialization +- Fix broken e1000 PCI config space +- Drop some patches which have been upstreamed +- Drop the make-release script; we have an official tarball now + * Tue May 12 2009 Glauber Costa - 2:0.10-18 - move option rom setup function to the beginning of the file. This avoids static vs non-static issues, and is the way upstream does Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 2 Apr 2009 01:07:39 -0000 1.14 +++ sources 13 May 2009 08:35:55 -0000 1.15 @@ -1 +1 @@ -04c32fb43c722f180654f53e04ad17dd qemu-kvm-0.10.tar.gz +7b876a4899ed82517ca47898e59f215c qemu-kvm-0.10.4.tar.gz --- make-release DELETED --- --- qemu-fix-display-breakage.patch DELETED --- --- qemu-fix-load-linux.patch DELETED --- --- qemu-fix-qcow2-2TB.patch DELETED --- --- qemu-fix-qcow2-corruption.patch DELETED --- --- qemu-move-option-rom-reset-definition.patch DELETED --- From markmc at fedoraproject.org Wed May 13 11:22:30 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 13 May 2009 11:22:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-fix-load-linux.patch, 1.2, 1.3 qemu-roms-more-room.patch, 1.2, 1.3 qemu.spec, 1.91, 1.92 Message-ID: <20090513112230.05D3570115@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28506 Modified Files: qemu-roms-more-room.patch qemu.spec Added Files: qemu-fix-load-linux.patch Log Message: * Wed May 13 2009 Mark McLoughlin - 2:0.10.4-2 - Fix -kernel bustage in upstream 0.10.4 qemu-fix-load-linux.patch: Index: qemu-fix-load-linux.patch =================================================================== RCS file: qemu-fix-load-linux.patch diff -N qemu-fix-load-linux.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ qemu-fix-load-linux.patch 13 May 2009 11:21:59 -0000 1.3 @@ -0,0 +1,45 @@ +From 7a53bcbef278b4191d5cb497ef2b81509a00f670 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Wed, 13 May 2009 12:59:47 +0100 +Subject: [PATCH 1/1] Fix load_linux reset handling fix + +This fix on the stable branch: + + commit 2da1e398641d9fccf683645c808dee0d088f84cf + Author: Glauber Costa + Date: Fri May 8 02:22:13 2009 -0300 + + reset state for load_linux + +Caused -kernel to break. + +The problem is that we're passing the ROM's ram_addr_t to +load_linux() rather than its target_phys_addr_t. We also +need to register the memory before trying to write to +it. + +Signed-off-by: Mark McLoughlin +--- + hw/pc.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/pc.c b/hw/pc.c +index 062c306..e69a1f7 100644 +--- a/hw/pc.c ++++ b/hw/pc.c +@@ -954,10 +954,10 @@ vga_bios_error: + offset = option_rom_start; + if (linux_boot) { + option_rom_offset = qemu_ram_alloc(TARGET_PAGE_SIZE); +- load_linux(option_rom_offset, +- kernel_filename, initrd_filename, kernel_cmdline); + cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE, + option_rom_offset); ++ load_linux(option_rom_start, ++ kernel_filename, initrd_filename, kernel_cmdline); + offset += TARGET_PAGE_SIZE; + } + +-- +1.6.2.2 + qemu-roms-more-room.patch: Index: qemu-roms-more-room.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-roms-more-room.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- qemu-roms-more-room.patch 13 May 2009 08:35:55 -0000 1.2 +++ qemu-roms-more-room.patch 13 May 2009 11:21:59 -0000 1.3 @@ -97,7 +97,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q + cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE, option_rom_offset); - offset = TARGET_PAGE_SIZE; -+ offset = +TARGET_PAGE_SIZE; ++ offset += TARGET_PAGE_SIZE; } for (i = 0; i < nb_option_roms; i++) { Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -p -r1.91 -r1.92 --- qemu.spec 13 May 2009 08:35:55 -0000 1.91 +++ qemu.spec 13 May 2009 11:21:59 -0000 1.92 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.4 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -28,6 +28,7 @@ Patch12: qemu-roms-more-room.patch Patch13: qemu-roms-more-room-fix-vga-align.patch Patch14: qemu-bios-bigger-roms.patch Patch15: qemu-kvm-fix-kerneldir-includes.patch +Patch16: qemu-fix-load-linux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -223,6 +224,7 @@ such as kvmtrace and kvm_stat. %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -465,6 +467,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Wed May 13 2009 Mark McLoughlin - 2:0.10.4-2 +- Fix -kernel bustage in upstream 0.10.4 + * Tue May 12 2009 Mark McLoughlin - 2:0.10.4-1 - Update to 0.10.4 - Fix yet more qcow2 corruption (#498405) From markmc at fedoraproject.org Wed May 13 14:28:12 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 13 May 2009 14:28:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu.spec,1.92,1.93 Message-ID: <20090513142812.6809670115@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18759 Modified Files: qemu.spec Log Message: * Wed May 13 2009 Mark McLoughlin - 2:0.10.4-3 - Fix mixup between kvm.modules and the init script (reported by Rich Jones) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -p -r1.92 -r1.93 --- qemu.spec 13 May 2009 11:21:59 -0000 1.92 +++ qemu.spec 13 May 2009 14:27:42 -0000 1.93 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.4 -Release: 2%{?dist} +Release: 3%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -293,7 +293,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ mkdir -p $RPM_BUILD_ROOT%{_bindir}/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules install -m 0755 kvm/extboot/extboot.bin $RPM_BUILD_ROOT%{_datadir}/%{name} install -m 0755 kvm/user/kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm/user/kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ @@ -308,7 +308,7 @@ make prefix="${RPM_BUILD_ROOT}%{_prefix} docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ datadir="${RPM_BUILD_ROOT}%{_datadir}/%{name}" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* -install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE install -D -p -m 0644 qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl2/qemu.conf @@ -467,6 +467,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Wed May 13 2009 Mark McLoughlin - 2:0.10.4-3 +- Fix mixup between kvm.modules and the init script (reported by Rich Jones) + * Wed May 13 2009 Mark McLoughlin - 2:0.10.4-2 - Fix -kernel bustage in upstream 0.10.4 From markmc at fedoraproject.org Thu May 14 11:00:43 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 14 May 2009 11:00:43 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-dma-aio-cancellation1.patch, NONE, 1.1 qemu-dma-aio-cancellation2.patch, NONE, 1.1 qemu-dma-aio-cancellation3.patch, NONE, 1.1 qemu-dma-aio-cancellation4.patch, NONE, 1.1 qemu.spec, 1.93, 1.94 Message-ID: <20090514110043.DC37670097@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7042 Modified Files: qemu.spec Added Files: qemu-dma-aio-cancellation1.patch qemu-dma-aio-cancellation2.patch qemu-dma-aio-cancellation3.patch qemu-dma-aio-cancellation4.patch Log Message: * Thu May 14 2009 Mark McLoughlin - 2:0.10.4-4 - Cherry pick more DMA AIO cancellation fixes from upstream (#497170) qemu-dma-aio-cancellation1.patch: --- NEW FILE qemu-dma-aio-cancellation1.patch --- >From 3b92e958482155404cfd134a9608041eed69622a Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 20 Mar 2009 18:26:12 +0000 Subject: [STABLE][PATCH 1/4] Use vectored aiocb storage to store vector translation state Now that we have a dedicated acb pool for vector translation acbs, we can store the vector translation state in the acbs instead of in an external structure. Signed-off-by: Avi Kivity --- block.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index b12318f..689ea37 100644 --- a/block.c +++ b/block.c @@ -1332,31 +1332,32 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) /**************************************************************/ /* async I/Os */ -typedef struct VectorTranslationState { +typedef struct VectorTranslationAIOCB { + BlockDriverAIOCB common; QEMUIOVector *iov; uint8_t *bounce; int is_write; BlockDriverAIOCB *aiocb; - BlockDriverAIOCB *this_aiocb; -} VectorTranslationState; +} VectorTranslationAIOCB; -static void bdrv_aio_cancel_vector(BlockDriverAIOCB *acb) +static void bdrv_aio_cancel_vector(BlockDriverAIOCB *_acb) { - VectorTranslationState *s = acb->opaque; + VectorTranslationAIOCB *acb + = container_of(_acb, VectorTranslationAIOCB, common); - bdrv_aio_cancel(s->aiocb); + bdrv_aio_cancel(acb->aiocb); } static void bdrv_aio_rw_vector_cb(void *opaque, int ret) { - VectorTranslationState *s = opaque; + VectorTranslationAIOCB *s = (VectorTranslationAIOCB *)opaque; if (!s->is_write) { qemu_iovec_from_buffer(s->iov, s->bounce, s->iov->size); } qemu_vfree(s->bounce); - s->this_aiocb->cb(s->this_aiocb->opaque, ret); - qemu_aio_release(s->this_aiocb); + s->common.cb(s->common.opaque, ret); + qemu_aio_release(s); } static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, @@ -1368,11 +1369,9 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, int is_write) { - VectorTranslationState *s = qemu_mallocz(sizeof(*s)); - BlockDriverAIOCB *aiocb = qemu_aio_get_pool(&vectored_aio_pool, bs, - cb, opaque); + VectorTranslationAIOCB *s = qemu_aio_get_pool(&vectored_aio_pool, bs, + cb, opaque); - s->this_aiocb = aiocb; s->iov = iov; s->bounce = qemu_memalign(512, nb_sectors * 512); s->is_write = is_write; @@ -1384,7 +1383,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, s->aiocb = bdrv_aio_read(bs, sector_num, s->bounce, nb_sectors, bdrv_aio_rw_vector_cb, s); } - return aiocb; + return &s->common; } BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num, @@ -1560,7 +1559,7 @@ static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, void bdrv_init(void) { - aio_pool_init(&vectored_aio_pool, sizeof(BlockDriverAIOCB), + aio_pool_init(&vectored_aio_pool, sizeof(VectorTranslationAIOCB), bdrv_aio_cancel_vector); bdrv_register(&bdrv_raw); -- 1.6.0.6 qemu-dma-aio-cancellation2.patch: --- NEW FILE qemu-dma-aio-cancellation2.patch --- >From b591f5930d0eaa93690c5a7acf95e4f5a3e04e06 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 20 Mar 2009 18:26:16 +0000 Subject: [STABLE][PATCH 2/4] Move block dma helpers aiocb to store dma state Use the dedicated dma aiocb to store intermediate state for dma block transactions. Signed-off-by: Avi Kivity --- dma-helpers.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dma-helpers.c b/dma-helpers.c index 19fa4f0..96a120c 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -39,6 +39,7 @@ void qemu_sglist_destroy(QEMUSGList *qsg) } typedef struct { + BlockDriverAIOCB common; BlockDriverState *bs; BlockDriverAIOCB *acb; QEMUSGList *sg; @@ -48,13 +49,13 @@ typedef struct { target_phys_addr_t sg_cur_byte; QEMUIOVector iov; QEMUBH *bh; -} DMABlockState; +} DMAAIOCB; static void dma_bdrv_cb(void *opaque, int ret); static void reschedule_dma(void *opaque) { - DMABlockState *dbs = (DMABlockState *)opaque; + DMAAIOCB *dbs = (DMAAIOCB *)opaque; qemu_bh_delete(dbs->bh); dbs->bh = NULL; @@ -63,7 +64,7 @@ static void reschedule_dma(void *opaque) static void continue_after_map_failure(void *opaque) { - DMABlockState *dbs = (DMABlockState *)opaque; + DMAAIOCB *dbs = (DMAAIOCB *)opaque; dbs->bh = qemu_bh_new(reschedule_dma, dbs); qemu_bh_schedule(dbs->bh); @@ -71,11 +72,12 @@ static void continue_after_map_failure(void *opaque) static void dma_bdrv_cb(void *opaque, int ret) { - DMABlockState *dbs = (DMABlockState *)opaque; + DMAAIOCB *dbs = (DMAAIOCB *)opaque; target_phys_addr_t cur_addr, cur_len; void *mem; int i; + dbs->acb = NULL; dbs->sector_num += dbs->iov.size / 512; for (i = 0; i < dbs->iov.niov; ++i) { cpu_physical_memory_unmap(dbs->iov.iov[i].iov_base, @@ -85,10 +87,9 @@ static void dma_bdrv_cb(void *opaque, int ret) qemu_iovec_reset(&dbs->iov); if (dbs->sg_cur_index == dbs->sg->nsg || ret < 0) { - dbs->acb->cb(dbs->acb->opaque, ret); + dbs->common.cb(dbs->common.opaque, ret); qemu_iovec_destroy(&dbs->iov); - qemu_aio_release(dbs->acb); - qemu_free(dbs); + qemu_aio_release(dbs); return; } @@ -112,11 +113,11 @@ static void dma_bdrv_cb(void *opaque, int ret) } if (dbs->is_write) { - bdrv_aio_writev(dbs->bs, dbs->sector_num, &dbs->iov, - dbs->iov.size / 512, dma_bdrv_cb, dbs); + dbs->acb = bdrv_aio_writev(dbs->bs, dbs->sector_num, &dbs->iov, + dbs->iov.size / 512, dma_bdrv_cb, dbs); } else { - bdrv_aio_readv(dbs->bs, dbs->sector_num, &dbs->iov, - dbs->iov.size / 512, dma_bdrv_cb, dbs); + dbs->acb = bdrv_aio_readv(dbs->bs, dbs->sector_num, &dbs->iov, + dbs->iov.size / 512, dma_bdrv_cb, dbs); } } @@ -125,10 +126,10 @@ static BlockDriverAIOCB *dma_bdrv_io( BlockDriverCompletionFunc *cb, void *opaque, int is_write) { - DMABlockState *dbs = qemu_malloc(sizeof(*dbs)); + DMAAIOCB *dbs = qemu_aio_get_pool(&dma_aio_pool, bs, cb, opaque); + dbs->acb = NULL; dbs->bs = bs; - dbs->acb = qemu_aio_get_pool(&dma_aio_pool, bs, cb, opaque); dbs->sg = sg; dbs->sector_num = sector_num; dbs->sg_cur_index = 0; @@ -137,7 +138,7 @@ static BlockDriverAIOCB *dma_bdrv_io( dbs->bh = NULL; qemu_iovec_init(&dbs->iov, sg->nsg); dma_bdrv_cb(dbs, 0); - return dbs->acb; + return &dbs->common; } @@ -157,12 +158,14 @@ BlockDriverAIOCB *dma_bdrv_write(BlockDriverState *bs, static void dma_aio_cancel(BlockDriverAIOCB *acb) { - DMABlockState *dbs = (DMABlockState *)acb->opaque; + DMAAIOCB *dbs = container_of(acb, DMAAIOCB, common); - bdrv_aio_cancel(dbs->acb); + if (dbs->acb) { + bdrv_aio_cancel(dbs->acb); + } } void dma_helper_init(void) { - aio_pool_init(&dma_aio_pool, sizeof(BlockDriverAIOCB), dma_aio_cancel); + aio_pool_init(&dma_aio_pool, sizeof(DMAAIOCB), dma_aio_cancel); } -- 1.6.0.6 qemu-dma-aio-cancellation3.patch: --- NEW FILE qemu-dma-aio-cancellation3.patch --- >From 2df6efa1790a7a2894707257d2fe67b8d1cfb13a Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sat, 28 Mar 2009 16:11:20 +0000 Subject: [STABLE][PATCH 3/4] Fix vectored aio bounce handling immediate errors If a bounced vectored aio fails immediately (the inner aio submission returning NULL) then the bounce handler erronously returns an aio request which will never be completed (and which crashes when cancelled). Fix by detecting that the inner request has failed and propagating the error. Signed-off-by: Avi Kivity --- block.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 689ea37..b68a8da 100644 --- a/block.c +++ b/block.c @@ -1383,6 +1383,11 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, s->aiocb = bdrv_aio_read(bs, sector_num, s->bounce, nb_sectors, bdrv_aio_rw_vector_cb, s); } + if (!s->aiocb) { + qemu_vfree(s->bounce); + qemu_aio_release(s); + return NULL; + } return &s->common; } -- 1.6.0.6 qemu-dma-aio-cancellation4.patch: --- NEW FILE qemu-dma-aio-cancellation4.patch --- >From eaa874771bb83df639e2937884240a6b05622e3f Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sat, 28 Mar 2009 16:11:25 +0000 Subject: [STABLE][PATCH 4/4] Fix DMA API when handling an immediate error from block layer The block layer may signal an immediate error on an asynchronous request by returning NULL. The DMA API did not handle this correctly, returning an AIO request which would never complete (and which would crash if cancelled). Fix by detecting the failure and propagating it. Signed-off-by: Avi Kivity --- dma-helpers.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dma-helpers.c b/dma-helpers.c index 96a120c..1469e34 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -70,20 +70,26 @@ static void continue_after_map_failure(void *opaque) qemu_bh_schedule(dbs->bh); } -static void dma_bdrv_cb(void *opaque, int ret) +static void dma_bdrv_unmap(DMAAIOCB *dbs) { - DMAAIOCB *dbs = (DMAAIOCB *)opaque; - target_phys_addr_t cur_addr, cur_len; - void *mem; int i; - dbs->acb = NULL; - dbs->sector_num += dbs->iov.size / 512; for (i = 0; i < dbs->iov.niov; ++i) { cpu_physical_memory_unmap(dbs->iov.iov[i].iov_base, dbs->iov.iov[i].iov_len, !dbs->is_write, dbs->iov.iov[i].iov_len); } +} + +void dma_bdrv_cb(void *opaque, int ret) +{ + DMAAIOCB *dbs = (DMAAIOCB *)opaque; + target_phys_addr_t cur_addr, cur_len; + void *mem; + + dbs->acb = NULL; + dbs->sector_num += dbs->iov.size / 512; + dma_bdrv_unmap(dbs); qemu_iovec_reset(&dbs->iov); if (dbs->sg_cur_index == dbs->sg->nsg || ret < 0) { @@ -119,6 +125,11 @@ static void dma_bdrv_cb(void *opaque, int ret) dbs->acb = bdrv_aio_readv(dbs->bs, dbs->sector_num, &dbs->iov, dbs->iov.size / 512, dma_bdrv_cb, dbs); } + if (!dbs->acb) { + dma_bdrv_unmap(dbs); + qemu_iovec_destroy(&dbs->iov); + return; + } } static BlockDriverAIOCB *dma_bdrv_io( @@ -138,6 +149,10 @@ static BlockDriverAIOCB *dma_bdrv_io( dbs->bh = NULL; qemu_iovec_init(&dbs->iov, sg->nsg); dma_bdrv_cb(dbs, 0); + if (!dbs->acb) { + qemu_aio_release(dbs); + return NULL; + } return &dbs->common; } -- 1.6.0.6 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -p -r1.93 -r1.94 --- qemu.spec 13 May 2009 14:27:42 -0000 1.93 +++ qemu.spec 14 May 2009 11:00:13 -0000 1.94 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.4 -Release: 3%{?dist} +Release: 4%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -29,6 +29,10 @@ Patch13: qemu-roms-more-room-fix-vga-ali Patch14: qemu-bios-bigger-roms.patch Patch15: qemu-kvm-fix-kerneldir-includes.patch Patch16: qemu-fix-load-linux.patch +Patch17: qemu-dma-aio-cancellation1.patch +Patch18: qemu-dma-aio-cancellation2.patch +Patch19: qemu-dma-aio-cancellation3.patch +Patch20: qemu-dma-aio-cancellation4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -225,6 +229,10 @@ such as kvmtrace and kvm_stat. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -467,6 +475,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Thu May 14 2009 Mark McLoughlin - 2:0.10.4-4 +- Cherry pick more DMA AIO cancellation fixes from upstream (#497170) + * Wed May 13 2009 Mark McLoughlin - 2:0.10.4-3 - Fix mixup between kvm.modules and the init script (reported by Rich Jones) From glommer at fedoraproject.org Tue May 19 01:13:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 19 May 2009 01:13:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/vgabios/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vgabios.spec, 1.1, 1.2 Message-ID: <20090519011359.8CF7970114@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/vgabios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14666 Modified Files: .cvsignore sources vgabios.spec Log Message: updated to 0.6.c Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 3 Mar 2009 02:01:37 -0000 1.2 +++ .cvsignore 19 May 2009 01:13:28 -0000 1.3 @@ -1 +1 @@ -vgabios-0.6b.tgz +vgabios-0.6c.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 3 Mar 2009 02:01:37 -0000 1.2 +++ sources 19 May 2009 01:13:29 -0000 1.3 @@ -1 +1 @@ -36399621c4d6753e83a3cec3009c7183 vgabios-0.6b.tgz +2b0a5387594bb70cb1dbcc1f79ec824c vgabios-0.6c.tgz Index: vgabios.spec =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/devel/vgabios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vgabios.spec 3 Mar 2009 02:01:37 -0000 1.1 +++ vgabios.spec 19 May 2009 01:13:29 -0000 1.2 @@ -1,12 +1,12 @@ Name: vgabios Version: 0.6 -Release: 0.5.b%{?dist} +Release: 0.6.c%{?dist} Summary: LGPL implementation of a vga video bios Group: Applications/Emulators License: LGPLv2 URL: http://www.nongnu.org/vgabios/ -Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}b.tgz +Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}c.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dev86 @@ -19,7 +19,7 @@ emulators. It is not intended for use in %prep -%setup -q -n %{name}-%{version}b +%setup -q -n %{name}-%{version}c %build make clean @@ -50,18 +50,21 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Mar 02 2009 Glauber Costa - 0.6.0.5.b +* Mon May 18 2009 Glauber Costa - 0.6.0.6.c +- updated to 0.6.c (#499060) + +* Mon Mar 02 2009 Glauber Costa - 0.6-0.5.b - fixed naming to comply with guidelines. -* Tue Feb 17 2009 Glauber Costa - 0.6.0.4beta +* Tue Feb 17 2009 Glauber Costa - 0.6-0.4beta - removed leftovers and fixed rpmlint errors. -* Mon Feb 16 2009 Glauber Costa - 0.6.0.3beta +* Mon Feb 16 2009 Glauber Costa - 0.6-0.3beta - using dev86 to build directly on all arches, made package noarch. No more binaries \o/ -* Fri Feb 13 2009 Glauber Costa - 0.6.0.2beta +* Fri Feb 13 2009 Glauber Costa - 0.6-0.2beta - Addressing BZ 485418: added doc section, clean build root before we proceed, own vgabios directory -* Fri Feb 13 2009 Glauber Costa - 0.6.0.1beta +* Fri Feb 13 2009 Glauber Costa - 0.6-0.1beta - Created initial package From glommer at fedoraproject.org Tue May 19 01:15:56 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 19 May 2009 01:15:56 +0000 (UTC) Subject: [fedora-virt-maint] rpms/vgabios/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vgabios.spec, 1.1, 1.2 Message-ID: <20090519011556.675C570114@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/vgabios/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14950 Modified Files: .cvsignore sources vgabios.spec Log Message: updated to 0.6.c Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 3 Mar 2009 02:01:37 -0000 1.2 +++ .cvsignore 19 May 2009 01:15:25 -0000 1.3 @@ -1 +1 @@ -vgabios-0.6b.tgz +vgabios-0.6c.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 3 Mar 2009 02:01:37 -0000 1.2 +++ sources 19 May 2009 01:15:25 -0000 1.3 @@ -1 +1 @@ -36399621c4d6753e83a3cec3009c7183 vgabios-0.6b.tgz +2b0a5387594bb70cb1dbcc1f79ec824c vgabios-0.6c.tgz Index: vgabios.spec =================================================================== RCS file: /cvs/pkgs/rpms/vgabios/F-11/vgabios.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- vgabios.spec 3 Mar 2009 02:01:37 -0000 1.1 +++ vgabios.spec 19 May 2009 01:15:25 -0000 1.2 @@ -1,12 +1,12 @@ Name: vgabios Version: 0.6 -Release: 0.5.b%{?dist} +Release: 0.6.c%{?dist} Summary: LGPL implementation of a vga video bios Group: Applications/Emulators License: LGPLv2 URL: http://www.nongnu.org/vgabios/ -Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}b.tgz +Source0: http://savannah.gnu.org/download/%{name}/%{name}-%{version}c.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dev86 @@ -19,7 +19,7 @@ emulators. It is not intended for use in %prep -%setup -q -n %{name}-%{version}b +%setup -q -n %{name}-%{version}c %build make clean @@ -50,18 +50,21 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Mar 02 2009 Glauber Costa - 0.6.0.5.b +* Mon May 18 2009 Glauber Costa - 0.6.0.6.c +- updated to 0.6.c (#499060) + +* Mon Mar 02 2009 Glauber Costa - 0.6-0.5.b - fixed naming to comply with guidelines. -* Tue Feb 17 2009 Glauber Costa - 0.6.0.4beta +* Tue Feb 17 2009 Glauber Costa - 0.6-0.4beta - removed leftovers and fixed rpmlint errors. -* Mon Feb 16 2009 Glauber Costa - 0.6.0.3beta +* Mon Feb 16 2009 Glauber Costa - 0.6-0.3beta - using dev86 to build directly on all arches, made package noarch. No more binaries \o/ -* Fri Feb 13 2009 Glauber Costa - 0.6.0.2beta +* Fri Feb 13 2009 Glauber Costa - 0.6-0.2beta - Addressing BZ 485418: added doc section, clean build root before we proceed, own vgabios directory -* Fri Feb 13 2009 Glauber Costa - 0.6.0.1beta +* Fri Feb 13 2009 Glauber Costa - 0.6-0.1beta - Created initial package From glommer at fedoraproject.org Tue May 19 03:01:26 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 19 May 2009 03:01:26 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-fix-x86-feature-modifications-for-features-that-set.patch, NONE, 1.1 qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch, NONE, 1.1 qemu-trim-cpu-features-not-supported-by-kvm.patch, NONE, 1.1 qemu.spec, 1.94, 1.95 Message-ID: <20090519030127.037F370114@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8104 Modified Files: qemu.spec Added Files: qemu-fix-x86-feature-modifications-for-features-that-set.patch qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch qemu-trim-cpu-features-not-supported-by-kvm.patch Log Message: - Backport cpuid trimming from upstream (#499596) qemu-fix-x86-feature-modifications-for-features-that-set.patch: --- NEW FILE qemu-fix-x86-feature-modifications-for-features-that-set.patch --- >From cf6c4edfab98f587405ec61cd727ad70eeb9984e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 3 May 2009 17:04:03 +0300 Subject: [PATCH STABLE 2/3] Fix x86 feature modifications for features that set multiple bits QEMU allows adding or removing cpu features by using the syntax '-cpu +feature' or '-cpu -feature'. Some cpuid features cause more than one bit to be set or cleared; but QEMU stops after just one bit has been modified, causing the feature bits to be inconsistent. Fix by allowing all feature bits corresponding to a given name to be set. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- target-i386/helper.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) Index: qemu-kvm-0.10.4/target-i386/helper.c =================================================================== --- qemu-kvm-0.10.4.orig/target-i386/helper.c +++ qemu-kvm-0.10.4/target-i386/helper.c @@ -68,28 +68,31 @@ static void add_flagname_to_bitmaps(char uint32_t *ext3_features) { int i; + int found = 0; for ( i = 0 ; i < 32 ; i++ ) if (feature_name[i] && !strcmp (flagname, feature_name[i])) { *features |= 1 << i; - return; + found = 1; } for ( i = 0 ; i < 32 ; i++ ) if (ext_feature_name[i] && !strcmp (flagname, ext_feature_name[i])) { *ext_features |= 1 << i; - return; + found = 1; } for ( i = 0 ; i < 32 ; i++ ) if (ext2_feature_name[i] && !strcmp (flagname, ext2_feature_name[i])) { *ext2_features |= 1 << i; - return; + found = 1; } for ( i = 0 ; i < 32 ; i++ ) if (ext3_feature_name[i] && !strcmp (flagname, ext3_feature_name[i])) { *ext3_features |= 1 << i; - return; + found = 1; } - fprintf(stderr, "CPU feature %s not found\n", flagname); + if (!found) { + fprintf(stderr, "CPU feature %s not found\n", flagname); + } } extern const char *cpu_vendor_string; qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch: --- NEW FILE qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch --- >From d01f3fea76975026f4308bdd214004b9312cd9ea Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 3 May 2009 17:04:02 +0300 Subject: [PATCH STABLE 1/3] Make x86 cpuid feature names available in file scope To be used later. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- target-i386/helper.c | 55 +++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 8213703..3eb9697 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -32,39 +32,40 @@ //#define DEBUG_MMU +/* feature flags taken from "Intel Processor Identification and the CPUID + * Instruction" and AMD's "CPUID Specification". In cases of disagreement + * about feature names, the Linux name is used. */ +static const char *feature_name[] = { + "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", + "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", + "pat", "pse36", "pn" /* Intel psn */, "clflush" /* Intel clfsh */, NULL, "ds" /* Intel dts */, "acpi", "mmx", + "fxsr", "sse", "sse2", "ss", "ht" /* Intel htt */, "tm", "ia64", "pbe", +}; +static const char *ext_feature_name[] = { + "pni" /* Intel,AMD sse3 */, NULL, NULL, "monitor", "ds_cpl", "vmx", NULL /* Linux smx */, "est", + "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, + NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt", + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +}; +static const char *ext2_feature_name[] = { + "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", + "cx8" /* AMD CMPXCHG8B */, "apic", NULL, "syscall", "mtrr", "pge", "mca", "cmov", + "pat", "pse36", NULL, NULL /* Linux mp */, "nx" /* Intel xd */, NULL, "mmxext", "mmx", + "fxsr", "fxsr_opt" /* AMD ffxsr */, "pdpe1gb" /* AMD Page1GB */, "rdtscp", NULL, "lm" /* Intel 64 */, "3dnowext", "3dnow", +}; +static const char *ext3_feature_name[] = { + "lahf_lm" /* AMD LahfSahf */, "cmp_legacy", "svm", "extapic" /* AMD ExtApicSpace */, "cr8legacy" /* AMD AltMovCr8 */, "abm", "sse4a", "misalignsse", + "3dnowprefetch", "osvw", NULL /* Linux ibs */, NULL, "skinit", "wdt", NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +}; + static void add_flagname_to_bitmaps(char *flagname, uint32_t *features, uint32_t *ext_features, uint32_t *ext2_features, uint32_t *ext3_features) { int i; - /* feature flags taken from "Intel Processor Identification and the CPUID - * Instruction" and AMD's "CPUID Specification". In cases of disagreement - * about feature names, the Linux name is used. */ - static const char *feature_name[] = { - "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", - "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", - "pat", "pse36", "pn" /* Intel psn */, "clflush" /* Intel clfsh */, NULL, "ds" /* Intel dts */, "acpi", "mmx", - "fxsr", "sse", "sse2", "ss", "ht" /* Intel htt */, "tm", "ia64", "pbe", - }; - static const char *ext_feature_name[] = { - "pni" /* Intel,AMD sse3 */, NULL, NULL, "monitor", "ds_cpl", "vmx", NULL /* Linux smx */, "est", - "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, - NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt", - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - }; - static const char *ext2_feature_name[] = { - "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", - "cx8" /* AMD CMPXCHG8B */, "apic", NULL, "syscall", "mtrr", "pge", "mca", "cmov", - "pat", "pse36", NULL, NULL /* Linux mp */, "nx" /* Intel xd */, NULL, "mmxext", "mmx", - "fxsr", "fxsr_opt" /* AMD ffxsr */, "pdpe1gb" /* AMD Page1GB */, "rdtscp", NULL, "lm" /* Intel 64 */, "3dnowext", "3dnow", - }; - static const char *ext3_feature_name[] = { - "lahf_lm" /* AMD LahfSahf */, "cmp_legacy", "svm", "extapic" /* AMD ExtApicSpace */, "cr8legacy" /* AMD AltMovCr8 */, "abm", "sse4a", "misalignsse", - "3dnowprefetch", "osvw", NULL /* Linux ibs */, NULL, "skinit", "wdt", NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - }; for ( i = 0 ; i < 32 ; i++ ) if (feature_name[i] && !strcmp (flagname, feature_name[i])) { -- 1.5.6.6 qemu-trim-cpu-features-not-supported-by-kvm.patch: --- NEW FILE qemu-trim-cpu-features-not-supported-by-kvm.patch --- >From 3b944bee95c6a5ee561acfc4c4d75d8cc971a567 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 3 May 2009 17:04:04 +0300 Subject: [PATCH STABLE 3/3] kvm: Trim cpu features not supported by kvm Remove cpu features that are not supported by kvm from the cpuid features reported to the guest. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- target-i386/helper.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 1433857..6af5d23 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -93,6 +93,21 @@ static void add_flagname_to_bitmaps(char *flagname, uint32_t *features, } } +static void kvm_trim_features(uint32_t *features, uint32_t supported, + const char *names[]) +{ + int i; + uint32_t mask; + + for (i = 0; i < 32; ++i) { + mask = 1U << i; + if ((*features & mask) && !(supported & mask)) { + printf("Processor feature %s not supported by kvm\n", names[i]); + *features &= ~mask; + } + } +} + typedef struct x86_def_t { const char *name; uint32_t level; @@ -1672,7 +1687,21 @@ CPUX86State *cpu_x86_init(const char *cpu_model) #ifdef USE_KQEMU kqemu_init(env); #endif - if (kvm_enabled()) + if (kvm_enabled()) { kvm_init_vcpu(env); + kvm_trim_features(&env->cpuid_features, + kvm_arch_get_supported_cpuid(env, 1, R_EDX), + feature_name); + kvm_trim_features(&env->cpuid_ext_features, + kvm_arch_get_supported_cpuid(env, 1, R_ECX), + ext_feature_name); + kvm_trim_features(&env->cpuid_ext2_features, + kvm_arch_get_supported_cpuid(env, 0x80000001, R_EDX), + ext2_feature_name); + kvm_trim_features(&env->cpuid_ext3_features, + kvm_arch_get_supported_cpuid(env, 0x80000001, R_ECX), + ext3_feature_name); + } + return env; } -- 1.5.6.6 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -p -r1.94 -r1.95 --- qemu.spec 14 May 2009 11:00:13 -0000 1.94 +++ qemu.spec 19 May 2009 03:00:56 -0000 1.95 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.4 -Release: 4%{?dist} +Release: 5%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -33,6 +33,10 @@ Patch17: qemu-dma-aio-cancellation1.patc Patch18: qemu-dma-aio-cancellation2.patch Patch19: qemu-dma-aio-cancellation3.patch Patch20: qemu-dma-aio-cancellation4.patch +Patch21: qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch +Patch22: qemu-fix-x86-feature-modifications-for-features-that-set.patch +Patch23: qemu-trim-cpu-features-not-supported-by-kvm.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -233,6 +237,9 @@ such as kvmtrace and kvm_stat. %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch21 -p1 +#%patch22 -p1 +#%patch23 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -475,6 +482,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Mon May 18 2009 Glauber Costa - 2:0.10.4-5 +- Backport cpuid trimming from upstream (#499596) + * Thu May 14 2009 Mark McLoughlin - 2:0.10.4-4 - Cherry pick more DMA AIO cancellation fixes from upstream (#497170) From apevec at fedoraproject.org Wed May 20 10:41:21 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Wed, 20 May 2009 10:41:21 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/devel collectd-4.6.2-configure-OpenIPMI.patch, NONE, 1.1 collectd-4.6.2-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 collectd.spec, 1.18, 1.19 sources, 1.7, 1.8 collectd-4.5.1-configure-OpenIPMI.patch, 1.1, NONE collectd-4.5.1-include-collectd.d.patch, 1.2, NONE collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, 1.2, NONE Message-ID: <20090520104121.1084D70114@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017 Modified Files: .cvsignore collectd.spec sources Added Files: collectd-4.6.2-configure-OpenIPMI.patch collectd-4.6.2-include-collectd.d.patch Removed Files: collectd-4.5.1-configure-OpenIPMI.patch collectd-4.5.1-include-collectd.d.patch collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch Log Message: * Wed May 20 2009 Alan Pevec 4.6.2-1 - New upstream version 4.6.2 http://collectd.org/news.shtml#news64 collectd-4.6.2-configure-OpenIPMI.patch: --- NEW FILE collectd-4.6.2-configure-OpenIPMI.patch --- --- configure.orig 2009-03-18 11:56:42.000000000 +0100 +++ configure 2009-05-20 11:05:33.000000000 +0200 @@ -40327,7 +40327,7 @@ then { $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5 $as_echo_n "checking for libOpenIPMIpthread... " >&6; } - $PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null + $PKG_CONFIG --exists OpenIPMI 2>/dev/null if test "$?" != "0" then with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)" @@ -40340,7 +40340,7 @@ then { $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5 $as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; } - temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`" + temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread" if test "$?" = "0" then with_libopenipmipthread_cflags="$temp_result" @@ -40356,7 +40356,7 @@ then { $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5 $as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; } - temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`" + temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`" if test "$?" = "0" then with_libopenipmipthread_ldflags="$temp_result" collectd-4.6.2-include-collectd.d.patch: --- NEW FILE collectd-4.6.2-include-collectd.d.patch --- --- collectd-4.6.2/src/collectd.conf.in.orig 2009-03-18 11:55:39.000000000 +0100 +++ collectd-4.6.2/src/collectd.conf.in 2009-05-20 10:59:34.000000000 +0200 @@ -26,7 +26,6 @@ # LogLevel info # - at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors @BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent @@ -39,45 +38,33 @@ @BUILD_PLUGIN_DBI_TRUE at LoadPlugin dbi @BUILD_PLUGIN_DF_TRUE at LoadPlugin df @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk - at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns - at BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec @BUILD_PLUGIN_FILECOUNT_TRUE at LoadPlugin filecount @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp @BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables - at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi @BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs @BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq - at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt @BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load @BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon @BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached @BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory @BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter - at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql @BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs - at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE at LoadPlugin notify_desktop @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE at LoadPlugin notify_email @BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd - at BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut @BUILD_PLUGIN_ONEWIRE_TRUE at LoadPlugin onewire @BUILD_PLUGIN_OPENVPN_TRUE at LoadPlugin openvpn @BUILD_PLUGIN_ORACLE_TRUE at LoadPlugin oracle - at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl @BUILD_PLUGIN_PING_TRUE at LoadPlugin ping - at BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql @BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns @BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes @BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached - at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool - at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors @BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial - at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape @@ -551,3 +538,5 @@ # # Target "write" # + +Include "/etc/collectd.d" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 2 Mar 2009 23:43:02 -0000 1.7 +++ .cvsignore 20 May 2009 10:40:50 -0000 1.8 @@ -1 +1,2 @@ collectd-4.5.3.tar.bz2 +collectd-4.6.2.tar.bz2 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- collectd.spec 3 Mar 2009 15:26:08 -0000 1.18 +++ collectd.spec 20 May 2009 10:40:50 -0000 1.19 @@ -1,17 +1,15 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.5.3 -Release: 2%{?dist} +Version: 4.6.2 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 -Patch0: %{name}-4.5.1-include-collectd.d.patch +Patch0: %{name}-%{version}-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails -Patch1: %{name}-4.5.1-configure-OpenIPMI.patch -# posted upstream -Patch2: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch +Patch1: %{name}-%{version}-configure-OpenIPMI.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -153,7 +151,6 @@ This plugin collects information from vi %setup -q %patch0 -p1 %patch1 -p0 -%patch2 -p1 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in @@ -410,6 +407,10 @@ fi %changelog +* Wed May 20 2009 Alan Pevec 4.6.2-1 +- New upstream version 4.6.2 + http://collectd.org/news.shtml#news64 + * Tue Mar 03 2009 Alan Pevec 4.5.3-2 - patch for strict-aliasing issue in liboping.c Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 2 Mar 2009 23:43:02 -0000 1.7 +++ sources 20 May 2009 10:40:50 -0000 1.8 @@ -1 +1,2 @@ f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2 +ca1282372f15882ce07fdff6c61340d5 collectd-4.6.2.tar.bz2 --- collectd-4.5.1-configure-OpenIPMI.patch DELETED --- --- collectd-4.5.1-include-collectd.d.patch DELETED --- --- collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch DELETED --- From pkgdb at fedoraproject.org Wed May 20 14:06:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:06:37 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchcommits Message-ID: <20090520140637.A22F510F89F@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on libguestfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:06:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:06:35 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchbugzilla Message-ID: <20090520140636.0844410F876@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on libguestfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:06:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:06:48 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchcommits Message-ID: <20090520140648.4A3FC10F88C@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on libguestfs (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:06:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:06:49 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchbugzilla Message-ID: <20090520140649.10E8B10F8A4@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on libguestfs (Fedora 11) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:06:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:06:54 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchbugzilla Message-ID: <20090520140654.3022E10F876@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on libguestfs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:06:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:06:55 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchcommits Message-ID: <20090520140655.AF1B410F8A3@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on libguestfs (Fedora 10) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:07:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:07:00 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchbugzilla Message-ID: <20090520140700.C7D4910F8AA@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on libguestfs (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:07:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:07:01 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs: virtmaint has requested watchcommits Message-ID: <20090520140701.486A210F883@bastion2.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on libguestfs (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:47 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143947.483B510F876@bastion2.fedora.phx.redhat.com> rjones has set the watchcommits acl on libguestfs (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:48 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143948.7A5F210F883@bastion2.fedora.phx.redhat.com> rjones has set the watchbugzilla acl on libguestfs (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:49 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143949.C912510F8A9@bastion2.fedora.phx.redhat.com> rjones has set the watchbugzilla acl on libguestfs (Fedora 11) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:53 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143953.E926B10F8AF@bastion2.fedora.phx.redhat.com> rjones has set the watchcommits acl on libguestfs (Fedora 11) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:52 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143952.E5CB110F8AC@bastion2.fedora.phx.redhat.com> rjones has set the watchbugzilla acl on libguestfs (Fedora 10) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:54 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143954.5EAA610F8B2@bastion2.fedora.phx.redhat.com> rjones has set the watchcommits acl on libguestfs (Fedora 10) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:56 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143956.6AC7510F8B6@bastion2.fedora.phx.redhat.com> rjones has set the watchcommits acl on libguestfs (Fedora EPEL 5) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From pkgdb at fedoraproject.org Wed May 20 14:39:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Wed, 20 May 2009 14:39:56 +0000 Subject: [fedora-virt-maint] [pkgdb] libguestfs had acl change status Message-ID: <20090520143956.A7E4710F8B9@bastion2.fedora.phx.redhat.com> rjones has set the watchbugzilla acl on libguestfs (Fedora EPEL 5) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libguestfs From trac at fedorahosted.org Thu May 21 10:55:36 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 10:55:36 -0000 Subject: [fedora-virt-maint] [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces Message-ID: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: nobody Type: bug | Status: new Priority: minor | Milestone: Component: General | Version: Severity: Normal | Keywords: ---------------------+------------------------------------------------------ The virtmaint user account is used to subscribe the fedora-virt- maint at redhat.com list for CVS and bugzilla mails The mails sent by CVS bounce: (expanded from ): unknown user: "virtmaint" I'd expect virtmaint at fedoraproject.org to forward to fedora-virt- maint at redhat.com ? Note: we usually keep the account "inactive" so only list admins of fedora-virt-maint can login by requesting a password reset which is then trapped by mailman. I've just tried making the account active and sending a test mail and that bounces too. -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From rjones at fedoraproject.org Thu May 21 11:51:06 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 11:51:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.7, 1.8 libguestfs.spec, 1.18, 1.19 sources, 1.7, 1.8 Message-ID: <20090521115106.6797770114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22261 Modified Files: .cvsignore libguestfs.spec sources Log Message: - New upstream version 1.0.28. Nothing has visibly changed, but the source has been gettextized and we want to check that doesn't break anything. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 19 May 2009 11:49:03 -0000 1.7 +++ .cvsignore 21 May 2009 11:50:35 -0000 1.8 @@ -1 +1 @@ -libguestfs-1.0.27.tar.gz +libguestfs-1.0.28.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- libguestfs.spec 21 May 2009 08:12:11 -0000 1.18 +++ libguestfs.spec 21 May 2009 11:50:35 -0000 1.19 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.27 -Release: 3%{?dist} +Version: 1.0.28 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -452,6 +452,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 21 2009 Richard Jones - 1.0.28-1 +- New upstream version 1.0.28. Nothing has visibly changed, but + the source has been gettextized and we want to check that doesn't + break anything. + * Thu May 21 2009 Richard Jones - 1.0.27-3 - Change requirement from qemu -> qemu-kvm (RHBZ#501761). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 19 May 2009 11:49:03 -0000 1.7 +++ sources 21 May 2009 11:50:35 -0000 1.8 @@ -1 +1 @@ -12c01468e2bdd9710d5c12eaad3bff89 libguestfs-1.0.27.tar.gz +f5a0b08abaa266568cecd63b02438768 libguestfs-1.0.28.tar.gz From markmc at fedoraproject.org Thu May 21 12:07:39 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 21 May 2009 12:07:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-event-handling-1.patch, NONE, 1.1 libvirt-0.6.3-event-handling-2.patch, NONE, 1.1 libvirt-0.6.3-xml-attribute-escaping.patch, NONE, 1.1 libvirt.spec, 1.134, 1.135 Message-ID: <20090521120739.7158970114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26329 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-event-handling-1.patch libvirt-0.6.3-event-handling-2.patch libvirt-0.6.3-xml-attribute-escaping.patch Log Message: * Thu May 21 2009 Mark McLoughlin - 0.6.3-10.fc12 - Fix XML attribute escaping (bug #499791) - Fix serious event handling issues causing guests to be destroyed (bug #499698) libvirt-0.6.3-event-handling-1.patch: --- NEW FILE libvirt-0.6.3-event-handling-1.patch --- >From e7be6cc841a5652b73ddd2ccd3769c7f8bbad13d Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Tue, 12 May 2009 16:41:49 +0000 Subject: [PATCH 1/2] Fix interrupting of main event thread & protect against accidental uniniitalized variables --- qemud/event.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/qemud/event.c b/qemud/event.c index 65f548e..754f2b1 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -84,10 +84,10 @@ struct virEventLoop { static struct virEventLoop eventLoop; /* Unique ID for the next FD watch to be registered */ -static int nextWatch = 0; +static int nextWatch = 1; /* Unique ID for the next timer to be registered */ -static int nextTimer = 0; +static int nextTimer = 1; static void virEventLock(void) { @@ -143,15 +143,22 @@ int virEventAddHandleImpl(int fd, int events, void virEventUpdateHandleImpl(int watch, int events) { int i; + EVENT_DEBUG("Update handle w=%d e=%d", watch, events); + + if (watch <= 0) { + VIR_WARN("Ignoring invalid update watch %d", watch); + return; + } + virEventLock(); for (i = 0 ; i < eventLoop.handlesCount ; i++) { if (eventLoop.handles[i].watch == watch) { eventLoop.handles[i].events = virEventHandleTypeToPollEvent(events); + virEventInterruptLocked(); break; } } - virEventInterruptLocked(); virEventUnlock(); } @@ -164,6 +171,12 @@ void virEventUpdateHandleImpl(int watch, int events) { int virEventRemoveHandleImpl(int watch) { int i; EVENT_DEBUG("Remove handle %d", watch); + + if (watch <= 0) { + VIR_WARN("Ignoring invalid remove watch %d", watch); + return -1; + } + virEventLock(); for (i = 0 ; i < eventLoop.handlesCount ; i++) { if (eventLoop.handles[i].deleted) @@ -172,11 +185,11 @@ int virEventRemoveHandleImpl(int watch) { if (eventLoop.handles[i].watch == watch) { EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd); eventLoop.handles[i].deleted = 1; + virEventInterruptLocked(); virEventUnlock(); return 0; } } - virEventInterruptLocked(); virEventUnlock(); return -1; } @@ -232,6 +245,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) { struct timeval tv; int i; EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency); + + if (timer <= 0) { + VIR_WARN("Ignoring invalid update timer %d", timer); + return; + } + if (gettimeofday(&tv, NULL) < 0) { return; } @@ -244,10 +263,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) { frequency >= 0 ? frequency + (((unsigned long long)tv.tv_sec)*1000) + (((unsigned long long)tv.tv_usec)/1000) : 0; + virEventInterruptLocked(); break; } } - virEventInterruptLocked(); virEventUnlock(); } @@ -260,6 +279,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) { int virEventRemoveTimeoutImpl(int timer) { int i; EVENT_DEBUG("Remove timer %d", timer); + + if (timer <= 0) { + VIR_WARN("Ignoring invalid remove timer %d", timer); + return -1; + } + virEventLock(); for (i = 0 ; i < eventLoop.timeoutsCount ; i++) { if (eventLoop.timeouts[i].deleted) @@ -267,11 +292,11 @@ int virEventRemoveTimeoutImpl(int timer) { if (eventLoop.timeouts[i].timer == timer) { eventLoop.timeouts[i].deleted = 1; + virEventInterruptLocked(); virEventUnlock(); return 0; } } - virEventInterruptLocked(); virEventUnlock(); return -1; } @@ -617,9 +642,12 @@ static int virEventInterruptLocked(void) char c = '\0'; if (!eventLoop.running || - pthread_self() == eventLoop.leader) + pthread_self() == eventLoop.leader) { + VIR_DEBUG("Skip interrupt, %d %d", eventLoop.running, (int)eventLoop.leader); return 0; + } + VIR_DEBUG0("Interrupting"); if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c)) return -1; return 0; -- 1.6.0.6 libvirt-0.6.3-event-handling-2.patch: --- NEW FILE libvirt-0.6.3-event-handling-2.patch --- >From 6483ee77ed12f037d68a6adc690624fa1b508dc0 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Tue, 12 May 2009 16:43:04 +0000 Subject: [PATCH 2/2] Fix watch/timer event deletion --- qemud/event.c | 112 ++++++++++++++++++++++++++------------------------------- 1 files changed, 51 insertions(+), 61 deletions(-) diff --git a/qemud/event.c b/qemud/event.c index 754f2b1..a57d967 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -313,7 +313,7 @@ static int virEventCalculateTimeout(int *timeout) { EVENT_DEBUG("Calculate expiry of %d timers", eventLoop.timeoutsCount); /* Figure out if we need a timeout */ for (i = 0 ; i < eventLoop.timeoutsCount ; i++) { - if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0) + if (eventLoop.timeouts[i].frequency < 0) continue; EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt); @@ -350,32 +350,26 @@ static int virEventCalculateTimeout(int *timeout) { * file handles. The caller must free the returned data struct * returns: the pollfd array, or NULL on error */ -static int virEventMakePollFDs(struct pollfd **retfds) { +static struct pollfd *virEventMakePollFDs(void) { struct pollfd *fds; - int i, nfds = 0; + int i; - for (i = 0 ; i < eventLoop.handlesCount ; i++) { - if (eventLoop.handles[i].deleted) - continue; - nfds++; - } - *retfds = NULL; /* Setup the poll file handle data structs */ - if (VIR_ALLOC_N(fds, nfds) < 0) - return -1; + if (VIR_ALLOC_N(fds, eventLoop.handlesCount) < 0) + return NULL; - for (i = 0, nfds = 0 ; i < eventLoop.handlesCount ; i++) { - if (eventLoop.handles[i].deleted) - continue; - fds[nfds].fd = eventLoop.handles[i].fd; - fds[nfds].events = eventLoop.handles[i].events; - fds[nfds].revents = 0; + for (i = 0 ; i < eventLoop.handlesCount ; i++) { + EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d", i, + eventLoop.handles[i].watch, + eventLoop.handles[i].fd, + eventLoop.handles[i].events); + fds[i].fd = eventLoop.handles[i].fd; + fds[i].events = eventLoop.handles[i].events; + fds[i].revents = 0; //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events); - nfds++; } - *retfds = fds; - return nfds; + return fds; } @@ -435,26 +429,30 @@ static int virEventDispatchTimeouts(void) { * Returns 0 upon success, -1 if an error occurred */ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { - int i, n; + int i; - for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) { + /* NB, use nfds not eventLoop.handlesCount, because new + * fds might be added on end of list, and they're not + * in the fds array we've got */ + for (i = 0 ; i < nfds ; i++) { if (eventLoop.handles[i].deleted) { - EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd); + EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i, + eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } - if (fds[n].revents) { + if (fds[i].revents) { virEventHandleCallback cb = eventLoop.handles[i].cb; void *opaque = eventLoop.handles[i].opaque; - int hEvents = virPollEventToEventHandleType(fds[n].revents); - EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd, - fds[n].revents, eventLoop.handles[i].opaque); + int hEvents = virPollEventToEventHandleType(fds[i].revents); + EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i, + fds[i].fd, eventLoop.handles[i].watch, + fds[i].revents, eventLoop.handles[i].opaque); virEventUnlock(); (cb)(eventLoop.handles[i].watch, - fds[n].fd, hEvents, opaque); + fds[i].fd, hEvents, opaque); virEventLock(); } - n++; } return 0; @@ -545,22 +543,21 @@ static int virEventCleanupHandles(void) { * at least one file handle has an event, or a timer expires */ int virEventRunOnce(void) { - struct pollfd *fds; + struct pollfd *fds = NULL; int ret, timeout, nfds; virEventLock(); eventLoop.running = 1; eventLoop.leader = pthread_self(); - if ((nfds = virEventMakePollFDs(&fds)) < 0) { - virEventUnlock(); - return -1; - } - if (virEventCalculateTimeout(&timeout) < 0) { - VIR_FREE(fds); - virEventUnlock(); - return -1; - } + if (virEventCleanupTimeouts() < 0 || + virEventCleanupHandles() < 0) + goto error; + + if (!(fds = virEventMakePollFDs()) || + virEventCalculateTimeout(&timeout) < 0) + goto error; + nfds = eventLoop.handlesCount; virEventUnlock(); @@ -572,38 +569,31 @@ int virEventRunOnce(void) { if (errno == EINTR) { goto retry; } - VIR_FREE(fds); - return -1; + goto error_unlocked; } virEventLock(); - if (virEventDispatchTimeouts() < 0) { - VIR_FREE(fds); - virEventUnlock(); - return -1; - } + if (virEventDispatchTimeouts() < 0) + goto error; if (ret > 0 && - virEventDispatchHandles(nfds, fds) < 0) { - VIR_FREE(fds); - virEventUnlock(); - return -1; - } - VIR_FREE(fds); - - if (virEventCleanupTimeouts() < 0) { - virEventUnlock(); - return -1; - } + virEventDispatchHandles(nfds, fds) < 0) + goto error; - if (virEventCleanupHandles() < 0) { - virEventUnlock(); - return -1; - } + if (virEventCleanupTimeouts() < 0 || + virEventCleanupHandles() < 0) + goto error; eventLoop.running = 0; virEventUnlock(); + VIR_FREE(fds); return 0; + +error: + virEventUnlock(); +error_unlocked: + VIR_FREE(fds); + return -1; } static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED, -- 1.6.0.6 libvirt-0.6.3-xml-attribute-escaping.patch: --- NEW FILE libvirt-0.6.3-xml-attribute-escaping.patch --- >From 7f7a4403860f56d5a1ad65bfd16f5bf97a971d45 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 13 May 2009 16:19:59 +0000 Subject: [PATCH 1/1] * src/buf.c: avoid an XML attribute escaping bug #499791 daniel --- src/buf.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/buf.c b/src/buf.c index cdcdac9..259175d 100644 --- a/src/buf.c +++ b/src/buf.c @@ -266,7 +266,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st return; len = strlen(str); - if (VIR_ALLOC_N(escaped, 5 * len + 1) < 0) { + if (VIR_ALLOC_N(escaped, 6 * len + 1) < 0) { virBufferNoMemory(buf); return; } @@ -290,6 +290,20 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st *out++ = 'm'; *out++ = 'p'; *out++ = ';'; + } else if (*cur == '"') { + *out++ = '&'; + *out++ = 'q'; + *out++ = 'u'; + *out++ = 'o'; + *out++ = 't'; + *out++ = ';'; + } else if (*cur == '\'') { + *out++ = '&'; + *out++ = 'a'; + *out++ = 'p'; + *out++ = 'o'; + *out++ = 's'; + *out++ = ';'; } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') || (*cur == '\r')) { /* -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -p -r1.134 -r1.135 --- libvirt.spec 21 May 2009 10:42:33 -0000 1.134 +++ libvirt.spec 21 May 2009 12:07:09 -0000 1.135 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 9%{?dist}%{?extra_release} +Release: 10%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -74,6 +74,11 @@ Patch4: libvirt-0.6.3-enable-qemu-0-10-m Patch5: libvirt-0.6.2-fix-nosource-label.patch # Fix qemu argv detection with latest qemu (bz 501923) Patch6: libvirt-0.6.3-fix-qemu-argv-detection-with-kvm-85.patch +# Fix XML attribute escaping (bz 499791) +Patch7: libvirt-0.6.3-xml-attribute-escaping.patch +# Fix serious event handling issues causing guests to be destroyed (bz 499698) +Patch8: libvirt-0.6.3-event-handling-1.patch +Patch9: libvirt-0.6.3-event-handling-2.patch # Patches not for upstream. @@ -235,6 +240,9 @@ of recent versions of Linux (and other O %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %patch200 -p0 @@ -565,6 +573,10 @@ fi %endif %changelog +* Thu May 21 2009 Mark McLoughlin - 0.6.3-10.fc12 +- Fix XML attribute escaping (bug #499791) +- Fix serious event handling issues causing guests to be destroyed (bug #499698) + * Thu May 21 2009 Mark McLoughlin - 0.6.3-9.fc12 - Fix qemu argv detection with latest qemu (bug #501923) From markmc at fedoraproject.org Thu May 21 12:07:49 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 21 May 2009 12:07:49 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-event-handling-1.patch, NONE, 1.1 libvirt-0.6.2-event-handling-2.patch, NONE, 1.1 libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch, NONE, 1.1 libvirt-0.6.2-xml-attribute-escaping.patch, NONE, 1.1 libvirt.spec, 1.130, 1.131 Message-ID: <20090521120749.5CB5670114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26406 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-event-handling-1.patch libvirt-0.6.2-event-handling-2.patch libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch libvirt-0.6.2-xml-attribute-escaping.patch Log Message: * Thu May 21 2009 Mark McLoughlin - 0.6.2-9.fc11 - Fix qemu argv detection with latest qemu (bug #501923) - Fix XML attribute escaping (bug #499791) - Fix serious event handling issues causing guests to be destroyed (bug #499698) libvirt-0.6.2-event-handling-1.patch: --- NEW FILE libvirt-0.6.2-event-handling-1.patch --- >From e7be6cc841a5652b73ddd2ccd3769c7f8bbad13d Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Tue, 12 May 2009 16:41:49 +0000 Subject: [PATCH 1/2] Fix interrupting of main event thread & protect against accidental uniniitalized variables --- qemud/event.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/qemud/event.c b/qemud/event.c index 65f548e..754f2b1 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -84,10 +84,10 @@ struct virEventLoop { static struct virEventLoop eventLoop; /* Unique ID for the next FD watch to be registered */ -static int nextWatch = 0; +static int nextWatch = 1; /* Unique ID for the next timer to be registered */ -static int nextTimer = 0; +static int nextTimer = 1; static void virEventLock(void) { @@ -143,15 +143,22 @@ int virEventAddHandleImpl(int fd, int events, void virEventUpdateHandleImpl(int watch, int events) { int i; + EVENT_DEBUG("Update handle w=%d e=%d", watch, events); + + if (watch <= 0) { + VIR_WARN("Ignoring invalid update watch %d", watch); + return; + } + virEventLock(); for (i = 0 ; i < eventLoop.handlesCount ; i++) { if (eventLoop.handles[i].watch == watch) { eventLoop.handles[i].events = virEventHandleTypeToPollEvent(events); + virEventInterruptLocked(); break; } } - virEventInterruptLocked(); virEventUnlock(); } @@ -164,6 +171,12 @@ void virEventUpdateHandleImpl(int watch, int events) { int virEventRemoveHandleImpl(int watch) { int i; EVENT_DEBUG("Remove handle %d", watch); + + if (watch <= 0) { + VIR_WARN("Ignoring invalid remove watch %d", watch); + return -1; + } + virEventLock(); for (i = 0 ; i < eventLoop.handlesCount ; i++) { if (eventLoop.handles[i].deleted) @@ -172,11 +185,11 @@ int virEventRemoveHandleImpl(int watch) { if (eventLoop.handles[i].watch == watch) { EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd); eventLoop.handles[i].deleted = 1; + virEventInterruptLocked(); virEventUnlock(); return 0; } } - virEventInterruptLocked(); virEventUnlock(); return -1; } @@ -232,6 +245,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) { struct timeval tv; int i; EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency); + + if (timer <= 0) { + VIR_WARN("Ignoring invalid update timer %d", timer); + return; + } + if (gettimeofday(&tv, NULL) < 0) { return; } @@ -244,10 +263,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) { frequency >= 0 ? frequency + (((unsigned long long)tv.tv_sec)*1000) + (((unsigned long long)tv.tv_usec)/1000) : 0; + virEventInterruptLocked(); break; } } - virEventInterruptLocked(); virEventUnlock(); } @@ -260,6 +279,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) { int virEventRemoveTimeoutImpl(int timer) { int i; EVENT_DEBUG("Remove timer %d", timer); + + if (timer <= 0) { + VIR_WARN("Ignoring invalid remove timer %d", timer); + return -1; + } + virEventLock(); for (i = 0 ; i < eventLoop.timeoutsCount ; i++) { if (eventLoop.timeouts[i].deleted) @@ -267,11 +292,11 @@ int virEventRemoveTimeoutImpl(int timer) { if (eventLoop.timeouts[i].timer == timer) { eventLoop.timeouts[i].deleted = 1; + virEventInterruptLocked(); virEventUnlock(); return 0; } } - virEventInterruptLocked(); virEventUnlock(); return -1; } @@ -617,9 +642,12 @@ static int virEventInterruptLocked(void) char c = '\0'; if (!eventLoop.running || - pthread_self() == eventLoop.leader) + pthread_self() == eventLoop.leader) { + VIR_DEBUG("Skip interrupt, %d %d", eventLoop.running, (int)eventLoop.leader); return 0; + } + VIR_DEBUG0("Interrupting"); if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c)) return -1; return 0; -- 1.6.0.6 libvirt-0.6.2-event-handling-2.patch: --- NEW FILE libvirt-0.6.2-event-handling-2.patch --- >From 6483ee77ed12f037d68a6adc690624fa1b508dc0 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Tue, 12 May 2009 16:43:04 +0000 Subject: [PATCH 2/2] Fix watch/timer event deletion --- qemud/event.c | 112 ++++++++++++++++++++++++++------------------------------- 1 files changed, 51 insertions(+), 61 deletions(-) diff --git a/qemud/event.c b/qemud/event.c index 754f2b1..a57d967 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -313,7 +313,7 @@ static int virEventCalculateTimeout(int *timeout) { EVENT_DEBUG("Calculate expiry of %d timers", eventLoop.timeoutsCount); /* Figure out if we need a timeout */ for (i = 0 ; i < eventLoop.timeoutsCount ; i++) { - if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0) + if (eventLoop.timeouts[i].frequency < 0) continue; EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt); @@ -350,32 +350,26 @@ static int virEventCalculateTimeout(int *timeout) { * file handles. The caller must free the returned data struct * returns: the pollfd array, or NULL on error */ -static int virEventMakePollFDs(struct pollfd **retfds) { +static struct pollfd *virEventMakePollFDs(void) { struct pollfd *fds; - int i, nfds = 0; + int i; - for (i = 0 ; i < eventLoop.handlesCount ; i++) { - if (eventLoop.handles[i].deleted) - continue; - nfds++; - } - *retfds = NULL; /* Setup the poll file handle data structs */ - if (VIR_ALLOC_N(fds, nfds) < 0) - return -1; + if (VIR_ALLOC_N(fds, eventLoop.handlesCount) < 0) + return NULL; - for (i = 0, nfds = 0 ; i < eventLoop.handlesCount ; i++) { - if (eventLoop.handles[i].deleted) - continue; - fds[nfds].fd = eventLoop.handles[i].fd; - fds[nfds].events = eventLoop.handles[i].events; - fds[nfds].revents = 0; + for (i = 0 ; i < eventLoop.handlesCount ; i++) { + EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d", i, + eventLoop.handles[i].watch, + eventLoop.handles[i].fd, + eventLoop.handles[i].events); + fds[i].fd = eventLoop.handles[i].fd; + fds[i].events = eventLoop.handles[i].events; + fds[i].revents = 0; //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events); - nfds++; } - *retfds = fds; - return nfds; + return fds; } @@ -435,26 +429,30 @@ static int virEventDispatchTimeouts(void) { * Returns 0 upon success, -1 if an error occurred */ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { - int i, n; + int i; - for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) { + /* NB, use nfds not eventLoop.handlesCount, because new + * fds might be added on end of list, and they're not + * in the fds array we've got */ + for (i = 0 ; i < nfds ; i++) { if (eventLoop.handles[i].deleted) { - EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd); + EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i, + eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } - if (fds[n].revents) { + if (fds[i].revents) { virEventHandleCallback cb = eventLoop.handles[i].cb; void *opaque = eventLoop.handles[i].opaque; - int hEvents = virPollEventToEventHandleType(fds[n].revents); - EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd, - fds[n].revents, eventLoop.handles[i].opaque); + int hEvents = virPollEventToEventHandleType(fds[i].revents); + EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i, + fds[i].fd, eventLoop.handles[i].watch, + fds[i].revents, eventLoop.handles[i].opaque); virEventUnlock(); (cb)(eventLoop.handles[i].watch, - fds[n].fd, hEvents, opaque); + fds[i].fd, hEvents, opaque); virEventLock(); } - n++; } return 0; @@ -545,22 +543,21 @@ static int virEventCleanupHandles(void) { * at least one file handle has an event, or a timer expires */ int virEventRunOnce(void) { - struct pollfd *fds; + struct pollfd *fds = NULL; int ret, timeout, nfds; virEventLock(); eventLoop.running = 1; eventLoop.leader = pthread_self(); - if ((nfds = virEventMakePollFDs(&fds)) < 0) { - virEventUnlock(); - return -1; - } - if (virEventCalculateTimeout(&timeout) < 0) { - VIR_FREE(fds); - virEventUnlock(); - return -1; - } + if (virEventCleanupTimeouts() < 0 || + virEventCleanupHandles() < 0) + goto error; + + if (!(fds = virEventMakePollFDs()) || + virEventCalculateTimeout(&timeout) < 0) + goto error; + nfds = eventLoop.handlesCount; virEventUnlock(); @@ -572,38 +569,31 @@ int virEventRunOnce(void) { if (errno == EINTR) { goto retry; } - VIR_FREE(fds); - return -1; + goto error_unlocked; } virEventLock(); - if (virEventDispatchTimeouts() < 0) { - VIR_FREE(fds); - virEventUnlock(); - return -1; - } + if (virEventDispatchTimeouts() < 0) + goto error; if (ret > 0 && - virEventDispatchHandles(nfds, fds) < 0) { - VIR_FREE(fds); - virEventUnlock(); - return -1; - } - VIR_FREE(fds); - - if (virEventCleanupTimeouts() < 0) { - virEventUnlock(); - return -1; - } + virEventDispatchHandles(nfds, fds) < 0) + goto error; - if (virEventCleanupHandles() < 0) { - virEventUnlock(); - return -1; - } + if (virEventCleanupTimeouts() < 0 || + virEventCleanupHandles() < 0) + goto error; eventLoop.running = 0; virEventUnlock(); + VIR_FREE(fds); return 0; + +error: + virEventUnlock(); +error_unlocked: + VIR_FREE(fds); + return -1; } static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED, -- 1.6.0.6 libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch: --- NEW FILE libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch --- >From 2b3fcdc378e7bec5c1a78b81632756e92930fd24 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Mon, 11 May 2009 15:14:24 +0000 Subject: [PATCH 1/1] Fix QEMU ARGV detection with kvm >= 85 --- src/qemu_conf.c | 18 ++++++++++++++---- src/qemu_driver.c | 12 ++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 9cb71eb..a57d3ab 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -431,18 +431,28 @@ int qemudExtractVersionInfo(const char *qemu, return -1; char *help = NULL; - enum { MAX_HELP_OUTPUT_SIZE = 8192 }; + enum { MAX_HELP_OUTPUT_SIZE = 1024*64 }; int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help); - if (len < 0) + if (len < 0) { + virReportSystemError(NULL, errno, "%s", + _("Unable to read QEMU help output")); goto cleanup2; + } if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)", &major, &minor, µ, &kvm_version) != 4) kvm_version = 0; - if (!kvm_version && sscanf(help, "QEMU PC emulator version %u.%u.%u", - &major, &minor, µ) != 3) + if (!kvm_version && + sscanf(help, "QEMU PC emulator version %u.%u.%u", + &major, &minor, µ) != 3) { + char *eol = strchr(help, '\n'); + if (eol) *eol = '\0'; + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse QEMU version number in '%s'"), + help); goto cleanup2; + } version = (major * 1000 * 1000) + (minor * 1000) + micro; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 30642d5..bd60b29 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1391,12 +1391,8 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (qemudExtractVersionInfo(emulator, NULL, - &qemuCmdFlags) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Cannot determine QEMU argv syntax %s"), - emulator); + &qemuCmdFlags) < 0) goto cleanup; - } if (qemuPrepareHostDevices(conn, vm->def) < 0) goto cleanup; @@ -3715,12 +3711,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn, if (qemudExtractVersionInfo(vm->def->emulator, NULL, - &qemuCmdFlags) < 0) { - qemudReportError(conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, - _("Cannot determine QEMU argv syntax %s"), - vm->def->emulator); + &qemuCmdFlags) < 0) return -1; - } if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) { if (!(devname = qemudDiskDeviceName(conn, newdisk))) -- 1.6.0.6 libvirt-0.6.2-xml-attribute-escaping.patch: --- NEW FILE libvirt-0.6.2-xml-attribute-escaping.patch --- >From 7f7a4403860f56d5a1ad65bfd16f5bf97a971d45 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 13 May 2009 16:19:59 +0000 Subject: [PATCH 1/1] * src/buf.c: avoid an XML attribute escaping bug #499791 daniel --- src/buf.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/buf.c b/src/buf.c index cdcdac9..259175d 100644 --- a/src/buf.c +++ b/src/buf.c @@ -266,7 +266,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st return; len = strlen(str); - if (VIR_ALLOC_N(escaped, 5 * len + 1) < 0) { + if (VIR_ALLOC_N(escaped, 6 * len + 1) < 0) { virBufferNoMemory(buf); return; } @@ -290,6 +290,20 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st *out++ = 'm'; *out++ = 'p'; *out++ = ';'; + } else if (*cur == '"') { + *out++ = '&'; + *out++ = 'q'; + *out++ = 'u'; + *out++ = 'o'; + *out++ = 't'; + *out++ = ';'; + } else if (*cur == '\'') { + *out++ = '&'; + *out++ = 'a'; + *out++ = 'p'; + *out++ = 'o'; + *out++ = 's'; + *out++ = ';'; } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') || (*cur == '\r')) { /* -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -p -r1.130 -r1.131 --- libvirt.spec 11 May 2009 02:28:23 -0000 1.130 +++ libvirt.spec 21 May 2009 12:07:19 -0000 1.131 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 8%{?dist}%{?extra_release} +Release: 9%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -83,6 +83,13 @@ Patch3: libvirt-0.6.3-refresh-qemu-caps. Patch4: libvirt-0.6.2-enable-qemu-0-10-migration.patch # Don't try to label a disk with no path (e.g. empty cdrom) (bz 499569) Patch5: libvirt-0.6.2-fix-nosource-label.patch +# Fix qemu argv detection with latest qemu (bz 501923) +Patch6: libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch +# Fix XML attribute escaping (bz 499791) +Patch7: libvirt-0.6.2-xml-attribute-escaping.patch +# Fix serious event handling issues causing guests to be destroyed (bz 499698) +Patch8: libvirt-0.6.2-event-handling-1.patch +Patch9: libvirt-0.6.2-event-handling-2.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -243,6 +250,10 @@ of recent versions of Linux (and other O %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %patch200 -p0 @@ -566,6 +577,11 @@ fi %endif %changelog +* Thu May 21 2009 Mark McLoughlin - 0.6.2-9.fc11 +- Fix qemu argv detection with latest qemu (bug #501923) +- Fix XML attribute escaping (bug #499791) +- Fix serious event handling issues causing guests to be destroyed (bug #499698) + * Sun May 10 2009 Cole Robinson - 0.6.2-8.fc11 - Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569) From trac at fedorahosted.org Thu May 21 13:07:52 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 13:07:52 -0000 Subject: [fedora-virt-maint] Re: [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces In-Reply-To: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> References: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> Message-ID: <071.e35d708f964937b24fec79aefa75432d@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: mmcgrath Type: bug | Status: assigned Priority: minor | Milestone: Component: General | Version: Severity: Normal | Resolution: Keywords: | ---------------------+------------------------------------------------------ Changes (by mmcgrath): * owner: nobody => mmcgrath * status: new => assigned Comment: Is this account used just for the alias? Or is it used to assign packages to and stuff in pkgdb? -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From rjones at fedoraproject.org Thu May 21 13:13:10 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 13:13:10 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs.spec, 1.19, 1.20 Message-ID: <20090521131310.51F1A70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11592 Modified Files: libguestfs.spec Log Message: - Experiment with enabling tests to see if latest KVM fixes earlier problems. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- libguestfs.spec 21 May 2009 11:50:35 -0000 1.19 +++ libguestfs.spec 21 May 2009 13:12:39 -0000 1.20 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.28 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -276,7 +276,8 @@ make INSTALLDIRS=vendor %{?_smp_mflags} # BZ 494075 (ppc, ppc64) # BZ 500564 (i386, x86-64) -#make check +export LIBGUESTFS_DEBUG=1 +make check # Quick test: #./fish/guestfish -v < - 1.0.28-2 +- Experiment with enabling tests to see if latest KVM fixes earlier + problems. + * Thu May 21 2009 Richard Jones - 1.0.28-1 - New upstream version 1.0.28. Nothing has visibly changed, but the source has been gettextized and we want to check that doesn't From trac at fedorahosted.org Thu May 21 13:27:17 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 13:27:17 -0000 Subject: [fedora-virt-maint] Re: [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces In-Reply-To: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> References: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> Message-ID: <071.bde65e6f1421b1bb1fa61ba93582d73a@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: mmcgrath Type: bug | Status: assigned Priority: minor | Milestone: Component: General | Version: Severity: Normal | Resolution: Keywords: | ---------------------+------------------------------------------------------ Comment (by markmc): It's used for watchbugzilla and watchcommits in pkgdb -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From markmc at redhat.com Thu May 21 13:29:05 2009 From: markmc at redhat.com (Mark McLoughlin) Date: Thu, 21 May 2009 14:29:05 +0100 Subject: [fedora-virt-maint] test Message-ID: <1242912545.28844.42.camel@blaa> From trac at fedorahosted.org Thu May 21 13:32:37 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 13:32:37 -0000 Subject: [fedora-virt-maint] Re: [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces In-Reply-To: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> References: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> Message-ID: <071.8cf24ac128ae806b75746cc88ef3d2d2@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: toshio Type: bug | Status: new Priority: minor | Milestone: Component: General | Version: Severity: Normal | Resolution: Keywords: | ---------------------+------------------------------------------------------ Changes (by mmcgrath): * owner: mmcgrath => toshio * status: assigned => new Comment: K, in that case we're going to flag it a bot, I think at that point you won't be able to log in or out, but you also won't have to worry about bounces, password expirations, etc. -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From trac at fedorahosted.org Thu May 21 13:36:48 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 13:36:48 -0000 Subject: [fedora-virt-maint] Re: [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces In-Reply-To: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> References: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> Message-ID: <071.39faa32dece7896aa5527f84edf299f8@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: toshio Type: bug | Status: new Priority: minor | Milestone: Component: General | Version: Severity: Normal | Resolution: Keywords: | ---------------------+------------------------------------------------------ Comment (by markmc): okay, I thought toshio had already made it a "pseudo account" As I said previously to toshio, if we can't log in, we can't add virtmaint to more packages - e.g. just yesterday I added it to libguestfs It seems to be working now, however. Is it took a while for the inactive->active change to take effect? Or has someone else fixed it somehow? -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From markmc at fedoraproject.org Thu May 21 14:56:40 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 21 May 2009 14:56:40 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager-0.7.0-fix-window-resize.patch, NONE, 1.1 virt-manager-0.7.0-handle-arch-config.patch, NONE, 1.1 virt-manager-0.7.0-log-capabilities-at-startup.patch, NONE, 1.1 virt-manager-0.7.0-operating-typo.patch, NONE, 1.1 virt-manager-0.7.0-update-translations-for-operating-typo.patch, NONE, 1.1 virt-manager-0.7.0-vnc-auth-get-username.patch, NONE, 1.1 virt-manager.spec, 1.51, 1.52 Message-ID: <20090521145640.5806870114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8180 Modified Files: virt-manager.spec Added Files: virt-manager-0.7.0-fix-window-resize.patch virt-manager-0.7.0-handle-arch-config.patch virt-manager-0.7.0-log-capabilities-at-startup.patch virt-manager-0.7.0-operating-typo.patch virt-manager-0.7.0-update-translations-for-operating-typo.patch virt-manager-0.7.0-vnc-auth-get-username.patch Log Message: * Thu May 21 2009 Mark McLoughlin - 0.7.0-5.fc12 - Fix 'opertaing' typo in 'New VM' dialog (#495128) - Allow details window to resize again (#491683) - Handle collecting username for vnc authentication (#499589) - Actually handle arch config when creating a VM (#499145) - Log libvirt capabilities at startup to aid debugging (#500337) virt-manager-0.7.0-fix-window-resize.patch: --- NEW FILE virt-manager-0.7.0-fix-window-resize.patch --- # HG changeset patch # User "Daniel P. Berrange " # Date 1241624815 -3600 # Node ID dcae615e91996e3caae5a9026c48d2cc5e82b555 # Parent 3cc05aaac68819ae7eef54fa858134f85ef7772f Fix console window resize diff -r 3cc05aaac688 -r dcae615e9199 src/vmm-details.glade --- a/src/vmm-details.glade Mon Apr 27 09:33:56 2009 -0400 +++ b/src/vmm-details.glade Wed May 06 16:46:55 2009 +0100 @@ -3,8 +3,6 @@ - 800 - 600 Virtual Machine 800 600 virt-manager-0.7.0-handle-arch-config.patch: --- NEW FILE virt-manager-0.7.0-handle-arch-config.patch --- # HG changeset patch # User Cole Robinson # Date 1242062294 14400 # Node ID c299f80bbc9f484f27b5ba5415800f52e0b5275c # Parent da615f51dcfbe0b89aa4c9c1243c2d9f3426cd16 Fix changing 'arch' in VM create wizard. Previously it never did anything :( diff -r da615f51dcfb -r c299f80bbc9f src/virtManager/create.py --- a/src/virtManager/create.py Mon May 11 12:24:15 2009 -0400 +++ b/src/virtManager/create.py Mon May 11 13:18:14 2009 -0400 @@ -698,7 +698,7 @@ net_list.set_active(default) - def change_caps(self, gtype=None, dtype=None): + def change_caps(self, gtype=None, dtype=None, arch=None): if gtype == None: # If none specified, prefer HVM. This way, the default install @@ -714,7 +714,8 @@ caps=self.caps, os_type = gtype, type = dtype, - accelerated=True) + accelerated=True, + arch=arch) if (self.capsguest and self.capsdomain and (newg.arch == self.capsguest.arch and @@ -938,6 +939,11 @@ if idx < 0: return + arch = src.get_model()[idx][0] + self.change_caps(self.capsguest.os_type, + self.capsdomain.hypervisor_type, + arch) + def url_box_changed(self, ignore): # If the url_entry has focus, don't fire detect_media_os, it means # the user is probably typing virt-manager-0.7.0-log-capabilities-at-startup.patch: --- NEW FILE virt-manager-0.7.0-log-capabilities-at-startup.patch --- # HG changeset patch # User Cole Robinson # Date 1242141157 14400 # Node ID 48b62193630869193e8193f85ffe87ea4842de79 # Parent 4736f0f543369ae41d6caa1188e8c71d0f6e326a Log capabilities XML at connection startup. diff -r 4736f0f54336 -r 48b621936308 src/virtManager/connection.py --- a/src/virtManager/connection.py Tue May 12 10:35:43 2009 -0400 +++ b/src/virtManager/connection.py Tue May 12 11:12:37 2009 -0400 @@ -633,6 +633,8 @@ class vmmConnection(gobject.GObject): gtk.gdk.threads_enter() try: if self.state == self.STATE_ACTIVE: + logging.debug("%s capabilities:\n%s" % + (self.get_uri(), self.vmm.getCapabilities())) self.tick() self.emit("state-changed") virt-manager-0.7.0-operating-typo.patch: --- NEW FILE virt-manager-0.7.0-operating-typo.patch --- # HG changeset patch # User Cole Robinson # Date 1240333404 14400 # Node ID 1cfb9a961d2dbc3ca6d14fad46de3264e7480104 # Parent c5ecf4a3c7badaf3ec16103ad9c53c2e8bf91a5a Fix 'operating' typo in create wizard. diff -r c5ecf4a3c7ba -r 1cfb9a961d2d src/vmm-create.glade --- a/src/vmm-create.glade Mon Apr 20 13:51:15 2009 -0400 +++ b/src/vmm-create.glade Tue Apr 21 13:03:24 2009 -0400 @@ -202,7 +202,7 @@ True 0 - Choose how you would like to install the opertaing system + Choose how you would like to install the operating system False virt-manager-0.7.0-update-translations-for-operating-typo.patch: --- NEW FILE virt-manager-0.7.0-update-translations-for-operating-typo.patch --- diff -up virt-manager-0.7.0/po/as.po.operating-typo virt-manager-0.7.0/po/as.po diff -up virt-manager-0.7.0/po/bg.po.operating-typo virt-manager-0.7.0/po/bg.po --- virt-manager-0.7.0/po/bg.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/bg.po 2009-05-21 15:49:52.000000000 +0100 @@ -2468,7 +2468,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "???????? ?????????????? ?????? ?????????? ???????????? ???? ???????????????? ???????????? ?????????????????? ?????????????? ?? ?????????????? " "???? ?????????????????????? ????????????." diff -up virt-manager-0.7.0/po/bn_IN.po.operating-typo virt-manager-0.7.0/po/bn_IN.po --- virt-manager-0.7.0/po/bn_IN.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/bn_IN.po 2009-05-21 15:49:52.000000000 +0100 @@ -2430,7 +2430,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????????????????? ????????? ??????????????????????????? ????????????????????? ?????????????????????????????? ????????????????????? ?????????????????? ???????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/bs.po.operating-typo virt-manager-0.7.0/po/bs.po --- virt-manager-0.7.0/po/bs.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/bs.po 2009-05-21 15:49:52.000000000 +0100 @@ -2460,7 +2460,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ca.po.operating-typo virt-manager-0.7.0/po/ca.po --- virt-manager-0.7.0/po/ca.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/ca.po 2009-05-21 15:49:52.000000000 +0100 @@ -2476,7 +2476,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Si us plau indiqueu com voleu veure la pantalla del convidat." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/cs.po.operating-typo virt-manager-0.7.0/po/cs.po --- virt-manager-0.7.0/po/cs.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/cs.po 2009-05-21 15:49:52.000000000 +0100 @@ -2464,7 +2464,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/da.po.operating-typo virt-manager-0.7.0/po/da.po --- virt-manager-0.7.0/po/da.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/da.po 2009-05-21 15:49:52.000000000 +0100 @@ -2472,7 +2472,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/de.po.operating-typo virt-manager-0.7.0/po/de.po --- virt-manager-0.7.0/po/de.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/de.po 2009-05-21 15:49:52.000000000 +0100 @@ -2501,7 +2501,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Bitte geben Sie an, wie Sie die Gast-Anzeige sehen m??chten." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/es.po.operating-typo virt-manager-0.7.0/po/es.po --- virt-manager-0.7.0/po/es.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/es.po 2009-05-21 15:49:52.000000000 +0100 @@ -2546,7 +2546,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Por favor, indique c??mo le gustar??a visualizar su pantalla virtual." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/fi.po.operating-typo virt-manager-0.7.0/po/fi.po --- virt-manager-0.7.0/po/fi.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/fi.po 2009-05-21 15:49:52.000000000 +0100 @@ -2463,7 +2463,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Kuinka haluat katsoa vierasj??rjestelm??n n??ytt?????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/fr.po.operating-typo virt-manager-0.7.0/po/fr.po --- virt-manager-0.7.0/po/fr.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/fr.po 2009-05-21 15:49:52.000000000 +0100 @@ -2501,7 +2501,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Veuillez indiquer comment vous souhaiteriez visualiser l'affichage de " "l'invit??." diff -up virt-manager-0.7.0/po/gu.po.operating-typo virt-manager-0.7.0/po/gu.po --- virt-manager-0.7.0/po/gu.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/gu.po 2009-05-21 15:49:52.000000000 +0100 @@ -2406,7 +2406,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "???????????????????????? ??????????????? ??????????????? ????????? ?????? ??????????????? ??????????????????????????? ????????????????????? ?????????????????????????????? ????????? ??????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/hi.po.operating-typo virt-manager-0.7.0/po/hi.po --- virt-manager-0.7.0/po/hi.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/hi.po 2009-05-21 15:49:52.000000000 +0100 @@ -2459,7 +2459,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "??????????????? ??????????????? ?????? ???????????? ?????? ??????????????? ???????????????????????? ?????? ?????????????????? ?????????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/hr.po.operating-typo virt-manager-0.7.0/po/hr.po --- virt-manager-0.7.0/po/hr.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/hr.po 2009-05-21 15:49:52.000000000 +0100 @@ -2462,7 +2462,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Nazna??ite na koji biste na??in ??eljeli svoj novi virtualni sustav povezati s " "mre??om udomitelja." diff -up virt-manager-0.7.0/po/hu.po.operating-typo virt-manager-0.7.0/po/hu.po --- virt-manager-0.7.0/po/hu.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/hu.po 2009-05-21 15:49:52.000000000 +0100 @@ -2479,7 +2479,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/is.po.operating-typo virt-manager-0.7.0/po/is.po --- virt-manager-0.7.0/po/is.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/is.po 2009-05-21 15:49:52.000000000 +0100 @@ -2317,7 +2317,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/it.po.operating-typo virt-manager-0.7.0/po/it.po --- virt-manager-0.7.0/po/it.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/it.po 2009-05-21 15:49:52.000000000 +0100 @@ -2496,7 +2496,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Si prega di indicare come si desidera visualizzare lo schermo ospite." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ja.po.operating-typo virt-manager-0.7.0/po/ja.po --- virt-manager-0.7.0/po/ja.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/ja.po 2009-05-21 15:49:52.000000000 +0100 @@ -2424,7 +2424,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????????????????????????????????????????????????????????????????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/kn.po.operating-typo virt-manager-0.7.0/po/kn.po --- virt-manager-0.7.0/po/kn.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/kn.po 2009-05-21 15:49:53.000000000 +0100 @@ -2418,7 +2418,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "???????????????????????? ?????????????????????????????? ??????????????? ???????????? ??????????????????????????? ???????????? ???????????????????????? ??????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ko.po.operating-typo virt-manager-0.7.0/po/ko.po --- virt-manager-0.7.0/po/ko.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ko.po 2009-05-21 15:49:53.000000000 +0100 @@ -2454,7 +2454,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ml.po.operating-typo virt-manager-0.7.0/po/ml.po --- virt-manager-0.7.0/po/ml.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ml.po 2009-05-21 15:49:53.000000000 +0100 @@ -2361,7 +2361,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/mr.po.operating-typo virt-manager-0.7.0/po/mr.po --- virt-manager-0.7.0/po/mr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/mr.po 2009-05-21 15:49:53.000000000 +0100 @@ -2452,7 +2452,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "??????????????? ???????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ?????? ??????????????? ????????????????????? ?????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ms.po.operating-typo virt-manager-0.7.0/po/ms.po --- virt-manager-0.7.0/po/ms.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ms.po 2009-05-21 15:49:53.000000000 +0100 @@ -2448,7 +2448,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/nb.po.operating-typo virt-manager-0.7.0/po/nb.po --- virt-manager-0.7.0/po/nb.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/nb.po 2009-05-21 15:49:53.000000000 +0100 @@ -2397,7 +2397,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/nl.po.operating-typo virt-manager-0.7.0/po/nl.po --- virt-manager-0.7.0/po/nl.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/nl.po 2009-05-21 15:49:53.000000000 +0100 @@ -2275,7 +2275,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/or.po.operating-typo virt-manager-0.7.0/po/or.po --- virt-manager-0.7.0/po/or.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/or.po 2009-05-21 15:49:53.000000000 +0100 @@ -2424,7 +2424,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????? ????????????????????? ??????????????? ?????????????????????????????? ??????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ?????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pa.po.operating-typo virt-manager-0.7.0/po/pa.po --- virt-manager-0.7.0/po/pa.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pa.po 2009-05-21 15:49:53.000000000 +0100 @@ -2363,7 +2363,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pl.po.operating-typo virt-manager-0.7.0/po/pl.po --- virt-manager-0.7.0/po/pl.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pl.po 2009-05-21 15:49:53.000000000 +0100 @@ -2405,7 +2405,7 @@ msgid "Choose an operating systen type a msgstr "Wybierz typ i wersj?? systemu operacyjnego" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Wska??, jak chcesz zainstalowa?? system operacyjny" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pt_BR.po.operating-typo virt-manager-0.7.0/po/pt_BR.po --- virt-manager-0.7.0/po/pt_BR.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pt_BR.po 2009-05-21 15:49:53.000000000 +0100 @@ -2501,7 +2501,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Por favor, indique como voc?? gostaria de ver a tela do convidado." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pt.po.operating-typo virt-manager-0.7.0/po/pt.po --- virt-manager-0.7.0/po/pt.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pt.po 2009-05-21 15:49:53.000000000 +0100 @@ -2476,7 +2476,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Indique por favor como deseja ligar o seu novo sistema virtual ?? rede " "anfitri??." diff -up virt-manager-0.7.0/po/ro.po.operating-typo virt-manager-0.7.0/po/ro.po --- virt-manager-0.7.0/po/ro.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ro.po 2009-05-21 15:49:53.000000000 +0100 @@ -2483,7 +2483,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ru.po.operating-typo virt-manager-0.7.0/po/ru.po --- virt-manager-0.7.0/po/ru.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ru.po 2009-05-21 15:49:53.000000000 +0100 @@ -2468,7 +2468,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "?????????????? ???????????? ?????????? ?????????? ?????????????????????? ?????????????? ?? ??????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/sr at latin.po.operating-typo virt-manager-0.7.0/po/sr at latin.po --- virt-manager-0.7.0/po/sr at latin.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/sr at latin.po 2009-05-21 15:49:53.000000000 +0100 @@ -2469,7 +2469,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Nazna??ite kako ??elite da pove??ete novi virtuelni sistem sa mre??om doma??ina." diff -up virt-manager-0.7.0/po/sr.po.operating-typo virt-manager-0.7.0/po/sr.po --- virt-manager-0.7.0/po/sr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/sr.po 2009-05-21 15:49:53.000000000 +0100 @@ -2468,7 +2468,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "?????????????????? ???????? ???????????? ???? ???????????????? ???????? ?????????????????? ???????????? ???? ???????????? ????????????????." diff -up virt-manager-0.7.0/po/sv.po.operating-typo virt-manager-0.7.0/po/sv.po --- virt-manager-0.7.0/po/sv.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/sv.po 2009-05-21 15:49:53.000000000 +0100 @@ -2448,7 +2448,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "V??lj hur du vill ansluta ditt nya virtuella system till v??rdn??tverket." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ta.po.operating-typo virt-manager-0.7.0/po/ta.po --- virt-manager-0.7.0/po/ta.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ta.po 2009-05-21 15:49:53.000000000 +0100 @@ -2428,7 +2428,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "??????????????????????????? ?????????????????????????????? ??????????????? ????????????????????? ????????????????????? ??????????????????????????????????????????????????? ?????? ???????????????????????? ???????????????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/te.po.operating-typo virt-manager-0.7.0/po/te.po --- virt-manager-0.7.0/po/te.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/te.po 2009-05-21 15:49:53.000000000 +0100 @@ -2403,7 +2403,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "???????????? ?????????????????????????????? ?????????????????????????????? ???????????? ????????????????????????????????? ????????????????????????????????? ?????????????????? ???????????????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/tr.po.operating-typo virt-manager-0.7.0/po/tr.po --- virt-manager-0.7.0/po/tr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/tr.po 2009-05-21 15:49:53.000000000 +0100 @@ -2341,7 +2341,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/uk.po.operating-typo virt-manager-0.7.0/po/uk.po --- virt-manager-0.7.0/po/uk.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/uk.po 2009-05-21 15:49:53.000000000 +0100 @@ -2476,7 +2476,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/zh_CN.po.operating-typo virt-manager-0.7.0/po/zh_CN.po --- virt-manager-0.7.0/po/zh_CN.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/zh_CN.po 2009-05-21 15:49:53.000000000 +0100 @@ -2374,7 +2374,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "?????????????????????????????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/zh_TW.po.operating-typo virt-manager-0.7.0/po/zh_TW.po --- virt-manager-0.7.0/po/zh_TW.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/zh_TW.po 2009-05-21 15:49:53.000000000 +0100 @@ -2433,7 +2433,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????????????????????????????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 virt-manager-0.7.0-vnc-auth-get-username.patch: --- NEW FILE virt-manager-0.7.0-vnc-auth-get-username.patch --- # HG changeset patch # User "Daniel P. Berrange " # Date 1241720553 -3600 # Node ID 5b61bd10a66b91d40ad5652a8f39b14273175292 # Parent 6082392f2279e21a66482c58e230c2fc695eb66e Extend VNC auth handling to cope with fetching a username too & record username in gconf diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/config.py --- a/src/virtManager/config.py Wed May 06 16:47:10 2009 +0100 +++ b/src/virtManager/config.py Thu May 07 19:22:33 2009 +0100 @@ -23,6 +23,7 @@ import gtk.gdk import libvirt +import logging from virtManager.keyring import vmmKeyring from virtManager.secret import vmmSecret @@ -299,6 +300,7 @@ def has_keyring(self): if self.keyring == None: + logging.warning("Initializing keyring") self.keyring = vmmKeyring() return self.keyring.is_available() @@ -314,26 +316,30 @@ def get_console_password(self, vm): _id = self.conf.get_int(self.conf_dir + "/console/passwords/" + vm.get_uuid()) + username = self.conf.get_string(self.conf_dir + "/console/usernames/" + vm.get_uuid()) + + if username is None: + username = "" if _id != None: if not(self.has_keyring()): - return "" + return ("", "") secret = self.keyring.get_secret(_id) if secret != None and secret.get_name() == self.get_secret_name(vm): if not(secret.has_attribute("hvuri")): - return "" + return ("", "") if secret.get_attribute("hvuri") != vm.get_connection().get_uri(): - return "" + return ("", "") if not(secret.has_attribute("uuid")): - return "" + return ("", "") if secret.get_attribute("uuid") != vm.get_uuid(): - return "" + return ("", "") - return secret.get_secret() - return "" + return (secret.get_secret(), username) + return ("", username) - def set_console_password(self, vm, password): + def set_console_password(self, vm, password, username=""): if not(self.has_keyring()): return @@ -346,6 +352,7 @@ _id = self.keyring.add_secret(secret) if _id != None: self.conf.set_int(self.conf_dir + "/console/passwords/" + vm.get_uuid(), _id) + self.conf.set_string(self.conf_dir + "/console/usernames/" + vm.get_uuid(), username) def get_url_list_length(self): length = self.conf.get_int(self.conf_dir + "/urls/url-list-length") diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/details.py --- a/src/virtManager/details.py Wed May 06 16:47:10 2009 +0100 +++ b/src/virtManager/details.py Thu May 07 19:22:33 2009 +0100 @@ -500,7 +500,7 @@ self.update_scaling() def auth_login(self, ignore): - self.set_password() + self.set_credentials() self.activate_viewer_page() def toggle_toolbar(self, src): @@ -1302,23 +1302,44 @@ traceback.format_exc (stacktrace)) logging.error(details) - def set_password(self, src=None): - txt = self.window.get_widget("console-auth-password") - self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD, - txt.get_text()) + def set_credentials(self, src=None): + passwd = self.window.get_widget("console-auth-password") + if passwd.flags() & gtk.VISIBLE: + self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD, + passwd.get_text()) + username = self.window.get_widget("console-auth-username") + if username.flags() & gtk.VISIBLE: + self.vncViewer.set_credential(gtkvnc.CREDENTIAL_USERNAME, + username.get_text()) + + if self.window.get_widget("console-auth-remember").get_active(): + self.config.set_console_password(self.vm, passwd.get_text(), username.get_text()) def _vnc_auth_credential(self, src, credList): for i in range(len(credList)): - logging.debug("Got credential request %s", str(credList[i])) - if credList[i] == gtkvnc.CREDENTIAL_PASSWORD: - self.activate_auth_page() - elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME: - self.vncViewer.set_credential(credList[i], "libvirt-vnc") - else: - # Force it to stop re-trying + if credList[i] not in (gtkvnc.CREDENTIAL_PASSWORD, gtkvnc.CREDENTIAL_USERNAME, gtkvnc.CREDENTIAL_CLIENTNAME): + self.err.show_err(summary=_("Unable to provide requested credentials to the VNC server"), + details=_("The credential type %s is not supported") % (str(credList[i])), + title=_("Unable to authenticate"), + async=True) self.vncViewerRetriesScheduled = 10 self.vncViewer.close() self.activate_unavailable_page(_("Unsupported console authentication type")) + return + + withUsername = False + withPassword = False + for i in range(len(credList)): + logging.debug("Got credential request %s", str(credList[i])) + if credList[i] == gtkvnc.CREDENTIAL_PASSWORD: + withPassword = True + elif credList[i] == gtkvnc.CREDENTIAL_USERNAME: + withUsername = True + elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME: + self.vncViewer.set_credential(credList[i], "libvirt-vnc") + + if withUsername or withPassword: + self.activate_auth_page(withPassword, withUsername) def activate_unavailable_page(self, msg): self.window.get_widget("console-pages").set_current_page(PAGE_UNAVAILABLE) @@ -1329,20 +1350,41 @@ self.window.get_widget("console-pages").set_current_page(PAGE_SCREENSHOT) self.window.get_widget("details-menu-vm-screenshot").set_sensitive(True) - def activate_auth_page(self): - pw = self.config.get_console_password(self.vm) + def activate_auth_page(self, withPassword=True, withUsername=False): + (pw, username) = self.config.get_console_password(self.vm) self.window.get_widget("details-menu-vm-screenshot").set_sensitive(False) + + if withPassword: + self.window.get_widget("console-auth-password").show() + self.window.get_widget("label-auth-password").show() + else: + self.window.get_widget("console-auth-password").hide() + self.window.get_widget("label-auth-password").hide() + + if withUsername: + self.window.get_widget("console-auth-username").show() + self.window.get_widget("label-auth-username").show() + else: + self.window.get_widget("console-auth-username").hide() + self.window.get_widget("label-auth-username").hide() + + self.window.get_widget("console-auth-username").set_text(username) self.window.get_widget("console-auth-password").set_text(pw) - self.window.get_widget("console-auth-password").grab_focus() + if self.config.has_keyring(): self.window.get_widget("console-auth-remember").set_sensitive(True) - if pw != None and pw != "": + if pw != "" or username != "": self.window.get_widget("console-auth-remember").set_active(True) else: self.window.get_widget("console-auth-remember").set_active(False) else: self.window.get_widget("console-auth-remember").set_sensitive(False) self.window.get_widget("console-pages").set_current_page(PAGE_AUTHENTICATE) + if withUsername: + self.window.get_widget("console-auth-username").grab_focus() + else: + self.window.get_widget("console-auth-password").grab_focus() + def activate_viewer_page(self): self.window.get_widget("console-pages").set_current_page(PAGE_VNCVIEWER) diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/keyring.py --- a/src/virtManager/keyring.py Wed May 06 16:47:10 2009 +0100 +++ b/src/virtManager/keyring.py Thu May 07 19:22:33 2009 +0100 @@ -38,6 +38,8 @@ if not("default" in gnomekeyring.list_keyring_names_sync()): gnomekeyring.create_sync("default", None) self.keyring = gnomekeyring.get_default_keyring_sync() + if self.keyring == None: + logging.warning("Failed to create default keyring") except: logging.warning(("Keyring unavailable: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1]))) self.keyring = None @@ -61,6 +63,7 @@ return _id except: + logging.warning(("Failed to add secret: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1]))) return None def get_secret(self, _id): diff -r 6082392f2279 -r 5b61bd10a66b src/vmm-details.glade --- a/src/vmm-details.glade Wed May 06 16:47:10 2009 +0100 +++ b/src/vmm-details.glade Thu May 07 19:22:33 2009 +0100 @@ -553,7 +553,7 @@ True 3 - 2 + 3 3 3 3 @@ -564,6 +564,80 @@ + + + + + True + 0 + Password: + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + Save this password in your keyring + True + 0 + 0 + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + Username: + + + GTK_FILL + + + + + + True + True + * + + + + 1 + 2 + + + + True True @@ -608,53 +682,12 @@ 2 3 - GTK_FILL - - - - - - True - True - False - * - - - - 1 - 2 - - - - - - True - True - Save this password in your keyring - True - 0 - True - - - 1 - 2 1 2 GTK_FILL - - - True - 0 - Password: - - - GTK_FILL - - - 2 Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- virt-manager.spec 14 Apr 2009 21:12:30 -0000 1.51 +++ virt-manager.spec 21 May 2009 14:56:09 -0000 1.52 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.7.0 -Release: 4%{_extra_release} +Release: 5%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -21,6 +21,12 @@ Patch3: %{name}-%{version}-fix-button-or Patch4: %{name}-%{version}-fix-vcpu-cap.patch Patch5: %{name}-%{version}-delete-dup-conn.patch Patch6: %{name}-%{version}-update-translations.patch +Patch7: %{name}-%{version}-operating-typo.patch +Patch8: %{name}-%{version}-update-translations-for-operating-typo.patch +Patch9: %{name}-%{version}-fix-window-resize.patch +Patch10: %{name}-%{version}-vnc-auth-get-username.patch +Patch11: %{name}-%{version}-handle-arch-config.patch +Patch12: %{name}-%{version}-log-capabilities-at-startup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -99,6 +105,12 @@ management API. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build %configure @@ -176,6 +188,13 @@ fi %{_datadir}/dbus-1/services/%{name}.service %changelog +* Thu May 21 2009 Mark McLoughlin - 0.7.0-5.fc12 +- Fix 'opertaing' typo in 'New VM' dialog (#495128) +- Allow details window to resize again (#491683) +- Handle collecting username for vnc authentication (#499589) +- Actually handle arch config when creating a VM (#499145) +- Log libvirt capabilities at startup to aid debugging (#500337) + * Tue Apr 14 2009 Cole Robinson - 0.7.0-4.fc11 - More translation updates From markmc at fedoraproject.org Thu May 21 14:58:14 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 21 May 2009 14:58:14 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/F-11 virt-manager-0.7.0-fix-window-resize.patch, NONE, 1.1 virt-manager-0.7.0-handle-arch-config.patch, NONE, 1.1 virt-manager-0.7.0-log-capabilities-at-startup.patch, NONE, 1.1 virt-manager-0.7.0-operating-typo.patch, NONE, 1.1 virt-manager-0.7.0-update-translations-for-operating-typo.patch, NONE, 1.1 virt-manager-0.7.0-vnc-auth-get-username.patch, NONE, 1.1 virt-manager.spec, 1.51, 1.52 Message-ID: <20090521145814.C513E70114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/virt-manager/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8811 Modified Files: virt-manager.spec Added Files: virt-manager-0.7.0-fix-window-resize.patch virt-manager-0.7.0-handle-arch-config.patch virt-manager-0.7.0-log-capabilities-at-startup.patch virt-manager-0.7.0-operating-typo.patch virt-manager-0.7.0-update-translations-for-operating-typo.patch virt-manager-0.7.0-vnc-auth-get-username.patch Log Message: * Thu May 21 2009 Mark McLoughlin - 0.7.0-5.fc11 - Fix 'opertaing' typo in 'New VM' dialog (#495128) - Allow details window to resize again (#491683) - Handle collecting username for vnc authentication (#499589) - Actually handle arch config when creating a VM (#499145) - Log libvirt capabilities at startup to aid debugging (#500337) virt-manager-0.7.0-fix-window-resize.patch: --- NEW FILE virt-manager-0.7.0-fix-window-resize.patch --- # HG changeset patch # User "Daniel P. Berrange " # Date 1241624815 -3600 # Node ID dcae615e91996e3caae5a9026c48d2cc5e82b555 # Parent 3cc05aaac68819ae7eef54fa858134f85ef7772f Fix console window resize diff -r 3cc05aaac688 -r dcae615e9199 src/vmm-details.glade --- a/src/vmm-details.glade Mon Apr 27 09:33:56 2009 -0400 +++ b/src/vmm-details.glade Wed May 06 16:46:55 2009 +0100 @@ -3,8 +3,6 @@ - 800 - 600 Virtual Machine 800 600 virt-manager-0.7.0-handle-arch-config.patch: --- NEW FILE virt-manager-0.7.0-handle-arch-config.patch --- # HG changeset patch # User Cole Robinson # Date 1242062294 14400 # Node ID c299f80bbc9f484f27b5ba5415800f52e0b5275c # Parent da615f51dcfbe0b89aa4c9c1243c2d9f3426cd16 Fix changing 'arch' in VM create wizard. Previously it never did anything :( diff -r da615f51dcfb -r c299f80bbc9f src/virtManager/create.py --- a/src/virtManager/create.py Mon May 11 12:24:15 2009 -0400 +++ b/src/virtManager/create.py Mon May 11 13:18:14 2009 -0400 @@ -698,7 +698,7 @@ net_list.set_active(default) - def change_caps(self, gtype=None, dtype=None): + def change_caps(self, gtype=None, dtype=None, arch=None): if gtype == None: # If none specified, prefer HVM. This way, the default install @@ -714,7 +714,8 @@ caps=self.caps, os_type = gtype, type = dtype, - accelerated=True) + accelerated=True, + arch=arch) if (self.capsguest and self.capsdomain and (newg.arch == self.capsguest.arch and @@ -938,6 +939,11 @@ if idx < 0: return + arch = src.get_model()[idx][0] + self.change_caps(self.capsguest.os_type, + self.capsdomain.hypervisor_type, + arch) + def url_box_changed(self, ignore): # If the url_entry has focus, don't fire detect_media_os, it means # the user is probably typing virt-manager-0.7.0-log-capabilities-at-startup.patch: --- NEW FILE virt-manager-0.7.0-log-capabilities-at-startup.patch --- # HG changeset patch # User Cole Robinson # Date 1242141157 14400 # Node ID 48b62193630869193e8193f85ffe87ea4842de79 # Parent 4736f0f543369ae41d6caa1188e8c71d0f6e326a Log capabilities XML at connection startup. diff -r 4736f0f54336 -r 48b621936308 src/virtManager/connection.py --- a/src/virtManager/connection.py Tue May 12 10:35:43 2009 -0400 +++ b/src/virtManager/connection.py Tue May 12 11:12:37 2009 -0400 @@ -633,6 +633,8 @@ class vmmConnection(gobject.GObject): gtk.gdk.threads_enter() try: if self.state == self.STATE_ACTIVE: + logging.debug("%s capabilities:\n%s" % + (self.get_uri(), self.vmm.getCapabilities())) self.tick() self.emit("state-changed") virt-manager-0.7.0-operating-typo.patch: --- NEW FILE virt-manager-0.7.0-operating-typo.patch --- # HG changeset patch # User Cole Robinson # Date 1240333404 14400 # Node ID 1cfb9a961d2dbc3ca6d14fad46de3264e7480104 # Parent c5ecf4a3c7badaf3ec16103ad9c53c2e8bf91a5a Fix 'operating' typo in create wizard. diff -r c5ecf4a3c7ba -r 1cfb9a961d2d src/vmm-create.glade --- a/src/vmm-create.glade Mon Apr 20 13:51:15 2009 -0400 +++ b/src/vmm-create.glade Tue Apr 21 13:03:24 2009 -0400 @@ -202,7 +202,7 @@ True 0 - Choose how you would like to install the opertaing system + Choose how you would like to install the operating system False virt-manager-0.7.0-update-translations-for-operating-typo.patch: --- NEW FILE virt-manager-0.7.0-update-translations-for-operating-typo.patch --- diff -up virt-manager-0.7.0/po/as.po.operating-typo virt-manager-0.7.0/po/as.po diff -up virt-manager-0.7.0/po/bg.po.operating-typo virt-manager-0.7.0/po/bg.po --- virt-manager-0.7.0/po/bg.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/bg.po 2009-05-21 15:49:52.000000000 +0100 @@ -2468,7 +2468,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "???????? ?????????????? ?????? ?????????? ???????????? ???? ???????????????? ???????????? ?????????????????? ?????????????? ?? ?????????????? " "???? ?????????????????????? ????????????." diff -up virt-manager-0.7.0/po/bn_IN.po.operating-typo virt-manager-0.7.0/po/bn_IN.po --- virt-manager-0.7.0/po/bn_IN.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/bn_IN.po 2009-05-21 15:49:52.000000000 +0100 @@ -2430,7 +2430,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????????????????? ????????? ??????????????????????????? ????????????????????? ?????????????????????????????? ????????????????????? ?????????????????? ???????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/bs.po.operating-typo virt-manager-0.7.0/po/bs.po --- virt-manager-0.7.0/po/bs.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/bs.po 2009-05-21 15:49:52.000000000 +0100 @@ -2460,7 +2460,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ca.po.operating-typo virt-manager-0.7.0/po/ca.po --- virt-manager-0.7.0/po/ca.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/ca.po 2009-05-21 15:49:52.000000000 +0100 @@ -2476,7 +2476,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Si us plau indiqueu com voleu veure la pantalla del convidat." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/cs.po.operating-typo virt-manager-0.7.0/po/cs.po --- virt-manager-0.7.0/po/cs.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/cs.po 2009-05-21 15:49:52.000000000 +0100 @@ -2464,7 +2464,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/da.po.operating-typo virt-manager-0.7.0/po/da.po --- virt-manager-0.7.0/po/da.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/da.po 2009-05-21 15:49:52.000000000 +0100 @@ -2472,7 +2472,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/de.po.operating-typo virt-manager-0.7.0/po/de.po --- virt-manager-0.7.0/po/de.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/de.po 2009-05-21 15:49:52.000000000 +0100 @@ -2501,7 +2501,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Bitte geben Sie an, wie Sie die Gast-Anzeige sehen m??chten." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/es.po.operating-typo virt-manager-0.7.0/po/es.po --- virt-manager-0.7.0/po/es.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/es.po 2009-05-21 15:49:52.000000000 +0100 @@ -2546,7 +2546,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Por favor, indique c??mo le gustar??a visualizar su pantalla virtual." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/fi.po.operating-typo virt-manager-0.7.0/po/fi.po --- virt-manager-0.7.0/po/fi.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/fi.po 2009-05-21 15:49:52.000000000 +0100 @@ -2463,7 +2463,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Kuinka haluat katsoa vierasj??rjestelm??n n??ytt?????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/fr.po.operating-typo virt-manager-0.7.0/po/fr.po --- virt-manager-0.7.0/po/fr.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/fr.po 2009-05-21 15:49:52.000000000 +0100 @@ -2501,7 +2501,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Veuillez indiquer comment vous souhaiteriez visualiser l'affichage de " "l'invit??." diff -up virt-manager-0.7.0/po/gu.po.operating-typo virt-manager-0.7.0/po/gu.po --- virt-manager-0.7.0/po/gu.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/gu.po 2009-05-21 15:49:52.000000000 +0100 @@ -2406,7 +2406,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "???????????????????????? ??????????????? ??????????????? ????????? ?????? ??????????????? ??????????????????????????? ????????????????????? ?????????????????????????????? ????????? ??????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/hi.po.operating-typo virt-manager-0.7.0/po/hi.po --- virt-manager-0.7.0/po/hi.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/hi.po 2009-05-21 15:49:52.000000000 +0100 @@ -2459,7 +2459,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "??????????????? ??????????????? ?????? ???????????? ?????? ??????????????? ???????????????????????? ?????? ?????????????????? ?????????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/hr.po.operating-typo virt-manager-0.7.0/po/hr.po --- virt-manager-0.7.0/po/hr.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/hr.po 2009-05-21 15:49:52.000000000 +0100 @@ -2462,7 +2462,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Nazna??ite na koji biste na??in ??eljeli svoj novi virtualni sustav povezati s " "mre??om udomitelja." diff -up virt-manager-0.7.0/po/hu.po.operating-typo virt-manager-0.7.0/po/hu.po --- virt-manager-0.7.0/po/hu.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/hu.po 2009-05-21 15:49:52.000000000 +0100 @@ -2479,7 +2479,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/is.po.operating-typo virt-manager-0.7.0/po/is.po --- virt-manager-0.7.0/po/is.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/is.po 2009-05-21 15:49:52.000000000 +0100 @@ -2317,7 +2317,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/it.po.operating-typo virt-manager-0.7.0/po/it.po --- virt-manager-0.7.0/po/it.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/it.po 2009-05-21 15:49:52.000000000 +0100 @@ -2496,7 +2496,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Si prega di indicare come si desidera visualizzare lo schermo ospite." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ja.po.operating-typo virt-manager-0.7.0/po/ja.po --- virt-manager-0.7.0/po/ja.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/ja.po 2009-05-21 15:49:52.000000000 +0100 @@ -2424,7 +2424,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????????????????????????????????????????????????????????????????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/kn.po.operating-typo virt-manager-0.7.0/po/kn.po --- virt-manager-0.7.0/po/kn.po.operating-typo 2009-05-21 15:49:46.000000000 +0100 +++ virt-manager-0.7.0/po/kn.po 2009-05-21 15:49:53.000000000 +0100 @@ -2418,7 +2418,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "???????????????????????? ?????????????????????????????? ??????????????? ???????????? ??????????????????????????? ???????????? ???????????????????????? ??????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ko.po.operating-typo virt-manager-0.7.0/po/ko.po --- virt-manager-0.7.0/po/ko.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ko.po 2009-05-21 15:49:53.000000000 +0100 @@ -2454,7 +2454,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ml.po.operating-typo virt-manager-0.7.0/po/ml.po --- virt-manager-0.7.0/po/ml.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ml.po 2009-05-21 15:49:53.000000000 +0100 @@ -2361,7 +2361,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/mr.po.operating-typo virt-manager-0.7.0/po/mr.po --- virt-manager-0.7.0/po/mr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/mr.po 2009-05-21 15:49:53.000000000 +0100 @@ -2452,7 +2452,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "??????????????? ???????????????????????? ????????????????????? ???????????? ??????????????? ?????????????????? ?????? ??????????????? ????????????????????? ?????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ms.po.operating-typo virt-manager-0.7.0/po/ms.po --- virt-manager-0.7.0/po/ms.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ms.po 2009-05-21 15:49:53.000000000 +0100 @@ -2448,7 +2448,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/nb.po.operating-typo virt-manager-0.7.0/po/nb.po --- virt-manager-0.7.0/po/nb.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/nb.po 2009-05-21 15:49:53.000000000 +0100 @@ -2397,7 +2397,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/nl.po.operating-typo virt-manager-0.7.0/po/nl.po --- virt-manager-0.7.0/po/nl.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/nl.po 2009-05-21 15:49:53.000000000 +0100 @@ -2275,7 +2275,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/or.po.operating-typo virt-manager-0.7.0/po/or.po --- virt-manager-0.7.0/po/or.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/or.po 2009-05-21 15:49:53.000000000 +0100 @@ -2424,7 +2424,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????? ????????????????????? ??????????????? ?????????????????????????????? ??????????????? ???????????????????????? ?????????????????? ???????????? ??????????????? ?????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pa.po.operating-typo virt-manager-0.7.0/po/pa.po --- virt-manager-0.7.0/po/pa.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pa.po 2009-05-21 15:49:53.000000000 +0100 @@ -2363,7 +2363,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pl.po.operating-typo virt-manager-0.7.0/po/pl.po --- virt-manager-0.7.0/po/pl.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pl.po 2009-05-21 15:49:53.000000000 +0100 @@ -2405,7 +2405,7 @@ msgid "Choose an operating systen type a msgstr "Wybierz typ i wersj?? systemu operacyjnego" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Wska??, jak chcesz zainstalowa?? system operacyjny" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pt_BR.po.operating-typo virt-manager-0.7.0/po/pt_BR.po --- virt-manager-0.7.0/po/pt_BR.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pt_BR.po 2009-05-21 15:49:53.000000000 +0100 @@ -2501,7 +2501,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "Por favor, indique como voc?? gostaria de ver a tela do convidado." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/pt.po.operating-typo virt-manager-0.7.0/po/pt.po --- virt-manager-0.7.0/po/pt.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/pt.po 2009-05-21 15:49:53.000000000 +0100 @@ -2476,7 +2476,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Indique por favor como deseja ligar o seu novo sistema virtual ?? rede " "anfitri??." diff -up virt-manager-0.7.0/po/ro.po.operating-typo virt-manager-0.7.0/po/ro.po --- virt-manager-0.7.0/po/ro.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ro.po 2009-05-21 15:49:53.000000000 +0100 @@ -2483,7 +2483,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ru.po.operating-typo virt-manager-0.7.0/po/ru.po --- virt-manager-0.7.0/po/ru.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ru.po 2009-05-21 15:49:53.000000000 +0100 @@ -2468,7 +2468,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "?????????????? ???????????? ?????????? ?????????? ?????????????????????? ?????????????? ?? ??????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/sr at latin.po.operating-typo virt-manager-0.7.0/po/sr at latin.po --- virt-manager-0.7.0/po/sr at latin.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/sr at latin.po 2009-05-21 15:49:53.000000000 +0100 @@ -2469,7 +2469,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "Nazna??ite kako ??elite da pove??ete novi virtuelni sistem sa mre??om doma??ina." diff -up virt-manager-0.7.0/po/sr.po.operating-typo virt-manager-0.7.0/po/sr.po --- virt-manager-0.7.0/po/sr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/sr.po 2009-05-21 15:49:53.000000000 +0100 @@ -2468,7 +2468,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" "?????????????????? ???????? ???????????? ???? ???????????????? ???????? ?????????????????? ???????????? ???? ???????????? ????????????????." diff -up virt-manager-0.7.0/po/sv.po.operating-typo virt-manager-0.7.0/po/sv.po --- virt-manager-0.7.0/po/sv.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/sv.po 2009-05-21 15:49:53.000000000 +0100 @@ -2448,7 +2448,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "V??lj hur du vill ansluta ditt nya virtuella system till v??rdn??tverket." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/ta.po.operating-typo virt-manager-0.7.0/po/ta.po --- virt-manager-0.7.0/po/ta.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/ta.po 2009-05-21 15:49:53.000000000 +0100 @@ -2428,7 +2428,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "??????????????????????????? ?????????????????????????????? ??????????????? ????????????????????? ????????????????????? ??????????????????????????????????????????????????? ?????? ???????????????????????? ???????????????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/te.po.operating-typo virt-manager-0.7.0/po/te.po --- virt-manager-0.7.0/po/te.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/te.po 2009-05-21 15:49:53.000000000 +0100 @@ -2403,7 +2403,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "???????????? ?????????????????????????????? ?????????????????????????????? ???????????? ????????????????????????????????? ????????????????????????????????? ?????????????????? ???????????????????????????." #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/tr.po.operating-typo virt-manager-0.7.0/po/tr.po --- virt-manager-0.7.0/po/tr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/tr.po 2009-05-21 15:49:53.000000000 +0100 @@ -2341,7 +2341,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/uk.po.operating-typo virt-manager-0.7.0/po/uk.po --- virt-manager-0.7.0/po/uk.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/uk.po 2009-05-21 15:49:53.000000000 +0100 @@ -2476,7 +2476,7 @@ msgid "Choose an operating systen type a msgstr "" #: ../src/vmm-create.glade.h:16 -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/zh_CN.po.operating-typo virt-manager-0.7.0/po/zh_CN.po --- virt-manager-0.7.0/po/zh_CN.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/zh_CN.po 2009-05-21 15:49:53.000000000 +0100 @@ -2374,7 +2374,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "?????????????????????????????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 diff -up virt-manager-0.7.0/po/zh_TW.po.operating-typo virt-manager-0.7.0/po/zh_TW.po --- virt-manager-0.7.0/po/zh_TW.po.operating-typo 2009-05-21 15:49:47.000000000 +0100 +++ virt-manager-0.7.0/po/zh_TW.po 2009-05-21 15:49:53.000000000 +0100 @@ -2433,7 +2433,7 @@ msgstr "" #: ../src/vmm-create.glade.h:16 #, fuzzy -msgid "Choose how you would like to install the opertaing system" +msgid "Choose how you would like to install the operating system" msgstr "????????????????????????????????????????????????" #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13 virt-manager-0.7.0-vnc-auth-get-username.patch: --- NEW FILE virt-manager-0.7.0-vnc-auth-get-username.patch --- # HG changeset patch # User "Daniel P. Berrange " # Date 1241720553 -3600 # Node ID 5b61bd10a66b91d40ad5652a8f39b14273175292 # Parent 6082392f2279e21a66482c58e230c2fc695eb66e Extend VNC auth handling to cope with fetching a username too & record username in gconf diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/config.py --- a/src/virtManager/config.py Wed May 06 16:47:10 2009 +0100 +++ b/src/virtManager/config.py Thu May 07 19:22:33 2009 +0100 @@ -23,6 +23,7 @@ import gtk.gdk import libvirt +import logging from virtManager.keyring import vmmKeyring from virtManager.secret import vmmSecret @@ -299,6 +300,7 @@ def has_keyring(self): if self.keyring == None: + logging.warning("Initializing keyring") self.keyring = vmmKeyring() return self.keyring.is_available() @@ -314,26 +316,30 @@ def get_console_password(self, vm): _id = self.conf.get_int(self.conf_dir + "/console/passwords/" + vm.get_uuid()) + username = self.conf.get_string(self.conf_dir + "/console/usernames/" + vm.get_uuid()) + + if username is None: + username = "" if _id != None: if not(self.has_keyring()): - return "" + return ("", "") secret = self.keyring.get_secret(_id) if secret != None and secret.get_name() == self.get_secret_name(vm): if not(secret.has_attribute("hvuri")): - return "" + return ("", "") if secret.get_attribute("hvuri") != vm.get_connection().get_uri(): - return "" + return ("", "") if not(secret.has_attribute("uuid")): - return "" + return ("", "") if secret.get_attribute("uuid") != vm.get_uuid(): - return "" + return ("", "") - return secret.get_secret() - return "" + return (secret.get_secret(), username) + return ("", username) - def set_console_password(self, vm, password): + def set_console_password(self, vm, password, username=""): if not(self.has_keyring()): return @@ -346,6 +352,7 @@ _id = self.keyring.add_secret(secret) if _id != None: self.conf.set_int(self.conf_dir + "/console/passwords/" + vm.get_uuid(), _id) + self.conf.set_string(self.conf_dir + "/console/usernames/" + vm.get_uuid(), username) def get_url_list_length(self): length = self.conf.get_int(self.conf_dir + "/urls/url-list-length") diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/details.py --- a/src/virtManager/details.py Wed May 06 16:47:10 2009 +0100 +++ b/src/virtManager/details.py Thu May 07 19:22:33 2009 +0100 @@ -500,7 +500,7 @@ self.update_scaling() def auth_login(self, ignore): - self.set_password() + self.set_credentials() self.activate_viewer_page() def toggle_toolbar(self, src): @@ -1302,23 +1302,44 @@ traceback.format_exc (stacktrace)) logging.error(details) - def set_password(self, src=None): - txt = self.window.get_widget("console-auth-password") - self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD, - txt.get_text()) + def set_credentials(self, src=None): + passwd = self.window.get_widget("console-auth-password") + if passwd.flags() & gtk.VISIBLE: + self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD, + passwd.get_text()) + username = self.window.get_widget("console-auth-username") + if username.flags() & gtk.VISIBLE: + self.vncViewer.set_credential(gtkvnc.CREDENTIAL_USERNAME, + username.get_text()) + + if self.window.get_widget("console-auth-remember").get_active(): + self.config.set_console_password(self.vm, passwd.get_text(), username.get_text()) def _vnc_auth_credential(self, src, credList): for i in range(len(credList)): - logging.debug("Got credential request %s", str(credList[i])) - if credList[i] == gtkvnc.CREDENTIAL_PASSWORD: - self.activate_auth_page() - elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME: - self.vncViewer.set_credential(credList[i], "libvirt-vnc") - else: - # Force it to stop re-trying + if credList[i] not in (gtkvnc.CREDENTIAL_PASSWORD, gtkvnc.CREDENTIAL_USERNAME, gtkvnc.CREDENTIAL_CLIENTNAME): + self.err.show_err(summary=_("Unable to provide requested credentials to the VNC server"), + details=_("The credential type %s is not supported") % (str(credList[i])), + title=_("Unable to authenticate"), + async=True) self.vncViewerRetriesScheduled = 10 self.vncViewer.close() self.activate_unavailable_page(_("Unsupported console authentication type")) + return + + withUsername = False + withPassword = False + for i in range(len(credList)): + logging.debug("Got credential request %s", str(credList[i])) + if credList[i] == gtkvnc.CREDENTIAL_PASSWORD: + withPassword = True + elif credList[i] == gtkvnc.CREDENTIAL_USERNAME: + withUsername = True + elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME: + self.vncViewer.set_credential(credList[i], "libvirt-vnc") + + if withUsername or withPassword: + self.activate_auth_page(withPassword, withUsername) def activate_unavailable_page(self, msg): self.window.get_widget("console-pages").set_current_page(PAGE_UNAVAILABLE) @@ -1329,20 +1350,41 @@ self.window.get_widget("console-pages").set_current_page(PAGE_SCREENSHOT) self.window.get_widget("details-menu-vm-screenshot").set_sensitive(True) - def activate_auth_page(self): - pw = self.config.get_console_password(self.vm) + def activate_auth_page(self, withPassword=True, withUsername=False): + (pw, username) = self.config.get_console_password(self.vm) self.window.get_widget("details-menu-vm-screenshot").set_sensitive(False) + + if withPassword: + self.window.get_widget("console-auth-password").show() + self.window.get_widget("label-auth-password").show() + else: + self.window.get_widget("console-auth-password").hide() + self.window.get_widget("label-auth-password").hide() + + if withUsername: + self.window.get_widget("console-auth-username").show() + self.window.get_widget("label-auth-username").show() + else: + self.window.get_widget("console-auth-username").hide() + self.window.get_widget("label-auth-username").hide() + + self.window.get_widget("console-auth-username").set_text(username) self.window.get_widget("console-auth-password").set_text(pw) - self.window.get_widget("console-auth-password").grab_focus() + if self.config.has_keyring(): self.window.get_widget("console-auth-remember").set_sensitive(True) - if pw != None and pw != "": + if pw != "" or username != "": self.window.get_widget("console-auth-remember").set_active(True) else: self.window.get_widget("console-auth-remember").set_active(False) else: self.window.get_widget("console-auth-remember").set_sensitive(False) self.window.get_widget("console-pages").set_current_page(PAGE_AUTHENTICATE) + if withUsername: + self.window.get_widget("console-auth-username").grab_focus() + else: + self.window.get_widget("console-auth-password").grab_focus() + def activate_viewer_page(self): self.window.get_widget("console-pages").set_current_page(PAGE_VNCVIEWER) diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/keyring.py --- a/src/virtManager/keyring.py Wed May 06 16:47:10 2009 +0100 +++ b/src/virtManager/keyring.py Thu May 07 19:22:33 2009 +0100 @@ -38,6 +38,8 @@ if not("default" in gnomekeyring.list_keyring_names_sync()): gnomekeyring.create_sync("default", None) self.keyring = gnomekeyring.get_default_keyring_sync() + if self.keyring == None: + logging.warning("Failed to create default keyring") except: logging.warning(("Keyring unavailable: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1]))) self.keyring = None @@ -61,6 +63,7 @@ return _id except: + logging.warning(("Failed to add secret: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1]))) return None def get_secret(self, _id): diff -r 6082392f2279 -r 5b61bd10a66b src/vmm-details.glade --- a/src/vmm-details.glade Wed May 06 16:47:10 2009 +0100 +++ b/src/vmm-details.glade Thu May 07 19:22:33 2009 +0100 @@ -553,7 +553,7 @@ True 3 - 2 + 3 3 3 3 @@ -564,6 +564,80 @@ + + + + + True + 0 + Password: + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + Save this password in your keyring + True + 0 + 0 + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + Username: + + + GTK_FILL + + + + + + True + True + * + + + + 1 + 2 + + + + True True @@ -608,53 +682,12 @@ 2 3 - GTK_FILL - - - - - - True - True - False - * - - - - 1 - 2 - - - - - - True - True - Save this password in your keyring - True - 0 - True - - - 1 - 2 1 2 GTK_FILL - - - True - 0 - Password: - - - GTK_FILL - - - 2 Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-11/virt-manager.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- virt-manager.spec 14 Apr 2009 21:12:30 -0000 1.51 +++ virt-manager.spec 21 May 2009 14:58:14 -0000 1.52 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.7.0 -Release: 4%{_extra_release} +Release: 5%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -21,6 +21,12 @@ Patch3: %{name}-%{version}-fix-button-or Patch4: %{name}-%{version}-fix-vcpu-cap.patch Patch5: %{name}-%{version}-delete-dup-conn.patch Patch6: %{name}-%{version}-update-translations.patch +Patch7: %{name}-%{version}-operating-typo.patch +Patch8: %{name}-%{version}-update-translations-for-operating-typo.patch +Patch9: %{name}-%{version}-fix-window-resize.patch +Patch10: %{name}-%{version}-vnc-auth-get-username.patch +Patch11: %{name}-%{version}-handle-arch-config.patch +Patch12: %{name}-%{version}-log-capabilities-at-startup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -99,6 +105,12 @@ management API. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build %configure @@ -176,6 +188,13 @@ fi %{_datadir}/dbus-1/services/%{name}.service %changelog +* Thu May 21 2009 Mark McLoughlin - 0.7.0-5.fc11 +- Fix 'opertaing' typo in 'New VM' dialog (#495128) +- Allow details window to resize again (#491683) +- Handle collecting username for vnc authentication (#499589) +- Actually handle arch config when creating a VM (#499145) +- Log libvirt capabilities at startup to aid debugging (#500337) + * Tue Apr 14 2009 Cole Robinson - 0.7.0-4.fc11 - More translation updates From rjones at fedoraproject.org Thu May 21 15:33:52 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 15:33:52 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.8, 1.9 libguestfs.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <20090521153352.4053470114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16500 Modified Files: .cvsignore libguestfs.spec sources Log Message: - New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018). - This should allow us to enable tests for i386 and x86-64. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 21 May 2009 11:50:35 -0000 1.8 +++ .cvsignore 21 May 2009 15:33:21 -0000 1.9 @@ -1 +1 @@ -libguestfs-1.0.28.tar.gz +libguestfs-1.0.29.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- libguestfs.spec 21 May 2009 13:12:39 -0000 1.20 +++ libguestfs.spec 21 May 2009 15:33:21 -0000 1.21 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.28 -Release: 2%{?dist} +Version: 1.0.29 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -268,16 +268,21 @@ make INSTALLDIRS=vendor %{?_smp_mflags} %check +# Enable debugging - very useful if a test does fail, although +# it produces masses of output in the build.log. +export LIBGUESTFS_DEBUG=1 + # Uncomment one of these, depending on whether you want to # do a very long and thorough test ('make check') or just # a quick test to see if things generally work. # Currently tests are disabled on all architectures because of: # BZ 494075 (ppc, ppc64) -# BZ 500564 (i386, x86-64) +# BZ 500564 (i386, x86-64) - only on F-11 we think, seems to work on F-12 -export LIBGUESTFS_DEBUG=1 +%ifarch %{ix86} x86_64 make check +%endif # Quick test: #./fish/guestfish -v < - 1.0.28-2 -- Experiment with enabling tests to see if latest KVM fixes earlier - problems. +* Thu May 21 2009 Richard Jones - 1.0.29-1 +- New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018). +- This should allow us to enable tests for i386 and x86-64. * Thu May 21 2009 Richard Jones - 1.0.28-1 - New upstream version 1.0.28. Nothing has visibly changed, but Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 21 May 2009 11:50:35 -0000 1.8 +++ sources 21 May 2009 15:33:21 -0000 1.9 @@ -1 +1 @@ -f5a0b08abaa266568cecd63b02438768 libguestfs-1.0.28.tar.gz +3a92082fa47893f00821ae0e58fa4e7f libguestfs-1.0.29.tar.gz From trac at fedorahosted.org Thu May 21 15:43:46 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 15:43:46 -0000 Subject: [fedora-virt-maint] Re: [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces In-Reply-To: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> References: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> Message-ID: <071.df7c5d77f3531867c79ab65ed8c6ba28@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: toshio Type: bug | Status: new Priority: minor | Milestone: Component: General | Version: Severity: Normal | Resolution: Keywords: | ---------------------+------------------------------------------------------ Comment (by toshio): In order to add virtmaint to more packages you need to list the account in a cvsadmin request. We'll add some horrible UI to the pkgdb to make this self-serve in the mid-term future (probably over the summer/fall) and try to figure out some better UI once we have that functional. I thought that I had set it to be a bot account at the same time as I set up f-community to be a bot but apparently I was wrong. It's somewhat of a good thing, though, as it looks like fasClient (the program that generates the aliases) isn't handling the bot accounts right. Looking at what needs to happen there. -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From markmc at fedoraproject.org Thu May 21 16:01:59 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 21 May 2009 16:01:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/openbios/devel openbios-1.0-merge-sbss-into-bss.patch, NONE, 1.1 openbios.spec, 1.3, 1.4 openbios-ppc-nographic.patch, 1.1, NONE Message-ID: <20090521160159.B452E70114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/openbios/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22618 Modified Files: openbios.spec Added Files: openbios-1.0-merge-sbss-into-bss.patch Removed Files: openbios-ppc-nographic.patch Log Message: * Thu May 21 2009 Mark McLoughlin - 1.0-1 - Replace previous attempt to fix bug #494075 with fix from Pavel Roskin - Drop the 0.x.463 numbering; we are using official upstream 1.0 openbios-1.0-merge-sbss-into-bss.patch: --- NEW FILE openbios-1.0-merge-sbss-into-bss.patch --- Put .sbss and .sbss.* into .bss on PowerPC From: Pavel Roskin This is needed on Fedora 11. Otherwise, qemu reports: invalid/unsupported opcode: 00 - 18 - 01 (00004070) 00000004 1 invalid/unsupported opcode: 00 - 04 - 17 (000095c8) 000095ec 0 --- arch/ppc/qemu/ldscript | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript index 66fcbcd..840b498 100644 --- a/arch/ppc/qemu/ldscript +++ b/arch/ppc/qemu/ldscript @@ -46,6 +46,8 @@ SECTIONS .bss ALIGN(4096): { _bss = .; + *(.sbss) + *(.sbss.*) *(.bss) *(.bss.*) *(COMMON) Index: openbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- openbios.spec 14 Apr 2009 17:24:32 -0000 1.3 +++ openbios.spec 21 May 2009 16:01:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: openbios Version: 1.0 -Release: 0.6.svn463%{?dist} +Release: 1%{?dist} Summary: OpenBios implementation of IEEE 1275-1994 Group: Applications/Emulators License: GPLv2 @@ -10,7 +10,7 @@ URL: http://www.openfirmware.info/OpenB # tar czvf openbios-1.0.tar.gz openbios-1.0 Source0: %{name}/%{name}-%{version}.tar.gz Patch0: openbios-noerror.patch -Patch1: openbios-ppc-nographic.patch +Patch1: openbios-1.0-merge-sbss-into-bss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxslt @@ -92,8 +92,7 @@ BuildArch: noarch %setup -q %patch0 -p1 -# -p3, so we don't need to even touch upstream patch -%patch1 -p3 +%patch1 -p1 %build @@ -156,22 +155,26 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Apr 14 2009 Glauber Costa - 1.0.0.6 +* Thu May 21 2009 Mark McLoughlin - 1.0-1 +- Replace previous attempt to fix bug #494075 with fix from Pavel Roskin +- Drop the 0.x.463 numbering; we are using official upstream 1.0 + +* Tue Apr 14 2009 Glauber Costa - 1.0-0.6.463 - Applied bugfix for #494075 -* Wed Mar 04 2009 Glauber Costa - 1.0.0.5 +* Wed Mar 04 2009 Glauber Costa - 1.0-0.5.463 - created openbios-common instead of openbios-doc. It owns the directories and everybody depends on it. -* Wed Mar 04 2009 Glauber Costa - 1.0.0.4 +* Wed Mar 04 2009 Glauber Costa - 1.0-0.4.463 - Addressed comments on BZ 485420. rpmlint provides no error for me, added comentaries, and tell how to get the source. -* Tue Mar 03 2009 Glauber Costa - 1.0.0.3 +* Tue Mar 03 2009 Glauber Costa - 1.0-0.3.463 - Don't use prebuilt binaries anywhere. * Fri Feb 13 2009 Glauber Costa - 1.0.0.2 - Addressed comments on BZ 485420: clean build environment, own directories we create. -* Fri Feb 13 2009 Glauber Costa - 1.0.0.1 +* Fri Feb 13 2009 Glauber Costa - 1.0-0.1.463 - Created initial build for sparc32/sparc64 --- openbios-ppc-nographic.patch DELETED --- From markmc at fedoraproject.org Thu May 21 16:03:21 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Thu, 21 May 2009 16:03:21 +0000 (UTC) Subject: [fedora-virt-maint] rpms/openbios/F-11 openbios-1.0-merge-sbss-into-bss.patch, NONE, 1.1 openbios.spec, 1.3, 1.4 openbios-ppc-nographic.patch, 1.1, NONE Message-ID: <20090521160321.3D92770114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/openbios/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23046 Modified Files: openbios.spec Added Files: openbios-1.0-merge-sbss-into-bss.patch Removed Files: openbios-ppc-nographic.patch Log Message: * Thu May 21 2009 Mark McLoughlin - 1.0-1 - Replace previous attempt to fix bug #494075 with fix from Pavel Roskin - Drop the 0.x.463 numbering; we are using official upstream 1.0 openbios-1.0-merge-sbss-into-bss.patch: --- NEW FILE openbios-1.0-merge-sbss-into-bss.patch --- Put .sbss and .sbss.* into .bss on PowerPC From: Pavel Roskin This is needed on Fedora 11. Otherwise, qemu reports: invalid/unsupported opcode: 00 - 18 - 01 (00004070) 00000004 1 invalid/unsupported opcode: 00 - 04 - 17 (000095c8) 000095ec 0 --- arch/ppc/qemu/ldscript | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript index 66fcbcd..840b498 100644 --- a/arch/ppc/qemu/ldscript +++ b/arch/ppc/qemu/ldscript @@ -46,6 +46,8 @@ SECTIONS .bss ALIGN(4096): { _bss = .; + *(.sbss) + *(.sbss.*) *(.bss) *(.bss.*) *(COMMON) Index: openbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbios/F-11/openbios.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- openbios.spec 14 Apr 2009 17:24:32 -0000 1.3 +++ openbios.spec 21 May 2009 16:02:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: openbios Version: 1.0 -Release: 0.6.svn463%{?dist} +Release: 1%{?dist} Summary: OpenBios implementation of IEEE 1275-1994 Group: Applications/Emulators License: GPLv2 @@ -10,7 +10,7 @@ URL: http://www.openfirmware.info/OpenB # tar czvf openbios-1.0.tar.gz openbios-1.0 Source0: %{name}/%{name}-%{version}.tar.gz Patch0: openbios-noerror.patch -Patch1: openbios-ppc-nographic.patch +Patch1: openbios-1.0-merge-sbss-into-bss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxslt @@ -92,8 +92,7 @@ BuildArch: noarch %setup -q %patch0 -p1 -# -p3, so we don't need to even touch upstream patch -%patch1 -p3 +%patch1 -p1 %build @@ -156,22 +155,26 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Apr 14 2009 Glauber Costa - 1.0.0.6 +* Thu May 21 2009 Mark McLoughlin - 1.0-1 +- Replace previous attempt to fix bug #494075 with fix from Pavel Roskin +- Drop the 0.x.463 numbering; we are using official upstream 1.0 + +* Tue Apr 14 2009 Glauber Costa - 1.0-0.6.463 - Applied bugfix for #494075 -* Wed Mar 04 2009 Glauber Costa - 1.0.0.5 +* Wed Mar 04 2009 Glauber Costa - 1.0-0.5.463 - created openbios-common instead of openbios-doc. It owns the directories and everybody depends on it. -* Wed Mar 04 2009 Glauber Costa - 1.0.0.4 +* Wed Mar 04 2009 Glauber Costa - 1.0-0.4.463 - Addressed comments on BZ 485420. rpmlint provides no error for me, added comentaries, and tell how to get the source. -* Tue Mar 03 2009 Glauber Costa - 1.0.0.3 +* Tue Mar 03 2009 Glauber Costa - 1.0-0.3.463 - Don't use prebuilt binaries anywhere. * Fri Feb 13 2009 Glauber Costa - 1.0.0.2 - Addressed comments on BZ 485420: clean build environment, own directories we create. -* Fri Feb 13 2009 Glauber Costa - 1.0.0.1 +* Fri Feb 13 2009 Glauber Costa - 1.0-0.1.463 - Created initial build for sparc32/sparc64 --- openbios-ppc-nographic.patch DELETED --- From rjones at fedoraproject.org Thu May 21 16:20:19 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 16:20:19 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel test-bootbootboot.sh, NONE, 1.1 libguestfs.spec, 1.21, 1.22 Message-ID: <20090521162019.904EE70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28449 Modified Files: libguestfs.spec Added Files: test-bootbootboot.sh Log Message: Added test-bootbootboot.sh script which was missed from 1.0.29 tarball. --- NEW FILE test-bootbootboot.sh --- #!/bin/sh - # libguestfs # Copyright (C) 2009 Red Hat Inc. # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. # Some versions of qemu can be flakey and can hang occasionally # during boot (particularly KVM if the BIOS is the qemu version # which doesn't have the required KVM patches). Test repeatedly # booting. set -e rm -f test1.img dd if=/dev/zero of=test1.img bs=1024k count=500 n=20 if [ -n "$1" ]; then n=$1; fi export LIBGUESTFS_DEBUG=1 for i in $(seq 1 $n); do echo Test boot $i of $n ... ./fish/guestfish -a test1.img run done rm test1.img echo Test boot completed after $n iterations. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- libguestfs.spec 21 May 2009 15:33:21 -0000 1.21 +++ libguestfs.spec 21 May 2009 16:19:49 -0000 1.22 @@ -4,13 +4,16 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.29 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ Source0: http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Can be removed in 1.0.30: +Source1: test-bootbootboot.sh + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -237,6 +240,9 @@ Requires: jpackage-utils %prep %setup -q +# Can be removed in 1.0.30: +cp -n %{SOURCE1} . + mkdir -p daemon/m4 @@ -458,9 +464,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 21 2009 Richard Jones - 1.0.29-1 +* Thu May 21 2009 Richard Jones - 1.0.29-2 - New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018). - This should allow us to enable tests for i386 and x86-64. +- Added test-bootbootboot.sh script which was missed from 1.0.29 tarball. * Thu May 21 2009 Richard Jones - 1.0.28-1 - New upstream version 1.0.28. Nothing has visibly changed, but From rjones at fedoraproject.org Thu May 21 17:47:23 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 17:47:23 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs.spec, 1.22, 1.23 Message-ID: <20090521174723.4EE7D70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16779 Modified Files: libguestfs.spec Log Message: Pass kernel noapic flag to workaround RHBZ#502058. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- libguestfs.spec 21 May 2009 16:19:49 -0000 1.22 +++ libguestfs.spec 21 May 2009 17:46:52 -0000 1.23 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.29 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -284,7 +284,10 @@ export LIBGUESTFS_DEBUG=1 # Currently tests are disabled on all architectures because of: # BZ 494075 (ppc, ppc64) -# BZ 500564 (i386, x86-64) - only on F-11 we think, seems to work on F-12 +# BZ 502058 (i386, x86-64) - only on F-11 we think, seems to work on F-12 + +# Workaround for BZ 502058: +export LIBGUESTFS_APPEND=noapic %ifarch %{ix86} x86_64 make check @@ -464,10 +467,11 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 21 2009 Richard Jones - 1.0.29-2 +* Thu May 21 2009 Richard Jones - 1.0.29-3 - New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018). - This should allow us to enable tests for i386 and x86-64. - Added test-bootbootboot.sh script which was missed from 1.0.29 tarball. +- Pass kernel noapic flag to workaround RHBZ#502058. * Thu May 21 2009 Richard Jones - 1.0.28-1 - New upstream version 1.0.28. Nothing has visibly changed, but From rjones at fedoraproject.org Thu May 21 18:54:55 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 18:54:55 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.9, 1.10 libguestfs.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <20090521185456.0AB5D70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31690 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.30. Now includes test-bootbootboot.sh script. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 21 May 2009 15:33:21 -0000 1.9 +++ .cvsignore 21 May 2009 18:54:25 -0000 1.10 @@ -1 +1 @@ -libguestfs-1.0.29.tar.gz +libguestfs-1.0.30.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- libguestfs.spec 21 May 2009 17:46:52 -0000 1.23 +++ libguestfs.spec 21 May 2009 18:54:25 -0000 1.24 @@ -3,17 +3,14 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.29 -Release: 3%{?dist} +Version: 1.0.30 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ Source0: http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# Can be removed in 1.0.30: -Source1: test-bootbootboot.sh - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -240,9 +237,6 @@ Requires: jpackage-utils %prep %setup -q -# Can be removed in 1.0.30: -cp -n %{SOURCE1} . - mkdir -p daemon/m4 @@ -286,7 +280,8 @@ export LIBGUESTFS_DEBUG=1 # BZ 494075 (ppc, ppc64) # BZ 502058 (i386, x86-64) - only on F-11 we think, seems to work on F-12 -# Workaround for BZ 502058: +# Workaround for BZ 502058. This is only needed for F-11, but +# won't harm other builds. export LIBGUESTFS_APPEND=noapic %ifarch %{ix86} x86_64 @@ -467,6 +462,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 21 2009 Richard Jones - 1.0.30-1 +- New upstream version 1.0.30. Now includes test-bootbootboot.sh script. + * Thu May 21 2009 Richard Jones - 1.0.29-3 - New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018). - This should allow us to enable tests for i386 and x86-64. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 21 May 2009 15:33:21 -0000 1.9 +++ sources 21 May 2009 18:54:25 -0000 1.10 @@ -1 +1 @@ -3a92082fa47893f00821ae0e58fa4e7f libguestfs-1.0.29.tar.gz +02147252fcfbc4701e275689c0dc75de libguestfs-1.0.30.tar.gz From rjones at fedoraproject.org Thu May 21 19:01:34 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 19:01:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 .cvsignore, 1.4, 1.5 libguestfs.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20090521190134.40EB470114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725 Modified Files: .cvsignore libguestfs.spec sources Log Message: Backport version 1.0.30 from devel branch. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 20 May 2009 08:41:42 -0000 1.4 +++ .cvsignore 21 May 2009 19:01:03 -0000 1.5 @@ -1 +1 @@ -libguestfs-1.0.27.tar.gz +libguestfs-1.0.30.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- libguestfs.spec 21 May 2009 08:12:57 -0000 1.6 +++ libguestfs.spec 21 May 2009 19:01:03 -0000 1.7 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.27 -Release: 1%{?dist}.2 +Version: 1.0.30 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -268,15 +268,25 @@ make INSTALLDIRS=vendor %{?_smp_mflags} %check +# Enable debugging - very useful if a test does fail, although +# it produces masses of output in the build.log. +export LIBGUESTFS_DEBUG=1 + # Uncomment one of these, depending on whether you want to # do a very long and thorough test ('make check') or just # a quick test to see if things generally work. # Currently tests are disabled on all architectures because of: # BZ 494075 (ppc, ppc64) -# BZ 500564 (i386, x86-64) +# BZ 502058 (i386, x86-64) - only on F-11 we think, seems to work on F-12 -#make check +# Workaround for BZ 502058. This is only needed for F-11, but +# won't harm other builds. +export LIBGUESTFS_APPEND=noapic + +%ifarch %{ix86} x86_64 +make check +%endif # Quick test: #./fish/guestfish -v < - 1.0.30-1 +- Backport version 1.0.30 from devel branch. + * Thu May 21 2009 Richard Jones - 1.0.27-1.fc11.2 - Change requirement from qemu -> qemu-kvm (RHBZ#501761). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 20 May 2009 08:41:42 -0000 1.4 +++ sources 21 May 2009 19:01:03 -0000 1.5 @@ -1 +1 @@ -12c01468e2bdd9710d5c12eaad3bff89 libguestfs-1.0.27.tar.gz +02147252fcfbc4701e275689c0dc75de libguestfs-1.0.30.tar.gz From rjones at fedoraproject.org Thu May 21 20:01:02 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 20:01:02 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 libguestfs.spec,1.7,1.8 Message-ID: <20090521200102.E56D370114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11221 Modified Files: libguestfs.spec Log Message: Disable tests on i586 because of RHBZ#502074. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- libguestfs.spec 21 May 2009 19:01:03 -0000 1.7 +++ libguestfs.spec 21 May 2009 20:00:32 -0000 1.8 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.30 -Release: 1%{?dist} +Release: 1%{?dist}.2 License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -279,12 +279,13 @@ export LIBGUESTFS_DEBUG=1 # Currently tests are disabled on all architectures because of: # BZ 494075 (ppc, ppc64) # BZ 502058 (i386, x86-64) - only on F-11 we think, seems to work on F-12 +# BZ 502074 (i386) - sha1sum segfault on F-11 only # Workaround for BZ 502058. This is only needed for F-11, but # won't harm other builds. export LIBGUESTFS_APPEND=noapic -%ifarch %{ix86} x86_64 +%ifarch x86_64 make check %endif @@ -462,8 +463,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 21 2009 Richard Jones - 1.0.30-1 +* Thu May 21 2009 Richard Jones - 1.0.30-1.fc11.2 - Backport version 1.0.30 from devel branch. +- Disable tests on i586 because of RHBZ#502074. * Thu May 21 2009 Richard Jones - 1.0.27-1.fc11.2 - Change requirement from qemu -> qemu-kvm (RHBZ#501761). From trac at fedorahosted.org Thu May 21 21:15:20 2009 From: trac at fedorahosted.org (Fedora Infrastructure) Date: Thu, 21 May 2009 21:15:20 -0000 Subject: [fedora-virt-maint] Re: [Fedora Infrastructure] #1414: virtmaint@fedoraproject.org bounces In-Reply-To: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> References: <062.2e4eadd17aac8bc393fa59d187cfe024@fedorahosted.org> Message-ID: <071.eeff47e84288694880ddfd850f4cbf3f@fedorahosted.org> #1414: virtmaint at fedoraproject.org bounces ---------------------+------------------------------------------------------ Reporter: markmc | Owner: toshio Type: bug | Status: closed Priority: minor | Milestone: Component: General | Version: Severity: Normal | Resolution: fixed Keywords: | ---------------------+------------------------------------------------------ Changes (by toshio): * status: new => closed * resolution: => fixed Comment: Okay, server hotfixed and the changes made to the db. -- Ticket URL: Fedora Infrastructure Fedora Infrastructure Project for Bugs, feature requests and access to our source code. From rjones at fedoraproject.org Thu May 21 22:06:21 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 21 May 2009 22:06:21 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs.spec, 1.24, 1.25 Message-ID: <20090521220621.2312E70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5020/devel Modified Files: libguestfs.spec Log Message: Pull in a comment from the F-11 branch specfile. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- libguestfs.spec 21 May 2009 18:54:25 -0000 1.24 +++ libguestfs.spec 21 May 2009 22:05:50 -0000 1.25 @@ -279,6 +279,7 @@ export LIBGUESTFS_DEBUG=1 # Currently tests are disabled on all architectures because of: # BZ 494075 (ppc, ppc64) # BZ 502058 (i386, x86-64) - only on F-11 we think, seems to work on F-12 +# BZ 502074 (i386) - sha1sum segfault on F-11 only # Workaround for BZ 502058. This is only needed for F-11, but # won't harm other builds. From markmc at fedoraproject.org Fri May 22 09:25:00 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 22 May 2009 09:25:00 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-do-not-log-monitor-output.patch, NONE, 1.1 libvirt.spec, 1.131, 1.132 Message-ID: <20090522092500.67A3C70114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9441 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-do-not-log-monitor-output.patch Log Message: * Fri May 22 2009 Mark McLoughlin - 0.6.2-10.fc11 - Don't log monitor output to domain log file (bug #499584) libvirt-0.6.2-do-not-log-monitor-output.patch: --- NEW FILE libvirt-0.6.2-do-not-log-monitor-output.patch --- >From fbd16cecc72494e8a9450f38197221f2f50c9d0e Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Guido=20G=C3=BCnther?= Date: Thu, 16 Apr 2009 15:56:27 +0000 Subject: [PATCH 1/1] Don't log monitor output to domain log file. It's logged via the logging system already. Prefix monitor debug output with vm name. --- src/qemu_driver.c | 60 +++++++++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 79ee072..f5b5fa5 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1710,27 +1710,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm, goto error; } } - - /* Log, but ignore failures to write logfile for VM */ - if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { - char ebuf[1024]; - VIR_WARN(_("Unable to log VM console data: %s\n"), - virStrerror(errno, ebuf, sizeof ebuf)); - } - *reply = buf; return 0; error: - if (buf) { - /* Log, but ignore failures to write logfile for VM */ - if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { - char ebuf[1024]; - VIR_WARN(_("Unable to log VM console data: %s\n"), - virStrerror(errno, ebuf, sizeof ebuf)); - } - VIR_FREE(buf); - } + VIR_FREE(buf); return -1; } @@ -2463,7 +2447,7 @@ static int qemudDomainGetMemoryBalloon(virConnectPtr conn, goto cleanup; } - DEBUG ("balloon reply: '%s'", reply); + DEBUG ("%s: balloon reply: '%s'", vm->def->name, reply); if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { unsigned int memMB; char *end; @@ -2517,7 +2501,7 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn, /* If the command failed qemu prints: 'unknown command' * No message is printed on success it seems */ - DEBUG ("balloon reply: %s", reply); + DEBUG ("%s: balloon reply: %s",vm->def->name, reply); if (strstr(reply, "\nunknown command:")) { /* Don't set error - it is expected memory balloon fails on many qemu */ ret = 0; @@ -2812,7 +2796,7 @@ static int qemudDomainSave(virDomainPtr dom, goto cleanup; } - DEBUG ("migrate reply: %s", info); + DEBUG ("%s: migrate reply: %s", vm->def->name, info); /* If the command isn't supported then qemu prints: * unknown command: migrate" */ @@ -3658,7 +3642,7 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn, /* If the command failed qemu prints: * device not found, device is locked ... * No message is printed on success it seems */ - DEBUG ("ejectable media change reply: %s", reply); + DEBUG ("%s: ejectable media change reply: %s", vm->def->name, reply); if (strstr(reply, "\ndevice ")) { qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED, _("changing cdrom media failed: %s"), reply); @@ -3719,7 +3703,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn, return -1; } - DEBUG ("pci_add reply: %s", reply); + DEBUG ("%s: pci_add reply: %s", vm->def->name, reply); /* If the command succeeds qemu prints: * OK bus 0... */ #define PCI_ATTACH_OK_MSG "OK bus 0, slot " @@ -3787,7 +3771,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virConnectPtr conn, return -1; } - DEBUG ("attach_usb reply: %s", reply); + DEBUG ("%s: attach_usb reply: %s",vm->def->name, reply); /* If the command failed qemu prints: * Could not add ... */ if (strstr(reply, "Could not add ")) { @@ -3841,7 +3825,7 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn, return -1; } - DEBUG ("attach_usb reply: %s", reply); + DEBUG ("%s: attach_usb reply: %s", vm->def->name, reply); /* If the command failed qemu prints: * Could not add ... */ if (strstr(reply, "Could not add ")) { @@ -3980,7 +3964,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn, goto cleanup; } - DEBUG ("pci_del reply: %s", reply); + DEBUG ("%s: pci_del reply: %s",vm->def->name, reply); /* If the command fails due to a wrong slot qemu prints: invalid slot, * nothing is printed on success */ if (strstr(reply, "invalid slot")) { @@ -4210,7 +4194,7 @@ qemudDomainBlockStats (virDomainPtr dom, "%s", _("'info blockstats' command failed")); goto cleanup; } - DEBUG ("info blockstats reply: %s", info); + DEBUG ("%s: info blockstats reply: %s", vm->def->name, info); /* If the command isn't supported then qemu prints the supported * info commands, so the output starts "info ". Since this is @@ -4251,21 +4235,25 @@ qemudDomainBlockStats (virDomainPtr dom, if (STRPREFIX (p, "rd_bytes=")) { p += 9; if (virStrToLong_ll (p, &dummy, 10, &stats->rd_bytes) == -1) - DEBUG ("error reading rd_bytes: %s", p); + DEBUG ("%s: error reading rd_bytes: %s", + vm->def->name, p); } else if (STRPREFIX (p, "wr_bytes=")) { p += 9; if (virStrToLong_ll (p, &dummy, 10, &stats->wr_bytes) == -1) - DEBUG ("error reading wr_bytes: %s", p); + DEBUG ("%s: error reading wr_bytes: %s", + vm->def->name, p); } else if (STRPREFIX (p, "rd_operations=")) { p += 14; if (virStrToLong_ll (p, &dummy, 10, &stats->rd_req) == -1) - DEBUG ("error reading rd_req: %s", p); + DEBUG ("%s: error reading rd_req: %s", + vm->def->name, p); } else if (STRPREFIX (p, "wr_operations=")) { p += 14; if (virStrToLong_ll (p, &dummy, 10, &stats->wr_req) == -1) - DEBUG ("error reading wr_req: %s", p); + DEBUG ("%s: error reading wr_req: %s", + vm->def->name, p); } else - DEBUG ("unknown block stat near %s", p); + DEBUG ("%s: unknown block stat near %s", vm->def->name, p); /* Skip to next label. */ p = strchr (p, ' '); @@ -4477,7 +4465,7 @@ qemudDomainMemoryPeek (virDomainPtr dom, goto cleanup; } - DEBUG ("memsave reply: %s", info); + DEBUG ("%s: memsave reply: %s", vm->def->name, info); /* Read the memory file into buffer. */ if (saferead (fd, buffer, size) == (ssize_t) -1) { @@ -4794,7 +4782,7 @@ qemudDomainMigratePerform (virDomainPtr dom, "%s", _("off-line migration specified, but suspend operation failed")); goto cleanup; } - DEBUG ("stop reply: %s", info); + DEBUG ("%s: stop reply: %s", vm->def->name, info); VIR_FREE(info); paused = 1; @@ -4811,7 +4799,7 @@ qemudDomainMigratePerform (virDomainPtr dom, snprintf (cmd, sizeof cmd, "migrate_set_speed %lum", resource); qemudMonitorCommand (vm, cmd, &info); - DEBUG ("migrate_set_speed reply: %s", info); + DEBUG ("%s: migrate_set_speed reply: %s", vm->def->name, info); VIR_FREE (info); } @@ -4830,7 +4818,7 @@ qemudDomainMigratePerform (virDomainPtr dom, goto cleanup; } - DEBUG ("migrate reply: %s", info); + DEBUG ("%s: migrate reply: %s", vm->def->name, info); /* Now check for "fail" in the output string */ if (strstr(info, "fail") != NULL) { @@ -4869,7 +4857,7 @@ cleanup: vm->def->name); } else { - DEBUG ("cont reply: %s", info); + DEBUG ("%s: cont reply: %s", vm->def->name, info); VIR_FREE(info); } -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -p -r1.131 -r1.132 --- libvirt.spec 21 May 2009 12:07:19 -0000 1.131 +++ libvirt.spec 22 May 2009 09:24:30 -0000 1.132 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 9%{?dist}%{?extra_release} +Release: 10%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -90,6 +90,8 @@ Patch7: libvirt-0.6.2-xml-attribute-esca # Fix serious event handling issues causing guests to be destroyed (bz 499698) Patch8: libvirt-0.6.2-event-handling-1.patch Patch9: libvirt-0.6.2-event-handling-2.patch +# Don't log monitor output to domain log file (bz 499584) +Patch10: libvirt-0.6.2-do-not-log-monitor-output.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -254,6 +256,7 @@ of recent versions of Linux (and other O %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch200 -p0 @@ -577,6 +580,9 @@ fi %endif %changelog +* Fri May 22 2009 Mark McLoughlin - 0.6.2-10.fc11 +- Don't log monitor output to domain log file (bug #499584) + * Thu May 21 2009 Mark McLoughlin - 0.6.2-9.fc11 - Fix qemu argv detection with latest qemu (bug #501923) - Fix XML attribute escaping (bug #499791) From markmc at fedoraproject.org Fri May 22 15:19:59 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Fri, 22 May 2009 15:19:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 qemu-vnc-segfault.patch, NONE, 1.1.2.1 qemu.spec, 1.95, 1.95.2.1 Message-ID: <20090522151959.6A3C470114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14949 Modified Files: Tag: private-markmc-bz501131 qemu.spec Added Files: Tag: private-markmc-bz501131 qemu-vnc-segfault.patch Log Message: * Fri May 22 2009 Mark McLoughlin - 2:0.10.4-5.1 - Try out a hacky fix for vnc segfault (bug #501131) qemu-vnc-segfault.patch: --- NEW FILE qemu-vnc-segfault.patch --- diff -up qemu-kvm-0.10.4/vnc-auth-sasl.c.segfault qemu-kvm-0.10.4/vnc-auth-sasl.c --- qemu-kvm-0.10.4/vnc-auth-sasl.c.segfault 2009-05-22 15:41:13.000000000 +0100 +++ qemu-kvm-0.10.4/vnc-auth-sasl.c 2009-05-22 15:41:38.000000000 +0100 @@ -279,8 +279,9 @@ static int protocol_client_auth_sasl_ste vnc_write_u32(vs, 1); /* Reject auth */ vnc_write_u32(vs, sizeof("Authentication failed")); vnc_write(vs, "Authentication failed", sizeof("Authentication failed")); - vnc_flush(vs); - vnc_client_error(vs); + if (vnc_flush(vs)) { + vnc_client_error(vs); + } return -1; authabort: @@ -401,8 +402,9 @@ static int protocol_client_auth_sasl_sta vnc_write_u32(vs, 1); /* Reject auth */ vnc_write_u32(vs, sizeof("Authentication failed")); vnc_write(vs, "Authentication failed", sizeof("Authentication failed")); - vnc_flush(vs); - vnc_client_error(vs); + if (vnc_flush(vs)) { + vnc_client_error(vs); + } return -1; authabort: @@ -621,7 +623,8 @@ void start_auth_sasl(VncState *vs) mechlistlen = strlen(mechlist); vnc_write_u32(vs, mechlistlen); vnc_write(vs, mechlist, mechlistlen); - vnc_flush(vs); + if (!vnc_flush(vs)) + return; VNC_DEBUG("Wait for client mechname length\n"); vnc_read_when(vs, protocol_client_auth_sasl_mechname_len, 4); diff -up qemu-kvm-0.10.4/vnc-auth-vencrypt.c.segfault qemu-kvm-0.10.4/vnc-auth-vencrypt.c diff -up qemu-kvm-0.10.4/vnc.c.segfault qemu-kvm-0.10.4/vnc.c --- qemu-kvm-0.10.4/vnc.c.segfault 2009-05-22 15:41:13.000000000 +0100 +++ qemu-kvm-0.10.4/vnc.c 2009-05-22 15:50:29.000000000 +0100 @@ -213,9 +213,9 @@ static inline uint32_t vnc_has_feature(V 3) resolutions > 1024 */ -static void vnc_update_client(void *opaque); +static int vnc_update_client(VncState *vs); -static void vnc_colordepth(VncState *vs); +static int vnc_colordepth(VncState *vs); static inline void vnc_set_bit(uint32_t *d, int k) { @@ -335,7 +335,7 @@ void buffer_append(Buffer *buffer, const buffer->offset += len; } -static void vnc_resize(VncState *vs) +static int vnc_resize(VncState *vs) { DisplayState *ds = vs->ds; @@ -350,7 +350,9 @@ static void vnc_resize(VncState *vs) if (ds_get_bytes_per_pixel(ds) != vs->serverds.pf.bytes_per_pixel) console_color_init(ds); - vnc_colordepth(vs); + if (!vnc_colordepth(vs)) { + return 0; + } size_changed = ds_get_width(ds) != vs->serverds.width || ds_get_height(ds) != vs->serverds.height; vs->serverds = *(ds->surface); @@ -361,21 +363,29 @@ static void vnc_resize(VncState *vs) vnc_write_u16(vs, 1); /* number of rects */ vnc_framebuffer_update(vs, 0, 0, ds_get_width(ds), ds_get_height(ds), VNC_ENCODING_DESKTOPRESIZE); - vnc_flush(vs); + if (!vnc_flush(vs)) { + return 0; + } } } memset(vs->dirty_row, 0xFF, sizeof(vs->dirty_row)); memset(vs->old_data, 42, ds_get_linesize(vs->ds) * ds_get_height(vs->ds)); + + return 1; } static void vnc_dpy_resize(DisplayState *ds) { VncDisplay *vd = ds->opaque; VncState *vs = vd->clients; + while (vs != NULL) { + VncState *next = vs->next; + vnc_resize(vs); - vs = vs->next; + + vs = next; } } @@ -646,7 +656,9 @@ static void send_framebuffer_update(VncS static void vnc_copy(VncState *vs, int src_x, int src_y, int dst_x, int dst_y, int w, int h) { - vnc_update_client(vs); + if (!vnc_update_client(vs)) { + return; + } vnc_write_u8(vs, 0); /* msg id */ vnc_write_u8(vs, 0); @@ -661,12 +673,16 @@ static void vnc_dpy_copy(DisplayState *d { VncDisplay *vd = ds->opaque; VncState *vs = vd->clients; + while (vs != NULL) { + VncState *next = vs->next; + if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) vnc_copy(vs, src_x, src_y, dst_x, dst_y, w, h); else /* TODO */ vnc_update(vs, dst_x, dst_y, w, h); - vs = vs->next; + + vs = next; } } @@ -685,9 +701,8 @@ static int find_dirty_height(VncState *v return h; } -static void vnc_update_client(void *opaque) +static int vnc_update_client(VncState *vs) { - VncState *vs = opaque; if (vs->need_update && vs->csock != -1) { int y; uint8_t *row; @@ -734,7 +749,7 @@ static void vnc_update_client(void *opaq if (!has_dirty && !vs->audio_cap) { qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock) + VNC_REFRESH_INTERVAL); - return; + return 1; } /* Count rectangles */ @@ -770,7 +785,9 @@ static void vnc_update_client(void *opaq } vs->output.buffer[saved_offset] = (n_rectangles >> 8) & 0xFF; vs->output.buffer[saved_offset + 1] = n_rectangles & 0xFF; - vnc_flush(vs); + if (!vnc_flush(vs)) { + return 1; + } } @@ -778,6 +795,14 @@ static void vnc_update_client(void *opaq qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock) + VNC_REFRESH_INTERVAL); } + return 1; +} + +static void vnc_update_client_timer(void *opaque) +{ + VncState *vs = opaque; + + vnc_update_client(vs); } /* audio */ @@ -989,10 +1014,13 @@ static long vnc_client_write_plain(VncSt * the client socket. Will delegate actual work according to whether * SASL SSF layers are enabled (thus requiring encryption calls) */ -void vnc_client_write(void *opaque) +int vnc_flush(VncState *vs) { long ret; - VncState *vs = opaque; + + if (!vs->output.offset) { + return 1; + } #ifdef CONFIG_VNC_SASL if (vs->sasl.conn && @@ -1002,6 +1030,15 @@ void vnc_client_write(void *opaque) else #endif /* CONFIG_VNC_SASL */ ret = vnc_client_write_plain(vs); + + return !!ret; +} + +void vnc_client_write(void *opaque) +{ + VncState *vs = opaque; + + vnc_flush(vs); } void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) @@ -1148,12 +1185,6 @@ void vnc_write_u8(VncState *vs, uint8_t vnc_write(vs, (char *)&value, 1); } -void vnc_flush(VncState *vs) -{ - if (vs->output.offset) - vnc_client_write(vs); -} - uint8_t read_u8(uint8_t *data, size_t offset) { return data[offset]; @@ -1189,7 +1220,9 @@ static void check_pointer_type_change(Vn vnc_framebuffer_update(vs, absolute, 0, ds_get_width(vs->ds), ds_get_height(vs->ds), VNC_ENCODING_POINTER_TYPE_CHANGE); - vnc_flush(vs); + if (!vnc_flush(vs)) { + return; + } } vs->absolute = absolute; } @@ -1591,7 +1624,7 @@ static void vnc_dpy_setdata(DisplayState /* We don't have to do anything */ } -static void vnc_colordepth(VncState *vs) +static int vnc_colordepth(VncState *vs) { if (vnc_has_feature(vs, VNC_FEATURE_WMVI)) { /* Sending a WMVi message to notify the client*/ @@ -1601,9 +1634,10 @@ static void vnc_colordepth(VncState *vs) vnc_framebuffer_update(vs, 0, 0, ds_get_width(vs->ds), ds_get_height(vs->ds), VNC_ENCODING_WMVi); pixel_format_message(vs); - vnc_flush(vs); + return vnc_flush(vs); } else { set_pixel_conversion(vs); + return 1; } } @@ -1760,7 +1794,9 @@ static int protocol_client_init(VncState vnc_write_u32(vs, size); vnc_write(vs, buf, size); - vnc_flush(vs); + if (!vnc_flush(vs)) { + return 0; /* FIXME */ + } vnc_read_when(vs, protocol_client_msg, 1); @@ -1796,8 +1832,9 @@ static int protocol_client_auth_vnc(VncS vnc_write_u32(vs, sizeof(err)); vnc_write(vs, err, sizeof(err)); } - vnc_flush(vs); - vnc_client_error(vs); + if (vnc_flush(vs)) { + vnc_client_error(vs); + } return 0; } @@ -1820,14 +1857,15 @@ static int protocol_client_auth_vnc(VncS vnc_write_u32(vs, sizeof(err)); vnc_write(vs, err, sizeof(err)); } - vnc_flush(vs); - vnc_client_error(vs); + if (vnc_flush(vs)) { + vnc_client_error(vs); + } } else { VNC_DEBUG("Accepting VNC challenge response\n"); vnc_write_u32(vs, 0); /* Accept auth */ - vnc_flush(vs); - - start_client_init(vs); + if (vnc_flush(vs)) { + start_client_init(vs); + } } return 0; } @@ -1837,7 +1875,9 @@ void start_auth_vnc(VncState *vs) make_challenge(vs); /* Send client a 'random' challenge */ vnc_write(vs, vs->challenge, sizeof(vs->challenge)); - vnc_flush(vs); + if (!vnc_flush(vs)) { + return; + } vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge)); } @@ -1863,7 +1903,9 @@ static int protocol_client_auth(VncState VNC_DEBUG("Accept auth none\n"); if (vs->minor >= 8) { vnc_write_u32(vs, 0); /* Accept auth completion */ - vnc_flush(vs); + if (!vnc_flush(vs)) { + return 0; /* FIXME */ + } } start_client_init(vs); break; @@ -1922,8 +1964,9 @@ static int protocol_version(VncState *vs vs->minor != 8)) { VNC_DEBUG("Unsupported client version\n"); vnc_write_u32(vs, VNC_AUTH_INVALID); - vnc_flush(vs); - vnc_client_error(vs); + if (vnc_flush(vs)) { + vnc_client_error(vs); + } return 0; } /* Some broken clients report v3.4 or v3.5, which spec requires to be treated @@ -1936,18 +1979,21 @@ static int protocol_version(VncState *vs if (vs->vd->auth == VNC_AUTH_NONE) { VNC_DEBUG("Tell client auth none\n"); vnc_write_u32(vs, vs->vd->auth); - vnc_flush(vs); - start_client_init(vs); + if (vnc_flush(vs)) { + start_client_init(vs); + } } else if (vs->vd->auth == VNC_AUTH_VNC) { VNC_DEBUG("Tell client VNC auth\n"); vnc_write_u32(vs, vs->vd->auth); - vnc_flush(vs); - start_auth_vnc(vs); + if (vnc_flush(vs)) { + start_auth_vnc(vs); + } } else { VNC_DEBUG("Unsupported auth %d for protocol 3.3\n", vs->vd->auth); vnc_write_u32(vs, VNC_AUTH_INVALID); - vnc_flush(vs); - vnc_client_error(vs); + if (vnc_flush(vs)) { + vnc_client_error(vs); + } } } else { VNC_DEBUG("Telling client we support auth %d\n", vs->vd->auth); @@ -1972,7 +2018,7 @@ static void vnc_connect(VncDisplay *vd, vs->vd = vd; vs->ds = vd->ds; - vs->timer = qemu_new_timer(rt_clock, vnc_update_client, vs); + vs->timer = qemu_new_timer(rt_clock, vnc_update_client_timer, vs); vs->last_x = -1; vs->last_y = -1; @@ -1981,13 +2027,19 @@ static void vnc_connect(VncDisplay *vd, vs->as.fmt = AUD_FMT_S16; vs->as.endianness = 0; - vnc_resize(vs); + if (!vnc_resize(vs)) { + return; + } vnc_write(vs, "RFB 003.008\n", 12); - vnc_flush(vs); + if (!vnc_flush(vs)) { + return; + } vnc_read_when(vs, protocol_version, 12); memset(vs->old_data, 0, ds_get_linesize(vs->ds) * ds_get_height(vs->ds)); memset(vs->dirty_row, 0xFF, sizeof(vs->dirty_row)); - vnc_update_client(vs); + if (!vnc_update_client(vs)) { + return; + } reset_keys(vs); vs->next = vd->clients; diff -up qemu-kvm-0.10.4/vnc.h.segfault qemu-kvm-0.10.4/vnc.h --- qemu-kvm-0.10.4/vnc.h.segfault 2009-05-22 15:41:13.000000000 +0100 +++ qemu-kvm-0.10.4/vnc.h 2009-05-22 15:41:38.000000000 +0100 @@ -276,7 +276,7 @@ void vnc_write_u32(VncState *vs, uint32_ void vnc_write_s32(VncState *vs, int32_t value); void vnc_write_u16(VncState *vs, uint16_t value); void vnc_write_u8(VncState *vs, uint8_t value); -void vnc_flush(VncState *vs); +int vnc_flush(VncState *vs); void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting); Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.95 retrieving revision 1.95.2.1 diff -u -p -r1.95 -r1.95.2.1 --- qemu.spec 19 May 2009 03:00:56 -0000 1.95 +++ qemu.spec 22 May 2009 15:19:29 -0000 1.95.2.1 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.4 -Release: 5%{?dist} +Release: 5.1%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -37,6 +37,8 @@ Patch21: qemu-make-x86-cpuid-feature-nam Patch22: qemu-fix-x86-feature-modifications-for-features-that-set.patch Patch23: qemu-trim-cpu-features-not-supported-by-kvm.patch +Patch24: qemu-vnc-segfault.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -241,6 +243,8 @@ such as kvmtrace and kvm_stat. #%patch22 -p1 #%patch23 -p1 +%patch24 -p1 -b .segfault + %build # systems like rhel build system does not have a recent enough linker so # --build-id works. this option is used fedora 8 onwards for giving info @@ -482,6 +486,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Fri May 22 2009 Mark McLoughlin - 2:0.10.4-5.1 +- Try out a hacky fix for vnc segfault (bug #501131) + * Mon May 18 2009 Glauber Costa - 2:0.10.4-5 - Backport cpuid trimming from upstream (#499596) From rjones at fedoraproject.org Sat May 23 08:26:22 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sat, 23 May 2009 08:26:22 +0000 (UTC) Subject: [fedora-virt-maint] rpms/ocaml-libvirt/devel ocaml-libvirt.spec, 1.29, 1.30 Message-ID: <20090523082622.9F52570114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28090 Modified Files: ocaml-libvirt.spec Log Message: Rebuild for OCaml 3.11.1 Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- ocaml-libvirt.spec 16 Apr 2009 09:06:09 -0000 1.29 +++ ocaml-libvirt.spec 23 May 2009 08:25:52 -0000 1.30 @@ -6,7 +6,7 @@ Name: ocaml-libvirt Version: 0.6.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 23 2009 Richard W.M. Jones - 0.6.1.0-2 +- Rebuild for OCaml 3.11.1 + * Thu Apr 16 2009 S390x secondary arch maintainer - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) From rjones at fedoraproject.org Sat May 23 14:05:11 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sat, 23 May 2009 14:05:11 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.10, 1.11 libguestfs.spec, 1.25, 1.26 sources, 1.10, 1.11 Message-ID: <20090523140511.5106B70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23334 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Sat May 23 2009 Richard W.M. Jones - 1.0.31-1 - Rebuild for OCaml 3.11.1. - New upstream version 1.0.31. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 21 May 2009 18:54:25 -0000 1.10 +++ .cvsignore 23 May 2009 14:04:40 -0000 1.11 @@ -1 +1 @@ -libguestfs-1.0.30.tar.gz +libguestfs-1.0.31.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- libguestfs.spec 21 May 2009 22:05:50 -0000 1.25 +++ libguestfs.spec 23 May 2009 14:04:40 -0000 1.26 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.30 +Version: 1.0.31 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -463,6 +463,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 23 2009 Richard W.M. Jones - 1.0.31-1 +- Rebuild for OCaml 3.11.1. +- New upstream version 1.0.31. + * Thu May 21 2009 Richard Jones - 1.0.30-1 - New upstream version 1.0.30. Now includes test-bootbootboot.sh script. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 21 May 2009 18:54:25 -0000 1.10 +++ sources 23 May 2009 14:04:40 -0000 1.11 @@ -1 +1 @@ -02147252fcfbc4701e275689c0dc75de libguestfs-1.0.30.tar.gz +13754af787ed95f57616a3577bc72143 libguestfs-1.0.31.tar.gz From lkundrak at fedoraproject.org Sun May 24 11:21:29 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 24 May 2009 11:21:29 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/EL-5 qemu-0.1.5-disable-strip.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 qemu.spec, 1.23, 1.24 sources, 1.8, 1.9 qemu-0.7.0-build.patch, 1.5, NONE qemu-0.8.2-mb-nops.diff, 1.1, NONE qemu-0.9.1-block-rw-range-check.patch, 1.1, NONE qemu-0.9.1-isapcvga.patch, 1.1, NONE qemu-0.9.1-nic-defaults.patch, 1.1, NONE qemu-0.9.1-pty-rawmode.patch, 1.1, NONE Message-ID: <20090524112129.6255D70114@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/qemu/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15739 Modified Files: .cvsignore qemu.spec sources Added Files: qemu-0.1.5-disable-strip.patch Removed Files: qemu-0.7.0-build.patch qemu-0.8.2-mb-nops.diff qemu-0.9.1-block-rw-range-check.patch qemu-0.9.1-isapcvga.patch qemu-0.9.1-nic-defaults.patch qemu-0.9.1-pty-rawmode.patch Log Message: * Sun May 24 2009 Lubomir Rintel - 2:0.10.5-1 - Use the devel KVM spec file as base for EL-5 qemu - Rebase to stable qemu 0.10.5 qemu-0.1.5-disable-strip.patch: --- NEW FILE qemu-0.1.5-disable-strip.patch --- commit 1625af873aa8c9e4d22ad50a08e877110bf40623 Author: aliguori Date: Sun Apr 5 17:41:02 2009 +0000 Make binary stripping conditional (Riku Voipio) Currently qemu unconditionally strips binaries on install. This is a problem for packagers who may want to store/ship debug symbols of compiled packages for debugging purposes. Keep stripping as default for the oldtimers and add a --disable-strip flag to override. Signed-off-by: Riku Voipio Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk at 6983 c046a42c-6fe2-441c-8c8c-71466251a162 diff --git a/Makefile b/Makefile index 50914c4..a9e851f 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" diff --git a/Makefile.target b/Makefile.target index 353ba6c..b32d1af 100644 --- a/Makefile.target +++ b/Makefile.target @@ -749,7 +749,7 @@ clean: install: all ifneq ($(PROGS),) - $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" + $(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)" endif # Include automatically generated dependency files diff --git a/configure b/configure index fa77937..e974834 100755 --- a/configure +++ b/configure @@ -154,6 +154,7 @@ case "$cpu" in esac gprof="no" sparse="no" +strip_opt="yes" bigendian="no" mingw32="no" EXESUF="" @@ -396,6 +397,8 @@ for opt do ;; --disable-sparse) sparse="no" ;; + --disable-strip) strip_opt="no" + ;; --disable-vnc-tls) vnc_tls="no" ;; --disable-vnc-sasl) vnc_sasl="no" @@ -556,6 +559,7 @@ echo " --install=INSTALL use specified install [$install]" echo " --static enable static build [$static]" echo " --enable-sparse enable sparse checker" echo " --disable-sparse disable sparse checker (default)" +echo " --disable-strip disable stripping binaries" echo " --disable-werror disable compilation abort on warning" echo " --disable-sdl disable SDL" echo " --enable-cocoa enable COCOA (Mac OS X only)" @@ -1177,6 +1181,7 @@ echo "host big endian $bigendian" echo "target list $target_list" echo "gprof enabled $gprof" echo "sparse enabled $sparse" +echo "strip binaries $strip_opt" echo "profiler $profiler" echo "static build $static" echo "-Werror enabled $werror" @@ -1251,7 +1256,6 @@ echo "INSTALL=$install" >> $config_mak echo "CC=$cc" >> $config_mak echo "HOST_CC=$host_cc" >> $config_mak echo "AR=$ar" >> $config_mak -echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak # XXX: only use CFLAGS and LDFLAGS ? # XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross # compilation of dyngen tool (useful for win32 build on Linux host) @@ -1338,6 +1342,9 @@ if test "$sparse" = "yes" ; then echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_mak echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak fi +if test "$strip_opt" = "yes" ; then + echo "STRIP_OPT=-s" >> $config_mak +fi if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> $config_mak echo "#define WORDS_BIGENDIAN 1" >> $config_h Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 3 Dec 2008 11:52:52 -0000 1.8 +++ .cvsignore 24 May 2009 11:20:55 -0000 1.9 @@ -1 +1 @@ -qemu-0.9.1.tar.gz +qemu-0.10.5.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/EL-5/qemu.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- qemu.spec 3 Dec 2008 11:52:53 -0000 1.23 +++ qemu.spec 24 May 2009 11:20:56 -0000 1.24 @@ -1,34 +1,34 @@ -# For FC >= 6 we have gcc 3.4, for FC <= 5 we have gcc 3.2 -%if %{!?fedora:6}%{?fedora} >= 6 -%define gccver 34 -%else -%define gccver 32 -%endif - Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.9.1 -Release: 11%{?dist} -License: GPLv2+ and LGPLv2+ +Version: 0.10.5 +Release: 1 +# Epoch because we pushed a qemu-1.0 package +Epoch: 2 +License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ -Source0: http://www.qemu.org/%{name}-%{version}.tar.gz + +Source0: http://download.savannah.gnu.org/releases/qemu/%{name}-%{version}.tar.gz Source1: qemu.init -Patch0: qemu-0.7.0-build.patch -# Change default NIC to rtl8139 to get link-state detection -Patch3: qemu-0.9.1-nic-defaults.patch -Patch4: qemu-%{version}-block-rw-range-check.patch -# Upstream SVN changeset #4338 -Patch5: qemu-%{version}-pty-rawmode.patch -# Similar to upstream changeset #5026 -Patch6: qemu-0.9.1-isapcvga.patch + +Patch0: qemu-0.1.5-disable-strip.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service /sbin/chkconfig -Requires(postun): /sbin/service -Requires: %{name}-img = %{version}-%{release} -ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l +BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel +BuildRequires: dev86 +BuildRequires: pulseaudio-libs-devel +Requires: %{name}-user = %{epoch}:%{version}-%{release} +Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} +Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release} +Requires: %{name}-system-arm = %{epoch}:%{version}-%{release} +Requires: %{name}-system-cris = %{epoch}:%{version}-%{release} +Requires: %{name}-system-sh4 = %{epoch}:%{version}-%{release} +Requires: %{name}-system-m68k = %{epoch}:%{version}-%{release} +Requires: %{name}-system-mips = %{epoch}:%{version}-%{release} +Requires: %{name}-system-ppc = %{epoch}:%{version}-%{release} +Requires: %{name}-img = %{epoch}:%{version}-%{release} + +%define qemudocdir %{_docdir}/%{name}-%{version} %description QEMU is a generic and open source processor emulator which achieves a good @@ -43,75 +43,217 @@ emulation speed by using dynamic transla As QEMU requires no host kernel patches to run, it is safe and easy to use. -%package img -Summary: QEMU is a FAST! processor emulator +%package img +Summary: QEMU command line tool for manipulating disk images Group: Development/Tools - %description img -QEMU is a generic and open source processor emulator which achieves a good +QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. This package provides the command line tool for manipulating disk images +%package common +Summary: QEMU common files needed by all QEMU targets +Group: Development/Tools +%description common +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the common files needed by all QEMU targets + +%package user +Summary: QEMU user mode emulation of qemu targets +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service /sbin/chkconfig +Requires(postun): /sbin/service +%description user +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the user mode emulation of qemu targets + +%package system-x86 +Summary: QEMU system emulator for x86 +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description system-x86 +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for x86. When being run in a x86 +machine that supports it, this package also provides the KVM virtualization +platform. + +%package system-ppc +Summary: QEMU system emulator for ppc +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: openbios-ppc +%description system-ppc +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for ppc + +%package system-sparc +Summary: QEMU system emulator for sparc +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-sparc +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for sparc + +%package system-arm +Summary: QEMU system emulator for arm +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-arm +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for arm + +%package system-mips +Summary: QEMU system emulator for mips +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-mips +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for mips + +%package system-cris +Summary: QEMU system emulator for cris +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-cris +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for cris + +%package system-m68k +Summary: QEMU system emulator for m68k +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-m68k +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for m68k + +%package system-sh4 +Summary: QEMU system emulator for sh4 +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-sh4 +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for sh4 + %prep %setup -q -%patch0 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch0 -p1 -b .disable-strip %build +# systems like rhel build system does not have a recent enough linker so +# --build-id works. this option is used fedora 8 onwards for giving info +# to the debug packages. + +build_id_available() { + echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null +} + +if build_id_available; then + extraldflags="-Wl,--build-id"; + buildldflags="VL_LDFLAGS=-Wl,--build-id" +else + extraldflags="" + buildldflags="" +fi + ./configure \ + --target-list="i386-softmmu x86_64-softmmu arm-softmmu cris-softmmu m68k-softmmu \ + mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu ppc-softmmu \ + ppcemb-softmmu ppc64-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu \ + i386-linux-user x86_64-linux-user alpha-linux-user arm-linux-user \ + armeb-linux-user cris-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" \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ - --cc=gcc%{gccver} \ - --enable-alsa -# --extra-ldflags="-Wl,--build-id" -make %{?_smp_mflags} #VL_LDFLAGS="-Wl,--build-id" + --audio-drv-list=pa,sdl,alsa,oss \ + --disable-strip \ + --disable-kvm \ + --extra-ldflags=$extraldflags \ + --extra-cflags="$RPM_OPT_FLAGS" + +make V=1 %{?_smp_mflags} $buildldflags %install rm -rf $RPM_BUILD_ROOT make prefix="${RPM_BUILD_ROOT}%{_prefix}" \ bindir="${RPM_BUILD_ROOT}%{_bindir}" \ - sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \ + sharedir="${RPM_BUILD_ROOT}%{_datadir}/%{name}" \ mandir="${RPM_BUILD_ROOT}%{_mandir}" \ docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ - datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install -chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* - + datadir="${RPM_BUILD_ROOT}%{_datadir}/%{name}" install install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE %clean rm -rf $RPM_BUILD_ROOT -%post +%post user /sbin/chkconfig --add qemu -%preun +%preun user if [ $1 -eq 0 ]; then /sbin/service qemu stop &>/dev/null || : /sbin/chkconfig --del qemu fi -%postun +%postun user if [ $1 -ge 1 ]; then /sbin/service qemu condrestart &>/dev/null || : fi -%files +%files +%defattr(-,root,root) + +%files common +%defattr(-,root,root) +%doc %{qemudocdir}/Changelog +%doc %{qemudocdir}/README +%doc %{qemudocdir}/TODO +%doc %{qemudocdir}/qemu-doc.html +%doc %{qemudocdir}/qemu-tech.html +%doc %{qemudocdir}/COPYING +%doc %{qemudocdir}/COPYING.LIB +%doc %{qemudocdir}/LICENSE +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/keymaps/ +%{_mandir}/man1/qemu.1* +%{_mandir}/man8/qemu-nbd.8* +%{_bindir}/qemu-nbd +%files user %defattr(-,root,root) -%doc Changelog README TODO -%doc qemu-doc.html qemu-tech.html -%doc COPYING COPYING.LIB LICENSE %{_sysconfdir}/rc.d/init.d/qemu -%{_bindir}/qemu %{_bindir}/qemu-alpha %{_bindir}/qemu-arm %{_bindir}/qemu-armeb %{_bindir}/qemu-cris %{_bindir}/qemu-i386 +%{_bindir}/qemu-x86_64 %{_bindir}/qemu-m68k %{_bindir}/qemu-mips %{_bindir}/qemu-mipsel @@ -121,25 +263,52 @@ fi %{_bindir}/qemu-sh4 %{_bindir}/qemu-sh4eb %{_bindir}/qemu-sparc -%{_bindir}/qemu-sparc32plus %{_bindir}/qemu-sparc64 +%{_bindir}/qemu-sparc32plus +%files system-x86 +%defattr(-,root,root) +%{_bindir}/qemu +%{_bindir}/qemu-system-x86_64 +%{_datadir}/%{name}/bios.bin +%{_datadir}/%{name}/vgabios.bin +%{_datadir}/%{name}/vgabios-cirrus.bin +%{_datadir}/%{name}/pxe-e1000.bin +%{_datadir}/%{name}/pxe-pcnet.bin +%{_datadir}/%{name}/pxe-rtl8139.bin +%{_datadir}/%{name}/pxe-ne2k_pci.bin +%files system-sparc +%defattr(-,root,root) +%{_bindir}/qemu-system-sparc +%{_datadir}/%{name}/openbios-sparc32 +%{_datadir}/%{name}/openbios-sparc64 +%files system-arm +%defattr(-,root,root) %{_bindir}/qemu-system-arm +%files system-mips +%defattr(-,root,root) %{_bindir}/qemu-system-mips %{_bindir}/qemu-system-mipsel -%{_bindir}/qemu-system-ppc -%{_bindir}/qemu-system-sparc -%{_bindir}/qemu-system-x86_64 -%{_bindir}/qemu-system-cris -%{_bindir}/qemu-system-m68k %{_bindir}/qemu-system-mips64 %{_bindir}/qemu-system-mips64el +%files system-ppc +%defattr(-,root,root) +%{_bindir}/qemu-system-ppc %{_bindir}/qemu-system-ppc64 %{_bindir}/qemu-system-ppcemb +%{_datadir}/%{name}/openbios-ppc +%{_datadir}/%{name}/video.x +%{_datadir}/%{name}/bamboo.dtb +%{_datadir}/%{name}/ppc_rom.bin +%files system-cris +%defattr(-,root,root) +%{_bindir}/qemu-system-cris +%files system-m68k +%defattr(-,root,root) +%{_bindir}/qemu-system-m68k +%files system-sh4 +%defattr(-,root,root) %{_bindir}/qemu-system-sh4 %{_bindir}/qemu-system-sh4eb -%{_bindir}/qemu-x86_64 -%{_prefix}/share/qemu/ -%{_mandir}/man1/qemu.1* %files img %defattr(-,root,root) @@ -147,8 +316,183 @@ fi %{_mandir}/man1/qemu-img.1* %changelog -* Wed Dec 3 2008 Lubomir Rintel - 0.9.1-11 -- Fix VGA init on isapc machines +* Sun May 24 2009 Lubomir Rintel - 2:0.10.5-1 +- Use the devel KVM spec file as base for EL-5 qemu +- Rebase to stable qemu 0.10.5 + +* Thu May 21 2009 Mark McLoughlin - 2:0.10.50-4.kvm86 +- Update to kvm-86 release +- ChangeLog here: http://marc.info/?l=kvm&m=124282885729710 + +* Fri May 1 2009 Mark McLoughlin - 2:0.10.50-3.kvm85 +- Really provide qemu-kvm as a metapackage for comps + +* Tue Apr 28 2009 Mark McLoughlin - 2:0.10.50-2.kvm85 +- Provide qemu-kvm as a metapackage for comps + +* Mon Apr 27 2009 Mark McLoughlin - 2:0.10.50-1.kvm85 +- Update to qemu-kvm-devel-85 +- kvm-85 is based on qemu development branch, currently version 0.10.50 +- Include new qemu-io utility in qemu-img package +- Re-instate -help string for boot=on to fix virtio booting with libvirt +- Drop upstreamed patches +- Fix missing kernel/include/asm symlink in upstream tarball +- Fix target-arm build +- Fix build on ppc +- Disable preadv()/pwritev() until bug #497429 is fixed +- Kill more .kernelrelease uselessness +- Make non-kvm qemu build verbose + +* Fri Apr 24 2009 Mark McLoughlin - 2:0.10-15 +- Fix source numbering typos caused by make-release addition + +* Thu Apr 23 2009 Mark McLoughlin - 2:0.10-14 +- Improve instructions for generating the tarball + +* Tue Apr 21 2009 Mark McLoughlin - 2:0.10-13 +- Enable pulseaudio driver to fix qemu lockup at shutdown (#495964) + +* Tue Apr 21 2009 Mark McLoughlin - 2:0.10-12 +- Another qcow2 image corruption fix (#496642) + +* Mon Apr 20 2009 Mark McLoughlin - 2:0.10-11 +- Fix qcow2 image corruption (#496642) + +* Sun Apr 19 2009 Mark McLoughlin - 2:0.10-10 +- Run sysconfig.modules from %post on x86_64 too (#494739) + +* Sun Apr 19 2009 Mark McLoughlin - 2:0.10-9 +- Align VGA ROM to 4k boundary - fixes 'qemu-kvm -std vga' (#494376) + +* Tue Apr 14 2009 Glauber Costa - 2:0.10-8 +- Provide qemu-kvm conditional on the architecture. + +* Thu Apr 9 2009 Mark McLoughlin - 2:0.10-7 +- Add a much cleaner fix for vga segfault (#494002) + +* Sun Apr 5 2009 Glauber Costa - 2:0.10-6 +- Fixed qcow2 segfault creating disks over 2TB. #491943 + +* Fri Apr 3 2009 Mark McLoughlin - 2:0.10-5 +- Fix vga segfault under kvm-autotest (#494002) +- Kill kernelrelease hack; it's not needed +- Build with "make V=1" for more verbose logs + +* Thu Apr 02 2009 Glauber Costa - 2:0.10-4 +- Support botting gpxe roms. + +* Wed Apr 01 2009 Glauber Costa - 2:0.10-2 +- added missing patch. love for CVS. + +* Wed Apr 01 2009 Glauber Costa - 2:0.10-1 +- Include debuginfo for qemu-img +- Do not require qemu-common for qemu-img +- Explicitly own each of the firmware files +- remove firmwares for ppc and sparc. They should be provided by an external package. + Not that the packages exists for sparc in the secondary arch repo as noarch, but they + don't automatically get into main repos. Unfortunately it's the best we can do right + now. +- rollback a bit in time. Snapshot from avi's maint/2.6.30 + - this requires the sasl patches to come back. + - with-patched-kernel comes back. + +* Wed Mar 25 2009 Mark McLoughlin - 2:0.10-0.12.kvm20090323git +- BuildRequires pciutils-devel for device assignment (#492076) + +* Mon Mar 23 2009 Glauber Costa - 2:0.10-0.11.kvm20090323git +- Update to snapshot kvm20090323. +- Removed patch2 (upstream). +- use upstream's new split package. +- --with-patched-kernel flag not needed anymore +- Tell how to get the sources. + +* Wed Mar 18 2009 Glauber Costa - 2:0.10-0.10.kvm20090310git +- Added extboot to files list. + +* Wed Mar 11 2009 Glauber Costa - 2:0.10-0.9.kvm20090310git +- Fix wrong reference to bochs bios. + +* Wed Mar 11 2009 Glauber Costa - 2:0.10-0.8.kvm20090310git +- fix Obsolete/Provides pair +- Use kvm bios from bochs-bios package. +- Using RPM_OPT_FLAGS in configure +- Picked back audio-drv-list from kvm package + +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.7.kvm20090310git +- modify ppc patch + +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.6.kvm20090310git +- updated to kvm20090310git +- removed sasl patches (already in this release) + +* Tue Mar 10 2009 Glauber Costa - 2:0.10-0.5.kvm20090303git +- kvm.modules were being wrongly mentioned at %%install. +- update description for the x86 system package to include kvm support +- build kvm's own bios. It is still necessary while kvm uses a slightly different + irq routing mechanism + +* Thu Mar 05 2009 Glauber Costa - 2:0.10-0.4.kvm20090303git +- seems Epoch does not go into the tags. So start back here. + +* Thu Mar 05 2009 Glauber Costa - 2:0.10-0.1.kvm20090303git +- Use bochs-bios instead of bochs-bios-data +- It's official: upstream set on 0.10 + +* Thu Mar 5 2009 Daniel P. Berrange - 2:0.9.2-0.2.kvm20090303git +- Added BSD to license list, since many files are covered by BSD + +* Wed Mar 04 2009 Glauber Costa - 0.9.2-0.1.kvm20090303git +- missing a dot. shame on me + +* Wed Mar 04 2009 Glauber Costa - 0.92-0.1.kvm20090303git +- Set Epoch to 2 +- Set version to 0.92. It seems upstream keep changing minds here, so pick the lowest +- Provides KVM, Obsoletes KVM +- Only install qemu-kvm in ix86 and x86_64 +- Remove pkgdesc macros, as they were generating bogus output for rpm -qi. +- fix ppc and ppc64 builds + +* Tue Mar 03 2009 Glauber Costa - 0.10-0.3.kvm20090303git +- only execute post scripts for user package. +- added kvm tools. + +* Tue Mar 03 2009 Glauber Costa - 0.10-0.2.kvm20090303git +- put kvm.modules into cvs + +* Tue Mar 03 2009 Glauber Costa - 0.10-0.1.kvm20090303git +- Set Epoch to 1 +- Build KVM (basic build, no tools yet) +- Set ppc in ExcludeArch. This is temporary, just to fix one issue at a time. + ppc users (IBM ? ;-)) please wait a little bit. + +* Tue Mar 3 2009 Daniel P. Berrange - 1.0-0.5.svn6666 +- Support VNC SASL authentication protocol +- Fix dep on bochs-bios-data + +* Tue Mar 03 2009 Glauber Costa - 1.0-0.4.svn6666 +- use bios from bochs-bios package. + +* Tue Mar 03 2009 Glauber Costa - 1.0-0.3.svn6666 +- use vgabios from vgabios package. + +* Mon Mar 02 2009 Glauber Costa - 1.0-0.2.svn6666 +- use pxe roms from etherboot package. + +* Mon Mar 02 2009 Glauber Costa - 1.0-0.1.svn6666 +- Updated to tip svn (release 6666). Featuring split packages for qemu. + Unfortunately, still using binary blobs for the bioses. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 11 2009 Debarshi Ray - 0.9.1-12 +- Updated build patch. Closes Red Hat Bugzilla bug #465041. + +* Wed Dec 31 2008 Dennis Gilmore - 0.9.1-11 +- add sparcv9 and sparc64 support + +* Fri Jul 25 2008 Bill Nottingham +- Fix qemu-img summary (#456344) * Wed Jun 25 2008 Daniel P. Berrange - 0.9.1-10.fc10 - Rebuild for GNU TLS ABI change Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 3 Dec 2008 11:52:53 -0000 1.8 +++ sources 24 May 2009 11:20:56 -0000 1.9 @@ -1 +1 @@ -6591df8e9270eb358c881de4ebea1262 qemu-0.9.1.tar.gz +60060feb98c9649a5da8b136685f76ba qemu-0.10.5.tar.gz --- qemu-0.7.0-build.patch DELETED --- --- qemu-0.8.2-mb-nops.diff DELETED --- --- qemu-0.9.1-block-rw-range-check.patch DELETED --- --- qemu-0.9.1-isapcvga.patch DELETED --- --- qemu-0.9.1-nic-defaults.patch DELETED --- --- qemu-0.9.1-pty-rawmode.patch DELETED --- From lkundrak at fedoraproject.org Sun May 24 21:05:02 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 24 May 2009 21:05:02 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/EL-5 qemu.spec,1.24,1.25 Message-ID: <20090524210502.C0D9B70114@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/qemu/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26400 Modified Files: qemu.spec Log Message: Drop bad dependency Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/EL-5/qemu.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- qemu.spec 24 May 2009 11:20:56 -0000 1.24 +++ qemu.spec 24 May 2009 21:04:27 -0000 1.25 @@ -15,7 +15,6 @@ Patch0: qemu-0.1.5-disable-strip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel -BuildRequires: dev86 BuildRequires: pulseaudio-libs-devel Requires: %{name}-user = %{epoch}:%{version}-%{release} Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} From lkundrak at fedoraproject.org Sun May 24 21:54:55 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 24 May 2009 21:54:55 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/EL-5 qemu.spec,1.25,1.26 Message-ID: <20090524215455.CEA3470128@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/qemu/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8559 Modified Files: qemu.spec Log Message: Add a dist tag Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/EL-5/qemu.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- qemu.spec 24 May 2009 21:04:27 -0000 1.25 +++ qemu.spec 24 May 2009 21:54:24 -0000 1.26 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.5 -Release: 1 +Release: 1%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD From mschwendt at gmail.com Fri May 22 18:55:23 2009 From: mschwendt at gmail.com (Michael Schwendt) Date: Fri, 22 May 2009 18:55:23 -0000 Subject: [fedora-virt-maint] Broken dependencies in Fedora 12 Development - 2009-05-22 Message-ID: <20090522185523.20074.59720@faldor.intranet> Your following packages in the repository suffer from broken dependencies: package: ocaml-libvirt-0.6.1.0-1.fc11.i586 from dist-f12-build-current-i386 unresolved deps: ocaml(runtime) = 0:3.11.0 package: ocaml-libvirt-0.6.1.0-1.fc11.ppc from dist-f12-build-current-ppc unresolved deps: ocaml(runtime) = 0:3.11.0 package: ocaml-libvirt-0.6.1.0-1.fc11.ppc64 from dist-f12-build-current-ppc64 unresolved deps: ocaml(runtime) = 0:3.11.0 package: ocaml-libvirt-0.6.1.0-1.fc11.x86_64 from dist-f12-build-current-x86_64 unresolved deps: ocaml(runtime) = 0:3.11.0 From markmc at fedoraproject.org Mon May 25 13:39:21 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 25 May 2009 13:39:21 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/F-11 etherboot.spec,1.13,1.14 Message-ID: <20090525133921.2FD2F70114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/etherboot/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7897 Modified Files: etherboot.spec Log Message: * Mon May 25 2009 Mark McLoughlin - 5.4.4-14 - Enable PXE_DHCP_STRICT to fix PXE boot failures (bug #494541) Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/F-11/etherboot.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- etherboot.spec 3 Mar 2009 03:31:52 -0000 1.13 +++ etherboot.spec 25 May 2009 13:38:50 -0000 1.14 @@ -9,7 +9,7 @@ # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -105,27 +105,28 @@ computer. Many network adapters have a s installed. Etherboot is code that can be put in such a ROM - %prep %setup -q -%build %ifarch %{ix86} -cd src +# Enable PXE_DHCP_STRICT (see bug #494541) +sed -i -e 's/# \(CFLAGS.*PXE_DHCP_STRICT\)/\1/' src/Config + +# undi is broken by now +sed -i -e '/undi/d' src/Families +%endif +%build +%ifarch %{ix86} # %{optflags} wouldn't work with our hack to build the 32-bit binaries # on x86_64, so use %{__global_cflags} instead, that doesn't include # -m64 & related flags %define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'` %define makeflags EXTRA_CFLAGS="%{extra_cflags}" - -# undi is broken by now -sed -i -e '/undi/d' Families -make %{?_smp_mflags} allpxes allroms allzroms %{makeflags} +make -C src %{?_smp_mflags} %{makeflags} allpxes allroms allzroms %endif - %install rm -rf %{buildroot} %ifarch %{ix86} @@ -177,6 +178,9 @@ rm -rf %{buildroot} %changelog +* Mon May 25 2009 Mark McLoughlin - 5.4.4-14 +- Enable PXE_DHCP_STRICT to fix PXE boot failures (bug #494541) + * Tue Mar 03 2009 Glauber Costa - 5.4.4.13 - Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but works much better while rpm bug #442105 is not fixed yet. From markmc at fedoraproject.org Mon May 25 13:39:30 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 25 May 2009 13:39:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.13,1.14 Message-ID: <20090525133930.A7D1970114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7956 Modified Files: etherboot.spec Log Message: * Mon May 25 2009 Mark McLoughlin - 5.4.4-14 - Enable PXE_DHCP_STRICT to fix PXE boot failures (bug #494541) Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- etherboot.spec 3 Mar 2009 03:31:52 -0000 1.13 +++ etherboot.spec 25 May 2009 13:39:00 -0000 1.14 @@ -9,7 +9,7 @@ # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -105,27 +105,28 @@ computer. Many network adapters have a s installed. Etherboot is code that can be put in such a ROM - %prep %setup -q -%build %ifarch %{ix86} -cd src +# Enable PXE_DHCP_STRICT (see bug #494541) +sed -i -e 's/# \(CFLAGS.*PXE_DHCP_STRICT\)/\1/' src/Config + +# undi is broken by now +sed -i -e '/undi/d' src/Families +%endif +%build +%ifarch %{ix86} # %{optflags} wouldn't work with our hack to build the 32-bit binaries # on x86_64, so use %{__global_cflags} instead, that doesn't include # -m64 & related flags %define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'` %define makeflags EXTRA_CFLAGS="%{extra_cflags}" - -# undi is broken by now -sed -i -e '/undi/d' Families -make %{?_smp_mflags} allpxes allroms allzroms %{makeflags} +make -C src %{?_smp_mflags} %{makeflags} allpxes allroms allzroms %endif - %install rm -rf %{buildroot} %ifarch %{ix86} @@ -177,6 +178,9 @@ rm -rf %{buildroot} %changelog +* Mon May 25 2009 Mark McLoughlin - 5.4.4-14 +- Enable PXE_DHCP_STRICT to fix PXE boot failures (bug #494541) + * Tue Mar 03 2009 Glauber Costa - 5.4.4.13 - Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but works much better while rpm bug #442105 is not fixed yet. From markmc at fedoraproject.org Mon May 25 15:23:05 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 25 May 2009 15:23:05 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-bring-up-ipless-bridge.patch, NONE, 1.1 libvirt.spec, 1.135, 1.136 Message-ID: <20090525152305.C0BF670114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32425 Modified Files: libvirt.spec Added Files: libvirt-0.6.3-bring-up-ipless-bridge.patch Log Message: * Mon May 25 2009 Mark McLoughlin - 0.6.3-11.fc12 - Bring up the bridge, even if it doesn't have an IP address (bug #501912) libvirt-0.6.3-bring-up-ipless-bridge.patch: --- NEW FILE libvirt-0.6.3-bring-up-ipless-bridge.patch --- >From 4db7474b0c1907e877d7206edeb4d73962971096 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 12 May 2009 15:31:22 +0000 Subject: [PATCH 1/1] * src/network_driver.c: enable bridges which are not up without an IP address, patch by Ludwig Nussel Daniel --- src/network_driver.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/network_driver.c b/src/network_driver.c index a17a769..a163b15 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn, goto err_delbr; } - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) { virReportSystemError(conn, err, _("failed to bring the bridge '%s' up"), network->def->bridge); @@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn, networkRemoveIptablesRules(driver, network); err_delbr1: - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { char ebuf[1024]; networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); @@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, networkRemoveIptablesRules(driver, network); char ebuf[1024]; - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -p -r1.135 -r1.136 --- libvirt.spec 21 May 2009 12:07:09 -0000 1.135 +++ libvirt.spec 25 May 2009 15:22:34 -0000 1.136 @@ -55,7 +55,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.3 -Release: 10%{?dist}%{?extra_release} +Release: 11%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -79,6 +79,8 @@ Patch7: libvirt-0.6.3-xml-attribute-esca # Fix serious event handling issues causing guests to be destroyed (bz 499698) Patch8: libvirt-0.6.3-event-handling-1.patch Patch9: libvirt-0.6.3-event-handling-2.patch +# Bring up the bridge, even if it doesn't have an IP address (bz 501912) +Patch10: libvirt-0.6.3-bring-up-ipless-bridge.patch # Patches not for upstream. @@ -243,6 +245,7 @@ of recent versions of Linux (and other O %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch200 -p0 @@ -573,6 +576,9 @@ fi %endif %changelog +* Mon May 25 2009 Mark McLoughlin - 0.6.3-11.fc12 +- Bring up the bridge, even if it doesn't have an IP address (bug #501912) + * Thu May 21 2009 Mark McLoughlin - 0.6.3-10.fc12 - Fix XML attribute escaping (bug #499791) - Fix serious event handling issues causing guests to be destroyed (bug #499698) From markmc at fedoraproject.org Mon May 25 15:23:47 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Mon, 25 May 2009 15:23:47 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-bring-up-ipless-bridge.patch, NONE, 1.1 libvirt.spec, 1.132, 1.133 Message-ID: <20090525152347.B353F70114@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/libvirt/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32627 Modified Files: libvirt.spec Added Files: libvirt-0.6.2-bring-up-ipless-bridge.patch Log Message: * Mon May 25 2009 Mark McLoughlin - 0.6.2-11.fc11 - Bring up the bridge, even if it doesn't have an IP address (bug #501912) libvirt-0.6.2-bring-up-ipless-bridge.patch: --- NEW FILE libvirt-0.6.2-bring-up-ipless-bridge.patch --- >From 4db7474b0c1907e877d7206edeb4d73962971096 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 12 May 2009 15:31:22 +0000 Subject: [PATCH 1/1] * src/network_driver.c: enable bridges which are not up without an IP address, patch by Ludwig Nussel Daniel --- src/network_driver.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/network_driver.c b/src/network_driver.c index a17a769..a163b15 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn, goto err_delbr; } - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) { virReportSystemError(conn, err, _("failed to bring the bridge '%s' up"), network->def->bridge); @@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn, networkRemoveIptablesRules(driver, network); err_delbr1: - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { char ebuf[1024]; networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); @@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, networkRemoveIptablesRules(driver, network); char ebuf[1024]; - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } -- 1.6.0.6 Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -p -r1.132 -r1.133 --- libvirt.spec 22 May 2009 09:24:30 -0000 1.132 +++ libvirt.spec 25 May 2009 15:23:17 -0000 1.133 @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 10%{?dist}%{?extra_release} +Release: 11%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -92,6 +92,8 @@ Patch8: libvirt-0.6.2-event-handling-1.p Patch9: libvirt-0.6.2-event-handling-2.patch # Don't log monitor output to domain log file (bz 499584) Patch10: libvirt-0.6.2-do-not-log-monitor-output.patch +# Bring up the bridge, even if it doesn't have an IP address (bz 501912) +Patch11: libvirt-0.6.2-bring-up-ipless-bridge.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -257,6 +259,7 @@ of recent versions of Linux (and other O %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch200 -p0 @@ -580,6 +583,9 @@ fi %endif %changelog +* Mon May 25 2009 Mark McLoughlin - 0.6.2-11.fc11 +- Bring up the bridge, even if it doesn't have an IP address (bug #501912) + * Fri May 22 2009 Mark McLoughlin - 0.6.2-10.fc11 - Don't log monitor output to domain log file (bug #499584) From rjones at fedoraproject.org Tue May 26 09:08:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 26 May 2009 09:08:45 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 .cvsignore, 1.5, 1.6 libguestfs.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <20090526090845.99DFF70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7970 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.32. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 21 May 2009 19:01:03 -0000 1.5 +++ .cvsignore 26 May 2009 09:08:15 -0000 1.6 @@ -1 +1 @@ -libguestfs-1.0.30.tar.gz +libguestfs-1.0.32.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- libguestfs.spec 21 May 2009 20:00:32 -0000 1.8 +++ libguestfs.spec 26 May 2009 09:08:15 -0000 1.9 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.30 -Release: 1%{?dist}.2 +Version: 1.0.32 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -463,6 +463,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 26 2009 Richard Jones - 1.0.32-1 +- New upstream version 1.0.32. + * Thu May 21 2009 Richard Jones - 1.0.30-1.fc11.2 - Backport version 1.0.30 from devel branch. - Disable tests on i586 because of RHBZ#502074. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 21 May 2009 19:01:03 -0000 1.5 +++ sources 26 May 2009 09:08:15 -0000 1.6 @@ -1 +1 @@ -02147252fcfbc4701e275689c0dc75de libguestfs-1.0.30.tar.gz +f90c5b0c873da8109702be498cbd1f3b libguestfs-1.0.32.tar.gz From rjones at fedoraproject.org Tue May 26 09:08:41 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 26 May 2009 09:08:41 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.11, 1.12 libguestfs.spec, 1.26, 1.27 sources, 1.11, 1.12 Message-ID: <20090526090841.6B68370114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7933 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.32. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 23 May 2009 14:04:40 -0000 1.11 +++ .cvsignore 26 May 2009 09:08:10 -0000 1.12 @@ -1 +1 @@ -libguestfs-1.0.31.tar.gz +libguestfs-1.0.32.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- libguestfs.spec 23 May 2009 14:04:40 -0000 1.26 +++ libguestfs.spec 26 May 2009 09:08:10 -0000 1.27 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.31 +Version: 1.0.32 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -463,6 +463,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 26 2009 Richard W.M. Jones - 1.0.32-1 +- New upstream version 1.0.32. + * Sat May 23 2009 Richard W.M. Jones - 1.0.31-1 - Rebuild for OCaml 3.11.1. - New upstream version 1.0.31. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 23 May 2009 14:04:40 -0000 1.11 +++ sources 26 May 2009 09:08:10 -0000 1.12 @@ -1 +1 @@ -13754af787ed95f57616a3577bc72143 libguestfs-1.0.31.tar.gz +f90c5b0c873da8109702be498cbd1f3b libguestfs-1.0.32.tar.gz From rjones at fedoraproject.org Tue May 26 09:33:01 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 26 May 2009 09:33:01 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs.spec, 1.27, 1.28 Message-ID: <20090526093301.CEA1370114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12613 Modified Files: libguestfs.spec Log Message: Use %find_lang macro. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- libguestfs.spec 26 May 2009 09:08:10 -0000 1.27 +++ libguestfs.spec 26 May 2009 09:32:31 -0000 1.28 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.32 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -357,6 +357,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_ # Generator shouldn't be executable when we distribute it. chmod -x src/generator.ml +# Find locale files. +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -367,7 +370,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING %{_libdir}/guestfs/ @@ -463,8 +466,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue May 26 2009 Richard W.M. Jones - 1.0.32-1 +* Tue May 26 2009 Richard W.M. Jones - 1.0.32-2 - New upstream version 1.0.32. +- Use %%find_lang macro. * Sat May 23 2009 Richard W.M. Jones - 1.0.31-1 - Rebuild for OCaml 3.11.1. From rjones at fedoraproject.org Tue May 26 09:33:07 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 26 May 2009 09:33:07 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 libguestfs.spec,1.9,1.10 Message-ID: <20090526093307.B20C670114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12658 Modified Files: libguestfs.spec Log Message: Use %find_lang macro. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- libguestfs.spec 26 May 2009 09:08:15 -0000 1.9 +++ libguestfs.spec 26 May 2009 09:32:37 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.32 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -357,6 +357,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_ # Generator shouldn't be executable when we distribute it. chmod -x src/generator.ml +# Find locale files. +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -367,7 +370,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING %{_libdir}/guestfs/ @@ -463,8 +466,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue May 26 2009 Richard Jones - 1.0.32-1 +* Tue May 26 2009 Richard Jones - 1.0.32-1.fc11.1 - New upstream version 1.0.32. +- Use %%find_lang macro. * Thu May 21 2009 Richard Jones - 1.0.30-1.fc11.2 - Backport version 1.0.30 from devel branch. From rjones at fedoraproject.org Wed May 27 12:05:08 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 12:05:08 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 .cvsignore, 1.6, 1.7 libguestfs.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <20090527120508.9848370110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17884 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 26 May 2009 09:08:15 -0000 1.6 +++ .cvsignore 27 May 2009 12:04:37 -0000 1.7 @@ -1 +1 @@ -libguestfs-1.0.32.tar.gz +libguestfs-1.0.33.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- libguestfs.spec 26 May 2009 09:32:37 -0000 1.10 +++ libguestfs.spec 27 May 2009 12:04:38 -0000 1.11 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.32 -Release: 1%{?dist}.1 +Version: 1.0.33 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -253,7 +253,6 @@ createrepo repo ./configure \ --prefix=%{_prefix} --libdir=%{_libdir} \ --mandir=%{_mandir} \ - --with-java-home=%{java_home} \ --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \ --enable-debug-command \ %{extra} @@ -466,6 +465,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 27 2009 Richard W.M. Jones - 1.0.33-1 +- New upstream version 1.0.33. +- --with-java-home option is no longer required. +- Upstream contains potential fixes for: + 501878 built-in commands like 'alloc' and 'help' don't autocomplete + 501883 javadoc messed up in libguestfs java documentation + 501885 Doesn't detect missing Java, --with-java-home=no should not be needed + 502533 Polish translation of libguestfs + n/a Allow more ext filesystem kmods (Charles Duffy) + * Tue May 26 2009 Richard Jones - 1.0.32-1.fc11.1 - New upstream version 1.0.32. - Use %%find_lang macro. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 26 May 2009 09:08:15 -0000 1.6 +++ sources 27 May 2009 12:04:38 -0000 1.7 @@ -1 +1 @@ -f90c5b0c873da8109702be498cbd1f3b libguestfs-1.0.32.tar.gz +cd07465feec476e50031e50ee148a546 libguestfs-1.0.33.tar.gz From rjones at fedoraproject.org Wed May 27 12:05:09 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 12:05:09 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.12, 1.13 libguestfs.spec, 1.28, 1.29 sources, 1.12, 1.13 Message-ID: <20090527120509.444EA70110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17902 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 26 May 2009 09:08:10 -0000 1.12 +++ .cvsignore 27 May 2009 12:04:38 -0000 1.13 @@ -1 +1 @@ -libguestfs-1.0.32.tar.gz +libguestfs-1.0.33.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- libguestfs.spec 26 May 2009 09:32:31 -0000 1.28 +++ libguestfs.spec 27 May 2009 12:04:38 -0000 1.29 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.32 -Release: 2%{?dist} +Version: 1.0.33 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -253,7 +253,6 @@ createrepo repo ./configure \ --prefix=%{_prefix} --libdir=%{_libdir} \ --mandir=%{_mandir} \ - --with-java-home=%{java_home} \ --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \ --enable-debug-command \ %{extra} @@ -466,6 +465,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 27 2009 Richard W.M. Jones - 1.0.33-1 +- New upstream version 1.0.33. +- --with-java-home option is no longer required. +- Upstream contains potential fixes for: + 501878 built-in commands like 'alloc' and 'help' don't autocomplete + 501883 javadoc messed up in libguestfs java documentation + 501885 Doesn't detect missing Java, --with-java-home=no should not be needed + 502533 Polish translation of libguestfs + n/a Allow more ext filesystem kmods (Charles Duffy) + * Tue May 26 2009 Richard W.M. Jones - 1.0.32-2 - New upstream version 1.0.32. - Use %%find_lang macro. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 26 May 2009 09:08:10 -0000 1.12 +++ sources 27 May 2009 12:04:38 -0000 1.13 @@ -1 +1 @@ -f90c5b0c873da8109702be498cbd1f3b libguestfs-1.0.32.tar.gz +cd07465feec476e50031e50ee148a546 libguestfs-1.0.33.tar.gz From rjones at fedoraproject.org Wed May 27 13:36:47 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 13:36:47 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel test-bootbootboot.sh, 1.1, NONE Message-ID: <20090527133647.F376470110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10133 Removed Files: test-bootbootboot.sh Log Message: test-bootbootboot.sh is now included in the source tarball. --- test-bootbootboot.sh DELETED --- From rjones at fedoraproject.org Wed May 27 16:19:17 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 16:19:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.13, 1.14 libguestfs.spec, 1.29, 1.30 sources, 1.13, 1.14 Message-ID: <20090527161917.BEF3C70110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17224 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.34. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 27 May 2009 12:04:38 -0000 1.13 +++ .cvsignore 27 May 2009 16:18:47 -0000 1.14 @@ -1 +1 @@ -libguestfs-1.0.33.tar.gz +libguestfs-1.0.34.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- libguestfs.spec 27 May 2009 12:04:38 -0000 1.29 +++ libguestfs.spec 27 May 2009 16:18:47 -0000 1.30 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.33 +Version: 1.0.34 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -465,6 +465,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 27 2009 Richard W.M. Jones - 1.0.34-1 +- New upstream version 1.0.34. + * Wed May 27 2009 Richard W.M. Jones - 1.0.33-1 - New upstream version 1.0.33. - --with-java-home option is no longer required. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 27 May 2009 12:04:38 -0000 1.13 +++ sources 27 May 2009 16:18:47 -0000 1.14 @@ -1 +1 @@ -cd07465feec476e50031e50ee148a546 libguestfs-1.0.33.tar.gz +c56bc2d2bd4d1d82e417961f030dea29 libguestfs-1.0.34.tar.gz From rjones at fedoraproject.org Wed May 27 16:19:51 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 16:19:51 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 .cvsignore, 1.3, 1.4 libguestfs.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <20090527161951.7A1F870110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17457 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Wed May 27 2009 Richard Jones - 1.0.34-1 - Backport 1.0.34 from devel to EPEL. - There should now be a working qemu in EPEL (0.10.5). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 11 May 2009 16:25:59 -0000 1.3 +++ .cvsignore 27 May 2009 16:19:21 -0000 1.4 @@ -1 +1 @@ -libguestfs-1.0.23.tar.gz +libguestfs-1.0.34.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- libguestfs.spec 13 May 2009 15:45:26 -0000 1.10 +++ libguestfs.spec 27 May 2009 16:19:21 -0000 1.11 @@ -3,25 +3,26 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.23 -Release: 9%{?dist} +Version: 1.0.34 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ Source0: http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# Currently fails on non-x86 because of this error: -# "qemu: linux kernel too old to load a ram disk" -ExclusiveArch: %{ix86} x86_64 - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 2.0 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel -BuildRequires: qemu +%ifarch %{ix86} x86_64 +BuildRequires: qemu-system-x86 >= 0.10.5 +%endif +%ifarch ppc ppc64 +BuildRequires: qemu-system-ppc >= 0.10.5 +%endif BuildRequires: createrepo # This is only needed for RHEL 5 because readline-devel doesn't @@ -33,8 +34,11 @@ BuildRequires: ncurses-devel BuildRequires: kernel, bash, coreutils, lvm2 BuildRequires: MAKEDEV, net-tools, augeas-libs, file BuildRequires: module-init-tools, procps, strace, iputils -BuildRequires: grub, dosfstools, ntfsprogs -# ntfs-3g util-linux-ng +BuildRequires: dosfstools +# Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree +%ifarch %{ix86} x86_64 +BuildRequires: grub, ntfsprogs +%endif # These are only required if you want to build the bindings for # different languages: @@ -56,7 +60,12 @@ BuildRequires: java-devel #BuildRequires: perl-Sys-Virt # Runtime requires: -#Requires: qemu >= 0.10-7 +%ifarch %{ix86} x86_64 +Requires: qemu-system-x86 >= 0.10.5 +%endif +%ifarch ppc ppc64 +Requires: qemu-system-ppc >= 0.10.5 +%endif %description @@ -255,7 +264,6 @@ vmchannel_test=no \ ./configure \ --prefix=%{_prefix} --libdir=%{_libdir} \ --mandir=%{_mandir} \ - --with-java-home=%{java_home} \ --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \ --enable-debug-command \ %{extra} @@ -269,6 +277,16 @@ export PATH=/usr/sbin:$PATH make INSTALLDIRS=vendor %{?_smp_mflags} +%check +# Enable debugging - very useful if a test does fail, although +# it produces masses of output in the build.log. +export LIBGUESTFS_DEBUG=1 + +# Tests in subdirs fail because they all assume that the device +# is called /dev/sda, not /dev/hda as on EPEL-5. +make SUBDIRS= check + + %install rm -rf $RPM_BUILD_ROOT @@ -320,6 +338,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_ # Generator shouldn't be executable when we distribute it. chmod -x src/generator.ml +# Find locale files. +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -330,7 +351,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING %{_libdir}/guestfs/ @@ -395,10 +416,8 @@ rm -rf $RPM_BUILD_ROOT %doc README %{python_sitearch}/* %{python_sitelib}/*.py -%ifarch x86_64 %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo -%endif %files -n ruby-%{name} @@ -428,6 +447,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 27 2009 Richard Jones - 1.0.34-1 +- Backport 1.0.34 from devel to EPEL. +- There should now be a working qemu in EPEL (0.10.5). + * Wed May 13 2009 Richard Jones - 1.0.23-9 - Remove the runtime requires on non-existant package. It'll just fail instead. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 11 May 2009 16:25:59 -0000 1.3 +++ sources 27 May 2009 16:19:21 -0000 1.4 @@ -1 +1 @@ -b8a03144334b44220a688fac8a7de74d libguestfs-1.0.23.tar.gz +c56bc2d2bd4d1d82e417961f030dea29 libguestfs-1.0.34.tar.gz From kraxel at fedoraproject.org Wed May 27 16:24:32 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Wed, 27 May 2009 16:24:32 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel dom0-kernel.repo, NONE, 1.1 init.blktapctrl, NONE, 1.1 init.xenconsoled, NONE, 1.1 init.xend, NONE, 1.1 init.xenstored, NONE, 1.1 sysconfig.blktapctrl, NONE, 1.1 sysconfig.xenconsoled, NONE, 1.1 sysconfig.xenstored, NONE, 1.1 xen-configure-xend.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 sources, 1.54, 1.55 xen-dumpdir.patch, 1.4, 1.5 xen-initscript.patch, 1.11, 1.12 xen-net-disable-iptables-on-bridge.patch, 1.3, 1.4 xen.spec, 1.236, 1.237 xen-3.0.2-config-allow-unix-server.patch, 1.3, NONE xen-3.0.2-config-disable-reloc.patch, 1.3, NONE xen-backport-hg18782.patch, 1.1, NONE xen-backport-hg19075.patch, 1.1, NONE xen-backport-hg19108.patch, 1.1, NONE xen-backport-hg19109.patch, 1.1, NONE xen-backport-hg19110.patch, 1.1, NONE xen-config-dom0-minmem.patch, 1.3, NONE xen-gcc44-buildfix.patch, 1.1, NONE xen-initscript-pvops.patch, 1.1, NONE xen-net-disable-bridge-by-default.patch, 1.3, NONE Message-ID: <20090527162432.B67FA70110@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19530 Modified Files: .cvsignore sources xen-dumpdir.patch xen-initscript.patch xen-net-disable-iptables-on-bridge.patch xen.spec Added Files: dom0-kernel.repo init.blktapctrl init.xenconsoled init.xend init.xenstored sysconfig.blktapctrl sysconfig.xenconsoled sysconfig.xenstored xen-configure-xend.patch Removed Files: xen-3.0.2-config-allow-unix-server.patch xen-3.0.2-config-disable-reloc.patch xen-backport-hg18782.patch xen-backport-hg19075.patch xen-backport-hg19108.patch xen-backport-hg19109.patch xen-backport-hg19110.patch xen-config-dom0-minmem.patch xen-gcc44-buildfix.patch xen-initscript-pvops.patch xen-net-disable-bridge-by-default.patch Log Message: update to 3.4.0 --- NEW FILE dom0-kernel.repo --- [dom0-kernel] name=Experimental pv_ops/dom0 kernels for Fedora - $basearch baseurl=http://myoung.fedorapeople.org/dom0/$basearch/ enabled=0 gpgcheck=0 [dom0-kernel-source] name=Experimental pv_ops/dom0 kernels for Fedora - Source baseurl=http://myoung.fedorapeople.org/dom0/src/ enabled=0 gpgcheck=0 --- NEW FILE init.blktapctrl --- #!/bin/bash # # blktapctrl Script to start the Xen blktapctrl daemon # # Author: Daniel Berrange # # chkconfig: 2345 97 01 # description: Starts and stops the Xen blktapctrl daemon. ### BEGIN INIT INFO # Provides: blktapctrl # Required-Start: $syslog $remote_fs # Should-Start: # Required-Stop: $syslog $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Default-Enabled: yes # Short-Description: Start/stop blktapctrl # Description: Starts and stops the Xen blktapctrl daemon ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ ! -d /proc/xen ]; then exit 0 fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi # Default config params BLKTAPCTRL_ARGS= # User customized params test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl start() { echo -n $"Starting xen blktapctrl daemon: " /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl } stop() { echo -n $"Stoping xen blktapctrl daemon: " # blktapctrl is not restartable. So we refuse to stop it # unless the machine is being shutdown or rebooted anyway. if test "$runlevel" = "0" -o "$runlevel" = "6"; then killproc xenstored > /dev/null RETVAL=$? else RETVAL=1 fi test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/blktapctrl } rcstatus() { status blktapctrl RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; *) echo $"Usage: $0 {start|stop|status}" exit 1 esac exit $RETVAL --- NEW FILE init.xenconsoled --- #!/bin/bash # # xenconsoled Script to start and stop the Xen xenconsoled daemon # # Author: Daniel P. Berrange # # chkconfig: 2345 97 01 # description: Starts and stops the Xen control daemon. ### BEGIN INIT INFO # Provides: xenconsoled # Required-Start: $syslog $remote_fs # Should-Start: # Required-Stop: $syslog $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Default-Enabled: yes # Short-Description: Start/stop xenconsoled # Description: Starts and stops the Xen xenconsoled daemon. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ ! -d /proc/xen ]; then exit 0 fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi # Default config params XENCONSOLED_LOG_HYPERVISOR=no XENCONSOLED_LOG_GUESTS=no XENCONSOLED_LOG_DIR=/var/log/xen/console XENCONSOLED_ARGS= # User customized params test -f /etc/sysconfig/xenconsoled && . /etc/sysconfig/xenconsoled XENCONSOLED_LOG=none if [ "$XENCONSOLED_LOG_HYPERVISOR" = "yes" ] then if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] then XENCONSOLED_LOG=all else XENCONSOLED_LOG=hv fi else if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] then XENCONSOLED_LOG=guest fi fi start() { echo -n $"Starting xenconsoled daemon: " /usr/sbin/xenconsoled --log=$XENCONSOLED_LOG --log-dir=$XENCONSOLED_LOG_DIR $XENCONSOLED_ARGS RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenconsoled } stop() { echo -n $"Stopping xenconsoled daemon: " killproc xenconsoled > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenconsoled } rcstatus() { status xenconsoled RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } reload() { echo -n $"Reloading xenconsoled daemon: " killproc xenconsoled -HUP > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; reload) reload ;; restart|force-reload) stop start ;; condrestart) if [ -f /var/lock/subsys/xenconsoled ] then stop start fi ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" exit 1 esac exit $RETVAL --- NEW FILE init.xend --- #!/bin/bash # # xend Script to start and stop the Xen control daemon. # # Author: Keir Fraser # # chkconfig: 2345 98 01 # description: Starts and stops the Xen control daemon. ### BEGIN INIT INFO # Provides: xend # Required-Start: $syslog $remote_fs # Should-Start: # Required-Stop: $syslog $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Default-Enabled: yes # Short-Description: Start/stop xend # Description: Starts and stops the Xen control daemon. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ ! -d /proc/xen ]; then exit 0 fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi # Default config params start() { echo -n $"Starting xend daemon: " /usr/sbin/xend RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xend } stop() { echo -n $"Stopping xend daemon: " killproc xend > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xend } rcstatus() { status xend RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } reload() { echo -n $"Reloading xend daemon: " killproc xend -HUP > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; reload) reload ;; restart|force-reload) stop start ;; condrestart) if [ -f /var/lock/subsys/xend ] then stop start fi ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" exit 1 esac exit $RETVAL --- NEW FILE init.xenstored --- #!/bin/bash # # xenstored Script to start and stop the Xen control daemon. # # Author: Daniel Berrange /dev/null RETVAL=$? else RETVAL=1 fi test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenstored } rcstatus() { status xenstored RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; *) echo $"Usage: $0 {start|stop|status}" exit 1 esac exit $RETVAL --- NEW FILE sysconfig.blktapctrl --- #BLKTAPCTRL_ARGS= --- NEW FILE sysconfig.xenconsoled --- # Log all hypervisor messages (cf xm dmesg) #XENCONSOLED_LOG_HYPERVISOR=no # Log all guest console output (cf xm console) #XENCONSOLED_LOG_GUESTS=no # Location to store guest & hypervisor logs #XENCONSOLED_LOG_DIR=/var/log/xen/console #XENCONSOLED_ARGS= --- NEW FILE sysconfig.xenstored --- #XENSTORED_PID="/var/run/xenstore.pid" #XENSTORED_ARGS= xen-configure-xend.patch: --- NEW FILE xen-configure-xend.patch --- diff -up xen-3.4.0/tools/examples/xend-config.sxp.config xen-3.4.0/tools/examples/xend-config.sxp --- xen-3.4.0/tools/examples/xend-config.sxp.config 2009-05-20 17:12:50.000000000 +0200 +++ xen-3.4.0/tools/examples/xend-config.sxp 2009-05-20 17:15:35.000000000 +0200 @@ -58,11 +58,11 @@ #(xend-http-server no) -#(xend-unix-server no) +(xend-unix-server yes) #(xend-tcp-xmlrpc-server no) #(xend-unix-xmlrpc-server yes) -#(xend-relocation-server no) -(xend-relocation-server yes) +(xend-relocation-server no) +#(xend-relocation-server yes) #(xend-relocation-ssl-server no) #(xend-udev-event-server no) @@ -154,7 +154,8 @@ # two fake interfaces per guest domain. To do things like this, write # yourself a wrapper script, and call network-bridge from it, as appropriate. # -(network-script network-bridge) +#(network-script network-bridge) +(network-script /bin/true) # The script used to control virtual interfaces. This can be overridden on a # per-vif basis when creating a domain or a configuring a new vif. The @@ -186,7 +187,7 @@ # dom0-min-mem is the lowest permissible memory level (in MB) for dom0. # This is a minimum both for auto-ballooning (as enabled by # enable-dom0-ballooning below) and for xm mem-set when applied to dom0. -(dom0-min-mem 196) +(dom0-min-mem 256) # Whether to enable auto-ballooning of dom0 to allow domUs to be created. # If enable-dom0-ballooning = no, dom0 will never balloon out. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- .cvsignore 8 Jan 2009 20:18:01 -0000 1.39 +++ .cvsignore 27 May 2009 16:24:00 -0000 1.40 @@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz lwip-1.3.0.tar.gz pciutils-2.2.9.tar.bz2 zlib-1.2.3.tar.gz -xen-3.3.1.tar.gz +xen-3.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- sources 8 Jan 2009 20:18:01 -0000 1.54 +++ sources 27 May 2009 16:24:00 -0000 1.55 @@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4 newlib 36cc57650cffda9a0269493be2a169bb lwip-1.3.0.tar.gz cec05e7785497c5e19da2f114b934ffd pciutils-2.2.9.tar.bz2 debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz -77a61e08875625394ef6bf80e595ffa1 xen-3.3.1.tar.gz +bf1b29f07ec2c12673779600aea183b2 xen-3.4.0.tar.gz xen-dumpdir.patch: Index: xen-dumpdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-dumpdir.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- xen-dumpdir.patch 29 Aug 2008 11:11:46 -0000 1.4 +++ xen-dumpdir.patch 27 May 2009 16:24:01 -0000 1.5 @@ -1,18 +1,7 @@ -diff -rup xen-3.3.0-orig/tools/debugger/gdb/README xen-3.3.0-new/tools/debugger/gdb/README ---- xen-3.3.0-orig/tools/debugger/gdb/README 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/debugger/gdb/README 2008-08-29 11:27:13.000000000 +0100 -@@ -33,6 +33,6 @@ To debug a crashed domU guest: - 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before - starting xend. - 2. When the domain crashes, a core file is written to -- '/var/xen/dump/..core'. -+ '/var/lib/xen/dump/..core'. - 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. - 4. Connect to the server as for a running guest. -diff -rup xen-3.3.0-orig/tools/Makefile xen-3.3.0-new/tools/Makefile ---- xen-3.3.0-orig/tools/Makefile 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/Makefile 2008-08-29 11:27:42.000000000 +0100 -@@ -49,7 +49,7 @@ all: subdirs-all +diff -up xen-3.4.0/tools/Makefile.dump xen-3.4.0/tools/Makefile +--- xen-3.4.0/tools/Makefile.dump 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/Makefile 2009-05-20 17:03:26.000000000 +0200 +@@ -46,7 +46,7 @@ all: subdirs-all .PHONY: install install: subdirs-install @@ -21,16 +10,26 @@ diff -rup xen-3.3.0-orig/tools/Makefile $(INSTALL_DIR) $(DESTDIR)/var/log/xen $(INSTALL_DIR) $(DESTDIR)/var/lib/xen -diff -rup xen-3.3.0-orig/tools/python/xen/xend/XendDomainInfo.py xen-3.3.0-new/tools/python/xen/xend/XendDomainInfo.py ---- xen-3.3.0-orig/tools/python/xen/xend/XendDomainInfo.py 2008-08-22 10:49:08.000000000 +0100 -+++ xen-3.3.0-new/tools/python/xen/xend/XendDomainInfo.py 2008-08-29 11:27:14.000000000 +0100 -@@ -1843,7 +1843,7 @@ class XendDomainInfo: - try: - if not corefile: - this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) -- corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time, -+ corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time, - self.info['name_label'], self.domid) +diff -up xen-3.4.0/tools/debugger/gdb/README.dump xen-3.4.0/tools/debugger/gdb/README +--- xen-3.4.0/tools/debugger/gdb/README.dump 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/debugger/gdb/README 2009-05-20 17:03:26.000000000 +0200 +@@ -33,6 +33,6 @@ To debug a crashed domU guest: + 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before + starting xend. + 2. When the domain crashes, a core file is written to +- '/var/xen/dump/..core'. ++ '/var/lib/xen/dump/..core'. + 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. + 4. Connect to the server as for a running guest. +diff -up xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py 2009-05-20 17:03:56.000000000 +0200 +@@ -2096,7 +2096,7 @@ class XendDomainInfo: + + if not corefile: + this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) +- corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time, ++ corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time, + self.info['name_label'], self.domid) - if os.path.isdir(corefile): -Only in xen-3.3.0-new/tools/python/xen/xend: XendDomainInfo.py.orig + if os.path.isdir(corefile): xen-initscript.patch: Index: xen-initscript.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-initscript.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- xen-initscript.patch 29 Aug 2008 11:11:47 -0000 1.11 +++ xen-initscript.patch 27 May 2009 16:24:01 -0000 1.12 @@ -1,468 +1,7 @@ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/blktapctrl xen-3.2.0.new/tools/examples/init.d/blktapctrl ---- xen-3.2.0.orig/tools/examples/init.d/blktapctrl 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/blktapctrl 2008-02-01 17:45:49.000000000 -0500 -@@ -0,0 +1,80 @@ -+#!/bin/bash -+# -+# blktapctrl Script to start the Xen blktapctrl daemon -+# -+# Author: Daniel Berrange -+# -+# chkconfig: 2345 97 01 -+# description: Starts and stops the Xen blktapctrl daemon. -+### BEGIN INIT INFO -+# Provides: blktapctrl -+# Required-Start: $syslog $remote_fs -+# Should-Start: -+# Required-Stop: $syslog $remote_fs -+# Should-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 -+# Default-Enabled: yes -+# Short-Description: Start/stop blktapctrl -+# Description: Starts and stops the Xen blktapctrl daemon -+### END INIT INFO -+ -+# Source function library. -+. /etc/rc.d/init.d/functions -+ -+if [ ! -d /proc/xen ]; then -+ exit 0 -+fi -+if ! grep -q "control_d" /proc/xen/capabilities ; then -+ exit 0 -+fi -+ -+# Default config params -+BLKTAPCTRL_ARGS= -+ -+# User customized params -+test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl -+ -+start() { -+ echo -n $"Starting xen blktapctrl daemon: " -+ /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl -+} -+ -+stop() { -+ echo -n $"Stoping xen blktapctrl daemon: " -+ # Refuse to stop blktapctrl as it'll kill all guests -+ RETVAL=1 -+ echo_failure -+ echo -+} -+ -+rcstatus() { -+ status blktapctrl -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+ -+RETVAL=0 -+case "$1" in -+ start) -+ start -+ ;; -+ stop) -+ stop -+ ;; -+ status) -+ rcstatus -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status}" -+ exit 1 -+esac -+ -+exit $RETVAL -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.blktapctrl xen-3.2.0.new/tools/examples/init.d/sysconfig.blktapctrl ---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.blktapctrl 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.blktapctrl 2008-02-01 17:49:46.000000000 -0500 -@@ -0,0 +1 @@ -+#BLKTAPCTRL_ARGS= -diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenconsoled xen-3.2.0.new/tools/examples/init.d/sysconfig.xenconsoled ---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenconsoled 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.xenconsoled 2008-02-01 17:49:56.000000000 -0500 -@@ -0,0 +1,12 @@ -+ -+# Log all hypervisor messages (cf xm dmesg) -+#XENCONSOLED_LOG_HYPERVISOR=no -+ -+# Log all guest console output (cf xm console) -+#XENCONSOLED_LOG_GUESTS=no -+ -+# Location to store guest & hypervisor logs -+#XENCONSOLED_LOG_DIR=/var/log/xen/console -+ -+#XENCONSOLED_ARGS= -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenstored xen-3.2.0.new/tools/examples/init.d/sysconfig.xenstored ---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenstored 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.xenstored 2008-02-01 17:50:02.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+#XENSTORED_PID="/var/run/xenstore.pid" -+#XENSTORED_ARGS= -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/xenconsoled xen-3.2.0.new/tools/examples/init.d/xenconsoled ---- xen-3.2.0.orig/tools/examples/init.d/xenconsoled 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/xenconsoled 2008-02-01 18:07:00.000000000 -0500 -@@ -0,0 +1,121 @@ -+#!/bin/bash -+# -+# xenconsoled Script to start and stop the Xen xenconsoled daemon -+# -+# Author: Daniel P. Berrange -+# -+# chkconfig: 2345 97 01 -+# description: Starts and stops the Xen control daemon. -+### BEGIN INIT INFO -+# Provides: xenconsoled -+# Required-Start: $syslog $remote_fs -+# Should-Start: -+# Required-Stop: $syslog $remote_fs -+# Should-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 -+# Default-Enabled: yes -+# Short-Description: Start/stop xenconsoled -+# Description: Starts and stops the Xen xenconsoled daemon. -+### END INIT INFO -+ -+# Source function library. -+. /etc/rc.d/init.d/functions -+ -+if [ ! -d /proc/xen ]; then -+ exit 0 -+fi -+if ! grep -q "control_d" /proc/xen/capabilities ; then -+ exit 0 -+fi -+ -+# Default config params -+XENCONSOLED_LOG_HYPERVISOR=no -+XENCONSOLED_LOG_GUESTS=no -+XENCONSOLED_LOG_DIR=/var/log/xen/console -+XENCONSOLED_ARGS= -+ -+# User customized params -+test -f /etc/sysconfig/xenconsoled && . /etc/sysconfig/xenconsoled -+ -+XENCONSOLED_LOG=none -+if [ "$XENCONSOLED_LOG_HYPERVISOR" = "yes" ] -+then -+ if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] -+ then -+ XENCONSOLED_LOG=all -+ else -+ XENCONSOLED_LOG=hv -+ fi -+else -+ if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] -+ then -+ XENCONSOLED_LOG=guest -+ fi -+fi -+ -+start() { -+ echo -n $"Starting xenconsoled daemon: " -+ /usr/sbin/xenconsoled --log=$XENCONSOLED_LOG --log-dir=$XENCONSOLED_LOG_DIR $XENCONSOLED_ARGS -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenconsoled -+} -+ -+stop() { -+ echo -n $"Stopping xenconsoled daemon: " -+ killproc xenconsoled > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenconsoled -+} -+ -+rcstatus() { -+ status xenconsoled -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+reload() { -+ echo -n $"Reloading xenconsoled daemon: " -+ killproc xenconsoled -HUP > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+RETVAL=0 -+case "$1" in -+ start) -+ start -+ ;; -+ stop) -+ stop -+ ;; -+ status) -+ rcstatus -+ ;; -+ reload) -+ reload -+ ;; -+ restart|force-reload) -+ stop -+ start -+ ;; -+ condrestart) -+ if [ -f /var/lock/subsys/xenconsoled ] -+ then -+ stop -+ start -+ fi -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" -+ exit 1 -+esac -+ -+exit $RETVAL -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/xend xen-3.2.0.new/tools/examples/init.d/xend ---- xen-3.2.0.orig/tools/examples/init.d/xend 2008-02-01 17:13:01.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/xend 2008-02-01 17:45:22.000000000 -0500 -@@ -19,48 +19,79 @@ - # Description: Starts and stops the Xen control daemon. - ### END INIT INFO - -+# Source function library. -+. /etc/rc.d/init.d/functions -+ -+if [ ! -d /proc/xen ]; then -+ exit 0 -+fi - if ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 - fi - --# Wait for Xend to be up --function await_daemons_up --{ -- i=1 -- rets=10 -- xend status -- while [ $? -ne 0 -a $i -lt $rets ]; do -- sleep 1 -- echo -n . -- i=$(($i + 1)) -- xend status -- done -+# Default config params -+start() { -+ echo -n $"Starting xend daemon: " -+ /usr/sbin/xend -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xend -+} -+ -+stop() { -+ echo -n $"Stopping xend daemon: " -+ killproc xend > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xend - } - -+rcstatus() { -+ status xend -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+reload() { -+ echo -n $"Reloading xend daemon: " -+ killproc xend -HUP > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+RETVAL=0 - case "$1" in - start) -- xend start -- await_daemons_up -+ start - ;; - stop) -- xend stop -+ stop - ;; - status) -- xend status -+ rcstatus - ;; - reload) -- xend reload -+ reload - ;; - restart|force-reload) -- xend restart -- await_daemons_up -+ stop -+ start - ;; -+ condrestart) -+ if [ -f /var/lock/subsys/xend ] -+ then -+ stop -+ start -+ fi -+ ;; - *) -- # do not advertise unreasonable commands that there is no reason -- # to use with this device -- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}" -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" - exit 1 - esac - --exit $? -+exit $RETVAL - -diff -rupN xen-3.2.0.orig/tools/examples/init.d/xenstored xen-3.2.0.new/tools/examples/init.d/xenstored ---- xen-3.2.0.orig/tools/examples/init.d/xenstored 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/xenstored 2008-02-01 18:06:42.000000000 -0500 -@@ -0,0 +1,83 @@ -+#!/bin/bash -+# -+# xenstored Script to start and stop the Xen control daemon. -+# -+# Author: Daniel Berrange >sys.stderr, result[1] -- sys.exit(1) -- sys.path.append(result[1]) - from xen.xend.server import SrvDaemon -class CheckError(ValueError): @@ -612,10 +143,10 @@ diff -rup xen-3.3.0.orig/tools/misc/xend if __name__ == '__main__': sys.exit(main()) -diff -rup xen-3.3.0.orig/tools/python/xen/xend/osdep.py xen-3.3.0.new/tools/python/xen/xend/osdep.py ---- xen-3.3.0.orig/tools/python/xen/xend/osdep.py 2008-08-22 10:49:08.000000000 +0100 -+++ xen-3.3.0.new/tools/python/xen/xend/osdep.py 2008-08-29 11:08:54.000000000 +0100 -@@ -26,7 +26,7 @@ _scripts_dir = { +diff -up xen-3.4.0/tools/python/xen/xend/osdep.py.fix xen-3.4.0/tools/python/xen/xend/osdep.py +--- xen-3.4.0/tools/python/xen/xend/osdep.py.fix 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/python/xen/xend/osdep.py 2009-05-20 15:39:18.000000000 +0200 +@@ -27,7 +27,7 @@ _scripts_dir = { _xend_autorestart = { "NetBSD": True, @@ -624,10 +155,10 @@ diff -rup xen-3.3.0.orig/tools/python/xe "SunOS": False, } -diff -rup xen-3.3.0.orig/tools/python/xen/xend/server/SrvDaemon.py xen-3.3.0.new/tools/python/xen/xend/server/SrvDaemon.py ---- xen-3.3.0.orig/tools/python/xen/xend/server/SrvDaemon.py 2008-08-22 10:49:08.000000000 +0100 -+++ xen-3.3.0.new/tools/python/xen/xend/server/SrvDaemon.py 2008-08-29 11:08:54.000000000 +0100 -@@ -109,7 +109,14 @@ class Daemon: +diff -up xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py +--- xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py 2009-05-20 15:39:18.000000000 +0200 +@@ -110,7 +110,14 @@ class Daemon: # Fork, this allows the group leader to exit, # which means the child can never again regain control of the # terminal xen-net-disable-iptables-on-bridge.patch: Index: xen-net-disable-iptables-on-bridge.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-iptables-on-bridge.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- xen-net-disable-iptables-on-bridge.patch 29 Aug 2008 11:11:47 -0000 1.3 +++ xen-net-disable-iptables-on-bridge.patch 27 May 2009 16:24:01 -0000 1.4 @@ -1,6 +1,5 @@ -diff -rup xen-3.3.0-orig/tools/examples/vif-bridge xen-3.3.0-new/tools/examples/vif-bridge ---- xen-3.3.0-orig/tools/examples/vif-bridge 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/examples/vif-bridge 2008-08-29 11:29:38.000000000 +0100 +--- xen-3.3.0-orig/tools/hotplug/Linux/vif-bridge 2008-08-22 10:49:07.000000000 +0100 ++++ xen-3.3.0-new/tools/hotplug/Linux/vif-bridge 2008-08-29 11:29:38.000000000 +0100 @@ -91,8 +91,6 @@ case "$command" in ;; esac @@ -10,9 +9,8 @@ diff -rup xen-3.3.0-orig/tools/examples/ log debug "Successful vif-bridge $command for $vif, bridge $bridge." if [ "$command" == "online" ] then -diff -rup xen-3.3.0-orig/tools/examples/xen-network-common.sh xen-3.3.0-new/tools/examples/xen-network-common.sh ---- xen-3.3.0-orig/tools/examples/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/examples/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100 +--- xen-3.3.0-orig/tools/hotplug/Linux/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100 ++++ xen-3.3.0-new/tools/hotplug/Linux/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100 @@ -99,6 +99,13 @@ create_bridge () { brctl addbr ${bridge} brctl stp ${bridge} off Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -p -r1.236 -r1.237 --- xen.spec 10 Mar 2009 12:15:50 -0000 1.236 +++ xen.spec 27 May 2009 16:24:01 -0000 1.237 @@ -1,91 +1,42 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Always set these 3 tags -%define base_version 3.3.1 -%define base_release 11 - # Hypervisor ABI -%define hv_abi 3.3 -# Whether to build -hypervisor pacakges -%define hv_build 1 - -# For testing upstream dev trees run either -# hg archive -t tgz ../xen-unstable-[changeset].tgz -# Or -# hg archive -t tgz ../xen-3.1-testing-[changeset].tgz -# -# And set 'base_version' the release number that the current -# dev tree is targetted to become, - -# For dev trees, also set the changeset synced to -#define changeset 16701 - -# Name of the tree (ie the arg to hg archive, without .tgz suffix) -#define tree unstable -#define tree 3.1-testing - -# If upstream tree is also in release candidate stage, add this tag -#define relcandidate 5 - - - -# Don't change the following - they're all set based on the above params -# -# For prod RPMs we end up with a -# xen-3.1.2-1.fc9.i686.rpm -# -# For dev RPMs we end up with a -# xen-3.2.0-0.fc9.rc1.dev16606.i686.rpm -# -# NB, the leading '0' in the release ensures it is older than -# the first prod RPM for 3.2.0 - - -%define release_prefix %{?changeset:0}%{!?changeset:%{base_release}} -%define release_postfix %{?changeset:%{?relcandidate:.rc%{relcandidate}}.dev%{changeset}.%{base_release}} -%define version_tag %{base_version} -%define release_tag %{release_prefix}%{?dist}%{release_postfix} -%define directory_tag xen-%{?changeset:%{tree}-%{changeset}}%{!?tree:%{base_version}} -%define source_tag %{directory_tag}.tar.gz - +%define hv_abi 3.4 Summary: Xen is a virtual machine monitor Name: xen -Version: %{version_tag} -Release: %{release_tag} +Version: 3.4.0 +Release: 1%{?dist} Group: Development/Libraries License: GPLv2+ and LGPLv2+ and BSD URL: http://xen.org/ -Source0: %{source_tag} +Source0: http://bits.xensource.com/oss-xen/release/3.4.0/xen-3.4.0.tar.gz Source1: %{name}.modules Source2: %{name}.logrotate +Source3: dom0-kernel.repo # used by stubdoms Source10: lwip-1.3.0.tar.gz Source11: newlib-1.16.0.tar.gz Source12: zlib-1.2.3.tar.gz Source13: pciutils-2.2.9.tar.bz2 Source14: grub-0.97.tar.gz +# init.d bits +Source20: init.xenstored +Source21: init.xenconsoled +Source22: init.blktapctrl +Source23: init.xend +# sysconfig bits +Source30: sysconfig.xenstored +Source31: sysconfig.xenconsoled +Source32: sysconfig.blktapctrl + Patch1: xen-initscript.patch -Patch2: xen-initscript-pvops.patch -Patch3: xen-fix-deprecated-warnings.patch -Patch8: xen-xenstore-cli.patch -Patch13: xen-dumpdir.patch -Patch14: xen-net-disable-bridge-by-default.patch -Patch15: xen-net-disable-iptables-on-bridge.patch -Patch16: xen-gcc44-buildfix.patch -Patch17: xen-xenstored-fix.diff -Patch20: xen-backport-hg18782.patch -Patch21: xen-backport-hg19075.patch -Patch22: xen-backport-hg19108.patch -Patch23: xen-backport-hg19109.patch -Patch24: xen-backport-hg19110.patch -Patch30: xen-qemu-dm-unplug.diff - - -# Patches to modify the default config of xend -Patch100: xen-config-dom0-minmem.patch -Patch102: xen-3.0.2-config-allow-unix-server.patch -Patch103: xen-3.0.2-config-disable-reloc.patch +Patch2: xen-fix-deprecated-warnings.patch +Patch3: xen-xenstore-cli.patch +Patch4: xen-dumpdir.patch +Patch5: xen-net-disable-iptables-on-bridge.patch + +Patch100: xen-configure-xend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel @@ -136,7 +87,7 @@ which manage Xen virtual machines. Summary: Core Xen runtime environment Group: Development/Libraries Requires: xen-libs = %{version}-%{release} -Requires: /usr/bin/qemu-img +Requires: /usr/bin/qemu-img /usr/bin/qemu-nbd # Ensure we at least have a suitable kernel installed, though we can't # force user to actually boot it. Requires: xen-hypervisor-abi = %{hv_abi} @@ -146,7 +97,6 @@ This package contains the runtime progra form the core Xen userspace environment. -%if %{hv_build} %package hypervisor Summary: Libraries for Xen tools Group: Development/Libraries @@ -154,7 +104,15 @@ Provides: xen-hypervisor-abi = %{hv_abi} %description hypervisor This package contains the Xen hypervisor -%endif + + +%package doc +Summary: Xen documentation +Group: Development/Libraries + +%description doc +This package contains the Xen documentation. + %package devel Summary: Development libraries for Xen tools @@ -165,140 +123,127 @@ Requires: xen-libs = %{version}-%{releas This package contains what's needed to develop applications which manage Xen virtual machines. + %prep -%setup -q -n %{directory_tag} +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch8 -p1 - -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 - -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 - -cd tools/ioemu-qemu-xen -%patch30 -p1 -cd ../../ +%patch4 -p1 +%patch5 -p1 -# config patches %patch100 -p1 -%patch102 -p1 -%patch103 -p1 # stubdom sources cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom + %build -export XEN_VENDORVERSION="-%{release_tag}" -%if %{hv_build} -CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs xen -%{__make} stubdom -%else -CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs -%{__make} stubdom -%endif +export XEN_VENDORVERSION="-%{release}" +export CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} prefix=/usr dist-xen +make %{?_smp_mflags} prefix=/usr dist-tools +make %{?_smp_mflags} prefix=/usr dist-docs +unset CFLAGS +make dist-stubdom + %install rm -rf %{buildroot} -make XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs install-stubdom -mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain -mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet -mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/migrate -mkdir -p %{buildroot}%{_localstatedir}/lib/xenstored -mkdir -p %{buildroot}%{_localstatedir}/run/xenstored - -rm -rf %{buildroot}%{_sysconfdir}/hotplug - -# install all of the public headers -mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm -mkdir -p %{buildroot}%{_includedir}/xen/arch-x86 %{buildroot}%{_includedir}/xen/xsm -install -m 644 xen/include/public/io/*.h %{buildroot}%{_includedir}/xen/io -install -m 644 xen/include/public/hvm/*.h %{buildroot}%{_includedir}/xen/hvm -install -m 644 xen/include/public/xsm/*.h %{buildroot}%{_includedir}/xen/xsm -install -m 644 xen/include/public/arch-x86/*.h %{buildroot}%{_includedir}/xen/arch-x86 -install -m 644 xen/include/public/*.h %{buildroot}%{_includedir}/xen/ - -%if %{hv_build} -# install the hypervisor -install -d 755 %{buildroot}/boot/ -install -m 644 xen/xen.gz %{buildroot}/boot/xen-%{hv_abi}.gz -install -m 644 xen/xen-syms %{buildroot}/boot/xen-syms-%{hv_abi} -%endif +make DESTDIR=%{buildroot} prefix=/usr install-xen +make DESTDIR=%{buildroot} prefix=/usr install-tools +make DESTDIR=%{buildroot} prefix=/usr install-docs +make DESTDIR=%{buildroot} prefix=/usr install-stubdom -### fixing start-script dir -mkdir -p %{buildroot}%{_sysconfdir}/rc.d -mv -f %{buildroot}%{_sysconfdir}/init.d %{buildroot}%{_sysconfdir}/rc.d/ +############ debug packaging: list files ############ -mv -f %{buildroot}%{_sysconfdir}/udev/xen-backend.rules %{buildroot}%{_sysconfdir}/udev/rules.d/ +find %{buildroot} -print | xargs ls -ld | sed -e 's|.*%{buildroot}||' > f1.list -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules -install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/modules/%{name}.modules +############ kill unwanted stuff ############ -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +# stubdom: newlib +rm -rf %{buildroot}/usr/*-xen-elf + +# hypervisor symlinks +rm -rf %{buildroot}/boot/xen-3.4.gz +rm -rf %{buildroot}/boot/xen-3.gz # silly doc dir fun rm -fr %{buildroot}%{_datadir}/doc/xen rm -rf %{buildroot}%{_datadir}/doc/qemu -# Pointless wrapper -rm -f %{buildroot}%{_libdir}/%{name}/bin/qemu-dm.debug # Pointless helper rm -f %{buildroot}%{_sbindir}/xen-python-path -# Just plain evil -rm -f %{buildroot}%{_sbindir}/netfix - -# Tools that upstream are dropping -# ...replaced by kpartx -rm -f %{buildroot}%{_bindir}/lomount -# ...replaced by any serial console program -rm -f %{buildroot}%{_bindir}/xencons - -# Not built into our Xen kernels -rm -f %{buildroot}%{_bindir}/xenperf -rm -f %{buildroot}%{_sbindir}/xenperf - -# Doesn't work -rm -f %{buildroot}%{_sbindir}/xsview - -# create dirs in /var/run so that selinux contexts are right (#195952) -mkdir -p %{buildroot}%{_localstatedir}/run/xend -mkdir -p %{buildroot}%{_localstatedir}/run/xend/boot -mkdir -p %{buildroot}%{_localstatedir}/log/xen -mkdir -p %{buildroot}%{_localstatedir}/log/xen/console -mkdir -p %{buildroot}%{_localstatedir}/lib/xen/images -# avoid conflicting with qemu (#199759) -rm -f %{buildroot}/%{_mandir}/man*/qemu* - -# Don't duplicate binary already provided in QEMU -rm -f %{buildroot}/%{_bindir}/qemu-img-xen +# qemu stuff (unused or available from upstream) +rm -rf %{buildroot}/usr/share/xen/man +rm -rf %{buildroot}/usr/bin/qemu-*-xen ln -s qemu-img %{buildroot}/%{_bindir}/qemu-img-xen - -# Blow away clashing files -rm -f %{buildroot}/%{_datadir}/xen/man/man1/qemu.1* -rm -f %{buildroot}/%{_datadir}/xen/man/man1/qemu-img.1* - -# blow away unused files -for i in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ - pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ - vgabios.bin vgabios-cirrus.bin video.x +ln -s qemu-img %{buildroot}/%{_bindir}/qemu-nbd-xen +for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ + pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ + vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb do - rm -f %{buildroot}/%{_datadir}/xen/qemu/$i + rm -f %{buildroot}/%{_datadir}/xen/qemu/$file done -# blow away README's not intended for end users +# README's not intended for end users rm -f %{buildroot}/%{_sysconfdir}/xen/README* -#find_lang xen-xm +############ fixup files in /etc ############ + +# udev +rm -rf %{buildroot}/etc/udev/rules.d/xen*.rules +mv %{buildroot}/etc/udev/xen*.rules %{buildroot}/etc/udev/rules.d + +# modules +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/modules/%{name}.modules + +# logrotate +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} + +# init scripts +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +mv %{buildroot}%{_sysconfdir}/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d +rmdir %{buildroot}%{_sysconfdir}/init.d +install -m 755 %{SOURCE20} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenstored +install -m 755 %{SOURCE21} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenconsoled +install -m 755 %{SOURCE22} %{buildroot}%{_sysconfdir}/rc.d/init.d/blktapctrl +install -m 755 %{SOURCE23} %{buildroot}%{_sysconfdir}/rc.d/init.d/xend + +# sysconfig +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/sysconfig/xenstored +install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled +install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl + +############ fixup info files ############ + +mkdir -p %{buildroot}/usr/share/info +mv %{buildroot}/usr/info/*info* %{buildroot}/usr/share/info +rmdir %{buildroot}/usr/info + +############ create dirs in /var ############ + +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/domain +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/vnet +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/migrate +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/images +mkdir -p %{buildroot}%{_localstatedir}/log/xen/console + +############ add pointer to kernels ############ + +mkdir -p %{buildroot}%{_sysconfdir}/yum.repos.d +cp %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d + +############ debug packaging: list files ############ + +find %{buildroot} -print | xargs ls -ld | sed -e 's|.*%{buildroot}||' > f2.list +diff -u f1.list f2.list || true + +############ all done now ############ %post /sbin/chkconfig --add xend @@ -334,29 +279,22 @@ fi %postun libs -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # Base package only contains XenD/xm python stuff #files -f xen-xm.lang %files %defattr(-,root,root) %doc COPYING README -#doc docs/pdf/ -%doc docs/misc/ +%{_bindir}/xencons %{_sbindir}/xend %{_sbindir}/xm -# XenD / xm python code %{python_sitearch}/%{name} -%if 0%fedora > 8 %{python_sitearch}/xen-*.egg-info -%endif %{_mandir}/man1/xm.1* %{_mandir}/man5/xend-config.sxp.5* %{_mandir}/man5/xmdomain.cfg.5* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.dtd - # Startup script %{_sysconfdir}/rc.d/init.d/xend %{_sysconfdir}/rc.d/init.d/xendomains @@ -377,12 +315,14 @@ rm -rf $RPM_BUILD_ROOT %dir %{_localstatedir}/lib/%{name}/xend-db/migrate %dir %{_localstatedir}/lib/%{name}/xend-db/vnet +# pointer to dom0 kernel +%config(noreplace) %{_sysconfdir}/yum.repos.d/dom0-kernel.repo + %files libs %defattr(-,root,root) %{_libdir}/*.so.* %{_libdir}/fs/* - # All runtime stuff except for XenD/xm python stuff %files runtime %defattr(-,root,root) @@ -424,22 +364,20 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/fsimage.so %{python_sitearch}/grub -%if 0%fedora > 8 %{python_sitearch}/pygrub-*.egg-info -%endif # The firmware %ifnarch ia64 # Avoid owning /usr/lib twice on i386 %if "%{_libdir}" != "/usr/lib" %dir /usr/lib/%{name} -%endif %dir /usr/lib/%{name}/bin +/usr/lib/%{name}/bin/stubdom-dm +%endif %dir /usr/lib/%{name}/boot # HVM loader is always in /usr/lib regardless of multilib -/usr/lib/xen/bin/stubdom-dm -/usr/lib/xen/boot/ioemu-stubdom.gz /usr/lib/xen/boot/hvmloader +/usr/lib/xen/boot/ioemu-stubdom.gz /usr/lib/xen/boot/pv-grub*.gz %endif # General Xen state @@ -455,7 +393,7 @@ rm -rf $RPM_BUILD_ROOT %dir %attr(0700,root,root) %{_localstatedir}/run/xend/boot # All xenstore CLI tools -%{_bindir}/qemu-img-xen +%{_bindir}/qemu-*-xen %{_bindir}/xenstore %{_bindir}/xenstore-* %{_bindir}/pygrub @@ -480,18 +418,27 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/xenbaked %{_sbindir}/xenstored %{_sbindir}/xenpm +%{_sbindir}/xenpmd +%{_sbindir}/xenperf +%{_sbindir}/xsview # Xen logfiles %dir %attr(0700,root,root) %{_localstatedir}/log/xen # Guest/HV console logs %dir %attr(0700,root,root) %{_localstatedir}/log/xen/console -%if %{hv_build} %files hypervisor %defattr(-,root,root) /boot/xen-syms-* /boot/xen-*.gz -%endif +/boot/xen.gz + +%files doc +%defattr(-,root,root) +%doc docs/misc/ +%doc dist/install/usr/share/doc/xen/html +%doc dist/install/usr/share/doc/xen/pdf/*.pdf +/usr/share/info/*info* %files devel %defattr(-,root,root) @@ -502,6 +449,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog +* Wed May 27 2009 Gerd Hoffmann - 3.4.0-1 +- update to version 3.4.0. +- cleanup specfile, add doc subpackage. + * Tue Mar 10 2009 Gerd Hoffmann - 3.3.1-11 - fix python 2.6 warnings. --- xen-3.0.2-config-allow-unix-server.patch DELETED --- --- xen-3.0.2-config-disable-reloc.patch DELETED --- --- xen-backport-hg18782.patch DELETED --- --- xen-backport-hg19075.patch DELETED --- --- xen-backport-hg19108.patch DELETED --- --- xen-backport-hg19109.patch DELETED --- --- xen-backport-hg19110.patch DELETED --- --- xen-config-dom0-minmem.patch DELETED --- --- xen-gcc44-buildfix.patch DELETED --- --- xen-initscript-pvops.patch DELETED --- --- xen-net-disable-bridge-by-default.patch DELETED --- From rjones at fedoraproject.org Wed May 27 17:18:49 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 17:18:49 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 libguestfs.spec,1.11,1.12 Message-ID: <20090527171850.2213870110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5389 Modified Files: libguestfs.spec Log Message: Fails to build on PPC. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- libguestfs.spec 27 May 2009 16:19:21 -0000 1.11 +++ libguestfs.spec 27 May 2009 17:18:17 -0000 1.12 @@ -4,13 +4,17 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.34 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ Source0: http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Currently fails on PPC because: +# "No Package Found for kernel" +ExclusiveArch: %{ix86} x86_64 + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -447,6 +451,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 27 2009 Richard Jones - 1.0.34-1.el5.1 +- Fails to build on PPC. + * Wed May 27 2009 Richard Jones - 1.0.34-1 - Backport 1.0.34 from devel to EPEL. - There should now be a working qemu in EPEL (0.10.5). From rjones at fedoraproject.org Wed May 27 17:53:06 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 17:53:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 libguestfs.spec,1.12,1.13 Message-ID: <20090527175306.7458970110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15421 Modified Files: libguestfs.spec Log Message: Fix missing Augeas dependency. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- libguestfs.spec 27 May 2009 17:18:17 -0000 1.12 +++ libguestfs.spec 27 May 2009 17:52:36 -0000 1.13 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.34 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -259,6 +259,7 @@ mkdir -p daemon/m4 mkdir repo find /var/cache/yum/ -type f -name '*.rpm' -print0 | xargs -0 cp -t repo createrepo repo +ls -l repo %define extra --with-mirror=file://$(pwd)/repo --with-repo=epel-5 --with-updates=none %else %define extra %nil @@ -451,8 +452,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed May 27 2009 Richard Jones - 1.0.34-1.el5.1 +* Wed May 27 2009 Richard Jones - 1.0.34-1.el5.2 - Fails to build on PPC. +- Fix missing Augeas dependency. * Wed May 27 2009 Richard Jones - 1.0.34-1 - Backport 1.0.34 from devel to EPEL. From rjones at fedoraproject.org Wed May 27 18:40:47 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Wed, 27 May 2009 18:40:47 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 libguestfs.spec,1.13,1.14 Message-ID: <20090527184047.940A970110@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26026 Modified Files: libguestfs.spec Log Message: Fix missing Augeas dependency. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- libguestfs.spec 27 May 2009 17:52:36 -0000 1.13 +++ libguestfs.spec 27 May 2009 18:40:17 -0000 1.14 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.34 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -19,7 +19,7 @@ ExclusiveArch: %{ix86} x86_64 BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 2.0 -BuildRequires: augeas-devel >= 0.5.0 +#BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel %ifarch %{ix86} x86_64 BuildRequires: qemu-system-x86 >= 0.10.5 @@ -36,10 +36,11 @@ BuildRequires: ncurses-devel # Build requirements for the appliance: # (see 'make-initramfs.sh.in' in the source) BuildRequires: kernel, bash, coreutils, lvm2 -BuildRequires: MAKEDEV, net-tools, augeas-libs, file +BuildRequires: MAKEDEV, net-tools, file BuildRequires: module-init-tools, procps, strace, iputils BuildRequires: dosfstools # Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree +# Not working: augeas-libs %ifarch %{ix86} x86_64 BuildRequires: grub, ntfsprogs %endif @@ -452,7 +453,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed May 27 2009 Richard Jones - 1.0.34-1.el5.2 +* Wed May 27 2009 Richard Jones - 1.0.34-1.el5.3 - Fails to build on PPC. - Fix missing Augeas dependency. From kraxel at fedoraproject.org Wed May 27 20:06:28 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Wed, 27 May 2009 20:06:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/F-11 dom0-kernel.repo, NONE, 1.1 init.blktapctrl, NONE, 1.1 init.xenconsoled, NONE, 1.1 init.xend, NONE, 1.1 init.xenstored, NONE, 1.1 sysconfig.blktapctrl, NONE, 1.1 sysconfig.xenconsoled, NONE, 1.1 sysconfig.xenstored, NONE, 1.1 xen-configure-xend.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 sources, 1.54, 1.55 xen-dumpdir.patch, 1.4, 1.5 xen-initscript.patch, 1.11, 1.12 xen-net-disable-iptables-on-bridge.patch, 1.3, 1.4 xen.spec, 1.236, 1.237 xen-3.0.2-config-allow-unix-server.patch, 1.3, NONE xen-3.0.2-config-disable-reloc.patch, 1.3, NONE xen-backport-hg18782.patch, 1.1, NONE xen-backport-hg19075.patch, 1.1, NONE xen-backport-hg19108.patch, 1.1, NONE xen-backport-hg19109.patch, 1.1, NONE xen-backport-hg19110.patch, 1.1, NONE xen-config-dom0-minmem.patch, 1.3, NONE xen-gcc44-buildfix.patch, 1.1, NONE xen-initscript-pvops.patch, 1.1, NONE xen-net-disable-bridge-by-default.patch, 1.3, NONE Message-ID: <20090527200628.269E970110@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16320 Modified Files: .cvsignore sources xen-dumpdir.patch xen-initscript.patch xen-net-disable-iptables-on-bridge.patch xen.spec Added Files: dom0-kernel.repo init.blktapctrl init.xenconsoled init.xend init.xenstored sysconfig.blktapctrl sysconfig.xenconsoled sysconfig.xenstored xen-configure-xend.patch Removed Files: xen-3.0.2-config-allow-unix-server.patch xen-3.0.2-config-disable-reloc.patch xen-backport-hg18782.patch xen-backport-hg19075.patch xen-backport-hg19108.patch xen-backport-hg19109.patch xen-backport-hg19110.patch xen-config-dom0-minmem.patch xen-gcc44-buildfix.patch xen-initscript-pvops.patch xen-net-disable-bridge-by-default.patch Log Message: update to 3.4.0 --- NEW FILE dom0-kernel.repo --- [dom0-kernel] name=Experimental pv_ops/dom0 kernels for Fedora - $basearch baseurl=http://myoung.fedorapeople.org/dom0/$basearch/ enabled=0 gpgcheck=0 [dom0-kernel-source] name=Experimental pv_ops/dom0 kernels for Fedora - Source baseurl=http://myoung.fedorapeople.org/dom0/src/ enabled=0 gpgcheck=0 --- NEW FILE init.blktapctrl --- #!/bin/bash # # blktapctrl Script to start the Xen blktapctrl daemon # # Author: Daniel Berrange # # chkconfig: 2345 97 01 # description: Starts and stops the Xen blktapctrl daemon. ### BEGIN INIT INFO # Provides: blktapctrl # Required-Start: $syslog $remote_fs # Should-Start: # Required-Stop: $syslog $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Default-Enabled: yes # Short-Description: Start/stop blktapctrl # Description: Starts and stops the Xen blktapctrl daemon ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ ! -d /proc/xen ]; then exit 0 fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi # Default config params BLKTAPCTRL_ARGS= # User customized params test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl start() { echo -n $"Starting xen blktapctrl daemon: " /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl } stop() { echo -n $"Stoping xen blktapctrl daemon: " # blktapctrl is not restartable. So we refuse to stop it # unless the machine is being shutdown or rebooted anyway. if test "$runlevel" = "0" -o "$runlevel" = "6"; then killproc xenstored > /dev/null RETVAL=$? else RETVAL=1 fi test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/blktapctrl } rcstatus() { status blktapctrl RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; *) echo $"Usage: $0 {start|stop|status}" exit 1 esac exit $RETVAL --- NEW FILE init.xenconsoled --- #!/bin/bash # # xenconsoled Script to start and stop the Xen xenconsoled daemon # # Author: Daniel P. Berrange # # chkconfig: 2345 97 01 # description: Starts and stops the Xen control daemon. ### BEGIN INIT INFO # Provides: xenconsoled # Required-Start: $syslog $remote_fs # Should-Start: # Required-Stop: $syslog $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Default-Enabled: yes # Short-Description: Start/stop xenconsoled # Description: Starts and stops the Xen xenconsoled daemon. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ ! -d /proc/xen ]; then exit 0 fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi # Default config params XENCONSOLED_LOG_HYPERVISOR=no XENCONSOLED_LOG_GUESTS=no XENCONSOLED_LOG_DIR=/var/log/xen/console XENCONSOLED_ARGS= # User customized params test -f /etc/sysconfig/xenconsoled && . /etc/sysconfig/xenconsoled XENCONSOLED_LOG=none if [ "$XENCONSOLED_LOG_HYPERVISOR" = "yes" ] then if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] then XENCONSOLED_LOG=all else XENCONSOLED_LOG=hv fi else if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] then XENCONSOLED_LOG=guest fi fi start() { echo -n $"Starting xenconsoled daemon: " /usr/sbin/xenconsoled --log=$XENCONSOLED_LOG --log-dir=$XENCONSOLED_LOG_DIR $XENCONSOLED_ARGS RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenconsoled } stop() { echo -n $"Stopping xenconsoled daemon: " killproc xenconsoled > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenconsoled } rcstatus() { status xenconsoled RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } reload() { echo -n $"Reloading xenconsoled daemon: " killproc xenconsoled -HUP > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; reload) reload ;; restart|force-reload) stop start ;; condrestart) if [ -f /var/lock/subsys/xenconsoled ] then stop start fi ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" exit 1 esac exit $RETVAL --- NEW FILE init.xend --- #!/bin/bash # # xend Script to start and stop the Xen control daemon. # # Author: Keir Fraser # # chkconfig: 2345 98 01 # description: Starts and stops the Xen control daemon. ### BEGIN INIT INFO # Provides: xend # Required-Start: $syslog $remote_fs # Should-Start: # Required-Stop: $syslog $remote_fs # Should-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Default-Enabled: yes # Short-Description: Start/stop xend # Description: Starts and stops the Xen control daemon. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions if [ ! -d /proc/xen ]; then exit 0 fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi # Default config params start() { echo -n $"Starting xend daemon: " /usr/sbin/xend RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xend } stop() { echo -n $"Stopping xend daemon: " killproc xend > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xend } rcstatus() { status xend RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } reload() { echo -n $"Reloading xend daemon: " killproc xend -HUP > /dev/null RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; reload) reload ;; restart|force-reload) stop start ;; condrestart) if [ -f /var/lock/subsys/xend ] then stop start fi ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" exit 1 esac exit $RETVAL --- NEW FILE init.xenstored --- #!/bin/bash # # xenstored Script to start and stop the Xen control daemon. # # Author: Daniel Berrange /dev/null RETVAL=$? else RETVAL=1 fi test $RETVAL = 0 && echo_success || echo_failure echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenstored } rcstatus() { status xenstored RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure echo } RETVAL=0 case "$1" in start) start ;; stop) stop ;; status) rcstatus ;; *) echo $"Usage: $0 {start|stop|status}" exit 1 esac exit $RETVAL --- NEW FILE sysconfig.blktapctrl --- #BLKTAPCTRL_ARGS= --- NEW FILE sysconfig.xenconsoled --- # Log all hypervisor messages (cf xm dmesg) #XENCONSOLED_LOG_HYPERVISOR=no # Log all guest console output (cf xm console) #XENCONSOLED_LOG_GUESTS=no # Location to store guest & hypervisor logs #XENCONSOLED_LOG_DIR=/var/log/xen/console #XENCONSOLED_ARGS= --- NEW FILE sysconfig.xenstored --- #XENSTORED_PID="/var/run/xenstore.pid" #XENSTORED_ARGS= xen-configure-xend.patch: --- NEW FILE xen-configure-xend.patch --- diff -up xen-3.4.0/tools/examples/xend-config.sxp.config xen-3.4.0/tools/examples/xend-config.sxp --- xen-3.4.0/tools/examples/xend-config.sxp.config 2009-05-20 17:12:50.000000000 +0200 +++ xen-3.4.0/tools/examples/xend-config.sxp 2009-05-20 17:15:35.000000000 +0200 @@ -58,11 +58,11 @@ #(xend-http-server no) -#(xend-unix-server no) +(xend-unix-server yes) #(xend-tcp-xmlrpc-server no) #(xend-unix-xmlrpc-server yes) -#(xend-relocation-server no) -(xend-relocation-server yes) +(xend-relocation-server no) +#(xend-relocation-server yes) #(xend-relocation-ssl-server no) #(xend-udev-event-server no) @@ -154,7 +154,8 @@ # two fake interfaces per guest domain. To do things like this, write # yourself a wrapper script, and call network-bridge from it, as appropriate. # -(network-script network-bridge) +#(network-script network-bridge) +(network-script /bin/true) # The script used to control virtual interfaces. This can be overridden on a # per-vif basis when creating a domain or a configuring a new vif. The @@ -186,7 +187,7 @@ # dom0-min-mem is the lowest permissible memory level (in MB) for dom0. # This is a minimum both for auto-ballooning (as enabled by # enable-dom0-ballooning below) and for xm mem-set when applied to dom0. -(dom0-min-mem 196) +(dom0-min-mem 256) # Whether to enable auto-ballooning of dom0 to allow domUs to be created. # If enable-dom0-ballooning = no, dom0 will never balloon out. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-11/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- .cvsignore 8 Jan 2009 20:18:01 -0000 1.39 +++ .cvsignore 27 May 2009 20:05:56 -0000 1.40 @@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz lwip-1.3.0.tar.gz pciutils-2.2.9.tar.bz2 zlib-1.2.3.tar.gz -xen-3.3.1.tar.gz +xen-3.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-11/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- sources 8 Jan 2009 20:18:01 -0000 1.54 +++ sources 27 May 2009 20:05:57 -0000 1.55 @@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4 newlib 36cc57650cffda9a0269493be2a169bb lwip-1.3.0.tar.gz cec05e7785497c5e19da2f114b934ffd pciutils-2.2.9.tar.bz2 debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz -77a61e08875625394ef6bf80e595ffa1 xen-3.3.1.tar.gz +bf1b29f07ec2c12673779600aea183b2 xen-3.4.0.tar.gz xen-dumpdir.patch: Index: xen-dumpdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-11/xen-dumpdir.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- xen-dumpdir.patch 29 Aug 2008 11:11:46 -0000 1.4 +++ xen-dumpdir.patch 27 May 2009 20:05:57 -0000 1.5 @@ -1,18 +1,7 @@ -diff -rup xen-3.3.0-orig/tools/debugger/gdb/README xen-3.3.0-new/tools/debugger/gdb/README ---- xen-3.3.0-orig/tools/debugger/gdb/README 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/debugger/gdb/README 2008-08-29 11:27:13.000000000 +0100 -@@ -33,6 +33,6 @@ To debug a crashed domU guest: - 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before - starting xend. - 2. When the domain crashes, a core file is written to -- '/var/xen/dump/..core'. -+ '/var/lib/xen/dump/..core'. - 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. - 4. Connect to the server as for a running guest. -diff -rup xen-3.3.0-orig/tools/Makefile xen-3.3.0-new/tools/Makefile ---- xen-3.3.0-orig/tools/Makefile 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/Makefile 2008-08-29 11:27:42.000000000 +0100 -@@ -49,7 +49,7 @@ all: subdirs-all +diff -up xen-3.4.0/tools/Makefile.dump xen-3.4.0/tools/Makefile +--- xen-3.4.0/tools/Makefile.dump 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/Makefile 2009-05-20 17:03:26.000000000 +0200 +@@ -46,7 +46,7 @@ all: subdirs-all .PHONY: install install: subdirs-install @@ -21,16 +10,26 @@ diff -rup xen-3.3.0-orig/tools/Makefile $(INSTALL_DIR) $(DESTDIR)/var/log/xen $(INSTALL_DIR) $(DESTDIR)/var/lib/xen -diff -rup xen-3.3.0-orig/tools/python/xen/xend/XendDomainInfo.py xen-3.3.0-new/tools/python/xen/xend/XendDomainInfo.py ---- xen-3.3.0-orig/tools/python/xen/xend/XendDomainInfo.py 2008-08-22 10:49:08.000000000 +0100 -+++ xen-3.3.0-new/tools/python/xen/xend/XendDomainInfo.py 2008-08-29 11:27:14.000000000 +0100 -@@ -1843,7 +1843,7 @@ class XendDomainInfo: - try: - if not corefile: - this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) -- corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time, -+ corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time, - self.info['name_label'], self.domid) +diff -up xen-3.4.0/tools/debugger/gdb/README.dump xen-3.4.0/tools/debugger/gdb/README +--- xen-3.4.0/tools/debugger/gdb/README.dump 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/debugger/gdb/README 2009-05-20 17:03:26.000000000 +0200 +@@ -33,6 +33,6 @@ To debug a crashed domU guest: + 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before + starting xend. + 2. When the domain crashes, a core file is written to +- '/var/xen/dump/..core'. ++ '/var/lib/xen/dump/..core'. + 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. + 4. Connect to the server as for a running guest. +diff -up xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py 2009-05-20 17:03:56.000000000 +0200 +@@ -2096,7 +2096,7 @@ class XendDomainInfo: + + if not corefile: + this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) +- corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time, ++ corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time, + self.info['name_label'], self.domid) - if os.path.isdir(corefile): -Only in xen-3.3.0-new/tools/python/xen/xend: XendDomainInfo.py.orig + if os.path.isdir(corefile): xen-initscript.patch: Index: xen-initscript.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-11/xen-initscript.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- xen-initscript.patch 29 Aug 2008 11:11:47 -0000 1.11 +++ xen-initscript.patch 27 May 2009 20:05:57 -0000 1.12 @@ -1,468 +1,7 @@ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/blktapctrl xen-3.2.0.new/tools/examples/init.d/blktapctrl ---- xen-3.2.0.orig/tools/examples/init.d/blktapctrl 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/blktapctrl 2008-02-01 17:45:49.000000000 -0500 -@@ -0,0 +1,80 @@ -+#!/bin/bash -+# -+# blktapctrl Script to start the Xen blktapctrl daemon -+# -+# Author: Daniel Berrange -+# -+# chkconfig: 2345 97 01 -+# description: Starts and stops the Xen blktapctrl daemon. -+### BEGIN INIT INFO -+# Provides: blktapctrl -+# Required-Start: $syslog $remote_fs -+# Should-Start: -+# Required-Stop: $syslog $remote_fs -+# Should-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 -+# Default-Enabled: yes -+# Short-Description: Start/stop blktapctrl -+# Description: Starts and stops the Xen blktapctrl daemon -+### END INIT INFO -+ -+# Source function library. -+. /etc/rc.d/init.d/functions -+ -+if [ ! -d /proc/xen ]; then -+ exit 0 -+fi -+if ! grep -q "control_d" /proc/xen/capabilities ; then -+ exit 0 -+fi -+ -+# Default config params -+BLKTAPCTRL_ARGS= -+ -+# User customized params -+test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl -+ -+start() { -+ echo -n $"Starting xen blktapctrl daemon: " -+ /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl -+} -+ -+stop() { -+ echo -n $"Stoping xen blktapctrl daemon: " -+ # Refuse to stop blktapctrl as it'll kill all guests -+ RETVAL=1 -+ echo_failure -+ echo -+} -+ -+rcstatus() { -+ status blktapctrl -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+ -+RETVAL=0 -+case "$1" in -+ start) -+ start -+ ;; -+ stop) -+ stop -+ ;; -+ status) -+ rcstatus -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status}" -+ exit 1 -+esac -+ -+exit $RETVAL -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.blktapctrl xen-3.2.0.new/tools/examples/init.d/sysconfig.blktapctrl ---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.blktapctrl 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.blktapctrl 2008-02-01 17:49:46.000000000 -0500 -@@ -0,0 +1 @@ -+#BLKTAPCTRL_ARGS= -diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenconsoled xen-3.2.0.new/tools/examples/init.d/sysconfig.xenconsoled ---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenconsoled 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.xenconsoled 2008-02-01 17:49:56.000000000 -0500 -@@ -0,0 +1,12 @@ -+ -+# Log all hypervisor messages (cf xm dmesg) -+#XENCONSOLED_LOG_HYPERVISOR=no -+ -+# Log all guest console output (cf xm console) -+#XENCONSOLED_LOG_GUESTS=no -+ -+# Location to store guest & hypervisor logs -+#XENCONSOLED_LOG_DIR=/var/log/xen/console -+ -+#XENCONSOLED_ARGS= -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenstored xen-3.2.0.new/tools/examples/init.d/sysconfig.xenstored ---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenstored 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.xenstored 2008-02-01 17:50:02.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+#XENSTORED_PID="/var/run/xenstore.pid" -+#XENSTORED_ARGS= -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/xenconsoled xen-3.2.0.new/tools/examples/init.d/xenconsoled ---- xen-3.2.0.orig/tools/examples/init.d/xenconsoled 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/xenconsoled 2008-02-01 18:07:00.000000000 -0500 -@@ -0,0 +1,121 @@ -+#!/bin/bash -+# -+# xenconsoled Script to start and stop the Xen xenconsoled daemon -+# -+# Author: Daniel P. Berrange -+# -+# chkconfig: 2345 97 01 -+# description: Starts and stops the Xen control daemon. -+### BEGIN INIT INFO -+# Provides: xenconsoled -+# Required-Start: $syslog $remote_fs -+# Should-Start: -+# Required-Stop: $syslog $remote_fs -+# Should-Stop: -+# Default-Start: 3 4 5 -+# Default-Stop: 0 1 2 6 -+# Default-Enabled: yes -+# Short-Description: Start/stop xenconsoled -+# Description: Starts and stops the Xen xenconsoled daemon. -+### END INIT INFO -+ -+# Source function library. -+. /etc/rc.d/init.d/functions -+ -+if [ ! -d /proc/xen ]; then -+ exit 0 -+fi -+if ! grep -q "control_d" /proc/xen/capabilities ; then -+ exit 0 -+fi -+ -+# Default config params -+XENCONSOLED_LOG_HYPERVISOR=no -+XENCONSOLED_LOG_GUESTS=no -+XENCONSOLED_LOG_DIR=/var/log/xen/console -+XENCONSOLED_ARGS= -+ -+# User customized params -+test -f /etc/sysconfig/xenconsoled && . /etc/sysconfig/xenconsoled -+ -+XENCONSOLED_LOG=none -+if [ "$XENCONSOLED_LOG_HYPERVISOR" = "yes" ] -+then -+ if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] -+ then -+ XENCONSOLED_LOG=all -+ else -+ XENCONSOLED_LOG=hv -+ fi -+else -+ if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ] -+ then -+ XENCONSOLED_LOG=guest -+ fi -+fi -+ -+start() { -+ echo -n $"Starting xenconsoled daemon: " -+ /usr/sbin/xenconsoled --log=$XENCONSOLED_LOG --log-dir=$XENCONSOLED_LOG_DIR $XENCONSOLED_ARGS -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenconsoled -+} -+ -+stop() { -+ echo -n $"Stopping xenconsoled daemon: " -+ killproc xenconsoled > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenconsoled -+} -+ -+rcstatus() { -+ status xenconsoled -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+reload() { -+ echo -n $"Reloading xenconsoled daemon: " -+ killproc xenconsoled -HUP > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+RETVAL=0 -+case "$1" in -+ start) -+ start -+ ;; -+ stop) -+ stop -+ ;; -+ status) -+ rcstatus -+ ;; -+ reload) -+ reload -+ ;; -+ restart|force-reload) -+ stop -+ start -+ ;; -+ condrestart) -+ if [ -f /var/lock/subsys/xenconsoled ] -+ then -+ stop -+ start -+ fi -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" -+ exit 1 -+esac -+ -+exit $RETVAL -+ -diff -rupN xen-3.2.0.orig/tools/examples/init.d/xend xen-3.2.0.new/tools/examples/init.d/xend ---- xen-3.2.0.orig/tools/examples/init.d/xend 2008-02-01 17:13:01.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/xend 2008-02-01 17:45:22.000000000 -0500 -@@ -19,48 +19,79 @@ - # Description: Starts and stops the Xen control daemon. - ### END INIT INFO - -+# Source function library. -+. /etc/rc.d/init.d/functions -+ -+if [ ! -d /proc/xen ]; then -+ exit 0 -+fi - if ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 - fi - --# Wait for Xend to be up --function await_daemons_up --{ -- i=1 -- rets=10 -- xend status -- while [ $? -ne 0 -a $i -lt $rets ]; do -- sleep 1 -- echo -n . -- i=$(($i + 1)) -- xend status -- done -+# Default config params -+start() { -+ echo -n $"Starting xend daemon: " -+ /usr/sbin/xend -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xend -+} -+ -+stop() { -+ echo -n $"Stopping xend daemon: " -+ killproc xend > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xend - } - -+rcstatus() { -+ status xend -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+reload() { -+ echo -n $"Reloading xend daemon: " -+ killproc xend -HUP > /dev/null -+ RETVAL=$? -+ test $RETVAL = 0 && echo_success || echo_failure -+ echo -+} -+ -+RETVAL=0 - case "$1" in - start) -- xend start -- await_daemons_up -+ start - ;; - stop) -- xend stop -+ stop - ;; - status) -- xend status -+ rcstatus - ;; - reload) -- xend reload -+ reload - ;; - restart|force-reload) -- xend restart -- await_daemons_up -+ stop -+ start - ;; -+ condrestart) -+ if [ -f /var/lock/subsys/xend ] -+ then -+ stop -+ start -+ fi -+ ;; - *) -- # do not advertise unreasonable commands that there is no reason -- # to use with this device -- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}" -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" - exit 1 - esac - --exit $? -+exit $RETVAL - -diff -rupN xen-3.2.0.orig/tools/examples/init.d/xenstored xen-3.2.0.new/tools/examples/init.d/xenstored ---- xen-3.2.0.orig/tools/examples/init.d/xenstored 1969-12-31 19:00:00.000000000 -0500 -+++ xen-3.2.0.new/tools/examples/init.d/xenstored 2008-02-01 18:06:42.000000000 -0500 -@@ -0,0 +1,83 @@ -+#!/bin/bash -+# -+# xenstored Script to start and stop the Xen control daemon. -+# -+# Author: Daniel Berrange >sys.stderr, result[1] -- sys.exit(1) -- sys.path.append(result[1]) - from xen.xend.server import SrvDaemon -class CheckError(ValueError): @@ -612,10 +143,10 @@ diff -rup xen-3.3.0.orig/tools/misc/xend if __name__ == '__main__': sys.exit(main()) -diff -rup xen-3.3.0.orig/tools/python/xen/xend/osdep.py xen-3.3.0.new/tools/python/xen/xend/osdep.py ---- xen-3.3.0.orig/tools/python/xen/xend/osdep.py 2008-08-22 10:49:08.000000000 +0100 -+++ xen-3.3.0.new/tools/python/xen/xend/osdep.py 2008-08-29 11:08:54.000000000 +0100 -@@ -26,7 +26,7 @@ _scripts_dir = { +diff -up xen-3.4.0/tools/python/xen/xend/osdep.py.fix xen-3.4.0/tools/python/xen/xend/osdep.py +--- xen-3.4.0/tools/python/xen/xend/osdep.py.fix 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/python/xen/xend/osdep.py 2009-05-20 15:39:18.000000000 +0200 +@@ -27,7 +27,7 @@ _scripts_dir = { _xend_autorestart = { "NetBSD": True, @@ -624,10 +155,10 @@ diff -rup xen-3.3.0.orig/tools/python/xe "SunOS": False, } -diff -rup xen-3.3.0.orig/tools/python/xen/xend/server/SrvDaemon.py xen-3.3.0.new/tools/python/xen/xend/server/SrvDaemon.py ---- xen-3.3.0.orig/tools/python/xen/xend/server/SrvDaemon.py 2008-08-22 10:49:08.000000000 +0100 -+++ xen-3.3.0.new/tools/python/xen/xend/server/SrvDaemon.py 2008-08-29 11:08:54.000000000 +0100 -@@ -109,7 +109,14 @@ class Daemon: +diff -up xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py +--- xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix 2009-05-18 13:05:38.000000000 +0200 ++++ xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py 2009-05-20 15:39:18.000000000 +0200 +@@ -110,7 +110,14 @@ class Daemon: # Fork, this allows the group leader to exit, # which means the child can never again regain control of the # terminal xen-net-disable-iptables-on-bridge.patch: Index: xen-net-disable-iptables-on-bridge.patch =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-11/xen-net-disable-iptables-on-bridge.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- xen-net-disable-iptables-on-bridge.patch 29 Aug 2008 11:11:47 -0000 1.3 +++ xen-net-disable-iptables-on-bridge.patch 27 May 2009 20:05:57 -0000 1.4 @@ -1,6 +1,5 @@ -diff -rup xen-3.3.0-orig/tools/examples/vif-bridge xen-3.3.0-new/tools/examples/vif-bridge ---- xen-3.3.0-orig/tools/examples/vif-bridge 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/examples/vif-bridge 2008-08-29 11:29:38.000000000 +0100 +--- xen-3.3.0-orig/tools/hotplug/Linux/vif-bridge 2008-08-22 10:49:07.000000000 +0100 ++++ xen-3.3.0-new/tools/hotplug/Linux/vif-bridge 2008-08-29 11:29:38.000000000 +0100 @@ -91,8 +91,6 @@ case "$command" in ;; esac @@ -10,9 +9,8 @@ diff -rup xen-3.3.0-orig/tools/examples/ log debug "Successful vif-bridge $command for $vif, bridge $bridge." if [ "$command" == "online" ] then -diff -rup xen-3.3.0-orig/tools/examples/xen-network-common.sh xen-3.3.0-new/tools/examples/xen-network-common.sh ---- xen-3.3.0-orig/tools/examples/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100 -+++ xen-3.3.0-new/tools/examples/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100 +--- xen-3.3.0-orig/tools/hotplug/Linux/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100 ++++ xen-3.3.0-new/tools/hotplug/Linux/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100 @@ -99,6 +99,13 @@ create_bridge () { brctl addbr ${bridge} brctl stp ${bridge} off Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/F-11/xen.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -p -r1.236 -r1.237 --- xen.spec 10 Mar 2009 12:15:50 -0000 1.236 +++ xen.spec 27 May 2009 20:05:57 -0000 1.237 @@ -1,91 +1,42 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# Always set these 3 tags -%define base_version 3.3.1 -%define base_release 11 - # Hypervisor ABI -%define hv_abi 3.3 -# Whether to build -hypervisor pacakges -%define hv_build 1 - -# For testing upstream dev trees run either -# hg archive -t tgz ../xen-unstable-[changeset].tgz -# Or -# hg archive -t tgz ../xen-3.1-testing-[changeset].tgz -# -# And set 'base_version' the release number that the current -# dev tree is targetted to become, - -# For dev trees, also set the changeset synced to -#define changeset 16701 - -# Name of the tree (ie the arg to hg archive, without .tgz suffix) -#define tree unstable -#define tree 3.1-testing - -# If upstream tree is also in release candidate stage, add this tag -#define relcandidate 5 - - - -# Don't change the following - they're all set based on the above params -# -# For prod RPMs we end up with a -# xen-3.1.2-1.fc9.i686.rpm -# -# For dev RPMs we end up with a -# xen-3.2.0-0.fc9.rc1.dev16606.i686.rpm -# -# NB, the leading '0' in the release ensures it is older than -# the first prod RPM for 3.2.0 - - -%define release_prefix %{?changeset:0}%{!?changeset:%{base_release}} -%define release_postfix %{?changeset:%{?relcandidate:.rc%{relcandidate}}.dev%{changeset}.%{base_release}} -%define version_tag %{base_version} -%define release_tag %{release_prefix}%{?dist}%{release_postfix} -%define directory_tag xen-%{?changeset:%{tree}-%{changeset}}%{!?tree:%{base_version}} -%define source_tag %{directory_tag}.tar.gz - +%define hv_abi 3.4 Summary: Xen is a virtual machine monitor Name: xen -Version: %{version_tag} -Release: %{release_tag} +Version: 3.4.0 +Release: 1%{?dist} Group: Development/Libraries License: GPLv2+ and LGPLv2+ and BSD URL: http://xen.org/ -Source0: %{source_tag} +Source0: http://bits.xensource.com/oss-xen/release/3.4.0/xen-3.4.0.tar.gz Source1: %{name}.modules Source2: %{name}.logrotate +Source3: dom0-kernel.repo # used by stubdoms Source10: lwip-1.3.0.tar.gz Source11: newlib-1.16.0.tar.gz Source12: zlib-1.2.3.tar.gz Source13: pciutils-2.2.9.tar.bz2 Source14: grub-0.97.tar.gz +# init.d bits +Source20: init.xenstored +Source21: init.xenconsoled +Source22: init.blktapctrl +Source23: init.xend +# sysconfig bits +Source30: sysconfig.xenstored +Source31: sysconfig.xenconsoled +Source32: sysconfig.blktapctrl + Patch1: xen-initscript.patch -Patch2: xen-initscript-pvops.patch -Patch3: xen-fix-deprecated-warnings.patch -Patch8: xen-xenstore-cli.patch -Patch13: xen-dumpdir.patch -Patch14: xen-net-disable-bridge-by-default.patch -Patch15: xen-net-disable-iptables-on-bridge.patch -Patch16: xen-gcc44-buildfix.patch -Patch17: xen-xenstored-fix.diff -Patch20: xen-backport-hg18782.patch -Patch21: xen-backport-hg19075.patch -Patch22: xen-backport-hg19108.patch -Patch23: xen-backport-hg19109.patch -Patch24: xen-backport-hg19110.patch -Patch30: xen-qemu-dm-unplug.diff - - -# Patches to modify the default config of xend -Patch100: xen-config-dom0-minmem.patch -Patch102: xen-3.0.2-config-allow-unix-server.patch -Patch103: xen-3.0.2-config-disable-reloc.patch +Patch2: xen-fix-deprecated-warnings.patch +Patch3: xen-xenstore-cli.patch +Patch4: xen-dumpdir.patch +Patch5: xen-net-disable-iptables-on-bridge.patch + +Patch100: xen-configure-xend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel @@ -136,7 +87,7 @@ which manage Xen virtual machines. Summary: Core Xen runtime environment Group: Development/Libraries Requires: xen-libs = %{version}-%{release} -Requires: /usr/bin/qemu-img +Requires: /usr/bin/qemu-img /usr/bin/qemu-nbd # Ensure we at least have a suitable kernel installed, though we can't # force user to actually boot it. Requires: xen-hypervisor-abi = %{hv_abi} @@ -146,7 +97,6 @@ This package contains the runtime progra form the core Xen userspace environment. -%if %{hv_build} %package hypervisor Summary: Libraries for Xen tools Group: Development/Libraries @@ -154,7 +104,15 @@ Provides: xen-hypervisor-abi = %{hv_abi} %description hypervisor This package contains the Xen hypervisor -%endif + + +%package doc +Summary: Xen documentation +Group: Development/Libraries + +%description doc +This package contains the Xen documentation. + %package devel Summary: Development libraries for Xen tools @@ -165,140 +123,127 @@ Requires: xen-libs = %{version}-%{releas This package contains what's needed to develop applications which manage Xen virtual machines. + %prep -%setup -q -n %{directory_tag} +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch8 -p1 - -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 - -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 - -cd tools/ioemu-qemu-xen -%patch30 -p1 -cd ../../ +%patch4 -p1 +%patch5 -p1 -# config patches %patch100 -p1 -%patch102 -p1 -%patch103 -p1 # stubdom sources cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom + %build -export XEN_VENDORVERSION="-%{release_tag}" -%if %{hv_build} -CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs xen -%{__make} stubdom -%else -CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs -%{__make} stubdom -%endif +export XEN_VENDORVERSION="-%{release}" +export CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} prefix=/usr dist-xen +make %{?_smp_mflags} prefix=/usr dist-tools +make %{?_smp_mflags} prefix=/usr dist-docs +unset CFLAGS +make dist-stubdom + %install rm -rf %{buildroot} -make XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs install-stubdom -mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain -mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet -mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/migrate -mkdir -p %{buildroot}%{_localstatedir}/lib/xenstored -mkdir -p %{buildroot}%{_localstatedir}/run/xenstored - -rm -rf %{buildroot}%{_sysconfdir}/hotplug - -# install all of the public headers -mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm -mkdir -p %{buildroot}%{_includedir}/xen/arch-x86 %{buildroot}%{_includedir}/xen/xsm -install -m 644 xen/include/public/io/*.h %{buildroot}%{_includedir}/xen/io -install -m 644 xen/include/public/hvm/*.h %{buildroot}%{_includedir}/xen/hvm -install -m 644 xen/include/public/xsm/*.h %{buildroot}%{_includedir}/xen/xsm -install -m 644 xen/include/public/arch-x86/*.h %{buildroot}%{_includedir}/xen/arch-x86 -install -m 644 xen/include/public/*.h %{buildroot}%{_includedir}/xen/ - -%if %{hv_build} -# install the hypervisor -install -d 755 %{buildroot}/boot/ -install -m 644 xen/xen.gz %{buildroot}/boot/xen-%{hv_abi}.gz -install -m 644 xen/xen-syms %{buildroot}/boot/xen-syms-%{hv_abi} -%endif +make DESTDIR=%{buildroot} prefix=/usr install-xen +make DESTDIR=%{buildroot} prefix=/usr install-tools +make DESTDIR=%{buildroot} prefix=/usr install-docs +make DESTDIR=%{buildroot} prefix=/usr install-stubdom -### fixing start-script dir -mkdir -p %{buildroot}%{_sysconfdir}/rc.d -mv -f %{buildroot}%{_sysconfdir}/init.d %{buildroot}%{_sysconfdir}/rc.d/ +############ debug packaging: list files ############ -mv -f %{buildroot}%{_sysconfdir}/udev/xen-backend.rules %{buildroot}%{_sysconfdir}/udev/rules.d/ +find %{buildroot} -print | xargs ls -ld | sed -e 's|.*%{buildroot}||' > f1.list -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules -install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/modules/%{name}.modules +############ kill unwanted stuff ############ -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +# stubdom: newlib +rm -rf %{buildroot}/usr/*-xen-elf + +# hypervisor symlinks +rm -rf %{buildroot}/boot/xen-3.4.gz +rm -rf %{buildroot}/boot/xen-3.gz # silly doc dir fun rm -fr %{buildroot}%{_datadir}/doc/xen rm -rf %{buildroot}%{_datadir}/doc/qemu -# Pointless wrapper -rm -f %{buildroot}%{_libdir}/%{name}/bin/qemu-dm.debug # Pointless helper rm -f %{buildroot}%{_sbindir}/xen-python-path -# Just plain evil -rm -f %{buildroot}%{_sbindir}/netfix - -# Tools that upstream are dropping -# ...replaced by kpartx -rm -f %{buildroot}%{_bindir}/lomount -# ...replaced by any serial console program -rm -f %{buildroot}%{_bindir}/xencons - -# Not built into our Xen kernels -rm -f %{buildroot}%{_bindir}/xenperf -rm -f %{buildroot}%{_sbindir}/xenperf - -# Doesn't work -rm -f %{buildroot}%{_sbindir}/xsview - -# create dirs in /var/run so that selinux contexts are right (#195952) -mkdir -p %{buildroot}%{_localstatedir}/run/xend -mkdir -p %{buildroot}%{_localstatedir}/run/xend/boot -mkdir -p %{buildroot}%{_localstatedir}/log/xen -mkdir -p %{buildroot}%{_localstatedir}/log/xen/console -mkdir -p %{buildroot}%{_localstatedir}/lib/xen/images -# avoid conflicting with qemu (#199759) -rm -f %{buildroot}/%{_mandir}/man*/qemu* - -# Don't duplicate binary already provided in QEMU -rm -f %{buildroot}/%{_bindir}/qemu-img-xen +# qemu stuff (unused or available from upstream) +rm -rf %{buildroot}/usr/share/xen/man +rm -rf %{buildroot}/usr/bin/qemu-*-xen ln -s qemu-img %{buildroot}/%{_bindir}/qemu-img-xen - -# Blow away clashing files -rm -f %{buildroot}/%{_datadir}/xen/man/man1/qemu.1* -rm -f %{buildroot}/%{_datadir}/xen/man/man1/qemu-img.1* - -# blow away unused files -for i in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ - pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ - vgabios.bin vgabios-cirrus.bin video.x +ln -s qemu-img %{buildroot}/%{_bindir}/qemu-nbd-xen +for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ + pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ + vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb do - rm -f %{buildroot}/%{_datadir}/xen/qemu/$i + rm -f %{buildroot}/%{_datadir}/xen/qemu/$file done -# blow away README's not intended for end users +# README's not intended for end users rm -f %{buildroot}/%{_sysconfdir}/xen/README* -#find_lang xen-xm +############ fixup files in /etc ############ + +# udev +rm -rf %{buildroot}/etc/udev/rules.d/xen*.rules +mv %{buildroot}/etc/udev/xen*.rules %{buildroot}/etc/udev/rules.d + +# modules +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/modules/%{name}.modules + +# logrotate +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} + +# init scripts +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +mv %{buildroot}%{_sysconfdir}/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d +rmdir %{buildroot}%{_sysconfdir}/init.d +install -m 755 %{SOURCE20} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenstored +install -m 755 %{SOURCE21} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenconsoled +install -m 755 %{SOURCE22} %{buildroot}%{_sysconfdir}/rc.d/init.d/blktapctrl +install -m 755 %{SOURCE23} %{buildroot}%{_sysconfdir}/rc.d/init.d/xend + +# sysconfig +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/sysconfig/xenstored +install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled +install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl + +############ fixup info files ############ + +mkdir -p %{buildroot}/usr/share/info +mv %{buildroot}/usr/info/*info* %{buildroot}/usr/share/info +rmdir %{buildroot}/usr/info + +############ create dirs in /var ############ + +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/domain +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/vnet +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/migrate +mkdir -p %{buildroot}%{_localstatedir}/lib/xen/images +mkdir -p %{buildroot}%{_localstatedir}/log/xen/console + +############ add pointer to kernels ############ + +mkdir -p %{buildroot}%{_sysconfdir}/yum.repos.d +cp %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d + +############ debug packaging: list files ############ + +find %{buildroot} -print | xargs ls -ld | sed -e 's|.*%{buildroot}||' > f2.list +diff -u f1.list f2.list || true + +############ all done now ############ %post /sbin/chkconfig --add xend @@ -334,29 +279,22 @@ fi %postun libs -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # Base package only contains XenD/xm python stuff #files -f xen-xm.lang %files %defattr(-,root,root) %doc COPYING README -#doc docs/pdf/ -%doc docs/misc/ +%{_bindir}/xencons %{_sbindir}/xend %{_sbindir}/xm -# XenD / xm python code %{python_sitearch}/%{name} -%if 0%fedora > 8 %{python_sitearch}/xen-*.egg-info -%endif %{_mandir}/man1/xm.1* %{_mandir}/man5/xend-config.sxp.5* %{_mandir}/man5/xmdomain.cfg.5* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.dtd - # Startup script %{_sysconfdir}/rc.d/init.d/xend %{_sysconfdir}/rc.d/init.d/xendomains @@ -377,12 +315,14 @@ rm -rf $RPM_BUILD_ROOT %dir %{_localstatedir}/lib/%{name}/xend-db/migrate %dir %{_localstatedir}/lib/%{name}/xend-db/vnet +# pointer to dom0 kernel +%config(noreplace) %{_sysconfdir}/yum.repos.d/dom0-kernel.repo + %files libs %defattr(-,root,root) %{_libdir}/*.so.* %{_libdir}/fs/* - # All runtime stuff except for XenD/xm python stuff %files runtime %defattr(-,root,root) @@ -424,22 +364,20 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/fsimage.so %{python_sitearch}/grub -%if 0%fedora > 8 %{python_sitearch}/pygrub-*.egg-info -%endif # The firmware %ifnarch ia64 # Avoid owning /usr/lib twice on i386 %if "%{_libdir}" != "/usr/lib" %dir /usr/lib/%{name} -%endif %dir /usr/lib/%{name}/bin +/usr/lib/%{name}/bin/stubdom-dm +%endif %dir /usr/lib/%{name}/boot # HVM loader is always in /usr/lib regardless of multilib -/usr/lib/xen/bin/stubdom-dm -/usr/lib/xen/boot/ioemu-stubdom.gz /usr/lib/xen/boot/hvmloader +/usr/lib/xen/boot/ioemu-stubdom.gz /usr/lib/xen/boot/pv-grub*.gz %endif # General Xen state @@ -455,7 +393,7 @@ rm -rf $RPM_BUILD_ROOT %dir %attr(0700,root,root) %{_localstatedir}/run/xend/boot # All xenstore CLI tools -%{_bindir}/qemu-img-xen +%{_bindir}/qemu-*-xen %{_bindir}/xenstore %{_bindir}/xenstore-* %{_bindir}/pygrub @@ -480,18 +418,27 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/xenbaked %{_sbindir}/xenstored %{_sbindir}/xenpm +%{_sbindir}/xenpmd +%{_sbindir}/xenperf +%{_sbindir}/xsview # Xen logfiles %dir %attr(0700,root,root) %{_localstatedir}/log/xen # Guest/HV console logs %dir %attr(0700,root,root) %{_localstatedir}/log/xen/console -%if %{hv_build} %files hypervisor %defattr(-,root,root) /boot/xen-syms-* /boot/xen-*.gz -%endif +/boot/xen.gz + +%files doc +%defattr(-,root,root) +%doc docs/misc/ +%doc dist/install/usr/share/doc/xen/html +%doc dist/install/usr/share/doc/xen/pdf/*.pdf +/usr/share/info/*info* %files devel %defattr(-,root,root) @@ -502,6 +449,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog +* Wed May 27 2009 Gerd Hoffmann - 3.4.0-1 +- update to version 3.4.0. +- cleanup specfile, add doc subpackage. + * Tue Mar 10 2009 Gerd Hoffmann - 3.3.1-11 - fix python 2.6 warnings. --- xen-3.0.2-config-allow-unix-server.patch DELETED --- --- xen-3.0.2-config-disable-reloc.patch DELETED --- --- xen-backport-hg18782.patch DELETED --- --- xen-backport-hg19075.patch DELETED --- --- xen-backport-hg19108.patch DELETED --- --- xen-backport-hg19109.patch DELETED --- --- xen-backport-hg19110.patch DELETED --- --- xen-config-dom0-minmem.patch DELETED --- --- xen-gcc44-buildfix.patch DELETED --- --- xen-initscript-pvops.patch DELETED --- --- xen-net-disable-bridge-by-default.patch DELETED --- From kraxel at fedoraproject.org Thu May 28 08:04:08 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Thu, 28 May 2009 08:04:08 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen.spec,1.237,1.238 Message-ID: <20090528080408.3180670114@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21609 Modified Files: xen.spec Log Message: doc subpackage fixes Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.237 retrieving revision 1.238 diff -u -p -r1.237 -r1.238 --- xen.spec 27 May 2009 16:24:01 -0000 1.237 +++ xen.spec 28 May 2009 08:03:37 -0000 1.238 @@ -6,7 +6,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: GPLv2+ and LGPLv2+ and BSD URL: http://xen.org/ @@ -143,7 +143,7 @@ export XEN_VENDORVERSION="-%{release}" export CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} prefix=/usr dist-xen make %{?_smp_mflags} prefix=/usr dist-tools -make %{?_smp_mflags} prefix=/usr dist-docs +make prefix=/usr dist-docs unset CFLAGS make dist-stubdom @@ -222,7 +222,9 @@ install -m 644 %{SOURCE32} %{buildroot}% ############ fixup info files ############ mkdir -p %{buildroot}/usr/share/info -mv %{buildroot}/usr/info/*info* %{buildroot}/usr/share/info +for info in %{buildroot}/usr/info/*info*; do + mv "$info" "%{buildroot}/usr/share/info/xen-$(basename $info)" +done rmdir %{buildroot}/usr/info ############ create dirs in /var ############ @@ -278,6 +280,16 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%post doc +/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-configure.info +/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-standards.info + +%preun doc +if [ $1 = 0 ]; then + /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-configure.info + /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-standards.info +fi + %clean rm -rf %{buildroot} @@ -449,6 +461,11 @@ rm -rf %{buildroot} %{_libdir}/*.a %changelog +* Thu May 28 2009 Gerd Hoffmann - 3.4.0-2 +- rename info files to fix conflict with binutils. +- add install-info calls for the doc subpackage. +- un-parallelize doc build. + * Wed May 27 2009 Gerd Hoffmann - 3.4.0-1 - update to version 3.4.0. - cleanup specfile, add doc subpackage. From rjones at fedoraproject.org Thu May 28 08:08:20 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 08:08:20 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 libguestfs.spec,1.14,1.15 Message-ID: <20090528080820.93C8470114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22658 Modified Files: libguestfs.spec Log Message: Fix net builds (Charles Duffy). Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- libguestfs.spec 27 May 2009 18:40:17 -0000 1.14 +++ libguestfs.spec 28 May 2009 08:07:49 -0000 1.15 @@ -263,7 +263,7 @@ createrepo repo ls -l repo %define extra --with-mirror=file://$(pwd)/repo --with-repo=epel-5 --with-updates=none %else -%define extra %nil +%define extra --with-mirror=http://mirror.centos.org/centos-5/5.3/os/i386/ --with-repo=centos-5 --with-updates=none %endif vmchannel_test=no \ From rjones at fedoraproject.org Thu May 28 08:12:11 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 08:12:11 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 libguestfs.spec,1.15,1.16 Message-ID: <20090528081211.AD5BD70129@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23865 Modified Files: libguestfs.spec Log Message: i386 -> arch Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- libguestfs.spec 28 May 2009 08:07:49 -0000 1.15 +++ libguestfs.spec 28 May 2009 08:12:09 -0000 1.16 @@ -263,7 +263,7 @@ createrepo repo ls -l repo %define extra --with-mirror=file://$(pwd)/repo --with-repo=epel-5 --with-updates=none %else -%define extra --with-mirror=http://mirror.centos.org/centos-5/5.3/os/i386/ --with-repo=centos-5 --with-updates=none +%define extra --with-mirror=http://mirror.centos.org/centos-5/5.3/os/%{_arch}/ --with-repo=centos-5 --with-updates=none %endif vmchannel_test=no \ From rjones at fedoraproject.org Thu May 28 19:50:32 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 19:50:32 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 .cvsignore, 1.7, 1.8 libguestfs.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <20090528195032.BE63070114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16861 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 - New upstream version 1.0.35. - Fixes multiple bugs in bindings parameters (RHBZ#501892). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 27 May 2009 12:04:37 -0000 1.7 +++ .cvsignore 28 May 2009 19:50:32 -0000 1.8 @@ -1 +1 @@ -libguestfs-1.0.33.tar.gz +libguestfs-1.0.35.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- libguestfs.spec 27 May 2009 12:04:38 -0000 1.11 +++ libguestfs.spec 28 May 2009 19:50:32 -0000 1.12 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.33 +Version: 1.0.35 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -465,6 +465,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 +- New upstream version 1.0.35. +- Fixes multiple bugs in bindings parameters (RHBZ#501892). + * Wed May 27 2009 Richard W.M. Jones - 1.0.33-1 - New upstream version 1.0.33. - --with-java-home option is no longer required. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 27 May 2009 12:04:38 -0000 1.7 +++ sources 28 May 2009 19:50:32 -0000 1.8 @@ -1 +1 @@ -cd07465feec476e50031e50ee148a546 libguestfs-1.0.33.tar.gz +0810e1f6c96a62c94ead08c730e06e0f libguestfs-1.0.35.tar.gz From rjones at fedoraproject.org Thu May 28 19:50:48 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 19:50:48 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.14, 1.15 libguestfs.spec, 1.30, 1.31 sources, 1.14, 1.15 Message-ID: <20090528195048.99AC270114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16912 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 - New upstream version 1.0.35. - Fixes multiple bugs in bindings parameters (RHBZ#501892). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 27 May 2009 16:18:47 -0000 1.14 +++ .cvsignore 28 May 2009 19:50:47 -0000 1.15 @@ -1 +1 @@ -libguestfs-1.0.34.tar.gz +libguestfs-1.0.35.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- libguestfs.spec 27 May 2009 16:18:47 -0000 1.30 +++ libguestfs.spec 28 May 2009 19:50:48 -0000 1.31 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.34 +Version: 1.0.35 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -465,6 +465,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 +- New upstream version 1.0.35. +- Fixes multiple bugs in bindings parameters (RHBZ#501892). + * Wed May 27 2009 Richard W.M. Jones - 1.0.34-1 - New upstream version 1.0.34. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 27 May 2009 16:18:47 -0000 1.14 +++ sources 28 May 2009 19:50:48 -0000 1.15 @@ -1 +1 @@ -c56bc2d2bd4d1d82e417961f030dea29 libguestfs-1.0.34.tar.gz +0810e1f6c96a62c94ead08c730e06e0f libguestfs-1.0.35.tar.gz From rjones at fedoraproject.org Thu May 28 20:34:01 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 20:34:01 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 .cvsignore, 1.4, 1.5 libguestfs.spec, 1.16, 1.17 sources, 1.4, 1.5 Message-ID: <20090528203401.D68C770114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27142 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Thu May 28 2009 Richard Jones - 1.0.35-1 - New upstream version 1.0.35. - Disable tests, they took over 24 hours to run. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 27 May 2009 16:19:21 -0000 1.4 +++ .cvsignore 28 May 2009 20:33:31 -0000 1.5 @@ -1 +1 @@ -libguestfs-1.0.34.tar.gz +libguestfs-1.0.35.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- libguestfs.spec 28 May 2009 08:12:09 -0000 1.16 +++ libguestfs.spec 28 May 2009 20:33:31 -0000 1.17 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.34 -Release: 1%{?dist}.3 +Version: 1.0.35 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -290,7 +290,7 @@ export LIBGUESTFS_DEBUG=1 # Tests in subdirs fail because they all assume that the device # is called /dev/sda, not /dev/hda as on EPEL-5. -make SUBDIRS= check +#make SUBDIRS= check %install @@ -453,6 +453,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 28 2009 Richard Jones - 1.0.35-1 +- New upstream version 1.0.35. +- Disable tests, they took over 24 hours to run. + * Wed May 27 2009 Richard Jones - 1.0.34-1.el5.3 - Fails to build on PPC. - Fix missing Augeas dependency. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 27 May 2009 16:19:21 -0000 1.4 +++ sources 28 May 2009 20:33:31 -0000 1.5 @@ -1 +1 @@ -c56bc2d2bd4d1d82e417961f030dea29 libguestfs-1.0.34.tar.gz +0810e1f6c96a62c94ead08c730e06e0f libguestfs-1.0.35.tar.gz From rjones at fedoraproject.org Thu May 28 21:19:19 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 21:19:19 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.15, 1.16 libguestfs.spec, 1.31, 1.32 sources, 1.15, 1.16 Message-ID: <20090528211919.7D77970114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5471 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.36 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 28 May 2009 19:50:47 -0000 1.15 +++ .cvsignore 28 May 2009 21:18:49 -0000 1.16 @@ -1 +1 @@ -libguestfs-1.0.35.tar.gz +libguestfs-1.0.36.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- libguestfs.spec 28 May 2009 19:50:48 -0000 1.31 +++ libguestfs.spec 28 May 2009 21:18:49 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.35 +Version: 1.0.36 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -465,6 +465,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 28 2009 Richard W.M. Jones - 1.0.36-1 +- New upstream version 1.0.36. + * Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 - New upstream version 1.0.35. - Fixes multiple bugs in bindings parameters (RHBZ#501892). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 28 May 2009 19:50:48 -0000 1.15 +++ sources 28 May 2009 21:18:49 -0000 1.16 @@ -1 +1 @@ -0810e1f6c96a62c94ead08c730e06e0f libguestfs-1.0.35.tar.gz +9edb846577aeba08ebd11f955753c82e libguestfs-1.0.36.tar.gz From rjones at fedoraproject.org Thu May 28 21:19:57 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 21:19:57 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 .cvsignore, 1.8, 1.9 libguestfs.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <20090528211957.3CD2D70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5699 Modified Files: .cvsignore libguestfs.spec sources Log Message: New upstream version 1.0.36 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 28 May 2009 19:50:32 -0000 1.8 +++ .cvsignore 28 May 2009 21:19:26 -0000 1.9 @@ -1 +1 @@ -libguestfs-1.0.35.tar.gz +libguestfs-1.0.36.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- libguestfs.spec 28 May 2009 19:50:32 -0000 1.12 +++ libguestfs.spec 28 May 2009 21:19:26 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.35 +Version: 1.0.36 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -465,6 +465,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 28 2009 Richard W.M. Jones - 1.0.36-1 +- New upstream version 1.0.36. + * Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 - New upstream version 1.0.35. - Fixes multiple bugs in bindings parameters (RHBZ#501892). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 28 May 2009 19:50:32 -0000 1.8 +++ sources 28 May 2009 21:19:26 -0000 1.9 @@ -1 +1 @@ -0810e1f6c96a62c94ead08c730e06e0f libguestfs-1.0.35.tar.gz +9edb846577aeba08ebd11f955753c82e libguestfs-1.0.36.tar.gz From rjones at fedoraproject.org Thu May 28 22:13:51 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 22:13:51 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel libguestfs.spec, 1.32, 1.33 Message-ID: <20090528221351.88C3A70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19613 Modified Files: libguestfs.spec Log Message: Rerun the generator in prep section. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- libguestfs.spec 28 May 2009 21:18:49 -0000 1.32 +++ libguestfs.spec 28 May 2009 22:13:21 -0000 1.33 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.36 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -239,6 +239,9 @@ Requires: jpackage-utils mkdir -p daemon/m4 +# Rerun the generator to make sure all files are up to date. +src/generator.ml + %build %if %{buildnonet} @@ -465,8 +468,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 28 2009 Richard W.M. Jones - 1.0.36-1 +* Thu May 28 2009 Richard W.M. Jones - 1.0.36-2 - New upstream version 1.0.36. +- Rerun the generator in prep section. * Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 - New upstream version 1.0.35. From rjones at fedoraproject.org Thu May 28 22:14:05 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 28 May 2009 22:14:05 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 libguestfs.spec,1.13,1.14 Message-ID: <20090528221405.747DE70114@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19676 Modified Files: libguestfs.spec Log Message: Rerun the generator in prep section. Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- libguestfs.spec 28 May 2009 21:19:26 -0000 1.13 +++ libguestfs.spec 28 May 2009 22:13:35 -0000 1.14 @@ -4,7 +4,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.0.36 -Release: 1%{?dist} +Release: 1%{?dist}.2 License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -239,6 +239,9 @@ Requires: jpackage-utils mkdir -p daemon/m4 +# Rerun the generator to make sure all files are up to date. +src/generator.ml + %build %if %{buildnonet} @@ -465,8 +468,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 28 2009 Richard W.M. Jones - 1.0.36-1 +* Thu May 28 2009 Richard W.M. Jones - 1.0.36-1.fc11.2 - New upstream version 1.0.36. +- Rerun the generator in prep section. * Thu May 28 2009 Richard W.M. Jones - 1.0.35-1 - New upstream version 1.0.35. From rjones at fedoraproject.org Fri May 29 12:54:13 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 29 May 2009 12:54:13 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/F-11 .cvsignore, 1.9, 1.10 libguestfs.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <20090529125413.A971D70128@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7525 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Fri May 29 2009 Richard W.M. Jones - 1.0.37-1 - New upstream version 1.0.37. - Fixes: . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) . cramfs and squashfs modules should be available in libguestfs appliances (RHBZ#503135) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 28 May 2009 21:19:26 -0000 1.9 +++ .cvsignore 29 May 2009 12:53:42 -0000 1.10 @@ -1 +1 @@ -libguestfs-1.0.36.tar.gz +libguestfs-1.0.37.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- libguestfs.spec 28 May 2009 22:13:35 -0000 1.14 +++ libguestfs.spec 29 May 2009 12:53:43 -0000 1.15 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.36 -Release: 1%{?dist}.2 +Version: 1.0.37 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -17,6 +17,7 @@ BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 2.0 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel +BuildRequires: squashfs-tools BuildRequires: qemu-kvm >= 0.10-7 BuildRequires: createrepo BuildRequires: glibc-static @@ -468,6 +469,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 29 2009 Richard W.M. Jones - 1.0.37-1 +- New upstream version 1.0.37. +- Fixes: + . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) + . cramfs and squashfs modules should be available in libguestfs appliances + (RHBZ#503135) + * Thu May 28 2009 Richard W.M. Jones - 1.0.36-1.fc11.2 - New upstream version 1.0.36. - Rerun the generator in prep section. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 28 May 2009 21:19:26 -0000 1.9 +++ sources 29 May 2009 12:53:43 -0000 1.10 @@ -1 +1 @@ -9edb846577aeba08ebd11f955753c82e libguestfs-1.0.36.tar.gz +f8a2e487cc5e899851bbd4c86caf4285 libguestfs-1.0.37.tar.gz From rjones at fedoraproject.org Fri May 29 12:54:18 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 29 May 2009 12:54:18 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.16, 1.17 libguestfs.spec, 1.33, 1.34 sources, 1.16, 1.17 Message-ID: <20090529125418.0DC1070128@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7574 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Fri May 29 2009 Richard W.M. Jones - 1.0.37-1 - New upstream version 1.0.37. - Fixes: . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) . cramfs and squashfs modules should be available in libguestfs appliances (RHBZ#503135) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 28 May 2009 21:18:49 -0000 1.16 +++ .cvsignore 29 May 2009 12:53:47 -0000 1.17 @@ -1 +1 @@ -libguestfs-1.0.36.tar.gz +libguestfs-1.0.37.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- libguestfs.spec 28 May 2009 22:13:21 -0000 1.33 +++ libguestfs.spec 29 May 2009 12:53:47 -0000 1.34 @@ -3,8 +3,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.36 -Release: 2%{?dist} +Version: 1.0.37 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://et.redhat.com/~rjones/libguestfs/ @@ -17,6 +17,7 @@ BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 2.0 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel +BuildRequires: squashfs-tools BuildRequires: qemu-kvm >= 0.10-7 BuildRequires: createrepo BuildRequires: glibc-static @@ -468,6 +469,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 29 2009 Richard W.M. Jones - 1.0.37-1 +- New upstream version 1.0.37. +- Fixes: + . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) + . cramfs and squashfs modules should be available in libguestfs appliances + (RHBZ#503135) + * Thu May 28 2009 Richard W.M. Jones - 1.0.36-2 - New upstream version 1.0.36. - Rerun the generator in prep section. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- sources 28 May 2009 21:18:49 -0000 1.16 +++ sources 29 May 2009 12:53:47 -0000 1.17 @@ -1 +1 @@ -9edb846577aeba08ebd11f955753c82e libguestfs-1.0.36.tar.gz +f8a2e487cc5e899851bbd4c86caf4285 libguestfs-1.0.37.tar.gz From rjones at fedoraproject.org Fri May 29 12:54:34 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 29 May 2009 12:54:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libguestfs/EL-5 .cvsignore, 1.5, 1.6 libguestfs.spec, 1.17, 1.18 sources, 1.5, 1.6 Message-ID: <20090529125434.9033570128@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/libguestfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7552 Modified Files: .cvsignore libguestfs.spec sources Log Message: * Fri May 29 2009 Richard W.M. Jones - 1.0.37-1 - New upstream version 1.0.37. - Fixes: . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) . cramfs and squashfs modules should be available in libguestfs appliances (RHBZ#503135) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 28 May 2009 20:33:31 -0000 1.5 +++ .cvsignore 29 May 2009 12:54:04 -0000 1.6 @@ -1 +1 @@ -libguestfs-1.0.35.tar.gz +libguestfs-1.0.37.tar.gz Index: libguestfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- libguestfs.spec 28 May 2009 20:33:31 -0000 1.17 +++ libguestfs.spec 29 May 2009 12:54:04 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs -Version: 1.0.35 +Version: 1.0.37 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -21,6 +21,7 @@ BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 2.0 #BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel +BuildRequires: squashfs-tools %ifarch %{ix86} x86_64 BuildRequires: qemu-system-x86 >= 0.10.5 %endif @@ -453,6 +454,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 29 2009 Richard W.M. Jones - 1.0.37-1 +- New upstream version 1.0.37. +- Fixes: + . "mkdir-p" should not throw errors on preexisting directories (RHBZ#503133) + . cramfs and squashfs modules should be available in libguestfs appliances + (RHBZ#503135) + * Thu May 28 2009 Richard Jones - 1.0.35-1 - New upstream version 1.0.35. - Disable tests, they took over 24 hours to run. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 28 May 2009 20:33:31 -0000 1.5 +++ sources 29 May 2009 12:54:04 -0000 1.6 @@ -1 +1 @@ -0810e1f6c96a62c94ead08c730e06e0f libguestfs-1.0.35.tar.gz +f8a2e487cc5e899851bbd4c86caf4285 libguestfs-1.0.37.tar.gz From kraxel at fedoraproject.org Fri May 29 15:05:31 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Fri, 29 May 2009 15:05:31 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xenner/devel .cvsignore, 1.23, 1.24 sources, 1.22, 1.23 xenner.spec, 1.40, 1.41 xenner-noidlestats.diff, 1.1, NONE Message-ID: <20090529150531.0782570128@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xenner/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10047 Modified Files: .cvsignore sources xenner.spec Removed Files: xenner-noidlestats.diff Log Message: update to version 0.47 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- .cvsignore 26 Sep 2008 13:03:12 -0000 1.23 +++ .cvsignore 29 May 2009 15:04:59 -0000 1.24 @@ -1 +1 @@ -xenner-0.46.tar.gz +xenner-0.47.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 26 Sep 2008 13:03:13 -0000 1.22 +++ sources 29 May 2009 15:04:59 -0000 1.23 @@ -1 +1 @@ -81438375b78665d3bc13f0d67eea3add xenner-0.46.tar.gz +97bbf414ffb80903748f2a0492fb53e2 xenner-0.47.tar.gz Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- xenner.spec 27 Feb 2009 20:02:23 -0000 1.40 +++ xenner.spec 29 May 2009 15:05:00 -0000 1.41 @@ -1,11 +1,10 @@ Name: xenner License: GPLv2+ -Version: 0.46 -Release: 6%{?dist} +Version: 0.47 +Release: 1%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source0: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-noidlestats.diff URL: http://kraxel.fedorapeople.org/xenner/ Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 @@ -24,11 +23,9 @@ without the xen hypervisor, using kvm in %prep %setup -q -%patch0 -p0 %build export CFLAGS="%{optflags}" -CFLAGS="${CFLAGS//-fstack-protector/}" # incompatible make prefix="%{_prefix}" %install @@ -59,6 +56,9 @@ fi rm -rf %{buildroot} %changelog +* Fri May 29 2009 Gerd Hoffmann - 0.47-1 +- update to version 0.47 + * Fri Feb 27 2009 Tom "spot" Callaway - 0.46-6 - fix typo --- xenner-noidlestats.diff DELETED --- From veillard at fedoraproject.org Fri May 29 16:57:44 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Fri, 29 May 2009 16:57:44 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel .cvsignore, 1.40, 1.41 libvirt.spec, 1.136, 1.137 sources, 1.41, 1.42 libvirt-0.6.3-bring-up-ipless-bridge.patch, 1.1, NONE libvirt-0.6.3-enable-qemu-0-10-migration.patch, 1.1, NONE libvirt-0.6.3-event-handling-1.patch, 1.1, NONE libvirt-0.6.3-event-handling-2.patch, 1.1, NONE libvirt-0.6.3-fix-qemu-argv-detection-with-kvm-85.patch, 1.1, NONE libvirt-0.6.3-hostdev-managed.patch, 1.1, NONE libvirt-0.6.3-refresh-qemu-caps.patch, 1.1, NONE libvirt-0.6.3-shared-readonly-label.patch, 1.1, NONE libvirt-0.6.3-svirt-sound.patch, 1.1, NONE libvirt-0.6.3-xml-attribute-escaping.patch, 1.1, NONE Message-ID: <20090529165744.BC59B70128@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7684 Modified Files: .cvsignore libvirt.spec sources Removed Files: libvirt-0.6.3-bring-up-ipless-bridge.patch libvirt-0.6.3-enable-qemu-0-10-migration.patch libvirt-0.6.3-event-handling-1.patch libvirt-0.6.3-event-handling-2.patch libvirt-0.6.3-fix-qemu-argv-detection-with-kvm-85.patch libvirt-0.6.3-hostdev-managed.patch libvirt-0.6.3-refresh-qemu-caps.patch libvirt-0.6.3-shared-readonly-label.patch libvirt-0.6.3-svirt-sound.patch libvirt-0.6.3-xml-attribute-escaping.patch Log Message: Upstream release 0.6.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- .cvsignore 24 Apr 2009 14:57:21 -0000 1.40 +++ .cvsignore 29 May 2009 16:57:14 -0000 1.41 @@ -7,3 +7,4 @@ libvirt-0.6.0.tar.gz libvirt-0.6.1.tar.gz libvirt-0.6.2.tar.gz libvirt-0.6.3.tar.gz +libvirt-0.6.4.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -p -r1.136 -r1.137 --- libvirt.spec 25 May 2009 15:22:34 -0000 1.136 +++ libvirt.spec 29 May 2009 16:57:14 -0000 1.137 @@ -54,34 +54,14 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.3 -Release: 11%{?dist}%{?extra_release} +Version: 0.6.4 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz # Patches cherry-picked from upstream -# Handle shared/readonly image labelling (bz 493692) -Patch1: libvirt-0.6.3-shared-readonly-label.patch -# Handle correctly (bz 499386) -Patch2: libvirt-0.6.3-hostdev-managed.patch -# Refresh qemu caps when getCapabilities is called (bz 460649) -Patch3: libvirt-0.6.3-refresh-qemu-caps.patch -# Enable migration with qemu 0.10 Enable (bz 499704) -Patch4: libvirt-0.6.3-enable-qemu-0-10-migration.patch -# Don't try to label a disk with no path (e.g. empty cdrom) (bz 499569) -Patch5: libvirt-0.6.2-fix-nosource-label.patch -# Fix qemu argv detection with latest qemu (bz 501923) -Patch6: libvirt-0.6.3-fix-qemu-argv-detection-with-kvm-85.patch -# Fix XML attribute escaping (bz 499791) -Patch7: libvirt-0.6.3-xml-attribute-escaping.patch -# Fix serious event handling issues causing guests to be destroyed (bz 499698) -Patch8: libvirt-0.6.3-event-handling-1.patch -Patch9: libvirt-0.6.3-event-handling-2.patch -# Bring up the bridge, even if it doesn't have an IP address (bz 501912) -Patch10: libvirt-0.6.3-bring-up-ipless-bridge.patch - # Patches not for upstream. # Temporary hack till PulseAudio autostart problems are sorted @@ -236,16 +216,6 @@ of recent versions of Linux (and other O %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch200 -p0 @@ -576,6 +546,12 @@ fi %endif %changelog +* Fri May 29 2009 Daniel Veillard - 0.6.4-1.fc12 +- Upstream release of 0.6.4 +- new APIs +- fixes for latests QEmu/KVM versions +- various assorted fixes + * Mon May 25 2009 Mark McLoughlin - 0.6.3-11.fc12 - Bring up the bridge, even if it doesn't have an IP address (bug #501912) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- sources 24 Apr 2009 14:57:21 -0000 1.41 +++ sources 29 May 2009 16:57:14 -0000 1.42 @@ -1 +1 @@ -dd618bf0943a0be853ccc08308c7f427 libvirt-0.6.3.tar.gz +344a6913a94582ea3ab0ad75a9bfef22 libvirt-0.6.4.tar.gz --- libvirt-0.6.3-bring-up-ipless-bridge.patch DELETED --- --- libvirt-0.6.3-enable-qemu-0-10-migration.patch DELETED --- --- libvirt-0.6.3-event-handling-1.patch DELETED --- --- libvirt-0.6.3-event-handling-2.patch DELETED --- --- libvirt-0.6.3-fix-qemu-argv-detection-with-kvm-85.patch DELETED --- --- libvirt-0.6.3-hostdev-managed.patch DELETED --- --- libvirt-0.6.3-refresh-qemu-caps.patch DELETED --- --- libvirt-0.6.3-shared-readonly-label.patch DELETED --- --- libvirt-0.6.3-svirt-sound.patch DELETED --- --- libvirt-0.6.3-xml-attribute-escaping.patch DELETED --- From veillard at fedoraproject.org Fri May 29 17:05:50 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Fri, 29 May 2009 17:05:50 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-svirt-sound.patch, 1.2, 1.3 Message-ID: <20090529170550.AE60270128@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9684 Added Files: libvirt-0.6.3-svirt-sound.patch Log Message: Keep that patch, daniel libvirt-0.6.3-svirt-sound.patch: Index: libvirt-0.6.3-svirt-sound.patch =================================================================== RCS file: libvirt-0.6.3-svirt-sound.patch diff -N libvirt-0.6.3-svirt-sound.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libvirt-0.6.3-svirt-sound.patch 29 May 2009 17:05:50 -0000 1.3 @@ -0,0 +1,33 @@ +--- src/qemu_conf.c.orig 2009-04-02 11:50:10.000000000 +0200 ++++ src/qemu_conf.c 2009-04-03 17:46:59.000000000 +0200 +@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr + char domid[50]; + char *pidfile; + const char *cpu = NULL; ++ int skipSound = 0; ++ ++ if (driver->securityDriver && ++ driver->securityDriver->name && ++ STREQ(driver->securityDriver->name, "selinux") && ++ getuid() == 0) { ++ static int soundWarned = 0; ++ skipSound = 1; ++ if (def->nsounds && ++ !soundWarned) { ++ soundWarned = 1; ++ VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active"); ++ } ++ } + + uname_normalize(&ut); + +@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr + } + + /* Add sound hardware */ +- if (def->nsounds) { ++ if (def->nsounds && ++ !skipSound) { + int size = 100; + char *modstr; + if (VIR_ALLOC_N(modstr, size+1) < 0) From veillard at fedoraproject.org Fri May 29 17:28:59 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Fri, 29 May 2009 17:28:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.4-svirt-sound.patch, NONE, 1.1 libvirt.spec, 1.137, 1.138 libvirt-0.6.2-fix-nosource-label.patch, 1.1, NONE libvirt-0.6.3-svirt-sound.patch, 1.3, NONE Message-ID: <20090529172859.3D11F70128@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15117 Modified Files: libvirt.spec Added Files: libvirt-0.6.4-svirt-sound.patch Removed Files: libvirt-0.6.2-fix-nosource-label.patch libvirt-0.6.3-svirt-sound.patch Log Message: Old patch didn't apply in kodji ??? Daniel libvirt-0.6.4-svirt-sound.patch: --- NEW FILE libvirt-0.6.4-svirt-sound.patch --- --- src/qemu_conf.c.orig 2009-05-29 19:24:59.000000000 +0200 +++ src/qemu_conf.c 2009-05-29 19:19:39.000000000 +0200 @@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr char uuid[VIR_UUID_STRING_BUFLEN]; char domid[50]; const char *cpu = NULL; + int skipSound = 0; + + if (driver->securityDriver && + driver->securityDriver->name && + STREQ(driver->securityDriver->name, "selinux") && + getuid() == 0) { + static int soundWarned = 0; + skipSound = 1; + if (def->nsounds && + !soundWarned) { + soundWarned = 1; + VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active"); + } + } uname_normalize(&ut); @@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr } /* Add sound hardware */ - if (def->nsounds) { + if (def->nsounds && + !skipSound) { int size = 100; char *modstr; if (VIR_ALLOC_N(modstr, size+1) < 0) Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -p -r1.137 -r1.138 --- libvirt.spec 29 May 2009 16:57:14 -0000 1.137 +++ libvirt.spec 29 May 2009 17:28:28 -0000 1.138 @@ -66,7 +66,7 @@ Source: libvirt-%{version}.tar.gz # Temporary hack till PulseAudio autostart problems are sorted # out when SELinux enforcing (bz 486112) -Patch200: libvirt-0.6.3-svirt-sound.patch +Patch200: libvirt-0.6.4-svirt-sound.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ --- libvirt-0.6.2-fix-nosource-label.patch DELETED --- --- libvirt-0.6.3-svirt-sound.patch DELETED --- From glommer at fedoraproject.org Sun May 31 14:43:04 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Sun, 31 May 2009 14:43:04 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/F-11 .cvsignore, 1.15, 1.16 qemu-roms-more-room-fix-vga-align.patch, 1.2, 1.3 qemu-roms-more-room.patch, 1.3, 1.4 qemu.spec, 1.95, 1.96 sources, 1.15, 1.16 qemu-dma-aio-cancellation1.patch, 1.1, NONE qemu-dma-aio-cancellation2.patch, 1.1, NONE qemu-dma-aio-cancellation3.patch, 1.1, NONE qemu-dma-aio-cancellation4.patch, 1.1, NONE qemu-fix-gcc.patch, 1.2, NONE qemu-fix-load-linux.patch, 1.3, NONE qemu-trim-cpu-features-not-supported-by-kvm.patch, 1.1, NONE Message-ID: <20090531144304.DED1C70128@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13362 Modified Files: .cvsignore qemu-roms-more-room-fix-vga-align.patch qemu-roms-more-room.patch qemu.spec sources Removed Files: qemu-dma-aio-cancellation1.patch qemu-dma-aio-cancellation2.patch qemu-dma-aio-cancellation3.patch qemu-dma-aio-cancellation4.patch qemu-fix-gcc.patch qemu-fix-load-linux.patch qemu-trim-cpu-features-not-supported-by-kvm.patch Log Message: stable 0.10.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 13 May 2009 08:35:55 -0000 1.15 +++ .cvsignore 31 May 2009 14:42:32 -0000 1.16 @@ -1 +1 @@ -qemu-kvm-*.tar.gz +qemu-kvm-0.10.5.tar.gz qemu-roms-more-room-fix-vga-align.patch: Index: qemu-roms-more-room-fix-vga-align.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-roms-more-room-fix-vga-align.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- qemu-roms-more-room-fix-vga-align.patch 13 May 2009 08:35:55 -0000 1.2 +++ qemu-roms-more-room-fix-vga-align.patch 31 May 2009 14:42:34 -0000 1.3 @@ -18,10 +18,11 @@ Signed-off-by: Glauber Costa = 0xe0000000 ) { above_4g_mem_size = ram_size - 0xe0000000; -@@ -907,7 +908,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -905,7 +906,7 @@ static void pc_init1(ram_addr_t ram_size exit(1); } @@ -60,7 +61,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q /* VGA BIOS load */ if (cirrus_vga_enabled) { snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME); -@@ -925,12 +926,21 @@ vga_bios_error: +@@ -923,12 +924,21 @@ vga_bios_error: fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf); exit(1); } @@ -83,7 +84,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q /* map the last 128KB of the BIOS in ISA space */ isa_bios_size = bios_size; if (isa_bios_size > (128 * 1024)) -@@ -951,14 +961,14 @@ vga_bios_error: +@@ -949,14 +959,14 @@ vga_bios_error: ram_addr_t option_rom_offset; int size, offset; @@ -91,17 +92,17 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q + offset = option_rom_start; if (linux_boot) { option_rom_offset = qemu_ram_alloc(TARGET_PAGE_SIZE); - load_linux(option_rom_offset, - kernel_filename, initrd_filename, kernel_cmdline); - cpu_register_physical_memory(0xd0000, TARGET_PAGE_SIZE, + cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE, option_rom_offset); + load_linux(0xd0000, + kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); - offset = TARGET_PAGE_SIZE; + offset += TARGET_PAGE_SIZE; } for (i = 0; i < nb_option_roms; i++) { -@@ -968,13 +978,13 @@ vga_bios_error: +@@ -966,13 +976,13 @@ vga_bios_error: option_rom[i]); exit(1); } @@ -117,7 +118,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q exit(1); } size = (size + 4095) & ~4095; -@@ -982,9 +992,8 @@ vga_bios_error: +@@ -980,9 +990,8 @@ vga_bios_error: initialization, and (optionally) marked readonly by the BIOS before INT 19h. See the PNPBIOS specification, appendix B. DDIM support is mandatory for proper PCI expansion ROM support. */ Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -p -r1.95 -r1.96 --- qemu.spec 19 May 2009 03:00:56 -0000 1.95 +++ qemu.spec 31 May 2009 14:42:34 -0000 1.96 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.10.4 -Release: 5%{?dist} +Version: 0.10.5 +Release: 1%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -23,19 +23,10 @@ Patch8: 08-vnc-acl-mgmt.patch Patch9: kvm-upstream-ppc.patch Patch10: qemu-fix-debuginfo.patch -Patch11: qemu-fix-gcc.patch -Patch12: qemu-roms-more-room.patch -Patch13: qemu-roms-more-room-fix-vga-align.patch -Patch14: qemu-bios-bigger-roms.patch -Patch15: qemu-kvm-fix-kerneldir-includes.patch -Patch16: qemu-fix-load-linux.patch -Patch17: qemu-dma-aio-cancellation1.patch -Patch18: qemu-dma-aio-cancellation2.patch -Patch19: qemu-dma-aio-cancellation3.patch -Patch20: qemu-dma-aio-cancellation4.patch -Patch21: qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch -Patch22: qemu-fix-x86-feature-modifications-for-features-that-set.patch -Patch23: qemu-trim-cpu-features-not-supported-by-kvm.patch +Patch11: qemu-roms-more-room.patch +Patch12: qemu-roms-more-room-fix-vga-align.patch +Patch13: qemu-bios-bigger-roms.patch +Patch14: qemu-kvm-fix-kerneldir-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -231,15 +222,6 @@ such as kvmtrace and kvm_stat. %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -#%patch22 -p1 -#%patch23 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -482,6 +464,19 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Sun May 31 2009 Glauber Costa - 2:0.10.5-1 +- Update to 0.10.5, and remove already upstream patches + qemu-fix-gcc.patch + qemu-fix-load-linux.patch + qemu-dma-aio-cancellation1.patch + qemu-dma-aio-cancellation2.patch + qemu-dma-aio-cancellation3.patch + qemu-dma-aio-cancellation4.patch + + all cpuid trimming + + Conflicts: + qemu-roms-more-room.patch + * Mon May 18 2009 Glauber Costa - 2:0.10.4-5 - Backport cpuid trimming from upstream (#499596) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/F-11/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 13 May 2009 08:35:55 -0000 1.15 +++ sources 31 May 2009 14:42:34 -0000 1.16 @@ -1 +1 @@ -7b876a4899ed82517ca47898e59f215c qemu-kvm-0.10.4.tar.gz +e59ca20604ca8892d8f99b9fc5a159c1 qemu-kvm-0.10.5.tar.gz --- qemu-dma-aio-cancellation1.patch DELETED --- --- qemu-dma-aio-cancellation2.patch DELETED --- --- qemu-dma-aio-cancellation3.patch DELETED --- --- qemu-dma-aio-cancellation4.patch DELETED --- --- qemu-fix-gcc.patch DELETED --- --- qemu-fix-load-linux.patch DELETED --- --- qemu-trim-cpu-features-not-supported-by-kvm.patch DELETED ---