Skip to content

Commit ff785a0

Browse files
jiangcuojiangcuo
committed
bump qemu-server to 8.3.3+port
1 parent a881a8f commit ff785a0

9 files changed

Lines changed: 162 additions & 5 deletions

‎packages/qemu-server/autobuild.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,5 @@ echo "This is $PKGNAME build scripts"
66

77
. ../common.sh
88

9-
apt update
10-
apt install libglib2.0-dev libjson-c-dev libtest-mockmodule-perl pve-doc-generator pve-edk2-firmware -y
11-
sed -i "s/-b /& -d /" $SCRIPT_DIR/$PKGNAME/Makefile
12-
139
cd $SCRIPT_DIR/$PKGNAME
1410
exec_build_make

‎packages/qemu-server/patches/002-add-port-changelog.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/debian/changelog b/debian/changelog
2+
index 1439b7f3..0b93b9e8 100644
3+
--- a/debian/changelog
4+
+++ b/debian/changelog
5+
@@ -27,6 +27,24 @@ qemu-server (8.3.1) bookworm; urgency=medium
6+
7+
-- Proxmox Support Team <support@proxmox.com> Thu, 05 Dec 2024 12:38:12 +0100
8+
9+
+qemu-server (8.3.0+port3) bookworm; urgency=medium
10+
+
11+
+ * Add loongarch efi_vars support
12+
+
13+
+ -- Jiangcuo <jiangcuo@lierfang.com> Wed, 11 Dec 2024 13:44:37 +0800
14+
+
15+
+qemu-server (8.3.0+port2) bookworm; urgency=medium
16+
+
17+
+ * Fix usb hotplug error
18+
+
19+
+ -- Jiangcuo <jiangcuo@bingsin.com> Mon, 09 Dec 2024 16:30:48 +0800
20+
+
21+
+qemu-server (8.3.0+port1) bookworm; urgency=medium
22+
+
23+
+ * Fix cpu type on loongarch64
24+
+
25+
+ -- Jiangcuo <jiangcuo@bingsin.com> Thu, 05 Dec 2024 14:16:44 +0800
26+
+
27+
qemu-server (8.3.0) bookworm; urgency=medium
28+
29+
* api: import working storage: improve error message

‎packages/qemu-server/patches/005-bump-version-to-8.3.2.patch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/debian/changelog b/debian/changelog
2+
index 0b93b9e8..dbb548be 100644
3+
--- a/debian/changelog
4+
+++ b/debian/changelog
5+
@@ -18,6 +18,14 @@ qemu-server (8.3.2) bookworm; urgency=medium
6+
7+
-- Proxmox Support Team <support@proxmox.com> Mon, 09 Dec 2024 10:08:14 +0100
8+
9+
+qemu-server (8.3.1+port) bookworm; urgency=medium
10+
+
11+
+ * Set default bios type to ovmf when vm create
12+
+
13+
+ * Add Kunpeng920 cpu model.
14+
+
15+
+ -- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 11:22:33 +0800
16+
+
17+
qemu-server (8.3.1) bookworm; urgency=medium
18+
19+
* api: clone vm: make error for unsupported volumes appear in a

‎packages/qemu-server/patches/006-bump-qemu-server-to-8.3.2+port.patch‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/debian/changelog b/debian/changelog
2+
index dbb548be..afdaaa98 100644
3+
--- a/debian/changelog
4+
+++ b/debian/changelog
5+
@@ -12,6 +12,12 @@ qemu-server (8.3.3) bookworm; urgency=medium
6+
7+
-- Proxmox Support Team <support@proxmox.com> Sun, 15 Dec 2024 14:26:32 +0100
8+
9+
+qemu-server (8.3.2+port) bookworm; urgency=medium
10+
+
11+
+ * Add port verison
12+
+
13+
+ -- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 11:28:33 +0800
14+
+
15+
qemu-server (8.3.2) bookworm; urgency=medium
16+
17+
* use image format from storage layer for PVE-managed volumes

‎packages/qemu-server/patches/007-bump-version-to-8.3.3+port.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/debian/changelog b/debian/changelog
2+
index afdaaa98..87012a2a 100644
3+
--- a/debian/changelog
4+
+++ b/debian/changelog
5+
@@ -1,3 +1,9 @@
6+
+qemu-server (8.3.3+port) bookworm; urgency=medium
7+
+
8+
+ * Add port version
9+
+
10+
+ -- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 12:13:33 +0800
11+
+
12+
qemu-server (8.3.3) bookworm; urgency=medium
13+
14+
* fix #5980: import disk: fix spurious warning if no target disk is defined
15+
@@ -14,7 +20,7 @@ qemu-server (8.3.3) bookworm; urgency=medium
16+
17+
qemu-server (8.3.2+port) bookworm; urgency=medium
18+
19+
- * Add port verison
20+
+ * Add port version
21+
22+
-- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 11:28:33 +0800
23+

‎packages/qemu-server/patches/009-add-gicversion-param.patch‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
2+
index e1dc3e7e..d21fb6ed 100644
3+
--- a/PVE/API2/Qemu.pm
4+
+++ b/PVE/API2/Qemu.pm
5+
@@ -684,6 +684,7 @@ my $generaloptions = {
6+
'name' => 1,
7+
'onboot' => 1,
8+
'ostype' => 1,
9+
+ 'gicversion' =>1,
10+
'protection' => 1,
11+
'reboot' => 1,
12+
'startdate' => 1,
13+
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
14+
index 6f0d41fc..d351dfbc 100644
15+
--- a/PVE/QemuServer.pm
16+
+++ b/PVE/QemuServer.pm
17+
@@ -420,6 +420,12 @@ my $confdesc = {
18+
type => 'string',
19+
description => "Memory properties.",
20+
format => $PVE::QemuServer::Memory::memory_fmt
21+
+ },
22+
+ gicversion => {
23+
+ optional => 1,
24+
+ type => 'string',
25+
+ description => "Set virt gic-version",
26+
+ enum => [qw(host 2 3 4 max)],
27+
},
28+
'amd-sev' => {
29+
description => "Secure Encrypted Virtualization (SEV) features by AMD CPUs",
30+
@@ -4279,14 +4285,17 @@ sub config_to_command {
31+
my $machine_type_min = $machine_type;
32+
$machine_type_min =~ s/\+pve\d+$//;
33+
$machine_type_min .= "+pve$required_pve_version";
34+
+
35+
+
36+
+ my $gicv = $kvm ? 'host' : 'max';
37+
+ if ( $conf->{gicversion} ) {
38+
+ $gicv = $conf->{gicversion};
39+
+ }
40+
+
41+
if ($arch eq 'aarch64'){
42+
- if (!$kvm){
43+
- push @$machineFlags, "type=${machine_type_min}";
44+
- }else{
45+
- push @$machineFlags, "type=${machine_type_min},gic-version=host";
46+
- }
47+
+ push @$machineFlags, "type=${machine_type_min},gic-version=${gicv}";
48+
}else{
49+
- push @$machineFlags, "type=${machine_type_min}";
50+
+ push @$machineFlags, "type=${machine_type_min}";
51+
}
52+
53+
# This method is prevented from being executed on the Port branch.

‎packages/qemu-server/patches/010-bump-version-to-8.3.3+port2.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/debian/changelog b/debian/changelog
2+
index 87012a2a..caf93620 100644
3+
--- a/debian/changelog
4+
+++ b/debian/changelog
5+
@@ -1,3 +1,9 @@
6+
+qemu-server (8.3.3+port2) bookworm; urgency=medium
7+
+
8+
+ * Add 'gicversion' param.
9+
+
10+
+ -- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 12:28:33 +0800
11+
+
12+
qemu-server (8.3.3+port) bookworm; urgency=medium
13+
14+
* Add port version

‎packages/qemu-server/qemu-server‎

Submodule qemu-server updated from 0f8d3e0 to 6b2091d

‎packages/qemu-server/series‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
patches/001-init-for-port.patch
2+
patches/002-add-port-changelog.patch
23
patches/003-set-default-bios-to-ovmf-when-vm-create.diff
34
patches/004-add-Kunpeng-920-cpu-model.patch
5+
patches/005-bump-version-to-8.3.2.patch
6+
patches/006-bump-qemu-server-to-8.3.2+port.patch
7+
patches/007-bump-version-to-8.3.3+port.patch
8+
patches/009-add-gicversion-param.patch
9+
patches/010-bump-version-to-8.3.3+port2.patch

0 commit comments

Comments
 (0)