From 4a5845b98b19e0b053d6f38815ddde0f59740b17 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Jul 05 2012 09:48:44 +0000 Subject: Try to get Koji build working. - Add patch to fix build system (thanks Hans de Goede). - Remove vapic.bin (BIOS file no longer being created). --- diff --git a/.gitignore b/.gitignore index b5d4127..c24f3db 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ qemu-kvm-0.13.0-25fdf4a.tar.gz /qemu-kvm-0.15.0-0af4922.tar.gz /qemu-kvm-0.15.0.tar.gz /qemu-kvm-0.15.1.tar.gz +/qemu-kvm-1.1.0.tar.gz diff --git a/0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch b/0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch new file mode 100644 index 0000000..41b0178 --- /dev/null +++ b/0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch @@ -0,0 +1,53 @@ +>From 309ac5b2ef96678f30c67b71e342813688040e72 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 4 Jul 2012 17:19:20 +0200 +Subject: [PATCH 01/15] buildsys: Move msi[x] and virtio-pci from + Makefile.objs to Makefile.target + +Building both kvm and non kvm versions of qemu in the same tree, +results in a link error during the non kvm build with undefined references +to kvm_kernel_irqchip, expanded from the kvm_irqchip_in_kernel macro. + +This patch fixes this. + +Signed-off-by: Hans de Goede +--- + Makefile.objs | 2 -- + Makefile.target | 3 ++- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile.objs b/Makefile.objs +index 264f1fe..8d49738 100644 +--- a/Makefile.objs ++++ b/Makefile.objs +@@ -211,10 +211,8 @@ hw-obj-y = + hw-obj-y += vl.o loader.o + hw-obj-$(CONFIG_VIRTIO) += virtio-console.o + hw-obj-y += usb/libhw.o +-hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o + hw-obj-y += fw_cfg.o + hw-obj-$(CONFIG_PCI) += pci_bridge.o pci_bridge_dev.o +-hw-obj-$(CONFIG_PCI) += msix.o msi.o + hw-obj-$(CONFIG_PCI) += shpc.o + hw-obj-$(CONFIG_PCI) += slotid_cap.o + hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o +diff --git a/Makefile.target b/Makefile.target +index eda8637..ede8ed3 100644 +--- a/Makefile.target ++++ b/Makefile.target +@@ -183,9 +183,10 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.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 +-obj-$(CONFIG_PCI) += pci.o ++obj-$(CONFIG_PCI) += pci.o msi.o msix.o + obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o + obj-$(CONFIG_VIRTIO) += virtio-scsi.o ++obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o + obj-y += vhost_net.o + obj-$(CONFIG_VHOST_NET) += vhost.o + obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o +-- +1.7.10.4 + + diff --git a/qemu.spec b/qemu.spec index d1f4afc..ac38605 100644 --- a/qemu.spec +++ b/qemu.spec @@ -79,6 +79,9 @@ Source11: 99-qemu-guest-agent.rules Patch1: 0001-qemu-kvm-Add-missing-default-machine-options.patch Patch2: 0002-qemu-kvm-virtio-Do-not-register-mask-notifiers-witho.patch +# Speculative patch to fix msi and virtio-pci modules in build (not upstream). +Patch3: 0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch + # The infamous chardev flow control patches Patch101: 0101-char-Split-out-tcp-socket-close-code-in-a-separate-f.patch Patch102: 0102-char-Add-a-QemuChrHandlers-struct-to-initialise-char.patch @@ -344,6 +347,7 @@ such as kvm_stat. %setup -q -n qemu-kvm-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch101 -p1 %patch102 -p1 @@ -708,7 +712,6 @@ fi %{_datadir}/%{name}/linuxboot.bin %{_datadir}/%{name}/multiboot.bin %{_datadir}/%{name}/mpc8544ds.dtb -%{_datadir}/%{name}/vapic.bin %{_datadir}/%{name}/vgabios.bin %{_datadir}/%{name}/vgabios-cirrus.bin %{_datadir}/%{name}/vgabios-qxl.bin diff --git a/sources b/sources index c8f2676..be8c623 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00a825db46a70ba8ef9fc95da9cc7c1e qemu-kvm-1.0.tar.gz +2e19185b7fdf4c144f4719a88a5bde31 qemu-kvm-1.1.0.tar.gz