From a1092070d4dcd027a3bf95c157d816ee69e73c00 Mon Sep 17 00:00:00 2001
From: John Williams <john.williams@petalogix.com>
Date: Thu, 7 Jul 2011 12:45:05 +1000
Subject: [PATCH] microblaze: Add architecture support

Add libvirt support for MicroBlaze architecture as a QEMU target.  Based on mips/mipsel pattern.

Signed-off-by: John Williams <john.williams@petalogix.com>
---
 AUTHORS                                      |  1 +
 docs/drvqemu.html.in                         |  2 ++
 docs/schemas/capability.rng                  |  2 ++
 examples/apparmor/libvirt-qemu               |  4 ++++
 src/qemu/qemu_capabilities.c                 |  2 ++
 tests/capabilityschemadata/caps-qemu-kvm.xml | 24 ++++++++++++++++++++
 6 files changed, 35 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 2919249a54..e8d7e195f3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -181,6 +181,7 @@ Patches have also been contributed by:
   Ruben Kerkhof        <ruben@rubenkerkhof.com>
   Scott Moser          <smoser@ubuntu.com>
   Guannan Ren          <gren@redhat.com>
+  John Williams        <john.williams@petalogix.com>
 
   [....send patches to get your name here....]
 
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index 7230cae0bd..e0e44eb9e7 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -16,6 +16,8 @@
       <li>
         <strong>QEMU emulators</strong>: The driver will probe <code>/usr/bin</code>
         for the presence of <code>qemu</code>, <code>qemu-system-x86_64</code>,
+        <code>qemu-system-microblaze</code>,
+        <code>qemu-system-microblazeel</code>,
         <code>qemu-system-mips</code>,<code>qemu-system-mipsel</code>,
         <code>qemu-system-sparc</code>,<code>qemu-system-ppc</code>. The results
         of this can be seen from the capabilities XML output.
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index f894b0942c..99b4a9a7c9 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -325,6 +325,8 @@
       <value>arm</value>
       <value>i686</value>
       <value>ia64</value>
+      <value>microblaze</value>
+      <value>microblazeel</value>
       <value>mips</value>
       <value>mipsel</value>
       <value>ppc64</value>
diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
index faf86363c6..32515366c7 100644
--- a/examples/apparmor/libvirt-qemu
+++ b/examples/apparmor/libvirt-qemu
@@ -69,6 +69,8 @@
   /usr/bin/qemu-system-cris rmix,
   /usr/bin/qemu-system-i386 rmix,
   /usr/bin/qemu-system-m68k rmix,
+  /usr/bin/qemu-system-microblaze rmix,
+  /usr/bin/qemu-system-microblazeel rmix,
   /usr/bin/qemu-system-mips rmix,
   /usr/bin/qemu-system-mips64 rmix,
   /usr/bin/qemu-system-mips64el rmix,
@@ -87,6 +89,8 @@
   /usr/bin/qemu-cris rmix,
   /usr/bin/qemu-i386 rmix,
   /usr/bin/qemu-m68k rmix,
+  /usr/bin/qemu-microblaze rmix,
+  /usr/bin/qemu-microblazeel rmix,
   /usr/bin/qemu-mips rmix,
   /usr/bin/qemu-mipsel rmix,
   /usr/bin/qemu-ppc rmix,
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ad62a0773c..2c037ce64c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -160,6 +160,8 @@ static const struct qemu_arch_info const arch_info_hvm[] = {
     {  "x86_64", 64, NULL, "qemu-system-x86_64",
        NULL, arch_info_x86_64_flags, 2 },
     {  "arm",    32, NULL, "qemu-system-arm",    NULL, NULL, 0 },
+    {  "microblaze", 32, NULL, "qemu-system-microblaze",   NULL, NULL, 0 },
+    {  "microblazeel", 32, NULL, "qemu-system-microblazeel",   NULL, NULL, 0 },
     {  "mips",   32, NULL, "qemu-system-mips",   NULL, NULL, 0 },
     {  "mipsel", 32, NULL, "qemu-system-mipsel", NULL, NULL, 0 },
     {  "sparc",  32, NULL, "qemu-system-sparc",  NULL, NULL, 0 },
diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index 47accde9dd..dc6fb76d14 100644
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -111,6 +111,30 @@
     </arch>
   </guest>
 
+  <guest>
+    <os_type>hvm</os_type>
+    <arch name='microblaze'>
+      <wordsize>32</wordsize>
+      <emulator>/usr/bin/qemu-system-microblaze</emulator>
+      <machine>petalogix-s3adsp1800</machine>
+      <machine>microblaze-fdt</machine>
+      <domain type='qemu'>
+      </domain>
+    </arch>
+  </guest>
+
+  <guest>
+    <os_type>hvm</os_type>
+    <arch name='microblazeel'>
+      <wordsize>32</wordsize>
+      <emulator>/usr/bin/qemu-system-microblazeel</emulator>
+      <machine>petalogix-s3adsp1800</machine>
+      <machine>microblaze-fdt</machine>
+      <domain type='qemu'>
+      </domain>
+    </arch>
+  </guest>
+
   <guest>
     <os_type>hvm</os_type>
     <arch name='mips'>
-- 
GitLab