sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (2161c0bd0b423136871e9bb837c07e15f515704f)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (2161c0bd0b423136871e9bb837c07e15f515704f)
Date: Wed, 4 Aug 2010 02:57:53 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
kernels/kvm/BUILD | 13 +++++++++++--
kernels/kvm/CONFIGURE | 26 +++++++++++++++++++++++---
kernels/kvm/DETAILS | 6 +++---
kernels/kvm/HISTORY | 16 ++++++++++++++++
kernels/kvm/INSTALL | 24 +++++++++---------------
kernels/kvm/PRE_BUILD | 18 +++++++++++++++---
kernels/kvm/PROVIDES | 1 +
kernels/kvm/TRIGGERS | 1 -
kernels/kvm/archs | 32
++++++++++++++++++++++++++++++++
kernels/kvm/bug2823323.patch | 16 ----------------
kernels/kvm/kvm-88.tar.gz.sig | 0
kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig |binary
libs/libvirt/DEPENDS | 3 ++-
libs/libvirt/HISTORY | 4 ++++
utils/qemu/HISTORY | 3 +++
utils/qemu/PROVIDES | 1 +
17 files changed, 120 insertions(+), 44 deletions(-)

New commits:
commit 2161c0bd0b423136871e9bb837c07e15f515704f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kvm: kvm_stat (from KVM_DIAGTOOLS) requires CONFIG_DEBUG_FS

commit 278e5a3902e24328c41d2ae0d4d9f468564375b3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libvirt: Suggest dependency on any provider of QEMU to actually run the
QEMU VMs

commit b4889adff28c3441372b405b95b906382f7a0a80
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: qemu and kvm now provide QEMU functionality

commit b5bf5d5722d21086c9cd5f91ff54d7274518e897
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kvm: Build requested user/softmmu architectures

kvm is now qemu with kvm extra patches added and so is
functionally equivalent to qemu, so provide QEMU.

commit d9a9f692cafb709be9b75d2ff1674badf65c4ab2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kvm: Optionally build KVM diagnostic/debug tools

commit 83fc73fbacc78d9b21acbf6f03a4efc935a81f9a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kvm: Update to stable qemu-kvm branch, follows qemu with kvm modifications
No longer apply bug2823323.patch
Link qemu-system-x86_64 to qemu-kvm (which libvirt looks for to find if
kvm is supported)
No kernel module built, remove trigger on linux cast

diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD
index ddd77b1..32a02ec 100755
--- a/kernels/kvm/BUILD
+++ b/kernels/kvm/BUILD
@@ -1,4 +1,4 @@
-cd "${SOURCE_DIRECTORY}" &&
+message "Target list: $KVM_ARCHS" &&

./configure --prefix=${INSTALL_ROOT}/usr \
--extra-cflags="${CFLAGS}" \
@@ -6,7 +6,16 @@ cd "${SOURCE_DIRECTORY}" &&
--kerneldir="/lib/modules/$(get_kernel_version)/build" \
--disable-werror \
--disable-xen \
+ --target-list="$KVM_ARCHS" \
--audio-drv-list="${KVM_DRV}" \
--audio-card-list="${KVM_CARD}" \
$OPTS &&
-make
+make &&
+
+if [[ "$KVM_DIAGTOOLS" == "y" ]]; then
+ message "${MESSAGE_COLOR}Building KVM diagnostic/debugging
tools...${DEFAULT_COLOR}" &&
+ pushd "$SOURCE_DIRECTORY/kvm/user" &&
+ ./configure --prefix=$INSTALL_ROOT/usr &&
+ make &&
+ popd
+fi
diff --git a/kernels/kvm/CONFIGURE b/kernels/kvm/CONFIGURE
index 0042457..bb326f7 100755
--- a/kernels/kvm/CONFIGURE
+++ b/kernels/kvm/CONFIGURE
@@ -1,10 +1,30 @@
+local KVM_ARCH_LIST=`cat $SPELL_DIRECTORY/archs` &&
+persistent_add KVM_ARCHS &&
+
+# deliberately uses query, see locale CONFIGURE note
+if query "Handpick architectures to emulate (y/n)?" n; then
+ BACKTITLE="Qemu Archs Configuration" &&
+ TITLE="Arch Selection" &&
+ HELP="Select Arch you want to build qemu" &&
+
+ KVM_ARCHS=`dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --checklist "$HELP" \
+ 0 0 0 \
+ $KVM_ARCH_LIST`
+fi &&
+
+if [[ -z $KVM_ARCHS ]]; then
+ KVM_ARCHS=$(cut -f 1 $SPELL_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
+fi
+
. $GRIMOIRE/config_query_multi.function &&

config_query_multi KVM_DRV "Enable which sound system(s)?" \
oss alsa sdl esd pa fmod &&

config_query_multi KVM_CARD "Enable which sound card(s) emulation?" \
- ac97 es1370 sb16 cs4231a adlib gus &&
+ ac97 es1370 sb16 cs4231a adlib gus &&

-config_query_option KVM_ACCEL "Build kernel module?" y \
- "" "--disable-kvm"
+config_query KVM_DIAGTOOLS "Build KVM diagnostic/debug tools?" n
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index 9b17f61..f16a1b6 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,7 +1,7 @@
SPELL=kvm
- VERSION=88
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+ VERSION=0.12.5
+ SOURCE=qemu-${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qemu-${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
#
SOURCE_HASH=sha512:25cf2bd1c4ad1c1c01d6202ab61fbe2cc5ab48cb43e1bb7e04c47d1840f564cba613f6653ea7b517ddb86489796718bbf3b6587316e1f267bbb63bcd7307003e
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index 3eadb8d..a6576b3 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,19 @@
+2010-08-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Update to stable qemu-kvm branch, follows qemu with kvm
modifications
+ * CONFIGURE: Query if KVM diagnostic/debug tools should be built
+ Query for what user/softmmu architectures to build (just like qemu)
+ * PRE_BUILD: No longer apply bug2823323.patch
+ kvm_stat (from KVM_DIAGTOOLS) requires CONFIG_DEBUG_FS
+ * BUILD: Build KVM diagnostic/debug tools if requested
+ Build selected user/softmmu architectures
+ * INSTALL: Link qemu-system-x86_64 to qemu-kvm (which libvirt looks
for to
+ find if kvm is supported)
+ Install KVM diagnostic/debug tools if requested
+ * TRIGGERS: No kernel module built, remove trigger on linux cast
+ * PROVIDES: Now provides QEMU functionality (plus kvm bonus)
+ * bug2823323.patch: Applied upstream, removed
+ * archs: Add architectures from qemu package (which kvm now includes,
too)
+
2009-11-20 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Disabling KVM acceleration is now --disable-kvm
* DEPENDS: Does not know --disable-alsa
diff --git a/kernels/kvm/INSTALL b/kernels/kvm/INSTALL
index 8d95f40..f997929 100755
--- a/kernels/kvm/INSTALL
+++ b/kernels/kvm/INSTALL
@@ -1,16 +1,10 @@
-# install kernel modules
-local
kinstalldir="${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/kernel/drivers/kvm"
-mkdir -p "$kinstalldir" &&
+make install DESTDIR=${INSTALL_ROOT} &&
+ln -f $INSTALL_ROOT/usr/bin/qemu-system-x86_64 \
+ $INSTALL_ROOT/usr/bin/qemu-kvm &&

-case $(uname -m) in
- i*86) local KVM_ARCH=x86;;
- x86_64) local KVM_ARCH=x86;;
- ia64) local KVM_ARCH=ia64;;
-esac &&
-
-for kmod in kvm/kernel/$KVM_ARCH/*.ko; do
- install -v -o root -g root -m 644 $kmod $kinstalldir
-done &&
-
-depmod -a $(get_kernel_version) &&
-make install DESTDIR=${INSTALL_ROOT}
+if [[ "$KVM_DIAGTOOLS" == "y" ]]; then
+ message "${MESSAGE_COLOR}Installing KVM diagnostic/debugging
tools...${DEFAULT_COLOR}" &&
+ install -m 0755 kvm/user/kvmtrace $INSTALL_ROOT/usr/bin/kvmtrace &&
+ install -m 0755 kvm/user/kvmtrace_format
$INSTALL_ROOT/usr/bin/kvmtrace_format &&
+ install -m 0755 kvm/kvm_stat $INSTALL_ROOT/usr/bin/kvm_stat
+fi
diff --git a/kernels/kvm/PRE_BUILD b/kernels/kvm/PRE_BUILD
index 39d5c9d..1bd367d 100755
--- a/kernels/kvm/PRE_BUILD
+++ b/kernels/kvm/PRE_BUILD
@@ -1,3 +1,15 @@
-default_pre_build &&
-patch $SOURCE_DIRECTORY/kvm/kernel/external-module-compat-comm.h \
- $SCRIPT_DIRECTORY/bug2823323.patch
+#
+# kvm_stat requires CONFIG_DEBUG_FS
+#
+if [[ "$KVM_DIAGTOOLS" == "y" ]]; then
+ message "${MESSAGE_COLOR}Checking for CONFIG_DEBUG_FS in your
kernel...${DEFAULT_COLOR}" &&
+ local _KVM_DEBUG_FS=$(get_kernel_config CONFIG_DEBUG_FS) &&
+
+ if [[ "$_KVM_DEBUG_FS" != "y" ]]; then
+ message "${PROBLEM_COLOR}You don't have CONFIG_DEBUG_FS" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ return 1
+ fi
+fi &&
+default_pre_build
diff --git a/kernels/kvm/PROVIDES b/kernels/kvm/PROVIDES
new file mode 100755
index 0000000..a0b105b
--- /dev/null
+++ b/kernels/kvm/PROVIDES
@@ -0,0 +1 @@
+provides QEMU
diff --git a/kernels/kvm/TRIGGERS b/kernels/kvm/TRIGGERS
deleted file mode 100755
index bb1c400..0000000
--- a/kernels/kvm/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast linux cast_self
diff --git a/kernels/kvm/archs b/kernels/kvm/archs
new file mode 100644
index 0000000..4d0eb1f
--- /dev/null
+++ b/kernels/kvm/archs
@@ -0,0 +1,32 @@
+alpha-linux-user alpha on
+i386-linux-user i386 on
+arm-linux-user arm on
+armeb-linux-user armeb on
+cris-linux-user cris on
+m68k-linux-user m68k on
+mips-linux-user mips on
+mipsel-linux-user mipsel on
+ppc-linux-user ppc on
+ppc64-linux-user ppc64 on
+ppc64abi32-linux-user ppc64abi32 on
+sparc-linux-user sparc on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sh4-linux-user sh4 on
+sh4eb-linux-user sh4eb on
+x86_64-linux-user x86_64 on
+i386-softmmu i386-sofmmu on
+ppc-softmmu ppc-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc64-softmmu ppc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
+mips-softmmu mips-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips64-softmmu mips64-softmmu on
+mips64el-softmmu mips64el-softmmu on
+arm-softmmu arm-softmmu on
+m68k-softmmu m68k-softmmu on
+cris-softmmu cris-softmmu on
+sh4-softmmu sh4-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
diff --git a/kernels/kvm/bug2823323.patch b/kernels/kvm/bug2823323.patch
deleted file mode 100644
index 026d5cc..0000000
--- a/kernels/kvm/bug2823323.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Patch from http://patchwork.kernel.org/patch/36141/ fixes
-#
http://sourceforge.net/tracker/?func=detail&atid=893831&aid=2823323&group_id=180599
-#
-diff -Nur kvm-88.orig/kvm/kernel/external-module-compat-comm.h
kvm-88/kvm/kernel/external-module-compat-comm.h
---- kvm-88.orig/kvm/kernel/external-module-compat-comm.h 2009-07-17
20:47:08.000000000 -0300
-+++ kvm-88/kvm/kernel/external-module-compat-comm.h 2009-07-17
20:55:21.000000000 -0300
-@@ -845,7 +845,7 @@
-
- #include <linux/tracepoint.h>
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
-
- struct tracepoint;
-
diff --git a/kernels/kvm/kvm-88.tar.gz.sig b/kernels/kvm/kvm-88.tar.gz.sig
deleted file mode 100644
index 7081ec2..0000000
Binary files a/kernels/kvm/kvm-88.tar.gz.sig and /dev/null differ
diff --git a/kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig
b/kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig
new file mode 100644
index 0000000..63d0a1b
Binary files /dev/null and b/kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig differ
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index da507a7..876825f 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -81,5 +81,6 @@ optional_depends 'libnl' \
suggest_depends nc '' '' 'for remote SSH tunneling' &&
suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' &&
suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces' &&
-suggest_depends 'dnsmasq' '' '' 'for providing DHCP on virtual networks'
+suggest_depends 'dnsmasq' '' '' 'for providing DHCP on virtual networks' &&
+suggest_depends QEMU '' '' "for QEMU (use
${SPELL_COLOR}kvm${DEFAULT_COLOR} for QEMU/KVM) binaries?"

diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 0a59318..455f46c 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,7 @@
+2010-08-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest dependency on any provider of QEMU to actually run
the
+ QEMU VMs
+
2010-07-10 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.8.2
* DEPENDS: Optionally depends on libnl
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index fa06d93..467f69f 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2010-08-03 Eric Sandall <sandalle AT sourcemage.org>
+ * PROVIDES: qemu and kvm now provide QEMU functionality
+
2010-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.12.5

diff --git a/utils/qemu/PROVIDES b/utils/qemu/PROVIDES
new file mode 100755
index 0000000..a0b105b
--- /dev/null
+++ b/utils/qemu/PROVIDES
@@ -0,0 +1 @@
+provides QEMU

[SM-Commit] GIT changes to master grimoire by Eric Sandall (2161c0bd0b423136871e9bb837c07e15f515704f), Eric Sandall, 08/04/2010