public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH manager v2 08/17] ui: qemu: make osdefaults architecture aware
Date: Tue,  3 Feb 2026 11:00:13 +0100	[thread overview]
Message-ID: <20260203102118.1430545-9-d.csapak@proxmox.com> (raw)
In-Reply-To: <20260203102118.1430545-1-d.csapak@proxmox.com>

This enables us to have different default for different architectures,
e.g. using 'ovmf' for 'aarch64' for everything.

The external interface should be compatible, so there is nothing
to do for current callers.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/qemu/OSDefaults.js | 76 ++++++++++++++++++++++++++-------
 1 file changed, 60 insertions(+), 16 deletions(-)

diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js
index bcebd0b3..d921ab53 100644
--- a/www/manager6/qemu/OSDefaults.js
+++ b/www/manager6/qemu/OSDefaults.js
@@ -24,8 +24,17 @@ Ext.define('PVE.qemu.OSDefaults', {
 
         let addOS = function (settings) {
             if (Object.hasOwn(settings, 'parent')) {
-                let child = Ext.clone(me[settings.parent]);
-                me[settings.pveOS] = Ext.apply(child, settings);
+                let architectures = settings.architectures;
+                delete settings.architectures;
+
+                let child = {
+                    x86_64: Ext.apply({}, settings, me[settings.parent].x86_64),
+                };
+
+                for (const arch of Object.keys(architectures ?? {})) {
+                    child[arch] = Ext.apply({}, architectures[arch], me[settings.parent][arch]);
+                }
+                me[settings.pveOS] = child;
             } else {
                 throw 'Could not find your genitor';
             }
@@ -33,16 +42,33 @@ Ext.define('PVE.qemu.OSDefaults', {
 
         // default values
         me.generic = {
-            busType: 'ide',
-            networkCard: 'e1000',
-            busPriority: {
-                ide: 4,
-                sata: 3,
-                scsi: 2,
-                virtio: 1,
+            x86_64: {
+                busType: 'ide',
+                networkCard: 'e1000',
+                busPriority: {
+                    ide: 4,
+                    sata: 3,
+                    scsi: 2,
+                    virtio: 1,
+                },
+                scsihw: 'virtio-scsi-single',
+                cputype: 'x86-64-v2-AES',
+            },
+
+            aarch64: {
+                // aarch64 has no ide, and ovmf can't boot from sata
+                busType: 'scsi',
+                networkCard: 'e1000',
+                busPriority: {
+                    scsi: 4,
+                    sata: 3,
+                    virtio: 2,
+                    ide: 1,
+                },
+                scsihw: 'virtio-scsi-single',
+                cputype: 'neoverse-n2',
+                bios: 'ovmf',
             },
-            scsihw: 'virtio-scsi-single',
-            cputype: 'x86-64-v2-AES',
         };
 
         // virtio-net is in kernel since 2.6.25
@@ -58,6 +84,18 @@ Ext.define('PVE.qemu.OSDefaults', {
                 ide: 1,
             },
             networkCard: 'virtio',
+
+            architectures: {
+                aarch64: {
+                    busPriority: {
+                        scsi: 4,
+                        virtio: 2,
+                        sata: 2,
+                        ide: 1,
+                    },
+                    networkCard: 'virtio',
+                },
+            },
         });
 
         // recommendation from http://wiki.qemu.org/Windows2000
@@ -73,12 +111,18 @@ Ext.define('PVE.qemu.OSDefaults', {
             parent: 'w2k',
         });
 
-        me.getDefaults = function (ostype) {
-            if (PVE.qemu.OSDefaults[ostype]) {
-                return PVE.qemu.OSDefaults[ostype];
-            } else {
-                return PVE.qemu.OSDefaults.generic;
+        me.getDefaults = function (ostype, arch = 'x86_64') {
+            if (!PVE.qemu.OSDefaults[ostype]) {
+                ostype = 'generic';
             }
+
+            let os = PVE.qemu.OSDefaults[ostype];
+            if (os[arch]) {
+                return os[arch];
+            }
+
+            // default
+            return os.x86_64;
         };
     },
 });
-- 
2.47.3





  parent reply	other threads:[~2026-02-03 10:22 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-03 10:00 [PATCH manager v2 00/17] enable qemu vm architecture selection Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 01/17] api/pvestatd: broadcast and expose non-x86 host architecture Dominik Csapak
2026-02-03 13:56   ` Thomas Lamprecht
2026-02-03 15:07   ` Thomas Lamprecht
2026-02-03 10:00 ` [PATCH manager v2 02/17] ui: qemu: wizard: refactor ostype and cd selector into an OSPanel Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 03/17] ui: form: add filtered KVComboBox Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 04/17] ui: resource store: add architecture field Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 05/17] ui: qemu: add architecture specific defaults and helpers Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 06/17] ui: qemu: add architecture field in wizard and hardware view Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 07/17] ui: qemu: make scsi hw selector architecture aware Dominik Csapak
2026-02-03 10:00 ` Dominik Csapak [this message]
2026-02-03 10:00 ` [PATCH manager v2 09/17] ui: qemu: make os type " Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 10/17] ui: qemu: make machine panels/fields " Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 11/17] ui: qemu: make bios selector " Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 12/17] ui: qemu: make sortByPreviousUsage " Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 13/17] ui: qemu: wizard: use defaults to populate machine and bios Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 14/17] ui: qemu: wizard: make iso confid architecture specific Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 15/17] ui: qemu: make bus selector architecture aware Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 16/17] ui: qemu: make processor edit " Dominik Csapak
2026-02-03 10:00 ` [PATCH manager v2 17/17] ui: qemu: change ui default for cpu model Dominik Csapak
2026-02-03 10:56 ` [PATCH manager v2 00/17] enable qemu vm architecture selection Dominik Csapak
2026-02-03 13:34 ` 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=20260203102118.1430545-9-d.csapak@proxmox.com \
    --to=d.csapak@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal