From patchwork Wed Apr 18 20:02:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 153577 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 24943B6F9A for ; Thu, 19 Apr 2012 06:02:49 +1000 (EST) Received: from localhost ([::1]:33717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKb5S-0006sL-Hr for incoming@patchwork.ozlabs.org; Wed, 18 Apr 2012 16:02:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKb5I-0006s8-7m for qemu-devel@nongnu.org; Wed, 18 Apr 2012 16:02:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKb5G-0005pi-KD for qemu-devel@nongnu.org; Wed, 18 Apr 2012 16:02:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKb5G-0005np-Be for qemu-devel@nongnu.org; Wed, 18 Apr 2012 16:02:34 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3IK2WOc030959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 18 Apr 2012 16:02:32 -0400 Received: from blackpad.lan.raisama.net (ovpn-116-19.ams2.redhat.com [10.36.116.19]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3IK2QET015229; Wed, 18 Apr 2012 16:02:27 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 26E0C20065B; Wed, 18 Apr 2012 17:02:41 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 18 Apr 2012 17:02:37 -0300 Message-Id: <1334779360-19036-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1334779360-19036-1-git-send-email-ehabkost@redhat.com> References: <1334779360-19036-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: libvir-list@redhat.com, Jiri Denemark Subject: [Qemu-devel] [PATCH 2/5] eliminate arch_config_name variable 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 Not needed anymore, as the code that uses the variable is already inside arch_init.c. Signed-off-by: Eduardo Habkost --- arch_init.c | 3 +-- arch_init.h | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch_init.c b/arch_init.c index 4008115..152cbbb 100644 --- a/arch_init.c +++ b/arch_init.c @@ -54,7 +54,6 @@ int graphic_height = 600; int graphic_depth = 15; #endif -const char arch_config_name[] = CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf"; #if defined(TARGET_ALPHA) #define QEMU_ARCH QEMU_ARCH_ALPHA @@ -122,7 +121,7 @@ int qemu_read_default_config_files(void) return ret; } - ret = qemu_read_config_file(arch_config_name); + ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf"); if (ret < 0 && ret != -ENOENT) { return ret; } diff --git a/arch_init.h b/arch_init.h index 329faf7..495871b 100644 --- a/arch_init.h +++ b/arch_init.h @@ -1,8 +1,6 @@ #ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H -extern const char arch_config_name[]; - enum { QEMU_ARCH_ALL = -1, QEMU_ARCH_ALPHA = 1,