From patchwork Fri Oct 6 11:13:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729967 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp446737wrp; Fri, 6 Oct 2023 04:15:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5vDL25dQP2UfAbyDt837gpiqmak7ZETydDO5EMz3dM5wQBhd0cCPr73s0TTmes9D1MBcx X-Received: by 2002:a05:620a:240f:b0:775:6bb9:2956 with SMTP id d15-20020a05620a240f00b007756bb92956mr8341192qkn.67.1696590915223; Fri, 06 Oct 2023 04:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590915; cv=none; d=google.com; s=arc-20160816; b=XLLs3BpTXyUU5SA0Isu/5eB0NUBCXRTPRFzUuGhH66lT1ovWIS/E0Ywmuu1Zh2s198 K42nMCdRXic7HtkS2m2CslVLORwyoBeaW9Cw2+rrtC5oXW2zzKwF3HcF8uCYAt7gUuo4 4O5SIXO88gZ8Zt6m0HM96a3ZajK8fXR2thiwRt65V0LndxaEYktNvTF1+kmz0j6UwJ3h 7r/eIJ5TUp/1bDOVpnJQde4uB3rEbfxFE/r8R7JbKFtXSdfrgt3SEXZO22/86EG3KSzK JwGHg0Oi8Zcl2lHXLN+0QeiOnSafH1t1EPb7VCdex8ZorNnzBX9XSMTYy589sUqSqZgH 8HMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=lLXxT6jc2NK20FujXXX0O98awZJ12dxXlKKY1FyiVMgtnIgwMjqRBQATPjl2pSTlpg ix2sPVVmMp6E3/1K7Gq4fe1F250Sfodz1dRXQyrklPwI+LWOWN/lAUg/kGrE6r4ge/Wj nQH6W7gGkG3J2RJEd3a6E7mkNWbFLNvrLWYOXc3vWY/vX/Vzmx2aRuJmrbApfIT09DLP dQfjfUNUTh47sM+F0/Ag6nlLZ05fQPZ4AKmBxh8HSPfBsXgSxzakxC5lIAjDFijsbBcm E2eW8lDyEDWmyKCSxjKDNYSOcqNs4gMaXL1O226Lw+xchvqYDswxhsHfLZGAlCDTFMyK 77vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JdEaUXjW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t6-20020a05620a0b0600b00773d3c0bcdbsi2156526qkg.427.2023.10.06.04.15.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JdEaUXjW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinD-00088B-AH; Fri, 06 Oct 2023 07:14:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin4-000873-7V for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimx-0000IO-LA for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590875; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; b=JdEaUXjWyA1A7PFFEbpKK2L77Zkw8eEA3SCbLojAY3PI28DurBHcdtSoG+coD2Pv32iY1u n/XlgJmVZxGANYKiRLfHc7hQgGkYCo01wtRpFHQW9PWEQO6JZ0EYjWLYGbpqbXOtIQy0d4 i06XZzuMTuE0q5fXBZsC2GKKoppH33A= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-dbh-XtYZNACf6IpNFZNfxg-1; Fri, 06 Oct 2023 07:14:33 -0400 X-MC-Unique: dbh-XtYZNACf6IpNFZNfxg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-537fb536554so1818171a12.2 for ; Fri, 06 Oct 2023 04:14:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590872; x=1697195672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; b=QdO8cyU07reysCCsHMS6CIWAt+lzFBJen87RePwLC0SvJJVL8W2AwqFVUMTOt6+vA3 ycKQe5BZFWLEGV8bpYWb/5nX++WvWPD5DRIlekXQp4cgdIogvvPIz9tsF13bMsw+Xm9R wvloM7A+emMNs1CLr0m4jJp9YDmp5sLM13kdJv6QbsB33AHeC7/dl8zLoUxRRpWmlyzL mkG6c4vI+ZWEivZj+++yExq9zFpjkrONQcc+p6W8PVaDqqDTm8jC7sv65iOpuJhwXFFZ 0QBoXuJKS4Jdt5RilIx3pmqz2zbF+IwVDHap9IvfvJ/vYleMFECL/qVw/UsOJc9GCmst +kyw== X-Gm-Message-State: AOJu0Yzg2EiAjFDlChz/aibqF/lQ3nwMy3ZV4rRzBFZ5YrdKEI0jZ07v JiSn1A+Fcs0nGsV0tmXMw+gpDGICvC3C1LKHJNgRu+DCQli5C58oHk/C9VIexV07Vwx/5G8h+6Y cSwHPb3eKoV9AJWmHxJk4O/8Kmj1QiiCGzSZEwUiSTIpekDifGNPDW/D08hVVXikipp2yLgweHd A= X-Received: by 2002:a05:6402:6d4:b0:533:4c67:c911 with SMTP id n20-20020a05640206d400b005334c67c911mr7269537edy.19.1696590872060; Fri, 06 Oct 2023 04:14:32 -0700 (PDT) X-Received: by 2002:a05:6402:6d4:b0:533:4c67:c911 with SMTP id n20-20020a05640206d400b005334c67c911mr7269519edy.19.1696590871653; Fri, 06 Oct 2023 04:14:31 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id g18-20020a056402181200b0053782c81c69sm2397206edy.96.2023.10.06.04.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 10/26] accel: Rename accel_softmmu* -> accel_system* Date: Fri, 6 Oct 2023 13:13:56 +0200 Message-ID: <20231006111412.13130-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Rename accel.softmmu -> accel.system in file paths and the register_types() method. Rename sysemu_stubs_ss -> system_stubs_ss in meson following the pattern used on other source set names. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231004090629.37473-7-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- accel/accel-common.c | 2 +- accel/{accel-softmmu.c => accel-system.c} | 6 +++--- accel/{accel-softmmu.h => accel-system.h} | 6 +++--- accel/meson.build | 2 +- accel/stubs/meson.build | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) rename accel/{accel-softmmu.c => accel-system.c} (96%) rename accel/{accel-softmmu.h => accel-system.h} (77%) diff --git a/accel/accel-common.c b/accel/accel-common.c index df72cc989a9..965318daa36 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -30,7 +30,7 @@ #include "hw/core/accel-cpu.h" #ifndef CONFIG_USER_ONLY -#include "accel-softmmu.h" +#include "accel-system.h" #endif /* !CONFIG_USER_ONLY */ static const TypeInfo accel_type = { diff --git a/accel/accel-softmmu.c b/accel/accel-system.c similarity index 96% rename from accel/accel-softmmu.c rename to accel/accel-system.c index 9c804ba9e3b..fa8f43757ce 100644 --- a/accel/accel-softmmu.c +++ b/accel/accel-system.c @@ -28,7 +28,7 @@ #include "hw/boards.h" #include "sysemu/cpus.h" #include "qemu/error-report.h" -#include "accel-softmmu.h" +#include "accel-system.h" int accel_init_machine(AccelState *accel, MachineState *ms) { @@ -99,8 +99,8 @@ static const TypeInfo accel_ops_type_info = { .class_size = sizeof(AccelOpsClass), }; -static void accel_softmmu_register_types(void) +static void accel_system_register_types(void) { type_register_static(&accel_ops_type_info); } -type_init(accel_softmmu_register_types); +type_init(accel_system_register_types); diff --git a/accel/accel-softmmu.h b/accel/accel-system.h similarity index 77% rename from accel/accel-softmmu.h rename to accel/accel-system.h index 5e192f1882e..d41c62f21b1 100644 --- a/accel/accel-softmmu.h +++ b/accel/accel-system.h @@ -7,9 +7,9 @@ * See the COPYING file in the top-level directory. */ -#ifndef ACCEL_SOFTMMU_H -#define ACCEL_SOFTMMU_H +#ifndef ACCEL_SYSTEM_H +#define ACCEL_SYSTEM_H void accel_init_ops_interfaces(AccelClass *ac); -#endif /* ACCEL_SOFTMMU_H */ +#endif /* ACCEL_SYSTEM_H */ diff --git a/accel/meson.build b/accel/meson.build index 638a9a03ba9..3376810921d 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -1,5 +1,5 @@ specific_ss.add(files('accel-common.c', 'accel-blocker.c')) -system_ss.add(files('accel-softmmu.c')) +system_ss.add(files('accel-system.c')) user_ss.add(files('accel-user.c')) subdir('tcg') diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 6b0f200efe9..91a2d219258 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,6 +1,6 @@ -sysemu_stubs_ss = ss.source_set() -sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +system_stubs_ss = ss.source_set() +system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) -specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss) +specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss)