deepblue/Proxmox-Port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loong64 bump to pve6

Browse Source
This commit is contained in:
jiangcuo
2023-07-21 17:13:18 +08:00
parent ae6e05fb7b
commit 7bf203198a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Patchs/QemuServer/QemuServer.patch
View File

@@ -34,7 +34,7 @@
my $usbbus; my $usbbus;
- if ($q35 || $arch eq 'aarch64') { - if ($q35 || $arch eq 'aarch64') {
- $usbbus = 'ehci'; - $usbbus = 'ehci';
+ if ($q35 || $arch eq 'aarch64' || $arch eq 'riscv64' || $arch eq 'loongarch64') { + if ($q35 || $arch ne 'x86_64') {
+ $usbbus = 'qemu-xhci'; + $usbbus = 'qemu-xhci';
} else { } else {
$usbbus = 'uhci'; $usbbus = 'uhci';
@@ -233,7 +233,7 @@ diff -ur a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm
my $cputype = $kvm ? "kvm64" : "qemu64"; my $cputype = $kvm ? "kvm64" : "qemu64";
if ($arch eq 'aarch64') { if ($arch eq 'aarch64') {
- $cputype = 'cortex-a57'; - $cputype = 'cortex-a57';
+ $cputype = 'cortex-a57'; + $cputype = 'host';
+ } elsif ($arch eq 'riscv64') { + } elsif ($arch eq 'riscv64') {
+ $cputype = 'rv64'; + $cputype = 'rv64';
+ } elsif ($arch eq 'loongarch64'){ + } elsif ($arch eq 'loongarch64'){
@@ -278,7 +278,7 @@ diff -ur a/PVE/QemuServer/USB.pm b/PVE/QemuServer/USB.pm
- push @$devices, '-device', "usb-ehci,id=ehci$pciaddr"; - push @$devices, '-device', "usb-ehci,id=ehci$pciaddr";
+ if ($arch ne 'x86_64') { + if ($arch ne 'x86_64') {
+ $pciaddr = print_pci_addr('qemu-xhci', $bridges, $arch, $machine); + $pciaddr = print_pci_addr('qemu-xhci', $bridges, $arch, $machine);
+ push @$devices, '-device', "qemu-xhci,id=qemu-xchi"; + push @$devices, '-device', "qemu-xhci,id=qemu-xhci";
} elsif (!$is_q35) { } elsif (!$is_q35) {
$pciaddr = print_pci_addr("piix3", $bridges, $arch, $machine); $pciaddr = print_pci_addr("piix3", $bridges, $arch, $machine);
push @$devices, '-device', "piix3-usb-uhci,id=uhci$pciaddr.0x2"; push @$devices, '-device', "piix3-usb-uhci,id=uhci$pciaddr.0x2";

10
README.md
View File

@@ -4,6 +4,10 @@ I plan to port Proxmox VE and Proxmox Backup Server to any architecture.
By now, arm64 is finished. https://github.com/jiangcuo/Proxmox-Arm64 By now, arm64 is finished. https://github.com/jiangcuo/Proxmox-Arm64
# Progress
* pve6 base on debian sid -> done
# Current difficulties # Current difficulties
Proxmox VE 7 and Proxmox Backup Server use rust. Proxmox VE 7 and Proxmox Backup Server use rust.
@@ -13,7 +17,11 @@ Some crates and pkg don't work on riscv and loongarch64 yet,cause I can't build
such as: such as:
- Ring: - Ring:
https://github.com/briansmith/ring/pull/1436 - https://github.com/briansmith/ring/pull/1436 //riscv
- https://github.com/zhaixiaojuan/ring.git //loong64
- https://github.com/briansmith/webpki/issues/253
- Criu: - Criu:
https://github.com/checkpoint-restore/criu/issues/1702 https://github.com/checkpoint-restore/criu/issues/1702