From: Filip Schauer <f.schauer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 1/5] cpu config: add helper to get the default CPU type
Date: Wed, 21 Feb 2024 15:33:13 +0100 [thread overview]
Message-ID: <20240221143317.134090-3-f.schauer@proxmox.com> (raw)
In-Reply-To: <20240221143317.134090-1-f.schauer@proxmox.com>
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
PVE/QemuServer/CPUConfig.pm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm
index ca2946b..4be5262 100644
--- a/PVE/QemuServer/CPUConfig.pm
+++ b/PVE/QemuServer/CPUConfig.pm
@@ -405,7 +405,7 @@ sub print_cpu_device {
my ($conf, $id) = @_;
my $kvm = $conf->{kvm} // 1;
- my $cpu = $kvm ? "kvm64" : "qemu64";
+ my $cpu = get_default_cpu_type('x86_64', $kvm);
if (my $cputype = $conf->{cpu}) {
my $cpuconf = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cputype)
or die "Cannot parse cpu description: $cputype\n";
@@ -515,10 +515,7 @@ sub parse_cpuflag_list {
sub get_cpu_options {
my ($conf, $arch, $kvm, $kvm_off, $machine_version, $winversion, $gpu_passthrough) = @_;
- my $cputype = $kvm ? "kvm64" : "qemu64";
- if ($arch eq 'aarch64') {
- $cputype = 'cortex-a57';
- }
+ my $cputype = get_default_cpu_type($arch, $kvm);
my $cpu = {};
my $custom_cpu;
@@ -719,6 +716,15 @@ sub get_cpu_from_running_vm {
return $1;
}
+sub get_default_cpu_type {
+ my ($arch, $kvm) = @_;
+
+ my $cputype = $kvm ? 'kvm64' : 'qemu64';
+ $cputype = 'cortex-a57' if $arch eq 'aarch64';
+
+ return $cputype;
+}
+
__PACKAGE__->register();
__PACKAGE__->init();
--
2.39.2
next prev parent reply other threads:[~2024-02-21 14:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 14:33 [pve-devel] [PATCH-SERIES v8 qemu-server, common] Prevent starting a 32-bit VM using a 64-bit OVMF BIOS Filip Schauer
2024-02-21 14:33 ` [pve-devel] [PATCH common 1/1] tools: add is_native_arch to compare the CPU architecture Filip Schauer
2024-02-21 14:33 ` Filip Schauer [this message]
2024-02-21 14:33 ` [pve-devel] [PATCH qemu-server 2/5] prevent starting a 32-bit VM using a 64-bit OVMF BIOS Filip Schauer
2024-02-21 14:33 ` [pve-devel] [PATCH qemu-server 3/5] Move is_native from PVE::QemuServer to PVE::Tools Filip Schauer
2024-02-21 14:33 ` [pve-devel] [PATCH qemu-server 4/5] Unify the default value for 'kvm' Filip Schauer
2024-02-23 11:54 ` Filip Schauer
2024-02-21 14:33 ` [pve-devel] [PATCH qemu-server 5/5] cpu config: die on hotplug of non x86_64 CPUs Filip Schauer
2024-03-08 13:34 ` Thomas Lamprecht
2024-03-08 13:53 ` Fiona Ebner
2024-03-11 10:13 ` Filip Schauer
2024-03-08 13:34 ` [pve-devel] partially-applied-series: [PATCH-SERIES v8 qemu-server, common] Prevent starting a 32-bit VM using a 64-bit OVMF BIOS Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240221143317.134090-3-f.schauer@proxmox.com \
--to=f.schauer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox