From patchwork Wed Dec 13 18:12:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 121810 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5815408qgn; Wed, 13 Dec 2017 10:24:24 -0800 (PST) X-Google-Smtp-Source: ACJfBou0rW1iFt+Cd2cQB/K2MwkFPlJ9pP1OuqUiPvS2C4h60GvXxOjMoyS4Z9SXqR5QX1XBmdIl X-Received: by 10.37.38.201 with SMTP id m192mr2563627ybm.155.1513189464457; Wed, 13 Dec 2017 10:24:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513189464; cv=none; d=google.com; s=arc-20160816; b=aUzO+C5xYTvhWx9nPqrEAnWuQhDNQVslnHeWcGNFKurWigQk7nI/gJDyod0nHXx0s7 QNKV64dwI/t8TtYSFfZyhdO4dynCUsf30roQc4kvbqnZ/wbr44IiAEWE+JY/M4zc1uh3 SEYy6+xagUGStAeq+KXXS5YF/sl8j92rq9WNxW8wPPH6wP4iJTyAuV6+/JF4xbLBPa6n bdw9Yhfoi27xczGuttJkKdzAUayakKqUx8/CAU8Q28qqjsn2/O/N301FILtfpS+sA69B ebNNCbnCD5qXKnfA/V2t6gSIM3pQ5Olf1A/bMI+489XS82LhNEXvxCsRUJxYEU4oOcpj 21GQ== 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:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=4RmJw4fEE4FxwjroeJMFJCKIapqsUPokRcu83fZJzcY=; b=DNRVAkJE6EqtxXtj+o/aFrhQ92awV/gPzkPNn8JFvm4ZcUPmp2eVoS/D1RBPcyI16H t3jfyxOi1621IL/XdxciXMuBQ789D2UC7kDblez8D51NTRWQsj3WjmX7yVLfE9GL0+7I je4W4xpTJfomfkRevK4VzVVESbY1vqgD0PR4eC01yFu6VK9U43wdQxpN1n689tsgd6Nr 08xdEsiQf8sL3Ek5YOxeugYIAPhbf05F2Q+mHeajK8x/2W0OaPbuUe5sCNVGgVjCYh1l d3yYm4GmMAqNLeYZWEm6EDBaPYoXdc6pqf2fUW4uVDKdgrEj6t0GQ8E1LyCgup+tAy5B D0pQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q21si436174ywg.342.2017.12.13.10.24.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 13 Dec 2017 10:24:24 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePBhf-0005Ah-SS for patch@linaro.org; Wed, 13 Dec 2017 13:24:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePBWY-0004fR-9R for qemu-devel@nongnu.org; Wed, 13 Dec 2017 13:12:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePBWX-0007kh-Ha for qemu-devel@nongnu.org; Wed, 13 Dec 2017 13:12:54 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:39126) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePBWX-0007jE-AU for qemu-devel@nongnu.org; Wed, 13 Dec 2017 13:12:53 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1ePBWW-0007en-B7 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:12:52 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 13 Dec 2017 18:12:12 +0000 Message-Id: <1513188761-20784-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513188761-20784-1-git-send-email-peter.maydell@linaro.org> References: <1513188761-20784-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 14/43] hw/intc/arm_gicv3_its: Don't call post_load on reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: Eric Auger >From the very beginning, post_load() was called from common reset. This is not standard and obliged to discriminate the reset case from the restore case using the iidr value. Let's get rid of that call. Signed-off-by: Eric Auger Reviewed-by: Peter Maydell Message-id: 1511883692-11511-2-git-send-email-eric.auger@redhat.com Signed-off-by: Peter Maydell --- hw/intc/arm_gicv3_its_common.c | 2 -- hw/intc/arm_gicv3_its_kvm.c | 4 ---- 2 files changed, 6 deletions(-) -- 2.7.4 diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index f2cce59..2bd2f0f 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -131,8 +131,6 @@ static void gicv3_its_common_reset(DeviceState *dev) s->creadr = 0; s->iidr = 0; memset(&s->baser, 0, sizeof(s->baser)); - - gicv3_its_post_load(s, 0); } static void gicv3_its_common_class_init(ObjectClass *klass, void *data) diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 6fb45df..b1b322b 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -155,10 +155,6 @@ static void kvm_arm_its_post_load(GICv3ITSState *s) { int i; - if (!s->iidr) { - return; - } - kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS, GITS_IIDR, &s->iidr, true, &error_abort);