From nobody Wed May 14 17:00:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527868313021277.3284951536009; Fri, 1 Jun 2018 08:51:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B58F3001FBB; Fri, 1 Jun 2018 15:51:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F00030012B7; Fri, 1 Jun 2018 15:51:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A38E7180BA82; Fri, 1 Jun 2018 15:51:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w51FpUew010648 for ; Fri, 1 Jun 2018 11:51:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id C19222026DFD; Fri, 1 Jun 2018 15:51:30 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66AB32026DEF for ; Fri, 1 Jun 2018 15:51:30 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 17:51:11 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/9] qemu: command: Extract setup of one disk's command line X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 01 Jun 2018 15:51:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 106 ++++++++++++++++++++++++++++----------------= ---- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 118a412ffa..9fabfdcfef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2230,6 +2230,64 @@ qemuBuildDiskUnmanagedPRCommandLine(virCommandPtr cm= d, } +static int +qemuBuildDiskCommandLine(virCommandPtr cmd, + const virDomainDef *def, + virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps, + unsigned int bootindex, + bool driveBoot) +{ + char *optstr; + qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(disk->src); + qemuDomainSecretInfoPtr secinfo =3D NULL; + qemuDomainSecretInfoPtr encinfo =3D NULL; + + if (srcPriv) { + secinfo =3D srcPriv->secinfo; + encinfo =3D srcPriv->encinfo; + } + + if (qemuBuildDiskUnmanagedPRCommandLine(cmd, disk->src) < 0) + return -1; + + if (qemuBuildDiskSecinfoCommandLine(cmd, secinfo) < 0) + return -1; + + if (qemuBuildDiskSecinfoCommandLine(cmd, encinfo) < 0) + return -1; + + if (qemuBuildDiskSrcTLSx509CommandLine(cmd, disk->src, qemuCaps) < 0) + return -1; + + virCommandAddArg(cmd, "-drive"); + + if (!(optstr =3D qemuBuildDriveStr(disk, driveBoot, qemuCaps))) + return -1; + + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + + if (qemuDiskBusNeedsDeviceArg(disk->bus)) { + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_FDC) { + if (qemuBulildFloppyCommandLineOptions(cmd, def, disk, + bootindex) < 0) + return -1; + } else { + virCommandAddArg(cmd, "-device"); + + if (!(optstr =3D qemuBuildDriveDevStr(def, disk, bootindex, + qemuCaps))) + return -1; + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } + } + + return 0; +} + + static int qemuBuildDisksCommandLine(virCommandPtr cmd, const virDomainDef *def, @@ -2260,18 +2318,9 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, } for (i =3D 0; i < def->ndisks; i++) { - char *optstr; + virDomainDiskDefPtr disk =3D def->disks[i]; unsigned int bootindex =3D 0; bool driveBoot =3D false; - virDomainDiskDefPtr disk =3D def->disks[i]; - qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_= SOURCE_PRIVATE(disk->src); - qemuDomainSecretInfoPtr secinfo =3D NULL; - qemuDomainSecretInfoPtr encinfo =3D NULL; - - if (srcPriv) { - secinfo =3D srcPriv->secinfo; - encinfo =3D srcPriv->encinfo; - } if (disk->info.bootIndex) { bootindex =3D disk->info.bootIndex; @@ -2297,42 +2346,11 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, } } - if (qemuBuildDiskUnmanagedPRCommandLine(cmd, disk->src) < 0) - return -1; - - if (qemuBuildDiskSecinfoCommandLine(cmd, secinfo) < 0) - return -1; - - if (qemuBuildDiskSecinfoCommandLine(cmd, encinfo) < 0) - return -1; - - if (qemuBuildDiskSrcTLSx509CommandLine(cmd, disk->src, qemuCaps) <= 0) + if (qemuBuildDiskCommandLine(cmd, def, disk, qemuCaps, + bootindex, driveBoot) < 0) return -1; - - virCommandAddArg(cmd, "-drive"); - - if (!(optstr =3D qemuBuildDriveStr(disk, driveBoot, qemuCaps))) - return -1; - - virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); - - if (qemuDiskBusNeedsDeviceArg(disk->bus)) { - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_FDC) { - if (qemuBulildFloppyCommandLineOptions(cmd, def, disk, - bootindex) < 0) - return -1; - } else { - virCommandAddArg(cmd, "-device"); - - if (!(optstr =3D qemuBuildDriveDevStr(def, disk, bootindex, - qemuCaps))) - return -1; - virCommandAddArg(cmd, optstr); - VIR_FREE(optstr); - } - } } + return 0; } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list