10:54 a.m.
Now, that we have everything prepared, we can generate command
line for NVMe disks.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_block.c | 25 ++++++++-
src/qemu/qemu_command.c | 3 ++
src/qemu/qemu_process.c | 7 +++
.../disk-nvme.x86_64-latest.args | 52 +++++++++++++++++++
tests/qemuxml2argvtest.c | 1 +
5 files changed, 87 insertions(+), 1 deletion(-)
create mode 100644 tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 5eeb3757f1..bf49b7bc7c 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -992,6 +992,25 @@ qemuBlockStorageSourceGetVvfatProps(virStorageSourcePtr src)
}
+static virJSONValuePtr
+qemuBlockStorageSourceGetNVMeProps(virStorageSourcePtr src)
+{
+ const virStorageSourceNVMeDef *nvme = src->nvme;
+ VIR_AUTOFREE(char *) pciAddr = NULL;
+ virJSONValuePtr ret = NULL;
+
+ if (!(pciAddr = virPCIDeviceAddressAsString(&nvme->pciAddr)))
+ return NULL;
+
+ ignore_value(virJSONValueObjectCreate(&ret,
+ "s:driver", "nvme",
+ "s:device", pciAddr,
+ "U:namespace", nvme->namespace,
+ NULL));
+ return ret;
+}
+
+
static int
qemuBlockStorageSourceGetBlockdevGetCacheProps(virStorageSourcePtr src,
virJSONValuePtr props)
@@ -1049,8 +1068,12 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src,
return NULL;
break;
- case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_NVME:
+ if (!(fileprops = qemuBlockStorageSourceGetNVMeProps(src)))
+ return NULL;
+ break;
+
+ case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
return NULL;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 927641cf46..e42377927e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1594,6 +1594,9 @@ qemuDiskSourceNeedsProps(virStorageSourcePtr src,
src->haveTLS == VIR_TRISTATE_BOOL_YES)
return true;
+ if (actualType == VIR_STORAGE_TYPE_NVME)
+ return true;
+
return false;
}
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index aa09ef175a..ebe35e6363 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5294,6 +5294,13 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm,
_("PowerPC pseries machines do not support floppy
device"));
return -1;
}
+
+ if (src->type == VIR_STORAGE_TYPE_NVME &&
+ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_NVME)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("NVMe disks are not supported with this QEMU
binary"));
+ return -1;
+ }
}
return 0;
diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
new file mode 100644
index 0000000000..5ff41de7b9
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
@@ -0,0 +1,52 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i686 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+-drive file.driver=nvme,file.device=0000:01:00.0,file.namespace=1,format=raw,\
+if=none,id=drive-virtio-disk0 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+id=virtio-disk0,bootindex=1 \
+-drive file.driver=nvme,file.device=0000:01:00.0,file.namespace=2,format=raw,\
+if=none,id=drive-virtio-disk1 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
+id=virtio-disk1 \
+-drive file.driver=nvme,file.device=0000:02:00.0,file.namespace=1,format=raw,\
+if=none,id=drive-virtio-disk2 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\
+id=virtio-disk2 \
+-object secret,id=virtio-disk3-luks-secret0,\
+data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+-drive file.driver=nvme,file.device=0001:02:00.0,file.namespace=2,\
+key-secret=virtio-disk3-luks-secret0,format=luks,if=none,id=drive-virtio-disk3 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,\
+id=virtio-disk3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 0ac128be00..d4a16c35a6 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1068,6 +1068,7 @@ mymain(void)
driver.config->vxhsTLS = 0;
VIR_FREE(driver.config->vxhsTLSx509certdir);
DO_TEST("disk-no-boot", NONE);
+ DO_TEST_CAPS_LATEST("disk-nvme");
DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_FAILURE("disk-usb-nosupport", NONE);
--
2.21.0