[PATCH 09/11] qemu: Add support for emulated NVMe disks

From: Martin Kletzander <mkletzan(a)redhat.com&gt; Without any hotplug. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; Signed-off-by: Honglei Wang <honglei.wang(a)smartx.com&gt; --- src/qemu/qemu_command.c | 18 ++++++- src/qemu/qemu_validate.c | 13 +++++ .../disk-target-nvme.x86_64-latest.args | 39 ++++++++++++++ .../disk-target-nvme.x86_64-latest.xml | 53 +++++++++++++++++++ tests/qemuxmlconfdata/disk-target-nvme.xml | 32 +++++++++++ tests/qemuxmlconftest.c | 1 + 6 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/disk-target-nvme.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9ec9ce343b50..78bcae380c14 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -533,6 +533,18 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, break; case VIR_DOMAIN_DISK_BUS_NVME: + if (!(controllerAlias = virDomainControllerAliasFind(domainDef, + VIR_DOMAIN_CONTROLLER_TYPE_NVME, + info->addr.drive.controller))) + return -1; + + if (virJSONValueObjectAdd(&props, + "s:bus", controllerAlias, + "u:nsid", info->addr.drive.unit + 1, + NULL) < 0) + return -1; + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: case VIR_DOMAIN_DISK_BUS_USB: case VIR_DOMAIN_DISK_BUS_XEN: @@ -1724,6 +1736,9 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, break; case VIR_DOMAIN_DISK_BUS_NVME: + driver = "nvme-ns"; + break; + case VIR_DOMAIN_DISK_BUS_XEN: case VIR_DOMAIN_DISK_BUS_UML: case VIR_DOMAIN_DISK_BUS_SD: @@ -1793,7 +1808,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) biosCHSTrans = virDomainDiskGeometryTransTypeToString(disk->geometry.trans); - if (disk->serial) { + /* NVMe disks have serial numbers attached to controllers, not namespaces */ + if (disk->serial && disk->bus != VIR_DOMAIN_DISK_BUS_NVME) { virBuffer buf = VIR_BUFFER_INITIALIZER; virBufferEscape(&buf, '\\', " ", "%s", disk->serial); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8730cf4e941f..1da5771877ed 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3204,6 +3204,19 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, break; case VIR_DOMAIN_DISK_BUS_NVME: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVME_NS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NVMe disks are not supported with this QEMU binary")); + return -1; + } + + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected address type for nvme disk")); + return -1; + } + break; + case VIR_DOMAIN_DISK_BUS_XEN: case VIR_DOMAIN_DISK_BUS_SD: case VIR_DOMAIN_DISK_BUS_NONE: diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args new file mode 100644 index 000000000000..9551f1f2904b --- /dev/null +++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-bar \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-bar/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-bar/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-bar/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=bar,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-bar/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 00010203-0405-4607-8809-0a0b0c0d0e0f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"nvme","id":"nvme0","serial":"abcdefgh","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"nvme","id":"nvme1","serial":"ASDF","num_queues":4,"ioeventfd":true,"bus":"pci.0","addr":"0x3"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"nvme-ns","bus":"nvme0","nsid":1,"drive":"libvirt-2-storage","id":"nvme0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"nvme-ns","bus":"nvme0","nsid":2,"drive":"libvirt-1-storage","id":"nvme0-0-1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml new file mode 100644 index 000000000000..2a46300e6d36 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>bar</name> + <uuid>00010203-0405-4607-8809-0a0b0c0d0e0f</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='nvme0n1' bus='nvme'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='nvme0n2' bus='nvme'/> + <serial>abcdefgh</serial> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <controller type='nvme' index='0'> + <serial>abcdefgh</serial> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <controller type='nvme' index='1'> + <serial>ASDF</serial> + <driver queues='4' ioeventfd='on'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/disk-target-nvme.xml b/tests/qemuxmlconfdata/disk-target-nvme.xml new file mode 100644 index 000000000000..22ea57e1425b --- /dev/null +++ b/tests/qemuxmlconfdata/disk-target-nvme.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>bar</name> + <uuid>00010203-0405-4607-8809-0a0b0c0d0e0f</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='nvme0n1' bus='nvme'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='nvme0n2' bus='nvme'/> + <serial>abcdefgh</serial> + </disk> + <controller type='nvme' index='1'> + <serial>ASDF</serial> + <driver queues='4' ioeventfd="on"/> + </controller> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 9a29262d1b66..06a68e6bc6db 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1606,6 +1606,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-ssh"); DO_TEST_CAPS_LATEST("disk-no-boot"); DO_TEST_CAPS_LATEST("disk-nvme"); + DO_TEST_CAPS_LATEST("disk-target-nvme"); DO_TEST_CAPS_LATEST("disk-vhostuser-numa"); DO_TEST_CAPS_LATEST("disk-vhostuser"); DO_TEST_CAPS_ARCH_LATEST_FULL("disk-vhostvdpa", "x86_64", -- 2.49.0