From patchwork Wed Sep 2 22:43:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAA97C433E7 for ; Wed, 2 Sep 2020 23:07:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7FA8720767 for ; Wed, 2 Sep 2020 23:07:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PgYtUdoi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FA8720767 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbqU-0006Pm-Jt for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVn-00063W-6a for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVk-0000H0-NS for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s3S/AszU2npuLFVGLRWKun644Qipz/7LELQUErE38aE=; b=PgYtUdoinguoYjcMj7rDhz3zFp9iy27Ej5A8VwX3JmWfFcJhcGuwI9d+8kUSr++Cuxs5zQ nKsvtcXMnsWfHo5JZAsUlCxybfaMqPAIZlwtoj+pSc09ZwlBsxILPaWzfuBr3v9bVQClk6 bEQwmzwGQdNeu68icnktcPXwavd/OmI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-464-WfnT9OXwPEq_0bYcoJZenA-1; Wed, 02 Sep 2020 18:45:46 -0400 X-MC-Unique: WfnT9OXwPEq_0bYcoJZenA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 902CA1074642; Wed, 2 Sep 2020 22:45:45 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AC6918B59; Wed, 2 Sep 2020 22:45:45 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 60/63] tcg: Rename TCG_STATE to TCG_ACCEL Date: Wed, 2 Sep 2020 18:43:08 -0400 Message-Id: <20200902224311.1321159-61-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , berrange@redhat.com, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Richard Henderson Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- accel/tcg/tcg-all.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 7098ad96c3..08d82e5c03 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -46,7 +46,7 @@ typedef struct TCGState TCGState; #define TYPE_TCG_ACCEL ACCEL_CLASS_NAME("tcg") -DECLARE_INSTANCE_CHECKER(TCGState, TCG_STATE, +DECLARE_INSTANCE_CHECKER(TCGState, TCG_ACCEL, TYPE_TCG_ACCEL) /* mask must never be zero, except for A20 change call */ @@ -118,14 +118,14 @@ static bool default_mttcg_enabled(void) static void tcg_accel_instance_init(Object *obj) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); s->mttcg_enabled = default_mttcg_enabled(); } static int tcg_init(MachineState *ms) { - TCGState *s = TCG_STATE(current_accel()); + TCGState *s = TCG_ACCEL(current_accel()); tcg_exec_init(s->tb_size * 1024 * 1024); cpu_interrupt_handler = tcg_handle_interrupt; @@ -135,14 +135,14 @@ static int tcg_init(MachineState *ms) static char *tcg_get_thread(Object *obj, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); return g_strdup(s->mttcg_enabled ? "multi" : "single"); } static void tcg_set_thread(Object *obj, const char *value, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); if (strcmp(value, "multi") == 0) { if (TCG_OVERSIZED_GUEST) { @@ -172,7 +172,7 @@ static void tcg_get_tb_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); uint32_t value = s->tb_size; visit_type_uint32(v, name, &value, errp); @@ -182,7 +182,7 @@ static void tcg_set_tb_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); uint32_t value; if (!visit_type_uint32(v, name, &value, errp)) {