From nobody Fri May 17 07:47:28 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 1712003865655220.9824492199026; Mon, 1 Apr 2024 13:37:45 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7016D1C21; Mon, 1 Apr 2024 16:37:44 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CB4301B41; Mon, 1 Apr 2024 16:34:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0D7121AF8; Mon, 1 Apr 2024 16:34:36 -0400 (EDT) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 E16D01AF8 for ; Mon, 1 Apr 2024 16:34:32 -0400 (EDT) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-341808b6217so2926269f8f.3 for ; Mon, 01 Apr 2024 13:34:32 -0700 (PDT) Received: from localhost.localdomain ([134.0.206.35]) by smtp.gmail.com with ESMTPSA id bp8-20020a5d5a88000000b00343300a4eb8sm12140953wrb.49.2024.04.01.13.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 13:34:30 -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=1712003671; x=1712608471; 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=7ow89ZakYiQ92dKxuzt8J55ID0oUMjMtFmhDXWjCp4c=; b=myGEvEIwu8hK+Iqvm9vvRZy23hs5faszDonwl3EK1Ja+HkpoLCmbI8DoZ89ImB0Icb d2n/JwWP6fMCHzFlC7kmT3QUpEHMnvhAiMdUUS0kUiTbGwxZhrreqwvmFMpiXka8c4EJ 7NbfLUMmCJHIpcYojohqEXfJ8dJe0//Db3Y8xl2JvWjBxDGhdnqNWtHmNJYYLdfGAt6i Pt4/LP4daEiyYP3qRf9ImDT32Q4SrOavFdEuIcpi8nqOXZvbTdgytLnXNowYJBJGgFyj j2bd3TGpD110dcPuNxWuyFHpjODxOKsNJKFuF6vbyVvmatSNyOz5RCMEOkZlxazNpLJV qKyg== X-Gm-Message-State: AOJu0Yw73x5DNcq5+q0/Q26y/jzLKAOVambsZ/IH0fGO7yN1zZ7L90KX p1g597lNP4NCrVjlX2x6SkAf4TWy2AT1KdePoh2SaZPHlGg5VRPbfNNpY5j9 X-Google-Smtp-Source: AGHT+IFfTLsjg0uV72DmiBxjN66S7uBLIYgWemGZR6uBcoyK/08X5eCBCoFzZCyQHXGt2Rlo4P/sbA== X-Received: by 2002:a5d:58ef:0:b0:33e:cbec:b2bd with SMTP id f15-20020a5d58ef000000b0033ecbecb2bdmr6326037wrd.9.1712003671145; Mon, 01 Apr 2024 13:34:31 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemu_capabilities: Re-add QEMU_CAPS_DEVICE_USB_NET capability Date: Tue, 2 Apr 2024 02:01:16 +0530 Message-Id: <20240401203118.87850-2-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240401203118.87850-1-rayhan.faizel@gmail.com> References: <20240401203118.87850-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Message-ID-Hash: 4DI4QXASLYWHJ6GDOGWX2VA3ZJOERQYF X-Message-ID-Hash: 4DI4QXASLYWHJ6GDOGWX2VA3ZJOERQYF 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: 1712003866348100001 This capability was previously prefixed with X_ due to not being in use. Signed-off-by: Rayhan Faizel --- src/qemu/qemu_capabilities.c | 3 ++- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 + 39 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 21f93c6774..eea80529f6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -238,7 +238,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "device-video-primary", /* X_QEMU_CAPS_DEVICE_VIDEO_PRIMARY = */ "s390-sclp", /* QEMU_CAPS_DEVICE_SCLPCONSOLE */ "usb-serial", /* QEMU_CAPS_DEVICE_USB_SERIAL */ - "usb-net", /* X_QEMU_CAPS_DEVICE_USB_NET */ + "usb-net", /* QEMU_CAPS_DEVICE_USB_NET */ =20 /* 125 */ "add-fd", /* X_QEMU_CAPS_ADD_FD */ @@ -1266,6 +1266,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA }, { "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA }, { "usb-serial", QEMU_CAPS_DEVICE_USB_SERIAL }, + { "usb-net", QEMU_CAPS_DEVICE_USB_NET }, { "virtio-rng-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-device", QEMU_CAPS_DEVICE_VIRTIO_RNG }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5082967cba..ed5614c753 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -216,7 +216,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video de= vice */ QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ - X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ + QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ =20 /* 125 */ X_QEMU_CAPS_ADD_FD, /* -add-fd */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0_aarch64.xml index 33d06fface..806467c2a9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_ppc64.xml index 80f503fc46..1d6c2c0622 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml index 40e3211c57..bb8512ed8e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -33,6 +33,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_aarch64.xml index 1044a49742..4e8e73f4a0 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0_ppc64.xml index 1806e6316e..94c1bd588d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_riscv64.xml index f68d88f39b..35b5679d7a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml index 1741c003cb..df78e4a59b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -33,6 +33,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml index c863baa71c..a473a4c6df 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -33,6 +33,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_aarch64.xml index ddd30feaff..e3e3164659 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_ppc64.xml index be3d464df3..ceae0c28f8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_riscv64.xml index 9280e92fd8..327e6946ee 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml index da6229f8e2..f8999b1ab1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -33,6 +33,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0_aarch64.xml index 7cf7c0707b..9ac1327989 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -26,6 +26,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml index ffaa7c2a71..d4c30d7345 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml index 22a1fc3ac7..fd6150b02d 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0_aarch64.xml index 13253f13c0..17b999bf4b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index 719e7120a3..883e30d76e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -25,6 +25,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index 010f142dee..f0a87390c6 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index b359f22b03..2a37989538 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -30,6 +30,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0_aarch64.xml index c6f31b94fd..0e72365bb3 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index 2efa4d6259..4c4b8d2e5d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index 843225b19d..f7aada242d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index 3fda8bf6ea..36b2eb6204 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -30,6 +30,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 0d43787fa9..0ed41515c0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index 7a73f762de..e272f6d2bb 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 5ba0c24a4d..8a3d441db5 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -31,6 +31,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index 887cb02fa0..466e2c2576 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_8.0.0_riscv64.xml index 9af900aaa3..11c28dd374 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -24,6 +24,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index 62a42c3ab6..a17b91bcab 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.1.0_s390x.xml index 744261be10..ce6519999d 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -14,6 +14,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index 907fc39b99..b9bf81253c 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_8.2.0_aarch64.xml index fe4c65c9b7..ce278d337e 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -27,6 +27,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_armv7l.xml index e26dc43963..c9adb06fc3 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -29,6 +29,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/= qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index bfe59f0c29..275b77d5b2 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -30,6 +30,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.2.0_s390x.xml index 70e85bef28..7cc528015d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -14,6 +14,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_x86_64.xml index 40716fa8d1..274d09ea73 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -32,6 +32,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.0.0_x86_64.xml index 1873663353..037cc118ca 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -32,6 +32,7 @@ + --=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 07:47:28 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 1712003909504599.345102473762; Mon, 1 Apr 2024 13:38:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 703791D6D; Mon, 1 Apr 2024 16:38:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BA1EC1B84; Mon, 1 Apr 2024 16:34:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2EE9F1AF8; Mon, 1 Apr 2024 16:34:36 -0400 (EDT) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 E181C1A67 for ; Mon, 1 Apr 2024 16:34:33 -0400 (EDT) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-34100f4f9a2so3081296f8f.2 for ; Mon, 01 Apr 2024 13:34:33 -0700 (PDT) Received: from localhost.localdomain ([134.0.206.35]) by smtp.gmail.com with ESMTPSA id bp8-20020a5d5a88000000b00343300a4eb8sm12140953wrb.49.2024.04.01.13.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 13:34:32 -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=1712003672; x=1712608472; 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=zptFUMdGZCtUUCp+G0rvnqYjE+8+HN3UaQ1GxxVWA7Y=; b=G4bTxpjEgBCjuLOECy2Ml9mXQ3S70mFIp0GPvrIZ3l2mo08LupG0wSawwOUhYBlGyh usi3K0FMA5Nad23YxFxgVhzhTo9oBz3/PAqhnKlQTV0dPUZlWIucnIyInID55CagBe2s VQLId1xOiMRJpHAcfgmB8LSq7+JaBBPkoMqtJEau3foYoDONkvhnQIjGgPCgQgt1NrYY T4tzgnKj6U1n/esDlJhOPFSlicmL2mrP9gHxy0gQ7Mjde3XuN47CsoQOkgBLcEL8TjBL jnNxDC2qAeualDmJ7wHo1qwOrFo5yORE+rEhJorVr58hyqgPSslU8LTg8UOWsnKFFeHQ 03Uw== X-Gm-Message-State: AOJu0Yx7raRI+UoQYHucv5Q9+8/ppTZfaNYwJgdj5b26mHfIG9QDMDk2 6tsd88rfSAKyLBcR9JZj/1l9QCwkOhrlIlpFF3uE3dtbsM7VmbispNZZYYPN X-Google-Smtp-Source: AGHT+IGgHmavKcyA3scAZxtiZJwil/0dwfh/6xOQw/KtuhnoLCBUAYAH9irRk4OkEqiFQ4uqwJAHjw== X-Received: by 2002:adf:fe87:0:b0:341:b88b:1625 with SMTP id l7-20020adffe87000000b00341b88b1625mr6296966wrr.47.1712003672333; Mon, 01 Apr 2024 13:34:32 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH 2/3] conf: Improve parsing of usb-net devices Date: Tue, 2 Apr 2024 02:01:17 +0530 Message-Id: <20240401203118.87850-3-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240401203118.87850-1-rayhan.faizel@gmail.com> References: <20240401203118.87850-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Message-ID-Hash: AONW5CUZCBBQEMPSPGT5KBEEWDF456BW X-Message-ID-Hash: AONW5CUZCBBQEMPSPGT5KBEEWDF456BW 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: 1712003910470100001 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 Reviewed-by: Peter Krempa --- docs/formatdomain.rst | 2 +- src/conf/domain_conf.c | 9 ++++++++- src/qemu/qemu_domain_address.c | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 2adc2ff968..c58ff6a08c 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5596,7 +5596,7 @@ supported models with these commands: qemu-kvm -net nic,model=3D? /dev/null =20 Typical values for QEMU and KVM include: ne2k_isa i82551 i82557b i82559er -ne2k_pci pcnet rtl8139 e1000 virtio. :since:`Since 5.2.0`, +ne2k_pci pcnet rtl8139 e1000 virtio usb-net. :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. 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..83f9654fd8 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2087,6 +2087,11 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *net =3D def->nets[i]; =20 + /* Skip usb-net device */ + 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 07:47:28 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 1712003957446836.4883637297238; Mon, 1 Apr 2024 13:39:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4DA6D1B27; Mon, 1 Apr 2024 16:39:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EBE4F1CB8; Mon, 1 Apr 2024 16:34:52 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 06F6D1B47; Mon, 1 Apr 2024 16:34:37 -0400 (EDT) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 7F7551B01 for ; Mon, 1 Apr 2024 16:34:35 -0400 (EDT) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4156c7664d1so5886445e9.0 for ; Mon, 01 Apr 2024 13:34:35 -0700 (PDT) Received: from localhost.localdomain ([134.0.206.35]) by smtp.gmail.com with ESMTPSA id bp8-20020a5d5a88000000b00343300a4eb8sm12140953wrb.49.2024.04.01.13.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 13:34:33 -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=1712003674; x=1712608474; 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=fL0PgDi/q+Y4h11jTSW1MCGLrjtQIKLjhBOcW7xTuAt8HKxeQOZ5LTUvN9fINlJ6BL HhzCQBloDYu9zxsZec2ADlcbL/PhuTNt5+iTHQLN+Vm80FCaF6tiWLqQKy5VkLaWp3hE JOAOeSJHIAWYO/ZAFf8Myk26m7ndfNugt6NN8RW+RalEoUe/dNzGZMzaYVvdjanhJ0MV L43h5cmrDHCWolGzT4uo/+diXT7ON5/mVLNv4Rh4VBcakSN/x+e8L+qrFk5dJD7lIWAg vTleMjxWuTscL1nqYL8CxWxwdnJgwvxjyoohki5fQrSRn9WaADNXAHOulaLGw6HM2JrY Fklg== X-Gm-Message-State: AOJu0YzPbN/tdS+ngRrt93ZUlD49kIo+EtH2diDy5bk+Va5eK82hGnFt 6KDpHqwYzbufSbVwg69fvckj7MPsG4vvRqG3kfZvXn6zHkOlSTYe1Cwn9HHy X-Google-Smtp-Source: AGHT+IH9K++T1UdhRzZzelkU81VGPDy71nw+L0MjZPKqZy8uUqJLDUYPLSKzm5IoFcgWdy9ezwnNQA== X-Received: by 2002:a5d:620f:0:b0:33e:7503:d010 with SMTP id y15-20020a5d620f000000b0033e7503d010mr8322521wru.32.1712003673977; Mon, 01 Apr 2024 13:34:33 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH 3/3] tests: Add testcase for usb-net Date: Tue, 2 Apr 2024 02:01:18 +0530 Message-Id: <20240401203118.87850-4-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240401203118.87850-1-rayhan.faizel@gmail.com> References: <20240401203118.87850-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Message-ID-Hash: YX5ZRRJLVDRTHWWRMAIML5YVQE42BYU5 X-Message-ID-Hash: YX5ZRRJLVDRTHWWRMAIML5YVQE42BYU5 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: 1712003958619100001 Add small test case to demonstrate use of usb-net with user networking backend. Signed-off-by: Rayhan Faizel Reviewed-by: Peter Krempa --- .../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 + +
+ + + + + + + + +