From nobody Sun May 5 09:29:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1566554209; cv=none; d=zoho.com; s=zohoarc; b=F+9Mwk6qZileqOE3hPZHbEB4UjallLIoiMx3eVJK94tSAeG73Cto1iO24Cr2VDZ7CoB4rbjxlnvYH6DD56tiSiVEaPiKyC9GyRYQa4BMIc+QP5WUpWjAOtuXA8XSeqCEJzuAmzAkSphHAlHXrwRUNaAUZYzb7FoS9y2B+LC+9tY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566554209; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=UCfrd260TgRGL6O66hHB1/l6lDSzXZ8iPVYNs0yjHkQ=; b=WnH2pt/aS79q1nNwmnoa2dACrD5VapKkjophKyDVFr1ueCRpM07RkfaDg0ZIVbLRNu57oiCs/h0PQOht1+FrgmIPD+z62Bwa7ouLQd4iP6McK+ngzaKFJq2B0bTipRrZ8+CqPxHqtSr4GjWOC1+ylD9x/hOe3bCghkdSoUb5uRs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566554209674375.6470864149712; Fri, 23 Aug 2019 02:56:49 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id F3F4130917F1; Fri, 23 Aug 2019 09:56:47 +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 D872B1001B12; Fri, 23 Aug 2019 09:56:46 +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 299C0180B536; Fri, 23 Aug 2019 09:56:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7N9ugJj026092 for ; Fri, 23 Aug 2019 05:56:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8B30C18660; Fri, 23 Aug 2019 09:56:42 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14A5E18688 for ; Fri, 23 Aug 2019 09:56:39 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 23 Aug 2019 11:56:38 +0200 Message-Id: <51f27ef789cfba7ede0516379549dfd666cc0c49.1566554187.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] virpci: Rename virPCIDevice{Bind, Unbind}FromStubWithOverride 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: , Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 23 Aug 2019 09:56:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" After my previous patches we have virPCIDeviceBindToStub() and virPCIDeviceUnbindFromStub() which really do nothing but call virPCIDeviceBindToStubWithOverride() and virPCIDeviceUnbindFromStubWithOverride() respectively. Drop "WithOverride" from the names and drop the thin wrappers. Signed-off-by: Michal Privoznik --- Pushed under trivial rule. src/util/virpci.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 6724a8ad9e..ee78151e74 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1136,7 +1136,7 @@ virPCIDeviceBindWithDriverOverride(virPCIDevicePtr de= v, } =20 static int -virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) +virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) { if (!dev->unbind_from_stub) { VIR_DEBUG("Unbind from stub skipped for PCI device %s", dev->name); @@ -1147,13 +1147,7 @@ virPCIDeviceUnbindFromStubWithOverride(virPCIDeviceP= tr dev) } =20 static int -virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) -{ - return virPCIDeviceUnbindFromStubWithOverride(dev); -} - -static int -virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev) +virPCIDeviceBindToStub(virPCIDevicePtr dev) { const char *stubDriverName; VIR_AUTOFREE(char *) stubDriverPath =3D NULL; @@ -1192,12 +1186,6 @@ virPCIDeviceBindToStubWithOverride(virPCIDevicePtr d= ev) return 0; } =20 -static int -virPCIDeviceBindToStub(virPCIDevicePtr dev) -{ - return virPCIDeviceBindToStubWithOverride(dev); -} - /* virPCIDeviceDetach: * * Detach this device from the host driver, attach it to the stub --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list