From patchwork Fri Nov 3 12:37:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shanker Donthineni X-Patchwork-Id: 10039969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10905602DA for ; Fri, 3 Nov 2017 12:39:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2BF6295D4 for ; Fri, 3 Nov 2017 12:39:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6293295D6; Fri, 3 Nov 2017 12:39:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8D7B295D4 for ; Fri, 3 Nov 2017 12:39:00 +0000 (UTC) Received: from localhost ([::1]:36521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAbFU-0000oe-3U for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Nov 2017 08:39:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAbEo-0000my-3p for qemu-devel@nongnu.org; Fri, 03 Nov 2017 08:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAbEn-0002Xr-7I for qemu-devel@nongnu.org; Fri, 03 Nov 2017 08:38:18 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eAbEg-0002Rj-Rp; Fri, 03 Nov 2017 08:38:10 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B92C66079D; Fri, 3 Nov 2017 12:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1509712688; bh=bBmmM3HD1en8neI4O1iIadQqnIe6vXDU8LGHXGMDPvc=; h=From:To:Cc:Subject:Date:From; b=fmYsu5hdcB9nOCpUAPGcES7PVSuit1ZaWtUdm9jL9gxaNmXxUz6CgXokt+axjfDuV jE71cM4683zUR+S1kqKUqOsyQsKllIhskKAEdAQbJmsSqK+dfSfkcCp5MRZlUDqQlp Dys8rZycbm/eMzUTLfNpHgHPAPccjF4fxBej7US4= Received: from shankerd-ubuntu.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: shankerd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E835360313; Fri, 3 Nov 2017 12:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1509712688; bh=bBmmM3HD1en8neI4O1iIadQqnIe6vXDU8LGHXGMDPvc=; h=From:To:Cc:Subject:Date:From; b=fmYsu5hdcB9nOCpUAPGcES7PVSuit1ZaWtUdm9jL9gxaNmXxUz6CgXokt+axjfDuV jE71cM4683zUR+S1kqKUqOsyQsKllIhskKAEdAQbJmsSqK+dfSfkcCp5MRZlUDqQlp Dys8rZycbm/eMzUTLfNpHgHPAPccjF4fxBej7US4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E835360313 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=shankerd@codeaurora.org From: Shanker Donthineni To: Eric Auger , Peter Maydell Date: Fri, 3 Nov 2017 07:37:51 -0500 Message-Id: <1509712671-16299-1-git-send-email-shankerd@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 198.145.29.96 Subject: [Qemu-devel] [PATCH] hw/intc/arm_gicv3_its: Fix the VM termination in vm_change_state_handler() 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: , Cc: qemu-arm , qemu-devel , Shanker Donthineni Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The commit cddafd8f353d ("hw/intc/arm_gicv3_its: Implement state save /restore") breaks the backward compatibility with the older kernels where vITS save/restore support is not available. The vmstate function vm_change_state_handler() should not be registered if the running kernel doesn't support ITS save/restore feature. Otherwise VM instance will be killed whenever vmstate callback function is invoked. Observed a virtual machine shutdown with QEMU-2.10+linux-4.11 when testing the reboot command "virsh reboot --mode acpi" instead of reboot. KVM Error: 'KVM_SET_DEVICE_ATTR failed: Group 4 attr 0x00000000000001' Signed-off-by: Shanker Donthineni Reviewed-by: Eric Auger --- hw/intc/arm_gicv3_its_kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 39903d5..9b00ce5 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -111,13 +111,13 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp) error_free(s->migration_blocker); return; } + } else { + qemu_add_vm_change_state_handler(vm_change_state_handler, s); } kvm_msi_use_devid = true; kvm_gsi_direct_mapping = false; kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled(); - - qemu_add_vm_change_state_handler(vm_change_state_handler, s); } /**