From veillard at fedoraproject.org Mon Mar 2 06:08:03 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Mon, 2 Mar 2009 06:08:03 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.112,1.113 Message-ID: <20090302060803.8111C70115@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30312 Modified Files: libvirt.spec Log Message: Handle the i386->i586 arch change, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- libvirt.spec 25 Feb 2009 19:46:28 -0000 1.112 +++ libvirt.spec 2 Mar 2009 06:07:33 -0000 1.113 @@ -14,7 +14,7 @@ %define with_network 0%{!?_without_network:1} # Xen is available only on i386 x86_64 ia64 -%ifnarch i386 i686 x86_64 ia64 +%ifnarch i386 i586 i686 x86_64 ia64 %define with_xen 0 %endif @@ -47,7 +47,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.0 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -477,7 +477,10 @@ %endif %changelog -* Wed Feb 25 2009 Fedora Release Engineering - 0.6.0-5 +* Mon Mar 2 2009 Daniel Veillard - 0.6.0-6.fc11 +- make sure Xen is handled in i586 new default 32bits x86 packages + +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.0-5.fc11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-4.fc11 From kraxel at fedoraproject.org Mon Mar 2 10:46:46 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Mon, 2 Mar 2009 10:46:46 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen-initscript-pvops.patch, NONE, 1.1 xen.spec, 1.230, 1.231 Message-ID: <20090302104646.E165A70115@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21503 Modified Files: xen.spec Added Files: xen-initscript-pvops.patch Log Message: fix xenstored init script for pv_ops kernel xen-initscript-pvops.patch: --- NEW FILE xen-initscript-pvops.patch --- pv_ops/dom0 kernel has xenfs -> mount it if needed. --- a/tools/examples/init.d/xenstored.orig 2009-02-26 16:01:57.000000000 +0100 +++ b/tools/examples/init.d/xenstored 2009-02-26 16:03:20.000000000 +0100 @@ -25,6 +25,9 @@ if [ ! -d /proc/xen ]; then exit 0 fi +if [ ! -f /proc/xen/capabilities ]; then + mount -t xenfs xen /proc/xen +fi if ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi @@ -38,6 +41,7 @@ test -f /etc/sysconfig/xenstored && . /e start() { echo -n $"Starting xenstored daemon: " + rm -f /var/lib/xenstored/tdb /usr/sbin/xenstored --pid-file $XENSTORED_PID $XENSTORED_ARGS RETVAL=$? test $RETVAL = 0 && echo_success || echo_failure Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- xen.spec 27 Feb 2009 09:58:07 -0000 1.230 +++ xen.spec 2 Mar 2009 10:46:16 -0000 1.231 @@ -66,6 +66,7 @@ Source13: pciutils-2.2.9.tar.bz2 Source14: grub-0.97.tar.gz Patch1: xen-initscript.patch +Patch2: xen-initscript-pvops.patch Patch8: xen-xenstore-cli.patch Patch13: xen-dumpdir.patch Patch14: xen-net-disable-bridge-by-default.patch @@ -166,6 +167,7 @@ %prep %setup -q -n %{directory_tag} %patch1 -p1 +%patch2 -p1 %patch8 -p1 %patch13 -p1 @@ -497,6 +499,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 2 2009 Gerd Hoffmann - 3.3.1-7 +- fix xenstored init script for pv_ops kernel. + * Fri Feb 27 2009 Gerd Hoffmann - 3.3.1-6 - fix xenstored crash. - backport qemu-unplug patch. From kraxel at fedoraproject.org Mon Mar 2 10:52:29 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Mon, 2 Mar 2009 10:52:29 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen.spec,1.231,1.232 Message-ID: <20090302105229.5235D70115@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23676 Modified Files: xen.spec Log Message: bump release Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- xen.spec 2 Mar 2009 10:46:16 -0000 1.231 +++ xen.spec 2 Mar 2009 10:51:58 -0000 1.232 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 6 +%define base_release 7 # Hypervisor ABI %define hv_abi 3.3 From glommer at fedoraproject.org Mon Mar 2 19:58:07 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 19:58:07 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.9,1.10 Message-ID: <20090302195807.2B10570115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25809 Modified Files: etherboot.spec Log Message: more prebuilt binaries. Koji now supports noarch subpackages Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- etherboot.spec 24 Feb 2009 15:32:32 -0000 1.9 +++ etherboot.spec 2 Mar 2009 19:57:36 -0000 1.10 @@ -2,11 +2,9 @@ # the arches where we are able to actually build the binaries. # on the other arches, we will use the prebuilt binaries -%define real_build_arches %{ix86} x86_64 - Name: etherboot Version: 5.4.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -17,47 +15,46 @@ #Source0: http://kernel.org/pub/software/utils/boot/etherboot/%{name}-%{version}.tar.gz # The source without proto_fsp.c: Source0: %{name}-%{version}-nofsp.tar.gz -# prebuilt binaries, from etherboot-*-5.4.4-6.fc11.i386.rpm: -Source1: etherboot-binaries-5.4.4-6.fc11.i386.tar.bz # The script used to remove the proto_fsp.c files: Source2: strip-etherboot-tarball.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%ifarch %{real_build_arches} -%ifarch x86_64 -BuildRequires: glibc32 -%endif BuildRequires: perl BuildRequires: syslinux BuildRequires: mtools -%endif +BuildArch: %{ix86} %package pxes Summary: Etherboot - boot roms in .pxe format Group: Development/Tools +BuildArch: noarch %package roms Summary: Etherboot - boot roms in .rom format Group: Development/Tools Requires: %{name}-roms-kvm +BuildArch: noarch %package roms-kvm Summary: Etherboot - boot roms supported by KVM, .rom format Group: Development/Tools +BuildArch: noarch %package zroms Summary: Etherboot - boot roms in .zrom format Group: Development/Tools Requires: %{name}-zroms-kvm +BuildArch: noarch %package zroms-kvm Summary: Etherboot - boot roms supported by KVM, .zrom format Group: Development/Tools +BuildArch: noarch @@ -106,40 +103,20 @@ %prep %setup -q -%ifnarch %{real_build_arches} -# can't build the images on this arch. extract the prebuilt ones: -mkdir src/prebuilt -cd src/prebuilt -tar -jxf %{SOURCE1} -%endif - %build cd src -%ifarch %{real_build_arches} - # %{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'` - -%ifarch x86_64 -# flags needed to build the 32-bit binaries on x86_64 -%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386" -%else %define makeflags EXTRA_CFLAGS="%{extra_cflags}" -%endif + # undi is broken by now sed -i -e '/undi/d' Families make %{?_smp_mflags} allpxes allroms allzroms %{makeflags} -%else -# Simply copy the prebuilt binaries: -cp prebuilt/etherboot/* bin/ -%endif - - %install rm -rf %{buildroot} @@ -189,6 +166,9 @@ %changelog +* Mon Mar 02 2009 Glauber Costa - 5.4.5-10 +- No more prebuilt binaries. Koji now supports noarch subpackages + * Tue Feb 24 2009 Fedora Release Engineering - 5.4.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From glommer at fedoraproject.org Mon Mar 2 20:11:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:11:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.10,1.11 Message-ID: <20090302201159.AE85070115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28626 Modified Files: etherboot.spec Log Message: Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- etherboot.spec 2 Mar 2009 19:57:36 -0000 1.10 +++ etherboot.spec 2 Mar 2009 20:11:29 -0000 1.11 @@ -4,7 +4,7 @@ # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -24,7 +24,11 @@ BuildRequires: perl BuildRequires: syslinux BuildRequires: mtools -BuildArch: %{ix86} +%ifarch x86_64 +BuildRequires: glibc32 +%endif + +BuildArch: %{ix86} x86_64 %package pxes @@ -110,7 +114,12 @@ # 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'` +%ifarch x86_64 +# flags needed to build the 32-bit binaries on x86_64 +%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386" +%else %define makeflags EXTRA_CFLAGS="%{extra_cflags}" +%endif # undi is broken by now @@ -166,6 +175,9 @@ %changelog +* Mon Mar 02 2009 Glauber Costa - 5.4.5-11 +- Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch + * Mon Mar 02 2009 Glauber Costa - 5.4.5-10 - No more prebuilt binaries. Koji now supports noarch subpackages From glommer at fedoraproject.org Mon Mar 2 20:24:24 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:24:24 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec, 1.46, 1.47 sources, 1.9, 1.10 Message-ID: <20090302202424.7D03070115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31075 Modified Files: qemu.spec sources Log Message: Updated to tip svn (release 6666). Featuring split packages for qemu. Unfortunately, still using binary blobs for the bioses. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- qemu.spec 25 Feb 2009 17:26:18 -0000 1.46 +++ qemu.spec 2 Mar 2009 20:23:54 -0000 1.47 @@ -1,35 +1,55 @@ -# 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: 13%{?dist} +Version: 1.0 +Release: 0.1.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init -Patch0: qemu-0.9.1-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 -Patch6: qemu-0.9.1-alpha-int.patch -Patch7: qemu-0.9.1-dirent.patch -Patch8: qemu-0.9.1-sparc-configure.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 +BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel +Requires: %{name}-user = %{version}-%{release} +Requires: %{name}-system-x86 = %{version}-%{release} +Requires: %{name}-system-sparc = %{version}-%{release} +Requires: %{name}-system-arm = %{version}-%{release} +Requires: %{name}-system-cris = %{version}-%{release} +Requires: %{name}-system-sh4 = %{version}-%{release} +Requires: %{name}-system-m68k = %{version}-%{release} +Requires: %{name}-system-mips = %{version}-%{release} +Requires: %{name}-system-ppc = %{version}-%{release} Requires: %{name}-img = %{version}-%{release} -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l + +#ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l + +%define qemudocdir %{_docdir}/%{name}-%{version} + +%define qemupkg() \ +%package %1\ +Summary: QEMU %2\ +Group: Development/Tools \ +Requires: %{name}-common = %{version}-%{release} \ +%{nil} + +%define qemudesc() \ +%description %1 \ +QEMU is a generic and open source processor emulator which achieves a good \ +emulation speed by using dynamic translation. \ + \ +This package provides the %2 +%{nil} + +%define qemupkgdesc() \ +%package %1\ +Summary: QEMU %2\ +Group: Development/Tools \ +Requires: %{name}-common = %{version}-%{release} \ +%description %1 \ +QEMU is a generic and open source processor emulator which achieves a good \ +emulation speed by using dynamic translation. \ + \ +This package provides the %2 +%{nil} %description QEMU is a generic and open source processor emulator which achieves a good @@ -44,43 +64,56 @@ As QEMU requires no host kernel patches to run, it is safe and easy to use. -%package img -Summary: QEMU command line tool for disk image manipulation -Group: Development/Tools +%qemupkgdesc img {command line tool for manipulating disk images} -%description img -QEMU is a generic and open source processor emulator which achieves a good -emulation speed by using dynamic translation. +%qemupkgdesc common {common files needed by all QEMU targets} -This package provides the command line tool for manipulating disk images. +%qemupkg user {user mode emulation of qemu targets} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service /sbin/chkconfig +Requires(postun): /sbin/service +Requires: %{name}-common = %{version}-%{release} +%qemudesc user {user mode emulation of qemu targets} + +%qemupkg system-x86 {system emulator for x86} +%qemudesc system-x86 {system emulator for x86} +%qemupkgdesc system-ppc {system emulator for ppc} + +%qemupkg system-sparc {system emulator for sparc} +%qemudesc system-sparc {system emulator for sparc} + +%qemupkgdesc system-arm {system emulator for arm} +%qemupkgdesc system-mips {system emulator for mips} +%qemupkgdesc system-cris {system emulator for cris} +%qemupkgdesc system-m68k {system emulator for m68k} +%qemupkgdesc system-sh4 {system emulator for sh4} %prep %setup -q -%patch0 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build -# FIXME: add --extra-cflags="$RPM_OPT_FLAGS" when we drop gcc34 +# 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="--extra-ldflags=-Wl,--build-id" + buildldflags="VL_LDFLAGS=-Wl,--build-id" +else + extraldflags="" + buildldflags="" +fi + ./configure \ --prefix=%{_prefix} \ --interp-prefix=%{_prefix}/qemu-%%M \ - --cc=gcc%{gccver} \ -%ifnarch sparcv9 - --enable-alsa \ -%endif -%ifarch sparcv9 - --sparc_cpu=v932 \ -%endif -%ifarch sparc64 - --sparc_cpu=v9 \ -%endif - --extra-ldflags="-Wl,--build-id" -make %{?_smp_mflags} VL_LDFLAGS="-Wl,--build-id" + $extraldflags; +make %{?_smp_mflags} $buildldflags + %install rm -rf $RPM_BUILD_ROOT @@ -94,6 +127,7 @@ chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* 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 @@ -112,18 +146,33 @@ /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 +%{_prefix}/share/qemu/keymaps/ +%{_prefix}/share/qemu/* +%{_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 @@ -133,25 +182,44 @@ %{_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 +%{_prefix}/share/qemu/bios.bin +%{_prefix}/share/qemu/vgabios.bin +%{_prefix}/share/qemu/vgabios-cirrus.bin +%files system-sparc +%defattr(-,root,root) +%{_bindir}/qemu-system-sparc +%{_prefix}/share/qemu/openbios-sparc32 +%{_prefix}/share/qemu/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 +%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) @@ -159,6 +227,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 Jan 2008 22:34:32 -0000 1.9 +++ sources 2 Mar 2009 20:23:54 -0000 1.10 @@ -1 +1 @@ -6591df8e9270eb358c881de4ebea1262 qemu-0.9.1.tar.gz +8394aa871af278efcdec46c37f913533 qemu-1.0.tar.gz From glommer at fedoraproject.org Mon Mar 2 20:31:39 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:31:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel .cvsignore,1.9,1.10 Message-ID: <20090302203139.B876970115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32403 Modified Files: .cvsignore Log Message: new source file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 Jan 2008 22:34:32 -0000 1.9 +++ .cvsignore 2 Mar 2009 20:31:09 -0000 1.10 @@ -1,3 +1 @@ -.build*.log -*.src.rpm -qemu-0.9.1.tar.gz +qemu-1.0.tar.gz From glommer at fedoraproject.org Mon Mar 2 20:33:51 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Mon, 2 Mar 2009 20:33:51 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.11,1.12 Message-ID: <20090302203351.62DEB70115@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv335 Modified Files: etherboot.spec Log Message: bump version Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- etherboot.spec 2 Mar 2009 20:11:29 -0000 1.11 +++ etherboot.spec 2 Mar 2009 20:33:20 -0000 1.12 @@ -4,7 +4,7 @@ # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -175,10 +175,13 @@ %changelog -* Mon Mar 02 2009 Glauber Costa - 5.4.5-11 +* Mon Mar 02 2009 Glauber Costa - 5.4.4-11 +- bump version + +* Mon Mar 02 2009 Glauber Costa - 5.4.4-11 - Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch -* Mon Mar 02 2009 Glauber Costa - 5.4.5-10 +* Mon Mar 02 2009 Glauber Costa - 5.4.4-10 - No more prebuilt binaries. Koji now supports noarch subpackages * Tue Feb 24 2009 Fedora Release Engineering - 5.4.4-9 From apevec at fedoraproject.org Mon Mar 2 23:43:33 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Mon, 2 Mar 2009 23:43:33 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/devel .cvsignore, 1.6, 1.7 collectd.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <20090302234333.357F570116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6120 Modified Files: .cvsignore collectd.spec sources Log Message: * Mon Mar 02 2009 Alan Pevec 4.5.3-1 - New upstream version 4.5.3 - fixes collectd is built without iptables plugin, bz# 479208 - list all expected plugins explicitly to avoid such bugs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Nov 2008 10:06:55 -0000 1.6 +++ .cvsignore 2 Mar 2009 23:43:02 -0000 1.7 @@ -1 +1 @@ -collectd-4.5.1.tar.bz2 +collectd-4.5.3.tar.bz2 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- collectd.spec 24 Feb 2009 08:20:06 -0000 1.15 +++ collectd.spec 2 Mar 2009 23:43:02 -0000 1.16 @@ -1,15 +1,16 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.5.1 -Release: 4%{?dist} +Version: 4.5.3 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-include-collectd.d.patch +Patch0: %{name}-4.5.1-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails -Patch1: %{name}-%{version}-configure-OpenIPMI.patch +Patch1: %{name}-4.5.1-configure-OpenIPMI.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libvirt-devel, libxml2-devel @@ -156,7 +157,6 @@ %build %configure \ - --without-libiptc \ --disable-ascent \ --disable-static \ --enable-mysql \ @@ -168,6 +168,7 @@ --enable-ipmi \ --enable-nut \ --enable-postgresql \ + --enable-iptables \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -267,21 +268,47 @@ %dir %{_localstatedir}/lib/collectd/ %dir %{_libdir}/collectd -%{_libdir}/collectd/*.so* +%{_libdir}/collectd/apcups.so +%{_libdir}/collectd/battery.so +%{_libdir}/collectd/cpu.so +%{_libdir}/collectd/cpufreq.so +%{_libdir}/collectd/csv.so +%{_libdir}/collectd/df.so +%{_libdir}/collectd/disk.so +%{_libdir}/collectd/entropy.so +%{_libdir}/collectd/exec.so +%{_libdir}/collectd/filecount.so +%{_libdir}/collectd/hddtemp.so +%{_libdir}/collectd/interface.so +%{_libdir}/collectd/iptables.so +%{_libdir}/collectd/ipvs.so +%{_libdir}/collectd/irq.so +%{_libdir}/collectd/load.so +%{_libdir}/collectd/logfile.so +%{_libdir}/collectd/mbmon.so +%{_libdir}/collectd/memcached.so +%{_libdir}/collectd/memory.so +%{_libdir}/collectd/multimeter.so +%{_libdir}/collectd/network.so +%{_libdir}/collectd/nfs.so +%{_libdir}/collectd/ntpd.so +%{_libdir}/collectd/ping.so +%{_libdir}/collectd/powerdns.so +%{_libdir}/collectd/processes.so +%{_libdir}/collectd/serial.so +%{_libdir}/collectd/swap.so +%{_libdir}/collectd/syslog.so +%{_libdir}/collectd/tail.so +%{_libdir}/collectd/tcpconns.so +%{_libdir}/collectd/teamspeak2.so +%{_libdir}/collectd/thermal.so +%{_libdir}/collectd/unixsock.so +%{_libdir}/collectd/users.so +%{_libdir}/collectd/uuid.so +%{_libdir}/collectd/vmem.so +%{_libdir}/collectd/vserver.so +%{_libdir}/collectd/wireless.so %{_libdir}/collectd/types.db -%exclude %{_libdir}/collectd/apache.so* -%exclude %{_libdir}/collectd/dns.so* -%exclude %{_libdir}/collectd/email.so* -%exclude %{_libdir}/collectd/ipmi.so* -%exclude %{_libdir}/collectd/libvirt.so* -%exclude %{_libdir}/collectd/nut.so* -%exclude %{_libdir}/collectd/mysql.so* -%exclude %{_libdir}/collectd/nginx.so* -%exclude %{_libdir}/collectd/perl.so* -%exclude %{_libdir}/collectd/postgresql.so* -%exclude %{_libdir}/collectd/rrdtool.so* -%exclude %{_libdir}/collectd/sensors.so* -%exclude %{_libdir}/collectd/snmp.so* %doc AUTHORS ChangeLog COPYING INSTALL README %doc %{_mandir}/man1/collectd.1* @@ -295,51 +322,51 @@ %files apache %defattr(-, root, root, -) -%{_libdir}/collectd/apache.so* +%{_libdir}/collectd/apache.so %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf %files dns %defattr(-, root, root, -) -%{_libdir}/collectd/dns.so* +%{_libdir}/collectd/dns.so %config(noreplace) %{_sysconfdir}/collectd.d/dns.conf %files email %defattr(-, root, root, -) -%{_libdir}/collectd/email.so* +%{_libdir}/collectd/email.so %config(noreplace) %{_sysconfdir}/collectd.d/email.conf %doc %{_mandir}/man5/collectd-email.5* %files ipmi %defattr(-, root, root, -) -%{_libdir}/collectd/ipmi.so* +%{_libdir}/collectd/ipmi.so %config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf %files mysql %defattr(-, root, root, -) -%{_libdir}/collectd/mysql.so* +%{_libdir}/collectd/mysql.so %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf %files nginx %defattr(-, root, root, -) -%{_libdir}/collectd/nginx.so* +%{_libdir}/collectd/nginx.so %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf %files nut %defattr(-, root, root, -) -%{_libdir}/collectd/nut.so* +%{_libdir}/collectd/nut.so %config(noreplace) %{_sysconfdir}/collectd.d/nut.conf %files -n perl-Collectd %defattr(-, root, root, -) %doc perl-examples/* -%{_libdir}/collectd/perl.so* +%{_libdir}/collectd/perl.so %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd/ %config(noreplace) %{_sysconfdir}/collectd.d/perl.conf @@ -349,37 +376,42 @@ %files postgresql %defattr(-, root, root, -) -%{_libdir}/collectd/postgresql.so* +%{_libdir}/collectd/postgresql.so %config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf %doc src/postgresql_default.conf %files rrdtool %defattr(-, root, root, -) -%{_libdir}/collectd/rrdtool.so* +%{_libdir}/collectd/rrdtool.so %config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf %files sensors %defattr(-, root, root, -) -%{_libdir}/collectd/sensors.so* +%{_libdir}/collectd/sensors.so %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf %files snmp %defattr(-, root, root, -) -%{_libdir}/collectd/snmp.so* +%{_libdir}/collectd/snmp.so %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf %doc %{_mandir}/man5/collectd-snmp.5* %files virt %defattr(-, root, root, -) -%{_libdir}/collectd/libvirt.so* +%{_libdir}/collectd/libvirt.so %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf %changelog +* Mon Mar 02 2009 Alan Pevec 4.5.3-1 +- New upstream version 4.5.3 +- fixes collectd is built without iptables plugin, bz# 479208 +- list all expected plugins explicitly to avoid such bugs + * Tue Feb 24 2009 Fedora Release Engineering - 4.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Nov 2008 10:06:55 -0000 1.6 +++ sources 2 Mar 2009 23:43:02 -0000 1.7 @@ -1 +1 @@ -d85e00de03d40ca66d5eb4775e58fc1f collectd-4.5.1.tar.bz2 +f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2 From glommer at fedoraproject.org Tue Mar 3 00:16:30 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 00:16:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.47,1.48 Message-ID: <20090303001630.7F4F270116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12155 Modified Files: qemu.spec Log Message: use pxe roms from etherboot package. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- qemu.spec 2 Mar 2009 20:23:54 -0000 1.47 +++ qemu.spec 3 Mar 2009 00:16:00 -0000 1.48 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.1.svn6666%{?dist} +Release: 0.2.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -76,6 +76,7 @@ %qemudesc user {user mode emulation of qemu targets} %qemupkg system-x86 {system emulator for x86} +Requires: etherboot-zroms-kvm %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -129,6 +130,21 @@ 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 +rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin + +# the pxe etherboot images will be symlinks to the images on +# /usr/share/etherboot, as QEMU doesn't know how to look +# for other paths, yet. +pxe_link() { + ln -s ../etherboot/$2.zrom %{buildroot}/usr/share/qemu/pxe-$1.bin +} + +pxe_link e1000 e1000-82542 +pxe_link ne2k_pci ne +pxe_link pcnet pcnet32 +pxe_link rtl8139 rtl8139 +pxe_link virtio virtio-net + %clean rm -rf $RPM_BUILD_ROOT @@ -227,6 +243,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. From glommer at fedoraproject.org Tue Mar 3 02:39:12 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 02:39:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.48,1.49 Message-ID: <20090303023912.B9E4E70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12602 Modified Files: qemu.spec Log Message: use vgabios from vgabios package Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- qemu.spec 3 Mar 2009 00:16:00 -0000 1.48 +++ qemu.spec 3 Mar 2009 02:38:42 -0000 1.49 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.2.svn6666%{?dist} +Release: 0.3.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -77,6 +77,7 @@ %qemupkg system-x86 {system emulator for x86} Requires: etherboot-zroms-kvm +Requires: vgabios %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -131,6 +132,7 @@ install -D -p -m 0644 -t ${RPM_BUILD_ROOT}/%{qemudocdir} Changelog README TODO COPYING COPYING.LIB LICENSE rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/pxe*bin +rm -rf ${RPM_BUILD_ROOT}/usr/share//qemu/vgabios*bin # the pxe etherboot images will be symlinks to the images on # /usr/share/etherboot, as QEMU doesn't know how to look @@ -144,6 +146,8 @@ pxe_link pcnet pcnet32 pxe_link rtl8139 rtl8139 pxe_link virtio virtio-net +ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/usr/share/qemu/vgabios.bin +ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/usr/share/qemu/vgabios-cirrus.bin %clean rm -rf $RPM_BUILD_ROOT @@ -243,6 +247,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. From glommer at fedoraproject.org Tue Mar 3 03:32:23 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 03:32:23 +0000 (UTC) Subject: [fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.12,1.13 Message-ID: <20090303033223.2553D70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/etherboot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22182 Modified Files: etherboot.spec Log Message: Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but works much better while rpm bug #442105 is not fixed yet. Index: etherboot.spec =================================================================== RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- etherboot.spec 2 Mar 2009 20:33:20 -0000 1.12 +++ etherboot.spec 3 Mar 2009 03:31:52 -0000 1.13 @@ -1,10 +1,15 @@ %define formats pxe rom zrom +# debugging firmwares does not goes the same way as a normal program. +# moreover, all architectures providing debuginfo for a single noarch +# package is currently clashing in koji, so don't bother. +%global debug_package %{nil} + # the arches where we are able to actually build the binaries. # on the other arches, we will use the prebuilt binaries Name: etherboot Version: 5.4.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Etherboot collection of boot roms Group: Development/Tools @@ -21,15 +26,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%ifarch %{ix86} BuildRequires: perl BuildRequires: syslinux BuildRequires: mtools -%ifarch x86_64 -BuildRequires: glibc32 -%endif - -BuildArch: %{ix86} x86_64 - %package pxes Summary: Etherboot - boot roms in .pxe format @@ -62,12 +62,6 @@ -%description -Etherboot is a software package for creating ROM images that can -download code over an Ethernet network to be executed on an x86 -computer. Many network adapters have a socket where a ROM chip can be -installed. Etherboot is code that can be put in such a ROM - %description pxes Etherboot is a software package for creating ROM images that can @@ -102,33 +96,39 @@ %description zroms-kvm This package contains the etherboot ROMs for devices emulated by KVM, in .zrom format. +%endif + +%description +Etherboot is a software package for creating ROM images that can +download code over an Ethernet network to be executed on an x86 +computer. Many network adapters have a socket where a ROM chip can be +installed. Etherboot is code that can be put in such a ROM + %prep %setup -q %build +%ifarch %{ix86} cd src # %{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'` -%ifarch x86_64 -# flags needed to build the 32-bit binaries on x86_64 -%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386" -%else %define makeflags EXTRA_CFLAGS="%{extra_cflags}" -%endif # undi is broken by now sed -i -e '/undi/d' Families make %{?_smp_mflags} allpxes allroms allzroms %{makeflags} +%endif %install rm -rf %{buildroot} +%ifarch %{ix86} mkdir -p %{buildroot}/%{_datadir}/%{name}/ pushd src/bin/ for fmt in %{formats};do @@ -148,11 +148,12 @@ echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list done done +%endif %clean rm -rf %{buildroot} - +%ifarch %{ix86} %files pxes -f pxe.list %defattr(-,root,root,-) %dir %{_datadir}/%{name} @@ -172,10 +173,15 @@ %files zroms-kvm -f kvm.zrom.list %defattr(-,root,root,-) %dir %{_datadir}/%{name} +%endif %changelog -* Mon Mar 02 2009 Glauber Costa - 5.4.4-11 +* 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. + +* Mon Mar 02 2009 Glauber Costa - 5.4.4-12 - bump version * Mon Mar 02 2009 Glauber Costa - 5.4.4-11 From glommer at fedoraproject.org Tue Mar 3 03:41:12 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 03:41:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.49,1.50 Message-ID: <20090303034112.8579C70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23848 Modified Files: qemu.spec Log Message: use bios from bochs-bios package. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- qemu.spec 3 Mar 2009 02:38:42 -0000 1.49 +++ qemu.spec 3 Mar 2009 03:40:42 -0000 1.50 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.3.svn6666%{?dist} +Release: 0.4.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -78,6 +78,7 @@ %qemupkg system-x86 {system emulator for x86} Requires: etherboot-zroms-kvm Requires: vgabios +Requires: bochs-bios %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -133,6 +134,7 @@ 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 # the pxe etherboot images will be symlinks to the images on # /usr/share/etherboot, as QEMU doesn't know how to look @@ -148,6 +150,7 @@ pxe_link virtio virtio-net ln -s ../vgabios/VGABIOS-lgpl-latest.bin %{buildroot}/usr/share/qemu/vgabios.bin ln -s ../vgabios/VGABIOS-lgpl-latest.cirrus.bin %{buildroot}/usr/share/qemu/vgabios-cirrus.bin +ln -s ../bochs/BIOS-bochs-latest %{buildroot}/usr/share/qemu/bios.bin %clean rm -rf $RPM_BUILD_ROOT @@ -247,6 +250,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. From berrange at fedoraproject.org Tue Mar 3 10:52:53 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 10:52:53 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-0.9.1-alpha-int.patch, 1.1, NONE qemu-0.9.1-block-rw-range-check.patch, 1.2, NONE qemu-0.9.1-build.patch, 1.1, NONE qemu-0.9.1-dirent.patch, 1.1, NONE qemu-0.9.1-nic-defaults.patch, 1.1, NONE qemu-0.9.1-pty-rawmode.patch, 1.1, NONE qemu-0.9.1-sparc-configure.patch, 1.1, NONE Message-ID: <20090303105253.3DBCF70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/extras/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7018 Removed Files: qemu-0.9.1-alpha-int.patch qemu-0.9.1-block-rw-range-check.patch qemu-0.9.1-build.patch qemu-0.9.1-dirent.patch qemu-0.9.1-nic-defaults.patch qemu-0.9.1-pty-rawmode.patch qemu-0.9.1-sparc-configure.patch Log Message: Remove unused patches --- qemu-0.9.1-alpha-int.patch DELETED --- --- qemu-0.9.1-block-rw-range-check.patch DELETED --- --- qemu-0.9.1-build.patch DELETED --- --- qemu-0.9.1-dirent.patch DELETED --- --- qemu-0.9.1-nic-defaults.patch DELETED --- --- qemu-0.9.1-pty-rawmode.patch DELETED --- --- qemu-0.9.1-sparc-configure.patch DELETED --- From berrange at fedoraproject.org Tue Mar 3 12:55:34 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 3 Mar 2009 12:55:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu-sasl-01-tls-handshake-fix.patch, NONE, 1.1 qemu-sasl-02-vnc-monitor-info.patch, NONE, 1.1 qemu-sasl-03-display-keymaps.patch, NONE, 1.1 qemu-sasl-04-vnc-struct.patch, NONE, 1.1 qemu-sasl-05-vnc-tls-vencrypt.patch, NONE, 1.1 qemu-sasl-06-vnc-sasl.patch, NONE, 1.1 qemu-sasl-07-vnc-monitor-authinfo.patch, NONE, 1.1 qemu-sasl-08-vnc-acl-mgmt.patch, NONE, 1.1 qemu.spec, 1.50, 1.51 Message-ID: <20090303125534.1FBBE70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/extras/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15820 Modified Files: qemu.spec Added Files: qemu-sasl-01-tls-handshake-fix.patch qemu-sasl-02-vnc-monitor-info.patch qemu-sasl-03-display-keymaps.patch qemu-sasl-04-vnc-struct.patch qemu-sasl-05-vnc-tls-vencrypt.patch qemu-sasl-06-vnc-sasl.patch qemu-sasl-07-vnc-monitor-authinfo.patch qemu-sasl-08-vnc-acl-mgmt.patch Log Message: Added VNC SASL auth protocol support & fix bochs-bios-data dep qemu-sasl-01-tls-handshake-fix.patch: --- NEW FILE qemu-sasl-01-tls-handshake-fix.patch --- This patch was previously posted here: http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg00820.html In the case where the TLS handshake does *not* block on I/O, QEMU sends the next 'start sub-auth' message twice. This seriously confuses the VNC client :-) Fortunately the chances of the handshake not blocking are close to zero for a TCP socket, which is why it has not been noticed thus far. Even with both client & server on localhost, I can only hit the bug 1 time in 20. NB, the diff context here is not too informative. If you look at the full code you'll see that a few lines early we called vnc_start_tls() which called vnc_continue_handshake() which called the method start_auth_vencrypt_subauth(). Hence, fixing the bug, just involves removing the 2nd bogus call to start_auth_vencrypt_subauth() as per this patch. vnc.c | 8 -------- 1 file changed, 8 deletions(-) Signed-off-by: Daniel P. Berrange diff -r ff004fb525e7 vnc.c --- a/vnc.c Thu Feb 19 11:26:55 2009 +0000 +++ b/vnc.c Thu Feb 19 11:27:44 2009 +0000 @@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth VNC_DEBUG("Failed to complete TLS\n"); return 0; } - - if (vs->wiremode == VNC_WIREMODE_TLS) { - VNC_DEBUG("Starting VeNCrypt subauth\n"); - return start_auth_vencrypt_subauth(vs); - } else { - VNC_DEBUG("TLS handshake blocked\n"); - return 0; - } } return 0; } qemu-sasl-02-vnc-monitor-info.patch: --- NEW FILE qemu-sasl-02-vnc-monitor-info.patch --- The current 'info vnc' monitor output just displays the VNC server address as provided by the -vnc command line flag. This isn't particularly useful since it doesn't tell you what VNC is actually listening on. eg, if you use '-vnc :1' it is useful to know whether this translated to '0.0.0.0:5901' or chose IPv6 ':::5901'. It is also useful to know the address of the client that is currently connected. It is also useful to know the active authentication (if any). This patch tweaks the monitor output to look like: (qemu) info vnc Server: address: 0.0.0.0:5902 auth: vencrypt+x509 Client: none And when 2 clients are connected (qemu) info vnc Server: address: 0.0.0.0:5902 auth: vencrypt+x509 Client: address: 10.33.6.67:38621 Client: address: 10.33.6.63:38620 More data will be added to this later in the patch series... The 'addr_to_string' helper method in this patch is overly generic for the needs of this patch alone. This is because it will be re-used by the later SASL patches in this series, where the flexibility is important. vnc.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 10 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 4dbf24b567c4 vnc.c --- a/vnc.c Thu Feb 19 11:27:44 2009 +0000 +++ b/vnc.c Thu Feb 19 11:53:31 2009 +0000 @@ -166,19 +166,136 @@ struct VncState static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; +static char *addr_to_string(const char *format, + struct sockaddr_storage *sa, + socklen_t salen) { + char *addr; + char host[NI_MAXHOST]; + char serv[NI_MAXSERV]; + int err; + + if ((err = getnameinfo((struct sockaddr *)sa, salen, + host, sizeof(host), + serv, sizeof(serv), + NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { + VNC_DEBUG("Cannot resolve address %d: %s\n", + err, gai_strerror(err)); + return NULL; + } + + if (asprintf(&addr, format, host, serv) < 0) + return NULL; + + return addr; +} + +static char *vnc_socket_local_addr(const char *format, int fd) { + struct sockaddr_storage sa; + socklen_t salen; + + salen = sizeof(sa); + if (getsockname(fd, (struct sockaddr*)&sa, &salen) < 0) + return NULL; + + return addr_to_string(format, &sa, salen); +} + +static char *vnc_socket_remote_addr(const char *format, int fd) { + struct sockaddr_storage sa; + socklen_t salen; + + salen = sizeof(sa); + if (getpeername(fd, (struct sockaddr*)&sa, &salen) < 0) + return NULL; + + return addr_to_string(format, &sa, salen); +} + +static const char *vnc_auth_name(VncDisplay *vd) { + switch (vd->auth) { + case VNC_AUTH_INVALID: + return "invalid"; + case VNC_AUTH_NONE: + return "none"; + case VNC_AUTH_VNC: + return "vnc"; + case VNC_AUTH_RA2: + return "ra2"; + case VNC_AUTH_RA2NE: + return "ra2ne"; + case VNC_AUTH_TIGHT: + return "tight"; + case VNC_AUTH_ULTRA: + return "ultra"; + case VNC_AUTH_TLS: + return "tls"; + case VNC_AUTH_VENCRYPT: +#ifdef CONFIG_VNC_TLS + switch (vd->subauth) { + case VNC_AUTH_VENCRYPT_PLAIN: + return "vencrypt+plain"; + case VNC_AUTH_VENCRYPT_TLSNONE: + return "vencrypt+tls+none"; + case VNC_AUTH_VENCRYPT_TLSVNC: + return "vencrypt+tls+vnc"; + case VNC_AUTH_VENCRYPT_TLSPLAIN: + return "vencrypt+tls+plain"; + case VNC_AUTH_VENCRYPT_X509NONE: + return "vencrypt+x509+none"; + case VNC_AUTH_VENCRYPT_X509VNC: + return "vencrypt+x509+vnc"; + case VNC_AUTH_VENCRYPT_X509PLAIN: + return "vencrypt+x509+plain"; + default: + return "vencrypt"; + } +#else + return "vencrypt"; +#endif + } + return "unknown"; +} + +#define VNC_SOCKET_FORMAT_PRETTY "local %s:%s" + +static void do_info_vnc_client(VncState *client) +{ + char *clientAddr = + vnc_socket_remote_addr(" address: %s:%s\n", + client->csock); + if (!clientAddr) + return; + + term_puts("Client:\n"); + term_puts(clientAddr); + free(clientAddr); +} + void do_info_vnc(void) { - if (vnc_display == NULL || vnc_display->display == NULL) - term_printf("VNC server disabled\n"); - else { - term_printf("VNC server active on: "); - term_print_filename(vnc_display->display); - term_printf("\n"); + if (vnc_display == NULL || vnc_display->display == NULL) { + term_printf("Server: disabled\n"); + } else { + char *serverAddr = vnc_socket_local_addr(" address: %s:%s\n", + vnc_display->lsock); - if (vnc_display->clients == NULL) - term_printf("No client connected\n"); - else - term_printf("Client connected\n"); + if (!serverAddr) + return; + + term_puts("Server:\n"); + term_puts(serverAddr); + free(serverAddr); + term_printf(" auth: %s\n", vnc_auth_name(vnc_display)); + + if (vnc_display->clients) { + VncState *client = vnc_display->clients; + while (client) { + do_info_vnc_client(client); + client = client->next; + } + } else { + term_printf("Client: none\n"); + } } } qemu-sasl-03-display-keymaps.patch: --- NEW FILE qemu-sasl-03-display-keymaps.patch --- Each of the graphical frontends #include a .c file, for keymap code resulting in duplicated definitions & duplicated compiled code. A couple of small changes allowed this to be sanitized, so instead of doing a #include "keymaps.c", duplicating all code, we can have a shared keymaps.h file, and only compile code once. This allows the next patch to move the VncState struct out into a header file without causing clashing definitions. Makefile | 9 +++++--- b/keymaps.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ curses.c | 3 -- curses_keys.h | 9 +++----- keymaps.c | 45 ++++++++++++++++--------------------------- sdl.c | 3 -- sdl_keysym.h | 7 ++---- vnc.c | 5 +--- vnc_keysym.h | 7 ++---- 9 files changed, 97 insertions(+), 51 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 9ccd7a5b0382 Makefile --- a/Makefile Thu Feb 19 11:54:21 2009 +0000 +++ b/Makefile Thu Feb 19 13:15:19 2009 +0000 @@ -137,6 +137,7 @@ endif AUDIO_OBJS+= wavcapture.o OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) +OBJS+=keymaps.o ifdef CONFIG_SDL OBJS+=sdl.o x_keymap.o endif @@ -161,15 +162,17 @@ LIBS+=$(VDE_LIBS) cocoa.o: cocoa.m -sdl.o: sdl.c keymaps.c sdl_keysym.h +keymaps.o: keymaps.c keymaps.h + +sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h +vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -curses.o: curses.c keymaps.c curses_keys.h +curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) diff -r 9ccd7a5b0382 curses.c --- a/curses.c Thu Feb 19 11:54:21 2009 +0000 +++ b/curses.c Thu Feb 19 13:15:19 2009 +0000 @@ -158,7 +158,6 @@ static void curses_cursor_position(Displ /* generic keyboard conversion */ #include "curses_keys.h" -#include "keymaps.c" static kbd_layout_t *kbd_layout = 0; static int keycode2keysym[CURSES_KEYS]; @@ -311,7 +310,7 @@ static void curses_keyboard_setup(void) keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(keyboard_layout); + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); if (!kbd_layout) exit(1); } diff -r 9ccd7a5b0382 curses_keys.h --- a/curses_keys.h Thu Feb 19 11:54:21 2009 +0000 +++ b/curses_keys.h Thu Feb 19 13:15:19 2009 +0000 @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include "keymaps.h" + + #define KEY_RELEASE 0x80 #define KEY_MASK 0x7f #define SHIFT_CODE 0x2a @@ -239,11 +243,6 @@ static const int curses2keysym[CURSES_KE }; -typedef struct { - const char* name; - int keysym; -} name2keysym_t; - static const name2keysym_t name2keysym[] = { /* Plain ASCII */ { "space", 0x020 }, diff -r 9ccd7a5b0382 keymaps.c --- a/keymaps.c Thu Feb 19 11:54:21 2009 +0000 +++ b/keymaps.c Thu Feb 19 13:15:19 2009 +0000 @@ -22,34 +22,20 @@ * THE SOFTWARE. */ -static int get_keysym(const char *name) +#include "keymaps.h" +#include "sysemu.h" + +static int get_keysym(const name2keysym_t *table, + const char *name) { const name2keysym_t *p; - for(p = name2keysym; p->name != NULL; p++) { + for(p = table; p->name != NULL; p++) { if (!strcmp(p->name, name)) return p->keysym; } return 0; } -struct key_range { - int start; - int end; - struct key_range *next; -}; - -#define MAX_NORMAL_KEYCODE 512 -#define MAX_EXTRA_COUNT 256 -typedef struct { - uint16_t keysym2keycode[MAX_NORMAL_KEYCODE]; - struct { - int keysym; - uint16_t keycode; - } keysym2keycode_extra[MAX_EXTRA_COUNT]; - int extra_count; - struct key_range *keypad_range; - struct key_range *numlock_range; -} kbd_layout_t; static void add_to_key_range(struct key_range **krp, int code) { struct key_range *kr; @@ -73,7 +59,8 @@ static void add_to_key_range(struct key_ } } -static kbd_layout_t *parse_keyboard_layout(const char *language, +static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, + const char *language, kbd_layout_t * k) { FILE *f; @@ -102,7 +89,7 @@ static kbd_layout_t *parse_keyboard_layo if (!strncmp(line, "map ", 4)) continue; if (!strncmp(line, "include ", 8)) { - parse_keyboard_layout(line + 8, k); + parse_keyboard_layout(table, line + 8, k); } else { char *end_of_keysym = line; while (*end_of_keysym != 0 && *end_of_keysym != ' ') @@ -110,7 +97,7 @@ static kbd_layout_t *parse_keyboard_layo if (*end_of_keysym) { int keysym; *end_of_keysym = 0; - keysym = get_keysym(line); + keysym = get_keysym(table, line); if (keysym == 0) { // fprintf(stderr, "Warning: unknown keysym %s\n", line); } else { @@ -154,12 +141,14 @@ static kbd_layout_t *parse_keyboard_layo return k; } -static void *init_keyboard_layout(const char *language) + +void *init_keyboard_layout(const name2keysym_t *table, const char *language) { - return parse_keyboard_layout(language, 0); + return parse_keyboard_layout(table, language, 0); } -static int keysym2scancode(void *kbd_layout, int keysym) + +int keysym2scancode(void *kbd_layout, int keysym) { kbd_layout_t *k = kbd_layout; if (keysym < MAX_NORMAL_KEYCODE) { @@ -180,7 +169,7 @@ static int keysym2scancode(void *kbd_lay return 0; } -static inline int keycode_is_keypad(void *kbd_layout, int keycode) +int keycode_is_keypad(void *kbd_layout, int keycode) { kbd_layout_t *k = kbd_layout; struct key_range *kr; @@ -191,7 +180,7 @@ static inline int keycode_is_keypad(void return 0; } -static inline int keysym_is_numlock(void *kbd_layout, int keysym) +int keysym_is_numlock(void *kbd_layout, int keysym) { kbd_layout_t *k = kbd_layout; struct key_range *kr; diff -r 9ccd7a5b0382 keymaps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/keymaps.h Thu Feb 19 13:15:19 2009 +0000 @@ -0,0 +1,60 @@ +/* + * QEMU keysym to keycode conversion using rdesktop keymaps + * + * Copyright (c) 2004 Johannes Schindelin + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __QEMU_KEYMAPS_H__ +#define __QEMU_KEYMAPS_H__ + +#include "qemu-common.h" + +typedef struct { + const char* name; + int keysym; +} name2keysym_t; + +struct key_range { + int start; + int end; + struct key_range *next; +}; + +#define MAX_NORMAL_KEYCODE 512 +#define MAX_EXTRA_COUNT 256 +typedef struct { + uint16_t keysym2keycode[MAX_NORMAL_KEYCODE]; + struct { + int keysym; + uint16_t keycode; + } keysym2keycode_extra[MAX_EXTRA_COUNT]; + int extra_count; + struct key_range *keypad_range; + struct key_range *numlock_range; +} kbd_layout_t; + + +void *init_keyboard_layout(const name2keysym_t *table, const char *language); +int keysym2scancode(void *kbd_layout, int keysym); +int keycode_is_keypad(void *kbd_layout, int keycode); +int keysym_is_numlock(void *kbd_layout, int keysym); + +#endif /* __QEMU_KEYMAPS_H__ */ diff -r 9ccd7a5b0382 sdl.c --- a/sdl.c Thu Feb 19 11:54:21 2009 +0000 +++ b/sdl.c Thu Feb 19 13:15:19 2009 +0000 @@ -107,7 +107,6 @@ static void sdl_resize(DisplayState *ds) /* generic keyboard conversion */ #include "sdl_keysym.h" -#include "keymaps.c" static kbd_layout_t *kbd_layout = NULL; @@ -623,7 +622,7 @@ void sdl_display_init(DisplayState *ds, keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(keyboard_layout); + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); if (!kbd_layout) exit(1); } diff -r 9ccd7a5b0382 sdl_keysym.h --- a/sdl_keysym.h Thu Feb 19 11:54:21 2009 +0000 +++ b/sdl_keysym.h Thu Feb 19 13:15:19 2009 +0000 @@ -1,7 +1,6 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; + +#include "keymaps.h" + static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, diff -r 9ccd7a5b0382 vnc.c --- a/vnc.c Thu Feb 19 11:54:21 2009 +0000 +++ b/vnc.c Thu Feb 19 13:15:19 2009 +0000 @@ -35,7 +35,6 @@ #include "vnc.h" #include "vnc_keysym.h" -#include "keymaps.c" #include "d3des.h" #ifdef CONFIG_VNC_TLS @@ -2420,9 +2419,9 @@ void vnc_display_init(DisplayState *ds) vs->ds = ds; if (keyboard_layout) - vs->kbd_layout = init_keyboard_layout(keyboard_layout); + vs->kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); else - vs->kbd_layout = init_keyboard_layout("en-us"); + vs->kbd_layout = init_keyboard_layout(name2keysym, "en-us"); if (!vs->kbd_layout) exit(1); diff -r 9ccd7a5b0382 vnc_keysym.h --- a/vnc_keysym.h Thu Feb 19 11:54:21 2009 +0000 +++ b/vnc_keysym.h Thu Feb 19 13:15:19 2009 +0000 @@ -1,7 +1,6 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; + +#include "keymaps.h" + static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, qemu-sasl-04-vnc-struct.patch: --- NEW FILE qemu-sasl-04-vnc-struct.patch --- This patch moves the definitions of VncState and VncDisplay structs out into a vnc.h header file. This is to allow the code for TLS and SASL auth mechanisms to be moved out of the main vnc.c file. vnc.c | 109 ------------------------------------------------ vnc.h | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 148 insertions(+), 110 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 216ec7d1e30f vnc.c --- a/vnc.c Thu Feb 19 13:15:19 2009 +0000 +++ b/vnc.c Thu Feb 19 13:25:09 2009 +0000 @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Anthony Liguori * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,25 +24,16 @@ * THE SOFTWARE. */ -#include "qemu-common.h" -#include "console.h" +#include "vnc.h" #include "sysemu.h" #include "qemu_socket.h" #include "qemu-timer.h" -#include "audio/audio.h" -#include #define VNC_REFRESH_INTERVAL (1000 / 30) -#include "vnc.h" #include "vnc_keysym.h" #include "d3des.h" -#ifdef CONFIG_VNC_TLS -#include -#include -#endif /* CONFIG_VNC_TLS */ - // #define _VNC_DEBUG 1 #ifdef _VNC_DEBUG @@ -64,103 +56,6 @@ static void vnc_debug_gnutls_log(int lev } \ } -typedef struct Buffer -{ - size_t capacity; - size_t offset; - uint8_t *buffer; -} Buffer; - -typedef struct VncState VncState; - -typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len); - -typedef void VncWritePixels(VncState *vs, void *data, int size); - -typedef void VncSendHextileTile(VncState *vs, - int x, int y, int w, int h, - void *last_bg, - void *last_fg, - int *has_bg, int *has_fg); - -#define VNC_MAX_WIDTH 2048 -#define VNC_MAX_HEIGHT 2048 -#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32)) - -#define VNC_AUTH_CHALLENGE_SIZE 16 - -typedef struct VncDisplay VncDisplay; - -struct VncDisplay -{ - int lsock; - DisplayState *ds; - VncState *clients; - kbd_layout_t *kbd_layout; - - char *display; - char *password; - int auth; -#ifdef CONFIG_VNC_TLS - int subauth; - int x509verify; - - char *x509cacert; - char *x509cacrl; - char *x509cert; - char *x509key; -#endif -}; - -struct VncState -{ - QEMUTimer *timer; - int csock; - DisplayState *ds; - VncDisplay *vd; - int need_update; - uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; - char *old_data; - uint32_t features; - int absolute; - int last_x; - int last_y; - - uint32_t vnc_encoding; - uint8_t tight_quality; - uint8_t tight_compression; - - int major; - int minor; - - char challenge[VNC_AUTH_CHALLENGE_SIZE]; - -#ifdef CONFIG_VNC_TLS - int wiremode; - gnutls_session_t tls_session; -#endif - - Buffer output; - Buffer input; - /* current output mode information */ - VncWritePixels *write_pixels; - VncSendHextileTile *send_hextile_tile; - DisplaySurface clientds, serverds; - - CaptureVoiceOut *audio_cap; - struct audsettings as; - - VncReadEvent *read_handler; - size_t read_handler_expect; - /* input */ - uint8_t modifiers_state[256]; - - Buffer zlib; - Buffer zlib_tmp; - z_stream zlib_stream[4]; - - VncState *next; -}; static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; diff -r 216ec7d1e30f vnc.h --- a/vnc.h Thu Feb 19 13:15:19 2009 +0000 +++ b/vnc.h Thu Feb 19 13:25:09 2009 +0000 @@ -1,5 +1,148 @@ -#ifndef __VNCTIGHT_H -#define __VNCTIGHT_H +/* + * QEMU VNC display driver + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __QEMU_VNC_H +#define __QEMU_VNC_H + +#include "qemu-common.h" +#include "console.h" +#include "audio/audio.h" +#include + +#ifdef CONFIG_VNC_TLS +#include +#include +#endif /* CONFIG_VNC_TLS */ + +#include "keymaps.h" + +/***************************************************************************** + * + * Core data structures + * + *****************************************************************************/ + +typedef struct Buffer +{ + size_t capacity; + size_t offset; + uint8_t *buffer; +} Buffer; + +typedef struct VncState VncState; + +typedef int VncReadEvent(VncState *vs, uint8_t *data, size_t len); + +typedef void VncWritePixels(VncState *vs, void *data, int size); + +typedef void VncSendHextileTile(VncState *vs, + int x, int y, int w, int h, + void *last_bg, + void *last_fg, + int *has_bg, int *has_fg); + +#define VNC_MAX_WIDTH 2048 +#define VNC_MAX_HEIGHT 2048 +#define VNC_DIRTY_WORDS (VNC_MAX_WIDTH / (16 * 32)) + +#define VNC_AUTH_CHALLENGE_SIZE 16 + +typedef struct VncDisplay VncDisplay; + +struct VncDisplay +{ + int lsock; + DisplayState *ds; + VncState *clients; + kbd_layout_t *kbd_layout; + + char *display; + char *password; + int auth; +#ifdef CONFIG_VNC_TLS + int subauth; + int x509verify; + + char *x509cacert; + char *x509cacrl; + char *x509cert; + char *x509key; +#endif +}; + +struct VncState +{ + QEMUTimer *timer; + int csock; + DisplayState *ds; + VncDisplay *vd; + int need_update; + uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; + char *old_data; + uint32_t features; + int absolute; + int last_x; + int last_y; + + uint32_t vnc_encoding; + uint8_t tight_quality; + uint8_t tight_compression; + + int major; + int minor; + + char challenge[VNC_AUTH_CHALLENGE_SIZE]; + +#ifdef CONFIG_VNC_TLS + int wiremode; + gnutls_session_t tls_session; +#endif + + Buffer output; + Buffer input; + /* current output mode information */ + VncWritePixels *write_pixels; + VncSendHextileTile *send_hextile_tile; + DisplaySurface clientds, serverds; + + CaptureVoiceOut *audio_cap; + struct audsettings as; + + VncReadEvent *read_handler; + size_t read_handler_expect; + /* input */ + uint8_t modifiers_state[256]; + + Buffer zlib; + Buffer zlib_tmp; + z_stream zlib_stream[4]; + + VncState *next; +}; + /***************************************************************************** * @@ -111,4 +254,4 @@ enum { #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) #define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT) -#endif /* __VNCTIGHT_H */ +#endif /* __QEMU_VNC_H */ qemu-sasl-05-vnc-tls-vencrypt.patch: --- NEW FILE qemu-sasl-05-vnc-tls-vencrypt.patch --- This patch refactors the existing TLS code to make the main VNC code more managable. The code moves to two new files - vnc-tls.c: generic helpers for TLS handshake & credential setup - vnc-auth-vencrypt.c: the actual VNC TLS authentication mechanism. The reason for this split is that there are other TLS based auth mechanisms which we may like to use in the future. These can all share the same vnc-tls.c routines. In addition this will facilitate anyone who may want to port the vnc-tls.c file to allow for choice of GNUTLS & NSS for impl. The TLS state is moved out of the VncState struct, and into a separate VncStateTLS struct, defined in vnc-tls.h. This is then referenced from the main VncState. End size of the struct is the same, but it keeps things a little more managable. The vnc.h file gains a bunch more function prototypes, for functions in vnc.c that were previously static, but now need to be accessed from the separate auth code files. The only TLS related code still in the main vl.c is the command line argument handling / setup, and the low level I/O routines calling gnutls_send/recv. Makefile | 11 b/vnc-auth-vencrypt.c | 167 ++++++++++++++ b/vnc-auth-vencrypt.h | 33 ++ b/vnc-tls.c | 414 +++++++++++++++++++++++++++++++++++ b/vnc-tls.h | 70 ++++++ vnc.c | 581 +++----------------------------------------------- vnc.h | 76 ++++-- 7 files changed, 780 insertions(+), 572 deletions(-) Signed-off-by: Daniel P. Berrange diff -r dfa890dd7417 Makefile --- a/Makefile Mon Feb 23 13:05:49 2009 +0000 +++ b/Makefile Mon Feb 23 13:06:22 2009 +0000 @@ -145,6 +145,9 @@ ifdef CONFIG_CURSES OBJS+=curses.o endif OBJS+=vnc.o d3des.o +ifdef CONFIG_VNC_TLS +OBJS+=vnc-tls.o vnc-auth-vencrypt.o +endif ifdef CONFIG_COCOA OBJS+=cocoa.o @@ -168,10 +171,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h +vnc.h: vnc-tls.h vnc-auth-vencrypt.h keymaps.h + +vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) +vnc-tls.o: vnc-tls.c vnc.h + +vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h + curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) diff -r dfa890dd7417 vnc-auth-vencrypt.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-vencrypt.c Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,167 @@ +/* + * QEMU VNC display driver: VeNCrypt authentication setup + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vnc.h" + + +static void start_auth_vencrypt_subauth(VncState *vs) +{ + switch (vs->vd->subauth) { + case VNC_AUTH_VENCRYPT_TLSNONE: + case VNC_AUTH_VENCRYPT_X509NONE: + VNC_DEBUG("Accept TLS auth none\n"); + vnc_write_u32(vs, 0); /* Accept auth completion */ + start_client_init(vs); + break; + + case VNC_AUTH_VENCRYPT_TLSVNC: + case VNC_AUTH_VENCRYPT_X509VNC: + VNC_DEBUG("Start TLS auth VNC\n"); + start_auth_vnc(vs); + break; + + default: /* Should not be possible, but just in case */ + VNC_DEBUG("Reject auth %d\n", vs->vd->auth); + vnc_write_u8(vs, 1); + if (vs->minor >= 8) { + static const char err[] = "Unsupported authentication type"; + vnc_write_u32(vs, sizeof(err)); + vnc_write(vs, err, sizeof(err)); + } + vnc_client_error(vs); + } +} + +static void vnc_tls_handshake_io(void *opaque); + +static int vnc_start_vencrypt_handshake(struct VncState *vs) { + int ret; + + if ((ret = gnutls_handshake(vs->tls.session)) < 0) { + if (!gnutls_error_is_fatal(ret)) { + VNC_DEBUG("Handshake interrupted (blocking)\n"); + if (!gnutls_record_get_direction(vs->tls.session)) + qemu_set_fd_handler(vs->csock, vnc_tls_handshake_io, NULL, vs); + else + qemu_set_fd_handler(vs->csock, NULL, vnc_tls_handshake_io, vs); + return 0; + } + VNC_DEBUG("Handshake failed %s\n", gnutls_strerror(ret)); + vnc_client_error(vs); + return -1; + } + + if (vs->vd->tls.x509verify) { + if (vnc_tls_validate_certificate(vs) < 0) { + VNC_DEBUG("Client verification failed\n"); + vnc_client_error(vs); + return -1; + } else { + VNC_DEBUG("Client verification passed\n"); + } + } + + VNC_DEBUG("Handshake done, switching to TLS data mode\n"); + vs->tls.wiremode = VNC_WIREMODE_TLS; + qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs); + + start_auth_vencrypt_subauth(vs); + + return 0; +} + +static void vnc_tls_handshake_io(void *opaque) { + struct VncState *vs = (struct VncState *)opaque; + + VNC_DEBUG("Handshake IO continue\n"); + vnc_start_vencrypt_handshake(vs); +} + + + +#define NEED_X509_AUTH(vs) \ + ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN) + + +static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) +{ + int auth = read_u32(data, 0); + + if (auth != vs->vd->subauth) { + VNC_DEBUG("Rejecting auth %d\n", auth); + vnc_write_u8(vs, 0); /* Reject auth */ + vnc_flush(vs); + vnc_client_error(vs); + } else { + VNC_DEBUG("Accepting auth %d, setting up TLS for handshake\n", auth); + vnc_write_u8(vs, 1); /* Accept auth */ + vnc_flush(vs); + + if (vnc_tls_client_setup(vs, NEED_X509_AUTH(vs)) < 0) { + VNC_DEBUG("Failed to setup TLS\n"); + return 0; + } + + VNC_DEBUG("Start TLS VeNCrypt handshake process\n"); + if (vnc_start_vencrypt_handshake(vs) < 0) { + VNC_DEBUG("Failed to start TLS handshake\n"); + return 0; + } + } + return 0; +} + +static int protocol_client_vencrypt_init(VncState *vs, uint8_t *data, size_t len) +{ + if (data[0] != 0 || + data[1] != 2) { + VNC_DEBUG("Unsupported VeNCrypt protocol %d.%d\n", (int)data[0], (int)data[1]); + vnc_write_u8(vs, 1); /* Reject version */ + vnc_flush(vs); + vnc_client_error(vs); + } else { + VNC_DEBUG("Sending allowed auth %d\n", vs->vd->subauth); + vnc_write_u8(vs, 0); /* Accept version */ + vnc_write_u8(vs, 1); /* Number of sub-auths */ + vnc_write_u32(vs, vs->vd->subauth); /* The supported auth */ + vnc_flush(vs); + vnc_read_when(vs, protocol_client_vencrypt_auth, 4); + } + return 0; +} + + +void start_auth_vencrypt(VncState *vs) +{ + /* Send VeNCrypt version 0.2 */ + vnc_write_u8(vs, 0); + vnc_write_u8(vs, 2); + + vnc_read_when(vs, protocol_client_vencrypt_init, 2); +} + diff -r dfa890dd7417 vnc-auth-vencrypt.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-vencrypt.h Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,33 @@ +/* + * QEMU VNC display driver + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#ifndef __QEMU_VNC_AUTH_VENCRYPT_H__ +#define __QEMU_VNC_AUTH_VENCRYPT_H__ + +void start_auth_vencrypt(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */ diff -r dfa890dd7417 vnc-tls.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-tls.c Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,414 @@ +/* + * QEMU VNC display driver: TLS helpers + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vnc.h" +#include "qemu_socket.h" + +#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 +/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */ +static void vnc_debug_gnutls_log(int level, const char* str) { + VNC_DEBUG("%d %s", level, str); +} +#endif /* defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 */ + + +#define DH_BITS 1024 +static gnutls_dh_params_t dh_params; + +static int vnc_tls_initialize(void) +{ + static int tlsinitialized = 0; + + if (tlsinitialized) + return 1; + + if (gnutls_global_init () < 0) + return 0; + + /* XXX ought to re-generate diffie-hellmen params periodically */ + if (gnutls_dh_params_init (&dh_params) < 0) + return 0; + if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0) + return 0; + +#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 + gnutls_global_set_log_level(10); + gnutls_global_set_log_function(vnc_debug_gnutls_log); +#endif + + tlsinitialized = 1; + + return 1; +} + +static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport, + const void *data, + size_t len) { + struct VncState *vs = (struct VncState *)transport; + int ret; + + retry: + ret = send(vs->csock, data, len, 0); + if (ret < 0) { + if (errno == EINTR) + goto retry; + return -1; + } + return ret; +} + + +static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport, + void *data, + size_t len) { + struct VncState *vs = (struct VncState *)transport; + int ret; + + retry: + ret = recv(vs->csock, data, len, 0); + if (ret < 0) { + if (errno == EINTR) + goto retry; + return -1; + } + return ret; +} + + +static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void) +{ + gnutls_anon_server_credentials anon_cred; + int ret; + + if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) { + VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); + return NULL; + } + + gnutls_anon_set_server_dh_params(anon_cred, dh_params); + + return anon_cred; +} + + +static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncDisplay *vd) +{ + gnutls_certificate_credentials_t x509_cred; + int ret; + + if (!vd->tls.x509cacert) { + VNC_DEBUG("No CA x509 certificate specified\n"); + return NULL; + } + if (!vd->tls.x509cert) { + VNC_DEBUG("No server x509 certificate specified\n"); + return NULL; + } + if (!vd->tls.x509key) { + VNC_DEBUG("No server private key specified\n"); + return NULL; + } + + if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) { + VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); + return NULL; + } + if ((ret = gnutls_certificate_set_x509_trust_file(x509_cred, + vd->tls.x509cacert, + GNUTLS_X509_FMT_PEM)) < 0) { + VNC_DEBUG("Cannot load CA certificate %s\n", gnutls_strerror(ret)); + gnutls_certificate_free_credentials(x509_cred); + return NULL; + } + + if ((ret = gnutls_certificate_set_x509_key_file (x509_cred, + vd->tls.x509cert, + vd->tls.x509key, + GNUTLS_X509_FMT_PEM)) < 0) { + VNC_DEBUG("Cannot load certificate & key %s\n", gnutls_strerror(ret)); + gnutls_certificate_free_credentials(x509_cred); + return NULL; + } + + if (vd->tls.x509cacrl) { + if ((ret = gnutls_certificate_set_x509_crl_file(x509_cred, + vd->tls.x509cacrl, + GNUTLS_X509_FMT_PEM)) < 0) { + VNC_DEBUG("Cannot load CRL %s\n", gnutls_strerror(ret)); + gnutls_certificate_free_credentials(x509_cred); + return NULL; + } + } + + gnutls_certificate_set_dh_params (x509_cred, dh_params); + + return x509_cred; +} + + +int vnc_tls_validate_certificate(struct VncState *vs) +{ + int ret; + unsigned int status; + const gnutls_datum_t *certs; + unsigned int nCerts, i; + time_t now; + + VNC_DEBUG("Validating client certificate\n"); + if ((ret = gnutls_certificate_verify_peers2 (vs->tls.session, &status)) < 0) { + VNC_DEBUG("Verify failed %s\n", gnutls_strerror(ret)); + return -1; + } + + if ((now = time(NULL)) == ((time_t)-1)) { + return -1; + } + + if (status != 0) { + if (status & GNUTLS_CERT_INVALID) + VNC_DEBUG("The certificate is not trusted.\n"); + + if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) + VNC_DEBUG("The certificate hasn't got a known issuer.\n"); + + if (status & GNUTLS_CERT_REVOKED) + VNC_DEBUG("The certificate has been revoked.\n"); + + if (status & GNUTLS_CERT_INSECURE_ALGORITHM) + VNC_DEBUG("The certificate uses an insecure algorithm\n"); + + return -1; + } else { + VNC_DEBUG("Certificate is valid!\n"); + } + + /* Only support x509 for now */ + if (gnutls_certificate_type_get(vs->tls.session) != GNUTLS_CRT_X509) + return -1; + + if (!(certs = gnutls_certificate_get_peers(vs->tls.session, &nCerts))) + return -1; + + for (i = 0 ; i < nCerts ; i++) { + gnutls_x509_crt_t cert; + VNC_DEBUG ("Checking certificate chain %d\n", i); + if (gnutls_x509_crt_init (&cert) < 0) + return -1; + + if (gnutls_x509_crt_import(cert, &certs[i], GNUTLS_X509_FMT_DER) < 0) { + gnutls_x509_crt_deinit (cert); + return -1; + } + + if (gnutls_x509_crt_get_expiration_time (cert) < now) { + VNC_DEBUG("The certificate has expired\n"); + gnutls_x509_crt_deinit (cert); + return -1; + } + + if (gnutls_x509_crt_get_activation_time (cert) > now) { + VNC_DEBUG("The certificate is not yet activated\n"); + gnutls_x509_crt_deinit (cert); + return -1; + } + + if (gnutls_x509_crt_get_activation_time (cert) > now) { + VNC_DEBUG("The certificate is not yet activated\n"); + gnutls_x509_crt_deinit (cert); + return -1; + } + + gnutls_x509_crt_deinit (cert); + } + + return 0; +} + + +int vnc_tls_client_setup(struct VncState *vs, + int needX509Creds) { + static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; + static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 }; + static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0}; + static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0}; + + VNC_DEBUG("Do TLS setup\n"); + if (vnc_tls_initialize() < 0) { + VNC_DEBUG("Failed to init TLS\n"); + vnc_client_error(vs); + return -1; + } + if (vs->tls.session == NULL) { + if (gnutls_init(&vs->tls.session, GNUTLS_SERVER) < 0) { + vnc_client_error(vs); + return -1; + } + + if (gnutls_set_default_priority(vs->tls.session) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (gnutls_kx_set_priority(vs->tls.session, needX509Creds ? kx_x509 : kx_anon) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (gnutls_certificate_type_set_priority(vs->tls.session, cert_type_priority) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (gnutls_protocol_set_priority(vs->tls.session, protocol_priority) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + + if (needX509Creds) { + gnutls_certificate_server_credentials x509_cred = vnc_tls_initialize_x509_cred(vs->vd); + if (!x509_cred) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + if (gnutls_credentials_set(vs->tls.session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + gnutls_certificate_free_credentials(x509_cred); + vnc_client_error(vs); + return -1; + } + if (vs->vd->tls.x509verify) { + VNC_DEBUG("Requesting a client certificate\n"); + gnutls_certificate_server_set_request (vs->tls.session, GNUTLS_CERT_REQUEST); + } + + } else { + gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred(); + if (!anon_cred) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + vnc_client_error(vs); + return -1; + } + if (gnutls_credentials_set(vs->tls.session, GNUTLS_CRD_ANON, anon_cred) < 0) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + gnutls_anon_free_server_credentials(anon_cred); + vnc_client_error(vs); + return -1; + } + } + + gnutls_transport_set_ptr(vs->tls.session, (gnutls_transport_ptr_t)vs); + gnutls_transport_set_push_function(vs->tls.session, vnc_tls_push); + gnutls_transport_set_pull_function(vs->tls.session, vnc_tls_pull); + } + return 0; +} + + +void vnc_tls_client_cleanup(struct VncState *vs) +{ + if (vs->tls.session) { + gnutls_deinit(vs->tls.session); + vs->tls.session = NULL; + } + vs->tls.wiremode = VNC_WIREMODE_CLEAR; +} + + + +static int vnc_set_x509_credential(VncDisplay *vd, + const char *certdir, + const char *filename, + char **cred, + int ignoreMissing) +{ + struct stat sb; + + if (*cred) { + qemu_free(*cred); + *cred = NULL; + } + + *cred = qemu_malloc(strlen(certdir) + strlen(filename) + 2); + + strcpy(*cred, certdir); + strcat(*cred, "/"); + strcat(*cred, filename); + + VNC_DEBUG("Check %s\n", *cred); + if (stat(*cred, &sb) < 0) { + qemu_free(*cred); + *cred = NULL; + if (ignoreMissing && errno == ENOENT) + return 0; + return -1; + } + + return 0; +} + + +#define X509_CA_CERT_FILE "ca-cert.pem" +#define X509_CA_CRL_FILE "ca-crl.pem" +#define X509_SERVER_KEY_FILE "server-key.pem" +#define X509_SERVER_CERT_FILE "server-cert.pem" + + +int vnc_tls_set_x509_creds_dir(VncDisplay *vd, + const char *certdir) +{ + if (vnc_set_x509_credential(vd, certdir, X509_CA_CERT_FILE, &vd->tls.x509cacert, 0) < 0) + goto cleanup; + if (vnc_set_x509_credential(vd, certdir, X509_CA_CRL_FILE, &vd->tls.x509cacrl, 1) < 0) + goto cleanup; + if (vnc_set_x509_credential(vd, certdir, X509_SERVER_CERT_FILE, &vd->tls.x509cert, 0) < 0) + goto cleanup; + if (vnc_set_x509_credential(vd, certdir, X509_SERVER_KEY_FILE, &vd->tls.x509key, 0) < 0) + goto cleanup; + + return 0; + + cleanup: + qemu_free(vd->tls.x509cacert); + qemu_free(vd->tls.x509cacrl); + qemu_free(vd->tls.x509cert); + qemu_free(vd->tls.x509key); + vd->tls.x509cacert = vd->tls.x509cacrl = vd->tls.x509cert = vd->tls.x509key = NULL; + return -1; +} + diff -r dfa890dd7417 vnc-tls.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-tls.h Mon Feb 23 13:06:22 2009 +0000 @@ -0,0 +1,70 @@ +/* + * QEMU VNC display driver. TLS helpers + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2006 Fabrice Bellard + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#ifndef __QEMU_VNC_TLS_H__ +#define __QEMU_VNC_TLS_H__ + +#include +#include + +enum { + VNC_WIREMODE_CLEAR, + VNC_WIREMODE_TLS, +}; + +typedef struct VncDisplayTLS VncDisplayTLS; +typedef struct VncStateTLS VncStateTLS; + +/* Server state */ +struct VncDisplayTLS { + int x509verify; /* Non-zero if server requests & validates client cert */ + + /* Paths to x509 certs/keys */ + char *x509cacert; + char *x509cacrl; + char *x509cert; + char *x509key; +}; + +/* Per client state */ +struct VncStateTLS { + /* Whether data is being TLS encrypted yet */ + int wiremode; + gnutls_session_t session; +}; + +int vnc_tls_client_setup(VncState *vs, int x509Creds); +void vnc_tls_client_cleanup(VncState *vs); + +int vnc_tls_validate_certificate(VncState *vs); + +int vnc_tls_set_x509_creds_dir(VncDisplay *vd, + const char *path); + + +#endif /* __QEMU_VNC_TLS_H__ */ + diff -r dfa890dd7417 vnc.c --- a/vnc.c Mon Feb 23 13:05:49 2009 +0000 +++ b/vnc.c Mon Feb 23 13:06:22 2009 +0000 @@ -34,21 +34,6 @@ #include "vnc_keysym.h" #include "d3des.h" -// #define _VNC_DEBUG 1 - -#ifdef _VNC_DEBUG -#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) - -#if defined(CONFIG_VNC_TLS) && _VNC_DEBUG >= 2 -/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */ -static void vnc_debug_gnutls_log(int level, const char* str) { - VNC_DEBUG("%d %s", level, str); -} -#endif /* CONFIG_VNC_TLS && _VNC_DEBUG */ -#else -#define VNC_DEBUG(fmt, ...) do { } while (0) -#endif - #define count_bits(c, v) { \ for (c = 0; v; v >>= 1) \ { \ @@ -204,14 +189,7 @@ static inline uint32_t vnc_has_feature(V 3) resolutions > 1024 */ -static void vnc_write(VncState *vs, const void *data, size_t len); -static void vnc_write_u32(VncState *vs, uint32_t value); -static void vnc_write_s32(VncState *vs, int32_t value); -static void vnc_write_u16(VncState *vs, uint16_t value); -static void vnc_write_u8(VncState *vs, uint8_t value); -static void vnc_flush(VncState *vs); static void vnc_update_client(void *opaque); -static void vnc_client_read(void *opaque); static void vnc_colordepth(VncState *vs); @@ -867,10 +845,7 @@ static int vnc_client_io_error(VncState if (vs->input.buffer) qemu_free(vs->input.buffer); if (vs->output.buffer) qemu_free(vs->output.buffer); #ifdef CONFIG_VNC_TLS - if (vs->tls_session) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - } + vnc_tls_client_cleanup(vs); #endif /* CONFIG_VNC_TLS */ audio_del(vs); @@ -896,19 +871,20 @@ static int vnc_client_io_error(VncState return ret; } -static void vnc_client_error(VncState *vs) + +void vnc_client_error(VncState *vs) { vnc_client_io_error(vs, -1, EINVAL); } -static void vnc_client_write(void *opaque) +void vnc_client_write(void *opaque) { long ret; VncState *vs = opaque; #ifdef CONFIG_VNC_TLS - if (vs->tls_session) { - ret = gnutls_write(vs->tls_session, vs->output.buffer, vs->output.offset); + if (vs->tls.session) { + ret = gnutls_write(vs->tls.session, vs->output.buffer, vs->output.offset); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -931,13 +907,13 @@ static void vnc_client_write(void *opaqu } } -static void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) +void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) { vs->read_handler = func; vs->read_handler_expect = expecting; } -static void vnc_client_read(void *opaque) +void vnc_client_read(void *opaque) { VncState *vs = opaque; long ret; @@ -945,8 +921,8 @@ static void vnc_client_read(void *opaque buffer_reserve(&vs->input, 4096); #ifdef CONFIG_VNC_TLS - if (vs->tls_session) { - ret = gnutls_read(vs->tls_session, buffer_end(&vs->input), 4096); + if (vs->tls.session) { + ret = gnutls_read(vs->tls.session, buffer_end(&vs->input), 4096); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -980,7 +956,7 @@ static void vnc_client_read(void *opaque } } -static void vnc_write(VncState *vs, const void *data, size_t len) +void vnc_write(VncState *vs, const void *data, size_t len) { buffer_reserve(&vs->output, len); @@ -991,12 +967,12 @@ static void vnc_write(VncState *vs, cons buffer_append(&vs->output, data, len); } -static void vnc_write_s32(VncState *vs, int32_t value) +void vnc_write_s32(VncState *vs, int32_t value) { vnc_write_u32(vs, *(uint32_t *)&value); } -static void vnc_write_u32(VncState *vs, uint32_t value) +void vnc_write_u32(VncState *vs, uint32_t value) { uint8_t buf[4]; @@ -1008,7 +984,7 @@ static void vnc_write_u32(VncState *vs, vnc_write(vs, buf, 4); } -static void vnc_write_u16(VncState *vs, uint16_t value) +void vnc_write_u16(VncState *vs, uint16_t value) { uint8_t buf[2]; @@ -1018,74 +994,39 @@ static void vnc_write_u16(VncState *vs, vnc_write(vs, buf, 2); } -static void vnc_write_u8(VncState *vs, uint8_t value) +void vnc_write_u8(VncState *vs, uint8_t value) { vnc_write(vs, (char *)&value, 1); } -static void vnc_flush(VncState *vs) +void vnc_flush(VncState *vs) { if (vs->output.offset) vnc_client_write(vs); } -static uint8_t read_u8(uint8_t *data, size_t offset) +uint8_t read_u8(uint8_t *data, size_t offset) { return data[offset]; } -static uint16_t read_u16(uint8_t *data, size_t offset) +uint16_t read_u16(uint8_t *data, size_t offset) { return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF); } -static int32_t read_s32(uint8_t *data, size_t offset) +int32_t read_s32(uint8_t *data, size_t offset) { return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) | (data[offset + 2] << 8) | data[offset + 3]); } -static uint32_t read_u32(uint8_t *data, size_t offset) +uint32_t read_u32(uint8_t *data, size_t offset) { return ((data[offset] << 24) | (data[offset + 1] << 16) | (data[offset + 2] << 8) | data[offset + 3]); } -#ifdef CONFIG_VNC_TLS -static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport, - const void *data, - size_t len) { - struct VncState *vs = (struct VncState *)transport; - int ret; - - retry: - ret = send(vs->csock, data, len, 0); - if (ret < 0) { - if (errno == EINTR) - goto retry; - return -1; - } - return ret; -} - - -static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport, - void *data, - size_t len) { - struct VncState *vs = (struct VncState *)transport; - int ret; - - retry: - ret = recv(vs->csock, data, len, 0); - if (ret < 0) { - if (errno == EINTR) - goto retry; - return -1; - } - return ret; -} -#endif /* CONFIG_VNC_TLS */ - static void client_cut_text(VncState *vs, size_t len, uint8_t *text) { } @@ -1668,6 +1609,11 @@ static int protocol_client_init(VncState return 0; } +void start_client_init(VncState *vs) +{ + vnc_read_when(vs, protocol_client_init, 1); +} + static void make_challenge(VncState *vs) { int i; @@ -1723,12 +1669,12 @@ static int protocol_client_auth_vnc(VncS vnc_write_u32(vs, 0); /* Accept auth */ vnc_flush(vs); - vnc_read_when(vs, protocol_client_init, 1); + start_client_init(vs); } return 0; } -static int start_auth_vnc(VncState *vs) +void start_auth_vnc(VncState *vs) { make_challenge(vs); /* Send client a 'random' challenge */ @@ -1736,411 +1682,9 @@ static int start_auth_vnc(VncState *vs) vnc_flush(vs); vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge)); - return 0; } -#ifdef CONFIG_VNC_TLS -#define DH_BITS 1024 -static gnutls_dh_params_t dh_params; - -static int vnc_tls_initialize(void) -{ - static int tlsinitialized = 0; - - if (tlsinitialized) - return 1; - - if (gnutls_global_init () < 0) - return 0; - - /* XXX ought to re-generate diffie-hellmen params periodically */ - if (gnutls_dh_params_init (&dh_params) < 0) - return 0; - if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0) - return 0; - -#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2 - gnutls_global_set_log_level(10); - gnutls_global_set_log_function(vnc_debug_gnutls_log); -#endif - - tlsinitialized = 1; - - return 1; -} - -static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void) -{ - gnutls_anon_server_credentials anon_cred; - int ret; - - if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) { - VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); - return NULL; - } - - gnutls_anon_set_server_dh_params(anon_cred, dh_params); - - return anon_cred; -} - - -static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncState *vs) -{ - gnutls_certificate_credentials_t x509_cred; - int ret; - - if (!vs->vd->x509cacert) { - VNC_DEBUG("No CA x509 certificate specified\n"); - return NULL; - } - if (!vs->vd->x509cert) { - VNC_DEBUG("No server x509 certificate specified\n"); - return NULL; - } - if (!vs->vd->x509key) { - VNC_DEBUG("No server private key specified\n"); - return NULL; - } - - if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) { - VNC_DEBUG("Cannot allocate credentials %s\n", gnutls_strerror(ret)); - return NULL; - } - if ((ret = gnutls_certificate_set_x509_trust_file(x509_cred, - vs->vd->x509cacert, - GNUTLS_X509_FMT_PEM)) < 0) { - VNC_DEBUG("Cannot load CA certificate %s\n", gnutls_strerror(ret)); - gnutls_certificate_free_credentials(x509_cred); - return NULL; - } - - if ((ret = gnutls_certificate_set_x509_key_file (x509_cred, - vs->vd->x509cert, - vs->vd->x509key, - GNUTLS_X509_FMT_PEM)) < 0) { - VNC_DEBUG("Cannot load certificate & key %s\n", gnutls_strerror(ret)); - gnutls_certificate_free_credentials(x509_cred); - return NULL; - } - - if (vs->vd->x509cacrl) { - if ((ret = gnutls_certificate_set_x509_crl_file(x509_cred, - vs->vd->x509cacrl, - GNUTLS_X509_FMT_PEM)) < 0) { - VNC_DEBUG("Cannot load CRL %s\n", gnutls_strerror(ret)); - gnutls_certificate_free_credentials(x509_cred); - return NULL; - } - } - - gnutls_certificate_set_dh_params (x509_cred, dh_params); - - return x509_cred; -} - -static int vnc_validate_certificate(struct VncState *vs) -{ - int ret; - unsigned int status; - const gnutls_datum_t *certs; - unsigned int nCerts, i; - time_t now; - - VNC_DEBUG("Validating client certificate\n"); - if ((ret = gnutls_certificate_verify_peers2 (vs->tls_session, &status)) < 0) { - VNC_DEBUG("Verify failed %s\n", gnutls_strerror(ret)); - return -1; - } - - if ((now = time(NULL)) == ((time_t)-1)) { - return -1; - } - - if (status != 0) { - if (status & GNUTLS_CERT_INVALID) - VNC_DEBUG("The certificate is not trusted.\n"); - - if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - VNC_DEBUG("The certificate hasn't got a known issuer.\n"); - - if (status & GNUTLS_CERT_REVOKED) - VNC_DEBUG("The certificate has been revoked.\n"); - - if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - VNC_DEBUG("The certificate uses an insecure algorithm\n"); - - return -1; - } else { - VNC_DEBUG("Certificate is valid!\n"); - } - - /* Only support x509 for now */ - if (gnutls_certificate_type_get(vs->tls_session) != GNUTLS_CRT_X509) - return -1; - - if (!(certs = gnutls_certificate_get_peers(vs->tls_session, &nCerts))) - return -1; - - for (i = 0 ; i < nCerts ; i++) { - gnutls_x509_crt_t cert; - VNC_DEBUG ("Checking certificate chain %d\n", i); - if (gnutls_x509_crt_init (&cert) < 0) - return -1; - - if (gnutls_x509_crt_import(cert, &certs[i], GNUTLS_X509_FMT_DER) < 0) { - gnutls_x509_crt_deinit (cert); - return -1; - } - - if (gnutls_x509_crt_get_expiration_time (cert) < now) { - VNC_DEBUG("The certificate has expired\n"); - gnutls_x509_crt_deinit (cert); - return -1; - } - - if (gnutls_x509_crt_get_activation_time (cert) > now) { - VNC_DEBUG("The certificate is not yet activated\n"); - gnutls_x509_crt_deinit (cert); - return -1; - } - - if (gnutls_x509_crt_get_activation_time (cert) > now) { - VNC_DEBUG("The certificate is not yet activated\n"); - gnutls_x509_crt_deinit (cert); - return -1; - } - - gnutls_x509_crt_deinit (cert); - } - - return 0; -} - - -static int start_auth_vencrypt_subauth(VncState *vs) -{ - switch (vs->vd->subauth) { - case VNC_AUTH_VENCRYPT_TLSNONE: - case VNC_AUTH_VENCRYPT_X509NONE: - VNC_DEBUG("Accept TLS auth none\n"); - vnc_write_u32(vs, 0); /* Accept auth completion */ - vnc_read_when(vs, protocol_client_init, 1); - break; - - case VNC_AUTH_VENCRYPT_TLSVNC: - case VNC_AUTH_VENCRYPT_X509VNC: - VNC_DEBUG("Start TLS auth VNC\n"); - return start_auth_vnc(vs); - - default: /* Should not be possible, but just in case */ - VNC_DEBUG("Reject auth %d\n", vs->vd->auth); - vnc_write_u8(vs, 1); - if (vs->minor >= 8) { - static const char err[] = "Unsupported authentication type"; - vnc_write_u32(vs, sizeof(err)); - vnc_write(vs, err, sizeof(err)); - } - vnc_client_error(vs); - } - - return 0; -} - -static void vnc_handshake_io(void *opaque); - -static int vnc_continue_handshake(struct VncState *vs) { - int ret; - - if ((ret = gnutls_handshake(vs->tls_session)) < 0) { - if (!gnutls_error_is_fatal(ret)) { - VNC_DEBUG("Handshake interrupted (blocking)\n"); - if (!gnutls_record_get_direction(vs->tls_session)) - qemu_set_fd_handler(vs->csock, vnc_handshake_io, NULL, vs); - else - qemu_set_fd_handler(vs->csock, NULL, vnc_handshake_io, vs); - return 0; - } - VNC_DEBUG("Handshake failed %s\n", gnutls_strerror(ret)); - vnc_client_error(vs); - return -1; - } - - if (vs->vd->x509verify) { - if (vnc_validate_certificate(vs) < 0) { - VNC_DEBUG("Client verification failed\n"); - vnc_client_error(vs); - return -1; - } else { - VNC_DEBUG("Client verification passed\n"); - } - } - - VNC_DEBUG("Handshake done, switching to TLS data mode\n"); - vs->wiremode = VNC_WIREMODE_TLS; - qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, vs); - - return start_auth_vencrypt_subauth(vs); -} - -static void vnc_handshake_io(void *opaque) { - struct VncState *vs = (struct VncState *)opaque; - - VNC_DEBUG("Handshake IO continue\n"); - vnc_continue_handshake(vs); -} - -#define NEED_X509_AUTH(vs) \ - ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ - (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ - (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN) - - -static int vnc_start_tls(struct VncState *vs) { - static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; - static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 }; - static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0}; - static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0}; - - VNC_DEBUG("Do TLS setup\n"); - if (vnc_tls_initialize() < 0) { - VNC_DEBUG("Failed to init TLS\n"); - vnc_client_error(vs); - return -1; - } - if (vs->tls_session == NULL) { - if (gnutls_init(&vs->tls_session, GNUTLS_SERVER) < 0) { - vnc_client_error(vs); - return -1; - } - - if (gnutls_set_default_priority(vs->tls_session) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_kx_set_priority(vs->tls_session, NEED_X509_AUTH(vs) ? kx_x509 : kx_anon) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_certificate_type_set_priority(vs->tls_session, cert_type_priority) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_protocol_set_priority(vs->tls_session, protocol_priority) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - - if (NEED_X509_AUTH(vs)) { - gnutls_certificate_server_credentials x509_cred = vnc_tls_initialize_x509_cred(vs); - if (!x509_cred) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - if (gnutls_credentials_set(vs->tls_session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - gnutls_certificate_free_credentials(x509_cred); - vnc_client_error(vs); - return -1; - } - if (vs->vd->x509verify) { - VNC_DEBUG("Requesting a client certificate\n"); - gnutls_certificate_server_set_request (vs->tls_session, GNUTLS_CERT_REQUEST); - } - - } else { - gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred(); - if (!anon_cred) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - vnc_client_error(vs); - return -1; - } - if (gnutls_credentials_set(vs->tls_session, GNUTLS_CRD_ANON, anon_cred) < 0) { - gnutls_deinit(vs->tls_session); - vs->tls_session = NULL; - gnutls_anon_free_server_credentials(anon_cred); - vnc_client_error(vs); - return -1; - } - } - - gnutls_transport_set_ptr(vs->tls_session, (gnutls_transport_ptr_t)vs); - gnutls_transport_set_push_function(vs->tls_session, vnc_tls_push); - gnutls_transport_set_pull_function(vs->tls_session, vnc_tls_pull); - } - - VNC_DEBUG("Start TLS handshake process\n"); - return vnc_continue_handshake(vs); -} - -static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) -{ - int auth = read_u32(data, 0); - - if (auth != vs->vd->subauth) { - VNC_DEBUG("Rejecting auth %d\n", auth); - vnc_write_u8(vs, 0); /* Reject auth */ - vnc_flush(vs); - vnc_client_error(vs); - } else { - VNC_DEBUG("Accepting auth %d, starting handshake\n", auth); - vnc_write_u8(vs, 1); /* Accept auth */ - vnc_flush(vs); - - if (vnc_start_tls(vs) < 0) { - VNC_DEBUG("Failed to complete TLS\n"); - return 0; - } - } - return 0; -} - -static int protocol_client_vencrypt_init(VncState *vs, uint8_t *data, size_t len) -{ - if (data[0] != 0 || - data[1] != 2) { - VNC_DEBUG("Unsupported VeNCrypt protocol %d.%d\n", (int)data[0], (int)data[1]); - vnc_write_u8(vs, 1); /* Reject version */ - vnc_flush(vs); - vnc_client_error(vs); - } else { - VNC_DEBUG("Sending allowed auth %d\n", vs->vd->subauth); - vnc_write_u8(vs, 0); /* Accept version */ - vnc_write_u8(vs, 1); /* Number of sub-auths */ - vnc_write_u32(vs, vs->vd->subauth); /* The supported auth */ - vnc_flush(vs); - vnc_read_when(vs, protocol_client_vencrypt_auth, 4); - } - return 0; -} - -static int start_auth_vencrypt(VncState *vs) -{ - /* Send VeNCrypt version 0.2 */ - vnc_write_u8(vs, 0); - vnc_write_u8(vs, 2); - - vnc_read_when(vs, protocol_client_vencrypt_init, 2); - return 0; -} -#endif /* CONFIG_VNC_TLS */ - static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len) { /* We only advertise 1 auth scheme at a time, so client @@ -2163,17 +1707,19 @@ static int protocol_client_auth(VncState vnc_write_u32(vs, 0); /* Accept auth completion */ vnc_flush(vs); } - vnc_read_when(vs, protocol_client_init, 1); + start_client_init(vs); break; case VNC_AUTH_VNC: VNC_DEBUG("Start VNC auth\n"); - return start_auth_vnc(vs); + start_auth_vnc(vs); + break; #ifdef CONFIG_VNC_TLS case VNC_AUTH_VENCRYPT: VNC_DEBUG("Accept VeNCrypt auth\n");; - return start_auth_vencrypt(vs); + start_auth_vencrypt(vs); + break; #endif /* CONFIG_VNC_TLS */ default: /* Should not be possible, but just in case */ @@ -2226,7 +1772,7 @@ static int protocol_version(VncState *vs VNC_DEBUG("Tell client auth none\n"); vnc_write_u32(vs, vs->vd->auth); vnc_flush(vs); - vnc_read_when(vs, protocol_client_init, 1); + 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); @@ -2328,61 +1874,6 @@ void vnc_display_init(DisplayState *ds) register_displaychangelistener(ds, dcl); } -#ifdef CONFIG_VNC_TLS -static int vnc_set_x509_credential(VncDisplay *vs, - const char *certdir, - const char *filename, - char **cred, - int ignoreMissing) -{ - struct stat sb; - - if (*cred) { - qemu_free(*cred); - *cred = NULL; - } - - *cred = qemu_malloc(strlen(certdir) + strlen(filename) + 2); - - strcpy(*cred, certdir); - strcat(*cred, "/"); - strcat(*cred, filename); - - VNC_DEBUG("Check %s\n", *cred); - if (stat(*cred, &sb) < 0) { - qemu_free(*cred); - *cred = NULL; - if (ignoreMissing && errno == ENOENT) - return 0; - return -1; - } - - return 0; -} - -static int vnc_set_x509_credential_dir(VncDisplay *vs, - const char *certdir) -{ - if (vnc_set_x509_credential(vs, certdir, X509_CA_CERT_FILE, &vs->x509cacert, 0) < 0) - goto cleanup; - if (vnc_set_x509_credential(vs, certdir, X509_CA_CRL_FILE, &vs->x509cacrl, 1) < 0) - goto cleanup; - if (vnc_set_x509_credential(vs, certdir, X509_SERVER_CERT_FILE, &vs->x509cert, 0) < 0) - goto cleanup; - if (vnc_set_x509_credential(vs, certdir, X509_SERVER_KEY_FILE, &vs->x509key, 0) < 0) - goto cleanup; - - return 0; - - cleanup: - qemu_free(vs->x509cacert); - qemu_free(vs->x509cacrl); - qemu_free(vs->x509cert); - qemu_free(vs->x509key); - vs->x509cacert = vs->x509cacrl = vs->x509cert = vs->x509key = NULL; - return -1; -} -#endif /* CONFIG_VNC_TLS */ void vnc_display_close(DisplayState *ds) { @@ -2402,7 +1893,7 @@ void vnc_display_close(DisplayState *ds) vs->auth = VNC_AUTH_INVALID; #ifdef CONFIG_VNC_TLS vs->subauth = VNC_AUTH_INVALID; - vs->x509verify = 0; + vs->tls.x509verify = 0; #endif } @@ -2458,7 +1949,7 @@ int vnc_display_open(DisplayState *ds, c char *start, *end; x509 = 1; /* Require x509 certificates */ if (strncmp(options, "x509verify", 10) == 0) - vs->x509verify = 1; /* ...and verify client certs */ + vs->tls.x509verify = 1; /* ...and verify client certs */ /* Now check for 'x509=/some/path' postfix * and use that to setup x509 certificate/key paths */ @@ -2469,7 +1960,7 @@ int vnc_display_open(DisplayState *ds, c char *path = qemu_strndup(start + 1, len); VNC_DEBUG("Trying certificate path '%s'\n", path); - if (vnc_set_x509_credential_dir(vs, path) < 0) { + if (vnc_tls_set_x509_creds_dir(vs, path) < 0) { fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path); qemu_free(path); qemu_free(vs->display); diff -r dfa890dd7417 vnc.h --- a/vnc.h Mon Feb 23 13:05:49 2009 +0000 +++ b/vnc.h Mon Feb 23 13:06:22 2009 +0000 @@ -32,12 +32,15 @@ #include "audio/audio.h" #include -#ifdef CONFIG_VNC_TLS -#include -#include -#endif /* CONFIG_VNC_TLS */ +#include "keymaps.h" -#include "keymaps.h" +// #define _VNC_DEBUG 1 + +#ifdef _VNC_DEBUG +#define VNC_DEBUG(fmt, ...) do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) +#else +#define VNC_DEBUG(fmt, ...) do { } while (0) +#endif /***************************************************************************** * @@ -72,6 +75,11 @@ typedef void VncSendHextileTile(VncState typedef struct VncDisplay VncDisplay; +#ifdef CONFIG_VNC_TLS +#include "vnc-tls.h" +#include "vnc-auth-vencrypt.h" +#endif + struct VncDisplay { int lsock; @@ -83,13 +91,8 @@ struct VncDisplay char *password; int auth; #ifdef CONFIG_VNC_TLS - int subauth; - int x509verify; - - char *x509cacert; - char *x509cacrl; - char *x509cert; - char *x509key; + int subauth; /* Used by VeNCrypt */ + VncDisplayTLS tls; #endif }; @@ -117,8 +120,7 @@ struct VncState char challenge[VNC_AUTH_CHALLENGE_SIZE]; #ifdef CONFIG_VNC_TLS - int wiremode; - gnutls_session_t tls_session; + VncStateTLS tls; #endif Buffer output; @@ -162,12 +164,6 @@ enum { VNC_AUTH_VENCRYPT = 19 }; -#ifdef CONFIG_VNC_TLS -enum { - VNC_WIREMODE_CLEAR, - VNC_WIREMODE_TLS, -}; - enum { VNC_AUTH_VENCRYPT_PLAIN = 256, VNC_AUTH_VENCRYPT_TLSNONE = 257, @@ -178,12 +174,6 @@ enum { VNC_AUTH_VENCRYPT_X509PLAIN = 262, }; -#define X509_CA_CERT_FILE "ca-cert.pem" -#define X509_CA_CRL_FILE "ca-crl.pem" -#define X509_SERVER_KEY_FILE "server-key.pem" -#define X509_SERVER_CERT_FILE "server-cert.pem" - -#endif /* CONFIG_VNC_TLS */ /***************************************************************************** * @@ -254,4 +244,38 @@ enum { #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) #define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT) + +/***************************************************************************** + * + * Internal APIs + * + *****************************************************************************/ + +/* Event loop functions */ +void vnc_client_read(void *opaque); +void vnc_client_write(void *opaque); + + +/* Protocol I/O functions */ +void vnc_write(VncState *vs, const void *data, size_t len); +void vnc_write_u32(VncState *vs, uint32_t value); +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); +void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting); + + +/* Buffer I/O functions */ +uint8_t read_u8(uint8_t *data, size_t offset); +uint16_t read_u16(uint8_t *data, size_t offset); +int32_t read_s32(uint8_t *data, size_t offset); +uint32_t read_u32(uint8_t *data, size_t offset); + +/* Protocol stage functions */ +void vnc_client_error(VncState *vs); + +void start_client_init(VncState *vs); +void start_auth_vnc(VncState *vs); + #endif /* __QEMU_VNC_H */ qemu-sasl-06-vnc-sasl.patch: --- NEW FILE qemu-sasl-06-vnc-sasl.patch --- This patch adds the new SASL authentication protocol to the VNC server. It is enabled by setting the 'sasl' flag when launching VNC. SASL can optionally provide encryption via its SSF layer, if a suitable mechanism is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is not available, then it should be combined with the x509 VNC authentication protocol which provides encryption. eg, if using GSSAPI qemu -vnc localhost:1,sasl eg if using TLS/x509 for encryption qemu -vnc localhost:1,sasl,tls,x509 By default the Cyrus SASL library will look for its configuration in the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden by setting the SASL_CONF_PATH environment variable, eg to make it look in $HOME/.sasl2. NB unprivileged users may not have access to the full range of SASL mechanisms, since some of them require some administrative privileges to configure. The patch includes an example SASL configuration file which illustrates config for GSSAPI and Digest-MD5, though it should be noted that the latter is not really considered secure any more. Most of the SASL authentication code is located in a separate source file, vnc-auth-sasl.c. The main vnc.c file only contains minimal integration glue, specifically parsing of command line flags / setup, and calls to start the SASL auth process, to do encoding/decoding for data. There are several possible stacks for reading & writing of data, depending on the combo of VNC authentication methods in use - Clear. read/write straight to socket - TLS. read/write via GNUTLS helpers - SASL. encode/decode via SASL SSF layer, then read/write to socket - SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS Hence, the vnc_client_read & vnc_client_write methods have been refactored a little. vnc_client_read: main entry point for reading, calls either - vnc_client_read_plain reading, with no intermediate decoding - vnc_client_read_sasl reading, with SASL SSF decoding These two methods, then call vnc_client_read_buf(). This decides whether to write to the socket directly or write via GNUTLS. The situation is the same for writing data. More extensive comments have been added in the code / patch. The vnc_client_read_sasl and vnc_client_write_sasl method implementations live in the separate vnc-auth-sasl.c file. The state required for the SASL auth mechanism is kept in a separate VncStateSASL struct, defined in vnc-auth-sasl.h and included in the main VncState. The configure script probes for SASL and automatically enables it if found, unless --disable-vnc-sasl was given to override it. Makefile | 7 Makefile.target | 5 b/qemu.sasl | 34 ++ b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++ b/vnc-auth-sasl.h | 67 +++++ configure | 34 ++ qemu-doc.texi | 97 ++++++++ vnc-auth-vencrypt.c | 12 vnc.c | 249 ++++++++++++++++++-- vnc.h | 31 ++ 10 files changed, 1129 insertions(+), 33 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 6981d4d832a9 Makefile --- a/Makefile Mon Mar 02 11:13:33 2009 +0000 +++ b/Makefile Mon Mar 02 11:13:38 2009 +0000 @@ -148,6 +148,9 @@ OBJS+=vnc.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif +ifdef CONFIG_VNC_SASL +OBJS+=vnc-auth-sasl.o +endif ifdef CONFIG_COCOA OBJS+=cocoa.o @@ -171,7 +174,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.h: vnc-tls.h vnc-auth-vencrypt.h keymaps.h +vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h @@ -181,6 +184,8 @@ vnc-tls.o: vnc-tls.c vnc.h vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h +vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h + curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) diff -r 6981d4d832a9 Makefile.target --- a/Makefile.target Mon Mar 02 11:13:33 2009 +0000 +++ b/Makefile.target Mon Mar 02 11:13:38 2009 +0000 @@ -554,6 +554,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) LIBS += $(CONFIG_VNC_TLS_LIBS) endif +ifdef CONFIG_VNC_SASL +CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS) +LIBS += $(CONFIG_VNC_SASL_LIBS) +endif + ifdef CONFIG_BLUEZ LIBS += $(CONFIG_BLUEZ_LIBS) endif diff -r 6981d4d832a9 configure --- a/configure Mon Mar 02 11:13:33 2009 +0000 +++ b/configure Mon Mar 02 11:13:38 2009 +0000 @@ -164,6 +164,7 @@ fmod_lib="" fmod_inc="" oss_lib="" vnc_tls="yes" +vnc_sasl="yes" bsd="no" linux="no" solaris="no" @@ -387,6 +388,8 @@ for opt do ;; --disable-vnc-tls) vnc_tls="no" ;; + --disable-vnc-sasl) vnc_sasl="no" + ;; --disable-slirp) slirp="no" ;; --disable-vde) vde="no" @@ -544,6 +547,7 @@ echo " Availab echo " --enable-mixemu enable mixer emulation" echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" +echo " --disable-vnc-sasl disable SASL encryption for VNC server" echo " --disable-curses disable curses output" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" @@ -823,6 +827,25 @@ EOF fi ########################################## +# VNC SASL detection +if test "$vnc_sasl" = "yes" ; then +cat > $TMPC < +#include +int main(void) { sasl_server_init(NULL, "qemu"); return 0; } +EOF + # Assuming Cyrus-SASL installed in /usr prefix + vnc_sasl_cflags="" + vnc_sasl_libs="-lsasl2" + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \ + $vnc_sasl_libs 2> /dev/null ; then + : + else + vnc_sasl="no" + fi +fi + +########################################## # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF @@ -1130,6 +1153,11 @@ if test "$vnc_tls" = "yes" ; then echo " TLS CFLAGS $vnc_tls_cflags" echo " TLS LIBS $vnc_tls_libs" fi +echo "VNC SASL support $vnc_sasl" +if test "$vnc_sasl" = "yes" ; then + echo " SASL CFLAGS $vnc_sasl_cflags" + echo " SASL LIBS $vnc_sasl_libs" +fi if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi @@ -1371,6 +1399,12 @@ if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak echo "#define CONFIG_VNC_TLS 1" >> $config_h fi +if test "$vnc_sasl" = "yes" ; then + echo "CONFIG_VNC_SASL=yes" >> $config_mak + echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak + echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak + echo "#define CONFIG_VNC_SASL 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 -r 6981d4d832a9 qemu-doc.texi --- a/qemu-doc.texi Mon Mar 02 11:13:33 2009 +0000 +++ b/qemu-doc.texi Mon Mar 02 11:13:38 2009 +0000 @@ -616,6 +616,21 @@ path following this option specifies whe be loaded from. See the @ref{vnc_security} section for details on generating certificates. + at item sasl + +Require that the client use SASL to authenticate with the VNC server. +The exact choice of authentication method used is controlled from the +system / user's SASL configuration file for the 'qemu' service. This +is typically found in /etc/sasl2/qemu.conf. If running QEMU as an +unprivileged user, an environment variable SASL_CONF_PATH can be used +to make it search alternate locations for the service config. +While some SASL auth methods can also provide data encryption (eg GSSAPI), +it is recommended that SASL always be combined with the 'tls' and +'x509' settings to enable use of SSL and server certificates. This +ensures a data encryption preventing compromise of authentication +credentials. See the @ref{vnc_security} section for details on using +SASL authentication. + @end table @end table @@ -2061,7 +2076,10 @@ considerations depending on the deployme * vnc_sec_certificate:: * vnc_sec_certificate_verify:: * vnc_sec_certificate_pw:: +* vnc_sec_sasl:: +* vnc_sec_certificate_sasl:: * vnc_generate_cert:: +* vnc_setup_sasl:: @end menu @node vnc_sec_none @subsection Without passwords @@ -2144,6 +2162,41 @@ Password: ******** (qemu) @end example + + at node vnc_sec_sasl + at subsection With SASL authentication + +The SASL authentication method is a VNC extension, that provides an +easily extendable, pluggable authentication method. This allows for +integration with a wide range of authentication mechanisms, such as +PAM, GSSAPI/Kerberos, LDAP, SQL databases, one-time keys and more. +The strength of the authentication depends on the exact mechanism +configured. If the chosen mechanism also provides a SSF layer, then +it will encrypt the datastream as well. + +Refer to the later docs on how to choose the exact SASL mechanism +used for authentication, but assuming use of one supporting SSF, +then QEMU can be launched with: + + at example +qemu [...OPTIONS...] -vnc :1,sasl -monitor stdio + at end example + + at node vnc_sec_certificate_sasl + at subsection With x509 certificates and SASL authentication + +If the desired SASL authentication mechanism does not supported +SSF layers, then it is strongly advised to run it in combination +with TLS and x509 certificates. This provides securely encrypted +data stream, avoiding risk of compromising of the security +credentials. This can be enabled, by combining the 'sasl' option +with the aforementioned TLS + x509 options: + + at example +qemu [...OPTIONS...] -vnc :1,tls,x509,sasl -monitor stdio + at end example + + @node vnc_generate_cert @subsection Generating certificates for VNC @@ -2255,6 +2308,50 @@ EOF The @code{client-key.pem} and @code{client-cert.pem} files should now be securely copied to the client for which they were generated. + + at node vnc_setup_sasl + + at subsection Configuring SASL mechanisms + +The following documentation assumes use of the Cyrus SASL implementation on a +Linux host, but the principals should apply to any other SASL impl. When SASL +is enabled, the mechanism configuration will be loaded from system default +SASL service config /etc/sasl2/qemu.conf. If running QEMU as an +unprivileged user, an environment variable SASL_CONF_PATH can be used +to make it search alternate locations for the service config. + +The default configuration might contain + + at example +mech_list: digest-md5 +sasldb_path: /etc/qemu/passwd.db + at end example + +This says to use the 'Digest MD5' mechanism, which is similar to the HTTP +Digest-MD5 mechanism. The list of valid usernames & passwords is maintained +in the /etc/qemu/passwd.db file, and can be updated using the saslpasswd2 +command. While this mechanism is easy to configure and use, it is not +considered secure by modern standards, so only suitable for developers / +ad-hoc testing. + +A more serious deployment might use Kerberos, which is done with the 'gssapi' +mechanism + + at example +mech_list: gssapi +keytab: /etc/qemu/krb5.tab + at end example + +For this to work the administrator of your KDC must generate a Kerberos +principal for the server, with a name of 'qemu/somehost.example.com@@EXAMPLE.COM' +replacing 'somehost.example.com' with the fully qualified host name of the +machine running QEMU, and 'EXAMPLE.COM' with the Keberos Realm. + +Other configurations will be left as an exercise for the reader. It should +be noted that only Digest-MD5 and GSSAPI provides a SSF layer for data +encryption. For all other mechanisms, VNC should always be configured to +use TLS and x509 certificates to protect security credentials from snooping. + @node gdb_usage @section GDB usage diff -r 6981d4d832a9 qemu.sasl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qemu.sasl Mon Mar 02 11:13:38 2009 +0000 @@ -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 +# ones that can offer session encryption as well as authentication. +# +# If you're only using TLS, then you can turn on any mechanisms +# you like for authentication, because TLS provides the encryption +# +# Default to a simple username+password mechanism +# NB digest-md5 is no longer considered secure by current standards +mech_list: digest-md5 + +# Before you can use GSSAPI, you need a service principle on the +# KDC server for libvirt, and that to be exported to the keytab +# file listed below +#mech_list: gssapi +# +# You can also list many mechanisms at once, then the user can choose +# by adding '?auth=sasl.gssapi' to their libvirt URI, eg +# qemu+tcp://hostname/system?auth=sasl.gssapi +#mech_list: digest-md5 gssapi + +# Some older builds of MIT kerberos on Linux ignore this option & +# instead need KRB5_KTNAME env var. +# For modern Linux, and other OS, this should be sufficient +keytab: /etc/qemu/krb5.tab + +# If using digest-md5 for username/passwds, then this is the file +# containing the passwds. Use 'saslpasswd2 -a qemu [username]' +# to add entries, and 'sasldblistusers2 -a qemu' to browse it +sasldb_path: /etc/qemu/passwd.db + + +auxprop_plugin: sasldb + diff -r 6981d4d832a9 vnc-auth-sasl.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-sasl.c Mon Mar 02 11:13:38 2009 +0000 @@ -0,0 +1,626 @@ +/* + * QEMU VNC display driver: SASL auth protocol + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vnc.h" + +/* Max amount of data we send/recv for SASL steps to prevent DOS */ +#define SASL_DATA_MAX_LEN (1024 * 1024) + + +void vnc_sasl_client_cleanup(VncState *vs) +{ + if (vs->sasl.conn) { + vs->sasl.runSSF = vs->sasl.waitWriteSSF = vs->sasl.wantSSF = 0; + vs->sasl.encodedLength = vs->sasl.encodedOffset = 0; + vs->sasl.encoded = NULL; + free(vs->sasl.username); + free(vs->sasl.mechlist); + vs->sasl.username = vs->sasl.mechlist = NULL; + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + } +} + + +long vnc_client_write_sasl(VncState *vs) +{ + long ret; + + VNC_DEBUG("Write SASL: Pending output %p size %d offset %d Encoded: %p size %d offset %d\n", + vs->output.buffer, vs->output.capacity, vs->output.offset, + vs->sasl.encoded, vs->sasl.encodedLength, vs->sasl.encodedOffset); + + if (!vs->sasl.encoded) { + int err; + err = sasl_encode(vs->sasl.conn, + (char *)vs->output.buffer, + vs->output.offset, + (const char **)&vs->sasl.encoded, + &vs->sasl.encodedLength); + if (err != SASL_OK) + return vnc_client_io_error(vs, -1, EIO); + + vs->sasl.encodedOffset = 0; + } + + ret = vnc_client_write_buf(vs, + vs->sasl.encoded + vs->sasl.encodedOffset, + vs->sasl.encodedLength - vs->sasl.encodedOffset); + if (!ret) + return 0; + + vs->sasl.encodedOffset += ret; + if (vs->sasl.encodedOffset == vs->sasl.encodedLength) { + vs->output.offset = 0; + vs->sasl.encoded = NULL; + vs->sasl.encodedOffset = vs->sasl.encodedLength = 0; + } + + /* Can't merge this block with one above, because + * someone might have written more unencrypted + * data in vs->output while we were processing + * SASL encoded output + */ + if (vs->output.offset == 0) { + qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs); + } + + return ret; +} + + +long vnc_client_read_sasl(VncState *vs) +{ + long ret; + uint8_t encoded[4096]; + const char *decoded; + unsigned int decodedLen; + int err; + + ret = vnc_client_read_buf(vs, encoded, sizeof(encoded)); + if (!ret) + return 0; + + err = sasl_decode(vs->sasl.conn, + (char *)encoded, ret, + &decoded, &decodedLen); + + if (err != SASL_OK) + return vnc_client_io_error(vs, -1, -EIO); + VNC_DEBUG("Read SASL Encoded %p size %ld Decoded %p size %d\n", + encoded, ret, decoded, decodedLen); + buffer_reserve(&vs->input, decodedLen); + buffer_append(&vs->input, decoded, decodedLen); + return decodedLen; +} + + +static int vnc_auth_sasl_check_access(VncState *vs) +{ + const void *val; + int err; + + err = sasl_getprop(vs->sasl.conn, SASL_USERNAME, &val); + if (err != SASL_OK) { + VNC_DEBUG("cannot query SASL username on connection %d (%s)\n", + err, sasl_errstring(err, NULL, NULL)); + return -1; + } + if (val == NULL) { + VNC_DEBUG("no client username was found\n"); + return -1; + } + VNC_DEBUG("SASL client username %s\n", (const char *)val); + + vs->sasl.username = qemu_strdup((const char*)val); + + return 0; +} + +static int vnc_auth_sasl_check_ssf(VncState *vs) +{ + const void *val; + int err, ssf; + + if (!vs->sasl.wantSSF) + return 1; + + err = sasl_getprop(vs->sasl.conn, SASL_SSF, &val); + if (err != SASL_OK) + return 0; + + ssf = *(const int *)val; + VNC_DEBUG("negotiated an SSF of %d\n", ssf); + if (ssf < 56) + return 0; /* 56 is good for Kerberos */ + + /* Only setup for read initially, because we're about to send an RPC + * reply which must be in plain text. When the next incoming RPC + * arrives, we'll switch on writes too + * + * cf qemudClientReadSASL in qemud.c + */ + vs->sasl.runSSF = 1; + + /* We have a SSF that's good enough */ + return 1; +} + +/* + * Step Msg + * + * Input from client: + * + * u32 clientin-length + * u8-array clientin-string + * + * Output to client: + * + * u32 serverout-length + * u8-array serverout-strin + * u8 continue + */ + +static int protocol_client_auth_sasl_step_len(VncState *vs, uint8_t *data, size_t len); + +static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t datalen = len; + const char *serverout; + unsigned int serveroutlen; + int err; + char *clientdata = NULL; + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (datalen) { + clientdata = (char*)data; + clientdata[datalen-1] = '\0'; /* Wire includes '\0', but make sure */ + datalen--; /* Don't count NULL byte when passing to _start() */ + } + + VNC_DEBUG("Step using SASL Data %p (%d bytes)\n", + clientdata, datalen); + err = sasl_server_step(vs->sasl.conn, + clientdata, + datalen, + &serverout, + &serveroutlen); + if (err != SASL_OK && + err != SASL_CONTINUE) { + VNC_DEBUG("sasl step failed %d (%s)\n", + err, sasl_errdetail(vs->sasl.conn)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + if (serveroutlen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("sasl step reply data too long %d\n", + serveroutlen); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + VNC_DEBUG("SASL return data %d bytes, nil; %d\n", + serveroutlen, serverout ? 0 : 1); + + if (serveroutlen) { + vnc_write_u32(vs, serveroutlen + 1); + vnc_write(vs, serverout, serveroutlen + 1); + } else { + vnc_write_u32(vs, 0); + } + + /* Whether auth is complete */ + vnc_write_u8(vs, err == SASL_CONTINUE ? 0 : 1); + + if (err == SASL_CONTINUE) { + VNC_DEBUG("%s", "Authentication must continue\n"); + /* Wait for step length */ + vnc_read_when(vs, protocol_client_auth_sasl_step_len, 4); + } else { + if (!vnc_auth_sasl_check_ssf(vs)) { + VNC_DEBUG("Authentication rejected for weak SSF %d\n", vs->csock); + goto authreject; + } + + /* Check username whitelist ACL */ + if (vnc_auth_sasl_check_access(vs) < 0) { + VNC_DEBUG("Authentication rejected for ACL %d\n", vs->csock); + goto authreject; + } + + VNC_DEBUG("Authentication successful %d\n", vs->csock); + vnc_write_u32(vs, 0); /* Accept auth */ + /* + * Delay writing in SSF encoded mode until pending output + * buffer is written + */ + if (vs->sasl.runSSF) + vs->sasl.waitWriteSSF = vs->output.offset; + start_client_init(vs); + } + + return 0; + + authreject: + 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); + return -1; + + authabort: + vnc_client_error(vs); + return -1; +} + +static int protocol_client_auth_sasl_step_len(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t steplen = read_u32(data, 0); + VNC_DEBUG("Got client step len %d\n", steplen); + if (steplen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("Too much SASL data %d\n", steplen); + vnc_client_error(vs); + return -1; + } + + if (steplen == 0) + return protocol_client_auth_sasl_step(vs, NULL, 0); + else + vnc_read_when(vs, protocol_client_auth_sasl_step, steplen); + return 0; +} + +/* + * Start Msg + * + * Input from client: + * + * u32 clientin-length + * u8-array clientin-string + * + * Output to client: + * + * u32 serverout-length + * u8-array serverout-strin + * u8 continue + */ + +#define SASL_DATA_MAX_LEN (1024 * 1024) + +static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t datalen = len; + const char *serverout; + unsigned int serveroutlen; + int err; + char *clientdata = NULL; + + /* NB, distinction of NULL vs "" is *critical* in SASL */ + if (datalen) { + clientdata = (char*)data; + clientdata[datalen-1] = '\0'; /* Should be on wire, but make sure */ + datalen--; /* Don't count NULL byte when passing to _start() */ + } + + VNC_DEBUG("Start SASL auth with mechanism %s. Data %p (%d bytes)\n", + vs->sasl.mechlist, clientdata, datalen); + err = sasl_server_start(vs->sasl.conn, + vs->sasl.mechlist, + clientdata, + datalen, + &serverout, + &serveroutlen); + if (err != SASL_OK && + err != SASL_CONTINUE) { + VNC_DEBUG("sasl start failed %d (%s)\n", + err, sasl_errdetail(vs->sasl.conn)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + if (serveroutlen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("sasl start reply data too long %d\n", + serveroutlen); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + VNC_DEBUG("SASL return data %d bytes, nil; %d\n", + serveroutlen, serverout ? 0 : 1); + + if (serveroutlen) { + vnc_write_u32(vs, serveroutlen + 1); + vnc_write(vs, serverout, serveroutlen + 1); + } else { + vnc_write_u32(vs, 0); + } + + /* Whether auth is complete */ + vnc_write_u8(vs, err == SASL_CONTINUE ? 0 : 1); + + if (err == SASL_CONTINUE) { + VNC_DEBUG("%s", "Authentication must continue\n"); + /* Wait for step length */ + vnc_read_when(vs, protocol_client_auth_sasl_step_len, 4); + } else { + if (!vnc_auth_sasl_check_ssf(vs)) { + VNC_DEBUG("Authentication rejected for weak SSF %d\n", vs->csock); + goto authreject; + } + + /* Check username whitelist ACL */ + if (vnc_auth_sasl_check_access(vs) < 0) { + VNC_DEBUG("Authentication rejected for ACL %d\n", vs->csock); + goto authreject; + } + + VNC_DEBUG("Authentication successful %d\n", vs->csock); + vnc_write_u32(vs, 0); /* Accept auth */ + start_client_init(vs); + } + + return 0; + + authreject: + 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); + return -1; + + authabort: + vnc_client_error(vs); + return -1; +} + +static int protocol_client_auth_sasl_start_len(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t startlen = read_u32(data, 0); + VNC_DEBUG("Got client start len %d\n", startlen); + if (startlen > SASL_DATA_MAX_LEN) { + VNC_DEBUG("Too much SASL data %d\n", startlen); + vnc_client_error(vs); + return -1; + } + + if (startlen == 0) + return protocol_client_auth_sasl_start(vs, NULL, 0); + + vnc_read_when(vs, protocol_client_auth_sasl_start, startlen); + return 0; +} + +static int protocol_client_auth_sasl_mechname(VncState *vs, uint8_t *data, size_t len) +{ + char *mechname = malloc(len + 1); + if (!mechname) { + VNC_DEBUG("Out of memory reading mechname\n"); + vnc_client_error(vs); + } + strncpy(mechname, (char*)data, len); + mechname[len] = '\0'; + VNC_DEBUG("Got client mechname '%s' check against '%s'\n", + mechname, vs->sasl.mechlist); + + if (strncmp(vs->sasl.mechlist, mechname, len) == 0) { + if (vs->sasl.mechlist[len] != '\0' && + vs->sasl.mechlist[len] != ',') { + VNC_DEBUG("One %d", vs->sasl.mechlist[len]); + vnc_client_error(vs); + return -1; + } + } else { + char *offset = strstr(vs->sasl.mechlist, mechname); + VNC_DEBUG("Two %p\n", offset); + if (!offset) { + vnc_client_error(vs); + return -1; + } + VNC_DEBUG("Two '%s'\n", offset); + if (offset[-1] != ',' || + (offset[len] != '\0'&& + offset[len] != ',')) { + vnc_client_error(vs); + return -1; + } + } + + free(vs->sasl.mechlist); + vs->sasl.mechlist = mechname; + + VNC_DEBUG("Validated mechname '%s'\n", mechname); + vnc_read_when(vs, protocol_client_auth_sasl_start_len, 4); + return 0; +} + +static int protocol_client_auth_sasl_mechname_len(VncState *vs, uint8_t *data, size_t len) +{ + uint32_t mechlen = read_u32(data, 0); + VNC_DEBUG("Got client mechname len %d\n", mechlen); + if (mechlen > 100) { + VNC_DEBUG("Too long SASL mechname data %d\n", mechlen); + vnc_client_error(vs); + return -1; + } + if (mechlen < 1) { + VNC_DEBUG("Too short SASL mechname %d\n", mechlen); + vnc_client_error(vs); + return -1; + } + vnc_read_when(vs, protocol_client_auth_sasl_mechname,mechlen); + return 0; +} + +#define USES_X509_AUTH(vs) \ + ((vs)->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ + (vs)->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ + (vs)->subauth == VNC_AUTH_VENCRYPT_X509PLAIN || \ + (vs)->subauth == VNC_AUTH_VENCRYPT_X509SASL) + + +void start_auth_sasl(VncState *vs) +{ + const char *mechlist = NULL; + sasl_security_properties_t secprops; + int err; + char *localAddr, *remoteAddr; + int mechlistlen; + + VNC_DEBUG("Initialize SASL auth %d\n", vs->csock); + + /* Get local & remote client addresses in form IPADDR;PORT */ + if (!(localAddr = vnc_socket_local_addr("%s;%s", vs->csock))) + goto authabort; + + if (!(remoteAddr = vnc_socket_remote_addr("%s;%s", vs->csock))) { + free(localAddr); + goto authabort; + } + + err = sasl_server_new("vnc", + NULL, /* FQDN - just delegates to gethostname */ + NULL, /* User realm */ + localAddr, + remoteAddr, + NULL, /* Callbacks, not needed */ + SASL_SUCCESS_DATA, + &vs->sasl.conn); + free(localAddr); + free(remoteAddr); + localAddr = remoteAddr = NULL; + + if (err != SASL_OK) { + VNC_DEBUG("sasl context setup failed %d (%s)", + err, sasl_errstring(err, NULL, NULL)); + vs->sasl.conn = NULL; + goto authabort; + } + +#ifdef CONFIG_VNC_TLS + /* Inform SASL that we've got an external SSF layer from TLS/x509 */ + if (vs->vd->auth == VNC_AUTH_VENCRYPT && + vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) { + gnutls_cipher_algorithm_t cipher; + sasl_ssf_t ssf; + + cipher = gnutls_cipher_get(vs->tls.session); + if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { + VNC_DEBUG("%s", "cannot TLS get cipher size\n"); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + ssf *= 8; /* tls key size is bytes, sasl wants bits */ + + err = sasl_setprop(vs->sasl.conn, SASL_SSF_EXTERNAL, &ssf); + if (err != SASL_OK) { + VNC_DEBUG("cannot set SASL external SSF %d (%s)\n", + err, sasl_errstring(err, NULL, NULL)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + } else +#endif /* CONFIG_VNC_TLS */ + vs->sasl.wantSSF = 1; + + memset (&secprops, 0, sizeof secprops); + /* Inform SASL that we've got an external SSF layer from TLS */ + if (strncmp(vs->vd->display, "unix:", 5) == 0 +#ifdef CONFIG_VNC_TLS + /* Disable SSF, if using TLS+x509+SASL only. TLS without x509 + is not sufficiently strong */ + || (vs->vd->auth == VNC_AUTH_VENCRYPT && + vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) +#endif /* CONFIG_VNC_TLS */ + ) { + /* If we've got TLS or UNIX domain sock, we don't care about SSF */ + secprops.min_ssf = 0; + secprops.max_ssf = 0; + secprops.maxbufsize = 8192; + secprops.security_flags = 0; + } else { + /* Plain TCP, better get an SSF layer */ + secprops.min_ssf = 56; /* Good enough to require kerberos */ + secprops.max_ssf = 100000; /* Arbitrary big number */ + secprops.maxbufsize = 8192; + /* Forbid any anonymous or trivially crackable auth */ + secprops.security_flags = + SASL_SEC_NOANONYMOUS | SASL_SEC_NOPLAINTEXT; + } + + err = sasl_setprop(vs->sasl.conn, SASL_SEC_PROPS, &secprops); + if (err != SASL_OK) { + VNC_DEBUG("cannot set SASL security props %d (%s)\n", + err, sasl_errstring(err, NULL, NULL)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + + err = sasl_listmech(vs->sasl.conn, + NULL, /* Don't need to set user */ + "", /* Prefix */ + ",", /* Separator */ + "", /* Suffix */ + &mechlist, + NULL, + NULL); + if (err != SASL_OK) { + VNC_DEBUG("cannot list SASL mechanisms %d (%s)\n", + err, sasl_errdetail(vs->sasl.conn)); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + VNC_DEBUG("Available mechanisms for client: '%s'\n", mechlist); + + if (!(vs->sasl.mechlist = strdup(mechlist))) { + VNC_DEBUG("Out of memory"); + sasl_dispose(&vs->sasl.conn); + vs->sasl.conn = NULL; + goto authabort; + } + mechlistlen = strlen(mechlist); + vnc_write_u32(vs, mechlistlen); + vnc_write(vs, mechlist, mechlistlen); + vnc_flush(vs); + + VNC_DEBUG("Wait for client mechname length\n"); + vnc_read_when(vs, protocol_client_auth_sasl_mechname_len, 4); + + return; + + authabort: + vnc_client_error(vs); + return; +} + + diff -r 6981d4d832a9 vnc-auth-sasl.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vnc-auth-sasl.h Mon Mar 02 11:13:38 2009 +0000 @@ -0,0 +1,67 @@ +/* + * QEMU VNC display driver: SASL auth protocol + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#ifndef __QEMU_VNC_AUTH_SASL_H__ +#define __QEMU_VNC_AUTH_SASL_H__ + + +#include + +typedef struct VncStateSASL VncStateSASL; + +struct VncStateSASL { + sasl_conn_t *conn; + /* If we want to negotiate an SSF layer with client */ + int wantSSF :1; + /* If we are now running the SSF layer */ + int runSSF :1; + /* + * If this is non-zero, then wait for that many bytes + * to be written plain, before switching to SSF encoding + * This allows the VNC auth result to finish being + * written in plain. + */ + unsigned int waitWriteSSF; + + /* + * Buffering encoded data to allow more clear data + * to be stuffed onto the output buffer + */ + const uint8_t *encoded; + unsigned int encodedLength; + unsigned int encodedOffset; + char *username; + char *mechlist; +}; + +void vnc_sasl_client_cleanup(VncState *vs); + +long vnc_client_read_sasl(VncState *vs); +long vnc_client_write_sasl(VncState *vs); + +void start_auth_sasl(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_SASL_H__ */ + diff -r 6981d4d832a9 vnc-auth-vencrypt.c --- a/vnc-auth-vencrypt.c Mon Mar 02 11:13:33 2009 +0000 +++ b/vnc-auth-vencrypt.c Mon Mar 02 11:13:38 2009 +0000 @@ -43,8 +43,15 @@ static void start_auth_vencrypt_subauth( start_auth_vnc(vs); break; +#ifdef CONFIG_VNC_SASL + case VNC_AUTH_VENCRYPT_TLSSASL: + case VNC_AUTH_VENCRYPT_X509SASL: + VNC_DEBUG("Start TLS auth SASL\n"); + return start_auth_sasl(vs); +#endif /* CONFIG_VNC_SASL */ + default: /* Should not be possible, but just in case */ - VNC_DEBUG("Reject auth %d\n", vs->vd->auth); + VNC_DEBUG("Reject subauth %d server bug\n", vs->vd->auth); vnc_write_u8(vs, 1); if (vs->minor >= 8) { static const char err[] = "Unsupported authentication type"; @@ -105,7 +112,8 @@ static void vnc_tls_handshake_io(void *o #define NEED_X509_AUTH(vs) \ ((vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509NONE || \ (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509VNC || \ - (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN) + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509PLAIN || \ + (vs)->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) diff -r 6981d4d832a9 vnc.c --- a/vnc.c Mon Mar 02 11:13:33 2009 +0000 +++ b/vnc.c Mon Mar 02 11:13:38 2009 +0000 @@ -68,7 +68,8 @@ static char *addr_to_string(const char * return addr; } -static char *vnc_socket_local_addr(const char *format, int fd) { + +char *vnc_socket_local_addr(const char *format, int fd) { struct sockaddr_storage sa; socklen_t salen; @@ -79,7 +80,8 @@ static char *vnc_socket_local_addr(const return addr_to_string(format, &sa, salen); } -static char *vnc_socket_remote_addr(const char *format, int fd) { + +char *vnc_socket_remote_addr(const char *format, int fd) { struct sockaddr_storage sa; socklen_t salen; @@ -125,12 +127,18 @@ static const char *vnc_auth_name(VncDisp return "vencrypt+x509+vnc"; case VNC_AUTH_VENCRYPT_X509PLAIN: return "vencrypt+x509+plain"; + case VNC_AUTH_VENCRYPT_TLSSASL: + return "vencrypt+tls+sasl"; + case VNC_AUTH_VENCRYPT_X509SASL: + return "vencrypt+x509+sasl"; default: return "vencrypt"; } #else return "vencrypt"; #endif + case VNC_AUTH_SASL: + return "sasl"; } return "unknown"; } @@ -278,7 +286,7 @@ static void vnc_framebuffer_update(VncSt vnc_write_s32(vs, encoding); } -static void buffer_reserve(Buffer *buffer, size_t len) +void buffer_reserve(Buffer *buffer, size_t len) { if ((buffer->capacity - buffer->offset) < len) { buffer->capacity += (len + 1024); @@ -290,22 +298,22 @@ static void buffer_reserve(Buffer *buffe } } -static int buffer_empty(Buffer *buffer) +int buffer_empty(Buffer *buffer) { return buffer->offset == 0; } -static uint8_t *buffer_end(Buffer *buffer) +uint8_t *buffer_end(Buffer *buffer) { return buffer->buffer + buffer->offset; } -static void buffer_reset(Buffer *buffer) +void buffer_reset(Buffer *buffer) { buffer->offset = 0; } -static void buffer_append(Buffer *buffer, const void *data, size_t len) +void buffer_append(Buffer *buffer, const void *data, size_t len) { memcpy(buffer->buffer + buffer->offset, data, len); buffer->offset += len; @@ -821,7 +829,8 @@ static void audio_del(VncState *vs) } } -static int vnc_client_io_error(VncState *vs, int ret, int last_errno) + +int vnc_client_io_error(VncState *vs, int ret, int last_errno) { if (ret == 0 || ret == -1) { if (ret == -1) { @@ -847,6 +856,9 @@ static int vnc_client_io_error(VncState #ifdef CONFIG_VNC_TLS vnc_tls_client_cleanup(vs); #endif /* CONFIG_VNC_TLS */ +#ifdef CONFIG_VNC_SASL + vnc_sasl_client_cleanup(vs); +#endif /* CONFIG_VNC_SASL */ audio_del(vs); VncState *p, *parent = NULL; @@ -877,14 +889,28 @@ void vnc_client_error(VncState *vs) vnc_client_io_error(vs, -1, EINVAL); } -void vnc_client_write(void *opaque) + +/* + * Called to write a chunk of data to the client socket. The data may + * be the raw data, or may have already been encoded by SASL. + * The data will be written either straight onto the socket, or + * written via the GNUTLS wrappers, if TLS/SSL encryption is enabled + * + * NB, it is theoretically possible to have 2 layers of encryption, + * both SASL, and this TLS layer. It is highly unlikely in practice + * though, since SASL encryption will typically be a no-op if TLS + * is active + * + * Returns the number of bytes written, which may be less than + * the requested 'datalen' if the socket would block. Returns + * -1 on error, and disconnects the client socket. + */ +long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen) { long ret; - VncState *vs = opaque; - #ifdef CONFIG_VNC_TLS if (vs->tls.session) { - ret = gnutls_write(vs->tls.session, vs->output.buffer, vs->output.offset); + ret = gnutls_write(vs->tls.session, data, datalen); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -894,10 +920,42 @@ void vnc_client_write(void *opaque) } } else #endif /* CONFIG_VNC_TLS */ - ret = send(vs->csock, vs->output.buffer, vs->output.offset, 0); - ret = vnc_client_io_error(vs, ret, socket_error()); + ret = send(vs->csock, data, datalen, 0); + VNC_DEBUG("Wrote wire %p %d -> %ld\n", data, datalen, ret); + return vnc_client_io_error(vs, ret, socket_error()); +} + + +/* + * Called to write buffered data to the client socket, when not + * using any SASL SSF encryption layers. Will write as much data + * as possible without blocking. If all buffered data is written, + * will switch the FD poll() handler back to read monitoring. + * + * Returns the number of bytes written, which may be less than + * the buffered output data if the socket would block. Returns + * -1 on error, and disconnects the client socket. + */ +static long vnc_client_write_plain(VncState *vs) +{ + long ret; + +#ifdef CONFIG_VNC_SASL + VNC_DEBUG("Write Plain: Pending output %p size %d offset %d. Wait SSF %d\n", + vs->output.buffer, vs->output.capacity, vs->output.offset, + vs->sasl.waitWriteSSF); + + if (vs->sasl.conn && + vs->sasl.runSSF && + vs->sasl.waitWriteSSF) { + ret = vnc_client_write_buf(vs, vs->output.buffer, vs->sasl.waitWriteSSF); + if (ret) + vs->sasl.waitWriteSSF -= ret; + } else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_write_buf(vs, vs->output.buffer, vs->output.offset); if (!ret) - return; + return 0; memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret)); vs->output.offset -= ret; @@ -905,6 +963,29 @@ void vnc_client_write(void *opaque) if (vs->output.offset == 0) { qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs); } + + return ret; +} + + +/* + * First function called whenever there is data to be written to + * 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) +{ + long ret; + VncState *vs = opaque; + +#ifdef CONFIG_VNC_SASL + if (vs->sasl.conn && + vs->sasl.runSSF && + !vs->sasl.waitWriteSSF) + ret = vnc_client_write_sasl(vs); + else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_write_plain(vs); } void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting) @@ -913,16 +994,28 @@ void vnc_read_when(VncState *vs, VncRead vs->read_handler_expect = expecting; } -void vnc_client_read(void *opaque) + +/* + * Called to read a chunk of data from the client socket. The data may + * be the raw data, or may need to be further decoded by SASL. + * The data will be read either straight from to the socket, or + * read via the GNUTLS wrappers, if TLS/SSL encryption is enabled + * + * NB, it is theoretically possible to have 2 layers of encryption, + * both SASL, and this TLS layer. It is highly unlikely in practice + * though, since SASL encryption will typically be a no-op if TLS + * is active + * + * Returns the number of bytes read, which may be less than + * the requested 'datalen' if the socket would block. Returns + * -1 on error, and disconnects the client socket. + */ +long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen) { - VncState *vs = opaque; long ret; - - buffer_reserve(&vs->input, 4096); - #ifdef CONFIG_VNC_TLS if (vs->tls.session) { - ret = gnutls_read(vs->tls.session, buffer_end(&vs->input), 4096); + ret = gnutls_read(vs->tls.session, data, datalen); if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; @@ -932,13 +1025,53 @@ void vnc_client_read(void *opaque) } } else #endif /* CONFIG_VNC_TLS */ - ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0); - ret = vnc_client_io_error(vs, ret, socket_error()); + ret = recv(vs->csock, data, datalen, 0); + VNC_DEBUG("Read wire %p %d -> %ld\n", data, datalen, ret); + return vnc_client_io_error(vs, ret, socket_error()); +} + + +/* + * Called to read data from the client socket to the input buffer, + * when not using any SASL SSF encryption layers. Will read as much + * data as possible without blocking. + * + * Returns the number of bytes read. Returns -1 on error, and + * disconnects the client socket. + */ +static long vnc_client_read_plain(VncState *vs) +{ + int ret; + VNC_DEBUG("Read plain %p size %d offset %d\n", + vs->input.buffer, vs->input.capacity, vs->input.offset); + buffer_reserve(&vs->input, 4096); + ret = vnc_client_read_buf(vs, buffer_end(&vs->input), 4096); + if (!ret) + return 0; + vs->input.offset += ret; + return ret; +} + + +/* + * First function called whenever there is more data to be read from + * the client socket. Will delegate actual work according to whether + * SASL SSF layers are enabled (thus requiring decryption calls) + */ +void vnc_client_read(void *opaque) +{ + VncState *vs = opaque; + long ret; + +#ifdef CONFIG_VNC_SASL + if (vs->sasl.conn && vs->sasl.runSSF) + ret = vnc_client_read_sasl(vs); + else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_read_plain(vs); if (!ret) return; - vs->input.offset += ret; - while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) { size_t len = vs->read_handler_expect; int ret; @@ -1722,6 +1855,13 @@ static int protocol_client_auth(VncState break; #endif /* CONFIG_VNC_TLS */ +#ifdef CONFIG_VNC_SASL + case VNC_AUTH_SASL: + VNC_DEBUG("Accept SASL auth\n"); + start_auth_sasl(vs); + break; +#endif /* CONFIG_VNC_SASL */ + default: /* Should not be possible, but just in case */ VNC_DEBUG("Reject auth %d\n", vs->vd->auth); vnc_write_u8(vs, 1); @@ -1923,6 +2063,10 @@ int vnc_display_open(DisplayState *ds, c #ifdef CONFIG_VNC_TLS int tls = 0, x509 = 0; #endif +#ifdef CONFIG_VNC_SASL + int sasl = 0; + int saslErr; +#endif if (!vnc_display) return -1; @@ -1942,6 +2086,10 @@ int vnc_display_open(DisplayState *ds, c reverse = 1; } else if (strncmp(options, "to=", 3) == 0) { to_port = atoi(options+3) + 5900; +#ifdef CONFIG_VNC_SASL + } else if (strncmp(options, "sasl", 4) == 0) { + sasl = 1; /* Require SASL auth */ +#endif #ifdef CONFIG_VNC_TLS } else if (strncmp(options, "tls", 3) == 0) { tls = 1; /* Require TLS */ @@ -1978,6 +2126,22 @@ int vnc_display_open(DisplayState *ds, c } } + /* + * Combinations we support here: + * + * - no-auth (clear text, no auth) + * - password (clear text, weak auth) + * - sasl (encrypt, good auth *IF* using Kerberos via GSSAPI) + * - tls (encrypt, weak anonymous creds, no auth) + * - tls + password (encrypt, weak anonymous creds, weak auth) + * - tls + sasl (encrypt, weak anonymous creds, good auth) + * - tls + x509 (encrypt, good x509 creds, no auth) + * - tls + x509 + password (encrypt, good x509 creds, weak auth) + * - tls + x509 + sasl (encrypt, good x509 creds, good auth) + * + * NB1. TLS is a stackable auth scheme. + * NB2. the x509 schemes have option to validate a client cert dname + */ if (password) { #ifdef CONFIG_VNC_TLS if (tls) { @@ -1990,13 +2154,34 @@ int vnc_display_open(DisplayState *ds, c vs->subauth = VNC_AUTH_VENCRYPT_TLSVNC; } } else { -#endif +#endif /* CONFIG_VNC_TLS */ VNC_DEBUG("Initializing VNC server with password auth\n"); vs->auth = VNC_AUTH_VNC; #ifdef CONFIG_VNC_TLS vs->subauth = VNC_AUTH_INVALID; } -#endif +#endif /* CONFIG_VNC_TLS */ +#ifdef CONFIG_VNC_SASL + } else if (sasl) { +#ifdef CONFIG_VNC_TLS + if (tls) { + vs->auth = VNC_AUTH_VENCRYPT; + if (x509) { + VNC_DEBUG("Initializing VNC server with x509 SASL auth\n"); + vs->subauth = VNC_AUTH_VENCRYPT_X509SASL; + } else { + VNC_DEBUG("Initializing VNC server with TLS SASL auth\n"); + vs->subauth = VNC_AUTH_VENCRYPT_TLSSASL; + } + } else { +#endif /* CONFIG_VNC_TLS */ + VNC_DEBUG("Initializing VNC server with SASL auth\n"); + vs->auth = VNC_AUTH_SASL; +#ifdef CONFIG_VNC_TLS + vs->subauth = VNC_AUTH_INVALID; + } +#endif /* CONFIG_VNC_TLS */ +#endif /* CONFIG_VNC_SASL */ } else { #ifdef CONFIG_VNC_TLS if (tls) { @@ -2018,6 +2203,16 @@ int vnc_display_open(DisplayState *ds, c #endif } +#ifdef CONFIG_VNC_SASL + if ((saslErr = sasl_server_init(NULL, "qemu")) != SASL_OK) { + fprintf(stderr, "Failed to initialize SASL auth %s", + sasl_errstring(saslErr, NULL, NULL)); + free(vs->display); + vs->display = NULL; + return -1; + } +#endif + if (reverse) { /* connect to viewer */ if (strncmp(display, "unix:", 5) == 0) diff -r 6981d4d832a9 vnc.h --- a/vnc.h Mon Mar 02 11:13:33 2009 +0000 +++ b/vnc.h Mon Mar 02 11:13:38 2009 +0000 @@ -79,6 +79,10 @@ typedef struct VncDisplay VncDisplay; #include "vnc-tls.h" #include "vnc-auth-vencrypt.h" #endif +#ifdef CONFIG_VNC_SASL +#include "vnc-auth-sasl.h" +#endif + struct VncDisplay { @@ -118,10 +122,12 @@ struct VncState int minor; char challenge[VNC_AUTH_CHALLENGE_SIZE]; - #ifdef CONFIG_VNC_TLS VncStateTLS tls; #endif +#ifdef CONFIG_VNC_SASL + VncStateSASL sasl; +#endif Buffer output; Buffer input; @@ -160,8 +166,9 @@ enum { VNC_AUTH_RA2NE = 6, VNC_AUTH_TIGHT = 16, VNC_AUTH_ULTRA = 17, - VNC_AUTH_TLS = 18, - VNC_AUTH_VENCRYPT = 19 + VNC_AUTH_TLS = 18, /* Supported in GTK-VNC & VINO */ + VNC_AUTH_VENCRYPT = 19, /* Supported in GTK-VNC & VeNCrypt */ + VNC_AUTH_SASL = 20, /* Supported in GTK-VNC & VINO */ }; enum { @@ -172,6 +179,8 @@ enum { VNC_AUTH_VENCRYPT_X509NONE = 260, VNC_AUTH_VENCRYPT_X509VNC = 261, VNC_AUTH_VENCRYPT_X509PLAIN = 262, + VNC_AUTH_VENCRYPT_X509SASL = 263, + VNC_AUTH_VENCRYPT_TLSSASL = 264, }; @@ -255,6 +264,8 @@ enum { void vnc_client_read(void *opaque); void vnc_client_write(void *opaque); +long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen); +long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen); /* Protocol I/O functions */ void vnc_write(VncState *vs, const void *data, size_t len); @@ -274,8 +285,22 @@ uint32_t read_u32(uint8_t *data, size_t /* Protocol stage functions */ void vnc_client_error(VncState *vs); +int vnc_client_io_error(VncState *vs, int ret, int last_errno); void start_client_init(VncState *vs); void start_auth_vnc(VncState *vs); +/* Buffer management */ +void buffer_reserve(Buffer *buffer, size_t len); +int buffer_empty(Buffer *buffer); +uint8_t *buffer_end(Buffer *buffer); +void buffer_reset(Buffer *buffer); +void buffer_append(Buffer *buffer, const void *data, size_t len); + + +/* Misc helpers */ + +char *vnc_socket_local_addr(const char *format, int fd); +char *vnc_socket_remote_addr(const char *format, int fd); + #endif /* __QEMU_VNC_H */ qemu-sasl-07-vnc-monitor-authinfo.patch: --- NEW FILE qemu-sasl-07-vnc-monitor-authinfo.patch --- This patch extends the 'info vnc' monitor output to include information about the VNC client authentication credentials. For clients authenticated using SASL, this will output the username. For clients authenticated using x509 certificates, this will output the x509 distinguished name. Auth can be stacked, so both username & x509 dname may be shown. Server: address: 0.0.0.0:5902 auth: vencrypt+x509+sasl Client: address: 10.33.6.67:38621 x509 dname: C=GB,O=ACME,L=London,ST=London,CN=localhost username: admin Client: address: 10.33.6.63:38620 x509 dname: C=GB,O=ACME,L=London,ST=London,CN=localhost username: admin vnc-tls.c | 17 +++++++++++++++++ vnc-tls.h | 3 +++ vnc.c | 19 +++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) Signed-off-by: Daniel P. Berrange diff -r 440be37a35ea vnc-tls.c --- a/vnc-tls.c Fri Feb 20 11:46:26 2009 +0000 +++ b/vnc-tls.c Fri Feb 20 11:47:52 2009 +0000 @@ -241,6 +241,22 @@ int vnc_tls_validate_certificate(struct return -1; } + if (i == 0) { + size_t dnameSize = 1024; + vs->tls.dname = qemu_malloc(dnameSize); + requery: + if ((ret = gnutls_x509_crt_get_dn (cert, vs->tls.dname, &dnameSize)) != 0) { + if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER) { + vs->tls.dname = qemu_realloc(vs->tls.dname, dnameSize); + goto requery; + } + gnutls_x509_crt_deinit (cert); + VNC_DEBUG("Cannot get client distinguished name: %s", + gnutls_strerror (ret)); + return -1; + } + } + gnutls_x509_crt_deinit (cert); } @@ -347,6 +363,7 @@ void vnc_tls_client_cleanup(struct VncSt vs->tls.session = NULL; } vs->tls.wiremode = VNC_WIREMODE_CLEAR; + free(vs->tls.dname); } diff -r 440be37a35ea vnc-tls.h --- a/vnc-tls.h Fri Feb 20 11:46:26 2009 +0000 +++ b/vnc-tls.h Fri Feb 20 11:47:52 2009 +0000 @@ -55,6 +55,9 @@ struct VncStateTLS { /* Whether data is being TLS encrypted yet */ int wiremode; gnutls_session_t session; + + /* Client's Distinguished Name from the x509 cert */ + char *dname; }; int vnc_tls_client_setup(VncState *vs, int x509Creds); diff -r 440be37a35ea vnc.c --- a/vnc.c Fri Feb 20 11:46:26 2009 +0000 +++ b/vnc.c Fri Feb 20 11:47:52 2009 +0000 @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState term_puts("Client:\n"); term_puts(clientAddr); free(clientAddr); + +#ifdef CONFIG_VNC_TLS + if (client->tls.session && + client->tls.dname) + term_printf(" x509 dname: %s\n", client->tls.dname); + else + term_puts(" x509 dname: none\n"); +#endif +#ifdef CONFIG_VNC_SASL + if (client->sasl.conn && + client->sasl.username) + term_printf(" username: %s\n", client->sasl.username); + else + term_puts(" username: none\n"); +#endif } void do_info_vnc(void) @@ -1823,7 +1838,7 @@ static int protocol_client_auth(VncState /* We only advertise 1 auth scheme at a time, so client * must pick the one we sent. Verify this */ if (data[0] != vs->vd->auth) { /* Reject auth */ - VNC_DEBUG("Reject auth %d\n", (int)data[0]); + VNC_DEBUG("Reject auth %d because it didn't match advertized\n", (int)data[0]); vnc_write_u32(vs, 1); if (vs->minor >= 8) { static const char err[] = "Authentication failed"; @@ -1863,7 +1878,7 @@ static int protocol_client_auth(VncState #endif /* CONFIG_VNC_SASL */ default: /* Should not be possible, but just in case */ - VNC_DEBUG("Reject auth %d\n", vs->vd->auth); + VNC_DEBUG("Reject auth %d server code bug\n", vs->vd->auth); vnc_write_u8(vs, 1); if (vs->minor >= 8) { static const char err[] = "Authentication failed"; qemu-sasl-08-vnc-acl-mgmt.patch: --- NEW FILE qemu-sasl-08-vnc-acl-mgmt.patch --- This patch introduces a generic internal API for access control lists to be used by network servers in QEMU. It adds support for checking these ACL in the VNC server, in two places. The first ACL is for the SASL authentication mechanism, checking the SASL username. This ACL is called 'vnc.username'. The second is for the TLS authentication mechanism, when x509 client certificates are turned on, checking against the Distinguished Name of the client. This ACL is called 'vnc.x509dname' The internal API provides for an ACL with the following characteristics - A unique name, eg vnc.username, and vnc.x509dname. - A default policy, allow or deny - An ordered series of match rules, with allow or deny policy If none of the match rules apply, then the default policy is used. There is a monitor API to manipulate the ACLs, which I'll describe via examples (qemu) acl show vnc.username policy: allow (qemu) acl policy vnc.username denya acl: policy set to 'deny' (qemu) acl allow vnc.username fred acl: added rule at position 1 (qemu) acl allow vnc.username bob acl: added rule at position 2 (qemu) acl allow vnc.username joe 1 acl: added rule at position 1 (qemu) acl show vnc.username policy: deny 0: allow fred 1: allow joe 2: allow bob (qemu) acl show vnc.x509dname policy: allow (qemu) acl policy vnc.x509dname deny acl: policy set to 'deny' (qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=* acl: added rule at position 1 (qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob acl: added rule at position 2 (qemu) acl show vnc.x509dname policy: deny 0: allow C=GB,O=ACME,L=London,CN=* 1: allow C=GB,O=ACME,L=Boston,CN=bob By default the VNC server will not use any ACLs, allowing access to the server if the user successfully authenticates. To enable use of ACLs to restrict user access, the ',acl' flag should be given when starting QEMU. The initial ACL activated will be a 'deny all' policy and should be customized using monitor commands. eg enable SASL auth and ACLs qemu .... -vnc localhost:1,sasl,acl The next patch will provide a way to load a pre-defined ACL when starting up Makefile | 6 + b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ b/acl.h | 74 ++++++++++++++++++++++ configure | 18 +++++ monitor.c | 95 ++++++++++++++++++++++++++++ qemu-doc.texi | 49 ++++++++++++++ vnc-auth-sasl.c | 16 +++- vnc-auth-sasl.h | 7 ++ vnc-tls.c | 19 +++++ vnc-tls.h | 3 vnc.c | 21 ++++++ vnc.h | 3 12 files changed, 491 insertions(+), 5 deletions(-) Signed-off-by: Daniel P. Berrange diff -r b1008c5c6c16 Makefile --- a/Makefile Mon Mar 02 11:13:40 2009 +0000 +++ b/Makefile Mon Mar 02 12:11:04 2009 +0000 @@ -144,7 +144,7 @@ endif ifdef CONFIG_CURSES OBJS+=curses.o endif -OBJS+=vnc.o d3des.o +OBJS+=vnc.o acl.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif @@ -174,9 +174,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) +acl.o: acl.h acl.c + vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h -vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h +vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) diff -r b1008c5c6c16 acl.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/acl.c Mon Mar 02 12:11:04 2009 +0000 @@ -0,0 +1,185 @@ +/* + * QEMU access control list management + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + +#include "qemu-common.h" +#include "sysemu.h" +#include "acl.h" + +#ifdef HAVE_FNMATCH_H +#include +#endif + + +static unsigned int nacls = 0; +static qemu_acl **acls = NULL; + + + +qemu_acl *qemu_acl_find(const char *aclname) +{ + int i; + for (i = 0 ; i < nacls ; i++) { + if (strcmp(acls[i]->aclname, aclname) == 0) + return acls[i]; + } + + return NULL; +} + +qemu_acl *qemu_acl_init(const char *aclname) +{ + qemu_acl *acl; + + acl = qemu_acl_find(aclname); + if (acl) + return acl; + + acl = qemu_malloc(sizeof(*acl)); + acl->aclname = qemu_strdup(aclname); + /* Deny by default, so there is no window of "open + * access" between QEMU starting, and the user setting + * up ACLs in the monitor */ + acl->defaultDeny = 1; + + acl->nentries = 0; + TAILQ_INIT(&acl->entries); + + acls = qemu_realloc(acls, sizeof(*acls) * (nacls +1)); + acls[nacls] = acl; + nacls++; + + return acl; +} + +int qemu_acl_party_is_allowed(qemu_acl *acl, + const char *party) +{ + qemu_acl_entry *entry; + + TAILQ_FOREACH(entry, &acl->entries, next) { +#ifdef HAVE_FNMATCH_H + if (fnmatch(entry->match, party, 0) == 0) + return entry->deny ? 0 : 1; +#else + /* No fnmatch, so fallback to exact string matching + * instead of allowing wildcards */ + if (strcmp(entry->match, party) == 0) + return entry->deny ? 0 : 1; +#endif + } + + return acl->defaultDeny ? 0 : 1; +} + + +void qemu_acl_reset(qemu_acl *acl) +{ + qemu_acl_entry *entry; + + /* Put back to deny by default, so there is no window + * of "open access" while the user re-initializes the + * access control list */ + acl->defaultDeny = 1; + TAILQ_FOREACH(entry, &acl->entries, next) { + TAILQ_REMOVE(&acl->entries, entry, next); + free(entry->match); + free(entry); + } + acl->nentries = 0; +} + + +int qemu_acl_append(qemu_acl *acl, + int deny, + const char *match) +{ + qemu_acl_entry *entry; + + entry = qemu_malloc(sizeof(*entry)); + entry->match = qemu_strdup(match); + entry->deny = deny; + + TAILQ_INSERT_TAIL(&acl->entries, entry, next); + acl->nentries++; + + return acl->nentries; +} + + +int qemu_acl_insert(qemu_acl *acl, + int deny, + const char *match, + int index) +{ + qemu_acl_entry *entry; + qemu_acl_entry *tmp; + int i = 0; + + if (index <= 0) + return -1; + if (index >= acl->nentries) + return qemu_acl_append(acl, deny, match); + + + entry = qemu_malloc(sizeof(*entry)); + entry->match = qemu_strdup(match); + entry->deny = deny; + + TAILQ_FOREACH(tmp, &acl->entries, next) { + i++; + if (i == index) { + TAILQ_INSERT_BEFORE(tmp, entry, next); + acl->nentries++; + break; + } + } + + return i; +} + +int qemu_acl_remove(qemu_acl *acl, + const char *match) +{ + qemu_acl_entry *entry; + int i = 0; + + TAILQ_FOREACH(entry, &acl->entries, next) { + i++; + if (strcmp(entry->match, match) == 0) { + TAILQ_REMOVE(&acl->entries, entry, next); + return i; + } + } + return -1; +} + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 8 + * End: + */ diff -r b1008c5c6c16 acl.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/acl.h Mon Mar 02 12:11:04 2009 +0000 @@ -0,0 +1,74 @@ +/* + * QEMU access control list management + * + * Copyright (C) 2009 Red Hat, Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __QEMU_ACL_H__ +#define __QEMU_ACL_H__ + +#include "sys-queue.h" + +typedef struct qemu_acl_entry qemu_acl_entry; +typedef struct qemu_acl qemu_acl; + +struct qemu_acl_entry { + char *match; + int deny; + + TAILQ_ENTRY(qemu_acl_entry) next; +}; + +struct qemu_acl { + char *aclname; + unsigned int nentries; + TAILQ_HEAD(,qemu_acl_entry) entries; + int defaultDeny; +}; + +qemu_acl *qemu_acl_init(const char *aclname); + +qemu_acl *qemu_acl_find(const char *aclname); + +int qemu_acl_party_is_allowed(qemu_acl *acl, + const char *party); + +void qemu_acl_reset(qemu_acl *acl); + +int qemu_acl_append(qemu_acl *acl, + int deny, + const char *match); +int qemu_acl_insert(qemu_acl *acl, + int deny, + const char *match, + int index); +int qemu_acl_remove(qemu_acl *acl, + const char *match); + +#endif /* __QEMU_ACL_H__ */ + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 8 + * End: + */ diff -r b1008c5c6c16 configure --- a/configure Mon Mar 02 11:13:40 2009 +0000 +++ b/configure Mon Mar 02 12:11:04 2009 +0000 @@ -846,6 +846,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 @@ -1405,6 +1420,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 -r b1008c5c6c16 monitor.c --- a/monitor.c Mon Mar 02 11:13:40 2009 +0000 +++ b/monitor.c Mon Mar 02 12:11:04 2009 +0000 @@ -39,6 +39,7 @@ #include "qemu-timer.h" #include "migration.h" #include "kvm.h" +#include "acl.h" //#define DEBUG //#define DEBUG_COMPLETION @@ -1425,6 +1426,85 @@ static void do_info_balloon(void) term_printf("balloon: actual=%d\n", (int)(actual >> 20)); } +static void do_acl(const char *command, + const char *aclname, + const char *match, + int has_index, + int index) +{ + qemu_acl *acl; + + acl = qemu_acl_find(aclname); + if (!acl) { + term_printf("acl: unknown list '%s'\n", aclname); + return; + } + + if (strcmp(command, "show") == 0) { + int i = 0; + qemu_acl_entry *entry; + term_printf("policy: %s\n", + acl->defaultDeny ? "deny" : "allow"); + TAILQ_FOREACH(entry, &acl->entries, next) { + i++; + term_printf("%d: %s %s\n", i, + entry->deny ? "deny" : "allow", + entry->match); + } + } else if (strcmp(command, "reset") == 0) { + qemu_acl_reset(acl); + term_printf("acl: removed all rules\n"); + } else if (strcmp(command, "policy") == 0) { + if (!match) { + term_printf("acl: missing policy parameter\n"); + return; + } + + if (strcmp(match, "allow") == 0) { + acl->defaultDeny = 0; + term_printf("acl: policy set to 'allow'\n"); + } else if (strcmp(match, "deny") == 0) { + acl->defaultDeny = 1; + term_printf("acl: policy set to 'deny'\n"); + } else { + term_printf("acl: unknown policy '%s', expected 'deny' or 'allow'\n", match); + } + } else if ((strcmp(command, "allow") == 0) || + (strcmp(command, "deny") == 0)) { + int deny = strcmp(command, "deny") == 0 ? 1 : 0; + int ret; + + if (!match) { + term_printf("acl: missing match parameter\n"); + return; + } + + if (has_index) + ret = qemu_acl_insert(acl, deny, match, index); + else + ret = qemu_acl_append(acl, deny, match); + if (ret < 0) + term_printf("acl: unable to add acl entry\n"); + else + term_printf("acl: added rule at position %d\n", ret); + } else if (strcmp(command, "remove") == 0) { + int ret; + + if (!match) { + term_printf("acl: missing match parameter\n"); + return; + } + + ret = qemu_acl_remove(acl, match); + if (ret < 0) + term_printf("acl: no matching acl entry\n"); + else + term_printf("acl: removed rule at position %d\n", ret); + } else { + term_printf("acl: unknown command '%s'\n", command); + } +} + /* Please update qemu-doc.texi when adding or changing commands */ static const term_cmd_t term_cmds[] = { { "help|?", "s?", do_help, @@ -1529,6 +1609,12 @@ static const term_cmd_t term_cmds[] = { "target", "request VM to change it's memory allocation (in MB)" }, { "set_link", "ss", do_set_link, "name [up|down]", "change the link status of a network adapter" }, + { "acl", "sss?i?", do_acl, " [] []\n", + "acl show vnc.username\n" + "acl policy vnc.username deny\n" + "acl allow vnc.username fred\n" + "acl deny vnc.username bob\n" + "acl reset vnc.username\n" }, { NULL, NULL, }, }; @@ -2891,3 +2977,12 @@ void monitor_readline(const char *prompt monitor_hd[i]->focus = old_focus[i]; } } + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 8 + * End: + */ diff -r b1008c5c6c16 qemu-doc.texi --- a/qemu-doc.texi Mon Mar 02 11:13:40 2009 +0000 +++ b/qemu-doc.texi Mon Mar 02 12:11:04 2009 +0000 @@ -631,6 +631,19 @@ ensures a data encryption preventing com credentials. See the @ref{vnc_security} section for details on using SASL authentication. + at item acl + +Turn on access control lists for checking of the x509 client certificate +and SASL party. For x509 certs, the ACL check is made against the +certificate's distinguished name. This is something that looks like + at code{C=GB,O=ACME,L=Boston,CN=bob}. For SASL party, the ACL check is +made against the username, which depending on the SASL plugin, may +include a realm component, eg @code{bob} or @code{bob\@EXAMPLE.COM}. +When the @option{acl} flag is set, the initial access list will be +empty, with a @code{deny} policy. Thus no one will be allowed to +use the VNC server until the ACLs have been loaded. This can be +achieved using the @code{acl} monitor command. + @end table @end table @@ -1392,6 +1405,42 @@ Password: ******** @end table + at item acl @var{subcommand} @var{aclname} @var{match} @var{index} + +Manage access control lists for network services. There are currently +two named access control lists, @var{vnc.x509dname} and @var{vnc.username} +matching on the x509 client certificate distinguished name, and SASL +username respectively. + + at table @option + at item acl show +list all the match rules in the access control list, and the default +policy + at item acl policy @code{allow|deny} +set the default access control list policy, used in the event that +none of the explicit rules match. The default policy at startup is +always @code{deny} + at item acl allow [] +add a match to the access control list, allowing access. The match will +normally be an exact username or x509 distinguished name, but can +optionally include wildcard globs. eg @code{*\@EXAMPLE.COM} to allow +all users in the @code{EXAMPLE.COM} kerberos realm. The match will +normally be appended to the end of the ACL, but can be inserted +earlier in the list if the optional @code{index} parameter is supplied. + at item acl deny [] +add a match to the access control list, denying access. The match will +normally be an exact username or x509 distinguished name, but can +optionally include wildcard globs. eg @code{*\@EXAMPLE.COM} to allow +all users in the @code{EXAMPLE.COM} kerberos realm. The match will +normally be appended to the end of the ACL, but can be inserted +earlier in the list if the optional @code{index} parameter is supplied. + at item acl remove +remove the specified match rule from the access control list. + at item acl reset +remove all matches from the access control list, and set the default +policy back to @code{deny}. + at end table + @item screendump @var{filename} Save screen into PPM image @var{filename}. diff -r b1008c5c6c16 vnc-auth-sasl.c --- a/vnc-auth-sasl.c Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-auth-sasl.c Mon Mar 02 12:11:04 2009 +0000 @@ -120,22 +120,32 @@ static int vnc_auth_sasl_check_access(Vn { const void *val; int err; + int allow; err = sasl_getprop(vs->sasl.conn, SASL_USERNAME, &val); if (err != SASL_OK) { - VNC_DEBUG("cannot query SASL username on connection %d (%s)\n", + VNC_DEBUG("cannot query SASL username on connection %d (%s), denying access\n", err, sasl_errstring(err, NULL, NULL)); return -1; } if (val == NULL) { - VNC_DEBUG("no client username was found\n"); + VNC_DEBUG("no client username was found, denying access\n"); return -1; } VNC_DEBUG("SASL client username %s\n", (const char *)val); vs->sasl.username = qemu_strdup((const char*)val); - return 0; + if (vs->vd->sasl.acl == NULL) { + VNC_DEBUG("no ACL activated, allowing access\n"); + return 0; + } + + allow = qemu_acl_party_is_allowed(vs->vd->sasl.acl, vs->sasl.username); + + VNC_DEBUG("SASL client %s %s by ACL\n", vs->sasl.username, + allow ? "allowed" : "denied"); + return allow ? 0 : -1; } static int vnc_auth_sasl_check_ssf(VncState *vs) diff -r b1008c5c6c16 vnc-auth-sasl.h --- a/vnc-auth-sasl.h Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-auth-sasl.h Mon Mar 02 12:11:04 2009 +0000 @@ -30,6 +30,9 @@ #include typedef struct VncStateSASL VncStateSASL; +typedef struct VncDisplaySASL VncDisplaySASL; + +#include "acl.h" struct VncStateSASL { sasl_conn_t *conn; @@ -56,6 +59,10 @@ struct VncStateSASL { char *mechlist; }; +struct VncDisplaySASL { + qemu_acl *acl; +}; + void vnc_sasl_client_cleanup(VncState *vs); long vnc_client_read_sasl(VncState *vs); diff -r b1008c5c6c16 vnc-tls.c --- a/vnc-tls.c Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-tls.c Mon Mar 02 12:11:04 2009 +0000 @@ -255,6 +255,25 @@ int vnc_tls_validate_certificate(struct gnutls_strerror (ret)); return -1; } + + if (vs->vd->tls.x509verify) { + int allow; + if (!vs->vd->tls.acl) { + VNC_DEBUG("no ACL activated, allowing access"); + gnutls_x509_crt_deinit (cert); + continue; + } + + allow = qemu_acl_party_is_allowed(vs->vd->tls.acl, + vs->tls.dname); + + VNC_DEBUG("TLS x509 ACL check for %s is %s\n", + vs->tls.dname, allow ? "allowed" : "denied"); + if (!allow) { + gnutls_x509_crt_deinit (cert); + return -1; + } + } } gnutls_x509_crt_deinit (cert); diff -r b1008c5c6c16 vnc-tls.h --- a/vnc-tls.h Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc-tls.h Mon Mar 02 12:11:04 2009 +0000 @@ -31,6 +31,8 @@ #include #include +#include "acl.h" + enum { VNC_WIREMODE_CLEAR, VNC_WIREMODE_TLS, @@ -42,6 +44,7 @@ typedef struct VncStateTLS VncStateTLS; /* Server state */ struct VncDisplayTLS { int x509verify; /* Non-zero if server requests & validates client cert */ + qemu_acl *acl; /* Paths to x509 certs/keys */ char *x509cacert; diff -r b1008c5c6c16 vnc.c --- a/vnc.c Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc.c Mon Mar 02 12:11:04 2009 +0000 @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu_socket.h" #include "qemu-timer.h" +#include "acl.h" #define VNC_REFRESH_INTERVAL (1000 / 30) @@ -2082,6 +2083,7 @@ int vnc_display_open(DisplayState *ds, c int sasl = 0; int saslErr; #endif + int acl = 0; if (!vnc_display) return -1; @@ -2138,9 +2140,28 @@ int vnc_display_open(DisplayState *ds, c return -1; } #endif + } else if (strncmp(options, "acl", 3) == 0) { + acl = 1; } } +#ifdef CONFIG_VNC_TLS + if (acl && x509 && vs->tls.x509verify) { + if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) { + fprintf(stderr, "Failed to create x509 dname ACL\n"); + exit(1); + } + } +#endif +#ifdef CONFIG_VNC_SASL + if (acl && sasl) { + if (!(vs->sasl.acl = qemu_acl_init("vnc.username"))) { + fprintf(stderr, "Failed to create username ACL\n"); + exit(1); + } + } +#endif + /* * Combinations we support here: * diff -r b1008c5c6c16 vnc.h --- a/vnc.h Mon Mar 02 11:13:40 2009 +0000 +++ b/vnc.h Mon Mar 02 12:11:04 2009 +0000 @@ -98,6 +98,9 @@ struct VncDisplay int subauth; /* Used by VeNCrypt */ VncDisplayTLS tls; #endif +#ifdef CONFIG_VNC_SASL + VncDisplaySASL sasl; +#endif }; struct VncState Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- qemu.spec 3 Mar 2009 03:40:42 -0000 1.50 +++ qemu.spec 3 Mar 2009 12:55:33 -0000 1.51 @@ -1,14 +1,29 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.0 -Release: 0.4.svn6666%{?dist} +Release: 0.5.svn6666%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init + +# VNC SASL authentication support +# Not upstream yet, but approved for commit immediately +# after this release +Patch1: qemu-sasl-01-tls-handshake-fix.patch +Patch2: qemu-sasl-02-vnc-monitor-info.patch +Patch3: qemu-sasl-03-display-keymaps.patch +Patch4: qemu-sasl-04-vnc-struct.patch +Patch5: qemu-sasl-05-vnc-tls-vencrypt.patch +Patch6: qemu-sasl-06-vnc-sasl.patch +Patch7: qemu-sasl-07-vnc-monitor-authinfo.patch +Patch8: qemu-sasl-08-vnc-acl-mgmt.patch +# NB, delibrately not including patch 09 which is not +# intended for commit + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel +BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel Requires: %{name}-user = %{version}-%{release} Requires: %{name}-system-x86 = %{version}-%{release} Requires: %{name}-system-sparc = %{version}-%{release} @@ -78,7 +93,7 @@ %qemupkg system-x86 {system emulator for x86} Requires: etherboot-zroms-kvm Requires: vgabios -Requires: bochs-bios +Requires: bochs-bios-data %qemudesc system-x86 {system emulator for x86} %qemupkgdesc system-ppc {system emulator for ppc} @@ -93,6 +108,22 @@ %prep %setup -q +# 01-tls-handshake-fix +%patch1 -p1 +# 02-vnc-monitor-info +%patch2 -p1 +# 03-display-keymaps +%patch3 -p1 +# 04-vnc-struct +%patch4 -p1 +# 05-vnc-tls-vencrypt +%patch5 -p1 +# 06-vnc-sasl +%patch6 -p1 +# 07-vnc-monitor-authinfo +%patch7 -p1 +# 08-vnc-acl-mgmt +%patch8 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -132,6 +163,8 @@ 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 + 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 @@ -187,6 +220,7 @@ %{_mandir}/man1/qemu.1* %{_mandir}/man8/qemu-nbd.8* %{_bindir}/qemu-nbd +%config(noreplace) %{_sysconfdir}/sasl2/qemu.conf %files user %defattr(-,root,root) %{_sysconfdir}/rc.d/init.d/qemu @@ -250,6 +284,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. From apevec at fedoraproject.org Tue Mar 3 13:48:30 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Tue, 3 Mar 2009 13:48:30 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/devel collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, NONE, 1.1 collectd.spec, 1.16, 1.17 Message-ID: <20090303134830.2C8B870116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26447 Modified Files: collectd.spec Added Files: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch Log Message: * Tue Mar 03 2009 Alan Pevec 4.5.3-2 - patch for strict-aliasing issue in liboping.c collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch: --- NEW FILE collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch --- >From 76cdc4d21f40a65d775bbce3468996c4d0045d96 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Tue, 3 Mar 2009 14:36:36 +0100 Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue cc1: warnings being treated as errors liboping.c: In function 'ping_host_add': liboping.c:995: error: dereferencing pointer 'si' does break strict-aliasing rules ... Signed-off-by: Alan Pevec --- src/liboping/liboping.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c index 13bcc92..dee28fb 100644 --- a/src/liboping/liboping.c +++ b/src/liboping/liboping.c @@ -987,9 +987,12 @@ int ping_host_add (pingobj_t *obj, const char *host) if (ai_ptr->ai_family == AF_INET) { - struct sockaddr_in *si; - - si = (struct sockaddr_in *) &sockaddr; + union { + struct sockaddr_storage any_socket; + struct sockaddr_in si; + } s; + s.any_socket = sockaddr; + si = &s.si; si->sin_family = AF_INET; si->sin_port = htons (ph->ident); si->sin_addr.s_addr = htonl (INADDR_ANY); @@ -999,9 +1002,12 @@ int ping_host_add (pingobj_t *obj, const char *host) } else if (ai_ptr->ai_family == AF_INET6) { - struct sockaddr_in6 *si; - - si = (struct sockaddr_in6 *) &sockaddr; + union { + struct sockaddr_storage any_socket; + struct sockaddr_in6 si; + } s; + s.any_socket = sockaddr; + si = &s.si; si->sin6_family = AF_INET6; si->sin6_port = htons (ph->ident); si->sin6_addr = in6addr_any; -- 1.6.0.6 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- collectd.spec 2 Mar 2009 23:43:02 -0000 1.16 +++ collectd.spec 3 Mar 2009 13:47:59 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -10,6 +10,8 @@ Patch0: %{name}-4.5.1-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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -151,6 +153,7 @@ %setup -q %patch0 -p1 %patch1 -p0 +%patch2 -p1 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in @@ -407,6 +410,9 @@ %changelog +* Tue Mar 03 2009 Alan Pevec 4.5.3-2 +- patch for strict-aliasing issue in liboping.c + * Mon Mar 02 2009 Alan Pevec 4.5.3-1 - New upstream version 4.5.3 - fixes collectd is built without iptables plugin, bz# 479208 From apevec at fedoraproject.org Tue Mar 3 15:26:39 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Tue, 3 Mar 2009 15:26:39 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/devel collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, 1.1, 1.2 collectd.spec, 1.17, 1.18 Message-ID: <20090303152639.402A070116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23034 Modified Files: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch collectd.spec Log Message: fix the patch temp remove ipvs . . . . . . . . no (ip_vs.h not found) collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch: Index: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 3 Mar 2009 13:47:59 -0000 1.1 +++ collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 3 Mar 2009 15:26:08 -0000 1.2 @@ -1,4 +1,4 @@ -From 76cdc4d21f40a65d775bbce3468996c4d0045d96 Mon Sep 17 00:00:00 2001 +From b96ca3bd632f5fef539486a4c2c9906b32c31817 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Tue, 3 Mar 2009 14:36:36 +0100 Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue @@ -14,7 +14,7 @@ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c -index 13bcc92..dee28fb 100644 +index 13bcc92..94adb1d 100644 --- a/src/liboping/liboping.c +++ b/src/liboping/liboping.c @@ -987,9 +987,12 @@ int ping_host_add (pingobj_t *obj, const char *host) @@ -29,7 +29,7 @@ + struct sockaddr_in si; + } s; + s.any_socket = sockaddr; -+ si = &s.si; ++ struct sockaddr_in *si = &s.si; si->sin_family = AF_INET; si->sin_port = htons (ph->ident); si->sin_addr.s_addr = htonl (INADDR_ANY); @@ -45,7 +45,7 @@ + struct sockaddr_in6 si; + } s; + s.any_socket = sockaddr; -+ si = &s.si; ++ struct sockaddr_in6 *si = &s.si; si->sin6_family = AF_INET6; si->sin6_port = htons (ph->ident); si->sin6_addr = in6addr_any; Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- collectd.spec 3 Mar 2009 13:47:59 -0000 1.17 +++ collectd.spec 3 Mar 2009 15:26:08 -0000 1.18 @@ -162,6 +162,7 @@ %configure \ --disable-ascent \ --disable-static \ + --disable-ipvs \ --enable-mysql \ --enable-sensors \ --enable-email \ @@ -284,7 +285,6 @@ %{_libdir}/collectd/hddtemp.so %{_libdir}/collectd/interface.so %{_libdir}/collectd/iptables.so -%{_libdir}/collectd/ipvs.so %{_libdir}/collectd/irq.so %{_libdir}/collectd/load.so %{_libdir}/collectd/logfile.so From buildsys at fedoraproject.org Tue Mar 3 17:04:37 2009 From: buildsys at fedoraproject.org (buildsys at fedoraproject.org) Date: Tue, 3 Mar 2009 17:04:37 +0000 (UTC) Subject: [fedora-virt-maint] Broken dependencies: qemu Message-ID: <20090303170437.796601B8009@releng2.fedora.phx.redhat.com> qemu has broken dependencies in the development tree: On ppc: qemu-system-x86-1.0-0.4.svn6666.fc11.ppc requires bochs-bios On x86_64: qemu-system-x86-1.0-0.4.svn6666.fc11.x86_64 requires bochs-bios On i386: qemu-system-x86-1.0-0.4.svn6666.fc11.i586 requires bochs-bios On ppc64: qemu-system-x86-1.0-0.4.svn6666.fc11.ppc64 requires bochs-bios Please resolve this as soon as possible. From apevec at fedoraproject.org Tue Mar 3 21:41:14 2009 From: apevec at fedoraproject.org (Alan Pevec) Date: Tue, 3 Mar 2009 21:41:14 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/F-10 .cvsignore, 1.8, 1.9 collectd.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <20090303214114.180E470116@cvs1.fedora.phx.redhat.com> Author: apevec Update of /cvs/pkgs/rpms/collectd/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8843 Modified Files: .cvsignore collectd.spec sources Log Message: * Tue Mar 03 2009 Alan Pevec 4.5.3-1 - New upstream version 4.5.3 - fixes collectd is built without iptables plugin, bz# 479208 - list all expected plugins explicitly to avoid such bugs Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-10/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 Nov 2008 11:45:31 -0000 1.8 +++ .cvsignore 3 Mar 2009 21:40:43 -0000 1.9 @@ -1 +1 @@ -collectd-4.5.1.tar.bz2 +collectd-4.5.3.tar.bz2 Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-10/collectd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- collectd.spec 7 Dec 2008 20:54:11 -0000 1.15 +++ collectd.spec 3 Mar 2009 21:40:43 -0000 1.16 @@ -1,15 +1,16 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.5.1 -Release: 2.1%{?dist} +Version: 4.5.3 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-include-collectd.d.patch +Patch0: %{name}-4.5.1-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails -Patch1: %{name}-%{version}-configure-OpenIPMI.patch +Patch1: %{name}-4.5.1-configure-OpenIPMI.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libvirt-devel, libxml2-devel @@ -156,9 +157,9 @@ %build %configure \ - --without-libiptc \ --disable-ascent \ --disable-static \ + --disable-ipvs \ --enable-mysql \ --enable-sensors \ --enable-email \ @@ -168,6 +169,7 @@ --enable-ipmi \ --enable-nut \ --enable-postgresql \ + --enable-iptables \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -267,21 +269,46 @@ %dir %{_localstatedir}/lib/collectd/ %dir %{_libdir}/collectd -%{_libdir}/collectd/*.so* +%{_libdir}/collectd/apcups.so +%{_libdir}/collectd/battery.so +%{_libdir}/collectd/cpu.so +%{_libdir}/collectd/cpufreq.so +%{_libdir}/collectd/csv.so +%{_libdir}/collectd/df.so +%{_libdir}/collectd/disk.so +%{_libdir}/collectd/entropy.so +%{_libdir}/collectd/exec.so +%{_libdir}/collectd/filecount.so +%{_libdir}/collectd/hddtemp.so +%{_libdir}/collectd/interface.so +%{_libdir}/collectd/iptables.so +%{_libdir}/collectd/irq.so +%{_libdir}/collectd/load.so +%{_libdir}/collectd/logfile.so +%{_libdir}/collectd/mbmon.so +%{_libdir}/collectd/memcached.so +%{_libdir}/collectd/memory.so +%{_libdir}/collectd/multimeter.so +%{_libdir}/collectd/network.so +%{_libdir}/collectd/nfs.so +%{_libdir}/collectd/ntpd.so +%{_libdir}/collectd/ping.so +%{_libdir}/collectd/powerdns.so +%{_libdir}/collectd/processes.so +%{_libdir}/collectd/serial.so +%{_libdir}/collectd/swap.so +%{_libdir}/collectd/syslog.so +%{_libdir}/collectd/tail.so +%{_libdir}/collectd/tcpconns.so +%{_libdir}/collectd/teamspeak2.so +%{_libdir}/collectd/thermal.so +%{_libdir}/collectd/unixsock.so +%{_libdir}/collectd/users.so +%{_libdir}/collectd/uuid.so +%{_libdir}/collectd/vmem.so +%{_libdir}/collectd/vserver.so +%{_libdir}/collectd/wireless.so %{_libdir}/collectd/types.db -%exclude %{_libdir}/collectd/apache.so* -%exclude %{_libdir}/collectd/dns.so* -%exclude %{_libdir}/collectd/email.so* -%exclude %{_libdir}/collectd/ipmi.so* -%exclude %{_libdir}/collectd/libvirt.so* -%exclude %{_libdir}/collectd/nut.so* -%exclude %{_libdir}/collectd/mysql.so* -%exclude %{_libdir}/collectd/nginx.so* -%exclude %{_libdir}/collectd/perl.so* -%exclude %{_libdir}/collectd/postgresql.so* -%exclude %{_libdir}/collectd/rrdtool.so* -%exclude %{_libdir}/collectd/sensors.so* -%exclude %{_libdir}/collectd/snmp.so* %doc AUTHORS ChangeLog COPYING INSTALL README %doc %{_mandir}/man1/collectd.1* @@ -295,51 +322,51 @@ %files apache %defattr(-, root, root, -) -%{_libdir}/collectd/apache.so* +%{_libdir}/collectd/apache.so %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf %files dns %defattr(-, root, root, -) -%{_libdir}/collectd/dns.so* +%{_libdir}/collectd/dns.so %config(noreplace) %{_sysconfdir}/collectd.d/dns.conf %files email %defattr(-, root, root, -) -%{_libdir}/collectd/email.so* +%{_libdir}/collectd/email.so %config(noreplace) %{_sysconfdir}/collectd.d/email.conf %doc %{_mandir}/man5/collectd-email.5* %files ipmi %defattr(-, root, root, -) -%{_libdir}/collectd/ipmi.so* +%{_libdir}/collectd/ipmi.so %config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf %files mysql %defattr(-, root, root, -) -%{_libdir}/collectd/mysql.so* +%{_libdir}/collectd/mysql.so %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf %files nginx %defattr(-, root, root, -) -%{_libdir}/collectd/nginx.so* +%{_libdir}/collectd/nginx.so %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf %files nut %defattr(-, root, root, -) -%{_libdir}/collectd/nut.so* +%{_libdir}/collectd/nut.so %config(noreplace) %{_sysconfdir}/collectd.d/nut.conf %files -n perl-Collectd %defattr(-, root, root, -) %doc perl-examples/* -%{_libdir}/collectd/perl.so* +%{_libdir}/collectd/perl.so %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd/ %config(noreplace) %{_sysconfdir}/collectd.d/perl.conf @@ -349,37 +376,42 @@ %files postgresql %defattr(-, root, root, -) -%{_libdir}/collectd/postgresql.so* +%{_libdir}/collectd/postgresql.so %config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf %doc src/postgresql_default.conf %files rrdtool %defattr(-, root, root, -) -%{_libdir}/collectd/rrdtool.so* +%{_libdir}/collectd/rrdtool.so %config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf %files sensors %defattr(-, root, root, -) -%{_libdir}/collectd/sensors.so* +%{_libdir}/collectd/sensors.so %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf %files snmp %defattr(-, root, root, -) -%{_libdir}/collectd/snmp.so* +%{_libdir}/collectd/snmp.so %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf %doc %{_mandir}/man5/collectd-snmp.5* %files virt %defattr(-, root, root, -) -%{_libdir}/collectd/libvirt.so* +%{_libdir}/collectd/libvirt.so %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf %changelog +* Tue Mar 03 2009 Alan Pevec 4.5.3-1 +- New upstream version 4.5.3 +- fixes collectd is built without iptables plugin, bz# 479208 +- list all expected plugins explicitly to avoid such bugs + * Sun Dec 07 2008 Alan Pevec 4.5.1-2.1 - fix subpackages, bz# 475093 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/F-10/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Nov 2008 11:45:32 -0000 1.8 +++ sources 3 Mar 2009 21:40:43 -0000 1.9 @@ -1 +1 @@ -d85e00de03d40ca66d5eb4775e58fc1f collectd-4.5.1.tar.bz2 +f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2 From glommer at fedoraproject.org Tue Mar 3 23:57:38 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 3 Mar 2009 23:57:38 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel kvm-fix-strayR.patch, NONE, 1.1 kvm-upstream-ppc.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 qemu-sasl-01-tls-handshake-fix.patch, 1.1, 1.2 qemu-sasl-02-vnc-monitor-info.patch, 1.1, 1.2 qemu-sasl-03-display-keymaps.patch, 1.1, 1.2 qemu-sasl-04-vnc-struct.patch, 1.1, 1.2 qemu-sasl-05-vnc-tls-vencrypt.patch, 1.1, 1.2 qemu-sasl-06-vnc-sasl.patch, 1.1, 1.2 qemu-sasl-07-vnc-monitor-authinfo.patch, 1.1, 1.2 qemu-sasl-08-vnc-acl-mgmt.patch, 1.1, 1.2 qemu.spec, 1.51, 1.52 sources, 1.10, 1.11 Message-ID: <20090303235738.BD2DB70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv301 Modified Files: .cvsignore qemu-sasl-01-tls-handshake-fix.patch qemu-sasl-02-vnc-monitor-info.patch qemu-sasl-03-display-keymaps.patch qemu-sasl-04-vnc-struct.patch qemu-sasl-05-vnc-tls-vencrypt.patch qemu-sasl-06-vnc-sasl.patch qemu-sasl-07-vnc-monitor-authinfo.patch qemu-sasl-08-vnc-acl-mgmt.patch qemu.spec sources Added Files: kvm-fix-strayR.patch kvm-upstream-ppc.patch Log Message: - 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. kvm-fix-strayR.patch: --- NEW FILE kvm-fix-strayR.patch --- Newer gcc versions support a R"..." construct, so we can't use "abc"R"def" constructs without any space between R and the quotes, when using -std=gnu99 (that is used by the user/test code). This fixes this error: test/x86/vmexit.c:34:26: error: invalid character ' ' in raw string delimiter test/x86/vmexit.c: In function ???main???: test/x86/vmexit.c:34: error: stray ???R??? in program test/x86/vmexit.c:34:46: error: invalid character ' ' in raw string delimiter test/x86/vmexit.c:34: error: expected ???:??? or ???)??? before string constant test/x86/vmexit.c:34: error: stray ???R??? in program Signed-off-by: Eduardo Habkost --- user/test/x86/apic.c | 32 ++++++++++++++++---------------- user/test/x86/vmexit.c | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/user/test/x86/apic.c b/user/test/x86/apic.c index 9c6205b..2d963dc 100644 --- a/user/test/x86/apic.c +++ b/user/test/x86/apic.c @@ -54,14 +54,14 @@ asm ( "push %r9 \n\t" "push %r8 \n\t" #endif - "push %"R"di \n\t" - "push %"R"si \n\t" - "push %"R"bp \n\t" - "push %"R"sp \n\t" - "push %"R"bx \n\t" - "push %"R"dx \n\t" - "push %"R"cx \n\t" - "push %"R"ax \n\t" + "push %" R "di \n\t" + "push %" R "si \n\t" + "push %" R "bp \n\t" + "push %" R "sp \n\t" + "push %" R "bx \n\t" + "push %" R "dx \n\t" + "push %" R "cx \n\t" + "push %" R "ax \n\t" #ifdef __x86_64__ "mov %rsp, %rdi \n\t" "callq *8*16(%rsp) \n\t" @@ -70,14 +70,14 @@ asm ( "calll *4+4*8(%esp) \n\t" "add $4, %esp \n\t" #endif - "pop %"R"ax \n\t" - "pop %"R"cx \n\t" - "pop %"R"dx \n\t" - "pop %"R"bx \n\t" - "pop %"R"bp \n\t" - "pop %"R"bp \n\t" - "pop %"R"si \n\t" - "pop %"R"di \n\t" + "pop %" R "ax \n\t" + "pop %" R "cx \n\t" + "pop %" R "dx \n\t" + "pop %" R "bx \n\t" + "pop %" R "bp \n\t" + "pop %" R "bp \n\t" + "pop %" R "si \n\t" + "pop %" R "di \n\t" #ifdef __x86_64__ "pop %r8 \n\t" "pop %r9 \n\t" diff --git a/user/test/x86/vmexit.c b/user/test/x86/vmexit.c index bd57bfa..7339e2b 100644 --- a/user/test/x86/vmexit.c +++ b/user/test/x86/vmexit.c @@ -31,7 +31,7 @@ int main() t1 = rdtsc(); for (i = 0; i < N; ++i) - asm volatile ("push %%"R"bx; cpuid; pop %%"R"bx" + asm volatile ("push %%" R "bx; cpuid; pop %%" R "bx" : : : "eax", "ecx", "edx"); t2 = rdtsc(); printf("vmexit latency: %d\n", (int)((t2 - t1) / N)); -- 1.6.0.2.GIT kvm-upstream-ppc.patch: --- NEW FILE kvm-upstream-ppc.patch --- >From 1efd319579c8f34974d654b0a5ac5144424e693e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 13 Feb 2009 13:00:31 -0500 Subject: [PATCH] use KVM_UPSTREAM for ppc. ppc should compile with upstream qemu code, so, put these defines in ppc specific code that references kvm functions. We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation. Signed-off-by: Glauber Costa --- qemu/hw/ppc440.c | 1 + qemu/hw/ppc440_bamboo.c | 1 + qemu/target-ppc/helper.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c index 00d82e4..164c326 100644 --- a/qemu/hw/ppc440.c +++ b/qemu/hw/ppc440.c @@ -18,6 +18,7 @@ #include "ppc440.h" #include "ppc405.h" #include "sysemu.h" +#define KVM_UPSTREAM #include "kvm.h" #define PPC440EP_PCI_CONFIG 0xeec00000 diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c index fbd447c..60ddaf4 100644 --- a/qemu/hw/ppc440_bamboo.c +++ b/qemu/hw/ppc440_bamboo.c @@ -21,6 +21,7 @@ #include "boards.h" #include "sysemu.h" #include "ppc440.h" +#define KVM_UPSTREAM #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c index fc62a63..d49acaf 100644 --- a/qemu/target-ppc/helper.c +++ b/qemu/target-ppc/helper.c @@ -29,6 +29,7 @@ #include "exec-all.h" #include "helper_regs.h" #include "qemu-common.h" +#define KVM_UPSTREAM #include "kvm.h" //#define DEBUG_MMU -- 1.5.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 Mar 2009 20:31:09 -0000 1.10 +++ .cvsignore 3 Mar 2009 23:57:07 -0000 1.11 @@ -1 +1 @@ -qemu-1.0.tar.gz +kvm-84.git-snapshot-20090303.tar.gz qemu-sasl-01-tls-handshake-fix.patch: Index: qemu-sasl-01-tls-handshake-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-01-tls-handshake-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-01-tls-handshake-fix.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-01-tls-handshake-fix.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -22,9 +22,10 @@ Signed-off-by: Daniel P. Berrange -diff -r ff004fb525e7 vnc.c ---- a/vnc.c Thu Feb 19 11:26:55 2009 +0000 -+++ b/vnc.c Thu Feb 19 11:27:44 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth VNC_DEBUG("Failed to complete TLS\n"); return 0; qemu-sasl-02-vnc-monitor-info.patch: Index: qemu-sasl-02-vnc-monitor-info.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-02-vnc-monitor-info.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-02-vnc-monitor-info.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-02-vnc-monitor-info.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -38,9 +38,10 @@ Signed-off-by: Daniel P. Berrange -diff -r 4dbf24b567c4 vnc.c ---- a/vnc.c Thu Feb 19 11:27:44 2009 +0000 -+++ b/vnc.c Thu Feb 19 11:53:31 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -166,19 +166,136 @@ struct VncState static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; @@ -158,16 +159,17 @@ - term_printf("VNC server active on: "); - term_print_filename(vnc_display->display); - term_printf("\n"); +- +- if (vnc_display->clients == NULL) +- term_printf("No client connected\n"); +- else +- term_printf("Client connected\n"); + if (vnc_display == NULL || vnc_display->display == NULL) { + term_printf("Server: disabled\n"); + } else { + char *serverAddr = vnc_socket_local_addr(" address: %s:%s\n", + vnc_display->lsock); - -- if (vnc_display->clients == NULL) -- term_printf("No client connected\n"); -- else -- term_printf("Client connected\n"); ++ + if (!serverAddr) + return; + qemu-sasl-03-display-keymaps.patch: Index: qemu-sasl-03-display-keymaps.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-03-display-keymaps.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-03-display-keymaps.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-03-display-keymaps.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -20,10 +20,11 @@ Signed-off-by: Daniel P. Berrange -diff -r 9ccd7a5b0382 Makefile ---- a/Makefile Thu Feb 19 11:54:21 2009 +0000 -+++ b/Makefile Thu Feb 19 13:15:19 2009 +0000 -@@ -137,6 +137,7 @@ endif +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -141,6 +141,7 @@ endif AUDIO_OBJS+= wavcapture.o OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) @@ -31,7 +32,7 @@ ifdef CONFIG_SDL OBJS+=sdl.o x_keymap.o endif -@@ -161,15 +162,17 @@ LIBS+=$(VDE_LIBS) +@@ -165,15 +166,17 @@ LIBS+=$(VDE_LIBS) cocoa.o: cocoa.m @@ -52,9 +53,10 @@ bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -diff -r 9ccd7a5b0382 curses.c ---- a/curses.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/curses.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/curses.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/curses.c ++++ kvm-84.git-snapshot-20090303/qemu/curses.c @@ -158,7 +158,6 @@ static void curses_cursor_position(Displ /* generic keyboard conversion */ @@ -72,9 +74,10 @@ if (!kbd_layout) exit(1); } -diff -r 9ccd7a5b0382 curses_keys.h ---- a/curses_keys.h Thu Feb 19 11:54:21 2009 +0000 -+++ b/curses_keys.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/curses_keys.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/curses_keys.h ++++ kvm-84.git-snapshot-20090303/qemu/curses_keys.h @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. @@ -98,9 +101,10 @@ static const name2keysym_t name2keysym[] = { /* Plain ASCII */ { "space", 0x020 }, -diff -r 9ccd7a5b0382 keymaps.c ---- a/keymaps.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/keymaps.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/keymaps.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/keymaps.c ++++ kvm-84.git-snapshot-20090303/qemu/keymaps.c @@ -22,34 +22,20 @@ * THE SOFTWARE. */ @@ -206,9 +210,10 @@ { kbd_layout_t *k = kbd_layout; struct key_range *kr; -diff -r 9ccd7a5b0382 keymaps.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/keymaps.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/keymaps.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/keymaps.h @@ -0,0 +1,60 @@ +/* + * QEMU keysym to keycode conversion using rdesktop keymaps @@ -270,9 +275,10 @@ +int keysym_is_numlock(void *kbd_layout, int keysym); + +#endif /* __QEMU_KEYMAPS_H__ */ -diff -r 9ccd7a5b0382 sdl.c ---- a/sdl.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/sdl.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/sdl.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/sdl.c ++++ kvm-84.git-snapshot-20090303/qemu/sdl.c @@ -107,7 +107,6 @@ static void sdl_resize(DisplayState *ds) /* generic keyboard conversion */ @@ -290,9 +296,10 @@ if (!kbd_layout) exit(1); } -diff -r 9ccd7a5b0382 sdl_keysym.h ---- a/sdl_keysym.h Thu Feb 19 11:54:21 2009 +0000 -+++ b/sdl_keysym.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/sdl_keysym.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/sdl_keysym.h ++++ kvm-84.git-snapshot-20090303/qemu/sdl_keysym.h @@ -1,7 +1,6 @@ -typedef struct { - const char* name; @@ -304,9 +311,10 @@ static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, -diff -r 9ccd7a5b0382 vnc.c ---- a/vnc.c Thu Feb 19 11:54:21 2009 +0000 -+++ b/vnc.c Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -35,7 +35,6 @@ #include "vnc.h" @@ -327,9 +335,10 @@ if (!vs->kbd_layout) exit(1); -diff -r 9ccd7a5b0382 vnc_keysym.h ---- a/vnc_keysym.h Thu Feb 19 11:54:21 2009 +0000 -+++ b/vnc_keysym.h Thu Feb 19 13:15:19 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc_keysym.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc_keysym.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc_keysym.h @@ -1,7 +1,6 @@ -typedef struct { - const char* name; qemu-sasl-04-vnc-struct.patch: Index: qemu-sasl-04-vnc-struct.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-04-vnc-struct.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-04-vnc-struct.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-04-vnc-struct.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -9,9 +9,10 @@ Signed-off-by: Daniel P. Berrange -diff -r 216ec7d1e30f vnc.c ---- a/vnc.c Thu Feb 19 13:15:19 2009 +0000 -+++ b/vnc.c Thu Feb 19 13:25:09 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Anthony Liguori @@ -151,9 +152,10 @@ static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; -diff -r 216ec7d1e30f vnc.h ---- a/vnc.h Thu Feb 19 13:15:19 2009 +0000 -+++ b/vnc.h Thu Feb 19 13:25:09 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h @@ -1,5 +1,148 @@ -#ifndef __VNCTIGHT_H -#define __VNCTIGHT_H qemu-sasl-05-vnc-tls-vencrypt.patch: Index: qemu-sasl-05-vnc-tls-vencrypt.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-05-vnc-tls-vencrypt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-05-vnc-tls-vencrypt.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-05-vnc-tls-vencrypt.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -35,10 +35,11 @@ Signed-off-by: Daniel P. Berrange -diff -r dfa890dd7417 Makefile ---- a/Makefile Mon Feb 23 13:05:49 2009 +0000 -+++ b/Makefile Mon Feb 23 13:06:22 2009 +0000 -@@ -145,6 +145,9 @@ ifdef CONFIG_CURSES +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -149,6 +149,9 @@ ifdef CONFIG_CURSES OBJS+=curses.o endif OBJS+=vnc.o d3des.o @@ -48,7 +49,7 @@ ifdef CONFIG_COCOA OBJS+=cocoa.o -@@ -168,10 +171,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h +@@ -172,10 +175,16 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) @@ -66,9 +67,10 @@ curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -diff -r dfa890dd7417 vnc-auth-vencrypt.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-vencrypt.c Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c @@ -0,0 +1,167 @@ +/* + * QEMU VNC display driver: VeNCrypt authentication setup @@ -237,9 +239,10 @@ + vnc_read_when(vs, protocol_client_vencrypt_init, 2); +} + -diff -r dfa890dd7417 vnc-auth-vencrypt.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-vencrypt.h Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.h @@ -0,0 +1,33 @@ +/* + * QEMU VNC display driver @@ -274,9 +277,10 @@ +void start_auth_vencrypt(VncState *vs); + +#endif /* __QEMU_VNC_AUTH_VENCRYPT_H__ */ -diff -r dfa890dd7417 vnc-tls.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-tls.c Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.c @@ -0,0 +1,414 @@ +/* + * QEMU VNC display driver: TLS helpers @@ -692,9 +696,10 @@ + return -1; +} + -diff -r dfa890dd7417 vnc-tls.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-tls.h Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.h @@ -0,0 +1,70 @@ +/* + * QEMU VNC display driver. TLS helpers @@ -766,9 +771,10 @@ + +#endif /* __QEMU_VNC_TLS_H__ */ + -diff -r dfa890dd7417 vnc.c ---- a/vnc.c Mon Feb 23 13:05:49 2009 +0000 -+++ b/vnc.c Mon Feb 23 13:06:22 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -34,21 +34,6 @@ #include "vnc_keysym.h" #include "d3des.h" @@ -1016,9 +1022,9 @@ vnc_read_when(vs, protocol_client_auth_vnc, sizeof(vs->challenge)); - return 0; - } - - +-} +- +- -#ifdef CONFIG_VNC_TLS -#define DH_BITS 1024 -static gnutls_dh_params_t dh_params; @@ -1062,9 +1068,9 @@ - gnutls_anon_set_server_dh_params(anon_cred, dh_params); - - return anon_cred; --} -- -- + } + + -static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncState *vs) -{ - gnutls_certificate_credentials_t x509_cred; @@ -1544,10 +1550,11 @@ fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path); qemu_free(path); qemu_free(vs->display); -diff -r dfa890dd7417 vnc.h ---- a/vnc.h Mon Feb 23 13:05:49 2009 +0000 -+++ b/vnc.h Mon Feb 23 13:06:22 2009 +0000 -@@ -32,12 +32,15 @@ +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h +@@ -32,13 +32,16 @@ #include "audio/audio.h" #include @@ -1555,9 +1562,9 @@ -#include -#include -#endif /* CONFIG_VNC_TLS */ -+#include "keymaps.h" +- + #include "keymaps.h" --#include "keymaps.h" +// #define _VNC_DEBUG 1 + +#ifdef _VNC_DEBUG @@ -1565,9 +1572,10 @@ +#else +#define VNC_DEBUG(fmt, ...) do { } while (0) +#endif - ++ /***************************************************************************** * + * Core data structures @@ -72,6 +75,11 @@ typedef void VncSendHextileTile(VncState typedef struct VncDisplay VncDisplay; qemu-sasl-06-vnc-sasl.patch: Index: qemu-sasl-06-vnc-sasl.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-06-vnc-sasl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-06-vnc-sasl.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-06-vnc-sasl.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -75,10 +75,11 @@ Signed-off-by: Daniel P. Berrange -diff -r 6981d4d832a9 Makefile ---- a/Makefile Mon Mar 02 11:13:33 2009 +0000 -+++ b/Makefile Mon Mar 02 11:13:38 2009 +0000 -@@ -148,6 +148,9 @@ OBJS+=vnc.o d3des.o +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -152,6 +152,9 @@ OBJS+=vnc.o d3des.o ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif @@ -88,7 +89,7 @@ ifdef CONFIG_COCOA OBJS+=cocoa.o -@@ -171,7 +174,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h +@@ -175,7 +178,7 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) @@ -97,7 +98,7 @@ vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h -@@ -181,6 +184,8 @@ vnc-tls.o: vnc-tls.c vnc.h +@@ -185,6 +188,8 @@ vnc-tls.o: vnc-tls.c vnc.h vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h @@ -106,10 +107,11 @@ curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -diff -r 6981d4d832a9 Makefile.target ---- a/Makefile.target Mon Mar 02 11:13:33 2009 +0000 -+++ b/Makefile.target Mon Mar 02 11:13:38 2009 +0000 -@@ -554,6 +554,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) +Index: kvm-84.git-snapshot-20090303/qemu/Makefile.target +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile.target ++++ kvm-84.git-snapshot-20090303/qemu/Makefile.target +@@ -613,6 +613,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) LIBS += $(CONFIG_VNC_TLS_LIBS) endif @@ -121,9 +123,10 @@ ifdef CONFIG_BLUEZ LIBS += $(CONFIG_BLUEZ_LIBS) endif -diff -r 6981d4d832a9 configure ---- a/configure Mon Mar 02 11:13:33 2009 +0000 -+++ b/configure Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/configure +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/configure ++++ kvm-84.git-snapshot-20090303/qemu/configure @@ -164,6 +164,7 @@ fmod_lib="" fmod_inc="" oss_lib="" @@ -132,7 +135,7 @@ bsd="no" linux="no" solaris="no" -@@ -387,6 +388,8 @@ for opt do +@@ -403,6 +404,8 @@ for opt do ;; --disable-vnc-tls) vnc_tls="no" ;; @@ -141,7 +144,7 @@ --disable-slirp) slirp="no" ;; --disable-vde) vde="no" -@@ -544,6 +547,7 @@ echo " Availab +@@ -562,6 +565,7 @@ echo " Availab echo " --enable-mixemu enable mixer emulation" echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" @@ -149,7 +152,7 @@ echo " --disable-curses disable curses output" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" -@@ -823,6 +827,25 @@ EOF +@@ -874,6 +878,25 @@ EOF fi ########################################## @@ -175,7 +178,7 @@ # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF -@@ -1130,6 +1153,11 @@ if test "$vnc_tls" = "yes" ; then +@@ -1208,6 +1231,11 @@ if test "$vnc_tls" = "yes" ; then echo " TLS CFLAGS $vnc_tls_cflags" echo " TLS LIBS $vnc_tls_libs" fi @@ -187,7 +190,7 @@ if test -n "$sparc_cpu"; then echo "Target Sparc Arch $sparc_cpu" fi -@@ -1371,6 +1399,12 @@ if test "$vnc_tls" = "yes" ; then +@@ -1451,6 +1479,12 @@ if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak echo "#define CONFIG_VNC_TLS 1" >> $config_h fi @@ -200,10 +203,11 @@ qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h -diff -r 6981d4d832a9 qemu-doc.texi ---- a/qemu-doc.texi Mon Mar 02 11:13:33 2009 +0000 -+++ b/qemu-doc.texi Mon Mar 02 11:13:38 2009 +0000 -@@ -616,6 +616,21 @@ path following this option specifies whe +Index: kvm-84.git-snapshot-20090303/qemu/qemu-doc.texi +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/qemu-doc.texi ++++ kvm-84.git-snapshot-20090303/qemu/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. @@ -225,7 +229,7 @@ @end table @end table -@@ -2061,7 +2076,10 @@ considerations depending on the deployme +@@ -2058,7 +2073,10 @@ considerations depending on the deployme * vnc_sec_certificate:: * vnc_sec_certificate_verify:: * vnc_sec_certificate_pw:: @@ -236,7 +240,7 @@ @end menu @node vnc_sec_none @subsection Without passwords -@@ -2144,6 +2162,41 @@ Password: ******** +@@ -2141,6 +2159,41 @@ Password: ******** (qemu) @end example @@ -278,7 +282,7 @@ @node vnc_generate_cert @subsection Generating certificates for VNC -@@ -2255,6 +2308,50 @@ EOF +@@ -2252,6 +2305,50 @@ EOF The @code{client-key.pem} and @code{client-cert.pem} files should now be securely copied to the client for which they were generated. @@ -329,9 +333,10 @@ @node gdb_usage @section GDB usage -diff -r 6981d4d832a9 qemu.sasl ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/qemu.sasl Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/qemu.sasl +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/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 @@ -367,9 +372,10 @@ + +auxprop_plugin: sasldb + -diff -r 6981d4d832a9 vnc-auth-sasl.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-sasl.c Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c @@ -0,0 +1,626 @@ +/* + * QEMU VNC display driver: SASL auth protocol @@ -997,9 +1003,10 @@ +} + + -diff -r 6981d4d832a9 vnc-auth-sasl.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/vnc-auth-sasl.h Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h @@ -0,0 +1,67 @@ +/* + * QEMU VNC display driver: SASL auth protocol @@ -1068,9 +1075,10 @@ + +#endif /* __QEMU_VNC_AUTH_SASL_H__ */ + -diff -r 6981d4d832a9 vnc-auth-vencrypt.c ---- a/vnc-auth-vencrypt.c Mon Mar 02 11:13:33 2009 +0000 -+++ b/vnc-auth-vencrypt.c Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-auth-vencrypt.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-vencrypt.c @@ -43,8 +43,15 @@ static void start_auth_vencrypt_subauth( start_auth_vnc(vs); break; @@ -1098,9 +1106,10 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len) -diff -r 6981d4d832a9 vnc.c ---- a/vnc.c Mon Mar 02 11:13:33 2009 +0000 -+++ b/vnc.c Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -68,7 +68,8 @@ static char *addr_to_string(const char * return addr; } @@ -1340,17 +1349,19 @@ if (ret < 0) { if (ret == GNUTLS_E_AGAIN) errno = EAGAIN; -@@ -932,13 +1025,53 @@ void vnc_client_read(void *opaque) +@@ -932,12 +1025,52 @@ void vnc_client_read(void *opaque) } } else #endif /* CONFIG_VNC_TLS */ - ret = recv(vs->csock, buffer_end(&vs->input), 4096, 0); - ret = vnc_client_io_error(vs, ret, socket_error()); +- if (!ret) +- return; + ret = recv(vs->csock, data, datalen, 0); + VNC_DEBUG("Read wire %p %d -> %ld\n", data, datalen, ret); + return vnc_client_io_error(vs, ret, socket_error()); +} -+ + + +/* + * Called to read data from the client socket to the input buffer, @@ -1369,7 +1380,7 @@ + ret = vnc_client_read_buf(vs, buffer_end(&vs->input), 4096); + if (!ret) + return 0; -+ vs->input.offset += ret; + vs->input.offset += ret; + return ret; +} + @@ -1390,14 +1401,11 @@ + else +#endif /* CONFIG_VNC_SASL */ + ret = vnc_client_read_plain(vs); - if (!ret) - return; ++ if (!ret) ++ return; -- vs->input.offset += ret; -- while (vs->read_handler && vs->input.offset >= vs->read_handler_expect) { size_t len = vs->read_handler_expect; - int ret; @@ -1722,6 +1855,13 @@ static int protocol_client_auth(VncState break; #endif /* CONFIG_VNC_TLS */ @@ -1511,9 +1519,10 @@ if (reverse) { /* connect to viewer */ if (strncmp(display, "unix:", 5) == 0) -diff -r 6981d4d832a9 vnc.h ---- a/vnc.h Mon Mar 02 11:13:33 2009 +0000 -+++ b/vnc.h Mon Mar 02 11:13:38 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h @@ -79,6 +79,10 @@ typedef struct VncDisplay VncDisplay; #include "vnc-tls.h" #include "vnc-auth-vencrypt.h" qemu-sasl-07-vnc-monitor-authinfo.patch: Index: qemu-sasl-07-vnc-monitor-authinfo.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-07-vnc-monitor-authinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-07-vnc-monitor-authinfo.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-07-vnc-monitor-authinfo.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -29,9 +29,10 @@ Signed-off-by: Daniel P. Berrange -diff -r 440be37a35ea vnc-tls.c ---- a/vnc-tls.c Fri Feb 20 11:46:26 2009 +0000 -+++ b/vnc-tls.c Fri Feb 20 11:47:52 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.c @@ -241,6 +241,22 @@ int vnc_tls_validate_certificate(struct return -1; } @@ -63,9 +64,10 @@ } -diff -r 440be37a35ea vnc-tls.h ---- a/vnc-tls.h Fri Feb 20 11:46:26 2009 +0000 -+++ b/vnc-tls.h Fri Feb 20 11:47:52 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.h @@ -55,6 +55,9 @@ struct VncStateTLS { /* Whether data is being TLS encrypted yet */ int wiremode; @@ -76,9 +78,10 @@ }; int vnc_tls_client_setup(VncState *vs, int x509Creds); -diff -r 440be37a35ea vnc.c ---- a/vnc.c Fri Feb 20 11:46:26 2009 +0000 -+++ b/vnc.c Fri Feb 20 11:47:52 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState term_puts("Client:\n"); term_puts(clientAddr); qemu-sasl-08-vnc-acl-mgmt.patch: Index: qemu-sasl-08-vnc-acl-mgmt.patch =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-sasl-08-vnc-acl-mgmt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-sasl-08-vnc-acl-mgmt.patch 3 Mar 2009 12:55:33 -0000 1.1 +++ qemu-sasl-08-vnc-acl-mgmt.patch 3 Mar 2009 23:57:07 -0000 1.2 @@ -78,10 +78,11 @@ Signed-off-by: Daniel P. Berrange -diff -r b1008c5c6c16 Makefile ---- a/Makefile Mon Mar 02 11:13:40 2009 +0000 -+++ b/Makefile Mon Mar 02 12:11:04 2009 +0000 -@@ -144,7 +144,7 @@ endif +Index: kvm-84.git-snapshot-20090303/qemu/Makefile +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/Makefile ++++ kvm-84.git-snapshot-20090303/qemu/Makefile +@@ -148,7 +148,7 @@ endif ifdef CONFIG_CURSES OBJS+=curses.o endif @@ -90,7 +91,7 @@ ifdef CONFIG_VNC_TLS OBJS+=vnc-tls.o vnc-auth-vencrypt.o endif -@@ -174,9 +174,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h +@@ -178,9 +178,11 @@ sdl.o: sdl.c keymaps.h sdl_keysym.h sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) @@ -103,9 +104,10 @@ vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -diff -r b1008c5c6c16 acl.c ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/acl.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/acl.c +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/acl.c @@ -0,0 +1,185 @@ +/* + * QEMU access control list management @@ -292,9 +294,10 @@ + * tab-width: 8 + * End: + */ -diff -r b1008c5c6c16 acl.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/acl.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/acl.h +=================================================================== +--- /dev/null ++++ kvm-84.git-snapshot-20090303/qemu/acl.h @@ -0,0 +1,74 @@ +/* + * QEMU access control list management @@ -370,10 +373,11 @@ + * tab-width: 8 + * End: + */ -diff -r b1008c5c6c16 configure ---- a/configure Mon Mar 02 11:13:40 2009 +0000 -+++ b/configure Mon Mar 02 12:11:04 2009 +0000 -@@ -846,6 +846,21 @@ EOF +Index: kvm-84.git-snapshot-20090303/qemu/configure +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/configure ++++ kvm-84.git-snapshot-20090303/qemu/configure +@@ -897,6 +897,21 @@ EOF fi ########################################## @@ -395,7 +399,7 @@ # vde libraries probe if test "$vde" = "yes" ; then cat > $TMPC << EOF -@@ -1405,6 +1420,9 @@ if test "$vnc_sasl" = "yes" ; then +@@ -1485,6 +1500,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 @@ -405,18 +409,19 @@ qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_mak echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h -diff -r b1008c5c6c16 monitor.c ---- a/monitor.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/monitor.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/monitor.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/monitor.c ++++ kvm-84.git-snapshot-20090303/qemu/monitor.c @@ -39,6 +39,7 @@ #include "qemu-timer.h" #include "migration.h" #include "kvm.h" +#include "acl.h" - //#define DEBUG - //#define DEBUG_COMPLETION -@@ -1425,6 +1426,85 @@ static void do_info_balloon(void) + #include "qemu-kvm.h" + +@@ -1452,6 +1453,85 @@ static void do_info_balloon(void) term_printf("balloon: actual=%d\n", (int)(actual >> 20)); } @@ -502,20 +507,20 @@ /* Please update qemu-doc.texi when adding or changing commands */ static const term_cmd_t term_cmds[] = { { "help|?", "s?", do_help, -@@ -1529,6 +1609,12 @@ static const term_cmd_t term_cmds[] = { - "target", "request VM to change it's memory allocation (in MB)" }, +@@ -1557,6 +1637,12 @@ static const term_cmd_t term_cmds[] = { { "set_link", "ss", do_set_link, "name [up|down]", "change the link status of a network adapter" }, + { "set_link", "ss", do_set_link, "name [up|down]" }, + { "acl", "sss?i?", do_acl, " [] []\n", + "acl show vnc.username\n" + "acl policy vnc.username deny\n" + "acl allow vnc.username fred\n" + "acl deny vnc.username bob\n" + "acl reset vnc.username\n" }, - { NULL, NULL, }, - }; - -@@ -2891,3 +2977,12 @@ void monitor_readline(const char *prompt + { "cpu_set", "is", do_cpu_set_nr, "cpu [online|offline]", "change cpu state" }, + #if defined(TARGET_I386) || defined(TARGET_X86_64) + { "drive_add", "iss", drive_hot_add, "pcibus pcidevfn [file=file][,if=type][,bus=n]\n" +@@ -2927,3 +3013,12 @@ void monitor_readline(const char *prompt monitor_hd[i]->focus = old_focus[i]; } } @@ -528,10 +533,11 @@ + * tab-width: 8 + * End: + */ -diff -r b1008c5c6c16 qemu-doc.texi ---- a/qemu-doc.texi Mon Mar 02 11:13:40 2009 +0000 -+++ b/qemu-doc.texi Mon Mar 02 12:11:04 2009 +0000 -@@ -631,6 +631,19 @@ ensures a data encryption preventing com +Index: kvm-84.git-snapshot-20090303/qemu/qemu-doc.texi +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/qemu-doc.texi ++++ kvm-84.git-snapshot-20090303/qemu/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. @@ -551,7 +557,7 @@ @end table @end table -@@ -1392,6 +1405,42 @@ Password: ******** +@@ -1389,6 +1402,42 @@ Password: ******** @end table @@ -594,9 +600,10 @@ @item screendump @var{filename} Save screen into PPM image @var{filename}. -diff -r b1008c5c6c16 vnc-auth-sasl.c ---- a/vnc-auth-sasl.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-auth-sasl.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-auth-sasl.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.c @@ -120,22 +120,32 @@ static int vnc_auth_sasl_check_access(Vn { const void *val; @@ -633,9 +640,10 @@ } static int vnc_auth_sasl_check_ssf(VncState *vs) -diff -r b1008c5c6c16 vnc-auth-sasl.h ---- a/vnc-auth-sasl.h Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-auth-sasl.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-auth-sasl.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc-auth-sasl.h @@ -30,6 +30,9 @@ #include @@ -657,9 +665,10 @@ void vnc_sasl_client_cleanup(VncState *vs); long vnc_client_read_sasl(VncState *vs); -diff -r b1008c5c6c16 vnc-tls.c ---- a/vnc-tls.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-tls.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.c @@ -255,6 +255,25 @@ int vnc_tls_validate_certificate(struct gnutls_strerror (ret)); return -1; @@ -686,9 +695,10 @@ } gnutls_x509_crt_deinit (cert); -diff -r b1008c5c6c16 vnc-tls.h ---- a/vnc-tls.h Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc-tls.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc-tls.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc-tls.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc-tls.h @@ -31,6 +31,8 @@ #include #include @@ -706,9 +716,10 @@ /* Paths to x509 certs/keys */ char *x509cacert; -diff -r b1008c5c6c16 vnc.c ---- a/vnc.c Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc.c Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.c +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.c ++++ kvm-84.git-snapshot-20090303/qemu/vnc.c @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu_socket.h" @@ -754,9 +765,10 @@ /* * Combinations we support here: * -diff -r b1008c5c6c16 vnc.h ---- a/vnc.h Mon Mar 02 11:13:40 2009 +0000 -+++ b/vnc.h Mon Mar 02 12:11:04 2009 +0000 +Index: kvm-84.git-snapshot-20090303/qemu/vnc.h +=================================================================== +--- kvm-84.git-snapshot-20090303.orig/qemu/vnc.h ++++ kvm-84.git-snapshot-20090303/qemu/vnc.h @@ -98,6 +98,9 @@ struct VncDisplay int subauth; /* Used by VeNCrypt */ VncDisplayTLS tls; Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- qemu.spec 3 Mar 2009 12:55:33 -0000 1.51 +++ qemu.spec 3 Mar 2009 23:57:07 -0000 1.52 @@ -1,12 +1,18 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 1.0 -Release: 0.5.svn6666%{?dist} +Version: 0.10 +Release: 0.1.kvm20090303git%{?dist} +# I have mistakenly thought the revision name would be 1.0. +# So 0.10 series get Epoch = 1 +Epoch: 1 License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ -Source0: http://www.qemu.org/%{name}-%{version}.tar.gz +#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz +# FIXME: Say how to get the sources +Source0: kvm-84.git-snapshot-20090303.tar.gz Source1: qemu.init +Source2: kvm.modules # VNC SASL authentication support # Not upstream yet, but approved for commit immediately @@ -19,11 +25,14 @@ Patch6: qemu-sasl-06-vnc-sasl.patch Patch7: qemu-sasl-07-vnc-monitor-authinfo.patch Patch8: qemu-sasl-08-vnc-acl-mgmt.patch +Patch9: kvm-upstream-ppc.patch +Patch10: kvm-fix-strayR.patch # NB, delibrately not including patch 09 which is not # intended for commit BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel +BuildRequires: rsync Requires: %{name}-user = %{version}-%{release} Requires: %{name}-system-x86 = %{version}-%{release} Requires: %{name}-system-sparc = %{version}-%{release} @@ -35,6 +44,9 @@ Requires: %{name}-system-ppc = %{version}-%{release} Requires: %{name}-img = %{version}-%{release} +# sorry dudes, one step at a time +ExcludeArch: ppc ppc64 + #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l %define qemudocdir %{_docdir}/%{name}-%{version} @@ -107,7 +119,7 @@ %qemupkgdesc system-sh4 {system emulator for sh4} %prep -%setup -q +%setup -q -n kvm-84.git-snapshot-20090303 # 01-tls-handshake-fix %patch1 -p1 # 02-vnc-monitor-info @@ -124,6 +136,8 @@ %patch7 -p1 # 08-vnc-acl-mgmt %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -135,19 +149,43 @@ } if build_id_available; then - extraldflags="--extra-ldflags=-Wl,--build-id" + extraldflags="-Wl,--build-id"; buildldflags="VL_LDFLAGS=-Wl,--build-id" else extraldflags="" buildldflags="" fi +%ifarch %{ix86} x86_64 +# build kvm +echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease +./configure --with-patched-kernel --target-list=x86_64-softmmu \ + --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ + --qemu-ldflags=$extraldflags + +make %{?_smp_mflags} $buildldflags +cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm +make clean +%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 \ + 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 \ - $extraldflags; -make %{?_smp_mflags} $buildldflags + --kerneldir=$(pwd)/../kernel --prefix=%{_prefix} \ + --disable-kvm \ + --extra-ldflags=$extraldflags +make %{?_smp_mflags} $buildldflags %install rm -rf $RPM_BUILD_ROOT @@ -160,7 +198,14 @@ datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* +%ifarch %{ix86} x86_64 +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules +install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +%endif + +cd qemu install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu +install -D -p -m 0755 ../qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ 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 @@ -188,6 +233,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post system-x86 +%ifarch %{ix86} +# load kvm modules now, so we can make sure no reboot is needed. +# If there's already a kvm module installed, we don't mess with it +sh /%{_sysconfdir}/sysconfig/modules/kvm.modules +%endif + %post /sbin/chkconfig --add qemu @@ -245,6 +297,10 @@ %defattr(-,root,root) %{_bindir}/qemu %{_bindir}/qemu-system-x86_64 +%ifarch %{ix86} x86_64 +%{_bindir}/qemu-kvm +%{_sysconfdir}/sysconfig/modules/kvm.modules +%endif %{_prefix}/share/qemu/bios.bin %{_prefix}/share/qemu/vgabios.bin %{_prefix}/share/qemu/vgabios-cirrus.bin @@ -284,6 +340,12 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 Mar 2009 20:23:54 -0000 1.10 +++ sources 3 Mar 2009 23:57:07 -0000 1.11 @@ -1 +1 @@ -8394aa871af278efcdec46c37f913533 qemu-1.0.tar.gz +b81c0982015b21e01fe93a1d9405def8 kvm-84.git-snapshot-20090303.tar.gz From glommer at fedoraproject.org Wed Mar 4 00:12:27 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 00:12:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel kvm.modules, NONE, 1.1 qemu.spec, 1.52, 1.53 Message-ID: <20090304001227.5B85370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2698 Modified Files: qemu.spec Added Files: kvm.modules Log Message: add kvm.modules to cvs --- NEW FILE kvm.modules --- #!/bin/sh if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then modprobe kvm-intel >/dev/null 2>&1 fi if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then modprobe kvm-amd >/dev/null 2>&1 fi Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- qemu.spec 3 Mar 2009 23:57:07 -0000 1.52 +++ qemu.spec 4 Mar 2009 00:11:57 -0000 1.53 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.1.kvm20090303git%{?dist} +Release: 0.2.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 1 @@ -340,6 +340,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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) From glommer at fedoraproject.org Wed Mar 4 01:17:41 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 01:17:41 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.53,1.54 Message-ID: <20090304011741.1D46770116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11660 Modified Files: qemu.spec Log Message: only execute post scripts for user package. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- qemu.spec 4 Mar 2009 00:11:57 -0000 1.53 +++ qemu.spec 4 Mar 2009 01:17:10 -0000 1.54 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.2.kvm20090303git%{?dist} +Release: 0.3.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 1 @@ -240,16 +240,16 @@ sh /%{_sysconfdir}/sysconfig/modules/kvm.modules %endif -%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 @@ -340,6 +340,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Tue Mar 03 2009 Glauber Costa - 0.10-0.3.kvm20090303git +- only execute post scripts for user package. + * Tue Mar 03 2009 Glauber Costa - 0.10-0.2.kvm20090303git - put kvm.modules into cvs From crobinso at fedoraproject.org Wed Mar 4 01:41:45 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 01:41:45 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel .cvsignore, 1.16, 1.17 python-virtinst.spec, 1.54, 1.55 sources, 1.16, 1.17 virtinst-0.400.1-fedora11-ostype.patch, 1.1, NONE virtinst-0.400.1-fix-extra-args.patch, 1.1, NONE Message-ID: <20090304014145.71B1D70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15578 Modified Files: .cvsignore python-virtinst.spec sources Removed Files: virtinst-0.400.1-fedora11-ostype.patch virtinst-0.400.1-fix-extra-args.patch Log Message: Update to upstream 0.400.2: virt-install --import option for creating a guest from an existing disk virt-install --host-device option for host device passthrough virt-clone --original-xml for cloning from an xml file virt-install --nonetworks option. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 27 Jan 2009 00:49:30 -0000 1.16 +++ .cvsignore 4 Mar 2009 01:41:14 -0000 1.17 @@ -1 +1 @@ -virtinst-0.400.1.tar.gz +virtinst-0.400.2.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- python-virtinst.spec 27 Feb 2009 11:49:10 -0000 1.54 +++ python-virtinst.spec 4 Mar 2009 01:41:14 -0000 1.55 @@ -10,11 +10,9 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.1 -Release: 3%{_extra_release} +Version: 0.400.2 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-fix-extra-args.patch -Patch2: %{appname}-%{version}-fedora11-ostype.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,11 +27,8 @@ Requires: urlgrabber Requires: libxml2-python Requires: python-urlgrabber -BuildRequires: python-devel -BuildRequires: libxml2-python -BuildRequires: python-urlgrabber -BuildRequires: libvirt-python BuildRequires: gettext +BuildRequires: python-devel %description virtinst is a module that helps build and install libvirt based virtual @@ -43,8 +38,6 @@ %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -78,6 +71,13 @@ %{_bindir}/virt-convert %changelog +* Tue Mar 3 2009 Cole Robinson - 0.400.2-1.fc11 +- Update to version 0.400.2 +- virt-install --import option for creating a guest from an existing disk +- virt-install --host-device option for host device passthrough +- virt-clone --original-xml for cloning from an xml file +- virt-install --nonetworks option. + * Fri Feb 27 2009 Daniel P. Berrange - 0.400.1-3.fc11 - Add Fedora 11 OS type with USB tablet (rhbz #487028) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 27 Jan 2009 00:49:30 -0000 1.16 +++ sources 4 Mar 2009 01:41:14 -0000 1.17 @@ -1 +1 @@ -f7fa786880929ed98e28982fa8ec5343 virtinst-0.400.1.tar.gz +4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz --- virtinst-0.400.1-fedora11-ostype.patch DELETED --- --- virtinst-0.400.1-fix-extra-args.patch DELETED --- From glommer at fedoraproject.org Wed Mar 4 02:07:02 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 02:07:02 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.54,1.55 Message-ID: <20090304020702.B5ECD70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19883 Modified Files: qemu.spec Log Message: added kvm debugging tools Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- qemu.spec 4 Mar 2009 01:17:10 -0000 1.54 +++ qemu.spec 4 Mar 2009 02:06:32 -0000 1.55 @@ -118,6 +118,16 @@ %qemupkgdesc system-m68k {system emulator for m68k} %qemupkgdesc system-sh4 {system emulator for sh4} +%ifarch %{ix86} x86_64 +%package kvm-tools +Summary: KVM debugging and diagnostics tools +Group: Development/Tools + +%description kvm-tools +This package contains some diagnostics and debugging tools for KVM, +such as kvmtrace and kvm_stat. +%endif + %prep %setup -q -n kvm-84.git-snapshot-20090303 # 01-tls-handshake-fix @@ -165,6 +175,8 @@ make %{?_smp_mflags} $buildldflags cp qemu/x86_64-softmmu/qemu-system-x86_64 qemu-kvm +cp user/kvmtrace . +cp user/kvmtrace_format . make clean %endif @@ -201,6 +213,9 @@ %ifarch %{ix86} x86_64 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules +install -m 0755 kvmtrace %{buildroot}/%{_bindir}/ +install -m 0755 kvmtrace_format %{buildroot}/%{_bindir}/ +install -m 0755 kvm_stat %{buildroot}/%{_bindir}/ %endif cd qemu @@ -297,13 +312,18 @@ %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 %ifarch %{ix86} x86_64 %{_bindir}/qemu-kvm %{_sysconfdir}/sysconfig/modules/kvm.modules +%files kvm-tools +%defattr(-,root,root,-) +%{_bindir}/kvmtrace +%{_bindir}/kvmtrace_format +%{_bindir}/kvm_stat %endif -%{_prefix}/share/qemu/bios.bin -%{_prefix}/share/qemu/vgabios.bin -%{_prefix}/share/qemu/vgabios-cirrus.bin %files system-sparc %defattr(-,root,root) %{_bindir}/qemu-system-sparc @@ -342,6 +362,7 @@ %changelog * 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 From glommer at fedoraproject.org Wed Mar 4 02:30:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 02:30:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel kvm.spec,1.89,1.90 Message-ID: <20090304023059.2767B70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025 Modified Files: kvm.spec Log Message: use source from qemu package. use this a a meta package to make migration work properly Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- kvm.spec 25 Feb 2009 12:15:36 -0000 1.89 +++ kvm.spec 4 Mar 2009 02:30:28 -0000 1.90 @@ -1,40 +1,25 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 84 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net -Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +#Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz #Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz -Source1: %{name}.modules -Patch0: %{name}-62-block-rw-range-check.patch -Patch1: %{name}-83-compile-fixes.patch +#Source1: %{name}.modules +#Patch0: %{name}-62-block-rw-range-check.patch +#Patch1: %{name}-83-compile-fixes.patch # patches from upstream qemu BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel -# to build the bios -BuildRequires: dev86 -BuildRequires: iasl -BuildRequires: zlib-devel -# to check for binary blobs -BuildRequires: file -# TLS / x509 auth in VNC server -BuildRequires: gnutls-devel -# for the docs -BuildRequires: texi2html -BuildRequires: rsync # kvm kernel side is only x86/x86_64 as that's where the hardware is ExclusiveArch: %{ix86} x86_64 ia64 -Requires: initscripts >= 8.08-1 - -# We use the roms on /usr/share/etherboot -Requires: etherboot-roms-kvm - +Requires: qemu-system-x86 %package tools Summary: KVM debugging and diagnostics tools Group: Development/Tools +Requires: qemu-kvm-tools %description @@ -52,111 +37,10 @@ %prep -%setup -q - -%patch0 -p1 -b .block-rw-range-check -%patch1 -p1 -b .compile-fixes - -# "configure --kerneldir" looks for this -# FIXME: kvm-84 or later shouldn't need this anymore, see: -# http://git.kernel.org/?p=linux/kernel/git/marcelo/kvm-userspace.git;a=commit;h=4f45aa2db -echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease - -# we must not use any of the binaries from the qemu/pc-bios/ directory, -# as they don't have the corresponding sources shipped with them -rm -f qemu/pc-bios/*.{bin,x,dtb} qemu/pc-bios/openbios-* -find qemu/pc-bios -exec file {} \; | grep '\(data\|BIOS\|executable\)' && \ - echo "Found some binary blobs in qemu/pc-bios!" && exit 1 - %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 - qemuldflags="-Wl,--build-id"; -else - qemuldflags=""; -fi - - -# we need to install the data bits in a different path -sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure -./configure \ - --with-patched-kernel \ - --kerneldir=$(pwd)/kernel \ - --prefix=%{_prefix} \ - --qemu-ldflags=$qemuldflags \ - --disable-blobs \ - --audio-drv-list=sdl,alsa,oss -# sdl outputs to alsa or pulseaudio directly depending on what the system has configured -# 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 - -# build the bios, and fix it's makefile -sed -i 's/gcc -m32/gcc/' bios/Makefile -make bios - -make vgabios - -# we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the -# qemu bits. so let's set it for the other pieces. this requires some -# manual keeping up of what is in the kvm tree. -sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile -echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak -make %{?_smp_mflags} - - %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -# we have to have our own copies of the bios/keymaps due to incompat with -# qemu 0.9. include the man page -mv $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.1* $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/man*/qemu-img* $RPM_BUILD_ROOT/%{_docdir} -rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img -# no shared lib, static libs -rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir} - -# make install gives it bogus execute permissiions -chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1* - -install -d $RPM_BUILD_ROOT/%{_datadir}/%{name} -for i in bios.bin extboot.bin vgabios.bin vgabios-cirrus.bin -do - install -m 0644 qemu/pc-bios/$i $RPM_BUILD_ROOT/%{_datadir}/%{name}/$i -done - -mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm - -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules -install -m 0755 user/kvmtrace %{buildroot}/%{_bindir}/ -install -m 0755 user/kvmtrace_format %{buildroot}/%{_bindir}/ -install -m 0755 kvm_stat %{buildroot}/%{_bindir}/ - -# the pxe etherboot images will be symlinks to the images on -# /usr/share/etherboot, as KVM doesn't know how to look -# for other paths, yet. -pxe_link() { - ln -s ../etherboot/$2.rom %{buildroot}/usr/share/kvm/pxe-$1.bin -} - -pxe_link e1000 e1000-82542 -pxe_link ne2k_pci ne -pxe_link pcnet pcnet32 -pxe_link rtl8139 rtl8139 -pxe_link virtio virtio-net - %post -# load kvm modules now, so we can make sure no reboot is needed. -# If there's already a kvm module installed, we don't mess with it -sh /%{_sysconfdir}/sysconfig/modules/kvm.modules %clean @@ -164,39 +48,14 @@ %files -%defattr(-,root,root,-) -%{_bindir}/qemu-kvm -%{_bindir}/qemu-nbd - -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/keymaps -%{_datadir}/%{name}/keymaps/* - -%{_datadir}/%{name}/bios.bin -%{_datadir}/%{name}/extboot.bin -%{_datadir}/%{name}/pxe-e1000.bin -%{_datadir}/%{name}/pxe-ne2k_pci.bin -%{_datadir}/%{name}/pxe-pcnet.bin -%{_datadir}/%{name}/pxe-rtl8139.bin -%{_datadir}/%{name}/pxe-virtio.bin -%{_datadir}/%{name}/vgabios-cirrus.bin -%{_datadir}/%{name}/vgabios.bin - -%{_mandir}/man1/qemu-kvm.1* -%{_mandir}/man8/qemu-nbd.8* - -%{_sysconfdir}/sysconfig/modules/%{name}.modules - %files tools -%defattr(-,root,root,-) -%{_bindir}/kvmtrace -%{_bindir}/kvmtrace_format -%{_bindir}/kvm_stat - %changelog +* Tue Mar 03 2009 Glauber Costa - 84.3 +- don't do anything here and use qemu package. + * Wed Feb 25 2009 Fedora Release Engineering - 84-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From veillard at fedoraproject.org Wed Mar 4 13:34:15 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Wed, 4 Mar 2009 13:34:15 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel .cvsignore, 1.37, 1.38 libvirt.spec, 1.113, 1.114 sources, 1.38, 1.39 Message-ID: <20090304133415.A25FC70116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15966 Modified Files: .cvsignore libvirt.spec sources Log Message: Upstream release 0.6.1, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 9 Feb 2009 08:55:58 -0000 1.37 +++ .cvsignore 4 Mar 2009 13:33:45 -0000 1.38 @@ -4,3 +4,4 @@ x86_64 libvirt-*.tar.gz libvirt-0.6.0.tar.gz +libvirt-0.6.1.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- libvirt.spec 2 Mar 2009 06:07:33 -0000 1.113 +++ libvirt.spec 4 Mar 2009 13:33:45 -0000 1.114 @@ -46,16 +46,11 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.0 -Release: 6%{?dist}%{?extra_release} +Version: 0.6.1 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: %{name}-%{version}-timeout.patch -Patch2: %{name}-%{version}-rpccall.patch -Patch3: %{name}-%{version}-qemu-startup.patch -Patch4: %{name}-%{version}-dbus-threads.patch -Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -184,11 +179,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 mv NEWS NEWS.old iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS @@ -264,7 +254,10 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -f Makefile Makefile.in) +(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) +(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) +(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -462,6 +455,7 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml +%doc examples %if %{with_python} %files python @@ -477,6 +471,12 @@ %endif %changelog +* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc11 +- upstream release 0.6.1 +- support for node device detach reattach and reset +- sVirt mandatory access control support +- many bug fixes and small improvements + * Mon Mar 2 2009 Daniel Veillard - 0.6.0-6.fc11 - make sure Xen is handled in i586 new default 32bits x86 packages Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 6 Feb 2009 19:28:21 -0000 1.38 +++ sources 4 Mar 2009 13:33:45 -0000 1.39 @@ -1 +1 @@ -8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz +3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz From veillard at fedoraproject.org Wed Mar 4 15:24:56 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Wed, 4 Mar 2009 15:24:56 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-10 libvirt.spec, 1.109, 1.110 sources, 1.38, 1.39 libvirt-0.6.0-autostart-timeout.patch, 1.1, NONE libvirt-0.6.0-dbus-threads.patch, 1.1, NONE libvirt-0.6.0-qemu-startup.patch, 1.1, NONE libvirt-0.6.0-rpccall2.patch, 1.1, NONE libvirt-0.6.0-timeout.patch, 1.1, NONE Message-ID: <20090304152456.BCB1270116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2729 Modified Files: libvirt.spec sources Removed Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch libvirt-0.6.0-rpccall2.patch libvirt-0.6.0-timeout.patch Log Message: Upstream release 0.6.1, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/libvirt.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- libvirt.spec 18 Feb 2009 14:05:47 -0000 1.109 +++ libvirt.spec 4 Mar 2009 15:24:26 -0000 1.110 @@ -46,16 +46,11 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.0 -Release: 3%{?dist}%{?extra_release} +Version: 0.6.1 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: %{name}-%{version}-timeout.patch -Patch2: %{name}-%{version}-rpccall2.patch -Patch3: %{name}-%{version}-qemu-startup.patch -Patch4: %{name}-%{version}-dbus-threads.patch -Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -182,11 +177,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %if ! %{with_xen} @@ -259,7 +249,10 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -f Makefile Makefile.in) +(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) +(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) +(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -454,6 +447,7 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml +%doc examples %if %{with_python} %files python @@ -469,6 +463,12 @@ %endif %changelog +* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc10 +- upstream release 0.6.1 +- support for node device detach reattach and reset +- sVirt mandatory access control support +- many bug fixes and small improvements + * Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-3.fc10 - Fix QEMU startup timeout/race (rhbz #484649) - Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-10/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 6 Feb 2009 20:22:30 -0000 1.38 +++ sources 4 Mar 2009 15:24:26 -0000 1.39 @@ -1 +1 @@ -8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz +3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz --- libvirt-0.6.0-autostart-timeout.patch DELETED --- --- libvirt-0.6.0-dbus-threads.patch DELETED --- --- libvirt-0.6.0-qemu-startup.patch DELETED --- --- libvirt-0.6.0-rpccall2.patch DELETED --- --- libvirt-0.6.0-timeout.patch DELETED --- From crobinso at fedoraproject.org Wed Mar 4 16:25:52 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 16:25:52 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.2-update-polish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.55, 1.56 Message-ID: <20090304162552.F40AD70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13435 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-update-polish-trans.patch Log Message: Update polish translation (bz 310781) virtinst-0.400.2-update-polish-trans.patch: --- NEW FILE virtinst-0.400.2-update-polish-trans.patch --- # HG changeset patch # User Cole Robinson # Date 1236181896 18000 # Node ID 8adf5b7ab1bf036b2c9476726d4e7a0a5994ed60 # Parent ba3abd7909b8ed3d9b1798429bd257a551ff34c6 Updated polish translations. diff -r ba3abd7909b8 -r 8adf5b7ab1bf po/pl.po --- a/po/pl.po Tue Mar 03 17:59:02 2009 -0500 +++ b/po/pl.po Wed Mar 04 10:51:36 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 17:43-0500\n" -"PO-Revision-Date: 2008-09-15 22:59+0200\n" +"POT-Creation-Date: 2009-01-26 11:29-0500\n" +"PO-Revision-Date: 2009-02-06 18:20+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -14,60 +14,32 @@ "Content-Transfer-Encoding: 8bit\n" #: virtinst/CapabilitiesParser.py:168 -#, fuzzy, python-format -msgid "No domains available for virt type '%(type)s', arch %(arch)s." +msgid "No domains available for this guest." msgstr "Brak dost??pnych domen dla tego go??cia." -#: virtinst/CapabilitiesParser.py:393 -#, python-format -msgid "for arch '%s'" -msgstr "dla architektury \"%s\"" - -#: virtinst/CapabilitiesParser.py:397 -#, fuzzy, python-format -msgid "virtualization type '%s'" -msgstr "Nieobs??ugiwany typ wirtualizacji \"%s\" " - -#: virtinst/CapabilitiesParser.py:399 -#, fuzzy -msgid "any virtualization options" -msgstr "Opcje typu wirtualizacji" - -#: virtinst/CapabilitiesParser.py:401 -#, python-format -msgid "Host does not support %(virttype)s %(arch)s" -msgstr "" - -#: virtinst/CapabilitiesParser.py:414 -#, python-format -msgid "" -"Host does not support domain type '%(domain)s' for virtualization type '%" -"(virttype)s' arch '%(arch)s'" -msgstr "" - -#: virtinst/cli.py:117 +#: virtinst/cli.py:116 msgid "Exiting at user request." msgstr "Zamykanie na ????danie u??ytkownika." -#: virtinst/cli.py:122 +#: virtinst/cli.py:121 msgid "Must be root to create Xen guests" msgstr "Musisz by?? rootem, aby tworzy?? go??ci Xena" -#: virtinst/cli.py:124 +#: virtinst/cli.py:123 msgid "Could not find usable default libvirt connection." msgstr "Nie mo??na znale???? u??ywalnego domy??lnego po????czenia libvirt." -#: virtinst/cli.py:146 +#: virtinst/cli.py:145 #, python-format msgid "Force flag is set but input was required. Prompt was: %s" msgstr "Flaga wymuszenia jest ustawiona, ale pro??ba by??a wymagana. By??o to: %s" -#: virtinst/cli.py:149 +#: virtinst/cli.py:148 #, python-format msgid "Prompting disabled, but input was requested. Prompt was: %s" msgstr "Wy????czono pro??by, ale jedna by??a wymagana. By??a to: %s" -#: virtinst/cli.py:169 +#: virtinst/cli.py:168 #, python-format msgid "" "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " @@ -76,24 +48,24 @@ "Wy????czono pro??by, ale pytanie tak/nie zosta??o za????dane. Spr??buj --force, aby " "wymusi?? \"tak\" dla takich pr????b. Pro??ba to: %s" -#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 +#: virtinst/cli.py:178 virt-clone:48 virt-clone:58 virt-clone:87 msgid "ERROR: " msgstr "B????D: " -#: virtinst/cli.py:189 +#: virtinst/cli.py:188 msgid "A name is required for the virtual machine." msgstr "Nazwa maszyny wirtualnej jest wymagana." -#: virtinst/cli.py:197 +#: virtinst/cli.py:196 msgid "Memory amount is required for the virtual machine." msgstr "Ilo???? pami??ci dla maszyny wirtualnej jest wymagana." -#: virtinst/cli.py:199 +#: virtinst/cli.py:198 #, python-format msgid "Installs currently require %d megs of RAM." msgstr "Instalacja obecnie wymaga %d megabajt??w RAM-u." -#: virtinst/cli.py:219 +#: virtinst/cli.py:218 #, python-format msgid "" "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " @@ -104,211 +76,294 @@ "fizycznych (%d) na ho??cie. To b??dzie dzia??a??o, ale wydajno???? b??dzie s??aba. " "Jeste?? pewny? (\"yes\" lub \"no\")" -#: virtinst/cli.py:276 +#: virtinst/cli.py:275 msgid "Unknown network type " msgstr "Nieznany typ sieci " -#: virtinst/cli.py:293 +#: virtinst/cli.py:292 msgid "Cannot mix both --bridge and --network arguments" -msgstr "Nie mo??na miesza?? argument??w --bridge i --network" +msgstr "Nie mo??na miesza?? parametr??w --bridge i --network" -#: virtinst/cli.py:310 +#: virtinst/cli.py:309 msgid "Need to pass equal numbers of networks & mac addresses" msgstr "Nale??y poda?? r??wn?? liczb?? sieci i adres??w MAC" -#: virtinst/cli.py:332 +#: virtinst/cli.py:331 msgid "Can't specify more than one of VNC, SDL, or --nographics" msgstr "Nie mo??na poda?? wi??cej ni?? jedno z VNC, SDL lub --nographics" -#: virtinst/cli.py:376 virtinst/cli.py:381 virt-install:319 virt-install:324 +#: virtinst/cli.py:366 virtinst/cli.py:371 virt-install:301 virt-install:306 #, python-format msgid "%s option requires an argument" -msgstr "Opcja %s wymaga argumentu" +msgstr "Opcja %s wymaga parametru" -#: virtinst/CloneManager.py:54 -#, fuzzy -msgid "Connection must be a 'virConnect' instance." -msgstr "\"conn\" musi by?? virConnect." +#: virtinst/CloneManager.py:88 +msgid "Name or UUID of guest to clone is required" +msgstr "Nazwa lub UUID go??cia do sklonowania jest wymagana" -#: virtinst/CloneManager.py:102 -#, fuzzy -msgid "Original xml must be a string." -msgstr "Wariant systemu operacyjnego musi by?? ??a??cuchem." +#: virtinst/CloneManager.py:97 +msgid "A valid name or UUID of guest to clone is required" +msgstr "Prawid??owa nazwa lub UUID go??cia do sklonowania jest wymagana" -#: virtinst/CloneManager.py:114 +#: virtinst/CloneManager.py:107 #, python-format msgid "Invalid name for new guest: %s" msgstr "Nieprawid??owa nazwa nowego go??cia: %s" -#: virtinst/CloneManager.py:119 -#, fuzzy, python-format -msgid "Domain name '%s' already in use." -msgstr "Domena o nazwie %s ju?? istnieje!" - -#: virtinst/CloneManager.py:131 +#: virtinst/CloneManager.py:115 #, python-format msgid "Invalid uuid for new guest: %s" msgstr "Nieprawid??owy UUID nowego go??cia: %s" -#: virtinst/CloneManager.py:134 -#, fuzzy, python-format -msgid "UUID '%s' is in use by another guest." -msgstr "Dysk %s jest ju?? u??ywany przez innego go??cia!\n" +#: virtinst/CloneManager.py:125 +msgid "New file to use for disk image is required" +msgstr "Nowy plik do u??ycia obrazu dysku jest wymagany" -#: virtinst/CloneManager.py:149 -#, fuzzy, python-format -msgid "Could not use path '%s' for cloning: %s" -msgstr "Nie mo??na uruchomi?? puli pami??ci masowej: %s" +#: virtinst/CloneManager.py:207 +#, python-format +msgid "Domain %s is not found" [...2269 lines suppressed...] + +#: virt-install:656 +msgid "Domain installation still in progress. Waiting" +msgstr "Trwa instalacja domeny. Oczekiwanie" + +#: virt-install:663 +msgid "Domain has shutdown. Continuing." +msgstr "Domena zosta??a wy????czona. Kontynuowanie." + +#: virt-install:670 +#, python-format +msgid "Could not lookup domain after install: %s" +msgstr "Nie mo??na wyszuka?? domeny po instalacji: %s" + +#: virt-install:676 +msgid "Installation has exceeded specified timelimit. Exiting application." +msgstr "" +"Instalacja przekroczy??a podane ograniczenie czasu. Zamykanie aplikacji." + +#: virt-install:680 +msgid "" +"Domain installation still in progress. You can reconnect to \n" +"the console to complete the installation process." +msgstr "" +"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" +"konsol??, aby zako??czy?? proces instalacji." + +#: virt-install:688 #, python-format msgid "" "Domain installation does not appear to have been\n" @@ -1949,16 +1783,11 @@ "Instalacja go??cia zosta??a zako??czona... Mo??na ponownie uruchomi?? domen?? " "wykonuj??c \"virsh start %s\"" -#: virt-install:696 +#: virt-install:695 msgid "Guest installation complete... restarting guest." msgstr "Instalacja go??cia zosta??a zako??czona... Ponowne uruchamianie go??cia." -#: virt-install:702 -#, fuzzy -msgid "Guest install interrupted." -msgstr "Instalacja go??cia nie powiod??a si??" - -#: virt-install:709 +#: virt-install:704 #, python-format msgid "" "Domain installation may not have been\n" @@ -1970,149 +1799,3 @@ " powiod??a si??, mo??esz ponownie uruchomi?? domen??\n" " uruchamiaj??c \"virsh start %s\"; w innym przypadku\n" " uruchom ponownie instalacj??." - -#: virt-install:735 -#, fuzzy -msgid "Guest installation failed." -msgstr "Instalacja go??cia nie powiod??a si??" - -#: virt-install:745 -#, fuzzy, python-format -msgid "%d minutes " -msgstr " %d minut" - -#: virt-install:747 -#, fuzzy, python-format -msgid "" -"Domain installation still in progress. Waiting %sfor domain to complete " -"installation." -msgstr "" -"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" -"konsol??, aby zako??czy?? proces instalacji." - -#: virt-install:753 -msgid "Domain has shutdown. Continuing." -msgstr "Domena zosta??a wy????czona. Kontynuowanie." - -#: virt-install:760 -#, fuzzy, python-format -msgid "Could not lookup domain after install: %s" -msgstr "Nie mo??na wyszuka?? obiektu woluminu: %s" - -#: virt-install:767 -#, fuzzy -msgid "Installation has exceeded specified time limit. Exiting application." -msgstr "Instalacja przekroczy??a podane ograniczenie czasu. Przerywanie." - -#: virt-install:771 -msgid "" -"Domain installation still in progress. You can reconnect to \n" -"the console to complete the installation process." -msgstr "" -"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" -"konsol??, aby zako??czy?? proces instalacji." - -#~ msgid "Name or UUID of guest to clone is required" -#~ msgstr "Nazwa lub UUID go??cia do sklonowania jest wymagana" - -#~ msgid "A valid name or UUID of guest to clone is required" -#~ msgstr "Prawid??owa nazwa lub UUID go??cia do sklonowania jest wymagana" - -#~ msgid "New file to use for disk image is required" -#~ msgstr "Nowy plik do u??ycia obrazu dysku jest wymagany" - -#~ msgid "Domain status must be SHUTOFF" -#~ msgstr "Stan domeny musi by?? SHUTOFF" - -#~ msgid "Domain %s already exists" -#~ msgstr "Domena %s ju?? istnieje" - -#, fuzzy -#~ msgid "Cloning from %(src)s to %(dst)s..." -#~ msgstr "klonowanie z %(src)s do %(dst)s" - -#~ msgid "Invalid file location given: " -#~ msgstr "Podano nieprawid??owe po??o??enie pliku: " - -#, fuzzy -#~ msgid "Invalid file location given: %s: %s" -#~ msgstr "Podano nieprawid??owe po??o??enie pliku: " - -#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD" -#~ msgstr "" -#~ "Po????czenie nie obs??uguje wirtualizacji HVM; nie mo??na uruchomi?? Live CD" - -#~ msgid "Storage object name must be a string " -#~ msgstr "Obiekt pami??ci masowej musi by?? ??a??cuchem " - -#~ msgid "Storage object name can not be only " -#~ msgstr "Nazwa obiektu pami??ci masowej nie mo??e by?? tylko " - -#~ msgid "Storage object name can only contain " -#~ msgstr "Nazwa obiektu pami??ci masowej mo??e zawiera?? tylko " - -#~ msgid "'%s' is not managed on remote host: %s" -#~ msgstr "\"%s\" nie jest zarz??dzane na zdalnym ho??cie: %s" - -#~ msgid "Cannot parse capabilities" -#~ msgstr "Nie mo??na przeanalizowa?? mo??liwo??ci" - -#~ msgid "Only one of --pxe, --location and --cdrom can be used" -#~ msgstr "Tylko jedno z --pxe, --location i --cdrom mo??e zosta?? u??yte" - -#~ msgid "location must be specified for paravirtualized guests." -#~ msgstr "po??o??enie dla go??ci parawirtualizowanych musi zosta?? podane." - -#~ msgid "Domain installation still in progress. Waiting" -#~ msgstr "Trwa instalacja domeny. Oczekiwanie" - -#~ msgid "" -#~ "UUID for the guest; if none is given a random UUID will be generated. If " -#~ "you specify UUID, you should use a 32-digit hexadecimal number." -#~ msgstr "" -#~ "UUID go??cia; je??li ??aden nie zostanie podany, zostanie utworzony losowy " -#~ "UUID. Je??li podasz UUID, powiniene?? u??y?? 32 znakowej liczby szesnastkowej." - -#~ msgid "" -#~ "Total time to wait for VM to shutdown if console not present. Time less " -#~ "than 0 waits indefinitely." -#~ msgstr "" -#~ "Ca??kowity czas oczekiwania na wy????czenie maszyny wirtualnej, je??li " -#~ "konsola nie jest obecna. Czas poni??ej zera oznacza oczekiwanie w " -#~ "niesko??czono????." - -#~ msgid "The image name and version must be present" -#~ msgstr "Nazwa obrazu i wersja musz?? by?? obecne" - -#~ msgid "Scratch disk %s does not have a size attribute" -#~ msgstr "Dysk tymczasowy %s nie posiada atrybutu rozmiaru" - -#~ msgid "Disk file %s could not be found" -#~ msgstr "Nie mo??na znale???? pliku dysku %s" - -#~ msgid "Writing %s" -#~ msgstr "Zapisywanie %s" - -#~ msgid "Directory in which packaged file will be put" -#~ msgstr "Folder, w kt??rym spakowany plik zostanie umieszczony" - -#~ msgid "The image descriptor must contain name and version" -#~ msgstr "Deskryptor obrazu musi zawiera?? nazw?? i wersj??" - -#~ msgid "Validation failed: %s" -#~ msgstr "Sprawdzenie nie powiod??o si??: %s" - -#~ msgid "Packaging failed: %s" -#~ msgstr "Spakowanie nie powiod??o si??: %s" - -#~ msgid "Cloning domain..." -#~ msgstr "Klonowanie domeny..." - -#~ msgid "NFS installations are only supported as root" -#~ msgstr "Instalacje NFS s?? obs??ugiwane tylko przez roota" - -#~ msgid "Verifying install location..." -#~ msgstr "Sprawdzanie po??o??enia instalacji..." - -#~ msgid "Unsupported virtualization type" -#~ msgstr "Nieobs??ugiwany typ wirtualizacji" Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- python-virtinst.spec 4 Mar 2009 01:41:14 -0000 1.55 +++ python-virtinst.spec 4 Mar 2009 16:25:22 -0000 1.56 @@ -13,6 +13,7 @@ Version: 0.400.2 Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz +Patch1: %{appname}-%{version}-update-polish-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +39,7 @@ %prep %setup -q -n %{appname}-%{version} +%patch1 -p1 %build python setup.py build @@ -71,6 +73,9 @@ %{_bindir}/virt-convert %changelog +* Wed Mar 4 2009 Cole Robinson - 0.400.2-2.fc11 +- Update polish translation (bz 310781) + * Tue Mar 3 2009 Cole Robinson - 0.400.2-1.fc11 - Update to version 0.400.2 - virt-install --import option for creating a guest from an existing disk From crobinso at fedoraproject.org Wed Mar 4 16:27:06 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 16:27:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel python-virtinst.spec, 1.56, 1.57 Message-ID: <20090304162706.A974570116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13715 Modified Files: python-virtinst.spec Log Message: Bump spec. Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- python-virtinst.spec 4 Mar 2009 16:25:22 -0000 1.56 +++ python-virtinst.spec 4 Mar 2009 16:26:36 -0000 1.57 @@ -11,7 +11,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch License: GPLv2+ From crobinso at fedoraproject.org Wed Mar 4 16:29:02 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 16:29:02 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-10 virtinst-0.400.2-update-polish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.50, 1.51 sources, 1.15, 1.16 virtinst-0.400.0-bridge-network-collision.patch, 1.1, NONE virtinst-0.400.0-disk-pool-fixes.patch, 1.1, NONE virtinst-0.400.0-fedora11-ostype.patch, 1.1, NONE virtinst-0.400.0-fix-translated-help.patch, 1.1, NONE virtinst-0.400.0-log-fail-traceback.patch, 1.1, NONE virtinst-0.400.0-missing-variable.patch, 1.1, NONE virtinst-0.400.0-qemu-conn-check.patch, 1.1, NONE virtinst-0.400.0-refresh-storage-pool.patch, 1.1, NONE virtinst-0.400.0-undo-pxe-virtio.patch, 1.1, NONE virtinst-0.400.0-update-translations.patch, 1.1, NONE virtinst-0.400.0-virt-convert-dict.patch, 1.1, NONE virtinst-0.400.0-virtio-f9.patch, 1.1, NONE virtinst-0.400.0-win64-entry.patch, 1.1, NONE Message-ID: <20090304162902.7888C70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14219 Modified Files: python-virtinst.spec sources Added Files: virtinst-0.400.2-update-polish-trans.patch Removed Files: virtinst-0.400.0-bridge-network-collision.patch virtinst-0.400.0-disk-pool-fixes.patch virtinst-0.400.0-fedora11-ostype.patch virtinst-0.400.0-fix-translated-help.patch virtinst-0.400.0-log-fail-traceback.patch virtinst-0.400.0-missing-variable.patch virtinst-0.400.0-qemu-conn-check.patch virtinst-0.400.0-refresh-storage-pool.patch virtinst-0.400.0-undo-pxe-virtio.patch virtinst-0.400.0-update-translations.patch virtinst-0.400.0-virt-convert-dict.patch virtinst-0.400.0-virtio-f9.patch virtinst-0.400.0-win64-entry.patch Log Message: Update to version 0.400.2 virt-install --import option for creating a guest from an existing disk virt-install --host-device option for host device passthrough virt-clone --original-xml for cloning from an xml file virt-install --nonetworks option. virtinst-0.400.2-update-polish-trans.patch: --- NEW FILE virtinst-0.400.2-update-polish-trans.patch --- # HG changeset patch # User Cole Robinson # Date 1236181896 18000 # Node ID 8adf5b7ab1bf036b2c9476726d4e7a0a5994ed60 # Parent ba3abd7909b8ed3d9b1798429bd257a551ff34c6 Updated polish translations. diff -r ba3abd7909b8 -r 8adf5b7ab1bf po/pl.po --- a/po/pl.po Tue Mar 03 17:59:02 2009 -0500 +++ b/po/pl.po Wed Mar 04 10:51:36 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 17:43-0500\n" -"PO-Revision-Date: 2008-09-15 22:59+0200\n" +"POT-Creation-Date: 2009-01-26 11:29-0500\n" +"PO-Revision-Date: 2009-02-06 18:20+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -14,60 +14,32 @@ "Content-Transfer-Encoding: 8bit\n" #: virtinst/CapabilitiesParser.py:168 -#, fuzzy, python-format -msgid "No domains available for virt type '%(type)s', arch %(arch)s." +msgid "No domains available for this guest." msgstr "Brak dost??pnych domen dla tego go??cia." -#: virtinst/CapabilitiesParser.py:393 -#, python-format -msgid "for arch '%s'" -msgstr "dla architektury \"%s\"" - -#: virtinst/CapabilitiesParser.py:397 -#, fuzzy, python-format -msgid "virtualization type '%s'" -msgstr "Nieobs??ugiwany typ wirtualizacji \"%s\" " - -#: virtinst/CapabilitiesParser.py:399 -#, fuzzy -msgid "any virtualization options" -msgstr "Opcje typu wirtualizacji" - -#: virtinst/CapabilitiesParser.py:401 -#, python-format -msgid "Host does not support %(virttype)s %(arch)s" -msgstr "" - -#: virtinst/CapabilitiesParser.py:414 -#, python-format -msgid "" -"Host does not support domain type '%(domain)s' for virtualization type '%" -"(virttype)s' arch '%(arch)s'" -msgstr "" - -#: virtinst/cli.py:117 +#: virtinst/cli.py:116 msgid "Exiting at user request." msgstr "Zamykanie na ????danie u??ytkownika." -#: virtinst/cli.py:122 +#: virtinst/cli.py:121 msgid "Must be root to create Xen guests" msgstr "Musisz by?? rootem, aby tworzy?? go??ci Xena" -#: virtinst/cli.py:124 +#: virtinst/cli.py:123 msgid "Could not find usable default libvirt connection." msgstr "Nie mo??na znale???? u??ywalnego domy??lnego po????czenia libvirt." -#: virtinst/cli.py:146 +#: virtinst/cli.py:145 #, python-format msgid "Force flag is set but input was required. Prompt was: %s" msgstr "Flaga wymuszenia jest ustawiona, ale pro??ba by??a wymagana. By??o to: %s" -#: virtinst/cli.py:149 +#: virtinst/cli.py:148 #, python-format msgid "Prompting disabled, but input was requested. Prompt was: %s" msgstr "Wy????czono pro??by, ale jedna by??a wymagana. By??a to: %s" -#: virtinst/cli.py:169 +#: virtinst/cli.py:168 #, python-format msgid "" "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " @@ -76,24 +48,24 @@ "Wy????czono pro??by, ale pytanie tak/nie zosta??o za????dane. Spr??buj --force, aby " "wymusi?? \"tak\" dla takich pr????b. Pro??ba to: %s" -#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 +#: virtinst/cli.py:178 virt-clone:48 virt-clone:58 virt-clone:87 msgid "ERROR: " msgstr "B????D: " -#: virtinst/cli.py:189 +#: virtinst/cli.py:188 msgid "A name is required for the virtual machine." msgstr "Nazwa maszyny wirtualnej jest wymagana." -#: virtinst/cli.py:197 +#: virtinst/cli.py:196 msgid "Memory amount is required for the virtual machine." msgstr "Ilo???? pami??ci dla maszyny wirtualnej jest wymagana." -#: virtinst/cli.py:199 +#: virtinst/cli.py:198 #, python-format msgid "Installs currently require %d megs of RAM." msgstr "Instalacja obecnie wymaga %d megabajt??w RAM-u." -#: virtinst/cli.py:219 +#: virtinst/cli.py:218 #, python-format msgid "" "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " @@ -104,211 +76,294 @@ "fizycznych (%d) na ho??cie. To b??dzie dzia??a??o, ale wydajno???? b??dzie s??aba. " "Jeste?? pewny? (\"yes\" lub \"no\")" -#: virtinst/cli.py:276 +#: virtinst/cli.py:275 msgid "Unknown network type " msgstr "Nieznany typ sieci " -#: virtinst/cli.py:293 +#: virtinst/cli.py:292 msgid "Cannot mix both --bridge and --network arguments" -msgstr "Nie mo??na miesza?? argument??w --bridge i --network" +msgstr "Nie mo??na miesza?? parametr??w --bridge i --network" -#: virtinst/cli.py:310 +#: virtinst/cli.py:309 msgid "Need to pass equal numbers of networks & mac addresses" msgstr "Nale??y poda?? r??wn?? liczb?? sieci i adres??w MAC" -#: virtinst/cli.py:332 +#: virtinst/cli.py:331 msgid "Can't specify more than one of VNC, SDL, or --nographics" msgstr "Nie mo??na poda?? wi??cej ni?? jedno z VNC, SDL lub --nographics" -#: virtinst/cli.py:376 virtinst/cli.py:381 virt-install:319 virt-install:324 +#: virtinst/cli.py:366 virtinst/cli.py:371 virt-install:301 virt-install:306 #, python-format msgid "%s option requires an argument" -msgstr "Opcja %s wymaga argumentu" +msgstr "Opcja %s wymaga parametru" -#: virtinst/CloneManager.py:54 -#, fuzzy -msgid "Connection must be a 'virConnect' instance." -msgstr "\"conn\" musi by?? virConnect." +#: virtinst/CloneManager.py:88 +msgid "Name or UUID of guest to clone is required" +msgstr "Nazwa lub UUID go??cia do sklonowania jest wymagana" -#: virtinst/CloneManager.py:102 -#, fuzzy -msgid "Original xml must be a string." -msgstr "Wariant systemu operacyjnego musi by?? ??a??cuchem." +#: virtinst/CloneManager.py:97 +msgid "A valid name or UUID of guest to clone is required" +msgstr "Prawid??owa nazwa lub UUID go??cia do sklonowania jest wymagana" -#: virtinst/CloneManager.py:114 +#: virtinst/CloneManager.py:107 #, python-format msgid "Invalid name for new guest: %s" msgstr "Nieprawid??owa nazwa nowego go??cia: %s" -#: virtinst/CloneManager.py:119 -#, fuzzy, python-format -msgid "Domain name '%s' already in use." -msgstr "Domena o nazwie %s ju?? istnieje!" - -#: virtinst/CloneManager.py:131 +#: virtinst/CloneManager.py:115 #, python-format msgid "Invalid uuid for new guest: %s" msgstr "Nieprawid??owy UUID nowego go??cia: %s" -#: virtinst/CloneManager.py:134 -#, fuzzy, python-format -msgid "UUID '%s' is in use by another guest." -msgstr "Dysk %s jest ju?? u??ywany przez innego go??cia!\n" +#: virtinst/CloneManager.py:125 +msgid "New file to use for disk image is required" +msgstr "Nowy plik do u??ycia obrazu dysku jest wymagany" -#: virtinst/CloneManager.py:149 -#, fuzzy, python-format -msgid "Could not use path '%s' for cloning: %s" -msgstr "Nie mo??na uruchomi?? puli pami??ci masowej: %s" +#: virtinst/CloneManager.py:207 +#, python-format +msgid "Domain %s is not found" [...2269 lines suppressed...] + +#: virt-install:656 +msgid "Domain installation still in progress. Waiting" +msgstr "Trwa instalacja domeny. Oczekiwanie" + +#: virt-install:663 +msgid "Domain has shutdown. Continuing." +msgstr "Domena zosta??a wy????czona. Kontynuowanie." + +#: virt-install:670 +#, python-format +msgid "Could not lookup domain after install: %s" +msgstr "Nie mo??na wyszuka?? domeny po instalacji: %s" + +#: virt-install:676 +msgid "Installation has exceeded specified timelimit. Exiting application." +msgstr "" +"Instalacja przekroczy??a podane ograniczenie czasu. Zamykanie aplikacji." + +#: virt-install:680 +msgid "" +"Domain installation still in progress. You can reconnect to \n" +"the console to complete the installation process." +msgstr "" +"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" +"konsol??, aby zako??czy?? proces instalacji." + +#: virt-install:688 #, python-format msgid "" "Domain installation does not appear to have been\n" @@ -1949,16 +1783,11 @@ "Instalacja go??cia zosta??a zako??czona... Mo??na ponownie uruchomi?? domen?? " "wykonuj??c \"virsh start %s\"" -#: virt-install:696 +#: virt-install:695 msgid "Guest installation complete... restarting guest." msgstr "Instalacja go??cia zosta??a zako??czona... Ponowne uruchamianie go??cia." -#: virt-install:702 -#, fuzzy -msgid "Guest install interrupted." -msgstr "Instalacja go??cia nie powiod??a si??" - -#: virt-install:709 +#: virt-install:704 #, python-format msgid "" "Domain installation may not have been\n" @@ -1970,149 +1799,3 @@ " powiod??a si??, mo??esz ponownie uruchomi?? domen??\n" " uruchamiaj??c \"virsh start %s\"; w innym przypadku\n" " uruchom ponownie instalacj??." - -#: virt-install:735 -#, fuzzy -msgid "Guest installation failed." -msgstr "Instalacja go??cia nie powiod??a si??" - -#: virt-install:745 -#, fuzzy, python-format -msgid "%d minutes " -msgstr " %d minut" - -#: virt-install:747 -#, fuzzy, python-format -msgid "" -"Domain installation still in progress. Waiting %sfor domain to complete " -"installation." -msgstr "" -"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" -"konsol??, aby zako??czy?? proces instalacji." - -#: virt-install:753 -msgid "Domain has shutdown. Continuing." -msgstr "Domena zosta??a wy????czona. Kontynuowanie." - -#: virt-install:760 -#, fuzzy, python-format -msgid "Could not lookup domain after install: %s" -msgstr "Nie mo??na wyszuka?? obiektu woluminu: %s" - -#: virt-install:767 -#, fuzzy -msgid "Installation has exceeded specified time limit. Exiting application." -msgstr "Instalacja przekroczy??a podane ograniczenie czasu. Przerywanie." - -#: virt-install:771 -msgid "" -"Domain installation still in progress. You can reconnect to \n" -"the console to complete the installation process." -msgstr "" -"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" -"konsol??, aby zako??czy?? proces instalacji." - -#~ msgid "Name or UUID of guest to clone is required" -#~ msgstr "Nazwa lub UUID go??cia do sklonowania jest wymagana" - -#~ msgid "A valid name or UUID of guest to clone is required" -#~ msgstr "Prawid??owa nazwa lub UUID go??cia do sklonowania jest wymagana" - -#~ msgid "New file to use for disk image is required" -#~ msgstr "Nowy plik do u??ycia obrazu dysku jest wymagany" - -#~ msgid "Domain status must be SHUTOFF" -#~ msgstr "Stan domeny musi by?? SHUTOFF" - -#~ msgid "Domain %s already exists" -#~ msgstr "Domena %s ju?? istnieje" - -#, fuzzy -#~ msgid "Cloning from %(src)s to %(dst)s..." -#~ msgstr "klonowanie z %(src)s do %(dst)s" - -#~ msgid "Invalid file location given: " -#~ msgstr "Podano nieprawid??owe po??o??enie pliku: " - -#, fuzzy -#~ msgid "Invalid file location given: %s: %s" -#~ msgstr "Podano nieprawid??owe po??o??enie pliku: " - -#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD" -#~ msgstr "" -#~ "Po????czenie nie obs??uguje wirtualizacji HVM; nie mo??na uruchomi?? Live CD" - -#~ msgid "Storage object name must be a string " -#~ msgstr "Obiekt pami??ci masowej musi by?? ??a??cuchem " - -#~ msgid "Storage object name can not be only " -#~ msgstr "Nazwa obiektu pami??ci masowej nie mo??e by?? tylko " - -#~ msgid "Storage object name can only contain " -#~ msgstr "Nazwa obiektu pami??ci masowej mo??e zawiera?? tylko " - -#~ msgid "'%s' is not managed on remote host: %s" -#~ msgstr "\"%s\" nie jest zarz??dzane na zdalnym ho??cie: %s" - -#~ msgid "Cannot parse capabilities" -#~ msgstr "Nie mo??na przeanalizowa?? mo??liwo??ci" - -#~ msgid "Only one of --pxe, --location and --cdrom can be used" -#~ msgstr "Tylko jedno z --pxe, --location i --cdrom mo??e zosta?? u??yte" - -#~ msgid "location must be specified for paravirtualized guests." -#~ msgstr "po??o??enie dla go??ci parawirtualizowanych musi zosta?? podane." - -#~ msgid "Domain installation still in progress. Waiting" -#~ msgstr "Trwa instalacja domeny. Oczekiwanie" - -#~ msgid "" -#~ "UUID for the guest; if none is given a random UUID will be generated. If " -#~ "you specify UUID, you should use a 32-digit hexadecimal number." -#~ msgstr "" -#~ "UUID go??cia; je??li ??aden nie zostanie podany, zostanie utworzony losowy " -#~ "UUID. Je??li podasz UUID, powiniene?? u??y?? 32 znakowej liczby szesnastkowej." - -#~ msgid "" -#~ "Total time to wait for VM to shutdown if console not present. Time less " -#~ "than 0 waits indefinitely." -#~ msgstr "" -#~ "Ca??kowity czas oczekiwania na wy????czenie maszyny wirtualnej, je??li " -#~ "konsola nie jest obecna. Czas poni??ej zera oznacza oczekiwanie w " -#~ "niesko??czono????." - -#~ msgid "The image name and version must be present" -#~ msgstr "Nazwa obrazu i wersja musz?? by?? obecne" - -#~ msgid "Scratch disk %s does not have a size attribute" -#~ msgstr "Dysk tymczasowy %s nie posiada atrybutu rozmiaru" - -#~ msgid "Disk file %s could not be found" -#~ msgstr "Nie mo??na znale???? pliku dysku %s" - -#~ msgid "Writing %s" -#~ msgstr "Zapisywanie %s" - -#~ msgid "Directory in which packaged file will be put" -#~ msgstr "Folder, w kt??rym spakowany plik zostanie umieszczony" - -#~ msgid "The image descriptor must contain name and version" -#~ msgstr "Deskryptor obrazu musi zawiera?? nazw?? i wersj??" - -#~ msgid "Validation failed: %s" -#~ msgstr "Sprawdzenie nie powiod??o si??: %s" - -#~ msgid "Packaging failed: %s" -#~ msgstr "Spakowanie nie powiod??o si??: %s" - -#~ msgid "Cloning domain..." -#~ msgstr "Klonowanie domeny..." - -#~ msgid "NFS installations are only supported as root" -#~ msgstr "Instalacje NFS s?? obs??ugiwane tylko przez roota" - -#~ msgid "Verifying install location..." -#~ msgstr "Sprawdzanie po??o??enia instalacji..." - -#~ msgid "Unsupported virtualization type" -#~ msgstr "Nieobs??ugiwany typ wirtualizacji" Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- python-virtinst.spec 27 Feb 2009 11:55:40 -0000 1.50 +++ python-virtinst.spec 4 Mar 2009 16:28:31 -0000 1.51 @@ -10,22 +10,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.0 -Release: 6%{_extra_release} +Version: 0.400.2 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-qemu-conn-check.patch -Patch2: %{appname}-%{version}-virt-convert-dict.patch -Patch3: %{appname}-%{version}-virtio-f9.patch -Patch4: %{appname}-%{version}-log-fail-traceback.patch -Patch5: %{appname}-%{version}-bridge-network-collision.patch -Patch6: %{appname}-%{version}-refresh-storage-pool.patch -Patch7: %{appname}-%{version}-missing-variable.patch -Patch8: %{appname}-%{version}-disk-pool-fixes.patch -Patch9: %{appname}-%{version}-win64-entry.patch -Patch10: %{appname}-%{version}-update-translations.patch -Patch11: %{appname}-%{version}-undo-pxe-virtio.patch -Patch12: %{appname}-%{version}-fix-translated-help.patch -Patch13: %{appname}-%{version}-fedora11-ostype.patch +Patch1: %{appname}-%{version}-update-polish-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,9 +29,6 @@ Requires: libxml2-python Requires: python-urlgrabber BuildRequires: python-devel -BuildRequires: libxml2-python -BuildRequires: python-urlgrabber -BuildRequires: libvirt-python BuildRequires: gettext %description @@ -55,18 +40,6 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 %build python setup.py build @@ -97,10 +70,16 @@ %{_bindir}/virt-install %{_bindir}/virt-clone %{_bindir}/virt-image -%{_bindir}/virt-pack %{_bindir}/virt-convert %changelog +* Wed Mar 4 2009 Cole Robinson - 0.400.2-1.fc10 +- Update to version 0.400.2 +- virt-install --import option for creating a guest from an existing disk +- virt-install --host-device option for host device passthrough +- virt-clone --original-xml for cloning from an xml file +- virt-install --nonetworks option. + * Fri Feb 27 2009 Daniel P. Berrange - 0.400.0-6.fc10 - Add Fedora 11 OS type with USB tablet (rhbz #487028) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 10 Sep 2008 22:31:40 -0000 1.15 +++ sources 4 Mar 2009 16:28:31 -0000 1.16 @@ -1 +1 @@ -484792dfe05abc75082d44fc51b811f3 virtinst-0.400.0.tar.gz +484792dfe05abc75082d44fc51b811f3 virtinst-0.400.2.tar.gz --- virtinst-0.400.0-bridge-network-collision.patch DELETED --- --- virtinst-0.400.0-disk-pool-fixes.patch DELETED --- --- virtinst-0.400.0-fedora11-ostype.patch DELETED --- --- virtinst-0.400.0-fix-translated-help.patch DELETED --- --- virtinst-0.400.0-log-fail-traceback.patch DELETED --- --- virtinst-0.400.0-missing-variable.patch DELETED --- --- virtinst-0.400.0-qemu-conn-check.patch DELETED --- --- virtinst-0.400.0-refresh-storage-pool.patch DELETED --- --- virtinst-0.400.0-undo-pxe-virtio.patch DELETED --- --- virtinst-0.400.0-update-translations.patch DELETED --- --- virtinst-0.400.0-virt-convert-dict.patch DELETED --- --- virtinst-0.400.0-virtio-f9.patch DELETED --- --- virtinst-0.400.0-win64-entry.patch DELETED --- From crobinso at fedoraproject.org Wed Mar 4 16:33:48 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 16:33:48 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-10 .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 Message-ID: <20090304163348.228E770116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15271 Modified Files: .cvsignore sources Log Message: Push new source tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 10 Sep 2008 22:31:40 -0000 1.15 +++ .cvsignore 4 Mar 2009 16:33:17 -0000 1.16 @@ -1 +1 @@ -virtinst-0.400.0.tar.gz +virtinst-0.400.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 4 Mar 2009 16:28:31 -0000 1.16 +++ sources 4 Mar 2009 16:33:17 -0000 1.17 @@ -1 +1 @@ -484792dfe05abc75082d44fc51b811f3 virtinst-0.400.2.tar.gz +4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz From glommer at fedoraproject.org Wed Mar 4 17:33:11 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 17:33:11 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.55,1.56 Message-ID: <20090304173311.6B21670116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26551 Modified Files: qemu.spec Log Message: - 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 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- qemu.spec 4 Mar 2009 02:06:32 -0000 1.55 +++ qemu.spec 4 Mar 2009 17:32:40 -0000 1.56 @@ -1,10 +1,10 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.10 -Release: 0.3.kvm20090303git%{?dist} -# I have mistakenly thought the revision name would be 1.0. -# So 0.10 series get Epoch = 1 -Epoch: 1 +Version: 0.92 +Release: 0.1.kvm20090303git%{?dist} +# I have mistakenly thought the revision name would be 1.0. +# So 0.10 series get Epoch = 1 +Epoch: 2 License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://www.qemu.org/ @@ -33,51 +33,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: rsync -Requires: %{name}-user = %{version}-%{release} -Requires: %{name}-system-x86 = %{version}-%{release} -Requires: %{name}-system-sparc = %{version}-%{release} -Requires: %{name}-system-arm = %{version}-%{release} -Requires: %{name}-system-cris = %{version}-%{release} -Requires: %{name}-system-sh4 = %{version}-%{release} -Requires: %{name}-system-m68k = %{version}-%{release} -Requires: %{name}-system-mips = %{version}-%{release} -Requires: %{name}-system-ppc = %{version}-%{release} -Requires: %{name}-img = %{version}-%{release} - -# sorry dudes, one step at a time -ExcludeArch: ppc ppc64 +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} #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l %define qemudocdir %{_docdir}/%{name}-%{version} -%define qemupkg() \ -%package %1\ -Summary: QEMU %2\ -Group: Development/Tools \ -Requires: %{name}-common = %{version}-%{release} \ -%{nil} - -%define qemudesc() \ -%description %1 \ -QEMU is a generic and open source processor emulator which achieves a good \ -emulation speed by using dynamic translation. \ - \ -This package provides the %2 -%{nil} - -%define qemupkgdesc() \ -%package %1\ -Summary: QEMU %2\ -Group: Development/Tools \ -Requires: %{name}-common = %{version}-%{release} \ -%description %1 \ -QEMU is a generic and open source processor emulator which achieves a good \ -emulation speed by using dynamic translation. \ - \ -This package provides the %2 -%{nil} - %description QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. QEMU has two operating modes: @@ -91,32 +61,123 @@ As QEMU requires no host kernel patches to run, it is safe and easy to use. -%qemupkgdesc img {command line tool for manipulating disk images} +%package img +Summary: QEMU command line tool for manipulating disk images +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description img +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. -%qemupkgdesc common {common files needed by all QEMU targets} +This package provides the common files needed by all QEMU targets -%qemupkg user {user mode emulation of 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 -Requires: %{name}-common = %{version}-%{release} -%qemudesc user {user mode emulation of qemu targets} +%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 -%qemupkg system-x86 {system emulator for x86} +%package system-x86 +Summary: QEMU system emulator for x86 +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: etherboot-zroms-kvm Requires: vgabios Requires: bochs-bios-data -%qemudesc system-x86 {system emulator for x86} -%qemupkgdesc system-ppc {system emulator for ppc} +Provides: kvm >= 84 +Obsoletes: kvm < 85 -%qemupkg system-sparc {system emulator for sparc} -%qemudesc system-sparc {system emulator for sparc} +%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 + +%package system-ppc +Summary: QEMU system emulator for ppc +Group: Development/Tools +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-ppc +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. -%qemupkgdesc system-arm {system emulator for arm} -%qemupkgdesc system-mips {system emulator for mips} -%qemupkgdesc system-cris {system emulator for cris} -%qemupkgdesc system-m68k {system emulator for m68k} -%qemupkgdesc system-sh4 {system emulator for sh4} +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 %ifarch %{ix86} x86_64 %package kvm-tools @@ -202,6 +263,18 @@ %install rm -rf $RPM_BUILD_ROOT +%ifarch %{ix86} x86_64 +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules +mkdir -p $RPM_BUILD_ROOT%{_bindir}/ + +install -m 0755 %{SOURCE1} $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 -D -p -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" \ @@ -209,18 +282,7 @@ docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \ datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/* - -%ifarch %{ix86} x86_64 -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules -install -m 0755 kvmtrace %{buildroot}/%{_bindir}/ -install -m 0755 kvmtrace_format %{buildroot}/%{_bindir}/ -install -m 0755 kvm_stat %{buildroot}/%{_bindir}/ -%endif - -cd qemu install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu -install -D -p -m 0755 ../qemu-kvm $RPM_BUILD_ROOT%{_bindir}/ 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 @@ -360,6 +422,14 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. From glommer at fedoraproject.org Wed Mar 4 17:43:12 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 17:43:12 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.56,1.57 Message-ID: <20090304174312.2DB3370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28989 Modified Files: qemu.spec Log Message: remove long lines Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- qemu.spec 4 Mar 2009 17:32:40 -0000 1.56 +++ qemu.spec 4 Mar 2009 17:42:41 -0000 1.57 @@ -2,8 +2,8 @@ Name: qemu Version: 0.92 Release: 0.1.kvm20090303git%{?dist} -# I have mistakenly thought the revision name would be 1.0. -# So 0.10 series get Epoch = 1 +# I have mistakenly thought the revision name would be 1.0. +# So 0.10 series get Epoch = 1 Epoch: 2 License: GPLv2+ and LGPLv2+ Group: Development/Tools @@ -75,7 +75,7 @@ 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 +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 @@ -88,7 +88,7 @@ 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 +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 @@ -104,7 +104,7 @@ Obsoletes: kvm < 85 %description system-x86 -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 system emulator for x86 @@ -114,7 +114,7 @@ Group: Development/Tools Requires: %{name}-common = %{epoch}:%{version}-%{release} %description system-ppc -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 system emulator for ppc @@ -124,7 +124,7 @@ 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 +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 @@ -134,7 +134,7 @@ 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 +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 @@ -144,7 +144,7 @@ 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 +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 @@ -154,7 +154,7 @@ 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 +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 @@ -164,7 +164,7 @@ 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 +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 @@ -174,7 +174,7 @@ 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 +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 @@ -211,7 +211,7 @@ %patch10 -p1 %build -# systems like rhel build system does not have a recent enough linker so +# 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. From crobinso at fedoraproject.org Wed Mar 4 17:44:37 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 17:44:37 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-9 virtinst-0.400.2-update-polish-trans.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 python-virtinst.spec, 1.45, 1.46 sources, 1.15, 1.16 virtinst-0.400.0-bridge-network-collision.patch, 1.1, NONE virtinst-0.400.0-disk-pool-fixes.patch, 1.1, NONE virtinst-0.400.0-fix-translated-help.patch, 1.1, NONE virtinst-0.400.0-log-fail-traceback.patch, 1.1, NONE virtinst-0.400.0-missing-variable.patch, 1.1, NONE virtinst-0.400.0-qemu-conn-check.patch, 1.1, NONE virtinst-0.400.0-refresh-storage-pool.patch, 1.1, NONE virtinst-0.400.0-update-translations.patch, 1.1, NONE virtinst-0.400.0-virt-convert-dict.patch, 1.1, NONE virtinst-0.400.0-virtio-f9.patch, 1.1, NONE virtinst-0.400.0-win64-entry.patch, 1.1, NONE Message-ID: <20090304174437.67B0E70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29344 Modified Files: .cvsignore python-virtinst.spec sources Added Files: virtinst-0.400.2-update-polish-trans.patch Removed Files: virtinst-0.400.0-bridge-network-collision.patch virtinst-0.400.0-disk-pool-fixes.patch virtinst-0.400.0-fix-translated-help.patch virtinst-0.400.0-log-fail-traceback.patch virtinst-0.400.0-missing-variable.patch virtinst-0.400.0-qemu-conn-check.patch virtinst-0.400.0-refresh-storage-pool.patch virtinst-0.400.0-update-translations.patch virtinst-0.400.0-virt-convert-dict.patch virtinst-0.400.0-virtio-f9.patch virtinst-0.400.0-win64-entry.patch Log Message: Update to version 0.400.2 virt-install --import option for creating a guest from an existing disk virt-install --host-device option for host device passthrough virt-clone --original-xml for cloning from an xml file virt-install --nonetworks option. virtinst-0.400.2-update-polish-trans.patch: --- NEW FILE virtinst-0.400.2-update-polish-trans.patch --- # HG changeset patch # User Cole Robinson # Date 1236181896 18000 # Node ID 8adf5b7ab1bf036b2c9476726d4e7a0a5994ed60 # Parent ba3abd7909b8ed3d9b1798429bd257a551ff34c6 Updated polish translations. diff -r ba3abd7909b8 -r 8adf5b7ab1bf po/pl.po --- a/po/pl.po Tue Mar 03 17:59:02 2009 -0500 +++ b/po/pl.po Wed Mar 04 10:51:36 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 17:43-0500\n" -"PO-Revision-Date: 2008-09-15 22:59+0200\n" +"POT-Creation-Date: 2009-01-26 11:29-0500\n" +"PO-Revision-Date: 2009-02-06 18:20+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -14,60 +14,32 @@ "Content-Transfer-Encoding: 8bit\n" #: virtinst/CapabilitiesParser.py:168 -#, fuzzy, python-format -msgid "No domains available for virt type '%(type)s', arch %(arch)s." +msgid "No domains available for this guest." msgstr "Brak dost??pnych domen dla tego go??cia." -#: virtinst/CapabilitiesParser.py:393 -#, python-format -msgid "for arch '%s'" -msgstr "dla architektury \"%s\"" - -#: virtinst/CapabilitiesParser.py:397 -#, fuzzy, python-format -msgid "virtualization type '%s'" -msgstr "Nieobs??ugiwany typ wirtualizacji \"%s\" " - -#: virtinst/CapabilitiesParser.py:399 -#, fuzzy -msgid "any virtualization options" -msgstr "Opcje typu wirtualizacji" - -#: virtinst/CapabilitiesParser.py:401 -#, python-format -msgid "Host does not support %(virttype)s %(arch)s" -msgstr "" - -#: virtinst/CapabilitiesParser.py:414 -#, python-format -msgid "" -"Host does not support domain type '%(domain)s' for virtualization type '%" -"(virttype)s' arch '%(arch)s'" -msgstr "" - -#: virtinst/cli.py:117 +#: virtinst/cli.py:116 msgid "Exiting at user request." msgstr "Zamykanie na ????danie u??ytkownika." -#: virtinst/cli.py:122 +#: virtinst/cli.py:121 msgid "Must be root to create Xen guests" msgstr "Musisz by?? rootem, aby tworzy?? go??ci Xena" -#: virtinst/cli.py:124 +#: virtinst/cli.py:123 msgid "Could not find usable default libvirt connection." msgstr "Nie mo??na znale???? u??ywalnego domy??lnego po????czenia libvirt." -#: virtinst/cli.py:146 +#: virtinst/cli.py:145 #, python-format msgid "Force flag is set but input was required. Prompt was: %s" msgstr "Flaga wymuszenia jest ustawiona, ale pro??ba by??a wymagana. By??o to: %s" -#: virtinst/cli.py:149 +#: virtinst/cli.py:148 #, python-format msgid "Prompting disabled, but input was requested. Prompt was: %s" msgstr "Wy????czono pro??by, ale jedna by??a wymagana. By??a to: %s" -#: virtinst/cli.py:169 +#: virtinst/cli.py:168 #, python-format msgid "" "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for " @@ -76,24 +48,24 @@ "Wy????czono pro??by, ale pytanie tak/nie zosta??o za????dane. Spr??buj --force, aby " "wymusi?? \"tak\" dla takich pr????b. Pro??ba to: %s" -#: virtinst/cli.py:179 virt-clone:48 virt-clone:69 virt-clone:108 +#: virtinst/cli.py:178 virt-clone:48 virt-clone:58 virt-clone:87 msgid "ERROR: " msgstr "B????D: " -#: virtinst/cli.py:189 +#: virtinst/cli.py:188 msgid "A name is required for the virtual machine." msgstr "Nazwa maszyny wirtualnej jest wymagana." -#: virtinst/cli.py:197 +#: virtinst/cli.py:196 msgid "Memory amount is required for the virtual machine." msgstr "Ilo???? pami??ci dla maszyny wirtualnej jest wymagana." -#: virtinst/cli.py:199 +#: virtinst/cli.py:198 #, python-format msgid "Installs currently require %d megs of RAM." msgstr "Instalacja obecnie wymaga %d megabajt??w RAM-u." -#: virtinst/cli.py:219 +#: virtinst/cli.py:218 #, python-format msgid "" "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) " @@ -104,211 +76,294 @@ "fizycznych (%d) na ho??cie. To b??dzie dzia??a??o, ale wydajno???? b??dzie s??aba. " "Jeste?? pewny? (\"yes\" lub \"no\")" -#: virtinst/cli.py:276 +#: virtinst/cli.py:275 msgid "Unknown network type " msgstr "Nieznany typ sieci " -#: virtinst/cli.py:293 +#: virtinst/cli.py:292 msgid "Cannot mix both --bridge and --network arguments" -msgstr "Nie mo??na miesza?? argument??w --bridge i --network" +msgstr "Nie mo??na miesza?? parametr??w --bridge i --network" -#: virtinst/cli.py:310 +#: virtinst/cli.py:309 msgid "Need to pass equal numbers of networks & mac addresses" msgstr "Nale??y poda?? r??wn?? liczb?? sieci i adres??w MAC" -#: virtinst/cli.py:332 +#: virtinst/cli.py:331 msgid "Can't specify more than one of VNC, SDL, or --nographics" msgstr "Nie mo??na poda?? wi??cej ni?? jedno z VNC, SDL lub --nographics" -#: virtinst/cli.py:376 virtinst/cli.py:381 virt-install:319 virt-install:324 +#: virtinst/cli.py:366 virtinst/cli.py:371 virt-install:301 virt-install:306 #, python-format msgid "%s option requires an argument" -msgstr "Opcja %s wymaga argumentu" +msgstr "Opcja %s wymaga parametru" -#: virtinst/CloneManager.py:54 -#, fuzzy -msgid "Connection must be a 'virConnect' instance." -msgstr "\"conn\" musi by?? virConnect." +#: virtinst/CloneManager.py:88 +msgid "Name or UUID of guest to clone is required" +msgstr "Nazwa lub UUID go??cia do sklonowania jest wymagana" -#: virtinst/CloneManager.py:102 -#, fuzzy -msgid "Original xml must be a string." -msgstr "Wariant systemu operacyjnego musi by?? ??a??cuchem." +#: virtinst/CloneManager.py:97 +msgid "A valid name or UUID of guest to clone is required" +msgstr "Prawid??owa nazwa lub UUID go??cia do sklonowania jest wymagana" -#: virtinst/CloneManager.py:114 +#: virtinst/CloneManager.py:107 #, python-format msgid "Invalid name for new guest: %s" msgstr "Nieprawid??owa nazwa nowego go??cia: %s" -#: virtinst/CloneManager.py:119 -#, fuzzy, python-format -msgid "Domain name '%s' already in use." -msgstr "Domena o nazwie %s ju?? istnieje!" - -#: virtinst/CloneManager.py:131 +#: virtinst/CloneManager.py:115 #, python-format msgid "Invalid uuid for new guest: %s" msgstr "Nieprawid??owy UUID nowego go??cia: %s" -#: virtinst/CloneManager.py:134 -#, fuzzy, python-format -msgid "UUID '%s' is in use by another guest." -msgstr "Dysk %s jest ju?? u??ywany przez innego go??cia!\n" +#: virtinst/CloneManager.py:125 +msgid "New file to use for disk image is required" +msgstr "Nowy plik do u??ycia obrazu dysku jest wymagany" -#: virtinst/CloneManager.py:149 -#, fuzzy, python-format -msgid "Could not use path '%s' for cloning: %s" -msgstr "Nie mo??na uruchomi?? puli pami??ci masowej: %s" +#: virtinst/CloneManager.py:207 +#, python-format +msgid "Domain %s is not found" [...2269 lines suppressed...] + +#: virt-install:656 +msgid "Domain installation still in progress. Waiting" +msgstr "Trwa instalacja domeny. Oczekiwanie" + +#: virt-install:663 +msgid "Domain has shutdown. Continuing." +msgstr "Domena zosta??a wy????czona. Kontynuowanie." + +#: virt-install:670 +#, python-format +msgid "Could not lookup domain after install: %s" +msgstr "Nie mo??na wyszuka?? domeny po instalacji: %s" + +#: virt-install:676 +msgid "Installation has exceeded specified timelimit. Exiting application." +msgstr "" +"Instalacja przekroczy??a podane ograniczenie czasu. Zamykanie aplikacji." + +#: virt-install:680 +msgid "" +"Domain installation still in progress. You can reconnect to \n" +"the console to complete the installation process." +msgstr "" +"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" +"konsol??, aby zako??czy?? proces instalacji." + +#: virt-install:688 #, python-format msgid "" "Domain installation does not appear to have been\n" @@ -1949,16 +1783,11 @@ "Instalacja go??cia zosta??a zako??czona... Mo??na ponownie uruchomi?? domen?? " "wykonuj??c \"virsh start %s\"" -#: virt-install:696 +#: virt-install:695 msgid "Guest installation complete... restarting guest." msgstr "Instalacja go??cia zosta??a zako??czona... Ponowne uruchamianie go??cia." -#: virt-install:702 -#, fuzzy -msgid "Guest install interrupted." -msgstr "Instalacja go??cia nie powiod??a si??" - -#: virt-install:709 +#: virt-install:704 #, python-format msgid "" "Domain installation may not have been\n" @@ -1970,149 +1799,3 @@ " powiod??a si??, mo??esz ponownie uruchomi?? domen??\n" " uruchamiaj??c \"virsh start %s\"; w innym przypadku\n" " uruchom ponownie instalacj??." - -#: virt-install:735 -#, fuzzy -msgid "Guest installation failed." -msgstr "Instalacja go??cia nie powiod??a si??" - -#: virt-install:745 -#, fuzzy, python-format -msgid "%d minutes " -msgstr " %d minut" - -#: virt-install:747 -#, fuzzy, python-format -msgid "" -"Domain installation still in progress. Waiting %sfor domain to complete " -"installation." -msgstr "" -"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" -"konsol??, aby zako??czy?? proces instalacji." - -#: virt-install:753 -msgid "Domain has shutdown. Continuing." -msgstr "Domena zosta??a wy????czona. Kontynuowanie." - -#: virt-install:760 -#, fuzzy, python-format -msgid "Could not lookup domain after install: %s" -msgstr "Nie mo??na wyszuka?? obiektu woluminu: %s" - -#: virt-install:767 -#, fuzzy -msgid "Installation has exceeded specified time limit. Exiting application." -msgstr "Instalacja przekroczy??a podane ograniczenie czasu. Przerywanie." - -#: virt-install:771 -msgid "" -"Domain installation still in progress. You can reconnect to \n" -"the console to complete the installation process." -msgstr "" -"Trwa instalacja domeny. Mo??esz ponownie po????czy?? si?? z \n" -"konsol??, aby zako??czy?? proces instalacji." - -#~ msgid "Name or UUID of guest to clone is required" -#~ msgstr "Nazwa lub UUID go??cia do sklonowania jest wymagana" - -#~ msgid "A valid name or UUID of guest to clone is required" -#~ msgstr "Prawid??owa nazwa lub UUID go??cia do sklonowania jest wymagana" - -#~ msgid "New file to use for disk image is required" -#~ msgstr "Nowy plik do u??ycia obrazu dysku jest wymagany" - -#~ msgid "Domain status must be SHUTOFF" -#~ msgstr "Stan domeny musi by?? SHUTOFF" - -#~ msgid "Domain %s already exists" -#~ msgstr "Domena %s ju?? istnieje" - -#, fuzzy -#~ msgid "Cloning from %(src)s to %(dst)s..." -#~ msgstr "klonowanie z %(src)s do %(dst)s" - -#~ msgid "Invalid file location given: " -#~ msgstr "Podano nieprawid??owe po??o??enie pliku: " - -#, fuzzy -#~ msgid "Invalid file location given: %s: %s" -#~ msgstr "Podano nieprawid??owe po??o??enie pliku: " - -#~ msgid "Connection does not support HVM virtualisation, cannot boot live CD" -#~ msgstr "" -#~ "Po????czenie nie obs??uguje wirtualizacji HVM; nie mo??na uruchomi?? Live CD" - -#~ msgid "Storage object name must be a string " -#~ msgstr "Obiekt pami??ci masowej musi by?? ??a??cuchem " - -#~ msgid "Storage object name can not be only " -#~ msgstr "Nazwa obiektu pami??ci masowej nie mo??e by?? tylko " - -#~ msgid "Storage object name can only contain " -#~ msgstr "Nazwa obiektu pami??ci masowej mo??e zawiera?? tylko " - -#~ msgid "'%s' is not managed on remote host: %s" -#~ msgstr "\"%s\" nie jest zarz??dzane na zdalnym ho??cie: %s" - -#~ msgid "Cannot parse capabilities" -#~ msgstr "Nie mo??na przeanalizowa?? mo??liwo??ci" - -#~ msgid "Only one of --pxe, --location and --cdrom can be used" -#~ msgstr "Tylko jedno z --pxe, --location i --cdrom mo??e zosta?? u??yte" - -#~ msgid "location must be specified for paravirtualized guests." -#~ msgstr "po??o??enie dla go??ci parawirtualizowanych musi zosta?? podane." - -#~ msgid "Domain installation still in progress. Waiting" -#~ msgstr "Trwa instalacja domeny. Oczekiwanie" - -#~ msgid "" -#~ "UUID for the guest; if none is given a random UUID will be generated. If " -#~ "you specify UUID, you should use a 32-digit hexadecimal number." -#~ msgstr "" -#~ "UUID go??cia; je??li ??aden nie zostanie podany, zostanie utworzony losowy " -#~ "UUID. Je??li podasz UUID, powiniene?? u??y?? 32 znakowej liczby szesnastkowej." - -#~ msgid "" -#~ "Total time to wait for VM to shutdown if console not present. Time less " -#~ "than 0 waits indefinitely." -#~ msgstr "" -#~ "Ca??kowity czas oczekiwania na wy????czenie maszyny wirtualnej, je??li " -#~ "konsola nie jest obecna. Czas poni??ej zera oznacza oczekiwanie w " -#~ "niesko??czono????." - -#~ msgid "The image name and version must be present" -#~ msgstr "Nazwa obrazu i wersja musz?? by?? obecne" - -#~ msgid "Scratch disk %s does not have a size attribute" -#~ msgstr "Dysk tymczasowy %s nie posiada atrybutu rozmiaru" - -#~ msgid "Disk file %s could not be found" -#~ msgstr "Nie mo??na znale???? pliku dysku %s" - -#~ msgid "Writing %s" -#~ msgstr "Zapisywanie %s" - -#~ msgid "Directory in which packaged file will be put" -#~ msgstr "Folder, w kt??rym spakowany plik zostanie umieszczony" - -#~ msgid "The image descriptor must contain name and version" -#~ msgstr "Deskryptor obrazu musi zawiera?? nazw?? i wersj??" - -#~ msgid "Validation failed: %s" -#~ msgstr "Sprawdzenie nie powiod??o si??: %s" - -#~ msgid "Packaging failed: %s" -#~ msgstr "Spakowanie nie powiod??o si??: %s" - -#~ msgid "Cloning domain..." -#~ msgstr "Klonowanie domeny..." - -#~ msgid "NFS installations are only supported as root" -#~ msgstr "Instalacje NFS s?? obs??ugiwane tylko przez roota" - -#~ msgid "Verifying install location..." -#~ msgstr "Sprawdzanie po??o??enia instalacji..." - -#~ msgid "Unsupported virtualization type" -#~ msgstr "Nieobs??ugiwany typ wirtualizacji" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 1 Dec 2008 16:24:17 -0000 1.15 +++ .cvsignore 4 Mar 2009 17:44:06 -0000 1.16 @@ -1 +1 @@ -virtinst-0.400.0.tar.gz +virtinst-0.400.2.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- python-virtinst.spec 1 Dec 2008 18:15:18 -0000 1.45 +++ python-virtinst.spec 4 Mar 2009 17:44:06 -0000 1.46 @@ -10,20 +10,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.400.0 +Version: 0.400.2 Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-qemu-conn-check.patch -Patch2: %{appname}-%{version}-virt-convert-dict.patch -Patch3: %{appname}-%{version}-virtio-f9.patch -Patch4: %{appname}-%{version}-log-fail-traceback.patch -Patch5: %{appname}-%{version}-bridge-network-collision.patch -Patch6: %{appname}-%{version}-refresh-storage-pool.patch -Patch7: %{appname}-%{version}-missing-variable.patch -Patch8: %{appname}-%{version}-disk-pool-fixes.patch -Patch9: %{appname}-%{version}-win64-entry.patch -Patch10: %{appname}-%{version}-update-translations.patch -Patch11: %{appname}-%{version}-fix-translated-help.patch +Patch1: %{appname}-%{version}-update-polish-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,9 +29,6 @@ Requires: libxml2-python Requires: python-urlgrabber BuildRequires: python-devel -BuildRequires: libxml2-python -BuildRequires: python-urlgrabber -BuildRequires: libvirt-python BuildRequires: gettext %description @@ -53,16 +40,6 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build python setup.py build @@ -93,11 +70,17 @@ %{_bindir}/virt-install %{_bindir}/virt-clone %{_bindir}/virt-image -%{_bindir}/virt-pack %{_bindir}/virt-convert %changelog -* Mon Dec 1 2008 Cole Robinson - 0.400.0.fc9 +* Wed Mar 4 2009 Cole Robinson - 0.400.2-1.fc9 +- Update to version 0.400.2 +- virt-install --import option for creating a guest from an existing disk +- virt-install --host-device option for host device passthrough +- virt-clone --original-xml for cloning from an xml file +- virt-install --nonetworks option. + +* Mon Dec 1 2008 Cole Robinson - 0.400.0-1.fc9 - Rebase to version 0.400.0 with F10 fixes. - Add virt-convert tool - virt-install --disk option for using/provisioning libvirt storage Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 1 Dec 2008 16:24:17 -0000 1.15 +++ sources 4 Mar 2009 17:44:06 -0000 1.16 @@ -1 +1 @@ -484792dfe05abc75082d44fc51b811f3 virtinst-0.400.0.tar.gz +4bde385a237a7b1d250bd7c67687bbf5 virtinst-0.400.2.tar.gz --- virtinst-0.400.0-bridge-network-collision.patch DELETED --- --- virtinst-0.400.0-disk-pool-fixes.patch DELETED --- --- virtinst-0.400.0-fix-translated-help.patch DELETED --- --- virtinst-0.400.0-log-fail-traceback.patch DELETED --- --- virtinst-0.400.0-missing-variable.patch DELETED --- --- virtinst-0.400.0-qemu-conn-check.patch DELETED --- --- virtinst-0.400.0-refresh-storage-pool.patch DELETED --- --- virtinst-0.400.0-update-translations.patch DELETED --- --- virtinst-0.400.0-virt-convert-dict.patch DELETED --- --- virtinst-0.400.0-virtio-f9.patch DELETED --- --- virtinst-0.400.0-win64-entry.patch DELETED --- From crobinso at fedoraproject.org Wed Mar 4 17:54:02 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 17:54:02 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager-0.6.1-fix-cadl.patch, NONE, 1.1 virt-manager-0.6.1-fix-stats-prefs.patch, NONE, 1.1 virt-manager-0.6.1-update-polish.patch, NONE, 1.1 virt-manager.spec, 1.46, 1.47 Message-ID: <20090304175402.3937170116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30937 Modified Files: virt-manager.spec Added Files: virt-manager-0.6.1-fix-cadl.patch virt-manager-0.6.1-fix-stats-prefs.patch virt-manager-0.6.1-update-polish.patch Log Message: Update polish translation (bz 263301) Fix sending ctrl-alt-del to guest Fix cpu + mem stats options to remember preference. virt-manager-0.6.1-fix-cadl.patch: --- NEW FILE virt-manager-0.6.1-fix-cadl.patch --- diff -rup virt-manager-0.6.1/src/vmm-details.glade new/src/vmm-details.glade --- virt-manager-0.6.1/src/vmm-details.glade 2009-01-26 14:33:33.000000000 -0500 +++ new/src/vmm-details.glade 2009-03-04 12:31:51.000000000 -0500 @@ -218,15 +218,15 @@ - + True Ctrl+Alt+Backspace True - + - + True Ctrl+Alt+Delete True virt-manager-0.6.1-fix-stats-prefs.patch: --- NEW FILE virt-manager-0.6.1-fix-stats-prefs.patch --- # HG changeset patch # User Cole Robinson # Date 1234829084 18000 # Node ID ae434ddf4b7073773347f3d1cc449385db7267fd # Parent 7238b8b438bc3311b744debfb576849dbc262cda Fix regression for pre existing vm and stats preferences not keeping new values. diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade --- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500 +++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500 @@ -1,6 +1,6 @@ - + Preferences @@ -37,19 +37,53 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 + + True + True + 0 0 60 1 5 0 + + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 300 5 5 0 + 0.01 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + True 0 @@ -61,50 +95,18 @@ - + True - True - 0 0 300 5 5 0 - 0.01 + 0 + samples - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 60 1 5 0 - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maintain history of - - + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -141,18 +143,79 @@ 3 3 - + + True + 0 + CPU Usage + PANGO_ELLIPSIZE_END + + + GTK_FILL + + + + + True + 0 + Memory Usage + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Disk I/O + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Network I/O + + + 3 + 4 + GTK_FILL + + + + True True 0 True - + 1 2 - 3 - 4 + GTK_EXPAND + + + + + True + True + 0 + True + + + + 1 + 2 + 1 + 2 GTK_EXPAND @@ -173,80 +236,19 @@ - + True True 0 True - + 1 2 - 1 - 2 - GTK_EXPAND - - - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - 3 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL + GTK_EXPAND @@ -302,19 +304,27 @@ 1 2 - + True Never -When fullscreen -On mouse over +For all new domains +For all domains + - 3 - 4 + 1 + 2 5 + + True + 0 + Automatically open consoles: + + + True 0 @@ -326,22 +336,16 @@ - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains +When fullscreen +On mouse over + - 1 - 2 + 3 + 4 5 @@ -380,6 +384,13 @@ 1 8 + + True + 0 + Install Audio Device: + + + True 12 @@ -417,13 +428,6 @@ 2 - - - True - 0 - Install Audio Device: - - @@ -470,7 +474,7 @@ True True True - gtk-help + gtk-help True 0 @@ -500,7 +504,7 @@ True True True - gtk-close + gtk-close True 0 virt-manager-0.6.1-update-polish.patch: --- NEW FILE virt-manager-0.6.1-update-polish.patch --- # HG changeset patch # User Cole Robinson # Date 1234794921 18000 # Node ID 7238b8b438bc3311b744debfb576849dbc262cda # Parent 9d1aa6fcf42681caba0d9c50e15ffa6d10d9f8af Updated pl translation. diff -r 9d1aa6fcf426 -r 7238b8b438bc po/pl.po --- a/po/pl.po Sun Feb 15 21:40:21 2009 -0500 +++ b/po/pl.po Mon Feb 16 09:35:21 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 20:36+0100\n" -"PO-Revision-Date: 2008-12-12 20:46+0100\n" +"POT-Creation-Date: 2009-02-06 17:03+0100\n" +"PO-Revision-Date: 2009-02-06 20:23+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ #. ...the risk is we catch too much though #. Damned if we do, damned if we dont :-)( -#: ../src/virt-manager.py.in:264 +#: ../src/virt-manager.py.in:284 #, python-format msgid "Unable to initialize GTK: %s" msgstr "Nie mo??na zainicjowa?? GTK: %s" @@ -41,99 +41,138 @@ msgstr "Urz??dzenie d??wi??kowe instalacji dla zdalnej maszyny wirtualnej" #: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "Sonda?? statystyk procesora" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia dysku" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "Sonda?? statystyk u??ycia pami??ci" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia sieci" + +#: ../src/virt-manager.schemas.in.h:7 msgid "Show VCPU count in summary" msgstr "Wy??wietl podsumowanie licznika wirtualnych procesor??w" -#: ../src/virt-manager.schemas.in.h:4 +#: ../src/virt-manager.schemas.in.h:8 msgid "Show cpu usage in summary" msgstr "Wy??wietl podsumowanie u??ycia procesora" -#: ../src/virt-manager.schemas.in.h:5 +#: ../src/virt-manager.schemas.in.h:9 msgid "Show disk I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia dysku" -#: ../src/virt-manager.schemas.in.h:6 +#: ../src/virt-manager.schemas.in.h:10 msgid "Show domain id in summary" msgstr "Wy??wietl podsumowanie identyfikatora domeny" -#: ../src/virt-manager.schemas.in.h:7 +#: ../src/virt-manager.schemas.in.h:11 msgid "Show memory usage in summary" msgstr "Wy??wietl podsumowanie u??ycia pami??ci" -#: ../src/virt-manager.schemas.in.h:8 +#: ../src/virt-manager.schemas.in.h:12 msgid "Show network I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia sieci" -#: ../src/virt-manager.schemas.in.h:9 +#: ../src/virt-manager.schemas.in.h:13 msgid "Show run state in summary" msgstr "Wy??wietl podsumowanie stanu uruchomienia" -#: ../src/virt-manager.schemas.in.h:10 +#: ../src/virt-manager.schemas.in.h:14 msgid "Show the cpu usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia procesora w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:11 +#: ../src/virt-manager.schemas.in.h:15 msgid "Show the disk I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia dysku w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:12 +#: ../src/virt-manager.schemas.in.h:16 msgid "Show the domain id field in the domain list summary view" msgstr "Wy??wietl pole identyfikatora domeny w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:13 +#: ../src/virt-manager.schemas.in.h:17 msgid "Show the memory usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia pami??ci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:14 +#: ../src/virt-manager.schemas.in.h:18 msgid "Show the network I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia sieci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:15 +#: ../src/virt-manager.schemas.in.h:19 msgid "Show the run state field in the domain list summary view" msgstr "Wy??wietl pole stanu uruchomienia w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:16 +#: ../src/virt-manager.schemas.in.h:20 msgid "Show the virtual CPU count field in the domain list summary view" msgstr "" "Wy??wietl pole licznika wirtualnych procesor??w w widoku podsumowania listy " "domen" -#: ../src/virt-manager.schemas.in.h:17 +#: ../src/virt-manager.schemas.in.h:21 msgid "The length of the list of URLs" msgstr "D??ugo???? listy URL-i" -#: ../src/virt-manager.schemas.in.h:18 +#: ../src/virt-manager.schemas.in.h:22 msgid "The number of samples to keep in the statistics history" msgstr "Liczba przyk??ad??w przechowywanych w historii statystyk" -#: ../src/virt-manager.schemas.in.h:19 +#: ../src/virt-manager.schemas.in.h:23 msgid "" "The number of urls to keep in the history for the install media address page." msgstr "" "Liczba URL-i przechowywanych w historii strony adresowej no??nika " "instalacyjnego." -#: ../src/virt-manager.schemas.in.h:20 +#: ../src/virt-manager.schemas.in.h:24 msgid "The statistics history length" msgstr "D??ugo???? historii statystyk" -#: ../src/virt-manager.schemas.in.h:21 +#: ../src/virt-manager.schemas.in.h:25 msgid "The statistics update interval" msgstr "Cz??sto???? aktualizacji statystyk" -#: ../src/virt-manager.schemas.in.h:22 +#: ../src/virt-manager.schemas.in.h:26 msgid "The statistics update interval in seconds" msgstr "Cz??sto???? aktualizacji statystyk w sekundach" -#: ../src/virt-manager.schemas.in.h:23 +#: ../src/virt-manager.schemas.in.h:27 msgid "When to grab keyboard input for the console" msgstr "Kiedy przechwyci?? wej??cie klawiatury w konsoli" -#: ../src/virt-manager.schemas.in.h:24 +#: ../src/virt-manager.schemas.in.h:28 msgid "When to pop up a console for a guest" msgstr "Kiedy wy??wietli?? konsol?? go??cia" -#: ../src/virt-manager.schemas.in.h:25 +#: ../src/virt-manager.schemas.in.h:29 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia dysku maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia sieci maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i procesora maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "" +"Whether or not the app will poll connection and VM memory usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i pami??ci maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:33 msgid "" "Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " "in full screen mode, 2 = when mouse is over console" @@ -141,15 +180,15 @@ "Kiedy przechwyci?? wej??cie klawiatury w konsoli go??cia. 0 = nigdy, 1 = tylko " "w trybie pe??noekranowym, 2 = kiedy mysz jest nad konsol??" -#: ../src/virt-manager.schemas.in.h:26 +#: ../src/virt-manager.schemas.in.h:34 msgid "Whether to install a sound device for local VMs or not" msgstr "Czy instalowa?? urz??dzenie d??wi??kowe dla lokalnej maszyny wirtualnej" [...3161 lines suppressed...] -#: ../src/vmm-details.glade.h:118 +#: ../src/vmm-details.glade.h:103 msgid "_Take Screenshot" msgstr "_Wykonaj zrzut ekranu" -#: ../src/vmm-details.glade.h:119 ../src/vmm-manager.glade.h:22 +#: ../src/vmm-details.glade.h:104 ../src/vmm-manager.glade.h:22 msgid "_View" msgstr "_Widok" -#: ../src/vmm-details.glade.h:120 -msgid "disk\t" -msgstr "dysk\t" - -#: ../src/vmm-details.glade.h:121 -msgid "insert sound model" -msgstr "wstaw model d??wi??ku" - #: ../src/vmm-host.glade.h:2 msgid "IPv4 configuration" msgstr "Konfiguracja IPv4" @@ -3042,7 +3065,7 @@ msgid "Forwarding:" msgstr "Przekazywanie:" -#: ../src/vmm-host.glade.h:21 +#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:10 msgid "Host Details" msgstr "Szczeg????y hosta" @@ -3090,18 +3113,10 @@ msgid "Stop Pool" msgstr "Zatrzymaj pul??" -#: ../src/vmm-host.glade.h:39 -msgid "Storage Pools" -msgstr "Pule pami??ci masowej" - #: ../src/vmm-host.glade.h:40 msgid "Virtual Networks" msgstr "Sieci wirtualne" -#: ../src/vmm-host.glade.h:41 -msgid "Xen" -msgstr "Xen" - #: ../src/vmm-manager.glade.h:1 msgid "Add Connection..." msgstr "Dodaj po????czenie..." @@ -3116,21 +3131,21 @@ "Aktywne maszyny wirtualne\n" "Nieaktywne maszyny wirtualne" -#: ../src/vmm-manager.glade.h:6 -msgid "Connection Details..." -msgstr "Szczeg????y po????czenia..." +#: ../src/vmm-manager.glade.h:5 ../src/vmm-preferences.glade.h:6 +msgid "CPU Usage" +msgstr "U??ycie procesora" #: ../src/vmm-manager.glade.h:7 -msgid "Delete Machine" -msgstr "Usu?? maszyn??" +msgid "Delete Virtual Machine" +msgstr "Usu?? maszyn?? wirtualn??" #: ../src/vmm-manager.glade.h:9 msgid "Domain ID" msgstr "Identyfikator domeny" -#: ../src/vmm-manager.glade.h:10 -msgid "Machine Details..." -msgstr "Szczeg????y maszyny..." +#: ../src/vmm-manager.glade.h:11 ../src/vmm-preferences.glade.h:12 +msgid "Memory Usage" +msgstr "U??ycie pami??ci" #: ../src/vmm-manager.glade.h:13 msgid "Restore a saved machine from a filesystem image" @@ -3141,8 +3156,8 @@ msgstr "Przywr???? zapisan?? maszyn??..." #: ../src/vmm-manager.glade.h:16 -msgid "Virtual CPUs" -msgstr "Wirtualne procesory" +msgid "Virtual Machine Details" +msgstr "Szczeg????y maszyny wirtualnej" #: ../src/vmm-manager.glade.h:19 msgid "_Edit" @@ -3205,56 +3220,48 @@ msgstr "Konsole" #: ../src/vmm-preferences.glade.h:2 -msgid "New VM Preferences" -msgstr "Preferencje nowej maszyny wirtualnej" +msgid "Enable Stats Polling" +msgstr "W????cz sonda?? statystyk" #: ../src/vmm-preferences.glade.h:3 -msgid "Status monitoring" -msgstr "Stan monitorowania" +msgid "New VM" +msgstr "Nowa maszyna wirtualna" #: ../src/vmm-preferences.glade.h:4 -msgid "Auto Console" -msgstr "Automatyczna konsola" +msgid "Stats Options" +msgstr "Opcje statystyk" #: ../src/vmm-preferences.glade.h:5 msgid "Automatically open consoles:" msgstr "Automatycznie otw??rz konsole:" -#: ../src/vmm-preferences.glade.h:6 -msgid "Grab Keyboard" -msgstr "Przechwy?? klawiatur??" - -#: ../src/vmm-preferences.glade.h:7 +#: ../src/vmm-preferences.glade.h:8 msgid "Grab keyboard input:" msgstr "Przechwy?? wej??cie klawiatury:" -#: ../src/vmm-preferences.glade.h:8 -msgid "History Samples" -msgstr "Przyk??ady historii" - #: ../src/vmm-preferences.glade.h:9 msgid "Install Audio Device:" msgstr "Urz??dzenie d??wi??kowe instalacji:" #: ../src/vmm-preferences.glade.h:10 -msgid "Local VM" +msgid "Local virtual machine" msgstr "Lokalna maszyna wirtualna" #: ../src/vmm-preferences.glade.h:11 msgid "Maintain history of" msgstr "Zarz??dzaj histori??" -#: ../src/vmm-preferences.glade.h:12 +#: ../src/vmm-preferences.glade.h:14 msgid "" "Never\n" -"For new domains\n" +"For all new domains\n" "For all domains" msgstr "" "Nigdy\n" -"Dla nowych domen\n" +"Dla wszystkich nowych domen\n" "Dla wszystkich domen" -#: ../src/vmm-preferences.glade.h:15 +#: ../src/vmm-preferences.glade.h:17 msgid "" "Never\n" "When fullscreen\n" @@ -3264,26 +3271,30 @@ "Kiedy jest na pe??nym ekranie\n" "Przy najechaniu mysz??" -#: ../src/vmm-preferences.glade.h:18 +#: ../src/vmm-preferences.glade.h:20 msgid "Preferences" msgstr "Preferencje" -#: ../src/vmm-preferences.glade.h:19 -msgid "Remote VM" +#: ../src/vmm-preferences.glade.h:21 +msgid "Remote virtual machine" msgstr "Zdalna maszyna wirtualna" -#: ../src/vmm-preferences.glade.h:20 -msgid "Status Interval" -msgstr "Cz??sto???? stanu" +#: ../src/vmm-preferences.glade.h:22 +msgid "Stats" +msgstr "Statystyki" -#: ../src/vmm-preferences.glade.h:21 +#: ../src/vmm-preferences.glade.h:23 msgid "Update status every" msgstr "Zaktualizuj stan co" -#: ../src/vmm-preferences.glade.h:22 +#: ../src/vmm-preferences.glade.h:24 +msgid "VM Details" +msgstr "Szczeg????y maszyny wirtualnej" + +#: ../src/vmm-preferences.glade.h:25 msgid "samples" msgstr "przyk??ady" -#: ../src/vmm-preferences.glade.h:23 +#: ../src/vmm-preferences.glade.h:26 msgid "seconds" msgstr "sekundy" Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- virt-manager.spec 26 Feb 2009 00:32:18 -0000 1.46 +++ virt-manager.spec 4 Mar 2009 17:53:31 -0000 1.47 @@ -8,13 +8,16 @@ Name: virt-manager Version: 0.6.1 -Release: 3%{_extra_release} +Release: 4%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Patch1: %{name}-%{version}-update-polish.patch +Patch2: %{name}-%{version}-fix-cadl.patch +Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -53,7 +56,11 @@ # For console widget Requires: gtk-vnc-python >= 0.3.4 # For local authentication against PolicyKit +%if 0%{?fedora} >= 11 +Requires: PolicyKit-authentication-agent +%else if 0%{?fedora} >= 9 Requires: PolicyKit-gnome +%endif BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -82,6 +89,9 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %configure @@ -159,6 +169,11 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Mar 4 2009 Cole Robinson - 0.6.1-4.fc11 +- Update polish translation (bz 263301) +- Fix sending ctrl-alt-del to guest +- Fix cpu + mem stats options to remember preference. + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From glommer at fedoraproject.org Wed Mar 4 18:23:14 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 4 Mar 2009 18:23:14 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.57,1.58 Message-ID: <20090304182314.E607270116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3428 Modified Files: qemu.spec Log Message: 0.9.2 is the correct number. Missing dot, call me stupid. Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- qemu.spec 4 Mar 2009 17:42:41 -0000 1.57 +++ qemu.spec 4 Mar 2009 18:22:44 -0000 1.58 @@ -1,6 +1,6 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.92 +Version: 0.9.2 Release: 0.1.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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 From crobinso at fedoraproject.org Wed Mar 4 18:28:34 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 18:28:34 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/F-9 virt-manager-0.6.1-fix-cadl.patch, NONE, 1.1 virt-manager-0.6.1-fix-stats-prefs.patch, NONE, 1.1 virt-manager-0.6.1-update-polish.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 virt-manager.spec, 1.39, 1.40 virt-manager-0.6.0-conn-details-sensitivity.patch, 1.1, NONE virt-manager-0.6.0-connect-variable-typo.patch, 1.1, NONE virt-manager-0.6.0-fix-virt-type-desc.patch, 1.2, NONE virt-manager-0.6.0-multiple-sound-dev.patch, 1.1, NONE virt-manager-0.6.0-polkit-root.patch, 1.1, NONE virt-manager-0.6.0-populate-hostinfo-early.patch, 1.1, NONE virt-manager-0.6.0-update-potfiles.patch, 1.1, NONE virt-manager-0.6.0-update-translations.patch, 1.1, NONE virt-manager-0.6.0-vol-copy-popup.patch, 1.1, NONE virt-manager.console, 1.1, NONE virt-manager.pam, 1.1, NONE Message-ID: <20090304182834.B74F570116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4020 Modified Files: .cvsignore sources virt-manager.spec Added Files: virt-manager-0.6.1-fix-cadl.patch virt-manager-0.6.1-fix-stats-prefs.patch virt-manager-0.6.1-update-polish.patch Removed Files: virt-manager-0.6.0-conn-details-sensitivity.patch virt-manager-0.6.0-connect-variable-typo.patch virt-manager-0.6.0-fix-virt-type-desc.patch virt-manager-0.6.0-multiple-sound-dev.patch virt-manager-0.6.0-polkit-root.patch virt-manager-0.6.0-populate-hostinfo-early.patch virt-manager-0.6.0-update-potfiles.patch virt-manager-0.6.0-update-translations.patch virt-manager-0.6.0-vol-copy-popup.patch virt-manager.console virt-manager.pam Log Message: Update to 0.6.1 release Disk and Network VM stats reporting VM Migration support Support adding sound devices to existing VMs Allow specifying device model when adding a network device to an existing VM virt-manager-0.6.1-fix-cadl.patch: --- NEW FILE virt-manager-0.6.1-fix-cadl.patch --- diff -rup virt-manager-0.6.1/src/vmm-details.glade new/src/vmm-details.glade --- virt-manager-0.6.1/src/vmm-details.glade 2009-01-26 14:33:33.000000000 -0500 +++ new/src/vmm-details.glade 2009-03-04 12:31:51.000000000 -0500 @@ -218,15 +218,15 @@ - + True Ctrl+Alt+Backspace True - + - + True Ctrl+Alt+Delete True virt-manager-0.6.1-fix-stats-prefs.patch: --- NEW FILE virt-manager-0.6.1-fix-stats-prefs.patch --- # HG changeset patch # User Cole Robinson # Date 1234829084 18000 # Node ID ae434ddf4b7073773347f3d1cc449385db7267fd # Parent 7238b8b438bc3311b744debfb576849dbc262cda Fix regression for pre existing vm and stats preferences not keeping new values. diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade --- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500 +++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500 @@ -1,6 +1,6 @@ - + Preferences @@ -37,19 +37,53 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 + + True + True + 0 0 60 1 5 0 + + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 300 5 5 0 + 0.01 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + True 0 @@ -61,50 +95,18 @@ - + True - True - 0 0 300 5 5 0 - 0.01 + 0 + samples - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 60 1 5 0 - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maintain history of - - + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -141,18 +143,79 @@ 3 3 - + + True + 0 + CPU Usage + PANGO_ELLIPSIZE_END + + + GTK_FILL + + + + + True + 0 + Memory Usage + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Disk I/O + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Network I/O + + + 3 + 4 + GTK_FILL + + + + True True 0 True - + 1 2 - 3 - 4 + GTK_EXPAND + + + + + True + True + 0 + True + + + + 1 + 2 + 1 + 2 GTK_EXPAND @@ -173,80 +236,19 @@ - + True True 0 True - + 1 2 - 1 - 2 - GTK_EXPAND - - - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - 3 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL + GTK_EXPAND @@ -302,19 +304,27 @@ 1 2 - + True Never -When fullscreen -On mouse over +For all new domains +For all domains + - 3 - 4 + 1 + 2 5 + + True + 0 + Automatically open consoles: + + + True 0 @@ -326,22 +336,16 @@ - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains +When fullscreen +On mouse over + - 1 - 2 + 3 + 4 5 @@ -380,6 +384,13 @@ 1 8 + + True + 0 + Install Audio Device: + + + True 12 @@ -417,13 +428,6 @@ 2 - - - True - 0 - Install Audio Device: - - @@ -470,7 +474,7 @@ True True True - gtk-help + gtk-help True 0 @@ -500,7 +504,7 @@ True True True - gtk-close + gtk-close True 0 virt-manager-0.6.1-update-polish.patch: --- NEW FILE virt-manager-0.6.1-update-polish.patch --- # HG changeset patch # User Cole Robinson # Date 1234794921 18000 # Node ID 7238b8b438bc3311b744debfb576849dbc262cda # Parent 9d1aa6fcf42681caba0d9c50e15ffa6d10d9f8af Updated pl translation. diff -r 9d1aa6fcf426 -r 7238b8b438bc po/pl.po --- a/po/pl.po Sun Feb 15 21:40:21 2009 -0500 +++ b/po/pl.po Mon Feb 16 09:35:21 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 20:36+0100\n" -"PO-Revision-Date: 2008-12-12 20:46+0100\n" +"POT-Creation-Date: 2009-02-06 17:03+0100\n" +"PO-Revision-Date: 2009-02-06 20:23+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ #. ...the risk is we catch too much though #. Damned if we do, damned if we dont :-)( -#: ../src/virt-manager.py.in:264 +#: ../src/virt-manager.py.in:284 #, python-format msgid "Unable to initialize GTK: %s" msgstr "Nie mo??na zainicjowa?? GTK: %s" @@ -41,99 +41,138 @@ msgstr "Urz??dzenie d??wi??kowe instalacji dla zdalnej maszyny wirtualnej" #: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "Sonda?? statystyk procesora" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia dysku" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "Sonda?? statystyk u??ycia pami??ci" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia sieci" + +#: ../src/virt-manager.schemas.in.h:7 msgid "Show VCPU count in summary" msgstr "Wy??wietl podsumowanie licznika wirtualnych procesor??w" -#: ../src/virt-manager.schemas.in.h:4 +#: ../src/virt-manager.schemas.in.h:8 msgid "Show cpu usage in summary" msgstr "Wy??wietl podsumowanie u??ycia procesora" -#: ../src/virt-manager.schemas.in.h:5 +#: ../src/virt-manager.schemas.in.h:9 msgid "Show disk I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia dysku" -#: ../src/virt-manager.schemas.in.h:6 +#: ../src/virt-manager.schemas.in.h:10 msgid "Show domain id in summary" msgstr "Wy??wietl podsumowanie identyfikatora domeny" -#: ../src/virt-manager.schemas.in.h:7 +#: ../src/virt-manager.schemas.in.h:11 msgid "Show memory usage in summary" msgstr "Wy??wietl podsumowanie u??ycia pami??ci" -#: ../src/virt-manager.schemas.in.h:8 +#: ../src/virt-manager.schemas.in.h:12 msgid "Show network I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia sieci" -#: ../src/virt-manager.schemas.in.h:9 +#: ../src/virt-manager.schemas.in.h:13 msgid "Show run state in summary" msgstr "Wy??wietl podsumowanie stanu uruchomienia" -#: ../src/virt-manager.schemas.in.h:10 +#: ../src/virt-manager.schemas.in.h:14 msgid "Show the cpu usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia procesora w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:11 +#: ../src/virt-manager.schemas.in.h:15 msgid "Show the disk I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia dysku w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:12 +#: ../src/virt-manager.schemas.in.h:16 msgid "Show the domain id field in the domain list summary view" msgstr "Wy??wietl pole identyfikatora domeny w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:13 +#: ../src/virt-manager.schemas.in.h:17 msgid "Show the memory usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia pami??ci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:14 +#: ../src/virt-manager.schemas.in.h:18 msgid "Show the network I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia sieci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:15 +#: ../src/virt-manager.schemas.in.h:19 msgid "Show the run state field in the domain list summary view" msgstr "Wy??wietl pole stanu uruchomienia w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:16 +#: ../src/virt-manager.schemas.in.h:20 msgid "Show the virtual CPU count field in the domain list summary view" msgstr "" "Wy??wietl pole licznika wirtualnych procesor??w w widoku podsumowania listy " "domen" -#: ../src/virt-manager.schemas.in.h:17 +#: ../src/virt-manager.schemas.in.h:21 msgid "The length of the list of URLs" msgstr "D??ugo???? listy URL-i" -#: ../src/virt-manager.schemas.in.h:18 +#: ../src/virt-manager.schemas.in.h:22 msgid "The number of samples to keep in the statistics history" msgstr "Liczba przyk??ad??w przechowywanych w historii statystyk" -#: ../src/virt-manager.schemas.in.h:19 +#: ../src/virt-manager.schemas.in.h:23 msgid "" "The number of urls to keep in the history for the install media address page." msgstr "" "Liczba URL-i przechowywanych w historii strony adresowej no??nika " "instalacyjnego." -#: ../src/virt-manager.schemas.in.h:20 +#: ../src/virt-manager.schemas.in.h:24 msgid "The statistics history length" msgstr "D??ugo???? historii statystyk" -#: ../src/virt-manager.schemas.in.h:21 +#: ../src/virt-manager.schemas.in.h:25 msgid "The statistics update interval" msgstr "Cz??sto???? aktualizacji statystyk" -#: ../src/virt-manager.schemas.in.h:22 +#: ../src/virt-manager.schemas.in.h:26 msgid "The statistics update interval in seconds" msgstr "Cz??sto???? aktualizacji statystyk w sekundach" -#: ../src/virt-manager.schemas.in.h:23 +#: ../src/virt-manager.schemas.in.h:27 msgid "When to grab keyboard input for the console" msgstr "Kiedy przechwyci?? wej??cie klawiatury w konsoli" -#: ../src/virt-manager.schemas.in.h:24 +#: ../src/virt-manager.schemas.in.h:28 msgid "When to pop up a console for a guest" msgstr "Kiedy wy??wietli?? konsol?? go??cia" -#: ../src/virt-manager.schemas.in.h:25 +#: ../src/virt-manager.schemas.in.h:29 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia dysku maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia sieci maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i procesora maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "" +"Whether or not the app will poll connection and VM memory usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i pami??ci maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:33 msgid "" "Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " "in full screen mode, 2 = when mouse is over console" @@ -141,15 +180,15 @@ "Kiedy przechwyci?? wej??cie klawiatury w konsoli go??cia. 0 = nigdy, 1 = tylko " "w trybie pe??noekranowym, 2 = kiedy mysz jest nad konsol??" -#: ../src/virt-manager.schemas.in.h:26 +#: ../src/virt-manager.schemas.in.h:34 msgid "Whether to install a sound device for local VMs or not" msgstr "Czy instalowa?? urz??dzenie d??wi??kowe dla lokalnej maszyny wirtualnej" [...3161 lines suppressed...] -#: ../src/vmm-details.glade.h:118 +#: ../src/vmm-details.glade.h:103 msgid "_Take Screenshot" msgstr "_Wykonaj zrzut ekranu" -#: ../src/vmm-details.glade.h:119 ../src/vmm-manager.glade.h:22 +#: ../src/vmm-details.glade.h:104 ../src/vmm-manager.glade.h:22 msgid "_View" msgstr "_Widok" -#: ../src/vmm-details.glade.h:120 -msgid "disk\t" -msgstr "dysk\t" - -#: ../src/vmm-details.glade.h:121 -msgid "insert sound model" -msgstr "wstaw model d??wi??ku" - #: ../src/vmm-host.glade.h:2 msgid "IPv4 configuration" msgstr "Konfiguracja IPv4" @@ -3042,7 +3065,7 @@ msgid "Forwarding:" msgstr "Przekazywanie:" -#: ../src/vmm-host.glade.h:21 +#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:10 msgid "Host Details" msgstr "Szczeg????y hosta" @@ -3090,18 +3113,10 @@ msgid "Stop Pool" msgstr "Zatrzymaj pul??" -#: ../src/vmm-host.glade.h:39 -msgid "Storage Pools" -msgstr "Pule pami??ci masowej" - #: ../src/vmm-host.glade.h:40 msgid "Virtual Networks" msgstr "Sieci wirtualne" -#: ../src/vmm-host.glade.h:41 -msgid "Xen" -msgstr "Xen" - #: ../src/vmm-manager.glade.h:1 msgid "Add Connection..." msgstr "Dodaj po????czenie..." @@ -3116,21 +3131,21 @@ "Aktywne maszyny wirtualne\n" "Nieaktywne maszyny wirtualne" -#: ../src/vmm-manager.glade.h:6 -msgid "Connection Details..." -msgstr "Szczeg????y po????czenia..." +#: ../src/vmm-manager.glade.h:5 ../src/vmm-preferences.glade.h:6 +msgid "CPU Usage" +msgstr "U??ycie procesora" #: ../src/vmm-manager.glade.h:7 -msgid "Delete Machine" -msgstr "Usu?? maszyn??" +msgid "Delete Virtual Machine" +msgstr "Usu?? maszyn?? wirtualn??" #: ../src/vmm-manager.glade.h:9 msgid "Domain ID" msgstr "Identyfikator domeny" -#: ../src/vmm-manager.glade.h:10 -msgid "Machine Details..." -msgstr "Szczeg????y maszyny..." +#: ../src/vmm-manager.glade.h:11 ../src/vmm-preferences.glade.h:12 +msgid "Memory Usage" +msgstr "U??ycie pami??ci" #: ../src/vmm-manager.glade.h:13 msgid "Restore a saved machine from a filesystem image" @@ -3141,8 +3156,8 @@ msgstr "Przywr???? zapisan?? maszyn??..." #: ../src/vmm-manager.glade.h:16 -msgid "Virtual CPUs" -msgstr "Wirtualne procesory" +msgid "Virtual Machine Details" +msgstr "Szczeg????y maszyny wirtualnej" #: ../src/vmm-manager.glade.h:19 msgid "_Edit" @@ -3205,56 +3220,48 @@ msgstr "Konsole" #: ../src/vmm-preferences.glade.h:2 -msgid "New VM Preferences" -msgstr "Preferencje nowej maszyny wirtualnej" +msgid "Enable Stats Polling" +msgstr "W????cz sonda?? statystyk" #: ../src/vmm-preferences.glade.h:3 -msgid "Status monitoring" -msgstr "Stan monitorowania" +msgid "New VM" +msgstr "Nowa maszyna wirtualna" #: ../src/vmm-preferences.glade.h:4 -msgid "Auto Console" -msgstr "Automatyczna konsola" +msgid "Stats Options" +msgstr "Opcje statystyk" #: ../src/vmm-preferences.glade.h:5 msgid "Automatically open consoles:" msgstr "Automatycznie otw??rz konsole:" -#: ../src/vmm-preferences.glade.h:6 -msgid "Grab Keyboard" -msgstr "Przechwy?? klawiatur??" - -#: ../src/vmm-preferences.glade.h:7 +#: ../src/vmm-preferences.glade.h:8 msgid "Grab keyboard input:" msgstr "Przechwy?? wej??cie klawiatury:" -#: ../src/vmm-preferences.glade.h:8 -msgid "History Samples" -msgstr "Przyk??ady historii" - #: ../src/vmm-preferences.glade.h:9 msgid "Install Audio Device:" msgstr "Urz??dzenie d??wi??kowe instalacji:" #: ../src/vmm-preferences.glade.h:10 -msgid "Local VM" +msgid "Local virtual machine" msgstr "Lokalna maszyna wirtualna" #: ../src/vmm-preferences.glade.h:11 msgid "Maintain history of" msgstr "Zarz??dzaj histori??" -#: ../src/vmm-preferences.glade.h:12 +#: ../src/vmm-preferences.glade.h:14 msgid "" "Never\n" -"For new domains\n" +"For all new domains\n" "For all domains" msgstr "" "Nigdy\n" -"Dla nowych domen\n" +"Dla wszystkich nowych domen\n" "Dla wszystkich domen" -#: ../src/vmm-preferences.glade.h:15 +#: ../src/vmm-preferences.glade.h:17 msgid "" "Never\n" "When fullscreen\n" @@ -3264,26 +3271,30 @@ "Kiedy jest na pe??nym ekranie\n" "Przy najechaniu mysz??" -#: ../src/vmm-preferences.glade.h:18 +#: ../src/vmm-preferences.glade.h:20 msgid "Preferences" msgstr "Preferencje" -#: ../src/vmm-preferences.glade.h:19 -msgid "Remote VM" +#: ../src/vmm-preferences.glade.h:21 +msgid "Remote virtual machine" msgstr "Zdalna maszyna wirtualna" -#: ../src/vmm-preferences.glade.h:20 -msgid "Status Interval" -msgstr "Cz??sto???? stanu" +#: ../src/vmm-preferences.glade.h:22 +msgid "Stats" +msgstr "Statystyki" -#: ../src/vmm-preferences.glade.h:21 +#: ../src/vmm-preferences.glade.h:23 msgid "Update status every" msgstr "Zaktualizuj stan co" -#: ../src/vmm-preferences.glade.h:22 +#: ../src/vmm-preferences.glade.h:24 +msgid "VM Details" +msgstr "Szczeg????y maszyny wirtualnej" + +#: ../src/vmm-preferences.glade.h:25 msgid "samples" msgstr "przyk??ady" -#: ../src/vmm-preferences.glade.h:23 +#: ../src/vmm-preferences.glade.h:26 msgid "seconds" msgstr "sekundy" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-9/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 1 Dec 2008 17:37:42 -0000 1.20 +++ .cvsignore 4 Mar 2009 18:28:03 -0000 1.21 @@ -1 +1 @@ -virt-manager-0.6.0.tar.gz +virt-manager-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-9/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 1 Dec 2008 17:37:42 -0000 1.20 +++ sources 4 Mar 2009 18:28:03 -0000 1.21 @@ -1 +1 @@ -fd0acd111f180a0766b08d5f42cf5468 virt-manager-0.6.0.tar.gz +9c4eeaf447919b425f890b6bff715512 virt-manager-0.6.1.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-9/virt-manager.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- virt-manager.spec 7 Dec 2008 21:16:11 -0000 1.39 +++ virt-manager.spec 4 Mar 2009 18:28:04 -0000 1.40 @@ -7,7 +7,7 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.6.0 +Version: 0.6.1 Release: 1%{_extra_release} Summary: Virtual Machine Manager @@ -15,17 +15,9 @@ License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.pam -Source2: %{name}.console -Patch1: %{name}-%{version}-polkit-root.patch -Patch2: %{name}-%{version}-conn-details-sensitivity.patch -Patch3: %{name}-%{version}-populate-hostinfo-early.patch -Patch4: %{name}-%{version}-update-potfiles.patch -Patch5: %{name}-%{version}-update-translations.patch -Patch6: %{name}-%{version}-multiple-sound-dev.patch -Patch7: %{name}-%{version}-vol-copy-popup.patch -Patch8: %{name}-%{version}-connect-variable-typo.patch -Patch9: %{name}-%{version}-fix-virt-type-desc.patch +Patch1: %{name}-%{version}-update-polish.patch +Patch2: %{name}-%{version}-fix-cadl.patch +Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -59,14 +51,16 @@ Requires: librsvg2 # Earlier vte had broken python binding module Requires: vte >= 0.12.2 -# For the consolehelper PAM stuff -Requires: usermode # For online help Requires: scrollkeeper # For console widget Requires: gtk-vnc-python >= 0.3.4 # For local authentication against PolicyKit +%if 0%{?fedora} >= 11 +Requires: PolicyKit-authentication-agent +%else if 0%{?fedora} >= 9 Requires: PolicyKit-gnome +%endif BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -98,12 +92,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %configure @@ -115,15 +103,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la -# Adjust for console-helper magic -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name} -ln -s ../bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/%{name} - %find_lang %{name} %clean @@ -161,10 +140,7 @@ %defattr(-,root,root,-) %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas -%config(noreplace) %{_sysconfdir}/pam.d/%{name} -%{_sysconfdir}/security/console.apps/%{name} %{_bindir}/%{name} -%{_sbindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/* @@ -193,6 +169,13 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Mar 4 2009 Cole Robinson - 0.6.1-1.fc9 +- Update to 0.6.1 release +- Disk and Network VM stats reporting +- VM Migration support +- Support adding sound devices to existing VMs +- Allow specifying device model when adding a network device to an existing VM + * Mon Dec 1 2008 Cole Robinson - 0.6.0-1.fc9 - Update to 0.6.0 release with additional fixes from rawhide/F10 - Add libvirt storage management support --- virt-manager-0.6.0-conn-details-sensitivity.patch DELETED --- --- virt-manager-0.6.0-connect-variable-typo.patch DELETED --- --- virt-manager-0.6.0-fix-virt-type-desc.patch DELETED --- --- virt-manager-0.6.0-multiple-sound-dev.patch DELETED --- --- virt-manager-0.6.0-polkit-root.patch DELETED --- --- virt-manager-0.6.0-populate-hostinfo-early.patch DELETED --- --- virt-manager-0.6.0-update-potfiles.patch DELETED --- --- virt-manager-0.6.0-update-translations.patch DELETED --- --- virt-manager-0.6.0-vol-copy-popup.patch DELETED --- --- virt-manager.console DELETED --- --- virt-manager.pam DELETED --- From crobinso at fedoraproject.org Wed Mar 4 18:28:54 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Wed, 4 Mar 2009 18:28:54 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/F-10 virt-manager-0.6.1-fix-cadl.patch, NONE, 1.1 virt-manager-0.6.1-fix-stats-prefs.patch, NONE, 1.1 virt-manager-0.6.1-update-polish.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 virt-manager.spec, 1.39, 1.40 virt-manager-0.6.0-conn-details-sensitivity.patch, 1.1, NONE virt-manager-0.6.0-connect-variable-typo.patch, 1.1, NONE virt-manager-0.6.0-fix-virt-type-desc.patch, 1.2, NONE virt-manager-0.6.0-multiple-sound-dev.patch, 1.1, NONE virt-manager-0.6.0-polkit-root.patch, 1.2, NONE virt-manager-0.6.0-populate-hostinfo-early.patch, 1.1, NONE virt-manager-0.6.0-update-potfiles.patch, 1.1, NONE virt-manager-0.6.0-update-translations.patch, 1.1, NONE virt-manager-0.6.0-vol-copy-popup.patch, 1.1, NONE virt-manager.console, 1.1, NONE virt-manager.pam, 1.1, NONE Message-ID: <20090304182854.E7FD370116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4051 Modified Files: .cvsignore sources virt-manager.spec Added Files: virt-manager-0.6.1-fix-cadl.patch virt-manager-0.6.1-fix-stats-prefs.patch virt-manager-0.6.1-update-polish.patch Removed Files: virt-manager-0.6.0-conn-details-sensitivity.patch virt-manager-0.6.0-connect-variable-typo.patch virt-manager-0.6.0-fix-virt-type-desc.patch virt-manager-0.6.0-multiple-sound-dev.patch virt-manager-0.6.0-polkit-root.patch virt-manager-0.6.0-populate-hostinfo-early.patch virt-manager-0.6.0-update-potfiles.patch virt-manager-0.6.0-update-translations.patch virt-manager-0.6.0-vol-copy-popup.patch virt-manager.console virt-manager.pam Log Message: Update to 0.6.1 release Disk and Network VM stats reporting VM Migration support Support adding sound devices to existing VMs Allow specifying device model when adding a network device to an existing VM virt-manager-0.6.1-fix-cadl.patch: --- NEW FILE virt-manager-0.6.1-fix-cadl.patch --- diff -rup virt-manager-0.6.1/src/vmm-details.glade new/src/vmm-details.glade --- virt-manager-0.6.1/src/vmm-details.glade 2009-01-26 14:33:33.000000000 -0500 +++ new/src/vmm-details.glade 2009-03-04 12:31:51.000000000 -0500 @@ -218,15 +218,15 @@ - + True Ctrl+Alt+Backspace True - + - + True Ctrl+Alt+Delete True virt-manager-0.6.1-fix-stats-prefs.patch: --- NEW FILE virt-manager-0.6.1-fix-stats-prefs.patch --- # HG changeset patch # User Cole Robinson # Date 1234829084 18000 # Node ID ae434ddf4b7073773347f3d1cc449385db7267fd # Parent 7238b8b438bc3311b744debfb576849dbc262cda Fix regression for pre existing vm and stats preferences not keeping new values. diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade --- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500 +++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500 @@ -1,6 +1,6 @@ - + Preferences @@ -37,19 +37,53 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 + + True + True + 0 0 60 1 5 0 + + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 0 300 5 5 0 + 0.01 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + True 0 @@ -61,50 +95,18 @@ - + True - True - 0 0 300 5 5 0 - 0.01 + 0 + samples - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - 0 0 60 1 5 0 - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maintain history of - - + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -141,18 +143,79 @@ 3 3 - + + True + 0 + CPU Usage + PANGO_ELLIPSIZE_END + + + GTK_FILL + + + + + True + 0 + Memory Usage + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Disk I/O + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Network I/O + + + 3 + 4 + GTK_FILL + + + + True True 0 True - + 1 2 - 3 - 4 + GTK_EXPAND + + + + + True + True + 0 + True + + + + 1 + 2 + 1 + 2 GTK_EXPAND @@ -173,80 +236,19 @@ - + True True 0 True - + 1 2 - 1 - 2 - GTK_EXPAND - - - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - 3 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL + GTK_EXPAND @@ -302,19 +304,27 @@ 1 2 - + True Never -When fullscreen -On mouse over +For all new domains +For all domains + - 3 - 4 + 1 + 2 5 + + True + 0 + Automatically open consoles: + + + True 0 @@ -326,22 +336,16 @@ - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains +When fullscreen +On mouse over + - 1 - 2 + 3 + 4 5 @@ -380,6 +384,13 @@ 1 8 + + True + 0 + Install Audio Device: + + + True 12 @@ -417,13 +428,6 @@ 2 - - - True - 0 - Install Audio Device: - - @@ -470,7 +474,7 @@ True True True - gtk-help + gtk-help True 0 @@ -500,7 +504,7 @@ True True True - gtk-close + gtk-close True 0 virt-manager-0.6.1-update-polish.patch: --- NEW FILE virt-manager-0.6.1-update-polish.patch --- # HG changeset patch # User Cole Robinson # Date 1234794921 18000 # Node ID 7238b8b438bc3311b744debfb576849dbc262cda # Parent 9d1aa6fcf42681caba0d9c50e15ffa6d10d9f8af Updated pl translation. diff -r 9d1aa6fcf426 -r 7238b8b438bc po/pl.po --- a/po/pl.po Sun Feb 15 21:40:21 2009 -0500 +++ b/po/pl.po Mon Feb 16 09:35:21 2009 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 20:36+0100\n" -"PO-Revision-Date: 2008-12-12 20:46+0100\n" +"POT-Creation-Date: 2009-02-06 17:03+0100\n" +"PO-Revision-Date: 2009-02-06 20:23+0100\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ #. ...the risk is we catch too much though #. Damned if we do, damned if we dont :-)( -#: ../src/virt-manager.py.in:264 +#: ../src/virt-manager.py.in:284 #, python-format msgid "Unable to initialize GTK: %s" msgstr "Nie mo??na zainicjowa?? GTK: %s" @@ -41,99 +41,138 @@ msgstr "Urz??dzenie d??wi??kowe instalacji dla zdalnej maszyny wirtualnej" #: ../src/virt-manager.schemas.in.h:3 +msgid "Poll cpu stats" +msgstr "Sonda?? statystyk procesora" + +#: ../src/virt-manager.schemas.in.h:4 +msgid "Poll disk i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia dysku" + +#: ../src/virt-manager.schemas.in.h:5 +msgid "Poll memory usage stats" +msgstr "Sonda?? statystyk u??ycia pami??ci" + +#: ../src/virt-manager.schemas.in.h:6 +msgid "Poll net i/o stats" +msgstr "Sonda?? statystyk wej??cia/wyj??cia sieci" + +#: ../src/virt-manager.schemas.in.h:7 msgid "Show VCPU count in summary" msgstr "Wy??wietl podsumowanie licznika wirtualnych procesor??w" -#: ../src/virt-manager.schemas.in.h:4 +#: ../src/virt-manager.schemas.in.h:8 msgid "Show cpu usage in summary" msgstr "Wy??wietl podsumowanie u??ycia procesora" -#: ../src/virt-manager.schemas.in.h:5 +#: ../src/virt-manager.schemas.in.h:9 msgid "Show disk I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia dysku" -#: ../src/virt-manager.schemas.in.h:6 +#: ../src/virt-manager.schemas.in.h:10 msgid "Show domain id in summary" msgstr "Wy??wietl podsumowanie identyfikatora domeny" -#: ../src/virt-manager.schemas.in.h:7 +#: ../src/virt-manager.schemas.in.h:11 msgid "Show memory usage in summary" msgstr "Wy??wietl podsumowanie u??ycia pami??ci" -#: ../src/virt-manager.schemas.in.h:8 +#: ../src/virt-manager.schemas.in.h:12 msgid "Show network I/O in summary" msgstr "Wy??wietl podsumowanie wej??cia/wyj??cia sieci" -#: ../src/virt-manager.schemas.in.h:9 +#: ../src/virt-manager.schemas.in.h:13 msgid "Show run state in summary" msgstr "Wy??wietl podsumowanie stanu uruchomienia" -#: ../src/virt-manager.schemas.in.h:10 +#: ../src/virt-manager.schemas.in.h:14 msgid "Show the cpu usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia procesora w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:11 +#: ../src/virt-manager.schemas.in.h:15 msgid "Show the disk I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia dysku w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:12 +#: ../src/virt-manager.schemas.in.h:16 msgid "Show the domain id field in the domain list summary view" msgstr "Wy??wietl pole identyfikatora domeny w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:13 +#: ../src/virt-manager.schemas.in.h:17 msgid "Show the memory usage field in the domain list summary view" msgstr "Wy??wietl pole u??ycia pami??ci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:14 +#: ../src/virt-manager.schemas.in.h:18 msgid "Show the network I/O field in the domain list summary view" msgstr "Wy??wietl pole wej??cia/wyj??cia sieci w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:15 +#: ../src/virt-manager.schemas.in.h:19 msgid "Show the run state field in the domain list summary view" msgstr "Wy??wietl pole stanu uruchomienia w widoku podsumowania listy domen" -#: ../src/virt-manager.schemas.in.h:16 +#: ../src/virt-manager.schemas.in.h:20 msgid "Show the virtual CPU count field in the domain list summary view" msgstr "" "Wy??wietl pole licznika wirtualnych procesor??w w widoku podsumowania listy " "domen" -#: ../src/virt-manager.schemas.in.h:17 +#: ../src/virt-manager.schemas.in.h:21 msgid "The length of the list of URLs" msgstr "D??ugo???? listy URL-i" -#: ../src/virt-manager.schemas.in.h:18 +#: ../src/virt-manager.schemas.in.h:22 msgid "The number of samples to keep in the statistics history" msgstr "Liczba przyk??ad??w przechowywanych w historii statystyk" -#: ../src/virt-manager.schemas.in.h:19 +#: ../src/virt-manager.schemas.in.h:23 msgid "" "The number of urls to keep in the history for the install media address page." msgstr "" "Liczba URL-i przechowywanych w historii strony adresowej no??nika " "instalacyjnego." -#: ../src/virt-manager.schemas.in.h:20 +#: ../src/virt-manager.schemas.in.h:24 msgid "The statistics history length" msgstr "D??ugo???? historii statystyk" -#: ../src/virt-manager.schemas.in.h:21 +#: ../src/virt-manager.schemas.in.h:25 msgid "The statistics update interval" msgstr "Cz??sto???? aktualizacji statystyk" -#: ../src/virt-manager.schemas.in.h:22 +#: ../src/virt-manager.schemas.in.h:26 msgid "The statistics update interval in seconds" msgstr "Cz??sto???? aktualizacji statystyk w sekundach" -#: ../src/virt-manager.schemas.in.h:23 +#: ../src/virt-manager.schemas.in.h:27 msgid "When to grab keyboard input for the console" msgstr "Kiedy przechwyci?? wej??cie klawiatury w konsoli" -#: ../src/virt-manager.schemas.in.h:24 +#: ../src/virt-manager.schemas.in.h:28 msgid "When to pop up a console for a guest" msgstr "Kiedy wy??wietli?? konsol?? go??cia" -#: ../src/virt-manager.schemas.in.h:25 +#: ../src/virt-manager.schemas.in.h:29 +msgid "Whether or not the app will poll VM disk i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia dysku maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:30 +msgid "Whether or not the app will poll VM network i/o statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki wej??cia/wyj??cia sieci maszyny wirtualnej" + +#: ../src/virt-manager.schemas.in.h:31 +msgid "Whether or not the app will poll connection and VM cpu usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i procesora maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:32 +msgid "" +"Whether or not the app will poll connection and VM memory usage statistics" +msgstr "" +"Czy aplikacja ma sondowa?? statystyki u??ycia po????czenia i pami??ci maszyny " +"wirtualnej" + +#: ../src/virt-manager.schemas.in.h:33 msgid "" "Whether to grab keyboard input for a guest console. 0 = never, 1 = only when " "in full screen mode, 2 = when mouse is over console" @@ -141,15 +180,15 @@ "Kiedy przechwyci?? wej??cie klawiatury w konsoli go??cia. 0 = nigdy, 1 = tylko " "w trybie pe??noekranowym, 2 = kiedy mysz jest nad konsol??" -#: ../src/virt-manager.schemas.in.h:26 +#: ../src/virt-manager.schemas.in.h:34 msgid "Whether to install a sound device for local VMs or not" msgstr "Czy instalowa?? urz??dzenie d??wi??kowe dla lokalnej maszyny wirtualnej" [...3161 lines suppressed...] -#: ../src/vmm-details.glade.h:118 +#: ../src/vmm-details.glade.h:103 msgid "_Take Screenshot" msgstr "_Wykonaj zrzut ekranu" -#: ../src/vmm-details.glade.h:119 ../src/vmm-manager.glade.h:22 +#: ../src/vmm-details.glade.h:104 ../src/vmm-manager.glade.h:22 msgid "_View" msgstr "_Widok" -#: ../src/vmm-details.glade.h:120 -msgid "disk\t" -msgstr "dysk\t" - -#: ../src/vmm-details.glade.h:121 -msgid "insert sound model" -msgstr "wstaw model d??wi??ku" - #: ../src/vmm-host.glade.h:2 msgid "IPv4 configuration" msgstr "Konfiguracja IPv4" @@ -3042,7 +3065,7 @@ msgid "Forwarding:" msgstr "Przekazywanie:" -#: ../src/vmm-host.glade.h:21 +#: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:10 msgid "Host Details" msgstr "Szczeg????y hosta" @@ -3090,18 +3113,10 @@ msgid "Stop Pool" msgstr "Zatrzymaj pul??" -#: ../src/vmm-host.glade.h:39 -msgid "Storage Pools" -msgstr "Pule pami??ci masowej" - #: ../src/vmm-host.glade.h:40 msgid "Virtual Networks" msgstr "Sieci wirtualne" -#: ../src/vmm-host.glade.h:41 -msgid "Xen" -msgstr "Xen" - #: ../src/vmm-manager.glade.h:1 msgid "Add Connection..." msgstr "Dodaj po????czenie..." @@ -3116,21 +3131,21 @@ "Aktywne maszyny wirtualne\n" "Nieaktywne maszyny wirtualne" -#: ../src/vmm-manager.glade.h:6 -msgid "Connection Details..." -msgstr "Szczeg????y po????czenia..." +#: ../src/vmm-manager.glade.h:5 ../src/vmm-preferences.glade.h:6 +msgid "CPU Usage" +msgstr "U??ycie procesora" #: ../src/vmm-manager.glade.h:7 -msgid "Delete Machine" -msgstr "Usu?? maszyn??" +msgid "Delete Virtual Machine" +msgstr "Usu?? maszyn?? wirtualn??" #: ../src/vmm-manager.glade.h:9 msgid "Domain ID" msgstr "Identyfikator domeny" -#: ../src/vmm-manager.glade.h:10 -msgid "Machine Details..." -msgstr "Szczeg????y maszyny..." +#: ../src/vmm-manager.glade.h:11 ../src/vmm-preferences.glade.h:12 +msgid "Memory Usage" +msgstr "U??ycie pami??ci" #: ../src/vmm-manager.glade.h:13 msgid "Restore a saved machine from a filesystem image" @@ -3141,8 +3156,8 @@ msgstr "Przywr???? zapisan?? maszyn??..." #: ../src/vmm-manager.glade.h:16 -msgid "Virtual CPUs" -msgstr "Wirtualne procesory" +msgid "Virtual Machine Details" +msgstr "Szczeg????y maszyny wirtualnej" #: ../src/vmm-manager.glade.h:19 msgid "_Edit" @@ -3205,56 +3220,48 @@ msgstr "Konsole" #: ../src/vmm-preferences.glade.h:2 -msgid "New VM Preferences" -msgstr "Preferencje nowej maszyny wirtualnej" +msgid "Enable Stats Polling" +msgstr "W????cz sonda?? statystyk" #: ../src/vmm-preferences.glade.h:3 -msgid "Status monitoring" -msgstr "Stan monitorowania" +msgid "New VM" +msgstr "Nowa maszyna wirtualna" #: ../src/vmm-preferences.glade.h:4 -msgid "Auto Console" -msgstr "Automatyczna konsola" +msgid "Stats Options" +msgstr "Opcje statystyk" #: ../src/vmm-preferences.glade.h:5 msgid "Automatically open consoles:" msgstr "Automatycznie otw??rz konsole:" -#: ../src/vmm-preferences.glade.h:6 -msgid "Grab Keyboard" -msgstr "Przechwy?? klawiatur??" - -#: ../src/vmm-preferences.glade.h:7 +#: ../src/vmm-preferences.glade.h:8 msgid "Grab keyboard input:" msgstr "Przechwy?? wej??cie klawiatury:" -#: ../src/vmm-preferences.glade.h:8 -msgid "History Samples" -msgstr "Przyk??ady historii" - #: ../src/vmm-preferences.glade.h:9 msgid "Install Audio Device:" msgstr "Urz??dzenie d??wi??kowe instalacji:" #: ../src/vmm-preferences.glade.h:10 -msgid "Local VM" +msgid "Local virtual machine" msgstr "Lokalna maszyna wirtualna" #: ../src/vmm-preferences.glade.h:11 msgid "Maintain history of" msgstr "Zarz??dzaj histori??" -#: ../src/vmm-preferences.glade.h:12 +#: ../src/vmm-preferences.glade.h:14 msgid "" "Never\n" -"For new domains\n" +"For all new domains\n" "For all domains" msgstr "" "Nigdy\n" -"Dla nowych domen\n" +"Dla wszystkich nowych domen\n" "Dla wszystkich domen" -#: ../src/vmm-preferences.glade.h:15 +#: ../src/vmm-preferences.glade.h:17 msgid "" "Never\n" "When fullscreen\n" @@ -3264,26 +3271,30 @@ "Kiedy jest na pe??nym ekranie\n" "Przy najechaniu mysz??" -#: ../src/vmm-preferences.glade.h:18 +#: ../src/vmm-preferences.glade.h:20 msgid "Preferences" msgstr "Preferencje" -#: ../src/vmm-preferences.glade.h:19 -msgid "Remote VM" +#: ../src/vmm-preferences.glade.h:21 +msgid "Remote virtual machine" msgstr "Zdalna maszyna wirtualna" -#: ../src/vmm-preferences.glade.h:20 -msgid "Status Interval" -msgstr "Cz??sto???? stanu" +#: ../src/vmm-preferences.glade.h:22 +msgid "Stats" +msgstr "Statystyki" -#: ../src/vmm-preferences.glade.h:21 +#: ../src/vmm-preferences.glade.h:23 msgid "Update status every" msgstr "Zaktualizuj stan co" -#: ../src/vmm-preferences.glade.h:22 +#: ../src/vmm-preferences.glade.h:24 +msgid "VM Details" +msgstr "Szczeg????y maszyny wirtualnej" + +#: ../src/vmm-preferences.glade.h:25 msgid "samples" msgstr "przyk??ady" -#: ../src/vmm-preferences.glade.h:23 +#: ../src/vmm-preferences.glade.h:26 msgid "seconds" msgstr "sekundy" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-10/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 10 Sep 2008 23:06:21 -0000 1.20 +++ .cvsignore 4 Mar 2009 18:28:23 -0000 1.21 @@ -1 +1 @@ -virt-manager-0.6.0.tar.gz +virt-manager-0.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-10/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 10 Sep 2008 23:06:21 -0000 1.20 +++ sources 4 Mar 2009 18:28:23 -0000 1.21 @@ -1 +1 @@ -fd0acd111f180a0766b08d5f42cf5468 virt-manager-0.6.0.tar.gz +9c4eeaf447919b425f890b6bff715512 virt-manager-0.6.1.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/F-10/virt-manager.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- virt-manager.spec 7 Dec 2008 21:22:22 -0000 1.39 +++ virt-manager.spec 4 Mar 2009 18:28:24 -0000 1.40 @@ -7,25 +7,17 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.6.0 -Release: 5%{_extra_release} +Version: 0.6.1 +Release: 1%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.pam -Source2: %{name}.console -Patch1: %{name}-%{version}-polkit-root.patch -Patch2: %{name}-%{version}-conn-details-sensitivity.patch -Patch3: %{name}-%{version}-populate-hostinfo-early.patch -Patch4: %{name}-%{version}-update-potfiles.patch -Patch5: %{name}-%{version}-update-translations.patch -Patch6: %{name}-%{version}-multiple-sound-dev.patch -Patch7: %{name}-%{version}-vol-copy-popup.patch -Patch8: %{name}-%{version}-connect-variable-typo.patch -Patch9: %{name}-%{version}-fix-virt-type-desc.patch +Patch1: %{name}-%{version}-update-polish.patch +Patch2: %{name}-%{version}-fix-cadl.patch +Patch3: %{name}-%{version}-fix-stats-prefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -59,14 +51,16 @@ Requires: librsvg2 # Earlier vte had broken python binding module Requires: vte >= 0.12.2 -# For the consolehelper PAM stuff -Requires: usermode # For online help Requires: scrollkeeper # For console widget Requires: gtk-vnc-python >= 0.3.4 # For local authentication against PolicyKit +%if 0%{?fedora} >= 11 +Requires: PolicyKit-authentication-agent +%else if 0%{?fedora} >= 9 Requires: PolicyKit-gnome +%endif BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -98,12 +92,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %configure @@ -115,15 +103,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la -# Adjust for console-helper magic -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name} -ln -s ../bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/%{name} - %find_lang %{name} %clean @@ -161,10 +140,7 @@ %defattr(-,root,root,-) %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas -%config(noreplace) %{_sysconfdir}/pam.d/%{name} -%{_sysconfdir}/security/console.apps/%{name} %{_bindir}/%{name} -%{_sbindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/* @@ -193,6 +169,13 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Mar 4 2009 Cole Robinson - 0.6.1-1.fc10 +- Update to 0.6.1 release +- Disk and Network VM stats reporting +- VM Migration support +- Support adding sound devices to existing VMs +- Allow specifying device model when adding a network device to an existing VM + * Sun Dec 7 2008 Cole Robinson - 0.6.0-5.fc10 - Fix a spelling error in virt descriptions - Fix gnome-python2-gnome requires regression (bz 474521) --- virt-manager-0.6.0-conn-details-sensitivity.patch DELETED --- --- virt-manager-0.6.0-connect-variable-typo.patch DELETED --- --- virt-manager-0.6.0-fix-virt-type-desc.patch DELETED --- --- virt-manager-0.6.0-multiple-sound-dev.patch DELETED --- --- virt-manager-0.6.0-polkit-root.patch DELETED --- --- virt-manager-0.6.0-populate-hostinfo-early.patch DELETED --- --- virt-manager-0.6.0-update-potfiles.patch DELETED --- --- virt-manager-0.6.0-update-translations.patch DELETED --- --- virt-manager-0.6.0-vol-copy-popup.patch DELETED --- --- virt-manager.console DELETED --- --- virt-manager.pam DELETED --- From veillard at fedoraproject.org Wed Mar 4 21:49:37 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Wed, 4 Mar 2009 21:49:37 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.114,1.115 Message-ID: <20090304214937.448CA70116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987 Modified Files: libvirt.spec Log Message: Maybe missing lzo-devel to link with gnulib-tls, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- libvirt.spec 4 Mar 2009 13:33:45 -0000 1.114 +++ libvirt.spec 4 Mar 2009 21:49:06 -0000 1.115 @@ -102,6 +102,7 @@ BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel +BuildRequires: lzo-devel BuildRequires: hal-devel %if %{with_avahi} BuildRequires: avahi-devel From veillard at fedoraproject.org Thu Mar 5 10:04:54 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Thu, 5 Mar 2009 10:04:54 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/F-9 libvirt.spec, 1.100, 1.101 sources, 1.37, 1.38 libvirt-0.6.0-autostart-timeout.patch, 1.1, NONE libvirt-0.6.0-dbus-threads.patch, 1.1, NONE libvirt-0.6.0-qemu-startup.patch, 1.1, NONE libvirt-0.6.0-rpccall.patch, 1.1, NONE libvirt-0.6.0-timeout.patch, 1.1, NONE Message-ID: <20090305100454.EEFCF70116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25668 Modified Files: libvirt.spec sources Removed Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: 0.6.1 upstream release, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- libvirt.spec 18 Feb 2009 14:15:19 -0000 1.100 +++ libvirt.spec 5 Mar 2009 10:04:24 -0000 1.101 @@ -46,16 +46,11 @@ Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.6.0 -Release: 3%{?dist}%{?extra_release} +Version: 0.6.1 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: %{name}-%{version}-timeout.patch -Patch2: %{name}-%{version}-rpccall.patch -Patch3: %{name}-%{version}-qemu-startup.patch -Patch4: %{name}-%{version}-dbus-threads.patch -Patch5: %{name}-%{version}-autostart-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -182,11 +177,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %if ! %{with_xen} @@ -259,7 +249,9 @@ %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -f Makefile Makefile.in) +(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) +(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) +(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la @@ -454,6 +446,7 @@ %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml +%doc examples %if %{with_python} %files python @@ -469,6 +462,12 @@ %endif %changelog +* Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc9 +- upstream release 0.6.1 +- support for node device detach reattach and reset +- sVirt mandatory access control support +- many bug fixes and small improvements + * Wed Feb 18 2009 Daniel P. Berrange - 0.6.0-3.fc9 - Fix QEMU startup timeout/race (rhbz #484649) - Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 6 Feb 2009 20:01:02 -0000 1.37 +++ sources 5 Mar 2009 10:04:24 -0000 1.38 @@ -1 +1 @@ -8e0120d5452b37179f682031bf0895ea libvirt-0.6.0.tar.gz +3154ea9d4a0778497dfdf58cb98127c0 libvirt-0.6.1.tar.gz --- libvirt-0.6.0-autostart-timeout.patch DELETED --- --- libvirt-0.6.0-dbus-threads.patch DELETED --- --- libvirt-0.6.0-qemu-startup.patch DELETED --- --- libvirt-0.6.0-rpccall.patch DELETED --- --- libvirt-0.6.0-timeout.patch DELETED --- From veillard at fedoraproject.org Thu Mar 5 10:10:49 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Thu, 5 Mar 2009 10:10:49 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt.spec,1.115,1.116 Message-ID: <20090305101049.BF4A870116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26497 Modified Files: libvirt.spec Log Message: Not related to lzo-devel, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- libvirt.spec 4 Mar 2009 21:49:06 -0000 1.115 +++ libvirt.spec 5 Mar 2009 10:10:19 -0000 1.116 @@ -102,7 +102,6 @@ BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel -BuildRequires: lzo-devel BuildRequires: hal-devel %if %{with_avahi} BuildRequires: avahi-devel From berrange at fedoraproject.org Thu Mar 5 12:38:31 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Thu, 5 Mar 2009 12:38:31 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.58,1.59 Message-ID: <20090305123831.ED43870116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3132 Modified Files: qemu.spec Log Message: Added BSD to license list Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- qemu.spec 4 Mar 2009 18:22:44 -0000 1.58 +++ qemu.spec 5 Mar 2009 12:38:01 -0000 1.59 @@ -1,11 +1,11 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.9.2 -Release: 0.1.kvm20090303git%{?dist} +Release: 0.2.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 -License: GPLv2+ and LGPLv2+ +License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools URL: http://www.qemu.org/ #Source0: http://www.qemu.org/%{name}-%{version}.tar.gz @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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 From veillard at fedoraproject.org Thu Mar 5 12:55:06 2009 From: veillard at fedoraproject.org (Daniel Veillard) Date: Thu, 5 Mar 2009 12:55:06 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.0-autostart-timeout.patch, 1.1, NONE libvirt-0.6.0-dbus-threads.patch, 1.1, NONE libvirt-0.6.0-qemu-startup.patch, 1.1, NONE libvirt-0.6.0-rpccall.patch, 1.2, NONE libvirt-0.6.0-timeout.patch, 1.2, NONE Message-ID: <20090305125506.687C470116@cvs1.fedora.phx.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5988 Removed Files: libvirt-0.6.0-autostart-timeout.patch libvirt-0.6.0-dbus-threads.patch libvirt-0.6.0-qemu-startup.patch libvirt-0.6.0-rpccall.patch libvirt-0.6.0-timeout.patch Log Message: Just removing the old 0.6.0 set of patches, Daniel --- libvirt-0.6.0-autostart-timeout.patch DELETED --- --- libvirt-0.6.0-dbus-threads.patch DELETED --- --- libvirt-0.6.0-qemu-startup.patch DELETED --- --- libvirt-0.6.0-rpccall.patch DELETED --- --- libvirt-0.6.0-timeout.patch DELETED --- From crobinso at fedoraproject.org Thu Mar 5 15:14:51 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 5 Mar 2009 15:14:51 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.57, 1.58 Message-ID: <20090305151451.6F27270116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28502 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-fix-file.patch Log Message: Fix virt-install --file option (bz 488731) virtinst-0.400.2-fix-file.patch: --- NEW FILE virtinst-0.400.2-fix-file.patch --- # HG changeset patch # User Cole Robinson # Date 1236265193 18000 # Node ID eae3579380dd2112393e0011c1b3212243c39d94 # Parent 8a1d27ec3458e1639f01d05a5d5d691f7e83baeb Fix using virt-install --file (it's outright broken) diff -r 8a1d27ec3458 -r eae3579380dd virt-install --- a/virt-install Thu Mar 05 09:58:15 2009 -0500 +++ b/virt-install Thu Mar 05 09:59:53 2009 -0500 @@ -168,7 +168,8 @@ if not devtype: devtype = virtinst.VirtualDisk.DEVICE_DISK - ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache) + ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, + cache) logging.debug("parse_disk: returning %s" % str(ret)) return ret @@ -178,9 +179,9 @@ # Get disk parameters if is_file_path: (path, voltuple, volinst, device, bus, readOnly, shared, size, - sparse) = \ + sparse, cache) = \ (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False, - False, size, sparse) + False, size, sparse, None) else: (path, voltuple, volinst, device, bus, readOnly, shared, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- python-virtinst.spec 4 Mar 2009 16:26:36 -0000 1.57 +++ python-virtinst.spec 5 Mar 2009 15:14:20 -0000 1.58 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch +Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -73,6 +75,9 @@ %{_bindir}/virt-convert %changelog +* Thu Mar 5 2009 Cole Robinson - 0.400.2-3.fc11 +- Fix virt-install --file option (bz 488731) + * Wed Mar 4 2009 Cole Robinson - 0.400.2-2.fc11 - Update polish translation (bz 310781) From crobinso at fedoraproject.org Thu Mar 5 15:25:17 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 5 Mar 2009 15:25:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-9 virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.46, 1.47 Message-ID: <20090305152517.3919070116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30413 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-fix-file.patch Log Message: Fix virt-install --file option (bz 488731) virtinst-0.400.2-fix-file.patch: --- NEW FILE virtinst-0.400.2-fix-file.patch --- # HG changeset patch # User Cole Robinson # Date 1236265193 18000 # Node ID eae3579380dd2112393e0011c1b3212243c39d94 # Parent 8a1d27ec3458e1639f01d05a5d5d691f7e83baeb Fix using virt-install --file (it's outright broken) diff -r 8a1d27ec3458 -r eae3579380dd virt-install --- a/virt-install Thu Mar 05 09:58:15 2009 -0500 +++ b/virt-install Thu Mar 05 09:59:53 2009 -0500 @@ -168,7 +168,8 @@ if not devtype: devtype = virtinst.VirtualDisk.DEVICE_DISK - ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache) + ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, + cache) logging.debug("parse_disk: returning %s" % str(ret)) return ret @@ -178,9 +179,9 @@ # Get disk parameters if is_file_path: (path, voltuple, volinst, device, bus, readOnly, shared, size, - sparse) = \ + sparse, cache) = \ (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False, - False, size, sparse) + False, size, sparse, None) else: (path, voltuple, volinst, device, bus, readOnly, shared, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- python-virtinst.spec 4 Mar 2009 17:44:06 -0000 1.46 +++ python-virtinst.spec 5 Mar 2009 15:24:46 -0000 1.47 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch +Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -73,6 +75,9 @@ %{_bindir}/virt-convert %changelog +* Thu Mar 5 2009 Cole Robinson - 0.400.2-2.fc9 +- Fix virt-install --file option (bz 488731) + * Wed Mar 4 2009 Cole Robinson - 0.400.2-1.fc9 - Update to version 0.400.2 - virt-install --import option for creating a guest from an existing disk From crobinso at fedoraproject.org Thu Mar 5 15:26:43 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Thu, 5 Mar 2009 15:26:43 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-10 virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.51, 1.52 Message-ID: <20090305152643.B207E70116@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30862 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.2-fix-file.patch Log Message: Fix virt-install --file option (bz 488731) virtinst-0.400.2-fix-file.patch: --- NEW FILE virtinst-0.400.2-fix-file.patch --- # HG changeset patch # User Cole Robinson # Date 1236265193 18000 # Node ID eae3579380dd2112393e0011c1b3212243c39d94 # Parent 8a1d27ec3458e1639f01d05a5d5d691f7e83baeb Fix using virt-install --file (it's outright broken) diff -r 8a1d27ec3458 -r eae3579380dd virt-install --- a/virt-install Thu Mar 05 09:58:15 2009 -0500 +++ b/virt-install Thu Mar 05 09:59:53 2009 -0500 @@ -168,7 +168,8 @@ if not devtype: devtype = virtinst.VirtualDisk.DEVICE_DISK - ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache) + ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, + cache) logging.debug("parse_disk: returning %s" % str(ret)) return ret @@ -178,9 +179,9 @@ # Get disk parameters if is_file_path: (path, voltuple, volinst, device, bus, readOnly, shared, size, - sparse) = \ + sparse, cache) = \ (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False, - False, size, sparse) + False, size, sparse, None) else: (path, voltuple, volinst, device, bus, readOnly, shared, Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- python-virtinst.spec 4 Mar 2009 16:28:31 -0000 1.51 +++ python-virtinst.spec 5 Mar 2009 15:26:13 -0000 1.52 @@ -11,9 +11,10 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.2 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-update-polish-trans.patch +Patch2: %{appname}-%{version}-fix-file.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +41,7 @@ %prep %setup -q -n %{appname}-%{version} %patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -73,6 +75,9 @@ %{_bindir}/virt-convert %changelog +* Thu Mar 5 2009 Cole Robinson - 0.400.2-2.fc10 +- Fix virt-install --file option (bz 488731) + * Wed Mar 4 2009 Cole Robinson - 0.400.2-1.fc10 - Update to version 0.400.2 - virt-install --import option for creating a guest from an existing disk From glommer at fedoraproject.org Thu Mar 5 20:01:26 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:01:26 +0000 (UTC) Subject: [fedora-virt-maint] rpms/kvm/devel dead.package, NONE, 1.1 kvm-62-block-rw-range-check.patch, 1.9, NONE kvm-83-compile-fixes.patch, 1.1, NONE kvm.modules, 1.1, NONE kvm.spec, 1.90, NONE sources, 1.43, NONE Message-ID: <20090305200126.43B1570116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/kvm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5715 Added Files: dead.package Removed Files: kvm-62-block-rw-range-check.patch kvm-83-compile-fixes.patch kvm.modules kvm.spec sources Log Message: dead package: obsoleted in favour of qemu --- NEW FILE dead.package --- Obsoleted by qemu --- kvm-62-block-rw-range-check.patch DELETED --- --- kvm-83-compile-fixes.patch DELETED --- --- kvm.modules DELETED --- --- kvm.spec DELETED --- --- sources DELETED --- From glommer at fedoraproject.org Thu Mar 5 20:03:43 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:03:43 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.59,1.60 Message-ID: <20090305200343.C643370116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5964 Modified Files: qemu.spec Log Message: Use bochs-bios instead of bochs-bios-data It's official: upstream set on 0.10 Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- qemu.spec 5 Mar 2009 12:38:01 -0000 1.59 +++ qemu.spec 5 Mar 2009 20:03:13 -0000 1.60 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.9.2 -Release: 0.2.kvm20090303git%{?dist} +Version: 0.10 +Release: 0.1.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -99,7 +99,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: etherboot-zroms-kvm Requires: vgabios -Requires: bochs-bios-data +Requires: bochs-bios Provides: kvm >= 84 Obsoletes: kvm < 85 @@ -422,6 +422,10 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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 From glommer at fedoraproject.org Thu Mar 5 20:06:59 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Thu, 5 Mar 2009 20:06:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.60,1.61 Message-ID: <20090305200659.9713170116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6488 Modified Files: qemu.spec Log Message: tag adjustment Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- qemu.spec 5 Mar 2009 20:03:13 -0000 1.60 +++ qemu.spec 5 Mar 2009 20:06:29 -0000 1.61 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.1.kvm20090303git%{?dist} +Release: 0.4.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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 From kraxel at fedoraproject.org Fri Mar 6 09:22:57 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Fri, 6 Mar 2009 09:22:57 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen.modules, 1.1, 1.2 xen.spec, 1.232, 1.233 Message-ID: <20090306092257.6F80D70116@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2845 Modified Files: xen.modules xen.spec Log Message: misc fixes Index: xen.modules =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.modules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen.modules 12 Jun 2007 13:50:13 -0000 1.1 +++ xen.modules 6 Mar 2009 09:22:26 -0000 1.2 @@ -1,9 +1,11 @@ #!/bin/sh -test -f /proc/xen/capabilities || exit 0 -grep -q "control_d" /proc/xen/capabilities || exit 0 +test -d /proc/xen || exit 0 +test -f /proc/xen/capabilities || mount -t xenfs xen /proc/xen +test -f /proc/xen/capabilities || exit 0 +grep -q "control_d" /proc/xen/capabilities || exit 0 -for m in blkbk netbk blktap xenblktap +for module in evtchn blkbk netbk do - modprobe $m >/dev/null 2>&1 + modprobe $m >/dev/null 2>&1 done Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- xen.spec 2 Mar 2009 10:51:58 -0000 1.232 +++ xen.spec 6 Mar 2009 09:22:27 -0000 1.233 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 7 +%define base_release 8 # Hypervisor ABI %define hv_abi 3.3 @@ -113,7 +113,7 @@ # installs xen. Requires: kpartx Prereq: chkconfig -ExclusiveArch: i386 i586 i686 x86_64 ia64 +ExclusiveArch: %{ix86} x86_64 ia64 %description This package contains the XenD daemon and xm command line @@ -195,6 +195,7 @@ 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 @@ -499,6 +500,11 @@ %{_libdir}/*.a %changelog +* Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-8 +- fix xen.modules init script for pv_ops kernel. +- stick rpm release tag into XEN_VENDORVERSION. +- use %{ix86} macro in ExclusiveArch. + * Mon Mar 2 2009 Gerd Hoffmann - 3.3.1-7 - fix xenstored init script for pv_ops kernel. From kraxel at fedoraproject.org Fri Mar 6 11:27:22 2009 From: kraxel at fedoraproject.org (Gerd Hoffmann) Date: Fri, 6 Mar 2009 11:27:22 +0000 (UTC) Subject: [fedora-virt-maint] rpms/xen/devel xen.modules, 1.2, 1.3 xen.spec, 1.233, 1.234 Message-ID: <20090306112722.4774770116@cvs1.fedora.phx.redhat.com> Author: kraxel Update of /cvs/pkgs/rpms/xen/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2895 Modified Files: xen.modules xen.spec Log Message: keep blktapctrl turned off by default, fix xen.modules tyops Index: xen.modules =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.modules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen.modules 6 Mar 2009 09:22:26 -0000 1.2 +++ xen.modules 6 Mar 2009 11:26:51 -0000 1.3 @@ -5,7 +5,6 @@ test -f /proc/xen/capabilities || exit 0 grep -q "control_d" /proc/xen/capabilities || exit 0 -for module in evtchn blkbk netbk -do - modprobe $m >/dev/null 2>&1 +for module in evtchn blkbk netbk; do + modprobe ${module} >/dev/null 2>&1 done Index: xen.spec =================================================================== RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- xen.spec 6 Mar 2009 09:22:27 -0000 1.233 +++ xen.spec 6 Mar 2009 11:26:51 -0000 1.234 @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.3.1 -%define base_release 8 +%define base_release 9 # Hypervisor ABI %define hv_abi 3.3 @@ -315,7 +315,7 @@ %post runtime /sbin/chkconfig --add xenconsoled /sbin/chkconfig --add xenstored -/sbin/chkconfig --add blktapctrl +#/sbin/chkconfig --add blktapctrl if [ $1 != 0 ]; then service xenconsoled condrestart @@ -500,10 +500,11 @@ %{_libdir}/*.a %changelog -* Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-8 +* Fri Mar 6 2009 Gerd Hoffmann - 3.3.1-9 - fix xen.modules init script for pv_ops kernel. - stick rpm release tag into XEN_VENDORVERSION. - use %{ix86} macro in ExclusiveArch. +- keep blktapctrl turned off by default. * Mon Mar 2 2009 Gerd Hoffmann - 3.3.1-7 - fix xenstored init script for pv_ops kernel. From berrange at fedoraproject.org Fri Mar 6 13:32:09 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Mar 2009 13:32:09 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.1-vnc-sasl-auth.patch, NONE, 1.1 libvirt.spec, 1.116, 1.117 Message-ID: <20090306133209.3F45B70116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv401 Modified Files: libvirt.spec Added Files: libvirt-0.6.1-vnc-sasl-auth.patch Log Message: Fix crash after storage vol deletion fails. Add SASL auth support in QEMU libvirt-0.6.1-vnc-sasl-auth.patch: --- NEW FILE libvirt-0.6.1-vnc-sasl-auth.patch --- diff -r 961d4b1ca1d3 qemud/libvirtd_qemu.aug --- a/qemud/libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000 +++ b/qemud/libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000 @@ -27,6 +27,8 @@ module Libvirtd_qemu = | str_entry "vnc_tls_x509_cert_dir" | bool_entry "vnc_tls_x509_verify" | str_entry "vnc_password" + | bool_entry "vnc_sasl" + | str_entry "vnc_sasl_dir" (* Each enty in the config is one of the following three ... *) let entry = vnc_entry diff -r 961d4b1ca1d3 qemud/test_libvirtd_qemu.aug --- a/qemud/test_libvirtd_qemu.aug Wed Mar 04 13:17:44 2009 +0000 +++ b/qemud/test_libvirtd_qemu.aug Thu Mar 05 14:22:50 2009 +0000 @@ -60,6 +60,25 @@ vnc_tls_x509_verify = 1 # example here before you set this # vnc_password = \"XYZ12345\" + + +# Enable use of SASL encryption on the VNC server. This requires +# a VNC client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. UltraVNC, RealVNC, TightVNC do not support this +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +vnc_sasl = 1 + + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +vnc_sasl_dir = \"/some/directory/sasl2\" " test Libvirtd_qemu.lns get conf = @@ -123,3 +142,22 @@ vnc_password = \"XYZ12345\" { "#comment" = "example here before you set this" } { "#comment" = "" } { "vnc_password" = "XYZ12345" } +{ "#empty" } +{ "#empty" } +{ "#comment" = "Enable use of SASL encryption on the VNC server. This requires" } +{ "#comment" = "a VNC client which supports the SASL protocol extension." } +{ "#comment" = "Examples include vinagre, virt-viewer and virt-manager" } +{ "#comment" = "itself. UltraVNC, RealVNC, TightVNC do not support this" } +{ "#comment" = "" } +{ "#comment" = "It is necessary to configure /etc/sasl2/qemu.conf to choose" } +{ "#comment" = "the desired SASL plugin (eg, GSSPI for Kerberos)" } +{ "#comment" = "" } +{ "vnc_sasl" = "1" } +{ "#empty" } +{ "#empty" } +{ "#comment" = "The default SASL configuration file is located in /etc/sasl2/" } +{ "#comment" = "When running libvirtd unprivileged, it may be desirable to" } +{ "#comment" = "override the configs in this location. Set this parameter to" } +{ "#comment" = "point to the directory, and create a qemu.conf in that location" } +{ "#comment" = "" } +{ "vnc_sasl_dir" = "/some/directory/sasl2" } diff -r 961d4b1ca1d3 src/qemu.conf --- a/src/qemu.conf Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu.conf Thu Mar 05 14:22:50 2009 +0000 @@ -60,6 +60,27 @@ # vnc_password = "XYZ12345" +# Enable use of SASL encryption on the VNC server. This requires +# a VNC client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. UltraVNC, RealVNC, TightVNC do not support this +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +# vnc_sasl = 1 + + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +# vnc_sasl_dir = "/some/directory/sasl2" + + + + # The default security driver is SELinux. If SELinux is disabled # on the host, then the security driver will automatically disable # itself. If you wish to disable QEMU SELinux security driver while diff -r 961d4b1ca1d3 src/qemu_conf.c --- a/src/qemu_conf.c Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_conf.c Thu Mar 05 14:22:50 2009 +0000 @@ -161,6 +161,21 @@ int qemudLoadDriverConfig(struct qemud_d } } + p = virConfGetValue (conf, "vnc_sasl"); + CHECK_TYPE ("vnc_sasl", VIR_CONF_LONG); + if (p) driver->vncSASL = p->l; + + p = virConfGetValue (conf, "vnc_sasl_dir"); + CHECK_TYPE ("vnc_sasl_dir", VIR_CONF_STRING); + if (p && p->str) { + VIR_FREE(driver->vncSASLdir); + if (!(driver->vncSASLdir = strdup(p->str))) { + virReportOOMError(NULL); + virConfFree(conf); + return -1; + } + } + virConfFree (conf); return 0; } @@ -838,15 +853,20 @@ int qemudBuildCommandLine(virConnectPtr goto no_memory; \ } while (0) +#define ADD_ENV_PAIR(envname, val) \ + do { \ + char *envval; \ + ADD_ENV_SPACE; \ + if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \ + goto no_memory; \ + qenv[qenvc++] = envval; \ + } while (0) + #define ADD_ENV_COPY(envname) \ do { \ char *val = getenv(envname); \ - char *envval; \ - ADD_ENV_SPACE; \ if (val != NULL) { \ - if (virAsprintf(&envval, "%s=%s", envname, val) < 0) \ - goto no_memory; \ - qenv[qenvc++] = envval; \ + ADD_ENV_PAIR(envname, val); \ } \ } while (0) @@ -1295,6 +1315,15 @@ int qemudBuildCommandLine(virConnectPtr driver->vncTLSx509certdir); } } + + if (driver->vncSASL) { + virBufferAddLit(&opt, ",sasl"); + + if (driver->vncSASLdir) + ADD_ENV_PAIR("SASL_CONF_DIR", driver->vncSASLdir); + + /* TODO: Support ACLs later */ + } } else { virBufferVSprintf(&opt, "%d", vm->def->graphics->data.vnc.port - 5900); diff -r 961d4b1ca1d3 src/qemu_conf.h --- a/src/qemu_conf.h Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_conf.h Thu Mar 05 14:22:50 2009 +0000 @@ -73,9 +73,11 @@ struct qemud_driver { char *stateDir; unsigned int vncTLS : 1; unsigned int vncTLSx509verify : 1; + unsigned int vncSASL : 1; char *vncTLSx509certdir; char *vncListen; char *vncPassword; + char *vncSASLdir; virCapsPtr caps; diff -r 961d4b1ca1d3 src/qemu_driver.c --- a/src/qemu_driver.c Wed Mar 04 13:17:44 2009 +0000 +++ b/src/qemu_driver.c Thu Mar 05 14:22:50 2009 +0000 @@ -620,6 +620,7 @@ qemudShutdown(void) { VIR_FREE(qemu_driver->vncTLSx509certdir); VIR_FREE(qemu_driver->vncListen); VIR_FREE(qemu_driver->vncPassword); + VIR_FREE(qemu_driver->vncSASLdir); /* Free domain callback list */ virDomainEventCallbackListFree(qemu_driver->domainEventCallbacks); diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,24 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml Thu Mar 05 14:22:50 2009 +0000 @@ -0,0 +1,24 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219200 + 219200 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + + + + + diff -r 961d4b1ca1d3 tests/qemuxml2argvtest.c --- a/tests/qemuxml2argvtest.c Wed Mar 04 13:17:44 2009 +0000 +++ b/tests/qemuxml2argvtest.c Thu Mar 05 14:22:50 2009 +0000 @@ -213,6 +213,19 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_CACHE_V2); DO_TEST("disk-usb", 0); DO_TEST("graphics-vnc", 0); + + driver.vncSASL = 1; + driver.vncSASLdir = strdup("/root/.sasl2"); + DO_TEST("graphics-vnc-sasl", 0); + driver.vncTLS = 1; + driver.vncTLSx509verify = 1; + driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu"); + DO_TEST("graphics-vnc-tls", 0); + driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0; + free(driver.vncSASLdir); + free(driver.vncTLSx509certdir); + driver.vncSASLdir = driver.vncTLSx509certdir = NULL; + DO_TEST("graphics-sdl", 0); DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- libvirt.spec 5 Mar 2009 10:10:19 -0000 1.116 +++ libvirt.spec 6 Mar 2009 13:31:38 -0000 1.117 @@ -47,10 +47,14 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.1 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch1: libvirt-%{version}-storage-delete-fail.patch + +# Not upstream yet - pending QEMU merge +Patch100: libvirt-%{version}-vnc-sasl-auth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -179,6 +183,9 @@ %prep %setup -q +%patch1 -p1 + +%patch100 -p1 mv NEWS NEWS.old iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS @@ -471,6 +478,10 @@ %endif %changelog +* Fri Mar 6 2009 Daniel P. Berrange - 0.6.1-2.fc11 +- Fix crash after storage vol deletion fails +- Add patch to enable VNC SASL authentication + * Wed Mar 4 2009 Daniel Veillard - 0.6.1-1.fc11 - upstream release 0.6.1 - support for node device detach reattach and reset From berrange at fedoraproject.org Fri Mar 6 13:40:59 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Fri, 6 Mar 2009 13:40:59 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.1-storage-delete-fail.patch, NONE, 1.1 Message-ID: <20090306134059.1789470116@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3373 Added Files: libvirt-0.6.1-storage-delete-fail.patch Log Message: Actually add the patch this time libvirt-0.6.1-storage-delete-fail.patch: --- NEW FILE libvirt-0.6.1-storage-delete-fail.patch --- diff -rup libvirt-0.6.1.orig/src/storage_driver.c libvirt-0.6.1.new/src/storage_driver.c --- libvirt-0.6.1.orig/src/storage_driver.c 2009-02-16 03:43:41.000000000 -0500 +++ libvirt-0.6.1.new/src/storage_driver.c 2009-03-06 08:02:51.000000000 -0500 @@ -1296,7 +1296,6 @@ storageVolumeDelete(virStorageVolPtr obj ret = 0; cleanup: - virStorageVolDefFree(vol); if (pool) virStoragePoolObjUnlock(pool); return ret; From glommer at fedoraproject.org Fri Mar 6 15:52:19 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Fri, 6 Mar 2009 15:52:19 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.61,1.62 Message-ID: <20090306155219.B58CA70116@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30940 Modified Files: qemu.spec Log Message: kvm.modules being wrongly stated Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- qemu.spec 5 Mar 2009 20:06:29 -0000 1.61 +++ qemu.spec 6 Mar 2009 15:51:49 -0000 1.62 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.4.kvm20090303git%{?dist} +Release: 0.5.kvm20090303git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -267,7 +267,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules mkdir -p $RPM_BUILD_ROOT%{_bindir}/ -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 kvmtrace $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 kvm_stat $RPM_BUILD_ROOT%{_bindir}/ @@ -422,6 +422,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* Fri Mar 06 2009 Glauber Costa - 2:0.10-0.5.kvm20090303git +- kvm.modules were being wrongly mentioned at %install. + * Thu Mar 05 2009 Glauber Costa - 2:0.10-0.4.kvm20090303git - seems Epoch does not go into the tags. So start back here. From lutter at fedoraproject.org Tue Mar 10 00:49:40 2009 From: lutter at fedoraproject.org (David Lutterkort) Date: Tue, 10 Mar 2009 00:49:40 +0000 (UTC) Subject: [fedora-virt-maint] rpms/ruby-libvirt/devel ruby-libvirt.spec, 1.11, 1.12 Message-ID: <20090310004940.3391870034@cvs1.fedora.phx.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/ruby-libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17156 Modified Files: ruby-libvirt.spec Log Message: Disable tests since they cause spurious failures Index: ruby-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-libvirt/devel/ruby-libvirt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ruby-libvirt.spec 25 Feb 2009 21:25:23 -0000 1.11 +++ ruby-libvirt.spec 10 Mar 2009 00:49:09 -0000 1.12 @@ -3,7 +3,7 @@ Name: ruby-libvirt Version: 0.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby bindings for libvirt Group: Development/Languages @@ -36,10 +36,10 @@ install -p -m0644 lib/libvirt.rb %{buildroot}%{ruby_sitelib} install -p -m0755 ext/libvirt/_libvirt.so %{buildroot}%{ruby_sitearch} -%check -%if 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} > 5 -rake test -%endif +#%check +#%if 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} > 5 +#rake test +#%endif %clean rm -rf $RPM_BUILD_ROOT @@ -53,6 +53,9 @@ %changelog +* Mon Mar 9 2009 David Lutterkort - 0.1.0-4 +- Disable tests since they cause spurious failures + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From berrange at fedoraproject.org Tue Mar 17 16:01:25 2009 From: berrange at fedoraproject.org (Daniel P. Berrange) Date: Tue, 17 Mar 2009 16:01:25 +0000 (UTC) Subject: [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.1-svirt-sound.patch, NONE, 1.1 libvirt.spec, 1.120, 1.121 Message-ID: <20090317160125.3FD3B70132@cvs1.fedora.phx.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4081 Modified Files: libvirt.spec Added Files: libvirt-0.6.1-svirt-sound.patch Log Message: Disable sound cards when running sVirt libvirt-0.6.1-svirt-sound.patch: --- NEW FILE libvirt-0.6.1-svirt-sound.patch --- diff -rup libvirt-0.6.1.orig/src/qemu_conf.c libvirt-0.6.1.new/src/qemu_conf.c --- libvirt-0.6.1.orig/src/qemu_conf.c 2009-03-17 11:57:04.000000000 +0000 +++ libvirt-0.6.1.new/src/qemu_conf.c 2009-03-17 15:50:08.000000000 +0000 @@ -757,6 +757,20 @@ int qemudBuildCommandLine(virConnectPtr char uuid[VIR_UUID_STRING_BUFLEN]; char domid[50]; char *pidfile; + int skipSound = 0; + + if (driver->securityDriver && + driver->securityDriver->name && + STREQ(driver->securityDriver->name, "selinux") && + getuid == 0) { + static int soundWarned = 0; + skipSound = 1; + if (vm->def->nsounds && + !soundWarned) { + soundWarned = 1; + VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active"); + } + } uname_normalize(&ut); @@ -1364,7 +1378,8 @@ int qemudBuildCommandLine(virConnectPtr } /* Add sound hardware */ - if (vm->def->nsounds) { + if (vm->def->nsounds && + !skipSound) { int size = 100; char *modstr; if (VIR_ALLOC_N(modstr, size+1) < 0) Only in libvirt-0.6.1.new/src: qemu_conf.c~ Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- libvirt.spec 17 Mar 2009 15:31:31 -0000 1.120 +++ libvirt.spec 17 Mar 2009 16:00:54 -0000 1.121 @@ -66,6 +66,10 @@ # Not upstream yet - pending QEMU merge Patch100: libvirt-0.6.1-vnc-sasl-auth.patch +# Not for upstream. Temporary hack till PulseAudio autostart +# problems are sorted out when SELinux enforcing +Patch200: libvirt-0.6.1-svirt-sound.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -209,6 +213,7 @@ %patch11 -p1 %patch100 -p1 +%patch200 -p1 mv NEWS NEWS.old iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS @@ -503,6 +508,7 @@ %changelog * Tue Mar 17 2009 Daniel P. Berrange - 0.6.1-5.fc11 - Don't relabel shared/readonly disks +- Disable sound cards when running sVirt * Tue Mar 17 2009 Daniel P. Berrange - 0.6.1-4.fc11 - Fix memory allocation for xend lookup From glommer at fedoraproject.org Wed Mar 18 19:01:27 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Wed, 18 Mar 2009 19:01:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.67,1.68 Message-ID: <20090318190127.7AA3470132@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29387 Modified Files: qemu.spec Log Message: added extboot to files list Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- qemu.spec 11 Mar 2009 19:21:28 -0000 1.67 +++ qemu.spec 18 Mar 2009 19:00:56 -0000 1.68 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.9.kvm20090310git%{?dist} +Release: 0.10.kvm20090310git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -360,6 +360,7 @@ %{_prefix}/share/qemu/vgabios.bin %{_prefix}/share/qemu/vgabios-cirrus.bin %ifarch %{ix86} x86_64 +%{_prefix}/share/qemu/extboot.bin %{_bindir}/qemu-kvm %{_sysconfdir}/sysconfig/modules/kvm.modules %files kvm-tools @@ -404,6 +405,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. From rel-eng at fedoraproject.org Fri Mar 6 05:57:54 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Fri, 06 Mar 2009 05:57:54 -0000 Subject: [fedora-virt-maint] #1317: kvm is retired Message-ID: <050.ea6ff006b8dbc27aa131f1afc68a4424@fedoraproject.org> #1317: kvm is retired ---------------------+------------------------------------------------------ Reporter: glommer | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: new Milestone: | Component: koji Keywords: | ---------------------+------------------------------------------------------ kvm is now provided by qemu, so it should be blocked from further builds -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From rel-eng at fedoraproject.org Fri Mar 6 13:58:01 2009 From: rel-eng at fedoraproject.org (Fedora Release Engineering) Date: Fri, 06 Mar 2009 13:58:01 -0000 Subject: [fedora-virt-maint] Re: #1317: kvm is retired In-Reply-To: <050.ea6ff006b8dbc27aa131f1afc68a4424@fedoraproject.org> References: <050.ea6ff006b8dbc27aa131f1afc68a4424@fedoraproject.org> Message-ID: <059.5949efd2e1ddb464e7190b787f512639@fedoraproject.org> #1317: kvm is retired ----------------------+----------------------------------------------------- Reporter: glommer | Owner: rel-eng at lists.fedoraproject.org Type: task | Status: closed Milestone: | Component: koji Resolution: fixed | Keywords: ----------------------+----------------------------------------------------- Changes (by jwboyer): * status: new => closed * resolution: => fixed Comment: Blocked -- Ticket URL: Fedora Release Engineering Release Engineering for the Fedora Project From crobinso at fedoraproject.org Mon Mar 23 20:56:17 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 23 Mar 2009 20:56:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel virtinst-0.400.3-fix-virtimage-scratch.patch, NONE, 1.1 virtinst-0.400.3-hostdev-libvirt-calls.patch, NONE, 1.1 virtinst-0.400.3-spanish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.59, 1.60 Message-ID: <20090323205617.E685870133@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17691 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-virtimage-scratch.patch virtinst-0.400.3-hostdev-libvirt-calls.patch virtinst-0.400.3-spanish-trans.patch Log Message: Add spanish translation (bz 480816) Fix calls to libvirt host device detach/reset Fix virt-image with create-on-the-fly disks virtinst-0.400.3-fix-virtimage-scratch.patch: --- NEW FILE virtinst-0.400.3-fix-virtimage-scratch.patch --- # HG changeset patch # User Cole Robinson # Date 1237821788 14400 # Node ID 8fdb20af39f965aa1ff20ea34ba294db08a7f3e2 # Parent d5f630ee97ea16c91ff3a9db50caff350b72df90 Fix virt-image with scratch + user disks. diff -r d5f630ee97ea -r 8fdb20af39f9 virtinst/ImageParser.py --- a/virtinst/ImageParser.py Mon Mar 23 11:14:38 2009 -0400 +++ b/virtinst/ImageParser.py Mon Mar 23 11:23:08 2009 -0400 @@ -240,13 +240,7 @@ import sha has_hashlib = False - meter_ct = 0 m = None - disk_size = os.path.getsize(self.file) - if meter: - meter.start(size=disk_size, - text=_("Checking disk signature for %s" % self.file)) - if has_hashlib is True: if self.csum.has_key("sha256"): csumvalue = self.csum["sha256"] @@ -262,6 +256,12 @@ if not m: return + meter_ct = 0 + disk_size = os.path.getsize(self.file) + if meter: + meter.start(size=disk_size, + text=_("Checking disk signature for %s" % self.file)) + f = open(self.file,"r") while 1: chunk = f.read(65536) virtinst-0.400.3-hostdev-libvirt-calls.patch: --- NEW FILE virtinst-0.400.3-hostdev-libvirt-calls.patch --- # HG changeset patch # User Cole Robinson # Date 1237302675 14400 # Node ID 1288ff456cdb1a387771624594300ab6be324181 # Parent 143cad71a2a6e83bfff7f46a0f7105e3eeb43ab2 Fix node device dettach/reset libvirt calls diff -r 143cad71a2a6 -r 1288ff456cdb virtinst/NodeDeviceParser.py --- a/virtinst/NodeDeviceParser.py Mon Mar 09 23:31:51 2009 -0400 +++ b/virtinst/NodeDeviceParser.py Tue Mar 17 11:11:15 2009 -0400 @@ -405,10 +405,11 @@ if not isinstance(conn, libvirt.virConnect): raise ValueError(_("'conn' must be a virConnect instance.")) - if dir(libvirt).count("virNodeDeviceDettach") == 0: - return False + if (hasattr(libvirt, "virNodeDevice") and + hasattr(libvirt.virNodeDevice, "dettach")): + return True - return True + return False def lookupNodeName(conn, name): """ diff -r 143cad71a2a6 -r 1288ff456cdb virtinst/VirtualHostDevice.py --- a/virtinst/VirtualHostDevice.py Mon Mar 09 23:31:51 2009 -0400 +++ b/virtinst/VirtualHostDevice.py Tue Mar 17 11:11:15 2009 -0400 @@ -201,8 +201,8 @@ try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.deviceDetach() - self._nodedev.deviceReset() + self._nodedev.dettach() + self._nodedev.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) virtinst-0.400.3-spanish-trans.patch: --- NEW FILE virtinst-0.400.3-spanish-trans.patch --- # HG changeset patch # User Cole Robinson # Date 1237840860 14400 # Node ID a4a3db71aa9efb0f92ba71781954ef4e2788b0d6 # Parent cda75d189b9ca347371dd477c94ffbb3d577e121 Add spanish translation. diff -r cda75d189b9c -r a4a3db71aa9e po/es.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/es.po Mon Mar 23 16:41:00 2009 -0400 @@ -0,0 +1,1433 @@ +# Fedora Spanish Translation of virtinst. +# This file is distributed under the same license as the virtinst package. +# +# H??ctor Daniel Cabrera , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: Fedora Spanish Translation of virtinst\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-10 14:00-0400\n" +"PO-Revision-Date: 2009-01-20 13:06-0300\n" +"Last-Translator: h??ctor daniel cabrera \n" +"Language-Team: Fedora Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: virt-clone:45 +msgid "What is the name for the cloned virtual machine?" +msgstr "??Cu??l es el nombre de la m??quina virtual clonada?" + +#: virt-clone:50 +#: virt-clone:60 +#: virt-clone:89 +#: virtinst/cli.py:175 +msgid "ERROR: " +msgstr "ERROR:" + +#: virt-clone:55 +msgid "What is the name or uuid of the original virtual machine?" +msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?" + +#: virt-clone:83 +msgid "What would you like to use as the cloned disk (file path)?" +msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?" + +#: virt-clone:94 +#, python-format +msgid "This will overwrite the existing path '%s'!\n" +msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n" + +#: virt-clone:96 +msgid "Do you really want to use this disk (yes or no)?" +msgstr "??Realmente quiere utilizar este disco (si o no)?" + +#: virt-clone:102 +#: virt-install:202 +#, python-format +msgid "Disk %s is already in use by another guest!\n" +msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n" + +#: virt-clone:103 +#: virt-install:203 +msgid "Do you really want to use the disk (yes or no)? " +msgstr "??Realmente quiere utilizar el disco (si o no)?" + +#: virt-clone:132 +msgid "Name or uuid for the original guest; The status must be shut off" +msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado" + +#: virt-clone:136 +msgid "Name for the new guest" +msgstr "Nombre para el nuevo hu??sped" + +#: virt-clone:141 +msgid "New UUID for the clone guest; Default is a randomly generated UUID" +msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID" + +#: virt-clone:146 +msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC" +msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC " + +#: virt-clone:151 +msgid "New file to use as the disk image for the new guest" +msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped" + +#: virt-clone:155 +#: virt-image:128 +#: virt-install:317 +msgid "Connect to hypervisor with URI" +msgstr "Conectar al hipervisor con URI" + +#: virt-clone:161 +msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)" +msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)" + +#: virt-clone:166 +msgid "Do not use a sparse file for the clone's disk image" +msgstr "No utilice un archivo separado para la imagen del disco de lo clonado" + +#: virt-clone:171 +msgid "Preserve a new file to use as the disk image for the new guest" +msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped " + +#: virt-clone:175 +#: virt-image:137 +#: virt-install:447 +#: virt-pack:109 +msgid "Print debugging information" +msgstr "Mostrar informaci??n de depuraci??n" + +#: virt-clone:177 +#: virt-image:143 +msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts" +msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada" + +#: virt-clone:194 +msgid "Must be root to clone Xen guests" +msgstr "Debe ser root para poder clonar hu??spedes Xen" + +#: virt-clone:229 +#: virt-image:242 +#: virt-install:697 +msgid "Installation aborted at user request" +msgstr "Instalaci??n abortada a pedido del usuario" + +#: virt-image:67 +#, python-format +msgid "Warning: more networks were provided [%i] then nics required [%i]. All extras are ignored" +msgstr "Aviso: se han provisto m??s redes [%i] que las necesarias para los seud??nimos [%i]. Todo lo extra se ha ignorado" + +#: virt-image:71 +#, python-format +msgid "The image requires %i network interface" +msgstr "La imagen requiere una interfase de red %i " + +#: virt-image:90 +#: virt-install:323 +msgid "Name of the guest instance" +msgstr "Nombre de la instancia del hu??sped" + +#: virt-image:92 +#: virt-install:325 +msgid "Memory to allocate for guest instance in megabytes" +msgstr "Cantidad de memoria en megabytes para alojar la instancia del hu??sped " + +#: virt-image:95 +msgid "UUID for the guest; if none is given a random UUID will be generated. If you specify UUID, you should use a 32-digit hexadecimal number." +msgstr "UUID para el hu??sped; si no se provee ninguno, se generar?? uno en forma aleatoria. Si especifica alg??n UUID, debe usar un n??mero hexadecimal de 32 d??gitos." + +#: virt-image:97 +#: virt-install:334 +msgid "Number of vcpus to configure for your guest" +msgstr "Cantidad de vcpus a configurar para su hu??sped" + +#: virt-image:99 +#: virt-install:336 +msgid "Check that vcpus do not exceed physical CPUs and warn if they do." +msgstr "Verifica que los vcpus no excedan los CPUs f??sicos y avisa si lo hacen." + +#: virt-image:104 +#: virt-install:423 +msgid "Fixed MAC address for the guest; if none or RANDOM is given a random address will be used" +msgstr "Direcci??n MAC adecuada para el hu??sped; si ninguna o CUALQUIERA es dada, se generar?? una direcci??n de manera aleatoria" + +#: virt-image:107 +#: virt-install:415 +msgid "Bridge to connect guest NIC to; if none given, will try to determine the default" +msgstr "Puente para conectar el NIC del hu??sped; si no es dado ninguno, se intentar?? determinar uno por defecto" + +#: virt-image:110 +#: virt-install:419 +msgid "Connect the guest to a virtual network, forwarding to the physical network with NAT" +msgstr "Conecta el hu??sped a la red virtual, reenvi??ndolo a la red f??sica a trav??s de NAT" + +#: virt-image:114 +#: virt-install:429 +msgid "Use VNC for graphics support" +msgstr "Utilizar VNC para el soporte gr??fico" + +#: virt-image:116 +#: virt-install:431 +msgid "Port to use for VNC" +msgstr "Puerto a ser usado para VNC" + +#: virt-image:118 +#: virt-install:433 +msgid "Use SDL for graphics support" +msgstr "Utilizar SDL para soporte gr??fico" + +#: virt-image:120 +#: virt-install:435 +msgid "Don't set up a graphical console for the guest." +msgstr "No configura una consola gr??fica para el hu??sped." + +#: virt-image:124 +#: virt-install:442 +msgid "set up keymap for a graphical console" +msgstr "define un mapa de teclado para una consola gr??fica" + +#: virt-image:132 +#: virt-install:356 +msgid "Disables APIC for fully virtualized guest (overrides value in os-type/os-variant db)" +msgstr "Deshabilita APIC para un hu??sped completamente virtual (se anulan los valores en os-type/os-variant db) " + +#: virt-image:133 +#: virt-install:360 +msgid "Disables ACPI for fully virtualized guest (overrides value in os-type/os-variant db)" +msgstr "Deshabilita ACPI para un hu??sped completamente virtual (se anulan los valores en os-type/os-variant db)" + +#: virt-image:139 +msgid "Print the libvirt XML, but do not start the domain" +msgstr "Muestra el libvirt XML, pero no inicia el dominio" + +#: virt-image:141 +msgid "The zero-based index of the boot record to use" +msgstr "El ??ndice de base cero del registro de inicializaci??n a ser usado" + +#: virt-image:146 +msgid "Overwrite, or destroy, an existing image with the same name" +msgstr "Anula o destruye cualquier imagen existente con el mismo nombre" + +#: virt-image:151 +#: virt-pack:113 +msgid "You need to provide an image XML descriptor" +msgstr "Necesita indicar un descriptor de imagen XML" + +#: virt-image:168 +msgid "Cannot parse" +msgstr "No fue posible analizar" + +#: virt-image:172 +msgid "Cannot parse capabilities" +msgstr "No fue posible analizar capacidades" + +#: virt-image:177 +#, python-format +msgid "The index for --boot must be between 0 and %d" +msgstr "El ??ndice para --boot debe ser entre 0 y %d" + +#: virt-image:220 +#, python-format +msgid "" +"\n" +"\n" +"Creating guest %s..." +msgstr "" +"\n" +"\n" +"Creando hu??sped %s..." + +#: virt-image:224 +msgid "Guest creation failed" +msgstr "Fall?? la creaci??n del hu??sped" + +#: virt-image:230 +#, python-format +msgid "" +"Domain creation may not have been\n" +"successful. If it was, you can restart your domain\n" +"by running 'virsh start %s'; otherwise, please\n" +"restart your installation." +msgstr "" +"La creaci??n del dominio podr??a no haber sido\n" +"exitosa. Si lo fue, puede reiniciar su dominio\n" +"ejecutando \"virsh start %s\"; de lo contrario, por favor\reinicie su instalaci??n." + +#: virt-install:73 +#, python-format +msgid "Couldn't create default storage pool '%s': %s" +msgstr "No se ha podido crear un grupo de almacenamiento por defecto '%s': %s" + +#: virt-install:96 +msgid "--disk path must start with path=, pool=, or vol=." +msgstr "--disk path debe iniciar con path=, pool=, o vol=." + +#: virt-install:122 +#: virt-install:134 +#, python-format +msgid "Unknown '%s' value '%s'" +msgstr "Valor '%s' desconocido '%s'" + +#: virt-install:127 +#, python-format +msgid "Improper value for 'size': %s" +msgstr "Valor desapropiado para 'size': %s" + +#: virt-install:136 +#, python-format +msgid "Unknown --disk option '%s'." +msgstr "Opci??n --disk desconocida '%s'." + +#: virt-install:145 +msgid "Size must be specified with all 'pool='" +msgstr "El tama??o debe especificarse en todos los 'pool='" + +#: virt-install:158 +msgid "Storage volume must be specified as pool=poolname/volname" +msgstr "El vol??men de almacenamiento debe especificarse como pool=poolname/volname" + +#: virt-install:198 +#, python-format +msgid "Error with storage parameters: %s" +msgstr "Error en los par??metros de almacenamiento: %s" + +#: virt-install:210 +msgid " Do you really want to use the disk (yes or no)?" +msgstr "??Realmente desea utilizar el disco? (s?? o no)" + +#: virt-install:218 +msgid "Cannot use --file, --size, or --disk with --nodisks" +msgstr "No es posible utilizar --file, --size o --disk con --nodisks" + +#: virt-install:221 +msgid "Cannot mix --file, --nonsparse, or --file-size with --disk options. Please see the manual for --disk syntax." +msgstr "No se puede mezclar --file, --nonsparse, o --file-size con --disk options. Por favor vea el manual para --disk syntax." + +#: virt-install:224 +msgid "A disk must be specified (use --nodisks to override)" +msgstr "Un disco debe ser especificado (utilice --nodisks para anular)" + +#: virt-install:232 +msgid "Need to pass size for each disk" +msgstr "Es necesario pasar el tama??o para cada disco" + +#: virt-install:259 +msgid "Only one of --pxe, --location and --cdrom can be used" +msgstr "S??lo uno de --pxe, --location y --cdrom puede ser utilizado" + +#: virt-install:263 +msgid "Network PXE boot is not supported for paravirtualized guests" +msgstr "Inicializaci??n PXE en red no est?? soportado para hu??spedes paravirtualizados " + +#: virt-install:266 +msgid "Paravirtualized guests cannot install off cdrom media." +msgstr "Hu??spedes paravirtualizados no pueden instalarse desde un dispositivo cdrom." + +#: virt-install:268 +msgid "location must be specified for paravirtualized guests." +msgstr "debe especificarse un lugar para los hu??spedes paravirtualizados. " + +#: virt-install:271 +msgid "--location can not be specified for remote connections." +msgstr "--location no puede ser especificado para conexiones remotas." + +#: virt-install:280 +msgid "One of --pxe, --location, or cdrom media must be specified." +msgstr "Debe ser especificao --pxe, --location, o cdrom media. " + +#: virt-install:297 +#, python-format +msgid "Error creating cdrom disk: %s" +msgstr "Error al crear disco cdrom: %s" + +#: virt-install:303 +#: virt-install:308 +#: virtinst/cli.py:354 +#: virtinst/cli.py:359 +#, python-format +msgid "%s option requires an argument" +msgstr "La opci??n %s requiere un argumento" + +#: virt-install:320 +msgid "General Options" +msgstr "Opciones Generales" + +#: virt-install:329 +msgid "The CPU architecture to simulate" +msgstr "La arquitectura del CPU a ser simulada" + +#: virt-install:332 +msgid "UUID for the guest." +msgstr "UUID para el hu??sped." + +#: virt-install:340 +msgid "Set which physical CPUs Domain can use." +msgstr "Especifique qu?? dominios f??sicos del CPU pueden utilizarse. " + +#: virt-install:343 +msgid "Full Virtualization specific options." +msgstr "Opciones espec??ficas de una virtualizaci??n total." + +#: virt-install:345 +msgid "Use sound device emulation" +msgstr "Utilice emulaci??n del dispositivo de sonido" + +#: virt-install:348 +msgid "The OS type for fully virtualized guests, e.g. 'linux', 'unix', 'windows'" +msgstr "El tipo de sistema operativo para hu??pedes totalmente virtualizados, por ejemplo, \"linux\", \"unix\", \"windows\"" + +#: virt-install:352 +msgid "The OS variant for fully virtualized guests, e.g. 'fedora6', 'rhel5', 'solaris10', 'win2k'" +msgstr "La variante del sistema operativo para hu??spedes totalmente virtualizados, por ejemplo, \"fedora6\", \"rhel5\", \"solaris10\", \"win2k\"" + +#: virt-install:363 +msgid "Virtualization Type Options" +msgstr "Opciones del Tipo de Virtualizaci??n" + +#: virt-install:365 +msgid "This guest should be a fully virtualized guest" +msgstr "Este hu??sped deber??a ser un hu??sped completamente virtualizado" + +#: virt-install:367 +msgid "This guest should be a paravirtualized guest" +msgstr "Este hu??sped deber??a ser un hu??sped paravirtualizado" + +#: virt-install:370 +msgid "Use kernel acceleration capabilities (kvm, kqemu, ...)" +msgstr "Utilice capacidades de aceleraci??n del kernel (kvm, kquemu, ...)" + +#: virt-install:374 +msgid "Installation Method Options" +msgstr "Opciones para el M??todo de Instalaci??n" + +#: virt-install:377 +msgid "CD-ROM installation media" +msgstr "Medio de instalaci??n de CD-ROM" + +#: virt-install:380 +msgid "Installation source (eg, nfs:host:/path, http://host/path, ftp://host/path)" +msgstr "Fuente de instalaci??n (por ejemplo, nfs:host:/path, http://host/path, ftp://host/path)" + +#: virt-install:383 +msgid "Boot from the network using the PXE protocol" +msgstr "Inicialice un instalador desde la red utilizando el protocolo PXE" + +#: virt-install:385 +msgid "Treat the CDROM media is a LiveCD" +msgstr "Indique que el contenido del CDROM sea tratado como un LiveCD" + +#: virt-install:388 +msgid "Additional arguments to pass to the kernel booted from --location" +msgstr "Se necesitan argumentos adicionales para pasar al kernel inicializado desde --location" + +#: virt-install:392 +msgid "Storage Configuration" +msgstr "Configuraci??n de Almacenamiento" + +#: virt-install:395 +msgid "Specify storage to use as a disk with various options." +msgstr "Indique almacenamiento a ser utilizado como disco con varias opciones." + +#: virt-install:399 +msgid "File to use as the disk image" +msgstr "Archivo a ser usado como imagen de disco" + +#: virt-install:402 +msgid "Size of the disk image (if it doesn't exist) in gigabytes" +msgstr "Tama??o de la imagen del disco (si es que no existe) en gigabytes" + +#: virt-install:406 +msgid "Don't use sparse files for disks. Note that this will be significantly slower for guest creation" +msgstr "No utilice archivos separados para los discos. F??jese que esto ser?? significativamente m??s lento para la creaci??n de hu??spedes" + +#: virt-install:409 +msgid "Don't set up any disks for the guest." +msgstr "No configure ning??n disco para el hu??sped." + +#: virt-install:412 +msgid "Networking Configuration" +msgstr "Configuraci??n de Redes" + +#: virt-install:427 +msgid "Graphics Configuration" +msgstr "Configuraci??n de Gr??ficos" + +#: virt-install:438 +msgid "Don't automatically try to connect to the guest console" +msgstr "No intentar conectarse autom??ticamente con la consola hu??sped " + +#: virt-install:445 +msgid "Miscellaneous Options" +msgstr "Opciones Varias" + +#: virt-install:449 +msgid "Disables the automatic rebooting when the installation is complete." +msgstr "Deshabilita la reinicializaci??n autom??tica cuando se ha completado la instalaci??n." + +#: virt-install:452 +msgid "Total time to wait for VM to shutdown if console not present. Time less than 0 waits indefinitely." +msgstr "Tiempo total de espera para que se apague la VM si la consola no est?? presente. Si el tiempo es menor que 0 la espera es indefinida." + +#: virt-install:456 +msgid "Forces 'yes' for any applicable prompts, terminates for all others" +msgstr "Provoca un \"si\" forzado para cualquier solicitud adecuada, y finaliza todas los dem??s" + +#: virt-install:460 +msgid "Request user input for ambiguous situations. Default is false, so will terminate if a prompt would typically be fired. " +msgstr "Solicita entradas del usuario para situaciones ambiguas. Por defecto est?? configurado en \"falso\" (false), de modo que finalizar?? cualquier solicitud que sea ignorada. " + +#: virt-install:480 +msgid "Unable to connect to graphical console: virt-viewer not installed. Please install the 'virt-viewer' package." +msgstr "No se ha podido conectar a una consola gr??fica: no est?? instalado el virt-viewer. Por favor, instale el paquete \"virt-viewer\"-" + +#: virt-install:512 +msgid "Can't do both --hvm and --paravirt" +msgstr "No se puede hacer --hvm y --paravirt al mismo tiempo" + +#: virt-install:523 +#: virt-install:528 +msgid "default" +msgstr "por defecto" + +#: virt-install:527 +#, python-format +msgid "Unsupported virtualization type '%s' " +msgstr "Tipo de virtualizaci??n '%s' no soportada" + +#: virt-install:530 +#, python-format +msgid "for arch '%s'" +msgstr "para arq '%s'" + +#: virt-install:626 +msgid "" +"\n" +"\n" +"Starting install..." +msgstr "" +"\n" +"\n" +"Empezando la instalaci??n..." + +#: virt-install:642 +msgid "Guest installation failed" +msgstr "La instalaci??n del hu??sped ha fallado" + +#: virt-install:649 +#, python-format +msgid " %d minutes" +msgstr "%d minutos" + +#: virt-install:647 +msgid "Domain installation still in progress. Waiting" +msgstr "Instalaci??n lde dominio todav??a en progreso. Esperando" + +#: virt-install:654 +msgid "Domain has shutdown. Continuing." +msgstr "El dominio ha concluido. Continuando." + +#: virt-install:660 +msgid "Installation has exceeded specified timelimit. Aborting." +msgstr "La instalaci??n ha excedido el tiempo especificado. Abortando" + +#: virt-install:664 +msgid "" +"Domain installation still in progress. You can reconnect to \n" +"the console to complete the installation process." +msgstr "" +"La instalaci??n del dominio contin??a en progreso. Puede reconectarse a \n" +"la consola para completar el proceso de instalaci??n." + +#: virt-install:672 +#, python-format +msgid "" +"Domain installation does not appear to have been\n" +" successful. If it was, you can restart your domain\n" +" by running 'virsh start %s'; otherwise, please\n" +" restart your installation." +msgstr "" +"La instalaci??n del dominio no parece haber sido\n" +" exitosa. Si lo fue, puede reiniciar su dominio\n" +" ejecutando 'virsh start %s'; de lo contrario, por favor\n" +" reinicie su instalaci??n." + +#: virt-install:676 +#, python-format +msgid "" +"Guest installation complete... you can restart your domain\n" +"by running 'virsh start %s'" +msgstr "" +"Instalaci??n de hu??sped completa... puede reiniciar su dominio\n" +"ejecutando 'virsh start %s'" + +#: virt-install:679 +msgid "Guest installation complete... restarting guest." +msgstr "Instalaci??n de hu??sped completa... reiniciando hu??sped." + +#: virt-install:688 +#, python-format +msgid "" +"Domain installation may not have been\n" +" successful. If it was, you can restart your domain\n" +" by running 'virsh start %s'; otherwise, please\n" +" restart your installation." +msgstr "" +"La instalaci??n del dominio podr??a no haber sido\n" +" exitosa. Si lo fue, puede reiniciar su dominio\n" +" ejecutando 'virsh start %s'; de lo contrario, por favor\n" +" reinicie su instalaci??n." + +#: virt-pack:58 +msgid "The image name and version must be present" +msgstr "Deben estar presentes el nombre y la versi??n de la imagen" + +#: virt-pack:73 +#, python-format +msgid "Scratch disk %s does not have a size attribute" +msgstr "El disco transitorio %s no tiene un atributo de tama??o" + +#: virt-pack:76 +#, python-format +msgid "Disk file %s could not be found" +msgstr "No puede encontrarse el archivo de disco %s" + +#: virt-pack:93 +#, python-format +msgid "Writing %s" +msgstr "Escribiendo %s" + +#: virt-pack:107 +msgid "Directory in which packaged file will be put" +msgstr "Directorio en el cual ser?? puesto el archivo empaquetado" + +#: virt-pack:123 +msgid "The image descriptor must contain name and version" +msgstr "El descriptor de imagen debe contener un nombre y una versi??n" + +#: virt-pack:132 +#, python-format +msgid "Validation failed: %s" +msgstr "Fallo en la validaci??n: %s" + +#: virt-pack:138 +#, python-format +msgid "Packaging failed: %s" +msgstr "Fallo en el empaquetamiento: %s" + +#: virtinst/CapabilitiesParser.py:168 +msgid "No domains available for this guest." +msgstr "No existen dominios disponibles para este hu??sped." + +#: virtinst/cli.py:112 +msgid "Exiting at user request." +msgstr "Saliendo a pedido del usuario." + +#: virtinst/cli.py:118 +msgid "Must be root to create Xen guests" +msgstr "Debe ser root para poder crear un hu??sped Xen" + +#: virtinst/cli.py:120 +msgid "Could not find usable default libvirt connection." +msgstr "No se ha podido encontrar una conexi??n por defecto libvirt que sea utilizable. " + +#: virtinst/cli.py:142 +#, python-format +msgid "Force flag is set but input was required. Prompt was: %s" +msgstr "Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %s " + +#: virtinst/cli.py:145 +#, python-format +msgid "Prompting disabled, but input was requested. Prompt was: %s" +msgstr "Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %s " + +#: virtinst/cli.py:165 +#, python-format +msgid "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for such prompts. Prompt was: %s" +msgstr "Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente --force para forzar un \"si\" para este tipo de peticiones. Se pide: %s" + +#: virtinst/cli.py:185 +msgid "A name is required for the virtual machine." +msgstr "Se requiere un nombre para la m??quina virtual." + +#: virtinst/cli.py:193 +msgid "Memory amount is required for the virtual machine." +msgstr "Se requiere una cantidad de memoria para la m??quina virtual." + +#: virtinst/cli.py:195 +#, python-format +msgid "Installs currently require %d megs of RAM." +msgstr "La instalaci??n actualmente requiere %d megas de RAM." + +#: virtinst/cli.py:215 +#, python-format +msgid "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) on the host. This will work, but performance will be poor. Are you sure? (yes or no)" +msgstr "Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)" + +#: virtinst/cli.py:270 +msgid "Unknown network type " +msgstr "Tipo de red desconocido" + +#: virtinst/cli.py:288 +msgid "Cannot mix both --bridge and --network arguments" +msgstr "No se pueden mezclar los argumentos de --bridge y de --network" + +#: virtinst/cli.py:297 +msgid "Need to pass equal numbers of networks & mac addresses" +msgstr "Se necesita pasar la misma cantidad de redes & y de direcciones mac" + +#: virtinst/cli.py:319 +msgid "Can't specify more than one of VNC, SDL, or --nographics" +msgstr "No se puede especificar m??s de un VNC, SDL, o --nographics" + +#: virtinst/CloneManager.py:74 +msgid "Name or UUID of guest to clone is required" +msgstr "Se requiere nombre o UUID del hu??sped a clonar" + +#: virtinst/CloneManager.py:83 +msgid "A valid name or UUID of guest to clone is required" +msgstr "Se requiere un nombre v??lido o UUID de hu??sped a clonar" + +#: virtinst/CloneManager.py:93 +#, python-format +msgid "Invalid name for new guest: %s" +msgstr "Nombre inv??lido para el nuevo hu??ped: %s" + +#: virtinst/CloneManager.py:101 +#, python-format +msgid "Invalid uuid for new guest: %s" +msgstr "UUID inv??lido para el nuevo hu??ped: %s" + +#: virtinst/CloneManager.py:109 +msgid "New file to use for disk image is required" +msgstr "Se requiere un nuevo archivo para usar para la imagen del disco" + +#: virtinst/CloneManager.py:187 +#, python-format +msgid "Domain %s is not found" +msgstr "No se encuentra el dominio %s" + +#: virtinst/CloneManager.py:204 +msgid "Domain status must be SHUTOFF" +msgstr "El estado del dominio debe ser SHUTOFF" + +#: virtinst/CloneManager.py:211 +#, python-format +msgid "Domain %s already exists" +msgstr "El dominio %s ya existe" + +#: virtinst/CloneManager.py:220 +#: virtinst/Guest.py:871 +msgid "The UUID you entered is already in use by another guest!" +msgstr "??El UUID que ha ingresado est?? siendo utilizado por otro hu??sped!" + +#: virtinst/CloneManager.py:264 +#, python-format +msgid "Missing new file to use disk image for %s" +msgstr "No se encuentra el archivo nuevo para usar la imagen de disco para %s" + +#: virtinst/CloneManager.py:547 +#, python-format +msgid "Cloning from %(src)s to %(dst)s" +msgstr "Clonando desde %(src)s a %(dst)s" + +#: virtinst/CloneManager.py:549 +msgid "Cloning domain..." +msgstr "Clonando dominio..." + +#: virtinst/DistroManager.py:93 +#, python-format +msgid "Could not find an installable distribution at '%s'" +msgstr "No se ha podido encontrar una distribuci??n instalable en '%s'" + +#: virtinst/DistroManager.py:104 +#: virtinst/DistroManager.py:122 +msgid "Invalid install location: " +msgstr "Lugar de instalaci??n inv??lido:" + +#: virtinst/DistroManager.py:162 +msgid "Invalid NFS format: No path specified." +msgstr "Formato NFS inv??lido: No se ha especificado ninguna ruta." + +#: virtinst/DistroManager.py:177 +#, python-format +msgid "Checking installer location failed: %s" +msgstr "Verificando falla en el localizador de instalaci??n: %s" + +#: virtinst/DistroManager.py:180 +msgid "Install media location must be an NFS, HTTP or FTP network install source, or an existing local file/device" +msgstr "La fuente del archivo de instalaci??n debe encontrarse en una red NFS, HTTP o FTP, o en un archivo/dispositvo local " + +#: virtinst/DistroManager.py:185 +msgid "NFS installations are only supported as root" +msgstr "Instalaciones de tipo NFS solo son soportadas como root" + +#: virtinst/FullVirtGuest.py:206 +msgid "OS type must be a string." +msgstr "El tipo de sistema operativo debe ser una cadena." + +#: virtinst/FullVirtGuest.py:213 +#, python-format +msgid "OS type '%s' does not exist in our dictionary" +msgstr "El tipo de sistema operativo '%s' no existe en nuestro diccionario" + +#: virtinst/FullVirtGuest.py:221 +msgid "OS variant must be a string." +msgstr "La variante del sistema operativo debe ser una cadena." + +#: virtinst/FullVirtGuest.py:227 +#, python-format +msgid "OS variant '%(var)s; does not exist in our dictionary for OS type '%(ty)s'" +msgstr "La variante '%(var)s'; no existe en nuestro diccionario para el sistema operativo '%(ty)s'" + +#: virtinst/FullVirtGuest.py:238 +#, python-format +msgid "Unknown OS variant '%s'" +msgstr "Variante de sistema operativo desconocida '%s'" + +#: virtinst/FullVirtGuest.py:323 +msgid "Unable to start domain for guest, aborting installation!" +msgstr "??Imposible iniciar dominio para el hu??ped, abortando la instalaci??n!" + +#: virtinst/FullVirtGuest.py:364 +#, python-format +msgid "Invalid dictionary entry for device '%s %s'" +msgstr "Entrada de diccionario inv??lida para el dispositivo '%s %s'" + +#: virtinst/Guest.py:54 +msgid "MAC address must be of the format AA:BB:CC:DD:EE:FF" +msgstr "La direcci??n MAC debe tener el formato AA:BB:CC:DD:EE:FF" + +#: virtinst/Guest.py:62 +msgid "A network name was not provided" +msgstr "No se ha provisto un nombre de red" + +#: virtinst/Guest.py:68 +#, python-format +msgid "Unknown network type %s" +msgstr "Tipo de red desconocido %s" + +#: virtinst/Guest.py:105 +msgid "The MAC address you entered is already in use by another active virtual machine." +msgstr "La direcci??n MAC que ha ingresado est?? siendo utilizada por otra m??quina virtual activa." + +#: virtinst/Guest.py:108 +msgid "The MAC address you entered conflicts with a device on the physical host." +msgstr "La direcci??n MAC que ha ingresado presenta conflicitos con un dispositivo en el anfitri??n f??sico" + +#: virtinst/Guest.py:110 +msgid "The MAC address you entered is already in use by another inactive virtual machine." +msgstr "La direcci??n MAC que ha ingresado est?? siendo utilizada por otra m??quina virtual inactiva." + +#: virtinst/Guest.py:181 +#, python-format +msgid "'model' must be a string, was '%s'." +msgstr "'modelo' debe ser una cadena, era '%s'." + +#: virtinst/Guest.py:184 +#, python-format +msgid "Unsupported sound model '%s'" +msgstr "Modelo de sonido no soportado '%s'" + +#: virtinst/Guest.py:204 +msgid "Unknown graphics type" +msgstr "Tipo de gr??ficos no soportado" + +#: virtinst/Guest.py:221 +msgid "Keymap must be a string" +msgstr "El mapa de teclado debe ser una cadena" + +#: virtinst/Guest.py:223 +msgid "Keymap must be less than 16 characters" +msgstr "El mapa de teclado debe ser menor que 16 caracteres" + +#: virtinst/Guest.py:225 +msgid "Keymap can only contain alphanumeric, '_', or '-' characters" +msgstr "El mapa de teclado s??lo puede contener caracteres alfanum??ricos, y los signos \"_\", y \"-\"" + +#: virtinst/Guest.py:236 +msgid "VNC port must be a number between 5900 and 65535, or -1 for auto allocation" +msgstr "El puerto VNC debe ser un n??mero entre 5900 y 65535, o -1, para que se asigne autom??ticamente " + +#: virtinst/Guest.py:333 +msgid "Guest.cdrom must be a boolean type" +msgstr "Guest.cdrom debe ser de tipo booleano" + +#: virtinst/Guest.py:350 +#: virtinst/Guest.py:355 +#: virtinst/Guest.py:359 +msgid "Must pass both a kernel and initrd" +msgstr "Debe pasar tanto un kernel como un initrd" + +#: virtinst/Guest.py:362 +msgid "Kernel and initrd must be specified by a list, dict, or tuple." +msgstr "El kernel y el initrd deben ser especificados por una lista, un diccionario o una tupla." + +#: virtinst/Guest.py:399 +msgid "Unable to connect to hypervisor, aborting installation!" +msgstr "??No se ha podido conectar con el hypervisor, abortando la instalaci??n!" + +#: virtinst/Guest.py:424 +msgid "System name must be a string greater than 0 and no more than 50 characters" +msgstr "El nombre del sistema debe ser una cadena mayor que 0 y que posea no m??s de 50 carateres" + +#: virtinst/Guest.py:426 +msgid "System name must not be only numeric characters" +msgstr "El nombre del sistema no debe contener solo caracteres num??ricos" + +#: virtinst/Guest.py:428 +msgid "System name can only contain: alphanumeric '_', '.', ':', '+', or '-' characters" +msgstr "El nombre del sistema solo puede contener: caracteres alfanum??ricos, y los signos \"_\", \".\", \":\", \"+\", y \"-\" " + +#: virtinst/Guest.py:439 +msgid "Memory value must be an integer greater than 0" +msgstr "El valor de la memoria debe ser un entero mayor que 0" + +#: virtinst/Guest.py:450 +msgid "Max Memory value must be an integer greater than 0" +msgstr "El valor de la memoria m??xima debe ser un entero mayor que 0" + +#: virtinst/Guest.py:461 +#: virtinst/Storage.py:315 +msgid "UUID must be a string." +msgstr "UUID debe ser una cadena." + +#: virtinst/Guest.py:467 +#: virtinst/Storage.py:321 +msgid "UUID must be a 32-digit hexadecimal number. It may take the form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX or may omit hyphens altogether." +msgstr "UUID debe ser un n??mero hexadecimal de 32 d??gitos. Puede tener la forma de XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX o pueden omitirse los guiones." + +#: virtinst/Guest.py:482 +msgid "Number of vcpus must be a postive integer." +msgstr "El n??mero de cpus virtuales debe ser un entero positivo." + +#: virtinst/Guest.py:485 +#, python-format +msgid "Number of vcpus must be no greater than %d for this vm type." +msgstr "El n??mero de cpus virtuales no debe mayor que %d para este tipo de m??quina virtual." + +#: virtinst/Guest.py:494 +msgid "cpuset must be string" +msgstr "cpuset debe ser una cadena" + +#: virtinst/Guest.py:496 +msgid "cpuset can only contain numeric, ',', or '-' characters" +msgstr "cpuset debe contener solo caracteres n??mericos, o los signos \",\", y \"-\"" + +#: virtinst/Guest.py:503 +msgid "cpuset contains invalid format." +msgstr "cpuset contiene un formato inv??lido." + +#: virtinst/Guest.py:505 +#: virtinst/Guest.py:508 +msgid "cpuset's pCPU numbers must be less than pCPUs." +msgstr "Los n??meros cpuset de las pCPU deben ser menores que las pCPUs." + +#: virtinst/Guest.py:549 +msgid "Must specify whether graphics are enabled" +msgstr "Debe especificarse si el modo gr??fico est?? habilitado" + +#: virtinst/Guest.py:568 +msgid "Graphics enabled must be True or False" +msgstr "Modo gr??fico habilitado deber ser Verdadero o Falso" + +#: virtinst/Guest.py:611 +msgid "You must specify a valid ISO or CD-ROM location for the installation" +msgstr "Debe especificar una imagen ISO o una direcci??n de CD-ROM v??lida para la instalaci??n" + +#: virtinst/Guest.py:614 +msgid "The specified media path does not exist." +msgstr "No existe la ruta al contenido especificado." + +#: virtinst/Guest.py:757 +#, python-format +msgid "Could not remove old vm '%s': %s" +msgstr "No se puede eliminar la antigua m??quina virtual '%s': %s" + +#: virtinst/Guest.py:759 +#, python-format +msgid "Domain named %s already exists!" +msgstr "??El nombre del dominio %s ya existe!" + +#: virtinst/Guest.py:766 +msgid "Creating domain..." +msgstr "Creando dominio..." + +#: virtinst/Guest.py:769 +msgid "Unable to create domain for the guest, aborting installation!" +msgstr "??No se ha podido crear el dominio para el hu??sped, abortando la instalaci??n!" + +#: virtinst/Guest.py:789 +msgid "It appears that your installation has crashed. You should be able to find more information in the logs" +msgstr "Aparentemente su instalaci??n ha fallado. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:835 +msgid "Domain has not existed. You should be able to find more information in the logs" +msgstr "El dominio no existe. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:837 +msgid "Domain has not run yet. You should be able to find more information in the logs" +msgstr "El dominio no est?? ejecut??ndose a??n. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:852 +msgid "Domain has already been started!" +msgstr "??El dominio ya se est?? ejecutando!" + +#: virtinst/Guest.py:879 +msgid "Name and memory must be specified for all guests!" +msgstr "??El nombre y la memoria debe ser especificado para todos los hu??spedes!" + +#: virtinst/ImageFetcher.py:74 +msgid "Verifying install location..." +msgstr "Verificando lugar de instalaci??n..." + +#: virtinst/ImageFetcher.py:78 +#, python-format +msgid "Opening URL %s failed: %s" +msgstr "Fallo al abril la URL %s: %s" + +#: virtinst/ImageFetcher.py:94 +#, python-format +msgid "Retrieving file %s..." +msgstr "Obteniendo archivo %s..." + +#: virtinst/ImageFetcher.py:96 +#, python-format +msgid "Couldn't acquire file %s: %s" +msgstr "No se ha podido adquirir el archivo %s: %s" + +#: virtinst/ImageFetcher.py:157 +#: virtinst/ImageFetcher.py:159 +msgid "Invalid file location given: " +msgstr "Se ha indicado una direcci??n de archivo inv??lida:" + +#: virtinst/ImageFetcher.py:194 +#, python-format +msgid "Mounting location %s failed" +msgstr "Fallo al intentar montar la direcci??n %s" + +#: virtinst/ImageManager.py:43 +msgid "Could not find suitable boot descriptor for this host" +msgstr "No se ha podido encontrar un descriptor de inicializaci??n acorde a este anfitri??n" + +#: virtinst/ImageManager.py:49 +msgid "Unsupported virtualization type" +msgstr "Tipo de virtualizaci??n no soportada" + +#: virtinst/ImageManager.py:96 +#, python-format +msgid "System disk %s does not exist" +msgstr "El disco del sistema %s no existe" + +#: virtinst/ImageParser.py:78 +msgid "Expected exactly one 'domain' element" +msgstr "Se esperaba solo un elemento de \"dominio\"" + +#: virtinst/ImageParser.py:83 +#, python-format +msgid "Disk entry for '%s' not found" +msgstr "No se ha podido encontrar la entrada de disco para '%s'" + +#: virtinst/ImageParser.py:110 +#, python-format +msgid "Memory must be an integer, but is '%s'" +msgstr "La memoria debe ser un entero, pero es '%s'" + +#: virtinst/ImageParser.py:219 +#, python-format +msgid "The format for disk %s must be one of %s" +msgstr "El formato para disco %s debe ser uno de %s" + +#: virtinst/ImageParser.py:258 +msgid "Root element is not 'image'" +msgstr "El elemento root no es \"imagen\" " + +#: virtinst/LiveCDInstaller.py:50 +msgid "Connection does not support HVM virtualisation, cannot boot live CD" +msgstr "La conexi??n no soporta virtualizaci??n HVM, no se puede inicializar live CD" + +#: virtinst/LiveCDInstaller.py:59 +msgid "CDROM media must be specified for the live CD installer." +msgstr "El contenido del CDROM debe ser especificado para el instalador de live CD" + +#: virtinst/OSDistro.py:141 +#, python-format +msgid "Could not find a kernel path for virt type '%s'" +msgstr "No se puede encontrar una ruta de kernel para el tipo '%s' de virtualizaci??n" + +#: virtinst/OSDistro.py:156 +msgid "Could not find a boot iso path for this tree." +msgstr "No se puede encontrar una ruta de inicializaci??n iso para este ??rbol. " + +#: virtinst/OSDistro.py:360 +msgid "Unable to determine kernel RPM path" +msgstr "No se puede determinar la ruta del kernel RPM" + +#: virtinst/OSDistro.py:362 +msgid "Unable to determine install-initrd RPM path" +msgstr "No se puede determinar la ruta del RPM install-initrd" + +#: virtinst/OSDistro.py:373 +msgid "Building initrd" +msgstr "Generando initrd" + +#: virtinst/ParaVirtGuest.py:43 +msgid "A location must be specified to install from" +msgstr "Debe especificarse un lugar desde donde instalar" + +#: virtinst/Storage.py:87 +#, python-format +msgid "Unknown storage object type: %s" +msgstr "Tipo de objeto de almacenamiento desconocido: %s" + +#: virtinst/Storage.py:116 +msgid "'conn' must be a libvirt connection object." +msgstr "'conn' debe ser un objeto de conexi??n libvirt." + +#: virtinst/Storage.py:118 +msgid "Passed connection is not libvirt storage capable" +msgstr "La conexi??n pasada no es capaz de almacenamiento libvirt" + +#: virtinst/Storage.py:129 +msgid "Storage object name must be a string " +msgstr "El nombre del objeto de almacenamiento debe ser una cadena" + +#: virtinst/Storage.py:132 +msgid "Storage object name can not be only " +msgstr "El nombre del objeto de almacenamiento no puede ser solamente" + +#: virtinst/Storage.py:135 +msgid "Storage object name can only contain " +msgstr "El nombre del objeto de almacenamiento puede contener solamente " + +#: virtinst/Storage.py:150 +msgid "Permissions must be passed as a dict object" +msgstr "Deben ser pasados permisos como objeto de diccionario" + +#: virtinst/Storage.py:153 +msgid "Permissions must contain 'mode', 'owner', 'group' and 'label' keys." +msgstr "Los permisos deben contener las llaves 'mode', 'owner', 'group' y 'label'." + +#: virtinst/Storage.py:160 +#, python-format +msgid "'%s' is not an absolute path." +msgstr "'%s' no es una ruta absoluta." + +#: virtinst/Storage.py:219 +msgid "Filesystem Directory" +msgstr "Directorio del Sistema de Archivos" + +#: virtinst/Storage.py:220 +msgid "Pre-Formatted Block Device" +msgstr "Dispositivo de Bloque Preformateado" + +#: virtinst/Storage.py:221 +msgid "Network Exported Directory" +msgstr "Directorio de Red Exportado" + +#: virtinst/Storage.py:222 +msgid "LVM Volume Group" +msgstr "Grupo de Volumen LVM" + +#: virtinst/Storage.py:223 +msgid "Physical Disk Device" +msgstr "Dispositivo de Disco F??sico" + +#: virtinst/Storage.py:224 +msgid "iSCSI Target" +msgstr "Destino iSCSI" + +#: virtinst/Storage.py:234 +#: virtinst/Storage.py:271 +#, python-format +msgid "Unknown storage pool type: %s" +msgstr "Tipo de grupo de almacenamiento desconocido: %s" + +#: virtinst/Storage.py:307 +msgid "Host name must be a string" +msgstr "El nombre del anfitri??n debe ser una cadena" + +#: virtinst/Storage.py:337 +#, python-format +msgid "Name '%s' already in use by another pool." +msgstr "El nombre '%s' ya est?? siendo usado por otro grupo." + +#: virtinst/Storage.py:375 +#, python-format +msgid "Could not define storage pool: %s" +msgstr "No se puede definir grupo de almacenamiento: %s" + +#: virtinst/Storage.py:385 +#, python-format +msgid "Could not build storage pool: %s" +msgstr "No se puede generar un grupo de almacenamiento: %s" + +#: virtinst/Storage.py:394 +#, python-format +msgid "Could not start storage pool: %s" +msgstr "No se puede iniciar grupo de almacenamiento: %s" + +#: virtinst/Storage.py:471 +#, python-format +msgid "Unknown Filesystem format: %s" +msgstr "Formato del sistema de archivos desconocido: %s" + +#: virtinst/Storage.py:486 +msgid "Device path is required" +msgstr "Se requiere una ruta de dispositivo" + +#: virtinst/Storage.py:523 +#, python-format +msgid "Unknown Network Filesystem format: %s" +msgstr "Formato de Sistema de Archivo de Red desconocido: %s" + +#: virtinst/Storage.py:537 +#: virtinst/Storage.py:663 +msgid "Hostname is required" +msgstr "Se requiere el nombre del anfitri??n" + +#: virtinst/Storage.py:539 +#: virtinst/Storage.py:613 +#: virtinst/Storage.py:665 +msgid "Host path is required" +msgstr "Se requiere una ruta de anfitri??n" + +#: virtinst/Storage.py:600 +#, python-format +msgid "Unknown Disk format: %s" +msgstr "Formato de disco desconocido: %s" + +#: virtinst/Storage.py:625 +msgid "Must explicitly specify disk format if formatting disk device." +msgstr "Se debe especificar expl??citamente un formato de disco si se formatea el dispositivo de disco." + +#: virtinst/Storage.py:681 +msgid "One of pool or pool_name must be specified." +msgstr "Se debe especificar, o bien grupo, o bien pool_name." + +#: virtinst/Storage.py:684 +#: virtinst/Storage.py:754 +msgid "'conn' must be specified with 'pool_name'" +msgstr "debe especificarse 'conn' con 'pool_name'" + +#: virtinst/Storage.py:740 +msgid "Default volume target path range exceeded." +msgstr "Se ha excedido el rango de la ruta al volumen de destino por defecto." + +#: virtinst/Storage.py:750 +msgid "Must specify pool_object or pool_name" +msgstr "Debe especificarse pool_object, o pool_name" + +#: virtinst/Storage.py:756 +msgid "Connection does not support storage management." +msgstr "La conexi??n no soporta gerenciamiento de almacenamiento." + +#: virtinst/Storage.py:761 +#, python-format +msgid "Couldn't find storage pool '%s': %s" +msgstr "No se ha podido encontrar grupo de almacenamiento '%s': %s" + +#: virtinst/Storage.py:765 +msgid "pool_object must be a virStoragePool" +msgstr "pool_object debe ser un virStoragePool" + +#: virtinst/Storage.py:780 +msgid "Capacity must be a positive number" +msgstr "La capacidad debe ser un n??mero positivo" + +#: virtinst/Storage.py:801 +msgid "Allocation must be a non-negative number" +msgstr "El alojamiento debe ser un n??mero no negativo" + +#: virtinst/Storage.py:821 +msgid "'pool' must be a virStoragePool instance." +msgstr "'grupo' debe ser una instancia de virStoragePool." + +#: virtinst/Storage.py:823 +#, python-format +msgid "pool '%s' must be active." +msgstr "grupo '%s' debe estar activa." + +#: virtinst/Storage.py:832 +#, python-format +msgid "'%s' is not a valid format." +msgstr "'%s' no es un formato v??lido." + +#: virtinst/Storage.py:842 +#, python-format +msgid "Name '%s' already in use by another volume." +msgstr "El nombre '%s' ya est?? siendo utilizado por otro volumen." + +#: virtinst/Storage.py:912 +#, python-format +msgid "There is not enough free space on the storage pool to create the volume. (%d M requested allocation > %d M available)" +msgstr "No hay suficiente espacio libre en el grupo de almacenamiento para crear el volumen. (%d M alojamiento requerido > %d M disponible)" + +#: virtinst/Storage.py:918 +#, python-format +msgid "The requested volume capacity will exceed the available pool space when the volume is fully allocated. (%d M requested capacity > %d M available)" +msgstr "La capacidad del volumen solicitada superar?? el espacio disponible del grupo de almacenamiento cuando el volumen est?? completamente alojado. (%d M capacidad requerida > %d M disponible)" + +#: virtinst/util.py:45 +#, python-format +msgid "Invalid line length while parsing %s." +msgstr "Tama??o de l??nea inv??lido en el proceso de an??lisis %s." + +#: virtinst/util.py:46 +#, python-format +msgid "Defaulting bridge to xenbr%d" +msgstr "Estableciendo un puente por defecto hacia xenbr%d" + +#: virtinst/util.py:402 +#: virtinst/VirtualDevice.py:59 +msgid "'conn' must be a virConnect instance." +msgstr "'conn' debe ser una instancia de virConnect." + +#: virtinst/VirtualDevice.py:44 +msgid "'conn' must be a virConnect instance" +msgstr "'conn' debe ser una instancia de virConnect" + +#: virtinst/VirtualDevice.py:68 +#, python-format +msgid "'%s' must be True or False" +msgstr "'%s' debe ser Verdadero o Falso" + +#: virtinst/VirtualDevice.py:72 +#, python-format +msgid "'%s' must be a string, not '%s'." +msgstr "'%s' debe ser una cadena, no '%s'." + +#: virtinst/VirtualDisk.py:160 +msgid "'size' must be a number greater than 0." +msgstr "'size' debe ser un n??mero mayor que 0." + +#: virtinst/VirtualDisk.py:170 +#, python-format +msgid "Unknown storage type '%s'" +msgstr "Tipo de almacenamiento desconocido '%s'" + +#: virtinst/VirtualDisk.py:179 +#, python-format +msgid "Unknown device type '%s'" +msgstr "Tipo de dispositivo desconocido '%s'" + +#: virtinst/VirtualDisk.py:209 +msgid "vol_object must be a virStorageVol instance" +msgstr "vol_object debe ser una instancia de virStorageVol" + +#: virtinst/VirtualDisk.py:217 +msgid "vol_install must be a StorageVolume instance." +msgstr "vol_install debe ser una instancia de StorageVolume." + +#: virtinst/VirtualDisk.py:258 +msgid "Unknown storage volume type." +msgstr "Tipo de volumen de almacenamiento desconocido." + +#: virtinst/VirtualDisk.py:273 +#, python-format +msgid "Passed type '%s' does not match detected storage type '%s'" +msgstr "El tipo pasado '%s' no se corresponde con el tipo de almacenamiento detectado '%s'" + +#: virtinst/VirtualDisk.py:283 +msgid "volName must be a tuple of the form ('poolname', 'volname')" +msgstr "volName debe ser un tupla de la forma ('poolname', 'volname')" + +#: virtinst/VirtualDisk.py:286 +msgid "'volName' requires a passed connection." +msgstr "'volName' requiere una conexi??n pasada." + +#: virtinst/VirtualDisk.py:288 +msgid "Connection does not support storage lookup." +msgstr "La conexi??n no soporta b??squeda de almacenamiento." + +#: virtinst/VirtualDisk.py:294 +#, python-format +msgid "Couldn't lookup volume object: %s" +msgstr "No se ha posido buscar el objeto de volumen: %s" + +#: virtinst/VirtualDisk.py:315 +msgid "Connection doesn't support remote storage." +msgstr "La conexi??n no soporta almacenamiento remoto." + +#: virtinst/VirtualDisk.py:334 +#, python-format +msgid "Size must be specified for non existent path '%s'" +msgstr "Un tama??o debe ser especificado para rutas no existentes: '%s'" + +#: virtinst/VirtualDisk.py:354 +#, python-format +msgid "'%s' is not managed on remote host: %s" +msgstr "'%s' no est?? gerenciado en anfitriones remotos: %s" + +#: virtinst/VirtualDisk.py:364 +msgid "Must specify libvirt managed storage if on a remote connection" +msgstr "Debe especificar almacenamiento gerenciado por libvirt si es una conexi??n remota" + +#: virtinst/VirtualDisk.py:371 +#, python-format +msgid "Device type '%s' requires a path" +msgstr "El tipo de dispositivo '%s' requiere una ruta" + +#: virtinst/VirtualDisk.py:402 +msgid "The path must be a file or a device, not a directory" +msgstr "La ruta debe ser un archivo o un dispositivo, no un directorio." + +#: virtinst/VirtualDisk.py:410 +#, python-format +msgid "Cannot create storage for %s device." +msgstr "No se puede crear almacenamiento para el dispositivo %s." + +#: virtinst/VirtualDisk.py:416 +msgid "Local block device path must exist." +msgstr "Debe exisitir una ruta de dispositivo de bloque local." + +#: virtinst/VirtualDisk.py:421 +#, python-format +msgid "No write access to directory '%s'" +msgstr "El directorio '%s' no permite acceso para escritura" + +#: virtinst/VirtualDisk.py:424 +#, python-format +msgid "size is required for non-existent disk '%s'" +msgstr "se requiere tama??o para discos no existentes '%s'" + +#: virtinst/VirtualDisk.py:459 +msgid "Creating storage file..." +msgstr "Creando archivo de almacenamiento..." + +#: virtinst/VirtualDisk.py:476 +#, python-format +msgid "Error creating diskimage %s: %s" +msgstr "Error al crear una imagen de disco %s: %s" + +#: virtinst/VirtualDisk.py:498 +msgid "'disknode' or self.target must be set!" +msgstr "??Debe configurarse 'disknode' o self.target! " + +#: virtinst/VirtualDisk.py:558 +msgid "The filesystem will not have enough free space to fully allocate the sparse file when the guest is running." +msgstr "El sistema de archivos no tendr?? suficiente espacio libre para alojar completamente el archivo separado, una vez que el hu??sped se encuentre en ejecuci??n. " + +#: virtinst/VirtualDisk.py:563 +msgid "There is not enough free space to create the disk." +msgstr "No hay espacio libre suficiente para crear el disco." + +#: virtinst/VirtualDisk.py:567 +#, python-format +msgid " %d M requested > %d M available" +msgstr " %d M solicitado > %d disponible" + +#: virtinst/VirtualDisk.py:670 +msgid "Cannot determine device bus/type." +msgstr "No se puede determinar el dispositivo bus/type." + +#: virtinst/VirtualDisk.py:677 +msgid "IDE CDROM must use 'hdc', but target in use." +msgstr "IDE CDROM debe usar 'hdc', pero se est?? utilizando." + +#: virtinst/VirtualDisk.py:693 +#, python-format +msgid "No more space for disks of type '%s'" +msgstr "No hay m??s espacio para discos del tipo '%s'" + Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- python-virtinst.spec 10 Mar 2009 05:26:21 -0000 1.59 +++ python-virtinst.spec 23 Mar 2009 20:55:47 -0000 1.60 @@ -8,11 +8,20 @@ %define appname virtinst +%if 0%{?fedora} >= 9 +%define with_egg 1 +%else +%define with_egg 0 +%endif + Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 Release: 1%{_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 +Patch3: %{appname}-%{version}-spanish-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +47,9 @@ %prep %setup -q -n %{appname}-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build python setup.py build @@ -61,7 +73,9 @@ %dir %{python_sitelib}/virtconv %{python_sitelib}/%{appname}/* %{python_sitelib}/virtconv/* +%if %{with_egg} %{python_sitelib}/%{appname}-*.egg-info +%endif %{_mandir}/man1/* %{_mandir}/man5/* %{_sbindir}/virt-install @@ -71,6 +85,11 @@ %{_bindir}/virt-convert %changelog +* Mon Mar 23 2009 Cole Robinson - 0.400.3-2.fc11 +- Add spanish translation (bz 480816) +- Fix calls to libvirt host device detach/reset +- Fix virt-image with create-on-the-fly disks + * Tue Mar 10 2009 Cole Robinson - 0.400.3-1.fc11 - Update to bugfix release 0.400.3 - Fix virt-install --os-type windows installs From crobinso at fedoraproject.org Mon Mar 23 20:57:17 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 23 Mar 2009 20:57:17 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/devel python-virtinst.spec, 1.60, 1.61 Message-ID: <20090323205717.628F770132@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18238 Modified Files: python-virtinst.spec Log Message: Bump version number. Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- python-virtinst.spec 23 Mar 2009 20:55:47 -0000 1.60 +++ python-virtinst.spec 23 Mar 2009 20:56:47 -0000 1.61 @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 1%{_extra_release} +Release: 2%{_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 Mon Mar 23 21:13:27 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 23 Mar 2009 21:13:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-10 virtinst-0.400.3-fix-virtimage-scratch.patch, NONE, 1.1 virtinst-0.400.3-hostdev-libvirt-calls.patch, NONE, 1.1 virtinst-0.400.3-spanish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.53, 1.54 Message-ID: <20090323211327.8BECA70132@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22264 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-virtimage-scratch.patch virtinst-0.400.3-hostdev-libvirt-calls.patch virtinst-0.400.3-spanish-trans.patch Log Message: Add spanish translation (bz 480816) Fix calls to libvirt host device detach/reset Fix virt-image with create-on-the-fly disks virtinst-0.400.3-fix-virtimage-scratch.patch: --- NEW FILE virtinst-0.400.3-fix-virtimage-scratch.patch --- # HG changeset patch # User Cole Robinson # Date 1237821788 14400 # Node ID 8fdb20af39f965aa1ff20ea34ba294db08a7f3e2 # Parent d5f630ee97ea16c91ff3a9db50caff350b72df90 Fix virt-image with scratch + user disks. diff -r d5f630ee97ea -r 8fdb20af39f9 virtinst/ImageParser.py --- a/virtinst/ImageParser.py Mon Mar 23 11:14:38 2009 -0400 +++ b/virtinst/ImageParser.py Mon Mar 23 11:23:08 2009 -0400 @@ -240,13 +240,7 @@ import sha has_hashlib = False - meter_ct = 0 m = None - disk_size = os.path.getsize(self.file) - if meter: - meter.start(size=disk_size, - text=_("Checking disk signature for %s" % self.file)) - if has_hashlib is True: if self.csum.has_key("sha256"): csumvalue = self.csum["sha256"] @@ -262,6 +256,12 @@ if not m: return + meter_ct = 0 + disk_size = os.path.getsize(self.file) + if meter: + meter.start(size=disk_size, + text=_("Checking disk signature for %s" % self.file)) + f = open(self.file,"r") while 1: chunk = f.read(65536) virtinst-0.400.3-hostdev-libvirt-calls.patch: --- NEW FILE virtinst-0.400.3-hostdev-libvirt-calls.patch --- # HG changeset patch # User Cole Robinson # Date 1237302675 14400 # Node ID 1288ff456cdb1a387771624594300ab6be324181 # Parent 143cad71a2a6e83bfff7f46a0f7105e3eeb43ab2 Fix node device dettach/reset libvirt calls diff -r 143cad71a2a6 -r 1288ff456cdb virtinst/NodeDeviceParser.py --- a/virtinst/NodeDeviceParser.py Mon Mar 09 23:31:51 2009 -0400 +++ b/virtinst/NodeDeviceParser.py Tue Mar 17 11:11:15 2009 -0400 @@ -405,10 +405,11 @@ if not isinstance(conn, libvirt.virConnect): raise ValueError(_("'conn' must be a virConnect instance.")) - if dir(libvirt).count("virNodeDeviceDettach") == 0: - return False + if (hasattr(libvirt, "virNodeDevice") and + hasattr(libvirt.virNodeDevice, "dettach")): + return True - return True + return False def lookupNodeName(conn, name): """ diff -r 143cad71a2a6 -r 1288ff456cdb virtinst/VirtualHostDevice.py --- a/virtinst/VirtualHostDevice.py Mon Mar 09 23:31:51 2009 -0400 +++ b/virtinst/VirtualHostDevice.py Tue Mar 17 11:11:15 2009 -0400 @@ -201,8 +201,8 @@ try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.deviceDetach() - self._nodedev.deviceReset() + self._nodedev.dettach() + self._nodedev.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) virtinst-0.400.3-spanish-trans.patch: --- NEW FILE virtinst-0.400.3-spanish-trans.patch --- # HG changeset patch # User Cole Robinson # Date 1237840860 14400 # Node ID a4a3db71aa9efb0f92ba71781954ef4e2788b0d6 # Parent cda75d189b9ca347371dd477c94ffbb3d577e121 Add spanish translation. diff -r cda75d189b9c -r a4a3db71aa9e po/es.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/es.po Mon Mar 23 16:41:00 2009 -0400 @@ -0,0 +1,1433 @@ +# Fedora Spanish Translation of virtinst. +# This file is distributed under the same license as the virtinst package. +# +# H??ctor Daniel Cabrera , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: Fedora Spanish Translation of virtinst\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-10 14:00-0400\n" +"PO-Revision-Date: 2009-01-20 13:06-0300\n" +"Last-Translator: h??ctor daniel cabrera \n" +"Language-Team: Fedora Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: virt-clone:45 +msgid "What is the name for the cloned virtual machine?" +msgstr "??Cu??l es el nombre de la m??quina virtual clonada?" + +#: virt-clone:50 +#: virt-clone:60 +#: virt-clone:89 +#: virtinst/cli.py:175 +msgid "ERROR: " +msgstr "ERROR:" + +#: virt-clone:55 +msgid "What is the name or uuid of the original virtual machine?" +msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?" + +#: virt-clone:83 +msgid "What would you like to use as the cloned disk (file path)?" +msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?" + +#: virt-clone:94 +#, python-format +msgid "This will overwrite the existing path '%s'!\n" +msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n" + +#: virt-clone:96 +msgid "Do you really want to use this disk (yes or no)?" +msgstr "??Realmente quiere utilizar este disco (si o no)?" + +#: virt-clone:102 +#: virt-install:202 +#, python-format +msgid "Disk %s is already in use by another guest!\n" +msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n" + +#: virt-clone:103 +#: virt-install:203 +msgid "Do you really want to use the disk (yes or no)? " +msgstr "??Realmente quiere utilizar el disco (si o no)?" + +#: virt-clone:132 +msgid "Name or uuid for the original guest; The status must be shut off" +msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado" + +#: virt-clone:136 +msgid "Name for the new guest" +msgstr "Nombre para el nuevo hu??sped" + +#: virt-clone:141 +msgid "New UUID for the clone guest; Default is a randomly generated UUID" +msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID" + +#: virt-clone:146 +msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC" +msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC " + +#: virt-clone:151 +msgid "New file to use as the disk image for the new guest" +msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped" + +#: virt-clone:155 +#: virt-image:128 +#: virt-install:317 +msgid "Connect to hypervisor with URI" +msgstr "Conectar al hipervisor con URI" + +#: virt-clone:161 +msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)" +msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)" + +#: virt-clone:166 +msgid "Do not use a sparse file for the clone's disk image" +msgstr "No utilice un archivo separado para la imagen del disco de lo clonado" + +#: virt-clone:171 +msgid "Preserve a new file to use as the disk image for the new guest" +msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped " + +#: virt-clone:175 +#: virt-image:137 +#: virt-install:447 +#: virt-pack:109 +msgid "Print debugging information" +msgstr "Mostrar informaci??n de depuraci??n" + +#: virt-clone:177 +#: virt-image:143 +msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts" +msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada" + +#: virt-clone:194 +msgid "Must be root to clone Xen guests" +msgstr "Debe ser root para poder clonar hu??spedes Xen" + +#: virt-clone:229 +#: virt-image:242 +#: virt-install:697 +msgid "Installation aborted at user request" +msgstr "Instalaci??n abortada a pedido del usuario" + +#: virt-image:67 +#, python-format +msgid "Warning: more networks were provided [%i] then nics required [%i]. All extras are ignored" +msgstr "Aviso: se han provisto m??s redes [%i] que las necesarias para los seud??nimos [%i]. Todo lo extra se ha ignorado" + +#: virt-image:71 +#, python-format +msgid "The image requires %i network interface" +msgstr "La imagen requiere una interfase de red %i " + +#: virt-image:90 +#: virt-install:323 +msgid "Name of the guest instance" +msgstr "Nombre de la instancia del hu??sped" + +#: virt-image:92 +#: virt-install:325 +msgid "Memory to allocate for guest instance in megabytes" +msgstr "Cantidad de memoria en megabytes para alojar la instancia del hu??sped " + +#: virt-image:95 +msgid "UUID for the guest; if none is given a random UUID will be generated. If you specify UUID, you should use a 32-digit hexadecimal number." +msgstr "UUID para el hu??sped; si no se provee ninguno, se generar?? uno en forma aleatoria. Si especifica alg??n UUID, debe usar un n??mero hexadecimal de 32 d??gitos." + +#: virt-image:97 +#: virt-install:334 +msgid "Number of vcpus to configure for your guest" +msgstr "Cantidad de vcpus a configurar para su hu??sped" + +#: virt-image:99 +#: virt-install:336 +msgid "Check that vcpus do not exceed physical CPUs and warn if they do." +msgstr "Verifica que los vcpus no excedan los CPUs f??sicos y avisa si lo hacen." + +#: virt-image:104 +#: virt-install:423 +msgid "Fixed MAC address for the guest; if none or RANDOM is given a random address will be used" +msgstr "Direcci??n MAC adecuada para el hu??sped; si ninguna o CUALQUIERA es dada, se generar?? una direcci??n de manera aleatoria" + +#: virt-image:107 +#: virt-install:415 +msgid "Bridge to connect guest NIC to; if none given, will try to determine the default" +msgstr "Puente para conectar el NIC del hu??sped; si no es dado ninguno, se intentar?? determinar uno por defecto" + +#: virt-image:110 +#: virt-install:419 +msgid "Connect the guest to a virtual network, forwarding to the physical network with NAT" +msgstr "Conecta el hu??sped a la red virtual, reenvi??ndolo a la red f??sica a trav??s de NAT" + +#: virt-image:114 +#: virt-install:429 +msgid "Use VNC for graphics support" +msgstr "Utilizar VNC para el soporte gr??fico" + +#: virt-image:116 +#: virt-install:431 +msgid "Port to use for VNC" +msgstr "Puerto a ser usado para VNC" + +#: virt-image:118 +#: virt-install:433 +msgid "Use SDL for graphics support" +msgstr "Utilizar SDL para soporte gr??fico" + +#: virt-image:120 +#: virt-install:435 +msgid "Don't set up a graphical console for the guest." +msgstr "No configura una consola gr??fica para el hu??sped." + +#: virt-image:124 +#: virt-install:442 +msgid "set up keymap for a graphical console" +msgstr "define un mapa de teclado para una consola gr??fica" + +#: virt-image:132 +#: virt-install:356 +msgid "Disables APIC for fully virtualized guest (overrides value in os-type/os-variant db)" +msgstr "Deshabilita APIC para un hu??sped completamente virtual (se anulan los valores en os-type/os-variant db) " + +#: virt-image:133 +#: virt-install:360 +msgid "Disables ACPI for fully virtualized guest (overrides value in os-type/os-variant db)" +msgstr "Deshabilita ACPI para un hu??sped completamente virtual (se anulan los valores en os-type/os-variant db)" + +#: virt-image:139 +msgid "Print the libvirt XML, but do not start the domain" +msgstr "Muestra el libvirt XML, pero no inicia el dominio" + +#: virt-image:141 +msgid "The zero-based index of the boot record to use" +msgstr "El ??ndice de base cero del registro de inicializaci??n a ser usado" + +#: virt-image:146 +msgid "Overwrite, or destroy, an existing image with the same name" +msgstr "Anula o destruye cualquier imagen existente con el mismo nombre" + +#: virt-image:151 +#: virt-pack:113 +msgid "You need to provide an image XML descriptor" +msgstr "Necesita indicar un descriptor de imagen XML" + +#: virt-image:168 +msgid "Cannot parse" +msgstr "No fue posible analizar" + +#: virt-image:172 +msgid "Cannot parse capabilities" +msgstr "No fue posible analizar capacidades" + +#: virt-image:177 +#, python-format +msgid "The index for --boot must be between 0 and %d" +msgstr "El ??ndice para --boot debe ser entre 0 y %d" + +#: virt-image:220 +#, python-format +msgid "" +"\n" +"\n" +"Creating guest %s..." +msgstr "" +"\n" +"\n" +"Creando hu??sped %s..." + +#: virt-image:224 +msgid "Guest creation failed" +msgstr "Fall?? la creaci??n del hu??sped" + +#: virt-image:230 +#, python-format +msgid "" +"Domain creation may not have been\n" +"successful. If it was, you can restart your domain\n" +"by running 'virsh start %s'; otherwise, please\n" +"restart your installation." +msgstr "" +"La creaci??n del dominio podr??a no haber sido\n" +"exitosa. Si lo fue, puede reiniciar su dominio\n" +"ejecutando \"virsh start %s\"; de lo contrario, por favor\reinicie su instalaci??n." + +#: virt-install:73 +#, python-format +msgid "Couldn't create default storage pool '%s': %s" +msgstr "No se ha podido crear un grupo de almacenamiento por defecto '%s': %s" + +#: virt-install:96 +msgid "--disk path must start with path=, pool=, or vol=." +msgstr "--disk path debe iniciar con path=, pool=, o vol=." + +#: virt-install:122 +#: virt-install:134 +#, python-format +msgid "Unknown '%s' value '%s'" +msgstr "Valor '%s' desconocido '%s'" + +#: virt-install:127 +#, python-format +msgid "Improper value for 'size': %s" +msgstr "Valor desapropiado para 'size': %s" + +#: virt-install:136 +#, python-format +msgid "Unknown --disk option '%s'." +msgstr "Opci??n --disk desconocida '%s'." + +#: virt-install:145 +msgid "Size must be specified with all 'pool='" +msgstr "El tama??o debe especificarse en todos los 'pool='" + +#: virt-install:158 +msgid "Storage volume must be specified as pool=poolname/volname" +msgstr "El vol??men de almacenamiento debe especificarse como pool=poolname/volname" + +#: virt-install:198 +#, python-format +msgid "Error with storage parameters: %s" +msgstr "Error en los par??metros de almacenamiento: %s" + +#: virt-install:210 +msgid " Do you really want to use the disk (yes or no)?" +msgstr "??Realmente desea utilizar el disco? (s?? o no)" + +#: virt-install:218 +msgid "Cannot use --file, --size, or --disk with --nodisks" +msgstr "No es posible utilizar --file, --size o --disk con --nodisks" + +#: virt-install:221 +msgid "Cannot mix --file, --nonsparse, or --file-size with --disk options. Please see the manual for --disk syntax." +msgstr "No se puede mezclar --file, --nonsparse, o --file-size con --disk options. Por favor vea el manual para --disk syntax." + +#: virt-install:224 +msgid "A disk must be specified (use --nodisks to override)" +msgstr "Un disco debe ser especificado (utilice --nodisks para anular)" + +#: virt-install:232 +msgid "Need to pass size for each disk" +msgstr "Es necesario pasar el tama??o para cada disco" + +#: virt-install:259 +msgid "Only one of --pxe, --location and --cdrom can be used" +msgstr "S??lo uno de --pxe, --location y --cdrom puede ser utilizado" + +#: virt-install:263 +msgid "Network PXE boot is not supported for paravirtualized guests" +msgstr "Inicializaci??n PXE en red no est?? soportado para hu??spedes paravirtualizados " + +#: virt-install:266 +msgid "Paravirtualized guests cannot install off cdrom media." +msgstr "Hu??spedes paravirtualizados no pueden instalarse desde un dispositivo cdrom." + +#: virt-install:268 +msgid "location must be specified for paravirtualized guests." +msgstr "debe especificarse un lugar para los hu??spedes paravirtualizados. " + +#: virt-install:271 +msgid "--location can not be specified for remote connections." +msgstr "--location no puede ser especificado para conexiones remotas." + +#: virt-install:280 +msgid "One of --pxe, --location, or cdrom media must be specified." +msgstr "Debe ser especificao --pxe, --location, o cdrom media. " + +#: virt-install:297 +#, python-format +msgid "Error creating cdrom disk: %s" +msgstr "Error al crear disco cdrom: %s" + +#: virt-install:303 +#: virt-install:308 +#: virtinst/cli.py:354 +#: virtinst/cli.py:359 +#, python-format +msgid "%s option requires an argument" +msgstr "La opci??n %s requiere un argumento" + +#: virt-install:320 +msgid "General Options" +msgstr "Opciones Generales" + +#: virt-install:329 +msgid "The CPU architecture to simulate" +msgstr "La arquitectura del CPU a ser simulada" + +#: virt-install:332 +msgid "UUID for the guest." +msgstr "UUID para el hu??sped." + +#: virt-install:340 +msgid "Set which physical CPUs Domain can use." +msgstr "Especifique qu?? dominios f??sicos del CPU pueden utilizarse. " + +#: virt-install:343 +msgid "Full Virtualization specific options." +msgstr "Opciones espec??ficas de una virtualizaci??n total." + +#: virt-install:345 +msgid "Use sound device emulation" +msgstr "Utilice emulaci??n del dispositivo de sonido" + +#: virt-install:348 +msgid "The OS type for fully virtualized guests, e.g. 'linux', 'unix', 'windows'" +msgstr "El tipo de sistema operativo para hu??pedes totalmente virtualizados, por ejemplo, \"linux\", \"unix\", \"windows\"" + +#: virt-install:352 +msgid "The OS variant for fully virtualized guests, e.g. 'fedora6', 'rhel5', 'solaris10', 'win2k'" +msgstr "La variante del sistema operativo para hu??spedes totalmente virtualizados, por ejemplo, \"fedora6\", \"rhel5\", \"solaris10\", \"win2k\"" + +#: virt-install:363 +msgid "Virtualization Type Options" +msgstr "Opciones del Tipo de Virtualizaci??n" + +#: virt-install:365 +msgid "This guest should be a fully virtualized guest" +msgstr "Este hu??sped deber??a ser un hu??sped completamente virtualizado" + +#: virt-install:367 +msgid "This guest should be a paravirtualized guest" +msgstr "Este hu??sped deber??a ser un hu??sped paravirtualizado" + +#: virt-install:370 +msgid "Use kernel acceleration capabilities (kvm, kqemu, ...)" +msgstr "Utilice capacidades de aceleraci??n del kernel (kvm, kquemu, ...)" + +#: virt-install:374 +msgid "Installation Method Options" +msgstr "Opciones para el M??todo de Instalaci??n" + +#: virt-install:377 +msgid "CD-ROM installation media" +msgstr "Medio de instalaci??n de CD-ROM" + +#: virt-install:380 +msgid "Installation source (eg, nfs:host:/path, http://host/path, ftp://host/path)" +msgstr "Fuente de instalaci??n (por ejemplo, nfs:host:/path, http://host/path, ftp://host/path)" + +#: virt-install:383 +msgid "Boot from the network using the PXE protocol" +msgstr "Inicialice un instalador desde la red utilizando el protocolo PXE" + +#: virt-install:385 +msgid "Treat the CDROM media is a LiveCD" +msgstr "Indique que el contenido del CDROM sea tratado como un LiveCD" + +#: virt-install:388 +msgid "Additional arguments to pass to the kernel booted from --location" +msgstr "Se necesitan argumentos adicionales para pasar al kernel inicializado desde --location" + +#: virt-install:392 +msgid "Storage Configuration" +msgstr "Configuraci??n de Almacenamiento" + +#: virt-install:395 +msgid "Specify storage to use as a disk with various options." +msgstr "Indique almacenamiento a ser utilizado como disco con varias opciones." + +#: virt-install:399 +msgid "File to use as the disk image" +msgstr "Archivo a ser usado como imagen de disco" + +#: virt-install:402 +msgid "Size of the disk image (if it doesn't exist) in gigabytes" +msgstr "Tama??o de la imagen del disco (si es que no existe) en gigabytes" + +#: virt-install:406 +msgid "Don't use sparse files for disks. Note that this will be significantly slower for guest creation" +msgstr "No utilice archivos separados para los discos. F??jese que esto ser?? significativamente m??s lento para la creaci??n de hu??spedes" + +#: virt-install:409 +msgid "Don't set up any disks for the guest." +msgstr "No configure ning??n disco para el hu??sped." + +#: virt-install:412 +msgid "Networking Configuration" +msgstr "Configuraci??n de Redes" + +#: virt-install:427 +msgid "Graphics Configuration" +msgstr "Configuraci??n de Gr??ficos" + +#: virt-install:438 +msgid "Don't automatically try to connect to the guest console" +msgstr "No intentar conectarse autom??ticamente con la consola hu??sped " + +#: virt-install:445 +msgid "Miscellaneous Options" +msgstr "Opciones Varias" + +#: virt-install:449 +msgid "Disables the automatic rebooting when the installation is complete." +msgstr "Deshabilita la reinicializaci??n autom??tica cuando se ha completado la instalaci??n." + +#: virt-install:452 +msgid "Total time to wait for VM to shutdown if console not present. Time less than 0 waits indefinitely." +msgstr "Tiempo total de espera para que se apague la VM si la consola no est?? presente. Si el tiempo es menor que 0 la espera es indefinida." + +#: virt-install:456 +msgid "Forces 'yes' for any applicable prompts, terminates for all others" +msgstr "Provoca un \"si\" forzado para cualquier solicitud adecuada, y finaliza todas los dem??s" + +#: virt-install:460 +msgid "Request user input for ambiguous situations. Default is false, so will terminate if a prompt would typically be fired. " +msgstr "Solicita entradas del usuario para situaciones ambiguas. Por defecto est?? configurado en \"falso\" (false), de modo que finalizar?? cualquier solicitud que sea ignorada. " + +#: virt-install:480 +msgid "Unable to connect to graphical console: virt-viewer not installed. Please install the 'virt-viewer' package." +msgstr "No se ha podido conectar a una consola gr??fica: no est?? instalado el virt-viewer. Por favor, instale el paquete \"virt-viewer\"-" + +#: virt-install:512 +msgid "Can't do both --hvm and --paravirt" +msgstr "No se puede hacer --hvm y --paravirt al mismo tiempo" + +#: virt-install:523 +#: virt-install:528 +msgid "default" +msgstr "por defecto" + +#: virt-install:527 +#, python-format +msgid "Unsupported virtualization type '%s' " +msgstr "Tipo de virtualizaci??n '%s' no soportada" + +#: virt-install:530 +#, python-format +msgid "for arch '%s'" +msgstr "para arq '%s'" + +#: virt-install:626 +msgid "" +"\n" +"\n" +"Starting install..." +msgstr "" +"\n" +"\n" +"Empezando la instalaci??n..." + +#: virt-install:642 +msgid "Guest installation failed" +msgstr "La instalaci??n del hu??sped ha fallado" + +#: virt-install:649 +#, python-format +msgid " %d minutes" +msgstr "%d minutos" + +#: virt-install:647 +msgid "Domain installation still in progress. Waiting" +msgstr "Instalaci??n lde dominio todav??a en progreso. Esperando" + +#: virt-install:654 +msgid "Domain has shutdown. Continuing." +msgstr "El dominio ha concluido. Continuando." + +#: virt-install:660 +msgid "Installation has exceeded specified timelimit. Aborting." +msgstr "La instalaci??n ha excedido el tiempo especificado. Abortando" + +#: virt-install:664 +msgid "" +"Domain installation still in progress. You can reconnect to \n" +"the console to complete the installation process." +msgstr "" +"La instalaci??n del dominio contin??a en progreso. Puede reconectarse a \n" +"la consola para completar el proceso de instalaci??n." + +#: virt-install:672 +#, python-format +msgid "" +"Domain installation does not appear to have been\n" +" successful. If it was, you can restart your domain\n" +" by running 'virsh start %s'; otherwise, please\n" +" restart your installation." +msgstr "" +"La instalaci??n del dominio no parece haber sido\n" +" exitosa. Si lo fue, puede reiniciar su dominio\n" +" ejecutando 'virsh start %s'; de lo contrario, por favor\n" +" reinicie su instalaci??n." + +#: virt-install:676 +#, python-format +msgid "" +"Guest installation complete... you can restart your domain\n" +"by running 'virsh start %s'" +msgstr "" +"Instalaci??n de hu??sped completa... puede reiniciar su dominio\n" +"ejecutando 'virsh start %s'" + +#: virt-install:679 +msgid "Guest installation complete... restarting guest." +msgstr "Instalaci??n de hu??sped completa... reiniciando hu??sped." + +#: virt-install:688 +#, python-format +msgid "" +"Domain installation may not have been\n" +" successful. If it was, you can restart your domain\n" +" by running 'virsh start %s'; otherwise, please\n" +" restart your installation." +msgstr "" +"La instalaci??n del dominio podr??a no haber sido\n" +" exitosa. Si lo fue, puede reiniciar su dominio\n" +" ejecutando 'virsh start %s'; de lo contrario, por favor\n" +" reinicie su instalaci??n." + +#: virt-pack:58 +msgid "The image name and version must be present" +msgstr "Deben estar presentes el nombre y la versi??n de la imagen" + +#: virt-pack:73 +#, python-format +msgid "Scratch disk %s does not have a size attribute" +msgstr "El disco transitorio %s no tiene un atributo de tama??o" + +#: virt-pack:76 +#, python-format +msgid "Disk file %s could not be found" +msgstr "No puede encontrarse el archivo de disco %s" + +#: virt-pack:93 +#, python-format +msgid "Writing %s" +msgstr "Escribiendo %s" + +#: virt-pack:107 +msgid "Directory in which packaged file will be put" +msgstr "Directorio en el cual ser?? puesto el archivo empaquetado" + +#: virt-pack:123 +msgid "The image descriptor must contain name and version" +msgstr "El descriptor de imagen debe contener un nombre y una versi??n" + +#: virt-pack:132 +#, python-format +msgid "Validation failed: %s" +msgstr "Fallo en la validaci??n: %s" + +#: virt-pack:138 +#, python-format +msgid "Packaging failed: %s" +msgstr "Fallo en el empaquetamiento: %s" + +#: virtinst/CapabilitiesParser.py:168 +msgid "No domains available for this guest." +msgstr "No existen dominios disponibles para este hu??sped." + +#: virtinst/cli.py:112 +msgid "Exiting at user request." +msgstr "Saliendo a pedido del usuario." + +#: virtinst/cli.py:118 +msgid "Must be root to create Xen guests" +msgstr "Debe ser root para poder crear un hu??sped Xen" + +#: virtinst/cli.py:120 +msgid "Could not find usable default libvirt connection." +msgstr "No se ha podido encontrar una conexi??n por defecto libvirt que sea utilizable. " + +#: virtinst/cli.py:142 +#, python-format +msgid "Force flag is set but input was required. Prompt was: %s" +msgstr "Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %s " + +#: virtinst/cli.py:145 +#, python-format +msgid "Prompting disabled, but input was requested. Prompt was: %s" +msgstr "Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %s " + +#: virtinst/cli.py:165 +#, python-format +msgid "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for such prompts. Prompt was: %s" +msgstr "Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente --force para forzar un \"si\" para este tipo de peticiones. Se pide: %s" + +#: virtinst/cli.py:185 +msgid "A name is required for the virtual machine." +msgstr "Se requiere un nombre para la m??quina virtual." + +#: virtinst/cli.py:193 +msgid "Memory amount is required for the virtual machine." +msgstr "Se requiere una cantidad de memoria para la m??quina virtual." + +#: virtinst/cli.py:195 +#, python-format +msgid "Installs currently require %d megs of RAM." +msgstr "La instalaci??n actualmente requiere %d megas de RAM." + +#: virtinst/cli.py:215 +#, python-format +msgid "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) on the host. This will work, but performance will be poor. Are you sure? (yes or no)" +msgstr "Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)" + +#: virtinst/cli.py:270 +msgid "Unknown network type " +msgstr "Tipo de red desconocido" + +#: virtinst/cli.py:288 +msgid "Cannot mix both --bridge and --network arguments" +msgstr "No se pueden mezclar los argumentos de --bridge y de --network" + +#: virtinst/cli.py:297 +msgid "Need to pass equal numbers of networks & mac addresses" +msgstr "Se necesita pasar la misma cantidad de redes & y de direcciones mac" + +#: virtinst/cli.py:319 +msgid "Can't specify more than one of VNC, SDL, or --nographics" +msgstr "No se puede especificar m??s de un VNC, SDL, o --nographics" + +#: virtinst/CloneManager.py:74 +msgid "Name or UUID of guest to clone is required" +msgstr "Se requiere nombre o UUID del hu??sped a clonar" + +#: virtinst/CloneManager.py:83 +msgid "A valid name or UUID of guest to clone is required" +msgstr "Se requiere un nombre v??lido o UUID de hu??sped a clonar" + +#: virtinst/CloneManager.py:93 +#, python-format +msgid "Invalid name for new guest: %s" +msgstr "Nombre inv??lido para el nuevo hu??ped: %s" + +#: virtinst/CloneManager.py:101 +#, python-format +msgid "Invalid uuid for new guest: %s" +msgstr "UUID inv??lido para el nuevo hu??ped: %s" + +#: virtinst/CloneManager.py:109 +msgid "New file to use for disk image is required" +msgstr "Se requiere un nuevo archivo para usar para la imagen del disco" + +#: virtinst/CloneManager.py:187 +#, python-format +msgid "Domain %s is not found" +msgstr "No se encuentra el dominio %s" + +#: virtinst/CloneManager.py:204 +msgid "Domain status must be SHUTOFF" +msgstr "El estado del dominio debe ser SHUTOFF" + +#: virtinst/CloneManager.py:211 +#, python-format +msgid "Domain %s already exists" +msgstr "El dominio %s ya existe" + +#: virtinst/CloneManager.py:220 +#: virtinst/Guest.py:871 +msgid "The UUID you entered is already in use by another guest!" +msgstr "??El UUID que ha ingresado est?? siendo utilizado por otro hu??sped!" + +#: virtinst/CloneManager.py:264 +#, python-format +msgid "Missing new file to use disk image for %s" +msgstr "No se encuentra el archivo nuevo para usar la imagen de disco para %s" + +#: virtinst/CloneManager.py:547 +#, python-format +msgid "Cloning from %(src)s to %(dst)s" +msgstr "Clonando desde %(src)s a %(dst)s" + +#: virtinst/CloneManager.py:549 +msgid "Cloning domain..." +msgstr "Clonando dominio..." + +#: virtinst/DistroManager.py:93 +#, python-format +msgid "Could not find an installable distribution at '%s'" +msgstr "No se ha podido encontrar una distribuci??n instalable en '%s'" + +#: virtinst/DistroManager.py:104 +#: virtinst/DistroManager.py:122 +msgid "Invalid install location: " +msgstr "Lugar de instalaci??n inv??lido:" + +#: virtinst/DistroManager.py:162 +msgid "Invalid NFS format: No path specified." +msgstr "Formato NFS inv??lido: No se ha especificado ninguna ruta." + +#: virtinst/DistroManager.py:177 +#, python-format +msgid "Checking installer location failed: %s" +msgstr "Verificando falla en el localizador de instalaci??n: %s" + +#: virtinst/DistroManager.py:180 +msgid "Install media location must be an NFS, HTTP or FTP network install source, or an existing local file/device" +msgstr "La fuente del archivo de instalaci??n debe encontrarse en una red NFS, HTTP o FTP, o en un archivo/dispositvo local " + +#: virtinst/DistroManager.py:185 +msgid "NFS installations are only supported as root" +msgstr "Instalaciones de tipo NFS solo son soportadas como root" + +#: virtinst/FullVirtGuest.py:206 +msgid "OS type must be a string." +msgstr "El tipo de sistema operativo debe ser una cadena." + +#: virtinst/FullVirtGuest.py:213 +#, python-format +msgid "OS type '%s' does not exist in our dictionary" +msgstr "El tipo de sistema operativo '%s' no existe en nuestro diccionario" + +#: virtinst/FullVirtGuest.py:221 +msgid "OS variant must be a string." +msgstr "La variante del sistema operativo debe ser una cadena." + +#: virtinst/FullVirtGuest.py:227 +#, python-format +msgid "OS variant '%(var)s; does not exist in our dictionary for OS type '%(ty)s'" +msgstr "La variante '%(var)s'; no existe en nuestro diccionario para el sistema operativo '%(ty)s'" + +#: virtinst/FullVirtGuest.py:238 +#, python-format +msgid "Unknown OS variant '%s'" +msgstr "Variante de sistema operativo desconocida '%s'" + +#: virtinst/FullVirtGuest.py:323 +msgid "Unable to start domain for guest, aborting installation!" +msgstr "??Imposible iniciar dominio para el hu??ped, abortando la instalaci??n!" + +#: virtinst/FullVirtGuest.py:364 +#, python-format +msgid "Invalid dictionary entry for device '%s %s'" +msgstr "Entrada de diccionario inv??lida para el dispositivo '%s %s'" + +#: virtinst/Guest.py:54 +msgid "MAC address must be of the format AA:BB:CC:DD:EE:FF" +msgstr "La direcci??n MAC debe tener el formato AA:BB:CC:DD:EE:FF" + +#: virtinst/Guest.py:62 +msgid "A network name was not provided" +msgstr "No se ha provisto un nombre de red" + +#: virtinst/Guest.py:68 +#, python-format +msgid "Unknown network type %s" +msgstr "Tipo de red desconocido %s" + +#: virtinst/Guest.py:105 +msgid "The MAC address you entered is already in use by another active virtual machine." +msgstr "La direcci??n MAC que ha ingresado est?? siendo utilizada por otra m??quina virtual activa." + +#: virtinst/Guest.py:108 +msgid "The MAC address you entered conflicts with a device on the physical host." +msgstr "La direcci??n MAC que ha ingresado presenta conflicitos con un dispositivo en el anfitri??n f??sico" + +#: virtinst/Guest.py:110 +msgid "The MAC address you entered is already in use by another inactive virtual machine." +msgstr "La direcci??n MAC que ha ingresado est?? siendo utilizada por otra m??quina virtual inactiva." + +#: virtinst/Guest.py:181 +#, python-format +msgid "'model' must be a string, was '%s'." +msgstr "'modelo' debe ser una cadena, era '%s'." + +#: virtinst/Guest.py:184 +#, python-format +msgid "Unsupported sound model '%s'" +msgstr "Modelo de sonido no soportado '%s'" + +#: virtinst/Guest.py:204 +msgid "Unknown graphics type" +msgstr "Tipo de gr??ficos no soportado" + +#: virtinst/Guest.py:221 +msgid "Keymap must be a string" +msgstr "El mapa de teclado debe ser una cadena" + +#: virtinst/Guest.py:223 +msgid "Keymap must be less than 16 characters" +msgstr "El mapa de teclado debe ser menor que 16 caracteres" + +#: virtinst/Guest.py:225 +msgid "Keymap can only contain alphanumeric, '_', or '-' characters" +msgstr "El mapa de teclado s??lo puede contener caracteres alfanum??ricos, y los signos \"_\", y \"-\"" + +#: virtinst/Guest.py:236 +msgid "VNC port must be a number between 5900 and 65535, or -1 for auto allocation" +msgstr "El puerto VNC debe ser un n??mero entre 5900 y 65535, o -1, para que se asigne autom??ticamente " + +#: virtinst/Guest.py:333 +msgid "Guest.cdrom must be a boolean type" +msgstr "Guest.cdrom debe ser de tipo booleano" + +#: virtinst/Guest.py:350 +#: virtinst/Guest.py:355 +#: virtinst/Guest.py:359 +msgid "Must pass both a kernel and initrd" +msgstr "Debe pasar tanto un kernel como un initrd" + +#: virtinst/Guest.py:362 +msgid "Kernel and initrd must be specified by a list, dict, or tuple." +msgstr "El kernel y el initrd deben ser especificados por una lista, un diccionario o una tupla." + +#: virtinst/Guest.py:399 +msgid "Unable to connect to hypervisor, aborting installation!" +msgstr "??No se ha podido conectar con el hypervisor, abortando la instalaci??n!" + +#: virtinst/Guest.py:424 +msgid "System name must be a string greater than 0 and no more than 50 characters" +msgstr "El nombre del sistema debe ser una cadena mayor que 0 y que posea no m??s de 50 carateres" + +#: virtinst/Guest.py:426 +msgid "System name must not be only numeric characters" +msgstr "El nombre del sistema no debe contener solo caracteres num??ricos" + +#: virtinst/Guest.py:428 +msgid "System name can only contain: alphanumeric '_', '.', ':', '+', or '-' characters" +msgstr "El nombre del sistema solo puede contener: caracteres alfanum??ricos, y los signos \"_\", \".\", \":\", \"+\", y \"-\" " + +#: virtinst/Guest.py:439 +msgid "Memory value must be an integer greater than 0" +msgstr "El valor de la memoria debe ser un entero mayor que 0" + +#: virtinst/Guest.py:450 +msgid "Max Memory value must be an integer greater than 0" +msgstr "El valor de la memoria m??xima debe ser un entero mayor que 0" + +#: virtinst/Guest.py:461 +#: virtinst/Storage.py:315 +msgid "UUID must be a string." +msgstr "UUID debe ser una cadena." + +#: virtinst/Guest.py:467 +#: virtinst/Storage.py:321 +msgid "UUID must be a 32-digit hexadecimal number. It may take the form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX or may omit hyphens altogether." +msgstr "UUID debe ser un n??mero hexadecimal de 32 d??gitos. Puede tener la forma de XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX o pueden omitirse los guiones." + +#: virtinst/Guest.py:482 +msgid "Number of vcpus must be a postive integer." +msgstr "El n??mero de cpus virtuales debe ser un entero positivo." + +#: virtinst/Guest.py:485 +#, python-format +msgid "Number of vcpus must be no greater than %d for this vm type." +msgstr "El n??mero de cpus virtuales no debe mayor que %d para este tipo de m??quina virtual." + +#: virtinst/Guest.py:494 +msgid "cpuset must be string" +msgstr "cpuset debe ser una cadena" + +#: virtinst/Guest.py:496 +msgid "cpuset can only contain numeric, ',', or '-' characters" +msgstr "cpuset debe contener solo caracteres n??mericos, o los signos \",\", y \"-\"" + +#: virtinst/Guest.py:503 +msgid "cpuset contains invalid format." +msgstr "cpuset contiene un formato inv??lido." + +#: virtinst/Guest.py:505 +#: virtinst/Guest.py:508 +msgid "cpuset's pCPU numbers must be less than pCPUs." +msgstr "Los n??meros cpuset de las pCPU deben ser menores que las pCPUs." + +#: virtinst/Guest.py:549 +msgid "Must specify whether graphics are enabled" +msgstr "Debe especificarse si el modo gr??fico est?? habilitado" + +#: virtinst/Guest.py:568 +msgid "Graphics enabled must be True or False" +msgstr "Modo gr??fico habilitado deber ser Verdadero o Falso" + +#: virtinst/Guest.py:611 +msgid "You must specify a valid ISO or CD-ROM location for the installation" +msgstr "Debe especificar una imagen ISO o una direcci??n de CD-ROM v??lida para la instalaci??n" + +#: virtinst/Guest.py:614 +msgid "The specified media path does not exist." +msgstr "No existe la ruta al contenido especificado." + +#: virtinst/Guest.py:757 +#, python-format +msgid "Could not remove old vm '%s': %s" +msgstr "No se puede eliminar la antigua m??quina virtual '%s': %s" + +#: virtinst/Guest.py:759 +#, python-format +msgid "Domain named %s already exists!" +msgstr "??El nombre del dominio %s ya existe!" + +#: virtinst/Guest.py:766 +msgid "Creating domain..." +msgstr "Creando dominio..." + +#: virtinst/Guest.py:769 +msgid "Unable to create domain for the guest, aborting installation!" +msgstr "??No se ha podido crear el dominio para el hu??sped, abortando la instalaci??n!" + +#: virtinst/Guest.py:789 +msgid "It appears that your installation has crashed. You should be able to find more information in the logs" +msgstr "Aparentemente su instalaci??n ha fallado. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:835 +msgid "Domain has not existed. You should be able to find more information in the logs" +msgstr "El dominio no existe. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:837 +msgid "Domain has not run yet. You should be able to find more information in the logs" +msgstr "El dominio no est?? ejecut??ndose a??n. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:852 +msgid "Domain has already been started!" +msgstr "??El dominio ya se est?? ejecutando!" + +#: virtinst/Guest.py:879 +msgid "Name and memory must be specified for all guests!" +msgstr "??El nombre y la memoria debe ser especificado para todos los hu??spedes!" + +#: virtinst/ImageFetcher.py:74 +msgid "Verifying install location..." +msgstr "Verificando lugar de instalaci??n..." + +#: virtinst/ImageFetcher.py:78 +#, python-format +msgid "Opening URL %s failed: %s" +msgstr "Fallo al abril la URL %s: %s" + +#: virtinst/ImageFetcher.py:94 +#, python-format +msgid "Retrieving file %s..." +msgstr "Obteniendo archivo %s..." + +#: virtinst/ImageFetcher.py:96 +#, python-format +msgid "Couldn't acquire file %s: %s" +msgstr "No se ha podido adquirir el archivo %s: %s" + +#: virtinst/ImageFetcher.py:157 +#: virtinst/ImageFetcher.py:159 +msgid "Invalid file location given: " +msgstr "Se ha indicado una direcci??n de archivo inv??lida:" + +#: virtinst/ImageFetcher.py:194 +#, python-format +msgid "Mounting location %s failed" +msgstr "Fallo al intentar montar la direcci??n %s" + +#: virtinst/ImageManager.py:43 +msgid "Could not find suitable boot descriptor for this host" +msgstr "No se ha podido encontrar un descriptor de inicializaci??n acorde a este anfitri??n" + +#: virtinst/ImageManager.py:49 +msgid "Unsupported virtualization type" +msgstr "Tipo de virtualizaci??n no soportada" + +#: virtinst/ImageManager.py:96 +#, python-format +msgid "System disk %s does not exist" +msgstr "El disco del sistema %s no existe" + +#: virtinst/ImageParser.py:78 +msgid "Expected exactly one 'domain' element" +msgstr "Se esperaba solo un elemento de \"dominio\"" + +#: virtinst/ImageParser.py:83 +#, python-format +msgid "Disk entry for '%s' not found" +msgstr "No se ha podido encontrar la entrada de disco para '%s'" + +#: virtinst/ImageParser.py:110 +#, python-format +msgid "Memory must be an integer, but is '%s'" +msgstr "La memoria debe ser un entero, pero es '%s'" + +#: virtinst/ImageParser.py:219 +#, python-format +msgid "The format for disk %s must be one of %s" +msgstr "El formato para disco %s debe ser uno de %s" + +#: virtinst/ImageParser.py:258 +msgid "Root element is not 'image'" +msgstr "El elemento root no es \"imagen\" " + +#: virtinst/LiveCDInstaller.py:50 +msgid "Connection does not support HVM virtualisation, cannot boot live CD" +msgstr "La conexi??n no soporta virtualizaci??n HVM, no se puede inicializar live CD" + +#: virtinst/LiveCDInstaller.py:59 +msgid "CDROM media must be specified for the live CD installer." +msgstr "El contenido del CDROM debe ser especificado para el instalador de live CD" + +#: virtinst/OSDistro.py:141 +#, python-format +msgid "Could not find a kernel path for virt type '%s'" +msgstr "No se puede encontrar una ruta de kernel para el tipo '%s' de virtualizaci??n" + +#: virtinst/OSDistro.py:156 +msgid "Could not find a boot iso path for this tree." +msgstr "No se puede encontrar una ruta de inicializaci??n iso para este ??rbol. " + +#: virtinst/OSDistro.py:360 +msgid "Unable to determine kernel RPM path" +msgstr "No se puede determinar la ruta del kernel RPM" + +#: virtinst/OSDistro.py:362 +msgid "Unable to determine install-initrd RPM path" +msgstr "No se puede determinar la ruta del RPM install-initrd" + +#: virtinst/OSDistro.py:373 +msgid "Building initrd" +msgstr "Generando initrd" + +#: virtinst/ParaVirtGuest.py:43 +msgid "A location must be specified to install from" +msgstr "Debe especificarse un lugar desde donde instalar" + +#: virtinst/Storage.py:87 +#, python-format +msgid "Unknown storage object type: %s" +msgstr "Tipo de objeto de almacenamiento desconocido: %s" + +#: virtinst/Storage.py:116 +msgid "'conn' must be a libvirt connection object." +msgstr "'conn' debe ser un objeto de conexi??n libvirt." + +#: virtinst/Storage.py:118 +msgid "Passed connection is not libvirt storage capable" +msgstr "La conexi??n pasada no es capaz de almacenamiento libvirt" + +#: virtinst/Storage.py:129 +msgid "Storage object name must be a string " +msgstr "El nombre del objeto de almacenamiento debe ser una cadena" + +#: virtinst/Storage.py:132 +msgid "Storage object name can not be only " +msgstr "El nombre del objeto de almacenamiento no puede ser solamente" + +#: virtinst/Storage.py:135 +msgid "Storage object name can only contain " +msgstr "El nombre del objeto de almacenamiento puede contener solamente " + +#: virtinst/Storage.py:150 +msgid "Permissions must be passed as a dict object" +msgstr "Deben ser pasados permisos como objeto de diccionario" + +#: virtinst/Storage.py:153 +msgid "Permissions must contain 'mode', 'owner', 'group' and 'label' keys." +msgstr "Los permisos deben contener las llaves 'mode', 'owner', 'group' y 'label'." + +#: virtinst/Storage.py:160 +#, python-format +msgid "'%s' is not an absolute path." +msgstr "'%s' no es una ruta absoluta." + +#: virtinst/Storage.py:219 +msgid "Filesystem Directory" +msgstr "Directorio del Sistema de Archivos" + +#: virtinst/Storage.py:220 +msgid "Pre-Formatted Block Device" +msgstr "Dispositivo de Bloque Preformateado" + +#: virtinst/Storage.py:221 +msgid "Network Exported Directory" +msgstr "Directorio de Red Exportado" + +#: virtinst/Storage.py:222 +msgid "LVM Volume Group" +msgstr "Grupo de Volumen LVM" + +#: virtinst/Storage.py:223 +msgid "Physical Disk Device" +msgstr "Dispositivo de Disco F??sico" + +#: virtinst/Storage.py:224 +msgid "iSCSI Target" +msgstr "Destino iSCSI" + +#: virtinst/Storage.py:234 +#: virtinst/Storage.py:271 +#, python-format +msgid "Unknown storage pool type: %s" +msgstr "Tipo de grupo de almacenamiento desconocido: %s" + +#: virtinst/Storage.py:307 +msgid "Host name must be a string" +msgstr "El nombre del anfitri??n debe ser una cadena" + +#: virtinst/Storage.py:337 +#, python-format +msgid "Name '%s' already in use by another pool." +msgstr "El nombre '%s' ya est?? siendo usado por otro grupo." + +#: virtinst/Storage.py:375 +#, python-format +msgid "Could not define storage pool: %s" +msgstr "No se puede definir grupo de almacenamiento: %s" + +#: virtinst/Storage.py:385 +#, python-format +msgid "Could not build storage pool: %s" +msgstr "No se puede generar un grupo de almacenamiento: %s" + +#: virtinst/Storage.py:394 +#, python-format +msgid "Could not start storage pool: %s" +msgstr "No se puede iniciar grupo de almacenamiento: %s" + +#: virtinst/Storage.py:471 +#, python-format +msgid "Unknown Filesystem format: %s" +msgstr "Formato del sistema de archivos desconocido: %s" + +#: virtinst/Storage.py:486 +msgid "Device path is required" +msgstr "Se requiere una ruta de dispositivo" + +#: virtinst/Storage.py:523 +#, python-format +msgid "Unknown Network Filesystem format: %s" +msgstr "Formato de Sistema de Archivo de Red desconocido: %s" + +#: virtinst/Storage.py:537 +#: virtinst/Storage.py:663 +msgid "Hostname is required" +msgstr "Se requiere el nombre del anfitri??n" + +#: virtinst/Storage.py:539 +#: virtinst/Storage.py:613 +#: virtinst/Storage.py:665 +msgid "Host path is required" +msgstr "Se requiere una ruta de anfitri??n" + +#: virtinst/Storage.py:600 +#, python-format +msgid "Unknown Disk format: %s" +msgstr "Formato de disco desconocido: %s" + +#: virtinst/Storage.py:625 +msgid "Must explicitly specify disk format if formatting disk device." +msgstr "Se debe especificar expl??citamente un formato de disco si se formatea el dispositivo de disco." + +#: virtinst/Storage.py:681 +msgid "One of pool or pool_name must be specified." +msgstr "Se debe especificar, o bien grupo, o bien pool_name." + +#: virtinst/Storage.py:684 +#: virtinst/Storage.py:754 +msgid "'conn' must be specified with 'pool_name'" +msgstr "debe especificarse 'conn' con 'pool_name'" + +#: virtinst/Storage.py:740 +msgid "Default volume target path range exceeded." +msgstr "Se ha excedido el rango de la ruta al volumen de destino por defecto." + +#: virtinst/Storage.py:750 +msgid "Must specify pool_object or pool_name" +msgstr "Debe especificarse pool_object, o pool_name" + +#: virtinst/Storage.py:756 +msgid "Connection does not support storage management." +msgstr "La conexi??n no soporta gerenciamiento de almacenamiento." + +#: virtinst/Storage.py:761 +#, python-format +msgid "Couldn't find storage pool '%s': %s" +msgstr "No se ha podido encontrar grupo de almacenamiento '%s': %s" + +#: virtinst/Storage.py:765 +msgid "pool_object must be a virStoragePool" +msgstr "pool_object debe ser un virStoragePool" + +#: virtinst/Storage.py:780 +msgid "Capacity must be a positive number" +msgstr "La capacidad debe ser un n??mero positivo" + +#: virtinst/Storage.py:801 +msgid "Allocation must be a non-negative number" +msgstr "El alojamiento debe ser un n??mero no negativo" + +#: virtinst/Storage.py:821 +msgid "'pool' must be a virStoragePool instance." +msgstr "'grupo' debe ser una instancia de virStoragePool." + +#: virtinst/Storage.py:823 +#, python-format +msgid "pool '%s' must be active." +msgstr "grupo '%s' debe estar activa." + +#: virtinst/Storage.py:832 +#, python-format +msgid "'%s' is not a valid format." +msgstr "'%s' no es un formato v??lido." + +#: virtinst/Storage.py:842 +#, python-format +msgid "Name '%s' already in use by another volume." +msgstr "El nombre '%s' ya est?? siendo utilizado por otro volumen." + +#: virtinst/Storage.py:912 +#, python-format +msgid "There is not enough free space on the storage pool to create the volume. (%d M requested allocation > %d M available)" +msgstr "No hay suficiente espacio libre en el grupo de almacenamiento para crear el volumen. (%d M alojamiento requerido > %d M disponible)" + +#: virtinst/Storage.py:918 +#, python-format +msgid "The requested volume capacity will exceed the available pool space when the volume is fully allocated. (%d M requested capacity > %d M available)" +msgstr "La capacidad del volumen solicitada superar?? el espacio disponible del grupo de almacenamiento cuando el volumen est?? completamente alojado. (%d M capacidad requerida > %d M disponible)" + +#: virtinst/util.py:45 +#, python-format +msgid "Invalid line length while parsing %s." +msgstr "Tama??o de l??nea inv??lido en el proceso de an??lisis %s." + +#: virtinst/util.py:46 +#, python-format +msgid "Defaulting bridge to xenbr%d" +msgstr "Estableciendo un puente por defecto hacia xenbr%d" + +#: virtinst/util.py:402 +#: virtinst/VirtualDevice.py:59 +msgid "'conn' must be a virConnect instance." +msgstr "'conn' debe ser una instancia de virConnect." + +#: virtinst/VirtualDevice.py:44 +msgid "'conn' must be a virConnect instance" +msgstr "'conn' debe ser una instancia de virConnect" + +#: virtinst/VirtualDevice.py:68 +#, python-format +msgid "'%s' must be True or False" +msgstr "'%s' debe ser Verdadero o Falso" + +#: virtinst/VirtualDevice.py:72 +#, python-format +msgid "'%s' must be a string, not '%s'." +msgstr "'%s' debe ser una cadena, no '%s'." + +#: virtinst/VirtualDisk.py:160 +msgid "'size' must be a number greater than 0." +msgstr "'size' debe ser un n??mero mayor que 0." + +#: virtinst/VirtualDisk.py:170 +#, python-format +msgid "Unknown storage type '%s'" +msgstr "Tipo de almacenamiento desconocido '%s'" + +#: virtinst/VirtualDisk.py:179 +#, python-format +msgid "Unknown device type '%s'" +msgstr "Tipo de dispositivo desconocido '%s'" + +#: virtinst/VirtualDisk.py:209 +msgid "vol_object must be a virStorageVol instance" +msgstr "vol_object debe ser una instancia de virStorageVol" + +#: virtinst/VirtualDisk.py:217 +msgid "vol_install must be a StorageVolume instance." +msgstr "vol_install debe ser una instancia de StorageVolume." + +#: virtinst/VirtualDisk.py:258 +msgid "Unknown storage volume type." +msgstr "Tipo de volumen de almacenamiento desconocido." + +#: virtinst/VirtualDisk.py:273 +#, python-format +msgid "Passed type '%s' does not match detected storage type '%s'" +msgstr "El tipo pasado '%s' no se corresponde con el tipo de almacenamiento detectado '%s'" + +#: virtinst/VirtualDisk.py:283 +msgid "volName must be a tuple of the form ('poolname', 'volname')" +msgstr "volName debe ser un tupla de la forma ('poolname', 'volname')" + +#: virtinst/VirtualDisk.py:286 +msgid "'volName' requires a passed connection." +msgstr "'volName' requiere una conexi??n pasada." + +#: virtinst/VirtualDisk.py:288 +msgid "Connection does not support storage lookup." +msgstr "La conexi??n no soporta b??squeda de almacenamiento." + +#: virtinst/VirtualDisk.py:294 +#, python-format +msgid "Couldn't lookup volume object: %s" +msgstr "No se ha posido buscar el objeto de volumen: %s" + +#: virtinst/VirtualDisk.py:315 +msgid "Connection doesn't support remote storage." +msgstr "La conexi??n no soporta almacenamiento remoto." + +#: virtinst/VirtualDisk.py:334 +#, python-format +msgid "Size must be specified for non existent path '%s'" +msgstr "Un tama??o debe ser especificado para rutas no existentes: '%s'" + +#: virtinst/VirtualDisk.py:354 +#, python-format +msgid "'%s' is not managed on remote host: %s" +msgstr "'%s' no est?? gerenciado en anfitriones remotos: %s" + +#: virtinst/VirtualDisk.py:364 +msgid "Must specify libvirt managed storage if on a remote connection" +msgstr "Debe especificar almacenamiento gerenciado por libvirt si es una conexi??n remota" + +#: virtinst/VirtualDisk.py:371 +#, python-format +msgid "Device type '%s' requires a path" +msgstr "El tipo de dispositivo '%s' requiere una ruta" + +#: virtinst/VirtualDisk.py:402 +msgid "The path must be a file or a device, not a directory" +msgstr "La ruta debe ser un archivo o un dispositivo, no un directorio." + +#: virtinst/VirtualDisk.py:410 +#, python-format +msgid "Cannot create storage for %s device." +msgstr "No se puede crear almacenamiento para el dispositivo %s." + +#: virtinst/VirtualDisk.py:416 +msgid "Local block device path must exist." +msgstr "Debe exisitir una ruta de dispositivo de bloque local." + +#: virtinst/VirtualDisk.py:421 +#, python-format +msgid "No write access to directory '%s'" +msgstr "El directorio '%s' no permite acceso para escritura" + +#: virtinst/VirtualDisk.py:424 +#, python-format +msgid "size is required for non-existent disk '%s'" +msgstr "se requiere tama??o para discos no existentes '%s'" + +#: virtinst/VirtualDisk.py:459 +msgid "Creating storage file..." +msgstr "Creando archivo de almacenamiento..." + +#: virtinst/VirtualDisk.py:476 +#, python-format +msgid "Error creating diskimage %s: %s" +msgstr "Error al crear una imagen de disco %s: %s" + +#: virtinst/VirtualDisk.py:498 +msgid "'disknode' or self.target must be set!" +msgstr "??Debe configurarse 'disknode' o self.target! " + +#: virtinst/VirtualDisk.py:558 +msgid "The filesystem will not have enough free space to fully allocate the sparse file when the guest is running." +msgstr "El sistema de archivos no tendr?? suficiente espacio libre para alojar completamente el archivo separado, una vez que el hu??sped se encuentre en ejecuci??n. " + +#: virtinst/VirtualDisk.py:563 +msgid "There is not enough free space to create the disk." +msgstr "No hay espacio libre suficiente para crear el disco." + +#: virtinst/VirtualDisk.py:567 +#, python-format +msgid " %d M requested > %d M available" +msgstr " %d M solicitado > %d disponible" + +#: virtinst/VirtualDisk.py:670 +msgid "Cannot determine device bus/type." +msgstr "No se puede determinar el dispositivo bus/type." + +#: virtinst/VirtualDisk.py:677 +msgid "IDE CDROM must use 'hdc', but target in use." +msgstr "IDE CDROM debe usar 'hdc', pero se est?? utilizando." + +#: virtinst/VirtualDisk.py:693 +#, python-format +msgid "No more space for disks of type '%s'" +msgstr "No hay m??s espacio para discos del tipo '%s'" + Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- python-virtinst.spec 10 Mar 2009 05:14:37 -0000 1.53 +++ python-virtinst.spec 23 Mar 2009 21:12:56 -0000 1.54 @@ -11,8 +11,11 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 1%{_extra_release} +Release: 2%{_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 +Patch3: %{appname}-%{version}-spanish-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +41,9 @@ %prep %setup -q -n %{appname}-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build python setup.py build @@ -71,6 +77,11 @@ %{_bindir}/virt-convert %changelog +* Mon Mar 23 2009 Cole Robinson - 0.400.3-2.fc10 +- Add spanish translation (bz 480816) +- Fix calls to libvirt host device detach/reset +- Fix virt-image with create-on-the-fly disks + * Tue Mar 10 2009 Cole Robinson - 0.400.3-1.fc10 - Update to bugfix release 0.400.3 - Fix virt-install --os-type windows installs From crobinso at fedoraproject.org Mon Mar 23 21:14:00 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 23 Mar 2009 21:14:00 +0000 (UTC) Subject: [fedora-virt-maint] rpms/python-virtinst/F-9 virtinst-0.400.3-fix-virtimage-scratch.patch, NONE, 1.1 virtinst-0.400.3-hostdev-libvirt-calls.patch, NONE, 1.1 virtinst-0.400.3-spanish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.48, 1.49 Message-ID: <20090323211400.D924970132@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/python-virtinst/F-9 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22446 Modified Files: python-virtinst.spec Added Files: virtinst-0.400.3-fix-virtimage-scratch.patch virtinst-0.400.3-hostdev-libvirt-calls.patch virtinst-0.400.3-spanish-trans.patch Log Message: Add spanish translation (bz 480816) Fix calls to libvirt host device detach/reset Fix virt-image with create-on-the-fly disks virtinst-0.400.3-fix-virtimage-scratch.patch: --- NEW FILE virtinst-0.400.3-fix-virtimage-scratch.patch --- # HG changeset patch # User Cole Robinson # Date 1237821788 14400 # Node ID 8fdb20af39f965aa1ff20ea34ba294db08a7f3e2 # Parent d5f630ee97ea16c91ff3a9db50caff350b72df90 Fix virt-image with scratch + user disks. diff -r d5f630ee97ea -r 8fdb20af39f9 virtinst/ImageParser.py --- a/virtinst/ImageParser.py Mon Mar 23 11:14:38 2009 -0400 +++ b/virtinst/ImageParser.py Mon Mar 23 11:23:08 2009 -0400 @@ -240,13 +240,7 @@ import sha has_hashlib = False - meter_ct = 0 m = None - disk_size = os.path.getsize(self.file) - if meter: - meter.start(size=disk_size, - text=_("Checking disk signature for %s" % self.file)) - if has_hashlib is True: if self.csum.has_key("sha256"): csumvalue = self.csum["sha256"] @@ -262,6 +256,12 @@ if not m: return + meter_ct = 0 + disk_size = os.path.getsize(self.file) + if meter: + meter.start(size=disk_size, + text=_("Checking disk signature for %s" % self.file)) + f = open(self.file,"r") while 1: chunk = f.read(65536) virtinst-0.400.3-hostdev-libvirt-calls.patch: --- NEW FILE virtinst-0.400.3-hostdev-libvirt-calls.patch --- # HG changeset patch # User Cole Robinson # Date 1237302675 14400 # Node ID 1288ff456cdb1a387771624594300ab6be324181 # Parent 143cad71a2a6e83bfff7f46a0f7105e3eeb43ab2 Fix node device dettach/reset libvirt calls diff -r 143cad71a2a6 -r 1288ff456cdb virtinst/NodeDeviceParser.py --- a/virtinst/NodeDeviceParser.py Mon Mar 09 23:31:51 2009 -0400 +++ b/virtinst/NodeDeviceParser.py Tue Mar 17 11:11:15 2009 -0400 @@ -405,10 +405,11 @@ if not isinstance(conn, libvirt.virConnect): raise ValueError(_("'conn' must be a virConnect instance.")) - if dir(libvirt).count("virNodeDeviceDettach") == 0: - return False + if (hasattr(libvirt, "virNodeDevice") and + hasattr(libvirt.virNodeDevice, "dettach")): + return True - return True + return False def lookupNodeName(conn, name): """ diff -r 143cad71a2a6 -r 1288ff456cdb virtinst/VirtualHostDevice.py --- a/virtinst/VirtualHostDevice.py Mon Mar 09 23:31:51 2009 -0400 +++ b/virtinst/VirtualHostDevice.py Tue Mar 17 11:11:15 2009 -0400 @@ -201,8 +201,8 @@ try: # Do this as a sanity check, so that we don't fail at domain # start time - self._nodedev.deviceDetach() - self._nodedev.deviceReset() + self._nodedev.dettach() + self._nodedev.reset() except Exception, e: raise RuntimeError(_("Could not detach PCI device: %s" % str(e))) virtinst-0.400.3-spanish-trans.patch: --- NEW FILE virtinst-0.400.3-spanish-trans.patch --- # HG changeset patch # User Cole Robinson # Date 1237840860 14400 # Node ID a4a3db71aa9efb0f92ba71781954ef4e2788b0d6 # Parent cda75d189b9ca347371dd477c94ffbb3d577e121 Add spanish translation. diff -r cda75d189b9c -r a4a3db71aa9e po/es.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/es.po Mon Mar 23 16:41:00 2009 -0400 @@ -0,0 +1,1433 @@ +# Fedora Spanish Translation of virtinst. +# This file is distributed under the same license as the virtinst package. +# +# H??ctor Daniel Cabrera , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: Fedora Spanish Translation of virtinst\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-10 14:00-0400\n" +"PO-Revision-Date: 2009-01-20 13:06-0300\n" +"Last-Translator: h??ctor daniel cabrera \n" +"Language-Team: Fedora Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: virt-clone:45 +msgid "What is the name for the cloned virtual machine?" +msgstr "??Cu??l es el nombre de la m??quina virtual clonada?" + +#: virt-clone:50 +#: virt-clone:60 +#: virt-clone:89 +#: virtinst/cli.py:175 +msgid "ERROR: " +msgstr "ERROR:" + +#: virt-clone:55 +msgid "What is the name or uuid of the original virtual machine?" +msgstr "??Cu??l es el nombre o el uuid de la m??quina virtual original?" + +#: virt-clone:83 +msgid "What would you like to use as the cloned disk (file path)?" +msgstr "??Qu?? (ruta de archivo) le gustar??a utilizar para el disco clonado?" + +#: virt-clone:94 +#, python-format +msgid "This will overwrite the existing path '%s'!\n" +msgstr "Esto sobrescribir?? las rutas existentes '%s'!\n" + +#: virt-clone:96 +msgid "Do you really want to use this disk (yes or no)?" +msgstr "??Realmente quiere utilizar este disco (si o no)?" + +#: virt-clone:102 +#: virt-install:202 +#, python-format +msgid "Disk %s is already in use by another guest!\n" +msgstr "??El disco %s ya est?? siendo utilizado por otro hu??sped!\n" + +#: virt-clone:103 +#: virt-install:203 +msgid "Do you really want to use the disk (yes or no)? " +msgstr "??Realmente quiere utilizar el disco (si o no)?" + +#: virt-clone:132 +msgid "Name or uuid for the original guest; The status must be shut off" +msgstr "Nombre o uuid del hu??sped original; el status debe ser apagado" + +#: virt-clone:136 +msgid "Name for the new guest" +msgstr "Nombre para el nuevo hu??sped" + +#: virt-clone:141 +msgid "New UUID for the clone guest; Default is a randomly generated UUID" +msgstr "Nuevo UUID para el hu??sped clonado; por defecto se genera en forma aleatoria una UUID" + +#: virt-clone:146 +msgid "New fixed MAC address for the clone guest. Default is a randomly generated MAC" +msgstr "Nueva direcci??n MAC adecuada para el hu??sped clonado. Por defecto se genera en forma aleatoria una MAC " + +#: virt-clone:151 +msgid "New file to use as the disk image for the new guest" +msgstr "Nuevo archivo para ser usado como imagen de disco para el nuevo hu??sped" + +#: virt-clone:155 +#: virt-image:128 +#: virt-install:317 +msgid "Connect to hypervisor with URI" +msgstr "Conectar al hipervisor con URI" + +#: virt-clone:161 +msgid "Force to copy devices (eg, if 'hdc' is a readonly cdrom device, --force-copy=hdc)" +msgstr "Copiando dispositivos de manera forzada (por ejemplo, si \"hdc\" es un dispositivo cdrom s??lo de lectura, --force-copy=hdc)" + +#: virt-clone:166 +msgid "Do not use a sparse file for the clone's disk image" +msgstr "No utilice un archivo separado para la imagen del disco de lo clonado" + +#: virt-clone:171 +msgid "Preserve a new file to use as the disk image for the new guest" +msgstr "Preserve un archivo nuevo para utilizarlo como la imagen del disco del nuevo hu??sped " + +#: virt-clone:175 +#: virt-image:137 +#: virt-install:447 +#: virt-pack:109 +msgid "Print debugging information" +msgstr "Mostrar informaci??n de depuraci??n" + +#: virt-clone:177 +#: virt-image:143 +msgid "Do not prompt for input. Answers yes where applicable, terminates for all other prompts" +msgstr "No solicite entrada. Una respuesta positiva, cuando se aplique, finaliza cualquier otra entrada" + +#: virt-clone:194 +msgid "Must be root to clone Xen guests" +msgstr "Debe ser root para poder clonar hu??spedes Xen" + +#: virt-clone:229 +#: virt-image:242 +#: virt-install:697 +msgid "Installation aborted at user request" +msgstr "Instalaci??n abortada a pedido del usuario" + +#: virt-image:67 +#, python-format +msgid "Warning: more networks were provided [%i] then nics required [%i]. All extras are ignored" +msgstr "Aviso: se han provisto m??s redes [%i] que las necesarias para los seud??nimos [%i]. Todo lo extra se ha ignorado" + +#: virt-image:71 +#, python-format +msgid "The image requires %i network interface" +msgstr "La imagen requiere una interfase de red %i " + +#: virt-image:90 +#: virt-install:323 +msgid "Name of the guest instance" +msgstr "Nombre de la instancia del hu??sped" + +#: virt-image:92 +#: virt-install:325 +msgid "Memory to allocate for guest instance in megabytes" +msgstr "Cantidad de memoria en megabytes para alojar la instancia del hu??sped " + +#: virt-image:95 +msgid "UUID for the guest; if none is given a random UUID will be generated. If you specify UUID, you should use a 32-digit hexadecimal number." +msgstr "UUID para el hu??sped; si no se provee ninguno, se generar?? uno en forma aleatoria. Si especifica alg??n UUID, debe usar un n??mero hexadecimal de 32 d??gitos." + +#: virt-image:97 +#: virt-install:334 +msgid "Number of vcpus to configure for your guest" +msgstr "Cantidad de vcpus a configurar para su hu??sped" + +#: virt-image:99 +#: virt-install:336 +msgid "Check that vcpus do not exceed physical CPUs and warn if they do." +msgstr "Verifica que los vcpus no excedan los CPUs f??sicos y avisa si lo hacen." + +#: virt-image:104 +#: virt-install:423 +msgid "Fixed MAC address for the guest; if none or RANDOM is given a random address will be used" +msgstr "Direcci??n MAC adecuada para el hu??sped; si ninguna o CUALQUIERA es dada, se generar?? una direcci??n de manera aleatoria" + +#: virt-image:107 +#: virt-install:415 +msgid "Bridge to connect guest NIC to; if none given, will try to determine the default" +msgstr "Puente para conectar el NIC del hu??sped; si no es dado ninguno, se intentar?? determinar uno por defecto" + +#: virt-image:110 +#: virt-install:419 +msgid "Connect the guest to a virtual network, forwarding to the physical network with NAT" +msgstr "Conecta el hu??sped a la red virtual, reenvi??ndolo a la red f??sica a trav??s de NAT" + +#: virt-image:114 +#: virt-install:429 +msgid "Use VNC for graphics support" +msgstr "Utilizar VNC para el soporte gr??fico" + +#: virt-image:116 +#: virt-install:431 +msgid "Port to use for VNC" +msgstr "Puerto a ser usado para VNC" + +#: virt-image:118 +#: virt-install:433 +msgid "Use SDL for graphics support" +msgstr "Utilizar SDL para soporte gr??fico" + +#: virt-image:120 +#: virt-install:435 +msgid "Don't set up a graphical console for the guest." +msgstr "No configura una consola gr??fica para el hu??sped." + +#: virt-image:124 +#: virt-install:442 +msgid "set up keymap for a graphical console" +msgstr "define un mapa de teclado para una consola gr??fica" + +#: virt-image:132 +#: virt-install:356 +msgid "Disables APIC for fully virtualized guest (overrides value in os-type/os-variant db)" +msgstr "Deshabilita APIC para un hu??sped completamente virtual (se anulan los valores en os-type/os-variant db) " + +#: virt-image:133 +#: virt-install:360 +msgid "Disables ACPI for fully virtualized guest (overrides value in os-type/os-variant db)" +msgstr "Deshabilita ACPI para un hu??sped completamente virtual (se anulan los valores en os-type/os-variant db)" + +#: virt-image:139 +msgid "Print the libvirt XML, but do not start the domain" +msgstr "Muestra el libvirt XML, pero no inicia el dominio" + +#: virt-image:141 +msgid "The zero-based index of the boot record to use" +msgstr "El ??ndice de base cero del registro de inicializaci??n a ser usado" + +#: virt-image:146 +msgid "Overwrite, or destroy, an existing image with the same name" +msgstr "Anula o destruye cualquier imagen existente con el mismo nombre" + +#: virt-image:151 +#: virt-pack:113 +msgid "You need to provide an image XML descriptor" +msgstr "Necesita indicar un descriptor de imagen XML" + +#: virt-image:168 +msgid "Cannot parse" +msgstr "No fue posible analizar" + +#: virt-image:172 +msgid "Cannot parse capabilities" +msgstr "No fue posible analizar capacidades" + +#: virt-image:177 +#, python-format +msgid "The index for --boot must be between 0 and %d" +msgstr "El ??ndice para --boot debe ser entre 0 y %d" + +#: virt-image:220 +#, python-format +msgid "" +"\n" +"\n" +"Creating guest %s..." +msgstr "" +"\n" +"\n" +"Creando hu??sped %s..." + +#: virt-image:224 +msgid "Guest creation failed" +msgstr "Fall?? la creaci??n del hu??sped" + +#: virt-image:230 +#, python-format +msgid "" +"Domain creation may not have been\n" +"successful. If it was, you can restart your domain\n" +"by running 'virsh start %s'; otherwise, please\n" +"restart your installation." +msgstr "" +"La creaci??n del dominio podr??a no haber sido\n" +"exitosa. Si lo fue, puede reiniciar su dominio\n" +"ejecutando \"virsh start %s\"; de lo contrario, por favor\reinicie su instalaci??n." + +#: virt-install:73 +#, python-format +msgid "Couldn't create default storage pool '%s': %s" +msgstr "No se ha podido crear un grupo de almacenamiento por defecto '%s': %s" + +#: virt-install:96 +msgid "--disk path must start with path=, pool=, or vol=." +msgstr "--disk path debe iniciar con path=, pool=, o vol=." + +#: virt-install:122 +#: virt-install:134 +#, python-format +msgid "Unknown '%s' value '%s'" +msgstr "Valor '%s' desconocido '%s'" + +#: virt-install:127 +#, python-format +msgid "Improper value for 'size': %s" +msgstr "Valor desapropiado para 'size': %s" + +#: virt-install:136 +#, python-format +msgid "Unknown --disk option '%s'." +msgstr "Opci??n --disk desconocida '%s'." + +#: virt-install:145 +msgid "Size must be specified with all 'pool='" +msgstr "El tama??o debe especificarse en todos los 'pool='" + +#: virt-install:158 +msgid "Storage volume must be specified as pool=poolname/volname" +msgstr "El vol??men de almacenamiento debe especificarse como pool=poolname/volname" + +#: virt-install:198 +#, python-format +msgid "Error with storage parameters: %s" +msgstr "Error en los par??metros de almacenamiento: %s" + +#: virt-install:210 +msgid " Do you really want to use the disk (yes or no)?" +msgstr "??Realmente desea utilizar el disco? (s?? o no)" + +#: virt-install:218 +msgid "Cannot use --file, --size, or --disk with --nodisks" +msgstr "No es posible utilizar --file, --size o --disk con --nodisks" + +#: virt-install:221 +msgid "Cannot mix --file, --nonsparse, or --file-size with --disk options. Please see the manual for --disk syntax." +msgstr "No se puede mezclar --file, --nonsparse, o --file-size con --disk options. Por favor vea el manual para --disk syntax." + +#: virt-install:224 +msgid "A disk must be specified (use --nodisks to override)" +msgstr "Un disco debe ser especificado (utilice --nodisks para anular)" + +#: virt-install:232 +msgid "Need to pass size for each disk" +msgstr "Es necesario pasar el tama??o para cada disco" + +#: virt-install:259 +msgid "Only one of --pxe, --location and --cdrom can be used" +msgstr "S??lo uno de --pxe, --location y --cdrom puede ser utilizado" + +#: virt-install:263 +msgid "Network PXE boot is not supported for paravirtualized guests" +msgstr "Inicializaci??n PXE en red no est?? soportado para hu??spedes paravirtualizados " + +#: virt-install:266 +msgid "Paravirtualized guests cannot install off cdrom media." +msgstr "Hu??spedes paravirtualizados no pueden instalarse desde un dispositivo cdrom." + +#: virt-install:268 +msgid "location must be specified for paravirtualized guests." +msgstr "debe especificarse un lugar para los hu??spedes paravirtualizados. " + +#: virt-install:271 +msgid "--location can not be specified for remote connections." +msgstr "--location no puede ser especificado para conexiones remotas." + +#: virt-install:280 +msgid "One of --pxe, --location, or cdrom media must be specified." +msgstr "Debe ser especificao --pxe, --location, o cdrom media. " + +#: virt-install:297 +#, python-format +msgid "Error creating cdrom disk: %s" +msgstr "Error al crear disco cdrom: %s" + +#: virt-install:303 +#: virt-install:308 +#: virtinst/cli.py:354 +#: virtinst/cli.py:359 +#, python-format +msgid "%s option requires an argument" +msgstr "La opci??n %s requiere un argumento" + +#: virt-install:320 +msgid "General Options" +msgstr "Opciones Generales" + +#: virt-install:329 +msgid "The CPU architecture to simulate" +msgstr "La arquitectura del CPU a ser simulada" + +#: virt-install:332 +msgid "UUID for the guest." +msgstr "UUID para el hu??sped." + +#: virt-install:340 +msgid "Set which physical CPUs Domain can use." +msgstr "Especifique qu?? dominios f??sicos del CPU pueden utilizarse. " + +#: virt-install:343 +msgid "Full Virtualization specific options." +msgstr "Opciones espec??ficas de una virtualizaci??n total." + +#: virt-install:345 +msgid "Use sound device emulation" +msgstr "Utilice emulaci??n del dispositivo de sonido" + +#: virt-install:348 +msgid "The OS type for fully virtualized guests, e.g. 'linux', 'unix', 'windows'" +msgstr "El tipo de sistema operativo para hu??pedes totalmente virtualizados, por ejemplo, \"linux\", \"unix\", \"windows\"" + +#: virt-install:352 +msgid "The OS variant for fully virtualized guests, e.g. 'fedora6', 'rhel5', 'solaris10', 'win2k'" +msgstr "La variante del sistema operativo para hu??spedes totalmente virtualizados, por ejemplo, \"fedora6\", \"rhel5\", \"solaris10\", \"win2k\"" + +#: virt-install:363 +msgid "Virtualization Type Options" +msgstr "Opciones del Tipo de Virtualizaci??n" + +#: virt-install:365 +msgid "This guest should be a fully virtualized guest" +msgstr "Este hu??sped deber??a ser un hu??sped completamente virtualizado" + +#: virt-install:367 +msgid "This guest should be a paravirtualized guest" +msgstr "Este hu??sped deber??a ser un hu??sped paravirtualizado" + +#: virt-install:370 +msgid "Use kernel acceleration capabilities (kvm, kqemu, ...)" +msgstr "Utilice capacidades de aceleraci??n del kernel (kvm, kquemu, ...)" + +#: virt-install:374 +msgid "Installation Method Options" +msgstr "Opciones para el M??todo de Instalaci??n" + +#: virt-install:377 +msgid "CD-ROM installation media" +msgstr "Medio de instalaci??n de CD-ROM" + +#: virt-install:380 +msgid "Installation source (eg, nfs:host:/path, http://host/path, ftp://host/path)" +msgstr "Fuente de instalaci??n (por ejemplo, nfs:host:/path, http://host/path, ftp://host/path)" + +#: virt-install:383 +msgid "Boot from the network using the PXE protocol" +msgstr "Inicialice un instalador desde la red utilizando el protocolo PXE" + +#: virt-install:385 +msgid "Treat the CDROM media is a LiveCD" +msgstr "Indique que el contenido del CDROM sea tratado como un LiveCD" + +#: virt-install:388 +msgid "Additional arguments to pass to the kernel booted from --location" +msgstr "Se necesitan argumentos adicionales para pasar al kernel inicializado desde --location" + +#: virt-install:392 +msgid "Storage Configuration" +msgstr "Configuraci??n de Almacenamiento" + +#: virt-install:395 +msgid "Specify storage to use as a disk with various options." +msgstr "Indique almacenamiento a ser utilizado como disco con varias opciones." + +#: virt-install:399 +msgid "File to use as the disk image" +msgstr "Archivo a ser usado como imagen de disco" + +#: virt-install:402 +msgid "Size of the disk image (if it doesn't exist) in gigabytes" +msgstr "Tama??o de la imagen del disco (si es que no existe) en gigabytes" + +#: virt-install:406 +msgid "Don't use sparse files for disks. Note that this will be significantly slower for guest creation" +msgstr "No utilice archivos separados para los discos. F??jese que esto ser?? significativamente m??s lento para la creaci??n de hu??spedes" + +#: virt-install:409 +msgid "Don't set up any disks for the guest." +msgstr "No configure ning??n disco para el hu??sped." + +#: virt-install:412 +msgid "Networking Configuration" +msgstr "Configuraci??n de Redes" + +#: virt-install:427 +msgid "Graphics Configuration" +msgstr "Configuraci??n de Gr??ficos" + +#: virt-install:438 +msgid "Don't automatically try to connect to the guest console" +msgstr "No intentar conectarse autom??ticamente con la consola hu??sped " + +#: virt-install:445 +msgid "Miscellaneous Options" +msgstr "Opciones Varias" + +#: virt-install:449 +msgid "Disables the automatic rebooting when the installation is complete." +msgstr "Deshabilita la reinicializaci??n autom??tica cuando se ha completado la instalaci??n." + +#: virt-install:452 +msgid "Total time to wait for VM to shutdown if console not present. Time less than 0 waits indefinitely." +msgstr "Tiempo total de espera para que se apague la VM si la consola no est?? presente. Si el tiempo es menor que 0 la espera es indefinida." + +#: virt-install:456 +msgid "Forces 'yes' for any applicable prompts, terminates for all others" +msgstr "Provoca un \"si\" forzado para cualquier solicitud adecuada, y finaliza todas los dem??s" + +#: virt-install:460 +msgid "Request user input for ambiguous situations. Default is false, so will terminate if a prompt would typically be fired. " +msgstr "Solicita entradas del usuario para situaciones ambiguas. Por defecto est?? configurado en \"falso\" (false), de modo que finalizar?? cualquier solicitud que sea ignorada. " + +#: virt-install:480 +msgid "Unable to connect to graphical console: virt-viewer not installed. Please install the 'virt-viewer' package." +msgstr "No se ha podido conectar a una consola gr??fica: no est?? instalado el virt-viewer. Por favor, instale el paquete \"virt-viewer\"-" + +#: virt-install:512 +msgid "Can't do both --hvm and --paravirt" +msgstr "No se puede hacer --hvm y --paravirt al mismo tiempo" + +#: virt-install:523 +#: virt-install:528 +msgid "default" +msgstr "por defecto" + +#: virt-install:527 +#, python-format +msgid "Unsupported virtualization type '%s' " +msgstr "Tipo de virtualizaci??n '%s' no soportada" + +#: virt-install:530 +#, python-format +msgid "for arch '%s'" +msgstr "para arq '%s'" + +#: virt-install:626 +msgid "" +"\n" +"\n" +"Starting install..." +msgstr "" +"\n" +"\n" +"Empezando la instalaci??n..." + +#: virt-install:642 +msgid "Guest installation failed" +msgstr "La instalaci??n del hu??sped ha fallado" + +#: virt-install:649 +#, python-format +msgid " %d minutes" +msgstr "%d minutos" + +#: virt-install:647 +msgid "Domain installation still in progress. Waiting" +msgstr "Instalaci??n lde dominio todav??a en progreso. Esperando" + +#: virt-install:654 +msgid "Domain has shutdown. Continuing." +msgstr "El dominio ha concluido. Continuando." + +#: virt-install:660 +msgid "Installation has exceeded specified timelimit. Aborting." +msgstr "La instalaci??n ha excedido el tiempo especificado. Abortando" + +#: virt-install:664 +msgid "" +"Domain installation still in progress. You can reconnect to \n" +"the console to complete the installation process." +msgstr "" +"La instalaci??n del dominio contin??a en progreso. Puede reconectarse a \n" +"la consola para completar el proceso de instalaci??n." + +#: virt-install:672 +#, python-format +msgid "" +"Domain installation does not appear to have been\n" +" successful. If it was, you can restart your domain\n" +" by running 'virsh start %s'; otherwise, please\n" +" restart your installation." +msgstr "" +"La instalaci??n del dominio no parece haber sido\n" +" exitosa. Si lo fue, puede reiniciar su dominio\n" +" ejecutando 'virsh start %s'; de lo contrario, por favor\n" +" reinicie su instalaci??n." + +#: virt-install:676 +#, python-format +msgid "" +"Guest installation complete... you can restart your domain\n" +"by running 'virsh start %s'" +msgstr "" +"Instalaci??n de hu??sped completa... puede reiniciar su dominio\n" +"ejecutando 'virsh start %s'" + +#: virt-install:679 +msgid "Guest installation complete... restarting guest." +msgstr "Instalaci??n de hu??sped completa... reiniciando hu??sped." + +#: virt-install:688 +#, python-format +msgid "" +"Domain installation may not have been\n" +" successful. If it was, you can restart your domain\n" +" by running 'virsh start %s'; otherwise, please\n" +" restart your installation." +msgstr "" +"La instalaci??n del dominio podr??a no haber sido\n" +" exitosa. Si lo fue, puede reiniciar su dominio\n" +" ejecutando 'virsh start %s'; de lo contrario, por favor\n" +" reinicie su instalaci??n." + +#: virt-pack:58 +msgid "The image name and version must be present" +msgstr "Deben estar presentes el nombre y la versi??n de la imagen" + +#: virt-pack:73 +#, python-format +msgid "Scratch disk %s does not have a size attribute" +msgstr "El disco transitorio %s no tiene un atributo de tama??o" + +#: virt-pack:76 +#, python-format +msgid "Disk file %s could not be found" +msgstr "No puede encontrarse el archivo de disco %s" + +#: virt-pack:93 +#, python-format +msgid "Writing %s" +msgstr "Escribiendo %s" + +#: virt-pack:107 +msgid "Directory in which packaged file will be put" +msgstr "Directorio en el cual ser?? puesto el archivo empaquetado" + +#: virt-pack:123 +msgid "The image descriptor must contain name and version" +msgstr "El descriptor de imagen debe contener un nombre y una versi??n" + +#: virt-pack:132 +#, python-format +msgid "Validation failed: %s" +msgstr "Fallo en la validaci??n: %s" + +#: virt-pack:138 +#, python-format +msgid "Packaging failed: %s" +msgstr "Fallo en el empaquetamiento: %s" + +#: virtinst/CapabilitiesParser.py:168 +msgid "No domains available for this guest." +msgstr "No existen dominios disponibles para este hu??sped." + +#: virtinst/cli.py:112 +msgid "Exiting at user request." +msgstr "Saliendo a pedido del usuario." + +#: virtinst/cli.py:118 +msgid "Must be root to create Xen guests" +msgstr "Debe ser root para poder crear un hu??sped Xen" + +#: virtinst/cli.py:120 +msgid "Could not find usable default libvirt connection." +msgstr "No se ha podido encontrar una conexi??n por defecto libvirt que sea utilizable. " + +#: virtinst/cli.py:142 +#, python-format +msgid "Force flag is set but input was required. Prompt was: %s" +msgstr "Se ha establecido una se??al forzada, pero se necesita una entrada. Se pide: %s " + +#: virtinst/cli.py:145 +#, python-format +msgid "Prompting disabled, but input was requested. Prompt was: %s" +msgstr "Las peticiones est??n deshabilitadas, pero se solicita una entrada. Se pide: %s " + +#: virtinst/cli.py:165 +#, python-format +msgid "Prompting disabled, but yes/no was requested. Try --force to force 'yes' for such prompts. Prompt was: %s" +msgstr "Las peticiones est??n deshabilitadas, pero se ha solicitado un si/no. Intente --force para forzar un \"si\" para este tipo de peticiones. Se pide: %s" + +#: virtinst/cli.py:185 +msgid "A name is required for the virtual machine." +msgstr "Se requiere un nombre para la m??quina virtual." + +#: virtinst/cli.py:193 +msgid "Memory amount is required for the virtual machine." +msgstr "Se requiere una cantidad de memoria para la m??quina virtual." + +#: virtinst/cli.py:195 +#, python-format +msgid "Installs currently require %d megs of RAM." +msgstr "La instalaci??n actualmente requiere %d megas de RAM." + +#: virtinst/cli.py:215 +#, python-format +msgid "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) on the host. This will work, but performance will be poor. Are you sure? (yes or no)" +msgstr "Ha pedido m??s CPUs virtuales (%d) que los CPUs f??sicos (%d) en el anfitri??n. Esto podr??a funcionar, pero el desempe??o ser?? pobre. ??Esta seguro? (si o no)" + +#: virtinst/cli.py:270 +msgid "Unknown network type " +msgstr "Tipo de red desconocido" + +#: virtinst/cli.py:288 +msgid "Cannot mix both --bridge and --network arguments" +msgstr "No se pueden mezclar los argumentos de --bridge y de --network" + +#: virtinst/cli.py:297 +msgid "Need to pass equal numbers of networks & mac addresses" +msgstr "Se necesita pasar la misma cantidad de redes & y de direcciones mac" + +#: virtinst/cli.py:319 +msgid "Can't specify more than one of VNC, SDL, or --nographics" +msgstr "No se puede especificar m??s de un VNC, SDL, o --nographics" + +#: virtinst/CloneManager.py:74 +msgid "Name or UUID of guest to clone is required" +msgstr "Se requiere nombre o UUID del hu??sped a clonar" + +#: virtinst/CloneManager.py:83 +msgid "A valid name or UUID of guest to clone is required" +msgstr "Se requiere un nombre v??lido o UUID de hu??sped a clonar" + +#: virtinst/CloneManager.py:93 +#, python-format +msgid "Invalid name for new guest: %s" +msgstr "Nombre inv??lido para el nuevo hu??ped: %s" + +#: virtinst/CloneManager.py:101 +#, python-format +msgid "Invalid uuid for new guest: %s" +msgstr "UUID inv??lido para el nuevo hu??ped: %s" + +#: virtinst/CloneManager.py:109 +msgid "New file to use for disk image is required" +msgstr "Se requiere un nuevo archivo para usar para la imagen del disco" + +#: virtinst/CloneManager.py:187 +#, python-format +msgid "Domain %s is not found" +msgstr "No se encuentra el dominio %s" + +#: virtinst/CloneManager.py:204 +msgid "Domain status must be SHUTOFF" +msgstr "El estado del dominio debe ser SHUTOFF" + +#: virtinst/CloneManager.py:211 +#, python-format +msgid "Domain %s already exists" +msgstr "El dominio %s ya existe" + +#: virtinst/CloneManager.py:220 +#: virtinst/Guest.py:871 +msgid "The UUID you entered is already in use by another guest!" +msgstr "??El UUID que ha ingresado est?? siendo utilizado por otro hu??sped!" + +#: virtinst/CloneManager.py:264 +#, python-format +msgid "Missing new file to use disk image for %s" +msgstr "No se encuentra el archivo nuevo para usar la imagen de disco para %s" + +#: virtinst/CloneManager.py:547 +#, python-format +msgid "Cloning from %(src)s to %(dst)s" +msgstr "Clonando desde %(src)s a %(dst)s" + +#: virtinst/CloneManager.py:549 +msgid "Cloning domain..." +msgstr "Clonando dominio..." + +#: virtinst/DistroManager.py:93 +#, python-format +msgid "Could not find an installable distribution at '%s'" +msgstr "No se ha podido encontrar una distribuci??n instalable en '%s'" + +#: virtinst/DistroManager.py:104 +#: virtinst/DistroManager.py:122 +msgid "Invalid install location: " +msgstr "Lugar de instalaci??n inv??lido:" + +#: virtinst/DistroManager.py:162 +msgid "Invalid NFS format: No path specified." +msgstr "Formato NFS inv??lido: No se ha especificado ninguna ruta." + +#: virtinst/DistroManager.py:177 +#, python-format +msgid "Checking installer location failed: %s" +msgstr "Verificando falla en el localizador de instalaci??n: %s" + +#: virtinst/DistroManager.py:180 +msgid "Install media location must be an NFS, HTTP or FTP network install source, or an existing local file/device" +msgstr "La fuente del archivo de instalaci??n debe encontrarse en una red NFS, HTTP o FTP, o en un archivo/dispositvo local " + +#: virtinst/DistroManager.py:185 +msgid "NFS installations are only supported as root" +msgstr "Instalaciones de tipo NFS solo son soportadas como root" + +#: virtinst/FullVirtGuest.py:206 +msgid "OS type must be a string." +msgstr "El tipo de sistema operativo debe ser una cadena." + +#: virtinst/FullVirtGuest.py:213 +#, python-format +msgid "OS type '%s' does not exist in our dictionary" +msgstr "El tipo de sistema operativo '%s' no existe en nuestro diccionario" + +#: virtinst/FullVirtGuest.py:221 +msgid "OS variant must be a string." +msgstr "La variante del sistema operativo debe ser una cadena." + +#: virtinst/FullVirtGuest.py:227 +#, python-format +msgid "OS variant '%(var)s; does not exist in our dictionary for OS type '%(ty)s'" +msgstr "La variante '%(var)s'; no existe en nuestro diccionario para el sistema operativo '%(ty)s'" + +#: virtinst/FullVirtGuest.py:238 +#, python-format +msgid "Unknown OS variant '%s'" +msgstr "Variante de sistema operativo desconocida '%s'" + +#: virtinst/FullVirtGuest.py:323 +msgid "Unable to start domain for guest, aborting installation!" +msgstr "??Imposible iniciar dominio para el hu??ped, abortando la instalaci??n!" + +#: virtinst/FullVirtGuest.py:364 +#, python-format +msgid "Invalid dictionary entry for device '%s %s'" +msgstr "Entrada de diccionario inv??lida para el dispositivo '%s %s'" + +#: virtinst/Guest.py:54 +msgid "MAC address must be of the format AA:BB:CC:DD:EE:FF" +msgstr "La direcci??n MAC debe tener el formato AA:BB:CC:DD:EE:FF" + +#: virtinst/Guest.py:62 +msgid "A network name was not provided" +msgstr "No se ha provisto un nombre de red" + +#: virtinst/Guest.py:68 +#, python-format +msgid "Unknown network type %s" +msgstr "Tipo de red desconocido %s" + +#: virtinst/Guest.py:105 +msgid "The MAC address you entered is already in use by another active virtual machine." +msgstr "La direcci??n MAC que ha ingresado est?? siendo utilizada por otra m??quina virtual activa." + +#: virtinst/Guest.py:108 +msgid "The MAC address you entered conflicts with a device on the physical host." +msgstr "La direcci??n MAC que ha ingresado presenta conflicitos con un dispositivo en el anfitri??n f??sico" + +#: virtinst/Guest.py:110 +msgid "The MAC address you entered is already in use by another inactive virtual machine." +msgstr "La direcci??n MAC que ha ingresado est?? siendo utilizada por otra m??quina virtual inactiva." + +#: virtinst/Guest.py:181 +#, python-format +msgid "'model' must be a string, was '%s'." +msgstr "'modelo' debe ser una cadena, era '%s'." + +#: virtinst/Guest.py:184 +#, python-format +msgid "Unsupported sound model '%s'" +msgstr "Modelo de sonido no soportado '%s'" + +#: virtinst/Guest.py:204 +msgid "Unknown graphics type" +msgstr "Tipo de gr??ficos no soportado" + +#: virtinst/Guest.py:221 +msgid "Keymap must be a string" +msgstr "El mapa de teclado debe ser una cadena" + +#: virtinst/Guest.py:223 +msgid "Keymap must be less than 16 characters" +msgstr "El mapa de teclado debe ser menor que 16 caracteres" + +#: virtinst/Guest.py:225 +msgid "Keymap can only contain alphanumeric, '_', or '-' characters" +msgstr "El mapa de teclado s??lo puede contener caracteres alfanum??ricos, y los signos \"_\", y \"-\"" + +#: virtinst/Guest.py:236 +msgid "VNC port must be a number between 5900 and 65535, or -1 for auto allocation" +msgstr "El puerto VNC debe ser un n??mero entre 5900 y 65535, o -1, para que se asigne autom??ticamente " + +#: virtinst/Guest.py:333 +msgid "Guest.cdrom must be a boolean type" +msgstr "Guest.cdrom debe ser de tipo booleano" + +#: virtinst/Guest.py:350 +#: virtinst/Guest.py:355 +#: virtinst/Guest.py:359 +msgid "Must pass both a kernel and initrd" +msgstr "Debe pasar tanto un kernel como un initrd" + +#: virtinst/Guest.py:362 +msgid "Kernel and initrd must be specified by a list, dict, or tuple." +msgstr "El kernel y el initrd deben ser especificados por una lista, un diccionario o una tupla." + +#: virtinst/Guest.py:399 +msgid "Unable to connect to hypervisor, aborting installation!" +msgstr "??No se ha podido conectar con el hypervisor, abortando la instalaci??n!" + +#: virtinst/Guest.py:424 +msgid "System name must be a string greater than 0 and no more than 50 characters" +msgstr "El nombre del sistema debe ser una cadena mayor que 0 y que posea no m??s de 50 carateres" + +#: virtinst/Guest.py:426 +msgid "System name must not be only numeric characters" +msgstr "El nombre del sistema no debe contener solo caracteres num??ricos" + +#: virtinst/Guest.py:428 +msgid "System name can only contain: alphanumeric '_', '.', ':', '+', or '-' characters" +msgstr "El nombre del sistema solo puede contener: caracteres alfanum??ricos, y los signos \"_\", \".\", \":\", \"+\", y \"-\" " + +#: virtinst/Guest.py:439 +msgid "Memory value must be an integer greater than 0" +msgstr "El valor de la memoria debe ser un entero mayor que 0" + +#: virtinst/Guest.py:450 +msgid "Max Memory value must be an integer greater than 0" +msgstr "El valor de la memoria m??xima debe ser un entero mayor que 0" + +#: virtinst/Guest.py:461 +#: virtinst/Storage.py:315 +msgid "UUID must be a string." +msgstr "UUID debe ser una cadena." + +#: virtinst/Guest.py:467 +#: virtinst/Storage.py:321 +msgid "UUID must be a 32-digit hexadecimal number. It may take the form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX or may omit hyphens altogether." +msgstr "UUID debe ser un n??mero hexadecimal de 32 d??gitos. Puede tener la forma de XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX o pueden omitirse los guiones." + +#: virtinst/Guest.py:482 +msgid "Number of vcpus must be a postive integer." +msgstr "El n??mero de cpus virtuales debe ser un entero positivo." + +#: virtinst/Guest.py:485 +#, python-format +msgid "Number of vcpus must be no greater than %d for this vm type." +msgstr "El n??mero de cpus virtuales no debe mayor que %d para este tipo de m??quina virtual." + +#: virtinst/Guest.py:494 +msgid "cpuset must be string" +msgstr "cpuset debe ser una cadena" + +#: virtinst/Guest.py:496 +msgid "cpuset can only contain numeric, ',', or '-' characters" +msgstr "cpuset debe contener solo caracteres n??mericos, o los signos \",\", y \"-\"" + +#: virtinst/Guest.py:503 +msgid "cpuset contains invalid format." +msgstr "cpuset contiene un formato inv??lido." + +#: virtinst/Guest.py:505 +#: virtinst/Guest.py:508 +msgid "cpuset's pCPU numbers must be less than pCPUs." +msgstr "Los n??meros cpuset de las pCPU deben ser menores que las pCPUs." + +#: virtinst/Guest.py:549 +msgid "Must specify whether graphics are enabled" +msgstr "Debe especificarse si el modo gr??fico est?? habilitado" + +#: virtinst/Guest.py:568 +msgid "Graphics enabled must be True or False" +msgstr "Modo gr??fico habilitado deber ser Verdadero o Falso" + +#: virtinst/Guest.py:611 +msgid "You must specify a valid ISO or CD-ROM location for the installation" +msgstr "Debe especificar una imagen ISO o una direcci??n de CD-ROM v??lida para la instalaci??n" + +#: virtinst/Guest.py:614 +msgid "The specified media path does not exist." +msgstr "No existe la ruta al contenido especificado." + +#: virtinst/Guest.py:757 +#, python-format +msgid "Could not remove old vm '%s': %s" +msgstr "No se puede eliminar la antigua m??quina virtual '%s': %s" + +#: virtinst/Guest.py:759 +#, python-format +msgid "Domain named %s already exists!" +msgstr "??El nombre del dominio %s ya existe!" + +#: virtinst/Guest.py:766 +msgid "Creating domain..." +msgstr "Creando dominio..." + +#: virtinst/Guest.py:769 +msgid "Unable to create domain for the guest, aborting installation!" +msgstr "??No se ha podido crear el dominio para el hu??sped, abortando la instalaci??n!" + +#: virtinst/Guest.py:789 +msgid "It appears that your installation has crashed. You should be able to find more information in the logs" +msgstr "Aparentemente su instalaci??n ha fallado. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:835 +msgid "Domain has not existed. You should be able to find more information in the logs" +msgstr "El dominio no existe. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:837 +msgid "Domain has not run yet. You should be able to find more information in the logs" +msgstr "El dominio no est?? ejecut??ndose a??n. Deber??a poder encontrar m??s informaci??n en los logs" + +#: virtinst/Guest.py:852 +msgid "Domain has already been started!" +msgstr "??El dominio ya se est?? ejecutando!" + +#: virtinst/Guest.py:879 +msgid "Name and memory must be specified for all guests!" +msgstr "??El nombre y la memoria debe ser especificado para todos los hu??spedes!" + +#: virtinst/ImageFetcher.py:74 +msgid "Verifying install location..." +msgstr "Verificando lugar de instalaci??n..." + +#: virtinst/ImageFetcher.py:78 +#, python-format +msgid "Opening URL %s failed: %s" +msgstr "Fallo al abril la URL %s: %s" + +#: virtinst/ImageFetcher.py:94 +#, python-format +msgid "Retrieving file %s..." +msgstr "Obteniendo archivo %s..." + +#: virtinst/ImageFetcher.py:96 +#, python-format +msgid "Couldn't acquire file %s: %s" +msgstr "No se ha podido adquirir el archivo %s: %s" + +#: virtinst/ImageFetcher.py:157 +#: virtinst/ImageFetcher.py:159 +msgid "Invalid file location given: " +msgstr "Se ha indicado una direcci??n de archivo inv??lida:" + +#: virtinst/ImageFetcher.py:194 +#, python-format +msgid "Mounting location %s failed" +msgstr "Fallo al intentar montar la direcci??n %s" + +#: virtinst/ImageManager.py:43 +msgid "Could not find suitable boot descriptor for this host" +msgstr "No se ha podido encontrar un descriptor de inicializaci??n acorde a este anfitri??n" + +#: virtinst/ImageManager.py:49 +msgid "Unsupported virtualization type" +msgstr "Tipo de virtualizaci??n no soportada" + +#: virtinst/ImageManager.py:96 +#, python-format +msgid "System disk %s does not exist" +msgstr "El disco del sistema %s no existe" + +#: virtinst/ImageParser.py:78 +msgid "Expected exactly one 'domain' element" +msgstr "Se esperaba solo un elemento de \"dominio\"" + +#: virtinst/ImageParser.py:83 +#, python-format +msgid "Disk entry for '%s' not found" +msgstr "No se ha podido encontrar la entrada de disco para '%s'" + +#: virtinst/ImageParser.py:110 +#, python-format +msgid "Memory must be an integer, but is '%s'" +msgstr "La memoria debe ser un entero, pero es '%s'" + +#: virtinst/ImageParser.py:219 +#, python-format +msgid "The format for disk %s must be one of %s" +msgstr "El formato para disco %s debe ser uno de %s" + +#: virtinst/ImageParser.py:258 +msgid "Root element is not 'image'" +msgstr "El elemento root no es \"imagen\" " + +#: virtinst/LiveCDInstaller.py:50 +msgid "Connection does not support HVM virtualisation, cannot boot live CD" +msgstr "La conexi??n no soporta virtualizaci??n HVM, no se puede inicializar live CD" + +#: virtinst/LiveCDInstaller.py:59 +msgid "CDROM media must be specified for the live CD installer." +msgstr "El contenido del CDROM debe ser especificado para el instalador de live CD" + +#: virtinst/OSDistro.py:141 +#, python-format +msgid "Could not find a kernel path for virt type '%s'" +msgstr "No se puede encontrar una ruta de kernel para el tipo '%s' de virtualizaci??n" + +#: virtinst/OSDistro.py:156 +msgid "Could not find a boot iso path for this tree." +msgstr "No se puede encontrar una ruta de inicializaci??n iso para este ??rbol. " + +#: virtinst/OSDistro.py:360 +msgid "Unable to determine kernel RPM path" +msgstr "No se puede determinar la ruta del kernel RPM" + +#: virtinst/OSDistro.py:362 +msgid "Unable to determine install-initrd RPM path" +msgstr "No se puede determinar la ruta del RPM install-initrd" + +#: virtinst/OSDistro.py:373 +msgid "Building initrd" +msgstr "Generando initrd" + +#: virtinst/ParaVirtGuest.py:43 +msgid "A location must be specified to install from" +msgstr "Debe especificarse un lugar desde donde instalar" + +#: virtinst/Storage.py:87 +#, python-format +msgid "Unknown storage object type: %s" +msgstr "Tipo de objeto de almacenamiento desconocido: %s" + +#: virtinst/Storage.py:116 +msgid "'conn' must be a libvirt connection object." +msgstr "'conn' debe ser un objeto de conexi??n libvirt." + +#: virtinst/Storage.py:118 +msgid "Passed connection is not libvirt storage capable" +msgstr "La conexi??n pasada no es capaz de almacenamiento libvirt" + +#: virtinst/Storage.py:129 +msgid "Storage object name must be a string " +msgstr "El nombre del objeto de almacenamiento debe ser una cadena" + +#: virtinst/Storage.py:132 +msgid "Storage object name can not be only " +msgstr "El nombre del objeto de almacenamiento no puede ser solamente" + +#: virtinst/Storage.py:135 +msgid "Storage object name can only contain " +msgstr "El nombre del objeto de almacenamiento puede contener solamente " + +#: virtinst/Storage.py:150 +msgid "Permissions must be passed as a dict object" +msgstr "Deben ser pasados permisos como objeto de diccionario" + +#: virtinst/Storage.py:153 +msgid "Permissions must contain 'mode', 'owner', 'group' and 'label' keys." +msgstr "Los permisos deben contener las llaves 'mode', 'owner', 'group' y 'label'." + +#: virtinst/Storage.py:160 +#, python-format +msgid "'%s' is not an absolute path." +msgstr "'%s' no es una ruta absoluta." + +#: virtinst/Storage.py:219 +msgid "Filesystem Directory" +msgstr "Directorio del Sistema de Archivos" + +#: virtinst/Storage.py:220 +msgid "Pre-Formatted Block Device" +msgstr "Dispositivo de Bloque Preformateado" + +#: virtinst/Storage.py:221 +msgid "Network Exported Directory" +msgstr "Directorio de Red Exportado" + +#: virtinst/Storage.py:222 +msgid "LVM Volume Group" +msgstr "Grupo de Volumen LVM" + +#: virtinst/Storage.py:223 +msgid "Physical Disk Device" +msgstr "Dispositivo de Disco F??sico" + +#: virtinst/Storage.py:224 +msgid "iSCSI Target" +msgstr "Destino iSCSI" + +#: virtinst/Storage.py:234 +#: virtinst/Storage.py:271 +#, python-format +msgid "Unknown storage pool type: %s" +msgstr "Tipo de grupo de almacenamiento desconocido: %s" + +#: virtinst/Storage.py:307 +msgid "Host name must be a string" +msgstr "El nombre del anfitri??n debe ser una cadena" + +#: virtinst/Storage.py:337 +#, python-format +msgid "Name '%s' already in use by another pool." +msgstr "El nombre '%s' ya est?? siendo usado por otro grupo." + +#: virtinst/Storage.py:375 +#, python-format +msgid "Could not define storage pool: %s" +msgstr "No se puede definir grupo de almacenamiento: %s" + +#: virtinst/Storage.py:385 +#, python-format +msgid "Could not build storage pool: %s" +msgstr "No se puede generar un grupo de almacenamiento: %s" + +#: virtinst/Storage.py:394 +#, python-format +msgid "Could not start storage pool: %s" +msgstr "No se puede iniciar grupo de almacenamiento: %s" + +#: virtinst/Storage.py:471 +#, python-format +msgid "Unknown Filesystem format: %s" +msgstr "Formato del sistema de archivos desconocido: %s" + +#: virtinst/Storage.py:486 +msgid "Device path is required" +msgstr "Se requiere una ruta de dispositivo" + +#: virtinst/Storage.py:523 +#, python-format +msgid "Unknown Network Filesystem format: %s" +msgstr "Formato de Sistema de Archivo de Red desconocido: %s" + +#: virtinst/Storage.py:537 +#: virtinst/Storage.py:663 +msgid "Hostname is required" +msgstr "Se requiere el nombre del anfitri??n" + +#: virtinst/Storage.py:539 +#: virtinst/Storage.py:613 +#: virtinst/Storage.py:665 +msgid "Host path is required" +msgstr "Se requiere una ruta de anfitri??n" + +#: virtinst/Storage.py:600 +#, python-format +msgid "Unknown Disk format: %s" +msgstr "Formato de disco desconocido: %s" + +#: virtinst/Storage.py:625 +msgid "Must explicitly specify disk format if formatting disk device." +msgstr "Se debe especificar expl??citamente un formato de disco si se formatea el dispositivo de disco." + +#: virtinst/Storage.py:681 +msgid "One of pool or pool_name must be specified." +msgstr "Se debe especificar, o bien grupo, o bien pool_name." + +#: virtinst/Storage.py:684 +#: virtinst/Storage.py:754 +msgid "'conn' must be specified with 'pool_name'" +msgstr "debe especificarse 'conn' con 'pool_name'" + +#: virtinst/Storage.py:740 +msgid "Default volume target path range exceeded." +msgstr "Se ha excedido el rango de la ruta al volumen de destino por defecto." + +#: virtinst/Storage.py:750 +msgid "Must specify pool_object or pool_name" +msgstr "Debe especificarse pool_object, o pool_name" + +#: virtinst/Storage.py:756 +msgid "Connection does not support storage management." +msgstr "La conexi??n no soporta gerenciamiento de almacenamiento." + +#: virtinst/Storage.py:761 +#, python-format +msgid "Couldn't find storage pool '%s': %s" +msgstr "No se ha podido encontrar grupo de almacenamiento '%s': %s" + +#: virtinst/Storage.py:765 +msgid "pool_object must be a virStoragePool" +msgstr "pool_object debe ser un virStoragePool" + +#: virtinst/Storage.py:780 +msgid "Capacity must be a positive number" +msgstr "La capacidad debe ser un n??mero positivo" + +#: virtinst/Storage.py:801 +msgid "Allocation must be a non-negative number" +msgstr "El alojamiento debe ser un n??mero no negativo" + +#: virtinst/Storage.py:821 +msgid "'pool' must be a virStoragePool instance." +msgstr "'grupo' debe ser una instancia de virStoragePool." + +#: virtinst/Storage.py:823 +#, python-format +msgid "pool '%s' must be active." +msgstr "grupo '%s' debe estar activa." + +#: virtinst/Storage.py:832 +#, python-format +msgid "'%s' is not a valid format." +msgstr "'%s' no es un formato v??lido." + +#: virtinst/Storage.py:842 +#, python-format +msgid "Name '%s' already in use by another volume." +msgstr "El nombre '%s' ya est?? siendo utilizado por otro volumen." + +#: virtinst/Storage.py:912 +#, python-format +msgid "There is not enough free space on the storage pool to create the volume. (%d M requested allocation > %d M available)" +msgstr "No hay suficiente espacio libre en el grupo de almacenamiento para crear el volumen. (%d M alojamiento requerido > %d M disponible)" + +#: virtinst/Storage.py:918 +#, python-format +msgid "The requested volume capacity will exceed the available pool space when the volume is fully allocated. (%d M requested capacity > %d M available)" +msgstr "La capacidad del volumen solicitada superar?? el espacio disponible del grupo de almacenamiento cuando el volumen est?? completamente alojado. (%d M capacidad requerida > %d M disponible)" + +#: virtinst/util.py:45 +#, python-format +msgid "Invalid line length while parsing %s." +msgstr "Tama??o de l??nea inv??lido en el proceso de an??lisis %s." + +#: virtinst/util.py:46 +#, python-format +msgid "Defaulting bridge to xenbr%d" +msgstr "Estableciendo un puente por defecto hacia xenbr%d" + +#: virtinst/util.py:402 +#: virtinst/VirtualDevice.py:59 +msgid "'conn' must be a virConnect instance." +msgstr "'conn' debe ser una instancia de virConnect." + +#: virtinst/VirtualDevice.py:44 +msgid "'conn' must be a virConnect instance" +msgstr "'conn' debe ser una instancia de virConnect" + +#: virtinst/VirtualDevice.py:68 +#, python-format +msgid "'%s' must be True or False" +msgstr "'%s' debe ser Verdadero o Falso" + +#: virtinst/VirtualDevice.py:72 +#, python-format +msgid "'%s' must be a string, not '%s'." +msgstr "'%s' debe ser una cadena, no '%s'." + +#: virtinst/VirtualDisk.py:160 +msgid "'size' must be a number greater than 0." +msgstr "'size' debe ser un n??mero mayor que 0." + +#: virtinst/VirtualDisk.py:170 +#, python-format +msgid "Unknown storage type '%s'" +msgstr "Tipo de almacenamiento desconocido '%s'" + +#: virtinst/VirtualDisk.py:179 +#, python-format +msgid "Unknown device type '%s'" +msgstr "Tipo de dispositivo desconocido '%s'" + +#: virtinst/VirtualDisk.py:209 +msgid "vol_object must be a virStorageVol instance" +msgstr "vol_object debe ser una instancia de virStorageVol" + +#: virtinst/VirtualDisk.py:217 +msgid "vol_install must be a StorageVolume instance." +msgstr "vol_install debe ser una instancia de StorageVolume." + +#: virtinst/VirtualDisk.py:258 +msgid "Unknown storage volume type." +msgstr "Tipo de volumen de almacenamiento desconocido." + +#: virtinst/VirtualDisk.py:273 +#, python-format +msgid "Passed type '%s' does not match detected storage type '%s'" +msgstr "El tipo pasado '%s' no se corresponde con el tipo de almacenamiento detectado '%s'" + +#: virtinst/VirtualDisk.py:283 +msgid "volName must be a tuple of the form ('poolname', 'volname')" +msgstr "volName debe ser un tupla de la forma ('poolname', 'volname')" + +#: virtinst/VirtualDisk.py:286 +msgid "'volName' requires a passed connection." +msgstr "'volName' requiere una conexi??n pasada." + +#: virtinst/VirtualDisk.py:288 +msgid "Connection does not support storage lookup." +msgstr "La conexi??n no soporta b??squeda de almacenamiento." + +#: virtinst/VirtualDisk.py:294 +#, python-format +msgid "Couldn't lookup volume object: %s" +msgstr "No se ha posido buscar el objeto de volumen: %s" + +#: virtinst/VirtualDisk.py:315 +msgid "Connection doesn't support remote storage." +msgstr "La conexi??n no soporta almacenamiento remoto." + +#: virtinst/VirtualDisk.py:334 +#, python-format +msgid "Size must be specified for non existent path '%s'" +msgstr "Un tama??o debe ser especificado para rutas no existentes: '%s'" + +#: virtinst/VirtualDisk.py:354 +#, python-format +msgid "'%s' is not managed on remote host: %s" +msgstr "'%s' no est?? gerenciado en anfitriones remotos: %s" + +#: virtinst/VirtualDisk.py:364 +msgid "Must specify libvirt managed storage if on a remote connection" +msgstr "Debe especificar almacenamiento gerenciado por libvirt si es una conexi??n remota" + +#: virtinst/VirtualDisk.py:371 +#, python-format +msgid "Device type '%s' requires a path" +msgstr "El tipo de dispositivo '%s' requiere una ruta" + +#: virtinst/VirtualDisk.py:402 +msgid "The path must be a file or a device, not a directory" +msgstr "La ruta debe ser un archivo o un dispositivo, no un directorio." + +#: virtinst/VirtualDisk.py:410 +#, python-format +msgid "Cannot create storage for %s device." +msgstr "No se puede crear almacenamiento para el dispositivo %s." + +#: virtinst/VirtualDisk.py:416 +msgid "Local block device path must exist." +msgstr "Debe exisitir una ruta de dispositivo de bloque local." + +#: virtinst/VirtualDisk.py:421 +#, python-format +msgid "No write access to directory '%s'" +msgstr "El directorio '%s' no permite acceso para escritura" + +#: virtinst/VirtualDisk.py:424 +#, python-format +msgid "size is required for non-existent disk '%s'" +msgstr "se requiere tama??o para discos no existentes '%s'" + +#: virtinst/VirtualDisk.py:459 +msgid "Creating storage file..." +msgstr "Creando archivo de almacenamiento..." + +#: virtinst/VirtualDisk.py:476 +#, python-format +msgid "Error creating diskimage %s: %s" +msgstr "Error al crear una imagen de disco %s: %s" + +#: virtinst/VirtualDisk.py:498 +msgid "'disknode' or self.target must be set!" +msgstr "??Debe configurarse 'disknode' o self.target! " + +#: virtinst/VirtualDisk.py:558 +msgid "The filesystem will not have enough free space to fully allocate the sparse file when the guest is running." +msgstr "El sistema de archivos no tendr?? suficiente espacio libre para alojar completamente el archivo separado, una vez que el hu??sped se encuentre en ejecuci??n. " + +#: virtinst/VirtualDisk.py:563 +msgid "There is not enough free space to create the disk." +msgstr "No hay espacio libre suficiente para crear el disco." + +#: virtinst/VirtualDisk.py:567 +#, python-format +msgid " %d M requested > %d M available" +msgstr " %d M solicitado > %d disponible" + +#: virtinst/VirtualDisk.py:670 +msgid "Cannot determine device bus/type." +msgstr "No se puede determinar el dispositivo bus/type." + +#: virtinst/VirtualDisk.py:677 +msgid "IDE CDROM must use 'hdc', but target in use." +msgstr "IDE CDROM debe usar 'hdc', pero se est?? utilizando." + +#: virtinst/VirtualDisk.py:693 +#, python-format +msgid "No more space for disks of type '%s'" +msgstr "No hay m??s espacio para discos del tipo '%s'" + Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- python-virtinst.spec 10 Mar 2009 05:14:20 -0000 1.48 +++ python-virtinst.spec 23 Mar 2009 21:13:30 -0000 1.49 @@ -11,8 +11,11 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 1%{_extra_release} +Release: 2%{_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 +Patch3: %{appname}-%{version}-spanish-trans.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +41,9 @@ %prep %setup -q -n %{appname}-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build python setup.py build @@ -71,6 +77,11 @@ %{_bindir}/virt-convert %changelog +* Mon Mar 23 2009 Cole Robinson - 0.400.3-2.fc9 +- Add spanish translation (bz 480816) +- Fix calls to libvirt host device detach/reset +- Fix virt-image with create-on-the-fly disks + * Tue Mar 10 2009 Cole Robinson - 0.400.3-1.fc9 - Update to bugfix release 0.400.3 - Fix virt-install --os-type windows installs From crobinso at fedoraproject.org Mon Mar 23 22:06:28 2009 From: crobinso at fedoraproject.org (Cole Robinson) Date: Mon, 23 Mar 2009 22:06:28 +0000 (UTC) Subject: [fedora-virt-maint] rpms/virt-manager/devel virt-manager-0.7.0-old-xen-compat.patch, NONE, 1.1 virt-manager-0.7.0-vm-migrate-list.patch, NONE, 1.1 virt-manager.spec, 1.48, 1.49 Message-ID: <20090323220628.CC74F70132@cvs1.fedora.phx.redhat.com> Author: crobinso Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2966 Modified Files: virt-manager.spec Added Files: virt-manager-0.7.0-old-xen-compat.patch virt-manager-0.7.0-vm-migrate-list.patch Log Message: Back compat fixes for connecting to older xen installations (bz 489885) Don't show harmless NoneType error when launching new VM details window virt-manager-0.7.0-old-xen-compat.patch: --- NEW FILE virt-manager-0.7.0-old-xen-compat.patch --- # HG changeset patch # User Cole Robinson # Date 1236957667 14400 # Node ID 4331403b2e66dafdda618283dcea259a66fba423 # Parent 89c007e38850e1283447ea4c19ff6f64ce6224b6 Fix xml parsing for old style 'console' xml. diff -r 89c007e38850 -r 4331403b2e66 src/virtManager/details.py --- a/src/virtManager/details.py Mon Mar 09 23:38:03 2009 -0400 +++ b/src/virtManager/details.py Fri Mar 13 11:21:07 2009 -0400 @@ -1106,7 +1106,7 @@ _("(Primary Console)") or "") self.window.get_widget("char-type").set_markup(typelabel) self.window.get_widget("char-dev-type").set_text(charinfo[4] or "-") - self.window.get_widget("char-target-port").set_text(charinfo[3]) + self.window.get_widget("char-target-port").set_text(charinfo[3] or "") self.window.get_widget("char-source-path").set_text(charinfo[5] or "-") def refresh_hostdev_page(self): diff -r 89c007e38850 -r 4331403b2e66 src/virtManager/domain.py --- a/src/virtManager/domain.py Mon Mar 09 23:38:03 2009 -0400 +++ b/src/virtManager/domain.py Fri Mar 13 11:21:07 2009 -0400 @@ -806,7 +806,7 @@ def _parse_char_devs(ctx): chars = [] devs = [] - devs = ctx.xpathEval("/domain/devices/console") + devs.extend(ctx.xpathEval("/domain/devices/console")) devs.extend(ctx.xpathEval("/domain/devices/parallel")) devs.extend(ctx.xpathEval("/domain/devices/serial")) @@ -822,7 +822,7 @@ target_port = None source_path = None - for child in node.children: + for child in node.children or []: if child.name == "target": target_port = child.prop("port") if child.name == "source": # HG changeset patch # User Cole Robinson # Date 1236964404 14400 # Node ID 7ab8a12b3527d97bc92acca7e6e6ff3fbdd9746b # Parent 4331403b2e66dafdda618283dcea259a66fba423 Check what XMLDesc flags the connection supports before using them. diff -r 4331403b2e66 -r 7ab8a12b3527 src/virtManager/connection.py --- a/src/virtManager/connection.py Fri Mar 13 11:21:07 2009 -0400 +++ b/src/virtManager/connection.py Fri Mar 13 13:13:24 2009 -0400 @@ -104,6 +104,7 @@ self.state = self.STATE_DISCONNECTED self.vmm = None self.storage_capable = None + self.dom_xml_flags = None # Connection Storage pools: UUID -> vmmStoragePool self.pools = {} @@ -290,6 +291,29 @@ def get_capabilities(self): return virtinst.CapabilitiesParser.parse(self.vmm.getCapabilities()) + def set_dom_flags(self, vm): + if self.dom_xml_flags != None: + # Already set + return + + self.dom_xml_flags = [] + for flags in [libvirt.VIR_DOMAIN_XML_SECURE, + libvirt.VIR_DOMAIN_XML_INACTIVE, + (libvirt.VIR_DOMAIN_XML_SECURE | + libvirt.VIR_DOMAIN_XML_INACTIVE )]: + try: + vm.XMLDesc(flags) + self.dom_xml_flags.append(flags) + except libvirt.libvirtError, e: + logging.debug("%s does not support flags=%d : %s" % + (self.get_uri(), flags, str(e))) + + def has_dom_flags(self, flags): + if self.dom_xml_flags == None: + return False + + return bool(self.dom_xml_flags.count(flags)) + def is_kvm_supported(self): if self.is_qemu_session(): return False diff -r 4331403b2e66 -r 7ab8a12b3527 src/virtManager/domain.py --- a/src/virtManager/domain.py Fri Mar 13 11:21:07 2009 -0400 +++ b/src/virtManager/domain.py Fri Mar 13 13:13:24 2009 -0400 @@ -75,6 +75,10 @@ self.toggle_sample_network_traffic() self.toggle_sample_disk_io() + # Determine available XML flags (older libvirt versions will error + # out if passed SECURE_XML, INACTIVE_XML, etc) + self.connection.set_dom_flags(vm) + def get_xml(self): # Get domain xml. If cached xml is invalid, update. if self._xml is None or not self._valid_xml: @@ -85,8 +89,12 @@ # Force an xml update. Signal 'config-changed' if domain xml has # changed since last refresh + flags = libvirt.VIR_DOMAIN_XML_SECURE + if not self.connection.has_dom_flags(flags): + flags = 0 + origxml = self._xml - self._xml = self.vm.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) + self._xml = self.vm.XMLDesc(flags) self._valid_xml = True if origxml != self._xml: @@ -106,8 +114,15 @@ return self._orig_inactive_xml def refresh_inactive_xml(self): - self._orig_inactive_xml = self.vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE | libvirt.VIR_DOMAIN_XML_SECURE) - print "xml refresh to: %s" % self._orig_inactive_xml + flags = (libvirt.VIR_DOMAIN_XML_INACTIVE | + libvirt.VIR_DOMAIN_XML_SECURE) + if not self.connection.has_dom_flags(flags): + flags = libvirt.VIR_DOMAIN_XML_INACTIVE + + if not self.connection.has_dom_flags: + flags = 0 + + self._orig_inactive_xml = self.vm.XMLDesc(flags) def release_handle(self): del(self.vm) # HG changeset patch # User Cole Robinson # Date 1236969435 14400 # Node ID 6374136c62476678cf965eaac2c2680602641371 # Parent 403916479f503f79f23bb682698b38f595eb0626 Fix default 'New VM' install options on older xen connections. diff -r 403916479f50 -r 6374136c6247 src/virtManager/create.py --- a/src/virtManager/create.py Fri Mar 13 14:35:55 2009 -0400 +++ b/src/virtManager/create.py Fri Mar 13 14:37:15 2009 -0400 @@ -690,6 +690,16 @@ net_list.set_active(default) def change_caps(self, gtype=None, dtype=None): + + if gtype == None: + # If none specified, prefer HVM. This way, the default install + # options won't be limited because we default to PV. If hvm not + # supported, differ to guest_lookup + for g in self.caps.guests: + if g.os_type == "hvm": + gtype = "hvm" + break + (newg, newdom) = virtinst.CapabilitiesParser.guest_lookup(conn=self.conn.vmm, caps=self.caps, virt-manager-0.7.0-vm-migrate-list.patch: --- NEW FILE virt-manager-0.7.0-vm-migrate-list.patch --- # HG changeset patch # User Cole Robinson # Date 1237844305 14400 # Node ID c0da7f8bb4be5ca9ace313b5e94c002248088081 # Parent 8077dae2ea80d56914648d7508e9fcbea0690563 Pull necessary info from vm object when building migrate list. diff -r 8077dae2ea80 -r c0da7f8bb4be src/virtManager/details.py --- a/src/virtManager/details.py Fri Mar 13 14:37:57 2009 -0400 +++ b/src/virtManager/details.py Mon Mar 23 17:38:25 2009 -0400 @@ -727,7 +727,8 @@ def set_migrate_menu(self): menu = self.window.get_widget("details-menu-migrate_menu") - self.engine.populate_migrate_menu(menu, self.control_vm_migrate) + self.engine.populate_migrate_menu(menu, self.control_vm_migrate, + self.vm) def set_pause_widget_states(self, state): try: diff -r 8077dae2ea80 -r c0da7f8bb4be src/virtManager/engine.py --- a/src/virtManager/engine.py Fri Mar 13 14:37:57 2009 -0400 +++ b/src/virtManager/engine.py Mon Mar 23 17:38:25 2009 -0400 @@ -574,8 +574,8 @@ migrate_progress.set_title(" ") return migrate_progress - def populate_migrate_menu(self, menu, migrate_func): - conns = self.get_available_migrate_hostnames() + def populate_migrate_menu(self, menu, migrate_func, vm): + conns = self.get_available_migrate_hostnames(vm) # Clear menu for item in menu: @@ -597,9 +597,9 @@ mitem.show() menu.add(mitem) - def get_available_migrate_hostnames(self): - driver = self.windowManager.current_connection().get_driver() - uri = self.windowManager.current_connection().get_uri() + def get_available_migrate_hostnames(self, vm): + driver = vm.get_connection().get_driver() + uri = vm.get_connection().get_uri() available_migrate_hostnames = {} # Returns list of lists of the form diff -r 8077dae2ea80 -r c0da7f8bb4be src/virtManager/manager.py --- a/src/virtManager/manager.py Fri Mar 13 14:37:57 2009 -0400 +++ b/src/virtManager/manager.py Mon Mar 23 17:38:25 2009 -0400 @@ -1124,7 +1124,12 @@ vm.get_uuid(), hostname) def set_migrate_submenu(self, src): - self.engine.populate_migrate_menu(self.vmmenumigrate, self.migrate) + vm = self.current_vm() + if not vm: + return + + self.engine.populate_migrate_menu(self.vmmenumigrate, self.migrate, + vm) def _add_connection(self, engine, conn): conn.connect("vm-added", self.vm_added) Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- virt-manager.spec 10 Mar 2009 06:37:24 -0000 1.48 +++ virt-manager.spec 23 Mar 2009 22:05:58 -0000 1.49 @@ -8,13 +8,15 @@ Name: virt-manager Version: 0.7.0 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Patch1: %{name}-%{version}-old-xen-compat.patch +Patch2: %{name}-%{version}-vm-migrate-list.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested @@ -55,7 +57,8 @@ # For local authentication against PolicyKit %if 0%{?fedora} >= 11 Requires: PolicyKit-authentication-agent -%else if 0%{?fedora} >= 9 +%endif +%if 0%{?fedora} >= 9 && 0%{?fedora} < 11 Requires: PolicyKit-gnome %endif @@ -86,6 +89,8 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %configure @@ -163,6 +168,10 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Mon Mar 23 2009 Cole Robinson - 0.7.0-2.fc11 +- Back compat fixes for connecting to older xen installations (bz 489885) +- Don't show harmless NoneType error when launching new VM details window + * Tue Mar 10 2009 Cole Robinson - 0.7.0-1.fc11 - Update to release 0.7.0 - Redesigned 'New Virtual Machine' wizard From glommer at fedoraproject.org Tue Mar 24 01:29:27 2009 From: glommer at fedoraproject.org (Glauber Costa) Date: Tue, 24 Mar 2009 01:29:27 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel .cvsignore, 1.12, 1.13 qemu.spec, 1.68, 1.69 sources, 1.12, 1.13 kvm-fix-strayR.patch, 1.1, NONE Message-ID: <20090324012927.30AE070132@cvs1.fedora.phx.redhat.com> Author: glommer Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18694 Modified Files: .cvsignore qemu.spec sources Removed Files: kvm-fix-strayR.patch Log Message: 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. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 Mar 2009 23:43:31 -0000 1.12 +++ .cvsignore 24 Mar 2009 01:28:56 -0000 1.13 @@ -1 +1 @@ -kvm-84.git-snapshot-20090310.tar.gz +qemu-kvm-devel-85rc1.git-snapshot-20090323.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- qemu.spec 18 Mar 2009 19:00:56 -0000 1.68 +++ qemu.spec 24 Mar 2009 01:28:56 -0000 1.69 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.10.kvm20090310git%{?dist} +Release: 0.11.kvm20090323git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -9,13 +9,18 @@ Group: Development/Tools URL: http://www.qemu.org/ #Source0: http://www.qemu.org/%{name}-%{version}.tar.gz -# FIXME: Say how to get the sources -Source0: kvm-84.git-snapshot-20090310.tar.gz +# 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 +# echo "kdir=$(pwd)/kvm" > ~/.kvm-release-config +# cd kvm-userspace +# mkdir $(HOME)/sf-releases +# ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD + +Source0: qemu-kvm-devel-85rc1.git-snapshot-20090323.tar.gz Source1: qemu.init Source2: kvm.modules Patch1: kvm-upstream-ppc.patch -Patch2: kvm-fix-strayR.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel @@ -177,9 +182,8 @@ %endif %prep -%setup -q -n kvm-84.git-snapshot-20090310 +%setup -q -n qemu-kvm-devel-85rc1.git-snapshot-20090323 %patch1 -p1 -%patch2 -p1 %build # systems like rhel build system does not have a recent enough linker so @@ -204,7 +208,7 @@ # sdl outputs to alsa or pulseaudio directly depending on what the system has configured # 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 --with-patched-kernel --target-list=x86_64-softmmu \ +./configure --target-list=x86_64-softmmu \ --kerneldir=$(pwd)/kernel --prefix=%{_prefix} \ --audio-drv-list=sdl,alsa,oss \ --qemu-ldflags=$extraldflags \ @@ -405,6 +409,13 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 Mar 2009 23:43:33 -0000 1.12 +++ sources 24 Mar 2009 01:28:56 -0000 1.13 @@ -1 +1 @@ -a43cc777acc08855e0364d249bff3da6 kvm-84.git-snapshot-20090310.tar.gz +67eac5a4ab26bfa159539d49bd30a89d qemu-kvm-devel-85rc1.git-snapshot-20090323.tar.gz --- kvm-fix-strayR.patch DELETED --- From lkundrak at fedoraproject.org Wed Mar 25 06:43:23 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 25 Mar 2009 06:43:23 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/EL-5 collectd.spec, 1.18, 1.19 sources, 1.7, 1.8 collectd-4.4.4-configure-OpenIPMI.patch, 1.1, NONE collectd-4.4.4-include-collectd.d.patch, 1.1, NONE Message-ID: <20090325064323.403E670132@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/collectd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14712 Modified Files: collectd.spec sources Removed Files: collectd-4.4.4-configure-OpenIPMI.patch collectd-4.4.4-include-collectd.d.patch Log Message: Merge 4.5.3 from devel Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/EL-5/collectd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- collectd.spec 27 Oct 2008 20:24:38 -0000 1.18 +++ collectd.spec 25 Mar 2009 06:42:51 -0000 1.19 @@ -1,24 +1,23 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.4.4 +Version: 4.5.3 Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-include-collectd.d.patch +Patch0: %{name}-4.5.1-include-collectd.d.patch # bug 468067 "pkg-config --libs OpenIPMIpthread" fails -Patch1: %{name}-%{version}-configure-OpenIPMI.patch +Patch1: %{name}-4.5.1-configure-OpenIPMI.patch +# posted upstream +Patch2: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -%ifnarch ppc -BuildRequires: libvirt-devel -BuildRequires: lm_sensors-devel -%endif -BuildRequires: libxml2-devel +BuildRequires: libvirt-devel, libxml2-devel BuildRequires: rrdtool-devel +BuildRequires: lm_sensors-devel BuildRequires: curl-devel %if 0%{?fedora} >= 8 BuildRequires: perl-libs, perl-devel @@ -31,11 +30,8 @@ BuildRequires: libpcap-devel BuildRequires: mysql-devel BuildRequires: OpenIPMI-devel - -%ifnarch ppc -# Only required until libvirt-devel is fixed (rhbz#460138) -BuildRequires: xen-devel -%endif +BuildRequires: postgresql-devel +BuildRequires: nut-devel %description collectd is a small daemon written in C for performance. It reads various @@ -48,7 +44,7 @@ %package apache Summary: Apache plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, curl +Requires: collectd = %{version}-%{release} %description apache This plugin collects data provided by Apache's 'mod_status'. @@ -72,7 +68,7 @@ %package ipmi Summary: IPMI module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, OpenIPMI +Requires: collectd = %{version}-%{release} %description ipmi This plugin for collectd provides IPMI support. @@ -80,7 +76,7 @@ %package mysql Summary: MySQL module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, mysql +Requires: collectd = %{version}-%{release} %description mysql MySQL querying plugin. This plugins provides data of issued commands, called handlers and database traffic. @@ -89,11 +85,19 @@ %package nginx Summary: Nginx plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, curl +Requires: collectd = %{version}-%{release} %description nginx This plugin gets data provided by nginx. +%package nut +Summary: Network UPS Tools module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release} +%description nut +This plugin for collectd provides Network UPS Tools support. + + %package -n perl-Collectd Summary: Perl bindings for collectd Group: System Environment/Daemons @@ -103,6 +107,15 @@ This package contains Perl bindings and plugin for collectd. +%package postgresql +Summary: PostgreSQL module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release} +%description postgresql +PostgreSQL querying plugin. This plugins provides data of issued commands, +called handlers and database traffic. + + %package rrdtool Summary: RRDTool module for collectd Group: System Environment/Daemons @@ -111,7 +124,6 @@ This plugin for collectd provides rrdtool support. -%ifnarch ppc %package sensors Summary: Libsensors module for collectd Group: System Environment/Daemons @@ -119,7 +131,6 @@ %description sensors This plugin for collectd provides querying of sensors supported by lm_sensors. -%endif %package snmp @@ -130,38 +141,38 @@ This plugin for collectd provides querying of net-snmp. -%ifnarch ppc %package virt Summary: Libvirt plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, libvirt +Requires: collectd = %{version}-%{release} %description virt This plugin collects information from virtualized guests. -%endif %prep %setup -q %patch0 -p1 %patch1 -p0 - +%patch2 -p1 + sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in %build %configure \ - --without-libiptc \ --disable-ascent \ --disable-static \ + --disable-ipvs \ --enable-mysql \ -%ifnarch ppc --enable-sensors \ -%endif --enable-email \ --enable-apache \ --enable-perl \ --enable-unixsock \ --enable-ipmi \ + --enable-nut \ + --enable-postgresql \ + --enable-iptables \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -169,7 +180,6 @@ %install %{__rm} -rf %{buildroot} %{__rm} -rf contrib/SpamAssassin -%{__rm} -rf contrib/collection3 %{__make} install DESTDIR="%{buildroot}" %{__install} -Dp -m0644 src/collectd.conf %{buildroot}%{_sysconfdir}/collectd.conf @@ -192,23 +202,20 @@ mkdir perl-examples find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \; +# postresql config example will be included by %doc +rm %{buildroot}%{_datadir}/collectd/postgresql_default.conf + # Move config contribs mkdir -p %{buildroot}/etc/collectd.d/ cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf cp contrib/redhat/email.conf %{buildroot}/etc/collectd.d/email.conf cp contrib/redhat/mysql.conf %{buildroot}/etc/collectd.d/mysql.conf cp contrib/redhat/nginx.conf %{buildroot}/etc/collectd.d/nginx.conf -%ifnarch ppc cp contrib/redhat/sensors.conf %{buildroot}/etc/collectd.d/sensors.conf -%endif cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf # configs for subpackaged plugins -subpkgs="dns ipmi perl rrdtool" -%ifnarch ppc -subpkgs="$subpkgs libvirt" -%endif -for p in $subpkgs +for p in dns ipmi libvirt nut perl postgresql rrdtool do %{__cat} > %{buildroot}/etc/collectd.d/$p.conf < 4.4.4-2 -- remove contrib/collection3 because of missing Perl dependencies in EL-5 +* Tue Mar 03 2009 Alan Pevec 4.5.3-2 +- patch for strict-aliasing issue in liboping.c -* Wed Oct 22 2008 Alan Pevec 4.4.4-1 -- new upstream bugfix release 4.4.4 - http://collectd.org/news.shtml#news59 +* Mon Mar 02 2009 Alan Pevec 4.5.3-1 +- New upstream version 4.5.3 +- fixes collectd is built without iptables plugin, bz# 479208 +- list all expected plugins explicitly to avoid such bugs + +* Tue Feb 24 2009 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 23 2009 Richard W.M. Jones - 4.5.1-3 +- Rebuild against new mysql client. -* Tue Sep 16 2008 Alan Pevec 4.4.3-1 -- New upstream bugfix release 4.4.3. - http://collectd.org/news.shtml#news57 - -* Mon Sep 01 2008 Alan Pevec 4.4.2-1 -- New upstream release 4.4.2. - -* Thu Aug 28 2008 Richard W.M. Jones 4.4.1-9 -- Exclude libvirt module, Xen deps, on PPC. -- Exclude sensors module also on PPC. +* Sun Dec 07 2008 Alan Pevec 4.5.1-2.1 +- fix subpackages, bz# 475093 -* Mon Aug 25 2008 Richard W.M. Jones 4.4.1-7 -- +BR xen-devel (explicit dep required because of rhbz#460138). +* Sun Nov 30 2008 Alan Pevec 4.5.1-2 +- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067 + +* Sun Oct 22 2008 Alan Pevec 4.5.1-1 +- New upstream version 4.5.1, bz# 470943 + http://collectd.org/news.shtml#news59 +- enable Network UPS Tools (nut) plugin, bz# 465729 +- enable postgresql plugin +- spec cleanup, bz# 473641 -* Mon Aug 25 2008 Richard W.M. Jones 4.4.1-5 -- Force rebuild. +* Fri Aug 01 2008 Alan Pevec 4.4.2-1 +- New upstream version 4.4.2. * Thu Jul 03 2008 Lubomir Rintel 4.4.1-4 - Fix a typo introduced by previous change that prevented building in el5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/collectd/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Oct 2008 09:17:06 -0000 1.7 +++ sources 25 Mar 2009 06:42:51 -0000 1.8 @@ -1 +1 @@ -9e0e89150b1ff28fc0fdd8a198c9ac5e collectd-4.4.4.tar.bz2 +f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2 --- collectd-4.4.4-configure-OpenIPMI.patch DELETED --- --- collectd-4.4.4-include-collectd.d.patch DELETED --- From lkundrak at fedoraproject.org Wed Mar 25 06:45:55 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 25 Mar 2009 06:45:55 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/EL-5 collectd-4.5.1-configure-OpenIPMI.patch, NONE, 1.1 collectd-4.5.1-include-collectd.d.patch, NONE, 1.1 collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, NONE, 1.1 Message-ID: <20090325064555.4468070132@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/collectd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15016 Added 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: Add patches that were forgotten collectd-4.5.1-configure-OpenIPMI.patch: --- NEW FILE collectd-4.5.1-configure-OpenIPMI.patch --- --- configure.ORIG 2008-10-16 22:43:28.000000000 +0200 +++ configure 2008-11-30 11:30:53.000000000 +0100 @@ -36831,7 +36831,7 @@ then { echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5 echo $ECHO_N "checking for libOpenIPMIpthread... $ECHO_C" >&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)" @@ -36844,7 +36844,7 @@ then { echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5 echo $ECHO_N "checking for libOpenIPMIpthread CFLAGS... $ECHO_C" >&6; } - temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`" + temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread" if test "$?" = "0" then with_libopenipmipthread_cflags="$temp_result" @@ -36860,7 +36860,7 @@ then { echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5 echo $ECHO_N "checking for libOpenIPMIpthread LDFLAGS... $ECHO_C" >&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.5.1-include-collectd.d.patch: --- NEW FILE collectd-4.5.1-include-collectd.d.patch --- --- collectd-4.5.1/src/collectd.conf.in.ORIG 2008-10-16 22:29:56.000000000 +0200 +++ collectd-4.5.1/src/collectd.conf.in 2008-11-30 10:39:23.000000000 +0100 @@ -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 @@ -36,42 +35,30 @@ @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv @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 - 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 - 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 @@ -423,3 +410,4 @@ # Verbose false # +Include "/etc/collectd.d" collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch: --- NEW FILE collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch --- >From b96ca3bd632f5fef539486a4c2c9906b32c31817 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Tue, 3 Mar 2009 14:36:36 +0100 Subject: [PATCH] Fix gcc-4.4 strict-aliasing issue cc1: warnings being treated as errors liboping.c: In function 'ping_host_add': liboping.c:995: error: dereferencing pointer 'si' does break strict-aliasing rules ... Signed-off-by: Alan Pevec --- src/liboping/liboping.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c index 13bcc92..94adb1d 100644 --- a/src/liboping/liboping.c +++ b/src/liboping/liboping.c @@ -987,9 +987,12 @@ int ping_host_add (pingobj_t *obj, const char *host) if (ai_ptr->ai_family == AF_INET) { - struct sockaddr_in *si; - - si = (struct sockaddr_in *) &sockaddr; + union { + struct sockaddr_storage any_socket; + struct sockaddr_in si; + } s; + s.any_socket = sockaddr; + struct sockaddr_in *si = &s.si; si->sin_family = AF_INET; si->sin_port = htons (ph->ident); si->sin_addr.s_addr = htonl (INADDR_ANY); @@ -999,9 +1002,12 @@ int ping_host_add (pingobj_t *obj, const char *host) } else if (ai_ptr->ai_family == AF_INET6) { - struct sockaddr_in6 *si; - - si = (struct sockaddr_in6 *) &sockaddr; + union { + struct sockaddr_storage any_socket; + struct sockaddr_in6 si; + } s; + s.any_socket = sockaddr; + struct sockaddr_in6 *si = &s.si; si->sin6_family = AF_INET6; si->sin6_port = htons (ph->ident); si->sin6_addr = in6addr_any; -- 1.6.0.6 From lkundrak at fedoraproject.org Wed Mar 25 07:19:13 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Wed, 25 Mar 2009 07:19:13 +0000 (UTC) Subject: [fedora-virt-maint] rpms/collectd/EL-5 collectd.spec,1.19,1.20 Message-ID: <20090325071913.DB3C970132@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/collectd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18583 Modified Files: collectd.spec Log Message: * Wed Mar 25 2009 Lubomir Rintel - 4.5.3-2.1 - Disable sensors and libvirt for EL5 on ppc, VT is x86 only Index: collectd.spec =================================================================== RCS file: /cvs/pkgs/rpms/collectd/EL-5/collectd.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- collectd.spec 25 Mar 2009 06:42:51 -0000 1.19 +++ collectd.spec 25 Mar 2009 07:18:43 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.5.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -15,9 +15,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +%ifarch %{ix86} x86_64 BuildRequires: libvirt-devel, libxml2-devel -BuildRequires: rrdtool-devel BuildRequires: lm_sensors-devel +%endif +BuildRequires: rrdtool-devel BuildRequires: curl-devel %if 0%{?fedora} >= 8 BuildRequires: perl-libs, perl-devel @@ -124,6 +126,7 @@ This plugin for collectd provides rrdtool support. +%ifarch %{ix86} x86_64 %package sensors Summary: Libsensors module for collectd Group: System Environment/Daemons @@ -131,6 +134,7 @@ %description sensors This plugin for collectd provides querying of sensors supported by lm_sensors. +%endif %package snmp @@ -141,12 +145,14 @@ This plugin for collectd provides querying of net-snmp. +%ifarch %{ix86} x86_64 %package virt Summary: Libvirt plugin for collectd Group: System Environment/Daemons Requires: collectd = %{version}-%{release} %description virt This plugin collects information from virtualized guests. +%endif %prep @@ -164,7 +170,9 @@ --disable-static \ --disable-ipvs \ --enable-mysql \ +%ifarch %{ix86} x86_64 --enable-sensors \ +%endif --enable-email \ --enable-apache \ --enable-perl \ @@ -215,7 +223,7 @@ cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf # configs for subpackaged plugins -for p in dns ipmi libvirt nut perl postgresql rrdtool +for p in dns ipmi nut libvirt perl postgresql rrdtool do %{__cat} > %{buildroot}/etc/collectd.d/$p.conf < - 4.5.3-2.1 +- Disable sensors and libvirt for EL5 on ppc, VT is x86 only + * Tue Mar 03 2009 Alan Pevec 4.5.3-2 - patch for strict-aliasing issue in liboping.c From markmc at fedoraproject.org Wed Mar 25 09:51:44 2009 From: markmc at fedoraproject.org (Mark McLoughlin) Date: Wed, 25 Mar 2009 09:51:44 +0000 (UTC) Subject: [fedora-virt-maint] rpms/qemu/devel qemu.spec,1.69,1.70 Message-ID: <20090325095144.8AA1E70132@cvs1.fedora.phx.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/qemu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7239 Modified Files: qemu.spec Log Message: * Wed Mar 25 2009 Mark McLoughlin - 2:0.10-0.12.kvm20090323git - BuildRequires pciutils-devel for device assignment (#492076) Index: qemu.spec =================================================================== RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- qemu.spec 24 Mar 2009 01:28:56 -0000 1.69 +++ qemu.spec 25 Mar 2009 09:51:13 -0000 1.70 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10 -Release: 0.11.kvm20090323git%{?dist} +Release: 0.12.kvm20090323git%{?dist} # I have mistakenly thought the revision name would be 1.0. # So 0.10 series get Epoch = 1 Epoch: 2 @@ -25,6 +25,7 @@ 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 Requires: %{name}-user = %{epoch}:%{version}-%{release} Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release} @@ -409,6 +410,9 @@ %{_mandir}/man1/qemu-img.1* %changelog +* 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). From pkgdb at fedoraproject.org Thu Mar 26 10:15:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 26 Mar 2009 10:15:13 +0000 Subject: [fedora-virt-maint] [pkgdb] bochs: virtmaint has requested watchbugzilla Message-ID: <20090326101505.77C48208511@bastion.fedora.phx.redhat.com> virtmaint has requested the watchbugzilla acl on bochs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 26 10:13:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 26 Mar 2009 10:13:42 +0000 Subject: [fedora-virt-maint] [pkgdb] bochs: virtmaint has requested watchcommits Message-ID: <20090326101507.CF9FB208550@bastion.fedora.phx.redhat.com> virtmaint has requested the watchcommits acl on bochs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 26 11:35:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 26 Mar 2009 11:35:41 +0000 Subject: [fedora-virt-maint] [pkgdb] bochs had acl change status Message-ID: <20090326113706.50A6F2084CC@bastion.fedora.phx.redhat.com> jwrdegoede has set the watchcommits acl on bochs (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs From pkgdb at fedoraproject.org Thu Mar 26 11:37:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Thu, 26 Mar 2009 11:37:18 +0000 Subject: [fedora-virt-maint] [pkgdb] bochs had acl change status Message-ID: <20090326113711.2CD27208511@bastion.fedora.phx.redhat.com> jwrdegoede has set the watchbugzilla acl on bochs (Fedora devel) to Approved for virtmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/bochs