From patchwork Wed Sep 25 12:58:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 277858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE4D12C0330 for ; Wed, 25 Sep 2013 23:23:34 +1000 (EST) Received: from localhost ([::1]:52680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOp41-0005ne-2y for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 09:23:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOogR-0003w1-PI for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:59:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOogI-0000QX-Fi for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:59:11 -0400 Received: from mail-qe0-x230.google.com ([2607:f8b0:400d:c02::230]:53535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOogI-0000QF-CU; Wed, 25 Sep 2013 08:59:02 -0400 Received: by mail-qe0-f48.google.com with SMTP id nd7so4073248qeb.21 for ; Wed, 25 Sep 2013 05:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=n0OsEFjEQZ0EkgXKNaXQxOXLrYqYmhUicsZCM60D4JU=; b=XH4TQ6e7yvESoB5uOdYXz1IM1KPij2n3N4iukz32oPqA+y8bJCgFm4kVSlN8NZY1q7 GJXP/pwG+hFzoNygi3u9iWOEf9b26xbu1+WzIO6HitUEitcZd5uuNXQTCzBe3tY2MS61 N+Mj48O2HZWaUmKiBvzX8QUP4kSGIXhPUS6Z9t7XlDsakkhoiT+QZgB56BK3TKf1FMCX ONzVIuQLT8vh6h/eVfrH/IctvH2fhYJqgWJA+px1gqEeAvFpEPbKDPzo8KL9NhGm/Wer izloB0d8uBJsfN3br0gOvv6H/c/oRXsO04unb/lkdFreaswDfgBOAAm7LnugZ1YF1gOU 0wig== X-Received: by 10.224.127.6 with SMTP id e6mr37650710qas.67.1380113941870; Wed, 25 Sep 2013 05:59:01 -0700 (PDT) Received: from loki.morrigu.org ([70.114.130.150]) by mx.google.com with ESMTPSA id g2sm65250216qaf.12.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 05:59:01 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 25 Sep 2013 07:58:03 -0500 Message-Id: <1380113886-16845-36-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c02::230 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 35/38] kvmvapic: Clear also physical ROM address when entering INACTIVE state 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka 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 Signed-off-by: Paolo Bonzini (cherry picked from commit 4357930b8a7d2fcff2d8121ec518117428a781e7) Signed-off-by: Michael Roth --- 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;