[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.6.4-1-2-ga161c5f

[Guido Günther]

The following commit has been merged in the master branch:
commit a161c5f669fadfebac44e761a31e2a4b1b4f7c04
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Fri Jul 3 19:14:15 2009 +0200

    allow to qemu to emulate arm

diff --git a/debian/patches/0005-allow-to-qemu-to-emulate-arm.patch b/debian/patches/0005-allow-to-qemu-to-emulate-arm.patch
new file mode 100644
index 0000000..6f8db74
--- /dev/null
+++ b/debian/patches/0005-allow-to-qemu-to-emulate-arm.patch
@@ -0,0 +1,35 @@
+From: C.J. Adams-Collier <cjac at colliertech.org>
+Date: Fri, 3 Jul 2009 19:12:55 +0200
+Subject: [PATCH] allow to qemu to emulate arm
+
+---
+ src/qemu_conf.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index d54f2ca..15f9795 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -186,6 +186,12 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
+ static const char *const arch_info_hvm_x86_machines[] = {
+     "pc", "isapc"
+ };
++static const char *const arch_info_hvm_arm_machines[] = {
++  "versatilepb","integratorcp","versatileab","realview",
++  "akita","spitz","borzoi","terrier","sx1-v1","sx1",
++  "cheetah","n800","n810","lm3s811evb","lm3s6965evb",
++  "connex","verdex","mainstone","musicpal","tosa",
++};
+ static const char *const arch_info_hvm_mips_machines[] = {
+     "mips"
+ };
+@@ -236,6 +242,8 @@ static const struct qemu_arch_info const arch_info_hvm[] = {
+        "/usr/bin/qemu", "/usr/bin/qemu-system-x86_64", arch_info_i686_flags, 4 },
+     {  "x86_64", 64, arch_info_hvm_x86_machines, 2,
+        "/usr/bin/qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 },
++    {  "arm", 32, arch_info_hvm_arm_machines, 20,
++       "/usr/bin/qemu-system-arm", NULL, NULL, 0 },
+     {  "mips", 32, arch_info_hvm_mips_machines, 1,
+        "/usr/bin/qemu-system-mips", NULL, NULL, 0 },
+     {  "mipsel", 32, arch_info_hvm_mips_machines, 1,
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a8c0f9e..5396c6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
+0005-allow-to-qemu-to-emulate-arm.patch

-- 
Libvirt Debian packaging