diff --git a/qemu-nonvoid_return.patch b/qemu-nonvoid_return.patch new file mode 100644 index 00000000..61c38888 --- /dev/null +++ b/qemu-nonvoid_return.patch @@ -0,0 +1,20 @@ +--- hw/mpcore.c ++++ hw/mpcore.c +@@ -106,6 +106,7 @@ + case 12: /* Interrupt status. */ + return s->status; + } ++ return 0; + } + + static void mpcore_timer_write(mpcore_timer_state *s, int offset, +--- target-m68k/translate.c ++++ target-m68k/translate.c +@@ -452,6 +452,7 @@ + default: + qemu_assert(0, "bad operand size"); + } ++ return 0; + } + + /* Assign value to a register. If the width is less than the register width diff --git a/qemu.changes b/qemu.changes index 564bb6bb..bfa2d2b1 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 4 13:08:59 CEST 2008 - ro@suse.de + +- fix build by adding return statements for two nonvoid functions + (qemu-nonvoid_return.patch), actually unreached code + ------------------------------------------------------------------- Thu Jul 24 13:56:06 CEST 2008 - uli@suse.de diff --git a/qemu.spec b/qemu.spec index 88cc727e..9c3b7291 100644 --- a/qemu.spec +++ b/qemu.spec @@ -18,7 +18,7 @@ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT Group: System/Emulators/PC Summary: Universal CPU emulator Version: 0.9.2svn20080703 -Release: 1 +Release: 2 Source: %name-20080703.tar.bz2 Patch1: qemu-0.9.0.cvs-binfmt.patch Patch6: qemu-0.7.0-amd64.patch @@ -50,6 +50,7 @@ Patch85: qemu-img-vmdk-scsi.patch Patch86: qemu-svn-ncurses.patch Patch87: qemu-svn-nodyngen.patch Patch88: qemu-svn-pcap.patch +Patch90: qemu-nonvoid_return.patch Source200: kvm_bios.bin # this is to make lint happy Source300: rpmlintrc @@ -97,6 +98,7 @@ ln -s fpu/*.h . %patch86 %patch87 %patch88 +%patch90 %build cp -p %SOURCE200 pc-bios/ @@ -163,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Mon Aug 04 2008 ro@suse.de +- fix build by adding return statements for two nonvoid functions + (qemu-nonvoid_return.patch), actually unreached code * Thu Jul 24 2008 uli@suse.de - update -> current SVN - MIPS Magnum R4000 machine (Hervé Poussineau)