From nobody Mon Feb 9 10:50:06 2026 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=1674466568; cv=none; d=zohomail.com; s=zohoarc; b=AhWKqAJ/VHXLEX6Yk57ZrjHM4Zm3S5KWKGz9U97xQzuJ5F9vd4Uo9Oh3rBodFltX/HKLHN3i95a2nrUBhS1p99egE9EsDRBTvqNfD+nHHPWyyFi/wJUqXokOiPlhAuZoo+5I6KQD9d6FDNQs9fR58ZwCRFIdkfuWWaijLwm+3xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674466568; 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=PA9lbWvjWWllLTVoFczat1JPQ5+SpYNIwIpSIko+lNQ=; b=aJVW+RlbHS2uJDRI9c/zpAx+mnMce5S2LDALZtMEDaW9H2gQTn8LuBOCu7lwe65QmxsQ2rmY7nH96Ca6cFRogO4AoFEz9JGzyqxnCtNx6j2osqVmpsVqseN0+Qc1+IkkaapqKZjRD+PxXt3BTJUgzPdrVavX9Q23+Rwko3CxmZo= 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 1674466568062858.642135374732; Mon, 23 Jan 2023 01:36:08 -0800 (PST) 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-539-4ANlqt09MpCmNczCmwSDsg-1; Mon, 23 Jan 2023 04:34:38 -0500 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 1666388282F; Mon, 23 Jan 2023 09:34:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F23052027002; Mon, 23 Jan 2023 09:34:31 +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 DEA5A1946594; Mon, 23 Jan 2023 09:34:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1E7BA1946589 for ; Mon, 23 Jan 2023 09:34:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0BC46111F3DB; Mon, 23 Jan 2023 09:34:30 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5A361121339 for ; Mon, 23 Jan 2023 09:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674466566; 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=PA9lbWvjWWllLTVoFczat1JPQ5+SpYNIwIpSIko+lNQ=; b=EFxbZlUcD+7Z/5nd/9/LiTHZXMLwXNsMKx8hmwnr6ZM2pSajP99iG9x+xi2DcQCFmDcLPe uDePjs+mup+HLSFJzaVM7AGOIFresz0tvhg84z19oqjh1MrEWkZKdMwY2oiPwJrayUdBxP 4afQvuyh7i8YeOKNZPJsjE1fVWkfKEM= X-MC-Unique: 4ANlqt09MpCmNczCmwSDsg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 07/15] vbox: Drop UIUSBCommon::Enable() Date: Mon, 23 Jan 2023 10:34:16 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 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: 1674466569742100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The UIUSBCommon::Enable() function is no longer needed as it is a NOP. Drop it. Signed-off-by: Michal Privoznik --- src/vbox/vbox_common.c | 1 - src/vbox/vbox_tmpl.c | 8 -------- src/vbox/vbox_uniformed_api.h | 1 - 3 files changed, 10 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 4bd118b308..70a9ffbc0d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1749,7 +1749,6 @@ vboxAttachUSB(virDomainDef *def, struct _vboxDriver *= data, IMachine *machine) rc =3D gVBoxAPI.UIMachine.GetUSBCommon(machine, &USBCommon); if (NS_FAILED(rc) || !USBCommon) return; - gVBoxAPI.UIUSBCommon.Enable(USBCommon); =20 for (i =3D 0; i < def->nhostdevs; i++) { char *filtername =3D NULL; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index dac195bf49..e611412f7e 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1678,13 +1678,6 @@ _vrdeServerSetNetAddress(struct _vboxDriver *data, return rc; } =20 -static nsresult -_usbCommonEnable(IUSBCommon *USBCommon G_GNUC_UNUSED) -{ - /* We don't need to set usb enabled for vbox 4.3 and later */ - return 0; -} - static nsresult _usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled) { @@ -2413,7 +2406,6 @@ static vboxUniformedIVRDEServer _UIVRDEServer =3D { }; =20 static vboxUniformedIUSBCommon _UIUSBCommon =3D { - .Enable =3D _usbCommonEnable, .GetEnabled =3D _usbCommonGetEnabled, .CreateDeviceFilter =3D _usbCommonCreateDeviceFilter, .InsertDeviceFilter =3D _usbCommonInsertDeviceFilter, diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 3a9c317092..23fb769c37 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -354,7 +354,6 @@ typedef struct { =20 /* Common Functions for IUSBController and IUSBDeviceFilters */ typedef struct { - nsresult (*Enable)(IUSBCommon *USBCommon); nsresult (*GetEnabled)(IUSBCommon *USBCommon, PRBool *enabled); nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name, IUSBDeviceFilter **filter); --=20 2.39.1