From patchwork Tue Sep 22 18:38:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 54006 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id E27C922D91 for ; Tue, 22 Sep 2015 18:39:01 +0000 (UTC) Received: by wicuu12 with SMTP id uu12sf12499890wic.2 for ; Tue, 22 Sep 2015 11:39:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :from:date:message-id:to:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=SgQndA41PX0CUKtjcMkJVn2WEkp7wZg1fXpPKi+DADE=; b=Lkr6u289TLunri3wMF2HrptqBPrGrRulCwIs2uKnYZ4Nz9/rTFjqzIQH8CP//AmMtJ jVNkb3WUjLGhX4ltaAvfDjPYlwLTqzDFCptEpG9caHfj7VjHLJI5NtOGm6NfkPkALWUn EqIZcZK6SdYGBG3lPrWIPoHx9rSg7gzG8O5wZtB02/H6SyfwsVkK49ADjnRhACplvuHV C685HRF8HDTG+zqzxmzpamxh5D8Ei1YmdKj4MAcTiBegEuYt6A3e33iK1qAXRd+GXDx2 9Fbm9j7NtYYPadULRNkote1ABuRBIYNAiauDMdai4OmeCq9lDYvO21af4FE/UW84mW8I BCGg== X-Gm-Message-State: ALoCoQkg17YtbWT5UDf4daAF3SQMrCQu3dR38cpAMz5vQA0xs/CW57p7vbKyTc0lWeC6uncDmoCo X-Received: by 10.112.78.101 with SMTP id a5mr4643558lbx.9.1442947141161; Tue, 22 Sep 2015 11:39:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.163.73 with SMTP id m70ls61467lfe.39.gmail; Tue, 22 Sep 2015 11:39:01 -0700 (PDT) X-Received: by 10.112.55.40 with SMTP id o8mr10266119lbp.6.1442947141012; Tue, 22 Sep 2015 11:39:01 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id lf4si1898762lab.158.2015.09.22.11.39.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2015 11:39:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lacao8 with SMTP id ao8so924930lac.3 for ; Tue, 22 Sep 2015 11:39:00 -0700 (PDT) X-Received: by 10.152.37.162 with SMTP id z2mr10068070laj.117.1442947140702; Tue, 22 Sep 2015 11:39:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp651243lbq; Tue, 22 Sep 2015 11:38:59 -0700 (PDT) X-Received: by 10.140.133.196 with SMTP id 187mr34005087qhf.2.1442947139613; Tue, 22 Sep 2015 11:38:59 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 140si2817660qhx.55.2015.09.22.11.38.59 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Sep 2015 11:38:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeSSx-0006PV-4P for patch@linaro.org; Tue, 22 Sep 2015 14:38:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeSSP-0005vQ-Jn for qemu-devel@nongnu.org; Tue, 22 Sep 2015 14:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeSSM-0003Ve-EY for qemu-devel@nongnu.org; Tue, 22 Sep 2015 14:38:25 -0400 Received: from mail-vk0-f48.google.com ([209.85.213.48]:33170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeSSM-0003VT-AK for qemu-devel@nongnu.org; Tue, 22 Sep 2015 14:38:22 -0400 Received: by vkgd64 with SMTP id d64so12685281vkg.0 for ; Tue, 22 Sep 2015 11:38:22 -0700 (PDT) X-Received: by 10.31.180.68 with SMTP id d65mr16805883vkf.27.1442947101925; Tue, 22 Sep 2015 11:38:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.153.15 with HTTP; Tue, 22 Sep 2015 11:38:02 -0700 (PDT) In-Reply-To: References: From: Peter Maydell Date: Tue, 22 Sep 2015 11:38:02 -0700 Message-ID: To: Pavel Fedin X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.213.48 Cc: Shlomo Pongratz , Shlomo Pongratz , QEMU Developers Subject: Re: [Qemu-devel] [PATCH v14 0/5] vGICv3 support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On 17 September 2015 at 10:27, Peter Maydell wrote: > On 9 September 2015 at 08:49, Pavel Fedin wrote: >> This series introduces support for GICv3 by KVM. Software emulation is >> currently not supported. >> >> v13 => v14 >> >> - Rebased on the latest master, fixed conflicts in hw/arm/virt.c >> > > You'll need to fix the acpi related bits Shannon has review comments > on in patch 5, but otherwise this looks good to me. Having discussed this with Shannon yesterday, the fixes required are trivial. Shannon kindly sent me this tiny patch, so I'm just going to squash that into your patch 5 and put the whole lot into target-arm.next, rather than make you have to go through another round. hw/arm/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) AcpiMadtGenericInterrupt *gicc = acpi_data_push(table_data, thanks -- PMM diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 0dd7fce..59c84ff 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -454,8 +454,8 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, gicr->type = ACPI_APIC_GENERIC_REDISTRIBUTOR; gicr->length = sizeof(*gicr); - gicr->base_address = memmap[VIRT_GIC_REDIST].base; - gicr->range_length = memmap[VIRT_GIC_REDIST].size; + gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base); + gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size); } else { for (i = 0; i < guest_info->smp_cpus; i++) {