From patchwork Tue Apr 2 14:58:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D170E2C01EE for ; Wed, 3 Apr 2013 02:41:10 +1100 (EST) Received: from localhost ([::1]:52435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2nh-0007aP-Fi for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 11:07:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2lG-0004tE-NS for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:04:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2lF-0003PO-Fr for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:04:34 -0400 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:62202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gV-0001Fz-BI for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:39 -0400 Received: by mail-ea0-f175.google.com with SMTP id r16so267369ead.34 for ; Tue, 02 Apr 2013 07:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=rHzFXCXQpmli8YxH7UmPuWXCHOW4jY4edikkVUXvNWg=; b=DKAcseiT9uI++Tj5YI/aq+JYbS9yTbuYqCwAiQoIGE5LDLfQagALMR8MQMG1b5DmHT g9C3A9qGOOJIJAqZLpN36F7IFwtZnLOEHKPI4PbSJy3pM6TiT8rD94KUFvYjFcJwpt1P Ll3e0dIiXe2fvfQXkfO1cX/Vdl/1GTqbqJbpQ+hYVGJsxO21Ohdgw4iaZo0UPCyRBCFm qz5EbmFIOaKvCts3GRnDOMSqw3A+aXsuUOEFExV22aZ4JpQfh7+fnbDrJcN+xYvUVuEH 2yN3I1eUNgU1+2XL7og+6skZvs73M8zfrcH+e6P0zSLrqYcci3DogydEJWV9vLfWAIge NSHg== X-Received: by 10.14.194.198 with SMTP id m46mr49680395een.8.1364914778561; Tue, 02 Apr 2013 07:59:38 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id n2sm3179353eeo.10.2013.04.02.07.59.36 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 07:59:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:58:43 +0200 Message-Id: <1364914749-11141-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22f Subject: [Qemu-devel] [PATCH 09/35] hw: move watchdogs to hw/watchdog, configure via default-configs/ 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: Paolo Bonzini --- default-configs/i386-softmmu.mak | 1 + default-configs/pci.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/i386/Makefile.objs | 1 - hw/watchdog/Makefile.objs | 3 ++- hw/{ => watchdog}/wdt_ib700.c | 0 6 files changed, 5 insertions(+), 2 deletions(-) rename hw/{ => watchdog}/wdt_ib700.c (100%) diff --git a/hw/wdt_ib700.c b/hw/watchdog/wdt_ib700.c similarity index 100% rename from hw/wdt_ib700.c rename to hw/watchdog/wdt_ib700.c diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index e041a63..7dd0669 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -29,3 +29,4 @@ CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y CONFIG_TPM_PASSTHROUGH=y CONFIG_PCI_HOTPLUG=y +CONFIG_WDT_IB700=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index ce56d58..f5f100e 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -23,3 +23,4 @@ CONFIG_ESP_PCI=y CONFIG_SERIAL=y CONFIG_SERIAL_PCI=y CONFIG_IPACK=y +CONFIG_WDT_IB6300ESB=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 5ba1116..0e5ab55 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -29,3 +29,4 @@ CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y CONFIG_TPM_PASSTHROUGH=y CONFIG_PCI_HOTPLUG=y +CONFIG_WDT_IB700=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index c813b1e..5559a8b 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,6 @@ obj-y += mc146818rtc.o obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o -obj-y += wdt_ib700.o obj-y += debugcon.o debugexit.o obj-y += pc_sysfw.o obj-y += lpc_ich9.o q35.o diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs index f57133b..4b0374a 100644 --- a/hw/watchdog/Makefile.objs +++ b/hw/watchdog/Makefile.objs @@ -1,2 +1,3 @@ common-obj-y += watchdog.o -common-obj-$(CONFIG_PCI) += wdt_i6300esb.o +common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o +common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o