From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:4301:0:0:0:0:0 with SMTP id h1-v6csp695515wrq; Tue, 3 Jul 2018 00:25:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcQ53s603iZOR2qACZcA6nGnh/bUEN9eu2ewDLAnI37uJpcodRLIzHRAJAPfRrHmSg4Pa64 X-Received: by 2002:ac8:24fa:: with SMTP id t55-v6mr26944969qtt.196.1530602746431; Tue, 03 Jul 2018 00:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530602746; cv=none; d=google.com; s=arc-20160816; b=FgVOKXni4gsIbgYOmERYzi+5+6/zA2h+fMRZSAex9uT0B8u9Kkag3t4y5LIicr2l+Z AB6wCseKACtqSXkAupXy+Qh6hbJjgB07rIr5d0LXGCRNMtjzP9HAsuJBd6amh5mOI79A rXrFETtB3UsKSEp/MZBHgQe4OFReqJp3cPaTiw+Tixalc9Hsr8wZJmSm8upRM/aG4NkW kVQKWONhBGj79L7JKMK26Y2YrqT17A/9dtfB/LzanQM96pcRIAR+RhwdoWJ+ZvOUUbFQ gXaFtva7k10ZRyL2R1IYESxjG+8k2z1X9pV5uAcNb3H89W1dnBF9F0aX8eSRnVuUtJBt G/+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=pPPVXZnTWaVXDmtVU/8xxIIqv3Mo2Sc0Gz+izd0H8WI=; b=ZS5i6eno0R0Rvykl9jGeVCDmWZYzpytO/nOPtrCeJBGYfs8E1uMTrGortubNvEu00J mQ7n0NwVfIDCFojUu8wgOM5jU6VSlBNv3Qy0gzpvg3o6gjlUj44AutqX/9938SKCt6wD xEe/Qy+MiIdUNN3yKNs6EJofYtgNK5baPd5j7AcfJcy16JZT9phBO6yYNFPpSVDeqhDv je3IGRGeipx1YU1ZW1UqmNNoY4FbGvXhRD4cw5UfbirfENQSeNl/LPqvVMwIIYKUfcP4 DdY31t8qyoyIjOJ2SWkv+7l2JxwxLlcYcgHyoKOqAh4lVjGc2XG7jEfgFLKfUKqNASnX Chag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c27-v6si472616qta.261.2018.07.03.00.25.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 00:25:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFh3-00047x-V0 for alex.bennee@linaro.org; Tue, 03 Jul 2018 03:25:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFcx-00039J-EM for qemu-arm@nongnu.org; Tue, 03 Jul 2018 03:25:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faFbt-00052Z-D6 for qemu-arm@nongnu.org; Tue, 03 Jul 2018 03:21:31 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35310 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faFbs-00051U-Hl; Tue, 03 Jul 2018 03:20:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D84BF8182D38; Tue, 3 Jul 2018 07:20:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-71.ams2.redhat.com [10.36.116.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id E76AC1C5A3; Tue, 3 Jul 2018 07:20:21 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, imammedo@redhat.com, david@redhat.com Date: Tue, 3 Jul 2018 09:19:45 +0200 Message-Id: <1530602398-16127-3-git-send-email-eric.auger@redhat.com> In-Reply-To: <1530602398-16127-1-git-send-email-eric.auger@redhat.com> References: <1530602398-16127-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 03 Jul 2018 07:20:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 03 Jul 2018 07:20:23 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eric.auger@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-arm] [RFC v3 02/15] hw/boards: Add a MachineState parameter to kvm_type callback X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, david@gibson.dropbear.id.au, dgilbert@redhat.com, agraf@suse.de Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: JgFWskgT4kLr On ARM, the kvm_type will be resolved by querying the KVMState. Let's add the MachineState handle to the callback so that we can retrieve the KVMState handle. in kvm_init, when the callback is called, the kvm_state variable is not yet set. Signed-off-by: Eric Auger Acked-by: David Gibson [ppc parts] --- accel/kvm/kvm-all.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/spapr.c | 2 +- include/hw/boards.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index eb7db92..37ac834 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1549,7 +1549,7 @@ static int kvm_init(MachineState *ms) kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type"); if (mc->kvm_type) { - type = mc->kvm_type(kvm_type); + type = mc->kvm_type(ms, kvm_type); } else if (kvm_type) { ret = -EINVAL; fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type); diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ff715ff..606b827 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -511,7 +511,7 @@ static void ppc_core99_init(MachineState *machine) qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); } -static int core99_kvm_type(const char *arg) +static int core99_kvm_type(MachineState *ms, const char *arg) { /* Always force PR KVM */ return 2; diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 4608bab..1211fcd 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -363,7 +363,7 @@ static void ppc_heathrow_init(MachineState *machine) qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); } -static int heathrow_kvm_type(const char *arg) +static int heathrow_kvm_type(MachineState *ms, const char *arg) { /* Always force PR KVM */ return 2; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b32b971..db6b018 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2841,7 +2841,7 @@ static void spapr_machine_init(MachineState *machine) } } -static int spapr_kvm_type(const char *vm_type) +static int spapr_kvm_type(MachineState *ms, const char *vm_type) { if (!vm_type) { return 0; diff --git a/include/hw/boards.h b/include/hw/boards.h index 79069dd..3ac9594 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -173,7 +173,7 @@ struct MachineClass { void (*init)(MachineState *state); void (*reset)(void); void (*hot_add_cpu)(const int64_t id, Error **errp); - int (*kvm_type)(const char *arg); + int (*kvm_type)(MachineState *ms, const char *arg); BlockInterfaceType block_default_type; int units_per_default_bus; -- 2.5.5