Add support for arm emulation if qemu-system-arm is present

* src/qemu_conf.c: patch from C.J. Adams-Collier adding support
  for arm emulation if qemu-system-arm is present
daniel

diff --git a/ChangeLog b/ChangeLog
index cb1715426b26f0b772aba4cca2216706cbcc8d36..6a3d14e3804dd1dcd8e3838824f85356214a31d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul  3 15:08:24 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/qemu_conf.c: patch from C.J. Adams-Collier adding support
+         for arm emulation if qemu-system-arm is present
+
 Thu Jul  3 11:27:14 GMT 2009 Mark McLoughlin <markmc@redhat.com>
 
        Patch from Cole Robinson in https://bugzilla.redhat.com/499569

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 83992a3960497a9767b87698ac911b75ac67b0ee..9ca60b97bdf9d3c062ed340323f5d0d44fbee3af 100644 (file)
--- 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,