From nobody Fri Oct 18 06:16:22 2024 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=1678135692; cv=none; d=zohomail.com; s=zohoarc; b=PfZOw+UkrzncGWviVzRVlbhqVTQjc8Q9gX8ttDmWvRduy2PJj86UxlyGFboK1hCcc/BisWap3MPzYXpZarKJgXAeQfWEgXYksmHyrhSqj0H4jt+3xd2LDw26I2DObVD3zdO3B50kFrkQEKWCX6tgTFgnxKKJm+AjM21hnb1OHX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678135692; 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=dnlMzq0mFatoEsr3VGKatZnDMUf5S7Aaopfj9ANHaXw=; b=Y6asQTBhclW6FdgjxKmFlrzE7+b2FCaXstZz/khfnD/aMXdT8nsoNZJiYwanVIEHagB1CqRfGDLZtD+ryJ2ccPft7kMB9C3IK3i8AvSoqBQADMMDqXu4xMZZhYG5L3BTgdK+LT1NB8AWrMqx5WM89tO2qBjnkT/Wa+tlPUNIH+w= 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 1678135692335251.9761696637462; Mon, 6 Mar 2023 12:48:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-437-kqdiQPczP9K4uMnMjyqkNg-1; Mon, 06 Mar 2023 15:47:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF6ED299E75A; Mon, 6 Mar 2023 20:47:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B8324014D1D; Mon, 6 Mar 2023 20:47:14 +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 8D48C194658D; Mon, 6 Mar 2023 20:47:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 150221946595 for ; Mon, 6 Mar 2023 20:47:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DE1B151FF; Mon, 6 Mar 2023 20:47:12 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFED5175AD for ; Mon, 6 Mar 2023 20:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678135691; 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=dnlMzq0mFatoEsr3VGKatZnDMUf5S7Aaopfj9ANHaXw=; b=UuGaZjPs/9yx3VvtSoWfCCYfty0E8bz91K2zQ+N8btU1OBVKR14kxwaWsmLz0Po7Jh9xe9 jLP4xBXW5EqORMKdnRIYk2QL4EOhGLhQOySy0Y5qN6M0z9tmc5lvgzag4341aSNYcMVhrH QXvCYBLwM9goO0ANVeTX5A5uXXEcTF8= X-MC-Unique: kqdiQPczP9K4uMnMjyqkNg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/15] qemu: capabilities: Remove unused virQEMUCapsInitQMPBasicArch Date: Mon, 6 Mar 2023 21:46:43 +0100 Message-Id: <21d654c5e1f035283574272d780d8c266fcedd5f.1678135546.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.2 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: 1678135693546100001 Content-Type: text/plain; charset="utf-8" The function doesn't set any capability and we don't want to add arch-dependent always-peresent capabilities in the future. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 57 ------------------------------------ src/qemu/qemu_capspriv.h | 3 -- tests/qemuhotplugtest.c | 2 -- tests/qemuxml2argvtest.c | 2 -- tests/qemuxml2xmltest.c | 3 -- 5 files changed, 67 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 76fb739fbc..18c4c0b1cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5462,61 +5462,6 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps, } -/** - * virQEMUCapsInitQMPBasicArch: - * @qemuCaps: QEMU capabilities - * - * Initialize @qemuCaps with basic always present and architecture-depende= nt - * capabilities. - */ -void -virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) -{ - switch (qemuCaps->arch) { - case VIR_ARCH_S390: - case VIR_ARCH_S390X: - case VIR_ARCH_AARCH64: - case VIR_ARCH_I686: - case VIR_ARCH_X86_64: - case VIR_ARCH_ALPHA: - case VIR_ARCH_PPC: - case VIR_ARCH_PPCEMB: - case VIR_ARCH_SH4: - case VIR_ARCH_SH4EB: - case VIR_ARCH_RISCV32: - case VIR_ARCH_RISCV64: - case VIR_ARCH_SPARC: - case VIR_ARCH_SPARC64: - case VIR_ARCH_ARMV6L: - case VIR_ARCH_ARMV7L: - case VIR_ARCH_ARMV7B: - case VIR_ARCH_CRIS: - case VIR_ARCH_ITANIUM: - case VIR_ARCH_LM32: - case VIR_ARCH_M68K: - case VIR_ARCH_MICROBLAZE: - case VIR_ARCH_MICROBLAZEEL: - case VIR_ARCH_MIPS: - case VIR_ARCH_MIPSEL: - case VIR_ARCH_MIPS64: - case VIR_ARCH_MIPS64EL: - case VIR_ARCH_OR32: - case VIR_ARCH_PARISC: - case VIR_ARCH_PARISC64: - case VIR_ARCH_PPCLE: - case VIR_ARCH_PPC64: - case VIR_ARCH_PPC64LE: - case VIR_ARCH_UNICORE32: - case VIR_ARCH_XTENSA: - case VIR_ARCH_XTENSAEB: - case VIR_ARCH_NONE: - case VIR_ARCH_LAST: - default: - break; - } -} - - /** * virQEMUCapsInitQMPVersionCaps: * @qemuCaps: QEMU capabilities @@ -5666,8 +5611,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0) return -1; - virQEMUCapsInitQMPBasicArch(qemuCaps); - /* initiate all capabilities based on qemu version */ virQEMUCapsInitQMPVersionCaps(qemuCaps); diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 720435f762..60fdf02f06 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -66,9 +66,6 @@ virQEMUCapsInitCPUModel(virQEMUCaps *qemuCaps, virCPUDef *cpu, bool migratable); -void -virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps); - qemuMonitorCPUModelInfo * virQEMUCapsGetCPUModelInfo(virQEMUCaps *qemuCaps, virDomainVirtType type); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3b54a9e957..6a36856d8a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -70,8 +70,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt, priv->qemuCaps =3D virQEMUCapsNew(); - virQEMUCapsInitQMPBasicArch(priv->qemuCaps); - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cbb57523e9..740d7a5db5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -345,8 +345,6 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, virQEMUCapsSetArch(info->qemuCaps, arch); - virQEMUCapsInitQMPBasicArch(info->qemuCaps); - if (testAddCPUModels(info->qemuCaps, !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0) return -1; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 473031df08..a1f8b004fb 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -41,9 +41,6 @@ testXML2XMLCommon(const struct testQemuInfo *info) else driver.caps =3D linuxCaps; - if (!(info->flags & FLAG_REAL_CAPS)) - virQEMUCapsInitQMPBasicArch(info->qemuCaps); - virFileCacheClear(driver.qemuCapsCache); if (info->args.hostOS =3D=3D HOST_OS_MACOS) --=20 2.39.2