From nobody Fri May 3 08:09:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594131173; cv=none; d=zohomail.com; s=zohoarc; b=TgBXaCYEDLNisJU9UPIMXC5qOf6TJj32Ot690oVms2IQC4301cDzvJUWdHKEWkMEomZrCe4awWQz2hC7/TlmSTsXU2gcdyqbFgCulFfLd0s9zcfM37eVyaH34aAuwMdrBRCW5Hh9Dgx7ShuhECSTaACtTJhTn2hf1ydMOEE2N6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594131173; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/bstk1svvtrWqIWWvH0rCPMWgMvsWqi+7fe7dH2rZJM=; b=c5JVRP4h7iTSOzbjbQLrfAAIqKauLmEYJJNoN2E0KGgEVhNqj2nbd6hXVk0EMngB3YvXBCO1dMbY4/3PKOEga1BX/MkAoIFNWtoaUI0IwoAoK9wJnOQEH/ijpA2fZ4fTOld4oXmSCLj0R0eSZBM/oG5B6Te+6z327Kq2NDH0TTI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594131173747921.1499579146739; Tue, 7 Jul 2020 07:12:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-lLa6_NMkN2GZ7QPjncM8vw-1; Tue, 07 Jul 2020 10:11:49 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE5C58005B0; Tue, 7 Jul 2020 14:11:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00AE85D9DC; Tue, 7 Jul 2020 14:11:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A96986C9FD; Tue, 7 Jul 2020 14:11:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 067EBXlV023874 for ; Tue, 7 Jul 2020 10:11:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E52B208DD80; Tue, 7 Jul 2020 14:11: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 09EBD208DD82 for ; Tue, 7 Jul 2020 14:11:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B5D618E0A75 for ; Tue, 7 Jul 2020 14:11:30 +0000 (UTC) Received: from mail.diateam.net (mail.diateam.net [92.222.227.130]) by relay.mimecast.com with ESMTP id us-mta-413-y9LumOBqNHiXPZPXkenLwg-1; Tue, 07 Jul 2020 10:11:27 -0400 Received: (qmail 20779 invoked from network); 7 Jul 2020 16:04:46 +0200 Received: by simscan 1.4.0 ppid: 20772, pid: 20773, t: 2.2312s scanners: regex: 1.4.0 clamav: 0.101.5/m:59/d:25804 spam: 3.4.2 Received: from lstlambert-656-1-116-247.w80-14.abo.wanadoo.fr (HELO radium.diateam.local) (bastien.orivel@diateam.net@80.14.167.247) by mail.diateam.net (envelope-from bastien.orivel@diateam.net) with SMTP; 7 Jul 2020 16:04:44 +0200 X-MC-Unique: lLa6_NMkN2GZ7QPjncM8vw-1 X-MC-Unique: y9LumOBqNHiXPZPXkenLwg-1 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.virtualys.com X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_20,KHOP_HELO_FCRDNS, RCVD_IN_SORBS_DUL,RDNS_DYNAMIC,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.2 X-Spam-ASN: AS3215 80.14.0.0/16 From: Bastien Orivel To: libvir-list@redhat.com Subject: [PATCH] Change the virtual NICs limit for the ESX driver Date: Tue, 7 Jul 2020 16:04:33 +0200 Message-Id: <20200707140433.3292-1-bastien.orivel@diateam.net> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Bastien Orivel X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since the ESX virtual hardware version 4.0, virtual machines support up to 10 virtual NICs instead of 4 previously. This changes the limit accordingly based on the provided `virtualHW.version`. Signed-off-by: Bastien Orivel Reviewed-by: Michal Privoznik --- src/vmx/vmx.c | 20 ++++++++++++++------ src/vmx/vmx.h | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 67bbe27fde..afe6fe0a1a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -290,7 +290,7 @@ def->fss[0]... <=3D> sharedFolder0= .present =3D "true" ##########################################################################= ###### ## nets ##################################################################= ###### =20 - ethernet[0..3] -> + ethernet[0..9] -> =20 ethernet0.present =3D "true" = # defaults to "false" ethernet0.startConnected =3D "true= " # defaults to "true" @@ -3376,7 +3376,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tionPtr xmlopt, virDomainDe =20 /* def:nets */ for (i =3D 0; i < def->nnets; ++i) { - if (virVMXFormatEthernet(def->nets[i], i, &buffer) < 0) + if (virVMXFormatEthernet(def->nets[i], i, &buffer, virtualHW_versi= on) < 0) goto cleanup; } =20 @@ -3732,15 +3732,23 @@ virVMXFormatFileSystem(virDomainFSDefPtr def, int n= umber, virBufferPtr buffer) =20 int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, - virBufferPtr buffer) + virBufferPtr buffer, int virtualHW_version) { char mac_string[VIR_MAC_STRING_BUFLEN]; unsigned int prefix, suffix; =20 - if (controller < 0 || controller > 3) { + /* + * Machines older than virtualHW.version =3D 7 (ESXi 4.0) only support= up to 4 + * virtual NICs. New machines support up to 10. + */ + int controller_limit =3D 4; + if (virtualHW_version >=3D 7) + controller_limit =3D 10; + + if (controller < 0 || controller > controller_limit) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Ethernet controller index %d out of [0..3] range= "), - controller); + _("Ethernet controller index %d out of [0..%d] rang= e"), + controller, controller_limit - 1); return -1; } =20 diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index 63f47822fb..7069a50b6e 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -131,7 +131,7 @@ int virVMXFormatFileSystem(virDomainFSDefPtr def, int n= umber, virBufferPtr buffer); =20 int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, - virBufferPtr buffer); + virBufferPtr buffer, int virtualHW_version); =20 int virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, virBufferPtr buffer); --=20 2.20.1