From patchwork Thu Jun 6 03:17:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 249257 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 2E4102C0087 for ; Thu, 6 Jun 2013 13:20:54 +1000 (EST) Received: from localhost ([::1]:40281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkQku-0005VS-7Y for incoming@patchwork.ozlabs.org; Wed, 05 Jun 2013 23:20:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkQik-0002Cn-Gv for qemu-devel@nongnu.org; Wed, 05 Jun 2013 23:18:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkQij-0004B5-Ig for qemu-devel@nongnu.org; Wed, 05 Jun 2013 23:18:38 -0400 Received: from [222.73.24.84] (port=46456 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkQii-0004A8-Aw for qemu-devel@nongnu.org; Wed, 05 Jun 2013 23:18:37 -0400 X-IronPort-AV: E=Sophos;i="4.87,811,1363104000"; d="scan'208";a="7474079" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 06 Jun 2013 11:15:42 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r563IRmg008934; Thu, 6 Jun 2013 11:18:32 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013060611164744-1881059 ; Thu, 6 Jun 2013 11:16:47 +0800 From: liguang To: Igor Mammedov Date: Thu, 6 Jun 2013 11:17:00 +0800 Message-Id: <1370488621-6915-8-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1370488621-6915-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1370488621-6915-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/06 11:16:47, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/06 11:16:51, Serialize complete at 2013/06/06 11:16:51 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Kevin Wolf , Alexander Graf , Anthony Liguori , Stefan Berger , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Christian Borntraeger , Markus Armbruster , Joel Schopp , Gerd Hoffmann , Paolo Bonzini , Luiz Capitulino , Laszlo Ersek , =?UTF-8?q?Andreas=20F=C3=A4rber?= , liguang , Isaku Yamahata Subject: [Qemu-devel] [PATCH RFC v2 7/8] pc: add EC qdev init for piix & q35 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 Signed-off-by: liguang --- hw/i386/pc_piix.c | 6 ++++++ hw/i386/pc_q35.c | 5 +++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 71ce2ff..378c980 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -46,6 +46,8 @@ #include "exec/address-spaces.h" #include "hw/acpi/acpi.h" #include "cpu.h" +#include "hw/acpi/ec.h" + #ifdef CONFIG_XEN # include #endif @@ -229,6 +231,10 @@ static void pc_init1(MemoryRegion *system_memory, if (has_pvpanic) { pvpanic_init(isa_bus); } + + if (qemu_ec_enabled()) { + ec_dev_init(isa_bus); + } } static void pc_init_pci(QEMUMachineInitArgs *args) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index f171ed3..9c2d3b1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -42,6 +42,7 @@ #include "hw/ide/ahci.h" #include "hw/usb.h" #include "hw/cpu/icc_bus.h" +#include "hw/acpi/ec.h" /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 @@ -206,6 +207,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args) if (has_pvpanic) { pvpanic_init(isa_bus); } + + if (qemu_ec_enabled()) { + ec_dev_init(isa_bus); + } } static void pc_q35_init_1_4(QEMUMachineInitArgs *args)