bhyve supports marking disks "readonly" using the "ro" parameter.
Update AHCI, NVMe, and virtio-blk command generation to add this
parameter when <readonly/> is specified.

Signed-off-by: Roman Bogorodskiy <[email protected]>
---
 src/bhyve/bhyve_command.c                     |  9 ++++-
 .../bhyvexml2argv-bhyveload-bootorder.args    |  2 +-
 .../bhyvexml2argv-bhyveload-bootorder1.args   |  2 +-
 .../bhyvexml2argv-bhyveload-bootorder3.args   |  2 +-
 .../x86_64/bhyvexml2argv-disk-cdrom-grub.args |  2 +-
 .../x86_64/bhyvexml2argv-disk-cdrom.args      |  2 +-
 .../x86_64/bhyvexml2argv-disk-readonly.args   | 11 +++++
 .../x86_64/bhyvexml2argv-disk-readonly.ldargs |  4 ++
 .../x86_64/bhyvexml2argv-disk-readonly.xml    | 40 +++++++++++++++++++
 tests/bhyvexml2argvtest.c                     |  1 +
 10 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args
 create mode 100644 
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs
 create mode 100644 
tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 7e3d3d4553..31ea9d6740 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -369,6 +369,9 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def,
         if (disk->info.bootIndex != 0)
             virBufferAsprintf(&device, ",bootindex=%u", disk->info.bootIndex);
 
+        if (disk->src->readonly)
+            virBufferAddLit(&device, ",ro");
+
         virBufferAddBuffer(&buf, &device);
     }
 
@@ -391,7 +394,6 @@ bhyveBuildSCSIControllerArgStr(const virDomainDef *def,
     size_t i;
 
     for (i = 0; i < def->ndisks; i++) {
-        g_auto(virBuffer) device = VIR_BUFFER_INITIALIZER;
         virDomainDiskDef *disk = def->disks[i];
 
         if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)
@@ -518,6 +520,8 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def,
                               disk->wwn);
         if (controller->opts.nvmeopts.serial)
             virBufferAsprintf(&opt, ",ser=%s", 
controller->opts.nvmeopts.serial);
+        if (disk->src->readonly)
+            virBufferAddLit(&opt, ",ro");
 
         nvme_opts = virBufferContentAndReset(&opt);
 
@@ -600,6 +604,9 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def 
G_GNUC_UNUSED,
     if (disk->info.bootIndex != 0)
         virBufferAsprintf(&opts, ",bootindex=%u", disk->info.bootIndex);
 
+    if (disk->src->readonly)
+        virBufferAddLit(&opts, ",ro");
+
     virCommandAddArg(cmd, "-s");
     virCommandAddArgFormat(cmd, "%d:0,virtio-blk,%s%s",
                            disk->info.addr.pci.slot,
diff --git 
a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args
index a6df2a673e..6ecc2ef181 100644
--- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args
@@ -5,6 +5,6 @@ bhyve \
 -H \
 -P \
 -s 0:0,hostbridge \
--s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \
+-s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,ro \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 \
 bhyve
diff --git 
a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args
index f10304cc9f..e554ab84d4 100644
--- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args
@@ -5,6 +5,6 @@ bhyve \
 -H \
 -P \
 -s 0:0,hostbridge \
--s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \
+-s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,ro \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e \
 bhyve
diff --git 
a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args
index bdcd73499b..2d78b21299 100644
--- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args
@@ -5,6 +5,6 @@ bhyve \
 -H \
 -P \
 -s 0:0,hostbridge \
--s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,bootindex=1 \
+-s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,bootindex=1,ro \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 \
 bhyve
diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args
index f54ebbc8b3..64af5e8c09 100644
--- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args
@@ -5,6 +5,6 @@ bhyve \
 -H \
 -P \
 -s 0:0,hostbridge \
--s 2:0,ahci,cd:/tmp/cdrom.iso \
+-s 2:0,ahci,cd:/tmp/cdrom.iso,ro \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 \
 bhyve
diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args
index ba6ddeffbe..a2f2ea8d71 100644
--- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args
@@ -5,6 +5,6 @@ bhyve \
 -H \
 -P \
 -s 0:0,hostbridge \
--s 2:0,ahci,cd:/tmp/cdrom.iso \
+-s 2:0,ahci,cd:/tmp/cdrom.iso,ro \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b \
 bhyve
diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args
new file mode 100644
index 0000000000..9cb5abc162
--- /dev/null
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args
@@ -0,0 +1,11 @@
+bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-s 
2:0,nvme,/tmp/nvme-readonly.img,maxq=2,qsz=256,eui64=0x01000000efbeadde,ser=BHYVE-NVME0-01234,ro
 \
+-s 
3:0,ahci,hd:/tmp/sata-readonly.img,nmrr=7200,ser=BHYVE-SATA-RO,ro,hd:/tmp/sata-writable.img,nmrr=5400,ser=BHYVE-SATA-RW
 \
+-s 4:0,virtio-blk,/tmp/virtio-readonly.img,ro \
+bhyve
diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs
new file mode 100644
index 0000000000..02a3ac0f73
--- /dev/null
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs
@@ -0,0 +1,4 @@
+bhyveload \
+-m 214 \
+-d /tmp/sata-readonly.img \
+bhyve
diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml 
b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml
new file mode 100644
index 0000000000..2dbc1a9bd2
--- /dev/null
+++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml
@@ -0,0 +1,40 @@
+<domain type='bhyve'>
+  <name>bhyve</name>
+  <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+  <memory>219136</memory>
+  <vcpu>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <devices>
+    <controller type='nvme' index='0'>
+      <serial>BHYVE-NVME0-01234</serial>
+    </controller>
+    <disk type='file'>
+      <serial>BHYVE-SATA-RO</serial>
+      <driver name='file' type='raw'/>
+      <source file='/tmp/sata-readonly.img'/>
+      <target dev='hda' bus='sata' rotation_rate='7200'/>
+      <readonly/>
+    </disk>
+    <disk type='file'>
+      <serial>BHYVE-SATA-RW</serial>
+      <driver name='file' type='raw'/>
+      <source file='/tmp/sata-writable.img'/>
+      <target dev='hdb' bus='sata' rotation_rate='5400'/>
+    </disk>
+    <disk type='file'>
+      <driver name='file' type='raw'/>
+      <source file='/tmp/virtio-readonly.img'/>
+      <target dev='vda' bus='virtio'/>
+      <readonly/>
+    </disk>
+    <disk type='file'>
+      <driver name='file' type='raw' queues='2' queue_size='256'/>
+      <source file='/tmp/nvme-readonly.img'/>
+      <target dev='nvme0n1' bus='nvme'/>
+      <wwn>01000000efbeadde</wwn>
+      <readonly/>
+    </disk>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index 0b700cc5b0..c208db6311 100644
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -239,6 +239,7 @@ mymain(void)
     DO_TEST_FAILURE("acpiapic");
     DO_TEST("disk-cdrom");
     DO_TEST("disk-virtio");
+    DO_TEST("disk-readonly");
     DO_TEST("macaddr");
     DO_TEST("serial");
     DO_TEST("console");
-- 
2.55.0

Reply via email to