From nobody Sun Feb 8 07:08:04 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1709929752962115.99789878274771; Fri, 8 Mar 2024 12:29:12 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EAD9B1D31; Fri, 8 Mar 2024 15:29:11 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 46CAB1DEA; Fri, 8 Mar 2024 15:20:37 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AA7721C1B; Fri, 8 Mar 2024 15:20:11 -0500 (EST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CC2011C15 for ; Fri, 8 Mar 2024 15:20:09 -0500 (EST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4131675e8d5so9568705e9.1 for ; Fri, 08 Mar 2024 12:20:09 -0800 (PST) Received: from localhost.localdomain ([37.186.51.144]) by smtp.gmail.com with ESMTPSA id b3-20020a05600003c300b0033e3cb02cefsm229849wrg.86.2024.03.08.12.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:20:07 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929208; x=1710534008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gXsK+L+7m+86W0nrJPnv0KTSfX7GDUytln1Xhdcw8CE=; b=CrHWvqPVrvs6IYpMY6KrOXLE6/pvLD2fObh73OiqIoD3yKH1/d8mifGrgGl8QrrFOy hdrtJJhmIIb0RTEnqQJs4kMgjkTxxYKQnOtXpGyknDWc6U47DiNF3y/U0962O/Sftq6z Bm+jA0xSL4wwAjPKAzDVwPZ9ngbop9XaBfRcukMls9KJiBEKFToDsSduAinyX2dJRUri sUsdPmh0moxUUXaLm85mxPGoJBt/wocuTjN2qYv8z7H2fCs7AeNU3CfS5crg8rlEeFwv GeCUALyc+jBD5/4C2QTJrJAP0ALQhkMuo0HYuCBBI0wE8Osxkazy76Zm/jtKfcb8W82h GksQ== X-Gm-Message-State: AOJu0YyCr/bDDdMA0OO6hXx16LWiyhTu0THb8apE2aa0egzXuNfKmhlo 7KXcDWD3EGFuKTkCuujDTUzlEzhVKlGSwFPbz+3hvJLZHG+9v6ZAs0cyauT7NP8= X-Google-Smtp-Source: AGHT+IFTEXkUO2u+6Va6q0hNyCTI9c9SDYlAS2hQoqdJNgbc/1ZQa+Id3tLo+xmIC3uI+VTTcBeyUQ== X-Received: by 2002:a05:600c:3542:b0:412:ebce:4166 with SMTP id i2-20020a05600c354200b00412ebce4166mr214088wmq.32.1709929208072; Fri, 08 Mar 2024 12:20:08 -0800 (PST) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH 2/4] qemu: Support for parsing usb-mtp devices Date: Sat, 9 Mar 2024 01:46:46 +0530 Message-Id: <20240308201648.102984-3-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240308201648.102984-1-rayhan.faizel@gmail.com> References: <20240308201648.102984-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Message-ID-Hash: 7Q4VRDYMSX7DHY47BHO4LHQ3B5XHERDS X-Message-ID-Hash: 7Q4VRDYMSX7DHY47BHO4LHQ3B5XHERDS X-MailFrom: rayhan.faizel@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Rayhan Faizel X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1709929754722100001 The source tag sets the rootdir property of the device, which is the direct= ory exposed to the guest via the MTP device. The target tag sets the desc prope= rty. This device supports read-only mode as well. Like virtiofs, it does not support additional access modes. Signed-off-by: Rayhan Faizel --- src/bhyve/bhyve_command.c | 1 + src/conf/domain_conf.c | 10 +++++++++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_command.c | 34 +++++++++++++++++++++++++++++++ src/qemu/qemu_domain_address.c | 7 +++++-- src/qemu/qemu_validate.c | 13 ++++++++++++ 7 files changed, 69 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index d05b01ae5d..bc287307c8 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -611,6 +611,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSE= D, case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: + case VIR_DOMAIN_FS_DRIVER_TYPE_MTP: case VIR_DOMAIN_FS_DRIVER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported filesystem driver '%1$s'"), diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3597959e33..396e388ca8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -517,6 +517,7 @@ VIR_ENUM_IMPL(virDomainFSDriver, "nbd", "ploop", "virtiofs", + "mtp", ); =20 VIR_ENUM_IMPL(virDomainFSAccessMode, @@ -28721,6 +28722,15 @@ virDomainUSBDeviceDefForeach(virDomainDef *def, } } =20 + /* usb-mtp */ + for (i =3D 0; i < def->nfss; i++) { + virDomainFSDef *fsdev =3D def->fss[i]; + if (fsdev->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_MTP) { + if (iter(&fsdev->info, opaque) < 0) + return -1; + } + } + return 0; } =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c7e5005b3b..76251938b8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -804,6 +804,7 @@ typedef enum { VIR_DOMAIN_FS_DRIVER_TYPE_NBD, VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP, VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS, + VIR_DOMAIN_FS_DRIVER_TYPE_MTP, =20 VIR_DOMAIN_FS_DRIVER_TYPE_LAST } virDomainFSDriverType; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index df44cd9857..c992956280 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3253,6 +3253,11 @@ + + + mtp + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2719574fb5..9c20670843 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -861,6 +861,7 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDef= *device, *baseName =3D "vhost-user-fs"; break; =20 + case VIR_DOMAIN_FS_DRIVER_TYPE_MTP: case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: @@ -2310,6 +2311,33 @@ qemuBuildDisksCommandLine(virCommand *cmd, } =20 =20 +static int +qemuBuildMTPCommandLine(virCommand *cmd, + virDomainFSDef *fs, + const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + g_autoptr(virJSONValue) props =3D NULL; + + if (virJSONValueObjectAdd(&props, + "s:driver", "usb-mtp", + "s:id", fs->info.alias, + "s:rootdir", fs->src->path, + "s:desc", fs->dst, + "b:readonly", fs->readonly, + NULL) < 0) + return -1; + + if (qemuBuildDeviceAddressProps(props, def, &fs->info) < 0) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) < 0) + return -1; + + return 0; +} + + virJSONValue * qemuBuildVHostUserFsDevProps(virDomainFSDef *fs, const virDomainDef *def, @@ -2493,6 +2521,12 @@ qemuBuildFilesystemCommandLine(virCommand *cmd, return -1; break; =20 + case VIR_DOMAIN_FS_DRIVER_TYPE_MTP: + /* Media Transfer Protocol over USB */ + if (qemuBuildMTPCommandLine(cmd, def->fss[i], def, qemuCaps) <= 0) + return -1; + break; + case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index af486aea97..cc3bc76971 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -642,6 +642,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, /* vhost-user-fs-pci */ return virtioFlags; =20 + case VIR_DOMAIN_FS_DRIVER_TYPE_MTP: case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: @@ -2074,8 +2075,10 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, if (!virDeviceInfoPCIAddressIsWanted(&def->fss[i]->info)) continue; =20 - /* Only support VirtIO-9p-pci so far. If that changes, - * we might need to skip devices here */ + /* Skip MTP device */ + if (def->fss[i]->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_MTP) + continue; + if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->fss[i]->info)= < 0) return -1; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 73afd094a9..2d391a3916 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4469,6 +4469,19 @@ qemuValidateDomainDeviceDefFS(virDomainFSDef *fs, } break; =20 + case VIR_DOMAIN_FS_DRIVER_TYPE_MTP: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_MTP)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("mtp is not supported with this QEMU binary")= ); + return -1; + } + if (fs->accessmode !=3D VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("mtp only supports passthrough accessmode")); + return -1; + } + break; + case VIR_DOMAIN_FS_DRIVER_TYPE_LAST: default: virReportEnumRangeError(virDomainFSDriverType, fs->fsdriver); --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org