public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH 0/2] vm-img: ovf template updates
@ 2023-02-27 17:48 Henning Schild
  2023-02-27 17:48 ` [PATCH 1/2] vm-img: virtualbox: update ovf template Henning Schild
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Henning Schild @ 2023-02-27 17:48 UTC (permalink / raw)
  To: isar-users; +Cc: Henning Schild

The virtualbox template had some sort of issue that one could not
"vboxmanage import" the ova, likely depending on the version of
vbox or if a similar ova was imported before.

While fixing this i also decided to give both vmware and virtualbox
paravirtualized storage controllers by default, and change a few things
here and there.

All is tested on VMware Workstation 16.2.5 and Virtualbox 7.1 and 7.0 on
a Linux host.

Henning Schild (2):
  vm-img: virtualbox: update ovf template
  vm-img: vmware: update ovf template

 .../virtualbox/vm-img-virtualbox.ovf.tmpl     | 83 +++++++++++++------
 .../images/vmware/vm-img-vmware.ovf.tmpl      |  7 +-
 2 files changed, 62 insertions(+), 28 deletions(-)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/2] vm-img: virtualbox: update ovf template
  2023-02-27 17:48 [PATCH 0/2] vm-img: ovf template updates Henning Schild
@ 2023-02-27 17:48 ` Henning Schild
  2023-02-27 17:48 ` [PATCH 2/2] vm-img: vmware: " Henning Schild
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Henning Schild @ 2023-02-27 17:48 UTC (permalink / raw)
  To: isar-users; +Cc: Henning Schild

These templates are by enlarge taken from exported VMs, so it is really
hard to change only one thing at a time and ensuring things will still
work as expected. So this commit does multiple things at a time.

It repairs the ofv by taking the StorageControllers into the Hardware
block.
It switches the default disk from IDE to virtio.
It adds a USB host controller and pointer device.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 .../virtualbox/vm-img-virtualbox.ovf.tmpl     | 83 +++++++++++++------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl b/meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl
index c9561a2c3e53..66d558515748 100644
--- a/meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl
+++ b/meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl
@@ -63,14 +63,41 @@
         <rasd:ResourceSubType>PIIX4</rasd:ResourceSubType>
         <rasd:ResourceType>5</rasd:ResourceType>
       </Item>
+      <Item>
+        <rasd:Address>0</rasd:Address>
+        <rasd:Caption>virtioSCSIController0</rasd:Caption>
+        <rasd:Description>VirtioSCSI Controller</rasd:Description>
+        <rasd:ElementName>virtioSCSIController0</rasd:ElementName>
+        <rasd:InstanceID>5</rasd:InstanceID>
+        <rasd:ResourceSubType>VirtioSCSI</rasd:ResourceSubType>
+        <rasd:ResourceType>20</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:Address>0</rasd:Address>
+        <rasd:Caption>usb</rasd:Caption>
+        <rasd:Description>USB Controller</rasd:Description>
+        <rasd:ElementName>usb</rasd:ElementName>
+        <rasd:InstanceID>6</rasd:InstanceID>
+        <rasd:ResourceType>23</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:AddressOnParent>3</rasd:AddressOnParent>
+        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
+        <rasd:Caption>sound</rasd:Caption>
+        <rasd:Description>Sound Card</rasd:Description>
+        <rasd:ElementName>sound</rasd:ElementName>
+        <rasd:InstanceID>7</rasd:InstanceID>
+        <rasd:ResourceSubType>ensoniq1371</rasd:ResourceSubType>
+        <rasd:ResourceType>35</rasd:ResourceType>
+      </Item>
       <Item>
         <rasd:AddressOnParent>0</rasd:AddressOnParent>
         <rasd:Caption>disk1</rasd:Caption>
         <rasd:Description>Disk Image</rasd:Description>
         <rasd:ElementName>disk1</rasd:ElementName>
         <rasd:HostResource>/disk/vmdisk1</rasd:HostResource>
-        <rasd:InstanceID>5</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
+        <rasd:InstanceID>8</rasd:InstanceID>
+        <rasd:Parent>5</rasd:Parent>
         <rasd:ResourceType>17</rasd:ResourceType>
       </Item>
       <Item>
@@ -78,50 +105,56 @@
         <rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption>
         <rasd:Connection>NAT</rasd:Connection>
         <rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName>
-        <rasd:InstanceID>6</rasd:InstanceID>
+        <rasd:InstanceID>9</rasd:InstanceID>
         <rasd:ResourceType>10</rasd:ResourceType>
       </Item>
     </VirtualHardwareSection>
     <vbox:Machine ovf:required="false" version="1.12-linux" uuid="{${VM_UUID}}" name="${OVA_NAME}" OSType="Debian_64" snapshotFolder="Snapshots" lastStateChange="${LAST_CHANGE}">
       <ovf:Info>Complete VirtualBox machine configuration in VirtualBox format</ovf:Info>
+      <ExtraData>
+        <ExtraDataItem name="GUI/FirstRun" value="no"/>
+      </ExtraData>
       <Hardware>
         <CPU count="${OVA_NUMBER_OF_CPU}">
-          <PAE enabled="true"/>
+          <PAE enabled="false"/>
+          <LongMode enabled="true"/>
+          <X2APIC enabled="true"/>
           <HardwareVirtExLargePages enabled="false"/>
         </CPU>
         <Memory RAMSize="${OVA_MEMORY}"/>
-	<Firmware type="${OVA_FIRMWARE_UPPERCASE}"/>
-        <Boot>
-          <Order position="1" device="HardDisk"/>
-          <Order position="2" device="None"/>
-          <Order position="3" device="None"/>
-          <Order position="4" device="None"/>
-        </Boot>
+        <Firmware type="${OVA_FIRMWARE_UPPERCASE}"/>
+        <HID Pointing="USBTablet"/>
+        <Chipset type="ICH9"/>
         <Display VRAMSize="${OVA_VRAM}" monitorCount="1" accelerate3D="${OVA_3D_ACCEL}" accelerate2DVideo="false"/>
-	<RemoteDisplay enabled="false"/>
-        <BIOS>
-	  <IOAPIC enabled="${OVA_ACPI}"/>
+        <RemoteDisplay enabled="true"/>
+	<BIOS>
+          <IOAPIC enabled="${OVA_ACPI}"/>
         </BIOS>
-        <USBController enabled="false" enabledEhci="false"/>
+        <USB>
+          <Controllers>
+            <Controller name="OHCI" type="OHCI"/>
+            <Controller name="EHCI" type="EHCI"/>
+          </Controllers>
+        </USB>
         <Network>
           <Adapter slot="0" enabled="true" MACAddress="${PRIMARY_MAC}" cable="true" type="virtio">
             <NAT/>
           </Adapter>
         </Network>
-        <LPT>
-          <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
-        </LPT>
         <AudioAdapter driver="Pulse" enabled="false"/>
         <Clipboard/>
         <GuestProperties/>
+        <StorageControllers>
+          <StorageController name="IDE" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true">
+            <AttachedDevice passthrough="false" type="DVD" hotpluggable="false" port="1" device="0"/>
+          </StorageController>
+          <StorageController name="SATA" type="VirtioSCSI" PortCount="1" useHostIOCache="false" Bootable="true">
+            <AttachedDevice type="HardDisk" port="0" device="0">
+              <Image uuid="{${DISK_UUID}}"/>
+            </AttachedDevice>
+          </StorageController>
+        </StorageControllers>
       </Hardware>
-      <StorageControllers>
-        <StorageController name="IDE Controller" type="PIIX4" PortCount="2" useHostIOCache="true" Bootable="true">
-          <AttachedDevice type="HardDisk" port="0" device="0">
-            <Image uuid="{${DISK_UUID}}"/>
-          </AttachedDevice>
-        </StorageController>
-      </StorageControllers>
     </vbox:Machine>
   </VirtualSystem>
 </Envelope>
-- 
2.39.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/2] vm-img: vmware: update ovf template
  2023-02-27 17:48 [PATCH 0/2] vm-img: ovf template updates Henning Schild
  2023-02-27 17:48 ` [PATCH 1/2] vm-img: virtualbox: update ovf template Henning Schild
@ 2023-02-27 17:48 ` Henning Schild
  2023-02-27 20:41 ` [PATCH 0/2] vm-img: ovf template updates Henning Schild
  2023-03-07  4:12 ` Uladzimir Bely
  3 siblings, 0 replies; 5+ messages in thread
From: Henning Schild @ 2023-02-27 17:48 UTC (permalink / raw)
  To: isar-users; +Cc: Henning Schild

Switch scsi controller type to pvscsi to improve performance and reduce
host load.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 .../recipes-core/images/vmware/vm-img-vmware.ovf.tmpl      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl b/meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl
index 79d9cb0e24d4..85797f15832a 100644
--- a/meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl
+++ b/meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl
@@ -45,10 +45,11 @@
       </Item>
       <Item>
         <rasd:Address>0</rasd:Address>
-        <rasd:Description>IDE Controller</rasd:Description>
-        <rasd:ElementName>ideController0</rasd:ElementName>
+        <rasd:Description>SCSI Controller</rasd:Description>
+        <rasd:ElementName>scsiController0</rasd:ElementName>
         <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceType>5</rasd:ResourceType>
+        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
+        <rasd:ResourceType>6</rasd:ResourceType>
       </Item>
       <Item>
         <rasd:AddressOnParent>0</rasd:AddressOnParent>
-- 
2.39.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 0/2] vm-img: ovf template updates
  2023-02-27 17:48 [PATCH 0/2] vm-img: ovf template updates Henning Schild
  2023-02-27 17:48 ` [PATCH 1/2] vm-img: virtualbox: update ovf template Henning Schild
  2023-02-27 17:48 ` [PATCH 2/2] vm-img: vmware: " Henning Schild
@ 2023-02-27 20:41 ` Henning Schild
  2023-03-07  4:12 ` Uladzimir Bely
  3 siblings, 0 replies; 5+ messages in thread
From: Henning Schild @ 2023-02-27 20:41 UTC (permalink / raw)
  To: isar-users

Am Mon, 27 Feb 2023 18:48:18 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> The virtualbox template had some sort of issue that one could not
> "vboxmanage import" the ova, likely depending on the version of
> vbox or if a similar ova was imported before.
> 
> While fixing this i also decided to give both vmware and virtualbox
> paravirtualized storage controllers by default, and change a few
> things here and there.
> 
> All is tested on VMware Workstation 16.2.5 and Virtualbox 7.1 and 7.0

Virtualbox 6.1 and 7.0 not 7.1 that is not yet a thing.

Henning

> on a Linux host.
> 
> Henning Schild (2):
>   vm-img: virtualbox: update ovf template
>   vm-img: vmware: update ovf template
> 
>  .../virtualbox/vm-img-virtualbox.ovf.tmpl     | 83
> +++++++++++++------ .../images/vmware/vm-img-vmware.ovf.tmpl      |
> 7 +- 2 files changed, 62 insertions(+), 28 deletions(-)
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 0/2] vm-img: ovf template updates
  2023-02-27 17:48 [PATCH 0/2] vm-img: ovf template updates Henning Schild
                   ` (2 preceding siblings ...)
  2023-02-27 20:41 ` [PATCH 0/2] vm-img: ovf template updates Henning Schild
@ 2023-03-07  4:12 ` Uladzimir Bely
  3 siblings, 0 replies; 5+ messages in thread
From: Uladzimir Bely @ 2023-03-07  4:12 UTC (permalink / raw)
  To: isar-users

In the email from Monday, 27 February 2023 20:48:18 +03 user Henning Schild wrote:
> The virtualbox template had some sort of issue that one could not
> "vboxmanage import" the ova, likely depending on the version of
> vbox or if a similar ova was imported before.
> 
> While fixing this i also decided to give both vmware and virtualbox
> paravirtualized storage controllers by default, and change a few things
> here and there.
> 
> All is tested on VMware Workstation 16.2.5 and Virtualbox 7.1 and 7.0 on
> a Linux host.
> 
> Henning Schild (2):
>   vm-img: virtualbox: update ovf template
>   vm-img: vmware: update ovf template
> 
>  .../virtualbox/vm-img-virtualbox.ovf.tmpl     | 83 +++++++++++++------
>  .../images/vmware/vm-img-vmware.ovf.tmpl      |  7 +-
>  2 files changed, 62 insertions(+), 28 deletions(-)
> 
> 

Merged to next, thanks.



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-03-07  4:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-27 17:48 [PATCH 0/2] vm-img: ovf template updates Henning Schild
2023-02-27 17:48 ` [PATCH 1/2] vm-img: virtualbox: update ovf template Henning Schild
2023-02-27 17:48 ` [PATCH 2/2] vm-img: vmware: " Henning Schild
2023-02-27 20:41 ` [PATCH 0/2] vm-img: ovf template updates Henning Schild
2023-03-07  4:12 ` Uladzimir Bely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox