From nobody Fri May 17 10:44:05 2024 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712144766029409.83807826874715; Wed, 3 Apr 2024 04:46:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CE68018C9; Wed, 3 Apr 2024 07:46:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 77F071AB7; Wed, 3 Apr 2024 07:44:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C6F518FC; Wed, 3 Apr 2024 07:44:45 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 C281118FC for ; Wed, 3 Apr 2024 07:44:44 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-7KtXYOkZN4u7wSPLm0AH2Q-1; Wed, 03 Apr 2024 07:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0388828043C9 for ; Wed, 3 Apr 2024 11:44:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70D444853 for ; Wed, 3 Apr 2024 11:44:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 7KtXYOkZN4u7wSPLm0AH2Q-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/2] docs: Rewrite documentation for network device models Date: Wed, 3 Apr 2024 13:44:19 +0200 Message-ID: <27a3e14682da8f3d52da3c5ae5a8b061dc6bd63e.1712144605.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: CWFT7JOACEINY5EOU5MLLHKI4DSASRLL X-Message-ID-Hash: CWFT7JOACEINY5EOU5MLLHKI4DSASRLL X-MailFrom: pkrempa@redhat.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 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: 1712144767533100001 Since libvirt now tries to interpret network device models (unless an unknow model is used) the documentation didn't make a good job specifying what is supported. Rewrite the docs to explicitly list the models which we do parse. Signed-off-by: Peter Krempa Reviewed-by: Jonathon Jongsma --- docs/formatdomain.rst | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e2f66b982c..a68d90c4a4 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5592,23 +5592,26 @@ Setting the NIC model ... For hypervisors which support this, you can set the model of emulated netw= ork -interface card. +interface card via the ``model`` element. -The values for ``type`` aren't defined specifically by libvirt, but by wha= t the -underlying hypervisor supports (if any). For QEMU and KVM you can get a li= st of -supported models with these commands: +While libvirt accepts any value as the ``type`` and passes it to the +hypervisor to preserve compatibility, most devices nowadays have additional +handling and address allocation which may not work properly unless the mod= el +is known by libvirt. -:: +Libvirt supports natively the following network device models: +``virtio``, ``virtio-transitional`` (:since:`Since 5.2.0`), +``virtio-non-transitional`` (:since:`Since 5.2.0`), ``e1000``, ``e1000e``, +``igb`` (:since:`Since 9.3.0`), ``rtl8139``, ``netfront``, +``usb-net`` (:since:`Since 10.3.0`), ``spapr-vlan``, ``lan9118``, ``scm91c= 111``, +``vlance``, ``vmxnet``, ``vmxnet2``, ``vmxnet3``, ``Am79C970A``, ``Am79C97= 3``, +``82540EM``, ``82545EM``, ``82543GC``. + +For QEMU you can get a list of supported models with this commands: - qemu -net nic,model=3D? /dev/null - qemu-kvm -net nic,model=3D? /dev/null +:: -Typical values for QEMU and KVM include: ne2k_isa i82551 i82557b i82559er -ne2k_pci pcnet rtl8139 e1000 virtio. :since:`Since 5.2.0`, -``virtio-transitional`` and ``virtio-non-transitional`` values are support= ed. -See `Virtio transitional devices`_ for more details. -:since:`Since 9.3.0` igb is also supported. -:since:`Since 10.3.0` usb-net is supported. + qemu-system-x86_64 -net nic,model=3D? Setting NIC driver-specific options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 10:44:05 2024 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712144821074154.60047523982723; Wed, 3 Apr 2024 04:47:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BAD3819CB; Wed, 3 Apr 2024 07:46:59 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6F3511A67; Wed, 3 Apr 2024 07:44:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6019218EE; Wed, 3 Apr 2024 07:44:46 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 AEBDE18FC for ; Wed, 3 Apr 2024 07:44:45 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-Rj7ltg-jMIy7JyIgyvNRQQ-1; Wed, 03 Apr 2024 07:44:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 10D9628043C7 for ; Wed, 3 Apr 2024 11:44:44 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5777F37FC for ; Wed, 3 Apr 2024 11:44:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Rj7ltg-jMIy7JyIgyvNRQQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/2] virDomainDeviceIsUSB: Handle all USB devices and simplify the code Date: Wed, 3 Apr 2024 13:44:20 +0200 Message-ID: <2bdb7de804864fa1ff6e804db1da52bc8639fb60.1712144605.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: VANTHJ2QB3OTYMFBTTGS2TDARW5AZIGR X-Message-ID-Hash: VANTHJ2QB3OTYMFBTTGS2TDARW5AZIGR X-MailFrom: pkrempa@redhat.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 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: 1712144821909100001 Rework 'virDomainUSBDeviceDefForeach' to use virDomainDeviceInfoIterate instead of open-coding all iterators. To achieve this 'virDomainDeviceIsUSB' needs to be fixed as it didn't properly handle 'sound', 'fs', 'chr', 'ccid', and 'net usb devices. Signed-off-by: Peter Krempa Reviewed-by: Jonathon Jongsma --- src/conf/domain_conf.c | 228 +++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 122 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 48c5d546da..457bee08b1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28262,28 +28262,117 @@ virDomainObjFormat(virDomainObj *obj, return virBufferContentAndReset(&buf); } + static bool -virDomainDeviceIsUSB(virDomainDeviceDef *dev) -{ - int t =3D dev->type; - if ((t =3D=3D VIR_DOMAIN_DEVICE_DISK && - dev->data.disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_USB) || - (t =3D=3D VIR_DOMAIN_DEVICE_INPUT && - dev->data.input->bus =3D=3D VIR_DOMAIN_INPUT_BUS_USB) || - (t =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV && - dev->data.hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - dev->data.hostdev->source.subsys.type =3D=3D - VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) || - (t =3D=3D VIR_DOMAIN_DEVICE_HUB && - dev->data.hub->type =3D=3D VIR_DOMAIN_HUB_TYPE_USB) || - (t =3D=3D VIR_DOMAIN_DEVICE_REDIRDEV && - dev->data.redirdev->bus =3D=3D VIR_DOMAIN_REDIRDEV_BUS_USB)) - return true; +virDomainDeviceIsUSB(virDomainDeviceDef *dev, + bool skipHubs) +{ + switch (dev->type) { + case VIR_DOMAIN_DEVICE_HUB: + if (skipHubs) + return false; + + return dev->data.hub->type =3D=3D VIR_DOMAIN_HUB_TYPE_USB; + + case VIR_DOMAIN_DEVICE_HOSTDEV: + return dev->data.hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOS= TDEV_SUBSYS_TYPE_USB; + + case VIR_DOMAIN_DEVICE_DISK: + return dev->data.disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_USB; + + case VIR_DOMAIN_DEVICE_NET: + return dev->data.net->model =3D=3D VIR_DOMAIN_NET_MODEL_USB_NET; + + case VIR_DOMAIN_DEVICE_CONTROLLER: + return dev->data.controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYP= E_CCID; + + case VIR_DOMAIN_DEVICE_INPUT: + return dev->data.input->bus =3D=3D VIR_DOMAIN_INPUT_BUS_USB; + + case VIR_DOMAIN_DEVICE_CHR: + if (dev->data.chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SE= RIAL) + return dev->data.chr->targetType =3D=3D VIR_DOMAIN_CHR_SERIAL_= TARGET_TYPE_USB; + + return false; + + case VIR_DOMAIN_DEVICE_SOUND: + return dev->data.sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_USB; + + case VIR_DOMAIN_DEVICE_REDIRDEV: + return dev->data.redirdev->bus =3D=3D VIR_DOMAIN_REDIRDEV_BUS_USB; + + case VIR_DOMAIN_DEVICE_FS: + return dev->data.fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_MTP; + + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_VIDEO: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_NONE: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_LAST: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_VSOCK: + case VIR_DOMAIN_DEVICE_AUDIO: + case VIR_DOMAIN_DEVICE_CRYPTO: + break; + } return false; } +struct virDomainUSBDeviceDefForeachIteratorData { + virDomainUSBDeviceDefIterator iter; + void *iterdata; + bool skipHubs; +}; + + +static int +virDomainUSBDeviceDefForeachIterator(virDomainDef *def G_GNUC_UNUSED, + virDomainDeviceDef *device, + virDomainDeviceInfo *info, + void *opaque) +{ + struct virDomainUSBDeviceDefForeachIteratorData *data =3D opaque; + + if (!virDomainDeviceIsUSB(device, data->skipHubs)) + return 0; + + if (data->iter(info, data->iterdata) < 0) + return -1; + + return 0; +} + + +int +virDomainUSBDeviceDefForeach(virDomainDef *def, + virDomainUSBDeviceDefIterator iter, + void *opaque, + bool skipHubs) +{ + struct virDomainUSBDeviceDefForeachIteratorData data =3D { + .iter =3D iter, + .iterdata =3D opaque, + .skipHubs =3D skipHubs, + }; + + return virDomainDeviceInfoIterate(def, + virDomainUSBDeviceDefForeachIterator, + &data); +} + + + typedef struct _virDomainCompatibleDeviceData virDomainCompatibleDeviceDat= a; struct _virDomainCompatibleDeviceData { virDomainDeviceInfo *newInfo; @@ -28345,7 +28434,7 @@ virDomainDefCompatibleDevice(virDomainDef *def, if (!virDomainDefHasUSB(def) && def->os.type !=3D VIR_DOMAIN_OSTYPE_EXE && - virDomainDeviceIsUSB(dev)) { + virDomainDeviceIsUSB(dev, false)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Device configuration is not compatible: Domain h= as no USB bus support")); return -1; @@ -28658,111 +28747,6 @@ virDomainSmartcardDefForeach(virDomainDef *def, } -int -virDomainUSBDeviceDefForeach(virDomainDef *def, - virDomainUSBDeviceDefIterator iter, - void *opaque, - bool skipHubs) -{ - size_t i; - - /* usb-hub */ - if (!skipHubs) { - for (i =3D 0; i < def->nhubs; i++) { - virDomainHubDef *hub =3D def->hubs[i]; - if (hub->type =3D=3D VIR_DOMAIN_HUB_TYPE_USB) { - if (iter(&hub->info, opaque) < 0) - return -1; - } - } - } - - /* usb-host */ - for (i =3D 0; i < def->nhostdevs; i++) { - virDomainHostdevDef *hostdev =3D def->hostdevs[i]; - if (hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_T= YPE_USB) { - if (iter(hostdev->info, opaque) < 0) - return -1; - } - } - - /* usb-storage */ - for (i =3D 0; i < def->ndisks; i++) { - virDomainDiskDef *disk =3D def->disks[i]; - if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_USB) { - if (iter(&disk->info, opaque) < 0) - return -1; - } - } - - /* usb-net */ - for (i =3D 0; i < def->nnets; i++) { - virDomainNetDef *net =3D def->nets[i]; - if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_USB_NET) { - if (iter(&net->info, opaque) < 0) - return -1; - } - } - - /* usb-ccid */ - for (i =3D 0; i < def->ncontrollers; i++) { - virDomainControllerDef *cont =3D def->controllers[i]; - if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_CCID) { - if (iter(&cont->info, opaque) < 0) - return -1; - } - } - - /* usb-kbd, usb-mouse, usb-tablet */ - for (i =3D 0; i < def->ninputs; i++) { - virDomainInputDef *input =3D def->inputs[i]; - - if (input->bus =3D=3D VIR_DOMAIN_INPUT_BUS_USB) { - if (iter(&input->info, opaque) < 0) - return -1; - } - } - - /* usb-serial */ - for (i =3D 0; i < def->nserials; i++) { - virDomainChrDef *serial =3D def->serials[i]; - if (serial->targetType =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_US= B) { - if (iter(&serial->info, opaque) < 0) - return -1; - } - } - - /* usb-audio model=3Dusb */ - for (i =3D 0; i < def->nsounds; i++) { - virDomainSoundDef *sound =3D def->sounds[i]; - if (sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_USB) { - if (iter(&sound->info, opaque) < 0) - return -1; - } - } - - /* usb-redir */ - for (i =3D 0; i < def->nredirdevs; i++) { - virDomainRedirdevDef *redirdev =3D def->redirdevs[i]; - if (redirdev->bus =3D=3D VIR_DOMAIN_REDIRDEV_BUS_USB) { - if (iter(&redirdev->info, opaque) < 0) - return -1; - } - } - - /* 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; -} - - /* Copy src into a new definition; with the quality of the copy * depending on the migratable flag (false for transitions between * persistent and active, true for transitions across save files or --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org