From 1f467d1ab1ad3bbb4c07095f4ef7478c60d4bd32 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 1 Nov 2017 16:05:55 +0100 Subject: [PATCH] qemu: command: Move disk serial validation to qemuCheckDiskConfig --- src/qemu/qemu_command.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1c8e3d6838..2fe4ae380a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1429,6 +1429,10 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, } } + if (disk->serial && + qemuSafeSerialParamValue(disk->serial) < 0) + return -1; + return 0; } @@ -1714,8 +1718,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (disk->serial && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { - if (qemuSafeSerialParamValue(disk->serial) < 0) - goto error; virBufferAddLit(&opt, ",serial="); virBufferEscape(&opt, '\\', " ", "%s", disk->serial); }