From patchwork Fri May 30 20:11:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 354328 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CB3521400A8 for ; Sat, 31 May 2014 06:16:05 +1000 (EST) Received: from localhost ([::1]:56415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqTDf-0004XN-Pj for incoming@patchwork.ozlabs.org; Fri, 30 May 2014 16:16:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqTBp-0001WH-QA for qemu-devel@nongnu.org; Fri, 30 May 2014 16:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqTBj-0006Ac-Lf for qemu-devel@nongnu.org; Fri, 30 May 2014 16:14:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqTBj-0006AT-DH for qemu-devel@nongnu.org; Fri, 30 May 2014 16:14:03 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4UKE1Rj004022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 May 2014 16:14:01 -0400 Received: from amt.cnet (vpn1-5-185.gru2.redhat.com [10.97.5.185]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4UKE0oC019369; Fri, 30 May 2014 16:14:01 -0400 Received: from amt.cnet (localhost [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 784B91003E2; Fri, 30 May 2014 17:13:15 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.7/8.14.7/Submit) id s4UKDEXf018204; Fri, 30 May 2014 17:13:14 -0300 Message-Id: <20140530201220.213952416@amt.cnet> User-Agent: quilt/0.60-1 Date: Fri, 30 May 2014 17:11:46 -0300 From: mtosatti@redhat.com To: qemu-devel@nongnu.org References: <20140530201145.194061806@amt.cnet> Content-Disposition: inline; filename=config X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: gleb@kernel.org, mprivozn@redhat.com, Marcelo Tosatti , armbru@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [patch 1/3] generate device configuration file header 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 Required to use device CONFIG_ options from C code. To be used by next patch. Signed-off-by: Marcelo Tosatti Index: qemu/Makefile.target =================================================================== --- qemu.orig/Makefile.target +++ qemu/Makefile.target @@ -37,6 +37,9 @@ STPFILES= config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak +config-devices.h: config-devices.h-timestamp +config-devices.h-timestamp: config-devices.mak + ifdef CONFIG_TRACE_SYSTEMTAP stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp @@ -193,5 +196,5 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp" endif -GENERATED_HEADERS += config-target.h +GENERATED_HEADERS += config-target.h config-devices.h Makefile: $(GENERATED_HEADERS) Index: qemu/monitor.c =================================================================== --- qemu.orig/monitor.c +++ qemu/monitor.c @@ -69,6 +69,7 @@ #include "qmp-commands.h" #include "hmp.h" #include "qemu/thread.h" +#include "config-devices.h" /* for pic/irq_info */ #if defined(TARGET_SPARC)