rpms
/
oz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tell libvirt we are using qcow2 firmware on riscv64 

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-09-09 18:28:19 +03:00
parent e76ba181b6
commit 54063bad48
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oz-add-riscv64.patch
View File

@ -1,5 +1,5 @@
diff --git a/oz/Guest.py b/oz/Guest.py
index 9cc80a6..9c5dc1d 100644
index 9cc80a6..7c9c22f 100644
--- a/oz/Guest.py
+++ b/oz/Guest.py
@@ -135,7 +135,7 @@ class Guest(object):
@ -29,16 +29,18 @@ index 9cc80a6..9c5dc1d 100644
mods = {'arch': self.tdl.arch, 'machine': 'virt'}
oz.ozutil.lxml_subelement(osNode, "type", "hvm", mods)
if bootdev:
@@ -497,7 +497,7 @@ class Guest(object):
oz.ozutil.lxml_subelement(osNode, "initrd", initrd)
if cmdline:
oz.ozutil.lxml_subelement(osNode, "cmdline", cmdline)
- if self.tdl.arch in ["aarch64", "armv7l"]:
+ if self.tdl.arch in ["aarch64", "armv7l", "riscv64"]:
@@ -501,6 +501,10 @@ class Guest(object):
loader, nvram = oz.ozutil.find_uefi_firmware(self.tdl.arch)
oz.ozutil.lxml_subelement(osNode, "loader", loader, {'readonly': 'yes', 'type': 'pflash'})
oz.ozutil.lxml_subelement(osNode, "nvram", None, {'template': nvram})
@@ -529,7 +529,7 @@ class Guest(object):
+ if self.tdl.arch in ["riscv64"]:
+ loader, nvram = oz.ozutil.find_uefi_firmware(self.tdl.arch)
+ oz.ozutil.lxml_subelement(osNode, "loader", loader, {'readonly': 'yes', 'type': 'pflash', 'format': 'qcow2'})
+ oz.ozutil.lxml_subelement(osNode, "nvram", None, {'template': nvram, 'format': 'qcow2'})
# x86_64 has legacy requirements so we check for defaults as well as for edk2
if self.tdl.arch in ["x86_64"] and self.config.useuefi == True:
loader, nvram = oz.ozutil.find_uefi_firmware(self.tdl.arch)
@@ -529,7 +533,7 @@ class Guest(object):
elif self.mousetype == "usb":
mousedict['type'] = 'tablet'
oz.ozutil.lxml_subelement(devices, "input", None, mousedict)

5
oz.spec
View File

@ -1,6 +1,6 @@
Name: oz
Version: 0.18.1
Release: 6.1.riscv64%{?dist}
Release: 6.2.riscv64%{?dist}
Summary: Library and utilities for automated guest OS installs
License: LGPLv2
URL: http://github.com/clalancette/oz
@ -95,6 +95,9 @@ fi
%{python3_sitelib}/%{name}*.egg-info
%changelog
* Sat Sep 09 2023 David Abdurachmanov <davidlt@rivosinc.com> - 0.18.1-6.2.riscv64
- Tell libvirt we are using qcow2 firmware on riscv64
* Sat Sep 09 2023 David Abdurachmanov <davidlt@rivosinc.com> - 0.18.1-6.1.riscv64
- Use UEFI/EDK2 firmware (qcow2) on riscv64 + QEMU setup