From bc9e714751673d9efbccea0d41853004b98710b6 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Mar 02 2011 17:09:57 +0000 Subject: Re-enable cris and sparc --- diff --git a/qemu-fix-non-PCI-target-build.patch b/qemu-fix-non-PCI-target-build.patch new file mode 100644 index 0000000..b479efa --- /dev/null +++ b/qemu-fix-non-PCI-target-build.patch @@ -0,0 +1,53 @@ +commit 1a8364456c2f3946b4feb8fc78eaf00d974f4c03 +Author: Jan Kiszka +Date: Wed Feb 23 09:28:53 2011 +0100 + + qemu-kvm: Fix non-PCI target build + + Replace obsolete qemu-kvm.h with kvm.h in pci.c and build that module + just like upstream does. This fixes non-x86 targets which have no PCI + support. + + Signed-off-by: Jan Kiszka + Signed-off-by: Avi Kivity + +diff --git a/Makefile.objs b/Makefile.objs +index f5702eb..3ec7121 100644 +--- a/Makefile.objs ++++ b/Makefile.objs +@@ -170,7 +170,7 @@ hw-obj-y = + hw-obj-y += loader.o + hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o + hw-obj-y += fw_cfg.o +-hw-obj-$(CONFIG_PCI) += pci_bridge.o ++hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o + hw-obj-$(CONFIG_PCI) += msix.o msi.o + hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o + hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o +diff --git a/Makefile.target b/Makefile.target +index 6e9a024..23367eb 100644 +--- a/Makefile.target ++++ b/Makefile.target +@@ -195,7 +195,7 @@ endif #CONFIG_BSD_USER + # System emulator target + ifdef CONFIG_SOFTMMU + +-obj-y = arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o balloon.o ++obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o + # virtio has to be here due to weird dependency between PCI and virtio-net. + # need to fix this properly + obj-$(CONFIG_NO_PCI) += pci-stub.o +diff --git a/hw/pci.c b/hw/pci.c +index 0c44939..1f6cebe 100644 +--- a/hw/pci.c ++++ b/hw/pci.c +@@ -29,8 +29,8 @@ + #include "net.h" + #include "sysemu.h" + #include "loader.h" +-#include "qemu-kvm.h" + #include "hw/pc.h" ++#include "kvm.h" + #include "device-assignment.h" + #include "qemu-objects.h" + #include "range.h" diff --git a/qemu.spec b/qemu.spec index 46765a4..98c115b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.14.0 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -37,6 +37,8 @@ Source8: ksmtuned.conf # with F-13/ Patch00: pc-add-a-Fedora-13-machine-type-for-backward-compat.patch +Patch01: qemu-fix-non-PCI-target-build.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel BuildRequires: libaio-devel @@ -53,7 +55,7 @@ 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-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} @@ -188,15 +190,15 @@ 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. +%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 +This package provides the system emulator for cris %package system-m68k Summary: QEMU system emulator for m68k @@ -233,6 +235,7 @@ such as kvm_stat. %setup -q -n qemu-kvm-%{version} %patch00 -p1 +%patch01 -p1 %build # By default we build everything, but allow x86 to build a minimal version @@ -240,9 +243,9 @@ such as kvm_stat. %if %{with_x86only} buildarch="i386-softmmu x86_64-softmmu i386-linux-user x86_64-linux-user" %else - buildarch="i386-softmmu x86_64-softmmu arm-softmmu m68k-softmmu \ + buildarch="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 \ + 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 \ @@ -521,7 +524,7 @@ fi %files system-sparc %defattr(-,root,root) -# %{_bindir}/qemu-system-sparc + %{_bindir}/qemu-system-sparc %{_datadir}/%{name}/openbios-sparc32 %{_datadir}/%{name}/openbios-sparc64 @@ -545,9 +548,9 @@ fi %{_datadir}/%{name}/bamboo.dtb %{_datadir}/%{name}/ppc_rom.bin -# %files system-cris -# %defattr(-,root,root) -# %{_bindir}/qemu-system-cris +%files system-cris +%defattr(-,root,root) +%{_bindir}/qemu-system-cris %files system-m68k %defattr(-,root,root) @@ -567,6 +570,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Wed Mar 02 2011 Justin M. Forbes - 2:0.14.0-2 +- Re-enable sparc and cris builds + * Thu Feb 24 2011 Justin M. Forbes - 2:0.14.0-1 - Update to 0.14.0 release