SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmspawn: use qemu_device_driver_to_string() in resolve_disk_driver

Browse Source 
Drop the inline DiskType → QEMU device driver switch and call the shared
helper instead. serial_max and the CD-ROM read-only flag stay inline
since they are vmspawn-local.

Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
This commit is contained in:
Christian Brauner
2026-04-24 14:39:24 +02:00
parent 258c667845
commit 74a07cb774
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vmspawn/vmspawn.c
+1 -6
View File
@@ -2273,7 +2273,6 @@ static int qemu_config_add_qmp_monitor(FILE *config_file, int bridge_fds[2], int
}
static int resolve_disk_driver(DiskType dt, const char *filename, DriveInfo *info) {
const char *driver;
size_t serial_max;
int r;
@@ -2282,19 +2281,15 @@ static int resolve_disk_driver(DiskType dt, const char *filename, DriveInfo *inf
switch (dt) {
case DISK_TYPE_VIRTIO_BLK:
driver = "virtio-blk-pci";
serial_max = DISK_SERIAL_MAX_LEN_VIRTIO_BLK;
break;
case DISK_TYPE_VIRTIO_SCSI:
driver = "scsi-hd";
serial_max = DISK_SERIAL_MAX_LEN_SCSI;
break;
case DISK_TYPE_NVME:
driver = "nvme";
serial_max = DISK_SERIAL_MAX_LEN_NVME;
break;
case DISK_TYPE_VIRTIO_SCSI_CDROM:
driver = "scsi-cd";
serial_max = DISK_SERIAL_MAX_LEN_SCSI;
info->flags |= QMP_DRIVE_READ_ONLY;
break;
@@ -2302,7 +2297,7 @@ static int resolve_disk_driver(DiskType dt, const char *filename, DriveInfo *inf
assert_not_reached();
}
info->disk_driver = strdup(driver);
info->disk_driver = strdup(ASSERT_PTR(qemu_device_driver_to_string(dt)));
if (!info->disk_driver)
return log_oom();