From patchwork Thu Apr 4 19:22:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233942 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 15E5E2C00A6 for ; Fri, 5 Apr 2013 07:29:09 +1100 (EST) Received: from localhost ([::1]:49746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNppJ-0007GG-MQ for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:28:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplE-000199-Qx for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplD-0001nb-4C for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:48 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:47057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplC-0001nT-S8 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:47 -0400 Received: by mail-wi0-f181.google.com with SMTP id hj8so2971275wib.8 for ; Thu, 04 Apr 2013 12:23:46 -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=BrKW22xR9hQgTn0bSX33CYTCP5roXTpzz0qn/60tgAsb3TyLHzJwAIwi+H74GIXHNz bA+QFyRHoI0lbFvkgFvWzWaEHVhWcQxRJJFmwqN4xRW0H9ifdb1SaadSYLG1F0EaQSF/ S6NmiusLM1NeMY6J+fK7Z04tImuVen6nzKQMAyEDLCetgV/cMl5WNwzei8RVzt1yktKK J0Qg5Bbie3JPzylL39tjo1NqORw3rp7aCuXsfrEVUPRRm7ugF0Dic+WR/VB7bwq4xWq5 VMtMC1k8KyIwUunYqBemJAiLRum+VmF35QBQ+wrIa6O2fUHK/QNRKp74C6wOIKwsyduh AUzA== X-Received: by 10.195.13.232 with SMTP id fb8mr11615431wjd.51.1365103426253; Thu, 04 Apr 2013 12:23:46 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.23.44 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:23:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:22:50 +0200 Message-Id: <1365103395-11547-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-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:400c:c05::235 Subject: [Qemu-devel] [PATCH 10/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