From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1582389334; cv=none; d=zohomail.com; s=zohoarc; b=b04JU8g40zGNbSvzo7O7B7xGtKwo6a2qMPSwMDyrjgkkVzOr82/ULEtd6q82Gw1OZeqWIYHko5OLGQmR+l8aOraCM1Xk6AIb6wXb9cYvUINP+4CNih/O6m9kAjlQQj/FSCdqc8YeUbJA7jmLMw1Q3R08hYW+RPBJD3HrLCLTauk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389334; 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=GDZHtpOi0seT7SiOnVrN17CS+3p+G8be+1D/NZxQCNY=; b=gjPaRsmkaBEOSHwM7qt9odKQKOumHzEfqdUMQl/ZwRFL+pNmJODz3r84jUzyT400NAg6yIpzi3VvlRrldGKkgpsSrO5RZGxNeUJiLCzIjiF/LgISRG60Wqp2HUAJnBO3pOLKnYDX7c4+m9fS++gSVkdT9tjZSfMTqhz+CFoq3Og= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1582389334840643.3188801786002; Sat, 22 Feb 2020 08:35:34 -0800 (PST) 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-41--hzLsEEgMGGnuXoVrLaKRA-1; Sat, 22 Feb 2020 11:35:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63B63100550E; Sat, 22 Feb 2020 16:35:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3CBF191833; Sat, 22 Feb 2020 16:35:26 +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 EA24618089CF; Sat, 22 Feb 2020 16:35:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGW7Hm013565 for ; Sat, 22 Feb 2020 11:32:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3E4FB5C1B5; Sat, 22 Feb 2020 16:32:07 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97BAE5C1C3 for ; Sat, 22 Feb 2020 16:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389333; 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=GDZHtpOi0seT7SiOnVrN17CS+3p+G8be+1D/NZxQCNY=; b=gf8j7Yjpw74FElDEF5xKWzQp5wv7zlfTDjoWWRwYBLxb93TklJB1FYXkGZRfs/bRG//pWK guDFk3ugT6GD4lWZzbDdweCoV1P03WQ07zVRxII5HSahevmt0lFjnuIzZAc1imiFRrhWgD mlWHma7kTjqdOCITcsvhQdWp6hkXjfc= X-MC-Unique: -hzLsEEgMGGnuXoVrLaKRA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/8] conf: virnwfilterbindingdef: include virxml.h Date: Sat, 22 Feb 2020 17:31:52 +0100 Message-Id: <5c9f3053b5753072e6f28dceb6cb3438084c18ee.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The ParseNode function takes arguments with types from libxml. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/virnwfilterbindingdef.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbinding= def.h index 3d291fd6bf..2b83d5bd21 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -25,6 +25,7 @@ #include "virmacaddr.h" #include "virhash.h" #include "virbuffer.h" +#include "virxml.h" =20 typedef struct _virNWFilterBindingDef virNWFilterBindingDef; typedef virNWFilterBindingDef *virNWFilterBindingDefPtr; --=20 2.24.1 From nobody Sun May 5 11:58:25 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1582389354; cv=none; d=zohomail.com; s=zohoarc; b=CX5Tm1OvlQcPOTBH3fdzvinvR9scmkgvsbB9pUQuY+ZsDrFYEeQt4/7UwRLYevZ6iTkjnsIhHAwGUdpRIdGcLoPeDdKX90ETnMcZU2JJcT25LuvN2x+V317+LoiZcBL1KnNvNjRDU/TdiGzDFWBwPW0OVPvduhLA//KOLC5IKFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389354; 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=9m8AxwbjY0ocgL+NIGUXG62cmNDjds8MsaANghfli2c=; b=NdX8KjoBTp0CJ70DR+aZfrqnBczsiYfzScI6QVleIVCy6pZbD39li4TPwndavcXBL817e6DEVgs4CBnAFvjDJgpN8bElMHuvcDjTVMBxe9QRrS0ax2UnB7CfqK1sHyQs7Ctp3DJP28GETJkbFo2bFNRfygPHcDQXNmkJQpIOm+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1582389354227119.22795432616488; Sat, 22 Feb 2020 08:35:54 -0800 (PST) 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-485-R9FJgJsvMVKCarRWxkrOTA-1; Sat, 22 Feb 2020 11:35:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 149511005512; Sat, 22 Feb 2020 16:35:45 +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 DE4D727180; Sat, 22 Feb 2020 16:35:44 +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 939AB860C9; Sat, 22 Feb 2020 16:35:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWA0s013576 for ; Sat, 22 Feb 2020 11:32:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3794A5C1C3; Sat, 22 Feb 2020 16:32:10 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4273E5C1B5 for ; Sat, 22 Feb 2020 16:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389353; 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=9m8AxwbjY0ocgL+NIGUXG62cmNDjds8MsaANghfli2c=; b=ZDURv0TdDQfPKbHfpyOK+R7wR/21wEZ0m2thDZBpL4ma7NK/jE6a5YOvOv+WG1a5GflSZ8 ZrsdLgGyC54vlwyH8ve4NdtjFmFNXP0UEQFFTLJUZiMcEhfz5KnNUjQ4uKszYR1oWKzOsj DsK+NIoNoM/XGWh7zM7aE2riI59F5SM= X-MC-Unique: R9FJgJsvMVKCarRWxkrOTA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/8] bridge: include netdev_bandwidth_conf.h Date: Sat, 22 Feb 2020 17:31:53 +0100 Message-Id: <252034300f2710b843410d8442740fca545d74cb.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This file uses the virNetDevBandwidth*Floor helpers without including the correct include, relying on virnetworkportdef.h to include it. Signed-off-by: J=C3=A1n Tomko Fixes: 17f430eb5cfaaa3388077f2b0856f011f0b2a4c3 Reviewed-by: Michal Privoznik --- src/network/bridge_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fbc0bea238..00896fc87d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -68,6 +68,8 @@ #include "virjson.h" #include "virnetworkportdef.h" =20 +#include "netdev_bandwidth_conf.h" + #define VIR_FROM_THIS VIR_FROM_NETWORK #define MAX_BRIDGE_ID 256 =20 --=20 2.24.1 From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1582389418; cv=none; d=zohomail.com; s=zohoarc; b=aZZ4YXoZ03jH4c9sr8Gop65Dgwx1jaCgkvvPnLLRGjagFDFznREmv4vDCvGe+64crGmwLr8rmbO3AD5ZAQhnqYnrei0v2HdgnN4fQ0fazE6Wz0K5OjLK0bVA7B4H+RoQiValSO5w0twfsx6BigHGzRWjuc18fhW8Xj40p3iyR90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389418; 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=oROqlR6S77K/7jvSTRbIc5s3QhiSZUOaIHzuWlH1rA0=; b=I2YK8FApL4TbPgGhum0dfXf345ZfJPCpLVX4ae6NglXMgmGBNDowK8ZZtRCLCXHhzP7dHsLA46z+vsaaf5JU+nl6QwcJjOqS8WrfIC/n52d8SOk3cd9iyRE3MWAtEPIhpV4LIdgu1/NU4eYD6vWZZGUUGNT3Byo1B6KfbWRbs4Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1582389418304651.43902425324; Sat, 22 Feb 2020 08:36:58 -0800 (PST) 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-127-dLuVfff2OHKrARsPrxNI9Q-1; Sat, 22 Feb 2020 11:36:54 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 291A81005512; Sat, 22 Feb 2020 16:36:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E97AE91833; Sat, 22 Feb 2020 16:36:48 +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 8DB0318089CD; Sat, 22 Feb 2020 16:36:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWB4s013582 for ; Sat, 22 Feb 2020 11:32:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id A0F765C1C3; Sat, 22 Feb 2020 16:32:11 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEA1E5C1B5 for ; Sat, 22 Feb 2020 16:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389417; 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=oROqlR6S77K/7jvSTRbIc5s3QhiSZUOaIHzuWlH1rA0=; b=gyQiiwRTcPYZPO3Cbf8CzBZ9QmP18fdMRAR1F3FD9EwGoZFtyIvfQoWCZzJZfz+x6wD+aJ L5SNvh49rl0GINgOgFcXX/cR+NFBfhnvn82Ikq6bJzzwGRyZvoyis5aCnZv+lJAxVFpxqv 4Yn3lu2zN/pFbn5xfRAKR5jWIqcYkqY= X-MC-Unique: dLuVfff2OHKrARsPrxNI9Q-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/8] conf: virnetworkportdef: include virnetdevmacvlan Date: Sat, 22 Feb 2020 17:31:54 +0100 Message-Id: <0088887e136ee1468c24e747ea89d95c9e910107.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is pulled in via domain_conf.h somehow, but it is directly used. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/virnetworkportdef.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index a0705a8322..a972b698cc 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -24,6 +24,7 @@ #include "virerror.h" #include "virstring.h" #include "virfile.h" +#include "virnetdevmacvlan.h" #include "virnetworkportdef.h" #include "network_conf.h" =20 --=20 2.24.1 From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1582389176; cv=none; d=zohomail.com; s=zohoarc; b=EwSMz9ldQeMwsGtyKHp5Vm0GnaQY8I6bwc+RHMJT2U3yjem0gCFlO3JMUkmEFkGse8a4n33daW5DYd6joP3ji2j+7CPs7HstClDo/qi52+DqovGtRKtwA7gLvTCqL+uC0phgJrtzKZXC1+ctv2ETsVU+CAnxe25FOZQuJV6Qgm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389176; 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=7ocZYis7lPsXQatXZGeaPZ/ki1H27dKeLvnLTyFYf2k=; b=dGf2KhkR1YynAUbXiLV270XY230QWAuUJk8jbTRP53QiDnOoAtJuxXZ9iYCXi9UWn7PzzhWLUALWY7Pt0zeXddacd/jd+bCr28aTrwZEdHzmYHJT9dRz6lIHwq+H2O89LyxVx9EgIIwNFqXvn7VMFh81c2LTnTKVnUIi1PEddA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1582389176399149.33306520981535; Sat, 22 Feb 2020 08:32:56 -0800 (PST) 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-340-0d9daDkrOKGakf8_zbqCOQ-1; Sat, 22 Feb 2020 11:32:52 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 71A4E800D54; Sat, 22 Feb 2020 16:32:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A98A9051B; Sat, 22 Feb 2020 16:32:44 +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 D02261809567; Sat, 22 Feb 2020 16:32:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWDjT013593 for ; Sat, 22 Feb 2020 11:32:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 302095C1C3; Sat, 22 Feb 2020 16:32:13 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34F865C1B5 for ; Sat, 22 Feb 2020 16:32:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389175; 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=7ocZYis7lPsXQatXZGeaPZ/ki1H27dKeLvnLTyFYf2k=; b=KymvmcOCAin3fy5uyQkLK8e7R4IIw3i3jtXaGWby19Fro6Xuj22Y0rcSUjtpaOHP8q3Ejm NA+GbSD6j4xxga5Sbaoz6/UrG+8KKvYZUBnudfd3NY7Uhbn2S9g5jKUWgSnmzxTQnwXGCJ 3qTL2RGEMvYIEmh0aDPQcwkCoRxz+fY= X-MC-Unique: 0d9daDkrOKGakf8_zbqCOQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/8] conf: rename virNetDevSupportBandwidth to virNetDevSupportsBandwidth Date: Sat, 22 Feb 2020 17:31:55 +0100 Message-Id: <99ff5d173e8dbb34c3c7493f47c73e03a68f9f4a.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik Reviewed-by: Pavel Mores --- src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/netdev_bandwidth_conf.h | 2 +- src/lxc/lxc_driver.c | 4 ++-- src/lxc/lxc_process.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_hotplug.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 5cbb9f46e4..349b451e41 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -293,7 +293,7 @@ virDomainClearNetBandwidth(virDomainObjPtr vm) for (i =3D 0; i < vm->def->nnets; i++) { type =3D virDomainNetGetActualType(vm->def->nets[i]); if (virDomainNetGetActualBandwidth(vm->def->nets[i]) && - virNetDevSupportBandwidth(type)) + virNetDevSupportsBandwidth(type)) virNetDevBandwidthClear(vm->def->nets[i]->ifname); } } diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_c= onf.h index b9e57168be..172f9a50f9 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -37,7 +37,7 @@ int virNetDevBandwidthFormat(const virNetDevBandwidth *de= f, void virDomainClearNetBandwidth(virDomainObjPtr vm) ATTRIBUTE_NONNULL(1); =20 -static inline bool virNetDevSupportBandwidth(virDomainNetType type) +static inline bool virNetDevSupportsBandwidth(virDomainNetType type) { switch (type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index f7376188f0..f01c71f9e2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3920,7 +3920,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriverPtr driver, /* Set bandwidth or warn if requested and not supported. */ actualBandwidth =3D virDomainNetGetActualBandwidth(net); if (actualBandwidth) { - if (virNetDevSupportBandwidth(actualType)) { + if (virNetDevSupportsBandwidth(actualType)) { if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, !virDomainNetTypeSharesHostView(net)= ) < 0) goto cleanup; @@ -4377,7 +4377,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, =20 /* clear network bandwidth */ if (virDomainNetGetActualBandwidth(detach) && - virNetDevSupportBandwidth(actualType) && + virNetDevSupportsBandwidth(actualType) && virNetDevBandwidthClear(detach->ifname)) goto cleanup; =20 diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6851b3e3e2..d05304dd8f 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -621,7 +621,7 @@ virLXCProcessSetupInterfaces(virLXCDriverPtr driver, /* Set bandwidth or warn if requested and not supported. */ actualBandwidth =3D virDomainNetGetActualBandwidth(net); if (actualBandwidth) { - if (virNetDevSupportBandwidth(type)) { + if (virNetDevSupportsBandwidth(type)) { if (virNetDevBandwidthSet(net->ifname, actualBandwidth, fa= lse, !virDomainNetTypeSharesHostView(= net)) < 0) goto cleanup; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f69a9e651c..c44f50b2a8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8080,7 +8080,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, /* Set bandwidth or warn if requested and not supported. */ actualBandwidth =3D virDomainNetGetActualBandwidth(net); if (actualBandwidth) { - if (virNetDevSupportBandwidth(actualType)) { + if (virNetDevSupportsBandwidth(actualType)) { if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, !virDomainNetTypeSharesHostView(net)= ) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 39e1f044e0..0faf79e0d1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11594,12 +11594,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, =20 if (net) { actualType =3D virDomainNetGetActualType(net); - qosSupported =3D virNetDevSupportBandwidth(actualType); + qosSupported =3D virNetDevSupportsBandwidth(actualType); } =20 if (qosSupported && persistentNet) { actualType =3D virDomainNetGetActualType(persistentNet); - qosSupported =3D virNetDevSupportBandwidth(actualType); + qosSupported =3D virNetDevSupportsBandwidth(actualType); } =20 if (!qosSupported) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9800491755..ca18bb9e5f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1342,7 +1342,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, /* Set bandwidth or warn if requested and not supported. */ actualBandwidth =3D virDomainNetGetActualBandwidth(net); if (actualBandwidth) { - if (virNetDevSupportBandwidth(actualType)) { + if (virNetDevSupportsBandwidth(actualType)) { if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, !virDomainNetTypeSharesHostView(net)= ) < 0) goto cleanup; @@ -4582,7 +4582,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, return -1; =20 if (virDomainNetGetActualBandwidth(net) && - virNetDevSupportBandwidth(virDomainNetGetActualType(net)) && + virNetDevSupportsBandwidth(virDomainNetGetActualType(net)) && virNetDevBandwidthClear(net->ifname) < 0) VIR_WARN("cannot clear bandwidth setting for device : %s", net->ifname); --=20 2.24.1 From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1582389440; cv=none; d=zohomail.com; s=zohoarc; b=nkgQ5VTGxYXnnGW9sVGlSn14tvSZkNYFs5ISAof1n4D4X6SK/xc+5hyyaYcmBBugWGleUPt9P+fkwSW1ua0oDxK3C1msjGD3XPlkqj7mjR5OR2l7Xl45ez/8wonr9v2e+ZHoopjYrJncSnrtEJBwH1AriP9BUd8jWmrxnZGy8t4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389440; 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=taniKfBPZNS4Kfej+ipLAe9Wy8IZI6doVUBy70KEul0=; b=LYxzXQ11xux8GmzGBUHdnyZ5JhTecw6LrvBC4jcL3aZv4aJ5kg4Ii3bjXSV85eCHAqVdZldxmoT7p4fybOj2zLzYw5pUA0lJOKz6MkQYh8cjY2KIeGR/kprN/3NM4DAYIrWG/mYKvZV0u9iigufZUe2TaOdMSlVMJ4Mih4vpoHM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1582389440823611.3301025386627; Sat, 22 Feb 2020 08:37:20 -0800 (PST) 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-375-NzEaTcFHMASvmYl8A7cWTA-1; Sat, 22 Feb 2020 11:37:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE53D189F762; Sat, 22 Feb 2020 16:37:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8018560C63; Sat, 22 Feb 2020 16:37:11 +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 2D87818089CF; Sat, 22 Feb 2020 16:37:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWE1u013604 for ; Sat, 22 Feb 2020 11:32:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4EA235C1C3; Sat, 22 Feb 2020 16:32:14 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94C885C1B5 for ; Sat, 22 Feb 2020 16:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389439; 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=taniKfBPZNS4Kfej+ipLAe9Wy8IZI6doVUBy70KEul0=; b=fqJupLwxf46XrB+vSSK1MKto+axXgpSgLodkR68WB4F4zNd1llL8cBjLUOdlKQ76GY2kDR XYjdaLA2RrUw2BhNhlfs4WjBtqCoEfDqYaZEhU/vq8B3akgzvgft+M+xALOgw0ExMzMaEg dhIDo9zzGhWs+/zJJZgFT9Jblywq5f0= X-MC-Unique: NzEaTcFHMASvmYl8A7cWTA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/8] conf: virNetDevSupportsBandwidth: move into the C file Date: Sat, 22 Feb 2020 17:31:56 +0100 Message-Id: <35ff3abee47f1177da1e3e540c65cd8371645b46.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Make the header easier to read and let the compiler inline what it wants. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/netdev_bandwidth_conf.c | 23 +++++++++++++++++++++++ src/conf/netdev_bandwidth_conf.h | 24 +----------------------- src/libvirt_private.syms | 1 + 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 349b451e41..2fe0499638 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -299,6 +299,29 @@ virDomainClearNetBandwidth(virDomainObjPtr vm) } =20 =20 +bool virNetDevSupportsBandwidth(virDomainNetType type) +{ + switch ((virDomainNetType) type) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + return true; + case VIR_DOMAIN_NET_TYPE_USER: + 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_UDP: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: + break; + } + return false; +} + + bool virNetDevBandwidthHasFloor(const virNetDevBandwidth *b) { diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_c= onf.h index 172f9a50f9..5a70cb6bba 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -37,28 +37,6 @@ int virNetDevBandwidthFormat(const virNetDevBandwidth *d= ef, void virDomainClearNetBandwidth(virDomainObjPtr vm) ATTRIBUTE_NONNULL(1); =20 -static inline bool virNetDevSupportsBandwidth(virDomainNetType type) -{ - switch (type) { - case VIR_DOMAIN_NET_TYPE_BRIDGE: - case VIR_DOMAIN_NET_TYPE_NETWORK: - case VIR_DOMAIN_NET_TYPE_DIRECT: - case VIR_DOMAIN_NET_TYPE_ETHERNET: - return true; - case VIR_DOMAIN_NET_TYPE_USER: - 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_UDP: - case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_LAST: - break; - } - return false; -} - - +bool virNetDevSupportsBandwidth(virDomainNetType type); bool virNetDevBandwidthHasFloor(const virNetDevBandwidth *b); bool virNetDevBandwidthSupportsFloor(virNetworkForwardType type); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8883aa89cc..fbcc26ad98 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -737,6 +737,7 @@ virNetDevBandwidthFormat; virNetDevBandwidthHasFloor; virNetDevBandwidthParse; virNetDevBandwidthSupportsFloor; +virNetDevSupportsBandwidth; =20 =20 # conf/netdev_vlan_conf.h --=20 2.24.1 From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1582389463; cv=none; d=zohomail.com; s=zohoarc; b=V+c7uSPLG/I9AtuW4CiJdMh4Z0stjPH8D/t32wdnOejsGfABoiYLZd7KIOib7A24UxptPB7441vikc9RI9wthQO19qFt9CUYTIgmN1oUyPA49SJogNMyOtfDfO1pRZLU8zKi6TMdfg/NHGfwYTsI80VskVIJInIHdWqyZhGkkD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389463; 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=ITMLiU0vn3lLGE8dAk2jZXFA+jMRwv12aC00SwoLxEs=; b=kT0ncH/FIArYvcl3KIbbjX7bG3KseliCTNqyiM8aMyIwcnS/xdXov4mucK8+O4IjfIc201SIDLVjlzpPU+vpDOOBBym1wsV8afGAH9GqYMd/ZHuhCP3N+hdRWEW7r1eDMWnlhsmocw9cRVyipF/WMeMaIaEKEaCOksB8/Z0kK90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1582389463277213.2479827869788; Sat, 22 Feb 2020 08:37:43 -0800 (PST) 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-294-oIRUyuT_POqZDjbIPtFssQ-1; Sat, 22 Feb 2020 11:37:39 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 673A2800D54; Sat, 22 Feb 2020 16:37:34 +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 3D9AE1001281; Sat, 22 Feb 2020 16:37:34 +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 F1835860D1; Sat, 22 Feb 2020 16:37:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWFrX013614 for ; Sat, 22 Feb 2020 11:32:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id B82DF5C1C3; Sat, 22 Feb 2020 16:32:15 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 136325C1B5 for ; Sat, 22 Feb 2020 16:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389462; 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=ITMLiU0vn3lLGE8dAk2jZXFA+jMRwv12aC00SwoLxEs=; b=g2DxrlN9p5s99cVFwzUlOowX1UxtJ85KE3ahgHg7AeJLqSS75qeyhIH5zE+6OcwYI7u37t J8GPZx+t/YDO5ZpVr/n/OF4XJhlS0KLNeacV6gLGe8NtyROd3RqjA+VD97+GDZ0FxETgA+ GF8ULgZuV/NmQn6wdCUEgIlkrNiUt+Y= X-MC-Unique: oIRUyuT_POqZDjbIPtFssQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/8] conf: do not pass vm object to virDomainClearNetBandwidth Date: Sat, 22 Feb 2020 17:31:57 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This function only uses the domain definition. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/netdev_bandwidth_conf.c | 10 +++++----- src/conf/netdev_bandwidth_conf.h | 2 +- src/qemu/qemu_process.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 2fe0499638..396ac62019 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -285,16 +285,16 @@ virNetDevBandwidthFormat(const virNetDevBandwidth *de= f, } =20 void -virDomainClearNetBandwidth(virDomainObjPtr vm) +virDomainClearNetBandwidth(virDomainDefPtr def) { size_t i; virDomainNetType type; =20 - for (i =3D 0; i < vm->def->nnets; i++) { - type =3D virDomainNetGetActualType(vm->def->nets[i]); - if (virDomainNetGetActualBandwidth(vm->def->nets[i]) && + for (i =3D 0; i < def->nnets; i++) { + type =3D virDomainNetGetActualType(def->nets[i]); + if (virDomainNetGetActualBandwidth(def->nets[i]) && virNetDevSupportsBandwidth(type)) - virNetDevBandwidthClear(vm->def->nets[i]->ifname); + virNetDevBandwidthClear(def->nets[i]->ifname); } } =20 diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_c= onf.h index 5a70cb6bba..34046eacd7 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -34,7 +34,7 @@ int virNetDevBandwidthFormat(const virNetDevBandwidth *de= f, unsigned int class_id, virBufferPtr buf); =20 -void virDomainClearNetBandwidth(virDomainObjPtr vm) +void virDomainClearNetBandwidth(virDomainDefPtr def) ATTRIBUTE_NONNULL(1); =20 bool virNetDevSupportsBandwidth(virDomainNetType type); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8c1ed76677..3099099819 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7348,7 +7348,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, } =20 /* Clear network bandwidth */ - virDomainClearNetBandwidth(vm); + virDomainClearNetBandwidth(vm->def); =20 virDomainConfVMNWFilterTeardown(vm); =20 --=20 2.24.1 From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1582389376; cv=none; d=zohomail.com; s=zohoarc; b=eDMW2Cm3GpzlVJBTPeLEjTHNFFjKXjsOWDhZAREfUVc32cN+YcPPM2Wa5wnYPpmqhPD47M8Yt1UI1klxnamMU9tt1Xzp3cFGCUf4067DAr/QmcG6pB9bDh1ZSfMTFwE0VlWIqPt2sYc9q0kGqW6SsAQjMTJV/A8GGS7akGMx5Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389376; 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=5NiU0Os2M7rmtLtOUFZmyhT6bpXRYAjbQy4cAUI8uxE=; b=SWkWBrtHnBgHSQOSbctOQVT5CYvjzRgqUwYGOI+hXzMpoqxDnTyLi/YoKp+KAu3U7tEKZhapbjAa7B16EslwNOYzQ6CAQRGlzwmTmrYHjW7pTUqrNBO1AAzcWNWVS0R+VFamwTbsf4h2cYhUk4ESPOFzR7XGi73gSIvcJl7ER1Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1582389376060588.3804892675762; Sat, 22 Feb 2020 08:36:16 -0800 (PST) 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-330-W8eOjo_6O0uShdDceGl5mg-1; Sat, 22 Feb 2020 11:36:12 -0500 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 365F013F5; Sat, 22 Feb 2020 16:36:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 060C85D9E2; Sat, 22 Feb 2020 16:36:07 +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 AB70C18089D0; Sat, 22 Feb 2020 16:36:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWGK8013622 for ; Sat, 22 Feb 2020 11:32:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id F14A75C1C3; Sat, 22 Feb 2020 16:32:16 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 299415C1B5 for ; Sat, 22 Feb 2020 16:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389374; 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=5NiU0Os2M7rmtLtOUFZmyhT6bpXRYAjbQy4cAUI8uxE=; b=hSmZ0bYRwa+vXgaEKuijecWRa8Cs5Ysse9SUCZHJ8pvZsPJbSA/+hjOk8HA7r9nDANaJKb ETHVLgCO3PkQg6qaHFKup4FEGxkxW6BQzmiDcYsREHnNyvQiDpvikS6Amf1LynzC2VDZuP R94peiQPWlEfv4vmAx/mex8UAM6x/X8= X-MC-Unique: W8eOjo_6O0uShdDceGl5mg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 7/8] conf: reduce includes in virnetworkportdef.h Date: Sat, 22 Feb 2020 17:31:58 +0100 Message-Id: <5d3441bbda5d5dddc9760b03149c4db827cfdbb9.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All the _conf includes are only needed in the C file. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/virnetworkportdef.c | 4 ++++ src/conf/virnetworkportdef.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index a972b698cc..66d900088a 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -28,6 +28,10 @@ #include "virnetworkportdef.h" #include "network_conf.h" =20 +#include "netdev_bandwidth_conf.h" +#include "netdev_vlan_conf.h" +#include "netdev_vport_profile_conf.h" + #define VIR_FROM_THIS VIR_FROM_NETWORK =20 VIR_ENUM_IMPL(virNetworkPortPlug, diff --git a/src/conf/virnetworkportdef.h b/src/conf/virnetworkportdef.h index 78cf2c1ba4..72da8b6915 100644 --- a/src/conf/virnetworkportdef.h +++ b/src/conf/virnetworkportdef.h @@ -28,9 +28,6 @@ #include "virnetdevbandwidth.h" #include "virpci.h" #include "virxml.h" -#include "netdev_vport_profile_conf.h" -#include "netdev_bandwidth_conf.h" -#include "netdev_vlan_conf.h" =20 typedef struct _virNetworkPortDef virNetworkPortDef; typedef virNetworkPortDef *virNetworkPortDefPtr; --=20 2.24.1 From nobody Sun May 5 11:58:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1582389487; cv=none; d=zohomail.com; s=zohoarc; b=cbvSAPhzmKG5lmZnQ4KZuvO5ySSJdQee/xPX00IezPbjQL1H+RO6lfC3KawpM8itTHEJOkG7fwY6qcZlJj5VPDThC55vcaPjfoTaUR6fArsu/ZIeEuDFlP0ZjEq3HPhh4F853UKNAwx1pX6kDc32QOzntVWk6KxRDOILKghJcmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582389487; 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=pVkp34VXwIqe89BLrHs0Bxi0L0cYFL+g27k+zRPv3Ts=; b=Mqrlyi4dHEeFYqDkmohQ416ShoRLMpBp0s3jLFZGEn7La8BfEXyBLKSLcHD8FEdAJ/N7ZZxufljt1Adr+3XmsKocBuX/xuZKJmjzVTI9lsZYjAHXTBkeGIEpLmX6XrJgtvR17s9fAbtHgVvo6ldW5yrd1L19ph1tfnRdora7FXE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1582389487793983.0198133438018; Sat, 22 Feb 2020 08:38:07 -0800 (PST) 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-146-mXT5yfi2NrKga1r5SPZayQ-1; Sat, 22 Feb 2020 11:38:02 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6184513E4; Sat, 22 Feb 2020 16:37:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00E5227181; Sat, 22 Feb 2020 16:37:56 +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 BDAB618089CD; Sat, 22 Feb 2020 16:37:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01MGWIGN013634 for ; Sat, 22 Feb 2020 11:32:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7E4705C1C3; Sat, 22 Feb 2020 16:32:18 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-17.brq.redhat.com [10.40.200.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B7DD5C1B5 for ; Sat, 22 Feb 2020 16:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582389485; 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=pVkp34VXwIqe89BLrHs0Bxi0L0cYFL+g27k+zRPv3Ts=; b=aRT2Ir365+1gnXYwdYsjzNYRjx+oeHYbuT6oUPQCeysJ2vME9FuaxxNHZ713XampZ1WTBc S/6vF/62506o+V5FPigiD41sdhDvJtVvLA/UDblMQ8flRexipiOwBHYpZfQXqRiySfp1PH oE+wXIMGnZesSbX9s5EA17RgJ1j0hNk= X-MC-Unique: mXT5yfi2NrKga1r5SPZayQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 8/8] conf: include virnetworkportdef.h in domain_conf.h Date: Sat, 22 Feb 2020 17:31:59 +0100 Message-Id: <692c92060a048c391369219ae2812a489a65d379.1582389117.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that this file no longer transitively includes domain_conf.h, it can be included here. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/domain_conf.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cdc4d25700..d85c2d7706 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -44,6 +44,7 @@ #include "virnetdevvportprofile.h" #include "virnetdevbandwidth.h" #include "virnetdevvlan.h" +#include "virnetworkportdef.h" #include "virobject.h" #include "device_conf.h" #include "virbitmap.h" @@ -3643,11 +3644,6 @@ bool virDomainDefLifecycleActionAllowed(virDomainLifecycle type, virDomainLifecycleAction action); =20 -// Forward decl to avoid pulling in virnetworkportdef.h because -// that pulls in virhostdev.h which pulls in domain_conf.h (evil) -typedef struct _virNetworkPortDef virNetworkPortDef; -typedef virNetworkPortDef *virNetworkPortDefPtr; - virNetworkPortDefPtr virDomainNetDefToNetworkPort(virDomainDefPtr dom, virDomainNetDefPtr iface); --=20 2.24.1