Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp1242608lfg; Sun, 1 Mar 2020 02:42:42 -0800 (PST) X-Google-Smtp-Source: APXvYqxYnSieh1Tzh4QyTldowHjGnngMUI+qq/tqanVQSBylzZRafJjQQTOeDThyA392neItQ/j5 X-Received: by 2002:ac8:4711:: with SMTP id f17mr11187518qtp.160.1583059362462; Sun, 01 Mar 2020 02:42:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583059362; cv=none; d=google.com; s=arc-20160816; b=dgxay3X0MsMEDszyt5cAIoulZrhPhXCr90uIGXA+HyqwG5w/soVkQ4HINvox3pPYl/ 3WXRpORI+G4oZKhjcIQP9oC86Lku/fn55QRyW6QuF+88JteNimPXRL1eGsja/yG+DjTm QxRpoUfaRZXEPOSr6mDERivPdz9RGwWH7KFpYBHdVbGj8voMVpaKXsWInW0w5AVkS52U 0xZEbP2vCBPSYKi4AXP3iVVfqLrPRdTkxaC1Eu6sCmFvtR0WXYcftvRbeQ+3ri2igo9G aiGl/7/2RPE0QxwcmKEvh/WYH2sTLDTVy7PM18+CiHap5jp+cMkoCwn7p4KacPvhHHKo 03KQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=IEMzmuyV2juLppS5NQsF4RN5lh06edhDi1oAMTXdTOo=; b=cvfIFiDzLkNBd3u3CuAEaUwewqm/bqeDKcbzK4H5/UvfdkzT2WEPExDV7H2UX19frt z9RnXm8KQ0Z/Ng9rbJlZrTL2KHVCtxRkMAyqDAlm2bJj3wIzKCotlDLodlUWR0Hsnj3a XBuKVmGWbiyY4zvY3LpcnwwFLnCbFkCpsI+RCdDPkF7m09XWHikCaK2gyhHzAwWxc61U DUP5cYH6hMMb4SHdZ2y+5lvud353mYYUS87JFCRFbYAj6wwtgwFEZ2DFif+vjad2/9qK ocyY8633V9hO5o//TfLWbwa8RTEFZwHFHeBl0lcmQ8T7n6sO5i+n3U5z+7YJBHKIcOYg aaow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GKKOhre+; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j12si1651777qtp.214.2020.03.01.02.42.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 01 Mar 2020 02:42:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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=@redhat.com header.s=mimecast20190719 header.b=GKKOhre+; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8M3V-000564-TW for alex.bennee@linaro.org; Sun, 01 Mar 2020 05:42:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52946) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8M1s-0001Xy-Qk for qemu-arm@nongnu.org; Sun, 01 Mar 2020 05:41:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8M1r-0001lP-J2 for qemu-arm@nongnu.org; Sun, 01 Mar 2020 05:41:00 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:40976 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8M1r-0001l6-FM for qemu-arm@nongnu.org; Sun, 01 Mar 2020 05:40:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583059259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IEMzmuyV2juLppS5NQsF4RN5lh06edhDi1oAMTXdTOo=; b=GKKOhre+U5ytxAykqXTn85DeTghdSbH7pB7If8HeAE/5kYfWeNRkbgvIWq748X8VcBiNAh 4K+wBPSyK4bgCCZ5YEprR34/n3D7DCfN1vrph2nBBMrJioZfihUDCvdmS1FeEFEI6QVQDC mJ/niJ+A3xmOQfmsivEk/xnCypIvhqE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-45Th_9YTMzWU06szO4dmCQ-1; Sun, 01 Mar 2020 05:40:57 -0500 X-MC-Unique: 45Th_9YTMzWU06szO4dmCQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 575D3100550E; Sun, 1 Mar 2020 10:40:56 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B1E560C80; Sun, 1 Mar 2020 10:40:54 +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 Subject: [PATCH v2 3/6] hw/arm/virt: Introduce finalize_gic_version() Date: Sun, 1 Mar 2020 11:40:37 +0100 Message-Id: <20200301104040.15186-4-eric.auger@redhat.com> In-Reply-To: <20200301104040.15186-1-eric.auger@redhat.com> References: <20200301104040.15186-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maz@kernel.org, drjones@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 3XPM3JwKzhO5 Let's move the code which freezes which gic-version to be applied in a dedicated function. We also now set by default the VIRT_GIC_VERSION_NO_SET. This eventually turns into the legacy v2 choice in the finalize() function. Signed-off-by: Eric Auger --- hw/arm/virt.c | 54 ++++++++++++++++++++++++++----------------- include/hw/arm/virt.h | 1 + 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b449a445de..338d56999f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1534,6 +1534,37 @@ static void virt_set_memmap(VirtMachineState *vms) } } =20 +/* + * finalize_gic_version - Determines the final gic_version + * according to the gic-version property + * + * Default GIC type is v2 + */ +static void finalize_gic_version(VirtMachineState *vms) +{ + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST || + vms->gic_version =3D=3D VIRT_GIC_VERSION_MAX) { + if (!kvm_enabled()) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST) { + error_report("gic-version=3Dhost requires KVM"); + exit(1); + } else { + /* "max": currently means 3 for TCG */ + vms->gic_version =3D VIRT_GIC_VERSION_3; + } + } else { + vms->gic_version =3D kvm_arm_vgic_probe(); + if (!vms->gic_version) { + error_report( + "Unable to determine GIC version supported by host"); + exit(1); + } + } + } else if (vms->gic_version =3D=3D VIRT_GIC_VERSION_NOSEL) { + vms->gic_version =3D VIRT_GIC_VERSION_2; + } +} + static void machvirt_init(MachineState *machine) { VirtMachineState *vms =3D VIRT_MACHINE(machine); @@ -1560,25 +1591,7 @@ static void machvirt_init(MachineState *machine) /* We can probe only here because during property set * KVM is not available yet */ - if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST || - vms->gic_version =3D=3D VIRT_GIC_VERSION_MAX) { - if (!kvm_enabled()) { - if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST) { - error_report("gic-version=3Dhost requires KVM"); - exit(1); - } else { - /* "max": currently means 3 for TCG */ - vms->gic_version =3D VIRT_GIC_VERSION_3; - } - } else { - vms->gic_version =3D kvm_arm_vgic_probe(); - if (!vms->gic_version) { - error_report( - "Unable to determine GIC version supported by host"); - exit(1); - } - } - } + finalize_gic_version(vms); =20 if (!cpu_type_valid(machine->cpu_type)) { error_report("mach-virt: CPU type %s not supported", machine->cpu_= type); @@ -2138,8 +2151,7 @@ static void virt_instance_init(Object *obj) "Set on/off to enable/disable using " "physical address space above 32 bits"= , NULL); - /* Default GIC type is v2 */ - vms->gic_version =3D VIRT_GIC_VERSION_2; + vms->gic_version =3D VIRT_GIC_VERSION_NOSEL; object_property_add_str(obj, "gic-version", virt_get_gic_version, virt_set_gic_version, NULL); object_property_set_description(obj, "gic-version", diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 6325b98269..5785416480 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -95,6 +95,7 @@ typedef enum VirtIOMMUType { VIRT_IOMMU_VIRTIO, } VirtIOMMUType; =20 +#define VIRT_GIC_VERSION_NOSEL (-2) #define VIRT_GIC_VERSION_MAX (-1) #define VIRT_GIC_VERSION_HOST 0 #define VIRT_GIC_VERSION_2 2 --=20 2.20.1