From nobody Fri May 17 10:13:39 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=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171204963577699.93783494453476; Tue, 2 Apr 2024 02:20:35 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A9E5C19B9; Tue, 2 Apr 2024 05:20:34 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E39A61AFE; Tue, 2 Apr 2024 05:19:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 48E841AE1; Tue, 2 Apr 2024 05:19:14 -0400 (EDT) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 8CB6419B9 for ; Tue, 2 Apr 2024 05:19:13 -0400 (EDT) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-341730bfc46so3496341f8f.3 for ; Tue, 02 Apr 2024 02:19:13 -0700 (PDT) Received: from localhost.localdomain ([134.0.206.35]) by smtp.gmail.com with ESMTPSA id u6-20020adfa186000000b00341e2146b53sm13637783wru.106.2024.04.02.02.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 02:19:11 -0700 (PDT) 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=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 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=1712049552; x=1712654352; 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=4FoO96ZgQwZFPswP3y9H2StoNMvk/wjySMM/bMwznKY=; b=LcOa95GS20asOnX/lv4dMhrQrVIjlp8xxcae3UqbZfNN7f9oRq7wCVrDKzEI/mFP0K ERtO0vwFOB7vRWMSj+6C6qOiXWkJ7S9jyo+A72CioWDGx6O/qAMOhFTWts4sFysV9yOZ IB6nVOzDm29Z8oSKjCNVXCub/voNrhT33/+vE08qz4N0Hj1HsO+s/BfOnf74p+KrUeR7 aaE0N0/VO8xqDSsBduuObphgbEbq2mpUSgqj4rLkpZx5UEzOIOO/bFCD+OR3qjqvjltj NleT6oRWyinY6HPfcvFtT8IfEN99M9qCwQxg0pZh1Z/MWBTGf7D2M+MQoXFp4XYtF6Lm mVCw== X-Gm-Message-State: AOJu0Yx5K+OmHhB55YP7JhC8MZ0M+7GhZ4SF1jpI96RkUJ9ICJIw2Dr+ tfxCOyazGBuje5NM2025SSiuOpcGDWFBM22Dspp0Ug8+GSNUmAZs+8o+k7Et X-Google-Smtp-Source: AGHT+IGEVZ8p9oYOm0Z1wFyApzStNC3g6XZOe/Of7XHIj6zppeCqhAlOlm58rg5uY8C/qLBYiMytAw== X-Received: by 2002:adf:e052:0:b0:341:b47f:e45a with SMTP id w18-20020adfe052000000b00341b47fe45amr8869918wrh.50.1712049551956; Tue, 02 Apr 2024 02:19:11 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH v2 1/2] conf: Automatically assign address to usb-net device Date: Tue, 2 Apr 2024 14:48:35 +0530 Message-Id: <20240402091835.249873-2-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240402091835.249873-1-rayhan.faizel@gmail.com> References: <20240402091835.249873-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Message-ID-Hash: SNR36GPLNYQ3STGNWK2SWRSHQSNXZAEV X-Message-ID-Hash: SNR36GPLNYQ3STGNWK2SWRSHQSNXZAEV 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: 1712049637594100001 This patch will allow usb-net devices to be automatically assigned a USB address (and skip any attempt to assign a PCI one). Signed-off-by: Rayhan Faizel --- docs/formatdomain.rst | 1 + src/conf/domain_conf.c | 9 ++++++++- src/qemu/qemu_domain_address.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 2adc2ff968..5fe2f3468c 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5600,6 +5600,7 @@ 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. =20 Setting NIC driver-specific options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 770b5fbbff..c45484c359 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28677,7 +28677,14 @@ virDomainUSBDeviceDefForeach(virDomainDef *def, } } =20 - /* TODO: add def->nets here when libvirt starts supporting usb-net */ + /* 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; + } + } =20 /* usb-ccid */ for (i =3D 0; i < def->ncontrollers; i++) { diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index cc3bc76971..7690021ca7 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2087,6 +2087,10 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *net =3D def->nets[i]; =20 + if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_USB_NET) { + continue; + } + /* type=3D'hostdev' network devices might be USB, and are also * in hostdevs list anyway, so handle them with other hostdevs * instead of here. --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Fri May 17 10:13:39 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=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712049682133117.71633056405778; Tue, 2 Apr 2024 02:21:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D9A731B73; Tue, 2 Apr 2024 05:21:20 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 054BE1B30; Tue, 2 Apr 2024 05:19:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1BD6319B9; Tue, 2 Apr 2024 05:19:16 -0400 (EDT) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 0394B1ADF for ; Tue, 2 Apr 2024 05:19:15 -0400 (EDT) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2d47a92cfefso59167341fa.1 for ; Tue, 02 Apr 2024 02:19:14 -0700 (PDT) Received: from localhost.localdomain ([134.0.206.35]) by smtp.gmail.com with ESMTPSA id u6-20020adfa186000000b00341e2146b53sm13637783wru.106.2024.04.02.02.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 02:19:12 -0700 (PDT) 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=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 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=1712049553; x=1712654353; 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=2qsvb//PnYKuBJGGnOnQcPHOblWcjPdhkDJEBIKVSQc=; b=oioVHA4MT30q1PcgyqKQo+nWLpn+FxMErAaUuPpFXGevdtwC0ZQcIK0IkodadIbFTF ocyBTBz2f7O0/IEB+t+UjGEMaKiAFfwpuAJRB5nKSckrV1u5CMnUHaDV5rHKDi8pY231 CnG99T20BG1eyzNdGtzx0KVLlCF4K2vhXG7ijx1ltbEiTo0AGqJgZ9vNEVPg7xxnr3f8 2VlLWq6zO8E9/jPqucDb/PbDuA5G/OzK4A2Kqt/T1/81I5+qy1t8DA3izBEq2Q+nmiqN g6NUqiHnTvksr3/Qfmw8hgIxNvoE2+6iScTEVDDRUKZzGqqKCAz3hdRknWnY299f/J+k Ie4Q== X-Gm-Message-State: AOJu0YzTSPMgbrIwA1WXqVqPyuv7X81eGtymnbNtFAYagF7l99FbTLdt MRORtzwMBrHTUIvZlPT4fBTlxdwsCG0syX4oecm93FsmVzYN35EyBqs/5hBg X-Google-Smtp-Source: AGHT+IEXZw1ZKo7hEM4sq0KXR9qbX2wIzpxLhqZlxR8c81z8F17g4E8AnumxRttHrKZjEFnewNRuhQ== X-Received: by 2002:a05:651c:3c8:b0:2d6:b4d5:d800 with SMTP id f8-20020a05651c03c800b002d6b4d5d800mr7779452ljp.23.1712049553033; Tue, 02 Apr 2024 02:19:13 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH v2 2/2] tests: Add testcase for usb-net Date: Tue, 2 Apr 2024 14:48:36 +0530 Message-Id: <20240402091835.249873-3-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240402091835.249873-1-rayhan.faizel@gmail.com> References: <20240402091835.249873-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Message-ID-Hash: 5XFV44CDCMYTBLOY5BPZSURVD27QEMSL X-Message-ID-Hash: 5XFV44CDCMYTBLOY5BPZSURVD27QEMSL 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: 1712049683774100001 Add small test case to demonstrate use of usb-net with user networking backend. Signed-off-by: Rayhan Faizel --- .../net-usb.x86_64-latest.args | 35 +++++++++++++++++++ .../qemuxmlconfdata/net-usb.x86_64-latest.xml | 35 +++++++++++++++++++ tests/qemuxmlconfdata/net-usb.xml | 20 +++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 91 insertions(+) create mode 100644 tests/qemuxmlconfdata/net-usb.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/net-usb.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/net-usb.xml diff --git a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args b/tests/qemux= mlconfdata/net-usb.x86_64-latest.args new file mode 100644 index 0000000000..714ab9aafe --- /dev/null +++ b/tests/qemuxmlconfdata/net-usb.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 2d4d4b20-b19b-4713-af0a-bf1cab8b455b \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"qemu-xhci","p2":1,"p3":1,"id":"usb","bus":"pci.0","add= r":"0x2"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"usb-net","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"usb.0","port":"1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/net-usb.x86_64-latest.xml b/tests/qemuxm= lconfdata/net-usb.x86_64-latest.xml new file mode 100644 index 0000000000..071fc9cfc4 --- /dev/null +++ b/tests/qemuxmlconfdata/net-usb.x86_64-latest.xml @@ -0,0 +1,35 @@ + + QEMUGuest1 + 2d4d4b20-b19b-4713-af0a-bf1cab8b455b + 4194304 + 4194304 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + + + + + +