From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akio Takebe Subject: [Patch] fix Oops at shutdown guest Date: Tue, 17 Jun 2008 16:22:30 +0900 Message-ID: <6C8D04AE75088takebe_akio@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: kvm@vger.kernel.org Return-path: Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:41957 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753388AbYFQHWz (ORCPT ); Tue, 17 Jun 2008 03:22:55 -0400 Received: from m3.gw.fujitsu.co.jp ([10.0.50.73]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id m5H7Ms2Y023341 for (envelope-from takebe_akio@jp.fujitsu.com); Tue, 17 Jun 2008 16:22:54 +0900 Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 088C02AC028 for ; Tue, 17 Jun 2008 16:22:54 +0900 (JST) Received: from s7.gw.fujitsu.co.jp (s7.gw.fujitsu.co.jp [10.0.50.97]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id B895412C0AE for ; Tue, 17 Jun 2008 16:22:53 +0900 (JST) Received: from s7.gw.fujitsu.co.jp (s7 [127.0.0.1]) by s7.gw.fujitsu.co.jp (Postfix) with ESMTP id A09DD161C007 for ; Tue, 17 Jun 2008 16:22:53 +0900 (JST) Received: from fjm503.ms.jp.fujitsu.com (fjm503.ms.jp.fujitsu.com [10.56.99.77]) by s7.gw.fujitsu.co.jp (Postfix) with ESMTP id 4F75E161C009 for ; Tue, 17 Jun 2008 16:22:53 +0900 (JST) Received: from fjmscan502.ms.jp.fujitsu.com (fjmscan502.ms.jp.fujitsu.com [10.56.99.142])by fjm503.ms.jp.fujitsu.com with ESMTP id m5H7MZhh028867 for ; Tue, 17 Jun 2008 16:22:35 +0900 Received: from jp.fujitsu.com (takebe.soft.fujitsu.com [10.33.110.49]) by fjmscan502.ms.jp.fujitsu.com (8.13.1/8.12.11) with SMTP id m5H7MXMl030528 for ; Tue, 17 Jun 2008 16:22:35 +0900 Sender: kvm-owner@vger.kernel.org List-ID: Hi, I got a Oops message when I shutdown a guest on x86_32 machine. The patch fixes this issue. Signed-off-by: Akio Takebe Best Regards, Akio Takebe --- diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4f38f5c..f9427e2 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -262,11 +262,11 @@ static void kvm_destroy_vm(struct kvm *kvm) spin_unlock(&kvm_lock); kvm_io_bus_destroy(&kvm->pio_bus); kvm_io_bus_destroy(&kvm->mmio_bus); - kvm_arch_destroy_vm(kvm); #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET if (kvm->coalesced_mmio_ring != NULL) free_page((unsigned long)kvm->coalesced_mmio_ring); #endif + kvm_arch_destroy_vm(kvm); mmdrop(mm); }