Skip to content
This repository has been archived by the owner on Apr 20, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/0.0.8'
Browse files Browse the repository at this point in the history 
Release: com.io7m.waxmill 0.0.8
Change: Ensure vm-console uses the correct NMDM device side (Ticket: #33)
  • Loading branch information
@io7m
io7m committed Jul 30, 2020
2 parents 1be34f6 + f39eec4 commit d724e83
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 24 deletions.
13 changes: 11 additions & 2 deletions README-CHANGES.xml
View file
Expand Up @@ -63,21 +63,30 @@
<c:change date="2020-07-29T00:00:00+00:00" summary="Add vm-id-of command"/>
</c:changes>
</c:release>
<c:release date="2020-07-30T15:42:16+00:00" ticket-system="com.github.io7m.waxmill" version="0.0.7">
<c:release date="2020-07-30T00:00:00+00:00" ticket-system="com.github.io7m.waxmill" version="0.0.7">
<c:changes>
<c:change date="2020-07-30T00:00:00+00:00" summary="Use -w by default.">
<c:tickets>
<c:ticket id="31"/>
</c:tickets>
</c:change>
<c:change date="2020-07-30T00:00:00+00:00" summary="Extended the vm-set command to cover all flags"/>
<c:change date="2020-07-30T15:42:16+00:00" summary="Assign VMs UUIDs with the bhyve -U flag">
<c:change date="2020-07-30T00:00:00+00:00" summary="Assign VMs UUIDs with the bhyve -U flag">
<c:tickets>
<c:ticket id="32"/>
</c:tickets>
</c:change>
</c:changes>
</c:release>
<c:release date="2020-07-30T16:03:51+00:00" ticket-system="com.github.io7m.waxmill" version="0.0.8">
<c:changes>
<c:change date="2020-07-30T16:03:51+00:00" summary="Ensure vm-console uses the correct NMDM device side">
<c:tickets>
<c:ticket id="33"/>
</c:tickets>
</c:change>
</c:changes>
</c:release>
</c:releases>
<c:ticket-systems>
<c:ticket-system default="true" id="com.github.io7m.waxmill" url="https://www.github.com/io7m/waxmill/issues/"/>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.boot/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.boot</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion com.io7m.waxmill.boot/src/main/java/com/io7m/waxmill/boot/WXMBootConfigurationEvaluator.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -743,7 +744,7 @@ private void configureBhyveDeviceLPCBackend(
.mountPoint()
.getFileSystem(),
this.machine.id(),
NMDM_HOST
NMDM_GUEST
)
));
break;
Expand Down
3 changes: 2 additions & 1 deletion com.io7m.waxmill.boot/src/main/java/com/io7m/waxmill/boot/internal/WXMDeviceMap.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -208,7 +209,7 @@ private static void processLPC(
.mountPoint()
.getFileSystem(),
machine.id(),
NMDM_HOST
NMDM_GUEST
);
others.add(path);
nmdmPaths.add(path);
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.client.api/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.client.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.client.vanilla/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.client.vanilla</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.cmdline/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.cmdline</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.database.api/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.database.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.database.vanilla/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.database.vanilla</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.documentation/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.documentation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.exceptions/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.exceptions</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.locks/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.locks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.machines/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.machines</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.parser.api/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.parser.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.process.api/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.process.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.process.posix/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.process.posix</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.realize/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.realize</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.serializer.api/pom.xml
View file
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.serializer.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.strings.api/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.strings.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.tests/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/src/test/java/com/io7m/waxmill/tests/boot/WXMBootConfigurationEvaluatorGRUBTest.java
View file
Expand Up @@ -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())),
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.waxmill.xml/pom.xml
View file
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>com.io7m.waxmill</artifactId>
<groupId>com.io7m.waxmill</groupId>
<version>0.0.7</version>
<version>0.0.8</version>
</parent>

<artifactId>com.io7m.waxmill.xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -12,7 +12,7 @@

<groupId>com.io7m.waxmill</groupId>
<artifactId>com.io7m.waxmill</artifactId>
<version>0.0.7</version>
<version>0.0.8</version>
<packaging>pom</packaging>

<description>FreeBSD BHyve Manager</description>
Expand Down

0 comments on commit d724e83

Please sign in to comment.