From patchwork Thu Oct 26 13:58:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 117240 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp806307qgn; Thu, 26 Oct 2017 07:03:34 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Ro6/jE909SNrft/ALwI2zIaRp7ZQPzZbcupC3LJwoO5BVNhT8T/JEJpUASYodL44+10qxp X-Received: by 10.37.37.82 with SMTP id l79mr592242ybl.393.1509026614652; Thu, 26 Oct 2017 07:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509026614; cv=none; d=google.com; s=arc-20160816; b=zS8x3IttxtvHC8unAzhAIzfOVmKuDzGxC5+e60jjWwJt4/mcEuJM+RYHo+K01DGSlC Wc6LJ6Nj1wU2eEdGBmpf5CJtlUGqLEwYib392q8nzdPSorTtXjbSqKQ2Jnjwubj1Hjoh TvL83cDgJSO0rDSInNtMLbbqEbm0QWHJKdqxX2Yg0h4vIREX2ADwHRaWLsJX+hEflB4J H7q48E1zUU925rd5WHpK32Gu+CAdKjSq8f7aw0Td1vNeDhS8mB1cYJNMTM3XEjk95Lv6 tG/Zix4T/lrzaMHn+iwFeEvih6hY6Xyye+kjr0huEm2vd9Qgn6r1SvvaPb9Z78cYfGmq EWTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=VHtGIAlK5Bu+IOQCEz4Uwl0jHwH+OVNOOrikc4kOhsw=; b=b7IdofnIsVLVKFCIayqMxvRzyDUpzKS2gkcrlVbcf+AqxLIeeAWy3kUYO526W9EPdR 0C9zyIeT1hHR7BzyjLf3AJ6s6H5EH+jiBa2dRhR5YSUSUdFoVA9GP/uqv3ocv+63pbYc c4mWhTudBQa6MaoNrOzSfBGndKV+Dp9wVKMl7YfTlySYMzCU9KJuASMDfqrtXQZRSLYh SD/LV5/3ewQHZ+XrAENnV6Tdy3/ryWA/o0HW4q9KTbLyS1F0CAst5q1H2G8FwSLxG9Td BLeC90zKZUp0R9uSR9XQCWg5mqi6TqzU+iJtxewslrRilGqCyM+2xw8V1FHhfPCqtEGB x9Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J3e840to; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a3si320618ybi.269.2017.10.26.07.03.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 26 Oct 2017 07:03:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J3e840to; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7ikw-0002WO-5D for patch@linaro.org; Thu, 26 Oct 2017 10:03:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7ifw-0008HD-Rr for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7ift-0008D1-LA for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:58:24 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:49415) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7ift-0008Bc-Cm for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:58:21 -0400 Received: by mail-wr0-x243.google.com with SMTP id g90so3260195wrd.6 for ; Thu, 26 Oct 2017 06:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=VHtGIAlK5Bu+IOQCEz4Uwl0jHwH+OVNOOrikc4kOhsw=; b=J3e840toUKNJCwrMrweccV3p55kv/CPEKmelwCu+eoudXyxLtN9AHvt8oZ5Y8ln7kK no6KMmLA5tEDROAZMFAyVRJR1O8SSTEd8m+yLbelPxlAdXhJDkgMHylLq/sRjbaw6IlF RlMpG0mN2m496JlCPs5v5xutqfMVhFvHY0Fvc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VHtGIAlK5Bu+IOQCEz4Uwl0jHwH+OVNOOrikc4kOhsw=; b=IsOTfWG2A7I8aN4XsJdI7vX8TGO+B1fpXe7yLXR/HrWZlq6eK1gVWVvtZ3vs/EtIIj UiOy88H+zdAZZ3rAgbGT3121AP2OJTB1Dnh/95O3uhGdABtcTOggmCXlBoPGLrNdZu+s INEMgzIPVlaDa2TxLmKyzkDw2NlF87A8phGR3pG/bvNnkNRBTYBEKVLfZEtMPh+Eup0m 4w+p1jfs5ZWrj4hj+kXATxS37Kfax7b4zKdLQXf52yzJeBkl5IGb5aB/1oy4ga0fOBBJ YAUlbcnni4z/PSCkX6JgSeCtqYNwCJS3xnOcI3P0jRFoPFvqrtxw8y7PRdv8uJBwg9w6 a44Q== X-Gm-Message-State: AMCzsaVMCF3smiHxAmJ0i8o7uwRzNQU6kPUTbPlv1e+KEzF5bWaysRwg OMZQuDGeZ6AKpx2YoNcFoiO8vckwPmI= X-Received: by 10.223.191.8 with SMTP id p8mr5773151wrh.69.1509026299809; Thu, 26 Oct 2017 06:58:19 -0700 (PDT) Received: from cloudburst.twiddle.net ([62.168.35.124]) by smtp.gmail.com with ESMTPSA id v7sm3607804wrd.56.2017.10.26.06.58.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Oct 2017 06:58:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 26 Oct 2017 15:58:14 +0200 Message-Id: <20171026135814.20773-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH] tcg: Avoid setting tcg_initialize if !CONFIG_TCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fix the build for --disable-tcg. Fixes: 55c3ceef61fcf06fc98ddc752b7cce788ce7680b Signed-off-by: Richard Henderson --- target/arm/cpu.c | 2 ++ target/i386/cpu.c | 2 ++ target/mips/cpu.c | 2 ++ target/ppc/translate_init.c | 2 ++ target/s390x/cpu.c | 2 ++ 5 files changed, 10 insertions(+) -- 2.13.6 Reviewed-by: Eduardo Habkost Reviewed-by: Emilio G. Cota diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 056284985d..a7f03eabe8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1760,7 +1760,9 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) #endif cc->disas_set_info = arm_disas_set_info; +#ifdef CONFIG_TCG cc->tcg_initialize = arm_translate_init; +#endif } static void cpu_register(const ARMCPUInfo *info) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 53ec94ac9b..2f556c0ea3 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4212,7 +4212,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) #endif cc->cpu_exec_enter = x86_cpu_exec_enter; cc->cpu_exec_exit = x86_cpu_exec_exit; +#ifdef CONFIG_TCG cc->tcg_initialize = tcg_x86_init; +#endif dc->user_creatable = true; } diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 0ae70288dd..80812f3e08 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -198,7 +198,9 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->vmsd = &vmstate_mips_cpu; #endif cc->disas_set_info = mips_cpu_disas_set_info; +#ifdef CONFIG_TCG cc->tcg_initialize = mips_tcg_init; +#endif cc->gdb_num_core_regs = 73; cc->gdb_stop_before_watchpoint = true; diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 13436e4760..61a9552c1c 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -10578,7 +10578,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) #ifndef CONFIG_USER_ONLY cc->virtio_is_big_endian = ppc_cpu_is_big_endian; #endif +#ifdef CONFIG_TCG cc->tcg_initialize = ppc_translate_init; +#endif dc->fw_name = "PowerPC,UNKNOWN"; } diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 824dfd6b65..ae3cee91a2 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -497,7 +497,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) #endif #endif cc->disas_set_info = s390_cpu_disas_set_info; +#ifdef CONFIG_TCG cc->tcg_initialize = s390x_translate_init; +#endif cc->gdb_num_core_regs = S390_NUM_CORE_REGS; cc->gdb_core_xml_file = "s390x-core64.xml";