From patchwork Tue Sep 3 16:08:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 2853283 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B15599F3DC for ; Tue, 3 Sep 2013 16:09:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A15C52041D for ; Tue, 3 Sep 2013 16:09:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BFF82041A for ; Tue, 3 Sep 2013 16:09:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756847Ab3ICQJF (ORCPT ); Tue, 3 Sep 2013 12:09:05 -0400 Received: from thoth.sbs.de ([192.35.17.2]:20633 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756228Ab3ICQJE (ORCPT ); Tue, 3 Sep 2013 12:09:04 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id r83G8r10016571; Tue, 3 Sep 2013 18:08:53 +0200 Received: from mchn199C.mchp.siemens.de.de ([139.25.40.156]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id r83G8r5V018026; Tue, 3 Sep 2013 18:08:53 +0200 From: Jan Kiszka To: Paolo Bonzini , Gleb Natapov Cc: qemu-devel , kvm@vger.kernel.org, "Zhanghaoyu (A)" , "Huangweidong (C)" , Luonengjun , "Michael S. Tsirkin" , Eric Blake , qemu-stable@nongnu.org Subject: [uq/master][PATCH 3/3] kvmvapic: Clear also physical ROM address when entering INACTIVE state Date: Tue, 3 Sep 2013 18:08:52 +0200 Message-Id: <65d16e2f9081163f43d61f4a6163998055a2fc80.1378224531.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.8.1.1.298.ge7eed54 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To avoid misinterpreting INACTIVE after migration as old qemu-kvm's STANDBY, also clear rom_state_paddr when going back to this state. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka --- hw/i386/kvmvapic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index f2e335d..cf6c714 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -511,6 +511,7 @@ static void vapic_reset(DeviceState *dev) VAPICROMState *s = VAPIC(dev); s->state = VAPIC_INACTIVE; + s->rom_state_paddr = 0; vapic_enable_tpr_reporting(false); } @@ -664,6 +665,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data, } if (vapic_prepare(s) < 0) { s->state = VAPIC_INACTIVE; + s->rom_state_paddr = 0; break; } break;