Merge pull request #905 from GNS3/use-32bit-smbios-juniper-devices

grossmj · web-flow · commit da305f851412 · 2024-07-31T19:21:55.000+02:00
Use 32-bit SMBIOS in all Juniper appliances
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": [
         {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"arch": "x86_64",`
`35`	`35`	`"console_type": "telnet",`
`36`	`36`	`"kvm": "require",`
`37`		`- "options": "-nographic"`
	`37`	`+ "options": "-nographic -machine q35,smbios-entry-point-type=32"`
`38`	`38`	`},`
`39`	`39`	`"images": [`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"arch": "x86_64",`
`27`	`27`	`"console_type": "telnet",`
`28`	`28`	`"kvm": "require",`
`29`		`- "options": "-nographic -enable-kvm"`
	`29`	`+ "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"`
`30`	`30`	`},`
`31`	`31`	`"images": [`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"arch": "x86_64",`
`24`	`24`	`"console_type": "vnc",`
`25`	`25`	`"kvm": "require",`
`26`		`- "options": "-nographic"`
	`26`	`+ "options": "-nographic -machine q35,smbios-entry-point-type=32"`
`27`	`27`	`},`
`28`	`28`	`"images": [`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"arch": "x86_64",`
`26`	`26`	`"console_type": "telnet",`
`27`	`27`	`"kvm": "require",`
`28`		`- "options": "-nographic -enable-kvm"`
	`28`	`+ "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"`
`29`	`29`	`},`
`30`	`30`	`"images": [`
`31`	`31`	`{`