From nobody Mon Dec 15 23:05:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846528; cv=none; d=zohomail.com; s=zohoarc; b=hlHg3OnxqHhnHkJ4ofmjQ+R3NjG9CWDyyksQuDdY2vKqnbtEBNuDX5lGU529Z3VyCXJ508AVNHftG4grOwID5+aQyqZns1jjGG+U7sSHUZWq/RwKRSrUHcrQBVeqPmuy0jcm/0rVN+kIjcQqN8scQJQklJjQRyO0q/kd8fKCT1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846528; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hCoKfAUuyktEuN2JCPocBLwvSAuLzt9TicN7jryokII=; b=RLgAE5kLHyynAY/WWaUcbGIZ0y1hYtHOHZ47x+Emp52m0L8RLA6qD/fyv8WcSUF2u6kPMoMiu/2T3Q6RNBMJ/rGmq23Yl+coT3QIyk0bbkApvmmjv54wAXAdtGNJ7BRo9Uy3WSpcf21JF5YtwBUbMRgxO0TvZOTq4GHEncvD9v8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658846528695113.46912136134847; Tue, 26 Jul 2022 07:42:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-BIjhLnEOMXSpn9pc3_UH8w-1; Tue, 26 Jul 2022 10:39:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2528103942F; Tue, 26 Jul 2022 14:39:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB38D2166B2B; Tue, 26 Jul 2022 14:39:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F17B41947BAA; Tue, 26 Jul 2022 14:39:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E3391194034A for ; Tue, 26 Jul 2022 14:39:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CDB2140CFD0A; Tue, 26 Jul 2022 14:39:04 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E70240CF8EE for ; Tue, 26 Jul 2022 14:39:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846527; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hCoKfAUuyktEuN2JCPocBLwvSAuLzt9TicN7jryokII=; b=CvJ9SIsb01jq4uGdTp0+KMkc0K1m//Ssb8UJKAJtCYtKlKWAdxpbdojMWpIUcSkOqYbs7X QLQqT6GhpNWQhavk8VvXZXOgA2nuSBgGofor5TdDqLuVLtAol+TsICwvoLo0Z7VvP2/MVf vQL3AnTjQanS2lS847gBOdnmKzoMGnw= X-MC-Unique: BIjhLnEOMXSpn9pc3_UH8w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 66/80] qemu: command: Generate -drive for SD cards via JSON props Date: Tue, 26 Jul 2022 16:37:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846530390100001 Content-Type: text/plain; charset="utf-8" Since we know we have a modern qemu at hand which can interpret the dotted syntax, we can format the -drive needed for SD cards via the common infrastructure we have for all blockdev stuff. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_command.c | 121 +++++++--------------------------------- 1 file changed, 20 insertions(+), 101 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index aec9e7415f..9fc3d91a42 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1789,44 +1789,6 @@ qemuDiskBusIsSD(int bus) } -/** - * qemuDiskSourceNeedsProps: - * @src: disk source - * - * Returns true, if the disk source needs to be generated from the JSON - * representation. Otherwise, the disk source should be represented using - * the legacy representation. - */ -static bool -qemuDiskSourceNeedsProps(virStorageSource *src) -{ - virStorageType actualType =3D virStorageSourceGetActualType(src); - - if (actualType =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_GLUSTER && - src->nhosts > 1) - return true; - - if (actualType =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_VXHS) - return true; - - if (actualType =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_ISCSI) - return true; - - if (actualType =3D=3D VIR_STORAGE_TYPE_NETWORK && - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_NBD && - src->haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) - return true; - - if (actualType =3D=3D VIR_STORAGE_TYPE_NVME) - return true; - - return false; -} - - /** * qemuDiskSourceGetProps: * @src: disk source struct @@ -1851,73 +1813,24 @@ qemuDiskSourceGetProps(virStorageSource *src) } -static int -qemuBuildDriveSourcePR(virBuffer *buf, - virDomainDiskDef *disk) -{ - g_autofree char *alias =3D NULL; - const char *defaultAlias =3D NULL; - - if (!disk->src->pr) - return 0; - - if (virStoragePRDefIsManaged(disk->src->pr)) - defaultAlias =3D qemuDomainGetManagedPRAlias(); - else if (!(alias =3D qemuDomainGetUnmanagedPRAlias(disk->info.alias))) - return -1; - - - virBufferAsprintf(buf, ",file.pr-manager=3D%s", alias ? alias : defaul= tAlias); - return 0; -} - - static int qemuBuildDriveSourceStr(virDomainDiskDef *disk, virBuffer *buf) { virStorageType actualType =3D virStorageSourceGetActualType(disk->src); qemuDomainStorageSourcePrivate *srcpriv =3D QEMU_DOMAIN_STORAGE_SOURCE= _PRIVATE(disk->src); - qemuDomainSecretInfo *secinfo =3D NULL; qemuDomainSecretInfo *encinfo =3D NULL; g_autoptr(virJSONValue) srcprops =3D NULL; - g_autofree char *source =3D NULL; bool rawluks =3D false; - if (srcpriv) { - secinfo =3D srcpriv->secinfo; + if (srcpriv) encinfo =3D srcpriv->encinfo; - } - - if (qemuDiskSourceNeedsProps(disk->src) && - !(srcprops =3D qemuDiskSourceGetProps(disk->src))) - return -1; - - if (!srcprops && - qemuGetDriveSourceString(disk->src, secinfo, &source) < 0) - return -1; - - /* nothing to format if the drive is empty */ - if (!(source || srcprops) || - ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY || - disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) && - disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_OPEN)) { - return 0; - } - if (actualType =3D=3D VIR_STORAGE_TYPE_BLOCK && - disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_OPEN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - disk->src->type =3D=3D VIR_STORAGE_TYPE_VOLUME ? - _("tray status 'open' is invalid for block type vol= ume") : - _("tray status 'open' is invalid for block type dis= k")); - return -1; - } - - if (source) { + switch (actualType) { + case VIR_STORAGE_TYPE_BLOCK: + case VIR_STORAGE_TYPE_FILE: + case VIR_STORAGE_TYPE_DIR: virBufferAddLit(buf, "file=3D"); - - /* for now the DIR based storage is handled by the magic FAT forma= t */ if (actualType =3D=3D VIR_STORAGE_TYPE_DIR) { virBufferAddLit(buf, "fat:"); @@ -1925,21 +1838,27 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk, virBufferAddLit(buf, "floppy:"); } - virQEMUBuildBufferEscapeComma(buf, source); - - if (secinfo) - virBufferAsprintf(buf, ",file.password-secret=3D%s", secinfo->= alias); - - if (disk->src->debug) - virBufferAsprintf(buf, ",file.debug=3D%d", disk->src->debugLev= el); + virQEMUBuildBufferEscapeComma(buf, disk->src->path); + break; - if (qemuBuildDriveSourcePR(buf, disk) < 0) + case VIR_STORAGE_TYPE_NETWORK: + if (!(srcprops =3D qemuDiskSourceGetProps(disk->src))) return -1; - } else { + if (virQEMUBuildCommandLineJSON(srcprops, buf, NULL, virQEMUBuildCommandLineJSONArrayNu= mbered) < 0) return -1; + break; + + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: + case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + break; } + + virBufferAddLit(buf, ","); if (encinfo) { --=20 2.36.1