[pve-devel] [PATCH 0/3] Windows 11 OS type and UI improvements

[pve-devel] [PATCH 0/3] Windows 11 OS type and UI improvements

[Stefan Reiter]

Add a specific 'win11' ostype for Windows 11 and Server 2022, with currently no
change on the backend, but enable q35, secure boot and a TPM in the wizard by
default if selected.


 qemu-server: Stefan Reiter (1):
  ostype: support Windows 11/Server 2022

 PVE/QemuServer.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

 manager: Stefan Reiter (2):
  ui: SystemEdit: promote advanced settings to normal
  ui: add 'win11' ostype and set defaults in wizard

 www/manager6/Utils.js           |  1 +
 www/manager6/qemu/SystemEdit.js | 66 +++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 28 deletions(-)

-- 
2.30.2

[pve-devel] [PATCH qemu-server 1/3] ostype: support Windows 11/Server 2022

[Stefan Reiter]

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 PVE/QemuServer.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index eb29fc2..6fc28e8 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -386,7 +386,7 @@ my $confdesc = {
     ostype => {
 	optional => 1,
 	type => 'string',
-        enum => [qw(other wxp w2k w2k3 w2k8 wvista win7 win8 win10 l24 l26 solaris)],
+        enum => [qw(other wxp w2k w2k3 w2k8 wvista win7 win8 win10 win11 l24 l26 solaris)],
 	description => "Specify guest operating system.",
 	verbose_description => <<EODESC,
 Specify guest operating system. This is used to enable special
@@ -402,6 +402,7 @@ wvista;; Microsoft Windows Vista
 win7;; Microsoft Windows 7
 win8;; Microsoft Windows 8/2012/2012r2
 win10;; Microsoft Windows 10/2016/2019
+win11;; Microsoft Windows 11/2022
 l24;; Linux 2.4 Kernel
 l26;; Linux 2.6 - 5.X Kernel
 solaris;; Solaris/OpenSolaris/OpenIndiania kernel
-- 
2.30.2

[pve-devel] applied: [PATCH qemu-server 1/3] ostype: support Windows 11/Server 2022

[Thomas Lamprecht]

On 11.10.21 14:55, Stefan Reiter wrote:
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  PVE/QemuServer.pm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH qemu-server 1/3] ostype: support Windows 11/Server 2022

[Thomas Lamprecht]

On 11.10.21 14:55, Stefan Reiter wrote:
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  PVE/QemuServer.pm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
>

applied, thanks!

[pve-devel] [PATCH manager 2/3] ui: SystemEdit: promote advanced settings to normal

[Stefan Reiter]

and reorder the panel a bit, as otherwise I found it *very* cluttered.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 www/manager6/qemu/SystemEdit.js | 50 +++++++++++++++------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js
index 362365a9..8d178f06 100644
--- a/www/manager6/qemu/SystemEdit.js
+++ b/www/manager6/qemu/SystemEdit.js
@@ -69,28 +69,15 @@ Ext.define('PVE.qemu.SystemInputPanel', {
 	    comboItems: PVE.Utils.kvm_vga_driver_array(),
 	},
 	{
-	    xtype: 'proxmoxcheckbox',
-	    name: 'agent',
-	    uncheckedValue: 0,
-	    defaultValue: 0,
-	    deleteDefaultValue: true,
-	    fieldLabel: gettext('Qemu Agent'),
-	},
-    ],
-
-    column2: [
-	{
-	    xtype: 'pveScsiHwSelector',
-	    name: 'scsihw',
+	    xtype: 'proxmoxKVComboBox',
+	    name: 'machine',
 	    value: '__default__',
-	    bind: {
-		value: '{current.scsihw}',
-	    },
-	    fieldLabel: gettext('SCSI Controller'),
+	    fieldLabel: gettext('Machine'),
+	    comboItems: [
+		['__default__', PVE.Utils.render_qemu_machine('')],
+		['q35', 'q35'],
+	    ],
 	},
-    ],
-
-    advancedColumn1: [
 	{
 	    xtype: 'pveQemuBiosSelector',
 	    name: 'bios',
@@ -126,16 +113,23 @@ Ext.define('PVE.qemu.SystemInputPanel', {
 	},
     ],
 
-    advancedColumn2: [
+    column2: [
 	{
-	    xtype: 'proxmoxKVComboBox',
-	    name: 'machine',
+	    xtype: 'pveScsiHwSelector',
+	    name: 'scsihw',
 	    value: '__default__',
-	    fieldLabel: gettext('Machine'),
-	    comboItems: [
-		['__default__', PVE.Utils.render_qemu_machine('')],
-		['q35', 'q35'],
-	    ],
+	    bind: {
+		value: '{current.scsihw}',
+	    },
+	    fieldLabel: gettext('SCSI Controller'),
+	},
+	{
+	    xtype: 'proxmoxcheckbox',
+	    name: 'agent',
+	    uncheckedValue: 0,
+	    defaultValue: 0,
+	    deleteDefaultValue: true,
+	    fieldLabel: gettext('Qemu Agent'),
 	},
 	{
 	    xtype: 'proxmoxcheckbox',
-- 
2.30.2

[pve-devel] applied: [PATCH manager 2/3] ui: SystemEdit: promote advanced settings to normal

[Thomas Lamprecht]

On 11.10.21 14:55, Stefan Reiter wrote:
> and reorder the panel a bit, as otherwise I found it *very* cluttered.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  www/manager6/qemu/SystemEdit.js | 50 +++++++++++++++------------------
>  1 file changed, 22 insertions(+), 28 deletions(-)
> 
>

applied, thanks!

But I still find that the visual separation of the hr + space of the advanced section
provided some UX improvement, felt less crowded that way.

Maybe we can place that in a box+<legend>Firmware</legend> thingy or at least have a
Label-only element with "Firmware" in columnt 1 and an empty element in column 2 to
somewhat replicate that visual grouping?

@Dominik: better ideas?

Re: [pve-devel] applied: [PATCH manager 2/3] ui: SystemEdit: promote advanced settings to normal

[Dominik Csapak]

On 10/21/21 13:51, Thomas Lamprecht wrote:
> On 11.10.21 14:55, Stefan Reiter wrote:
>> and reorder the panel a bit, as otherwise I found it *very* cluttered.
>>
>> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
>> ---
>>   www/manager6/qemu/SystemEdit.js | 50 +++++++++++++++------------------
>>   1 file changed, 22 insertions(+), 28 deletions(-)
>>
>>
> 
> applied, thanks!
> 
> But I still find that the visual separation of the hr + space of the advanced section
> provided some UX improvement, felt less crowded that way.
> 
> Maybe we can place that in a box+<legend>Firmware</legend>

could work, would have to test

> thingy or at least have a
> Label-only element with "Firmware" in columnt 1 and an empty element in column 2 to
> somewhat replicate that visual grouping?
> 

we do it like that already for the sync edit options in the realmedit,
so maybe we should stay consistent here and use the same style?

if you want, i can send a patch for this

Re: [pve-devel] applied: [PATCH manager 2/3] ui: SystemEdit: promote advanced settings to normal

[Thomas Lamprecht]

On 03.11.21 14:02, Dominik Csapak wrote:
>>
>> But I still find that the visual separation of the hr + space of the advanced section
>> provided some UX improvement, felt less crowded that way.
>>
>> Maybe we can place that in a box+<legend>Firmware</legend>
> 
> could work, would have to test
> 
>> thingy or at least have a
>> Label-only element with "Firmware" in columnt 1 and an empty element in column 2 to
>> somewhat replicate that visual grouping?
>>
> 
> we do it like that already for the sync edit options in the realmedit,
> so maybe we should stay consistent here and use the same style?
> 
> if you want, i can send a patch for this
> 

yes please.

[pve-devel] [PATCH manager 3/3] ui: add 'win11' ostype and set defaults in wizard

[Stefan Reiter]

Windows 11 requires a TPM and secure boot, so try to auto-enable both.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 www/manager6/Utils.js           |  1 +
 www/manager6/qemu/SystemEdit.js | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index ee92cd43..274d4db2 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -43,6 +43,7 @@ Ext.define('PVE.Utils', {
 	    { desc: '2.4 Kernel', val: 'l24' },
 	],
 	'Microsoft Windows': [
+	    { desc: '11/2022', val: 'win11' },
 	    { desc: '10/2016/2019', val: 'win10' },
 	    { desc: '8.x/2012/2012r2', val: 'win8' },
 	    { desc: '7/2008r2', val: 'win7' },
diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js
index 8d178f06..f3e3fe9c 100644
--- a/www/manager6/qemu/SystemEdit.js
+++ b/www/manager6/qemu/SystemEdit.js
@@ -56,6 +56,20 @@ Ext.define('PVE.qemu.SystemInputPanel', {
 	    'pveQemuBiosSelector': {
 		change: 'biosChange',
 	    },
+	    '#': {
+		afterrender: 'setMachine',
+	    },
+	},
+
+	setMachine: function() {
+	    let me = this;
+	    let vm = this.getViewModel();
+	    let ostype = vm.get('current.ostype');
+	    if (ostype === 'win11') {
+		me.lookup('machine').setValue('q35');
+		me.lookup('bios').setValue('ovmf');
+		me.lookup('addtpmbox').setValue(true);
+	    }
 	},
     },
 
@@ -71,6 +85,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
 	{
 	    xtype: 'proxmoxKVComboBox',
 	    name: 'machine',
+	    reference: 'machine',
 	    value: '__default__',
 	    fieldLabel: gettext('Machine'),
 	    comboItems: [
@@ -81,6 +96,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
 	{
 	    xtype: 'pveQemuBiosSelector',
 	    name: 'bios',
+	    reference: 'bios',
 	    value: '__default__',
 	    fieldLabel: 'BIOS',
 	},
-- 
2.30.2

Re: [pve-devel] [PATCH manager 3/3] ui: add 'win11' ostype and set defaults in wizard

[DERUMIER, Alexandre]

Hi,

I don't think that win2022 require tpm , only win11.

Le lundi 11 octobre 2021 à 14:55 +0200, Stefan Reiter a écrit :
Windows 11 requires a TPM and secure boot, so try to auto-enable both.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com<mailto:s.reiter@proxmox.com>>
---
 www/manager6/Utils.js           |  1 +
 www/manager6/qemu/SystemEdit.js | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index ee92cd43..274d4db2 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -43,6 +43,7 @@ Ext.define('PVE.Utils', {
            { desc: '2.4 Kernel', val: 'l24' },
        ],
        'Microsoft Windows': [
+           { desc: '11/2022', val: 'win11' },
            { desc: '10/2016/2019', val: 'win10' },
            { desc: '8.x/2012/2012r2', val: 'win8' },
            { desc: '7/2008r2', val: 'win7' },
diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js
index 8d178f06..f3e3fe9c 100644
--- a/www/manager6/qemu/SystemEdit.js
+++ b/www/manager6/qemu/SystemEdit.js
@@ -56,6 +56,20 @@ Ext.define('PVE.qemu.SystemInputPanel', {
            'pveQemuBiosSelector': {
                change: 'biosChange',
            },
+           '#': {
+               afterrender: 'setMachine',
+           },
+       },
+
+       setMachine: function() {
+           let me = this;
+           let vm = this.getViewModel();
+           let ostype = vm.get('current.ostype');
+           if (ostype === 'win11') {
+               me.lookup('machine').setValue('q35');
+               me.lookup('bios').setValue('ovmf');
+               me.lookup('addtpmbox').setValue(true);
+           }
        },
     },

@@ -71,6 +85,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
        {
            xtype: 'proxmoxKVComboBox',
            name: 'machine',
+           reference: 'machine',
            value: '__default__',
            fieldLabel: gettext('Machine'),
            comboItems: [
@@ -81,6 +96,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
        {
            xtype: 'pveQemuBiosSelector',
            name: 'bios',
+           reference: 'bios',
            value: '__default__',
            fieldLabel: 'BIOS',
        },

Re: [pve-devel] [PATCH manager 3/3] ui: add 'win11' ostype and set defaults in wizard

[Thomas Lamprecht]

Hi,

On 18.10.21 07:57, DERUMIER, Alexandre wrote:
> I don't think that win2022 require tpm , only win11.

seems so, but do you think it will hurt if we default to one (in GUI) anyway?
I mean it's only a check box to tick off if one does not wants it.

As otherwise it would add a bit of complication, we'd need to add a separate
win2022 os type just for that.

Re: [pve-devel] [PATCH manager 3/3] ui: add 'win11' ostype and set defaults in wizard

[DERUMIER, Alexandre]

Le lundi 18 octobre 2021 à 09:10 +0200, Thomas Lamprecht a écrit :
Hi,

On 18.10.21 07:57, DERUMIER, Alexandre wrote:
I don't think that win2022 require tpm , only win11.

seems so, but do you think it will hurt if we default to one (in GUI) anyway?
I mean it's only a check box to tick off if one does not wants it.

No, no problem, we can keep checkbox tick on by default for win11/2022.
maybe simply display an hint somewhere could be great ?


As otherwise it would add a bit of complication, we'd need to add a separate
win2022 os type just for that.

[pve-devel] applied: [PATCH manager 3/3] ui: add 'win11' ostype and set defaults in wizard

[Thomas Lamprecht]

On 11.10.21 14:55, Stefan Reiter wrote:
> Windows 11 requires a TPM and secure boot, so try to auto-enable both.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  www/manager6/Utils.js           |  1 +
>  www/manager6/qemu/SystemEdit.js | 16 ++++++++++++++++
>  2 files changed, 17 insertions(+)
> 
>

applied, thanks!

Oh and made a follow up that changed the labels to "EFI Storage" and "TPM Storage",
respectively,

Re: [pve-devel] [PATCH 0/3] Windows 11 OS type and UI improvements

[Aaron Lauterer]

Works. As discussed off list, we should make it clearer in the "System" panel, that the TPM and EFI disk settings (Storage selection and such) belong to those "Checkboxes". While it is somewhat clear if enabled manually, it is quite confusing with them already enabled because one chose Win11 as guest OS in the previous step.
Additionally, setting the RAM to a default of 4096 for Win11 guests might be a good idea, as the Win11 installer will refuse to install because the requirements are not met if there is not enough RAM. A too small disk (<52GiB) will cause a warning in the Disk selection dialog of the installer, but it will still install.

Besides that:

Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>

On 10/11/21 14:55, Stefan Reiter wrote:
> Add a specific 'win11' ostype for Windows 11 and Server 2022, with currently no
> change on the backend, but enable q35, secure boot and a TPM in the wizard by
> default if selected.
> 
> 
>   qemu-server: Stefan Reiter (1):
>    ostype: support Windows 11/Server 2022
> 
>   PVE/QemuServer.pm | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
>   manager: Stefan Reiter (2):
>    ui: SystemEdit: promote advanced settings to normal
>    ui: add 'win11' ostype and set defaults in wizard
> 
>   www/manager6/Utils.js           |  1 +
>   www/manager6/qemu/SystemEdit.js | 66 +++++++++++++++++++--------------
>   2 files changed, 39 insertions(+), 28 deletions(-)
> 

Re: [pve-devel] [PATCH 0/3] Windows 11 OS type and UI improvements

[Thomas Lamprecht]

On 12.10.21 15:51, Aaron Lauterer wrote:
> Works. As discussed off list, we should make it clearer in the "System"
> panel, that the TPM and EFI disk settings (Storage selection and such) belong
> to those "Checkboxes". While it is somewhat clear if enabled manually, it is
> quite confusing with them already enabled because one chose Win11 as guest OS
> in the previous step.

as dicussed off-list, I'd just extend the field labels for the respective storage selector.

- "EFIvars Storage"
- "TPM Storage"

> Additionally, setting the RAM to a default of 4096 for Win11 guests might be
> a good idea, as the Win11 installer will refuse to install because the
> requirements are not met if there is not enough RAM. A too small disk
> (<52GiB) will cause a warning in the Disk selection dialog of the installer,
> but it will still install.

Yes, thought about that too when running into the very dubious and unhelpful
"your system does not fulfill the min reqs. but we won't tell you why" the
first time.
With the new OS type we can default to 4 GiB memory and 64 GiB root disk for
win11 in addtion to the defaults changed here.

> 
> Besides that:
> 
> Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>
> 

thanks, those tags are always valuable!