diff options
author | Stu Miller <slackbuilds@go4it2day.com> | 2011-05-10 22:23:47 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2011-05-10 22:23:47 -0500 |
commit | 65282ac79cd679e5b7321a0954640f873226e996 (patch) | |
tree | 43e71240f8de38576c228344cbdc86aa63e8f38d /system/qemu-kvm/fixup-undefined-pci-references.patch | |
parent | 49c0d6564bd00f6d99c462af1934728cf03807e1 (diff) | |
download | slackbuilds-65282ac79cd679e5b7321a0954640f873226e996.tar.gz |
system/qemu-kvm: Updated for version 0.14.0.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/qemu-kvm/fixup-undefined-pci-references.patch')
-rw-r--r-- | system/qemu-kvm/fixup-undefined-pci-references.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/system/qemu-kvm/fixup-undefined-pci-references.patch b/system/qemu-kvm/fixup-undefined-pci-references.patch new file mode 100644 index 0000000000..4a002c7bf2 --- /dev/null +++ b/system/qemu-kvm/fixup-undefined-pci-references.patch @@ -0,0 +1,51 @@ +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 <jan.kiszka@xxxxxxxxxxx> +--- + Makefile.objs | 2 +- + Makefile.target | 2 +- + hw/pci.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +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" |