From nobody Tue Sep 9 03:16:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1738067055892917.0999872638068; Tue, 28 Jan 2025 04:24:15 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B73511388; Tue, 28 Jan 2025 07:24:14 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8755F1B42; Tue, 28 Jan 2025 07:23:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8FA601B1B; Tue, 28 Jan 2025 07:22:58 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F37641B19 for ; Tue, 28 Jan 2025 07:22:50 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-220-1p7sQ42oM1ysplQAWu4IOQ-1; Tue, 28 Jan 2025 07:22:49 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A1F7E1955DCC for ; Tue, 28 Jan 2025 12:22:48 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C73BC180035E for ; Tue, 28 Jan 2025 12:22:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738066970; h=from:from: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; bh=1mK9JRBvqQBo+1KRuzn4QXDt8UPLW3nhtqmknNwsehA=; b=b8odHDRwThNffau7KHFt36m+noxTupP8CpKrUVJaLRjGGxr++LN2KvFXgpBwJXosEabHsI vJVX8pSovBUc5buNavpEu6I7ryvgRgHQnNPiCZdPFj8iWob6uXv9DJTBa9k+Jq2zCxfZsq XXQ/7S5ETA8prXLCiJPa4ekGMzt7UXQ= X-MC-Unique: 1p7sQ42oM1ysplQAWu4IOQ-1 X-Mimecast-MFC-AGG-ID: 1p7sQ42oM1ysplQAWu4IOQ From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/5] vbox: Drop code supporting old VBox version Date: Tue, 28 Jan 2025 13:22:38 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vUdbfI8Y0kytt7QprtGPzj3F-OVwTkbZlf1ufcx53zs_1738066968 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XSFHIE766SHE7Q6AYR55H555S5OPKEMF X-Message-ID-Hash: XSFHIE766SHE7Q6AYR55H555S5OPKEMF X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1738067058148019000 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that only supported version of VirtualBox is 7.0.x the code that supports older versions can be dropped. Signed-off-by: Michal Privoznik --- src/vbox/vbox_tmpl.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index bb7a9b3a67..1be3d3dc2c 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -604,11 +604,7 @@ _virtualboxGetMachine(IVirtualBox *vboxObj, vboxIID *i= id, IMachine **machine) static nsresult _virtualboxOpenMachine(IVirtualBox *vboxObj, PRUnichar *settingsFile, IMac= hine **machine) { -#if VBOX_API_VERSION >=3D 7000000 return vboxObj->vtbl->OpenMachine(vboxObj, settingsFile, NULL, machine= ); -#else - return vboxObj->vtbl->OpenMachine(vboxObj, settingsFile, machine); -#endif } =20 static nsresult @@ -636,7 +632,6 @@ _virtualboxCreateMachine(struct _vboxDriver *data, virD= omainDef *def, IMachine * vboxIIDFromUUID(&iid, def->uuid); createFlags =3D g_strdup_printf("UUID=3D%s,forceOverwrite=3D0", uuidst= r); VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); -#if VBOX_API_VERSION >=3D 7000000 rc =3D data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, machineNameUtf16, @@ -648,16 +643,6 @@ _virtualboxCreateMachine(struct _vboxDriver *data, vir= DomainDef *def, IMachine * NULL, NULL, machine); -#else - rc =3D data->vboxObj->vtbl->CreateMachine(data->vboxObj, - NULL, - machineNameUtf16, - 0, - nsnull, - nsnull, - createFlagsUtf16, - machine); -#endif VIR_FREE(createFlags); VBOX_UTF16_FREE(machineNameUtf16); VBOX_UTF16_FREE(createFlagsUtf16); @@ -840,7 +825,6 @@ _machineGetBIOSSettings(IMachine *machine, IBIOSSetting= s **bios) static nsresult _machineGetAudioAdapter(IMachine *machine, IAudioAdapter **audioadapter) { -#if VBOX_API_VERSION >=3D 7000000 IAudioSettings *audioSettings =3D NULL; nsresult rc; =20 @@ -848,9 +832,6 @@ _machineGetAudioAdapter(IMachine *machine, IAudioAdapte= r **audioadapter) if (NS_FAILED(rc)) return rc; return audioSettings->vtbl->GetAdapter(audioSettings, audioadapter); -#else - return machine->vtbl->GetAudioAdapter(machine, audioadapter); -#endif } =20 static nsresult --=20 2.45.2