From patchwork Wed Oct 4 09:06:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 729268 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp239135wrs; Wed, 4 Oct 2023 02:11:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7LfTStbe7pqcU9k/0/qHikxgGdjx2dgqOorqtIwKMCLtMWZpuIjtKMBMJlm9yFRoqy0U3 X-Received: by 2002:a37:e302:0:b0:76e:f279:4c36 with SMTP id y2-20020a37e302000000b0076ef2794c36mr1603792qki.29.1696410680623; Wed, 04 Oct 2023 02:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696410680; cv=none; d=google.com; s=arc-20160816; b=n888cyIbHhokm/Mh73HAUGcXZ36ZHGxNb+yLU9RM/6evqNwloD3qZdlDB8+5uRErCR IuQdDVxQViclnKZDpeFYnVliOn0EUz6sw5fVMN+VIPThf+LgxZjodiRTACuCn28UbrNS xVM1/Zm+onPHbt4k1qDQ31XtoXKzM0hMBkX3DT3BvNQi1uaxMfFEB1BiDAiaZMtKR9iM Yf6c3Q1xGqN9sNGo5QCDpbt5JxTVRxNVljqBtTmYYUhlMmDa1kRhJGCOeyZZYL8dHcq3 D1Hdn8z1j8/VDMsQ9LfW0+BF9haNmnxdgfDLnseRIU7WqUFvhQPLwEEEyKxtO/eZAtMc kp5w== 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=/E8WljXb+dDaNTYEUBfTBEFw2aj3lZYVZ/YWdMp3Hys=; fh=yvcqgV7KdOnBpRgGBVjxiGpLXHfdZ1knBjnFreCP1nY=; b=R49mkCAuBtoF95UvmZ+CH78k8WfEtm5Fle4SkljrjH3T2QulY56qaFq+jxV/IeUl4Z F1XeLBvwU2aDRrN39uhrA2fMUxsx1qFLBypbYRDLFDrR4N4pBKqDHOtPGy0X0H8W1qNN YDS/5+Zev1pMz/S6AL+vXmAYq3gM86j/flaQ61f0T0J1dWeKsdJwDuSLF08/b5g7i4jt JRLQET4hk3qlLMzmlxuXp9dSeYdRZWOCNf4EowEvsiZw42/4Zi5cGJ1H3vvHC9l91WiL V+Loa/xIT5u6zv3gPAcaoHhwdGg1lbmZYZUGA8ppFj1tLYNJaT/GuCaI/ER/2EYU4+ru W2oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cONNgvSt; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q9-20020a05622a030900b0041974072606si1334242qtw.55.2023.10.04.02.11.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 02:11:20 -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=@linaro.org header.s=google header.b=cONNgvSt; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnxrJ-00033F-QN; Wed, 04 Oct 2023 05:08:04 -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 1qnxqd-00018v-Jn for qemu-devel@nongnu.org; Wed, 04 Oct 2023 05:07:15 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qnxqY-0007Sf-6H for qemu-devel@nongnu.org; Wed, 04 Oct 2023 05:07:15 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32799639a2aso1892431f8f.3 for ; Wed, 04 Oct 2023 02:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696410428; x=1697015228; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/E8WljXb+dDaNTYEUBfTBEFw2aj3lZYVZ/YWdMp3Hys=; b=cONNgvStFEjGijh9ABjrMYWXp4zjMS3k30ojXbmd4kG2rdJBCsRuHL1+JyLnwveUq0 fJxwPjv4OQt1d7xzfq+SaJxUoJ4JOzN8x4dkElgQJiLEI32SlhYm4HylS1/zifK8bkkv 5l/x4kHKhSa95LAFO3zz8V0r74WWBzWC5fa0uhhk0dBhADm+5HU5oT/MOsyIZpxBSxrD ALmPQLrHTGpQ/aomNlSZ9cb1DFGOhPMOT7bkv7lAHM6PCWl4rqP299Ufij10gHmYnDXU 3MojyYsOZyKgXb8MJyx3cC/q3rAklys85y38Pu2NAtuggDiYpLjmfDljudPTLQr4ElFt mtnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696410428; x=1697015228; 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=/E8WljXb+dDaNTYEUBfTBEFw2aj3lZYVZ/YWdMp3Hys=; b=aOQIPIA3/j8h21Ygc32/LUW7233rj8qG958L2TMzJSn8UmjdCmpg9EogX9e82wS1o5 yqwOC3tXgHTmfBOkdyLnShmr1SYveL60bhI+WgNgPuY2MWf45zhqEDmbeIw8F4D5pV7Q +CWF1pQ+97FkXLA81yi9mQe0PCFhKCjVHkNusfDoK1olg94qOzw1rESPIS4safnWUsGu hICRawQ/vwxc8CkKF7aLIg+VeXmL2qAh6U7p+2WGsgRUBPI/H+vFU6PHetBNbJxN2+PZ NdTRkADJHufZnq5rSRb5u3ECBY3eutcX4PxdJwgoZYq+nazY6y49eB2Ky27gt16pjjqO wzeg== X-Gm-Message-State: AOJu0Yy6Ys3W/x4gXImr37qRlYF3maLtXH6JPsfffq6GcnjhWZstQtab BgdAbykONtDn/s8H75XBfai14dmvSx7B8X0+BvI= X-Received: by 2002:adf:f084:0:b0:314:a3f:9c08 with SMTP id n4-20020adff084000000b003140a3f9c08mr1466397wro.39.1696410428108; Wed, 04 Oct 2023 02:07:08 -0700 (PDT) Received: from m1x-phil.lan (5ep85-h01-176-173-163-52.dslam.bbox.fr. [176.173.163.52]) by smtp.gmail.com with ESMTPSA id k13-20020a5d628d000000b0031f34a395e7sm3505666wru.45.2023.10.04.02.07.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Oct 2023 02:07:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, Thomas Huth , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH 06/13] accel: Rename accel_softmmu* -> accel_system* Date: Wed, 4 Oct 2023 11:06:21 +0200 Message-ID: <20231004090629.37473-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004090629.37473-1-philmd@linaro.org> References: <20231004090629.37473-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 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é --- accel/{accel-softmmu.h => accel-system.h} | 6 +++--- accel/accel-common.c | 2 +- accel/{accel-softmmu.c => accel-system.c} | 6 +++--- accel/meson.build | 2 +- accel/stubs/meson.build | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) rename accel/{accel-softmmu.h => accel-system.h} (77%) rename accel/{accel-softmmu.c => accel-system.c} (96%) 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 5e192f1882..d41c62f21b 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/accel-common.c b/accel/accel-common.c index df72cc989a..965318daa3 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 9c804ba9e3..fa8f43757c 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/meson.build b/accel/meson.build index 638a9a03ba..3376810921 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 6b0f200efe..91a2d21925 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)