From patchwork Tue Apr 2 14:24:16 2024 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: 13614176 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC639CD1284 for ; Tue, 2 Apr 2024 14:26:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4E-0000iJ-0E; Tue, 02 Apr 2024 10:24: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 1rrf4A-0000h0-6o for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:24:46 -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 1rrf47-0007Uo-Pf for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:24:45 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4161d73d876so3405255e9.3 for ; Tue, 02 Apr 2024 07:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067882; x=1712672682; 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=CSDhdndLpU3XMgaG/Eh3mfm25De8u1KWUZwd2xX2iow=; b=zysXliyK1ShjDLhZ98ZmVfYgIYAbCtDcKrwvrUoGWcalGKopPbmLTdJ8b4NkchqZil Xw4tSLWYxKwaw8YwSH+Mb0nwfrvAuDsjVmHQVsgxoHUPuCesp2lD/S3P88l3x+XOdkUE J+l3EEU4mnQ4r3/7ilxAHZlclCcg5xlbojpLdKfUxqlLkOcfNh6/8GtHqfrbutCUSt/6 1Jr5ejPQ3hUu+E2MO4gw2GuBCDAfW8HIY1x3DgXHRugo4ZOLjoq3BgK+VCr6IbYgSODL C7eaMPM/SqGSltX6KOMEP91lh74IvF05+TybZVtQT+kCuaIuTE1Yi483d0BTDixXwKf8 9FJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067882; x=1712672682; 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=CSDhdndLpU3XMgaG/Eh3mfm25De8u1KWUZwd2xX2iow=; b=Hnxrr5hCRj11QV3A+yBWETJ4pD9LHhQPqvbIHXI/1rDz1C1OBFiIBwtF44oFUXc1bI xXgP3xrPh9ap+ldjivBKB06Hc3zoJCnFA9NeyV2i+mg3iAlHrF+1e8kSwGjkivHdor/d d2p1Rg7JZrhCPTiIj2Kf0wQWzPprk+TpgV5sWbrCX/RLybxB50iLhZ0TOYChewof+G0J YVOFdu0DRQ0LACCe3mI08/prN4HvHbtARIG6hxkVcJcNmA+PA9v51V8lpfGELmw+Ly6Y BbpEuodUSpkBikLXtpvB2psxzGh+4MsYXx9elwRPpdgaZJaQA6bpscSarrF5pG0LJJQ4 NeTA== X-Gm-Message-State: AOJu0Yz8Oqz0ktw7S0ypjOfMDFpOJ/dW1F830ZlZJ2wKvf2mfKBtcVyA qhPQghPjUYyLVhfIPLYkpqPRkVc1ex2m3CSu9uc5OtUASscQJnRTUHagcEvcXPNLp9g4tt/S2Dm xdig= X-Google-Smtp-Source: AGHT+IFQvTW30uNYzbYSkDXUzi5KUl4zSR7hskiZ9EFqc1byxnQMzXWybCe30R/WkousKSpVlgJg8g== X-Received: by 2002:a05:600c:3b9f:b0:415:691c:f83d with SMTP id n31-20020a05600c3b9f00b00415691cf83dmr3342931wms.33.1712067881986; Tue, 02 Apr 2024 07:24:41 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id o12-20020a5d4a8c000000b0033e7b05edf3sm14300080wrq.44.2024.04.02.07.24.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:24:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Paolo Bonzini Subject: [PULL 01/15] accel/tcg/plugin: Remove CONFIG_SOFTMMU_GATE definition Date: Tue, 2 Apr 2024 16:24:16 +0200 Message-ID: <20240402142431.70700-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The CONFIG_SOFTMMU_GATE definition was never used, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20240313213339.82071-2-philmd@linaro.org> --- accel/tcg/plugin-gen.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 8028786c7b..cd78ef94a1 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -57,12 +57,6 @@ #include "exec/helper-info.c.inc" #undef HELPER_H -#ifdef CONFIG_SOFTMMU -# define CONFIG_SOFTMMU_GATE 1 -#else -# define CONFIG_SOFTMMU_GATE 0 -#endif - /* * plugin_cb_start TCG op args[]: * 0: enum plugin_gen_from From patchwork Tue Apr 2 14:24:17 2024 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: 13614177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9479CD1284 for ; Tue, 2 Apr 2024 14:26:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4L-0000lm-Ux; Tue, 02 Apr 2024 10:24: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 1rrf4I-0000kO-4I for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:24:54 -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 1rrf4F-0007az-KL for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:24:53 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4156dfa8a5cso9454175e9.3 for ; Tue, 02 Apr 2024 07:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067890; x=1712672690; 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=1SmMA2WUYuMdtgR4elvc+VfJjaj3cdDvnYNz/tQrOUw=; b=hb7kieW82LlLJuoQnppfDJv3NIowOFcAqoWsZQzMZmJGrn2J7bClLxWBGsekgCdJVC 6GBcwiXilliUtRRkLlJNRu+B3/Yktu0VKELk6Xx+nxTPnURMo8IKEhH3Dfq5JA0oBu9p BoRJj15zUKlorKuVpRwn/5LxQy5aSXJkTFG3dYtZXe4Uq0FELxM7V5a8njrJ19Ytz2DD +whb+VeJicvGkX04SPedxEZ/6Mh+t4grrXQEedydbKpBLOCnaZeRsT8ztgSu4U0R5wiE A20tnfcs4YEE+EGFV/vrEGxZOEuKZLXDVQZuPUq6PDkrkZjs3x53Fq7GEe8Dr0s27SMi Yvzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067890; x=1712672690; 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=1SmMA2WUYuMdtgR4elvc+VfJjaj3cdDvnYNz/tQrOUw=; b=gdsWvPHRH7DWpNiuE3SiSJr3hqGHmYT7Qa7dV0q2t9B/lscYFLvVnBsjSGdnyO6ZUj YkU+zbJLNOgV5eg3iKIagAQUYqRKCR9E/rmEQ3gn6OBs97SVo+UHAUS+u28TPIs9fl0j xwXi1vN5Wz3DpEEmOyY6mZfGJY23FcjPkLAsTRpyEvA8HF67MwzjuVL+jW1X3FjYrEOZ ZjC2rlf0HHKW3wzU9qgpHefnNsMhjapqzAunZQukrv55s3dBZvhDhyCTRwDnZkvonsfP 1xfb33YMyqFp76wS0DNEX7BMgVxsf2FkD+BqwsU2jEfBDAbZCsT68XeWXUYXTF2Rxz56 cCbA== X-Gm-Message-State: AOJu0YwPdohQlah1gFIDR1DQjhB5BrI6L87hjk33xhgoSfAsXurlT9tY nKjjzuIeSdnjWydfoToAaQZFa4lRP3VF4T1Ofw1xJqVCSUmvoRXWCQa2JY94kkeAxROsabmiRf0 eHvk= X-Google-Smtp-Source: AGHT+IFCfFzlxgMnREUyncytBY03AG2ycFfrVg2xQ9fXZDUncxBQQ/fBaP/YQ6jaH0P9nFaeyeQWAQ== X-Received: by 2002:a05:600c:1797:b0:415:8651:9bae with SMTP id x23-20020a05600c179700b0041586519baemr2547892wmo.41.1712067889798; Tue, 02 Apr 2024 07:24:49 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id l2-20020adff482000000b0033ec312cd8asm14249866wro.33.2024.04.02.07.24.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:24:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 02/15] gdbstub: Correct invalid mentions of 'softmmu' by 'system' Date: Tue, 2 Apr 2024 16:24:17 +0200 Message-ID: <20240402142431.70700-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20240313213339.82071-3-philmd@linaro.org> --- gdbstub/internals.h | 20 ++++++++++---------- gdbstub/system.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index e83b179920..66c939c67f 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -115,7 +115,7 @@ void gdb_read_byte(uint8_t ch); /* * Packet acknowledgement - we handle this slightly differently - * between user and softmmu mode, mainly to deal with the differences + * between user and system mode, mainly to deal with the differences * between the flexible chardev and the direct fd approaches. * * We currently don't support a negotiated QStartNoAckMode @@ -125,7 +125,7 @@ void gdb_read_byte(uint8_t ch); * gdb_got_immediate_ack() - check ok to continue * * Returns true to continue, false to re-transmit for user only, the - * softmmu stub always returns true. + * system stub always returns true. */ bool gdb_got_immediate_ack(void); /* utility helpers */ @@ -135,12 +135,12 @@ CPUState *gdb_first_attached_cpu(void); void gdb_append_thread_id(CPUState *cpu, GString *buf); int gdb_get_cpu_index(CPUState *cpu); unsigned int gdb_get_max_cpus(void); /* both */ -bool gdb_can_reverse(void); /* softmmu, stub for user */ +bool gdb_can_reverse(void); /* system emulation, stub for user */ int gdb_target_sigtrap(void); /* user */ void gdb_create_default_process(GDBState *s); -/* signal mapping, common for softmmu, specialised for user-mode */ +/* signal mapping, common for system, specialised for user-mode */ int gdb_signal_to_target(int sig); int gdb_target_signal_to_gdb(int sig); @@ -157,12 +157,12 @@ void gdb_continue(void); int gdb_continue_partial(char *newstates); /* - * Helpers with separate softmmu and user implementations + * Helpers with separate system and user implementations */ void gdb_put_buffer(const uint8_t *buf, int len); /* - * Command handlers - either specialised or softmmu or user only + * Command handlers - either specialised or system or user only */ void gdb_init_gdbserver_state(void); @@ -187,7 +187,7 @@ typedef union GdbCmdVariant { #define get_param(p, i) (&g_array_index(p, GdbCmdVariant, i)) -void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* softmmu */ +void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* system */ void gdb_handle_query_offsets(GArray *params, void *user_ctx); /* user */ void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx); /*user */ void gdb_handle_query_xfer_siginfo(GArray *params, void *user_ctx); /*user */ @@ -203,7 +203,7 @@ bool gdb_handle_detach_user(uint32_t pid); /* user */ void gdb_handle_query_attached(GArray *params, void *user_ctx); /* both */ -/* softmmu only */ +/* system only */ void gdb_handle_query_qemu_phy_mem_mode(GArray *params, void *user_ctx); void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx); @@ -213,11 +213,11 @@ bool gdb_handled_syscall(void); void gdb_disable_syscalls(void); void gdb_syscall_reset(void); -/* user/softmmu specific syscall handling */ +/* user/system specific syscall handling */ void gdb_syscall_handling(const char *syscall_packet); /* - * Break/Watch point support - there is an implementation for softmmu + * Break/Watch point support - there is an implementation for system * and user mode. */ bool gdb_supports_guest_debug(void); diff --git a/gdbstub/system.c b/gdbstub/system.c index 83fd452800..a3ce384cd1 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -1,5 +1,5 @@ /* - * gdb server stub - softmmu specific bits + * gdb server stub - system specific bits * * Debug integration depends on support from the individual * accelerators so most of this involves calling the ops helpers. From patchwork Tue Apr 2 14:24:18 2024 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: 13614178 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 71C17C6FD1F for ; Tue, 2 Apr 2024 14:26:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4S-0000qE-1U; Tue, 02 Apr 2024 10:25:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrf4P-0000oC-PL for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:01 -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 1rrf4M-0007ey-Ck for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:01 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-41569f1896dso11754595e9.2 for ; Tue, 02 Apr 2024 07:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067896; x=1712672696; 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=AnqQaUG1ZoPVgZF2Ex29MI5m2mNV0++IO/ZIMEDgcJ8=; b=KaaWZEWuBTXcgD+t8c+UuZgyzchRVRKAKfidaFXEGMXyahqM7coIWX70CvU/Lp+BPP QwsmuXrLgXZArjO7JkNZJGyL1MujOdIYcoH6HpuCZL4Kq6rEYd/H20Wdmr6JF6AAZ6V3 1oxsqpkKDjRpqmuu3IdqsoVzParI2lV+CspYzKdH9uUM8u7RDO9mrdHbZq4VbJD6yEx8 6lQ8AIoqVQ0Dr+tVmoDlPfIM52fH4/vl3Roie0gKNvtafrOoi8KRqYHPi5HB/yq99lux 8tlvnNKFRNYuQYlnkfhrGdk8XTeMqupXdIwoVtrZgqMEjeYmoy875MLmQdVAXwCPxNie UPeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067896; x=1712672696; 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=AnqQaUG1ZoPVgZF2Ex29MI5m2mNV0++IO/ZIMEDgcJ8=; b=jFoOox/Zh/vWGLV6FKeasLyDiDgerkARfaJ7LCUd3KY8/HwG2E53mUB+kuvksKOQqb 5fxs5Hyncd16oMQTcwffhDhOuvs7wkYqTqPzSl3ZkPkEN5jTm29Ka/aEa2aacC8Ojvwj s2GWYEfTc0dDeKo69wQoslmbFn2XXbXivU52coXRmdoGiAlRUdwjNtst5oMJ0au+yXLB 68FCZdfxtnh4grPk7QUYApBQz0YYWUo29kUbbArABxM7GADSwWdYNf1UAu5HfrpIO/ko hKwtB1+wpnkBJ7u7cjld9z/xAzFSvBo+M7vl2BYbz9ufXxLy9UtzBHaGTtXysRD8W/G3 WUgw== X-Gm-Message-State: AOJu0Yy+5tAdTHHybUHBj6jy5Tglcfc2oyWzqlescH2gaITt/jiCH2d0 TrbWe65VpWoblrndZE8SkDAiYw9mwvxyIg3auW+cPpTu9ZvLptRqWl5T3by8qI1FmgqlyJl/Xvz jjgc= X-Google-Smtp-Source: AGHT+IFjRWWqwBYV0XJAWcClqbaYZG/hgJysFiD/espoX/7BuA6K9XVvWp7g04khszacdMl9w6MpwA== X-Received: by 2002:a05:600c:3554:b0:414:6ee:a392 with SMTP id i20-20020a05600c355400b0041406eea392mr9854928wmq.8.1712067895857; Tue, 02 Apr 2024 07:24:55 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id ay15-20020a5d6f0f000000b003434c764f01sm5886406wrb.107.2024.04.02.07.24.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:24:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 03/15] gdbstub/system: Rename 'user_ctx' argument as 'ctx' Date: Tue, 2 Apr 2024 16:24:18 +0200 Message-ID: <20240402142431.70700-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20240313213339.82071-4-philmd@linaro.org> --- gdbstub/internals.h | 8 ++++---- gdbstub/system.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index 66c939c67f..32f9f63297 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -187,7 +187,7 @@ typedef union GdbCmdVariant { #define get_param(p, i) (&g_array_index(p, GdbCmdVariant, i)) -void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* system */ +void gdb_handle_query_rcmd(GArray *params, void *ctx); /* system */ void gdb_handle_query_offsets(GArray *params, void *user_ctx); /* user */ void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx); /*user */ void gdb_handle_query_xfer_siginfo(GArray *params, void *user_ctx); /*user */ @@ -201,11 +201,11 @@ void gdb_handle_query_supported_user(const char *gdb_supported); /* user */ bool gdb_handle_set_thread_user(uint32_t pid, uint32_t tid); /* user */ bool gdb_handle_detach_user(uint32_t pid); /* user */ -void gdb_handle_query_attached(GArray *params, void *user_ctx); /* both */ +void gdb_handle_query_attached(GArray *params, void *ctx); /* both */ /* system only */ -void gdb_handle_query_qemu_phy_mem_mode(GArray *params, void *user_ctx); -void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx); +void gdb_handle_query_qemu_phy_mem_mode(GArray *params, void *ctx); +void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *ctx); /* sycall handling */ void gdb_handle_file_io(GArray *params, void *user_ctx); diff --git a/gdbstub/system.c b/gdbstub/system.c index a3ce384cd1..d235403855 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -488,13 +488,13 @@ bool gdb_can_reverse(void) */ void gdb_handle_query_qemu_phy_mem_mode(GArray *params, - void *user_ctx) + void *ctx) { g_string_printf(gdbserver_state.str_buf, "%d", phy_memory_mode); gdb_put_strbuf(); } -void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx) +void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *ctx) { if (!params->len) { gdb_put_packet("E22"); @@ -509,7 +509,7 @@ void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx) gdb_put_packet("OK"); } -void gdb_handle_query_rcmd(GArray *params, void *user_ctx) +void gdb_handle_query_rcmd(GArray *params, void *ctx) { const guint8 zero = 0; int len; @@ -539,7 +539,7 @@ void gdb_handle_query_rcmd(GArray *params, void *user_ctx) * Execution state helpers */ -void gdb_handle_query_attached(GArray *params, void *user_ctx) +void gdb_handle_query_attached(GArray *params, void *ctx) { gdb_put_packet("1"); } From patchwork Tue Apr 2 14:24:19 2024 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: 13614183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32C05CD1284 for ; Tue, 2 Apr 2024 14:28:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4Y-0000tF-IY; Tue, 02 Apr 2024 10:25:10 -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 1rrf4W-0000ru-FB for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:08 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrf4T-0007kJ-3i for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:08 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4148c6132b4so34604685e9.1 for ; Tue, 02 Apr 2024 07:25:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067903; x=1712672703; 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=GBDHfu1WWwUZX0nO+1GdOpxUbxXBz6m2k2jhIHnZ7lw=; b=FC32CwpQHzC0Nynp1HeXvJGICZ0KibfLDnEKf4H09QTjps8uDomnjvVW/e1GCK+/Ht agBr3RxNQAarPv0wys3yAjf8AJ9oCXESQ57lwQxE9thWuvJjPpl1GI1LVwWHgNEt3gpl 649ex7LqjWzafD2G42Nn3NOjJgxaLzsS6EEwnGdpylET7ZYg9BvAMQQ25S+47WXsi47/ 3BtSpC8y6G0gRAZIt1eaazUi0U+CHjkmvcSHa+9PC5hbdwFh9VjI4u+OILC17LOXEKMH Y8Zzh05gO3Sm1gB3xGKcZK1gL257VYhhGLlnKMNo2nkspWJL/a9DNixq6W+JUtl14pp9 JyOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067903; x=1712672703; 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=GBDHfu1WWwUZX0nO+1GdOpxUbxXBz6m2k2jhIHnZ7lw=; b=UrKs4hpWi2yMS41LWJKI5sfJDM1tRrxjvsvA8QBiDBtY+hmoG8C+QH/rh9HlaZ8EED QhHZMOUoio9qaj7hwPQaymlf0NErSQZ7jk9xMis9W5FsJSZSjDlYbBsToNw0ilyaLFXt FW4C4h3k9FLix+MPxLgYbjIArdwfXMxcy+3YqsTZByEqpy0y4sy4NMJwVbRZe8Gb3EXo 0GQQAO0gtWPbM/uaeu4HwOY2l6OzPxRXjqfpYZ3CQhoJ2rPhaYWFtcNa1EmdNYEtHZ0z xt4vlGh6g67xlHcSOHoaVhIeldwYBsTofkkCigyn/tWnoUfzh5U2sd/JBOG3zxdWbvLJ J1tw== X-Gm-Message-State: AOJu0YzrzfsBvzLjMcJmUa7ZL9s6aNOM+a+dfRoI7gTdeNWj1i0icYOl oStwJPAdB8x4EQQGIiuZlN+jUkCr6qFw4FzqgCu2Clja7c3WffBM4Y8C8/qZBGaAHLkqpOG3+UJ 3Aj4= X-Google-Smtp-Source: AGHT+IFpk8y897vy3GKRfLVLbASH/dGJmNFBcUt+XZFp/SrU6uy80VtaD+l+UcRvZXxo8gJhJBoamg== X-Received: by 2002:a05:600c:3b29:b0:413:4299:ec9f with SMTP id m41-20020a05600c3b2900b004134299ec9fmr11034767wms.5.1712067902875; Tue, 02 Apr 2024 07:25:02 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id fs11-20020a05600c3f8b00b004146dd6bfe2sm18023274wmb.47.2024.04.02.07.25.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Nicholas Piggin , Daniel Henrique Barboza Subject: [PULL 04/15] target/ppc: Rename init_excp_4xx_softmmu() -> init_excp_4xx() Date: Tue, 2 Apr 2024 16:24:19 +0200 Message-ID: <20240402142431.70700-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Unify with other init_excp_FOO() in the same file. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Nicholas Piggin Message-Id: <20240313213339.82071-5-philmd@linaro.org> --- target/ppc/cpu_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 22fdea093b..6241de62ce 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -1642,7 +1642,7 @@ static void register_8xx_sprs(CPUPPCState *env) /*****************************************************************************/ /* Exception vectors models */ -static void init_excp_4xx_softmmu(CPUPPCState *env) +static void init_excp_4xx(CPUPPCState *env) { #if !defined(CONFIG_USER_ONLY) env->excp_vectors[POWERPC_EXCP_CRITICAL] = 0x00000100; @@ -2120,7 +2120,7 @@ static void init_proc_405(CPUPPCState *env) env->id_tlbs = 0; env->tlb_type = TLB_EMB; #endif - init_excp_4xx_softmmu(env); + init_excp_4xx(env); env->dcache_line_size = 32; env->icache_line_size = 32; /* Allocate hardware IRQ controller */ From patchwork Tue Apr 2 14:24:20 2024 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: 13614179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19A34C6FD1F for ; Tue, 2 Apr 2024 14:26:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4h-0000zZ-ID; Tue, 02 Apr 2024 10:25: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 1rrf4b-0000uI-FT for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:13 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrf4Z-0007yu-8h for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:13 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-34379b447c3so187668f8f.0 for ; Tue, 02 Apr 2024 07:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067909; x=1712672709; 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=uQbqgStHmRhecsY4PYqLfYr9cNfbGSMKT9lGuv09ipA=; b=PneklPK3VWzq7Rpn5MJMwrcOmZ+1kZlnIIZfc+UQ6NsFTudEX/wZu+9IcIIeFsc4Ef oRer9N1Y2vi2RSUgioIWehUSUb4Hg276okTDBY8R25IhjroBe2gx2rdl9ps5ea5oahdN iovT3uf6a18kuyIieZKCzeHwnW7dBNMns2VWDPOUt27srLXMgkH6UABqxVENPh3k3K8p D+BM8KEuLSFNaBpclbzdqvoIDyzXPde86eZjyiJhQ48a1aBaVW0j8DJ9HZzOG3ZqE4e8 3eS0eJpKGLK94BVWnYnU9m1XEA7Xzpno6r7WrK4WbzeocHAmtUiWelYzuItG1FpUwDVt eBRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067909; x=1712672709; 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=uQbqgStHmRhecsY4PYqLfYr9cNfbGSMKT9lGuv09ipA=; b=isorFe72NsLftnwgEIWa43tLub1oNBiK0n6GzLe0cNU8SQoCwResqgUOZTFqfWdPnp pF/YIAKmfypRUB+y3VxbnoV5u9JbYSCtJu/ID8C6RVm0eNUyDkzstaR7AWE188PaVVP3 jueltugWrTsBmaLAGa3lD45YFXyND5Jtgijqimm1E3kmaJb5WAViSml2WRm05ew8M7Bo BVBB9gaj0bTq3AsYw7VxY6kgy1kCTO5zdG3TCBWmAi0vTCN7QNCjWELXX50yGkj/YHcd L8ve735RNRDE0yg5m36ghXqQjIvD9GibniPaptsEDJ+4x19UCXo7UPM4jhwWJuiU9mZf EAxw== X-Gm-Message-State: AOJu0Yx8H8JU5fMGAHnUcUb53leDfULdENRETB0fj4fmX6eqk0L3imMm +xokawmwx/piUBRgUMVEf6Uw7jW9KDdYP95T7MYIljSI2Gl7+Hj9u2MN2gjywi09yif6YgfIcxu XhwE= X-Google-Smtp-Source: AGHT+IEvAnNvIwgwLIrQxcahNxqgsQYLujeuY26GIPu8RvmY1wHjDx3uISSi1gyraARLOTr3pZLG4w== X-Received: by 2002:a5d:56cb:0:b0:343:8022:dd08 with SMTP id m11-20020a5d56cb000000b003438022dd08mr327218wrw.0.1712067908944; Tue, 02 Apr 2024 07:25:08 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id bx26-20020a5d5b1a000000b0034356c434d0sm2796273wrb.117.2024.04.02.07.25.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Eric Auger , Peter Maydell Subject: [PULL 05/15] hw/arm/smmu: Avoid using inlined functions with external linkage again Date: Tue, 2 Apr 2024 16:24:20 +0200 Message-ID: <20240402142431.70700-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Similarly to commit 9de9fa5cf2 ("hw/arm/smmu-common: Avoid using inlined functions with external linkage"): None of our code base require / use inlined functions with external linkage. Some places use internal inlining in the hot path. These two functions are certainly not in any hot path and don't justify any inlining, so these are likely oversights rather than intentional. Fix: C compiler for the host machine: clang (clang 15.0.0 "Apple clang version 15.0.0 (clang-1500.3.9.4)") ... hw/arm/smmu-common.c:203:43: error: static function 'smmu_hash_remove_by_vmid' is used in an inline function with external linkage [-Werror,-Wstatic-in-inline] g_hash_table_foreach_remove(s->iotlb, smmu_hash_remove_by_vmid, &vmid); ^ include/hw/arm/smmu-common.h:197:1: note: use 'static' to give inline function 'smmu_iotlb_inv_vmid' internal linkage void smmu_iotlb_inv_vmid(SMMUState *s, uint16_t vmid); ^ static hw/arm/smmu-common.c:139:17: note: 'smmu_hash_remove_by_vmid' declared here static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value, ^ Fixes: ccc3ee3871 ("hw/arm/smmuv3: Add CMDs related to stage-2") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Eric Auger Message-Id: <20240313184954.42513-2-philmd@linaro.org> --- hw/arm/smmu-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 4caedb4998..c4b540656c 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -197,7 +197,7 @@ void smmu_iotlb_inv_asid(SMMUState *s, uint16_t asid) g_hash_table_foreach_remove(s->iotlb, smmu_hash_remove_by_asid, &asid); } -inline void smmu_iotlb_inv_vmid(SMMUState *s, uint16_t vmid) +void smmu_iotlb_inv_vmid(SMMUState *s, uint16_t vmid) { trace_smmu_iotlb_inv_vmid(vmid); g_hash_table_foreach_remove(s->iotlb, smmu_hash_remove_by_vmid, &vmid); From patchwork Tue Apr 2 14:24:21 2024 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: 13614180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A8EACD1284 for ; Tue, 2 Apr 2024 14:27:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4v-0001GO-5Z; Tue, 02 Apr 2024 10:25:33 -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 1rrf4j-00012l-N5 for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:25 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrf4g-00084b-0B for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:20 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3437d3db788so139206f8f.3 for ; Tue, 02 Apr 2024 07:25:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067915; x=1712672715; 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=vawk+LSw2Z6p/aOFRJRkJdEE2smC/bsXUmQB9oTHxK0=; b=IKmcaPZOpO6Pf72rYlxUfVocw6OuKhGZKuUkn/srCt9qoyxKOZAAPdLLrlFUO5b8Sn ClF83dBPD/U3SPmQ+rHoN5Dgt8MQI6+tB/+wQCATCuIFHJUXpVnODJpeQGICO9okO682 oRXRN1Mtcmp3daSg0LmskqmO/Qi68NDq32lmMa9wCFmxQhIw09qzUHyG3cfDrOWZo3bq c0H95ULCVo2TDvTJpTpTN+8I1meOuFmqMm9iyDr4GsX/lWhvqKxdDI8yjLvSLUxyZBm/ 1bSVkhw8QQr9f7zSUP6rMYgx5gxqHYVPri3MnSNOh7ma9Dse4GbCsUmgIT2/lhB/fceh TGVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067915; x=1712672715; 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=vawk+LSw2Z6p/aOFRJRkJdEE2smC/bsXUmQB9oTHxK0=; b=OvXiceU90Vq5MHGw0lyczexETI3jfpKzDT/prvZuFEEtl+cFG4DD6W32ULx2Xo2txC CaDbHJ+SsKlA154fPVgsrKoQJJdzj6T32S1wqdcMgs4qOoIEAs8/WzWoa180gfvW/I2J R+78v+DkLW92fcODSCKKZhfaUcM2bQYEIfhi6paFS8rzyD2MBXLsyba1W6wGpss3XIQe WrDkp4g+A2wAmQpKZCfJ4uYC0ZhLyG2mBdRvSJ3DdE7mLmjK+aZcsOmWQqMzZhVnqfVb mfhbe/OJiVF4Bqfy/8c1fZjd56yxwn0B0GaCzBUBtp+oO/tkmKlbV+pTonsQgjGhpiLi LWog== X-Gm-Message-State: AOJu0YzWDrNAOT89e3c1kfzoBpvmtZdVMzYK4dfOa1YYrKLNeaDTru63 Rp8ezyl0D/wCD6XPQB+5vdzKasAWGP/z4XR68eOhaVGY/0243ECKHTFIHY+kk63xjenjPYs1BqX Wn6g= X-Google-Smtp-Source: AGHT+IFJHpszbjIqBF+yYRpgQYe5a7ZHUg4a7GJafo0cxhAwOkZcBvYmyclis5LF/Q+ckcpOj8ETmg== X-Received: by 2002:adf:eed1:0:b0:33e:7865:cf67 with SMTP id a17-20020adfeed1000000b0033e7865cf67mr7659653wrp.55.1712067915477; Tue, 02 Apr 2024 07:25:15 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id l6-20020a05600c4f0600b0041469869d11sm21168544wmq.47.2024.04.02.07.25.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Alexander Graf , Cameron Esfahani , Roman Bolshakov Subject: [PULL 06/15] accel/hvf: Un-inline hvf_arch_supports_guest_debug() Date: Tue, 2 Apr 2024 16:24:21 +0200 Message-ID: <20240402142431.70700-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org See previous commit and commit 9de9fa5cf2 ("Avoid using inlined functions with external linkage") for rationale. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20240313184954.42513-3-philmd@linaro.org> --- target/arm/hvf/hvf.c | 2 +- target/i386/hvf/hvf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index e5f0f60093..65a5601804 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -2246,7 +2246,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu) hvf_arch_set_traps(); } -inline bool hvf_arch_supports_guest_debug(void) +bool hvf_arch_supports_guest_debug(void) { return true; } diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 11ffdd4c69..1ed8ed5154 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -708,7 +708,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu) { } -inline bool hvf_arch_supports_guest_debug(void) +bool hvf_arch_supports_guest_debug(void) { return false; } From patchwork Tue Apr 2 14:24:22 2024 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: 13614188 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 45FB5CD128D for ; Tue, 2 Apr 2024 14:28:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4w-0001K6-FQ; Tue, 02 Apr 2024 10:25:34 -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 1rrf4t-0001D9-TN for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:32 -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 1rrf4n-0008Ao-DC for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:30 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3436b096690so511581f8f.1 for ; Tue, 02 Apr 2024 07:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067922; x=1712672722; 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=xwZDj6i22zNsshQLGOawEr+LQWS78suiJsL8DAY6t9k=; b=yQmoSM6HZNtRTueqG4mllekcPyqjFnjLlGmJXY4ArLegJVNFO5rpEpfYQ9jMKlgnnZ AQm50fvAYZngiolXvSUKHYrOEmVlP9fPejU0oAaWLRibFYw+GJ34y7waCymZ4NOoO5no XFNhZkxEql+3CsfFqYY1UfEHLdmZFilbJjMPy5xWcZlVkuLXBDnmGnTtj7RZLsTGUGqu oiju77rYgzVvB2eWQd2IBRhhXgVDzmdJ95hKjwF8MnQv95UcWhAoLS34zETbTHUV78fY AMy3xqUKomla9NsfmNZMdXaBWYVjxdkbO/gZnkWcaDA1HJRP+pZOOe3Z54nnEwoaTEyh v9lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067922; x=1712672722; 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=xwZDj6i22zNsshQLGOawEr+LQWS78suiJsL8DAY6t9k=; b=NG4VELrg3MGh5F8TVEr0NsA9ngqocKYDjwXdvsV5uz9W//YZjl8rinsBXUr1lehtHz Et8eFhgbwdwUfqAMO9jBd0mK/ovBXPY/fVTbu9shj6zuh9KpPm+3DSIl52W9JWVjwOIQ sLNtYWJJNkf5OOkXk8J7r6LoD7DxGxC9gnf3W71qCrONymF1324l6V6RXJekMD9Qw5l7 YY7kr0OVOkIdijVrhf7+iOO1nN2NwO10MmbNTaHfLIViMaNz8W/I6k3Td6NKIGsEIrZE A98bnhBd/KSspWtRCdx6qXNQ8vslh7dfWmetXPLBwYNkcFdN88mzKLuXehHBFftKhD82 sBtw== X-Gm-Message-State: AOJu0YxqThycOfHzhpSBtdZi3wjmqviNuknFx9f5RfJp1609z66e9ic6 z7FXjvewH/iwpngKq2ikSyYQmQBruRyqtxbcbFD48n5hoWJy5ZXpFsg79ese9vKsT227NNJ4hKr KZDY= X-Google-Smtp-Source: AGHT+IHnyfHvzjH/4paP1GBT5Y0OidsdosNhQOHsj4YQC+yCQDDfFWmDG/Dg9bhk1SNG0/StWTvY6A== X-Received: by 2002:a5d:4ccc:0:b0:33e:c0fc:5e4b with SMTP id c12-20020a5d4ccc000000b0033ec0fc5e4bmr12886979wrt.2.1712067921877; Tue, 02 Apr 2024 07:25:21 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id fa14-20020a05600c518e00b004159df274d5sm2909420wmb.6.2024.04.02.07.25.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Thomas Huth , John Snow , Laurent Vivier , Paolo Bonzini Subject: [PULL 07/15] qtest/libqos: Reduce size_to_prdtl() declaration scope Date: Tue, 2 Apr 2024 16:24:22 +0200 Message-ID: <20240402142431.70700-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Since size_to_prdtl() is only used within ahci.c, declare it statically. This removes the last use of "inlined function with external linkage". See previous commit and commit 9de9fa5cf2 for rationale. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Message-Id: <20240326171009.26696-4-philmd@linaro.org> --- tests/qtest/libqos/ahci.h | 1 - tests/qtest/libqos/ahci.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qtest/libqos/ahci.h b/tests/qtest/libqos/ahci.h index 48017864bf..a0487a1557 100644 --- a/tests/qtest/libqos/ahci.h +++ b/tests/qtest/libqos/ahci.h @@ -599,7 +599,6 @@ void ahci_port_check_cmd_sanity(AHCIQState *ahci, AHCICommand *cmd); /* Misc */ bool is_atapi(AHCIQState *ahci, uint8_t port); -unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd); /* Command: Macro level execution */ void ahci_guest_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c index a2c94c6e06..6d59c7551a 100644 --- a/tests/qtest/libqos/ahci.c +++ b/tests/qtest/libqos/ahci.c @@ -662,7 +662,7 @@ unsigned ahci_pick_cmd(AHCIQState *ahci, uint8_t port) g_assert_not_reached(); } -inline unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd) +static unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd) { /* Each PRD can describe up to 4MiB */ g_assert_cmphex(bytes_per_prd, <=, 4096 * 1024); From patchwork Tue Apr 2 14:24:23 2024 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: 13614184 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22624CD1284 for ; Tue, 2 Apr 2024 14:28:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf4x-0001NU-DF; Tue, 02 Apr 2024 10:25:35 -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 1rrf4w-0001KO-HE for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:34 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrf4t-0008HN-CX for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:34 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4156e5c1c7eso7198995e9.1 for ; Tue, 02 Apr 2024 07:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067927; x=1712672727; 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=xfL4IVrnZ8RPkVaq+CH9l8CB4XL0LMP837JbxMa4yMw=; b=tt5YIe7O5QhcEoB0HhnIUL3Zbj90ghdC3I278gCLtvlQMEUGovQBI+prKUBE7KVbrS uDe2SC3WWvvhLANdXP0qyVSfKssI2HXFi5YJa6xPFc4MgAOJDq1hR1+n+PU8GoCDrQAb 13C7HqlJ1ydtjRlux+g1h7QyR2OWsQZVOlNeUEa3i74TMLwYmGkFDgSok9UxqAuWoTcl zylSZELVxNeNEHKdclGLGk7V12hWppc2mPGMcrCHDpvG6gQzFa83sGUsu/C/iU2081Tf pZwqB+3wEcCll+qSgCdLNn1RurR5bg+0cWC3Hpo6tDMZ4h4GNXrVbsZMkLo4NldscqCS REyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067927; x=1712672727; 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=xfL4IVrnZ8RPkVaq+CH9l8CB4XL0LMP837JbxMa4yMw=; b=FjrT/9l3VAGStWFd1fnYOREVidR7YWCPJ6vtPDeOahcuio8QbF/Ax4ZlP9ubD5XM1d h904Je4FEOkUH6Wg4s2FulzZmzkfM8CLBUp0rMGoIScvOG26c9F5aa3wCMeVBNPM/Seg OE1N0xf8SfDJpk2+tS8HwbFXui0uVzHTCy7oqvIPzsKhYR+5Uh2iNze0mYEmJssfFLRB pnHMVDRyexSaXU3VoSbfKvqZ2lbJ5dcsyoSsMgAxucOpbojjig0V6CDStmPgHU8uRTZf bEF0GOccfldjk2XY87kn6CAU3mik7K+AT6jMyKDkSZ6gIDyX7qG5JRNfg8BWlAWag/GT v1ow== X-Gm-Message-State: AOJu0YxDD79WH31Ux1yANIY4Imco9hAYP1iGMwiJ2nrzwtCSLtfQYtBY 1mpsKnDrKNb0FgUAriZ3aCMEJCyX9YGR9FJUw+CRQeeQReZI0xBveLz1yhNZKWsFHq0PVXXDOM7 2uXY= X-Google-Smtp-Source: AGHT+IGkFlLjYk2qN+++uoZbdByHhMiVj5ebWT6xzhb8ow571hGQV8IJrcnq7rZ6SZnY0q4i954BRw== X-Received: by 2002:a05:600c:4592:b0:415:611c:aa05 with SMTP id r18-20020a05600c459200b00415611caa05mr5674235wmo.18.1712067927761; Tue, 02 Apr 2024 07:25:27 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id b3-20020a05600c4e0300b004156da408b1sm3916554wmq.22.2024.04.02.07.25.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, Zhao Liu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 08/15] MAINTAINERS: Fix error-report.c entry Date: Tue, 2 Apr 2024 16:24:23 +0200 Message-ID: <20240402142431.70700-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu The commit 15002f60f792 ("util: rename qemu-error.c to match its header name") renamed util/qemu-error.c to util/error-report.c but missed to change the corresponding entry. To avoid get_maintainer.pl failing, update the error-report.c entry. Fixes: 15002f60f7 ("util: rename qemu-error.c to match its header name") Signed-off-by: Zhao Liu Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240327115539.3860270-1-zhao1.liu@linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a07af6b9d4..197a06b42f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3013,7 +3013,7 @@ F: include/qapi/error.h F: include/qemu/error-report.h F: qapi/error.json F: util/error.c -F: util/qemu-error.c +F: util/error-report.c F: scripts/coccinelle/err-bad-newline.cocci F: scripts/coccinelle/error-use-after-free.cocci F: scripts/coccinelle/error_propagate_null.cocci From patchwork Tue Apr 2 14:24:24 2024 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: 13614190 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAE5DCD1284 for ; Tue, 2 Apr 2024 14:29:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf53-0001eT-QL; Tue, 02 Apr 2024 10:25: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 1rrf51-0001Zl-Jj for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:39 -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 1rrf4y-0008OJ-TX for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:39 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4156684ee9cso14166545e9.1 for ; Tue, 02 Apr 2024 07:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067934; x=1712672734; 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=kQNXAA1wuI9r1xEVFBSvxjPye1eCu2fvaop4AIt2tLo=; b=Yt9ERwCRY5n/jJ7PAk7SKe2GNicxXTUNdVu62EJbua+QF+NjOzSHslPVKm+rldTdJp 8xIhRr8/Vj3JJOeC+dgCHhMhUcuoMyQzrKUjz9GVl83Vm/O2HQPV0eZoDMrHc4PECsOL pZxY6UNRA9A30TPz+9EJfhRvCZYaWFBCcAg2h4FTGwqtFC66z+5kGk7A+JHCbUdqjaQq qMrroyjV9UqqfxErd6+otvCPDGke79DgJdJFEQWyT7wCIluqRzzD9pekMOkSGuoN9gl7 TasMGYVH5Tu2OjZnJ3aKDMHxoSAyJQAwxcIh3qDH3cgbS0pgBdiulyGCvz7lUGQLueKF T/Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067934; x=1712672734; 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=kQNXAA1wuI9r1xEVFBSvxjPye1eCu2fvaop4AIt2tLo=; b=v1n/q8D6VrimtpD2p8NjbbKpKK81VwTe5j7O1RSusIldozJHvlxchtJib3tQMCRUFr +ExX4j4IgRneP9R0v3U2Vc6kAfmFDK724y0r/L7aXnApCMu7SuNWNXX31MOMKe4Gz693 39W2g3C6AgtXRdxqXkPP/o+E0Iz6PsPUkWpJ/izW1zfp/UZpkpZQ/+bhovzBQKXbflWy ZoWX5ZROq9mJv1gd2pXsGW3c+pGENv7FM9m+1HV9rmUZkP59I3Rzeg5quFtf+zlSIruc OPgE80drugymHvsODlxfOFVpdPJjEPIknemlDZoNrmRnroNgQ83SL59CU+TmhSLLG8ss RA6g== X-Gm-Message-State: AOJu0YwpjRHLD8L25YAAMnhKNlrC9id2+YXbAlWJ6IzHHZzjoDo4+JSC eTS6ig3kmUuFT5n53ez1iidnn9FGinHzdgKcLSUS2VMpOAvZImmeZ/YBEpy0TUiieCNkqnzkvxh dLec= X-Google-Smtp-Source: AGHT+IEbsSiMV7jilXYs2wV9OBg95AuR2LRSHkUc1BiINN5nAdttK0+iS4lqUtws+mmM3EGdu+r3Vw== X-Received: by 2002:a1c:4b04:0:b0:415:f755:5a1f with SMTP id y4-20020a1c4b04000000b00415f7555a1fmr1630323wma.29.1712067934343; Tue, 02 Apr 2024 07:25:34 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id p12-20020a05600c468c00b00413eb5aa694sm18186167wmo.38.2024.04.02.07.25.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jonathan Cameron , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PULL 09/15] hw/i386/pc: Restrict CXL to PCI-based machines Date: Tue, 2 Apr 2024 16:24:24 +0200 Message-ID: <20240402142431.70700-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org CXL is based on PCIe. In is pointless to initialize its context on non-PCI machines. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Jonathan Cameron Message-ID: <20240327161642.33574-1-philmd@linaro.org> --- hw/i386/pc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e80f02bef4..5c21b0c4db 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1738,7 +1738,9 @@ static void pc_machine_initfn(Object *obj) pcms->pcspk = isa_new(TYPE_PC_SPEAKER); object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", OBJECT(pcms->pcspk), "audiodev"); - cxl_machine_init(obj, &pcms->cxl_devices_state); + if (pcmc->pci_enabled) { + cxl_machine_init(obj, &pcms->cxl_devices_state); + } pcms->machine_done.notify = pc_machine_done; qemu_add_machine_init_done_notifier(&pcms->machine_done); From patchwork Tue Apr 2 14:24:25 2024 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: 13614187 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E3F2CD1284 for ; Tue, 2 Apr 2024 14:28:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf5q-0002Hq-7J; Tue, 02 Apr 2024 10:26: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 1rrf57-0001ny-Ns for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:46 -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 1rrf55-00006f-AF for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:45 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33ff53528ceso3778739f8f.0 for ; Tue, 02 Apr 2024 07:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067941; x=1712672741; 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=7qcHH+OAhHv5oWHUpWK7YMWCpNLvO0BPFhkfbb/3C2c=; b=hskFWnFBvkFPy8nFb1IeN2z+snIZBvs3k3PXE7OJ4wIUl+Cnl6LUze7nB3D9SRIFIm TvDcv0Tk64fLxcqiDjo6DZzaB3eE+XLqVayJdJBwdJWlEZXxm01tQQLXNL6P/57cw2Pv eaYwOpzuw4NgqHLbgKbUrCGMZ6y0Nj+XcxAY1oUhyA0k9moSoscOlATq9SjFrjGfKOuS MZpPFwGEI4lW+Vhsd680XjrAnWX5zj/mUD7N1U8bwTuIeR8OzBJPvjBRZiWWnZ0uj3NM fs1SNIjjgJ6XqhGQ9KqJ3gpRjMgOnxH3ZwB2ZEVsIgKi0Vc45AMkijSuWjZ9RmszWkUP rF8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067941; x=1712672741; 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=7qcHH+OAhHv5oWHUpWK7YMWCpNLvO0BPFhkfbb/3C2c=; b=Zo67w44yqG4aE07gg58tz0743VdYLvzQAir+aZhq00oIY1gmBUAsfnwAfDwuxlBGM2 xGb2jBieF9zSC5cBIsatHpNPkgTQDn++LxNV2YtS0lqTPdg8ky6Y67KaLc0/l7PU1K+n ocOT34m3WXuyUjQEL8SDPvTZwu5PbOXdvVcK2V8oC4fSHBlvZKWDBCxdTjcBrBctJcI+ AohdMd6Cv9d/gY1ASQr/g/Y4txxhT1ceyS2esvv80SlzVhH8Okipp07Cb+fA8qtlgNqp ChMWUo3Oxx3NPIRJM8VlZoSS+KVtQ/Ic92f+VBzb+nCFwXw5ML8AmADzUYcK2uGa8Wtr SB+A== X-Gm-Message-State: AOJu0YwXNElIB9qe50ypg4vlHvU1w9zGJQyNQVXmyAPNEo/dKJG/P8c6 6Xb3u/jnooCvpfM3IEL/a1MUpHrIjtUFqQqOnKYeaHH/I5Xz/P2tw8vSARpcR35f9lIMUTKtts5 gqB0= X-Google-Smtp-Source: AGHT+IEXIE7qmPsir59JZH4f0PPcQyJ4KagaBvkKMFNWGMsHJ3uFs9sfwByBvLsTeGCD+W46V6Wgcw== X-Received: by 2002:adf:ca8b:0:b0:33e:7719:325d with SMTP id r11-20020adfca8b000000b0033e7719325dmr7135610wrh.2.1712067941079; Tue, 02 Apr 2024 07:25:41 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id az15-20020adfe18f000000b0034335f13570sm12328862wrb.116.2024.04.02.07.25.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Fiona Ebner , Stefan Hajnoczi , Fam Zheng , Hanna Reitz Subject: [PULL 10/15] block: Remove unnecessary NULL check in bdrv_pad_request() Date: Tue, 2 Apr 2024 16:24:25 +0200 Message-ID: <20240402142431.70700-11-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Kevin Wolf Coverity complains that the check introduced in commit 3f934817 suggests that qiov could be NULL and we dereference it before reaching the check. In fact, all of the callers pass a non-NULL pointer, so just remove the misleading check. Resolves: Coverity CID 1542668 Signed-off-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Fiona Ebner Message-ID: <20240327192750.204197-1-kwolf@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- block/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index 395bea3bac..7217cf811b 100644 --- a/block/io.c +++ b/block/io.c @@ -1730,7 +1730,7 @@ static int bdrv_pad_request(BlockDriverState *bs, * For prefetching in stream_populate(), no qiov is passed along, because * only copy-on-read matters. */ - if (qiov && *qiov) { + if (*qiov) { sliced_iov = qemu_iovec_slice(*qiov, *qiov_offset, *bytes, &sliced_head, &sliced_tail, &sliced_niov); From patchwork Tue Apr 2 14:24:26 2024 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: 13614189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87CF8CD1284 for ; Tue, 2 Apr 2024 14:29:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf5q-0002cT-Qu; Tue, 02 Apr 2024 10:26: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 1rrf5G-000229-6y for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:00 -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 1rrf5C-0000Et-BN for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:25:52 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-341c7c8adf3so3638553f8f.0 for ; Tue, 02 Apr 2024 07:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067948; x=1712672748; 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=OjdzjLmAnFvDVsex65dJCtrM54ZeLuGIMveMRxi+eG4=; b=BVKZ2FGUPPvYTq2jCPV4KLtvC605Lsc2lPhk3LPf123LT0yE2xwSAOdFkdH1yUAYDA 7vXtkfuh/XEaqcenP/b1hDcPikJ8ACgxRc7zSrGrf+672J08MqmK+jMeJRF+WLfzdVRM qBXxSBResep8M9lQyQIPjAWKCgOSt3E411XDZH/PdHwq//CjWYX8/JCi2/EGmgYlGkfM z5rZUcaXTx2K61uePDhHLysCDhxNaQt9yF690jxGci3JKE7qH5kFzERYZ+Dcf0wfYymn nSz24LpWO2//jXNITt3jobVGF5pZEY58nn8sSE0qnWrvOH3fQya4mTjTYE0ejSUSxwUT vOEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067948; x=1712672748; 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=OjdzjLmAnFvDVsex65dJCtrM54ZeLuGIMveMRxi+eG4=; b=X34kkgp592fC2tLoTfGA538QhzFErdNHkAEWv0SV09RrspLzjENlT71yIa8XFH/pXE p5WVN9ouJw0KOQdnacxpNj1Cxmb/Q5wGI9I6YIrmFDh1NTN3Bv6SA8KhHZaqxVmcXhn7 yuyF+TUitaRkWqiyY8e1sjs3C5zxeeQnS6vRA5lTNNuwhWItvNIC3mCjvb6yLiQXyYBf XIQcKu7sxzJNyRgDEfroQakvKVpip4lKNlTNgWjtFBVhm6bPdAIgmDVYNxNbOddZSV7n QUHa4YuTBRL9j0gas6MJflXB97oaFrxd7Sj1KNLBWuCCe5UKEvDW/cBesnpIpSRkMVtR 0HnA== X-Gm-Message-State: AOJu0YyCIdBcj1MNrG8InyiARH3yvDxQ0xfnakGajcDJvocUfkFR6D7z UyZDl4yoNNOUzUxeoVC4EKVuMB9cTcW94TVWdb8CsY4xCrdgVSkIHV6+4z5zJExU6FS5ZoBPWA8 6zXs= X-Google-Smtp-Source: AGHT+IGYcAMyT0ce3AxxAxntLH9Goeq/9HJoQOd5CAofmb0FvpxhwPE554XSFu0VKUJa09jGvh1mDQ== X-Received: by 2002:a05:6000:1a8a:b0:343:39a6:45a1 with SMTP id f10-20020a0560001a8a00b0034339a645a1mr9792770wry.59.1712067948073; Tue, 02 Apr 2024 07:25:48 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id h18-20020adff192000000b003433a379a51sm520722wro.101.2024.04.02.07.25.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 11/15] plugins: fix -Werror=maybe-uninitialized false-positive Date: Tue, 2 Apr 2024 16:24:26 +0200 Message-ID: <20240402142431.70700-12-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Marc-André Lureau ../plugins/loader.c:405:15: error: ‘ctx’ may be used uninitialized [-Werror=maybe-uninitialized] Signed-off-by: Marc-André Lureau Reviewed-by: Pierrick Bouvier Message-ID: <20240328102052.3499331-15-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- plugins/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/loader.c b/plugins/loader.c index 9768b78eb6..513a429c57 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -390,7 +390,7 @@ void plugin_reset_uninstall(qemu_plugin_id_t id, bool reset) { struct qemu_plugin_reset_data *data; - struct qemu_plugin_ctx *ctx; + struct qemu_plugin_ctx *ctx = NULL; WITH_QEMU_LOCK_GUARD(&plugin.lock) { ctx = plugin_id_to_ctx_locked(id); From patchwork Tue Apr 2 14:24:27 2024 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: 13614182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3046BCD128D for ; Tue, 2 Apr 2024 14:27:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf5v-000350-G8; Tue, 02 Apr 2024 10:26:36 -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 1rrf5a-0002HN-GC for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:20 -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 1rrf5L-0000KV-AZ for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:02 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-33ff53528ceso3778903f8f.0 for ; Tue, 02 Apr 2024 07:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067954; x=1712672754; 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=UdHptW6/vmFiZMZ88dmnQIm/hdJiCEdE6JKu99L0Ilk=; b=HufWAAgk8e40SvOjg0tlNYJouxNf/WRJIsa/JTaf7qt1POY5ahqP+yxAKBbfd7wK/c N1XBjAJh2CdA32lcFd6QrR5TZiPFk/veOVV9Ff8hQmpEr7jO2TM7briplrmGo7In2R+j SOncngXqQltxGwHOTkceeVLdSJaJxZ4fJVfPQRhw5FY9S9+Uy4/qOhQZUoSJE/co9MND e51mCiL6I0P2o7PVbJqf3zC7FOhhwotULmpD8T0U61/OasfHFYZLsE7m8Q0joQZeBz+c XcZLrq6aZUhF+uCyoLoDLWbAHsIluooP1WxS5P/weF3s1nEom0MwP/3q9vyTzVveUNob /9Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067954; x=1712672754; 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=UdHptW6/vmFiZMZ88dmnQIm/hdJiCEdE6JKu99L0Ilk=; b=aJcNr8E/H91KmEk9tplF2ow9FQ0R/1uEfBRXMEWcZO2QMIb5/cngCUftapHE4rE29D p6tQuQ8vtFijvSj8rVjn+ofGV3dX4KhEHQi7BTdKxldJLG9VVYcXBo39B5dp32ifCtVi n/+OBQ0hs0Pxrqo1m2h6Po7BMTKr99cXSsI9pnLdpvcYzhH/Tz2DaO8gaAcRHmwt5uju imq4oOpuKuc42yI6Vq8LV5Roq5JArq7S7vN3KLVcbBFo6AJ0tFjIPHMOiXhqmgReEJ5F EN64+HLRhqAygYI0HbtA0/J0ZZnpExZGXaLEAybs1LrzOMV0tC1H22LRjChUX/kH/e88 B1vQ== X-Gm-Message-State: AOJu0Yx60YbPPi77obqJ0M9IxjkK1V3C7WR4xnt7/IrSIdjuwVZT4jCn 8LBIZ+To1MBj4ue0XjHQMXZk/3GTjBjwh2BaC2067WSMPhCNzQs0cNqh6G9/RX0y7WAxEhUFQur LzjA= X-Google-Smtp-Source: AGHT+IFiVGIz6hUw63J+oL2x0lH56xk6vCoRVjjs++gnHuYH9IqZW9qRKSwmwiEaIaW8+7hUAoQS0Q== X-Received: by 2002:a5d:6451:0:b0:33d:2775:1e63 with SMTP id d17-20020a5d6451000000b0033d27751e63mr8411023wrw.41.1712067954632; Tue, 02 Apr 2024 07:25:54 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id c9-20020a7bc2a9000000b0041552dbc539sm13501997wmk.11.2024.04.02.07.25.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:25:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Klaus Jensen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Keith Busch , Klaus Jensen , Jesper Devantier Subject: [PULL 12/15] hw/nvme: fix -Werror=maybe-uninitialized Date: Tue, 2 Apr 2024 16:24:27 +0200 Message-ID: <20240402142431.70700-13-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Marc-André Lureau ../hw/nvme/ctrl.c:6081:21: error: ‘result’ may be used uninitialized [-Werror=maybe-uninitialized] It's not obvious that 'result' is set in all code paths. When &result is a returned argument, it's even less clear. Looking at various assignments, 0 seems to be a suitable default value. Signed-off-by: Marc-André Lureau Reviewed-by: Klaus Jensen Message-ID: <20240328102052.3499331-18-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index c2b17de987..127c3d2383 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -5894,7 +5894,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeRequest *req) uint32_t dw10 = le32_to_cpu(cmd->cdw10); uint32_t dw11 = le32_to_cpu(cmd->cdw11); uint32_t nsid = le32_to_cpu(cmd->nsid); - uint32_t result; + uint32_t result = 0; uint8_t fid = NVME_GETSETFEAT_FID(dw10); NvmeGetFeatureSelect sel = NVME_GETFEAT_SELECT(dw10); uint16_t iv; From patchwork Tue Apr 2 14:24:28 2024 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: 13614186 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A417BC6FD1F for ; Tue, 2 Apr 2024 14:28:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf6i-00052o-Gk; Tue, 02 Apr 2024 10:27: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 1rrf60-0003KK-2e for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:44 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrf5r-0000Oi-8O for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:36 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4155baa696eso18307415e9.2 for ; Tue, 02 Apr 2024 07:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067961; x=1712672761; 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=l+fO7oYBR7TJebc9irMjmG12sytPdpVdcVHcme4RXSE=; b=OpAHjBMp1eX5zuX7XRQ2kN1WEbKjPq4bL5y1pjQA6KovJJkhkaTB0axW3gVA2QuYUv tBhSDvUPB4vmezF02WHIUNgCqEuBiEXIFvRwAxZCWY2VpXG2PHhhQocz4tIOLDNR1HW8 5BxG5FxG4NvLLYR4QkbiOqpFHAa//4LeBUXG+faT4g1hadGtULl8/bmvMKICh0p0rC+u WV6zhJO/WphMgdbF/1QHT+gQZeKwM02d12edumS9H4l2/G8HOvVM461pus/u5znILCYB uhzIcdZ6uyRDwbE894wmbnW182ClP7Y9HcjPzfm6b4Zw8gyEUF1k60a/5oZZeo+Zr1yH g2dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067961; x=1712672761; 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=l+fO7oYBR7TJebc9irMjmG12sytPdpVdcVHcme4RXSE=; b=hHQ3CixOxd7QZ3yPVauxK5Z0SweMtBBN2eaHjzDeQekkrKGU81wEJn5jVQKieBxg8n Wz6+nDEubeVTqX4yUE3vkzYS2o1FJZnJb/ExkHVTnX3zEnwG8kkgyXotajU3EFm1YAQf gRG8pv7JPrTiy1ugLoDSDisoCy1CpvP/F1CvgbDA5DvxPdVwTld0kuGsEZcycmuP6iwm 85ms1DmM8tFgZ3KxEPGKAtrYGSBBgnJxdryJgV0IuuiRLVa0KQ5kW07wNqBCwjbnqpdL K/8JplRyXJljlRfKYwd9qEK8v8hpsfoM9D5wsTj0RsWixbPHECmYy8rdm07yRHyxFfbC /4Hw== X-Gm-Message-State: AOJu0YwMgNyB40nXoqNKSMFTBW+H1I0HSA39Favw/GIAgGb5BjxOGIRI jOulwprcasTlev56lWFlYOomGtQeiZ8Rbn9hruwqNPUlRqVGqLON19vOVzLHYQMWMPvQX4BIYsp HJ2Q= X-Google-Smtp-Source: AGHT+IFDQ96sSk7UlJhfdLan7XZpN4NSRR0kfFNYVAQfR3LH07i0y2URirND7uiku+7YhxrJ9OIngQ== X-Received: by 2002:adf:fac4:0:b0:33e:c316:2a51 with SMTP id a4-20020adffac4000000b0033ec3162a51mr7397994wrs.27.1712067961597; Tue, 02 Apr 2024 07:26:01 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id g1-20020adfa481000000b00341e7e52802sm14396909wrb.92.2024.04.02.07.26.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:26:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, Glenn Miles , Glenn Miles , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 13/15] gpio/pca955x: Update maintainer email address Date: Tue, 2 Apr 2024 16:24:28 +0200 Message-ID: <20240402142431.70700-14-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Glenn Miles It was noticed that my linux.vnet.ibm.com address does not always work so dropping the vnet to see if that works better. Signed-off-by: Glenn Miles Message-ID: <20240328194914.2145709-1-milesg@linux.vnet.ibm.com> Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 197a06b42f..e71183eef9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1545,7 +1545,7 @@ F: pc-bios/skiboot.lid F: tests/qtest/pnv* pca955x -M: Glenn Miles +M: Glenn Miles L: qemu-ppc@nongnu.org L: qemu-arm@nongnu.org S: Odd Fixes From patchwork Tue Apr 2 14:24:29 2024 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: 13614181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4362FCD1284 for ; Tue, 2 Apr 2024 14:27:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf6k-0005Sp-UH; Tue, 02 Apr 2024 10:27:26 -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 1rrf60-0003KL-2u for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:44 -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 1rrf5q-0000Sa-ML for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:33 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4156c4fe401so10376645e9.1 for ; Tue, 02 Apr 2024 07:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067968; x=1712672768; 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=LJR+J0sIff2Vu4D6kvT0n6WHFLydqkfqEpFRyA0c+dE=; b=pTjwvD7joMHBtcGP5BstWpq5hNCUhEJAu7/qNNsKlOAshUYM0cEPMpxbEM6RAcovCa TRg6E/xG6dpY1uNg1bdvgEWLZhcFvxBa+5NZ9AcilXqccbkIhH6fpo2lVJC111aD/PTT RXQiVuoXALFg7iGbUwT3CHmtVkUsPky8zrX3RvNNQi83my6LrgKK5LfIzVET5VdHAP/v n0vtG5Uso6Zw2/EqxUlmhNk79C9tR0Q/2eKxEOo+55dZYDJDW75X/YwzGJZaIi/vt8Mg rs+pS067Lq9FUulYRekOBOG5hCAVjfb3AwaizL1mLi90wTortpeTTkEiCzu5r1SYKd3N ntDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067968; x=1712672768; 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=LJR+J0sIff2Vu4D6kvT0n6WHFLydqkfqEpFRyA0c+dE=; b=o8ngBz3deOyu/gm58OkHLgU4haLqTwclD14b9BnLZcposBRaZP0CFPYhBv27gxdUCf GRtptBIottt4mT12k9hbENOBqKfTabBYVkoG5KeHDMYLd3YPbrAFQtXPwphxGeJAGqhh +MV87nPHjj73lj/3cFza3YRWRwPqKBZtKp1xD4LNcSjyU4//LXxAFsbzVefUTCfr3wnU nD6ZovscXl+9iOoUyIj03mwtslV5KF1nRbldDOVafTfIygpjKcz1J4xTqmHW5NJjdxyW TPD/xGIcGwERCuX+XatyJQejE8QcVxYz3d1a6dW0Kl5lkuwUYi/QODIW4i01a+5zLJyU TpcQ== X-Gm-Message-State: AOJu0YwQ+3DSMRp56COqhsE3Th2FRbwBw5rFVzd6ha4EB0AOYKOzQSok Wu/cIVdOHYDJc5CXIuE6HO3gdHfOaXWzr0jBRY0OYm+gceYHci8Q3nW0SlM6cK8P/thPzbbbfx7 ppWg= X-Google-Smtp-Source: AGHT+IG4zA6UOegYcEWoMux0JI6FAPHoRZzc1piBq7h3ig/Eh1YzJIg8mY+dO6cQ2T2ozzVJidRvZg== X-Received: by 2002:a05:600c:19c6:b0:414:132e:b485 with SMTP id u6-20020a05600c19c600b00414132eb485mr10180645wmq.27.1712067968445; Tue, 02 Apr 2024 07:26:08 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id p12-20020a05600c358c00b0041486a6f9fcsm21378049wmq.37.2024.04.02.07.26.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:26:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, Artem Chernyshev , Oleg Sviridov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , David Woodhouse , Paul Durrant , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PULL 14/15] hw/xen_evtchn: Initialize flush_kvm_routes Date: Tue, 2 Apr 2024 16:24:29 +0200 Message-ID: <20240402142431.70700-15-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Artem Chernyshev In xen_evtchn_soft_reset() variable flush_kvm_routes can be used before being initialized. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Oleg Sviridov Signed-off-by: Artem Chernyshev Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240329113939.257033-1-artem.chernyshev@red-soft.ru> Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/kvm/xen_evtchn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index a5052c0ea3..07bd0c9ab8 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -1097,7 +1097,7 @@ static int close_port(XenEvtchnState *s, evtchn_port_t port, int xen_evtchn_soft_reset(void) { XenEvtchnState *s = xen_evtchn_singleton; - bool flush_kvm_routes; + bool flush_kvm_routes = false; int i; if (!s) { From patchwork Tue Apr 2 14:24:30 2024 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: 13614185 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BBA2CCD1284 for ; Tue, 2 Apr 2024 14:28:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrf6K-0003nk-6G; Tue, 02 Apr 2024 10:27:00 -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 1rrf5q-0002ZS-Cb for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:30 -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 1rrf5j-0000Xo-PM for qemu-devel@nongnu.org; Tue, 02 Apr 2024 10:26:26 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-415446af364so26340145e9.0 for ; Tue, 02 Apr 2024 07:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712067976; x=1712672776; 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=LiQNL8qlUJUwVLo8ka7ZFh5OPYv1xBVi+fy9VmqgzRE=; b=lYzBQOB5xsn43gK0Cwk6kH7vdBEUOyARdDJv+GMWThn/j/uprIrJ+5xDju6+k2h9Yd OZzvBai9M9LUsBu+p/qQTBAYIwmrK0xAr1RqlFheoZB9IAOklLpbacaXK6nbDNoseX2d 8ChOnaUEEj7LnIeh40pHlzak5qUE2/HW9x46VYr2c2FhVammZ69x2nGyBo94aGh/lqA1 W6GYkYedEHSch55Gk/CFSiD99h6Xd3I1fP9CPcoJdltKqbfMvqw5MtIwzgNL44VDZ0ji eFM7mZ6Y8+uEIlrAEI0xPQsi6Yt1cAwXxj4XP65JW71FPoBsBeAjIh/9l9zTRf9vn/2m Nepg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712067976; x=1712672776; 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=LiQNL8qlUJUwVLo8ka7ZFh5OPYv1xBVi+fy9VmqgzRE=; b=mFmjew4SO5/N7ZvdaVZEWHzD9FhZkL0LtQA0EmPaqkyL00I+g1nmRJLhUZ1E1I3SFE cGOPCs1mlBVFfeG0VbOi/B6lmMzXqAz1+0CaY703P2ztzOFau/Yenh6MvvrNnEopLc0U tzN6zAMYpv6wBMnwQ4RlNk8S8xDXAZSREvp4PBMbiHWrJZjauPUNsOl9rmOK3P3XemvI m1Em8W3LJ2KQOnCcMLBqgBmT4UAm2CxgCGXAkQwQcX/sRFkkG7pQbMcClJR7WWHwcz9g 2z/Db4bkr9RPMr5O1zoAQF4nB65PNv96AZG28i0lUDmS2zxVG+bfkUUMy9OE3S4AAnMg YP2w== X-Gm-Message-State: AOJu0YxpQ8a6kus4E9VEzKpvzrt2pQxLLYcwTjDJVwacn0hpeI6hjqwy xBExYTxcB00G4nTB92XHiZDWdiMEy+0xpPwuIljNm0LFQkCuyuzrlnFPtFMoG8eMT2NJT9WqI0N dWbg= X-Google-Smtp-Source: AGHT+IE6saWf+oB/j8EBTqEFwDKJJ227HWQfzru1atRapCKVrnKsUxhdQi/s7wh3tKOXEde21OYylQ== X-Received: by 2002:adf:f108:0:b0:33e:c68d:d536 with SMTP id r8-20020adff108000000b0033ec68dd536mr10768328wro.15.1712067975793; Tue, 02 Apr 2024 07:26:15 -0700 (PDT) Received: from m1x-phil.lan ([176.187.202.91]) by smtp.gmail.com with ESMTPSA id dn13-20020a0560000c0d00b00341b7d5054bsm14389989wrb.72.2024.04.02.07.26.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Apr 2024 07:26:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, Yajun Wu , Jiri Pirko , "Michael S . Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Jason Wang Subject: [PULL 15/15] hw/net/virtio-net: fix qemu set used ring flag even vhost started Date: Tue, 2 Apr 2024 16:24:30 +0200 Message-ID: <20240402142431.70700-16-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240402142431.70700-1-philmd@linaro.org> References: <20240402142431.70700-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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Yajun Wu When vhost-user or vhost-kernel is handling virtio net datapath, QEMU should not touch used ring. But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event). VRING_USED_F_NO_NOTIFY is set by QEMU in following code path: #0 virtio_queue_split_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:511 #1 0x0000559d6dbf033b in virtio_queue_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:576 #2 0x0000559d6dbbbdbc in virtio_net_handle_tx_bh (vdev=0x559d703a6aa0, vq=0x7ff5f4c920a8) at ../hw/net/virtio-net.c:2801 #3 0x0000559d6dbf4791 in virtio_queue_notify_vq (vq=0x7ff5f4c920a8) at ../hw/virtio/virtio.c:2248 #4 0x0000559d6dbf79da in virtio_queue_host_notifier_read (n=0x7ff5f4c9211c) at ../hw/virtio/virtio.c:3525 #5 0x0000559d6d9a5814 in virtio_bus_cleanup_host_notifier (bus=0x559d703a6a20, n=1) at ../hw/virtio/virtio-bus.c:321 #6 0x0000559d6dbf83c9 in virtio_device_stop_ioeventfd_impl (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3774 #7 0x0000559d6d9a55c8 in virtio_bus_stop_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:259 #8 0x0000559d6d9a53e8 in virtio_bus_grab_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:199 #9 0x0000559d6dbf841c in virtio_device_grab_ioeventfd (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3783 #10 0x0000559d6d9bde18 in vhost_dev_enable_notifiers (hdev=0x559d707edd70, vdev=0x559d703a6aa0) at ../hw/virtio/vhost.c:1592 #11 0x0000559d6d89a0b8 in vhost_net_start_one (net=0x559d707edd70, dev=0x559d703a6aa0) at ../hw/net/vhost_net.c:266 #12 0x0000559d6d89a6df in vhost_net_start (dev=0x559d703a6aa0, ncs=0x559d7048d890, data_queue_pairs=31, cvq=0) at ../hw/net/vhost_net.c:412 #13 0x0000559d6dbb5b89 in virtio_net_vhost_status (n=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:311 #14 0x0000559d6dbb5e34 in virtio_net_set_status (vdev=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:392 #15 0x0000559d6dbb60d8 in virtio_net_set_link_status (nc=0x559d7048d890) at ../hw/net/virtio-net.c:455 #16 0x0000559d6da64863 in qmp_set_link (name=0x559d6f0b83d0 "hostnet1", up=true, errp=0x7ffdd76569f0) at ../net/net.c:1459 #17 0x0000559d6da7226e in net_vhost_user_event (opaque=0x559d6f0b83d0, event=CHR_EVENT_OPENED) at ../net/vhost-user.c:301 #18 0x0000559d6ddc7f63 in chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:62 #19 0x0000559d6ddc7fdc in qemu_chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:82 This issue causes guest kernel stop kicking device and traffic stop. Add vhost_started check in virtio_net_handle_tx_bh to fix this wrong VRING_USED_F_NO_NOTIFY set. Signed-off-by: Yajun Wu Reviewed-by: Jiri Pirko Acked-by: Michael S. Tsirkin Message-ID: <20240402045109.97729-1-yajunw@nvidia.com> [PMD: Use unlikely()] Signed-off-by: Philippe Mathieu-Daudé --- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a6ff000cd9..58014a92ad 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq) VirtIONet *n = VIRTIO_NET(vdev); VirtIONetQueue *q = &n->vqs[vq2q(virtio_get_queue_index(vq))]; + if (unlikely(n->vhost_started)) { + return; + } + if (unlikely((n->status & VIRTIO_NET_S_LINK_UP) == 0)) { virtio_net_drop_tx_queue_data(vdev, vq); return;