From 121f6d9de798b3496e0093230ce9b530a9ed97dd Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 23 Jul 2024 16:52:57 +0200
Subject: [PATCH] Use 32-bit SMBIOS for all Juniper devices

---
 appliances/juniper-junos-space.gns3a | 5 +++--
 appliances/juniper-vmx-legacy.gns3a  | 2 +-
 appliances/juniper-vmx-vcp.gns3a     | 2 +-
 appliances/juniper-vmx-vfp.gns3a     | 3 ++-
 appliances/juniper-vqfx-pfe.gns3a    | 2 +-
 appliances/juniper-vqfx-re.gns3a     | 3 ++-
 appliances/juniper-vrr.gns3a         | 2 +-
 appliances/juniper-vsrx.gns3a        | 3 ++-
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/appliances/juniper-junos-space.gns3a b/appliances/juniper-junos-space.gns3a
index c333c34..659d6a5 100644
--- a/appliances/juniper-junos-space.gns3a
+++ b/appliances/juniper-junos-space.gns3a
@@ -12,18 +12,19 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deplyments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123",
+    "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deployments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123",
     "symbol": "juniper-vqfx.svg",
     "port_name_format": "em{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,
         "ram": 16384,
+        "cpus": 4,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-smp 4 -nographic"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vmx-legacy.gns3a b/appliances/juniper-vmx-legacy.gns3a
index 1409c4c..592c4a6 100644
--- a/appliances/juniper-vmx-legacy.gns3a
+++ b/appliances/juniper-vmx-legacy.gns3a
@@ -34,7 +34,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vmx-vcp.gns3a b/appliances/juniper-vmx-vcp.gns3a
index 089f4dc..d1d9493 100644
--- a/appliances/juniper-vmx-vcp.gns3a
+++ b/appliances/juniper-vmx-vcp.gns3a
@@ -26,7 +26,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -enable-kvm"
+        "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vmx-vfp.gns3a b/appliances/juniper-vmx-vfp.gns3a
index dba3ee1..ff1145e 100644
--- a/appliances/juniper-vmx-vfp.gns3a
+++ b/appliances/juniper-vmx-vfp.gns3a
@@ -20,11 +20,12 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 13,
         "ram": 4096,
+        "cpus": 4,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -enable-kvm -smp cpus=3"
+        "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vqfx-pfe.gns3a b/appliances/juniper-vqfx-pfe.gns3a
index 23cacef..7a4c4e2 100644
--- a/appliances/juniper-vqfx-pfe.gns3a
+++ b/appliances/juniper-vqfx-pfe.gns3a
@@ -23,7 +23,7 @@
         "arch": "x86_64",
         "console_type": "vnc",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vqfx-re.gns3a b/appliances/juniper-vqfx-re.gns3a
index b47c34d..855d2a1 100644
--- a/appliances/juniper-vqfx-re.gns3a
+++ b/appliances/juniper-vqfx-re.gns3a
@@ -19,11 +19,12 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 12,
         "ram": 1024,
+        "cpus": 2,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -smp 2"
+        "options": "-nographic -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vrr.gns3a b/appliances/juniper-vrr.gns3a
index 8c447a2..8ec4d50 100644
--- a/appliances/juniper-vrr.gns3a
+++ b/appliances/juniper-vrr.gns3a
@@ -25,7 +25,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-nographic -enable-kvm"
+        "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {
diff --git a/appliances/juniper-vsrx.gns3a b/appliances/juniper-vsrx.gns3a
index bd13122..347632b 100644
--- a/appliances/juniper-vsrx.gns3a
+++ b/appliances/juniper-vsrx.gns3a
@@ -19,11 +19,12 @@
         "adapter_type": "vmxnet3",
         "adapters": 6,
         "ram": 4096,
+        "cpus": 2,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-smp 2"
+        "options": "-machine q35,smbios-entry-point-type=32"
     },
     "images": [
         {