From patchwork Tue Jun 18 15:59:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 805270 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:144:b0:362:4979:7f74 with SMTP id r4csp276219wrx; Tue, 18 Jun 2024 09:11:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9Bi9fRuHHNILvDb7OlE0qaGcctA7FoQM+06mE7lJzBj0OjWHDOf0lW2vI47pJ88QiDlIvwOFoK64Yje32TB7v X-Google-Smtp-Source: AGHT+IE/+6tgkBTNUbLrzRuY2tjmHguOy5vrcH+AbXH+lawNtL8ZaGV4bBrw6z1uXsm0wUp6hF6P X-Received: by 2002:a05:622a:210:b0:43a:ea41:c9cd with SMTP id d75a77b69052e-444a7a876a6mr2910041cf.59.1718727109195; Tue, 18 Jun 2024 09:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718727109; cv=none; d=google.com; s=arc-20160816; b=rTpLa+razs8vMbtbYkiGQkSNSgSpYFT3P9ZBu5IkPFYM0Z/m+iQGqpXCu4v8yCN4E8 3F1ycGpKuIJrQgJ1B2o9r4Yc6vN/kV0yCZq+WviFW+O0tfTzV0hAYccKkO/ubM+M52yx i6EXjizUgXga9s/DTHOmjJgVkAbkcjogpe0tOq25MvM7lJ78lb+dqi8KxTXkAJylDm/4 NP2UrDfQ12uSTVmP1hs4A+fEbldZQGNIeII84Jq7bLenfNi16DFKTXqTEPrLOsTEUo0v AWBHM36FLyUaqehEIDuoqZaqe7HCmBGD5YMdo5SVhMRNoaBjwA4JYfMqLXQ7ovvdEeSs +sBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=j6xz4zvShz/n3G+e5wncGUZkG18e32dlxx/8hJCVqxk=; fh=QeIS5kb1Uh2g1z6dWJxoYMIPD1Pl4adL6YUWYeE5yJk=; b=XtLEg+u0bht3xi1nYN1YqGBCm6EIQBop/CMAifx6s8bmf227ICVZiIosSQ0wnRZk1w 5yaUHvzw3kNM3acPexqpXwFqapy+qVBvDGJWA5+TlBdHUZc5nVueRm9Fcuw50cnznz4d 8RRva99K+POga7XSf1FwZLUUIYkSDpBnV0BPeobdZWL5shM87oPAM+U1U/W9hUCK9EGG cUGo+B8P+2d3NiavulReECxTFLrvCuXQC67Dx2ReSS1kP2DM2goMP5AWZTXiFMgZ110X KpvPGMT70LHVgm0dVgTSLkhn9KEq3HLzrDz7nXnx/GOt4RhX8AqEFiMwneWn0R+EKns3 rp4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z0x+yBPD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-441f2eaa2dcsi123250511cf.348.2024.06.18.09.11.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2024 09:11:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z0x+yBPD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJbHN-00048d-5M; Tue, 18 Jun 2024 12:01:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJbHB-0003qZ-IH for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:01:42 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbH7-0006nV-IR for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:01:40 -0400 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-57cf8880f95so1500611a12.3 for ; Tue, 18 Jun 2024 09:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726496; x=1719331296; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j6xz4zvShz/n3G+e5wncGUZkG18e32dlxx/8hJCVqxk=; b=Z0x+yBPDy5VjhLSP1zCZE1sGQSaKP/KfLkcXWh7j28a5xBqTYS62JzmNErsuKO0FVk 7zigvPUZ9bEU17PoGQ7jSkZ1hs0tfm7pwa7BfNWtD/7Rr+RrNferbTxGbcuMch57vRbP cd/hAVJ7sUkVdO2ntwsl2bi24RYUFOtRokGOf04UdIymjiWzxtmIZ0KWhxf1EOyugrxf iNGJo1GA69Ej/Yx5yClncqCbpl8iZgZbv4rf+eGm82v6bKUtEd+HEwo7nEevkW0+L+eA vOnNUtMPU/d03wXlrBU0qtjrPYPOvDzMMWg+bjLFhCyYF3/0Hgmfmgw+ciL9woujJHNu bDCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726496; x=1719331296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j6xz4zvShz/n3G+e5wncGUZkG18e32dlxx/8hJCVqxk=; b=tGjndogxfpe5cOxf8gZtnb8NQV5EUdoboDSzsyTzuu13RZD5uiNbJ/ukSwzQxiTb4c 4WUYiTja/ITcQDWRqlwMwyFKxNoCySsPBgAL7pX9SYWkeXaBryL8egeJmvyYzaK5+9pA onKyfadGcxGhIOtdUgnr7KjXkZfkiIxL1SImb56L1mgQdchvENXdCTMKtqDhsjllF4Qb 9p9+RghbtS3vmiNJpOxgVAy60uMxr/gOp16Q02xhz83nicMMylYb0dX7VXRxfrmtWBw0 xvPz7PvbZWFpK2ihugh3EJzfdfNTFOrf2Xko5noOwEqsaBxFEfTBDm9/h22WjSbHOcsG Rh6w== X-Gm-Message-State: AOJu0YzYAyEHyJULepzl5A/MBMjYkwSs9OkHKqCY9UHi8/cKZkNQGf/4 0XP6+OpEDi0FBaOB6O+GkYGevGcjQ3M3ccHKbEPi4jswdNhKfc26gWf8pYMv6BfLBsNvMy7Eofs b X-Received: by 2002:a50:96c3:0:b0:57c:9c5d:d18e with SMTP id 4fb4d7f45d1cf-57cbd6a85e1mr10899410a12.36.1718726495645; Tue, 18 Jun 2024 09:01:35 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57cb72da708sm7888029a12.37.2024.06.18.09.01.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:01:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Zhao Liu , Igor Mammedov Subject: [PULL 09/76] target/i386/kvm: Remove x86_cpu_change_kvm_default() and 'kvm-cpu.h' Date: Tue, 18 Jun 2024 17:59:31 +0200 Message-ID: <20240618160039.36108-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240618160039.36108-1-philmd@linaro.org> References: <20240618160039.36108-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=philmd@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org x86_cpu_change_kvm_default() was only used out of kvm-cpu.c by the pc-i440fx-2.1 machine, which got removed. Make it static, and remove its declaration. "kvm-cpu.h" is now empty, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Message-Id: <20240617071118.60464-10-philmd@linaro.org> --- target/i386/kvm/kvm-cpu.h | 41 --------------------------------------- target/i386/kvm/kvm-cpu.c | 3 +-- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 target/i386/kvm/kvm-cpu.h diff --git a/target/i386/kvm/kvm-cpu.h b/target/i386/kvm/kvm-cpu.h deleted file mode 100644 index e858ca21e5..0000000000 --- a/target/i386/kvm/kvm-cpu.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * i386 KVM CPU type and functions - * - * Copyright (c) 2003 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#ifndef KVM_CPU_H -#define KVM_CPU_H - -#ifdef CONFIG_KVM -/* - * Change the value of a KVM-specific default - * - * If value is NULL, no default will be set and the original - * value from the CPU model table will be kept. - * - * It is valid to call this function only for properties that - * are already present in the kvm_default_props table. - */ -void x86_cpu_change_kvm_default(const char *prop, const char *value); - -#else /* !CONFIG_KVM */ - -#define x86_cpu_change_kvm_default(a, b) - -#endif /* CONFIG_KVM */ - -#endif /* KVM_CPU_H */ diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index f76972e47e..f9b99b5f50 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "host-cpu.h" -#include "kvm-cpu.h" #include "qapi/error.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -178,7 +177,7 @@ static PropValue kvm_default_props[] = { /* * Only for builtin_x86_defs models initialized with x86_register_cpudef_types. */ -void x86_cpu_change_kvm_default(const char *prop, const char *value) +static void x86_cpu_change_kvm_default(const char *prop, const char *value) { PropValue *pv; for (pv = kvm_default_props; pv->prop; pv++) {