Ensure that vm-console uses the correct NMDM side

Fix: #33
io7m · Jul 30, 2020 · d1f9034 · d1f9034
1 parent 01a036e
commit d1f9034
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/com.io7m.waxmill.boot/src/main/java/com/io7m/waxmill/boot/WXMBootConfigurationEvaluator.java b/com.io7m.waxmill.boot/src/main/java/com/io7m/waxmill/boot/WXMBootConfigurationEvaluator.java
@@ -76,6 +76,7 @@
 import static com.io7m.waxmill.machines.WXMBootConfigurationType.WXMEvaluatedBootConfigurationType;
 import static com.io7m.waxmill.machines.WXMDeviceType.WXMDeviceVirtioNetworkType.WXMTTYBackendType;
 import static com.io7m.waxmill.machines.WXMDeviceType.WXMStorageBackendType;
+import static com.io7m.waxmill.machines.WXMTTYBackends.NMDMSide.NMDM_GUEST;
 import static com.io7m.waxmill.machines.WXMTTYBackends.NMDMSide.NMDM_HOST;
 import static com.io7m.waxmill.machines.WXMTTYBackends.nmdmPath;
 
@@ -743,7 +744,7 @@ private void configureBhyveDeviceLPCBackend(
                 .mountPoint()
                 .getFileSystem(),
               this.machine.id(),
-              NMDM_HOST
+              NMDM_GUEST
             )
           ));
         break;

diff --git a/com.io7m.waxmill.boot/src/main/java/com/io7m/waxmill/boot/internal/WXMDeviceMap.java b/com.io7m.waxmill.boot/src/main/java/com/io7m/waxmill/boot/internal/WXMDeviceMap.java
@@ -50,6 +50,7 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
+import static com.io7m.waxmill.machines.WXMTTYBackends.NMDMSide.NMDM_GUEST;
 import static com.io7m.waxmill.machines.WXMTTYBackends.NMDMSide.NMDM_HOST;
 import static com.io7m.waxmill.machines.WXMTTYBackends.nmdmPath;
 
@@ -208,7 +209,7 @@ private static void processLPC(
               .mountPoint()
               .getFileSystem(),
             machine.id(),
-            NMDM_HOST
+            NMDM_GUEST
           );
           others.add(path);
           nmdmPaths.add(path);

diff --git a/...ests/src/test/java/com/io7m/waxmill/tests/boot/WXMBootConfigurationEvaluatorGRUBTest.java b/...ests/src/test/java/com/io7m/waxmill/tests/boot/WXMBootConfigurationEvaluatorGRUBTest.java
@@ -1418,7 +1418,7 @@ public void linuxLPC()
     final var lastExec = commands.lastExecution().orElseThrow();
     assertEquals(
       String.format(
-        "/usr/sbin/bhyve -U %s -P -A -w -H -c cpus=1,sockets=1,cores=1,threads=1 -m 512M -s 0:0:0,hostbridge -s 0:1:0,ahci-hd,/tmp/file -s 0:2:0,lpc -l bootrom,/tmp/rom -l com1,/dev/nmdm_%s_B -l com2,stdio %s",
+        "/usr/sbin/bhyve -U %s -P -A -w -H -c cpus=1,sockets=1,cores=1,threads=1 -m 512M -s 0:0:0,hostbridge -s 0:1:0,ahci-hd,/tmp/file -s 0:2:0,lpc -l bootrom,/tmp/rom -l com1,/dev/nmdm_%s_A -l com2,stdio %s",
         machine.id(),
         machine.id(),
         WXMShortIDs.encode(machine.id())),