From patchwork Fri Aug 13 08:23:06 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiaotian Feng <dfeng@redhat.com>
X-Patchwork-Id: 119394
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7D8XOHS010910
	for <patchwork-kvm@patchwork.kernel.org>;
	Fri, 13 Aug 2010 08:33:24 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933985Ab0HMIXd (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Fri, 13 Aug 2010 04:23:33 -0400
Received: from mx1.redhat.com ([209.132.183.28]:19629 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1761356Ab0HMIXV (ORCPT <rfc822;kvm@vger.kernel.org>);
	Fri, 13 Aug 2010 04:23:21 -0400
Received: from int-mx08.intmail.prod.int.phx2.redhat.com
	(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7D8NDf2015179
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Fri, 13 Aug 2010 04:23:13 -0400
Received: from danny.com (dhcp-65-180.nay.redhat.com [10.66.65.180])
	by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o7D8N8DW031927; Fri, 13 Aug 2010 04:23:09 -0400
From: Xiaotian Feng <dfeng@redhat.com>
To: kvm@vger.kernel.org, x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Xiaotian Feng <dfeng@redhat.com>,
	Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
	"H. Peter Anvin" <hpa@zytor.com>, Gleb Natapov <gleb@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Gregory Haskins <ghaskins@novell.com>
Subject: [PATCH] kvm: destroy workqueue on kvm_create_pit() failures
Date: Fri, 13 Aug 2010 16:23:06 +0800
Message-Id: <1281687786-3200-1-git-send-email-dfeng@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Fri, 13 Aug 2010 08:34:10 +0000 (UTC)


diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 0fd6378..f539c3c 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -742,7 +742,7 @@ fail:
 	kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier);
 	kvm_unregister_irq_ack_notifier(kvm, &pit_state->irq_ack_notifier);
 	kvm_free_irq_source_id(kvm, pit->irq_source_id);
-
+	destroy_workqueue(pit->wq);
 	kfree(pit);
 	return NULL;
 }