From nobody Fri May 17 05:50:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1660742873; cv=none; d=zohomail.com; s=zohoarc; b=kM3Q9/TigxJ3H/si5/CsqtFt7pz3I53biE9e4SnPqKyAaicyTt5yGAPSX3HOTss2U877en3nWfTmUuHj0GA7+V3a6sWnj3ILo6mtyZ8w4AO5sNmcEti4udf3P6qGDCuC+/UTZo3zz3H4JUd/FJwvYCjg8KFvs6EVH3Fpo9AKWWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660742873; 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=GTTLUcu8RsuuLU+k+IR8D1L30hE6zhhlmfhf5nlYxZs=; b=eSOL/R9a+LK1kUduH2qgWFUXKfddWQTk57TKzyGkdm/TESiURTlaV7i8WOe2oX16T/+qnYgz6REzc4wmlfC8FXSsS9LLaVzMkI/GUazS1RbpmE4cW5InoMJfFdth3cTaFue8pQGtFnRza5ZmpY+2SBM9qtVM73oj7Vb1Qf6jI4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1660742873130677.9182590400296; Wed, 17 Aug 2022 06:27:53 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-2-2JPBxMfzNTWOaNXf2CYERQ-1; Wed, 17 Aug 2022 09:27:50 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08569294EDCD; Wed, 17 Aug 2022 13:27:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9BFC492C3B; Wed, 17 Aug 2022 13:27:48 +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 0D100193F518; Wed, 17 Aug 2022 13:27:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id ACD181946A40 for ; Wed, 17 Aug 2022 12:50:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8AC9B2166B2A; Wed, 17 Aug 2022 12:50:47 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86C872166B29 for ; Wed, 17 Aug 2022 12:50:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6AA27811E7A for ; Wed, 17 Aug 2022 12:50:47 +0000 (UTC) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-605-EwryEj9WOUqizPNwwEHpiQ-1; Wed, 17 Aug 2022 08:50:46 -0400 Received: by mail-ed1-f72.google.com with SMTP id s21-20020a056402521500b00440e91f30easo8617465edd.7 for ; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id fu17-20020a170907b01100b0073095265adesm6693294ejc.165.2022.08.17.05.50.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:50:44 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 713B98F2D649 for ; Wed, 17 Aug 2022 14:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660742872; 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=GTTLUcu8RsuuLU+k+IR8D1L30hE6zhhlmfhf5nlYxZs=; b=ccrxn2bGe3kwmcrnpQkhKbi4iEVlX2mWmI+hx8F/2vfDWNv9lM6wFR/xQfK8SxnHRTxiGn v4xTkj4CUfaD5828tmABOAvh6bb1I0ZHSKEW4lgUuUH9qJ4/7iMhYL5NOtmwTWwA7y/zlg k5jxrU61WmV0eS8Pz4w24GYMl26GvJc= X-MC-Unique: 2JPBxMfzNTWOaNXf2CYERQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: EwryEj9WOUqizPNwwEHpiQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=GTTLUcu8RsuuLU+k+IR8D1L30hE6zhhlmfhf5nlYxZs=; b=rEBN6wXkf7OvHSrz+eGd3jzd+fu0ET9sdNm+QWSoSyCQ6sutnc7h/R1ITj+3ypmt7w 9UCERYZjMqIFqD4sIwqkhZTIG2RGDGCYOmqizXXTY+0swson47qEOEd6RjfrFZC2GJ9P YKGv9L6ZPFZQwkW0JouPrwcDHAUC795BCXAm6jPQW3+Y205kJVT2nqVe2XDQJghjdVVk h3JbM+PMoL7c7bTse2dW6D2AAAt3sQFg8VDtEtsfkCWIkO9h1+/avMFn1GrozR2/ai/9 e2COsdJbaWaVUczSwwTFKtWlT7UNLgo3qWACckJLGKGmkZ2i+OQKglA4wIHGbvD7skKD tltw== X-Gm-Message-State: ACgBeo20KuqJvRPl6pMA98oxjC6dTTJalToBxLaOnyoHqSawvS9avPeU G7RgMYJyE2jlCgzZNXMvxRH/oqrYyYGTfptx+tp6aHE3qZxbZnZzDdi8iCcEKKHGz/yyefePT6z YNcZEx0L3N/f8oOAT0H5k4XoGc5b2iTAqNajRENfXX3fJN2rsHeBmD6YlgM+C7ulgGMCt5f4= X-Received: by 2002:a17:906:5a6f:b0:730:ba7c:6bb5 with SMTP id my47-20020a1709065a6f00b00730ba7c6bb5mr16814419ejc.720.1660740644939; Wed, 17 Aug 2022 05:50:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR5xuZfkSHNUB+PvUJNBBN7E0kbetIfauvw6JZOT3AI/vrg5F5J0ueH1BVzdfou1wHXhWb1rAg== X-Received: by 2002:a17:906:5a6f:b0:730:ba7c:6bb5 with SMTP id my47-20020a1709065a6f00b00730ba7c6bb5mr16814411ejc.720.1660740644748; Wed, 17 Aug 2022 05:50:44 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 1/5] tests: Fix vmx/xml filenames Date: Wed, 17 Aug 2022 14:50:36 +0200 Message-Id: <877a5f6a9e0dadd8b6a47a1fec4fdcbd43eef5eb.1660740500.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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.85 on 10.11.54.9 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: 1660742874490100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 70768cda9740 added a functionality that was previously (in an unsubm= itted version of the commit) represented differently in the XML, but the filenames kept the old name. Fix the name so they are not misleading. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- .../{ethernet-unmanaged-nodev.vmx =3D> ethernet-dummy.vmx} | 0 .../{ethernet-unmanaged-nodev.xml =3D> ethernet-dummy.xml} | 0 tests/vmx2xmltest.c | 2 +- ...-ethernet-unmanaged-nodev.vmx =3D> xml2vmx-ethernet-dummy.vmx} | 0 ...-ethernet-unmanaged-nodev.xml =3D> xml2vmx-ethernet-dummy.xml} | 0 tests/xml2vmxtest.c | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename tests/vmx2xmldata/{ethernet-unmanaged-nodev.vmx =3D> ethernet-dummy= .vmx} (100%) rename tests/vmx2xmldata/{ethernet-unmanaged-nodev.xml =3D> ethernet-dummy= .xml} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-unmanaged-nodev.vmx =3D> xml2vm= x-ethernet-dummy.vmx} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-unmanaged-nodev.xml =3D> xml2vm= x-ethernet-dummy.xml} (100%) diff --git a/tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx b/tests/vmx2xml= data/ethernet-dummy.vmx similarity index 100% rename from tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx rename to tests/vmx2xmldata/ethernet-dummy.vmx diff --git a/tests/vmx2xmldata/ethernet-unmanaged-nodev.xml b/tests/vmx2xml= data/ethernet-dummy.xml similarity index 100% rename from tests/vmx2xmldata/ethernet-unmanaged-nodev.xml rename to tests/vmx2xmldata/ethernet-dummy.xml diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index e08079512b53..3ab39148e0a4 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -236,7 +236,7 @@ mymain(void) DO_TEST("ethernet-static"); DO_TEST("ethernet-vpx"); DO_TEST("ethernet-other"); - DO_TEST("ethernet-unmanaged-nodev"); + DO_TEST("ethernet-dummy"); =20 DO_TEST("serial-file"); DO_TEST("serial-device"); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx b/tests= /xml2vmxdata/xml2vmx-ethernet-dummy.vmx similarity index 100% rename from tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx rename to tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml b/tests= /xml2vmxdata/xml2vmx-ethernet-dummy.xml similarity index 100% rename from tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml rename to tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 0ea213d5d5cd..7723c1efabdd 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -225,7 +225,7 @@ mymain(void) DO_TEST("ethernet-other", "ethernet-other", 4); DO_TEST("ethernet-mac-type", "ethernet-mac-type", 4); =20 - DO_TEST("ethernet-unmanaged-nodev", "ethernet-unmanaged-nodev", 4); + DO_TEST("ethernet-dummy", "ethernet-dummy", 4); =20 DO_TEST("serial-file", "serial-file", 4); DO_TEST("serial-device", "serial-device", 4); --=20 2.37.2 From nobody Fri May 17 05:50:13 2024 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=1660742852; cv=none; d=zohomail.com; s=zohoarc; b=Tk/rBUjSxIWucFVk8OP0d2+h0ARZz2A0FTji8IbyISngXI1ETaIucNnt99H30oUCnyE4fd1DfrOAYMu0TxsG3LJNEJgqSQ1Wv4YyCP06x7Upj07ErQp5vuYMlJIbdX7brRzsGMUmtrQPyA0i0vbLjIHoDf9ZcTydleLhD+xNDzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660742852; 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=rLVNYjilNoXZ5Us1Z0XGxkh0niEzv4/KUgNzRRT/Lb4=; b=Rr2+Ti7CX+zhq2EiRzDtnl0SccwzoxljcnAvS3O/6WOYLNnBCl+ZvtTh7E6ZFCMVBxbM4AoUr+RglQb526fsy1164uaYJgI5Jja2EU53VabMePaZXjtokRybCzoMBxQJuEozhZUu4Uez8+CK2NOn664xH5Nt2EyhJ9TOYIWmXms= 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 166074285206953.440707850016224; Wed, 17 Aug 2022 06:27:32 -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-97-DTCotTBAPsWaNhSf8an5ZA-1; Wed, 17 Aug 2022 09:27:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 947631019C91; Wed, 17 Aug 2022 13:27:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80DFD400E726; Wed, 17 Aug 2022 13:27:23 +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 D4D01194E00C; Wed, 17 Aug 2022 13:27:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CC0ED1946A40 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B0B77112131B; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ACFDB1121314 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91F8085A581 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-472-MvMeKSrqM5uwgw6oFCBm3Q-1; Wed, 17 Aug 2022 08:50:47 -0400 Received: by mail-ed1-f72.google.com with SMTP id r12-20020a05640251cc00b00440647ec649so8836619edd.21 for ; Wed, 17 Aug 2022 05:50:46 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id r11-20020aa7d58b000000b00445e1489313sm1140872edq.94.2022.08.17.05.50.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:50:44 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 7BCE88F2D64A for ; Wed, 17 Aug 2022 14:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660742850; 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=rLVNYjilNoXZ5Us1Z0XGxkh0niEzv4/KUgNzRRT/Lb4=; b=Vs/SzRVzyDjhj2sv09NdV+CzHT+dprNtxzhbu+IIKHdc6dbm2qdj8rtujtOOa6YSaM6bi7 4vgK+DcYXLOLgW85ITzhRSaQ5NGWXfGErNJ0JOIW9ji5I0kc3Rd46Ic6VQhAbbxA6CUQWV PuxwZzejNQsax4yOd7Jo0HTCMcS44bU= X-MC-Unique: DTCotTBAPsWaNhSf8an5ZA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: MvMeKSrqM5uwgw6oFCBm3Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=rLVNYjilNoXZ5Us1Z0XGxkh0niEzv4/KUgNzRRT/Lb4=; b=oZy4PaEqZHmSTxM6hXGHRKlIfCP48pG0jiU56AJnTlUoHwUsDeVqSndHtyjdpuGGQX kMnIseqlZ5ICvyAGYyh0kWj4/63r7RJH8c1pioNrNUwV8gB5q6V9e4zzg6+lDVG7GzAV E1XCSMau8JWrUiY6mkUSUv3eP2Ru8oIBEz6vDo8KBc98sgGR3sjoGbbhr29NtBYHeaP7 8Alx0IrR7Q0bxPPm5lbu6SvpM8O+CoT/jJwH61jM9jduC54kHXyC0IM84iwnDs+IjMLS tPmke2OCbyETiPWud3tfFD8TedVS3+MDRGkMhdu4dVIymQ5f1oL+F3poJeVmTL+bnm0d DZYg== X-Gm-Message-State: ACgBeo1hdg8b6NsDZKZvIpgNDSQKJbVrFRAUqLB/G4EPYZI8gBs5OAFd ZVLvyIDRstxdO60WruavusJUSGqLol9WAjZv8w+RDLwveW3CmzEAhmCDUzBdSTtKG+HgThf+5OO zuGE77lrwK49eriaKJOYecUKD1iucdL4oqKuPKGVyfYer5BfATrj4oy5auybIJalcYjY1pqk= X-Received: by 2002:a17:907:6d8b:b0:730:c160:1f9c with SMTP id sb11-20020a1709076d8b00b00730c1601f9cmr16875385ejc.342.1660740645341; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR4wM9YpVU8gIGNOchLccyOXbMQGW6nw5uYtX6cKw8bg26sO5jIIfGQDR/cMuzPaweBeTQx0kA== X-Received: by 2002:a17:907:6d8b:b0:730:c160:1f9c with SMTP id sb11-20020a1709076d8b00b00730c1601f9cmr16875370ejc.342.1660740645016; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 2/5] conf: Rewrite virNetDevVPortProfileCopy Date: Wed, 17 Aug 2022 14:50:37 +0200 Message-Id: <1e266676d34ef2718af744dc95b875b83eeb16bd.1660740500.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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.84 on 10.11.54.2 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: 1660742854381100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This makes it nicer to use as since it cannot fail shortens the usage in all callers. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 9 +++------ src/util/virnetdevvportprofile.c | 18 ++++++++++-------- src/util/virnetdevvportprofile.h | 5 +++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7764b1054d6f..0cfbe22dc099 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29348,8 +29348,7 @@ virDomainNetDefToNetworkPort(virDomainDef *dom, =20 memcpy(&port->mac, &iface->mac, VIR_MAC_BUFLEN); =20 - if (virNetDevVPortProfileCopy(&port->virtPortProfile, iface->virtPortP= rofile) < 0) - return NULL; + port->virtPortProfile =3D virNetDevVPortProfileCopy(iface->virtPortPro= file); =20 if (virNetDevBandwidthCopy(&port->bandwidth, iface->bandwidth) < 0) return NULL; @@ -29448,8 +29447,7 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDe= f *iface, goto error; } =20 - if (virNetDevVPortProfileCopy(&actual->virtPortProfile, port->virtPort= Profile) < 0) - goto error; + actual->virtPortProfile =3D virNetDevVPortProfileCopy(port->virtPortPr= ofile); =20 if (virNetDevBandwidthCopy(&actual->bandwidth, port->bandwidth) < 0) goto error; @@ -29589,8 +29587,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *do= m, return NULL; } =20 - if (virNetDevVPortProfileCopy(&port->virtPortProfile, actual->virtPort= Profile) < 0) - return NULL; + port->virtPortProfile =3D virNetDevVPortProfileCopy(actual->virtPortPr= ofile); =20 if (virNetDevBandwidthCopy(&port->bandwidth, actual->bandwidth) < 0) return NULL; diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index 88c34879525e..ae23f795b25a 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -122,16 +122,18 @@ virNetDevVPortProfileEqual(const virNetDevVPortProfil= e *a, const virNetDevVPortP } =20 =20 -int virNetDevVPortProfileCopy(virNetDevVPortProfile **dst, const virNetDev= VPortProfile *src) +virNetDevVPortProfile * +virNetDevVPortProfileCopy(const virNetDevVPortProfile *src) { - if (!src) { - *dst =3D NULL; - return 0; - } + virNetDevVPortProfile *ret =3D NULL; =20 - *dst =3D g_new0(virNetDevVPortProfile, 1); - memcpy(*dst, src, sizeof(*src)); - return 0; + if (!src) + return NULL; + + ret =3D g_new0(virNetDevVPortProfile, 1); + memcpy(ret, src, sizeof(*ret)); + + return ret; } =20 =20 diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprof= ile.h index e7a93e23a4f5..600b2093c507 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -77,8 +77,9 @@ struct _virNetDevVPortProfile { =20 bool virNetDevVPortProfileEqual(const virNetDevVPortProfile *a, const virNetDevVPortProfile *b); -int virNetDevVPortProfileCopy(virNetDevVPortProfile **dst, - const virNetDevVPortProfile *src); + +virNetDevVPortProfile * +virNetDevVPortProfileCopy(const virNetDevVPortProfile *src); =20 int virNetDevVPortProfileCheckComplete(virNetDevVPortProfile *virtport, bool generateMissing); --=20 2.37.2 From nobody Fri May 17 05:50:13 2024 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=1660744086; cv=none; d=zohomail.com; s=zohoarc; b=kAyCbWlnIH1SfK8PH6s6NhbYK7ppmr/0R9BkDQinn/0hvwQ3sXXfuoCRZtLTvkem3dEkZP3CGpvfYzk9w2jG+HNp1B9UeI07VrUBvtBR09M+nv/HbqKkOjS8PJ/yle5OYmP9+KOB0cax1kpvmMIg3kzGaGPLuLovipNPgKJpqTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660744086; 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=PdkyM4dUFaVD/Nf0Ozv4T+ZqaYxVmp5vajkLv/ezwzQ=; b=nU+b4HgGx11iQkZaKXDVFGoiH5a9kFx1OxXPHbjhONZVv5SQclntUK29qfkrpL2O4JGUb9JVEX5tTpRlsWwuzG/VmkMnMP74RDYf5zVPftLTfp7ARsk8FvOKR4YwjkfZc1K9DhTLYN7lFy8DfJd2cLjCP8LcpT0aFBxekGUzyLM= 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 1660744086434603.1619050643047; Wed, 17 Aug 2022 06:48:06 -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-399-TqI6NnMuP_e6JVTMrcvUaA-1; Wed, 17 Aug 2022 09:48:01 -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 D9A878037AC; Wed, 17 Aug 2022 13:47:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 833DF2166B2A; Wed, 17 Aug 2022 13:47:58 +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 3F072193F516; Wed, 17 Aug 2022 13:47:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 75F1C1946A40 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 68FF8C15BB3; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65476C15BBD for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4CFE338005D6 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-640-HWCMnSKlOj2W_X6C3YhXHA-1; Wed, 17 Aug 2022 08:50:47 -0400 Received: by mail-ej1-f72.google.com with SMTP id qw34-20020a1709066a2200b00730ca5a94bfso2902739ejc.3 for ; Wed, 17 Aug 2022 05:50:46 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id b6-20020a056402138600b004418c7d633bsm10497458edv.18.2022.08.17.05.50.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:50:44 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 863F58F2D64B for ; Wed, 17 Aug 2022 14:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660744085; 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=PdkyM4dUFaVD/Nf0Ozv4T+ZqaYxVmp5vajkLv/ezwzQ=; b=MOKBZ/PCuKIElNfx3Rgb1s4VzzQvBl9u9mEMf7G6Px7IKQDYT0gSJnysLLyCPhIOiBCreo hz4ExYHdivimMlNpQ/6a72mutxKd8ZPcaq0kFROwO66vjhud92uZtiQbZO87/nECMetuJ6 HkN8s580tM6ClI8R6+5FfZW4ckkcodk= X-MC-Unique: TqI6NnMuP_e6JVTMrcvUaA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: HWCMnSKlOj2W_X6C3YhXHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=PdkyM4dUFaVD/Nf0Ozv4T+ZqaYxVmp5vajkLv/ezwzQ=; b=QpTvz5RAIC82aNZA+PzVZjA7qtVPP3ARdYJIP6dfw7WdI0FzsYtaSFux769tdIa8fe pATtoe7wMi829j3y+NbNlWShs0Yf/gVhSFf80doz2YqOx1f7c/W2Mi2s6V77oGwDfwXj G2xRCCQ+xm/jMxBrprxr1qkLqEbFLP7DUYhgVkWVkuTNnk5Q+krqd07hjtPybRasCAbv p6iMcR4ekWmimkYjQVSlQSuKIabsYOlPwgDW9vQL2d/b7jcp6EGs0fqpvbME7G2Hk/CN Ma3LyM2dXN4oewq6L7S5RhCYKsxiZBhePHPdyOr2JD0ewLAoDWr47mz/8ez/WYd0wUJx tBRg== X-Gm-Message-State: ACgBeo3T8WY4tzJIp7UBcjK5FA0e2JhK2Ew5ITC3pP6Wevh6gAjU/tTt sWyJXQboxfqjhYDmnE7lovj4RHO3as60ud77Ge61z5VunBUZK3JPHWmT7THBmy7hdz4aiyerSy2 Azq5HTiBCUp64bmodpq5XPLWeZMt3tbqNyejjFMxJEpSx7/As7rFL2DEYo0gZbFwtRl2SSXA= X-Received: by 2002:a05:6402:43c6:b0:43d:79a6:4e32 with SMTP id p6-20020a05640243c600b0043d79a64e32mr22263039edc.281.1660740645881; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR5WeX4oaU0l0UatEYoMB8KLWVNiApLwvxDA+vzy8D8RgYVo9J7Reyd6tvyiyxe+vKCOsW688A== X-Received: by 2002:a05:6402:43c6:b0:43d:79a6:4e32 with SMTP id p6-20020a05640243c600b0043d79a64e32mr22263021edc.281.1660740645656; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 3/5] vmx: Require networkName for bridged and custom NICs Date: Wed, 17 Aug 2022 14:50:38 +0200 Message-Id: <63ccbea6d30340065552dd14b72eff7425139ed2.1660740500.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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 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: 1660744086769100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 70768cda9740 marked this particular config string optional, but forgot that two of the interface types still require this name to exist. Mark it as optional only if there is no connectionType. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 49eef12e3ea7..7b705b895ed1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2826,7 +2826,7 @@ virVMXParseEthernet(virConf *conf, int controller, vi= rDomainNetDef **def) STRCASEEQ(connectionType, "bridged") || STRCASEEQ(connectionType, "custom")) { if (virVMXGetConfigString(conf, networkName_name, &networkName, - true) < 0) + connectionType =3D=3D NULL) < 0) goto cleanup; } =20 --=20 2.37.2 From nobody Fri May 17 05:50:13 2024 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=1660743630; cv=none; d=zohomail.com; s=zohoarc; b=K1e7QEBCrpXM/LDFozA1HTXm2JzLKtqxrLrjVqdiW6/6fiJFRGthWuI01a2TXwl+FIBy2bknetjtCBu68iAq/mnw+ZRISQFcIss0fglzXdOql3wKlK6m7du4A8QuiYeyVfVjGsWUqGGlCxSUqjoQ7pL4IZhfaWNf8XBUYRwIcW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660743630; 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=JcYlMPwAZxGlE0whOaEviOaL+mwi074+DzoLrb06coY=; b=GiQtoRjdNE8juOJtAM0HwTU1hu43/GjLZcDaj862bxdz/TqGCDLcEHm17eDmlK3P+moI3pY0YlueR4ldzhvg4U3jXpI1zgLqZVupYTpUjBpLPVZdEQA1Xo0TQRuch01/bvafhJ3GvlxjsSWtDpRsNDPMqRqVaj2ZbcyZAtB71B8= 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 1660743630575321.1885366182381; Wed, 17 Aug 2022 06:40:30 -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-245-CoJtqS5-PpGM9kFkBmSL-Q-1; Wed, 17 Aug 2022 09:40:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3EA90101A589; Wed, 17 Aug 2022 13:40:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8ED7314152E1; Wed, 17 Aug 2022 13:40:19 +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 4EDB0193F6F6; Wed, 17 Aug 2022 13:40:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5842C193F6F6 for ; Wed, 17 Aug 2022 12:50:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4BAA5112131B; Wed, 17 Aug 2022 12:50:49 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 478071121319 for ; Wed, 17 Aug 2022 12:50:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 29702802D2C for ; Wed, 17 Aug 2022 12:50:49 +0000 (UTC) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-373-xp6X3dipNzqhJo30fLtGvA-1; Wed, 17 Aug 2022 08:50:47 -0400 Received: by mail-ej1-f71.google.com with SMTP id sb17-20020a1709076d9100b00730fe97f897so2930789ejc.16 for ; Wed, 17 Aug 2022 05:50:47 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id az8-20020a170907904800b0072ae174cdd4sm6707211ejc.111.2022.08.17.05.50.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:50:44 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 9199C8F2D64C for ; Wed, 17 Aug 2022 14:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660743628; 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=JcYlMPwAZxGlE0whOaEviOaL+mwi074+DzoLrb06coY=; b=Nty6MNhK/SXNFQhS9/KlRfSdDRmtHpmPCnc/ze9LUYReDvX0/Yv/cg3HVb6p4luPNRa4ij xa7wFJRppcXDllKae1y1Sinat3EomeF1Ajo67aYvxTiavqt29RE+QytukrI3sy8ZiDpHBA jm9OBuwZSvU/suSXa7Js6vK9kZrfUMk= X-MC-Unique: CoJtqS5-PpGM9kFkBmSL-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: xp6X3dipNzqhJo30fLtGvA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=JcYlMPwAZxGlE0whOaEviOaL+mwi074+DzoLrb06coY=; b=ID5o4g62rK4tIqdxzNjcL0VJFqEQ2IZAGZt61qHgngNh+lcUZSNXQ524BNNT4AxvrX 3M6mWcXqONqzzYVgTvBhiQE0MmzPl/TEz0iF6tJcsuW9676nPUldmfEUc+iWb4Lv9UBU DHoyHpZ7Oz10Ga7Hxtoop+pjp42URNDK/7h64PU2YyMmN5DYI3SQ/bBUd6/qH4PYVRxv ERPScjdcuf6IKMMJyXITxfOmEEnnDOTu9cGB52YvW1hxy6c9xA/c57fT+NND5PzZxseI n5GeYIRWEqhUHi1j0sGXA566VX62FI2oCsBLtNTz4e+k+tHCt+hc2rB/IFkxEtQ6EzLZ 1Wbw== X-Gm-Message-State: ACgBeo3qO7OueguZov8XoJFR6P6vaYmwe0bHmdIAGBtDkccnPcJkA2OP miVb7vWY8twca4S2YDNVVY/OvXvcm/fUKKWS0iSElEKUtr4Ml1YEf2jQwQ7RqaDlMCxBdDQPsrD vdvkOq6i0moJQgEvhhSAkl4DHVx34VLthpR7486IuhPHIEXuM03w7QZ8AKN1s9Oewl3FEOhY= X-Received: by 2002:a17:907:e90:b0:730:8f6b:c14e with SMTP id ho16-20020a1709070e9000b007308f6bc14emr16574830ejc.250.1660740646359; Wed, 17 Aug 2022 05:50:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR4V8ARenWIAkac028UZLlrFyq8/8CYS+f6+JLjO7CRvBwMRj67XBXAeeNF23t2PZWY4li4zug== X-Received: by 2002:a17:907:e90:b0:730:8f6b:c14e with SMTP id ho16-20020a1709070e9000b007308f6bc14emr16574808ejc.250.1660740645965; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 4/5] conf, docs, schemas: Add support for interface type vds Date: Wed, 17 Aug 2022 14:50:39 +0200 Message-Id: <3829b2610ec32b4977d6831f713e02f984c8190b.1660740500.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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.85 on 10.11.54.7 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: 1660743631966100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This represents an interface connected to a VMWare Distributed Switch, previously obscured as a dummy interface. Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- docs/formatdomain.rst | 30 +++++++++++---- src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 64 +++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 7 ++++ src/conf/netdev_bandwidth_conf.c | 1 + src/conf/schemas/domaincommon.rng | 23 +++++++++++ src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 ++ src/lxc/lxc_process.c | 2 + src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_hotplug.c | 3 ++ src/qemu/qemu_interface.c | 2 + src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 1 + src/vmx/vmx.c | 1 + tools/virsh-domain.c | 1 + 19 files changed, 141 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index ed0d9c19593b..3a8aa96fdc0a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5244,22 +5244,36 @@ Dummy network interface ^^^^^^^^^^^^^^^^^^^^^^^ =20 An unconnected network interface sounds pretty pointless, but can show up = for -example with VMWare when libvirt does not have any more information to pro= vide. -Two such scenarios are currently known: +example with VMWare without any specified network to be connected to. +:since:`Since 8.7.0` =20 -1) network interface exists, but is not connected to any existing network -2) the interface is connected to something known as VMWare Distributed Swi= tch +:: + + ... + + + + + + ... =20 -The difference between these two is not (yet?) discoverable by libvirt, so= at -least the information gathered from the hypervisor is provided in the -element. :since:`Since 8.7.0` +VMWare Distributed Switch +^^^^^^^^^^^^^^^^^^^^^^^^^ + +Interface can be connected to VMWare Distributed Switch, but since libvirt +cannot provide information about that architecture, the information presen= ted +here is only what can be gathered from the VM configuration. VMs with this +interface type can be created, so that editing of the XML works properly, +however libvirt cannot guarantee that any changes in these parameters will= be +valid in the hypervisor. :since:`Since 8.7.0` =20 :: =20 ... - + + ... diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 67ca4a7a0dcd..03f051edf67e 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -302,6 +302,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: virReportEnumRangeError(virDomainNetType, netType); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0cfbe22dc099..2fc94b40efe2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -574,6 +574,7 @@ VIR_ENUM_IMPL(virDomainNet, "udp", "vdpa", "dummy", + "vds", ); =20 VIR_ENUM_IMPL(virDomainNetModel, @@ -2497,6 +2498,7 @@ virDomainActualNetDefFree(virDomainActualNetDef *def) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -2621,6 +2623,10 @@ virDomainNetDefFree(virDomainNetDef *def) virDomainHostdevDefClear(&def->data.hostdev.def); break; =20 + case VIR_DOMAIN_NET_TYPE_VDS: + g_free(def->data.vds.portgroup_id); + break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_DUMMY: @@ -8899,6 +8905,8 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *vhost_path =3D NULL; g_autofree char *tap =3D NULL; g_autofree char *vhost =3D NULL; + g_autofree char *switchid =3D NULL; + g_autofree char *connectionid =3D NULL; const char *prefix =3D xmlopt ? xmlopt->config.netPrefix : NULL; =20 if (!(def =3D virDomainNetDefNew(xmlopt))) @@ -8932,6 +8940,13 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, portid =3D virXMLPropString(source_node, "portid"); } =20 + if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_VDS) { + switchid =3D virXMLPropString(source_node, "switchid"); + portid =3D virXMLPropString(source_node, "portid"); + portgroup =3D virXMLPropString(source_node, "portgroupid"); + connectionid =3D virXMLPropString(source_node, "connectionid"); + } + if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_INTERNAL) internal =3D virXMLPropString(source_node, "name"); =20 @@ -9313,6 +9328,36 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, } break; =20 + case VIR_DOMAIN_NET_TYPE_VDS: + if (!switchid) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source switchid for interface type '= %s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + + if (virUUIDParse(switchid, def->data.vds.switch_id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse switchid '%s'"), switchid); + goto error; + } + + if (virStrToLong_ll(portid, NULL, 0, &def->data.vds.port_id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse portid '%s'"), portid); + goto error; + } + + if (virStrToLong_ll(connectionid, NULL, 0, &def->data.vds.connecti= on_id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse connectionid '%s'"), connect= ionid); + goto error; + } + + def->data.vds.portgroup_id =3D g_steal_pointer(&portgroup); + + break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_DUMMY: @@ -9495,6 +9540,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_VDPA: break; case VIR_DOMAIN_NET_TYPE_LAST: @@ -23683,7 +23729,21 @@ virDomainNetDefFormat(virBuffer *buf, def->data.vdpa.devicepath); sourceLines++; } + break; + + case VIR_DOMAIN_NET_TYPE_VDS: { + char switchidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(def->data.vds.switch_id, switchidstr); + virBufferEscapeString(buf, "data.vds.port_= id); + virBufferEscapeString(buf, " portgroupid=3D'%s'", def->data.vd= s.portgroup_id); + virBufferAsprintf(buf, " connectionid=3D'%lld'", def->data.vds= .connection_id); + + sourceLines++; + break; + } =20 case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_DUMMY: @@ -28303,6 +28363,7 @@ virDomainNetGetActualVirtPortProfile(const virDomai= nNetDef *iface) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -28317,6 +28378,7 @@ virDomainNetGetActualVirtPortProfile(const virDomai= nNetDef *iface) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: return NULL; @@ -29314,6 +29376,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDe= f *net) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -29576,6 +29639,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *do= m, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unexpected network port type %s"), virDomainNetTypeToString(virDomainNetGetActualType(= iface))); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7b81acf5db3b..a1f6cf7a6fd0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -940,6 +940,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_VDPA, VIR_DOMAIN_NET_TYPE_DUMMY, + VIR_DOMAIN_NET_TYPE_VDS, =20 VIR_DOMAIN_NET_TYPE_LAST } virDomainNetType; @@ -1133,6 +1134,12 @@ struct _virDomainNetDef { struct { virDomainHostdevDef def; } hostdev; + struct { + unsigned char switch_id[VIR_UUID_BUFLEN]; + char *portgroup_id; + long long port_id; + long long connection_id; + } vds; } data; /* virtPortProfile is used by network/bridge/direct/hostdev */ virNetDevVPortProfile *virtPortProfile; diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 58d166901a8c..b1ebfea6ddd7 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -296,6 +296,7 @@ bool virNetDevSupportsBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 5d530f957b0d..7f6ea1d8887d 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3440,6 +3440,29 @@ =20 + + + vds + + + + + + + + + + + + + + + + + + + + diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 92e4e0ee605f..ab736713271b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1392,6 +1392,7 @@ libxlMakeNic(virDomainDef *def, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported interface type %s"), diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d90ec674e5f6..10ac8013739f 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1678,6 +1678,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(net->type)); return -1; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c63f4b14eaf8..9328f242df6a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -423,6 +423,7 @@ static int virLXCControllerGetNICIndexes(virLXCControll= er *ctrl) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type %s"), virDomainNetTypeToString(actualType)); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 6bd2cdd205d4..8a7135ff4733 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3466,6 +3466,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Network device type is not supported")); goto cleanup; @@ -3522,6 +3523,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: /* no-op */ @@ -3965,6 +3967,7 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only bridged veth devices can be detached")); goto cleanup; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index fab23fa2b11f..6b12bff25cb8 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -597,6 +597,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unsupported network type %s"), @@ -1609,6 +1610,7 @@ virLXCProcessReconnectNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 812176ab992e..1523ca704794 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3962,6 +3962,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: /* Should have been handled earlier via PCI/USB hotplug code. */ case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -8182,6 +8183,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -8280,6 +8282,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ break; @@ -8319,6 +8322,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* These types don't use a network device on the host, but * instead use some other type of connection to the emulated diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9d5dd07958ad..45f00e162d63 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9733,6 +9733,7 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 30f146f2f4d9..751fa84013b0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1231,6 +1231,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("hotplug of interface type of %s is not implement= ed yet"), @@ -3387,6 +3388,7 @@ qemuDomainChangeNetFilter(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filters not supported on interfaces of type %s"), virDomainNetTypeToString(virDomainNetGetActualType(= newdev))); @@ -3739,6 +3741,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("unable to change config on '%s' network type= "), virDomainNetTypeToString(newdev->type)); diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index fa34ecd5130f..3ec92fdd7d36 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -119,6 +119,7 @@ qemuInterfaceStartDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; @@ -206,6 +207,7 @@ qemuInterfaceStopDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cfcf879f5908..5c8413a6b64c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3262,6 +3262,7 @@ qemuProcessNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -8267,6 +8268,7 @@ void qemuProcessStop(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* No special cleanup procedure for these types. */ break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 6e457f381412..41765bba3710 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1761,6 +1761,7 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 7b705b895ed1..b7b997e83540 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3973,6 +3973,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(def->type)); return -1; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 451f51d633d8..d2ea4d1c7b44 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1070,6 +1070,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: vshError(ctl, _("No support for %s in command 'attach-interface'"), type); --=20 2.37.2 From nobody Fri May 17 05:50:13 2024 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=1660742848; cv=none; d=zohomail.com; s=zohoarc; b=fXd8Y44YBq67sWK4LELcjBpNgN3wUK2dZ2hhO6iQkDgrtEYnRn0hbp+ychmbnI2GAffuQDKTeGMMrLsGFoydrTi4gn+R8khHjNkqfm+aTE5GpbO/MLgaqM8Fq1SLwj1gC43vkqQTC+hvMNbk6N36Mj7dSvM8do84hBzoydZxu3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660742848; 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=mfKZKgTlHHCEV4od7ArYUjlsFGo63S4YDmIbYjiC0sw=; b=RJCG0Lmz/aZpE2W1R1/ZgYUD8KjH/XoyVlXM5iouwbZJTtXV/Icu9qp2/fL8zg52hybymIdLDRTY6b+Ofllfao32ZKl5lJIRH/SlUu9hQ7znwdvnFZwlFR5Z4OHZLoqv21D9vdWV76Z5bM6vlpYrpeO085QQ7FUpy5wfWCVWG+c= 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 1660742848867925.4498866981336; Wed, 17 Aug 2022 06:27:28 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-31-G0IcRpA6ME6TANqE_JT16Q-1; Wed, 17 Aug 2022 09:27:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71CE729DD9BA; Wed, 17 Aug 2022 13:27:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0048C1121314; Wed, 17 Aug 2022 13:27:22 +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 B8100193F6F6; Wed, 17 Aug 2022 13:27:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C69611946A40 for ; Wed, 17 Aug 2022 12:50:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A98512166B2B; Wed, 17 Aug 2022 12:50:53 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A61DA2166B2A for ; Wed, 17 Aug 2022 12:50:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FDC085A588 for ; Wed, 17 Aug 2022 12:50:53 +0000 (UTC) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-278-9FpZg-qkP6-I6EpKPZAidw-1; Wed, 17 Aug 2022 08:50:47 -0400 Received: by mail-ed1-f71.google.com with SMTP id z3-20020a056402274300b0043d4da3b4b5so8646825edd.12 for ; Wed, 17 Aug 2022 05:50:47 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id r2-20020a1709061ba200b0073087f7dfe2sm6742601ejg.125.2022.08.17.05.50.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:50:46 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 9C9078F2D64D for ; Wed, 17 Aug 2022 14:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660742847; 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=mfKZKgTlHHCEV4od7ArYUjlsFGo63S4YDmIbYjiC0sw=; b=U05nO5N9kcq2mV/zgzlRe463SGCccrPwGqAkqYAJSrQUU/EkGtv3+STW3wsaEPSJ7LNJ3i S8V46x+byysefvZ3SG64C99/VIZ+06GGtzzHBXlGesF40MeMMPchOB+aSnIDbKFW7nthZf thi1NA0VWSqnqyGdCA7jWTV0nXD/xew= X-MC-Unique: G0IcRpA6ME6TANqE_JT16Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 9FpZg-qkP6-I6EpKPZAidw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=mfKZKgTlHHCEV4od7ArYUjlsFGo63S4YDmIbYjiC0sw=; b=uVj9ZrOc1LxnzPfDLA5QRNRy7juIaErTz+vPX7IYoCWI0o2LTOZkn2kMIGEkLeWPQq SA4mVg4OKfGCOtAGZV3UaMQ5rmnOXQDy6+swqVtQIvM7MjbMCF9xSR19Gl0c6AhDX+Lt rPFonCvZ5p84j+M8Qs/9pokJ5bxMl6osWM7Pau6Ke76hjgSAC1gop6RQtn+TFEs6rftd Qz4KZDrja3mUAoxJGGK6HVlqbnEkaaUaL5yOS2wbt8+82qBL+wTvEEuJ5HxtSy9THpTg q/PGoY+VlTZRe5lmsq0VROut35IDcNXeXP5gAZnrhb8t00TjiVCdY/pps7F/kYg5mCIb NOlw== X-Gm-Message-State: ACgBeo3ogmfdaadtNr/QQt+/ieF/rqiN30oZBbF8YENczn31C2dCHjpS BiQRjwKFxAwY4sH8tctToh8BTMjMfDbiI13j62/c8nexp7WA1f08SY4VmYLW5GfkN/lMbgWWi7J YJLfzybGEQiEEg5MWbp3LP6A5TC/TcwfkCdwl2LfOWifIyIvv+5npYQFqGowSaqWh6+902iw= X-Received: by 2002:a05:6402:248a:b0:440:9709:df09 with SMTP id q10-20020a056402248a00b004409709df09mr22867872eda.42.1660740646727; Wed, 17 Aug 2022 05:50:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR4WKk7sw0YIHXbQ1s24Tsk+8DZMKHdTyCXRaFrQJMdRR5iXuiFn4XZIfqhECEyKZwIFCJl1rQ== X-Received: by 2002:a05:6402:248a:b0:440:9709:df09 with SMTP id q10-20020a056402248a00b004409709df09mr22867849eda.42.1660740646476; Wed, 17 Aug 2022 05:50:46 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 5/5] vmx: Add support for VDS interface Date: Wed, 17 Aug 2022 14:50:40 +0200 Message-Id: <1544c90ecc65e8b38fc2e628c4e0ea2128104245.1660740500.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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.3 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: 1660742850521100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Since we cannot properly plug a new VM into the distributed switch, we can = at least report the provided pieces of information, so that XML editing still = works even for VMs with such interfaces. https://bugzilla.redhat.com/show_bug.cgi?id=3D1988211 Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 76 ++++++++++++++++++---- tests/vmx2xmldata/ethernet-vds.vmx | 11 ++++ tests/vmx2xmldata/ethernet-vds.xml | 24 +++++++ tests/vmx2xmltest.c | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx | 18 +++++ tests/xml2vmxdata/xml2vmx-ethernet-vds.xml | 15 +++++ tests/xml2vmxtest.c | 1 + 7 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 tests/vmx2xmldata/ethernet-vds.vmx create mode 100644 tests/vmx2xmldata/ethernet-vds.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vds.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index b7b997e83540..9ad463658aa8 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2700,6 +2700,13 @@ virVMXParseEthernet(virConf *conf, int controller, v= irDomainNetDef **def) char networkName_name[48] =3D ""; char *networkName =3D NULL; =20 + char switchId_name[48] =3D ""; + char *switchId =3D NULL; + + char portId_name[48] =3D ""; + char portgroupId_name[48] =3D ""; + char connectionId_name[48] =3D ""; + int netmodel =3D VIR_DOMAIN_NET_MODEL_UNKNOWN; =20 if (def =3D=3D NULL || *def !=3D NULL) { @@ -2721,6 +2728,13 @@ virVMXParseEthernet(virConf *conf, int controller, v= irDomainNetDef **def) VMX_BUILD_NAME(networkName); VMX_BUILD_NAME(vnet); =20 + g_snprintf(prefix, sizeof(prefix), "ethernet%d.dvs", controller); + + VMX_BUILD_NAME(switchId); + VMX_BUILD_NAME(portId); + VMX_BUILD_NAME(portgroupId); + VMX_BUILD_NAME(connectionId); + /* vmx:present */ if (virVMXGetConfigBoolean(conf, present_name, &present, false, true) = < 0) return -1; @@ -2836,19 +2850,36 @@ virVMXParseEthernet(virConf *conf, int controller, = virDomainNetDef **def) goto cleanup; } =20 + if (virVMXGetConfigString(conf, switchId_name, &switchId, true) < 0) + goto cleanup; + /* Setup virDomainNetDef */ - if (connectionType =3D=3D NULL && networkName =3D=3D NULL) { - /* - * Having neither a connectionType nor a network name can mean two - * things: - * - * 1) there is no connection of that nic - * 2) the nic is connected to VMWare Distributed Switch - * - * But we do not see any difference between these and hence we rep= ort - * the closest thing to at least make virt-v2v and others work whe= n they - * read the domain XML. - */ + if (switchId) { + (*def)->type =3D VIR_DOMAIN_NET_TYPE_VDS; + + if (virUUIDParse(switchId, (*def)->data.vds.switch_id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse UUID from string '%s'"), + switchId); + goto cleanup; + } + + if (virVMXGetConfigString(conf, + portgroupId_name, + &(*def)->data.vds.portgroup_id, + false) < 0 || + virVMXGetConfigLong(conf, + portId_name, + &(*def)->data.vds.port_id, + 0, + false) < 0 || + virVMXGetConfigLong(conf, + connectionId_name, + &(*def)->data.vds.connection_id, + 0, + false) < 0) + goto cleanup; + } else if (connectionType =3D=3D NULL && networkName =3D=3D NULL) { (*def)->type =3D VIR_DOMAIN_NET_TYPE_DUMMY; } else if (connectionType =3D=3D NULL || STRCASEEQ(connectionType, "br= idged")) { (*def)->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; @@ -3962,6 +3993,26 @@ virVMXFormatEthernet(virDomainNetDef *def, int contr= oller, case VIR_DOMAIN_NET_TYPE_DUMMY: break; =20 + case VIR_DOMAIN_NET_TYPE_VDS: { + unsigned char *uuid =3D def->data.vds.switch_id; + + virBufferAsprintf(buffer, "ethernet%d.dvs.switchId =3D \"%02x %02x= %02x %02x %02x " + "%02x %02x %02x-%02x %02x %02x %02x %02x %02x %0= 2x %02x\"\n", + controller, uuid[0], uuid[1], uuid[2], uuid[3], = uuid[4], + uuid[5], uuid[6], uuid[7], uuid[8], uuid[9], uui= d[10], + uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]= ); + + virBufferAsprintf(buffer, "ethernet%d.dvs.portId =3D \"%lld\"\n", + controller, def->data.vds.port_id); + + virBufferAsprintf(buffer, "ethernet%d.dvs.", controller); + virBufferEscapeString(buffer, "portgroupId =3D \"%s\"\n", def->dat= a.vds.portgroup_id); + + virBufferAsprintf(buffer, "ethernet%d.dvs.connectionId =3D \"%lld\= "\n", + controller, def->data.vds.connection_id); + break; + } + case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: @@ -3973,7 +4024,6 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(def->type)); return -1; diff --git a/tests/vmx2xmldata/ethernet-vds.vmx b/tests/vmx2xmldata/etherne= t-vds.vmx new file mode 100644 index 000000000000..f68587bcf181 --- /dev/null +++ b/tests/vmx2xmldata/ethernet-vds.vmx @@ -0,0 +1,11 @@ +config.version =3D "8" +virtualHW.version =3D "4" +ethernet0.present =3D "true" +ethernet0.virtualDev =3D "e1000e" +ethernet0.addressType =3D "vpx" +ethernet0.generatedAddress =3D "00:50:56:87:65:43" +ethernet0.dvs.switchId =3D "50 34 26 b2 94 e9 3b 16-1d 68 87 bf ff 4a 54 4= 0" +ethernet0.dvs.portId =3D "5" +ethernet0.dvs.portgroupId =3D "dvportgroup-1285" +ethernet0.dvs.connectionId =3D "408217997" +displayName =3D "test" diff --git a/tests/vmx2xmldata/ethernet-vds.xml b/tests/vmx2xmldata/etherne= t-vds.xml new file mode 100644 index 000000000000..ab842b168c9b --- /dev/null +++ b/tests/vmx2xmldata/ethernet-vds.xml @@ -0,0 +1,24 @@ + + test + 00000000-0000-0000-0000-000000000000 + 32768 + 32768 + 1 + + hvm + + + destroy + restart + destroy + + + + + + + + + diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 3ab39148e0a4..07d7bf24c2b3 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -237,6 +237,7 @@ mymain(void) DO_TEST("ethernet-vpx"); DO_TEST("ethernet-other"); DO_TEST("ethernet-dummy"); + DO_TEST("ethernet-vds"); =20 DO_TEST("serial-file"); DO_TEST("serial-device"); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx b/tests/xml2vmxdata= /xml2vmx-ethernet-vds.vmx new file mode 100644 index 000000000000..bcc04bc21a6e --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx @@ -0,0 +1,18 @@ +.encoding =3D "UTF-8" +config.version =3D "8" +virtualHW.version =3D "4" +guestOS =3D "other" +uuid.bios =3D "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName =3D "ethernet-vpx" +memsize =3D "4" +numvcpus =3D "1" +floppy0.present =3D "false" +floppy1.present =3D "false" +ethernet0.present =3D "true" +ethernet0.virtualDev =3D "e1000e" +ethernet0.dvs.switchId =3D "50 34 26 b2 94 e9 3b 16-1d 68 87 bf ff 4a 54 4= 0" +ethernet0.dvs.portId =3D "5" +ethernet0.dvs.portgroupId =3D "dvportgroup-1285" +ethernet0.dvs.connectionId =3D "408217997" +ethernet0.addressType =3D "vpx" +ethernet0.generatedAddress =3D "00:50:56:87:65:43" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vds.xml b/tests/xml2vmxdata= /xml2vmx-ethernet-vds.xml new file mode 100644 index 000000000000..69d44a62da1c --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vds.xml @@ -0,0 +1,15 @@ + + ethernet-vpx + 564d9bef-acd9-b4e0-c8f0-aea8b9103515 + 4096 + + hvm + + + + + + + + + diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 7723c1efabdd..c921c8a3b0eb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -226,6 +226,7 @@ mymain(void) DO_TEST("ethernet-mac-type", "ethernet-mac-type", 4); =20 DO_TEST("ethernet-dummy", "ethernet-dummy", 4); + DO_TEST("ethernet-vds", "ethernet-vds", 4); =20 DO_TEST("serial-file", "serial-file", 4); DO_TEST("serial-device", "serial-device", 4); --=20 2.37.2