Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (405a9b884ba56adc616fc4130e8eb302b2d73160)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (405a9b884ba56adc616fc4130e8eb302b2d73160)
  • Date: Fri, 4 Mar 2011 05:31:40 -0600

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

dev/null |binary
kernels/kvm/DETAILS | 2 -
kernels/kvm/HISTORY | 5 ++
kernels/kvm/PRE_BUILD | 3 +
kernels/kvm/pci.patch | 61
+++++++++++++++++++++++++++++++++
kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig | 0
kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig |binary
7 files changed, 69 insertions(+), 2 deletions(-)

New commits:
commit 405a9b884ba56adc616fc4130e8eb302b2d73160
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kvm: updated spell to 0.14.0

diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index eaabdd9..d737908 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=kvm
- VERSION=0.13.0
+ VERSION=0.14.0
SOURCE=qemu-${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qemu-${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index 9275c3e..d725d81 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,8 @@
+2011-03-04 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.14.0
+ * pci.patch: fixes non-x86 targets which have no PCI support.
(upstream patch)
+
http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commit;h=ac360f5441282f0bd1061654776bb11a2db91a5b
+
2011-03-02 Eri Sandall <sandalle AT sourcemage.org>
* BUILD: user/ renamed to test/ for diagnostic tools
Have to build kvmtrace separately
diff --git a/kernels/kvm/PRE_BUILD b/kernels/kvm/PRE_BUILD
index 1bd367d..54f3f27 100755
--- a/kernels/kvm/PRE_BUILD
+++ b/kernels/kvm/PRE_BUILD
@@ -12,4 +12,5 @@ if [[ "$KVM_DIAGTOOLS" == "y" ]]; then
return 1
fi
fi &&
-default_pre_build
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/pci.patch
diff --git a/kernels/kvm/pci.patch b/kernels/kvm/pci.patch
new file mode 100644
index 0000000..9e897a7
--- /dev/null
+++ b/kernels/kvm/pci.patch
@@ -0,0 +1,61 @@
+From ac360f5441282f0bd1061654776bb11a2db91a5b Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <jan.kiszka AT siemens.com>
+Date: Wed, 23 Feb 2011 09:28:53 +0100
+Subject: [PATCH] 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 <jan.kiszka AT siemens.com>
+Signed-off-by: Avi Kivity <avi AT redhat.com>
+(cherry picked from commit cf3a3feb8d6309a5c79277fc084d7785729b7262)
+---
+ 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 a647c45..37dea57 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 9680cc4..e3caa53 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 7792aa9..2f4a0fa 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"
+--
+1.7.4.1
+
diff --git a/kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig
deleted file mode 100644
index 327be7f..0000000
Binary files a/kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig and /dev/null differ
diff --git a/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig
new file mode 100644
index 0000000..2948adc
Binary files /dev/null and b/kernels/kvm/qemu-kvm-0.14.0.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (405a9b884ba56adc616fc4130e8eb302b2d73160), Bor Kraljič, 03/04/2011

Archive powered by MHonArc 2.6.24.

Top of Page