Skip to content

Commit 69b30fe

Browse files
jiangcuojiangcuo
committed
bump qemu-server to 8.3.7
1 parent 17229f1 commit 69b30fe

11 files changed

Lines changed: 204 additions & 25 deletions

packages/qemu-server/patches/001-remap-pcie-addr-on-port.patch renamed to packages/qemu-server/patches/0001-remap-pcie-addr-on-port.patch

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 3707d3177bee6b5f12a01766cbaeea6b6551b4ed Mon Sep 17 00:00:00 2001
1+
From d2c0ec81c00ca6d2a1062af2dfb43b8390e3bf6b Mon Sep 17 00:00:00 2001
22
From: jiangcuo <jiangcuo@bingsin.com>
33
Date: Mon, 3 Feb 2025 12:36:05 +0800
4-
Subject: [PATCH] remap pcie addr on port
4+
Subject: [PATCH 1/9] remap pcie addr on port
55

66
---
77
PVE/QemuServer/PCI.pm | 416 ++++++++++++++++++++++++++------------
@@ -607,3 +607,6 @@ index 00000000..2d13bc63
607607
+ addr = "1.0"
608608
+ chassis_nr = "1"
609609
+
610+
--
611+
2.39.5
612+

packages/qemu-server/patches/002-add-port-support.patch renamed to packages/qemu-server/patches/0002-add-port-support.patch

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
From d129754b2c456da7d53822024690ef19e10f3a35 Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 13:52:51 +0800
4+
Subject: [PATCH 2/9] add port support
5+
6+
---
7+
PVE/API2/Qemu.pm | 41 ++++++++-
8+
PVE/API2/Qemu/Machine.pm | 4 +-
9+
PVE/QemuServer.pm | 178 +++++++++++++++++++++++++++++-------
10+
PVE/QemuServer/CPUConfig.pm | 56 +++++++++---
11+
PVE/QemuServer/Helpers.pm | 2 +
12+
PVE/QemuServer/Machine.pm | 6 +-
13+
6 files changed, 234 insertions(+), 53 deletions(-)
14+
115
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
2-
index 45fe6ea6..877bcba8 100644
16+
index 295260e7..43a91b80 100644
317
--- a/PVE/API2/Qemu.pm
418
+++ b/PVE/API2/Qemu.pm
519
@@ -17,7 +17,7 @@ use PVE::CGroup;
@@ -17,26 +31,26 @@ index 45fe6ea6..877bcba8 100644
1731
use PVE::QemuServer::Cloudinit;
1832
-use PVE::QemuServer::CPUConfig;
1933
+use PVE::QemuServer::CPUConfig qw(get_default_cpu_type);
20-
use PVE::QemuServer::Drive qw(checked_parse_volname);
34+
use PVE::QemuServer::Drive qw(checked_volume_format checked_parse_volname);
2135
use PVE::QemuServer::Helpers;
2236
use PVE::QemuServer::ImportDisk;
23-
@@ -663,6 +663,7 @@ my $memoryoptions = {
37+
@@ -664,6 +664,7 @@ my $memoryoptions = {
2438

2539
my $hwtypeoptions = {
2640
'acpi' => 1,
2741
+ 'arch' => 1,
2842
'hotplug' => 1,
2943
'kvm' => 1,
3044
'machine' => 1,
31-
@@ -686,6 +687,7 @@ my $generaloptions = {
45+
@@ -687,6 +688,7 @@ my $generaloptions = {
3246
'name' => 1,
3347
'onboot' => 1,
3448
'ostype' => 1,
3549
+ 'gicversion' =>1,
3650
'protection' => 1,
3751
'reboot' => 1,
3852
'startdate' => 1,
39-
@@ -1238,10 +1240,43 @@ __PACKAGE__->register_method({
53+
@@ -1239,10 +1241,43 @@ __PACKAGE__->register_method({
4054
$conf->{smbios1} = PVE::QemuServer::generate_smbios1_uuid();
4155
}
4256

@@ -658,3 +672,6 @@ index f1acde8f..33ed1756 100644
658672
$machine ||= default_machine_for_arch($arch);
659673
my $pvever = get_pve_version($kvmversion);
660674
$machine .= "+pve$pvever";
675+
--
676+
2.39.5
677+

packages/qemu-server/patches/003-add-arch-when-qm-list.patch renamed to packages/qemu-server/patches/0003-add-arch-when-qm-list.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From aef90f1371569e58995a9bf2cde4d83a0dbc4d84 Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 13:53:52 +0800
4+
Subject: [PATCH 3/9] add arch when qm list
5+
6+
---
7+
PVE/CLI/qm.pm | 6 +++---
8+
1 file changed, 3 insertions(+), 3 deletions(-)
9+
110
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
211
index 4214a7ca..18ab3326 100755
312
--- a/PVE/CLI/qm.pm
@@ -17,3 +26,6 @@ index 4214a7ca..18ab3326 100755
1726
$rec->{qmpstatus} || $rec->{status},
1827
($rec->{maxmem} || 0)/(1024*1024),
1928
($rec->{maxdisk} || 0)/(1024*1024*1024),
29+
--
30+
2.39.5
31+

packages/qemu-server/patches/004-fix-query-machine-capabilities-on-port.patch renamed to packages/qemu-server/patches/0004-fix-query-machine-capabilities-on-port.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From dd7de9d78cb4d12f50a6481abd513f77375e5bcc Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 13:55:03 +0800
4+
Subject: [PATCH 4/9] fix query-machine-capabilities on port
5+
6+
---
7+
query-machine-capabilities/query-machine-capabilities.c | 9 +++++++++
8+
1 file changed, 9 insertions(+)
9+
110
diff --git a/query-machine-capabilities/query-machine-capabilities.c b/query-machine-capabilities/query-machine-capabilities.c
211
index 0c522afc..3c375770 100644
312
--- a/query-machine-capabilities/query-machine-capabilities.c
@@ -25,3 +34,6 @@ index 0c522afc..3c375770 100644
2534
}
2635

2736
int prepare_output_directory() {
37+
--
38+
2.39.5
39+

packages/qemu-server/patches/005-fix-test-for-port.patch renamed to packages/qemu-server/patches/0005-fix-test-for-port.patch

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,81 @@
1+
From 61c0acf3cd0248098333d231eb2f8e08db7f1821 Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 15:00:50 +0800
4+
Subject: [PATCH 5/9] fix test for port
5+
6+
---
7+
test/cfg2cmd/bootorder-empty.conf | 1 +
8+
test/cfg2cmd/bootorder-empty.conf.cmd | 2 +-
9+
test/cfg2cmd/bootorder-legacy.conf | 1 +
10+
test/cfg2cmd/bootorder-legacy.conf.cmd | 2 +-
11+
test/cfg2cmd/bootorder.conf | 1 +
12+
test/cfg2cmd/bootorder.conf.cmd | 2 +-
13+
test/cfg2cmd/cputype-icelake-client-deprecation.conf | 1 +
14+
test/cfg2cmd/custom-cpu-model-defaults.conf | 1 +
15+
test/cfg2cmd/custom-cpu-model-host-phys-bits.conf | 1 +
16+
test/cfg2cmd/custom-cpu-model.conf | 1 +
17+
test/cfg2cmd/efi-raw-old.conf | 1 +
18+
test/cfg2cmd/efi-raw-template.conf | 1 +
19+
test/cfg2cmd/efi-raw-template.conf.cmd | 2 +-
20+
test/cfg2cmd/efi-raw.conf | 1 +
21+
test/cfg2cmd/efi-raw.conf.cmd | 2 +-
22+
test/cfg2cmd/efi-secboot-and-tpm-q35.conf | 1 +
23+
test/cfg2cmd/efi-secboot-and-tpm.conf | 1 +
24+
test/cfg2cmd/efidisk-on-rbd.conf | 1 +
25+
test/cfg2cmd/efidisk-on-rbd.conf.cmd | 2 +-
26+
test/cfg2cmd/i440fx-viommu-intel.conf | 1 +
27+
test/cfg2cmd/i440fx-viommu-virtio.conf | 1 +
28+
test/cfg2cmd/i440fx-win10-hostpci.conf | 1 +
29+
test/cfg2cmd/ide.conf | 1 +
30+
test/cfg2cmd/memory-hotplug-hugepages.conf | 1 +
31+
test/cfg2cmd/memory-hotplug.conf | 1 +
32+
test/cfg2cmd/memory-hugepages-1g.conf | 1 +
33+
test/cfg2cmd/memory-hugepages-2m.conf | 1 +
34+
test/cfg2cmd/minimal-defaults-to-new-machine.conf | 1 +
35+
test/cfg2cmd/minimal-defaults-unsupported-pve-version.conf | 1 +
36+
test/cfg2cmd/minimal-defaults.conf | 1 +
37+
test/cfg2cmd/netdev-7.0-multiqueues.conf | 1 +
38+
test/cfg2cmd/netdev-7.1-multiqueues.conf | 1 +
39+
test/cfg2cmd/netdev-7.1.conf | 1 +
40+
test/cfg2cmd/netdev.conf | 1 +
41+
test/cfg2cmd/old-qemu.conf | 1 +
42+
test/cfg2cmd/ostype-usb13-error.conf | 1 +
43+
test/cfg2cmd/pinned-version-pxe-pve.conf | 1 +
44+
test/cfg2cmd/pinned-version-pxe.conf | 1 +
45+
test/cfg2cmd/pinned-version.conf | 1 +
46+
test/cfg2cmd/q35-ide.conf | 1 +
47+
test/cfg2cmd/q35-linux-hostpci-mapping.conf | 1 +
48+
test/cfg2cmd/q35-linux-hostpci-multifunction.conf | 1 +
49+
test/cfg2cmd/q35-linux-hostpci-template.conf | 1 +
50+
test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf | 1 +
51+
test/cfg2cmd/q35-linux-hostpci.conf | 1 +
52+
test/cfg2cmd/q35-simple-6.0.conf | 1 +
53+
test/cfg2cmd/q35-simple-7.0.conf | 1 +
54+
test/cfg2cmd/q35-simple-pinned-6.1.conf | 1 +
55+
test/cfg2cmd/q35-simple.conf | 1 +
56+
test/cfg2cmd/q35-usb13-error.conf | 1 +
57+
test/cfg2cmd/q35-usb2.conf | 1 +
58+
test/cfg2cmd/q35-usb3.conf | 1 +
59+
test/cfg2cmd/q35-viommu-intel.conf | 1 +
60+
test/cfg2cmd/q35-viommu-virtio.conf | 1 +
61+
test/cfg2cmd/q35-win10-hostpci.conf | 1 +
62+
test/cfg2cmd/qemu-xhci-7.1.conf | 1 +
63+
test/cfg2cmd/qemu-xhci-q35-7.1.conf | 1 +
64+
test/cfg2cmd/seabios_serial.conf | 1 +
65+
test/cfg2cmd/simple-balloon-free-page-reporting.conf | 1 +
66+
test/cfg2cmd/simple-btrfs.conf | 1 +
67+
test/cfg2cmd/simple-virtio-blk.conf | 1 +
68+
test/cfg2cmd/simple1-template.conf | 1 +
69+
test/cfg2cmd/simple1.conf | 1 +
70+
test/cfg2cmd/spice-enhancments.conf | 1 +
71+
test/cfg2cmd/spice-linux-4.1.conf | 1 +
72+
test/cfg2cmd/spice-usb3.conf | 1 +
73+
test/cfg2cmd/spice-win.conf | 1 +
74+
test/cfg2cmd/usb13-error.conf | 1 +
75+
test/cfg2cmd/vnc-clipboard-spice.conf | 1 +
76+
test/cfg2cmd/vnc-clipboard-std.conf | 1 +
77+
70 files changed, 70 insertions(+), 6 deletions(-)
78+
179
diff --git a/test/cfg2cmd/bootorder-empty.conf b/test/cfg2cmd/bootorder-empty.conf
280
index ccfadb9f..1cd6ee18 100644
381
--- a/test/cfg2cmd/bootorder-empty.conf
@@ -642,3 +720,6 @@ index 1474766b..97e67630 100644
642720
# TEST: Test for a VNC clipboard with a std display
643721
vga: std,clipboard=vnc
644722
+arch: x86_64
723+
--
724+
2.39.5
725+

packages/qemu-server/patches/006-remove-test-when-build.patch renamed to packages/qemu-server/patches/0006-remove-test-when-build.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From 18b7e4c640644b5426ac76313a735ffe98961b8f Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 15:05:22 +0800
4+
Subject: [PATCH 6/9] remove test when build
5+
6+
---
7+
Makefile | 1 -
8+
1 file changed, 1 deletion(-)
9+
110
diff --git a/Makefile b/Makefile
211
index ed67fe0a..a5cdd3e1 100644
312
--- a/Makefile
@@ -10,3 +19,6 @@ index ed67fe0a..a5cdd3e1 100644
1019

1120
.PHONY: upload
1221
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
22+
--
23+
2.39.5
24+

packages/qemu-server/patches/007-Adjust-some-code-so-that.patch renamed to packages/qemu-server/patches/0007-Adjust-some-code-so-that-it-can-pass-the-test-on-the.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
From 180c33f9c88bab26a0faea298f06c0c54cf6e652 Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 15:07:03 +0800
4+
Subject: [PATCH 7/9] Adjust some code so that it can pass the test on the
5+
x86_64 platform.
6+
7+
---
8+
PVE/QemuServer.pm | 27 +++---
9+
PVE/QemuServer/CPUConfig.pm | 19 ++--
10+
PVE/QemuServer/PCI.pm | 170 ++++++++++++++++++------------------
11+
3 files changed, 108 insertions(+), 108 deletions(-)
12+
113
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
214
index 56ecb1cd..d45db7a9 100644
315
--- a/PVE/QemuServer.pm
@@ -282,3 +294,6 @@ index 15c18691..c4efd943 100644
282294
'scsihw2' => { bus => 4, addr => 1 },
283295
'scsihw3' => { bus => 4, addr => 2 },
284296
'scsihw4' => { bus => 4, addr => 3 },
297+
--
298+
2.39.5
299+

packages/qemu-server/patches/008-change-xhci-to-pcie0.patch renamed to packages/qemu-server/patches/0008-change-xhci-to-pcie.0.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From 196109494d4f18ad4cafd55e4b01633381b978b0 Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 16:18:43 +0800
4+
Subject: [PATCH 8/9] change xhci to pcie.0
5+
6+
---
7+
PVE/QemuServer/PCI.pm | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
110
diff --git a/PVE/QemuServer/PCI.pm b/PVE/QemuServer/PCI.pm
211
index c4efd943..85e50eff 100644
312
--- a/PVE/QemuServer/PCI.pm
@@ -18,3 +27,6 @@ index c4efd943..85e50eff 100644
1827
# 'net0' => { bus => 1, addr => 3 }, This support net0 hotplug
1928
'net1' => { bus => 1, addr => 4 },
2029
'net2' => { bus => 1, addr => 5 },
30+
--
31+
2.39.5
32+

packages/qemu-server/patches/009-bump-version-to-8.3.6+port.patch renamed to packages/qemu-server/patches/0009-bump-version-to-8.3.6-port.patch

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1+
From 94c99b8c369887856767383105fe5f2a94e9a555 Mon Sep 17 00:00:00 2001
2+
From: jiangcuo <jiangcuo@bingsin.com>
3+
Date: Mon, 3 Feb 2025 16:20:25 +0800
4+
Subject: [PATCH 9/9] bump version to 8.3.6+port
5+
6+
---
7+
debian/changelog | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
8+
1 file changed, 88 insertions(+)
9+
110
diff --git a/debian/changelog b/debian/changelog
2-
index 7d440810..6ca7dd0f 100644
11+
index 90f24779..45c55312 100644
312
--- a/debian/changelog
413
+++ b/debian/changelog
5-
@@ -1,3 +1,11 @@
14+
@@ -7,6 +7,14 @@ qemu-server (8.3.7) bookworm; urgency=medium
15+
16+
-- Proxmox Support Team <support@proxmox.com> Tue, 04 Feb 2025 17:12:25 +0100
17+
618
+qemu-server (8.3.6+port) bookworm; urgency=medium
719
+
820
+ * Update to Port version
@@ -14,7 +26,7 @@ index 7d440810..6ca7dd0f 100644
1426
qemu-server (8.3.6) bookworm; urgency=medium
1527

1628
* api: do not set an empty machine option when pinning
17-
@@ -34,6 +42,24 @@ qemu-server (8.3.4) bookworm; urgency=medium
29+
@@ -43,6 +51,24 @@ qemu-server (8.3.4) bookworm; urgency=medium
1830

1931
-- Proxmox Support Team <support@proxmox.com> Fri, 17 Jan 2025 19:32:17 +0100
2032

@@ -39,7 +51,7 @@ index 7d440810..6ca7dd0f 100644
3951
qemu-server (8.3.3) bookworm; urgency=medium
4052

4153
* fix #5980: import disk: fix spurious warning if no target disk is defined
42-
@@ -48,12 +74,26 @@ qemu-server (8.3.3) bookworm; urgency=medium
54+
@@ -57,12 +83,26 @@ qemu-server (8.3.3) bookworm; urgency=medium
4355

4456
-- Proxmox Support Team <support@proxmox.com> Sun, 15 Dec 2024 14:26:32 +0100
4557

@@ -66,7 +78,7 @@ index 7d440810..6ca7dd0f 100644
6678
qemu-server (8.3.1) bookworm; urgency=medium
6779

6880
* api: clone vm: make error for unsupported volumes appear in a
69-
@@ -63,6 +103,24 @@ qemu-server (8.3.1) bookworm; urgency=medium
81+
@@ -72,6 +112,24 @@ qemu-server (8.3.1) bookworm; urgency=medium
7082

7183
-- Proxmox Support Team <support@proxmox.com> Thu, 05 Dec 2024 12:38:12 +0100
7284

@@ -91,7 +103,7 @@ index 7d440810..6ca7dd0f 100644
91103
qemu-server (8.3.0) bookworm; urgency=medium
92104

93105
* api: import working storage: improve error message
94-
@@ -260,6 +318,20 @@ qemu-server (8.1.2) bookworm; urgency=medium
106+
@@ -269,6 +327,20 @@ qemu-server (8.1.2) bookworm; urgency=medium
95107

96108
-- Proxmox Support Team <support@proxmox.com> Fri, 19 Apr 2024 16:09:18 +0200
97109

@@ -112,7 +124,7 @@ index 7d440810..6ca7dd0f 100644
112124
qemu-server (8.1.1) bookworm; urgency=medium
113125

114126
* config: pending network: avoid undef-warning on old/new comparison
115-
@@ -312,6 +384,12 @@ qemu-server (8.1.0) bookworm; urgency=medium
127+
@@ -321,6 +393,12 @@ qemu-server (8.1.0) bookworm; urgency=medium
116128

117129
-- Proxmox Support Team <support@proxmox.com> Fri, 08 Mar 2024 15:00:25 +0100
118130

@@ -125,7 +137,7 @@ index 7d440810..6ca7dd0f 100644
125137
qemu-server (8.0.10) bookworm; urgency=medium
126138

127139
* sdn: pass vmid and hostname to allow requesting a new mapping
128-
@@ -330,6 +408,16 @@ qemu-server (8.0.9) bookworm; urgency=medium
140+
@@ -339,6 +417,16 @@ qemu-server (8.0.9) bookworm; urgency=medium
129141

130142
-- Proxmox Support Team <support@proxmox.com> Tue, 21 Nov 2023 15:40:27 +0100
131143

@@ -142,3 +154,6 @@ index 7d440810..6ca7dd0f 100644
142154
qemu-server (8.0.8) bookworm; urgency=medium
143155

144156
* fix #2816: restore: remove timeout when allocating disks
157+
--
158+
2.39.5
159+

‎packages/qemu-server/qemu-server‎

Submodule qemu-server updated from 9ebec81 to 7a6c664

0 commit comments

Comments
 (0)