pillar/hypervisor/kvm_test: reflect latest changes in kvm.go

Make tests pass. Signed-off-by: Roman Penyaev <[email protected]>
lf-edge · Feb 7, 2025 · 92e7e40 · 92e7e40
1 parent b9bf6dc
commit 92e7e40
Showing 1 changed file with 18 additions and 44 deletions.
diff --git a/pkg/pillar/hypervisor/kvm_test.go b/pkg/pillar/hypervisor/kvm_test.go
@@ -190,11 +190,9 @@ func TestCreateDomConfigOnlyCom1(t *testing.T) {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -205,7 +203,6 @@ func TestCreateDomConfigOnlyCom1(t *testing.T) {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -478,11 +475,9 @@ func TestCreateDomConfigOnlyCom1(t *testing.T) {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -493,7 +488,6 @@ func TestCreateDomConfigOnlyCom1(t *testing.T) {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -731,11 +725,9 @@ func TestCreateDomConfigOnlyCom1(t *testing.T) {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -746,7 +738,6 @@ func TestCreateDomConfigOnlyCom1(t *testing.T) {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -1206,11 +1197,9 @@ func domConfigArm64() string {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -1221,7 +1210,6 @@ func domConfigArm64() string {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -1508,11 +1496,9 @@ func domConfigAmd64FML() string {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -1523,7 +1509,6 @@ func domConfigAmd64FML() string {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -1809,11 +1794,9 @@ func domConfigAmd64Legacy() string {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -1824,7 +1807,6 @@ func domConfigAmd64Legacy() string {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -2098,11 +2080,9 @@ func domConfigAmd64() string {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -2113,7 +2093,6 @@ func domConfigAmd64() string {
 
 
 
-
 #[device "video0"]
 #  driver = "qxl-vga"
 #  ram_size = "67108864"
@@ -2385,11 +2364,9 @@ func domConfigContainerVNC() string {
   addr = "3"
 
 [chardev "charserial0"]
-  backend = "socket"
+  backend = "pty"
   mux = "on"
   path = "/run/hypervisor/kvm/%s/cons"
-  server = "on"
-  wait = "off"
   logfile = "/dev/fd/1"
   logappend = "on"
 
@@ -2398,27 +2375,24 @@ func domConfigContainerVNC() string {
   chardev = "charserial0"
   name = "org.lfedge.eve.console.0"
 
-
 [chardev "charserial1"]
-  backend = "socket"
-  mux = "on"
+  backend = "pty"
   path = "/run/hypervisor/kvm/%s/shim-cons"
-  server = "on"
-  wait = "off"
-  logfile = "/dev/fd/1"
-  logappend = "on"
 
-[device]
-  driver = "virtconsole"
-  chardev = "charserial1"
-  name = "org.lfedge.eve.console.shim"
 [chardev "charserial2"]
   backend = "vc"
 
+[chardev "charhub0"]
+  backend = "hub"
+  chardevs.0 = "charserial1"
+  chardevs.1 = "charserial2"
+  logfile = "/dev/fd/1"
+  logappend = "on"
+
 [device]
   driver = "virtconsole"
-  chardev = "charserial2"
-  name = "org.lfedge.eve.console.shim.forvnc"
+  chardev = "charhub0"
+  name = "org.lfedge.eve.console.shim"
 
 
 [vnc "default"]