<div dir="ltr">Hi Dann,<div>there is currently some apparmor upstreaming going on [1].</div><div>You'd want to add a similar line for your new paths as well I think.</div><div><br></div><div>[1]: <a href="https://www.redhat.com/archives/libvir-list/2017-May/msg00474.html">https://www.redhat.com/archives/libvir-list/2017-May/msg00474.html</a><br></div><div><br></div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jun 7, 2017 at 12:06 PM, dann frazier <span dir="ltr"><<a href="mailto:dann.frazier@canonical.com" target="_blank">dann.frazier@canonical.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Add a path for UEFI VMs for AArch32 VMs. This is the path Debian is currently<br>
using in experimental. libvirt is the de facto canonical location for<br>
where distros should place these firmware images, so let's define this path<br>
here to try and minimize distro fragmentation.<br>
---<br>
src/qemu/qemu_conf.c | 12 ++++++++----<br>
1 file changed, 8 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c<br>
index 73c33d6788..c1bd91935b 100644<br>
--- a/src/qemu/qemu_conf.c<br>
+++ b/src/qemu/qemu_conf.c<br>
@@ -130,6 +130,8 @@ void qemuDomainCmdlineDefFree(<wbr>qemuDomainCmdlineDefPtr def)<br>
#define VIR_QEMU_OVMF_SEC_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd"<br>
#define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.<wbr>fd"<br>
#define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.<wbr>fd"<br>
+#define VIR_QEMU_AAVMF32_LOADER_PATH "/usr/share/AAVMF/AAVMF32_<wbr>CODE.fd"<br>
+#define VIR_QEMU_AAVMF32_NVRAM_PATH "/usr/share/AAVMF/AAVMF32_<wbr>VARS.fd"<br>
<br>
virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)<br>
{<br>
@@ -334,11 +336,11 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)<br>
goto error;<br>
<br>
#else<br>
- if (VIR_ALLOC_N(cfg->firmwares, 3) < 0)<br>
+ if (VIR_ALLOC_N(cfg->firmwares, 4) < 0)<br>
goto error;<br>
- cfg->nfirmwares = 3;<br>
+ cfg->nfirmwares = 4;<br>
if (VIR_ALLOC(cfg->firmwares[0]) < 0 || VIR_ALLOC(cfg->firmwares[1]) < 0 ||<br>
- VIR_ALLOC(cfg->firmwares[2]) < 0)<br>
+ VIR_ALLOC(cfg->firmwares[2]) < 0 || VIR_ALLOC(cfg->firmwares[3]) < 0)<br>
goto error;<br>
<br>
if (VIR_STRDUP(cfg->firmwares[0]-<wbr>>name, VIR_QEMU_AAVMF_LOADER_PATH) < 0 ||<br>
@@ -346,7 +348,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)<br>
VIR_STRDUP(cfg->firmwares[1]-><wbr>name, VIR_QEMU_OVMF_LOADER_PATH) < 0 ||<br>
VIR_STRDUP(cfg->firmwares[1]-><wbr>nvram, VIR_QEMU_OVMF_NVRAM_PATH) < 0 ||<br>
VIR_STRDUP(cfg->firmwares[2]-><wbr>name, VIR_QEMU_OVMF_SEC_LOADER_PATH) < 0 ||<br>
- VIR_STRDUP(cfg->firmwares[2]-><wbr>nvram, VIR_QEMU_OVMF_SEC_NVRAM_PATH) < 0)<br>
+ VIR_STRDUP(cfg->firmwares[2]-><wbr>nvram, VIR_QEMU_OVMF_SEC_NVRAM_PATH) < 0 ||<br>
+ VIR_STRDUP(cfg->firmwares[3]-><wbr>name, VIR_QEMU_AAVMF32_LOADER_PATH) < 0 ||<br>
+ VIR_STRDUP(cfg->firmwares[3]-><wbr>nvram, VIR_QEMU_AAVMF32_NVRAM_PATH) < 0)<br>
goto error;<br>
#endif<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.11.0<br>
<br>
--<br>
libvir-list mailing list<br>
<a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/<wbr>mailman/listinfo/libvir-list</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><span style="color:rgb(136,136,136);font-size:12.8px">Christian Ehrhardt</span><div style="color:rgb(136,136,136);font-size:12.8px">Software Engineer, Ubuntu Server</div><div style="color:rgb(136,136,136);font-size:12.8px">Canonical Ltd</div></div></div></div></div>
</div>