From nobody Mon Sep 16 19:37:41 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=1693923976; cv=none; d=zohomail.com; s=zohoarc; b=g6N1waiA/TYDK+stm15XOqxZl93Sncmma2S3p8mJp4wnORCd9DMiA3WsRvs68CB3wmzxTPaJpdw3sGLlqB3U29sif4a1NF32bp9tGeE4tcCpr+JCN/6ckk2zGD7srmIwj3yMohtuZr3vK955tPbE4Jc0y4Zjb/y3uGKo/1vKKE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923976; 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=HiwukYetKAv54lK/VLReelbr4V3NWORrx54ualqNZS4=; b=O1Z2f2ZtCpHjNDBVhniFekKrG7OvREEvxjrf4ZMUk81f3aEfOBRFaANtiwXcqTlDRgJHXHhNHX69lJsOpaMuATNjHGc8VcxwjyNRzj6xpfiJR9r1xh5wesVkTAkcTHV9TCAfb7yAQmD8QYsbwNehbKH0nXISJV2kgbx/Fo3UkU0= 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 1693923976597208.4635920895514; Tue, 5 Sep 2023 07:26:16 -0700 (PDT) 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-513-Bj2-rpMsOe-ANfoHWTfQQg-1; Tue, 05 Sep 2023 10:26:10 -0400 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 7DC698DF4E4; Tue, 5 Sep 2023 14:25:18 +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 6B8FE412F2CF; Tue, 5 Sep 2023 14:25:18 +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 5BF7F1946595; Tue, 5 Sep 2023 14:25:18 +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 4604919465B3 for ; Tue, 5 Sep 2023 14:25:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 278741013288; Tue, 5 Sep 2023 14:25:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B6E81121314 for ; Tue, 5 Sep 2023 14:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923975; 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=HiwukYetKAv54lK/VLReelbr4V3NWORrx54ualqNZS4=; b=f4+UM6yh3SLZQncGlRffSvmN+FSgwxwPrPZqkj0PoxI0bCrqM/6pLk9vPU3aylYMEhUPyC imlhDtpcgWqZ7hluyNiJIYZPnsrFeckjtTIzMbDO1c0Nx8fNV/5IipHsekT8MjXr0w1cy6 U4nSwKZsqi6iYFTtZ+QyTOLtVlWajUc= X-MC-Unique: Bj2-rpMsOe-ANfoHWTfQQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 51/51] qemu: capabilities: Remove 'virQEMUCapsAddCPUDefinitions' Date: Tue, 5 Sep 2023 16:24:18 +0200 Message-ID: <75fb32d29f2036d7cca308792c2efd7e009dd00e.1693923601.git.pkrempa@redhat.com> 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.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: 1693923978791100001 Content-Type: text/plain; charset="utf-8" The function was used only to fill the cpu models into fake capabilities, whic no longer exists. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 40 ------------------------------------ src/qemu/qemu_capabilities.h | 5 ----- 2 files changed, 45 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7b5f59e0f1..87412dd4ec 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2119,46 +2119,6 @@ bool virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCap= s *qemuCaps) } -/* Note that this function is invoked only by test code for faking support= ed cpu - * models */ -int -virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, - virDomainVirtType type, - const char **name, - size_t count, - virDomainCapsCPUUsable usable) -{ - size_t i; - size_t start; - virQEMUCapsAccel *accel =3D virQEMUCapsGetAccel(qemuCaps, type); - qemuMonitorCPUDefs *defs =3D accel->cpuModels; - - if (defs) { - start =3D defs->ncpus; - - VIR_EXPAND_N(defs->cpus, defs->ncpus, count); - } else { - start =3D 0; - - if (!(defs =3D qemuMonitorCPUDefsNew(count))) - return -1; - - accel->cpuModels =3D defs; - } - - for (i =3D 0; i < count; i++) { - qemuMonitorCPUDefInfo *cpu =3D defs->cpus + start + i; - - cpu->usable =3D usable; - cpu->name =3D g_strdup(name[i]); - /* while the type name doesn't correspond with reality, this is ju= st for fake cpu models */ - cpu->type =3D g_strdup(name[i]); - } - - return 0; -} - - static virDomainCapsCPUModels * virQEMUCapsCPUDefsToModels(virArch arch, qemuMonitorCPUDefs *defs, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index afc28620dd..e51d3fffdc 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -708,11 +708,6 @@ virArch virQEMUCapsGetArch(virQEMUCaps *qemuCaps); unsigned int virQEMUCapsGetVersion(virQEMUCaps *qemuCaps); const char *virQEMUCapsGetPackage(virQEMUCaps *qemuCaps); -int virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps, - virDomainVirtType type, - const char **name, - size_t count, - virDomainCapsCPUUsable usable); virDomainCapsCPUModels *virQEMUCapsGetCPUModels(virQEMUCaps *qemuCaps, virDomainVirtType type, const char **modelAllowe= d, --=20 2.41.0