From patchwork Thu Aug 31 12:56:04 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: 718983 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp455598wrn; Thu, 31 Aug 2023 06:01:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHncU1lB3rDK7WAVqmJtWW/jW/GqbjbgMWbC1ffybIs3raOdQecPX58bpG9dYD6zmbTKN4A X-Received: by 2002:a05:6214:21ce:b0:64f:72cc:4bca with SMTP id d14-20020a05621421ce00b0064f72cc4bcamr4121807qvh.47.1693486905677; Thu, 31 Aug 2023 06:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693486905; cv=none; d=google.com; s=arc-20160816; b=HTdx8b/D03eIdfJ9E0CPP802r2MSHeKhF8bqfioDKj32HXNJ4gBTrUnEgeJOZRcfXB wHBr5SET1XyARjtx1B30PhNGzUDJaw2WYBJBsuiD8O2pmMKnSw+JPVvJnczkmlwibYRO 4ykcHRRH9vVnmQLhJyUT7z0kvytZOzLBXUBVOcp8jvGnpQ+uRM6ZGeoJ8C6nOWfkzAzq XJ63sOSGCxq00lOHghJ8gAktSgABAphkcGqqZtHl+LbJkguSLz76lcdwbmO8W/uFUuIa 5MaTd8P2GjLwN965tFcGI7tuEwlSc6di5LxSv8jjPcl9bYbjrcdN8dmJz6hs/h7bEHtN nXmw== 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=uyAFkv08soXTPpT+cRfZCYJSEeJIQENRamQ8RwwrU9I=; fh=Hk+asnoAIE/cJ1B7Fk+B6dLh/nhza2YRAoue5tchXI0=; b=iduHBVkY9rfAq4xm+FpZFml8sBP1Fbr5buMhjMyDWCnc7t1sg/rDfnowHRkjJrmyLt z8Nycl+0wVExqkcl2zcki3sdIANXZVJNmbUujlF1QgcSyjjzYeW6/hvGQK/cOXd/VfuI tHIHw2HdWKHG4TgJOfVn+16jvMWSnHU4vitMT2GEJ5cP53MvZcLK7ySUscCaUltt/+fh eB1ZHoYfpLUmgif98TpNzOU/ueOeQKfDHxdOYfy7aSddEdRua72Uw9h+M/+mpXWQziNU o8jdg5Yk9QILnhan6Cs9UPvXFxOn7Xf1xGBrYTX+yG/Bz+5oExXODZGf4Ra9yGGJOAdX pW6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rAysmBZd; 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 k4-20020a0cf284000000b0064f518dac87si813498qvl.319.2023.08.31.06.01.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:01:45 -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=rAysmBZd; 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 1qbhEi-0002TI-Dr; Thu, 31 Aug 2023 08:57:24 -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 1qbhEW-0002KG-6A for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:12 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhEM-00056R-OE for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:11 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-31dca134c83so607568f8f.3 for ; Thu, 31 Aug 2023 05:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486621; x=1694091421; 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=uyAFkv08soXTPpT+cRfZCYJSEeJIQENRamQ8RwwrU9I=; b=rAysmBZdVavMJmO3SDObVitmXhOMr5spuDx5NdFePMcSfZ2ENKdde+1dxsEfnfrwNu xN0lR14Sol5DxBvGret5TKFwx/iDOFuux/TZpxUo8WeLH8J/kygBjx18KM6lz4GIsQlN uAIEpLVMBfo9JjiegY0zk36fZrgio5lfp6iGRkvMvveKsa8KfSG8yHI2+orKV3EbV7KD cG67KBlWVsYPcLLdEMt1lQfTl4QYQehLfj6m+cUBFIjJGXFUqksUZ9tzulmPK5Ric/9s C1ITa/o/Safxb36MUOSDs22jHwrPyW+NCEEkizW40PcZkNwLy3Q80yw/C8HAbn84SaiV 1S3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486621; x=1694091421; 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=uyAFkv08soXTPpT+cRfZCYJSEeJIQENRamQ8RwwrU9I=; b=QYZoevAe0SNJIgiTpZlqsKZxqcc9Io1oqrMEo179RKHEWOnOwmaWEj0iQfSHM/xr/G S1Repq1P5g2//JHDPPyGl7S7NMnX6AOTRRStMmmszLsus9DpCLVirgF0U/HxMNv7MHVD TKvzGzcbjQDizYIDw1bHnEcQ+G6svKa0BINKEYYSnYegt3m7qUdaVM5sTMpW1KCEnM2P iiuNVDLFtjrddpxyvslOGdJjypMxr7FiqBJAoDUGoGnyXhxcUYO3G1DIA8OvHiSeZik9 zFenPDwvV5nL5obPBtkRkjnuoQHEd4KHrFqOhjZBaFuIKuULjrPyap+HHNixtYUpHB8c 3LnQ== X-Gm-Message-State: AOJu0YyUOlYM+0+frh4MXV0l4NLwpoO8iJJbL2f9aCzeghltGYapg+F1 pRcWD0DvmCGbpjzSO5cOTcGHRremO/auO+O1kF4= X-Received: by 2002:a5d:40cf:0:b0:314:1b4d:bb27 with SMTP id b15-20020a5d40cf000000b003141b4dbb27mr4035422wrq.64.1693486620800; Thu, 31 Aug 2023 05:57:00 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id s16-20020adfecd0000000b0030ada01ca78sm2172105wro.10.2023.08.31.05.56.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Alexandre Iooss , Mahmoud Mandour , Riku Voipio , Laurent Vivier , Peter Xu , David Hildenbrand Subject: [PULL 02/41] accel/tcg: spelling fixes Date: Thu, 31 Aug 2023 14:56:04 +0200 Message-ID: <20230831125646.67855-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Message-ID: <20230823065335.1919380-18-mjt@tls.msk.ru> Reviewed-by: Alex Bennée Message-ID: <20230823065335.1919380-19-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/core/tcg-cpu-ops.h | 2 +- include/tcg/helper-info.h | 2 +- include/tcg/tcg.h | 4 ++-- include/user/safe-syscall.h | 2 +- accel/tcg/tb-maint.c | 2 +- contrib/plugins/cache.c | 2 +- contrib/plugins/lockstep.c | 2 +- linux-user/flatload.c | 2 +- linux-user/syscall.c | 4 ++-- semihosting/config.c | 2 +- semihosting/syscalls.c | 4 ++-- softmmu/icount.c | 2 +- softmmu/ioport.c | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 3e8b1b737a..479713a36e 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -14,7 +14,7 @@ struct TCGCPUOps { /** - * @initialize: Initalize TCG state + * @initialize: Initialize TCG state * * Called when the first CPU is realized. */ diff --git a/include/tcg/helper-info.h b/include/tcg/helper-info.h index 4b6c9b43e8..7c27d6164a 100644 --- a/include/tcg/helper-info.h +++ b/include/tcg/helper-info.h @@ -1,5 +1,5 @@ /* - * TCG Helper Infomation Structure + * TCG Helper Information Structure * * Copyright (c) 2023 Linaro Ltd * diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 61d7c81b44..c9c6d770d0 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -879,7 +879,7 @@ enum { /* Instruction operands are 64-bits (otherwise 32-bits). */ TCG_OPF_64BIT = 0x10, /* Instruction is optional and not implemented by the host, or insn - is generic and should not be implemened by the host. */ + is generic and should not be implemented by the host. */ TCG_OPF_NOT_PRESENT = 0x20, /* Instruction operands are vectors. */ TCG_OPF_VECTOR = 0x40, @@ -1123,7 +1123,7 @@ static inline int tcg_can_emit_vec_op(TCGOpcode o, TCGType t, unsigned ve) /* Expand the tuple (opc, type, vece) on the given arguments. */ void tcg_expand_vec_op(TCGOpcode, TCGType, unsigned, TCGArg, ...); -/* Replicate a constant C accoring to the log2 of the element size. */ +/* Replicate a constant C according to the log2 of the element size. */ uint64_t dup_const(unsigned vece, uint64_t c); #define dup_const(VECE, C) \ diff --git a/include/user/safe-syscall.h b/include/user/safe-syscall.h index ddceef12e2..195cedac04 100644 --- a/include/user/safe-syscall.h +++ b/include/user/safe-syscall.h @@ -91,7 +91,7 @@ * * The basic setup is that we make the host syscall via a known * section of host native assembly. If a signal occurs, our signal - * handler checks the interrupted host PC against the addresse of that + * handler checks the interrupted host PC against the address of that * known section. If the PC is before or at the address of the syscall * instruction then we change the PC to point at a "return * -QEMU_ERESTARTSYS" code path instead, and then exit the signal handler diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index c406b2f7b7..32ae8af61c 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -1,5 +1,5 @@ /* - * Translation Block Maintaince + * Translation Block Maintenance * * Copyright (c) 2003 Fabrice Bellard * diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index 5036213f1b..dea4a56c8d 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -350,7 +350,7 @@ static int in_cache(Cache *cache, uint64_t addr) * @cache: The cache under simulation * @addr: The address of the requested memory location * - * Returns true if the requsted data is hit in the cache and false when missed. + * Returns true if the requested data is hit in the cache and false when missed. * The cache is updated on miss for the next access. */ static bool access_cache(Cache *cache, uint64_t addr) diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index 3614c3564c..850f7b2941 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -108,7 +108,7 @@ static void report_divergance(ExecState *us, ExecState *them) /* * If we have diverged before did we get back on track or are we - * totally loosing it? + * totally losing it? */ if (divergence_log) { DivergeState *last = (DivergeState *) divergence_log->data; diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 8f5e9f489b..4331a11bf0 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -780,7 +780,7 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) /* Enforce final stack alignment of 16 bytes. This is sufficient for all current targets, and excess alignment is harmless. */ stack_len = bprm->envc + bprm->argc + 2; - stack_len += flat_argvp_envp_on_stack() ? 2 : 0; /* arvg, argp */ + stack_len += flat_argvp_envp_on_stack() ? 2 : 0; /* argv, argp */ stack_len += 1; /* argc */ stack_len *= sizeof(abi_ulong); sp -= (sp - stack_len) & 15; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9353268cc1..7ccd3affbe 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1809,7 +1809,7 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, uint32_t *dst = (uint32_t *)data; memcpy(dst, target_data, len); - /* fix endianess of first 32-bit word */ + /* fix endianness of first 32-bit word */ if (len >= sizeof(uint32_t)) { *dst = tswap32(*dst); } @@ -2920,7 +2920,7 @@ get_timeout: unlock_user(results, optval_addr, 0); return ret; } - /* swap host endianess to target endianess. */ + /* swap host endianness to target endianness. */ for (i = 0; i < (len / sizeof(uint32_t)); i++) { results[i] = tswap32(results[i]); } diff --git a/semihosting/config.c b/semihosting/config.c index 89a1759687..8ca569735d 100644 --- a/semihosting/config.c +++ b/semihosting/config.c @@ -8,7 +8,7 @@ * targets that support it. Architecture specific handling is handled * in target/HW/HW-semi.c * - * Semihosting is sightly strange in that it is also supported by some + * Semihosting is slightly strange in that it is also supported by some * linux-user targets. However in that use case no configuration of * the outputs and command lines is supported. * diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index 68899ebb1c..d27574a1e2 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -720,7 +720,7 @@ void semihost_sys_read_gf(CPUState *cs, gdb_syscall_complete_cb complete, GuestFD *gf, target_ulong buf, target_ulong len) { /* - * Bound length for 64-bit guests on 32-bit hosts, not overlowing ssize_t. + * Bound length for 64-bit guests on 32-bit hosts, not overflowing ssize_t. * Note the Linux kernel does this with MAX_RW_COUNT, so it's not a bad * idea to do this unconditionally. */ @@ -761,7 +761,7 @@ void semihost_sys_write_gf(CPUState *cs, gdb_syscall_complete_cb complete, GuestFD *gf, target_ulong buf, target_ulong len) { /* - * Bound length for 64-bit guests on 32-bit hosts, not overlowing ssize_t. + * Bound length for 64-bit guests on 32-bit hosts, not overflowing ssize_t. * Note the Linux kernel does this with MAX_RW_COUNT, so it's not a bad * idea to do this unconditionally. */ diff --git a/softmmu/icount.c b/softmmu/icount.c index a5cef9c60a..144e24829c 100644 --- a/softmmu/icount.c +++ b/softmmu/icount.c @@ -325,7 +325,7 @@ void icount_start_warp_timer(void) * vCPU is sleeping and warp can't be started. * It is probably a race condition: notification sent * to vCPU was processed in advance and vCPU went to sleep. - * Therefore we have to wake it up for doing someting. + * Therefore we have to wake it up for doing something. */ if (replay_has_event()) { qemu_clock_notify(QEMU_CLOCK_VIRTUAL); diff --git a/softmmu/ioport.c b/softmmu/ioport.c index b66e0a5a8e..1824aa808c 100644 --- a/softmmu/ioport.c +++ b/softmmu/ioport.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ /* - * splitted out ioport related stuffs from vl.c. + * split out ioport related stuffs from vl.c. */ #include "qemu/osdep.h" From patchwork Thu Aug 31 12:56:05 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: 718981 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp454987wrn; Thu, 31 Aug 2023 06:01:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3jfJ2gwt7DJaRzIUbzMJWIuElwLY4D1U8HfTZaMmWjjL24s4jkSqvejAvJCW8FK9PSzAh X-Received: by 2002:a05:6358:9989:b0:129:d05d:691e with SMTP id j9-20020a056358998900b00129d05d691emr6573691rwb.19.1693486862556; Thu, 31 Aug 2023 06:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693486862; cv=none; d=google.com; s=arc-20160816; b=CRhDK/5acf7gaTN2QICTXqN5IProLO9+rl/m5KvJ4AZ5IVy0I7XwzgRWv3KzFmXc4Q fQZWCr4sPLOW0TWkvk+VMbopP2TI8/VovYeEypSy8CIGjx0HGWLhwiByD0Rn1XMsQVlO NfEKP5LtjF69Jx/pOziXBSldqU0PjSKyvq8e1HUopaMgaIPfxfi5yI7Nte65kxW+cjXf JuuA5IcQ+Mk5L5thlEOkskVeNcItHE4CX/piBX+pPTQh8iQalC+1osQgMfADLd2hNQXj sw6APw+/xyDTs7rapH0KCV5tiURZT2O5FPk7UbOnO/I/99XKI3ZcpHTrrPwc2a7wWn1o 3/gQ== 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=aVa0NtnHK7rvI035uHhcp5vIA6pkk4dL+deBSQt+atY=; fh=8HLhek0fCRY9CNhIbsrpPv2KS3B438mEPZtUlmXQ5xA=; b=Aftc2DfWYV+BxZcWXigvkXQWstH8kLnhSVdYFTXdWGpKCdhL4+LJsUxGJUR6TIschz cZt8/KPdItzWk6e4+wPuCtLJmvtV6nDpgYwa1vy4ol1A+orYtwCX6cPvzQvIZNwIqfQY JjMfJDf09WYTdL42t28jqX7+m8ktNMOBNeG+EsDEZZNDPOVRi1ItQpu+wbagCnKTlY0k nJKTWr7le/dNOWK1kHWVlSwBWie+pFgtv5/aCei9jLQiBLGJrAv4xGHzvh53whcZqe3K gcqUZvaOs6Vz9/vUEzWAgKRaAaB2TP2xtaqpAXJjyl4f3Df8GJSMVWPyQ19OBeWGEaAg vGUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EDSohC7P; 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 h2-20020a05620a400200b0076cc34b44c1si953679qko.292.2023.08.31.06.01.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:01:02 -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=EDSohC7P; 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 1qbhEo-0002eg-2h; Thu, 31 Aug 2023 08:57:30 -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 1qbhEW-0002KR-Gq for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:13 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhET-00058H-6a for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:12 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40078c4855fso7014915e9.3 for ; Thu, 31 Aug 2023 05:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486626; x=1694091426; 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=aVa0NtnHK7rvI035uHhcp5vIA6pkk4dL+deBSQt+atY=; b=EDSohC7PA2zAbK5akzAukNSivCLGisvbINZHctfF65M0Qk3TJcnrEnXb8FYg7fnZhY DZKdy1fSsAA5V/ogs0nkmmfnCf/jarlJUhutRBNkaksVnMEdCtIrlRJmoeSwdUOpkwqs lpNl9w7dgDfiMLVPeMw7QbP+aOBilH/ZdTD4FG1n3P+UQI8ZyrkIfJU5dr8tcWKsjMYs pojw03rwh6OKTOOLiP81rgF2YpwZ8ZVUPfoD/C55uRa496WOKFYieihZMTDni4MEfUb1 HnobqqGn5s76K6cgqnNd6/ESV7BmsMteofWEHMBqeumh3xqz7a8dK7ceYGx9dH0GAfmm vohA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486626; x=1694091426; 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=aVa0NtnHK7rvI035uHhcp5vIA6pkk4dL+deBSQt+atY=; b=RRM2uW8I/S1b/NokQZHb4GbH4KS33KqUgeYy1gM63q6JoMl/rysIjcwbRz8frCSghA TjxaYtJFdw7SAW84jJuQWZQmB6VJJUgqchgqYhZp1X8+9aKRkGUvu3hvxuQ4Zd9WWo7X DAFhteHrpkMyBj5Y2k7ckkOvfrXmWQHVXFTRIJTXvAd1cNfJ9LTJ6NKI/OkNK5SCUa+Y JomVfxhZftTSCYqA0xO/wfR07/y7WLoJo53yOmrfQ8HjmqvLl8Aq8UA/L/u+t8P4okmo QOflpll88Q7biRwVHL8fOApaj2yicOnlN1pbcZie/JWmA2F54UCPSpfJQpotSqHMAh3W m55w== X-Gm-Message-State: AOJu0YwCPsnYfLbVuopC4EzxqyaO37zBnCUE4gvFgrBIYek1ryz47Jk0 ArRB8GEdZpgtxGqQ573Tz4HSU5y74wlMmDRQFWw= X-Received: by 2002:a5d:6150:0:b0:319:6d3c:c5e5 with SMTP id y16-20020a5d6150000000b003196d3cc5e5mr3909177wrt.58.1693486626202; Thu, 31 Aug 2023 05:57:06 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c299000b00400268671c6sm1911549wmd.13.2023.08.31.05.57.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Peter Maydell Subject: [PULL 03/41] qemu/uri: Use QueryParams type definition Date: Thu, 31 Aug 2023 14:56:05 +0200 Message-ID: <20230831125646.67855-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 Follow QEMU CODING_STYLE, use the type definition, making that prototype match the following two. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Message-Id: <20230605175647.88395-4-philmd@linaro.org> --- include/qemu/uri.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/uri.h b/include/qemu/uri.h index b43f35a6a6..2875c51417 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -96,7 +96,7 @@ typedef struct QueryParams { QueryParam *p; /* array of parameters */ } QueryParams; -struct QueryParams *query_params_new (int init_alloc); +QueryParams *query_params_new (int init_alloc); extern QueryParams *query_params_parse (const char *query); extern void query_params_free (QueryParams *ps); From patchwork Thu Aug 31 12:56:07 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: 718978 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp453772wrn; Thu, 31 Aug 2023 05:58:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHA3xvVBeuft1BJF082kMpOzjXDWjDrFAOxyyPSfwDKxOMILJYPwI052wvYk+l49yStToMm X-Received: by 2002:a05:620a:34f:b0:767:dd02:e908 with SMTP id t15-20020a05620a034f00b00767dd02e908mr2015170qkm.64.1693486738123; Thu, 31 Aug 2023 05:58:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693486738; cv=none; d=google.com; s=arc-20160816; b=c9ip3soztN7kb+XbGCG9qlmwYA+PdooMA72hZQOvgs+HF75DZOKlYdwXuIt4dQ6/gf 5LoF44wvYwbqOJ+yZ8fvtNI5Qyz388e1qJekmA//pp2T4JqRfJ3SIG/E8TKx1skk0aRl x/BVorKv39KgYVgfzNw3QCqnNNKupVunmHwrkfy/SuYeH62irb1iO4J15quPeqjo+yYU s85ptWhx9SV0QV4urcmgbJsenqXnPf1XnkWhqfXtLMZLQ+SaC5ONWyrQxS7kXqY4VQ44 +xnEp4cbtTBvt2Sn6jnImEzSXRj1aweIIhasuf2RHDaChCgU3UCe9qrp5U8B/8CffyR1 2L7w== 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=XdOtrub1S9PyK3Of9msYB/6KGqYXgpPYDD/KQybr13o=; fh=UEYgv4rifacS13S/IeLIl7IT/RAP0upDkvEvPrlMReE=; b=XMDIwQv2wsD/IWAnUVK6a5v+u8TPOfz4FbkJI+4yBXaa46nYpH/NA/9V9zVeyCmhJ8 ygiGGHyc9ORDRD/65j2fMziYPUpe7LgU/Z99YC58ZC3C3mda4EB1UmZ2cf35Wal+LIK9 uI5CcAurNebvNJof1SfJpLcMoOgB5jOj8i6Q8ceiK9qo3OBZYXqlrh8Aflkhv+9mUVtH zT84Zctm/gEM4/B1nOiuhqCVPNjCVby9qHyqSpHdYleDMPKFePJ4G4e/j8LkorRvupNd wIgO4UKp6dNn0E81HfwiNCnmAC+Jevv0hA/BkvG3X1mc9PFGfNVC+GjtoNUt9pyzPdLk YaDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aMhBDJp2; 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 t14-20020a05620a450e00b00767fb4a3ff0si928231qkp.532.2023.08.31.05.58.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 05:58:58 -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=aMhBDJp2; 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 1qbhF8-0002tI-UR; Thu, 31 Aug 2023 08:57:54 -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 1qbhEo-0002ef-1s for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:30 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhEg-0005CE-PT for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:29 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fbd33a57b6so6960775e9.2 for ; Thu, 31 Aug 2023 05:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486639; x=1694091439; 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=XdOtrub1S9PyK3Of9msYB/6KGqYXgpPYDD/KQybr13o=; b=aMhBDJp2m1IsfWWNidkZRakyhpS0YH5OC36yEBaEA+F7V8+YPTe0YaDey/LKO+n/Sp 1PuX4AG++droWT+ElFFWh8S4EiZuCjNFHxkf10KWLxjqYFtvkdWvUxCy/TxFF672loaU AD9kCUZy+uQlv+YlE0uvp70ZgEXmcjNiu+nqcJT9EhAGA2jq9YUGrTsMTqvcOlmm+Ne5 Fz9/tgH3exrDUGc6038YRDpwAy+YC4KJRiXjUFBBCMXmjjiVonsC6GG8Z9eB2JTY3HaG utHmGsOm7JZWX0cmTo0CoT/9BT4C+xae7Q7ngxzSJNJM6bKt0WMIb/up912jz4J/5SDW ng1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486639; x=1694091439; 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=XdOtrub1S9PyK3Of9msYB/6KGqYXgpPYDD/KQybr13o=; b=RD2hu2g/JU/HPWdlMONSuEBYH6oBvMe7Chv/Xgjs1YXkn8Dr4A0pNJAvUZ6zgiEuy4 /joGvsJirztDDkVid+ue32jhbz0/UzMsWylBhJnx/nXJwQfS5NxDzvuuuCviRzdqjR5Q +s2gYmtg8veT5gr6IwsxA5uweJWTflVLXYGChvcfaxtO3nieAFgVwH0qqo1nHDDYd2jA 3ekd0qw4POdKyaJFjy/PdBVfvpR2UQRsgI7adgvBYQTrtkslPGpdgztdMyLkQinCIr/w rDA5PnRe0sE4FZPUsvNneeccfCiFmx9FZpRsOVz4C1PXFKVW/1xdin0iRMcRCnc+uN51 avIw== X-Gm-Message-State: AOJu0YwwzXgOM8Qy8cTk7JqE210YLuHn9tJLEbJZa1z/zi64VNl6XmtN I8QX1jMod2UXc8xqGymg6fQwwq7NJin8qfimmjg= X-Received: by 2002:adf:dc8b:0:b0:31a:dd55:e69c with SMTP id r11-20020adfdc8b000000b0031add55e69cmr4260280wrj.60.1693486638982; Thu, 31 Aug 2023 05:57:18 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id e5-20020a5d5945000000b003197a4b0f68sm2186305wri.7.2023.08.31.05.57.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Helge Deller , Jason Wang Subject: [PULL 05/41] hw/net/i82596: Include missing 'exec/address-spaces.h' header Date: Thu, 31 Aug 2023 14:56:07 +0200 Message-ID: <20230831125646.67855-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 hw/net/i82596.c access the global 'address_space_memory' calling the ld/st_phys() API. address_space_memory is declared in "exec/address-spaces.h". Currently this header is indirectly pulled in via another header. Explicitly include it to avoid when refactoring unrelated headers: hw/net/i82596.c:91:23: error: use of undeclared identifier 'address_space_memory'; did you mean 'address_space_destroy'? return ldub_phys(&address_space_memory, addr); ^~~~~~~~~~~~~~~~~~~~ address_space_destroy Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230619074153.44268-2-philmd@linaro.org> --- hw/net/i82596.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/net/i82596.c b/hw/net/i82596.c index ab26f8bea1..6defa9d3a1 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -15,6 +15,7 @@ #include "hw/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "exec/address-spaces.h" #include "qemu/module.h" #include "trace.h" #include "i82596.h" From patchwork Thu Aug 31 12:56:08 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: 718984 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp456793wrn; Thu, 31 Aug 2023 06:03:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFsyeRKJyVj0u+1jzPEY1m/OLHQdDxL3BxcEFjEoQCgMDwrzqF6oKyjeOyBHE34psp9aVPa X-Received: by 2002:a05:622a:1a0e:b0:410:20b8:967e with SMTP id f14-20020a05622a1a0e00b0041020b8967emr3322989qtb.12.1693486995163; Thu, 31 Aug 2023 06:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693486995; cv=none; d=google.com; s=arc-20160816; b=JJOUVhXbn3SKIoJkARJS9y1kszUSpnfmKf9dN0ww7RSh2ZZ2RbMJmPG54RI5FLPJN6 cBGBQ4FqSW+krBr2QXK601JgGGOXRD4plfKWC40MSPooE1+lvY+BZJMjQrsWwGbdsNnt ixgOc0BkcEjCrtsg9046/SbpcO/yYhGlNbvERW/by0eb6Y/+mVXJr02rea3lG0W6dhfs D4GFOF3RaIWTTlAanpTOU9XjgDxewmpl+hPiqUYh5dv/QVZjVzDgC42INNnT7bJVkvhw dCFUhEfxmv/aQct/QuouA9Tcru+qGDcGggLZwt95eDq2IQ1e4sMhpzwjYOTVR3apxbqu 0dmg== 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=bNsqCjIrn7zPEbmcPc2JoOkFxTFsvtPHpgJNrPfRe3k=; fh=SRheZk8w8qaz272zt1Ue91fPcaDByZWGdyOzwrBfBOk=; b=F2Cv7+G3+DfVlpittx2qrxwVo0RdRsNHTQEwbd18mzKqXayN1aoVbeUx0i51Ix4Yo2 G4owlscY0ogURpe+sI9I6Zyv5yiPbu8xvnS/UL5cnP2V3RQuUVtNKsRzs/TXuoU1y4eb Ztwvkh1Esvizm/GlvqSPOgKtwClaVoL+CeQngWZm3pHgQgEiPeGZgey3wHqkkZaRvEoD EaJI6TnyBhOcnEn982FudnfQljN+40NWstrjCsxRUN/5FlQo+kyxwESvo6no79HUPxep ztg79YrtAA8M+w8UL9jtY3NCWh/iwJVN0PnOETf4iH4wG/A4FZ2RHR2MqIhwXdaaGDsx fqvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dy2Oa8eU; 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 i9-20020ac85c09000000b00403cecf35bfsi838364qti.297.2023.08.31.06.03.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:03: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=@linaro.org header.s=google header.b=Dy2Oa8eU; 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 1qbhHL-00052A-Kw; Thu, 31 Aug 2023 09:00:07 -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 1qbhEr-0002lA-90 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:34 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhEj-0005E5-UH for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:33 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-401b5516104so7023545e9.2 for ; Thu, 31 Aug 2023 05:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486644; x=1694091444; 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=bNsqCjIrn7zPEbmcPc2JoOkFxTFsvtPHpgJNrPfRe3k=; b=Dy2Oa8eUvBjrN+Piny9LuZZhv32bc7Pj6pUUp0rhZWO3ZSKp28fzJdyvxh16mvaWFQ olI5o134o2gavn3ocyvuFWordWMIKkYfMzaAPz4lI2XxkH5GXdPe9lnjrN2hVxHLJz23 Mz+25Ksl2qAiJUMSoBibg1AjA+5oMLlKS3Cy0BA4VByJOmnPNqEgPjSuXywvyAp2Pgv0 SYfPgwyymGV7vNHJhDEA5HTfV2gPOoRMfvE8TarEhJLW91a+LLr5FrAgW7O/xeRd18sO 82J0lW2/63Qmlr7n9tkd9Vv+bODoJojUiNi/iTYghbt557sAobdbiKbOz36zpq0Xl5lr 4Edg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486644; x=1694091444; 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=bNsqCjIrn7zPEbmcPc2JoOkFxTFsvtPHpgJNrPfRe3k=; b=TkJJeLVri5P2wbDTKYSRQJSrNcf+yVcKr691na2pt8Na2r7E5mWdjex7SVoZiFuEKS /X8e+lDnFoTFjactzZSeGXQ60O+72xTJhllrBJyZmW/49tcZxYFZvMvE8WA/7unw1S3w 7I+joZN5IMh5C2V6Roo+7Ek/lVNPtP7B4mG1e8Vjm4QKoOpuFHCaaQGHjgoRD0D6Db95 jFgKcBh4ZBdmvQqhWaRwkgFsiO0T0BhOVYe32lNkKnQa0LLMokmSerZRheNhzvWq2dEM SbWKjnOUOZJ3Wj34qfBzIlkp4tJRaxAJ30oTk98AIZRKCsLSDRpgxm9trHqqjC0ffUvM 5tNQ== X-Gm-Message-State: AOJu0Ywpw+hepTE7CsJt0/SHM92DvFpRVqZqlmMHPyKJ/O0DthAhlXuH F8L2+4OJDI0LuAbGxs/CZXOUa+sGDvJ1iGygEOg= X-Received: by 2002:a1c:4b14:0:b0:401:dc7c:2488 with SMTP id y20-20020a1c4b14000000b00401dc7c2488mr3945207wma.11.1693486644318; Thu, 31 Aug 2023 05:57:24 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id f9-20020a7bcd09000000b003fe0a0e03fcsm5059538wmj.12.2023.08.31.05.57.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" Subject: [PULL 06/41] hw/dma/etraxfs: Include missing 'exec/memory.h' header Date: Thu, 31 Aug 2023 14:56:08 +0200 Message-ID: <20230831125646.67855-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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 The 'fs_dma_ctrl' structure has a MemoryRegion 'mmio' field which is initialized in etraxfs_dmac_init() calling memory_region_init_io() and memory_region_add_subregion(). These functions are declared in "exec/memory.h", along with the MemoryRegion structure. Include the missing header. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230619074153.44268-3-philmd@linaro.org> --- hw/dma/etraxfs_dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index a1068b19ea..9c0003de51 100644 --- a/hw/dma/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.c @@ -28,6 +28,7 @@ #include "qemu/main-loop.h" #include "sysemu/runstate.h" #include "exec/address-spaces.h" +#include "exec/memory.h" #include "hw/cris/etraxfs_dma.h" From patchwork Thu Aug 31 12:56:09 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: 719001 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462864wrn; Thu, 31 Aug 2023 06:11:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkf6QqsyC6Fu7qChqVyw1jpz7reKmgr2o1ImuW5z7UoFUmWEaV76c886HsDs5f8yAtxXT6 X-Received: by 2002:a0c:aad7:0:b0:64f:9108:e368 with SMTP id g23-20020a0caad7000000b0064f9108e368mr2124324qvb.30.1693487504606; Thu, 31 Aug 2023 06:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487504; cv=none; d=google.com; s=arc-20160816; b=uuKD4uesDajmTiMUR55mk5ORBk93nkt73YP2aV1aBq9+3LiC34w1UR4bJrQtsZgfOh lHflkbwjwziLrJEnqUQSaVuZIHYv1LMJFBHsu8FrlLfrQBVnoJZ30ZOwmHiRLRZO6isZ cUrkYaUTmqv9iggOpdSgqeMe14WjbvEXNNM2ePsLDs3DS//re/Kvc5i5vCJIquXB52aC YQ3cVF9nxaARqVYpWafgJIzjIfLkaqgEOVMPSAEHH8f8OMMlfDVV1n05Nou43yvomIa6 qVeSmXzrWs3uRDRQ2Yy40TatxdInSM3BjSQjlfA11szhypKivLhow+3QhSdknduFf/FI uApA== 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=d7qIBX23XIKc4/u+ga9LSmsROxltOGYIHLrY8CEfGsM=; fh=ehJgi6qtc5GgGFSi7kUe5Uk36tkdtVlia04EiCfbU/Y=; b=rcOHj+SH0OMizNN/t4kY8SiZnSJFCBo4+Yg4Y3TZmlloHctBnz6b7XuH/QKjOTt/V3 CeqvbjZvMlOHPN2YH1zz7JSvZdvVstZ8vz7jBBGogOPP/V4djjl61eyrCCWab0CyLf9y w7onDP91n6brrKWVrR6rz2404Wh6BTrVB+4hHGE5ox3C1YbIjc4Sx49Ig4jcjpzHh1ST M9ydbTTk1S1DCDx2cCu4qm+QSiuhGI1BGetFVeuI0KPbEV6ysg5ra/GUNE3sGwixDZDJ YMXPKSPtKbeTJr+vLGygDRA0NcHe/v31yf3Gt6rEL8gcQsvzCHr59CKJa0/rEvXkOMfJ ZPVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nrrWo0pB; 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 fh1-20020a0562141a0100b0063608a0b0f0si825295qvb.576.2023.08.31.06.11.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:44 -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=nrrWo0pB; 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 1qbhI1-0008C8-W6; Thu, 31 Aug 2023 09:00:50 -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 1qbhEy-0002pf-5x for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:41 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhEp-0005Gq-Ay for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:37 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-31aeedbb264so649920f8f.0 for ; Thu, 31 Aug 2023 05:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486649; x=1694091449; 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=d7qIBX23XIKc4/u+ga9LSmsROxltOGYIHLrY8CEfGsM=; b=nrrWo0pBWhQCoFWyLzBG3zpDc7PkECubeXFH2LUv/r8XvZhKno6x7TWRhp6KCAWrDg 7imyMlNCc3X+V1GtGOPlO8oPqtY0Lnk+2ReKAfUimFmqLfb77xAIStpWhrlq7VsYGYEn uJyMBeeUfNgWfhwMRlZKlPbyQZUHJgW2mT50vXi68LMJfWy/5J2tJDiOsKV5U7pfTcrN YqQnnKLUuFh+PVTtZx+N3XEhj0HtN6pol8HRo6IgKzAnJTjFSZBLQtXmslMZgcrkOPDp 6fWwFOci4CDQzRj3i7l72ClL9a2HHF0hemUnzsiN5vdi5lRtyiX58yMzXdcVSANJRI12 zYjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486649; x=1694091449; 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=d7qIBX23XIKc4/u+ga9LSmsROxltOGYIHLrY8CEfGsM=; b=WYyVdB7sPAgjp7oFmHSqbB0gUbRcP1yTmEGuqSmolUcXQ7hwjgy2QsMazLM7+QoVI/ iZfc6SmIBUcfhKiFYRq+GHLY+APWelZ7G44k5Ztan5kHn4GdydEr5nhv2AfYjZ+VscpD DgEaK66WeBOkoD/p8Ferecyq0r5JnTZWaqmEqpQk4f/OAnpYpmgLJ8q0+V5k60ScoJ6K rmp4RDxvjRCX440tiJEKppGo21GpwF6Csbgf1a4uCxCyVrMVOWXyxxuZSEmDhbnB3gIa 6qtyr+MrExoiPd5CD/Qqiwtl3mOw7lMG0s9EP2VCUAWZ3artjqgCuaTOi35AlYYcyN0h NTQw== X-Gm-Message-State: AOJu0Yzyj9LFFwRNaa+rxZ2WYM+6m6II9Df4Q80Bpfjok2dENDSPYSli vyFSEQkbUmHK6BvmaG1f278fA0LIqHrLDNgbSCA= X-Received: by 2002:adf:e788:0:b0:31a:d6cb:7f95 with SMTP id n8-20020adfe788000000b0031ad6cb7f95mr3957781wrm.18.1693486649554; Thu, 31 Aug 2023 05:57:29 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id i5-20020adfefc5000000b0031759e6b43fsm2175456wrp.39.2023.08.31.05.57.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson Subject: [PULL 07/41] exec/address-spaces.h: Remove unuseful 'exec/memory.h' include Date: Thu, 31 Aug 2023 14:56:09 +0200 Message-ID: <20230831125646.67855-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 "exec/address-spaces.h" declares get_system_io() and get_system_memory(), both returning a MemoryRegion pointer. MemoryRegion is forward declared in "qemu/typedefs.h", so we don't need any declaration from "exec/memory.h" here. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230619074153.44268-4-philmd@linaro.org> --- include/exec/address-spaces.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/address-spaces.h b/include/exec/address-spaces.h index db8bfa9a92..0d0aa61d68 100644 --- a/include/exec/address-spaces.h +++ b/include/exec/address-spaces.h @@ -19,8 +19,6 @@ * you're one of them. */ -#include "exec/memory.h" - #ifndef CONFIG_USER_ONLY /* Get the root memory region. This interface should only be used temporarily From patchwork Thu Aug 31 12:56:10 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: 718980 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp454961wrn; Thu, 31 Aug 2023 06:01:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjMShcV794U3c+C5NObSJzEuRxqpzhCCzF2J8fzDI7Q1SoApaBpVTJ8EnwBOyBUIxVrN4Y X-Received: by 2002:a05:6358:6f82:b0:135:4003:7857 with SMTP id s2-20020a0563586f8200b0013540037857mr3982867rwn.31.1693486860836; Thu, 31 Aug 2023 06:01:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693486860; cv=none; d=google.com; s=arc-20160816; b=bNLDekOwJB4IeZtKwc71HzPY2duSeWnHsMejJ3GpkUVsHD2Xo6NWpZbRydckZapmiU qeLSUvjOneFfeG5hwdCTEA+SFbN7WedzwZBxBwAS1qYsrlg1IeaekLHVpHM1ty0/Ze/+ nr+rViJR1wcX3ZO/4Zg55nJFHJqvEuWdoNJX7WPKkfP88ITrJfLlc+OM01dFJhKZTCu+ BzMvfaMrMPbXe5+NUHp+j4FIFC3WIOLA16pEkWS/CR7iDGHXhhml4uZknl96ruDdYHTk Gz+9v2kHWpXxpFUbXIfd2TSxLSLf8Qq7YRwLhMYBYYZXn1/qztCbJMVDm2XI+rHvbBSQ eR7Q== 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=Jp50x3wJK7x4LxNpAtuBZu9CKHmOOVq7QE4QCfb0dao=; fh=N6IPqxlE/EqK99XsBvfnA4l+ZTynOIoBW771uFu62YU=; b=LgzUxz6Rk083J7vm0tD5x+Ih8VMp5OcyfSH1TuGUkU84Pn5kbzfYpq+nfnsyOl6ywW Dqrlmxpy9/OK5fXaXZdgAROG/oWjm97/EJagPw4T0bc0/BRssQzjjUo3ctkxrGlHzMPx /mjVFSZRNIesn922r7UcIZSOtOlLPp8WaP2F6GHBWq+8kxHq1vUyfVzMNE/qotx+SjKv ndRULQsfOCN13vGFEkenmEfR0Q80eT97J4th3fw8Z0rEPcfI/yJna+BPB+lzDsMgV7j0 DSay1cgBQ7ovAf8Jd5RDpPtKFlkijsYn01mMKHKJdz0JT7i2xbrIsmfjUWhtusmkHbff RriA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MfASd75h; 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 rf6-20020a05620a8e8600b0076c8d5c1aeesi836579qkn.551.2023.08.31.06.01.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:01:00 -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=MfASd75h; 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 1qbhHj-0006HD-JO; Thu, 31 Aug 2023 09:00:31 -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 1qbhF2-0002u3-Bo for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:45 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhEx-0005JL-TV for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:42 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-401b5516104so7025145e9.2 for ; Thu, 31 Aug 2023 05:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486655; x=1694091455; 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=Jp50x3wJK7x4LxNpAtuBZu9CKHmOOVq7QE4QCfb0dao=; b=MfASd75hoLx+RzR8wmJ9sHCbhC5b4SGy6WtsEc4sKTJ9spUnZe/1p2yvjpJfy6JVnw YmTYuKuyR7q7zsYg2VsI+rqZsjBvgsaDwRH9tUQSBeuhBavh0czv56U4vDDdaX4SGbVA RFdWA872krGtu+YGSUgCoELqMcXWd1nJdmVm1aUC+WF9sXWAzMDVeAFZPieJrwELvPBC Qe66FEGS9NG5lqhcHKFzGr2HrC3xemaqLN7syy+o5yFu7QRLfLq5/RUmtOX5y2qm7CXn Fkg+UyrVIgA8sbSp1jRZaN6Fbr4vpl04k13F0DxasSAkj2ygOkqhNNVIJdD0XCRlQEu4 oACA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486655; x=1694091455; 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=Jp50x3wJK7x4LxNpAtuBZu9CKHmOOVq7QE4QCfb0dao=; b=BqXW+Fxo8iJtGAOM8/A3MbZdc+0IeAsrdDYgXsixkBZiosBnlpBslNBhVpZB6OXfrw DFIOeGqWz6dqnP7IFTmCPERrki7Oxq8yxnHkO0HfSSRMHblg3JrvoV5skVTAtNUB/3hk JKjQawgWuZQeYAZyA7WpJOIHZyCaN4S2cb8dMt1jxgS14dkMQoUalUYnfgvkoyfIwYHX rpuoZNhwFiAr3BBkg+odklZ45kHupDOhoOjPZCNQDSTuYxXaxT9DL0lzkvdPe3MJx3ui S3OIk3UKq1TXNikKQfT0lMFnSz5pgiAyEdu/MKOWWNC7Jch07pTxdv3viFAsyJFbtbRE Z6bQ== X-Gm-Message-State: AOJu0YyRj1kA0qm0r7Jy+Ic812Eu6NhyxsGqdJr2uKujJHmW2rIsmbea UG07CHY9H4+1VQ9bjlXMgeHAR/Ydco/vz4OZ5lo= X-Received: by 2002:a05:600c:231a:b0:401:bf87:9895 with SMTP id 26-20020a05600c231a00b00401bf879895mr4465464wmo.22.1693486655352; Thu, 31 Aug 2023 05:57:35 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id f22-20020a7bc8d6000000b00401c9228bf7sm1914641wml.18.2023.08.31.05.57.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , David Gibson , Greg Kurz , Nicholas Piggin Subject: [PULL 08/41] target/ppc/pmu: Include missing 'qemu/timer.h' header Date: Thu, 31 Aug 2023 14:56:10 +0200 Message-ID: <20230831125646.67855-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 Since commit c2eff582a3 ("target/ppc: PMU basic cycle count for pseries TCG") pmu_update_cycles() uses QEMU_CLOCK_VIRTUAL and calls qemu_clock_get_ns(), both defined in "qemu/timer.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-2-philmd@linaro.org> --- target/ppc/power8-pmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 7bb4bf81f7..2537cded83 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -16,6 +16,7 @@ #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/error-report.h" +#include "qemu/timer.h" #include "qemu/main-loop.h" #include "hw/ppc/ppc.h" #include "power8-pmu.h" From patchwork Thu Aug 31 12:56:11 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: 718986 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp460787wrn; Thu, 31 Aug 2023 06:08:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5V3kt2ZYKgSWNttj5dTKf46B944UrNtbD61R+Jt/c5SLxwdens1E//0mUUm9CY25t/pzS X-Received: by 2002:a05:622a:6f09:b0:3f5:16af:17db with SMTP id iv9-20020a05622a6f0900b003f516af17dbmr2555244qtb.0.1693487323501; Thu, 31 Aug 2023 06:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487323; cv=none; d=google.com; s=arc-20160816; b=UaEiNWQXCwvoeKmUqrZi1EcMCIEg726AIadhehjsqvXr10VBqoKkVrvVK9HoQiINfC RsayefXs7yYKunE/JHE9/kpuGw0MKTjQnqkawsMwPzmCVkDo+GUzD7a+RgvMSzzAQJ0+ nAxA4Ti0FETH/iLioRw8TWfpMcyHWlzEae4jvnRpE7yxg4qdhCf+WgJ5gVApy1kTv7Ds xm9quYFaSy4RSH+s8UfkKXuNa2ekNDzb4B8PqdxSBpJ6nOV0CGBJKakic+Bm7Yco7d6l 5zXjMi83b/vRPqq9+fKLNYw+8IxSuVXasjqIySkU+bxjJlZeChMN77vYRNfrlw14O9sz wKlg== 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=OEBOMsh/2YnVXzixxLDyYqxUdUQOvziVNTmEZMBX0zo=; fh=+j9mkJWFeBlg3tgjNCfKQ2d5Q02bvruS5zHcYwno2d8=; b=kUliAhEi/zaD2RW9jCvzupm7Z2HHjBsmvozPd9+mX3DaU2lmKYPYX4DhZfDGZ39Q/N rq91F4aAHoQt4jfH+QoInmT7fkshni4Hwg3kxeCNRBNDib4qHg0DPSXchxN8jtSRiOZr YUBcIXb23oqMiZQX4Q+8L8r3pNOw7OXSQWsgpbaseInv+NuJ61k2SjnP0ykjHUnSb2oX a+HntAbQB3wVdR4vgU+TCvNpXcy44T+WewktL2UGhvz5fZiiNidy38p+KRiSz0u85geC nbeZZKonC9JuptNTVW44z6Jd+5yCyAZp+uE0ghe6CChN1XAwsX+7IJTxQ64Uju/JK7+0 40Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q7gXQi51; 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 j5-20020ac85f85000000b00404d56daa9csi828187qta.809.2023.08.31.06.08.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:08:43 -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=q7gXQi51; 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 1qbhHM-0005FX-JK; Thu, 31 Aug 2023 09:00:09 -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 1qbhFB-0002xk-Ov for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:54 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhF2-0005LG-71 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:48 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-307d20548adso641299f8f.0 for ; Thu, 31 Aug 2023 05:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486661; x=1694091461; 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=OEBOMsh/2YnVXzixxLDyYqxUdUQOvziVNTmEZMBX0zo=; b=q7gXQi51bkl/faqbG5DeWykzANSO+dP0F+d7XfJxrzOdVly4o1roQGyTdru02vHDEP 2Epwcn2T6N95iwOKH96OVRpXswy4bkE+G7x9dKR1LkymX6UTaPqp0sEAJhh2s3AmlBZ+ L4L6ubkQ1UwsC50F0h/nQzi6i61GbkJxr+crpx6Uji96IGlWb921sXTeMFnjyj9lyH/h aXzcbg8QH4MFhQpy2zirkHME6QpW6AMAoEVcYcHnYeBCYJsPblVJaFD6Ji7gqj6c7od7 m7f9yGIVdrNA3Ue4FN6n/cY6xyiZWj8872G/Q5BQqc1QWq1URvgylGURo1BwwNKW5V3F A71g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486661; x=1694091461; 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=OEBOMsh/2YnVXzixxLDyYqxUdUQOvziVNTmEZMBX0zo=; b=K/4kWhkUjb2rb4/7t1hlKpnN9o3aktkE329+sN6e2BzyGhu/T/Rpy+jhsQyzkEHxuh sApqULUIKaFvrt3LSh8oXyVPd+/++QIdbVe/k4GojcU5hxaEq5RBqhpP9GNH1GTogiS6 30gMZaxN8UIroaoL8gLOvxbxFi+2GDYeLk3F2+f7NmyfIDFZl2sBes0gcWw2sFRuBRGH lLrU3pqeq8GMK2imQJ6Xo67KrNTekcwG/l2rWE3u5R0RPRfyjYhmwDfwC8l3dniJNxWY +vswTgjOWiVOQmWZv14rPVthu6Gaol7CSYz0Jp4MPdQtyQz+QuC5lFbHpEe7Q/G0LiIO mNlw== X-Gm-Message-State: AOJu0Yyl3PY8Xiyq53kof0UDoGaJWBqieOKF6IS14phfQy95Pc59lZzT 2zye6lh9kWdyK52QdIALIJUXpFSdqcdsV9XVTsA= X-Received: by 2002:adf:e6ce:0:b0:319:74d5:a2d7 with SMTP id y14-20020adfe6ce000000b0031974d5a2d7mr4511339wrm.32.1693486661117; Thu, 31 Aug 2023 05:57:41 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id h18-20020adff4d2000000b003141e629cb6sm2158792wrp.101.2023.08.31.05.57.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei Subject: [PULL 09/41] target/riscv/pmu: Restrict 'qemu/log.h' include to source Date: Thu, 31 Aug 2023 14:56:11 +0200 Message-ID: <20230831125646.67855-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 Declarations from "riscv/pmu.h" don't need anything from "qemu/log.h", reduce it's inclusion to the source. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-3-philmd@linaro.org> --- target/riscv/pmu.h | 1 - target/riscv/pmu.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h index 0c819ca983..d2be06a133 100644 --- a/target/riscv/pmu.h +++ b/target/riscv/pmu.h @@ -16,7 +16,6 @@ * this program. If not, see . */ -#include "qemu/log.h" #include "cpu.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" diff --git a/target/riscv/pmu.c b/target/riscv/pmu.c index db06b3882f..36f6307d28 100644 --- a/target/riscv/pmu.c +++ b/target/riscv/pmu.c @@ -17,6 +17,7 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "cpu.h" #include "pmu.h" #include "sysemu/cpu-timers.h" From patchwork Thu Aug 31 12:56:12 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: 719002 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462935wrn; Thu, 31 Aug 2023 06:11:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAtFMPhBr67aXBiLm8XHBElZ1P4HfNl/Pus3ml/IRUwa7V3JJ4nS/WDQRdFkgstmEO6F4g X-Received: by 2002:a0c:b701:0:b0:64f:6676:e6fa with SMTP id t1-20020a0cb701000000b0064f6676e6famr3010741qvd.7.1693487510560; Thu, 31 Aug 2023 06:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487510; cv=none; d=google.com; s=arc-20160816; b=qjFzmMlELaVAKgUE9ycFiWykfKx7F7VWKlCZU6nEt+EiIk+bDBMxOaL/0w6+7M57o1 DgJOE91qwCH0K2pe9ZRmpNnANJyA+6SRRsTj5yOF54ol95LMsTZCCUElgUfTI/uakbiK so7klDRmcCAzqP4Bj2TUF3xS3dK4fIWJbSu+vyGnUU7p7tabNdZLHrwrOO2h8gHtQVxS QFwfEbFv3FhCvcyzz2LYLu2KEsqpKISZrsC4yObXlom6DA1pKZxgeqKuT1ZQV1+Mj2NG AkOPYE0mufv6s7nu4dfPYkBZH+piC0Niu4SwDGhDcv6WmaW7wR6SB+JhuysiUTadbrfu mrAw== 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=RGsHEuyFoG4D07fPwCyTopmI6+5DcT12Nv/vCGRvwBA=; fh=zPby5tpCTm8ppSrp1rs0jVIwH/bVa1BdpqaRaDY5qN8=; b=zwdQi+Wi6aySTB5ejyhP+xb7i/cXDGuyX7O0PyVUU2+3SxOP6nxgSdPXnTNf8uWJUQ zvy+M6T+MQqTrylI777J2ri/MWK1nd63+BH/v87YCLaOJ37vi/XbiJ/Hfx/RKdhR607I v10vcuSI7w8dB2Mbh8+TL2jjEA1mF4EFevVQPXksi1crh7uFigrcT87amvxTfOitWVNg DCRKJrcuJkJPsc14kQ69XHcAU1Y81Tyz1hbUhJVE2GP6An9CxQ97MxtceqBm6x2VkwQz X6pwkuKfzLUGNRZvUvK5XngiqdlFBYJZFnOnmkGJNvu/2o+5tQXRmUAO5uEnpsU4UBV/ CI7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jAK3cfG8; 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 f3-20020a0ccc83000000b006261bd7a355si818899qvl.375.2023.08.31.06.11.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:50 -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=jAK3cfG8; 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 1qbhI8-0000X9-I0; Thu, 31 Aug 2023 09:00:56 -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 1qbhFG-00032r-TF for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:59 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFB-0005Oo-Hi for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:57:58 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3ff7d73a6feso7061175e9.1 for ; Thu, 31 Aug 2023 05:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486668; x=1694091468; 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=RGsHEuyFoG4D07fPwCyTopmI6+5DcT12Nv/vCGRvwBA=; b=jAK3cfG84TIOtj2LAh5tqKi6QMHrpgt/Y4R4eOj8QbIhIiKsSL1lfi+rKbgpN6iZjk dV2D+Jz7Y49hBx/OP0UsgNA0Fyh7GDJ63mnIruQmLrMZrRlCQ2qaqd3ozYkt28UQQgjr 1P3B5wkR9XRv+h09TZc04anoAnDb8p6Ub1jD/+X/BrNRnE5hR3D7L3Ks54AICYoj01ys Jup516hQV0zQMzLSEH5uVhBMasEEdy+fs/u6xCTB5FZwtogwRLFh04waMXbXAX7dyrBm RVXtLbGMjLo3qmYXbSUXKljPEYbAeH10Aj5iqBV/xAeLnHC7F1TbvjFpbHELXxSKhZf8 5UOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486668; x=1694091468; 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=RGsHEuyFoG4D07fPwCyTopmI6+5DcT12Nv/vCGRvwBA=; b=B3CNLd1dYpDV41vcYYTdK6n+Wul1dJchrU2KzVUuLXwX/aWqOghRjnTCFweNiyVQt2 7tu4JMX17BU58kBOkj5RoI3voNVHRlmaHS1jZLxCLcaVMtF6SC94ug3GpK40y0VBsV7e k+yVQ4YvjYalvoPALnHYIPUqn2uITJ/i08NK1elmNZaqZmTHDlRZr4CoblsnvHgSb69K R1Jjqjmyga00eabkqCZm0Hd3iHe9MMMrtwVrAtsTB6QbH/IN6AxhpA8j5OkkOm90cN30 e+ybMoMHLCb9fPelKt0tpG1qC7ItGPW6W530RSWpAtfVVIUheMJTQXDqjAKn0Gcgk6Jy wL/A== X-Gm-Message-State: AOJu0Yytbrx1qZH7KEFWOde6g96KEszEteTWLD+wD4yoZKFHtO7zcKpd FSaGa4MwCL7oNLbVMrR5Fl9BUgjPKzlW0vipwYs= X-Received: by 2002:a05:600c:ac4:b0:3fe:1b4e:c484 with SMTP id c4-20020a05600c0ac400b003fe1b4ec484mr4008814wmr.5.1693486667797; Thu, 31 Aug 2023 05:57:47 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id d9-20020a5d4f89000000b0031c5b380291sm2184139wru.110.2023.08.31.05.57.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Michael Rolnik , Paolo Bonzini , Eduardo Habkost , Song Gao , Xiaojuan Yang , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei Subject: [PULL 10/41] target/translate: Include missing 'exec/cpu_ldst.h' header Date: Thu, 31 Aug 2023 14:56:12 +0200 Message-ID: <20230831125646.67855-11-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 All these files access the CPU LD/ST API declared in "exec/cpu_ldst.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-4-philmd@linaro.org> --- target/avr/helper.c | 1 + target/i386/tcg/fpu_helper.c | 1 + target/i386/tcg/sysemu/excp_helper.c | 1 + target/loongarch/cpu.c | 1 + target/mips/tcg/ldst_helper.c | 1 + target/mips/tcg/msa_helper.c | 1 + target/riscv/op_helper.c | 1 + target/riscv/vector_helper.c | 1 + 8 files changed, 8 insertions(+) diff --git a/target/avr/helper.c b/target/avr/helper.c index e6e7d51487..fdc9884ea0 100644 --- a/target/avr/helper.c +++ b/target/avr/helper.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "hw/core/tcg-cpu-ops.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "exec/address-spaces.h" #include "exec/helper-proto.h" diff --git a/target/i386/tcg/fpu_helper.c b/target/i386/tcg/fpu_helper.c index 6f3741b635..4430d3d380 100644 --- a/target/i386/tcg/fpu_helper.c +++ b/target/i386/tcg/fpu_helper.c @@ -21,6 +21,7 @@ #include #include "cpu.h" #include "tcg-cpu.h" +#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "fpu/softfloat-macros.h" diff --git a/target/i386/tcg/sysemu/excp_helper.c b/target/i386/tcg/sysemu/excp_helper.c index b5f0abffa3..226689a4f2 100644 --- a/target/i386/tcg/sysemu/excp_helper.c +++ b/target/i386/tcg/sysemu/excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "tcg/helper-tcg.h" diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 27fc6e1f33..65f9320e34 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -11,6 +11,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "sysemu/qtest.h" +#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h" diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index c1a8380e34..97056d00a2 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "exec/memop.h" #include "internal.h" diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c index 29b31d70fe..c8597b9e30 100644 --- a/target/mips/tcg/msa_helper.c +++ b/target/mips/tcg/msa_helper.c @@ -22,6 +22,7 @@ #include "internal.h" #include "tcg/tcg.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/memop.h" #include "fpu/softfloat.h" diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 9cdb9cdd06..7e2f1908ee 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -23,6 +23,7 @@ #include "internals.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" /* Exceptions processing helpers */ diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index bf7e0029a1..bc9e151aa9 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "exec/memop.h" #include "exec/exec-all.h" +#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "tcg/tcg-gvec-desc.h" From patchwork Thu Aug 31 12:56:13 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: 718994 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462137wrn; Thu, 31 Aug 2023 06:10:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvwJaomLsVSgYLhpqZhatdglXtGghMBjidAuLmbub2ylE8ES5RRWxiOr0LgSJ6kPURSmyq X-Received: by 2002:a05:622a:1893:b0:411:ff22:b37f with SMTP id v19-20020a05622a189300b00411ff22b37fmr2706446qtc.16.1693487435935; Thu, 31 Aug 2023 06:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487435; cv=none; d=google.com; s=arc-20160816; b=Wm2GCAWC6qau5fS4XGBXyuDgy2wLkDSdmAd1NOqqZoh5iieMCxdIf4j4C5rHZwA/gW k56TtAUBdWAEgGdITw3rSFCDa4mUa/a6ZnV2HKZus/Itob6u3Ma1AGIqZ/3Sd3DGcIy7 gUwAwbakOLxmkRzSTeUzPPmYkzQSOyy8zH3YX2aER3Ba8lEkCMAAnNwmVm4dL7H0J+6V tuVxXEpMTN4ORI2I8BXUcW9OiB0NQYVQsqnqENA9jRr2scS+aHWo2xxgr2UXGkpGT3J1 LJK6u7Eo42vZDXeXyUAzTfAS2W1dimZGy6XO1sc5BelOBwO2iPes4b498zrIdzrb04d+ rgyA== 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=EWFG4EongnTwNm4gc3SaYrZZrKAf899rD48bNs5phBA=; fh=YSseXhaASgT14RYDeqdxM3B3Tn9CQf6fAO7oyEFtT3s=; b=UQ6upQGD6wrHpX7tOwU86hhklx7fBxWk1hnfv4trs/iAaP5B+GBpLUKD4qKXh6EXmO o+ea276mNbbFAWw+BFlirkVZ4HR5xVI7cQB9Uetn1RHjmszQ/HDdhs7uwZrZrMcvYDNN sdMebxLoQaJwEw7l0Niwd7dsnxZCN4j+tsPMIoQN7yzdCh+vSw6Gmrd5dywF2ZET3rW/ q4wgoGvDm/20sKKewEONbeUw1pni5gJxYoZ9drEKtctkQcn6uO0//csSyfP8toMRpoDn aXYLNN2BR/JnoHb2Ic4OWesTlokixWUD1IxeEiEUDKM4iBtIzfaMnsIUZATfXJQOgv+a i/dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jX/FUq1O"; 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 q6-20020a05622a04c600b00403eeb8f219si782702qtx.753.2023.08.31.06.10.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:10:35 -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="jX/FUq1O"; 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 1qbhId-00022T-S8; Thu, 31 Aug 2023 09:01:41 -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 1qbhFJ-00035U-Di for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:02 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFE-0005Qc-O3 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:00 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-31c7912416bso645402f8f.1 for ; Thu, 31 Aug 2023 05:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486674; x=1694091474; 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=EWFG4EongnTwNm4gc3SaYrZZrKAf899rD48bNs5phBA=; b=jX/FUq1O8cVMqN4lk9eTKpzdYY4Cq5uh7c+rnkz6M1llJmbnXIt61glTJnw755byiZ l8Lcn+M4H9dU2Wm3YEzTU5nuH9Edb9ZWbmz3HkHPmH8lyJMHr2jw5lwRYlER0apypElL GTOoIm+4NIi+XcZJmjVnnXjCX5/H6vvmVe4mSFhSWRxtSLDsXG1/eey9sTiJn1xL1lpD zJoMBqDwuLTBt//sWlJ2X0BO1Kxrj152SwwV2jCgT47pbGMKnljumfSCoGK01tGQD/KM I715LKPdYuh2w+hLaYnOHr9rO+Ve8g5odmteul3TV6yKK5ELM2aQHrA6HarMRdMK7yG8 8O3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486674; x=1694091474; 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=EWFG4EongnTwNm4gc3SaYrZZrKAf899rD48bNs5phBA=; b=QqOTpLuLqo+R1FQqsUJ2mwOtaGT5QlOJohvqk3mgQTNxWT9+ygEnAsTHJq0DITmK2M Y239gOWAO4oPEW4DJSC33yurYTo3s6jvIrcUu9GME9YP5q/nJ3JJb/sUnWg2dYwgNcgl YqlVcHF5iJrpOyyM7Wkx8F2FhsoOUfOQ/gStZicrj9C5PQ5sIMtUeXb1DdR/SXXWfE/I 2cNIK19EGHxE5KPJmGQJiQleziQAiqV4iHPGIuq+K4dLiFJ0L90qkmGHgW5ro/TQKnhB b4UvXvBDfPABpVc1dTvULt6eD2j/2ZIBo6HVyHwxeg+5OYwUjv2qNZCQoNMwk9KGQHYY 4DJg== X-Gm-Message-State: AOJu0Yw/9qWN64QI+C3VQkQIYy99GC7mEk4zrn4ugnBRi8g2A+rXuZ+Q jvTFv6p/uo/lKQHqhJcdPvKwo0jn4ayC+c//ZtE= X-Received: by 2002:a5d:5242:0:b0:31a:d2b2:f29d with SMTP id k2-20020a5d5242000000b0031ad2b2f29dmr4355231wrc.8.1693486673944; Thu, 31 Aug 2023 05:57:53 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id l3-20020a1ced03000000b003feae747ff2sm5128839wmh.35.2023.08.31.05.57.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Brian Cain , Laurent Vivier , "Edgar E. Iglesias" , Chris Wulff , Marek Vasut , Stafford Horne , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , David Gibson , Greg Kurz , Nicholas Piggin , Yoshinori Sato , Mark Cave-Ayland , Artyom Tarasenko Subject: [PULL 11/41] target/translate: Remove unnecessary 'exec/cpu_ldst.h' header Date: Thu, 31 Aug 2023 14:56:13 +0200 Message-ID: <20230831125646.67855-12-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 All these files only access the translator_ld/st API declared in "exec/translator.h". The CPU ld/st API from declared in "exec/cpu_ldst.h" is not used, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-5-philmd@linaro.org> --- target/alpha/translate.c | 1 - target/hexagon/translate.c | 1 - target/hppa/translate.c | 1 - target/m68k/translate.c | 1 - target/microblaze/translate.c | 1 - target/nios2/translate.c | 1 - target/openrisc/translate.c | 1 - target/ppc/translate.c | 1 - target/sh4/translate.c | 1 - target/sparc/translate.c | 1 - 10 files changed, 10 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 0839182a1f..9be912c50c 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -24,7 +24,6 @@ #include "qemu/host-utils.h" #include "exec/exec-all.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 708339198e..c00254e4d5 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -23,7 +23,6 @@ #include "exec/helper-gen.h" #include "exec/helper-proto.h" #include "exec/translation-block.h" -#include "exec/cpu_ldst.h" #include "exec/log.h" #include "internal.h" #include "attribs.h" diff --git a/target/hppa/translate.c b/target/hppa/translate.c index e3af668252..c04dc15228 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -23,7 +23,6 @@ #include "qemu/host-utils.h" #include "exec/exec-all.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 15b3701b8f..9e224fe796 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -25,7 +25,6 @@ #include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h" -#include "exec/cpu_ldst.h" #include "exec/translator.h" #include "exec/helper-proto.h" diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 7e7f837c63..d02c16296a 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -24,7 +24,6 @@ #include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" -#include "exec/cpu_ldst.h" #include "exec/helper-gen.h" #include "exec/translator.h" #include "qemu/qemu-print.h" diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 4264c7ec6b..dfc546d3bb 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -29,7 +29,6 @@ #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/log.h" -#include "exec/cpu_ldst.h" #include "exec/translator.h" #include "qemu/qemu-print.h" #include "semihosting/semihost.h" diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 7c6f80daf1..d65758449f 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -26,7 +26,6 @@ #include "qemu/log.h" #include "qemu/bitops.h" #include "qemu/qemu-print.h" -#include "exec/cpu_ldst.h" #include "exec/translator.h" #include "exec/helper-proto.h" diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 74796ec7ba..49b6a757b7 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -27,7 +27,6 @@ #include "tcg/tcg-op-gvec.h" #include "qemu/host-utils.h" #include "qemu/main-loop.h" -#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 49c87d7a01..c1e590feb3 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -22,7 +22,6 @@ #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" diff --git a/target/sparc/translate.c b/target/sparc/translate.c index fa80a91161..3bf0ab8135 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -25,7 +25,6 @@ #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" #include "exec/helper-gen.h" From patchwork Thu Aug 31 12:56:14 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: 718985 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp460460wrn; Thu, 31 Aug 2023 06:08:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxQCeqHrzo6jxe5WXPLL/YZri1UrI8q4TMnuH/NlKxS2VFeaLFdJZHRmSdl6wLN9Z22MTC X-Received: by 2002:a9d:4e90:0:b0:6b9:6276:c64c with SMTP id v16-20020a9d4e90000000b006b96276c64cmr5064784otk.12.1693487293391; Thu, 31 Aug 2023 06:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487293; cv=none; d=google.com; s=arc-20160816; b=iw//hRQG8pgsmQSWqjGxn6mwA2ffbis9F3fBimEnmId6oLS4AoiyIRfGIsXutORZfn bYJoe2hqaxGB9DqBhurqUk70OzrlwFkoLSjkWBxF6ZCfC2l++7Yq9YYzseSay15wYjZX bL7MRRC+Zgfr18HCiMYfJlHynLoBlsBG5SUUjizG32Iph6l/3PvYnpNpqy53v8da5PO1 sZfFvUBoQdsy1nptPQlvmJB/e+P9K61tXAENzQ8ZMm2ty/sibmp0q75kj98Skp+GhSHd ts9EscBCliRtHa48j4LRJvZx6GqZh3kgEpHTUJqffq6C3IYitdKE90aLtq4eCuswdL8n UDsg== 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=ckF3KMkPZoMJE539B3wi9BjBQFsmfr+Lf+8EhQQKEuk=; fh=oqkxg9j63M6YqZWP4SziXgurivxQ6XH1yX5knoDTdbU=; b=1IO7KVahCR5dtdnS23DMlzwpUgdaXwZqG4H+Bd1tBxd9a4NPZL5eTCfgAzfjxPbrgE DsZr9LDCWVge7ncNq3MfVxoNgxtyH36gW/KIVRIYKhp4W4X8VYFIoh7pAZ1I7XvbTEyv nV5q85AiHrnLieMbp9Z3XCnGnbiFGIyRGfxIomaahBkhYt6yy2HsJqodnVKT1PFbBAeP d6tNqP+J876UwzS1ubaMh2T9TlkvsvNVoPUVo5bKD+pStay6xDUC1lkCQPhMJXgtMimY WRHKHU2zsB6p9UB7dy8uP941294QfD2L9nrcdvUiwMeS7BtX0UP00aNIDS2YUIt5bXGV Kdtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w3BDIGHi; 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 y6-20020a05622a164600b004120cdcb199si796959qtj.796.2023.08.31.06.08.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:08:13 -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=w3BDIGHi; 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 1qbhI4-0008Pt-CD; Thu, 31 Aug 2023 09:00:52 -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 1qbhFM-00037v-IL for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:05 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFJ-0005SW-6C for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:04 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-401ceda85cdso7524185e9.1 for ; Thu, 31 Aug 2023 05:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486679; x=1694091479; 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=ckF3KMkPZoMJE539B3wi9BjBQFsmfr+Lf+8EhQQKEuk=; b=w3BDIGHi0jtA1JGF+WnjEKOUXj3SSbAAMMuWB5/xoS9Yt1LNAHb/z/0YL7+iDsuPeO uh9Ve8fGlesKcq/SRxH8JdmnvbLu399WZXFa3nq8tfw5PLkz6Z82Pi+6dmjAcJqW58l6 u/HpHOnsDXR4fN+NFLkAYSzAaZ4yj1PSxAsSPLXULSxVZ0mwpWAlHlYqJrlkQYl8raBd tFxLzvBvd9x5xNbEJRWw+Git5t/DdHMQ73vuSv6XQjZPQGG3MyMq2Ib00xedCaECYBO6 44rQv1bCSlcYoCvX0db8AygZy3MfJZZ2/A8sb3L42SN+9vnX5u9PZnz/hyDc4PvHaShf rBTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486679; x=1694091479; 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=ckF3KMkPZoMJE539B3wi9BjBQFsmfr+Lf+8EhQQKEuk=; b=kT9yh4zZqAM9+oHKIcUW8/LH4Wc4mMVc7F8v0Eul9/JpnD1GK0cH52LZkpoiR6x/J6 kEhcUbYSRou+ef04TpT9i9SNFsMbuFWZHihf6Wkc/PBUz0zQ5xTIGdd0IGJstqslaVvz h8IHcImC1JfSu3dDK9Pi2c3kBuW/rbPXXah60aX0yyMsbOanXeaV5UxOAyo4ZSPDeec3 Rgv/JaYhWhjfBmjYn2/YjwhgQ4fS6FhMGG358uVYyKO9/sb8M+qZfdwbRmqPAOMlDR+9 fD7yRtPJE8IV64KOzadlmQCdDQTEm13Y4P4erUbRNbd7Ei2KnsHGCYsU5qzt9QQVIR7e 4Tew== X-Gm-Message-State: AOJu0YxN1ADPQfBPhBCjjGLkFfAJ0YJjnEGRDJayb8lDWXifMzhiacdK Rp4xbM50j3sA72IDvE4jFxdBEYxINOBzoGcFPVI= X-Received: by 2002:a05:600c:11c1:b0:3fe:90f:8496 with SMTP id b1-20020a05600c11c100b003fe090f8496mr3959276wmi.1.1693486679232; Thu, 31 Aug 2023 05:57:59 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id l7-20020a7bc447000000b003fe1fe56202sm1908227wmi.33.2023.08.31.05.57.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:57:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Paolo Bonzini Subject: [PULL 12/41] target/translate: Restrict 'exec/cpu_ldst.h' to user emulation Date: Thu, 31 Aug 2023 14:56:14 +0200 Message-ID: <20230831125646.67855-13-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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 Only handle_sigsegv_accerr_write(), declared with user emulation, requires "exec/cpu_ldst.h" (for the abi_ptr typedef). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-6-philmd@linaro.org> --- include/exec/exec-all.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index d02517e95f..b2f5cd4c2a 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -21,7 +21,7 @@ #define EXEC_ALL_H #include "cpu.h" -#ifdef CONFIG_TCG +#if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif #include "exec/translation-block.h" From patchwork Thu Aug 31 12:56:15 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: 718979 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp454928wrn; Thu, 31 Aug 2023 06:00:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzThBZePHAvBgkgba6SkndDNyCh83BrVostbkP/2IIDYTrF8HEB45Jm8p0donRuETXSn5Q X-Received: by 2002:a0c:b307:0:b0:63c:f0f9:fedf with SMTP id s7-20020a0cb307000000b0063cf0f9fedfmr2593859qve.4.1693486858391; Thu, 31 Aug 2023 06:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693486858; cv=none; d=google.com; s=arc-20160816; b=06WNfWK2bNy3xmI5smCGvr+MRU7mrlGIV5tlquB6+pjuU9d1HKrdr1e7vtcsUE6eHk 37G3gMMCpBhBo8HOR437IWaToH9TCsKbpqg2w8kPLAHTPmbCccvRZnec5hBU4WdfUuu9 m6yKFYy/BQlTGsSkuHCfNU9k2BkwAYBqKeGtkaGHqEurFbMmycorlZV2sKbzbRy0GOK1 BOJKijTo1Gk3CGQh4N8woCcrSsSedvq+jdQFFHL1E0BPaagSv+0Qgp7oU18pHjqhSxpV qmX/BoecBTqWl3MVRVdQBebF3iYqSwgOcyQyI0bSUMba8lVBZ5TqfP5xlwki6YgHmieI horw== 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=sO6ZIHVbK+18/xJUsh8T6zEIqxOQUhu4K3Jic6wZRnQ=; fh=6Ll0yr3XNZnwSYinQ2S+8C+4e7TejBeQr04ktkgQbY0=; b=YzpXKrLn8O89PFFDw83rM6U6CdHj50dfRqjssi2zwETRt8JFY/Hny5MQ0a3JZ3mWdo lK380P/TLNaDUYDVjNPrFUMXqDtxtkfXOfJ0U5OmIrFPNDxrcQWNpDLucQBn3pZtLKHm qecgduZQqDc6JINfPM9C3s0QkwJeQvLq7cQzjQO5gzO23IQz5G/Q1l1njpFg88Yu9dK6 OmUmBBC6NPNeRrvtW6Bb89FJpItqHxX3yhwd2SbmHA7slVAdOZdLyS2EHEWvaXZ31W3c y/T5OALrkVwAkbgNC4Z7363VsOvfUtUz0GjbW0+R/uKQ6R6YQ4NduMN10PSRH5iNs18x 1AvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eAfEucj3; 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 w13-20020ac87e8d000000b004135f1597easi840331qtj.568.2023.08.31.06.00.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:00:58 -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=eAfEucj3; 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 1qbhHu-0007B4-Co; Thu, 31 Aug 2023 09:00:42 -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 1qbhFU-0003DO-30 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:13 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFO-0005V0-Sa for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:11 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fee8af9cb9so7632215e9.1 for ; Thu, 31 Aug 2023 05:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486685; x=1694091485; 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=sO6ZIHVbK+18/xJUsh8T6zEIqxOQUhu4K3Jic6wZRnQ=; b=eAfEucj3tx5MHS8XSt0+Y5gnfFbBdtRonS/X6q3aeIuLsFSDo1nkfYrLjdf7JJ3F1d xezkHhByE8Wg28C0Wf64ZDYSmVNnG1FOpefo4A8m69NWOxkuc8YmAS63NmzDuMkF6zOF zkPU21UcWRZH/rggjJf/+8P+225bbEHW0vX7E26779QET0/n7YDECEaw2ciKV0tVtRlV 2gTgv3/dSNEfyESNBsjFnudzeeI65pDKCb+ahff9DraPb0P6ZlwgJ23I13Qly2rVJd1h +m1iixHtWHvU6peP+vNa29vJIY96SdYOgJBQx3w0cg9MqJB6ePxfRhkIoSCEZ1xOp/mu kxRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486685; x=1694091485; 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=sO6ZIHVbK+18/xJUsh8T6zEIqxOQUhu4K3Jic6wZRnQ=; b=gRiEFAGF02n1omUhjr4wRi0TejDKIuRs9b98jMEc8AUyP9NYxNzIKIWxt5zc4YYsNu SOf1oxIW/4N5C+rPho278n4drp7Dba0tiszSXq7/QNIy1WGa4IMNY/HSnSIoGsSoJAPA TUlYsS0NGQSFqk2dxHh92pUWXQUt1Uh73p8mbfLoPsjxyZ5atLmTiOR7PFRJywftA6c0 YiXM/J5pqgRzpEqCiIg232dQQG5YsReDaJWt7c/ypE3vlZvTLzrLZrXncVf1R4i2k9Nh NuQ5caNyPQpodohbGf54c02WSpagDVh+ecNo85LGqrw0/7Zc55LuWdbbAFnnJg4Q3dsi suwQ== X-Gm-Message-State: AOJu0YyvRu0QVUjJs1dt4AC6FvpJWK52e/eiStGav69oM9AHAjmxl1lk WraHuMe/zWbf5IM/rQK70yB0m80klq8LIvN7vFU= X-Received: by 2002:a7b:cd0a:0:b0:401:cc0f:f866 with SMTP id f10-20020a7bcd0a000000b00401cc0ff866mr4839520wmj.12.1693486685237; Thu, 31 Aug 2023 05:58:05 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id y23-20020a7bcd97000000b003fbc9d178a8sm5168090wmj.4.2023.08.31.05.58.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Max Filippov Subject: [PULL 13/41] target/helpers: Remove unnecessary 'exec/cpu_ldst.h' header Date: Thu, 31 Aug 2023 14:56:15 +0200 Message-ID: <20230831125646.67855-14-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 These files don't use the CPU ld/st API, remove the unnecessary "exec/cpu_ldst.h" header. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230828221314.18435-7-philmd@linaro.org> --- target/riscv/pmu.h | 1 - target/cris/op_helper.c | 1 - target/mips/tcg/fpu_helper.c | 1 - target/mips/tcg/sysemu/lcsr_helper.c | 1 - target/s390x/tcg/excp_helper.c | 1 - target/s390x/tcg/fpu_helper.c | 1 - target/xtensa/mmu_helper.c | 1 - target/xtensa/op_helper.c | 1 - 8 files changed, 8 deletions(-) diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h index d2be06a133..60fdd6f42c 100644 --- a/target/riscv/pmu.h +++ b/target/riscv/pmu.h @@ -18,7 +18,6 @@ #include "cpu.h" #include "qemu/main-loop.h" -#include "exec/exec-all.h" bool riscv_pmu_ctr_monitor_instructions(CPURISCVState *env, uint32_t target_ctr); diff --git a/target/cris/op_helper.c b/target/cris/op_helper.c index 40cb74ce73..98a9aaf504 100644 --- a/target/cris/op_helper.c +++ b/target/cris/op_helper.c @@ -24,7 +24,6 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" //#define CRIS_OP_HELPER_DEBUG diff --git a/target/mips/tcg/fpu_helper.c b/target/mips/tcg/fpu_helper.c index 8ce56ed7c8..45d593de48 100644 --- a/target/mips/tcg/fpu_helper.c +++ b/target/mips/tcg/fpu_helper.c @@ -25,7 +25,6 @@ #include "internal.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #include "fpu/softfloat.h" #include "fpu_helper.h" diff --git a/target/mips/tcg/sysemu/lcsr_helper.c b/target/mips/tcg/sysemu/lcsr_helper.c index 942143d209..8f97d04313 100644 --- a/target/mips/tcg/sysemu/lcsr_helper.c +++ b/target/mips/tcg/sysemu/lcsr_helper.c @@ -13,7 +13,6 @@ #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #define GET_MEMTXATTRS(cas) \ ((MemTxAttrs){.requester_id = env_cpu(cas)->cpu_index}) diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index b7116d0577..b875bf14e5 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #include "s390x-internal.h" #include "tcg_s390x.h" #ifndef CONFIG_USER_ONLY diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c index c329b31261..d8bd5748fa 100644 --- a/target/s390x/tcg/fpu_helper.c +++ b/target/s390x/tcg/fpu_helper.c @@ -23,7 +23,6 @@ #include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index fa66e8e867..57b75882c4 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -34,7 +34,6 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #define XTENSA_MPU_SEGMENT_MASK 0x0000001f #define XTENSA_MPU_ACC_RIGHTS_MASK 0x00000f00 diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c index 1af7becc54..10a2b51f91 100644 --- a/target/xtensa/op_helper.c +++ b/target/xtensa/op_helper.c @@ -31,7 +31,6 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #include "qemu/timer.h" #ifndef CONFIG_USER_ONLY From patchwork Thu Aug 31 12:56:16 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: 719004 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp463296wrn; Thu, 31 Aug 2023 06:12:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgo2d0/AT3xXC6pRHPGMBqGJ8S+JFnxFUD5KizZH/AeiNHg9C4MbwXmvnj8T8C/A+I2hRY X-Received: by 2002:ac8:5bc1:0:b0:400:ab3a:1714 with SMTP id b1-20020ac85bc1000000b00400ab3a1714mr3337253qtb.11.1693487544813; Thu, 31 Aug 2023 06:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487544; cv=none; d=google.com; s=arc-20160816; b=w8pKeiptSE0eEAff2u94fEOUwt1tFaGBlxUaAKy+hiQbZ9c/GoZWtVdiWPeyWRBKWg Y9DP0qhY8vx2di9WR4E044eDDbNjlzjaIFjhKkVLuZ0ZMD3vf/M+dAMkicpnn+pcoXif dPrDOpKvI2AvlLdk/IjH5GZ/Z6IG+z9yqUb4TOhd36h4304KYq4PGIJ71qrDJoQJ6Hn7 T41QXThMj51c1QjChW5QfMaBiLpnSqPBSDtUffIzDc7pKBQHIcjU8RKrnRC16AO/EJCu 6wdhI6b7cfvfsX5FxMqOvdo8Twn1+J7Cel+t8BRKxYgLlmFKq2f6W3HQAfYm0LyTwRdE rJHw== 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=T8Rzt94Oq4ZBRDqKkCqv7vBHeUbY8NjNoX/xG/H7lQk=; fh=BMk5qXduLlNP8ROX5W9hIcNmA71lrvt8zpMzPpEU3K0=; b=BNsuumqiyF0IaYNXMvbL2ddJmmNGOTsCv62BOFeoyVcxYamM1DLNETew4BGHmqz7A6 5xmixKcytw2kiCyY0qHM86l/9xBsey56Oj2W+xLff3sFhi2y8EQnLD2LvYKqJXOsGjXL jWvcHIXjL/5Vke+n0qIMD7a8AJ0mOXFdsL4xly0KqzzJXZxL3qGvV/HpBVkUMgPIe08Q ruS5vR8ZBqeu4r3N592T8s/2DM6m4YKdBD1kZbozyjpuG4djIxmMd3BCwUjrcu+XaeeI qZ6lCnvRbImDlz8Zhho1ON4MDbBXLvmtBqRfB/G7NZA8CtoMKt/y5vYdDVTny+9QBMb7 4KLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jKH8sSwU; 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 u22-20020ac858d6000000b0040fd98e84b6si844428qta.197.2023.08.31.06.12.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:12:24 -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=jKH8sSwU; 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 1qbhL2-0007TW-9Z; Thu, 31 Aug 2023 09:03:56 -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 1qbhFd-0003He-Gx for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:24 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFW-0005Ww-Ad for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:19 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-401f68602a8so7204005e9.3 for ; Thu, 31 Aug 2023 05:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486692; x=1694091492; 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=T8Rzt94Oq4ZBRDqKkCqv7vBHeUbY8NjNoX/xG/H7lQk=; b=jKH8sSwUSoJ7elCMQbgYaJQGskAMHLtrWHCIdolrFTpSBcbZqa7gWG9Dpf/GV6x1Jq /ipur8FQsosjH25elnexIN8Y4zI+Pc/yH65x5HpfU8hbvSGtH9B2ezfruTsRERvnA8kk 8aTx8WPp4NPMkhEbIRhLAD7PoKb+y0dIf4ysPdbDCxiPj8pkMjyrXS0NAc07bfokfMUQ iltEF6pMhvcKFI4q0SteeYfuyu+X/RdoznAnH+2K3/CevFTukGUS6+qF81Qpqv08jJTO gwE6cZevgfrDr0vMzu226zYG76Z/eyUvLVaUFVWnIsdeZD+w0CVHFNTHO/w7FMJS6Nuv 1yNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486692; x=1694091492; 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=T8Rzt94Oq4ZBRDqKkCqv7vBHeUbY8NjNoX/xG/H7lQk=; b=ABUMwCzqrm+QXpWSJdpqgbEWGl320dsrDxVr8IEGAszROKjLPF2gF25n6XgBE5rFZC MxUBK7xF5JqsvY/uJk3QeqUDibnRdSpJFqbaTbbEFbZx6udHj4l0rTax2AFTid9EyaQc KnLiCLtBLsYX5XDQGpBX2YBKdqK2xJaofZL2VUrs8lC1wRy+WyQO98oJqbFFfRHEFDTM 7Es68QDSm5TUmraX4mnAPvvkc3kgniN/E/Y8wn8BB/exIK+zliGCzEwx0OFZPtMozdZ/ JC+frWvUdC7CzLWJLOmHIUeJXPbnw/zu3p48VArYg8vWLHxDxhlFUg3w9lQVUgkPw65y ISGg== X-Gm-Message-State: AOJu0YxuPGGvXmqCRB0oP97yYYgr/20dio9IS47dR8ipU7rzmHu7r/Tj e0RgYdQWCopWy5ZzsDmKx27EK5qOjQDpj7jnuFw= X-Received: by 2002:a05:600c:292:b0:401:b0f2:88c0 with SMTP id 18-20020a05600c029200b00401b0f288c0mr4157753wmk.16.1693486691879; Thu, 31 Aug 2023 05:58:11 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id k11-20020a5d6d4b000000b0031ad2663ed0sm2131830wri.66.2023.08.31.05.58.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Song Gao , Xiaojuan Yang , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Chris Wulff , Marek Vasut , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , David Gibson , Greg Kurz , Nicholas Piggin , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Liu Zhiwei , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Max Filippov Subject: [PULL 14/41] target/helpers: Remove unnecessary 'qemu/main-loop.h' header Date: Thu, 31 Aug 2023 14:56:16 +0200 Message-ID: <20230831125646.67855-15-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 "qemu/main-loop.h" declares functions related to QEMU's main loop mutex, which these files don't access. Remove the unused "qemu/main-loop.h" header. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-8-philmd@linaro.org> --- target/riscv/pmu.h | 1 - target/loongarch/iocsr_helper.c | 1 - target/loongarch/op_helper.c | 1 - target/mips/tcg/sysemu/lcsr_helper.c | 1 - target/nios2/op_helper.c | 1 - target/ppc/int_helper.c | 1 - target/ppc/machine.c | 1 - target/ppc/mem_helper.c | 1 - target/ppc/mmu_common.c | 1 - target/ppc/mmu_helper.c | 1 - target/ppc/power8-pmu.c | 1 - target/ppc/translate.c | 1 - target/riscv/csr.c | 1 - target/riscv/m128_helper.c | 1 - target/riscv/op_helper.c | 1 - target/s390x/tcg/crypto_helper.c | 1 - target/s390x/tcg/misc_helper.c | 1 - target/xtensa/dbg_helper.c | 1 - target/xtensa/fpu_helper.c | 1 - target/xtensa/mmu_helper.c | 1 - target/xtensa/op_helper.c | 1 - target/xtensa/win_helper.c | 1 - 22 files changed, 22 deletions(-) diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h index 60fdd6f42c..2bfb71ba87 100644 --- a/target/riscv/pmu.h +++ b/target/riscv/pmu.h @@ -17,7 +17,6 @@ */ #include "cpu.h" -#include "qemu/main-loop.h" bool riscv_pmu_ctr_monitor_instructions(CPURISCVState *env, uint32_t target_ctr); diff --git a/target/loongarch/iocsr_helper.c b/target/loongarch/iocsr_helper.c index dda9845d6c..6cd01d5f09 100644 --- a/target/loongarch/iocsr_helper.c +++ b/target/loongarch/iocsr_helper.c @@ -6,7 +6,6 @@ */ #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/loongarch/op_helper.c b/target/loongarch/op_helper.c index cf84f20aba..fe79c62fa4 100644 --- a/target/loongarch/op_helper.c +++ b/target/loongarch/op_helper.c @@ -7,7 +7,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/mips/tcg/sysemu/lcsr_helper.c b/target/mips/tcg/sysemu/lcsr_helper.c index 8f97d04313..fb57bcbb78 100644 --- a/target/mips/tcg/sysemu/lcsr_helper.c +++ b/target/mips/tcg/sysemu/lcsr_helper.c @@ -7,7 +7,6 @@ */ #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" #include "qemu/host-utils.h" diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index 0aaf33ffc2..5017457c5e 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "qemu/main-loop.h" void helper_raise_exception(CPUNios2State *env, uint32_t index) { diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 834da80fe3..96cdb3c7e3 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internal.h" #include "qemu/host-utils.h" -#include "qemu/main-loop.h" #include "qemu/log.h" #include "exec/helper-proto.h" #include "crypto/aes.h" diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 134b16c625..1270a1f7fc 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -7,7 +7,6 @@ #include "mmu-hash64.h" #include "migration/cpu.h" #include "qapi/error.h" -#include "qemu/main-loop.h" #include "kvm_ppc.h" #include "power8-pmu.h" diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index 46eae65819..c7535481d6 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "exec/exec-all.h" #include "qemu/host-utils.h" -#include "qemu/main-loop.h" #include "exec/helper-proto.h" #include "helper_regs.h" #include "exec/cpu_ldst.h" diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 8c000e250d..6ca5d12207 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -28,7 +28,6 @@ #include "exec/log.h" #include "helper_regs.h" #include "qemu/error-report.h" -#include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "internal.h" #include "mmu-book3s-v3.h" diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index d3ea7588f9..f87d35379a 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -28,7 +28,6 @@ #include "exec/log.h" #include "helper_regs.h" #include "qemu/error-report.h" -#include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "internal.h" #include "mmu-book3s-v3.h" diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 2537cded83..cbc5889d91 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -17,7 +17,6 @@ #include "exec/helper-proto.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "qemu/main-loop.h" #include "hw/ppc/ppc.h" #include "power8-pmu.h" diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 49b6a757b7..7111b34030 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -26,7 +26,6 @@ #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" #include "qemu/host-utils.h" -#include "qemu/main-loop.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/riscv/csr.c b/target/riscv/csr.c index ea7585329e..de31818daa 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "pmu.h" #include "time_helper.h" -#include "qemu/main-loop.h" #include "exec/exec-all.h" #include "exec/tb-flush.h" #include "sysemu/cpu-timers.h" diff --git a/target/riscv/m128_helper.c b/target/riscv/m128_helper.c index e6a4f6120a..ec14aaa901 100644 --- a/target/riscv/m128_helper.c +++ b/target/riscv/m128_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "qemu/main-loop.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 7e2f1908ee..5355225d56 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internals.h" -#include "qemu/main-loop.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_helper.c index 762b277884..93aabd236f 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -13,7 +13,6 @@ */ #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "s390x-internal.h" #include "tcg_s390x.h" diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 576157b1f3..e85658ce22 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "s390x-internal.h" #include "qemu/host-utils.h" diff --git a/target/xtensa/dbg_helper.c b/target/xtensa/dbg_helper.c index ce2a820c60..3e0c9e8e8b 100644 --- a/target/xtensa/dbg_helper.c +++ b/target/xtensa/dbg_helper.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/xtensa/fpu_helper.c b/target/xtensa/fpu_helper.c index d2a10cc797..381e83ded8 100644 --- a/target/xtensa/fpu_helper.c +++ b/target/xtensa/fpu_helper.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 57b75882c4..12552a3347 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "qemu/units.h" #include "cpu.h" diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c index 10a2b51f91..03e2c1889a 100644 --- a/target/xtensa/op_helper.c +++ b/target/xtensa/op_helper.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/xtensa/win_helper.c b/target/xtensa/win_helper.c index 5a1555360a..ec9ff44db0 100644 --- a/target/xtensa/win_helper.c +++ b/target/xtensa/win_helper.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" From patchwork Thu Aug 31 12:56:17 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: 718987 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461104wrn; Thu, 31 Aug 2023 06:09:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBjbGg+0xjKkcgGcfvALc7Kt4plwOMlml99I0ssBSDJVGTpPEPJqcMtw7NRI3CXT8S+ikt X-Received: by 2002:a0c:f245:0:b0:64f:43b9:fe4c with SMTP id z5-20020a0cf245000000b0064f43b9fe4cmr2796708qvl.47.1693487350751; Thu, 31 Aug 2023 06:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487350; cv=none; d=google.com; s=arc-20160816; b=mU0hhpFqjVuMQTIZMiCOQ9puSps+dBBW6uEUO/2kx1wCXDUmJrG2EUnO9y6MsqJtQH vjNCebLPv9ngvovgnoxS6I+fCRAMFhF3EHnifUtaXjjWSKWzZtLBTpgaj8v4wyMiUWr1 RdFhJhSPEzYd9gXTAux8LcHI80Yh2ZKy2pcTOpA9jJTAFbJpC6NxyylqCFliLW8Tsd6G 97jv2mAeVL+zfJgcGrv8fD+sSKAONNJ1D75ydfRxEYKGI/OzXuYo20pkNOfUMU10Iopf qiKGPhi3LytQCRgN53vHPfOj6sVQvcACusATYMAh3swEBnaOGO4uy/7AXTwraxevoOqP FNPQ== 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=QjQL80nyATLPTIBkc5alImMKX6tkMfdHx2YY+WxS1L0=; fh=6MB1nhhAFdK3h8cGY4b/YKLqWeU7fzcVHeHQ1GAhPhk=; b=h6rMhJa1cQTKtKYOlHZfBN6H+UrRiY/YoXlIJe5YFdqdIXkCjveMVC1MHEBBzOjyc+ yCkRl598pE8g0IKobpm5P2Q6hZ1d8ZrUvkos6lmDO5lBxWVF48Zgy+PKOQS5Cpc4BZOt qb8OvX7tjlyGQVug9uWFeDH5CZIJmdExL8iqUqCoYFpOZR/QDocXWI9KcDdAxOO3GBca 2zf7cUZORk6Z0EGAhc7pXhW6VYXQ1U4u97x/t0ozwJTzLO0IxpnicWPzt+H9LnUafYw4 P4BlkGY37ZHmKUMAc1MgWltt1e5MvpDhiwzIZ/SoSk4loP5nzdzeKDgylTcsPclha/qu dqrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cebTV8R0; 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-20020a0cf5c9000000b0064cec5a2abbsi815233qvm.537.2023.08.31.06.09.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:09:10 -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=cebTV8R0; 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 1qbhIA-0000rE-Dh; Thu, 31 Aug 2023 09:00:58 -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 1qbhFf-0003IJ-MI for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFc-0005YH-7I for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:23 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-31c4d5bd69cso604471f8f.3 for ; Thu, 31 Aug 2023 05:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486697; x=1694091497; 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=QjQL80nyATLPTIBkc5alImMKX6tkMfdHx2YY+WxS1L0=; b=cebTV8R04yWBkOGOfo2qgQ7yYxe+zWEnQr7thKkWwHrwn3g1WqKt0ojULVdAaKH6bE Cx6e7x5lKH4oDvOXoyaeRJZghPnIC/pUgtIUAQTottoEcZ9SHcoJ/9Pl2tV4E8xgpNVx u/mCdlEENYi4p9n/3No7PD0Fhss929ohANuSDAUwxp0ntOovVV9/pLiLIvy9DTkBK9mz pwbun1M3VN/knZX3mP6D/D8N8ksCHzJFXrgYwAkP1buNlP/ZIBdxFB81Kymd3JeL0sC0 Od9QWq4mjXeQM8w+ZeGGehaYdkzmRP7zNq4FYzvBs0J1rtqZe0b8F9Bhi8PxcdKfS9ur PmjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486697; x=1694091497; 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=QjQL80nyATLPTIBkc5alImMKX6tkMfdHx2YY+WxS1L0=; b=B8zHtyvlEZOb8Da8xf5aE3dTyog2cOQ5XXwtbVoHGOoVIojcfXgNdmSO8iE/2A7xuP MOPttZC6L+uPVupcJPokBtn1Y6ThKLz12X/ajkC+Jrck0K2JDnaa6+qZWGhPRQZfFhwd N9fs8A3HLR1+TBoJaEKzKoOhg5WMVMXFvYxf9wMqgBJVmmUQDjs6xVkTMpXfsRfy+uSu 8GNtD2cGrOWduZPu8BCCMC3gIte4K3buzGFMMQaLS3JF49VTv7xft7xHlTESvmmOgl+L DplA2mrC79MApO62cMiQdOY5U20t1GdO45xsIFBb0AOFjlWa/k3qaUbv2gUq6ax7tLH8 0Xzw== X-Gm-Message-State: AOJu0Yy5LrcYnj7eS+rxTI0XHt5wl12Ptm8Qzu3yAZrOBaI9BlIqkFGf 9ewv70iGg/b36eHvY4zelM7ar0Bs7QgxhimJIS8= X-Received: by 2002:a5d:574a:0:b0:317:3dff:7189 with SMTP id q10-20020a5d574a000000b003173dff7189mr4116020wrw.66.1693486697342; Thu, 31 Aug 2023 05:58:17 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id r5-20020adfe685000000b003143867d2ebsm2184094wrm.63.2023.08.31.05.58.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PULL 15/41] target/mips: Remove unused headers in lcsr_helper.c Date: Thu, 31 Aug 2023 14:56:17 +0200 Message-ID: <20230831125646.67855-16-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 This files only access the address_space_ld/st API, declared in "exec/cpu-all.h", already included by "cpu.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-9-philmd@linaro.org> --- target/mips/tcg/sysemu/lcsr_helper.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/mips/tcg/sysemu/lcsr_helper.c b/target/mips/tcg/sysemu/lcsr_helper.c index fb57bcbb78..25e03572fe 100644 --- a/target/mips/tcg/sysemu/lcsr_helper.c +++ b/target/mips/tcg/sysemu/lcsr_helper.c @@ -8,10 +8,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "internal.h" -#include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #define GET_MEMTXATTRS(cas) \ ((MemTxAttrs){.requester_id = env_cpu(cas)->cpu_index}) From patchwork Thu Aug 31 12:56:18 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: 719000 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462831wrn; Thu, 31 Aug 2023 06:11:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4qI2Xx9WZu5LWIb2eunGVwlNhE12eiNs5TpQZ9T0pgjiEcYpEjjmd4HDBKmvcbki3iFkN X-Received: by 2002:a05:622a:1312:b0:412:c2a:eaef with SMTP id v18-20020a05622a131200b004120c2aeaefmr3175781qtk.11.1693487501308; Thu, 31 Aug 2023 06:11:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487501; cv=none; d=google.com; s=arc-20160816; b=Usg7z2oJQtUULFG7/xpwlHBHQHfjA4aaRJoVsj7PZDkZm3k/xPFI60Z5u7+GEhjpTq 6mA+yz9G2K+c7lzz7ZeaNtAeChRkHP97xikOsGh0WJYWtKq3bF0Qg2q+uMtVMQtKkDC2 syj8rbWEDCiZUZtVLR/XfsoEEZLLlhvTij8DNDq1wkpYUhtweUz97uGXkg4WR/6/F+8A p7g20dpy//ANClH4rB25bcdSILX3LLDG8xruwzaU3QITM/WDD1xHZLGpb9kVUk34FA5W C/q7u2F/Alslgdpm880l+bcLM8CaNkP7snMXEYijxSqhsKvYZyf/jlxjEIc8HHExH3Nz UAow== 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=npXC2cUG3xwBM86LQFtlABD0NAvwwGboOAIVdLWrRRI=; fh=dr7PdaRKoWbuNE9hteFBhkgFoOt/juYsjcguatGTkbU=; b=WdgLrIpNBsPBJ0wLnrHDKLdFomApv7Vf+DOGPPZBwXXxaotVHdhLakiwAywOvoWodb 4MJ6q93PsacUwCKmJDmoH8oQ0RCnhBTr6X5oemgiQvC2sfbF2RpVrl8SEFbBgAupfLa+ uiN5nw8XXNitErFyElXR2UZg+PsCZvkFf6uqFAAu4pbcKZVI0OhP+1w8JxhKBybbvmJh SGM34WofEfMEHvoh0U0xBCkhNtpoV1AM4ee7unvXmbJyLQgKOQuaoHH7IjZ0gEW1sD0R 7DZg1FwiK90OEAiFfk0Si0W4Sj2fUcuyPUjbvmIvkJxUmStiHBDGc1IW2D1k2g2Lq3ti EfyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M6c02v5U; 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 s16-20020ac85cd0000000b004054348657dsi843507qta.618.2023.08.31.06.11.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:41 -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=M6c02v5U; 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 1qbhIu-0002Sy-1Q; Thu, 31 Aug 2023 09:01:44 -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 1qbhFl-0003KC-Er for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFh-0005aJ-Cf for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:29 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fef56f7248so7533865e9.3 for ; Thu, 31 Aug 2023 05:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486703; x=1694091503; 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=npXC2cUG3xwBM86LQFtlABD0NAvwwGboOAIVdLWrRRI=; b=M6c02v5UqYa4WmSRhnXr81EZ8h646oOAEtyJMpQLOm2jEfnUPS/aeHCnf7uWW9BznD tSS5Afi2uttVt/WuXUcFgty6t1mjkk644s/cTn6PephoVZ5u5grPvpC0hUko1Gh9fkCu y+oFHz4drO4CpePNxdi8Sy7bEkHDN5qteGY4EFm93OXTvdC1IYoOzKdo3zeY+DCCwqis i6bawe4XwVQy+EMxygHK/R8x+Q5HpFXh9W8r0NrQCcjE2vj2yl23Rln6IPMZSAHOh+mu eMEenChJf53ubz72RoU1x/XOSUp2Hg3Ya++dUkDRfBWBrw7fKyDmHFl0H/ljDjcf4OvW tMxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486703; x=1694091503; 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=npXC2cUG3xwBM86LQFtlABD0NAvwwGboOAIVdLWrRRI=; b=Gf73c4P4FdfsX6qR5BfD+BiAc/kzckSsRfkYM8W2GbvM4zoZFzlFHG4kYnTF2b+zRe Pdh3JUMHVSTFmjDQzjpMlPRBqT4CXEeqOA1V2fW8bpuqr46OJs5WROu645LEtoWVmp2E 3kxDET/qs2BaqIydXZZnqLgqejaP6V01/x0a7RAfYC/kMKVp0tOrJoVjtx79KbqBwnIF SF7WjGyle/Ty+Krxpm93+Kq+yWls6p8IvH/FgFElGKXEFv0MG/ZRzO3IafY2yUd+gnzY SnYJHfpTtaPHUPy5YptwPmRMHMWn08vlGoaMWklzwbXa28gfYTmdW6K7wV702ASq2QSg wHng== X-Gm-Message-State: AOJu0YyawplxZpsIqyR66LzePycenD66UCyKuLspj3AHE+ZTbBQtPVqT r2MzrjV0Fkgmh7HRiofo0AY+dAMM821QT5rZeyk= X-Received: by 2002:a7b:cb8f:0:b0:401:d258:ad26 with SMTP id m15-20020a7bcb8f000000b00401d258ad26mr4401784wmi.19.1693486702890; Thu, 31 Aug 2023 05:58:22 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id y3-20020a5d4ac3000000b003141a3c4353sm2134044wrs.30.2023.08.31.05.58.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Max Filippov Subject: [PULL 16/41] target/xtensa: Include missing 'qemu/atomic.h' header Date: Thu, 31 Aug 2023 14:56:18 +0200 Message-ID: <20230831125646.67855-17-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 Since commit fa92bd4af7 ("target/xtensa: fix access to the INTERRUPT SR") these files use QEMU atomic API. Explicit the header inclusion instead of relying on implicit and indirect inclusion. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-10-philmd@linaro.org> --- hw/xtensa/pic_cpu.c | 1 + target/xtensa/exc_helper.c | 1 + target/xtensa/op_helper.c | 1 + 3 files changed, 3 insertions(+) diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index 6c9447565d..8cef88c61b 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -30,6 +30,7 @@ #include "hw/irq.h" #include "qemu/log.h" #include "qemu/timer.h" +#include "qemu/atomic.h" void check_interrupts(CPUXtensaState *env) { diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c index 43f6a862de..91354884f7 100644 --- a/target/xtensa/exc_helper.c +++ b/target/xtensa/exc_helper.c @@ -31,6 +31,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" +#include "qemu/atomic.h" #include "exec/exec-all.h" void HELPER(exception)(CPUXtensaState *env, uint32_t excp) diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c index 03e2c1889a..7bb8cd6726 100644 --- a/target/xtensa/op_helper.c +++ b/target/xtensa/op_helper.c @@ -30,6 +30,7 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" +#include "qemu/atomic.h" #include "qemu/timer.h" #ifndef CONFIG_USER_ONLY From patchwork Thu Aug 31 12:56:19 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: 718999 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462717wrn; Thu, 31 Aug 2023 06:11:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENeo3Wh2BTh9buvgdfesoE5185QG6lxFOys7RqGTcIEs2KpB1ihbBkmcNHx/FEjS3kRbCK X-Received: by 2002:a05:620a:1789:b0:76c:5715:b4a3 with SMTP id ay9-20020a05620a178900b0076c5715b4a3mr3383436qkb.13.1693487489068; Thu, 31 Aug 2023 06:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487489; cv=none; d=google.com; s=arc-20160816; b=mcHjlyJTepFavyg1gUYllFHuAEm4k+VR+1SB0WpuSZrmezcZYOrGRApKUDUPQlhIl8 cdE7SvDRqoVTkEiktJcI48XliKAbyzALduGj0evqLNLaNAWIyDuUnrBBxPOIHa66SrfL napACi9ZCoJYpry4EDz1r6+9qjomz2/OhbTlWgSq+gH/rLUA1wnpP+7iv0uUDZil3hCd AkMHEE+iJeq3EkkczDtoWuMobEvtbIKVNjVijiKMEh2q4SliVa6xgM4XhzxLCt2irqz6 lvDr8f4XDKNLY7ohpKDkP8eYax5i+QXYslrZotvfsENxHinGADcFdfo26pZoDvbMcGQt pW5w== 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=w2l3etk60u9ufgIOfv/s6JAhxToUw77UDbpQWhQFU8I=; fh=ehJgi6qtc5GgGFSi7kUe5Uk36tkdtVlia04EiCfbU/Y=; b=xkoE8f2DTAqycw98bQyIUwZJObrpRG/DfBctFQ6Se4TOqiqslPIhNSXexDAa2LTFGr +GMHT2dcEIi2XYidiwBZ7gpbhNoKEjvL+DvQEHlRvKXq2CcM03czpaFfLhE1KcmRnqJE jyigD+fNwYg8CeVrBT52CFbF5vpx0KMsO3HizoXbV/0TbDD1R1b8OG3Y5bme73xXOAph EGwd/EfBpfxSBNJ271I1sO+JkI135qbwx8JrkkeNbsrp+ulAXvS+VQAe98MW14NJbFYZ 5/PWTjGEvUzNAWflXthwRuHZJRoehFeOFg7J5vpLXFQPzUdQIyrmk4A33vkCB96H8WwE BnnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mwo5Z+As; 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 qd9-20020a05620a658900b00762216391bfsi890767qkn.767.2023.08.31.06.11.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:29 -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=Mwo5Z+As; 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 1qbhJY-0005Tm-MH; Thu, 31 Aug 2023 09:02:32 -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 1qbhFp-0003Pa-Eq for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFl-0005c0-L4 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:33 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4018af103bcso4756485e9.1 for ; Thu, 31 Aug 2023 05:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486708; x=1694091508; 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=w2l3etk60u9ufgIOfv/s6JAhxToUw77UDbpQWhQFU8I=; b=Mwo5Z+AsbGQCYpaTW6CftIo1L21sFXa9Xrb3tkMT3yuXCyDAPdeZdc1vQhUobpceBx 6hk5xLrU4g/wpD1chFcenaIXOB8Us8I8u2iYcYLbmRLNq5OhiRtXiEbM0UGq149bYWc9 qMjBnH0oAU0qYVOOIN2JvpKvLkQtZ8zfS1fhGP7gVnr9MOe7sjQfH+g5kb8DxAtCjRXh 3QH0+jUePmRRIac/bh6aRGXyBXTPFiZwxa496CreC69ldKWyXQHt74RsFU/ZlSAON5DJ 3GYFknVOYpIV5TvC1fZ0ZzNbUP62QTfwBaDIDOskFkhacR9mCicVLg4j43rpwT1gNF19 BOBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486708; x=1694091508; 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=w2l3etk60u9ufgIOfv/s6JAhxToUw77UDbpQWhQFU8I=; b=GyPTET6fsOrpYSfKS4XjX+LuKePn+4x9Zfz/SBmXfSUeJtFAzfrvgxoiHWFrUaxaoi sLdrpQssT/9NNKIHA48fn6WEVwU6Y4OFgpyzksTkHa7q7n7O4RQefAILrxU8Bw0yqgK4 Q4KB7vimQU76Tmo94XLoHT1l7DIKgRjH3ZNSm1H6LiLJ4oF+5YpEuvYY3qxpl8p1Sypa YCY4C+eTeELanvUAWfu+HYidA5eMe5aRbff3htKh4G5Qpe0SsNNf79koBcq4pQnmuWe1 SAGK2cd50stxmlN88lwq/OAArVue9bSE8Q81mRTIN3uH4CYMXCznk1tzeQWvIggcwJWx byxA== X-Gm-Message-State: AOJu0YzrkXY+Ekt/eByGZ7AG3IlpdD3VXnix+jKaGukvkXF0nTgbHIIk FD/5ZXB0Bx0FZHJS3nVpFU0xRFaob5gWjzrEKr4= X-Received: by 2002:a05:600c:3591:b0:401:bc03:1aae with SMTP id p17-20020a05600c359100b00401bc031aaemr2130849wmq.12.1693486708110; Thu, 31 Aug 2023 05:58:28 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id hn8-20020a05600ca38800b003fee6e170f9sm1902522wmb.45.2023.08.31.05.58.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson Subject: [PULL 17/41] qemu/processor: Remove unused 'qemu/atomic.h' header Date: Thu, 31 Aug 2023 14:56:19 +0200 Message-ID: <20230831125646.67855-18-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-11-philmd@linaro.org> --- include/qemu/processor.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/qemu/processor.h b/include/qemu/processor.h index 8e16c9277d..9f0dcdf28f 100644 --- a/include/qemu/processor.h +++ b/include/qemu/processor.h @@ -7,8 +7,6 @@ #ifndef QEMU_PROCESSOR_H #define QEMU_PROCESSOR_H -#include "qemu/atomic.h" - #if defined(__i386__) || defined(__x86_64__) # define cpu_relax() asm volatile("rep; nop" ::: "memory") From patchwork Thu Aug 31 12:56:20 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: 718997 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462600wrn; Thu, 31 Aug 2023 06:11:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPl5jq+M1UhxH7BDar0lHVPmeVV+uJrYT11Px4P+Dx1WqK81WXUyaMdC4AW7d5YQZS3zaJ X-Received: by 2002:a0c:e441:0:b0:64a:3320:8a8d with SMTP id d1-20020a0ce441000000b0064a33208a8dmr2887071qvm.30.1693487478002; Thu, 31 Aug 2023 06:11:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487477; cv=none; d=google.com; s=arc-20160816; b=aDMsaULPhaqYSbHFsKb5zTyRyS3Q5hwcRcdSNMlIbhEzE5L8MeImqlqlDYbzyOXCJu XpS4q6PDG0ENEw+mlmA5GkNtVeiqIaenbLeeg3aUpUn6fYxXr1TuJXIHEbXwWCdl7+QX nQ49hEpS7o0El7MnEAVlFw6FYM8DfC8HCYjKCJH2CuJM58BUiS9Nm9Me1eA4qXrA1hZg wYp917NoZ6kAQ/Mebxn0C153uCxmr2Y1IvxA/zxRlebCK1FgmIM/n2+TPdXF72VYJb2P hBNidOxbYqWaRfsmmM/UlR09Ht1lI3reV33HRI9MdaL+L/PvVGplBMeAQdKJz5YNWIRH tuNA== 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=1e6wfOUuMKCjdsL213yjWvY/4BGAvkNLIa8eLz9Omvk=; fh=ehJgi6qtc5GgGFSi7kUe5Uk36tkdtVlia04EiCfbU/Y=; b=CWU94K5IRiROdudBjHfIzSI41YPTHs10I43PTR761WARAqiIrXxN7F3LP73kRYqoOO Pj/wv7OKI00fHD4i2r/mQS/qKAFDsBasT4T3ub4MgWciokzy+4QSFbI7+OIFh2vYsFOu l2UL0RrRKhTCnQopsy0TLXpsoIiVp+GmXSIS4cJvlHzROcLPLFmzVu7UljphUHiioXKa BsZkdoPpDAugayzEV5AKbiRd1xlEZ/24fzO83ojk1RQDH5wSymzd/x2pweWbrMzihRjv INDOuMXZ2C7Eh2MK6BCaaRKGyjvS+oWp4q+pfnSDEOEWbgEwi30HuociCILr/OhS3j8H Cf7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GqF3GdQV; 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 m4-20020a0cf184000000b0064b3487ffd0si844255qvl.135.2023.08.31.06.11.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:17 -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=GqF3GdQV; 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 1qbhKN-0006eG-4D; Thu, 31 Aug 2023 09:03:15 -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 1qbhFu-0003cE-Li for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:40 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFr-0005eA-PI for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:38 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-31c5c06e8bbso635371f8f.1 for ; Thu, 31 Aug 2023 05:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486713; x=1694091513; 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=1e6wfOUuMKCjdsL213yjWvY/4BGAvkNLIa8eLz9Omvk=; b=GqF3GdQVzYimY9Po0NsGNUukTmmDDvsPWS/nUcIXw+JBi/N+/oL9qpzAzNN2aiDHkI 9ofSg81Gi/P4Z+/TGoTmVsUh76Hchj044h2eyZe4QS1+QDWZmdL4G02Ndzui2eEywxhc ZXbiOVuGj1cd0cyqO9QguLxF2Stp7uOt7TLJ0dMcuod+1JF7jNcM6qZelmyezgsbvFw4 Cb2wJJs5qaBf5I8gcxEgZcpCt2uk9mwmMMwc7AXLiTIBIOZ4ORbQ9XgTyn0mOscYg5nd T6woG8kSpF0hsabxvgV9addb3+NTftYVbZxCnpsplbGvg7rqm1lkYj2sRokO97aMuyio sIRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486713; x=1694091513; 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=1e6wfOUuMKCjdsL213yjWvY/4BGAvkNLIa8eLz9Omvk=; b=HD1mJN0J8ygjSKb+737ElMrlUO0C3M52uHZgrpcv7xo4icJKSijNlrB15R7E9kbz76 YtVQEj8gAhh+eMuVUysrlu6qVwQJesJhtAVsRXHwXkoVee8qk7o94ujmuMLdFRbUwrtF FCnxEbTysQGu7RRCJOcUUf9iMD0dC8ORKy/DyjbQwT4sI2+S3H1BiMYk84X1T+FS17sZ G92jiCnMHVECP7vezBRfN218XQR4muYEb5H59+gZS4+QQI+WimnsCc67fLfdvwMB55YS gbomJhAql7GXJBSmX+4H2YeSfp3YSfz+3uTWaSVQhwW8Xqf+PUBq4FVQKWe7chp4QdXi RSkw== X-Gm-Message-State: AOJu0Yzn48r7pv6b7b6MUFninygCaiQcNGfvIqrNW2UE5VlwNdwdFmQL XfpBe9x4Cgs3LMQpSgEGQfsk+IRWVycSiRDMZNw= X-Received: by 2002:a05:6000:11c6:b0:317:5b76:826 with SMTP id i6-20020a05600011c600b003175b760826mr3994669wrx.0.1693486713368; Thu, 31 Aug 2023 05:58:33 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id e2-20020a05600c218200b003fef5402d2dsm5122621wme.8.2023.08.31.05.58.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson Subject: [PULL 18/41] exec/translation-block: Clean up includes Date: Thu, 31 Aug 2023 14:56:20 +0200 Message-ID: <20230831125646.67855-19-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 'qemu/atomic.h' and 'exec/target_page.h' are not used. 'qemu/interval-tree.h' is only required for user emulation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230828221314.18435-12-philmd@linaro.org> --- include/exec/translation-block.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/exec/translation-block.h b/include/exec/translation-block.h index 5119924927..b785751774 100644 --- a/include/exec/translation-block.h +++ b/include/exec/translation-block.h @@ -7,11 +7,11 @@ #ifndef EXEC_TRANSLATION_BLOCK_H #define EXEC_TRANSLATION_BLOCK_H -#include "qemu/atomic.h" #include "qemu/thread.h" -#include "qemu/interval-tree.h" #include "exec/cpu-common.h" -#include "exec/target_page.h" +#ifdef CONFIG_USER_ONLY +#include "qemu/interval-tree.h" +#endif /* * Page tracking code uses ram addresses in system mode, and virtual From patchwork Thu Aug 31 12:56: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: 718998 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462687wrn; Thu, 31 Aug 2023 06:11:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHn59y+1r+2NUua0pAkk9SRbf1ko1A41lmS/uzhW5GahcKh+MlUbK29zo8tC+HqtvXLqBlW X-Received: by 2002:a05:622a:350:b0:410:37b2:3c98 with SMTP id r16-20020a05622a035000b0041037b23c98mr3170568qtw.38.1693487485049; Thu, 31 Aug 2023 06:11:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487485; cv=none; d=google.com; s=arc-20160816; b=Db64DmCg4YqJb5WTy6Tdoa4PuMCI1ImOL98Jcip3htvRJMI5qSYcbDFmo8qUUD3vLa 2ncchPoI/eTyNlEDJxxDAMo6r2TgBWgW+cXoR3ovvvdiQyu3YHa7gR9kyjchLkGJAmW8 qdsq2lWzhE0VPmhvY7P88/owzSpTXLbqDtaTHUhXcHOYSl0JL1unMtyEOYBWKi3QvKLl sm2ZKwk4IXFFm6fVke/k2pHywNegJfnZwH3Izz7+GUxPu7S5815xICwp87KheCkKbmKF 0KN03OQSqHx4rDqKSVZ6lCTTZ5gtgi3Kuthim+tnEciEULt2vwXPiIGkNwsgRhveb0Sp aNeg== 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=lc+zehBV0WTpSARPKJiAuhNqXhUfl1UCHLHXG51mOVw=; fh=L4xYMHiSCfHm3TO7F0WSv42URi+Ecb3wLcnZOGsxOjw=; b=W68mZHig7p1aN9YtXW4Vo+JJ7mwmzDvU1XYVfV9sAxT7pyxjcETo0qpRlRdZFgAVQq J3V11KI4IhWoC6MdK53knveJ57d+MXUqHxxK5mA5WXYnuRLZaR0awKkJo+hjVqwVMNcE wVjqnSvazUazh7Fo8hV+Q1q0MDnur2/7In13MCGQPB5esKUJfUYXLYCBb2LJNFgywc1k o+aVCRMzSfsvUGm+zhSb/UkzY6YqetCWaCDB6ITnwIXptjMY8znMa66JKscKqEwgefql riRrQwnJmtlfcbktHAYD/7qEfUvNRRmUzU58jMXEWLeQEpz2gM3TUbhsoUA19cM6LgiT UXZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iKVejxWm; 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 s9-20020a05622a178900b00403e9e235easi797912qtk.709.2023.08.31.06.11.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:25 -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=iKVejxWm; 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 1qbhJ2-0003VM-LL; Thu, 31 Aug 2023 09:01:52 -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 1qbhG0-0003lw-Ge for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:46 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhFw-0005ff-Ce for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:44 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-401d10e3e54so7222775e9.2 for ; Thu, 31 Aug 2023 05:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486718; x=1694091518; 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=lc+zehBV0WTpSARPKJiAuhNqXhUfl1UCHLHXG51mOVw=; b=iKVejxWmiOlaX7GwaZhPI00nnP4mRWxHV5NWtMmhza8vkLICaoFbTz8k/1WUU0RWiy M8JeVs4gAIyD5kk7Oyq3Kaef91CwojZ/e7qJdzBOALnplBBJKtkmiB4v8VMA/49mexq+ 431hsYh3t06rueoznQNw51kk7G11tLzB4NQlGc4EUhLD2zp0muQo4ehPsRmSBkyGx1X0 elSXlpr+O6NqfVFqVhXKV+7YZzoQNt7lu3B6rcihmzv1DoybQiicBqWLZFDudobHGZTb PUnRE+swSFTxAJn7x7yLGKc9sVdLewRwCj0kDP8LihWaPg0EyBHUkOdqOpWue6Btdfoj 0a1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486718; x=1694091518; 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=lc+zehBV0WTpSARPKJiAuhNqXhUfl1UCHLHXG51mOVw=; b=SREDqkxei0L0+llDzCMqT9AvpNNe8efUcrdKIYKVfhkSAI7AMoUOHHctXLuuubDBZT KJuWhNrSTh3F0FzUdXCl4rZqLbAH16Z6PTOD+g7OQlT4V2V3VOa7l1R/GHc23EXONUSW 81kVLPaTPxLef2HUN3TDdZdtY5kz/+y3mTZSpxUfS99rnubwKGLxEO1W6b/LKSzHtP6u JNN3eOQ9Txowmn04ID4CRmGoWLir9eGtwMv805h9sk/MaclNZ63Znu1lSlRG9JAFuo0D FZBp9dmrt1G1GCixQsh0olDeT64ze+kn7M4Kf4vJr3LI7sXHXxz9DlKUBJV7SgTmpbkN STpQ== X-Gm-Message-State: AOJu0YyeyEa1vTDhFLfn7BCyoESH9qdWaY3dcZ1aXzJVQObgE6mbcY1G ZrG1sIfwwN6LTUAu1F+l5wBfP8vDA2hLIPHkRJY= X-Received: by 2002:a1c:7215:0:b0:3fe:111a:d1d9 with SMTP id n21-20020a1c7215000000b003fe111ad1d9mr4139380wmc.25.1693486718798; Thu, 31 Aug 2023 05:58:38 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id e2-20020a05600c218200b003fef5402d2dsm5122852wme.8.2023.08.31.05.58.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Subject: [PULL 19/41] chardev/char-fe: Document FEWatchFunc typedef Date: Thu, 31 Aug 2023 14:56:21 +0200 Message-ID: <20230831125646.67855-20-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 Signed-off-by: Philippe Mathieu-Daudé Acked-by: Marc-André Lureau Message-Id: <20230705133139.54419-4-philmd@linaro.org> --- include/chardev/char-fe.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/chardev/char-fe.h b/include/chardev/char-fe.h index 8c420fa36e..0109602d63 100644 --- a/include/chardev/char-fe.h +++ b/include/chardev/char-fe.h @@ -175,6 +175,20 @@ void qemu_chr_fe_printf(CharBackend *be, const char *fmt, ...) G_GNUC_PRINTF(2, 3); +/** + * FEWatchFunc: a #GSourceFunc called when any conditions requested by + * qemu_chr_fe_add_watch() is satisfied. + * @do_not_use: depending on the underlying chardev, a GIOChannel or a + * QIOChannel. DO NOT USE! + * @cond: bitwise combination of conditions watched and satisfied + * before calling this callback. + * @data: user data passed at creation to qemu_chr_fe_add_watch(). Can + * be NULL. + * + * Returns: G_SOURCE_REMOVE if the GSource should be removed from the + * main loop, or G_SOURCE_CONTINUE to leave the GSource in + * the main loop. + */ typedef gboolean (*FEWatchFunc)(void *do_not_use, GIOCondition condition, void *data); /** From patchwork Thu Aug 31 12:56:22 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: 719016 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp467368wrn; Thu, 31 Aug 2023 06:18:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEprUAp0c33Uqw0JReRfwBHgsxsdMm56aHJbgMiWRXT9prfyubj5FcfBFEOrNpWPBQPITou X-Received: by 2002:a5d:4906:0:b0:317:597b:9f92 with SMTP id x6-20020a5d4906000000b00317597b9f92mr4041964wrq.57.1693487932802; Thu, 31 Aug 2023 06:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487932; cv=none; d=google.com; s=arc-20160816; b=sYpvC1i+ZH0yMneqMfPQ4TaNFw5cfJZgTmT8gRNHhW4Nq8U0VXmK3jLQwf6SFb2ehe 7KcVupj8bak8qdK8ZQYB/i3HZZZg65AA9qxZBsK0fSbWNnqePZSM+f/6rMcNJVwozXlj Ir9rrVr0jwB3KYhqykLPYUCTSP4IiYPLlchFZb1Pic9+mjWBYjj/PYGHygVCilQCdBYD zdLNFPgKnIO4cJViHBdE+lsK8T3JqzMUOa3tImRZ+jWQAPVAqiMx7gqrGeBba8qf7gUA IiBdM9jK7tgMMcNpIEXwTGr+yK5X2EjEoSODXwTbqsFZlcnBID/ELjyj+DSvREIJtq5C V56A== 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=ltDvR2BAZ2X9usEMn+DOp5maTDaOUlNKujgVGnXvoz0=; fh=VjG573EgGAsaBW2kGScQR4gyST8ub8MoFdZGdiyWK50=; b=X6rmxXCMAIPQjFf+VeaHOgdNQYtnh071PpYgpxltlGEGdNokPkQYKngbAcb4UJxdPq 7g9s+7p3E8B853q8pR05EuHRYpOwizK6JZqv2ehb8Mjpgp91koYCiK86Mdu8Uw2tAbGv DmCi9Eo/A9ZXyQ/3/TCifwQwt8j55I1sZqj8utSdqRSt20i286qinDNdTTLE892oyCYw FXSH1wNd070Kc7NSVlv3N4/UOXGQUiZ5pG+KlaAR8tXeDrxmbFAdUVqNcFiu6KnkNNu0 ChZ5EVJgkgv/aDVnc2HMt9kvTSfW1eLFAHQMInlcEC/ESKfaYdyl3aQ8snrCaatsZ/+O 8Sfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RQWvn9mT; 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 v35-20020a05600c4da300b003fa782a8847si788077wmp.62.2023.08.31.06.18.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:18:52 -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=RQWvn9mT; 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 1qbhKV-00071C-Lj; Thu, 31 Aug 2023 09:03:23 -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 1qbhG8-0003vb-2C for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:53 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhG2-0005hn-Qf for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:50 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40078c4855fso7030295e9.3 for ; Thu, 31 Aug 2023 05:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486725; x=1694091525; 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=ltDvR2BAZ2X9usEMn+DOp5maTDaOUlNKujgVGnXvoz0=; b=RQWvn9mTH7BAPI1Z4djAcIBodSx0Bth8vAMbZI/6sVBPZ5U9CdNkWHKcImlsBO1zci v080mo36q2Yotz9lXXdR3ddHOlZQ74jLaPCul3VAGq2flLVkumw3Oi0IQBMxgB6inTSN AYmVf6E5nT/cMM0hRzOq8FzAZwKJc7TmAh3mquts90ZIKdOqPa/IT9lsJpiapoKmbR/p TaoqjZgf9xg7iLlo1g2Q0mg1avNIq9e2Tcry2qsZ60Q1Bgw5elHQcfPpWwM9EP5YLgPr 1X7rAOLfLH/GE1+IXSB+pq9M0QnHAqQK5Yj9dwbhl32JPNniEIeuHO8t5iQY9vyMtZTA AbYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486725; x=1694091525; 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=ltDvR2BAZ2X9usEMn+DOp5maTDaOUlNKujgVGnXvoz0=; b=M12EuXhMjYvDb/jkjL9EtSkk1WMYIv6DbnkaIQSZqwMves26l36u67M34dr5aTq/Ya 7VadhJDLZzimlc7cuOU3hx11VXaCk0a4TkUTgMMkI7VL9kocTHeRdUh0BtzJImk+u6Th krKXqOLl7T1+6ZNfE3rL+jH22FkDsZ34DOdWPCmwsj2ZBxzxYois4gmHFPBLSCU1eJ40 fKpeBYz+1edI8/TDqQL6qyInmbqf+1TXbCrCZ4F2cUe6fHCFrGDksgVD/7OTwmZGSIjC 4JxrOhmb0Rim2vufikicKc/ItbvcH/oz/aENtjM+MYoZ1VyH0BH/M4REDBxnc/KWqeYm t1Qg== X-Gm-Message-State: AOJu0YwWaNFjgWJtTTP/o2JKUfikvzS486tYbqMCOzbMaCfLUTgd7igH fAcI+uyyIwtNXW+3BftBys7zIx+G5oUIGFDRg9Q= X-Received: by 2002:a7b:c3d2:0:b0:401:d947:c8a4 with SMTP id t18-20020a7bc3d2000000b00401d947c8a4mr3797191wmj.29.1693486724996; Thu, 31 Aug 2023 05:58:44 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id z8-20020a05600c220800b003fe29dc0ff2sm1930778wml.21.2023.08.31.05.58.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , "Edgar E. Iglesias" , Alistair Francis , Peter Maydell , Paolo Bonzini , Joel Stanley , "Michael S. Tsirkin" , Laurent Vivier , Amit Shah , Gerd Hoffmann , "Dr. David Alan Gilbert" , Markus Armbruster , Jason Wang Subject: [PULL 20/41] hw/char: Have FEWatchFunc handlers return G_SOURCE_CONTINUE/REMOVE Date: Thu, 31 Aug 2023 14:56:22 +0200 Message-ID: <20230831125646.67855-21-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 GLib recommend to use G_SOURCE_REMOVE / G_SOURCE_CONTINUE for GSourceFunc callbacks. Our FEWatchFunc is a GSourceFunc returning such value. Use such definitions which are "more memorable" [*]. [*] https://docs.gtk.org/glib/callback.SourceFunc.html#return-value Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Message-Id: <20230705133139.54419-5-philmd@linaro.org> --- hw/char/cadence_uart.c | 8 ++++---- hw/char/cmsdk-apb-uart.c | 6 +++--- hw/char/ibex_uart.c | 8 ++++---- hw/char/nrf51_uart.c | 4 ++-- hw/char/serial.c | 2 +- hw/char/virtio-console.c | 2 +- hw/usb/redirect.c | 2 +- monitor/monitor.c | 2 +- net/vhost-user.c | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 807e398541..eff0304a18 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -307,11 +307,11 @@ static gboolean cadence_uart_xmit(void *do_not_use, GIOCondition cond, /* instant drain the fifo when there's no back-end */ if (!qemu_chr_fe_backend_connected(&s->chr)) { s->tx_count = 0; - return FALSE; + return G_SOURCE_REMOVE; } if (!s->tx_count) { - return FALSE; + return G_SOURCE_REMOVE; } ret = qemu_chr_fe_write(&s->chr, s->tx_fifo, s->tx_count); @@ -326,12 +326,12 @@ static gboolean cadence_uart_xmit(void *do_not_use, GIOCondition cond, cadence_uart_xmit, s); if (!r) { s->tx_count = 0; - return FALSE; + return G_SOURCE_REMOVE; } } uart_update_status(s); - return FALSE; + return G_SOURCE_REMOVE; } static void uart_write_tx_fifo(CadenceUARTState *s, const uint8_t *buf, diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index f8dc89ee3d..d466cd93de 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -199,7 +199,7 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque) s->watch_tag = 0; if (!(s->ctrl & R_CTRL_TX_EN_MASK) || !(s->state & R_STATE_TXFULL_MASK)) { - return FALSE; + return G_SOURCE_REMOVE; } ret = qemu_chr_fe_write(&s->chr, &s->txbuf, 1); @@ -215,7 +215,7 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque) } /* Transmit pending */ trace_cmsdk_apb_uart_tx_pending(); - return FALSE; + return G_SOURCE_REMOVE; } buffer_drained: @@ -227,7 +227,7 @@ buffer_drained: s->intstatus |= R_INTSTATUS_TX_MASK; } cmsdk_apb_uart_update(s); - return FALSE; + return G_SOURCE_REMOVE; } static void uart_cancel_transmit(CMSDKAPBUART *s) diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index f70adb5308..51708c0836 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -147,7 +147,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond, /* instant drain the fifo when there's no back-end */ if (!qemu_chr_fe_backend_connected(&s->chr)) { s->tx_level = 0; - return FALSE; + return G_SOURCE_REMOVE; } if (!s->tx_level) { @@ -156,7 +156,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond, s->uart_intr_state |= R_INTR_STATE_TX_EMPTY_MASK; s->uart_intr_state &= ~R_INTR_STATE_TX_WATERMARK_MASK; ibex_uart_update_irqs(s); - return FALSE; + return G_SOURCE_REMOVE; } ret = qemu_chr_fe_write(&s->chr, s->tx_fifo, s->tx_level); @@ -171,7 +171,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond, ibex_uart_xmit, s); if (!r) { s->tx_level = 0; - return FALSE; + return G_SOURCE_REMOVE; } } @@ -192,7 +192,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond, } ibex_uart_update_irqs(s); - return FALSE; + return G_SOURCE_REMOVE; } static void uart_write_tx_fifo(IbexUartState *s, const uint8_t *buf, diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 3c6f982de9..dfe2276d71 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -93,13 +93,13 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque) */ goto buffer_drained; } - return FALSE; + return G_SOURCE_REMOVE; } buffer_drained: s->reg[R_UART_TXDRDY] = 1; s->pending_tx_byte = false; - return FALSE; + return G_SOURCE_REMOVE; } static void uart_cancel_transmit(NRF51UARTState *s) diff --git a/hw/char/serial.c b/hw/char/serial.c index 270e1b1094..f3094f860f 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -226,7 +226,7 @@ static gboolean serial_watch_cb(void *do_not_use, GIOCondition cond, SerialState *s = opaque; s->watch_tag = 0; serial_xmit(s); - return FALSE; + return G_SOURCE_REMOVE; } static void serial_xmit(SerialState *s) diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index dd5a02e339..dbe0b28e60 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -45,7 +45,7 @@ static gboolean chr_write_unblocked(void *do_not_use, GIOCondition cond, vcon->watch = 0; virtio_serial_throttle_port(VIRTIO_SERIAL_PORT(vcon), false); - return FALSE; + return G_SOURCE_REMOVE; } /* Callback function that's called when the guest sends us data */ diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 39fbaaab16..4bbf8afb33 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -278,7 +278,7 @@ static gboolean usbredir_write_unblocked(void *do_not_use, GIOCondition cond, dev->watch = 0; usbredirparser_do_write(dev->parser); - return FALSE; + return G_SOURCE_REMOVE; } static int usbredir_write(void *priv, uint8_t *data, int count) diff --git a/monitor/monitor.c b/monitor/monitor.c index dc352f9e9d..941f87815a 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -144,7 +144,7 @@ static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond, QEMU_LOCK_GUARD(&mon->mon_lock); mon->out_watch = 0; monitor_flush_locked(mon); - return FALSE; + return G_SOURCE_REMOVE; } /* Caller must hold mon->mon_lock */ diff --git a/net/vhost-user.c b/net/vhost-user.c index 5993e4afca..12555518e8 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -239,7 +239,7 @@ static gboolean net_vhost_user_watch(void *do_not_use, GIOCondition cond, qemu_chr_fe_disconnect(&s->chr); - return TRUE; + return G_SOURCE_CONTINUE; } static void net_vhost_user_event(void *opaque, QEMUChrEvent event); From patchwork Thu Aug 31 12:56:23 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: 718995 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462161wrn; Thu, 31 Aug 2023 06:10:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDkm95ISczR+IKDsTQ5U4Egims1fFwmHwakssSohClHAhEtCDGmQZU02RG4mi8yiwgHu0q X-Received: by 2002:a05:6808:2228:b0:3a5:a78b:f773 with SMTP id bd40-20020a056808222800b003a5a78bf773mr7069530oib.6.1693487438488; Thu, 31 Aug 2023 06:10:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487438; cv=none; d=google.com; s=arc-20160816; b=JvSMUSb2I/nn4PPR9X1ZHolhY7VPbINdL4IIKVxbnyLOPPXS+F0/vw5F32llFWqibx S2HqIwLdJn4RFrKZn9MDp41v3Pf0mkb1YVt/U7i8s+wh4+BUUYvjLTCTe/3rdGq++2we 13UP2rUqGryLlOvEjQoTDek4FgeIa2QvSRiWU6pWggQiXKDoabUHMLxFHJiZsnBYT7EW /Hh9rY1fXdks2R2o5cIDQvzzXF/2J9Q5MeEcezdIzgZskZDYLbtOuFqE24ccS6mLjNT7 dA4Dwg7lY4NirjaM2t8H0GbViN2RzvrvyPjE5P8TutOG2c6q/Mi75tN4bS6e2c5VdQJL tarA== 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=+5bbQfYGZZhyRdQ+SvkDiLWY1Nv20tz8tbv49oHFS9o=; fh=L9Oo008+Nqsfk0USGXpaDe087xqX7JUXX6SpSZBrdUE=; b=wKJzLGw10sKYvNRCPhBzqdYHBul1TSnJHcP0Iz1Ydbq3O6JfkJ+VPBVwacRapoMN31 iYBbcXBwj/6BCVqTG2ISS944OrFinb5DrSNyC2a/EZpYDmwIU2ymxVIzoBoyZ52sBwVe Q+gZJTswkcX82jVfxAjjOBr74a9i9V8eFxjJ8qUlkSxtMpZxAU9WWh01TxBOTZLAltgh h47c8zzpfTPcTu5qZAjBQiEw9ZbGfMSYqdLif1CSFFw71bNbh0EnlIPZB6ig2ba+gAJz l4Cc6UqHV16H9/ZxfeRP6VdhUB2GP9snIsdPAi6fYPb5xZHKWkuGSQti+nG7YxLRsmb7 2owg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="M9Kat/cj"; 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 14-20020ac8570e000000b00403a7a5ace0si834689qtw.382.2023.08.31.06.10.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:10:38 -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="M9Kat/cj"; 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 1qbhKT-0006y7-TO; Thu, 31 Aug 2023 09:03:21 -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 1qbhGI-00046X-AV for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:07 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGA-0005l1-F6 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:58:57 -0400 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-76df3d8fb4eso43065985a.1 for ; Thu, 31 Aug 2023 05:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486733; x=1694091533; 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=+5bbQfYGZZhyRdQ+SvkDiLWY1Nv20tz8tbv49oHFS9o=; b=M9Kat/cjpOlQ4+vKeehxL0ZEAhBnTWjoAVq2lrBsC41Cv76EbGJqlK0c41PF1KA9oe zT5iegc6BRHpyKo0C15n4FFT+uavz+/xeYTohsNFKqn7pSukA/wg4ltULf4aRu4qY3ub 76VgYQa+nFm62a0dEtAFIE9yreLgWhQ5/rQyyTWOOUsAzMDOBVqNNtTs8Tgse9peZS87 Zo/I89VYStVcc3RNL9Wqbf5JPwwIRlmxyN+GFzuC8qs9069O6vbxKUAEj5KgivXpQiT2 IB96Ow6jzI00aloAeg1ml0paT7kyV6/FSV2ss42whd5C2JWH1jCrqDuuuwKkeFCqg+3X fZlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486733; x=1694091533; 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=+5bbQfYGZZhyRdQ+SvkDiLWY1Nv20tz8tbv49oHFS9o=; b=Fzfx5yxcAGS78p2l4n+3HoLcoWHmMhyB3bzXrEV06+lxNdIimiBANjVk+6p37olWnp 0GaCovtuTjKfpfl+ElNmxE4NhK11T8B7t+bJ3wWjWkFIkYnv28JSuWp8towQ4rGy9QCl qLgBx9TBzbiv6DMf36a6YJTjt85unjuTqmRR5zMLhGNLJr/VZk/SlbOVmZ7kLiXjHbGa jZx0Yfsg9E3hcd4/6IsLca8hUoGurSze+25QnTweEWi2oIq4TPOunSnRBSyjcqguCesE MC+KDMSks1L61x/+xYRGHcPTqv5x8LS0Tgzim1u80AKU9dVdyd6GZcfkLCtik95aHTQd 3o8w== X-Gm-Message-State: AOJu0YzbLWTJmvVuUMqwHVasn76fxMOSRsbXIKzjfAqxAVZ+HBzKN8tq LwGnU0sK2NWsMloMKbr15/uPHa0Y9haoMwf5BG0= X-Received: by 2002:a05:620a:17ac:b0:76c:aff9:9f27 with SMTP id ay44-20020a05620a17ac00b0076caff99f27mr2915897qkb.59.1693486732897; Thu, 31 Aug 2023 05:58:52 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id r4-20020a05620a03c400b0076cd2591629sm576981qkm.6.2023.08.31.05.58.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:58:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Subject: [PULL 21/41] hw/char/pl011: Restrict MemoryRegionOps implementation access sizes Date: Thu, 31 Aug 2023 14:56:23 +0200 Message-ID: <20230831125646.67855-22-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::734; envelope-from=philmd@linaro.org; helo=mail-qk1-x734.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 The pl011_read() and pl011_write() handlers shift the offset argument by 2, so are implemented on a 32-bit boundary. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230710175102.32429-2-philmd@linaro.org> --- hw/char/pl011.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 77bbc2a982..73f1a3aea2 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -358,6 +358,8 @@ static const MemoryRegionOps pl011_ops = { .read = pl011_read, .write = pl011_write, .endianness = DEVICE_NATIVE_ENDIAN, + .impl.min_access_size = 4, + .impl.max_access_size = 4, }; static bool pl011_clock_needed(void *opaque) From patchwork Thu Aug 31 12:56:24 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: 719006 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp464018wrn; Thu, 31 Aug 2023 06:13:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGicOWCvwcLrofbEh5Lof2zJFZCWQPR56GzHzwGfeAkBMd5ZmgmyuvBVgftToa6t3BKZ2HY X-Received: by 2002:a05:622a:204:b0:40f:ea3e:777e with SMTP id b4-20020a05622a020400b0040fea3e777emr3616859qtx.21.1693487620501; Thu, 31 Aug 2023 06:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487620; cv=none; d=google.com; s=arc-20160816; b=l6P9QDLaakyfc7i7MEZ4GWsct0IMIhx5dCV+rYBnjcXV/haDxuIJWxY+m01bVlHyuV 8qi3wrYOVqIFKAeHE2ArdeyYEYukELZBiBgnXstNaF9SE+1bHT7y0R8sv0RIJ8w0F/9P zdFG25dh9FLNSWs0nB2cnKWLUJiXB5MnuDa6nmUlt7wUqMdhuUj+pZADLWfFMKYeDjDF HiGJD6PO0rtTxaealnn4soNuIfl48tpVFS5xnuSpSxwlibGqlc2yMd1ErAOgWO56J5QI 1YxaVQ6lgPHM0gZW6MMWGBo8Ad7pqQmBJ4LRFC7+Y44xB0OuOn2KGZBqMRzaJQ5A6cjh OFjA== 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=hQQOLonhj1lfjw6EyIeNwvldxW3rnJRehE92SZcD36E=; fh=C1g9WbLYbqb5ZMWGblSPCb82pDI9M8ifDDaJhEe0Xjk=; b=skj6IMjppHhHlqbiTJWvA4JdY4QWafqd3e3RkxBGRG7i0c/QtSCVM4cFAqmSKgCsg2 bOQtYqHL9alyHH0rnruAW7QpMmas1QEeB3SzhcB/L2JvSQcuGDwd6orvUS5JjgJ4pvl3 GtDpC8EVm8i14i0n/T+4Yd7WMLERypLuXy1MJ+EterD0xaZ90OvaKHdN9UxhYx8fU/Pn DS2g6bRpu4vNBt5KUK2MahoJLsCzNlDdH4lMC8NMGu6fNyE9OrtrEhliD7SqAhNJxH8Q AugMAR8dggTsEN6SETZ4ixGofF+Yf1wMgw65ZIFil6NcOCkGJVGKz0ZuzLy33vVi1PqZ murA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BQ1ghpm2; 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 d6-20020ac85d86000000b00403ef5890edsi859077qtx.680.2023.08.31.06.13.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:13:40 -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=BQ1ghpm2; 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 1qbhKv-0007DW-2m; Thu, 31 Aug 2023 09:03:49 -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 1qbhGN-0004D8-Vq for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:15 -0400 Received: from mail-yb1-xb35.google.com ([2607:f8b0:4864:20::b35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGI-0005ms-O4 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:06 -0400 Received: by mail-yb1-xb35.google.com with SMTP id 3f1490d57ef6-d7bb34576b9so529534276.3 for ; Thu, 31 Aug 2023 05:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486741; x=1694091541; 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=hQQOLonhj1lfjw6EyIeNwvldxW3rnJRehE92SZcD36E=; b=BQ1ghpm2f/TH+wm03s8Dj7UuTOVpyXpwyk2e5690TB0VpDNCLLP2nedcDPnpW5zOTH LX13u6ghQF2tf9uLoWan3iYG+WLavzoKT80ZEU18njcVgWrPpYC5rJzjtp2tXa5qfRHu C7TwuCRxikNwGPG+jPJjPWojHX+u78fCYbJj8YjOLLu5ciogF/FmQQ7m7kPMGQoSXf/k 2hSnrRykfAm6mX1fxkcZhm5bOlrz6R2RfNSEjHyXtYjP3vraVDHdqdz3KdeQf1gwSmaU MjOIUea4Xh5rbQb4LQWph7JXIrrReROeSoQMhCAKOYHsRqn5PNw8h5+jwhWKB4MCytWY A8wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486741; x=1694091541; 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=hQQOLonhj1lfjw6EyIeNwvldxW3rnJRehE92SZcD36E=; b=F5TJC0FPUzCK17BB2rRoW1y3f79ga917m91OC8mQ9p2lTq3cj7bQzGPAmmid/Fo+Q9 s7LLsKnwSiNlG7J2rV6rBh7pcJ8EBJ3yjFkiN/YIRe2MiW6Ti4NUGrBImi53PES4lrcr FglAfBaCHzYRgJEwIML8sKK/c2vY/D2d14V/44Gf1F/xZoMSBfm8hXPgwi6kMaHQgtQV CiFKosIJSRG/CJjrBc2cqZsCpg9fu+pnC11q3xyUkAfTnhHW7GTinOg8oZC8ODUt7I8O tsRQEH/H52HOBF+J20gZIujY+urSfZznbvfHfTcSNTii8+7KmQrgNlkqKzPoE3hXsWXr e2xQ== X-Gm-Message-State: AOJu0YyBFNOlyFi3iTMOznRZzxp1qo9vdLbLP3gr6JNEnQUf+0U9hY3h K7AtYo9yzz3FnI/fCM2ZkI/Jkdzq9UFj8XVa7A0= X-Received: by 2002:a25:d20a:0:b0:d0f:6f1d:89ec with SMTP id j10-20020a25d20a000000b00d0f6f1d89ecmr5473933ybg.35.1693486740963; Thu, 31 Aug 2023 05:59:00 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id i85-20020a25d158000000b00d74c54dea92sm298458ybg.25.2023.08.31.05.58.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Subject: [PULL 22/41] hw/char/pl011: Display register name in trace events Date: Thu, 31 Aug 2023 14:56:24 +0200 Message-ID: <20230831125646.67855-23-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::b35; envelope-from=philmd@linaro.org; helo=mail-yb1-xb35.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=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 To avoid knowing the register addresses by heart, display their name along in the trace events. Since the MMIO region is 4K wide (0x1000 bytes), displaying the address with 3 digits is enough, so reduce the address format. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20230522153144.30610-5-philmd@linaro.org> --- hw/char/pl011.c | 25 ++++++++++++++++++++++--- hw/char/trace-events | 4 ++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 73f1a3aea2..c3203e5b41 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -51,6 +51,7 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr) #define PL011_INT_TX 0x20 #define PL011_INT_RX 0x10 +/* Flag Register, UARTFR */ #define PL011_FLAG_TXFE 0x80 #define PL011_FLAG_RXFF 0x40 #define PL011_FLAG_TXFF 0x20 @@ -76,6 +77,24 @@ static const unsigned char pl011_id_arm[8] = static const unsigned char pl011_id_luminary[8] = { 0x11, 0x00, 0x18, 0x01, 0x0d, 0xf0, 0x05, 0xb1 }; +static const char *pl011_regname(hwaddr offset) +{ + static const char *const rname[] = { + [0] = "DR", [1] = "RSR", [6] = "FR", [8] = "ILPR", [9] = "IBRD", + [10] = "FBRD", [11] = "LCRH", [12] = "CR", [13] = "IFLS", [14] = "IMSC", + [15] = "RIS", [16] = "MIS", [17] = "ICR", [18] = "DMACR", + }; + unsigned idx = offset >> 2; + + if (idx < ARRAY_SIZE(rname) && rname[idx]) { + return rname[idx]; + } + if (idx >= 0x3f8 && idx <= 0x400) { + return "ID"; + } + return "UNKN"; +} + /* Which bits in the interrupt status matter for each outbound IRQ line ? */ static const uint32_t irqmask[] = { INT_E | INT_MS | INT_RT | INT_TX | INT_RX, /* combined IRQ */ @@ -191,7 +210,7 @@ static uint64_t pl011_read(void *opaque, hwaddr offset, break; } - trace_pl011_read(offset, r); + trace_pl011_read(offset, r, pl011_regname(offset)); return r; } @@ -234,7 +253,7 @@ static void pl011_write(void *opaque, hwaddr offset, PL011State *s = (PL011State *)opaque; unsigned char ch; - trace_pl011_write(offset, value); + trace_pl011_write(offset, value, pl011_regname(offset)); switch (offset >> 2) { case 0: /* UARTDR */ @@ -252,7 +271,7 @@ static void pl011_write(void *opaque, hwaddr offset, case 6: /* UARTFR */ /* Writes to Flag register are ignored. */ break; - case 8: /* UARTUARTILPR */ + case 8: /* UARTILPR */ s->ilpr = value; break; case 9: /* UARTIBRD */ diff --git a/hw/char/trace-events b/hw/char/trace-events index 2ecb36232e..babf4d35ea 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -54,9 +54,9 @@ escc_sunmouse_event(int dx, int dy, int buttons_state) "dx=%d dy=%d buttons=0x%0 # pl011.c pl011_irq_state(int level) "irq state %d" -pl011_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +pl011_read(uint32_t addr, uint32_t value, const char *regname) "addr 0x%03x value 0x%08x reg %s" pl011_read_fifo(int read_count) "FIFO read, read_count now %d" -pl011_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +pl011_write(uint32_t addr, uint32_t value, const char *regname) "addr 0x%03x value 0x%08x reg %s" pl011_can_receive(uint32_t lcr, int read_count, int r) "LCR 0x%08x read_count %d returning %d" pl011_put_fifo(uint32_t c, int read_count) "new char 0x%x read_count now %d" pl011_put_fifo_full(void) "FIFO now full, RXFF set" From patchwork Thu Aug 31 12:56:25 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: 719014 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp467018wrn; Thu, 31 Aug 2023 06:18:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEE5Qv5vYPIpU9kMOTW8wr9ie1sit1HqWybmXFnyzNHovkizJ6V7Ar2jEnyj/k1/whFW+l8 X-Received: by 2002:a05:600c:214d:b0:401:bdd7:499d with SMTP id v13-20020a05600c214d00b00401bdd7499dmr4183386wml.25.1693487893772; Thu, 31 Aug 2023 06:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487893; cv=none; d=google.com; s=arc-20160816; b=NIEA8jKQIvYhvrTCgunbyMdksTGOwvf062eN3NgbVweIXBFYyT5gpYbfJo7sZ5MiTy RwpxnZQgk8hruyO6mxnz4axwTVoVXu/dYyFSeRPF1ibjZRq5UGySc0kMqy6gFlQFd22L P2FSAAsY42AmVpbA/ISUmOWhxnv6Wq1IlKSFvyvXB8775uryq5b8wZAura73hx6wtlMF VMuygosi5RFun31NNcFW54pFS7A4noTq2YD9v+spa4R+FQznOB7nO1LpSIKlDQ/bQMbC fSbfp2XcXigSmTjeSK+gRHkHwf5zVAAYYVOqjYnBAXJU6ELbeq14LagC4MevLI6twNDr ghQg== 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=GxA/5EXb2SmpDTy3rgcCO3KdbceHG3sLJR7WKjQ1/Y8=; fh=C1g9WbLYbqb5ZMWGblSPCb82pDI9M8ifDDaJhEe0Xjk=; b=s3UJR4Dtz5TGSignBYRlITzs9MUgRMhH7DslvY0GOTIPlWecG6Gx4yL4+g04eSY5c9 IR9gOP9dFnaIsPJg4YrXw0jr+BFsrQL1d4fK6Lr/1MPsiEFdH8aTIP3PwSJZ5Aa5jwta 3HNqtjNmFCg78l59Z3d2qR3aUYaKzO5RYo9sWSgcTPkamxP/744hvs8xTNVOcubhs+F8 U87Y3q5sJOgjU2KZrhyUgwIpStSh7Kuq3fPoaIbHSStG6gM5CWceIGEDww1JCbzpWUUa 42txF3QUlOtT4YFeaffKXXkh14+NblMgnCTSdiy3mNqENyOhfh3WqBv2A5RpSA58hj2x M6WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KftkL0tU; 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 x19-20020a05600c179300b004003f6294f0si1950799wmo.53.2023.08.31.06.18.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:18:13 -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=KftkL0tU; 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 1qbhJV-0005Pn-VD; Thu, 31 Aug 2023 09:02:22 -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 1qbhGT-0004Dk-RE for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:18 -0400 Received: from mail-yw1-x1132.google.com ([2607:f8b0:4864:20::1132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGQ-0005q5-8a for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:12 -0400 Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-58cd9d9dbf5so10131687b3.0 for ; Thu, 31 Aug 2023 05:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486749; x=1694091549; 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=GxA/5EXb2SmpDTy3rgcCO3KdbceHG3sLJR7WKjQ1/Y8=; b=KftkL0tURDmv9kk6wv+NzYLaIdWqE3EHoNBlZVZyyBfK0e7qeC0URUkoyrcuSXL67u gHskIagRgXksHntUyFWUixjuthsiVeX8Iv4ScO16vQwAGhgVr0QGLfM/taKNaI67svit X5SnJVos2xL2B3p9H2BYlXMSG68BLsHXhof7LhTS56M+cgSCY3NczSeE98y4+vudfQn0 V1BOQkuaIVP/rdAql/Q2khXmMu3i0+0NhsKG9f5Tk7S028xRIzokoXAFxHxTcYZEIr0B ZZ+VlgQw2g7EnpXTzYK3BSDNfXOY8aYznKv3d431BIhkENiniJQt+3CMzGG4/PZ4lo6P kS0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486749; x=1694091549; 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=GxA/5EXb2SmpDTy3rgcCO3KdbceHG3sLJR7WKjQ1/Y8=; b=VNviY1LlTkYXZ3WpZqzaEeQ4ishNwygXRLVq/xreF9M5MQ4w5smZybmlL2GJuR8gcS +wkG8kpSS1IRh8ywymZWRVHIbiAju9cJUlnnFxF4vDBLflDnh4GgwfrCr3jtGO66xqDP bNsRUKXq9a+iTLMwoSc4xCeCYarE9kUxhh6YhBm2+XsM+MKNz7VY3ZJrvCiEU7dK/Hoc G3ExpiCKguZqch/lh9pZZW32VJmqolwckM/JBezXN+wRVk9ptsTHAkY7xL0zWeaSsN29 7ehAQbFgX/Gje/MdHg5tAgo5RqDsyR7TJLPZYCNWsZK61FWM/2tdWsMshBim36qRkIbR OvIg== X-Gm-Message-State: AOJu0Yz1b0tG730n3QxJEDLCObFaq5sj33wC/yNIOOMx/1s8uIS4kjQq 0RQ5tvkHYvuDydZ/oaDWgx1kYg39PvEcqu0S+No= X-Received: by 2002:a0d:d6cb:0:b0:58f:bda3:7d9 with SMTP id y194-20020a0dd6cb000000b0058fbda307d9mr2154104ywd.26.1693486748816; Thu, 31 Aug 2023 05:59:08 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id b131-20020a0dd989000000b005772abf6234sm391546ywe.11.2023.08.31.05.59.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Subject: [PULL 23/41] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions Date: Thu, 31 Aug 2023 14:56:25 +0200 Message-ID: <20230831125646.67855-24-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1132; envelope-from=philmd@linaro.org; helo=mail-yw1-x1132.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 PL011_INT_TX duplicates INT_TX, and PL011_INT_RX INT_RX. Follow other register fields definitions from this file, keep the shorter form. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20230522153144.30610-6-philmd@linaro.org> --- hw/char/pl011.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index c3203e5b41..96675f52cc 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -48,9 +48,6 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr) return dev; } -#define PL011_INT_TX 0x20 -#define PL011_INT_RX 0x10 - /* Flag Register, UARTFR */ #define PL011_FLAG_TXFE 0x80 #define PL011_FLAG_RXFF 0x40 @@ -157,7 +154,7 @@ static uint64_t pl011_read(void *opaque, hwaddr offset, s->flags |= PL011_FLAG_RXFE; } if (s->read_count == s->read_trigger - 1) - s->int_level &= ~ PL011_INT_RX; + s->int_level &= ~ INT_RX; trace_pl011_read_fifo(s->read_count); s->rsr = c >> 8; pl011_update(s); @@ -262,7 +259,7 @@ static void pl011_write(void *opaque, hwaddr offset, /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1); - s->int_level |= PL011_INT_TX; + s->int_level |= INT_TX; pl011_update(s); break; case 1: /* UARTRSR/UARTECR */ @@ -350,7 +347,7 @@ static void pl011_put_fifo(void *opaque, uint32_t value) s->flags |= PL011_FLAG_RXFF; } if (s->read_count == s->read_trigger) { - s->int_level |= PL011_INT_RX; + s->int_level |= INT_RX; pl011_update(s); } } From patchwork Thu Aug 31 12:56:26 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: 719009 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp465437wrn; Thu, 31 Aug 2023 06:15:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRy7lDXXnu/tVPeXyQFUevJR7QoFXIo7cC1Y7xmAK7ER9xUVNWCCBfCGCyic4w3TkpUCTs X-Received: by 2002:a0c:e254:0:b0:64b:d060:925a with SMTP id x20-20020a0ce254000000b0064bd060925amr2505626qvl.13.1693487755969; Thu, 31 Aug 2023 06:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487755; cv=none; d=google.com; s=arc-20160816; b=OpbYVwusM7sw9tXP9MfNkpOchsSY8JEUzGejt9+5IzNel6SwOk+a9dYMhiTRNrfsMF KnWHiThxLuZFoEKrmi/9VbN8yvZaRbT5oVCEYfgzIka/Ym3lRrH4Ol9M7jOmrxV8Dmr+ 3m4n+9jmrmeVh7J+3bARYb0sXlAn154WS1BQZpMm3rCYfLrXuFFU6wa4N6Ll/VNegiAW m3qvjD+P3fWMscm4j4dlr0fqEbPgIInAqyYstbbbXsmTuczCzTi01Xpyg10DOZw6bl8Z wnJYvPOwDOALZxNkh9vL02c9T3JcHD1iDoTayUNrWISK/+w5DlICoGV2MmonabN6lsOu NyHg== 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=K9fF8pIxAEbO1JVLS8qke83pavQv2lkvy3aArf23uO4=; fh=C1g9WbLYbqb5ZMWGblSPCb82pDI9M8ifDDaJhEe0Xjk=; b=Kbt90+AZOdl+fFWd+0DKmae4fhPeU/tu+ryCprrlaBsWu4nLbkJLaZ1eerB4ZrK5+W nv+9y+VgLyjKV/jnOUjU/Nkw/dr6arikCoJ16TGugIUFhgZKFnNG6Jh/K7804x7x9rBS D5b+T5T0nNQXORt4P46pmJRfJTnYrC6bFib+nF3DdZhy1RP/zVSnuRi47ORVQOKTz2eg JnIfuT4nOZ5exnprzDduwag04YZYTONdOXtfWNDxhMSYu1XUTeEfLNWvWA29mAPe7/rW SCM0QtVBQ6NiHOyHR80DzRjRV2wOTkcaIXuoYEtvBpYNXNDKw0aDfym8rwfumGZXOJAX xYQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U+ujwEYq; 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 d24-20020a0cb2d8000000b00649a195fbbcsi824016qvf.303.2023.08.31.06.15.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:15:55 -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=U+ujwEYq; 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 1qbhKL-0006NQ-G4; Thu, 31 Aug 2023 09:03:13 -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 1qbhGa-0004Ml-K5 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:24 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGY-0005uE-1J for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:20 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-76f08e302a1so50149885a.1 for ; Thu, 31 Aug 2023 05:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486756; x=1694091556; 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=K9fF8pIxAEbO1JVLS8qke83pavQv2lkvy3aArf23uO4=; b=U+ujwEYqQM3eIXUkydQYLzhXZYQ2rseIjBxygt4+yAiMOIOu1LuDSiTCt2uUMHyQL2 5N6KEjj4pXlAqzzTMIARnwRv89aPxO6PsXqK4HSuKiPoVZ2GfgAVyj02/Uv1smN61aHZ QMo47O7uS0P6bLaNipi+hC+OA9gJ0DSisbb/yNzxtUPGvmzJBhwVqKBAj5weEn6nFfBP nLwoYvQrMf6DRnbfmVuXHsNmpXtKm28D65wzEvd8reQhaYugbaAZkry8HMg2iZvpGhP9 PsJV+MaYoZ/6CTfs+wOI5Sfra2XMSZggrRsyr24PRQQUyxp7nfJrAlJ/KdOu9E/lJq5+ LVug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486756; x=1694091556; 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=K9fF8pIxAEbO1JVLS8qke83pavQv2lkvy3aArf23uO4=; b=RRAiu0KVcaA8c7SEewfZ59+zqCkTCeTYdnPZHnGCi4H0hkZXh4GyFI2aDx5kJetPfo KnzXO/EHf/QCbOyNGDQ+CjTDKc2redH54pwgAw9ryfwMM976BvLjat1WEtSobtwPF+kj GX6zcREJ2Ah2nYdN6x+gYF2XOX7659/ZhBxXXqqYcq8cjBp0P/YhY6jBrJOJ5th/R1T+ 2syT0L7guXmAmLOEIj/bA0MXG1B0UDwS3MiT40QDbRa9ddvhXM/Lj5YLOWU3+ltHmKFc 7ozKUrg/8RHf/FpWpyZD80sV98HHTBOhreb7M8F7pqT9Mnw/EOaXRSQ8z6fvW7KvWCKx EQ8Q== X-Gm-Message-State: AOJu0YxSATxbBPzD1Rl8OQg7Q430CJFOtG/IPcTCDsBT6TZ+/cQ5K+xd rKKAE7QIUsTucTR577/T/2iMGS+5UD8NkK0DB9Q= X-Received: by 2002:a05:620a:143a:b0:767:915a:ccf6 with SMTP id k26-20020a05620a143a00b00767915accf6mr2254503qkj.65.1693486756318; Thu, 31 Aug 2023 05:59:16 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id x12-20020ae9f80c000000b00767da10efb6sm565423qkh.97.2023.08.31.05.59.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Subject: [PULL 24/41] hw/char/pl011: Replace magic values by register field definitions Date: Thu, 31 Aug 2023 14:56:26 +0200 Message-ID: <20230831125646.67855-25-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::731; envelope-from=philmd@linaro.org; helo=mail-qk1-x731.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=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 0x400 is Data Register Break Error (DR_BE), 0x10 is Line Control Register Fifo Enabled (LCR_FEN) and 0x1 is Send Break (LCR_BRK). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20230522153144.30610-7-philmd@linaro.org> --- hw/char/pl011.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 96675f52cc..58edeb9ddb 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -54,6 +54,9 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr) #define PL011_FLAG_TXFF 0x20 #define PL011_FLAG_RXFE 0x10 +/* Data Register, UARTDR */ +#define DR_BE (1 << 10) + /* Interrupt status bits in UARTRIS, UARTMIS, UARTIMSC */ #define INT_OE (1 << 10) #define INT_BE (1 << 9) @@ -69,6 +72,10 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr) #define INT_E (INT_OE | INT_BE | INT_PE | INT_FE) #define INT_MS (INT_RI | INT_DSR | INT_DCD | INT_CTS) +/* Line Control Register, UARTLCR_H */ +#define LCR_FEN (1 << 4) +#define LCR_BRK (1 << 0) + static const unsigned char pl011_id_arm[8] = { 0x11, 0x10, 0x14, 0x00, 0x0d, 0xf0, 0x05, 0xb1 }; static const unsigned char pl011_id_luminary[8] = @@ -116,7 +123,7 @@ static void pl011_update(PL011State *s) static bool pl011_is_fifo_enabled(PL011State *s) { - return (s->lcr & 0x10) != 0; + return (s->lcr & LCR_FEN) != 0; } static inline unsigned pl011_get_fifo_depth(PL011State *s) @@ -218,7 +225,7 @@ static void pl011_set_read_trigger(PL011State *s) the threshold. However linux only reads the FIFO in response to an interrupt. Triggering the interrupt when the FIFO is non-empty seems to make things work. */ - if (s->lcr & 0x10) + if (s->lcr & LCR_FEN) s->read_trigger = (s->ifl >> 1) & 0x1c; else #endif @@ -281,11 +288,11 @@ static void pl011_write(void *opaque, hwaddr offset, break; case 11: /* UARTLCR_H */ /* Reset the FIFO state on FIFO enable or disable */ - if ((s->lcr ^ value) & 0x10) { + if ((s->lcr ^ value) & LCR_FEN) { pl011_reset_fifo(s); } - if ((s->lcr ^ value) & 0x1) { - int break_enable = value & 0x1; + if ((s->lcr ^ value) & LCR_BRK) { + int break_enable = value & LCR_BRK; qemu_chr_fe_ioctl(&s->chr, CHR_IOCTL_SERIAL_SET_BREAK, &break_enable); } @@ -359,8 +366,9 @@ static void pl011_receive(void *opaque, const uint8_t *buf, int size) static void pl011_event(void *opaque, QEMUChrEvent event) { - if (event == CHR_EVENT_BREAK) - pl011_put_fifo(opaque, 0x400); + if (event == CHR_EVENT_BREAK) { + pl011_put_fifo(opaque, DR_BE); + } } static void pl011_clock_update(void *opaque, ClockEvent event) From patchwork Thu Aug 31 12:56:27 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: 718990 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461438wrn; Thu, 31 Aug 2023 06:09:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZ1RvoZxg0BCJELoi97LINKpQ3o51GL1bMSWYe8i+BtqcbcEc9WLu0ny8UObRCHoX+y3sp X-Received: by 2002:a05:6808:1386:b0:3a1:d656:21c with SMTP id c6-20020a056808138600b003a1d656021cmr6321597oiw.21.1693487377329; Thu, 31 Aug 2023 06:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487377; cv=none; d=google.com; s=arc-20160816; b=STOV+2FSFDRQ4DALIuhpKir7U83tHZ+yquK2WiZ76TZkmDEG1F92XYiVnUPZJ82OV/ yRCPRk82Aj+TaqFgoGkqbpVUQ3lr02Euh0G6U8zkswgEYtXTrmNZ+naYIYKAI/Bs+D40 RJxQDRIuI5WMCHmynvgUr4neLjWqmmbWVwntq2fo+xo7Rly2N8XnvZDSnZl0p2UmMc+G Z1rx7q1U1U5V+kk9ugr+6XHcOcxFxqlW3XG6EVQj46ho7iMP7+noaOZ/3ukBhwNCQRlp /82Vx/AZYaI4m18MG4Q+1VYAkd8X585jkR2z+DcswAr9QHT2MfUEl5PGEdlp5R/hpGTn GQ4g== 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=24nF/N+YzUtE3HhDlO2XU4XzAEvrvbZNN4parmEdVAE=; fh=7DvjPb8ngx49dTsKIGB6exd/tsDYFhAD7t1B/G+l5Fo=; b=bD8KNzX7GFEwooSld4BjtwSRRDIZSbtM8Pc0HndXPdswgmAFivbGcLdIzv9fWUlXAq Asl/0F6ZUoJqnHnhnm0SNOxwLqzS/TsnaaPUiVUU8ny3JJBq5alnKlMUs6h5BuILcbLc m9hFYXyhirEOTWPPOY6I8TSpi4/cnyrwIx/VWnVbuw1Zk5N1Xn1/Ro1Pxva9sS+2KrP1 yDjFG7UaXxtuDRQ5dOVPRS19RShpyvs0mtc95r4SSyCVv87Ps7dN4wQA5vio2J1AdWGp ttYRU+ge8Z78DB7nnEbgRsiIgl9NRO69nFrCmUYqNsQVDQTeR7u+Crj6iRBYTu/+Mt5L ghiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AdqSwMeS; 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 c14-20020a0cca0e000000b0064f4f14aedbsi843726qvk.340.2023.08.31.06.09.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:09:37 -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=AdqSwMeS; 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 1qbhLE-0007q6-Bz; Thu, 31 Aug 2023 09:04:08 -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 1qbhGn-0004bM-I8 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:37 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGi-0005wB-0S for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:32 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-529fb04a234so983955a12.3 for ; Thu, 31 Aug 2023 05:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486762; x=1694091562; 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=24nF/N+YzUtE3HhDlO2XU4XzAEvrvbZNN4parmEdVAE=; b=AdqSwMeSmeNpTUxF+OoIEvGdlgYKiIQlQFeWvycyrkJt6VfM8Ai8r42IKy/SdEHFId SE+6OSAoplnWZJxnthYiHgaCmsolT06mSriZPNBfnaRFaag+yLZKVgFaoeOkUOdj+arE OXXaPDLzrHu5p40qzzbJ0W6Hbrkz2u1MVwKGx03KbzTq+xXKCCiuZwGwPY6L/vLUAm58 SbCx9EaJoVXznyVSIWzUVTg/Q9o+3bTJnnwILOsyUL4dGoI8mMgOBPlUBbl7R2FZUWhn qrV6C7E3bv7L3ENXpO3m+zeMQzd0W5pasiyX1FH2LlJTG7Z0nDZOqvPeRyUqhMoK2+gC Qe4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486762; x=1694091562; 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=24nF/N+YzUtE3HhDlO2XU4XzAEvrvbZNN4parmEdVAE=; b=JHXREMHtM//9fVVe+jRM33dj6SqfMtgyod79ECFZz37z0glaxvyrv9H+hypGZGPTTG kr9uZseW2yjtEVsXQsWbgXMigXqX+5is2D0CePyYO5Hut5oEw4AUqr+ZDRVaBQdwn1uS oMj30quvLMo7hxfP3srGjJ7bSKyGa9pmCGHxgNy5Ve+Q6b9go0gzyWB/vIHka1xlEjvB OsBMBIJapqv6/F+vPf0WP6+2OC2g+qo9qpie7RnMSS+IR/KZh0FSD5woeSueq8YgTu75 oLcuYJEs23s13Pm/fHhbpAEcvaepUsgAYAkkLSlWj1rb3dC/5foWFAiCoGvroduO3dAw QScw== X-Gm-Message-State: AOJu0YwdrhYXsQxPWU0CXivaiACdYt9x6DVBi4hiMwl0AVtkEhB9Fs+g 8Ta3yv7Cu8Mo/qUCRPgngpU7O8Krx+2YnZAjtII= X-Received: by 2002:a50:ec95:0:b0:523:b1b0:f69f with SMTP id e21-20020a50ec95000000b00523b1b0f69fmr4078743edr.32.1693486762097; Thu, 31 Aug 2023 05:59:22 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id i19-20020a056402055300b005233609e39dsm777727edx.30.2023.08.31.05.59.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Bernhard Beschow , Richard Henderson , Titus Rwantare Subject: [PULL 25/41] hw/i2c/pmbus_device: Fix modifying QOM class internals from instance Date: Thu, 31 Aug 2023 14:56:27 +0200 Message-ID: <20230831125646.67855-26-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=philmd@linaro.org; helo=mail-ed1-x529.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 QOM object instance should not modify its class state (because all other objects instanciated from this class get affected). Instead of modifying the PMBusDeviceClass 'device_num_pages' field the first time a instance is initialized (in pmbus_pages_alloc), introduce a new pmbus_pages_num() helper which returns the page number from the class without modifying the class state. The code logic become slighly simplified. Inspired-by: Bernhard Beschow Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230523064408.57941-4-philmd@linaro.org> --- hw/i2c/pmbus_device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 44fe4eddbb..8bc9d5108a 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -190,15 +190,18 @@ static void pmbus_quick_cmd(SMBusDevice *smd, uint8_t read) } } +static uint8_t pmbus_pages_num(PMBusDevice *pmdev) +{ + const PMBusDeviceClass *k = PMBUS_DEVICE_GET_CLASS(pmdev); + + /* some PMBus devices don't use the PAGE command, so they get 1 page */ + return k->device_num_pages ? : 1; +} + static void pmbus_pages_alloc(PMBusDevice *pmdev) { - /* some PMBus devices don't use the PAGE command, so they get 1 page */ - PMBusDeviceClass *k = PMBUS_DEVICE_GET_CLASS(pmdev); - if (k->device_num_pages == 0) { - k->device_num_pages = 1; - } - pmdev->num_pages = k->device_num_pages; - pmdev->pages = g_new0(PMBusPage, k->device_num_pages); + pmdev->num_pages = pmbus_pages_num(pmdev); + pmdev->pages = g_new0(PMBusPage, pmdev->num_pages); } void pmbus_check_limits(PMBusDevice *pmdev) From patchwork Thu Aug 31 12:56:28 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: 718989 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461372wrn; Thu, 31 Aug 2023 06:09:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHW4KPmjS8iWlgN+FSsacMbNqLLXgWag1Wu4C5dc04m+op1nECcYpVcxeENUBVyiV1ug1C5 X-Received: by 2002:a0c:f444:0:b0:64c:6bc:be10 with SMTP id h4-20020a0cf444000000b0064c06bcbe10mr2703835qvm.6.1693487370947; Thu, 31 Aug 2023 06:09:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487370; cv=none; d=google.com; s=arc-20160816; b=VaKfJjOCVxYn09zpWug9Sd7unqfRNhE3eZQQGEk1XDMgKoz0WUtbikiza71q62GAP5 +/78T2e8OtfOBWCMOngEmnYwLyRUEoQ9OmKze3Thvrt7TGAbzq035b5rgq4WgBGB0jSU IDkzpQ540ywfr92Q8E7yLwide/y4XF5Og8O6OX3FKvs823Ia8M53JnO1t5BZNGRsN/tV W1lc73B8Aqa2P7ultMaH3FlnN63tqwsF1vA7q/Kif3oZN6R1DyXnlr48PJ4VqACXh3z7 T7D3rRN8yGqxyMYtQB1e2Dqfz68/FI4dpgKZgprYG1iXTxhfOVEs29f3JqDcJ5y+jHf2 7tlA== 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=Occ8BC5H/FvkONSrz36OUIh3zPM4NWg3GVGnui/y/PY=; fh=9Q0cuBcSk3/xqkgTyQq17rTjHRbQHS04J5UiK5/uHcI=; b=x5D6qaUgaegek7Qofnpx7vWuYcUqY6AwTfM6LlWA++KP/ZFgfJwCbmpBiDmCzA1H8A i6sxtFsDAylWwaFiA/1b82pPLyq43PB8aoNhrupZg4oCtMQvhckCHzLimSrhS/lDY7Hj UTvNKJ/GwB53ELLM5+mIUOTd9+UkOvNjwBlHovR89phs8hKdmpDkLwnK8O8jokOZNa5x jQq1y1qCK3dwQzGoixx4cQVeFy18TdcEW+kz6Pnh6+34+ApZn3TnvSfaEDwwrvVU1Sp5 PjcxdlrRCQ3FTbm1ozuoRzpfSBLVLKaLsK4f+xawAGT+gGBlTL/uj+g8moZAtnP6XK76 DATw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vV04mWAP; 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 m10-20020a0c9d0a000000b0064f7b3cded6si843974qvf.274.2023.08.31.06.09.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:09:30 -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=vV04mWAP; 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 1qbhL2-0007VV-H9; Thu, 31 Aug 2023 09:03:56 -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 1qbhGs-0004ga-2o for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:40 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGn-0005zQ-4s for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:37 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-317c3ac7339so595246f8f.0 for ; Thu, 31 Aug 2023 05:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486768; x=1694091568; 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=Occ8BC5H/FvkONSrz36OUIh3zPM4NWg3GVGnui/y/PY=; b=vV04mWAPJeIR0CGQpZ3qrfQ58XeCAoG0Ny49MobdXAFE6LarKEXdLOmdqe92uyxVxw qVSkAVRTrQEA3vxp9QGGcjUaIRbkNb5ia/TCBBxuVYW7EZf5Fvkw0fnOViRbhUphY1gf MaguKATs+C81+SC/r33L3Z695he65Iz9gq/uvaKiEjpySStT0UwcUQ/KJ9n7DMtLG/Dc Hymiiee2keG+jkvTxirknxquATr2y+vv0IlAbMcq5+/OXTmMH8cReexa1veXEh0dz51P qIv0czqYfuBnMyMPOuE1mzKUqzp237XHhGe/dhMQ5o45X9/SkJdsPdDMcqyFVtbg1Cpx 7wuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486768; x=1694091568; 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=Occ8BC5H/FvkONSrz36OUIh3zPM4NWg3GVGnui/y/PY=; b=GpbtfV/gOdWMo+GhA8p/wjNfTc6CJU+UJ17PMRiWlIHGwF5bc3g8eSteDj6TbxtVzo s/8Icy9bUY8V4Ij3lmSesD5AV5n5DPtfmRiZAsqaG+VTo3eEUzuIzjXwnmesv0fcWmNc li/jFzmpw63Z37h0yUI+LxadhYA2x1C9Bfmgmz3yS7PtvkiQ2NznOGFWjNkMyOuS46iT M4gN86m3Vb/yB8nFkz1XyO5DgSM/7T3ItDoTqGVKtERfe90Hu/6f0kCT4Hq5WSGguPuw Iyesq11cL21u3vQCYXVUdhlWfrGD22qdzFjP++epJHx8Vx0LNQee41+/meBQpg7MWyA+ k8fQ== X-Gm-Message-State: AOJu0YyXInsLtJbgbOXCBYWN2v1VTQtMBNImFcFLA2E38HYpK4nXTHIC sDyIvF8e1XPWtsZKSV/3L3NXIUoCzduBQccbOOw= X-Received: by 2002:a5d:6706:0:b0:319:63f3:c0cb with SMTP id o6-20020a5d6706000000b0031963f3c0cbmr4341696wru.40.1693486767862; Thu, 31 Aug 2023 05:59:27 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c025000b003fee7b67f67sm1901789wmj.31.2023.08.31.05.59.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini , Titus Rwantare , Corey Minyard , Tyrone Ting , Hao Wu Subject: [PULL 26/41] hw/i2c: spelling fixes Date: Thu, 31 Aug 2023 14:56:28 +0200 Message-ID: <20230831125646.67855-27-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Message-ID: <20230823065335.1919380-14-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i2c/npcm7xx_smbus.h | 2 +- include/hw/misc/auxbus.h | 2 +- hw/i2c/pm_smbus.c | 2 +- hw/i2c/pmbus_device.c | 2 +- hw/i2c/smbus_slave.c | 2 +- hw/sensor/isl_pmbus_vr.c | 2 +- hw/sensor/max34451.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h index 3555e6836f..dc45963c0e 100644 --- a/include/hw/i2c/npcm7xx_smbus.h +++ b/include/hw/i2c/npcm7xx_smbus.h @@ -58,7 +58,7 @@ typedef enum NPCM7xxSMBusStatus { * @sclht: The SCL high time register. * @fif_ctl: The FIFO control register. * @fif_cts: The FIFO control status register. - * @fair_per: The fair preriod register. + * @fair_per: The fair period register. * @txf_ctl: The transmit FIFO control register. * @t_out: The SMBus timeout register. * @txf_sts: The transmit FIFO status register. diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h index b05799d2f7..03cacdee42 100644 --- a/include/hw/misc/auxbus.h +++ b/include/hw/misc/auxbus.h @@ -106,7 +106,7 @@ void aux_bus_realize(AUXBus *bus); * * Returns the reply of the request. * - * @bus Ths bus where the request happen. + * @bus The bus where the request happen. * @cmd The command requested. * @address The 20bits address of the slave. * @len The length of the read or write. diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index d7eae548cb..9ad6a47739 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -1,6 +1,6 @@ /* * PC SMBus implementation - * splitted from acpi.c + * split from acpi.c * * Copyright (c) 2006 Fabrice Bellard * diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 8bc9d5108a..cef51663d0 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -1626,7 +1626,7 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t *buf, uint8_t len) break; passthrough: - /* Unimplimented registers get passed to the device */ + /* Unimplemented registers get passed to the device */ default: if (pmdc->write_data) { ret = pmdc->write_data(pmdev, buf, len); diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c index feb3ec6333..2ef2c7c5f6 100644 --- a/hw/i2c/smbus_slave.c +++ b/hw/i2c/smbus_slave.c @@ -2,7 +2,7 @@ * QEMU SMBus device emulation. * * This code is a helper for SMBus device emulation. It implements an - * I2C device inteface and runs the SMBus protocol from the device + * I2C device interface and runs the SMBus protocol from the device * point of view and maps those to simple calls to emulate. * * Copyright (c) 2007 CodeSourcery. diff --git a/hw/sensor/isl_pmbus_vr.c b/hw/sensor/isl_pmbus_vr.c index eb344dd5a9..e51269f6b8 100644 --- a/hw/sensor/isl_pmbus_vr.c +++ b/hw/sensor/isl_pmbus_vr.c @@ -101,7 +101,7 @@ static void isl_pmbus_vr_exit_reset(Object *obj) } } -/* The raa228000 uses different direct mode coefficents from most isl devices */ +/* The raa228000 uses different direct mode coefficients from most isl devices */ static void raa228000_exit_reset(Object *obj) { PMBusDevice *pmdev = PMBUS_DEVICE(obj); diff --git a/hw/sensor/max34451.c b/hw/sensor/max34451.c index a91d8bd487..9db52ef677 100644 --- a/hw/sensor/max34451.c +++ b/hw/sensor/max34451.c @@ -734,7 +734,7 @@ static void max34451_init(Object *obj) /* * get and set the temperature of the internal temperature sensor in - * centidegrees Celcius i.e.: 2500 -> 25.00 C, max is 327.67 C + * centidegrees Celsius i.e.: 2500 -> 25.00 C, max is 327.67 C */ for (int i = 0; i < MAX34451_NUM_TEMP_DEVICES; i++) { object_property_add(obj, "temperature[*]", "uint16", From patchwork Thu Aug 31 12:56:29 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: 719015 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp467029wrn; Thu, 31 Aug 2023 06:18:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKYiC3q0abnO3YuvYI6InD2l4LPQtK1mz9ZVxUxdV2NL2Gq0ExPU7EchxGP7/v+H8C6yNd X-Received: by 2002:a5d:414f:0:b0:317:67bf:3376 with SMTP id c15-20020a5d414f000000b0031767bf3376mr4015249wrq.57.1693487895075; Thu, 31 Aug 2023 06:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487895; cv=none; d=google.com; s=arc-20160816; b=ZpyRK9IdOw9ZNqlscZ2R9i3V4oaXBnyFQb9OolIh7hBnE3eyQVqs+EiCXI0rpdD85n ZNZYyAIf9iBN3owj0N2cKjbfQvr922Xuwa/sSEHKG3bPHZ3RC9duB1TPONXu3Xbl+5+F PkqxG6zqRFRYzcMbJms4YplhtSfzVk2CM6uKP2LgwNGTTg0aaSZ+/IHh9vFMK8+z8UV4 vdFqNvzLulrxrPXv8P0m2AljG5a4Ose2kVRc6w4fv8xpLep9Ck7TmNELoifGqjiJ01ez tbs82MTaOcnxgAlaKoQKOvOtoC5ZDxoINu1WdPPQYKwgNNJDl6xbsdH7TxXZEEH+ObWs OlbQ== 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=sCCxv16p0EiY2aKlOpGL2Z1uWvBgdn7GkvBoQqZSuSQ=; fh=ncQCHh01/FBXw3z15cXb/f9zm1dsyhMeqD4FByO9RAM=; b=A/Fs/1JdNK/WFXfmlFnQpHb8P69VM21bh4h6I1834Bcp9Ww3xY5mciG/Lw8If1mZSe 3sbzYhHG1b9jxrhsINoVQiZ4qUvshuBn/BT7Rn6IUlTsZNDhLBvDMLRIR/LNTJJfHe7D d9hbT4QhUTpQm+i9sofqJFaQDuQOQ//tk2DC/PnsZacelPohXq6X7XI1Cz0TEyu1eRnl 4eZQgyJaHNpP71wZw39zMqmuMMepxtUKAu9aDgrJ/NGMXyE9u25W5jjlCY9J4wdIK1hf FV9L+Dfe7bnSF5liNZtfHyUZWnvGtn3cgUYMF1T/dKpDXLzXiwz1UFaS0a4m6TkdWOZA gjXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XrC7DTwU; 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 t17-20020a05600c41d100b003fe26bc8c2bsi767226wmh.228.2023.08.31.06.18.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:18: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=@linaro.org header.s=google header.b=XrC7DTwU; 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 1qbhLH-00082u-Lw; Thu, 31 Aug 2023 09:04:11 -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 1qbhGu-0004jw-Uq for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:42 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGp-00061g-GR for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:40 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-401da71b85eso7296795e9.1 for ; Thu, 31 Aug 2023 05:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486773; x=1694091573; 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=sCCxv16p0EiY2aKlOpGL2Z1uWvBgdn7GkvBoQqZSuSQ=; b=XrC7DTwUFnqOeLsTkPLW6yUb1NY+iNSk1KXGr8nZ2RaH9ALSGbv8TEdrWPyvqrNDQO +by4fiGlpzKWrJKF+hWX/K7c0kP0KNwB9+qjzySDc7ugCtPzej+U/6Sgt2Zxrc31k7qS qTudWVCvHzNPH2MsnuB2xWCBJe8T6Y4IOTUlhsjRELeJ/KBGTOfZU3121P/UVZMMOyMs t0ld2Ou8gAaH7ONCTJseKxcu46BARghmbTQyeZTyO88TcdqIstCHz0QdslibXzlNYXcC eBKT0l87IRq5iJ1j5t9N9+QUSG9q7GtdtM0ULeHPLbQ1jTTRqDo1Rywa6Oy1z1BRnBJ4 afRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486773; x=1694091573; 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=sCCxv16p0EiY2aKlOpGL2Z1uWvBgdn7GkvBoQqZSuSQ=; b=QVlmR9akUCp82u0sIZso9E7W528JzPM/TorUfpooIzUYQfUvDpAgR4XthKzcIPlT/z x5k0J7BmWNjtXIXfLHylN0ZPbf31LUUz1Oy1JivKv94O+mLwa7cQvFLJinmrbgg0Qr2K Rtf+CkoBs5frWASZEtlVINHa3JO3pJUjF1N9Zv8MzUF/B84icpud1M4g+bwKo2jaqrxS xUGfwJpsV0/trZYo2Xp2okjc611qKh7xCWLy9k7ReY07903seboweduaqCLkP23FMM/Z yM5pjrJs07+gjD0Ti3FJQ9XJNlEVXTNjTagIMHjlQJIpYrpLxElaAIobCnsg0d9I8h+I 6sMg== X-Gm-Message-State: AOJu0YzULFJfZ78u25vvTkSvS02fW8MIhBkrn+61Rpb5jfrUHSKCigDP 3Bdvxl5NRKPZPw9kezoc5iylRf0LZKVlh5J/Iio= X-Received: by 2002:adf:f40c:0:b0:315:9e1b:4ea6 with SMTP id g12-20020adff40c000000b003159e1b4ea6mr3895600wro.58.1693486773261; Thu, 31 Aug 2023 05:59:33 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id b15-20020a5d550f000000b0031c5ce91ad6sm2142636wrv.97.2023.08.31.05.59.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow Subject: [PULL 27/41] hw/ide: spelling fixes Date: Thu, 31 Aug 2023 14:56:29 +0200 Message-ID: <20230831125646.67855-28-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Message-ID: <20230823065335.1919380-14-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/ahci_internal.h | 4 ++-- hw/ide/cmd646.c | 2 +- hw/ide/core.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index 2480455372..c244bbd8be 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -61,13 +61,13 @@ enum AHCIHostReg { AHCI_HOST_REG_CTL = 1, /* GHC: global host control */ AHCI_HOST_REG_IRQ_STAT = 2, /* IS: interrupt status */ AHCI_HOST_REG_PORTS_IMPL = 3, /* PI: bitmap of implemented ports */ - AHCI_HOST_REG_VERSION = 4, /* VS: AHCI spec. version compliancy */ + AHCI_HOST_REG_VERSION = 4, /* VS: AHCI spec. version compliance */ AHCI_HOST_REG_CCC_CTL = 5, /* CCC_CTL: CCC Control */ AHCI_HOST_REG_CCC_PORTS = 6, /* CCC_PORTS: CCC Ports */ AHCI_HOST_REG_EM_LOC = 7, /* EM_LOC: Enclosure Mgmt Location */ AHCI_HOST_REG_EM_CTL = 8, /* EM_CTL: Enclosure Mgmt Control */ AHCI_HOST_REG_CAP2 = 9, /* CAP2: host capabilities, extended */ - AHCI_HOST_REG_BOHC = 10, /* BOHC: firmare/os handoff ctrl & status */ + AHCI_HOST_REG_BOHC = 10, /* BOHC: firmware/os handoff ctrl & status */ AHCI_HOST_REG__COUNT = 11 }; diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index cabe9048b1..c0bcfa4414 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -257,7 +257,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Error **errp) pci_conf[CNTRL] = CNTRL_EN_CH0; // enable IDE0 if (d->secondary) { - /* XXX: if not enabled, really disable the seconday IDE controller */ + /* XXX: if not enabled, really disable the secondary IDE controller */ pci_conf[CNTRL] |= CNTRL_EN_CH1; /* enable IDE1 */ } diff --git a/hw/ide/core.c b/hw/ide/core.c index de48ff9f86..ee116891ed 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1698,7 +1698,7 @@ static bool cmd_set_features(IDEState *s, uint8_t cmd) put_le16(identify_data + 63, 0x07); put_le16(identify_data + 88, 0x3f); break; - case 0x02: /* sigle word dma mode*/ + case 0x02: /* single word dma mode */ put_le16(identify_data + 62, 0x07 | (1 << (val + 8))); put_le16(identify_data + 63, 0x07); put_le16(identify_data + 88, 0x3f); From patchwork Thu Aug 31 12:56:30 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: 719005 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp463906wrn; Thu, 31 Aug 2023 06:13:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF07quYUfQ4OKbudNNjmhxlnh1IkwP12V3NunKo1oSF1d7/HmF1c+FXFhVmOx+v7t/3nZNv X-Received: by 2002:a05:6830:115:b0:6bc:d519:d7b3 with SMTP id i21-20020a056830011500b006bcd519d7b3mr4703812otp.37.1693487613538; Thu, 31 Aug 2023 06:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487613; cv=none; d=google.com; s=arc-20160816; b=AdrJFIZov7w/oPhz5aDWQ5po0UOfvjcGWoiHlAaEPyE9IopnQxHU4CNfm1x0pd8rMP 4eQzwERuCiHUzqLTxMPSFqgo48FkxSSH2nP2dFk11Y9xvevnxN4+ZwfsqieE89eKEqt8 SqOO3j+XxqU9SaYy+nRAZt9hdqjmcIz7Lme+I7OYYxmQcq2FW6LavD6ZzjTVISJcJ9nl RKhbmm/PGplSf7g0CHJ6icf1wc21zWCAw+sYNZNl8lauq9+JxcsNA3nSEGqAEpW7Hkp3 1g1pXOnZCb8XCHnfSOJfRTKm52HrZzHTHwybi6pozQg3jUOMgALIPNkzNKf5FMmal1RB dLAw== 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=ur9xi937dzz6Bl2U4bEFfYnHfQ2+6Mk7VLbsIy+yiQY=; fh=UMEEZ23ufbME07a4BnDtKsZVuwgHq/4Dtzvq5ho03g0=; b=s5EL1imFdrOybeGkdABKAlnEEAdzCl4LR4khz1aygrzUE03wAAmfHGgr35frv/Ty2V Ag/H5NNvtoyVH3stvqScXXR4s79dW0+p1/bKSvi2fuW7Cc1IkFkqmJr6rGBCJ+pGXQdi H5bcT3kBoobpOhiiH/q6Vh62FJnWDuDtINXvxPRPk8+P6DXN0RBSHWJJs2iiZP4DtPMe HGt4c1C8XCp1wuquiYgo3CbvhbOvY3hCHbJsWWy7sx50toIJ0CxS3IfS9nXdZlXIaa7d hotl7kmZUtPGRnuAkJLDRIOb6RBPFJq/YVJQ79x6PibsWDjmrERpfFEGKLPt/nJvU3WP SEug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p93qFbrX; 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 x20-20020a05622a001400b004053819f665si850127qtw.608.2023.08.31.06.13.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:13:33 -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=p93qFbrX; 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 1qbhLL-00089R-P2; Thu, 31 Aug 2023 09:04:15 -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 1qbhGz-0004pQ-OA for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:49 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhGu-00065p-IY for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:45 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-401f68602a8so7216475e9.3 for ; Thu, 31 Aug 2023 05:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486779; x=1694091579; 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=ur9xi937dzz6Bl2U4bEFfYnHfQ2+6Mk7VLbsIy+yiQY=; b=p93qFbrXQ6SN01gFC+mCDwinPT864Vc7iDNXuSaBjHtdOEM6rBKil8dKQMPYY2qjUY OtECUlmpp0yZSFIxBJB6tJq/vCr3YSyj+aM8gKaY63Yizrw5i60UeqyprRtf2k/ie+Pi hYJ86rk0Vu59s3rdEe3YbLm5746nZv6Wn+DU6nN6tsMEARtzQewj2zH+gG7x706l8ADh 1di5McuhMV0ZrWI+0aF8QQaq8m2M8XBvqTi2sTkDAaYHIPK/ib4NpVwFh8chxmWXTHOp OIO0FiXolg9WGjacQB/aIjGDDUCe/MVhzPzFvOQnGjKUKN7jipPA4ZFZ1WZ/FftdDV9N usrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486779; x=1694091579; 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=ur9xi937dzz6Bl2U4bEFfYnHfQ2+6Mk7VLbsIy+yiQY=; b=Zrz0pVpYdpzEzFx8FuB03/3U8/F8UXFJQjjEXs/AnhMMJRksHslFUKZxUjo1TQWN1r vldWIxUYBPQmyQmf7kW30lX/GCdvTON3nOghj9x0ITxSFF0BpEW/kcZJ+UNp01+IPcu/ bS/8ntlM5n5RVwredHh9Ib1BU0qksx3qROj54gF0ZJMC2eIwV/yHJ26+G9q94K0dl1Q1 r7+UGKSRcM3aKPChbUuxtl7Wg9f49WdJ1InYJ1hL0fKkCtQheBOOwM02ccxbH4Ql09+h BM/udhbxmQL9QKXStDr5AsnP3JnPhcDbFtLJ3l2WvVOoO/eDFrhpdOaXIjDt9mZYjgAP lIHw== X-Gm-Message-State: AOJu0YzB+iksPTWm4Ea9qrUQbYIlcqyL1/DBDMx9XpScOx5qOYdsD8BF Wtkty62HPtcTJszzesNeROUPynZwR9WFWfVFDrc= X-Received: by 2002:a05:600c:220d:b0:3fc:92:73d6 with SMTP id z13-20020a05600c220d00b003fc009273d6mr3971473wml.11.1693486778822; Thu, 31 Aug 2023 05:59:38 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id q9-20020adff789000000b003180027d67asm2141739wrp.19.2023.08.31.05.59.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Alistair Francis , "Edgar E. Iglesias" , Peter Maydell Subject: [PULL 28/41] hw/display: spelling fixes Date: Thu, 31 Aug 2023 14:56:30 +0200 Message-ID: <20230831125646.67855-29-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20230823065335.1919380-15-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- hw/display/bochs-display.c | 2 +- hw/display/qxl.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/xlnx_dp.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index e7ec268184..9138e98c3b 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -164,7 +164,7 @@ static int bochs_display_get_mode(BochsDisplayState *s, memset(mode, 0, sizeof(*mode)); switch (vbe[VBE_DISPI_INDEX_BPP]) { case 16: - /* best effort: support native endianess only */ + /* best effort: support native endianness only */ mode->format = PIXMAN_r5g6b5; mode->bytepp = 2; break; diff --git a/hw/display/qxl.c b/hw/display/qxl.c index f1c0eb7dfc..af941fb0c2 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1544,7 +1544,7 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm, } } -/* return 1 if surface destoy was initiated (in QXL_ASYNC case) or +/* return 1 if surface destroy was initiated (in QXL_ASYNC case) or * done (in QXL_SYNC case), 0 otherwise. */ static int qxl_destroy_primary(PCIQXLDevice *d, qxl_async_io async) { diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c index d67b0ad7b5..32b32a3044 100644 --- a/hw/display/ssd0303.c +++ b/hw/display/ssd0303.c @@ -8,7 +8,7 @@ */ /* The controller can support a variety of different displays, but we only - implement one. Most of the commends relating to brightness and geometry + implement one. Most of the commands relating to brightness and geometry setup are ignored. */ #include "qemu/osdep.h" diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index ab229d32b7..09b1bbed0a 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -8,7 +8,7 @@ */ /* The controller can support a variety of different displays, but we only - implement one. Most of the commends relating to brightness and geometry + implement one. Most of the commands relating to brightness and geometry setup are ignored. */ #include "qemu/osdep.h" diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index b0828d65aa..822355ecc6 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -380,7 +380,7 @@ static inline void xlnx_dp_audio_mix_buffer(XlnxDPState *s) static void xlnx_dp_audio_callback(void *opaque, int avail) { /* - * Get some data from the DPDMA and compute these datas. + * Get some data from the DPDMA and compute these data. * Then wait for QEMU's audio subsystem to call this callback. */ XlnxDPState *s = XLNX_DP(opaque); From patchwork Thu Aug 31 12:56:31 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: 718993 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461757wrn; Thu, 31 Aug 2023 06:10:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEtbLQyqtx4IH1zsXE6VQr0ufl3xix1do5J9mCs1Wp26digTsrmEl/xXKzJ2vqGXx6d1RH X-Received: by 2002:a0c:e3d2:0:b0:651:94b1:c0c7 with SMTP id e18-20020a0ce3d2000000b0065194b1c0c7mr1966507qvl.48.1693487403896; Thu, 31 Aug 2023 06:10:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487403; cv=none; d=google.com; s=arc-20160816; b=muhd3QeM1ndXayHsy+zmnGfF8POOhz+HwTJ2hd8kIxQFvfeYVIUfw4XOUBCmAo1CpC Pkw3fcJrg2/HpQttlSECD9Uv5YCTQ2mu/sCEV/RWLEYxbeXdqT2F3mgxSr5DoYC1sNh6 W8gWNPOUbfzjRAeHvY1gnuVC5068EaVNlErRvRT9dPe6VayjSNTWOUseK14lllbd6D3f Z2kZdljpvfr6VKhSpyM/tK3pYKq4TGAZP0GDdWY/CHPkcGLvp4Sw3IZNZLXIJpySXgvT Z4vbWnJ7kReFouYVMtcgYyOIoyPefLWnY5oDllfuZOD/Coy7iA/SCvl+uN6gTNBXWDtE ibKg== 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=AOY5lhScsDUk1SrUusOZvTotnRVyQlmmyNHy+CfjkrE=; fh=yEaAeg9XL4aRWN1JcMvhdlU3mF7OCYXc6iioPF52zLM=; b=zE5ZeX5xzqn90bxYAvDK+n9bP+jbs8FSm/LbOj0KiQcTSIeN/AM36soYLLPebpkNVu SjdXBdVNNz+pJ+pf3PBi72prYhaEViIDlQTzfwGN3aCA8uZTlldGkJsibClQ41CGI5mQ ffRQwQbCElSNLnxFKxi9oNEqXOBZk4LokCFFilMT3HRAU4OjZlyH9ZfYgcdmblgm0zIJ u7NEI7QjIYLOnNogTA7oApKDE48gsqKAN1CXW2ECL7SN+lQv5wmplm0Pm4G0DWdQmURX 15oJGuq/vIuXvdpyAm/w653jxnEhTmikuwz77cex5sMesulsNbvffdDqwRq+zcfWd5+p GEXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eOW4g3wM; 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 c9-20020a0ca9c9000000b0064f73d0f5b8si883915qvb.18.2023.08.31.06.10.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:10:03 -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=eOW4g3wM; 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 1qbhLD-0007oW-SS; Thu, 31 Aug 2023 09:04:07 -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 1qbhHB-0005AD-J9 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhH4-00069n-33 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 08:59:56 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401b3ea0656so7222545e9.0 for ; Thu, 31 Aug 2023 05:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486784; x=1694091584; 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=AOY5lhScsDUk1SrUusOZvTotnRVyQlmmyNHy+CfjkrE=; b=eOW4g3wMK8FPQEb7fC5G9DmYgQb56ynK2grxYReUbTFHyuA7IQsRsefLGXfI3ekAyp 1HlcSahHoj6RLWTzvVfOBp+5sqq5nJG/0PWcb525Ds3MYYgGMxIsBkvGeIn85Wx+EECi efAPkLpMMHKI3o8bmbiOn6SfLiB8O61v13Tw7UGbnab+MvFoM51P9b9TFLER49NDzRDW /iKfeWQUY9pggNFWRSKcFZCmMQyy+v4Np+uq52njn4grBvnkgAcR1KhEWyAGwloF4lU9 zNrZAUh5es7Pn9fhKA8OqHf5QUCId6x1SMDFCOlbl1XzoXSWGhwb+HJ47zjB+z7HX8Ta Ac0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486784; x=1694091584; 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=AOY5lhScsDUk1SrUusOZvTotnRVyQlmmyNHy+CfjkrE=; b=ARYpFj3DQ2OOl6Ov8o8b5qhmRJciMkZYNkNAwTIRXBXDcKcmbUeCNPuueDsyX5q3Rn FB8fGu7iw8X0PtwPjApAx7aozGGj8Vyc7zcSVFE9RVUzxnosOqvTtbWZviu/u39p53Fy HAgcSCPvlkOJqeiFUYy+IeDgO+SF1ARgnd6e/JxpUu79kaUsHKIvfQ/zrBoySklFkUI+ pTfRRAKsuHCQAmyedBun9SOqdWNlTrxExj7tgk1g7brsfJZOQE5gb/9tm3e7LTYbiKjJ 01ecgRPFtfuLhf82LQozqNoM5aZ9Vzw0xSU2HGFC8gS4vJtnAuvj0DBxBJnyDYvLuQ/V djSg== X-Gm-Message-State: AOJu0YxTNpOGMh2fWYPvGiihYU//OAO6b6Pe5SijtPz0Ff9dmtn/Lt1P lgregCZLMbCRFJYBLT4kJBhUyf8Xc8jig5M9D7E= X-Received: by 2002:a05:600c:2182:b0:3fd:1cfa:939e with SMTP id e2-20020a05600c218200b003fd1cfa939emr4481116wme.4.1693486784445; Thu, 31 Aug 2023 05:59:44 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c299000b00400268671c6sm1916994wmd.13.2023.08.31.05.59.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PULL 29/41] hw/mips: spelling fixes Date: Thu, 31 Aug 2023 14:56:31 +0200 Message-ID: <20230831125646.67855-30-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20230823065335.1919380-7-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/malta.c | 2 +- target/mips/tcg/msa_helper.c | 12 ++++++------ target/mips/tcg/mxu_translate.c | 6 +++--- target/mips/cpu-defs.c.inc | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index f9618fa5f5..16e9c4773f 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -627,7 +627,7 @@ static void bl_setup_gt64120_jump_kernel(void **p, uint64_t run_addr, 10, 10, 11, 11 /* PIIX IRQRC[A:D] */ }; - /* Bus endianess is always reversed */ + /* Bus endianness is always reversed */ #if TARGET_BIG_ENDIAN #define cpu_to_gt32(x) (x) #else diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c index c8597b9e30..c314a74397 100644 --- a/target/mips/tcg/msa_helper.c +++ b/target/mips/tcg/msa_helper.c @@ -803,9 +803,9 @@ void helper_msa_bset_d(CPUMIPSState *env, uint32_t wd, uint32_t ws, uint32_t wt) * | HADD_S.H | Vector Signed Horizontal Add (halfword) | * | HADD_S.W | Vector Signed Horizontal Add (word) | * | HADD_S.D | Vector Signed Horizontal Add (doubleword) | - * | HADD_U.H | Vector Unigned Horizontal Add (halfword) | - * | HADD_U.W | Vector Unigned Horizontal Add (word) | - * | HADD_U.D | Vector Unigned Horizontal Add (doubleword) | + * | HADD_U.H | Vector Unsigned Horizontal Add (halfword) | + * | HADD_U.W | Vector Unsigned Horizontal Add (word) | + * | HADD_U.D | Vector Unsigned Horizontal Add (doubleword) | * +---------------+----------------------------------------------------------+ */ @@ -3452,9 +3452,9 @@ void helper_msa_mulv_d(CPUMIPSState *env, * | HSUB_S.H | Vector Signed Horizontal Subtract (halfword) | * | HSUB_S.W | Vector Signed Horizontal Subtract (word) | * | HSUB_S.D | Vector Signed Horizontal Subtract (doubleword) | - * | HSUB_U.H | Vector Unigned Horizontal Subtract (halfword) | - * | HSUB_U.W | Vector Unigned Horizontal Subtract (word) | - * | HSUB_U.D | Vector Unigned Horizontal Subtract (doubleword) | + * | HSUB_U.H | Vector Unsigned Horizontal Subtract (halfword) | + * | HSUB_U.W | Vector Unsigned Horizontal Subtract (word) | + * | HSUB_U.D | Vector Unsigned Horizontal Subtract (doubleword) | * | SUBS_S.B | Vector Signed Saturated Subtract (of Signed) (byte) | * | SUBS_S.H | Vector Signed Saturated Subtract (of Signed) (halfword) | * | SUBS_S.W | Vector Signed Saturated Subtract (of Signed) (word) | diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translate.c index e662acd5df..cfcd8ac9bc 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -2977,14 +2977,14 @@ static void gen_mxu_Q8ADD(DisasContext *ctx) * to another one in XRc, with zero extending * to 16-bit and put results as packed 16-bit data * into XRa and XRd. - * aptn2 manages action add or subract of pairs of data. + * aptn2 manages action add or subtract of pairs of data. * * Q8ACCE XRa, XRb, XRc, XRd, aptn2 * Add/subtract quadruple of 8-bit packed in XRb * to another one in XRc, with zero extending * to 16-bit and accumulate results as packed 16-bit data * into XRa and XRd. - * aptn2 manages action add or subract of pairs of data. + * aptn2 manages action add or subtract of pairs of data. */ static void gen_mxu_q8adde(DisasContext *ctx, bool accumulate) { @@ -4056,7 +4056,7 @@ static void gen_mxu_s32sfl(DisasContext *ctx) /* * Q8SAD XRa, XRd, XRb, XRc - * Typical SAD opration for motion estimation. + * Typical SAD operation for motion estimation. */ static void gen_mxu_q8sad(DisasContext *ctx) { diff --git a/target/mips/cpu-defs.c.inc b/target/mips/cpu-defs.c.inc index 03185d9aa0..c0c389c59a 100644 --- a/target/mips/cpu-defs.c.inc +++ b/target/mips/cpu-defs.c.inc @@ -1045,7 +1045,7 @@ static void mvp_init(CPUMIPSState *env) return; } - /* MVPConf1 implemented, TLB sharable, no gating storage support, + /* MVPConf1 implemented, TLB shareable, no gating storage support, programmable cache partitioning implemented, number of allocatable and shareable TLB entries, MVP has allocatable TCs, 2 VPEs implemented, 5 TCs implemented. */ From patchwork Thu Aug 31 12:56:32 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: 719007 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp464229wrn; Thu, 31 Aug 2023 06:14:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2E7mFbBpn16kRLD2midYgDv4QkpGfSa/9SQ7Vcdu7mbXgyj2dr0UfOR0bxU6ipK1ecUaE X-Received: by 2002:a05:622a:4c6:b0:410:ab30:d568 with SMTP id q6-20020a05622a04c600b00410ab30d568mr2863929qtx.68.1693487642449; Thu, 31 Aug 2023 06:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487642; cv=none; d=google.com; s=arc-20160816; b=MGOW3wlJ+ng7rIkeZrdZ0f0oDs7UHQrAx+WYZjYOpPWXTqeg4fzxa521XgmrbR3x0J dfUf/ZvtF8oWxYb0I8tIt6fWm2kw63iHxtwq5X/4af1PTHVpF4NVg7mgoHBAIvC7FPrv Aq/Y22Ud7Hr9+u1pqbDYDnuasr+cIbq+FuMqm6Skb5AqA+h6NLTbVsX0oALj4dVck78A 31UnDqedBgmjUdrRNKj/gO2HR2NPIKnB47oc2H0v2XTkZTxzsDAoSDoFNXp3ZRnPBJtu b/GYaGQz805JPe/TgKOHVFu4q73LgTDN/c2bEoiPzIEL9eO0nbVvh6EEHHlQZDC1gZOj ndfg== 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=kvarTMVyPJNAN8F64FPOFchFGECSfRITva9tLBVtfvs=; fh=gmfPYtg/3PIHe9MnGR/MVP+gjobyeW7X44RtogqBIco=; b=A3T4b+w+1597FSdvAkdbNzhBmOmJCaxLKNgQXsszC55tju/11vXLb5O76oTdqdBJZF cMde/3/piLjZjozSR6m6PVZCJ9IfOXgtIX6ucR5Aoz1/Hr4rRc55UJT8EB3l7EKiNzbv /Ay+3vnGMEtNRsjJh/c4Tm0aXZrLwsd1HcNVY/Gm6Q5tiznyufyaurctilyrBXAeY9E6 IgWaKRwOXyOVtL8OK8F3lBj748fKfpp2RDXoNBWmcvRd7MArC385WCHw+ZRRUKA8A/KB 9577poZA2oQlQflIhveb0aPm5RXARHwuPo/WbFjE67vBtVNGOBbsPyLhhgPyb0WOVHnr JMyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tCiZhZgx; 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 i14-20020ac85e4e000000b0040fd6d8194bsi795269qtx.231.2023.08.31.06.14.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:14:02 -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=tCiZhZgx; 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 1qbhLO-0008Ai-Ly; Thu, 31 Aug 2023 09:04:18 -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 1qbhHL-0005FV-Gi for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:07 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhH5-0006Cq-Kd for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:00 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31c479ede21so616704f8f.2 for ; Thu, 31 Aug 2023 05:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486789; x=1694091589; 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=kvarTMVyPJNAN8F64FPOFchFGECSfRITva9tLBVtfvs=; b=tCiZhZgxWgVafbd+FaSzuyf1rt70TG/lynt8nDP3x7UnEnDZVrw+OC0e1/C5vmTv0o bubLTtjaUmUIBCNstzaVdYZNDjWsQAy3OzStFWsXNPM7GiC0DmeJXTwwCoi7+8Z/I6EE C14f+4JblobPW69agfSbg3Hp24a77NT0nTVXtYWlZK9xkQW0EHHr0A8NKgCMsVYECWju yR12QRYHFbH/7sjadn17uN0ynMhuDuXTBqN0fI/dfMx2ejyNj1900y0CtjyPdjC+6VNa u1pjHShQJRP6mBiB3aLJRJhIavNx3IwEoomQCfn68N90f8kMlCvBqzK2fgWswPejmQxK ZDqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486789; x=1694091589; 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=kvarTMVyPJNAN8F64FPOFchFGECSfRITva9tLBVtfvs=; b=ieKK8gh2PLSNcLR3f4X+Bs7LLuYXH3sW4L7/ZerLUllM95IVb7OkKIFpub5HFLdAKP a4PqOm96Sq5k+7zjVj3GEyLL2OHQQAzCRS3ahHEL1mmxBNBV6x4gVup1iszlp16iHDam PUiDOf9jBR5fqRrNekJ82Fq/y4nW8JahF0T6UGvt2JipKERLIM0dCGyxVnbwJyB9xQsA AkjXsBUNrDlmzg8D6nOTDqZwJmaqs3FchRzCUr0NlWfBSJvk5jmgNC60clUOKezyhtOY L5AEqzg+/UtO1dynLUiSm6Sc53SO/l3qCrAqsxClzbRc1jWiBwYzO3fK56w+aOPYwpN3 giag== X-Gm-Message-State: AOJu0YyENc+ITG6f/Hpy/RSuCUTcN5yk128/vgAw1kexq0dEW4HzL0Uu bYOoZMMrhtkZVFnyu8OG3GIlpOhKdFNdY7rPmEw= X-Received: by 2002:a05:6000:110a:b0:31a:e87e:103 with SMTP id z10-20020a056000110a00b0031ae87e0103mr3499071wrw.48.1693486789792; Thu, 31 Aug 2023 05:59:49 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id x16-20020adfffd0000000b0031c8a43712asm2168289wrs.69.2023.08.31.05.59.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 05:59:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng Subject: [PULL 30/41] hw/sd: spelling fixes Date: Thu, 31 Aug 2023 14:56:32 +0200 Message-ID: <20230831125646.67855-31-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Message-ID: <20230823065335.1919380-18-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 2 +- hw/sd/sdhci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 77a717d355..43c374e829 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1224,7 +1224,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) } break; - /* Block read commands (Classs 2) */ + /* Block read commands (Class 2) */ case 16: /* CMD16: SET_BLOCKLEN */ switch (sd->state) { case sd_transfer_state: diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 362c2c86aa..5564765a9b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1811,7 +1811,7 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) * on i.MX, but since it is not used by QEMU we do not care. * * We don't want to call sdhci_write(.., SDHC_TRNMOD, ...) - * here becuase it will result in a call to + * here because it will result in a call to * sdhci_send_command(s) which we don't want. * */ From patchwork Thu Aug 31 12:56:34 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: 719010 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp465484wrn; Thu, 31 Aug 2023 06:16:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ30UWuGee1YVpHtu0Q7bgpA4q38i7OW0UTMb7/V1xLIuToyRy9XZz+hji17n1uuBY5pPl X-Received: by 2002:a05:620a:2801:b0:76d:89c5:78a0 with SMTP id f1-20020a05620a280100b0076d89c578a0mr2892755qkp.63.1693487760593; Thu, 31 Aug 2023 06:16:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487760; cv=none; d=google.com; s=arc-20160816; b=QTSKcGleInK7V/J3ECD5hwk43K3Nz7t90nJC/wCsdRgtUGe/PDozfXm7uaxq3r5CbV tm8DOeRzbKpphGdhxJtIrFxwumW4e/DmZkXwl/P1XjlpJ9oIZ7jkWGR2nOQMXdaOFhZf 5h/nw7MmPituXlFmcM8ncD8rQl88CXNK3VzXP7XoIOQvlXX2ptJFGETAGqk2Mey23Fek MGlhYUo8KjuMAF6e+RZY7v/SR/qWIGQEVPoHe8Bs1yuWkw+PMzwHf/kaxsW4oRGsE0dO P1jnD4vGn7eLL3NdzhWI61tPTC+u6/gAiYzbc4tkRPySK5ksKvarBQ92+sifojxwqxE6 lu3A== 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=A8EundCVxScMr4tt/7YFkt/7+4fhMJQyHAWZWT88veQ=; fh=bxlmc0kDB2ue1a5ZbVi6JhaimuipZzd6pB0uojMRF9s=; b=PmskfgL/33gBGNTzDRyefZvbf+5DQai26jF0t53qV0TJy8gVwKPxH/xjKgdiDPSfJj zwKNwGa5xl+WUw7ccRXf2lnneO/Zg5CZ7oSo6+aERdLTiHBWA0VE6pq1HVPQv4kE9BfQ yjTa1TiFyHJW4j5EBk6mxN71hFDrVShlqaS0rKdCfpxqUnFW4HcWu6ZFDuqvbWBP5Dan csdby2kJpkwvjPRY6qnEnTXtgz0PYuc7ud1YtvWlPrvKXc990SuPa3Rvx4voVfrFFizL YUUka8UI5PYdXxCQetSmpGVHm1Uy0HI9ODijixLPw8b18rGDI3ecMVg9qIKIKHX2lE4D piSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=egQjO4qI; 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 bp43-20020a05620a45ab00b0076ccb18cad2si961450qkb.646.2023.08.31.06.16.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:16:00 -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=egQjO4qI; 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 1qbhLL-000895-5C; Thu, 31 Aug 2023 09:04:15 -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 1qbhHP-0005an-RZ for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:14 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHL-0006Gz-Ew for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:11 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31c6cd238e0so1311057f8f.0 for ; Thu, 31 Aug 2023 06:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486801; x=1694091601; 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=A8EundCVxScMr4tt/7YFkt/7+4fhMJQyHAWZWT88veQ=; b=egQjO4qICOsafCqxEjgccVxk7EjRDY8muzWAaojzCgMDoJ4l0+gyYcxQIVffhJM1G+ TxEwGJ4AHMmLSqZf86FCglZO/IbL5vypGVaWM3iSAkpyYcTpn7j9qOEiZJelY74dN+Nr ehaBWXOHgHohegynh3rhOvrB5fh62grEzBGhFsSuATbpKJCcoQS/iTINU8kQb/uyc4fp eMCKbSKmojcq7XKkZR7VBtwPgwq7GpXCzdZRjT2oxnwmF85ZYSCam2zWrw9qguJlG0YU upeks5kYZawH7xdnm5RKEMgFVZ8nKkhqwUN7whvRwGzFr4IMpf2NV2mJXuBxCAJ3GcfP F7Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486801; x=1694091601; 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=A8EundCVxScMr4tt/7YFkt/7+4fhMJQyHAWZWT88veQ=; b=W/8PTWM/tZTtfULKivEjUEIGcHz4vw4p9lkJi0dF+YMHtL/10MB63s+vCn0/x7xQho xTXRO4IPYwEaYuwlix8dfrTSu7yff2+fegnQYQCNZCwOJtMhWNgytRnEgBijpTwMDjac x9oMUzG+dQyCqtpAnuJBf6KRkKbEy4wnkMc21iy0afACm01J0IxQXNxLV4DgyaHf3zx8 l/z94vAuHn9l62jT3LDfik/yNFsjivo5Ial9wgdBmI6zbC58Rjk3+RKKdJfqHqvaYoHb 396eMPR/hPJbmKMbdtwpZkJZ56ECae+O4RfIJFeh0FGP15gZvoEajDd7/nsS49tVW1nT zesQ== X-Gm-Message-State: AOJu0YycCUlFuwGPmyVGH6WLGYXKZ/kZpCbsDHaGNkKxin6c9JmkPr7A jMbNm98oyD3Q710wDq5yL53usomO2OKxlmIYslU= X-Received: by 2002:a5d:44d2:0:b0:317:f3fd:21b0 with SMTP id z18-20020a5d44d2000000b00317f3fd21b0mr1976615wrr.7.1693486801382; Thu, 31 Aug 2023 06:00:01 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id b11-20020adfee8b000000b0031aeca90e1fsm2162331wro.70.2023.08.31.06.00.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Gerd Hoffmann Subject: [PULL 32/41] hw/usb/hcd-xhci: Avoid variable-length array in xhci_get_port_bandwidth() Date: Thu, 31 Aug 2023 14:56:34 +0200 Message-ID: <20230831125646.67855-33-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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 From: Peter Maydell In xhci_get_port_bandwidth(), we use a variable-length array to construct the buffer to send back to the guest. Avoid the VLA by using dma_memory_set() to directly request the memory system to fill the guest memory with a string of '80's. The codebase has very few VLAs, and if we can get rid of them all we can make the compiler error on new additions. This is a defensive measure against security bugs where an on-stack dynamic allocation isn't correctly size-checked (e.g. CVE-2021-3527). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230824164818.2652452-1-peter.maydell@linaro.org> --- hw/usb/hcd-xhci.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index b89b618ec2..324177ad5d 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2434,7 +2434,6 @@ static void xhci_detach_slot(XHCIState *xhci, USBPort *uport) static TRBCCode xhci_get_port_bandwidth(XHCIState *xhci, uint64_t pctx) { dma_addr_t ctx; - uint8_t bw_ctx[xhci->numports+1]; DPRINTF("xhci_get_port_bandwidth()\n"); @@ -2442,11 +2441,10 @@ static TRBCCode xhci_get_port_bandwidth(XHCIState *xhci, uint64_t pctx) DPRINTF("xhci: bandwidth context at "DMA_ADDR_FMT"\n", ctx); - /* TODO: actually implement real values here */ - bw_ctx[0] = 0; - memset(&bw_ctx[1], 80, xhci->numports); /* 80% */ - if (dma_memory_write(xhci->as, ctx, bw_ctx, sizeof(bw_ctx), - MEMTXATTRS_UNSPECIFIED) != MEMTX_OK) { + /* TODO: actually implement real values here. This is 80% for all ports. */ + if (stb_dma(xhci->as, ctx, 0, MEMTXATTRS_UNSPECIFIED) != MEMTX_OK || + dma_memory_set(xhci->as, ctx + 1, 80, xhci->numports, + MEMTXATTRS_UNSPECIFIED) != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DMA memory write failed!\n", __func__); return CC_TRB_ERROR; From patchwork Thu Aug 31 12:56:35 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: 718996 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp462551wrn; Thu, 31 Aug 2023 06:11:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGr+KTvfCE8WLf9sBe/hhoCk/qp+uHjW0d5Jot1c3ybXaetG1ztIPPEsvGjA968LZPlWq87 X-Received: by 2002:ac8:7d0a:0:b0:413:5f84:424d with SMTP id g10-20020ac87d0a000000b004135f84424dmr2703518qtb.20.1693487473174; Thu, 31 Aug 2023 06:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487473; cv=none; d=google.com; s=arc-20160816; b=ZxLFkhgMlp/ts0ivT4Xg5Rswlia7oi4E0Azf8d/41YpjrRJBTrGEIoONPvyDrgmnUu /1AHkFfRZQy8SVJkQZlg0xilbyJzB6MAtFOrX6pQHbPxW1f/7UGJILtu1yvsyVxCKD3j hCb8JaLiYoD6oF5gAJPHAqF3vAW7/fshAHq5aZWQKXjyYV9ANeL1sneAp/R2iAPHQXD+ tQtDPmnPJZGYyUiyevvERBBgG59hC0U/0U5/gQpqEOLEgrmpv5FDixZj7tiY5sgB7IiP LXzrbjKd4mrx3/KK4+bElvxTJOLgb93ISStzhmDCcz2efVnmUlYPryCR+IzSs/JV5nVs zrsQ== 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=RBqrh3+OwbRO0FKJwz0pOQZiq7Hglu3XVSiWyrHauk4=; fh=W7c4U4W3/8gWLrb98VKeqowzGk5A+4yUlqQlX7h+jUQ=; b=MaPyxu9/U76ySXPSYKLfAlhctaIvsCsLP0MPJeNlW4I9F6Xt/WBiU1D0SKvgY4+CmP vObwv7ovK/lupwi6NsuWhiLF61LsxXStLK0AFGpRh72xq4PkiID1YLKdR66Y6n9RQGe3 LNHVdPp8w02RzaXezx6J2UIrtl14TKJzH+BdCcnA9mhzSLAFhxHTrv+c01hr07v+nMCV KGYaoH7g+nv7cn2wCPFI2WSs7NfswnAJIrCPC/AJp1Ka/rNH9LK88au8+cQUkvHapofk GDTSTJO+PykWL57aywuRCMIvrbC9Lnl1gIc+juO5+qg/sr/WyhDReVn/Xr7z8qcIHeQa tjbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jwS/5IOw"; 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 f19-20020ac859d3000000b004053818fc0esi872449qtf.605.2023.08.31.06.11.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:11:13 -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="jwS/5IOw"; 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 1qbhLT-0008BH-0T; Thu, 31 Aug 2023 09:04:23 -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 1qbhHU-0005kf-7b for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:22 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHN-0006Uw-AD for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:15 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3fee5ddc23eso7129215e9.1 for ; Thu, 31 Aug 2023 06:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486807; x=1694091607; 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=RBqrh3+OwbRO0FKJwz0pOQZiq7Hglu3XVSiWyrHauk4=; b=jwS/5IOwS7px3CF7UdLJXiNGi0KzHBTBrNC3LNr1yrKDqhQx7fm3CUw4PBMeKW4J1H jc1OBsWy4pZKscTGUgc96/BfumC5sIiVKA5KpA7agOKtnX9Z3GCBWmbbX9DJi7nSswyr g5CQzniYwRsFnM7KXcYMLDaRq5++/3A8p7tqiEvw5FwqAe+ovuwV5WXBc3YWm5UwObqD Q6lYKRb6zjlV4HIDhZQCPc5DQErAWV4vfZ390BvPC9USoGs5L6m+FabLrs7g2XZPw0j3 awlETQmsyds6nj0Wh7DUw3/KJS5ok5b9lhC14HhenTs48OV7AHP+Tky/SfWMHoA3+wf8 paMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486807; x=1694091607; 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=RBqrh3+OwbRO0FKJwz0pOQZiq7Hglu3XVSiWyrHauk4=; b=aD7Q/MAljKoXAcY4gBEtPtdXCJV3P5Ce+Zc9kojKQ6AllmTK1XweoSIrYRkJ7NDSBl OUlzXf5AVgxTbU7csxyUmsYEzA1RY5YIIHlylhv/TZfkn/lm/y7ek5NXv8C6lXmyt8do CH3tjCZ2BM6Xr+y8htAbFg1TOrPoS1NUL7L/M/NJWZUc5x4GbkBeSIUuOiOztBvLG2Ok sHqSQDIJHb7El/CcmM3dOTKK9ri4aY8TYdakcr8d0GdW8UDJKRtZP6zpRug0Ez2XulGq SlE+LAcxZWJHzQzZk26jU7gXzw5+gSiVfgwmPHZEjFgH1DcFGPCoXIGoqQhUoeyS6SC+ R05w== X-Gm-Message-State: AOJu0Yxo3lJ2TZ3w6xj6mz7/7Y++ktJKCxpkjk3O4Fr8FBLGknfMRUx4 RPvUaEytjQmp4/it9L9rkGGxWRUvma903D57ilE= X-Received: by 2002:adf:e5cf:0:b0:317:e542:80a8 with SMTP id a15-20020adfe5cf000000b00317e54280a8mr3780210wrn.15.1693486807461; Thu, 31 Aug 2023 06:00:07 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id i16-20020adffc10000000b0031c5ee51638sm2147619wrr.109.2023.08.31.06.00.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Sergio Lopez , kvm@vger.kernel.org Subject: [PULL 33/41] hw/i386: Remove unuseful kvmclock_create() stub Date: Thu, 31 Aug 2023 14:56:35 +0200 Message-ID: <20230831125646.67855-34-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 We shouldn't call kvmclock_create() when KVM is not available or disabled: - check for kvm_enabled() before calling it - assert KVM is enabled once called Since the call is elided when KVM is not available, we can remove the stub (it is never compiled). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20230620083228.88796-2-philmd@linaro.org> --- include/hw/kvm/clock.h | 10 ---------- hw/i386/kvm/clock.c | 4 +++- hw/i386/microvm.c | 4 +++- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 4 +++- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/include/hw/kvm/clock.h b/include/hw/kvm/clock.h index 7994071c4f..3efe0a871c 100644 --- a/include/hw/kvm/clock.h +++ b/include/hw/kvm/clock.h @@ -13,16 +13,6 @@ #ifndef HW_KVM_CLOCK_H #define HW_KVM_CLOCK_H -#ifdef CONFIG_KVM - void kvmclock_create(bool create_always); -#else /* CONFIG_KVM */ - -static inline void kvmclock_create(bool create_always) -{ -} - -#endif /* !CONFIG_KVM */ - #endif diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index df70b4a033..0824c6d313 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -332,8 +332,10 @@ void kvmclock_create(bool create_always) { X86CPU *cpu = X86_CPU(first_cpu); - if (!kvm_enabled() || !kvm_has_adjust_clock()) + assert(kvm_enabled()); + if (!kvm_has_adjust_clock()) { return; + } if (create_always || cpu->env.features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) | diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 7227a2156c..6b762bc18e 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -180,7 +180,9 @@ static void microvm_devices_init(MicrovmMachineState *mms) x86ms->ioapic2 = ioapic_init_secondary(gsi_state); } - kvmclock_create(true); + if (kvm_enabled()) { + kvmclock_create(true); + } mms->virtio_irq_base = 5; mms->virtio_num_transports = 8; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ce1ac95274..3de8e0d741 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -192,7 +192,7 @@ static void pc_init1(MachineState *machine, pc_machine_init_sgx_epc(pcms); x86_cpus_init(x86ms, pcmc->default_cpu_version); - if (pcmc->kvmclock_enabled) { + if (kvm_enabled() && pcmc->kvmclock_enabled) { kvmclock_create(pcmc->kvmclock_create_always); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 37c4814bed..a95c5d046e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -183,7 +183,9 @@ static void pc_q35_init(MachineState *machine) pc_machine_init_sgx_epc(pcms); x86_cpus_init(x86ms, pcmc->default_cpu_version); - kvmclock_create(pcmc->kvmclock_create_always); + if (kvm_enabled()) { + kvmclock_create(pcmc->kvmclock_create_always); + } /* pci enabled */ if (pcmc->pci_enabled) { From patchwork Thu Aug 31 12:56:36 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: 719013 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp466785wrn; Thu, 31 Aug 2023 06:17:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFft3CxtQ2FQdmvzLr/Db+e+G7Eexkohu/lUDJTDBUxnlVcgZAe85v1WrmteHjqcZS9BIBe X-Received: by 2002:a05:6358:990d:b0:13a:6cb:4d91 with SMTP id w13-20020a056358990d00b0013a06cb4d91mr5489267rwa.7.1693487871879; Thu, 31 Aug 2023 06:17:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487871; cv=none; d=google.com; s=arc-20160816; b=mCFdWqZKEZEhpaVaJexCtt/u2YQDRUyj2/wojxK+kdZTVdZr6sx4rB+PK61T2CnLq8 RNofrXyfBlHnHOIsDl64Ou1ity8ygm8N30QRp1hWc6EPRvU5pIltJsu4fDhBtQf50Cnj 9EBqUnaHHtfegxyL/eXYX/lsJPdCKj+eTqJGDP6fLo7GS04ILWaCywA9ZtSCGdfIQmIT 6sZpx11PSooH6IB6O9yFLS3dVAKr88dFcQQyDmTZGbUxFMITAnLEP4SSJX6sX2+lZGQ7 XDFBQ0zRphslZxKx3CD/NlUA+4TTEWYwlMXReyI3CMu6g0j9am1jd0mkj67SGWbzH6MG /ELg== 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=VP+M0BihzQYUg4SRwLkLGrk4ZyudSjdzOazRzuk1iZE=; fh=D11LPqsqtRG3OcfDKhwB9TsaMWxCXXI3v0uU7V7xNIk=; b=lwfToIxSHlvxtLD5P9TruBoDS/5Lw3ZzecgFzYwie7tbc43ZrODgIoAMcCMwbs+k0U EHU7v8DEuP97Zl5d9ql9QpY0RYcP5JFW5sQAS+bqqbbULUjkTDkvq2o2BDadWgj2DFdj S8r/sYS+3OdFh0k6moDBtlruqkBL9qj0gc5S2WMr1PQg+LcZS309mPY7ZqCbGSQhYpzc Zf31HNCeCm5oemhmBEhtVRsCOeRiONqDv2XomA9nt9k+tH5FgrmE4xFsugPAjweEAo04 LpVb0Hv2uyEXOpXkuouXhLdS3yOEHc2d1P6QMSzPtslR+02z/7Pe45dXS6jeD6TONY1J 3FfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i5Bpdoze; 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 q18-20020a05622a04d200b00413691c1f3csi873686qtx.290.2023.08.31.06.17.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:17:51 -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=i5Bpdoze; 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 1qbhLH-00083o-Ux; Thu, 31 Aug 2023 09:04:11 -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 1qbhHY-0005vb-Gs for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:22 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHS-0006YM-Ve for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:20 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31c7912416bso647871f8f.1 for ; Thu, 31 Aug 2023 06:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486813; x=1694091613; 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=VP+M0BihzQYUg4SRwLkLGrk4ZyudSjdzOazRzuk1iZE=; b=i5Bpdoze4npJm6QxlKHqPZMz8I8wpJWrzHE5mIO849R+8GK+gDeAlSNm5kZKbclavb 5wR+gpTDRQLaEa9F7XJ0szqiSs+KOfjyAk3+rzqfcKMAE8KN1g46r7KSS32G6cOtAtOp CYgMyJ/nB+TzuSgqd5QXCgvVfIHsXZnubzaFiWym1EORm7Pn0nOKMUohT0Rmb4yFcVPy fASkFQPmuFLUBNgD+xqOkheExo27hk4NQBqPlUyeh3MYBuhBXjwZ7i1LPOW2Fv/oHlXD ymdb3g0JH0tFrYOQV1KpVlBYoGxq6DhMZJA6y+o3wQU82MfDzuqGlZZxUv4GmWCA9X1s 2cyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486813; x=1694091613; 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=VP+M0BihzQYUg4SRwLkLGrk4ZyudSjdzOazRzuk1iZE=; b=Ffl3Z9BCChv8MpVMzm0wiq4JQA1TgWBzk/CB3fyxjSt7nPqz6+YBNqHwrcAVCnIaHc nUeaT20lbcuaPzgIsaiQNpPtTx+jMffIHdf8XcP9YdLHfWUf37M7xKRZNdLIPKqgEYyo vM6ih03N8ivTIsdSYJ0IsPSFWpH61M0Ou0nieq0MDb6X++vHynhKsrLJC/txNojyg5TW gSLikiHitm/Jp4ALjEwppwyZkAs1+1w9NdRQ7aMXoJFOwB7Cw2pJT5XLCsVWgYA5Oq2/ r0MXBF9/b/CitY7VGMMFqKQoiy9sSQeIa2LM4E6uSAl2f2EOGnMoxoq8weEa6qQlA7pf Do0A== X-Gm-Message-State: AOJu0YwvlL5TCH6KA0+1FspTCP+FWMhmzdjFeI7Dww1DC3vvqGtOpiP0 nAnjKO695DK0PAFwcVHBsfDegbu0GyMCHi85SZo= X-Received: by 2002:a5d:6888:0:b0:319:854f:7b02 with SMTP id h8-20020a5d6888000000b00319854f7b02mr4148884wru.51.1693486813078; Thu, 31 Aug 2023 06:00:13 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id s16-20020adfecd0000000b0030ada01ca78sm2179819wro.10.2023.08.31.06.00.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Sergio Lopez Subject: [PULL 34/41] hw/i386: Rename 'hw/kvm/clock.h' -> 'hw/i386/kvm/clock.h' Date: Thu, 31 Aug 2023 14:56:36 +0200 Message-ID: <20230831125646.67855-35-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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 kvmclock_create() is only implemented in hw/i386/kvm/clock.h. Restrict the "hw/kvm/clock.h" header to i386 by moving it to hw/i386/. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20230620083228.88796-3-philmd@linaro.org> --- {include/hw => hw/i386}/kvm/clock.h | 4 ++-- hw/i386/kvm/clock.c | 2 +- hw/i386/microvm.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename {include/hw => hw/i386}/kvm/clock.h (85%) diff --git a/include/hw/kvm/clock.h b/hw/i386/kvm/clock.h similarity index 85% rename from include/hw/kvm/clock.h rename to hw/i386/kvm/clock.h index 3efe0a871c..401c7e445b 100644 --- a/include/hw/kvm/clock.h +++ b/hw/i386/kvm/clock.h @@ -10,8 +10,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef HW_KVM_CLOCK_H -#define HW_KVM_CLOCK_H +#ifndef HW_I386_KVM_CLOCK_H +#define HW_I386_KVM_CLOCK_H void kvmclock_create(bool create_always); diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 0824c6d313..34348a3324 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -22,7 +22,7 @@ #include "kvm/kvm_i386.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/kvm/clock.h" +#include "hw/i386/kvm/clock.h" #include "hw/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 6b762bc18e..8deeb62774 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -32,7 +32,7 @@ #include "hw/loader.h" #include "hw/irq.h" -#include "hw/kvm/clock.h" +#include "hw/i386/kvm/clock.h" #include "hw/i386/microvm.h" #include "hw/i386/x86.h" #include "target/i386/cpu.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3de8e0d741..5cbad6ad84 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -46,7 +46,7 @@ #include "hw/ide/piix.h" #include "hw/irq.h" #include "sysemu/kvm.h" -#include "hw/kvm/clock.h" +#include "hw/i386/kvm/clock.h" #include "hw/sysbus.h" #include "hw/i2c/smbus_eeprom.h" #include "exec/memory.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a95c5d046e..0bd68690f5 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -35,7 +35,7 @@ #include "hw/i2c/smbus_eeprom.h" #include "hw/rtc/mc146818rtc.h" #include "sysemu/kvm.h" -#include "hw/kvm/clock.h" +#include "hw/i386/kvm/clock.h" #include "hw/pci-host/q35.h" #include "hw/pci/pcie_port.h" #include "hw/qdev-properties.h" From patchwork Thu Aug 31 12:56:37 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: 719003 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp463246wrn; Thu, 31 Aug 2023 06:12:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGf03YH6BxW3RhyXNhflCn9/cvQa4DPEZVnJw/Db1D8SYR1ThQjxUo1ZvcIQiPuLW7lUvlO X-Received: by 2002:a05:6214:21a5:b0:649:a662:ce3b with SMTP id t5-20020a05621421a500b00649a662ce3bmr3233002qvc.17.1693487539860; Thu, 31 Aug 2023 06:12:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487539; cv=none; d=google.com; s=arc-20160816; b=GqER2B5CXgw7yhlsqEZEoLr45677UZ5mLRbTui6oEdJCBZmgt73y4T3EovWYSxr7eQ KEdPjvfBgBLEsqhd8YkwSyQle6S7we1uWR9gqcPZKU0zjzAx1IkUzHPZU78Mlbbbfvbx wnXJyVlt1CMOyTsAdSSiNJlrX+u5+KRYf6pYwdIbe+pNaEYzvxbqC2GzATCEfnGfHBYu uVuasnQWnTBsccW6OW+lGAL0o7PFsYAd/JuSCYhMsMeuVC7HEIGTKdeRaUsyKmcJ2kJR odqSLvyIH2QER7Dz+jrwgcxV4fcpxMglWdfJRjxWEG5z6WvuUC7fWM8lkHAxSHlR0aM2 CXEQ== 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=P4pW4nemJPjYVIP0e99/LIoCEfzLbBmEnwZT8fz868s=; fh=K1pMRBYxWidjd6gK05IXWA+ucg3D/BsM7PyoXK7BVrU=; b=aKNCE+jVwYsbk61IHwJAF9Da4C1WMKp8vOiiyf/hy5wYKT2uqaKbWpU9O3B9SIro7L T/P/CT5Grzw51pOpsBDEY6njS2Ki+aADfRSeXGu5w9cwWOfnWfq0y4ijCFEv7EGwygO5 WYRQrwypI0VLCGyVa5GbekH5BcIQKheURFgNoF0OE9xkqFYAFNc7OHZnbAmYbSaRLzSm 1CPLEGCWHKh33Wr0Ckbkcoskg5a+s+fU/RRfQhemk9ObcNwIqIyy4NxGVeCdQjTuUErz Up6cRhSQmzPlSjumpCtxY6R7+sbVSodmdoTP8UA6jJwL7Qh0LB+5E6/6FT45dZnzK+J4 5xSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hJ6sI9/4"; 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 l17-20020a0ce091000000b0064f4e7abc46si850428qvk.258.2023.08.31.06.12.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:12:19 -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="hJ6sI9/4"; 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 1qbhLU-0008BQ-6k; Thu, 31 Aug 2023 09:04:24 -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 1qbhHa-0005wc-I4 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:25 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHY-0006aM-6L for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:22 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31c479ede21so617286f8f.2 for ; Thu, 31 Aug 2023 06:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486818; x=1694091618; 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=P4pW4nemJPjYVIP0e99/LIoCEfzLbBmEnwZT8fz868s=; b=hJ6sI9/4HSDKBSTO16wg0rTnjWmvUVNfisH6ktdhT9Gh/G+aUqG9kc3uGqnchdfel5 HBoK547xNHslLv8Unw+u66bczl0KmhJi1jBxgzk1OOsvQGpfI61TyL6fbrbfflnyhybh 4aLnVWajOQD3CsdVKoSk62yVfqHM1zPZd3r1D5apTRilU74f+pUftO3sfXSpUxVjNWdR HvxZ2Jv8CwTxkgW+TEW6/EABeHm3EauG0vZTZmH/GS4POwRSbSORDM3MbOo+VriES+BD M38q93MwaWw3JKXv/sJujxWXxUqDmx542S0/IHxyD2tf/LAU8BcBXMSmHNjb23dbTUmT XN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486818; x=1694091618; 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=P4pW4nemJPjYVIP0e99/LIoCEfzLbBmEnwZT8fz868s=; b=kpXpp5IewxMjF8MaaiHHhnTxqzncNK/GKOQ4pmRpAQpGZCibNAQE8IjDbAmtzceXRT 1azmwiyPxJsjUW4L4u1jT/tqecPLXdh5c6xXqe6959Nkr8YIITuLl6maT1r3IxeG1GKt M+rV/hItIuW5+/l7/ifUil9EvYzso2GRN0Odm7zdta/5Qy6e6FeYx1Ug5LbwP3WHhxTD uEZ/q4ZStOTkIN9JX/NHWEODnYB1Y9knAjGz21qycy4O9SvKLoPtWXhK/s61x13eO+sZ V7mQ8I0Lk5YM1s31FY92ZiENHb6fbYfBitdcAp02ApFnIf+EvwSJVz1uK8plyuwBF5Xb 5x2w== X-Gm-Message-State: AOJu0Yy+WJVrl8q8cvt74FGNeQwjhRY1XR4QT2cUeiXM+5Og4d/4wB5U 2/xCeJCAN09Ni5bWaqr2H5GdzQZjlirNxx/IRTs= X-Received: by 2002:a5d:6884:0:b0:317:5747:b955 with SMTP id h4-20020a5d6884000000b003175747b955mr3642041wru.17.1693486818448; Thu, 31 Aug 2023 06:00:18 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id c17-20020adfe711000000b0031773a8e5c4sm2141968wrm.37.2023.08.31.06.00.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Francisco Iglesias , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 35/41] util/fifo8: Fix typo in fifo8_push_all() description Date: Thu, 31 Aug 2023 14:56:37 +0200 Message-ID: <20230831125646.67855-36-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Francisco Iglesias Reviewed-by: Alex Bennée Message-Id: <20230522153144.30610-2-philmd@linaro.org> --- include/qemu/fifo8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/fifo8.h b/include/qemu/fifo8.h index 28bf2cee57..16be02f361 100644 --- a/include/qemu/fifo8.h +++ b/include/qemu/fifo8.h @@ -46,7 +46,7 @@ void fifo8_push(Fifo8 *fifo, uint8_t data); * fifo8_push_all: * @fifo: FIFO to push to * @data: data to push - * @size: number of bytes to push + * @num: number of bytes to push * * Push a byte array to the FIFO. Behaviour is undefined if the FIFO is full. * Clients are responsible for checking the space left in the FIFO using From patchwork Thu Aug 31 12:56:38 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: 719018 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp467415wrn; Thu, 31 Aug 2023 06:18:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG00tfIDO480anQ3pRPXrjTIfcfrU1ejd74kSlHZTyAU2Ozdg1BK7qKlKAFggWLF35u4NXT X-Received: by 2002:a05:600c:2483:b0:401:d258:ad3d with SMTP id 3-20020a05600c248300b00401d258ad3dmr4416307wms.2.1693487937784; Thu, 31 Aug 2023 06:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487937; cv=none; d=google.com; s=arc-20160816; b=KzUphbazWDFfOxxUDXUiYlgCl+YsgSOhTIMfeMn6LtO3YQzh2NiAmNOPALkJKX+TQf I6GjmerufPM11AtBN1hZNqzzMDd/eVVOw36Ks+Yh6qpLO6U1qU0NY8KiT96YvWyZMMfd 7VGz123Ald2VStMinX0xGnybEvM7nN9zk/5sCefEXdRduLPpKVuuuIHz+GZLxHyL9gs4 O4PehB9Xel+XGLi6l4uvuSVA5NlZFEDCwN5VJTFw3alb6AfuhfVj4RJG05YDuvVDSEw0 ziJsgKhETWsFaGcX/XkBDkOwQ1z/AsWCdc8Brkdw5G4JHuqyuq8kZDSQH+a2ivygRNka pRwg== 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=fujFUeasp++TV/A3YKYPJrj4eV9vCNVc0Wd8QFOx7Zc=; fh=1hhhGUrGyKjTCPPv9yz9vWTUDafZk+zbQ6MVse3CJ6U=; b=FCDB6sSUrFsKijSeC/hYwe3Kp3CApaR/Go3BmLB6Bdkx90RenhEj4pdtl8ubeBaWWw 4+/h9+scTu5CvYAKdKzyxlwMAINIZkHYER+lA6/kkyjzI5gMneL++nr5GI7c0Cwe0LyS KAAfJq5krZ7mebMDuoHApL3EJNFdOVnlF11gwflkfn7phGHxzTlEqS3pYCustDDDVggX IW4cOpsOR1aUvoCg2/rK+AbslgqQw2qdelum6McLsB10cfO0p3AvmacXhE795W3eXT8T QvdWoHVgyxSoLxJOnN1imiCgATIYCFIeA+OO4UC6CaJI/+t46Hf0R8lq6OSk65atpYDX hreg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TPBo9FqS; 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 l12-20020a5d674c000000b0031de23d496asi678068wrw.782.2023.08.31.06.18.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:18:57 -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=TPBo9FqS; 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 1qbhLP-0008As-UR; Thu, 31 Aug 2023 09:04:19 -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 1qbhHl-0006c5-Bb for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:37 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHf-0006eY-HQ for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:32 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-401da71b7faso7921405e9.2 for ; Thu, 31 Aug 2023 06:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486824; x=1694091624; 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=fujFUeasp++TV/A3YKYPJrj4eV9vCNVc0Wd8QFOx7Zc=; b=TPBo9FqSN77AGishxIoazYzIc3ghkeNMS+P3wjFpB17aqbHKmI1Qb1W2a+/lbEh1Gy C/k3CUeaFoKw4p/fSj2RjZSJVPelvvmqDMSn67rtXVQ9n3hTJKwJznRcxHs9aIxOQAB/ JzLdCTb+97ex/evB5MXoYZl+lMEzzaYw/GMcE5Ux95P5sl/AQ1LiBQ59g5CMtLjvTEdP Z/h/yTQ3VXy1TXskEKUpqua8/gM925A/MR0YIAWNyJOyBA1OuaYXBUcqWziEQC9yK0yX AUHeZsQMy0lPe6g+Pg9Ya2+yvc2w0Wjl1HQh13zqfRS5ogLvt1X24GCdViB2C/A88lTa I+OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486824; x=1694091624; 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=fujFUeasp++TV/A3YKYPJrj4eV9vCNVc0Wd8QFOx7Zc=; b=AmSenI+UbbBaAxgzXP0/Jw0cl4z70z7obx6mdoGQD6JUpCPg3zlGvUfUI7Ra4RzlDC LAz052K47Wf7cnrvTqV6NM1Ghjpx3G/mYzQjSvyhvcvse2gfoXGmaUFDU3zAA524Ud3P JpUybIgLyi8c48LAtkKntoN/La3gWbrnZfFIM6tfTIpSYklC2YhbvF+kg+Xov1hxjSnd RnGnpjccqNA+SRCGX5O4A4j0S3nQ0PAkvx74NOmIMn1TBszBiuW2OgmSbauc+9q8IIYb Sg6oW4xWDcG+5VVQjFsIurz67FblFTSowa06k4ntsV730nveJWNlPKHFkrvslnHObCit qV/Q== X-Gm-Message-State: AOJu0YzXJNQHkViYUid+o6B7uY1j/K9SJ39dBFznJNK/7YpAFDkKESKd cP5ssEO1pmKSe3yECxnl7w13d3bArL3zXsItpPI= X-Received: by 2002:a5d:46cb:0:b0:319:6afc:7a3c with SMTP id g11-20020a5d46cb000000b003196afc7a3cmr3807766wrs.10.1693486824263; Thu, 31 Aug 2023 06:00:24 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id a2-20020adff7c2000000b003177074f830sm2165517wrq.59.2023.08.31.06.00.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , Peter Xu , Lukas Straub , Richard Henderson , Paolo Bonzini Subject: [PULL 36/41] util: spelling fixes Date: Thu, 31 Aug 2023 14:56:38 +0200 Message-ID: <20230831125646.67855-37-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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 From: Michael Tokarev Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20230823065335.1919380-3-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- include/elf.h | 4 ++-- include/io/channel-socket.h | 4 ++-- include/io/task.h | 2 +- include/qemu/iova-tree.h | 4 ++-- include/qemu/yank.h | 2 +- util/cpuinfo-aarch64.c | 4 ++-- util/cpuinfo-i386.c | 4 ++-- util/cpuinfo-ppc.c | 2 +- util/main-loop.c | 2 +- util/oslib-posix.c | 2 +- util/qdist.c | 2 +- util/qemu-sockets.c | 2 +- util/rcu.c | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/elf.h b/include/elf.h index ec9755e73b..e7259ec366 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1125,9 +1125,9 @@ typedef struct { #define EFA_PARISC_1_1 0x0210 /* PA-RISC 1.1 big-endian. */ #define EFA_PARISC_2_0 0x0214 /* PA-RISC 2.0 big-endian. */ -/* Additional section indeces. */ +/* Additional section indices. */ -#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tenatively declared +#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tentatively declared symbols in ANSI C. */ #define SHN_PARISC_HUGE_COMMON 0xff01 /* Common blocks in huge model. */ diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h index 513c428fe4..ab15577d38 100644 --- a/include/io/channel-socket.h +++ b/include/io/channel-socket.h @@ -124,7 +124,7 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, * qio_channel_socket_listen_sync: * @ioc: the socket channel object * @addr: the address to listen to - * @num: the expected ammount of connections + * @num: the expected amount of connections * @errp: pointer to a NULL-initialized error object * * Attempt to listen to the address @addr. This method @@ -141,7 +141,7 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *ioc, * qio_channel_socket_listen_async: * @ioc: the socket channel object * @addr: the address to listen to - * @num: the expected ammount of connections + * @num: the expected amount of connections * @callback: the function to invoke on completion * @opaque: user data to pass to @callback * @destroy: the function to free @opaque diff --git a/include/io/task.h b/include/io/task.h index beec4f5cfd..dc7d32ebd0 100644 --- a/include/io/task.h +++ b/include/io/task.h @@ -145,7 +145,7 @@ typedef void (*QIOTaskWorker)(QIOTask *task, * The QIOTask module can also be used to perform operations * in a background thread context, while still reporting the * results in the main event thread. This allows code which - * cannot easily be rewritten to be asychronous (such as DNS + * cannot easily be rewritten to be asynchronous (such as DNS * lookups) to be easily run non-blocking. Reporting the * results in the main thread context means that the caller * typically does not need to be concerned about thread diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h index 8528e5c98f..2a10a7052e 100644 --- a/include/qemu/iova-tree.h +++ b/include/qemu/iova-tree.h @@ -15,7 +15,7 @@ * Currently the iova tree will only allow to keep ranges * information, and no extra user data is allowed for each element. A * benefit is that we can merge adjacent ranges internally within the - * tree. It can save a lot of memory when the ranges are splitted but + * tree. It can save a lot of memory when the ranges are split but * mostly continuous. * * Note that current implementation does not provide any thread @@ -128,7 +128,7 @@ const DMAMap *iova_tree_find_address(const IOVATree *tree, hwaddr iova); * iova_tree_foreach: * * @tree: the iova tree to iterate on - * @iterator: the interator for the mappings, return true to stop + * @iterator: the iterator for the mappings, return true to stop * * Iterate over the iova tree. * diff --git a/include/qemu/yank.h b/include/qemu/yank.h index 5375a1f195..1907150933 100644 --- a/include/qemu/yank.h +++ b/include/qemu/yank.h @@ -25,7 +25,7 @@ typedef void (YankFn)(void *opaque); * @instance: The instance. * @errp: Error object. * - * Returns true on success or false if an error occured. + * Returns true on success or false if an error occurred. */ bool yank_register_instance(const YankInstance *instance, Error **errp); diff --git a/util/cpuinfo-aarch64.c b/util/cpuinfo-aarch64.c index ababc39550..7d39f47e3b 100644 --- a/util/cpuinfo-aarch64.c +++ b/util/cpuinfo-aarch64.c @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-2.0-or-later - * Host specific cpu indentification for AArch64. + * Host specific cpu identification for AArch64. */ #include "qemu/osdep.h" @@ -33,7 +33,7 @@ static bool sysctl_for_bool(const char *name) /* * We might in the future ask for properties not present in older kernels, * but we're only asking about static properties, all of which should be - * 'int'. So we shouln't see ENOMEM (val too small), or any of the other + * 'int'. So we shouldn't see ENOMEM (val too small), or any of the other * more exotic errors. */ assert(errno == ENOENT); diff --git a/util/cpuinfo-i386.c b/util/cpuinfo-i386.c index 3a7b7e0ad1..b2ed65bb10 100644 --- a/util/cpuinfo-i386.c +++ b/util/cpuinfo-i386.c @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-2.0-or-later - * Host specific cpu indentification for x86. + * Host specific cpu identification for x86. */ #include "qemu/osdep.h" @@ -74,7 +74,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(void) * of their memory operands to be 16-byte aligned. * * AMD has provided an even stronger guarantee that processors - * with AVX provide 16-byte atomicity for all cachable, + * with AVX provide 16-byte atomicity for all cacheable, * naturally aligned single loads and stores, e.g. MOVDQU. * * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104688 diff --git a/util/cpuinfo-ppc.c b/util/cpuinfo-ppc.c index 7212afa45d..1ea3db0ac8 100644 --- a/util/cpuinfo-ppc.c +++ b/util/cpuinfo-ppc.c @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-2.0-or-later - * Host specific cpu indentification for ppc. + * Host specific cpu identification for ppc. */ #include "qemu/osdep.h" diff --git a/util/main-loop.c b/util/main-loop.c index 014c795916..797b640c41 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -47,7 +47,7 @@ */ /* * Disable CFI checks. - * We are going to call a signal hander directly. Such handler may or may not + * We are going to call a signal handler directly. Such handler may or may not * have been defined in our binary, so there's no guarantee that the pointer * used to set the handler is a cfi-valid pointer. Since the handlers are * stored in kernel memory, changing the handler to an attacker-defined diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 760390b31e..4d583da7ce 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -671,7 +671,7 @@ void qemu_free_stack(void *stack, size_t sz) /* * Disable CFI checks. - * We are going to call a signal hander directly. Such handler may or may not + * We are going to call a signal handler directly. Such handler may or may not * have been defined in our binary, so there's no guarantee that the pointer * used to set the handler is a cfi-valid pointer. Since the handlers are * stored in kernel memory, changing the handler to an attacker-defined diff --git a/util/qdist.c b/util/qdist.c index 5f75e24c29..ef3566b03a 100644 --- a/util/qdist.c +++ b/util/qdist.c @@ -210,7 +210,7 @@ void qdist_bin__internal(struct qdist *to, const struct qdist *from, size_t n) /* * To avoid double-counting we capture [left, right) ranges, except for - * the righmost bin, which captures a [left, right] range. + * the rightmost bin, which captures a [left, right] range. */ while (j < from->n && (from->entries[j].x < right || i == n - 1)) { struct qdist_entry *o = &from->entries[j]; diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 892d33f5e6..83e84b1186 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -929,7 +929,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, if (pathbuf != NULL) { /* - * This dummy fd usage silences the mktemp() unsecure warning. + * This dummy fd usage silences the mktemp() insecure warning. * Using mkstemp() doesn't make things more secure here * though. bind() complains about existing files, so we have * to unlink first and thus re-open the race window. The diff --git a/util/rcu.c b/util/rcu.c index 30a7e22026..e587bcc483 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -355,7 +355,7 @@ void drain_call_rcu(void) * * Note that since we have only one global queue of the RCU callbacks, * we also end up waiting for most of RCU callbacks that were registered - * on the other threads, but this is a side effect that shoudn't be + * on the other threads, but this is a side effect that shouldn't be * assumed. */ From patchwork Thu Aug 31 12:56:39 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: 719008 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp464226wrn; Thu, 31 Aug 2023 06:14:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERUZxOt0xoMewZdi+IAsE48zj0SCMqFsQqv+QaZXf1fA2q6PyjkwaRzjW5ShJINs7McrpX X-Received: by 2002:a05:6358:9197:b0:139:d4cb:d9fd with SMTP id j23-20020a056358919700b00139d4cbd9fdmr6013608rwa.3.1693487642156; Thu, 31 Aug 2023 06:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487642; cv=none; d=google.com; s=arc-20160816; b=kvi6HicwBs05obO4LkYFF23nxGryn+msMA9+tHe2fuPSzXysorJaMz0sdEXTft/zSF eUHTKnEjAm2XmzThcyjqWZgmL3q+t7RrPigamdLhUBLoLF6/v9Y8ssyX00cYqIqoj8V0 1RlQ+Frfo8XgGD/kK0mNHzQOVud0Np+COA4lesGTpJ3L6vlvmkQe5vfyAAFI2k502g3O fgxuyZkPn54EK3k9HDE5cwbMtH5ZBiaBz+ohLCBCQnINrJ1hkSmToB/tzkbkihjbX84P Y+4yuUIuAnwIKarkEpv5rzTB5LNFNFhntUloR3sNjvatEh8sZd2fHXY6lYm030KbA1ST /NcA== 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=eBc3U04Z410g0QX/hz9VaosKX9rxbbm4KG7R96HSrHc=; fh=GwDQgbQsvzgefuna/OMlmquBRDVrylXRzBMgkP2ZNfw=; b=TqtSB/ZasPT2GikiK4NQ1P84bHVnueqphy6Bp5mC/jO/3fkCOXCInU6XuRVPPaq1lp w0bsVLubd0DP3BeemaFnerGU+f2aSJSN5M2eUcknvc2FQ7a7QvJw7ldv0wQHzYOmOtcx 8Gb1cfPdqOEFwqwDt7taZe/w2/ZvP8aYPLTSv0Yi20sJq1epuPfpwkfUvppUdYsU9sh5 AJVTyXXi11+0XPj36v3dAz07Z0jguIitIo//skQBFOtny8Hrz95TlZXBib4RY/xGmhia Bbnc26U9A1FOcQggXWcjFdlKiqp4FJRp6o8sVnDxEDPvJgLlhIB8NY9MhSbQ7Exu0RM1 MeEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fwIEO7fk; 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 sw5-20020a05620a4bc500b0076d7403a6d5si874083qkn.321.2023.08.31.06.14.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:14:02 -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=fwIEO7fk; 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 1qbhLO-0008Aa-E1; Thu, 31 Aug 2023 09:04:18 -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 1qbhHp-0006h8-Mg for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:38 -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 1qbhHk-0006jf-Gj for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:37 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-31dcd553fecso589819f8f.2 for ; Thu, 31 Aug 2023 06:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486831; x=1694091631; 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=eBc3U04Z410g0QX/hz9VaosKX9rxbbm4KG7R96HSrHc=; b=fwIEO7fkbC/qaXVQZcpOWw8L/4oVWJZtCVa6fnlti2EPIes4rT49y1xfGdyV5Abxjq 58aWjA/uGo+1VIYEWptHTJadiQCjMQo0/QvELQm4p+Jsnoj6waPchU49t0ARg350GQHN vstQPvwQOHr4W/9qZxkmR9+iBHcBSDxmmGvbOhDRhz2nvWmNtEE7y/rjI2HeloLGwTxt h0NyKLezYFSZUUe3lSSuZWoUsTZQFMwuXr9/0iHTSkht+zpbEIYXk/p+uZchscAm/v04 HAb9oM/+y+ean1Fv3O7sRooo1yOPVJHiKF5ayXzExAgUwkvQC0WjXls2VSEQswjH742W 2W/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486831; x=1694091631; 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=eBc3U04Z410g0QX/hz9VaosKX9rxbbm4KG7R96HSrHc=; b=Cs5/Pu4X8e62QPQxlQ16WG010pOuSjxkCjS4dsx2kgcR/A+pUS98HThgU7eb7OYkC1 0mtgap0cKO5lD9V0LcVjzAPtbpxxN4GLeS3zcJqWXlgPnkTvQkPiIcRNKar/DNJTwsRS eC0CR/HM3bWgOx2cPrySiDNWyo6vFnsnDyEgyZZIFebEfmu8QDTGOFySHFkxlZXy7h5g eNG8es1UJN2L0JpEmM5kugFJzyFwlJd/QRb8AKTtW2rPJMrLKuR7JnqyBhF4j+b9raGI 98e8ndJTRhVZeC2xXJaMaUPmLbUwbBtFpAZLownIgIIiYIeZ+iRmcSM6Hm7jfugbHl77 zkyg== X-Gm-Message-State: AOJu0Yx0xcdgbm2PmvMc6IrSocXrGVxmP/QOxAcQvQnas/1FqnAn7nyy tZP8LCVtOfNHBXAyS7aT01l/kEWpH2guquHM/qc= X-Received: by 2002:adf:f6c7:0:b0:31a:c6b2:8c63 with SMTP id y7-20020adff6c7000000b0031ac6b28c63mr3695259wrp.21.1693486830391; Thu, 31 Aug 2023 06:00:30 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id e33-20020a5d5961000000b0031433443265sm2162158wri.53.2023.08.31.06.00.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Peter Maydell , Akihiko Odaki Subject: [PULL 37/41] ui: spelling fixes Date: Thu, 31 Aug 2023 14:56:39 +0200 Message-ID: <20230831125646.67855-38-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-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 From: Michael Tokarev Signed-off-by: Michael Tokarev Message-ID: <20230823065335.1919380-2-mjt@tls.msk.ru> Signed-off-by: Philippe Mathieu-Daudé --- include/ui/kbd-state.h | 2 +- include/ui/spice-display.h | 2 +- ui/keymaps.h | 2 +- ui/vnc-enc-zywrle.h | 4 ++-- ui/sdl2-2d.c | 2 +- ui/sdl2.c | 2 +- ui/vnc-enc-zrle.c.inc | 2 +- ui/cocoa.m | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/ui/kbd-state.h b/include/ui/kbd-state.h index eb9067dd53..fb79776128 100644 --- a/include/ui/kbd-state.h +++ b/include/ui/kbd-state.h @@ -65,7 +65,7 @@ void qkbd_state_key_event(QKbdState *kbd, QKeyCode qcode, bool down); * using qemu_input_event_send_key_delay(). * * @kbd: state tracker state. - * @delay_ms: the delay in miliseconds. + * @delay_ms: the delay in milliseconds. */ void qkbd_state_set_delay(QKbdState *kbd, int delay_ms); diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 5aa13664d6..e1a9b36185 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -42,7 +42,7 @@ #define NUM_MEMSLOTS_GROUPS 2 /* - * Internal enum to differenciate between options for + * Internal enum to differentiate between options for * io calls that have a sync (old) version and an _async (new) * version: * QXL_SYNC: use the old version diff --git a/ui/keymaps.h b/ui/keymaps.h index 6473405485..3d52c0882a 100644 --- a/ui/keymaps.h +++ b/ui/keymaps.h @@ -44,7 +44,7 @@ typedef struct { /* "up" flag */ #define SCANCODE_UP 0x80 -/* Additional modifiers to use if not catched another way. */ +/* Additional modifiers to use if not caught another way. */ #define SCANCODE_SHIFT 0x100 #define SCANCODE_CTRL 0x200 #define SCANCODE_ALT 0x400 diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h index e661ec117d..64fbc90ee7 100644 --- a/ui/vnc-enc-zywrle.h +++ b/ui/vnc-enc-zywrle.h @@ -485,7 +485,7 @@ static inline void wavelet(int *buf, int width, int height, int level) /* RGB <=> YUV conversion stuffs. - YUV coversion is explained as following formula in strict meaning: + YUV conversion is explained as following formula in strict meaning: Y = 0.299R + 0.587G + 0.114B ( 0<=Y<=255) U = -0.169R - 0.331G + 0.500B (-128<=U<=127) V = 0.500R - 0.419G - 0.081B (-128<=V<=127) @@ -539,7 +539,7 @@ static inline void wavelet(int *buf, int width, int height, int level) +------+------+ So, we must transfer each sub images individually in strict meaning. - But at least ZRLE meaning, following one decompositon image is same as + But at least ZRLE meaning, following one decomposition image is same as avobe individual sub image. I use this format. (Strictly saying, transfer order is reverse(Hxy->Hy->Hx->L) for simplified procedure for any wavelet level.) diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index bfebbdeaea..06468cd493 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -150,7 +150,7 @@ bool sdl2_2d_check_format(DisplayChangeListener *dcl, { /* * We let SDL convert for us a few more formats than, - * the native ones. Thes are the ones I have tested. + * the native ones. These are the ones I have tested. */ return (format == PIXMAN_x8r8g8b8 || format == PIXMAN_a8r8g8b8 || diff --git a/ui/sdl2.c b/ui/sdl2.c index 0d91b555e3..ea4a92cd36 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -860,7 +860,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0"); #endif #ifndef CONFIG_WIN32 - /* QEMU uses its own low level keyboard hook procecure on Windows */ + /* QEMU uses its own low level keyboard hook procedure on Windows */ SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1"); #endif #ifdef SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED diff --git a/ui/vnc-enc-zrle.c.inc b/ui/vnc-enc-zrle.c.inc index c107d8affc..a8ca37d05e 100644 --- a/ui/vnc-enc-zrle.c.inc +++ b/ui/vnc-enc-zrle.c.inc @@ -110,7 +110,7 @@ static void ZRLE_ENCODE_TILE(VncState *vs, ZRLE_PIXEL *data, int w, int h, ZRLE_PIXEL *end = ptr + h * w; *end = ~*(end-1); /* one past the end is different so the while loop ends */ - /* Real limit is 127 but we wan't a way to know if there is more than 127 */ + /* Real limit is 127 but we want a way to know if there is more than 127 */ palette_init(palette, 256, ZRLE_BPP); while (ptr < end) { diff --git a/ui/cocoa.m b/ui/cocoa.m index 0c2153d17c..4d8989c4eb 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -2045,7 +2045,7 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) /* * Create the menu entries which depend on QEMU state (for consoles - * and removeable devices). These make calls back into QEMU functions, + * and removable devices). These make calls back into QEMU functions, * which is OK because at this point we know that the second thread * holds the iothread lock and is synchronously waiting for us to * finish. From patchwork Thu Aug 31 12:56:40 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: 719012 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp466569wrn; Thu, 31 Aug 2023 06:17:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmXoOrKa6ADMYVEIPew9B2IOKj602Mmn+ytXoYD5Z8Ny5rtqL8Kp5uIlxorByW1aDvDWgX X-Received: by 2002:a05:622a:449:b0:40f:e946:a3f4 with SMTP id o9-20020a05622a044900b0040fe946a3f4mr2748007qtx.37.1693487850870; Thu, 31 Aug 2023 06:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487850; cv=none; d=google.com; s=arc-20160816; b=NW+AE06ptsMuIxZo4YgbvlVEycJjGldNSqZzjVrp/5eeY1AnncgsXc7S8fx4ktv2+Q bGC1t8qa7umlqSmnlnTP1riPP8TUTcbW3lbrmqdPLqTNd0w3BoUEPE3Xju26uHf+9RGn fKVwim3/tBSN5i7RxrrxmzpI5G5Dm7OAQin2af64n8gxaNWDJIJ6OY0PAk6x/m4+0aym HmeIi/AkRKdcy5W+xw4/LSvAcC1fznbCR8rBbRAdNYVFjtEoAAwnndlkICh/nOB6fC8W jCZktYQ/X/UH8NPmtXgbLwEZqBChJTVvg5kIBPmlr61O0wn90InrYL6CCsiPBjBeRg+2 hXQw== 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=uHTYP96hxROQBfiRHrUY1wrTC25GMnf+igTYqzxdbDE=; fh=zn6o0f0gv5ZkC2kYOnqwo2ZvBbLYdyI8P1mhTaqTiyI=; b=Dtr4GOZepVXteK5TJCNPoFqK4pk3FslPvR1zmlTJrkQbo/gRg0+LbDFrn73JuGE4cU VDQgU/uDWq3vlx6+8XNiTSswbzIYk0vu00Z3xu4OGAT3NT28mvlrUiwWjZ7f1GIGPmQg RAMB2B0thQEyTuyEgno56XeepIaXkjwaa0JgbSTTzpHmzP9Y6oy1jMxJLC2vpcWzT9y5 V7y4vadWWVo46BkDPmJldcAOuoyaBEy3/mJoUrVV8d2Nlad28fnT8qXa6bNHgSirBPga FiT6NfIeS9y7TTE+HCQMcyIaC2PWtUSsHwDK0JlFI3CLnZv2peTpHchMceQOnsPViUpk itZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WD6MAfLi; 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 d17-20020a05622a101100b004009ad9bb96si821083qte.310.2023.08.31.06.17.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:17:30 -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=WD6MAfLi; 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 1qbhLP-0008Aq-Ny; Thu, 31 Aug 2023 09:04:19 -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 1qbhHu-0007Mn-Uj for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:43 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHq-0006lt-Po for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:42 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-401b393df02so7999425e9.1 for ; Thu, 31 Aug 2023 06:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486837; x=1694091637; 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=uHTYP96hxROQBfiRHrUY1wrTC25GMnf+igTYqzxdbDE=; b=WD6MAfLiIo8WFCh9IzuyV3eICQyOVpEgw1+9dovw3501/dIr9lvebzAf8+bRn63dUP 70Q5LftB9Nlee7NrBqhxg1FUenpbAZdn4xxjhfMc9uOL295JqCqDtO3shCQOB8RlGZJy C+pQRAEPasB3nJJ0jUyfe+BH8k9nf/N1Z70ERrxVniOIGBMEp+lYzAw7pPXhIBCxxrRH 9XgTw9r2Xtrmo6lgk/otO4EAHwGj51pefzBFefg7SIttWzmNzVbspBXCtLUyIw2ZIRxM vMZnK2RTQiwC7wQiSBf//rwChAIwapxwgQ/mS8Mzl+PpT6gL9ZGcBFcTEBw1PcHpdOR2 1P3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486837; x=1694091637; 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=uHTYP96hxROQBfiRHrUY1wrTC25GMnf+igTYqzxdbDE=; b=KRKDRMaT/QRuW8LiCUO9f87GY1DO2+hmcbq4mHmgBSoVLM4BJ7N7g9B6IhBnqJac5h D4b5StZ9rolXZ5F7BwJy9sfF3nYVaS0nKUtXoRiOQZxpvwIOo8XqCcy+fjDpPpd6e5G6 SJ979O7w4KeVpithXCWWGeOTF9kR7T9ZOQPxRyRfbVrUlz+R2FZS8aiwI+/49uDZwJ50 tn7QzGgYI5ZOLpQxcCXA3NIu3jBaDW+TDrhkAmWzL9cRIlx8ILJNLuHBbv+SRFg5e7mY dHb3eMG5oyFO7EieT5xK8xEWT7QIxUwv8TyYxPRbQALw68OU00IPtKPRgE3IgHtU/wcE xq4A== X-Gm-Message-State: AOJu0YyDticqiGdPicmargilCvqspnAY3guXaSMWWg4YvTwUgbZba/tx 4vcPnReyFDHaTfEqYqk00NEUW781EW1OIyQX1z0= X-Received: by 2002:adf:f5c6:0:b0:314:3b02:a8a8 with SMTP id k6-20020adff5c6000000b003143b02a8a8mr3761369wrp.55.1693486836365; Thu, 31 Aug 2023 06:00:36 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id r5-20020adfe685000000b003143867d2ebsm2189041wrm.63.2023.08.31.06.00.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Thomas Huth , Stefan Hajnoczi , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Juan Quintela Subject: [PULL 38/41] docs/style: permit inline loop variables Date: Thu, 31 Aug 2023 14:56:40 +0200 Message-ID: <20230831125646.67855-39-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 From: Alex Bennée I've already wasted enough of my time debugging aliased variables in deeply nested loops. While not scattering variable declarations around is a good aim I think we can make an exception for stuff used inside a loop. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Stefan Hajnoczi Acked-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230822155004.1158931-1-alex.bennee@linaro.org> --- docs/devel/style.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/devel/style.rst b/docs/devel/style.rst index 3cfcdeb9cd..2f68b50079 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -204,7 +204,14 @@ Declarations Mixed declarations (interleaving statements and declarations within blocks) are generally not allowed; declarations should be at the beginning -of blocks. +of blocks. To avoid accidental re-use it is permissible to declare +loop variables inside for loops: + +.. code-block:: c + + for (int i = 0; i < ARRAY_SIZE(thing); i++) { + /* do something loopy */ + } Every now and then, an exception is made for declarations inside a #ifdef or #ifndef block: if the code looks nicer, such declarations can From patchwork Thu Aug 31 12:56:41 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: 718988 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461355wrn; Thu, 31 Aug 2023 06:09:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH040dK40WGZnfkFdF0L2tYtCQlTpPOk79AKB+4HXvLfgEmv+Or9/kF1BKxEdjPgSu1pwaw X-Received: by 2002:a05:6870:80cf:b0:1c1:e6da:f88d with SMTP id r15-20020a05687080cf00b001c1e6daf88dmr5514345oab.56.1693487370265; Thu, 31 Aug 2023 06:09:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487370; cv=none; d=google.com; s=arc-20160816; b=DY8gZckPaWssWCkbJ4hC4/HoHusuRzRO2efwuOaB/toYfLH71YbDDI8eGy8HDTJ61d 7KHdCjG841X9Sr4akvPcQ+vam2imhlWI8ZD+VWXHIzE5N+xEPy4jEch5LYohJQO9Lyg3 kYNKSETOMEJOtp02oqrdMzoCJ7MCuj3Y3Eavz61+rAL4paWB9+Uf45VqgZYRSwpUBrYh Q6Sxotqr60jATyegce151wPS5BNxPJIk6R4XCPDlAV1HakntUusgSUQKteNtST9jGLEJ 3veHvG2nU3qCFK8ehDZmjtGFhfD7Vs22S+7qwy5VCBm1IwsbxY2Ti4z7IuqKpajamsgT k8LQ== 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=7hmpcKbPMiCB1lRYiTD63IbOGzz5WRqg6JB5CP58x9E=; fh=dTAPLjpUkGoqjwwcraRm4ZPxty7wZk6pgB0ZZE+vNWc=; b=Ci71o2vJiygSry48T39ZuGduMi+eLRUnV1Ey76T99TDqGvkmmj3PIKXRCcRHFUUpWT 6uAzYz8E2h1y7TTYKR0EENB9VUO2AHWdZyaPKEg+98fwyY6bI5K5D5Y98S3P8HfoF26S cKc003H7C0s8kIWLWV0GbWbsNlSWZshUE8+Un2aljT7WwoV2EuPjOmBhKeLZAMN9afrx 7dar5hVTUdkGKMxXF0rtKpfYJQuGN+GsOWafjwl0teB2xLPRci+kKGsvWa+OMYz/UX8o kGzPsRI2SMFQJEV3S0H78gsOU58dTjCMZT2Oxb2p+5SVip79/Hg/K8tenmbdmHRCVDSJ 9Plw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ei5+GZYK; 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 m17-20020a0cdb91000000b006516bcc0b8fsi835879qvk.192.2023.08.31.06.09.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:09:30 -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=Ei5+GZYK; 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 1qbhLZ-0008CA-8q; Thu, 31 Aug 2023 09:04:29 -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 1qbhI1-00088u-De for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:49 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhHx-0006ou-5F for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:48 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31dcf18f9e2so638590f8f.0 for ; Thu, 31 Aug 2023 06:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486843; x=1694091643; 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=7hmpcKbPMiCB1lRYiTD63IbOGzz5WRqg6JB5CP58x9E=; b=Ei5+GZYK8/+CY0aIOgA2fVUBPVljAjgdxJcdBubH6rGLe9ByOEBsiPYDYCvJ2QVZ0e 1lE7Tm1oWylsWX6+v5B5oP7XPo701MD2Tl0OfxQ4OE9MDerWhcc6bmLkI/cL8fvSg7W3 TQBJIDFMcwpFxbZkx2mwaMXR3NUIrM+OJJqXRXVtVyaDQ/fBqmDXOZL2QEs3b20f2H+b gloOzkZ6t/fcHeJEvLuSTLBdJG5jgC//C7ZIyvohXmj1n5YN0mYQSX/aofNEToF0jMka wWIeT2HTK8xDqMyjpkH/Z+VK3eDrNy0L21pdymlTGn1ZnJY5FHjupl+MFzRgcPWaQePz yzUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486843; x=1694091643; 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=7hmpcKbPMiCB1lRYiTD63IbOGzz5WRqg6JB5CP58x9E=; b=RbMO3kBeiCgLqsLzdckAB2yb0W1Fc+FdzrDRtwTBqzTuLh3FiwawMNWDJAGwhtUrvT IpR3LbMMt4pZ02PXmFK87nrNf/id8FCDnLr8yZNUbvnrTEyYTZndUrsBZ2bwNjGrPIw9 vv3neiAoMGv74CGl8DGqKoPBitC/viCvvggTzvmUTYZVef+FrKabhSIFM+2Ml4/JkpoW wq1+UdZcPtBYn9O4EwZVbKcElysxNdp9zhyzxqSyuiUHCRyUFZ/T0r6+cUlM48mcLOTb c7KKq6gk+cq3cB0NpOn/gfOJ3mIlzhMOeoN+Qm44XDg5TOI21s/F+RVpd58x8FMf1jZ7 6FcQ== X-Gm-Message-State: AOJu0YwSEDuA1w8X4emJqwS7T0tqWWnw7KfpgVHM3VzS7DE1oyuA/xRO oIHQ5T/OfiNnzyEviI0QvXaBzcZA6p6y3gKgaIw= X-Received: by 2002:a5d:5487:0:b0:317:6310:a616 with SMTP id h7-20020a5d5487000000b003176310a616mr3810958wrv.36.1693486843054; Thu, 31 Aug 2023 06:00:43 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id b17-20020a5d6351000000b0030fd03e3d25sm2183922wrw.75.2023.08.31.06.00.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , John Snow , Cleber Rosa Subject: [PULL 39/41] meson: Fix MESONINTROSPECT parsing Date: Thu, 31 Aug 2023 14:56:41 +0200 Message-ID: <20230831125646.67855-40-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 From: Akihiko Odaki The arguments in MESONINTROSPECT are quoted with shlex.quote() so it must be parsed with shlex.split(). Fixes: cf60ccc330 ("cutils: Introduce bundle mechanism") Reported-by: Michael Tokarev Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Tested-by: Michael Tokarev Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230812061540.5398-1-akihiko.odaki@daynix.com> --- scripts/symlink-install-tree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/symlink-install-tree.py b/scripts/symlink-install-tree.py index 8ed97e3c94..b72563895c 100644 --- a/scripts/symlink-install-tree.py +++ b/scripts/symlink-install-tree.py @@ -4,6 +4,7 @@ import errno import json import os +import shlex import subprocess import sys @@ -14,7 +15,7 @@ def destdir_join(d1: str, d2: str) -> str: return str(PurePath(d1, *PurePath(d2).parts[1:])) introspect = os.environ.get('MESONINTROSPECT') -out = subprocess.run([*introspect.split(' '), '--installed'], +out = subprocess.run([*shlex.split(introspect), '--installed'], stdout=subprocess.PIPE, check=True).stdout for source, dest in json.loads(out).items(): bundle_dest = destdir_join('qemu-bundle', dest) From patchwork Thu Aug 31 12:56:42 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: 718992 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461633wrn; Thu, 31 Aug 2023 06:09:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXTGBJETUeyImFzWLkjcEVmtg8qQpgHFk4HzaIXvPiPiiToJoT8bZ7vL6h/bHJjC8SzIiH X-Received: by 2002:a05:6214:29cb:b0:62f:f6ed:857e with SMTP id gh11-20020a05621429cb00b0062ff6ed857emr3626103qvb.55.1693487392104; Thu, 31 Aug 2023 06:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487392; cv=none; d=google.com; s=arc-20160816; b=HJf3n8ykS6/AV6tAKKmbdL8FqzXjpCSNHmi08bDLui2HWK/CnDOc6rx0t/GjvQRAE1 6n4mKCNMJek70lPyt9suEK/EwUZHivYXULPucQ92bB2Kx5+Cxb4fqI8g6pcYuICV3i9X o98yMbgzV+Uhxwwbj6kY2noU+OU6AoIz+Amb8E/edreT3dQJoJyiqIsSkW0ocvmw48Fg bNBtTKT+jWSb1o9MdvYeM8HEuIODUggqEeRofshBEd6VRfNhSD2ht0bxgXIhxWaXgQnQ G8axuUhjgcRP9vcFQqvmhBUoSKLc57nHgK/pNV36/AGf9nv2o1vHejEzPBj87n1BRosb 2z4A== 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=3i3x9Dz9RPQMfZg42SaVktArQRa8La0Ylbd8e6a9o0U=; fh=Zi2LYiqSYi41O7DQODJE/V0T01GGcAhs5Ap8S1dueuc=; b=ZB+6Z+g7BhwYEOzCMOPHmoPPEKN3EIGzGZb/6p5YZOMmAkI1i07D7rsfXXfl52hyqC jHyBZ+iIeU+C1G3q5DhzqnSphLlDW+NlclVGHyFiE4NnUxXxkIQnwijyeadVjllXfN/M sSAVzqCjb0TpsANMNsEqe/rHyPt3zypmD3D+6DJktis2qe4jdQdHAHqK8dMmYKl89Wj9 rLrcWluyWMO7K+T5A83Lu0eCuFJL72tTQv7yn8Ion4VN43RTofVSw83HtVoAy8mikInC Xt13QPy+52zKfTgZ+xgPC/WTv0LUfPaqZqUJgGIWfoSZTZOKP41TNtHzooMS3fbRZuzC +h9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zEH0iJL+; 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 v7-20020a0cdd87000000b006516bcc7780si858771qvk.347.2023.08.31.06.09.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:09:52 -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=zEH0iJL+; 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 1qbhLT-0008BO-MR; Thu, 31 Aug 2023 09:04:24 -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 1qbhI8-0000cB-8i for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:56 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhI3-0006sf-A1 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:00:55 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401d6f6b2e0so12599255e9.1 for ; Thu, 31 Aug 2023 06:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486849; x=1694091649; 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=3i3x9Dz9RPQMfZg42SaVktArQRa8La0Ylbd8e6a9o0U=; b=zEH0iJL+V+rjDrfQxhE5J2nzbDpkMrjFG3D0pu7MwPtKl6ZYCFrmVBc64exOSzoluB yfMsgWGOpMLdkQEkrrA9Oce8Ohn9eWbOt+Dhpn1DrYVdAuuAZ0h22ZgXHtTWsKDhwCHC OLZ9EK520G953eDL0NPCYG0JApVmtXqA7bElZj6GE/0kZIX8y/il0qr9t3pHmFiIVfuO jKFh+s/+pUvBVK9LpTamlM2lJeIa/GQAD3F9zHuiQd35hRl4Maml+ioZ0WotHZG4pkrQ j2DiEpjgiOM1kC/HBo9VuwFTFPq6yxvlsi7o6hrXx93z3m1ab3fmNqt1s76P/5LcGumR hC8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486849; x=1694091649; 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=3i3x9Dz9RPQMfZg42SaVktArQRa8La0Ylbd8e6a9o0U=; b=Kro5ZlXuvsOHVjlzAMM3RgybDmUEBVTD0iGlnL8XeJiT+jFlsPAKAsP7XjoLcl+F0j jj4zfyaPV8LYCFKLKjuNo/vgYqMwfpzWe0T4eLFknkpETYv1wfLgnMmL4ilv6gTIqPgS g08m5xZIW4J4dNLcdNZK+KF5IosWRQmBE03jVxaf5ZLPbrS2BGFPkolnq7Z/up74H4z2 T4X6qo+SIH9zowgOHwGmPf7vtaIydo7cIQInDRE7pbTtyjUDikl6PpyrzcLA2/hXkQav gc/39QI2Qpq6L2yj2F2bgt4kg7tUc4rFDMgK2eMFf5rin28Ga9vyLXHtbbsAMCv3VzFt 3XFg== X-Gm-Message-State: AOJu0YyHvzbXjC62+3MJKJqlzZ9oAtDvWJU2zi02q6LHYS4k4qt0oVZK wg8JQQC4EJvHCSQvDEHmeLczaRSTClw6q8Kb7os= X-Received: by 2002:a1c:720e:0:b0:400:5962:6aa9 with SMTP id n14-20020a1c720e000000b0040059626aa9mr2085595wmc.11.1693486848995; Thu, 31 Aug 2023 06:00:48 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id q12-20020adffecc000000b00316eb7770b8sm2197901wrs.5.2023.08.31.06.00.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, Alexander Graf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Akihiko Odaki , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PULL 40/41] build: Only define OS_OBJECT_USE_OBJC with gcc Date: Thu, 31 Aug 2023 14:56:42 +0200 Message-ID: <20230831125646.67855-41-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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 From: Alexander Graf Recent versions of macOS use clang instead of gcc. The OS_OBJECT_USE_OBJC define is only necessary when building with gcc. Let's not define it when building with clang. With this patch, I can successfully include GCD headers in QEMU when building with clang. Signed-off-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Akihiko Odaki Message-ID: <20230830161425.91946-2-graf@amazon.com> Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ec14079c67..296f6ef1d2 100644 --- a/meson.build +++ b/meson.build @@ -223,7 +223,9 @@ qemu_ldflags = [] if targetos == 'darwin' # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. - qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0' + if compiler.get_id() == 'gcc' + qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0' + endif elif targetos == 'solaris' # needed for CMSG_ macros in sys/socket.h qemu_common_flags += '-D_XOPEN_SOURCE=600' From patchwork Thu Aug 31 12:56:43 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: 718991 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp461440wrn; Thu, 31 Aug 2023 06:09:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuD0pHUPpg8lAur6RmWrstCQIMhLHokaXnSZVoT3vJDv1QKetVSCu1SRp4bDqmeEcW6kSn X-Received: by 2002:ac8:5bc5:0:b0:403:b645:86fa with SMTP id b5-20020ac85bc5000000b00403b64586famr3499753qtb.24.1693487377445; Thu, 31 Aug 2023 06:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693487377; cv=none; d=google.com; s=arc-20160816; b=ij/CYDZCNPStoybj/NtGO814O1WW+zG2uqeBYnV5Blurk/YO3+dF6yVcd/ZGiGk6F0 baE8UwOI4Q4s9bMmcSw/XnyVFMd6ePbe0jOoHKdmTHedQA4WriNbtc1D55bChNjrbLzA mdtTKqEPcvMMo1NuYyMeK0Jqc/EMLtuP/ol6SrBiTMSBOEajuPIRKawdIoGfM9J29uuJ nMEWCKAB3zkve74ex/SVO/w3/Be8w1siIfyIJlnboXwHqqAg6aKQwxrN9EIRybs3AWQ6 Uos3OAmIB3MJxwq91nUFA52g+Jo9eVfqpD/3X8kk1nuLuKgQGt5Zqiab8Dbo7NBocWFz WKUA== 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=7DlQKvvYxi/qCYEWGVTmqr7bzh4KTihilnnc7Rwr6fI=; fh=qdxsr9WPFtdJjlKxzgnvLnIy1YmgsSlAKZpFdRbbVlw=; b=0U2XXC0daQa9Z5/4OTqfCF6qKTw++m3Q1hihqkq1FyGVmul/IoL98L5nmP9yCsHz6N JlI4eO6Ul8Gtft1gOYgbS5xMZFaE0ZJ2xZOfnlEDpa1aTiESdUiwzSB17WeWgm3Sufcf yaKSx/3QeK6iRyoe0wN39FDHy3EvwrNMgGjYONA2D1IczBK45U1qRr7Dhye3+tlunF5f iKhnKSOTc1uTQyxYJzMthbYg16pfUq/z5KNVO7iRd4t4vzw8jWZtf8Kns3c1rkcRj4Q9 DDVsgbbxSh61GXY0hLrFZo0oOlY6peppqBtxGfUwmezWhFAQe+920A4QQ/K0i0+upuuH U14w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jCMrT8BI; 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 a8-20020ac85b88000000b004033ec2f5e4si821809qta.464.2023.08.31.06.09.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 06:09:37 -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=jCMrT8BI; 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 1qbhLU-0008BT-Ig; Thu, 31 Aug 2023 09:04:24 -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 1qbhID-0001UA-Px for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:01:03 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbhI8-0006xN-O6 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 09:01:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3fee8af9cb9so7663645e9.1 for ; Thu, 31 Aug 2023 06:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693486855; x=1694091655; 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=7DlQKvvYxi/qCYEWGVTmqr7bzh4KTihilnnc7Rwr6fI=; b=jCMrT8BIIecveYmht/zcR/MM4uSG20H+ePvDhXxPp5EyW4gGprD3ZFRlSJvHI4PkTF M9GnGmQQuS1T1lzbUXoP2Pd5DjxAm+T6ZcY1rIBUb1moJqFhcxUeSIRci2fus8QnQLXu qR84noLKVTQTohPxZFgVWrgt7HYhKzjv/ZrOdqaGkprfSMXqiRrkY3H9l9E03LuhoisL TqYYowdoob2Fd5ufFBYXt7elTFPFmyyuoyfCIKjk9mNuz+rfsceyNNPBurh7PXYEbQdw 8Cg6kYuDR7uvdhIV+Izm+MnrdgQiIuyVRK5x6Q20zeiKf8+RukKFa+G5mECmUzLfIdug g+Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693486855; x=1694091655; 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=7DlQKvvYxi/qCYEWGVTmqr7bzh4KTihilnnc7Rwr6fI=; b=hWAPB5tt0Kskrq8t2Z+I5Q7c4+HJKhQw8HzumlGiROyMgD1i5FCTVbM5/0xB+gWTrK +kPsvN4V9aCurL1weLsTd4aslTzNDVwMj0fVzrXYlGRcqD0X60MPAylCpx81QLmtbY4U 87QqZppLtMzDlZiu87zweJESxcXoX754pTE6cPF5fUpjOd91M9oLchKJoO3N4P+5U0r1 GFN0Q2KNa11hnXxEa98e4BY7s9rk0ivBfhXK3vhruAl6olCacXAr8bR7LcVwJq+oUd7A sbR5R/gNtZ52yHMv+oY2DHd4NY7Klg7vzrTs01rlf44wPqRKTg7pisvJHqdeplhYggKL pTBQ== X-Gm-Message-State: AOJu0YzeyIooY9jhcRMqDUP6bwJtTKQTvwS4UO8TTSFYI0gwAXC0vkhX tI+A9mrhDCIFtgYHw9gomrbrob4sU6rbm6tBPho= X-Received: by 2002:a05:600c:228e:b0:3fe:ef11:d79f with SMTP id 14-20020a05600c228e00b003feef11d79fmr4442477wmf.36.1693486854925; Thu, 31 Aug 2023 06:00:54 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id p1-20020a05600c204100b003fedcd02e2asm1881333wmg.35.2023.08.31.06.00.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 06:00:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Peter Maydell Subject: [PULL 41/41] tests/tcg/aarch64: Rename bti-crt.inc.c -> bti-crt.c.inc Date: Thu, 31 Aug 2023 14:56:43 +0200 Message-ID: <20230831125646.67855-42-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831125646.67855-1-philmd@linaro.org> References: <20230831125646.67855-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented as the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore rename 'bti-crt.inc.c' as 'bti-crt.c.inc'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Message-Id: <20230606141252.95032-6-philmd@linaro.org> --- tests/tcg/aarch64/bti-1.c | 2 +- tests/tcg/aarch64/bti-3.c | 2 +- tests/tcg/aarch64/{bti-crt.inc.c => bti-crt.c.inc} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/tcg/aarch64/{bti-crt.inc.c => bti-crt.c.inc} (100%) diff --git a/tests/tcg/aarch64/bti-1.c b/tests/tcg/aarch64/bti-1.c index 61924f0d7a..99a879af23 100644 --- a/tests/tcg/aarch64/bti-1.c +++ b/tests/tcg/aarch64/bti-1.c @@ -2,7 +2,7 @@ * Branch target identification, basic notskip cases. */ -#include "bti-crt.inc.c" +#include "bti-crt.c.inc" static void skip2_sigill(int sig, siginfo_t *info, ucontext_t *uc) { diff --git a/tests/tcg/aarch64/bti-3.c b/tests/tcg/aarch64/bti-3.c index a852856d9a..8c534c09d7 100644 --- a/tests/tcg/aarch64/bti-3.c +++ b/tests/tcg/aarch64/bti-3.c @@ -2,7 +2,7 @@ * BTI vs PACIASP */ -#include "bti-crt.inc.c" +#include "bti-crt.c.inc" static void skip2_sigill(int sig, siginfo_t *info, ucontext_t *uc) { diff --git a/tests/tcg/aarch64/bti-crt.inc.c b/tests/tcg/aarch64/bti-crt.c.inc similarity index 100% rename from tests/tcg/aarch64/bti-crt.inc.c rename to tests/tcg/aarch64/bti-crt.c.inc