commit kvm for openSUSE:Factory
Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at 2012-08-04 13:09:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvm (Old) and /work/SRC/openSUSE:Factory/.kvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvm", Maintainer is "BROGERS@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kvm/kvm.changes 2012-07-24 17:22:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kvm.new/kvm.changes 2012-08-04 13:10:15.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 31 02:11:56 UTC 2012 - brogers@suse.com + +- eliminate warnings from ipxe build + +------------------------------------------------------------------- +Tue Jul 24 13:37:13 UTC 2012 - vuntz@opensuse.org + +- Add libcap-devel BuildRequires since it's needed to enable VirtFS + support. +- Add usbredir-devel BuildRequires on openSUSE 12.2 and later to + enable USB network redirection support. +- Pass --enable-virtfs to configure to detect changes that will + cause VirtFS support to not be built. +- Manually remove virtfs-proxy-helper in %install, as it will be + part of qemu-tools. + +------------------------------------------------------------------- New: ---- ipxe-isa-Avoid-spurious-compiler-warning-on-gcc-4.7.patch ipxe-qib7322-Fix-compiler-warning-on-gcc-4.7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.PFnvbx/_old 2012-08-04 13:11:57.000000000 +0200 +++ /var/tmp/diff_new_pack.PFnvbx/_new 2012-08-04 13:11:57.000000000 +0200 @@ -55,6 +55,7 @@ %endif BuildRequires: libaio-devel BuildRequires: libattr-devel +BuildRequires: libcap-devel BuildRequires: libcurl-devel BuildRequires: libpulse-devel BuildRequires: ncurses-devel @@ -92,6 +93,9 @@ %endif %endif %endif +%if 0%{?suse_version} >= 1220 +BuildRequires: usbredir-devel >= 0.3.4 +%endif BuildRequires: pwdutils Requires: pwdutils Requires: python-curses @@ -121,6 +125,8 @@ # ipxe patches Patch01: ipxe-rom-settings.patch Patch02: ipxe-avoid-bad-array-reference.patch +Patch03: ipxe-qib7322-Fix-compiler-warning-on-gcc-4.7.patch +Patch04: ipxe-isa-Avoid-spurious-compiler-warning-on-gcc-4.7.patch # seabios patches Patch20: seabios-sanitize-version.patch @@ -207,6 +213,8 @@ # ipxe patches %patch01 -p1 %patch02 -p1 +%patch03 -p1 +%patch04 -p1 %endif %setup -q -n qemu-%{name}-%{package_true_version} -a 6 -a 9 -a 10 %if %{build_fw_from_source} @@ -303,6 +311,7 @@ --enable-kvm-device-assignment \ --disable-user \ --enable-vde \ + --enable-virtfs \ %if %{build_fw_from_source} --disable-blobs \ %endif @@ -345,7 +354,7 @@ cp roms/vgabios/VGABIOS-lgpl-latest.vmware.bin pc-bios/vgabios-vmware.bin cp roms/vgabios/VGABIOS-lgpl-latest.qxl.bin pc-bios/vgabios-qxl.bin cd ../%{pxe_rom_id}/src -make NO_WERROR=1 bin/blib.a %{?_smp_mflags} +make bin/blib.a %{?_smp_mflags} make bin/8086100e.rom %{?_smp_mflags} make bin/10222000.rom %{?_smp_mflags} make bin/10500940.rom %{?_smp_mflags} @@ -379,7 +388,7 @@ install_rom 1af41000 pxe-virtio %endif cd %{buildroot} -rm .%_bindir/{qemu-img,qemu-io,qemu-ga,qemu-nbd} +rm .%_bindir/{qemu-img,qemu-io,qemu-ga,qemu-nbd,virtfs-proxy-helper} rm -r .{%_libexecdir/qemu-bridge-helper,%_datadir/doc/qemu} %if !%{build_fw_from_source} rm .%_datadir/qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,bamboo.dtb,petalogix-ml605.dtb,petalogix-s3adsp1800.dtb} @@ -388,6 +397,7 @@ rm .%_datadir/qemu-kvm/bios.bin %endif rm -r .%_mandir/man1/qemu-img.1 +rm -r .%_mandir/man1/virtfs-proxy-helper.1 rm -r .%_mandir/man8/qemu-nbd.8 mv .%_bindir/{qemu-system*,qemu-kvm} mv .%_mandir/man1/{qemu.1,qemu-kvm.1} ++++++ ipxe-isa-Avoid-spurious-compiler-warning-on-gcc-4.7.patch ++++++
From a87c0c4f0f47f5dc4b4d7050b15713a9f7a52757 Mon Sep 17 00:00:00 2001 From: Michael Brown <mcb30@ipxe.org> Date: Fri, 20 Jul 2012 18:32:58 +0100 Subject: [PATCH] [isa] Avoid spurious compiler warning on gcc 4.7
gcc 4.7 produces a spurious warning about an array subscript being out of bounds. Use a pointer dereference instead of an array lookup to inhibit this spurious warning. Signed-off-by: Michael Brown <mcb30@ipxe.org> --- src/drivers/bus/isa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c index 9b562c6..da0c43c 100644 --- a/src/drivers/bus/isa.c +++ b/src/drivers/bus/isa.c @@ -46,9 +46,9 @@ static isa_probe_addr_t isa_extra_probe_addrs[] = { #endif #define ISA_IOADDR( driver, ioidx ) \ - ( ( (ioidx) < 0 ) ? \ - isa_extra_probe_addrs[ (ioidx) + ISA_EXTRA_PROBE_ADDR_COUNT ] : \ - (driver)->probe_addrs[(ioidx)] ) + ( ( (ioidx) >= 0 ) ? \ + (driver)->probe_addrs[(ioidx)] : \ + *( isa_extra_probe_addrs + (ioidx) + ISA_EXTRA_PROBE_ADDR_COUNT ) ) static void isabus_remove ( struct root_device *rootdev ); -- 1.7.7 ++++++ ipxe-qib7322-Fix-compiler-warning-on-gcc-4.7.patch ++++++
From 1ac62b914ec9f478cc0ed63a45a87196a583b073 Mon Sep 17 00:00:00 2001 From: Michael Brown <mcb30@ipxe.org> Date: Fri, 20 Jul 2012 19:18:50 +0100 Subject: [PATCH] [qib7322] Fix compiler warning on gcc 4.7
Originally-fixed-by: Christian Hesse <list@eworm.de> Signed-off-by: Michael Brown <mcb30@ipxe.org> --- src/drivers/infiniband/qib7322.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/drivers/infiniband/qib7322.c b/src/drivers/infiniband/qib7322.c index b66f8ef..8b61b8d 100644 --- a/src/drivers/infiniband/qib7322.c +++ b/src/drivers/infiniband/qib7322.c @@ -2062,6 +2062,9 @@ static int qib7322_ahb_read ( struct qib7322 *qib7322, unsigned int location, struct QIB_7322_ahb_transaction_reg xact; int rc; + /* Avoid returning uninitialised data on error */ + *data = 0; + /* Initiate transaction */ memset ( &xact, 0, sizeof ( xact ) ); BIT_FILL_2 ( &xact, -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de