Add libvirt support for MicroBlaze architecture as a QEMU target. Based on mips/mipsel pattern. Signed-off-by: John Williams <john.williams@petalogix.com> --- 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 ++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 0 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 7230cae..e0e44eb 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 f894b09..99b4a9a 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 faf8636..3251536 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 ad62a07..2c037ce 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 47accde..dc6fb76 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -113,6 +113,30 @@ <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'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mips</emulator> -- 1.7.0.4