From nobody Sat May 18 15:08: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=1659618461; cv=none; d=zohomail.com; s=zohoarc; b=cv8MsIqUdoQOsj3XtJZCDZWKONx6XSA9xY/P1/TIoYjk31InIiHHhgC89vLDPLKdMl6n6qvDIwczGmWsHhO+2Kp37kI7nMfxIcIIG7eg1qmSHkzAdWcM57vCaCLPEWmCkedDH65NO7S//y5BhBczt+RKpMoaR9m1YiFR3wjyQZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659618461; 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=yZ6pxGaY6N7n1C3GXOW8hy1SEwF//MmMdIjPviezzIM=; b=hKkhevviBmo59hIt4IcnDNbBTbLxJa4ymHl0/r8AKkYJHS+u67CGES3WvT79M5YpE7NhYbPqGdtP/tVNxLtNnJuQ/vqInCrASiPCiYX8T24TWfvxDWnoJNP/o+MoZsu2bNSXChbxTz4Qjw3wAivaUNMpf4QEFqvBI8wuKllG6t4= 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 1659618461794187.77240225152627; Thu, 4 Aug 2022 06:07:41 -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-570-Sy0y-sbEMGKVXaEya2blYw-1; Thu, 04 Aug 2022 09:07:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 93CF31C288D6; Thu, 4 Aug 2022 13:07:34 +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 800632026D4C; Thu, 4 Aug 2022 13:07:34 +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 4E2931946A5E; Thu, 4 Aug 2022 13:07:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B9F21946A56 for ; Thu, 4 Aug 2022 13:07:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3809A18EB7; Thu, 4 Aug 2022 13:07:33 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3477B909FF for ; Thu, 4 Aug 2022 13:07:33 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 17E681824603 for ; Thu, 4 Aug 2022 13:07:33 +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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-171-phdGQEGGNzaJc6PWryPUeQ-1; Thu, 04 Aug 2022 09:07:24 -0400 Received: by mail-ej1-f72.google.com with SMTP id js11-20020a17090797cb00b00730d73eac83so296907ejc.19 for ; Thu, 04 Aug 2022 06:07:24 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id j17-20020a50ed11000000b0043ba437fe04sm632662eds.78.2022.08.04.06.07.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 06:07:21 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 4022C8A1893C for ; Thu, 4 Aug 2022 15:07:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659618460; 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=yZ6pxGaY6N7n1C3GXOW8hy1SEwF//MmMdIjPviezzIM=; b=BVOuE6uTVQ5Fs82kJvy1iiKhntgrC9JCKZg40LgI8v+BiabHHHKklc1faF2BFkESg2UGSD 1+3TDXgrLD63s8XG5ifO/m7Vak7XvfPxyO4GaNKW0bx57TNR7Q2G2CeUrzkZ7tJQd5TNTk 6iHHq/lbDS80aoFg7DMAwND+mSYipOE= X-MC-Unique: Sy0y-sbEMGKVXaEya2blYw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: phdGQEGGNzaJc6PWryPUeQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yZ6pxGaY6N7n1C3GXOW8hy1SEwF//MmMdIjPviezzIM=; b=3MTJTigyrusszuQz6a+cpA7CK7hzckJHj2uXqBMcDUr7MXrr8YARtrjBbTaAmE/nwI K1q56GzNLxpl6ULPiTXzvCVZc0eMyk1XXwSXLBLY1UlIFjeUypfQYOBPVD8Yg8CQ3Ze5 9PHDV6F/WPRmEL9TkjfddO0Vxlgfof2s9n73X1M5qjfIfr7ZFWD4+14hx4rZYto9GIL7 md7OyW5Qgdon02fceNegTrPNY+QM1tt+BqU7DcZIHahO5fX3ygrZ6JVAnTHNduoQ5pvc iOk4PHUGeVnf2F3uot1lb7y7RK8817VPS5PN4EZX40eWr0/pcDmw5JXgUZQFRXOW7UZ+ AChg== X-Gm-Message-State: ACgBeo3rnAD8NhvdyRBQSmZwvHQsJDFOl3TLTDWJUEkOHDEArrdfQlcZ eKVTr1AWH7YVPnJd4WTNRqv9+t8CoJ31cEPd3r05h+scjwO2/P/1DL+GF9IKbWGwmEhEhB/FFCn 82dWShOKTU8ZunxYqM0LEMquA3uXNzm+VHE66DxMN6JwS/iwQmveirYMk32/km9AFMzFRTdU= X-Received: by 2002:a05:6402:1e8f:b0:43a:ddfc:5c4e with SMTP id f15-20020a0564021e8f00b0043addfc5c4emr1988408edf.358.1659618443095; Thu, 04 Aug 2022 06:07:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR6vObxDwNK5cZYl+g4Z0bRgaAUToirUb8naiEWXj+5BV2IsDWBrWM2rLpkqcb+Ulc/UbCWhCQ== X-Received: by 2002:a05:6402:1e8f:b0:43a:ddfc:5c4e with SMTP id f15-20020a0564021e8f00b0043addfc5c4emr1988385edf.358.1659618442846; Thu, 04 Aug 2022 06:07:22 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 1/3] vmx: Fix indentation Date: Thu, 4 Aug 2022 15:07:16 +0200 Message-Id: <4138f947958eb326ce6940eab36c0a06d78e9049.1659618320.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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.4 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: 1659618463441100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index f7261f5d2d96..318696fd56d5 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3925,7 +3925,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, =20 /* def:type, def:ifname -> vmx:connectionType */ switch (def->type) { - case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferAsprintf(buffer, "ethernet%d.networkName =3D \"%s\"\n", controller, def->data.bridge.brname); =20 @@ -3941,22 +3941,22 @@ virVMXFormatEthernet(virDomainNetDef *def, int cont= roller, =20 break; =20 - case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_USER: virBufferAsprintf(buffer, "ethernet%d.connectionType =3D \"nat\"\n= ", controller); break; =20 - case VIR_DOMAIN_NET_TYPE_ETHERNET: - case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - case VIR_DOMAIN_NET_TYPE_SERVER: - case VIR_DOMAIN_NET_TYPE_CLIENT: - case VIR_DOMAIN_NET_TYPE_MCAST: - case VIR_DOMAIN_NET_TYPE_NETWORK: - case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_DIRECT: - case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VDPA: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(def->type)); return -1; --=20 2.35.1 From nobody Sat May 18 15:08: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=1659618454; cv=none; d=zohomail.com; s=zohoarc; b=RyjBGKDyMXkvwbCwIKzHGd3Dk6It1BilZBBejQh+tfIoB98sZyfqQImL8uiIRemLePWdzVQuvm2nliFe/9YLFw3QKPBrmkb6xQh4uXpJzf8ZkcrzDe7HlX75uPuKqYaPVBEQEME++U8IVDKARjOAWO1UfP6tQk8+f55Vf8B0sbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659618454; 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=eRCkoebesI8LlkLGHCgfMkjcN29JlMU/QclXf5bqAhI=; b=Kce7nl1tCwAoQKe2tuCHEX6+jHixokCJn9HWurwdk8yey60NbDy2q0Glz1Cf1UeZ6pL8mK0RaJ4D28Ejy5cYEFPcLTwJsKGFhFNu7EpZooqILcfBTJGKLGoYMlwPeuIYJM/wB076DlB5+xDBG3c7m+DLVy1h1XZhZj43FxDhV8Q= 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 1659618454523655.164070953794; Thu, 4 Aug 2022 06:07:34 -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-288-TltJcw5fNbSpA_iEDwA4Xw-1; Thu, 04 Aug 2022 09:07:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91B198037B3; Thu, 4 Aug 2022 13:07:27 +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 4D0F9C33AE6; Thu, 4 Aug 2022 13:07:27 +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 AC72C1946A57; Thu, 4 Aug 2022 13:07:26 +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 0FB6F1946A71 for ; Thu, 4 Aug 2022 13:07:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E67EBC27DB3; Thu, 4 Aug 2022 13:07:25 +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 E1E3BC04482 for ; Thu, 4 Aug 2022 13:07:25 +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 C67A185A586 for ; Thu, 4 Aug 2022 13:07:25 +0000 (UTC) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-412-V6SpLgJLPZK60QrkRnd62w-1; Thu, 04 Aug 2022 09:07:24 -0400 Received: by mail-ed1-f70.google.com with SMTP id g8-20020a056402424800b0043e81c582a4so1210886edb.17 for ; Thu, 04 Aug 2022 06:07:24 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id m1-20020a1709066d0100b007308bebce51sm312534ejr.171.2022.08.04.06.07.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 06:07:22 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 413838A1893D for ; Thu, 4 Aug 2022 15:07:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659618453; 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=eRCkoebesI8LlkLGHCgfMkjcN29JlMU/QclXf5bqAhI=; b=Klhx4ginT4W8utegpNxCAT/kgj/AkD+B8mEfQwf+KAn2oXgC6fHn5UUsvSh/ab2NgEK98S FLdufXl43eE4Ki7ONYzA5dTDX5Cy4zShvqj8P0HSxfouTr2ykDuVr9BakuuC8pN9L9sTUR kFIHIHH0YruTqKY6AeRo40KogBvtiik= X-MC-Unique: TltJcw5fNbSpA_iEDwA4Xw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: V6SpLgJLPZK60QrkRnd62w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eRCkoebesI8LlkLGHCgfMkjcN29JlMU/QclXf5bqAhI=; b=1YJssuGh6t8UiZaLxYw1PRfj3KRTMbOizyzV1mkP32cF7H6AOWL6EQgwkbhd1eVv/w rulqeHC4WPg8K+vsgLRrdAQWYTL1CkRJ9klaS20Om7s6KZIEt5WHm/dMzo7Gcr0qK2KT kLLnt8VzA6kiwXlJ5WEEYV/y8Q53CJoOAejLz08iPo0+BRcbsn1eNTCcwX+VzJGdPyAM QFDuQPmgWlwSUKkzFw9iGh23vIvnXICIJhZujux14f1OKpaA8jZ+MMKHtpo8gt3zo6Yf ejIeOs3TK03DtC98fBIRItHJDCGc1SR0SJLQojdEcDe2FnEEIBjcQqXURbb+7qwskh6E Bw/A== X-Gm-Message-State: ACgBeo0AAP9KIdGIqMxPVtgRudVqSKAs4DppL2B8tiB4zv1kRZ3+nwfa tn/7pP7tQ1YRdVEaJqUQiX7v9vR4SHAigIZS/xIz+3QLqkwTAIbiAWR14uvs6zAlz+UiXTyRRXu R7pCJsPYVk5zpfDIENKY3kUuqHqGxn0S+lmGaC2KTtuxJq1w3iKbbMroPiN7M/by7EFPh+kQ= X-Received: by 2002:a05:6402:189:b0:437:8a8a:d08a with SMTP id r9-20020a056402018900b004378a8ad08amr1906964edv.241.1659618443309; Thu, 04 Aug 2022 06:07:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR7rfQd+WMHppBW1OHtoDuR80cLtKJGT2878/squ9LxCZCJKtlLm7MBz7h1llxnrOO9wr4tuBw== X-Received: by 2002:a05:6402:189:b0:437:8a8a:d08a with SMTP id r9-20020a056402018900b004378a8ad08amr1906937edv.241.1659618442948; Thu, 04 Aug 2022 06:07:22 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 2/3] conf, docs: Add support for dummy network interface Date: Thu, 4 Aug 2022 15:07:17 +0200 Message-Id: <91381b7a745c96bf9107dd11b0b5280d708056a4.1659618320.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.85 on 10.11.54.8 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: 1659618455286100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- docs/formatdomain.rst | 24 ++++++++++++++++++++++++ src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 10 ++++++++++ src/conf/domain_conf.h | 1 + src/conf/netdev_bandwidth_conf.c | 1 + src/conf/schemas/domaincommon.rng | 7 +++++++ 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 | 4 +++- 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, 68 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index adfdd7b7a5ac..ed0d9c19593b 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5240,6 +5240,30 @@ which the UDP socket packets will originate from the= QEMU host. :since:`Since ... =20 +Dummy network interface +^^^^^^^^^^^^^^^^^^^^^^^ + +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: + +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 + +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` + +:: + + ... + + + + + + ... + Setting the NIC model ^^^^^^^^^^^^^^^^^^^^^ =20 diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index fe3c1237c4d1..67ca4a7a0dcd 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -301,6 +301,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 50338b636563..7764b1054d6f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -573,6 +573,7 @@ VIR_ENUM_IMPL(virDomainNet, "hostdev", "udp", "vdpa", + "dummy", ); =20 VIR_ENUM_IMPL(virDomainNetModel, @@ -2495,6 +2496,7 @@ virDomainActualNetDefFree(virDomainActualNetDef *def) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -2621,6 +2623,7 @@ virDomainNetDefFree(virDomainNetDef *def) =20 case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9312,6 +9315,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, =20 case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9490,6 +9494,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_VDPA: break; case VIR_DOMAIN_NET_TYPE_LAST: @@ -23681,6 +23686,7 @@ virDomainNetDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -28296,6 +28302,7 @@ virDomainNetGetActualVirtPortProfile(const virDomai= nNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -28309,6 +28316,7 @@ virDomainNetGetActualVirtPortProfile(const virDomai= nNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: default: return NULL; @@ -29305,6 +29313,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDe= f *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -29568,6 +29577,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *do= m, case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 724265b6b528..7b81acf5db3b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -939,6 +939,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_HOSTDEV, VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_VDPA, + VIR_DOMAIN_NET_TYPE_DUMMY, =20 VIR_DOMAIN_NET_TYPE_LAST } virDomainNetType; diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 4d9f855916d7..58d166901a8c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -295,6 +295,7 @@ bool virNetDevSupportsBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index c4f293a4c35e..5d530f957b0d 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3433,6 +3433,13 @@ =20 + + + dummy + + + + diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index aa3d7925ec8f..92e4e0ee605f 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1391,6 +1391,7 @@ libxlMakeNic(virDomainDef *def, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 b97ba0a199c1..d90ec674e5f6 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1677,6 +1677,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 a71a662ebda7..c63f4b14eaf8 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -422,6 +422,7 @@ static int virLXCControllerGetNICIndexes(virLXCControll= er *ctrl) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 6b2f721178ac..6bd2cdd205d4 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3465,6 +3465,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Network device type is not supported")); goto cleanup; @@ -3520,6 +3521,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: default: /* no-op */ @@ -3962,6 +3964,7 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 f9854ac1389d..fab23fa2b11f 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -594,9 +594,10 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_LAST: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unsupported network type %s"), virDomainNetTypeToString(type)); @@ -1607,6 +1608,7 @@ virLXCProcessReconnectNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3f65b8adc794..ff7d432ccd2a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4351,6 +4351,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) =20 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_LAST: break; } @@ -8834,6 +8835,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -8931,6 +8933,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ break; @@ -8969,6 +8972,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 69e0c9e217c0..bc44687958f8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9837,6 +9837,7 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5eb370c3dfd4..2c2c270eb946 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1329,6 +1329,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("hotplug of interface type of %s is not implement= ed yet"), @@ -3494,6 +3495,7 @@ qemuDomainChangeNetFilter(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filters not supported on interfaces of type %s"), virDomainNetTypeToString(virDomainNetGetActualType(= newdev))); @@ -3846,6 +3848,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 cf8117d9961a..fa34ecd5130f 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -118,6 +118,7 @@ qemuInterfaceStartDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; @@ -204,6 +205,7 @@ qemuInterfaceStopDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 d29da6324234..dc3055a04b46 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3317,6 +3317,7 @@ qemuProcessNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -8340,6 +8341,7 @@ void qemuProcessStop(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: 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 41349829defd..8d26b43f731c 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1774,6 +1774,7 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 318696fd56d5..95e2d4ae249c 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3957,6 +3957,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_DUMMY: 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 1f995a462adb..451f51d633d8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1069,6 +1069,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_DUMMY: case VIR_DOMAIN_NET_TYPE_LAST: vshError(ctl, _("No support for %s in command 'attach-interface'"), type); --=20 2.35.1 From nobody Sat May 18 15:08: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=1659618455; cv=none; d=zohomail.com; s=zohoarc; b=LuG3cVnUcGKV4GMqPlnS6oLphghyHvxNPf2cay8w6+TuW0bwT+x1ZnPe9OczZBXWK9W0gRd7hhmfvu7A7triDbU4WNcj8vuwr6mowEj8yQjtOcM5ltzFGdyTQx/ogCThfvylGqr8lga21RbcqzhGjOnlkJntK7M4/tlB6oIm9Mo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659618455; 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=pxv039X5QHLDhb5h1tf4/pBjjReQG00Su7BBMgPHcPU=; b=Xm86afrg9Nq2x2SB8+e77KWGN3q5i44suG/Gt3GyDuQVRLg7oBXoVVYxfPSUQxRZHrCAlDSQjoJUk4dJnUHjXdOvbOE1aaAZzCY3R08jUMWvZZeqqvXgOZMrSC75ZFYRH/RRzQORp6RXBdDBPw+um44pKktOaQQLaKXq8RMx/3U= 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 1659618455831460.57491684878903; Thu, 4 Aug 2022 06:07:35 -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-339-WzFNwZyXPm2E3ImM_RMeGg-1; Thu, 04 Aug 2022 09:07:30 -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 D22793C01C17; Thu, 4 Aug 2022 13:07:27 +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 BBB80492CA7; Thu, 4 Aug 2022 13:07:27 +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 D036F1946A76; Thu, 4 Aug 2022 13:07:26 +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 1209E1946A72 for ; Thu, 4 Aug 2022 13:07:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 05F132166B2B; Thu, 4 Aug 2022 13:07:26 +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 024092166B2A for ; Thu, 4 Aug 2022 13:07:25 +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 DBE913802120 for ; Thu, 4 Aug 2022 13:07:25 +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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-eH1c4O2RMrKG5VxRmfCNRg-1; Thu, 04 Aug 2022 09:07:24 -0400 Received: by mail-ed1-f72.google.com with SMTP id i5-20020a05640242c500b0043e50334109so2767389edc.1 for ; Thu, 04 Aug 2022 06:07:24 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id s14-20020a508d0e000000b0043cc7a3ff7fsm658490eds.33.2022.08.04.06.07.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 06:07:22 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 446628A1893E for ; Thu, 4 Aug 2022 15:07:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659618453; 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=pxv039X5QHLDhb5h1tf4/pBjjReQG00Su7BBMgPHcPU=; b=NN1VjhVnnLxWBxr984828MbE4bUd6hd6CqpH3bvb6fLJbaDfqP8sWGWx5DBwFutBktxa8e XEHs/ShVewbAJ0t3LO0YihXnVa4mxgnfkiRlNWaei3G0VYJGbmXOsXhEjEtKVGIxs2KZvO YUlS/fCItMz0954l8QhHeNU58cUwaTk= X-MC-Unique: WzFNwZyXPm2E3ImM_RMeGg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: eH1c4O2RMrKG5VxRmfCNRg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pxv039X5QHLDhb5h1tf4/pBjjReQG00Su7BBMgPHcPU=; b=pd+Tl9HE8XpWgOxO8f3sl6QpHmJAieJaxRwrxHzvivxGq1tG77kNNYmqZCC7NTMkKZ /55Fj9TzB+CQR9K//1uRS/XFlmDa4pAGP9FA3Iw4Tq3DX5leky+VJ/NYxu3c4lG3xpyh EqHDK8z5kPyeiq6+ddd2Vmp4srbg7TVZa1A9KeZcBiDb84/6U8sYyMd/SkcEHOKVaYTC bMxQaw151mnwAXIuNhv5fpkJwnXLJW0kAhU0HoodW2HH7OTLNheKws8o/IsP+KBB7iz2 Y7q8XYrv0bob0/r0DG9YlHc2x7JdGM7Cpv6gH+76mgevMMqZj/U6/qZnxQotvdO+7Yn0 1Pgw== X-Gm-Message-State: ACgBeo3ebjU8fEk2OSHHYJNfNSx0et9JdmgRPRV92vvlZIOSmXCw62J9 d2N4kJg9YwuEdgXs1OwLwW8r224uIkDMdRVgCvyvuo+gjzvejrDRAdyG8GwzIjLG8X2nRf99uGw 3KYGyZy6LNuo2+4TlxPkc/a914IEcvXtJwqoO5yNbsok4yFmcKoZa5fgfucx0bofG3XVIJW8= X-Received: by 2002:a17:906:cc0d:b0:730:d6f3:277a with SMTP id ml13-20020a170906cc0d00b00730d6f3277amr1045334ejb.579.1659618443503; Thu, 04 Aug 2022 06:07:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR5fK2zPG87/d1MlL5BJ8mCXgnE1i6v5o98xeTvJB3rZQZ+NAPnhI9XsWZEMKF55ygaAVTqebA== X-Received: by 2002:a17:906:cc0d:b0:730:d6f3:277a with SMTP id ml13-20020a170906cc0d00b00730d6f3277amr1045307ejb.579.1659618443186; Thu, 04 Aug 2022 06:07:23 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 3/3] vmx: Add support for dummy network interface Date: Thu, 4 Aug 2022 15:07:18 +0200 Message-Id: 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: 1659618457266100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Also map it to an ethernet without connectionType and networkName. https://bugzilla.redhat.com/show_bug.cgi?id=3D1988211 Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 21 ++++++++++++++--- .../vmx2xmldata/ethernet-unmanaged-nodev.vmx | 7 ++++++ .../vmx2xmldata/ethernet-unmanaged-nodev.xml | 23 +++++++++++++++++++ tests/vmx2xmltest.c | 1 + .../xml2vmx-ethernet-unmanaged-nodev.vmx | 13 +++++++++++ .../xml2vmx-ethernet-unmanaged-nodev.xml | 13 +++++++++++ tests/xml2vmxtest.c | 2 ++ 7 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx create mode 100644 tests/vmx2xmldata/ethernet-unmanaged-nodev.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 95e2d4ae249c..49eef12e3ea7 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, - false) < 0) + true) < 0) goto cleanup; } =20 @@ -2837,7 +2837,20 @@ virVMXParseEthernet(virConf *conf, int controller, v= irDomainNetDef **def) } =20 /* Setup virDomainNetDef */ - if (connectionType =3D=3D NULL || STRCASEEQ(connectionType, "bridged")= ) { + 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. + */ + (*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; (*def)->data.bridge.brname =3D g_steal_pointer(&networkName); } else if (STRCASEEQ(connectionType, "hostonly")) { @@ -3946,6 +3959,9 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, controller); break; =20 + case VIR_DOMAIN_NET_TYPE_DUMMY: + break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: @@ -3957,7 +3973,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_DUMMY: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(def->type)); return -1; diff --git a/tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx b/tests/vmx2xml= data/ethernet-unmanaged-nodev.vmx new file mode 100644 index 000000000000..6e08536337f7 --- /dev/null +++ b/tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx @@ -0,0 +1,7 @@ +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" +displayName =3D "test" diff --git a/tests/vmx2xmldata/ethernet-unmanaged-nodev.xml b/tests/vmx2xml= data/ethernet-unmanaged-nodev.xml new file mode 100644 index 000000000000..a31243033785 --- /dev/null +++ b/tests/vmx2xmldata/ethernet-unmanaged-nodev.xml @@ -0,0 +1,23 @@ + + test + 00000000-0000-0000-0000-000000000000 + 32768 + 32768 + 1 + + hvm + + + destroy + restart + destroy + + + + + + + + diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index dbd771017bf3..e08079512b53 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -236,6 +236,7 @@ mymain(void) DO_TEST("ethernet-static"); DO_TEST("ethernet-vpx"); DO_TEST("ethernet-other"); + DO_TEST("ethernet-unmanaged-nodev"); =20 DO_TEST("serial-file"); DO_TEST("serial-device"); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx b/tests= /xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx new file mode 100644 index 000000000000..41ba2967c08f --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx @@ -0,0 +1,13 @@ +.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.addressType =3D "vpx" +ethernet0.generatedAddress =3D "00:50:56:87:65:43" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml b/tests= /xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml new file mode 100644 index 000000000000..a071b2f21513 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml @@ -0,0 +1,13 @@ + + ethernet-vpx + 564d9bef-acd9-b4e0-c8f0-aea8b9103515 + 4096 + + hvm + + + + + + + diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 1a7f2e4f3390..0ea213d5d5cd 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -225,6 +225,8 @@ 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("serial-file", "serial-file", 4); DO_TEST("serial-device", "serial-device", 4); DO_TEST("serial-pipe", "serial-pipe", 4); --=20 2.35.1