From patchwork Thu Aug 24 09:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 716531 Delivered-To: patch@linaro.org Received: by 2002:adf:f747:0:b0:317:ecd7:513f with SMTP id z7csp1237365wrp; Thu, 24 Aug 2023 02:33:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnI+aA0Hgzd5/jmZ9tv79unpT8M33HOscSrfWDAGP/OVsGtPG3ZI5uL1WQxjF2ODBJch/0 X-Received: by 2002:a0c:e484:0:b0:635:e4ed:b6c9 with SMTP id n4-20020a0ce484000000b00635e4edb6c9mr10826745qvl.24.1692869626593; Thu, 24 Aug 2023 02:33:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692869626; cv=none; d=google.com; s=arc-20160816; b=GiKwDOyiJePTmHCM6PRD5jZH4gYOGXVsAq8vtjVa/YoEtazELqSDoOE/9nYHeHfrl5 FAY34RcbQ/58qs/JDiNXzNbSgjIFEusexF/RLH68H8AkuYwSOGebjCSkWfRhCM8eqiLU SMAElLvWJjBqrRuIAZduBhXlJ0cmdRgo9yD+ZHYPrZMKaDzsaO84Gkd4kNPF1APRz0n0 Tp2rzV2iRJlBc27bZUmP3N6Qdfb/wV39p93Qu9QRNG8BFAIeFvAJiUB3GUuBi2fIR+qr bTyGS7zuFYeAVfiTrbi8NERRLJnecP2kEg5wD2XjfD1hB/ap3XuuN7O78b1PAgLFIve7 9YCg== 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:to:from :dkim-signature; bh=aeZYZvq4ZfImxsLYgMAThvvPorW5jC9WKxbUYeQ9C3c=; fh=bFDrUYhlTVi/QyetgXx/byg2+yO/22Hp9SjwoefyKLk=; b=EY6Dw2C4Y3y/vCb+CaW/rijnuGET2jAkti2r9E3/S1Ju+ULDY+QAOCMcy8MrYV2voY ZTIK2EDbwVHk9zJouuNP76qaXGWSUwnlNH9wY/OTHCuw/uCDKfNfbaEKDFqU10B5sid+ LfcAbDroCGsI0WBFJbywb0cC1a6QC52ECoMLI1FRpHbmh96uSslPv0bHzivl+OnB4zlS +nQSwCwfAIF56WEHLrgoEyNgCSwjFvicrrwmMXN3Viy+qm9dUiVXyGhj96yPu1jCuP1S fi5qkReT3Iueinlrl6EZWrUHysc2ouFjD9CJMuZKN1UUr6ApzaOZYwnqVJeKPMLd7akB VlCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LCvQkh3x; 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 a2-20020a0cca82000000b0063cf9bb01e4si3312318qvk.177.2023.08.24.02.33.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Aug 2023 02:33:46 -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=LCvQkh3x; 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 1qZ6eS-0006SM-VW; Thu, 24 Aug 2023 05:29:17 -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 1qZ6e3-00044s-LI for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:56 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ6dv-0004xo-Eh for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:48 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-31aeedbb264so4411427f8f.0 for ; Thu, 24 Aug 2023 02:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692869321; x=1693474121; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aeZYZvq4ZfImxsLYgMAThvvPorW5jC9WKxbUYeQ9C3c=; b=LCvQkh3xj5kTcfOwsLwE+IVbM46wseXviGaAWHmKTceB0e4+ytnvcvZ44Y7Zr1dtbj VRk4vWvDsDdszzWfVCdVB8rzq+8jdjSHsbmuhb/KGC6LrxQ0/USxAfIPt9r2a//SnZXc 5GYFjLAMcWrrAske+jn5L/hnGMYoTPdU7D1nLpdh0EMukOJT1XwSJUfNk//tTTRiQj+S T7Ib5GDU5bPqIQlZ+C1SVzXmc9M806YB9w4FlZgoFSfZGeyqK+qLC6N4RdsPM6+Xqjo6 s2q6nWUtX7qTe/89cPDGEUfMYaoMgjc1iVoivpwJa4dKo/B4qwPaAE/vGPIqAaMgzacz 4v3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692869321; x=1693474121; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aeZYZvq4ZfImxsLYgMAThvvPorW5jC9WKxbUYeQ9C3c=; b=A4YJeXJF0MGmcc9Y+yj9rSnylVLBEr1G5cJciNBN/efPVhU3x69YmoWjRMWnHNQr/c Q2WP05ZpOKYSpwPRp5Sd7KGuBqfxNgr5/6ApMhCdOButRfNKA3T4OVL9jFUjs9fBFTHq 6/SRQbwQPpDon7f7ZYdiO/46wOT1GUDH6pocl+Uvm4AtNqrIzN1WPL0au6qAnm0XgHBT 4uvdbBDFpcDCzW0uhVsUhOy+y8PImKKNgHeriMrcd9TjNOEcm79OBh7UV9jJlG0poPWo vkZ+NzcrsuZX+gHOJEMV8ICHvihbj7v5yIkH4PdPAxh5gtu1H2Hsc1rSY/gKsuiKWfeu whdw== X-Gm-Message-State: AOJu0YwSojTN/vPxdL0uPuXRppiDYEYvL609vUBTEjgza9QkLdWoowE0 dT/A2K4yyTE7n2z4NAey25Ghgn5h77XH/EaDB34= X-Received: by 2002:adf:f30d:0:b0:317:3c89:7f03 with SMTP id i13-20020adff30d000000b003173c897f03mr11407289wro.5.1692869320842; Thu, 24 Aug 2023 02:28:40 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id s12-20020adfeccc000000b00317b5c8a4f1sm21844004wro.60.2023.08.24.02.28.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 02:28:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/35] kvm: Introduce kvm_arch_get_default_type hook Date: Thu, 24 Aug 2023 10:28:08 +0100 Message-Id: <20230824092836.2239644-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824092836.2239644-1-peter.maydell@linaro.org> References: <20230824092836.2239644-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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 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 From: Akihiko Odaki kvm_arch_get_default_type() returns the default KVM type. This hook is particularly useful to derive a KVM type that is valid for "none" machine model, which is used by libvirt to probe the availability of KVM. For MIPS, the existing mips_kvm_type() is reused. This function ensures the availability of VZ which is mandatory to use KVM on the current QEMU. Cc: qemu-stable@nongnu.org Signed-off-by: Akihiko Odaki Message-id: 20230727073134.134102-2-akihiko.odaki@daynix.com Reviewed-by: Peter Maydell [PMM: added doc comment for new function] Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- include/sysemu/kvm.h | 2 ++ target/mips/kvm_mips.h | 9 --------- accel/kvm/kvm-all.c | 4 +++- hw/mips/loongson3_virt.c | 2 -- target/arm/kvm.c | 5 +++++ target/i386/kvm/kvm.c | 5 +++++ target/mips/kvm.c | 2 +- target/ppc/kvm.c | 5 +++++ target/riscv/kvm.c | 5 +++++ target/s390x/kvm/kvm.c | 5 +++++ 10 files changed, 31 insertions(+), 13 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 115f0cca79d..ccaf55caf73 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -369,6 +369,8 @@ int kvm_arch_get_registers(CPUState *cpu); int kvm_arch_put_registers(CPUState *cpu, int level); +int kvm_arch_get_default_type(MachineState *ms); + int kvm_arch_init(MachineState *ms, KVMState *s); int kvm_arch_init_vcpu(CPUState *cpu); diff --git a/target/mips/kvm_mips.h b/target/mips/kvm_mips.h index 171d53dbe13..c711269d0af 100644 --- a/target/mips/kvm_mips.h +++ b/target/mips/kvm_mips.h @@ -25,13 +25,4 @@ void kvm_mips_reset_vcpu(MIPSCPU *cpu); int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level); int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level); -#ifdef CONFIG_KVM -int mips_kvm_type(MachineState *machine, const char *vm_type); -#else -static inline int mips_kvm_type(MachineState *machine, const char *vm_type) -{ - return 0; -} -#endif - #endif /* KVM_MIPS_H */ diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 7b3da8dc3ab..b4723016379 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2458,7 +2458,7 @@ static int kvm_init(MachineState *ms) KVMState *s; const KVMCapabilityInfo *missing_cap; int ret; - int type = 0; + int type; uint64_t dirty_log_manual_caps; qemu_mutex_init(&kml_slots_lock); @@ -2523,6 +2523,8 @@ static int kvm_init(MachineState *ms) type = mc->kvm_type(ms, kvm_type); } else if (mc->kvm_type) { type = mc->kvm_type(ms, NULL); + } else { + type = kvm_arch_get_default_type(ms); } do { diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 3ad0a223df7..b74b358874f 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -29,7 +29,6 @@ #include "qemu/datadir.h" #include "qapi/error.h" #include "elf.h" -#include "kvm_mips.h" #include "hw/char/serial.h" #include "hw/intc/loongson_liointc.h" #include "hw/mips/mips.h" @@ -612,7 +611,6 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = LOONGSON_MAX_VCPUS; mc->default_ram_id = "loongson3.highram"; mc->default_ram_size = 1600 * MiB; - mc->kvm_type = mips_kvm_type; mc->minimum_page_bits = 14; mc->default_nic = "virtio-net-pci"; } diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b4c7654f498..40f577bfd55 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -247,6 +247,11 @@ int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) return ret > 0 ? ret : 40; } +int kvm_arch_get_default_type(MachineState *ms) +{ + return 0; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { int ret = 0; diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index ebfaf3d24c7..b45ce20fd8d 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2556,6 +2556,11 @@ static void register_smram_listener(Notifier *n, void *unused) &smram_address_space, 1, "kvm-smram"); } +int kvm_arch_get_default_type(MachineState *ms) +{ + return 0; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { uint64_t identity_base = 0xfffbc000; diff --git a/target/mips/kvm.c b/target/mips/kvm.c index c14e8f550fc..e98aad01bd5 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -1266,7 +1266,7 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) abort(); } -int mips_kvm_type(MachineState *machine, const char *vm_type) +int kvm_arch_get_default_type(MachineState *machine) { #if defined(KVM_CAP_MIPS_VZ) int r; diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index a8a935e2672..dc1182cd37e 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -108,6 +108,11 @@ static int kvm_ppc_register_host_cpu_type(void); static void kvmppc_get_cpu_characteristics(KVMState *s); static int kvmppc_get_dec_bits(void); +int kvm_arch_get_default_type(MachineState *ms) +{ + return 0; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ); diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c index b1fd2233c03..dbcf26f27d3 100644 --- a/target/riscv/kvm.c +++ b/target/riscv/kvm.c @@ -914,6 +914,11 @@ int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route, return 0; } +int kvm_arch_get_default_type(MachineState *ms) +{ + return 0; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { return 0; diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index a9e5880349d..9117fab6e8e 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -340,6 +340,11 @@ static void ccw_machine_class_foreach(ObjectClass *oc, void *opaque) mc->default_cpu_type = S390_CPU_TYPE_NAME("host"); } +int kvm_arch_get_default_type(MachineState *ms) +{ + return 0; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { object_class_foreach(ccw_machine_class_foreach, TYPE_S390_CCW_MACHINE,