From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071601; cv=none; d=zohomail.com; s=zohoarc; b=eQEOD61NhUXA4hmt54s6RWnfFvhxmcwy7jQUSMSZg3uGCasnp0C3j68G7DEdbGUlZLEGu6kDpYu6OC40hCGtxCaWOObDOvkjQYsCKnl4FoNfDQin2HoXzVKTb4V2IlIAIyBehGzn3VmhlRhsG1BocULv5yry2uRna3XW6BFLSyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071601; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=aAGNceKt9ICMl3PKB0LspGbqju2ajHOrPESyT1vA8as=; b=oI9Wi9f7siwO36gzhj9rHpo/jd7wYecL4ozMS2rmggTclfcEkSuD7q5pmo3GlaRZh5L//rhz4C/3oX3XuHCFrmo8BKLXfunISv0ho5J33Q5sE1j1nJuNGv0OIEvuCxXSDRjd+Jq7VUes5U0Q49Ojtn0EQ6BVqV6nl6wK1KsU7kw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177307160183511.250466133098485; Mon, 9 Mar 2026 08:53:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcuM-0003HN-OO; Mon, 09 Mar 2026 11:52:38 -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 1vzcuH-0003C7-2w for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:34 -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 1vzcuE-00086B-Nc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:32 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-439d8dc4ae4so1790686f8f.2 for ; Mon, 09 Mar 2026 08:52:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2ba06sm29306158f8f.24.2026.03.09.08.52.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071549; x=1773676349; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aAGNceKt9ICMl3PKB0LspGbqju2ajHOrPESyT1vA8as=; b=CCE/ksDdVgOC+lyN8n0YVhpN180fyNxwuB9yPiuDKlMJP79hThuyn00eOjJy7yg7lK Sss/miSiejzbp191q5XeVuqGfyjPNqk8O0EwbcOrEhnwAMjzWy9+YpaGoAfNZANa0W6/ xbvdDmPWjOvXDA8Dq3AH1UV7hOBzNHTUu3I8ZzWj05Urb8vN5o32vfjMw7g8R88PW85g AhupUnkvK3BkgupyZXod2Bozpa62Y9UPGLZT6+4sGXOl0mSMAu0H2lx/NGUAITijRAQU 23O42H0Pxmpc0kuv/npL2kw38GBCNRLNPuIeswMJ3VBMJz8gphkR5LhIKMz7GUWOBR7n 6Acw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071549; x=1773676349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=aAGNceKt9ICMl3PKB0LspGbqju2ajHOrPESyT1vA8as=; b=RKc+D0CRGocsdC4ZCPvGqXia2VwUJEHRWCKfIlJjGiMrrEuf7oy8CXZtdI0Ls6atIP rI/F2lobqDiyphKrDD6/ZsrHkdXXAcD/UMBewykjI9z9EVisaKFJUNLZIxdKiZTUgTUG WxnK924oJscJW0shj8+Ai0vi/OJfoHiLzgcK4Umn3coWxCeuOexfIXlJTRi40uI+e5Ij K76s/u3tXeGVmo1FiijD0nmKlNO7+3DuMHNAeMwXTe9Npo9shR0LqmFX+qtAEHYslu38 YNCSD+/wR24CAAu/UeB58B9vSPoYPofxEG0RPud/e3ZDrK62IXEETQ1+Kifok6uZkLY8 4lwA== X-Gm-Message-State: AOJu0Yw4QnPCArnVAKDprjgWbk9fBCJzADw6HFxUU8E+W+I45I7Sk5HP WFuIS69sTRlpXXxVk185yzmCzwiHp2rJpfjaX0VxICxSvISMUpQ75pcOVm34cctz9he9o4lLGYS rlOzuM5Q= X-Gm-Gg: ATEYQzzQoaableH/KGA+Vn4mCDw1YCnaaYiVtNMEtxwdvI7OaCA8Z8Q+GnXFhv5QBKL +ESehcOeGkMmrmu/0OTQqJGsoFpPk3AcIeIe4jxDs6XrKWWyAF4Y3j5+4aLpTbS7yEhxMlyM39E oJxMfJsl/G/TUy7PibAhBTv8+vIaVQ1lxz11oaKmAXTgTOEbJUY4eMj9K8umMKBfNal4aq+W1wW rhkOD56b6dCNJZikPVyP1h0KBEjmnYGu3MXFrZIvS1ZvF7ugyUs5x/j6U1ROqxmUQyaqla6MQjm 4RVAwFldMecwsZeAzSUeWaOnZZpEf5+58rvlAPdO5KOkkGNQpkHLwVLt6JMtQfWevyuWPLGCJdO 9lJhjBL6nMKBoySU/AzeyPcgXgWN1AMFtubfpeZwlqlI0KsWIfp3vjvYyJqyyk3Rq4gpCnpRlfj oCeUL5e+hmjcM75eE5NZBra62L/QvjPDtOz621NDX+KRqpJFPTa37zAeUkLQVvEUPqGNNejjxp X-Received: by 2002:a05:6000:2285:b0:439:ba69:101d with SMTP id ffacd0b85a97d-439da354ccbmr19755263f8f.1.1773071548697; Mon, 09 Mar 2026 08:52:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/49] hw/timer/hpet: Remove HPETState::hpet_offset_saved field Date: Mon, 9 Mar 2026 16:51:31 +0100 Message-ID: <20260309155219.62400-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071604278154100 The HPETState::hpet_offset_saved boolean was only set in the hw_compat_2_11[] array, via the 'hpet-offset-saved=3Dfalse' property. We removed all machines using that array, let's remove that property and all the code around it. Message-ID: <20250501230129.2596-6-philmd@linaro.org> [thuth: Adapted the rust part to the current master branch] Signed-off-by: Thomas Huth Reviewed-by: Zhao Liu Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260306093134.27789-1-thuth@redhat.com> --- hw/timer/hpet.c | 9 +-------- rust/hw/timer/hpet/src/device.rs | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 0d7b8e0c7a3..767093c431a 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -75,7 +75,6 @@ struct HPETState { QemuMutex lock; MemoryRegion iomem; uint64_t hpet_offset; - bool hpet_offset_saved; QemuSeqLock state_version; qemu_irq irqs[HPET_NUM_IRQ_ROUTES]; uint32_t flags; @@ -272,11 +271,6 @@ static int hpet_post_load(void *opaque, int version_id) t->cmp64 =3D hpet_calculate_cmp64(t, s->hpet_counter, t->cmp); t->last =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - NANOSECONDS_PE= R_SECOND; } - /* Recalculate the offset between the main counter and guest time */ - if (!s->hpet_offset_saved) { - s->hpet_offset =3D ticks_to_ns(s->hpet_counter) - - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - } =20 return 0; } @@ -285,7 +279,7 @@ static bool hpet_offset_needed(void *opaque) { HPETState *s =3D opaque; =20 - return hpet_enabled(s) && s->hpet_offset_saved; + return hpet_enabled(s); } =20 static bool hpet_rtc_irq_level_needed(void *opaque) @@ -766,7 +760,6 @@ static const Property hpet_device_properties[] =3D { DEFINE_PROP_UINT8("timers", HPETState, num_timers, HPET_MIN_TIMERS), DEFINE_PROP_BIT("msi", HPETState, flags, HPET_MSI_SUPPORT, false), DEFINE_PROP_UINT32(HPET_INTCAP, HPETState, intcap, 0), - DEFINE_PROP_BOOL("hpet-offset-saved", HPETState, hpet_offset_saved, tr= ue), }; =20 static void hpet_device_class_init(ObjectClass *klass, const void *data) diff --git a/rust/hw/timer/hpet/src/device.rs b/rust/hw/timer/hpet/src/devi= ce.rs index ebf715d3995..0a5c131819b 100644 --- a/rust/hw/timer/hpet/src/device.rs +++ b/rust/hw/timer/hpet/src/device.rs @@ -627,8 +627,6 @@ pub struct HPETState { flags: u32, =20 hpet_offset_migration: BqlCell, - #[property(rename =3D "hpet-offset-saved", default =3D true)] - hpet_offset_saved: bool, =20 irqs: [InterruptSource; HPET_NUM_IRQ_ROUTES], rtc_irq_level: BqlCell, @@ -947,11 +945,6 @@ fn post_load(&self, _version_id: u8) -> Result<(), mig= ration::Infallible> { tn_regs.last =3D CLOCK_VIRTUAL.get_ns() - NANOSECONDS_PER_SECO= ND; } =20 - // Recalculate the offset between the main counter and guest time - if !self.hpet_offset_saved { - self.hpet_offset_migration - .set(ticks_to_ns(regs.counter) - CLOCK_VIRTUAL.get_ns()); - } regs.hpet_offset =3D self.hpet_offset_migration.get(); =20 Ok(()) @@ -962,7 +955,7 @@ fn is_rtc_irq_level_needed(&self) -> bool { } =20 fn is_offset_needed(&self) -> bool { - self.regs.borrow().is_hpet_enabled() && self.hpet_offset_saved + self.regs.borrow().is_hpet_enabled() } =20 fn validate_num_timers(&self, _version_id: u8) -> bool { --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071593; cv=none; d=zohomail.com; s=zohoarc; b=V4Yd8L3IDAkRKO/F0hJ5DHpjpm3fMwlVE3PfdSTsxfGgR/J13Q3QtCDIB0XP++mbyn2/BZNXvi9oFfY2mDCvHoroIYm2WKcW5oFzk2sOEGyi1GtkGwtKZwLngNkWM/kG/FXG0oKBBbT1YnHw4mJLn1ZujE3ACrFhWsjfSZxryX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071593; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=dbkT8Ir/6ERT+BlEo9AWddD42Sjvd+yoa66xU1i+ei0=; b=KmkAivmRVnlbysz/khZPUd+yIwXnLx/E+UFJ/TFbEGo/GeoNlY2/yYm5kvq/85YI3ctsVOqFbg3JmtEcsTB8SR33V7s2L6PkLLZ4XJ7UxW4DyFWKxtqpBF0qb5zJ0s5C4z9y3PY8jLGIec6lg5KXHOYXfnLEc3OGrHIK0rpiWN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071593057772.3407512151463; Mon, 9 Mar 2026 08:53:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcuV-0003NH-MX; Mon, 09 Mar 2026 11:52:47 -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 1vzcuR-0003Ky-2B for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:43 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcuP-00087H-AS for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:42 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-482f454be5bso119541225e9.0 for ; Mon, 09 Mar 2026 08:52:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237e8095sm166780205e9.2.2026.03.09.08.52.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071556; x=1773676356; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dbkT8Ir/6ERT+BlEo9AWddD42Sjvd+yoa66xU1i+ei0=; b=ZSjoxE84tsxcMam+j5bOAXP8b28I/qeUvg/Be8av1Zo2drCbAs2/6+JpWopZHtXXSl O10L7LAq42WV2gSND3gSGBCv55YEIbnWiINgUmKJsJPIMuzh3j14D15jq53TMbno1vPw 9m+qC2PmwQ+WOT5b+TVHaQrp9xYDDMsOWXKrnPJlhW59J5PUWwgSZ+cNMjXOMcfT0ZX2 ekP/xzV7j/KKklcOCkPCg3KOcjoc6YovA/y/GACv6Ywo9c7XCNTL35b6hwDbpeVkpU0e budtsIaPb3uq4EzRqh5u2g+H1+MH71NS5mSa5cN5T3nCsY+SGEvex5OIBztpeSPhuouh ymZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071556; x=1773676356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dbkT8Ir/6ERT+BlEo9AWddD42Sjvd+yoa66xU1i+ei0=; b=wmfqFJLGstrZo5BIRkarYA23XJKhyTgNkz2LwNOc9lggCvD3SY5fJu0Y1cma7h2sQC nEApS1tLvBUX8N2FMi+I5UxezWefYYTevBNk5v7Q+kL8GS6ii5IXvapiuEAUVyV9Qz2m pECCr3u3ClfghV8vYntEcOB3tA6hk2onEk+DVNjT1b1Akd1T8+EYK+zHUZSkv/LIsVGg uukk18VwZlWNSn7pa2incO1gGG0MWyvh0uh4YmdHkt7G4R0w6JeTjyRPl0F7yahGmbbU ouSGcY/Voc79xkScgB0Wtji6CkWahD3UFnxY+XSxhdiffyHnsdxvKCz4InRgT1yEx2fo t3Zw== X-Gm-Message-State: AOJu0Yx8ayH/I8bG8rCn2JcxZcBV4V+wqUhLwWJAJmsTC0MEfaDvqm2b fq5ifngSF3JrpSGwXACZYN76JM7qj8MV5/WihJbZU39axT57reFI4Zs7CoyCAUgWH8+tIYEKmEs 1iNvXMPo= X-Gm-Gg: ATEYQzxzguKDIbHLH0YQRhG81OGFb2FA9OlfvNhfgnwuEMua5fxsH7iM3HWESeK98i8 tPh5P+EonXvFW7KNv0Ng+v/2k6DXliut6pNqFM+Vdelo6L6XmXQlz1nJEuJMX/dopLtbTQ2Zf/j TGKS46JY548KTROVqzQsZaFcYN0h6y02kXm1i3mllNdwzFFbEA13U53oLs0UmHNN3082CD5IYUH 8jYGupU1b7hnLcnv9nKugZ4ojyr8xodmJZw3r3SV9wbyKqaNz7f1ryiaG9X9BJ7P3NMQXqzO9s6 2aYt7OzUcF8C9uNL8MJKQQNh+ytUVXMKWv+hYvZwIAAX8SwfoKO6s76fZYTu64WKGR5IZKWa4T5 fifWhe3svVVMuVpo/RYbCxKVcC8XVRCcjfIx/OBL9kQh/6u2QzQcGz6KRuj+uR2BXzCz5GXSrlr UA8a2j4RzBW8HgHZ43Nl2lj2R3vAhwkDXrsVhjuZvImv/RGpSWbpIPMTzJLOZqJWo495K7LARh X-Received: by 2002:a05:600c:8b53:b0:485:3b33:f4b6 with SMTP id 5b1f17b1804b1-4854192dd55mr2123945e9.0.1773071555652; Mon, 09 Mar 2026 08:52:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/49] hw/i386/pc: Remove deprecated pc-q35/pc-i440fx/xenfv 3.1 machines Date: Mon, 9 Mar 2026 16:51:32 +0100 Message-ID: <20260309155219.62400-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071594152154100 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260309145013.44327-2-philmd@linaro.org> --- hw/i386/pc_piix.c | 25 ------------------------- hw/i386/pc_q35.c | 14 -------------- 2 files changed, 39 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 29c8e997131..2b94c472446 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -655,19 +655,6 @@ static void pc_i440fx_machine_4_0_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(4, 0); =20 -static void pc_i440fx_machine_3_1_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_i440fx_machine_4_0_options(m); - m->smbus_no_migration_support =3D true; - pcmc->pvh_enabled =3D false; - compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); - compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len); -} - -DEFINE_I440FX_MACHINE(3, 1); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { @@ -679,16 +666,4 @@ static void xenfv_machine_4_2_options(MachineClass *m) =20 DEFINE_PC_MACHINE(xenfv_4_2, "xenfv-4.2", pc_xen_hvm_init, xenfv_machine_4_2_options); - -static void xenfv_machine_3_1_options(MachineClass *m) -{ - pc_i440fx_machine_3_1_options(m); - m->desc =3D "Xen Fully-virtualized PC"; - m->alias =3D "xenfv"; - m->max_cpus =3D HVM_MAX_VCPUS; - m->default_machine_opts =3D "accel=3Dxen,suppress-vmdesc=3Don"; -} - -DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init, - xenfv_machine_3_1_options); #endif diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index f102da8e4a1..52b8064b4d2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -600,17 +600,3 @@ static void pc_q35_machine_4_0_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(4, 0); - -static void pc_q35_machine_3_1_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_q35_machine_4_0_options(m); - m->default_kernel_irqchip_split =3D false; - m->smbus_no_migration_support =3D true; - pcmc->pvh_enabled =3D false; - compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); - compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len); -} - -DEFINE_Q35_MACHINE(3, 1); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071595; cv=none; d=zohomail.com; s=zohoarc; b=PRqqeklZGcn6TYpi6vG6F3qqzC/wuenkd3Ea9En+XbWZmlWXEq47kXhGu75L8bbxr+ZtuD2WgSyGJOaijKqwVaXAs+ng+OgXaH6S1FB4XIC7DSghSs9P4RNYxmV7VfqxwKpP22e47aTvjF0V4wa5FAWS7Y77mi3cBNnGRW+JGpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071595; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=56kKgKQOzOqlPLqslOUBbDul2Zao5+wxBEi16b8zvOU=; b=Q7Fx75OBbAw9Z38VirCFosD7Vt+QktFZJkeJEkbEH2Mjg3r8pQT/Xv+ymfOrdmlruUpIgOJCfiH2Yke3V21tev3CIdKZGSip1i6qgNiiPNo2ZoDmxP0wYjh90PyookPF1iylGWkAGkIoc40ffdwb6rPpwdOpwBibmbuynYQwSnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071595117950.7440731138875; Mon, 9 Mar 2026 08:53:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcua-0003Pf-3Q; Mon, 09 Mar 2026 11:52:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcuU-0003N6-2U for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:47 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcuS-00088q-Fa for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:45 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4852b81c73aso20771575e9.3 for ; Mon, 09 Mar 2026 08:52:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aac28bsm580205e9.1.2026.03.09.08.52.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071562; x=1773676362; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=56kKgKQOzOqlPLqslOUBbDul2Zao5+wxBEi16b8zvOU=; b=A58nzerq/vLDD8vCmjGSpve07VnZ2LpJBrs1UejnUVgjTYwNaApb30Vb/BhRLWx+0c 0U5gEuOC+p4Po4I3zXdtIH6b3xSFE+9dmequMm0P+CZIAAgFS6OT108omOIwQolcupc5 XVhjHumoBkXd+W08auzMDoe/iMxOMio/bBr9C0gavs38jBHJEiZ15OpXFJqFw0xGQwZK N69kVLDCwPEheExBBgaa+ONorMNma5s+Rzt7n7wnUHiUYjZs55zdVC+4U+e1WOmLceQh ntB1vqgwxH47DzvoMC8kqWkhupqTsKezZTT0Meyv0ZxesBOTNYQRwqBC+69GaLBVJNWL Tong== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071562; x=1773676362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=56kKgKQOzOqlPLqslOUBbDul2Zao5+wxBEi16b8zvOU=; b=CVzjOBFHlUyWsyYP2kwnN01I3rODI5C/rPL5sNRUMvW0fVafaKcclPCaru4bMfU04H DhZCRpkdA0Sf4Nj48WX0YIfMdx+07gDENZ0DQQipTR3cxDw5C5av1h8OOVSLFDzmUPgO Ktn1Muvmebb10xTDSUfCNm8mvGTQYmYvQ6ngLkweQ5FhX6a432BttANVeM6l73TsX7yp nDAowN9rgRaSBiYH77KiXlIBOiQ22mOzqmp7s0DmUK0AHzsinwBxkAjrKIflXU5/6+yu 4EIHgSai8AFhdaZ/1e5oFQeDpF4kS2bav0iikGTKIzxULgfrB70+eGTZwUZslhdBze0D N1AA== X-Gm-Message-State: AOJu0Ywrs86QhYAlPzDjbA5esojO7tHpfHFp8SDzWB9lDceeyJxxsv/4 X8/DjkdAeiASKB3R8mwbiK5iGaXNGvZmu36/DSR+Z8nK++V5iZ7O7o1uXHzofdceX22k0a2GUhj sh/5mA1k= X-Gm-Gg: ATEYQzwMdoeQGlsFxtghR4b+035x+Db9tDMn8/nF7ooKkWpTIXJgTAQypEkfC0PvBxI X+Ijrd/XDydNTwdhQDbLn8yCYufhhDvv3guEphKgiNIUbsGkz8jUpL3+wdOzVQamEqDmFdkxj1W ymdYDARGCxTctlwkO7lNkP1o1OAp+8o+bv8pHJUpqvZ+eKGoUG08jB4H4p9FeY0FOpK+0fv2eTE ILpE0QLsV5k5P71/8m6SkvILxQtensUW9/AyJiGe0vVFFIZvXHmyICvv86T3L5V70ZWKF9654js r0Bw/43p/pKaSnJgEnVnPAzwFHg3FuUR/4Uj2zI8zYFnXszp+WcwzGv/Vm3LIb9E9GL3wcv3jpc YVXrYdeHBXi2mm298uSSqrQG0lf57uaEESBSACenTjO3CaUiZyPCE9WjQCgTbLsYijpLqhX5hMN /ZjnsfUmsPh4cYHcUUffkvpD/cnEyAN194jYXRa2oAhF/WQE9Bjw7E/yT06tByrwzqyf+v58dX X-Received: by 2002:a05:600c:6092:b0:485:4006:962d with SMTP id 5b1f17b1804b1-48540069889mr26195635e9.20.1773071562314; Mon, 09 Mar 2026 08:52:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/49] hw/i386/pc: Remove PCMachineClass::pvh_enabled field Date: Mon, 9 Mar 2026 16:51:33 +0100 Message-ID: <20260309155219.62400-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071596263154100 The PCMachineClass::pvh_enabled boolean was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-3-philmd@linaro.org> --- include/hw/i386/pc.h | 3 --- hw/i386/nitro_enclave.c | 2 +- hw/i386/pc.c | 6 ++---- hw/i386/x86-common.c | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5623660f5dd..908de5e1eab 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -110,9 +110,6 @@ struct PCMachineClass { bool enforce_amd_1tb_hole; bool isa_bios_alias; =20 - /* use PVH to load kernels that support this feature */ - bool pvh_enabled; - /* create kvmclock device even when KVM PV features are not exposed */ bool kvmclock_create_always; =20 diff --git a/hw/i386/nitro_enclave.c b/hw/i386/nitro_enclave.c index 640b1d8c548..4cd18166ff6 100644 --- a/hw/i386/nitro_enclave.c +++ b/hw/i386/nitro_enclave.c @@ -164,7 +164,7 @@ static void nitro_enclave_machine_initfn(Object *obj) } =20 static void x86_load_eif(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, bool pvh_enabled) + int acpi_data_size) { Error *err =3D NULL; char *eif_kernel, *eif_initrd, *eif_cmdline; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 052226baa57..3fc2f0a057e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -588,7 +588,6 @@ void xen_load_linux(PCMachineState *pcms) { int i; FWCfgState *fw_cfg; - PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms =3D X86_MACHINE(pcms); =20 assert(MACHINE(pcms)->kernel_filename !=3D NULL); @@ -598,7 +597,7 @@ void xen_load_linux(PCMachineState *pcms) fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus); rom_set_fw(fw_cfg); =20 - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || @@ -932,7 +931,7 @@ void pc_memory_init(PCMachineState *pcms, } =20 if (linux_boot) { - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); } =20 for (i =3D 0; i < nb_option_roms; i++) { @@ -1673,7 +1672,6 @@ static void pc_machine_class_init(ObjectClass *oc, co= nst void *data) pcmc->has_reserved_memory =3D true; pcmc->enforce_amd_1tb_hole =3D true; pcmc->isa_bios_alias =3D true; - pcmc->pvh_enabled =3D true; pcmc->kvmclock_create_always =3D true; x86mc->apic_xrupt_override =3D true; assert(!mc->get_hotplug_handler); diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index a420112666a..db8d4e855f4 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -704,8 +704,7 @@ void x86_load_linux(X86MachineState *x86ms, * saving the PVH entry point used by the x86/HVM direct boot ABI. * If load_elfboot() is successful, populate the fw_cfg info. */ - if (pvh_enabled && - load_elfboot(kernel_filename, kernel_size, + if (load_elfboot(kernel_filename, kernel_size, header, pvh_start_addr, fw_cfg)) { fclose(f); =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071595; cv=none; d=zohomail.com; s=zohoarc; b=EoUVnendZmpjAdx4w3Kgypl/m/VLt6vjW85JNOHJTSsz/f+zXav3wqEXjpbugS0RGbNZUAOFsJG7ZC2vGO5NA5J6J+eTRxw24aRf3+jLJnXMQrHokY9tter/hoGYnk5BcFNrOWjcppmF5TYOVM4B8jV1d7hUKT9GfaXX8ZHL4yQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071595; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=jhTtmUG2GdnqCp2iN5JX67owbOh0LsPxSVz/8hOXpME=; b=OY4VYzo9WcYlqZM/ybAN0vdHTklVCGYFcfwtXnLtVbm6FAW5WIriAWGqjGB2mV09KWC2Tq3znshlDopPeDtXbVo8786a6WAo0rkrUr/7Hcr5Vyr8hlIerlJNeFuWC7TtaRJMsAaWG8z+qcy1K/8rdCutA6oe0N/WpshrfYLTvVA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071595219445.45648670698085; Mon, 9 Mar 2026 08:53:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcup-0003bb-9R; Mon, 09 Mar 2026 11:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcud-0003R4-7O for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:56 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcub-00089Q-H3 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:52:54 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4853510b4f3so22726975e9.0 for ; Mon, 09 Mar 2026 08:52:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a7f1f5sm1579825e9.4.2026.03.09.08.52.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071569; x=1773676369; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jhTtmUG2GdnqCp2iN5JX67owbOh0LsPxSVz/8hOXpME=; b=Nu3Wn1pLLOoDaqZVHDlvGKmK/Eqy/Oj4ceGVD+CNYRe6mx5su0xXxvKd/K8B2SsI3v cI5dOTykvIlY7NRKFIreiD2SWrIvl9JdYmF2QTHTbgz44aXlgi0YQa1SHs+3RrAStSTg OWERLY2hu5YVUcsx+PnvcBlrBit233lDwDp9dTSxZ48oi/OV+L1C0IFg3IcjDvRcNG8b P209ksqJjxnE9Y6+VLIxKBTAHp051X6QwEPrIZQNmS8DKS+jUhlBd27QfzVJVuLWyWDh GTKika+X4ZRVMq7ukD2aM4qmUjq38WqPJOL9uVAmkjPbxUdeqRawDKeQcy7SzGUDY0md sicA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071569; x=1773676369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=jhTtmUG2GdnqCp2iN5JX67owbOh0LsPxSVz/8hOXpME=; b=mgnOB2Sbdn3MgS8nTFD336up7pjf9NR0UcCVpPPMlsHZ9g15rHb8EBG7nT80cArtT/ dgP+nL01mS+jXgPQQ4Ja7uE+FCZjOKfqh1hd8UemJsuOnK1sxNiNcDBlELSb9mPf9xld QEvvC5hRNEqRjNR3Koc83F3JLDORhtzy3q89fDqg1Uk9z8PPJg69Qfc5OGYexUETdUm9 kM11HLunasJ8gWm/6QNvx/0WFO7/RpkiYqc9cdpwDjSDRtvEfDRZLAEAbsSVCA+ZGA23 Cn9bo4u70hzPiJf+JkuAKFElWXc6y4QW23mfa4g4vpcC4oFfUfCNiCe+OAsPFBHJKs/W cOqw== X-Gm-Message-State: AOJu0YwnlGSzb681QPeC9YDlPg0z7Rie8sb6OgN9meM8RQcllxteACBv bzetWx/DlfGK0iTRzdd9lOvmr6G27kIxnjbjMn434r/ScrKfJXuzw5jJibTwZAsZz6rfq3wMK7i t4oImGbM= X-Gm-Gg: ATEYQzxNjKMZbvoFNXxFFjni1rNBORnwOgu3iK2Ho9GAxAeETB2hHKiCad5P8oP8jcN EBA66Ll+vkVdOpPBuqwbLyrp8Nvzq6p+YFC4Us9X9MqBeA2sndBk8FmivMSCc8uLXuj6zXQri+Q FYTgzDhLIlTG28NhdtGuB0OMP7c2gzI9w4GzaVr0XMmlbgbigk5uS0YQq6xS/4oqzVng6bbueLJ Hbcx++5zsg5Q0ROLi26ZnxYiWRdrpyvzUxxqihx1u8qJB0PGUwUGeNE0nURtikvhIxbTrzHuEV/ xgnvxYUpW+Y42xL6B8RCDcPOu34bk+w6VS42whzmOpchbfGz5dO94vc1/4pTWNpVURD0Ytb+WLP LLnnngA17dVaKm+zoPd/gDKzCdJUq3PZXgSSngSBXYsotH90UnhoVIZSAV6muFm8pckr+BUVZoF QxXaNddsXMEVYE3HH5kVbL8Y5HYQv0o7wf/6swaJ7SV2l2yK/AH9EpSSUFYHLY0Slf6b4PYr+N X-Received: by 2002:a05:600c:3b82:b0:485:3bb0:194 with SMTP id 5b1f17b1804b1-4853bb00605mr58481855e9.35.1773071568940; Mon, 09 Mar 2026 08:52:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/49] hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux() Date: Mon, 9 Mar 2026 16:51:34 +0100 Message-ID: <20260309155219.62400-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071596196154100 x86_load_linux()'s @pvh_enabled is now always %true: remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-4-philmd@linaro.org> --- include/hw/i386/microvm.h | 2 +- include/hw/i386/x86.h | 3 +-- hw/i386/microvm.c | 2 +- hw/i386/nitro_enclave.c | 2 +- hw/i386/pc.c | 4 ++-- hw/i386/x86-common.c | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index 6b9a5065272..184b7a8c094 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -79,7 +79,7 @@ struct MicrovmMachineClass { HotplugHandler *(*orig_hotplug_handler)(MachineState *machine, DeviceState *dev); void (*x86_load_linux)(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, bool pvh_enabled); + int acpi_data_size); }; =20 struct MicrovmMachineState { diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index a85a5600ce9..71fe6b5e122 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -129,8 +129,7 @@ void x86_bios_rom_reload(X86MachineState *x86ms); =20 void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, - bool pvh_enabled); + int acpi_data_size); =20 bool x86_machine_is_smm_enabled(const X86MachineState *x86ms); bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 7ff20512636..5a7889f21b8 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -330,7 +330,7 @@ static void microvm_memory_init(MicrovmMachineState *mm= s) rom_set_fw(fw_cfg); =20 if (machine->kernel_filename !=3D NULL) { - mmc->x86_load_linux(x86ms, fw_cfg, 0, true); + mmc->x86_load_linux(x86ms, fw_cfg, 0); } =20 if (mms->option_roms) { diff --git a/hw/i386/nitro_enclave.c b/hw/i386/nitro_enclave.c index 4cd18166ff6..a29f0044d0e 100644 --- a/hw/i386/nitro_enclave.c +++ b/hw/i386/nitro_enclave.c @@ -199,7 +199,7 @@ static void x86_load_eif(X86MachineState *x86ms, FWCfgS= tate *fw_cfg, machine->kernel_cmdline =3D eif_cmdline; } =20 - x86_load_linux(x86ms, fw_cfg, 0, true); + x86_load_linux(x86ms, fw_cfg, 0); =20 unlink(machine->kernel_filename); unlink(machine->initrd_filename); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3fc2f0a057e..00581dd8b44 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -597,7 +597,7 @@ void xen_load_linux(PCMachineState *pcms) fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus); rom_set_fw(fw_cfg); =20 - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA); for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || @@ -931,7 +931,7 @@ void pc_memory_init(PCMachineState *pcms, } =20 if (linux_boot) { - x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true); + x86_load_linux(x86ms, fw_cfg, PC_FW_DATA); } =20 for (i =3D 0; i < nb_option_roms; i++) { diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index db8d4e855f4..fde05fa7d7b 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -642,8 +642,7 @@ static bool load_elfboot(const char *kernel_filename, =20 void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, - int acpi_data_size, - bool pvh_enabled) + int acpi_data_size) { uint16_t protocol; int setup_size, kernel_size, cmdline_size; --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071605; cv=none; d=zohomail.com; s=zohoarc; b=csQVMayJ3t6APvzT4m6CN8QVTsv1ppCi2jj+I5M1Pkaajkks9NKt0252rKjgOflh2u6eccPtoobB00FgyLC9PRRX/CqovVzxeKDp++Go2XPySDRP9rxQPLJ3hV/D8PwYd/WXD+yWqxCNRRIt4Rbk3WlluxlXG9JX6/qAuuyymhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071605; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=UjlYj7EvBnMKHImEQ8XvxuaNoxFu0RUHBwONjSEDr6Y=; b=kVf8OtVirU+Q+PIJRrUksuYG0b7FYhsKLeNX4yYeGdyAQcqiCFz85bkz02FuF30ASh2hs8Hc36qaDS/qDxaYSIE7ow7YQCm0cVmnFTYzP/gl+krs86w9Rbe0bZ+624L7LcKgCBKFFCF++XDnwPpaGf9czVBNv0QFjFcltPVSDwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071605112104.17643252280175; Mon, 9 Mar 2026 08:53:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcus-0003lO-CN; Mon, 09 Mar 2026 11:53: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 1vzcuj-0003XY-6Q for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:02 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcug-0008AE-Um for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:00 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48534237460so18198695e9.3 for ; Mon, 09 Mar 2026 08:52:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485419c2930sm2739455e9.0.2026.03.09.08.52.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071576; x=1773676376; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UjlYj7EvBnMKHImEQ8XvxuaNoxFu0RUHBwONjSEDr6Y=; b=WURiTKvcRwwzHW+kRYmrHgJ6Wcqhsozd5mMYeRNk8eu2B3ptH50bfD6B4ho97EOdh0 wk34Etsb1DS0zQcyHP4Tnha2Grizxu6hB6Nh0MZvwwmH/VW7KuKv2uEPyIJSuFbuJdgg 5QRwuIQKeeQBXrYmxdZAET/Gh0HzAZ9H24lsirMrwiLlSazTMSzpxRdXLtQKUAZDstIh jcMQrlMT3c9kGfgY2sUli5uurnJgfO/WneDgTcPK6V2d9ByhqO5jVQcg0hecW4a1CIuj WwgD/mviA2nIhA5D1/mIdfbluuMDX+Q0UpCehEeO8NWa8OgVNvi6kgySq+yMF/4/8549 Ca6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071576; x=1773676376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UjlYj7EvBnMKHImEQ8XvxuaNoxFu0RUHBwONjSEDr6Y=; b=HmKFQP5p9T7fNv6vb/TQPQ79qpec+unSwJ04/wM4k3BFoqSk/T8ioSLM5GNHaHW7OF hPINoWufCGS5ChTfq4xEadgy3dLukZkL3xpBXxMqzN+NHJob1qpdeZD1BE6y4IUbvC6k q0RZqeEz3+wBXUGi1hxeolOfPHAk91k1841O+nTW1qVIo31ZO/MswGUSehKnMaUYyPNH Ku8ITb02Ijji+/m6MQhE+cFB7EYwNblZ5iuQ8UwCopDE7urEtgK2ANGE8QVvJR+93/5j Az426vpseY9l6Ylqc+1XCRFDsTq+SaZgVBqt/L4rPJSgdWGTUtRWCLxScD9W+cYw1qqp AEaQ== X-Gm-Message-State: AOJu0Yx0qVsrsVMwwanN1o1Y4mqBEofF8hzIuZgAhudKK7X7/MbdA17A iWwAMelF80VCViC71JDpp5+JHZciETb3eTA6gOxN68wisDfgE+Rsudx8YkZrjB6M4bQK/yNXT46 AgSw3Clg= X-Gm-Gg: ATEYQzw5dzpP+zmGdgSz9qKQRqKihWgKcdLjvxdY83kHu8HvcW9xULtqj+1+0q2O1Gl ffTfcyfn10xZ6JhPIXwwNazi/red6uqkFwmEeX9cNHpSq06ugDdBP+GlYgfbBESHl301nzlfl6I 6cmrDRtQuDBUxce3mzhQYYcPcprDKAIiKje3Z9KtoYoghL0Kd15rMAmh4dwt/BY7e3cu5+J5H0L 0p0spMz3NO9APxJy3dSDjkWMhmpcFKsV4QWpllvboTESMDk6dDwkzeiBy3rHl8PLZN5OBtRR5D6 pR+oJxwV4BgdkiFqcd1vzaxb+wkhtAZwAonknrIIKRvbS0Ynjbz8H5GhrMauBYzv04h0p+ua2ih bP22RiV2MTLuaqk9t/JErj1aP3f7i1yaaEq/ev/3MIqK1KnvpuW/MXY9d9xGyqKYi01ulPSzW1S eKbU873PvVcEDtQWXZp/bW8MHoRnX45yN98cUuTCc0uWai6ysMVkNFCN6xn1mEc0xJT7ENnZ9y X-Received: by 2002:a05:600c:310f:b0:485:390d:74f8 with SMTP id 5b1f17b1804b1-485390d7719mr77360355e9.25.1773071575711; Mon, 09 Mar 2026 08:52:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/49] hw/core/boards: Remove MachineClass::smbus_no_migration_support field Date: Mon, 9 Mar 2026 16:51:35 +0100 Message-ID: <20260309155219.62400-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071606323154100 The MachineClass::smbus_no_migration_support boolean was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it, along with pm_smbus_vmstate_needed(). Use the unconditional VMSTATE_BOOL() and VMSTATE_STRUCT() macros. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Acked-by: Corey Minyard Message-Id: <20260307152635.83893-5-philmd@linaro.org> --- include/hw/core/boards.h | 1 - include/hw/i2c/pm_smbus.h | 7 ------- hw/acpi/piix4.c | 8 +------- hw/i2c/pm_smbus.c | 7 ------- hw/i2c/smbus_eeprom.c | 4 +--- hw/i2c/smbus_ich9.c | 10 ++-------- 6 files changed, 4 insertions(+), 33 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 9ad2a7d5c97..e15dbcea83b 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -314,7 +314,6 @@ struct MachineClass { bool auto_enable_numa_with_memhp; bool auto_enable_numa_with_memdev; bool ignore_boot_device_suffixes; - bool smbus_no_migration_support; bool nvdimm_supported; bool numa_mem_supported; bool auto_enable_numa; diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index dafe0df4f69..62bbd45e803 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -44,13 +44,6 @@ typedef struct PMSMBus { =20 void pm_smbus_init(DeviceState *parent, PMSMBus *smb, bool force_aux_blk); =20 -/* - * For backwards compatibility on migration, older versions don't have - * working migration for pm_smbus, this lets us ignore the migrations - * for older machine versions. - */ -bool pm_smbus_vmstate_needed(void); - extern const VMStateDescription pmsmb_vmstate; =20 #endif /* PM_SMBUS_H */ diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 138ac3d3940..43860d12278 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -205,11 +205,6 @@ static const VMStateDescription vmstate_cpuhp_state = =3D { } }; =20 -static bool piix4_vmstate_need_smbus(void *opaque, int version_id) -{ - return pm_smbus_vmstate_needed(); -} - /* * This is a fudge to turn off the acpi_index field, * whose test was always broken on piix4 with 6.2 and older machine types. @@ -238,8 +233,7 @@ static const VMStateDescription vmstate_acpi =3D { VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), VMSTATE_UINT16(ar.pm1.cnt.cnt, PIIX4PMState), VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState), - VMSTATE_STRUCT_TEST(smb, PIIX4PMState, piix4_vmstate_need_smbus, 3, - pmsmb_vmstate, PMSMBus), + VMSTATE_STRUCT(smb, PIIX4PMState, 3, pmsmb_vmstate, PMSMBus), VMSTATE_TIMER_PTR(ar.tmr.timer, PIIX4PMState), VMSTATE_INT64(ar.tmr.overflow_time, PIIX4PMState), VMSTATE_STRUCT(ar.gpe, PIIX4PMState, 2, vmstate_gpe, ACPIGPE), diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index ead53d2724d..5654d516382 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -443,13 +443,6 @@ static const MemoryRegionOps pm_smbus_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -bool pm_smbus_vmstate_needed(void) -{ - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); - - return !mc->smbus_no_migration_support; -} - const VMStateDescription pmsmb_vmstate =3D { .name =3D "pmsmb", .version_id =3D 1, diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index d9ac556a0ab..693d4762205 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -88,11 +88,9 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t *= buf, uint8_t len) =20 static bool smbus_eeprom_vmstate_needed(void *opaque) { - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); SMBusEEPROMDevice *eeprom =3D opaque; =20 - return (eeprom->accessed || smbus_vmstate_needed(&eeprom->smbusdev)) && - !mc->smbus_no_migration_support; + return eeprom->accessed || smbus_vmstate_needed(&eeprom->smbusdev); } =20 static const VMStateDescription vmstate_smbus_eeprom =3D { diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 956c9b59bbc..51513e73fde 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -41,20 +41,14 @@ struct ICH9SMBState { PMSMBus smb; }; =20 -static bool ich9_vmstate_need_smbus(void *opaque, int version_id) -{ - return pm_smbus_vmstate_needed(); -} - static const VMStateDescription vmstate_ich9_smbus =3D { .name =3D "ich9_smb", .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, ICH9SMBState), - VMSTATE_BOOL_TEST(irq_enabled, ICH9SMBState, ich9_vmstate_need_smb= us), - VMSTATE_STRUCT_TEST(smb, ICH9SMBState, ich9_vmstate_need_smbus, 1, - pmsmb_vmstate, PMSMBus), + VMSTATE_BOOL(irq_enabled, ICH9SMBState), + VMSTATE_STRUCT(smb, ICH9SMBState, 1, pmsmb_vmstate, PMSMBus), VMSTATE_END_OF_LIST() } }; --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071609; cv=none; d=zohomail.com; s=zohoarc; b=RRJJmcFRPZ0zN6S3rVNu4MilX1ikZKYsnu0dDaXq7+xbFM/PPrF7ijsIll7ghjtu6Ulli1sfzKOOopPWHuKPVEdoKb7Xfpxp2dLInwfPdu+OiP2VgVlstUm/3ulGebRQvRwbJm2aVSnM9lHr2uisQtSEfWnNywmFXHLyGodLzo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071609; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=1Uao/CKWcfJ+UFrA+3AmPlD8nKqx8My4/8hpgD51tDU=; b=Nrew2UontldCQZxyBtPvhAr3q6e6OvyXMmgjQJT7ziFZgyT00MD7wufbODmIY1TnX9rmPxOhK7XgE3YdkorYGrO3OmAbOd0U67OZppl2m5Vj4BtU2+0B2gg9+sIDtQN1PL2OrU/1QgJxocscVThsMWuBPrgH7HGmzjV/WBluWC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071609216857.6056619348434; Mon, 9 Mar 2026 08:53:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcut-0003so-7l; Mon, 09 Mar 2026 11:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcuo-0003fI-QN for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:07 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcun-0008Aj-7j for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:06 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48534237460so18200765e9.3 for ; Mon, 09 Mar 2026 08:53:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853a59fc36sm195786325e9.9.2026.03.09.08.53.01 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071582; x=1773676382; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1Uao/CKWcfJ+UFrA+3AmPlD8nKqx8My4/8hpgD51tDU=; b=eRDOXr1SP3uMSoDwnvKAo2Lp2lQQVqE0Zz+1bp3YD1pXwUEN1PFpPANZ7804giyam6 RRGo3tlRKZa1BIFOyNOeP6UL1yla0ocPVyz0cgMUbFXwXk+YrFOcPHfWqCdRWKnhA+Ku fAgrqeQgrppesfn/0e/RHpYAtmJUHoLA1ce3QglUKHYEjgP8zDtRSL/mUYR+FzQBuYVv sIAPJ/w01FMnLL0KGf5crQt1V0IfBmUo4bFJW15fyxSkAD1pi/IPVI12B4UG7FlEO5Vw BfpIdoUkhfqjFqV3tFnPs11shdCD6+lOzf+253XUTj7mQYej5qdMpO8dZad9er3zkk2i UhhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071582; x=1773676382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=1Uao/CKWcfJ+UFrA+3AmPlD8nKqx8My4/8hpgD51tDU=; b=riPL10ze7zKW5WLpgIzJKGs5M3LThRnSGoKRTRXZRS8lIczkSi7noSpx3i/RA8aX5h QIAbunf/z9pJ3KPHR4tY/lunDXyYB16xGwxTbl+n389zribzf841AWhuT0mTJ05UhNZ9 ryd+6iwVmeLgODHGkFh5ajclsWiR0eWF45DRZIWP/dlubW/C6wf+9GC8KErPRttvaNs8 kWjtiqnQLO7IgjBvfb2Uge3muPFKDtF3RaixVNZo/sHRPchgLUzvsb/k2tfnyIUQGUDZ Pqs4ZYLWVlWUi0mglKeCYa9XvNnht/7wDdGWdBoIDDhyd+ubc76wZ5ZJF6B2NERDRv8W 0KYg== X-Gm-Message-State: AOJu0YzG632hRQPAEgcB+Bwyd2oeUddHG9AgLZOiW/GOwnMfalvVQb9R YKjMpqFO+vod0ZIDGUFL5NAP03a88TxHal5jymJlYZk3yzeTXH5648nw29hHqa7FDA3t0l2mvt0 sC8ryJjw= X-Gm-Gg: ATEYQzyBrLAk6aYalbs467wuR9/K9HJUJuG7k1N9mdo821ZJjjOvpHf7Uy8i40eCjme NOm3erYUa107Q+iye9hBolRSDlf9jaYjmjw6rZ/cvBj4tRkIoReL1L4N0lZP+RufFt0mr7E83VN +GyzjjsgotuNN2LaiYwCbK6MU1H4rhosg5MsdNJY0oMSJL6mLEBbsBOsAbhxXEEZGWbXNBb0fOV 5pEuGDBpGZkO1KbCpYwM64CfN6vU8DloqEsLqWKNLHNwBN+p/xQ5LZrhPa3CYpKXsfzY25UwV7h HwoIJAGxLfpoDnvcKiAJFilrKGIT8ABynQ7IEKXfNt/CoU5U7K/boZaCC69yJt4xEbuyG4RAVyZ LFboPqXpqAwF5PefGemLDsOVrBg8SqUSqcNMEjfQjTPAJDF8KmEsWt5O3kB0dZlufxQbWegeJRQ 1+gnu05bJoPJaVGbp+3myc774PdG/oHe7z4Itlkyg+COgj1JtpR2+HQA96YELmFKwGtdJnTWDs X-Received: by 2002:a05:600c:3b17:b0:483:7903:c3b1 with SMTP id 5b1f17b1804b1-4852695aeb9mr186807515e9.20.1773071582512; Mon, 09 Mar 2026 08:53:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/49] hw/i386/pc: Remove pc_compat_3_1[] array Date: Mon, 9 Mar 2026 16:51:36 +0100 Message-ID: <20260309155219.62400-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071610326154100 The pc_compat_3_1[] array was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-6-philmd@linaro.org> --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 25 ------------------------- 2 files changed, 28 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 908de5e1eab..4e1dd436ab7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -271,9 +271,6 @@ extern const size_t pc_compat_4_1_len; extern GlobalProperty pc_compat_4_0[]; extern const size_t pc_compat_4_0_len; =20 -extern GlobalProperty pc_compat_3_1[]; -extern const size_t pc_compat_3_1_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 00581dd8b44..f33e3f72656 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -180,31 +180,6 @@ const size_t pc_compat_4_1_len =3D G_N_ELEMENTS(pc_com= pat_4_1); GlobalProperty pc_compat_4_0[] =3D {}; const size_t pc_compat_4_0_len =3D G_N_ELEMENTS(pc_compat_4_0); =20 -GlobalProperty pc_compat_3_1[] =3D { - { "intel-iommu", "dma-drain", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "EPYC" "-" TYPE_X86_CPU, "npt", "off" }, - { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" }, - { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" }, - { "Skylake-Client" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Skylake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Cascadelake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Icelake-Client" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Icelake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, - { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" }, - { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" }, -}; -const size_t pc_compat_3_1_len =3D G_N_ELEMENTS(pc_compat_3_1); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071617; cv=none; d=zohomail.com; s=zohoarc; b=gzXgWelw5vZ888/m9bKPMFDo5qWIpTIDUz6ozKdIzZcV6KnGRR/rAzGtLq4qckPUHywqjkBSQuquHhCrgRGf/oywz5qAOKzG10xfknsnJQ/XcKwjCmgscvhz3sG0vohgsytqpB7lk0XTLgAvO12q/zTRegbNs1G/gnvgfGI+D3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071617; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=3AcIpsO3Z8lXw3c5iZUqwV5IA07HcbVKYRak/NRH6Uw=; b=RLdz/uzJ6xbCqRVDXcNWEM+VbfnnVvI9JBcTpkoyyVoNJxJiDFSv86bxhczKhtunKnaKI3k/DPPmk+nXwaH5yqmtHurlbtXzEs7pbtfd5yk7cMfLUb0tGRZ/QKndJ/8xrPiSjcgbK2XImWhXZcO80x+YYE2E+ec6ak7Fa342MMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071617951803.5915742681963; Mon, 9 Mar 2026 08:53:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcuy-0004Es-6d; Mon, 09 Mar 2026 11:53:16 -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 1vzcux-00047x-A0 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:15 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcut-0008Be-4C for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-439b6d9c981so5666290f8f.1 for ; Mon, 09 Mar 2026 08:53:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae46353sm31745284f8f.33.2026.03.09.08.53.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071589; x=1773676389; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3AcIpsO3Z8lXw3c5iZUqwV5IA07HcbVKYRak/NRH6Uw=; b=jn75L3/ebE2r90VKHhcEyp9HdSEYqgLffOvxip13lyJoob1W2g2PiLUKgIf9d5WBHF HWWYjF9MRtViE0qjhpdcS0q1kzQvoboMvSszjDfHAMeOXapDoZjL/HuEb96HLGET+TJT UqsVAEGRckptTfiQVNHCbEleb53XzbBbx8ixhVLHTN6VWF67DfLQ4RGFWKH0CSkY8S5g /3LKxNnT2T3sOvOrWjCg/PBt6CiAmtaY89bmk+mbot9COrc6fUFSCU0rdOkmVMVF3W1/ nacLu/r3ha4youM7GXrPJzvEOWXWfj3xP2dMGaR/nH+6iBizP3iLSwEY/wS1yfeAqdqK Q0WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071589; x=1773676389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3AcIpsO3Z8lXw3c5iZUqwV5IA07HcbVKYRak/NRH6Uw=; b=viQquhd6/kzAnGv60x75mjl38JKJO+4GHNdifpCMs/9pPtjnuW9L0Eutxphuo7CFZd srqDFyJdUcYk6KUQ1k/Wc3oUyAEreDZuAOcOz3n+TxFRem6NJkEdAox0MT0mToiQYGnz XyJVzYdYp1gD3x3iXrKdfcOkRP8ay8nUF1/BCBjxTne1ap3fM4gL2R9csvriEkro2IpY 4Rdyohkx+jY5Jv7yPrLk0EsxjnWbM+e7NOiLhAX0X+ROOvJJnQcPLC6z4rH3cBZJqZT8 o+uFXuEgAa/s4MlEexfoImR+C4XYpdwh4NULpxUkqq7UpJSi6QXLPRjHpLb06XvA/fMN NFOA== X-Gm-Message-State: AOJu0YwQuFOpWDXtSugbdhLI3TD20hJoDjYkmwvZo8kiTZn7Hdq3BKzz 5zUBPaT3vHkB3KpLUQ0jtxa26TZlXICykQpbGZZpPWlNPbtMB75FBDFjir6kJ6+oSP7v086rzM2 YQ26xKcI= X-Gm-Gg: ATEYQzwH2HGLTVEKAy6qb3s3yKuzvY/ekuK8udrWb7ItUxMsskZiSXnDIU9dKQePA3o /4oKpcxOW328T8Nqbpp3/N+CV7rp5omU+qXe5UaXKWomTkY9/rK0VYcc0lo6jurYLA4XQqzvSvJ 7DyTpNx16cnD42ZCaA7dXYIn5raik4RJ5j8aik7MEmDqeZlIeX/zk9OXajtBcdc1K76Fm3fhcls 93rqaTbxBVmmgXbuqG7jN2d0Fr0/5JlkWq4VGU/6Cgdc6G4BOylS8Ab8G/a0MbAIEsZvtdsxpSo +AGQdEkCroOhEvTbkrL4iosfld5XbB42plLNZ8DqCBDjK5rNye06/AZx2xhQGQNE1f/MTkJIdIP ZW+puTFs72bsfqLgj5AY9LfV7GXiSodq6KCCzqQ4pEMTM1TumFwGDts/7uyRUqwlPZp4SZw4k+p MEUrEw+SP+I8vn+9KdeViEi/0CDQtmbNqREAmpF7tNb/cmoRDG4rU6INVRGpXIDZ9lS91ZP9PO X-Received: by 2002:a05:6000:1789:b0:439:cd10:192a with SMTP id ffacd0b85a97d-439eff50330mr173977f8f.26.1773071589091; Mon, 09 Mar 2026 08:53:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/49] hw/i386/iommu: Remove IntelIOMMUState::dma_drain field Date: Mon, 9 Mar 2026 16:51:37 +0100 Message-ID: <20260309155219.62400-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071620179158500 The IntelIOMMUState::dma_drain boolean was only set in the pc_compat_3_1[] array, via the 'dma-drain=3Doff' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-7-philmd@linaro.org> --- include/hw/i386/intel_iommu.h | 1 - hw/i386/intel_iommu.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 54c2b6b77a0..e44ce318417 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -314,7 +314,6 @@ struct IntelIOMMUState { bool intr_eime; /* Extended interrupt mode enabled */ OnOffAuto intr_eim; /* Toggle for EIM cabability */ uint8_t aw_bits; /* Host/IOVA address width (in bits) */ - bool dma_drain; /* Whether DMA r/w draining enabled */ bool pasid; /* Whether to support PASID */ bool fs1gp; /* First Stage 1-GByte Page Support */ =20 diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index d24ba989bfc..f395fa248c0 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -4205,7 +4205,6 @@ static const Property vtd_properties[] =3D { DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, fals= e), DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false), DEFINE_PROP_BOOL("svm", IntelIOMMUState, svm, false), - DEFINE_PROP_BOOL("dma-drain", IntelIOMMUState, dma_drain, true), DEFINE_PROP_BOOL("stale-tm", IntelIOMMUState, stale_tm, false), DEFINE_PROP_BOOL("fs1gp", IntelIOMMUState, fs1gp, true), }; @@ -5000,11 +4999,8 @@ static void vtd_cap_init(IntelIOMMUState *s) X86IOMMUState *x86_iommu =3D X86_IOMMU_DEVICE(s); =20 s->cap =3D VTD_CAP_FRO | VTD_CAP_NFR | VTD_CAP_ND | VTD_ECAP_PT | - VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SSLPS | + VTD_CAP_MAMV | VTD_CAP_PSI | VTD_CAP_SSLPS | VTD_CAP_DRAIN | VTD_CAP_ESRTPS | VTD_CAP_MGAW(s->aw_bits); - if (s->dma_drain) { - s->cap |=3D VTD_CAP_DRAIN; - } if (x86_iommu->dma_translation) { if (s->aw_bits >=3D VTD_HOST_AW_39BIT) { s->cap |=3D VTD_CAP_SAGAW_39bit; @@ -5582,11 +5578,6 @@ static bool vtd_decide_config(IntelIOMMUState *s, Er= ror **errp) return false; } =20 - if (s->scalable_mode && !s->dma_drain) { - error_setg(errp, "Need to set dma_drain for scalable mode"); - return false; - } - if (s->pasid && !s->scalable_mode) { error_setg(errp, "Need to set scalable mode for PASID"); return false; --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071614; cv=none; d=zohomail.com; s=zohoarc; b=Zp6KHV1JNDCMR5BXqe52VuKBu40LbmuvFCuIcGWXTAfBFE8QITrCAqKAtIy5uTtPWLbuGNVGAVybHneCXNvNqI0ygCHyOI8BSZcgPERx/lXp8rQENfa8jt4gcxvpCPKQeh7Ek74XO9JVMN7SKInUgWkrvWpXyEFYUPFyBD5sL8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071614; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=44Beolhsb9IaT4rslnVVRU0yRvy4qFxSOsfGseaGZiU=; b=HDcYP8XVK85SoW8L7PR7I1HbbS4CvsvSTwst6LZo5XqswAmhKMdBEiR9uhwpuLWt7s+P14auElOsFCT5Iy30uRvN5O2D7/qC7zWHNNDlF8XpXIojXM2O68cY7DqnoJNORHhqj76ztWbD3ze5NBbx85fD4axN/ST0KfGz+Tm9xl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071614051240.18258953647978; Mon, 9 Mar 2026 08:53:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcv3-0004iD-0Q; Mon, 09 Mar 2026 11:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcv1-0004ZL-FZ for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:19 -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 1vzcuz-0008CE-Lg for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:19 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-48539cbb7b1so9338655e9.3 for ; Mon, 09 Mar 2026 08:53:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae57c05sm25504559f8f.39.2026.03.09.08.53.14 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071596; x=1773676396; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=44Beolhsb9IaT4rslnVVRU0yRvy4qFxSOsfGseaGZiU=; b=FsssENkXPdC4FIkjTc3g5ugSZwY6zAWOMTDDM6qac0Krb6qmQr76I09ZQfk4OeF1mU DyiBm5aiN/cQajH4gDYP3abIYirGea4u69aPQ5Q+Txm6G4T++o7kQh8tyljoTyr195/Q pIw6APVk8lYDbL28bTe4oI1wEdIaJwU+nWQcxCXOgGHY4ghizP98mUwv9kG+RzWohY7i EP11Yg6/FmRYBKtrPn20rkVrNjkFSVeeTSFAGPuRMiTDcyrrz+TH9OFkIpqzgV9Vce1u K/WsJti9F6z3l9dPzSbLOR/g2M8i3PXeQiCHtJ+SkIYMQgyVs8d4O3KyUtlkgEHNELrz h2kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071596; x=1773676396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=44Beolhsb9IaT4rslnVVRU0yRvy4qFxSOsfGseaGZiU=; b=jPseBNa1W+kfE4prJe5MfhJ2JT2u3ayBizJ8h84fqcQOl8TJR7rx5+XTIgFT0skrEv 92S1oUcf9zOqm+77r8o7Y8Hs8xFYe/Jy2RqbKXelVphbk0ifWPjzIlgemaKp0ROfJoZz DwTsltO457EqWrrFdcW8xtxU+vxOWEf6ryzfRBkJXrY/fJc0pQ/sufsOT4AToVIEjVva E5RzntEo2blfMbjx6ahehH3lUR8rkMOAEGqRgbk7AuiafL8NmNdMnrPL43HapMaWl/KA 0GtcwjgzrgZ6cnJmGWs8BlbHzBY1KTiXV6XSslSvVhF8Mmc2fm8btHPU8FuXlNP4Vj1N JO1A== X-Gm-Message-State: AOJu0Ywy+eWnk0xqEfo+6RGh++uTIF5zzspntqDLvfsRlq93Ss2B7cCc r5Cw7a9JLD26rIolbiQcpWQGHpVOmNlXqe4ZCup8mpnCe1stOIeovRHAJX1G7wIIK0xiWkc3dIp 8ltGPhUE= X-Gm-Gg: ATEYQzyk99pUTVfmcfod1qKxLX3xnsUTf7zcT9Ay4qdwDHfwwYuEdhhjsuxFNbSqMct x/wZPikTQYCFQqYyVflrRgVmPXHR6LJAkEiFfLkaIYwcTY1YaCPdYi5PFk+3BINwzEaUUzH2EcR 0lFXjDgeKqhnnGJ5H7IN6gMBkwe8ryLleCtn1YcKqq5gclolEG70Ax3fZ5rW3VGh1plXEKTDW3q KuG3vWIFBiOXL76kJJp8t6Gh2lbKCBsJRtibopbaDuqtQJWAz89TRBRBnQlnF5yL4OGpxSn0P8+ nkZ0kGqOew3tY9ToRi3X1IRXwFlsZYRlUOH9T4WEQKpvxiGWl1vgXnzVmM9yneghTSmUKs7pJtz ZX4z4gsVzX4tOdMdg0MWYIGkk9GkKz5fm6PGZUfKu33svRAd2H855LbPsPck8fN7wN6mIEPO0CT QrbLIWEKjpI9yms0kdWVTJcRRWisuDtWicU+GA4ulIG+EDr1a8wERMEQwEYGSp+tkAgbHrsaT5 X-Received: by 2002:a05:600c:4445:b0:477:7ab8:aba with SMTP id 5b1f17b1804b1-4852690fffemr213920095e9.1.1773071595606; Mon, 09 Mar 2026 08:53:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/49] target/i386/cpu: Remove X86CPU::intel_pt_auto_level field Date: Mon, 9 Mar 2026 16:51:38 +0100 Message-ID: <20260309155219.62400-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071616151158500 The X86CPU::intel_pt_auto_level boolean was only set in the pc_compat_3_1[] array, via the 'x-intel-pt-auto-level=3Doff' property. We removed all machines using that array, let's emove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-8-philmd@linaro.org> --- target/i386/cpu.h | 3 --- target/i386/cpu.c | 10 +--------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 2b70d56e9b0..5a62aa61579 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2457,9 +2457,6 @@ struct ArchCPU { /* Only advertise TOPOEXT features that AMD defines */ bool amd_topoext_features_only; =20 - /* Enable auto level-increase for Intel Processor Trace leave */ - bool intel_pt_auto_level; - /* if true fill the top bits of the MTRR_PHYSMASKn variable range */ bool fill_mtrr_mask; =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c77addd2c25..0a29ff805fa 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -9565,13 +9565,7 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **er= rp) =20 /* Intel Processor Trace requires CPUID[0x14] */ if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) { - if (cpu->intel_pt_auto_level) { - x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); - } else if (cpu->env.cpuid_min_level < 0x14) { - mark_unavailable_features(cpu, FEAT_7_0_EBX, - CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu ...,i= ntel-pt=3Don,min-level=3D0x14\""); - } + x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); } =20 /* @@ -10589,8 +10583,6 @@ static const Property x86_cpu_properties[] =3D { * to the specific Windows version being used." */ DEFINE_PROP_INT32("x-hv-max-vps", X86CPU, hv_max_vps, -1), - DEFINE_PROP_BOOL("x-intel-pt-auto-level", X86CPU, intel_pt_auto_level, - true), DEFINE_PROP_BOOL("x-l1-cache-per-thread", X86CPU, l1_cache_per_core, t= rue), DEFINE_PROP_BOOL("x-force-cpuid-0x1f", X86CPU, force_cpuid_0x1f, false= ), =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071656; cv=none; d=zohomail.com; s=zohoarc; b=YdYTtGIXUsRuZJrNZZ/oQDEqlLnBBLouFqV+PhC2v4p8BQmsCBMZKTGG8fHM1nU2sj4ZV7TCpMylUlzyoWEVsqIcuob54bfBx0SSr1o5kmcHwmD4+ul6T5pQ69j1lN+whQ0T7OolMDyn9WusJgTCYvRi/UioKMBJa6tna5UIxZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071656; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=pfrbHFhAv8bhscS2w7kB7DC3fNMKySB4UiY5tzkGzOE=; b=aUsBNS3KiFrqYH7JfVZSYYMjn6yOBE94whVAdqBKcZKCMJdbBFud9QsQoLP2xihwZP4jTEqRkqw9+d96Ema98/XpLbDxjif7uFQt3MMoA8oOx7JpkdOW/QaAkUZ1rQdIYJLq8O4l4402Din1usrzwTjCm1qlRuJX+JcZCzDj5LE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071656946733.7067912351126; Mon, 9 Mar 2026 08:54:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcvI-0005Er-Hd; Mon, 09 Mar 2026 11:53:38 -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 1vzcv9-0004vq-2c for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:27 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcv7-0008DH-G5 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:26 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-439cb5af25bso2178474f8f.1 for ; Mon, 09 Mar 2026 08:53:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae3f267sm26232109f8f.31.2026.03.09.08.53.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071602; x=1773676402; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pfrbHFhAv8bhscS2w7kB7DC3fNMKySB4UiY5tzkGzOE=; b=iJE3wbTSmP2cKoWlGJQ4ow40W8RlkLqncgIuz/HbGQNbPGBFy5vrvYO0aigwqgSlyU 0MF3KjV7ctuXhsdrpTzYxht2ABY+PgJXwTZJh2Gi1RaSM9+dOfZCNrHMeSsm9RjuzSHf mvxUUvE59KT6/CQV/z2vQFeEsOTTd5IY00/tZtPIrtCGmQkwafP/ODMVteA8+vHx/G4B prRtyyDpnBiJR9KQmsk3JSCAc7FCdWINAaSKj0VDX+BYqbR23kWxNKfssB0eEB1Ru9iK xeF42QN6Hf1nE53IK74G630/duwFxuVVfFz3e0n09CRjbkaCzWXv13SDmbLNcyPi8ejR pXUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071602; x=1773676402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pfrbHFhAv8bhscS2w7kB7DC3fNMKySB4UiY5tzkGzOE=; b=s5euGLmIUvNdMb6c2p0Im8CrI4QAW98Sumw4/HElu0eMKsOslD8fSImmN5NN6OlVdc 8GlCM18MGlhTU3DVw45i9VjqtUzufkDvuvk23A/imoo4mRBg6fCs8o4/SODpfNMp0BP9 MqgXChyBqCs6hRgh+O6vs2uWxhLVYOD234uhoKcxxdOLGgGXaUQci1twRdGjLzsoIMrh TqeVd6jxGuFZvdxLifzJntWAGBFKvITSLBFTUBga588tfekwDAin4fKzhCmeUQ3VMr1k fTk5yXlKsfO9rp3tdm//ZCz+0Vt4Wo3otEgpL5Wpic99+RVVRyj21aYAzsgW7IfLPaN0 mWeA== X-Gm-Message-State: AOJu0YwgL+KgVlxfrQrUEbQ8wt3OgDqoAsLZqNkKrQOEuS7u89+Et/kW 1SwoNf0UlyDAuKxHRsRXRv1GClyg8WO0V3mIaqlerrWSxZ1mHxMR7g3qrCOi+yIM1mYhgQPWXrj wznzUv1U= X-Gm-Gg: ATEYQzw/RgjI1zNI0RAJbzHCATPUJmvpEGvKkFjxlGi7laYF2ltcpUwX9AFiX5YkFPs YbZHgAYmzbIVp6y0NIstjEupOEdd8p95uvdE32Gz0Ms/3PRLCPLH8z4fuUslSTKTllEPUMmIMBV PPlN4AewF6btv6VyHhEyGct0lhl78JNMIL6nRDlILoGV9HZ0n0kbrMv0Sjn+ZDbDf/lwEhL/jpI odBw95WBE+8JQrqDIzXg9XoMtOClzEN3GdxVF3NQ8vd37E0A3CB8K6Ow5tiqpR125zcQAkaTjsb f1r7SkbjKgukD1PsgbXdGF/vl147hRaEBld/f4nHp4SCOVk0aYSetquxaEh/IGFkqRfejjmHl7L 0qPMjxc6fwaFIxTM8VTvByhijiASmpnAPGNXLMaDe+yCt46UFo+sbOyMpAFxATnsiQ8l1CjLbyT HnwacIfRSEWFIKiS6BsgGSKE0o8RqY5oM/f0G1MNMp/u1hOoaEpvI29RDckOVLV7vrlUHXge+L X-Received: by 2002:a05:6000:3107:b0:439:b3c5:ea1f with SMTP id ffacd0b85a97d-439da35f8d7mr22194715f8f.16.1773071602043; Mon, 09 Mar 2026 08:53:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/49] hw/core/machine: Remove the hw_compat_3_1[] array Date: Mon, 9 Mar 2026 16:51:39 +0100 Message-ID: <20260309155219.62400-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071658376158500 The hw_compat_3_1[] array was only used by the pc-q35-3.1 and pc-i440fx-3.1 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-9-philmd@linaro.org> --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 17 ----------------- 2 files changed, 20 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index e15dbcea83b..9155e0cc9ed 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -867,7 +867,4 @@ extern const size_t hw_compat_4_1_len; extern GlobalProperty hw_compat_4_0[]; extern const size_t hw_compat_4_0_len; =20 -extern GlobalProperty hw_compat_3_1[]; -extern const size_t hw_compat_3_1_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 162600425b0..9a3d826c3cb 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -221,23 +221,6 @@ GlobalProperty hw_compat_4_0[] =3D { }; const size_t hw_compat_4_0_len =3D G_N_ELEMENTS(hw_compat_4_0); =20 -GlobalProperty hw_compat_3_1[] =3D { - { "pcie-root-port", "x-speed", "2_5" }, - { "pcie-root-port", "x-width", "1" }, - { "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true= " }, - { "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "tru= e" }, - { "tpm-crb", "ppi", "false" }, - { "tpm-tis", "ppi", "false" }, - { "usb-kbd", "serial", "42" }, - { "usb-mouse", "serial", "42" }, - { "usb-tablet", "serial", "42" }, - { "virtio-blk-device", "discard", "false" }, - { "virtio-blk-device", "write-zeroes", "false" }, - { "virtio-balloon-device", "qemu-4-0-config-size", "false" }, - { "pcie-root-port-base", "disable-acs", "true" }, /* Added in 4.1 */ -}; -const size_t hw_compat_3_1_len =3D G_N_ELEMENTS(hw_compat_3_1); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071632; cv=none; d=zohomail.com; s=zohoarc; b=Wd1SF06ODXuUDup7I5G+IiXL3e50YvQjvso1dwbD+nVIPAv0CmC+8WeUejtcnCpwS+rnOUj0LHcbix5oOyQ3AaL4DdySk7luXDzvJ7mysBj7OF9D//5frV9up/8ZjtDLG9NISx9sCHAZl+0bAbtBC5b4Y2tU4I0S6P3S3zP+oVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071632; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=pgpA3PHGmA2cywOmnIHp4QQstzRdLHRlcUMp4w2UsrY=; b=Lk+6CXhGIcv1A7CmN1mczAnWtYIyQ8FGm49Tkh6isdrCZAGSPq+Qz7O7sJ/dQvDq7O+hY4DEHDxrFC0j+OVktsVx0+Y88xEi6hPTApmU8dUJmCfGUQGpoRqOlZJ2bUZroWmQJxQAUmzua5Vohv/K9zWvS2TODH+yi9VhYEkR9/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071632173914.9079899042507; Mon, 9 Mar 2026 08:53:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcvL-0005aR-NJ; Mon, 09 Mar 2026 11:53:39 -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 1vzcvE-0005Bl-Fk for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:32 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcvC-0008FP-Ns for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:32 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-439aeed8a5bso9200468f8f.3 for ; Mon, 09 Mar 2026 08:53:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9d8sm28693381f8f.21.2026.03.09.08.53.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071609; x=1773676409; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pgpA3PHGmA2cywOmnIHp4QQstzRdLHRlcUMp4w2UsrY=; b=hw05L4sm07BFjE1hsZoDVU/p1m5aPvMWfElezukKU0/Ezpa6htKlSyjpg4QagPvAVy r6G3Afk6xtTh49tJy7/OXvQDYBrTnQ+YAiKvXgkn/FlvQ0B4ogxcKmKPcYm8bJHDh35m CQJzIu7k23fTU8aa/WdW09qy768Ljdkhi5tC/y4cSRDA6FzIAeWWMgNh8nQ3u+wteOUp nqJJZD0529sH+SZS6H6REX0EOs8eNkBOfTugSZ+Wu+4nE3/0NFEBoJ7p3ruEAMDdY9Pa p9R9oE5RH9SWzd1yFwTn/PCp7yKuMg3B5EOVDy8cRCUZX7bNJGLp8gGmoZGj2B7AhlBx ziWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071609; x=1773676409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pgpA3PHGmA2cywOmnIHp4QQstzRdLHRlcUMp4w2UsrY=; b=gNdT4JA2zNyiQAWz2Y/JJJn1VsoqdeJVEUbR7i/F0XpVW/+QachoB+sj89uFHq8YXv l61p+ldYbv/mrqyI8eJCFcj5B1TXDXzb0pUGHrdENGSXnNFD2nNDEKExcx9YF7pV34pS X60D69tb81ZyiwdVN71V16SN35whEe5bteyGdpNSfChgVLlOE2Kjkyc2QWKbDGkDf/E1 MXc18Ss3Fm/hoDVbROA60nGzDT45otxsh42y8fow8JeIZGvzyyIuiil6WRFwodc87AkS zKNK4A8reKaqwkIE41L8E8vkEWWxq/4EruBrhtp7WGqrcEhHpNZoaGvZ2js9NJKGkB88 Ijgg== X-Gm-Message-State: AOJu0Yzl7bs2Qv3A4KngIG+I0Q2tX2k/G3us8R8lR+VUqjmNtt4xb3CZ 9SrLkEqRtgEI4wX5qMBAZuNfpbRDB83/TKxHQdfHWVHSW1iQT3uJwYddgimiskBy57yEHTxwBt8 3UJSj+l4= X-Gm-Gg: ATEYQzyP+WpeviDGrwDQNl9F/ZABKAgO0DXbLDvee7YRo29CpnUn8otTHTiT/LpszAS 2LvG69GOUIbWr8NY7vvEYScF7E/4p/fYvQKDNo1zw0KEGjpluf5piakPATWBjbH09JEF0LlizSX bYNJ777y1ww9BlSR379PYnjytmEyHORidc9cAytHZ8nK3itPr1l4iEXuVUT98cNuDexVuLBYbgc 47PjEWMg3SfL8FeBpvG1Ip5eUC5W91J653HpyN5x+aWlb5eW8Azc67cwH5d4s9ENkN7qwyXJ2iw 4WkESHZ7IjY6H79b2wGqQo7KFPrDsgX4z5Zd4M+QSl3Z4XVdyLY58ArDpFHg3lOjXVYgH6JneCt MZW+7xR+30sNqux1AGBxSOpDnNgoNokYZ5vNKFQsRp/i7VQf2t1SSIguasm+bEElNJv/B9fwEl2 tKALddNzKmDd5puuyN2ZgVY3qQ4IWPClYO7r6+a2TNPok2PAr/Yk35THIe5+O6Ve/C2DhLdMS5h vaXIyEm3kg= X-Received: by 2002:a05:6000:40cb:b0:439:cc01:c9ee with SMTP id ffacd0b85a97d-439da5554a3mr18488588f8f.3.1773071608643; Mon, 09 Mar 2026 08:53:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/49] hw/pci-bridge/pcie_rp: Remove PCIESlot::disable_acs field Date: Mon, 9 Mar 2026 16:51:40 +0100 Message-ID: <20260309155219.62400-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071634232158500 The PCIESlot::disable_acs boolean was only set in the hw_compat_3_1[] array, via the 'disable-acs=3Dtrue' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-10-philmd@linaro.org> --- include/hw/pci/pcie_port.h | 3 --- hw/pci-bridge/pcie_root_port.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h index 53cd64c5edf..b28af067a66 100644 --- a/include/hw/pci/pcie_port.h +++ b/include/hw/pci/pcie_port.h @@ -60,9 +60,6 @@ struct PCIESlot { PCIExpLinkWidth width; bool flitmode; =20 - /* Disable ACS (really for a pcie_root_port) */ - bool disable_acs; - /* Indicates whether any type of hot-plug is allowed on the slot */ bool hotplug; =20 diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index fe3ced56851..7c3e78010b4 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -117,7 +117,7 @@ static void rp_realize(PCIDevice *d, Error **errp) pcie_aer_root_init(d); rp_aer_vector_update(d); =20 - if (rpc->acs_offset && !s->disable_acs) { + if (rpc->acs_offset) { pcie_acs_init(d, rpc->acs_offset); } return; @@ -151,7 +151,6 @@ static void rp_exit(PCIDevice *d) static const Property rp_props[] =3D { DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present, QEMU_PCIE_SLTCAP_PCP_BITNR, true), - DEFINE_PROP_BOOL("disable-acs", PCIESlot, disable_acs, false), }; =20 static void rp_instance_post_init(Object *obj) --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071642; cv=none; d=zohomail.com; s=zohoarc; b=PGbi1DVCgBWe6WY4fj8OzWCkTxdqAn3jdmv72rcCdqvUoGmFsV5+wugknF0EkPReKdFhuTPROfvbBfoaVLft7i4en/PG2LCkpEzD/t/GoHlr0Mi8DtIkWA7irDOOSBp0HQY/qBP5oHOGMtkvagJ8jV4TciQaKI2t08AJxtlY47U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071642; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=ySdlk6vD91unfdXN8wBQdy41UnoNXGeY5USugHCizuQ=; b=hvya85ibXJIi9Qj1Uk1tSvHqW1dqBM9cZdduOvA2+2Z8Q4IIRMWt00p6mgjF+4P+GNTdFIKZv6TX9vZtZks0JVbyG8eXECDL6nb8UJpnWKmnSfa4AgpoU/1EUhLLId3JF+s4z7wQeY9i7h1LeQ++yJwRb4xLykoy+F1YYsCanlo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071642220167.34218064156255; Mon, 9 Mar 2026 08:54:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcvO-0005w9-55; Mon, 09 Mar 2026 11:53:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcvM-0005fr-8t for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:40 -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 1vzcvJ-0008Jf-MX for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:39 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-485392de558so7187695e9.1 for ; Mon, 09 Mar 2026 08:53:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae45786sm30401602f8f.32.2026.03.09.08.53.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071615; x=1773676415; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ySdlk6vD91unfdXN8wBQdy41UnoNXGeY5USugHCizuQ=; b=QK0m7d+Fp58fc/qj18qjOSAAvgxpkkow1bfrCnwr2au84razdCQeaVeRw/dZTamhov YhYV/dL0S01qrZm2b4UBAaPzi0ZqYRTfFJ1AamYm+LzSeFZ1ZeiEWgtS2o1WQOq7Ze2v Z/uOin0xcBXdWPZyavUYrRGlFIbh/lHtu1nVNNRiaebvfs621SUbkgpGEujOdzmH/SFD PbSOS9HzIO8y88Qbg81elIUvjWM4m5FAaVWINtjziVuEuMFkj34hIS9kMhpgg/cqMLEd chOsbOhPs6PRUfyKx+lQv3+hVwGOjMUxs49FGqI0ihPxlDsQ0wqRQ6dyJVxXdEKzRodL gs4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071615; x=1773676415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ySdlk6vD91unfdXN8wBQdy41UnoNXGeY5USugHCizuQ=; b=rXFD8lmS3xd+z4wK40mZn0ftW+hBLTJf9RhhKFbeffAExjCvJuTzCH3QPOAMl1TKKn LX3mJefvnf+onQYgKnxmfS6UMgB7nORqTQPHuK9e2zeyBSHMXXPV7BeLlRUoi6GdcfG/ J4CrI6xhawoSzEE80fQUScpaOm542jazUhLq/B0szE9AJSVNcEUZjTdrh24kd7uTB2R/ YuHttJWbjDk56YrEP9tLzRzPPcMoxtt1D78SpQHAWqgc534UhByrOHIrduH3MzFCruaP zgnJ+wyEk3euZ9EXwI32CBbf0+OFpxFyEVAqLDCVg0zGEzexyzCMwZB8FiWH28EOSw0x YnIg== X-Gm-Message-State: AOJu0YxSbZKkp+Aflt6NKKRqQb6vtZd0PI/cLGy2vyFh6jFSbogliofK om4vojYuPmFub7EyilPPPh+n3yMhOyuAdQLSHigHbuGl6Hqy0xLapofQzWd5mAywE+7tTx4JnPt bbWbuPbU= X-Gm-Gg: ATEYQzyCFoI4T72+3uQjY7JUM4EbRfEyQsMQxWomh27P2dwjWzMiWVlnP44A91Edg2/ mredSUg1C9rH1EADyw72QsngE+EH1/JWfcnXJuW1WkP6cVR/nquW75ZSNtIAJri0ZCA2OlpKsGR eS/NSR+Z+e/zpkPy0KSeqSIV+8x4iOkOB7GZlfC2/nkTwCYdIGQw0RB0Fg5gGlvL3tn550E6fRm P+5N5WyQtcHNPnPIz411ciCV6TyIzjChnjKKzNHQ/aSf7JEzLyHUPTMxOptuc5m3rsNssY7BwRB g/ojrSPj8humN97K9UxS9JxBBcnVJdjeZ4WfLEAXKtPktRwhO7Tlwvw4JsP31GFj4rtnvsKMreC rPMpHhs7wlu+n2jv7EU5v2C3IxEEgYHLIhnwQwZ7qcv4SkwjAYK/r6HT2Vlns0/HkyxSO8zHLpA 0uVBK7fNYnUb0dWAOxpKmDTlMK3ibFBcttUt1/leOGiFCy7d8pnopC4JQW3QL0tAl0qBvAKiuv X-Received: by 2002:a05:600c:4e8a:b0:485:3f41:e113 with SMTP id 5b1f17b1804b1-4853f41e355mr36307965e9.1.1773071615443; Mon, 09 Mar 2026 08:53:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/49] hw/i386/pc: Remove deprecated pc-q35-4.0[.1] and pc-i440fx-4.0 machines Date: Mon, 9 Mar 2026 16:51:41 +0100 Message-ID: <20260309155219.62400-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071645022154100 These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307154202.86309-2-philmd@linaro.org> --- hw/i386/pc_piix.c | 11 ----------- hw/i386/pc_q35.c | 25 ------------------------- 2 files changed, 36 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2b94c472446..4d71e0d51a2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -644,17 +644,6 @@ static void pc_i440fx_machine_4_1_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(4, 1); =20 -static void pc_i440fx_machine_4_0_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - pc_i440fx_machine_4_1_options(m); - pcmc->default_cpu_version =3D CPU_VERSION_LEGACY; - compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len); - compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len); -} - -DEFINE_I440FX_MACHINE(4, 0); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 52b8064b4d2..cb23322f5a4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -575,28 +575,3 @@ static void pc_q35_machine_4_1_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(4, 1); - -static void pc_q35_machine_4_0_1_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - pc_q35_machine_4_1_options(m); - pcmc->default_cpu_version =3D CPU_VERSION_LEGACY; - /* - * This is the default machine for the 4.0-stable branch. It is basica= lly - * a 4.0 that doesn't use split irqchip by default. It MUST hence appl= y the - * 4.0 compat props. - */ - compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len); - compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len); -} - -DEFINE_Q35_MACHINE_BUGFIX(4, 0, 1); - -static void pc_q35_machine_4_0_options(MachineClass *m) -{ - pc_q35_machine_4_0_1_options(m); - m->default_kernel_irqchip_split =3D true; - /* Compat props are applied by the 4.0.1 machine */ -} - -DEFINE_Q35_MACHINE(4, 0); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071633; cv=none; d=zohomail.com; s=zohoarc; b=gCrYW4UFrTBvWzogWQMiXuJntnvYZbDqxSPCvYCfGlE7c4HUip2UvIYstLzCqH9O/FGYMdOcYTn1hBIFZg/t/uGVC4OaCkd8aSfPWdgxGr7xAdErnDqOdfdDc9t9TY0KfoAgFTxiAZWJhWYy4bMqUvB9FZxoKIlOB8M0ajrRozc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071633; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=F1/3YUpYRmZXjja4BuejGPaJcObXsK5Vr2HdAMOPQ14=; b=bW+roBr3uC+LInwZ00Por2euPYDEpAAgo+i6eRfwZSFPvzJWExHCt98qjX5MJlUXYzYOrcSyFovGyln8zbH96gAv+H3DySJ7SbyKr1EvMD4syeKR9isdJ68qxqmkBSxEpbnb9ds04j3dl3+lMBWssEn6TcBylZgEOismpu+YSx4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071633109220.34815325220188; Mon, 9 Mar 2026 08:53:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcvS-0006Sj-Qm; Mon, 09 Mar 2026 11:53:46 -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 1vzcvR-0006Le-Lf for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:45 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcvQ-0008Qa-4U for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:45 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48538c5956bso14194075e9.0 for ; Mon, 09 Mar 2026 08:53:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a7f1f5sm1661765e9.4.2026.03.09.08.53.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071622; x=1773676422; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=F1/3YUpYRmZXjja4BuejGPaJcObXsK5Vr2HdAMOPQ14=; b=Uf/sISJsS5Y8Cd4r74HKM+EOPVhiftpkXbDRTJHSYwcHQiqD0l5aYkGkgIK0wRen7Q MiFBsTv1RbyEe1Gof2VYUj/OVKZuanqUB5nHQRpfWYVUJ7qgdCSWThwEopgRguzD2s65 r3fyv+QGdj45osv4stLXvpdWy3k1JGzzc4ecl+cxCPed0LmFr2Mkka1wB32rk2+P7AMk 1qQOHM+B8BjnccWF9Bg6lNSuD4oCUgySt+IUiGygTruwq6vg+gdG+Tc0SsBc+9IN8pE1 E/9XIYOS1c11FSTTUq09W7Vrh131/BUOOp0QgFPm9x8MHh4yinvgp+HjrrMMe6IpvMqX U2uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071622; x=1773676422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=F1/3YUpYRmZXjja4BuejGPaJcObXsK5Vr2HdAMOPQ14=; b=khYslWKghTGx/u9OoYT/1+o0M1QMhnJYyLCXHzJRfuH9jFTkQphSIGlCi5fa6O9czm rY/i4Y+nlD7FiTyBHpIwU2yOYWF79sKOXXiFoBhMgB7pgIKdSfjrZWWyoAzz486bdKeN gcTWKzMVCJtm3opuF+X3uIMrhYp1d+autWxwT09iJX3vyzHa9GT/hiz2JONwj/Mmxt/+ DbzLmnCLDiJpDURH1cm/CLukrBYZB18Y/VsKbIhkQ6Lc07rc3mplFkdpzNeb3JXH34Oj ODqqWQ8k9YHLNHX6KFuiByA7A/QNaB/nynaZmgM0U6bWWIu9kYj2y6WtfNS9K9SzCx29 eyOA== X-Gm-Message-State: AOJu0Yzj8ScnaxyFAv94LsMVhh1vpp15crOjqppYh4Y1kshh6TPBgmuf anTHkJYCKiK4v/EPN/gEx6ZWwc69sZFoKL6Q1v0KNPli2IkAlhnjFSZ3JSGP1xSkIOD2XRUSp1R P5+viMag= X-Gm-Gg: ATEYQzxLneOKNzjKYOPJY45JYYhVRO7Xm7vulD9+GLW06A8fvfxCeB2Dqeb8VaU9THj AW6UyADRiizXd4VPBvTsozYAacRxXMOWt18JCvQVa8c2AdG9rSRVl16WH9FuAcFii9qR4PIRAXM WbSFTN8+IkT9nfGiLUr8EELEWh6ZG5kv5NHzw7tB2spAKm87vcYLorVyaWkJBsvsqUbpiw314ty 6qVxeXJQhN0ZQWXpBOYfs7VkcUc2cvwcvEbsQQqT4fvk5SG7xa5xis+VBSn75I81siudxKI8R3N Jpk75/Nir5yqfny6FePINLAwwpeyKjNuBjLKSvwq+P4hIr2yD0z1wGho5OX6KhYgwgVLDh9unFz dZnEx+SomCKyAURcctJ9c5QVe1rA8X4su1dQmvYJJjC52XvnCq2dNhtEp9fzqnviXdg2MbH21UU UsiwSHrt8QKg/2csCf9CSEfKwkhFRDlRV9SO8F4knzXUSz6eUuMHfWRiCSoAmjE0RMoDFaRna1 X-Received: by 2002:a05:600c:8b53:b0:485:3b33:f4b6 with SMTP id 5b1f17b1804b1-4854192dd55mr2171895e9.0.1773071622071; Mon, 09 Mar 2026 08:53:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/49] hw/i386/pc: Remove pc_compat_4_0[] array Date: Mon, 9 Mar 2026 16:51:42 +0100 Message-ID: <20260309155219.62400-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071634696154100 The pc_compat_4_0[] array was only used by the pc-q35-4.0, pc-q35-4.0.1 and pc-i440fx-4.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307154202.86309-4-philmd@linaro.org> --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4e1dd436ab7..22325324d09 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -268,9 +268,6 @@ extern const size_t pc_compat_4_2_len; extern GlobalProperty pc_compat_4_1[]; extern const size_t pc_compat_4_1_len; =20 -extern GlobalProperty pc_compat_4_0[]; -extern const size_t pc_compat_4_0_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f33e3f72656..addf602da08 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -177,9 +177,6 @@ const size_t pc_compat_4_2_len =3D G_N_ELEMENTS(pc_comp= at_4_2); GlobalProperty pc_compat_4_1[] =3D {}; const size_t pc_compat_4_1_len =3D G_N_ELEMENTS(pc_compat_4_1); =20 -GlobalProperty pc_compat_4_0[] =3D {}; -const size_t pc_compat_4_0_len =3D G_N_ELEMENTS(pc_compat_4_0); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071678; cv=none; d=zohomail.com; s=zohoarc; b=QinRtRWD/lTkDpUKNVr3lsGMls6Pr9IHP1G/fyOxcJdOylxyjIGezcnxg//mvjGYAhuhJlmZe6csG+1CKvWte9j+YQuftucd1TwkXxrKE8haVCMarOyeZqGeoDVPfqjChG4abCtBtCrZqcL0/XJmJw64FqS/7JGuT5LjUPLiD0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071678; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=a08Md/WAEudx0JjenTi/rWK/LNu3K4IFgDGEGMN+LTY=; b=NPxYWjN2zT3YZm3RFtDEjzXD4IDKz3huKih/KSByGlYmENStj38m17qm7PnGyg8EWHBge1fEm1NtbdoE0wAxbyzPHIObgutp3N9kob1/oga8o8sbey+1Zyw65z31jOKqxEnhUl+YKPsTJpCREV27IIAQYG0Kb3KCuXYJ31S7w0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071678773475.252620302241; Mon, 9 Mar 2026 08:54:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcva-0006qQ-Cz; Mon, 09 Mar 2026 11:53:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcvY-0006le-5H for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:52 -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 1vzcvW-00005q-Gn for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:51 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-482f454be5bso119560585e9.0 for ; Mon, 09 Mar 2026 08:53:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d840sm30513259f8f.8.2026.03.09.08.53.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071629; x=1773676429; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a08Md/WAEudx0JjenTi/rWK/LNu3K4IFgDGEGMN+LTY=; b=a/Ah6703jQLsXv3zUUk288+UR3GK/4WsC2mP6hhvpkaYYzPRQ09fHdjj/eHibIUjn5 yfnJ1ZLfGRrjCemlu70lxgzRXDygaaN+weFisi7bnm+IGH8K7nXapu+rKPhQ42EqAOaZ 2vfk5ubS7zphzXQnzuJvtJYXfzYLHUnULzxKVvsL1lSZQIeZY2s9xkT6/6kwfFBiPm+s 1odPrT5vKIsrtp0T3ddbKdGBnwsuXThBCcnSPzGu4B2H+Qv48TFNGjlTVCYBgwaa+haI E4nKqFkkVWCQfPZmLTzwdRDA5hyjq8jIuC+LnMISSIBhQ7RQUmqIUt7UH/MI8qZqi/KM qT3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071629; x=1773676429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=a08Md/WAEudx0JjenTi/rWK/LNu3K4IFgDGEGMN+LTY=; b=Ao87oQ+vfUuGLSencUzEspxPQNtOnX1OOsuM0fV8MY6z6jqc8RFsqx7gu8VVfIHJDy i+Ju/sHk+K9150BiFl8Ll2JXxHjRqeokNKKMFQPoWnImYmi+Sf9JnyRmiKXqZnIGBtK+ XdIcqX7rnk5BSKOAjVizVVa7ISWYVXSI8qpzK4ed16GbutX6Z3z2IMOgEJ3WFeK9JbKb gDPwuYmYY9dkaeCTA5r1w3+XV36zNI2oLC4PxsLGDfccyENi/vcPO3ZKMAkbsf5QXOhK DRtx2zN7C7Kwu2dXa1Yg5ZEkb0OsxsMmG17kjBkGYRq3RpM3gW912DT7Njm0SoPrluPW Oh8Q== X-Gm-Message-State: AOJu0YxjL2oVNEuIQU+oo2/nrHA3+Ga1+BHG4riZxwPksoQECatWVO2A rRfLodhhES3yMLUZj2MaUey6SrkhzgrO82QB2E9keq+fYbeunswM+kh9P5DgX/QQX5Rl7b2UkwS VwxvtizA= X-Gm-Gg: ATEYQzxpwSRiGnb63eiTWdzfBIJhPINiy76aVMQ0q6HdVii2juQImj7uIs+sRoh3HQS 6l29oSW/zqhAhXoCOAA7lC59D3o9avPjedfpzQzQMu+/YdMk4xK6o2WbzJsiBRU4G5sEnYv+6Ps xsfit/UMbAfNc9gz5SbYMQSWM/0jv+MetnKAdNdfu3wL37BW+Q2mjSXBzG7ZGpuk3B0aPTKdT/K ROmkG3afwYWEuXOTN3C0VugnvnkJSk+fOLNvS31F1RToOaHj0v8sP/tedC78tBpUCw8+5qJvI6k 8BdtOfEKOEKuw+5r+69jsWy7ilNVjn5CteSj3T062uGZSmnHjQewm6TI8WXWGHCLo+yHfrcYWT4 Pyn25ioVQ6/rNbJq6fp/qMKwe3uFh+ebnkuocFK6dNf6ZOlctDr8x0bYK2aSuk4a2q/H0974h35 UcS3qLFRP9u2IPqhg0uVp66xSiJLtXexnLFSmV/j2LUCx95+8RP60u4LDZshFMoAmxo4n+Jptm X-Received: by 2002:a05:600c:3049:b0:47d:52ef:c572 with SMTP id 5b1f17b1804b1-485419ba021mr1005505e9.1.1773071628640; Mon, 09 Mar 2026 08:53:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/49] hw/core/machine: Remove the hw_compat_4_0[] array Date: Mon, 9 Mar 2026 16:51:43 +0100 Message-ID: <20260309155219.62400-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071679419154100 The hw_compat_4_0[] array was only used by the pc-q35-4.0 and pc-i440fx-4.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307154202.86309-5-philmd@linaro.org> --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 9155e0cc9ed..f85f31bd90d 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -864,7 +864,4 @@ extern const size_t hw_compat_4_2_len; extern GlobalProperty hw_compat_4_1[]; extern const size_t hw_compat_4_1_len; =20 -extern GlobalProperty hw_compat_4_0[]; -extern const size_t hw_compat_4_0_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 9a3d826c3cb..a14ad05b9a6 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -209,18 +209,6 @@ GlobalProperty hw_compat_4_1[] =3D { }; const size_t hw_compat_4_1_len =3D G_N_ELEMENTS(hw_compat_4_1); =20 -GlobalProperty hw_compat_4_0[] =3D { - { "VGA", "edid", "false" }, - { "secondary-vga", "edid", "false" }, - { "bochs-display", "edid", "false" }, - { "virtio-vga", "edid", "false" }, - { "virtio-gpu-device", "edid", "false" }, - { "virtio-device", "use-started", "false" }, - { "virtio-balloon-device", "qemu-4-0-config-size", "true" }, - { "pl031", "migrate-tick-offset", "false" }, -}; -const size_t hw_compat_4_0_len =3D G_N_ELEMENTS(hw_compat_4_0); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071643; cv=none; d=zohomail.com; s=zohoarc; b=KZbU1QRNnluZWvZFTXFA7t1AD1GJoqEQ6d/OfKfpSpOTDa0kyPqPc7LPzbiEOiUsJV4WFjN2VpkVVB3ebtTx2DRV4J9bhNByCJNQBVX9fMeRJ6EjVVEvSNmu8fVBp4y1HANMsdyfbazkamvj/mv8FE3sG8ssziYSG4hlBAuEYtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071643; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=PO1+Ml3mNJBa037aqT8Z2g6AbLpEBP5aH3yPV+0teXs=; b=dcbAF47tjy1VVCSDCRRctIjp5lmj+Jc6lP5hJaIZ13oJXr6VaQc1/Gh19JHKvUcq4euCI1EXHBm3Bc+tABQ0W0EWtdSSmrjK8lyooL/cqyw9+fwFLCO/2lrnpYg3fdPtlW1tFc3d0DXdKnj+rQVprh4e4/xY8mVlM/bn74beLmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071643966404.9219138106338; Mon, 9 Mar 2026 08:54:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcvh-0006z8-BV; Mon, 09 Mar 2026 11:54:01 -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 1vzcve-0006xq-Us for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:58 -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 1vzcvd-0000Fs-8v for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:53:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so24417715e9.0 for ; Mon, 09 Mar 2026 08:53:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a6bbcesm984865e9.3.2026.03.09.08.53.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071635; x=1773676435; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PO1+Ml3mNJBa037aqT8Z2g6AbLpEBP5aH3yPV+0teXs=; b=IPLe7pGPF+k92gd/zOc3MrifIu3pdixu9hbQJ3Yr3jtbQZcM/9zUY2NxQI4TVZmc3d 9+2WwXkFbckchfsblmxVFskjlz3T65K555oOUcf4QtluTBFs98462ShsbiYZo7VU2io4 pLyUy0eDbcnGNYHx8LwrSDI9WkKozv0LN7NlBK99qaet0sVnRLee6UIgp4WJCBxC5aIa 7XAb4UZFxckn+CUSvs2n1+mdkNIv1dmdBQjas9Bp8kMAvp4BYSMvQ97CCL0RE3WI8AmT oR5+8zVu35wpMROYz0eo7WBXc/VgDxV5O8KGLgGhQyOb2OaixkLjK3JAUCdTGN1cY6xU JdUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071635; x=1773676435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PO1+Ml3mNJBa037aqT8Z2g6AbLpEBP5aH3yPV+0teXs=; b=tbfvgalh7x+Ap0WmwFyLu3Ss1+JCj9pBMe2LRfRpyThimnMgR6BKkTajmeGb/dezSp uuFQi2ToA0azZNeNqD9JcfLayCWSfJW0w/oSws748sZuWbg7gj0z2b7HtIiQY38ftLac xO42xpw0533ll2ovd9WaP7Dhu/eK/cyfH6OoANtegdNu0XXSIC5Qy/cOJ8UZyxAdRhqp nTIkX4tDfhZA3IVl27Jhwha56DPalQZJXvwSjSVShEKGGPYQPoLN8nTaxK5PqGP+Q1Z6 MXt4TXb7SA6QbKhjYnBdztKi5F9ZxWz339N9jkfYOP7ap6m+EHqfq1c7jht0aTfnk5Gj lSzQ== X-Gm-Message-State: AOJu0Yz/f4+5T+M37f2c6rfBOLVJMDNIUk44s7ZZ4AB9VdZpfGteQr0F Rem+u4vNF/3v4bK9S8JtFKSq16hPRJZSAfPPeMepAqjaW4mLf3OWiJJAJuwSQWTIMWfd47+794y B4S/PYUQ= X-Gm-Gg: ATEYQzwUJYXNwQLrRVrTTU0nQ2nJu/5hR22YNCBe/YHaBiIJvvU1iBeR5jx5+nPtilt lxjvmXlrw/stsqQlox3hcUSMkaKRiWE/iojOWw5imLXI1FpZMx6pHuslc1sBUPzqkFQN6ZXhUV6 dJ3gLmqj/wfiverve1R/xNA+y2vhApw3QwQI5RMcnAMIJnrkQmT9Tk4bVXiTIUwJL4igadA4dIF Bulyhe/eBgG/o67PVygE3JIzqLQ8ZdhORcgaZNaegfF91OtsGI6B6eTc1XcIaMgAR8+bZUbSgpu DMPCvp7gUZW9Wms4IpFFgRO29Q0U1Y5CN91E3nfzLotkiLy123jzMdIa+JAU8CCNDqM0l6RkqY5 9Eiloh5jLJKltSFlUthakB7feY/+CsOjJUL2yduYgv5/5bQeCXQEAgQ7DE784oFeOjT/K86pLoy M89LZMF7ee40vlv7+x9/n83xnR3RkN9vV60ioCIIB4DOaZ07zDl/n2gRzBQkjCPoMf0mQPpiql X-Received: by 2002:a05:600c:3d90:b0:480:4d38:7abc with SMTP id 5b1f17b1804b1-485269304aamr176624885e9.11.1773071635217; Mon, 09 Mar 2026 08:53:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/49] hw/virtio: Remove VirtIOBalloon::qemu_4_0_config_size field Date: Mon, 9 Mar 2026 16:51:44 +0100 Message-ID: <20260309155219.62400-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071644396158500 The VirtIOBalloon::qemu_4_0_config_size boolean was only set in the hw_compat_4_0[] array, via the 'qemu-4-0-config-size=3Dtrue' property. We removed all machines using that array, lets remove that property. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307154202.86309-6-philmd@linaro.org> --- include/hw/virtio/virtio-balloon.h | 1 - hw/virtio/virtio-balloon.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-= balloon.h index 79ac194ccec..abbf3397188 100644 --- a/include/hw/virtio/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -70,7 +70,6 @@ struct VirtIOBalloon { int64_t stats_poll_interval; uint32_t host_features; =20 - bool qemu_4_0_config_size; uint32_t poison_val; =20 /* State of the resettable container */ diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 38bf1e84a1d..4c5f486ba23 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -708,9 +708,6 @@ static size_t virtio_balloon_config_size(VirtIOBalloon = *s) { uint64_t features =3D s->host_features; =20 - if (s->qemu_4_0_config_size) { - return sizeof(struct virtio_balloon_config); - } if (virtio_has_feature(features, VIRTIO_BALLOON_F_PAGE_POISON)) { return sizeof(struct virtio_balloon_config); } @@ -1054,8 +1051,6 @@ static const Property virtio_balloon_properties[] =3D= { * is disabled, resulting in QEMU 3.1 migration incompatibility. This * property retains this quirk for QEMU 4.1 machine types. */ - DEFINE_PROP_BOOL("qemu-4-0-config-size", VirtIOBalloon, - qemu_4_0_config_size, false), DEFINE_PROP_LINK("iothread", VirtIOBalloon, iothread, TYPE_IOTHREAD, IOThread *), }; --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071673; cv=none; d=zohomail.com; s=zohoarc; b=I8mf5t8fICm/HcDcdemaQVyPPGPeWGZFTDBR4aUPeGFDz6yoT2ElqULaZdWrry2DmCkTzDxyZ0NPnAW6ZKspXV9SE2A02YTEiPhkVcLSSp4TLowkK5+RzHgolbUmHJjk7vQ8/aT77Vchq1gd0EgAhsEwGyBoinBf0vm0sC6RRnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071673; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=vQ2Sn8Wbqu1NrXuJtMyexGGxp0O6O+LoeTC8M+EESYw=; b=c/hFkcxWAJGuu9b33djRZKaBzsqWq2dyhnXomfjoJTgCi5RjgPa2mnQ0Q1z80lQEjQIOAJQfJ6QID0l56lzaN1rSJcd4g48iaOKlQwSE4s+69pAejCe1lxBF7Um9R1Biof4DUb1Rhxl2mjl1LhpynhJYFuLgtlslajRNXrZw9ss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071673407895.5344678320781; Mon, 9 Mar 2026 08:54:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcvz-0007KJ-CI; Mon, 09 Mar 2026 11:54:25 -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 1vzcvm-0007Ez-Eq for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:08 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcvj-0000LW-QO for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:05 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4852f73d0a3so17544945e9.3 for ; Mon, 09 Mar 2026 08:54:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fb3668csm558452765e9.13.2026.03.09.08.54.01 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071642; x=1773676442; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vQ2Sn8Wbqu1NrXuJtMyexGGxp0O6O+LoeTC8M+EESYw=; b=hWev81pIKmphWWSpLrOAF0CA1WQ22MJXkU4PPtBhm05fzvi8EzioAxJRQ+eDitb4kB UkhalOxwOsku5CLr0eDAlZ5s3MDArbuY+F0CvcmiHQilJSDVpuUoTJmnIk0xC5BgAeZK 6Rnef4JujChbyZ4lC5WWj96DNfc8uZ0PuuFKGBBllhRwky7PRCaHSLb/++Pnc3AblBUC WDj4f9bc/PTOkTD4fpuhAX+YCL4lIRpIJ0aV96KBtyaKqNl0Y7T77uXUP1t67+DZV9R8 qsHQi84m3ZxNfm+qfyxv96islowNDNBabkwAimCNXLzJl+LECdkubphz7kBTZ7uI5D+5 V3+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071642; x=1773676442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=vQ2Sn8Wbqu1NrXuJtMyexGGxp0O6O+LoeTC8M+EESYw=; b=stWh7l3uRRQWN3CvH0Vk3jv2Z+bN61Uq8GN3vSW7rKv5/9Fv7J4I0SDxDo6hHhZx7D +qBPfd0a1aKdbb25Rfh9eLJ5sz39oG2pW+74sfPY44L5tc1qJOKmqQZhEOcuTfOpPVL7 gowgF/cLyTF0zfmWau76HzKJmlWbz1N4ZryL+wUrBuGQsO4CaeO0s+dpB3RxO4K4tSSy JAXqoPJgoW9re7kMXVSHkzHzeq18CAqFQjVG6JAqzrWkLle0pqASMTPd1VvxK4/7Wyai bcjr4Xnsr6cVLQDaaTFPxo938GrvuzLXX21i+4lQ4dj8acpk6FwfrkzIsmSqLdai5wTe YK3A== X-Gm-Message-State: AOJu0Yz8cbPYN9unRgq6EI0mLYUcAIYFICuvpM6gZGt/iH3+nefJEjse Bd+KYsvg5kEuPQu2K74Odtw1qc3SogI1xmpPxip/rm1Df+LuUvO3Px0/pot4tn6Wmx3unCgXK5H DdHwMg8w= X-Gm-Gg: ATEYQzyK99qNgPIjYZm1nRKbxusjLJCd5xK8ajRMU7Kbm0V9EgKrlBW8KFiqM0nTe1y viqHSfdlZxjNXloGK+lXdKtNHLYkISaPlB+tH9LJObVSMmHyH6Ahii67eEXQtw9S/E1Qhx2Kdv/ 18f8jJTKw81/5mQ2o8TF7zUGmxZWrOmgs67mNJz7CZ3l5pSUSF8cTgRtKXkaRruorZ15R7CZVZ5 1Mq6EtKXxaooqbc/QxZwBR380+BHIMjl7a63s3PZuV7sYZXqURXuixKx0tGQzQ7P+ryOhbn6X3d sfyl8UvqtNTIn9Q80ar6N1sZhaGE8kCa1TPK46ONFF/7+YLc26xvqDeKe0+CUUdfPmhUbELqmLK V45ZiyLnydnSh3xs5VT2a5tGc7aPNqhWUo6DINUAeCcJioRwYDkiTjsXXtI0/Qyx6KMyjzWs0Ir CuRrJqspYBCHrRa8YLejbmuRDJKeusLuNtVi5v+y/iamhKCUIxaSXtSaSCqKNt6vCraaEyNF92 X-Received: by 2002:a05:600c:8b2f:b0:485:3a59:99ca with SMTP id 5b1f17b1804b1-4853a599b8cmr81905465e9.16.1773071641839; Mon, 09 Mar 2026 08:54:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/49] hw/rtc/pl031: : Remove PL031State::migrate_tick_offset field Date: Mon, 9 Mar 2026 16:51:45 +0100 Message-ID: <20260309155219.62400-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071675372154100 The PL031State::migrate_tick_offset boolean was only set in the hw_compat_4_0[] array, via the 'migrate-tick-offset=3Dfalse' property. We removed all machines using that array, lets remove that property, along with the pl031_properties[] array which is now empty. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307154202.86309-7-philmd@linaro.org> --- include/hw/rtc/pl031.h | 1 - hw/rtc/pl031.c | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/include/hw/rtc/pl031.h b/include/hw/rtc/pl031.h index c8b26c2f00e..75779c63122 100644 --- a/include/hw/rtc/pl031.h +++ b/include/hw/rtc/pl031.h @@ -36,7 +36,6 @@ struct PL031State { uint32_t tick_offset_vmstate; uint32_t tick_offset; bool tick_offset_migrated; - bool migrate_tick_offset; =20 uint32_t mr; uint32_t lr; diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index b56877c3a20..09d1b15c779 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -278,18 +278,10 @@ static int pl031_tick_offset_post_load(void *opaque, = int version_id) return 0; } =20 -static bool pl031_tick_offset_needed(void *opaque) -{ - PL031State *s =3D opaque; - - return s->migrate_tick_offset; -} - static const VMStateDescription vmstate_pl031_tick_offset =3D { .name =3D "pl031/tick-offset", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D pl031_tick_offset_needed, .post_load =3D pl031_tick_offset_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT32(tick_offset, PL031State), @@ -319,25 +311,11 @@ static const VMStateDescription vmstate_pl031 =3D { } }; =20 -static const Property pl031_properties[] =3D { - /* - * True to correctly migrate the tick offset of the RTC. False to - * obtain backward migration compatibility with older QEMU versions, - * at the expense of the guest RTC going backwards compared with the - * host RTC when the VM is saved/restored if using -rtc host. - * (Even if set to 'true' older QEMU can migrate forward to newer QEMU; - * 'false' also permits newer QEMU to migrate to older QEMU.) - */ - DEFINE_PROP_BOOL("migrate-tick-offset", - PL031State, migrate_tick_offset, true), -}; - static void pl031_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &vmstate_pl031; - device_class_set_props(dc, pl031_properties); } =20 static const TypeInfo pl031_info =3D { --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071699; cv=none; d=zohomail.com; s=zohoarc; b=Vd/So1aYQDPXSIkzlPLHLDZtPFmXP3E8A7WqDbbEv6lbM6Fm213D2BbvVy8VZubZ4zLMexlY3PcmfKuehnc+7/ugRAj75eizP37CEazc897naytkEylmr4ciL1DZAvoblbeNSRbCakIKNC4pxHspRLyn2Rjovwk8LWIgD4PKeiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071699; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=WzoCoJMLqVNBMnjsc6P0ukejjlUBO9sj0mR2CllotAk=; b=QuMZ5Lei0WiLIK6KUIjh5F4q0qCM2qS6fKHDaStGG3d+PpWV9uscm6ncvGGeGMpcQTQCcH0SE+T0I0k/8JEFKEMO/iCFcq+y+C0l3E1KeFZ4xeS4/QWIcUdc0zTe0adLzhNjwudQwLNpCJXnwRJWs8K2QsyMH+nP6X6t+G64BZw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071699566630.6579677908909; Mon, 9 Mar 2026 08:54:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcwO-0007lK-P1; Mon, 09 Mar 2026 11:54:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcvu-0007Mj-Ew for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:17 -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 1vzcvq-0000ME-R6 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:13 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-439c5cce2c6so5478953f8f.3 for ; Mon, 09 Mar 2026 08:54:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae35cf7sm26157523f8f.26.2026.03.09.08.54.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071649; x=1773676449; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WzoCoJMLqVNBMnjsc6P0ukejjlUBO9sj0mR2CllotAk=; b=rnQvya0SHS+0uJwl4SrrPhpiYFw2SU87lMwg4zwrJqZyTDTzNc97tYH3eH5nwY81Ko 8HQj4Ki5rsisxgDSLzbufvvQp4Ijq8ad+KcdYGz0+W+LoYWg/8HZSDKJkcTG7Pt54wTt C9GbFqL5J/3zyuKhXkbL8T7vg0tRbhdvovc6R/YDKP7QQxY6HHhX1tre+ISa8bcvGF6i +UxQANCN4wEJobTtjJuL72sd2fNZvNrvVrQgJiKZUHrBstm644H+0Q6zKf560/yvZrUK v6ndrH93l1saXm04fbqeyHDyi14vPjCECr5entkrv6tpIMqukF9oHNIJrQYyi9Qf27kR FywA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071649; x=1773676449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=WzoCoJMLqVNBMnjsc6P0ukejjlUBO9sj0mR2CllotAk=; b=aKPIgYFlhWzsBlI05QxdfEil3e4CipJ5PXjs6dkty7PeoA4WlrTp+VEBUmTu1KEIXS xNcz82NWVgy2+0CQ8BZlmI5EngziJh2ece3mpN6h1mZJuKu9jS4ghFjc1293vW/Ome9T B/i7Eno7WiNNbUgmaXJlxNbgBXeal1QUIgSx84aT0+4iMbLmAAV8uCjAdQzFGAXRZzCm mIjCX0OJHnyxQfObLYqDlkqEb2AgaLK+2rzvxugl+hmD753wxOK6GrdJ+OfJE4B127Z+ /UfL1Rl1eFU4pS1Aa1OuG/tkugbPaoxdeQ+0rBulPU3jXyx1BpDOdXpq+wQWoY2IqMsj 5B8w== X-Gm-Message-State: AOJu0YwbVL0HQersG4aLxG+NjtNbl6olyAPBoL5QI6BBbW2tBLe8E80l 9ChnBj1DNBZ6WNXXFuI9UMU1wNf6vpUshW4m4MtEAgYlfPT8GN9SdevhBRxQwcieurBTUkagfAM bIVSzv8g= X-Gm-Gg: ATEYQzzQlNrnXw2Z8QqKBd0tZcU1p/sdF8wxaV2Tyn/neIjyCKtPdUVswqBHTtFWE0O x0oT+Zgm1e0ZKHY+vhUCJb3c74gNAkRQUZvFd8LnJ4cNA5wGSoE1HAnl8YdCv8VYdz+2NAyHp3u aQxcbzUACym2EWgbZHjScNI08YeN4FRWUeFWBqXgCtCB2OD3DAW0MJgzLYYEPkdPMggoQPOngvu X3QTP/AvvyYI6MBwud8fAMKvtuArYSUp0PbCSvcjzT3RLHH1jwPqopGOjscQ/VJGR3NKkB7j+rB 2Hae4LiJTppvy4AfqsEb61U87DtJUe7rrH98dUrZkT3GStSePdrbkbXWTYbva8+BugioxIpiU0n M3cV0utmo8P83TtYXeIwIbjdM0v4Wbw0gkRVCj8ia9PsgKc/8gw+ertMRGa35LPUSU2W4iyFNof 5E6grX2xRQZwZh35hhIyculDvC8knR+2CTu/J5aqDYDHBI/ljjv0jxdSXvwl5YzENAW47UYlCS X-Received: by 2002:a05:6000:26cc:b0:439:bc31:a056 with SMTP id ffacd0b85a97d-439da8a6cbdmr22338208f8f.51.1773071648812; Mon, 09 Mar 2026 08:54:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/49] tests: fix leaks in dbus-display-test Date: Mon, 9 Mar 2026 16:51:46 +0100 Message-ID: <20260309155219.62400-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071700703158501 From: Marc-Andr=C3=A9 Lureau Close the connections and complete the method invocations. Thanks ASAN for the report. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Fabiano Rosas Message-ID: <20260122113144.2046899-2-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/dbus-display-test.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-tes= t.c index 1d5951b7117..5773776cad5 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -76,6 +76,7 @@ test_dbus_display_vm(void) qemu_dbus_display1_vm_get_name(QEMU_DBUS_DISPLAY1_VM(vm)), =3D=3D, "dbus-test"); + g_clear_object(&conn); qtest_quit(qts); } =20 @@ -97,6 +98,8 @@ static gboolean listener_handle_scanout( GVariant *arg_data, TestDBusConsoleRegister *test) { + qemu_dbus_display1_listener_complete_scanout(object, invocation); + if (!test->with_map) { g_main_loop_quit(test->loop); } @@ -131,6 +134,9 @@ static gboolean listener_handle_scanout_map( g_assert_no_errno(addr =3D=3D MAP_FAILED ? -1 : 0); g_assert_no_errno(munmap(addr, len)); =20 + qemu_dbus_display1_listener_unix_map_complete_scanout_map(object, invo= cation, + NULL); + g_main_loop_quit(test->loop); =20 close(fd); @@ -287,6 +293,7 @@ test_dbus_display_console(const void* data) =20 g_clear_object(&test.server); g_clear_object(&test.listener_conn); + g_clear_object(&conn); qtest_quit(qts); } =20 @@ -322,6 +329,7 @@ test_dbus_display_keyboard(void) &err); if (g_error_matches(err, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) { g_test_skip("The VM doesn't have a console!"); + g_clear_object(&conn); qtest_quit(qts); return; } @@ -348,6 +356,7 @@ test_dbus_display_keyboard(void) g_assert_cmpint(qemu_dbus_display1_keyboard_get_modifiers( QEMU_DBUS_DISPLAY1_KEYBOARD(keyboard)), =3D=3D, 0); =20 + g_clear_object(&conn); qtest_quit(qts); } =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071735; cv=none; d=zohomail.com; s=zohoarc; b=aMaLR0Gs0TwVwUW1nJxnQlH7r1FxBGztbacVIHvX1U65V8+yFElZ5iaAqVOMk2VF8U9EVdk0toYBvSqHAfD0O2wkYZtR9lVbM4nMSD5JByq4uJ8PO2SYzHZsA0SIq+na00iyNZ2/UyUQLHq8/l7GU3lmfzuEeu8ooIeSgzxBkFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071735; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=8HKEnxXC7jOdNFCw1vDK2f2aMKDF2U6tfcBZgm/YZAs=; b=kQ76IuZ3WpwwjZdey4d5leUJlAP1SMjWi7grWogeHRrXGp6vdrWO2Jc2H1CqkMA6nvoeiSZKahM1pYyU9j7B6tn22MP8PXlgXBnRy9wM9YLvB2wL6wjcYSm5S5WxwNCSDKFK5KdNT9VqRYg1VviJZ2jW9kuWEV9z1Dozx7LBkcE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071735203480.05838442868753; Mon, 9 Mar 2026 08:55:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcwf-00081O-Pa; Mon, 09 Mar 2026 11:55:05 -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 1vzcw1-0007Td-MI for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:26 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcw0-0000Mg-6T for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:21 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48538c5956bso14201605e9.0 for ; Mon, 09 Mar 2026 08:54:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a9c293sm627925e9.10.2026.03.09.08.54.14 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071655; x=1773676455; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8HKEnxXC7jOdNFCw1vDK2f2aMKDF2U6tfcBZgm/YZAs=; b=oIyS8P55aFboGC/DXsIrU0vFutSSO0OXgppM0R/f8LXmzYe40O+MlU6tJgJFPwH5EK hpMj+GOq+lY5fppr/++i6yVZSCO9HqqrecT/0letUNUYJCRFUIbOpItnJRsaqecqA5mP oNhgSYFsF9NHxHHFG6Y91yJho56GZfQ3l5ONtV2kPnGJ9WOM6pTk51jRbMRoG1H6YD/i dBY4mlG7OvRhsB92QCvXG2aZ5HHqfteONAQY+pzNF8jv+O0toRcbK8wqvGDjP9KUlDGC Zj3h0Bczn7sPJpQRNTMT8oW2T1Weoa7ssFdVUU8LUhUDRhe2arba9vzLvKiy4SktItaR Geog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071655; x=1773676455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8HKEnxXC7jOdNFCw1vDK2f2aMKDF2U6tfcBZgm/YZAs=; b=f3GWM1o9AtA0vgpNW43HifN0jZVM8DJUQNk5YGyjNutYJ61Cfg5YfvMtWssrPg/NY+ PfLqM+akWWgM6tnl9TUMgzsLbKdWWTG6nPQhlXEvvwZuTQVPQQi/jp4JHy/how70S0cc PFQM6HcqinyF/vL5jq6SuceBjLAqFgScOvNNCkL99Nk9KIgSXxAwrNDgdl2HPBlZrdaG A8SXMcDuZ1spvUlQBmD276HCUpHfNWKqnwuoVzrPBiZBCRI1XnZH9/UYk8Csbv4oWUCT d5qpgt+ADogjf9IMDJK+WIqkXc7qHkx2JqGvKOLbO35Pq+E7boiyxDUG3jLApXtt7XE4 9M7Q== X-Gm-Message-State: AOJu0Yyx0saFqUiB2PoWzm6AIofJUu7CRekzC8AKIjZGGvIyX4u6M+qi mB9UIhg5hbw+NcY6Y67vtL9+h0bY9FYXW4mghQhMDFAEYNalNaiI+OOVBI6rpv8JWJonr5pgXTL 6VRWStNY= X-Gm-Gg: ATEYQzx5eWv5p3YD6Qdmc+EkxKyQ/OtbXjOzHzVs9VnFugX3M7IasVcvcP6T1v1DihL Hm3uX6KSw5cxP1KBSLnhH4Q2tEaUGHcMiHld6geullaD8X6QOKkeO/axDIn1mbctLPzenyS3ODu biGPZwc7OINEXk0kNpCLkTxnkFcCWbF3eJCs6yjNaA4Gk/FHfBfm4Lk557aDebgKTOgUS6pyDhh EpouY0wFH7aIFB08l1NI+0j+4cpS7LIsRx/OfW6YyNuEOCNmND4nqpWbEU6CoJjJxvBP5YWsVXj w5YvOmlONTIUPiXekcopckw1QfiVwC+bu2UmmDc4CzoDNWGjkq0yrsznraWZHf85dYP3pftbicn stsF+4BOz4u5UPTcUeReHpISi/8NCGOgyxE7Q4+13tGEzTEkN/DHUvPBSiaEvMbALsGT5WOlufj 4TF2rxY9me73z3oV7fS8qqQeclbZQWy0ZVLx9EZwQ088ZkgTZdMv8UBaSmvXbfWBl80b8y8zUc X-Received: by 2002:a05:600c:8b4b:b0:46e:59bd:f7e2 with SMTP id 5b1f17b1804b1-485419f1614mr1523135e9.11.1773071655530; Mon, 09 Mar 2026 08:54:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/49] ui/dbus: fix leak regression Date: Mon, 9 Mar 2026 16:51:47 +0100 Message-ID: <20260309155219.62400-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071736331154100 From: Marc-Andr=C3=A9 Lureau For some reason, during refactoring, an extra reference leak was introduced. Fixes: commit 7945576cf2 ("ui/dbus: factor out sending a scanout") Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260122113144.2046899-3-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- ui/dbus-listener.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 52e041edb0f..407719fc1e0 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -815,8 +815,7 @@ static void ddl_scanout(DBusDisplayListener *ddl) qemu_dbus_display1_listener_call_scanout( ddl->proxy, surface_width(ddl->ds), surface_height(ddl->ds), surface_stride(ddl->ds), surface_format(ddl->ds), v_data, - G_DBUS_CALL_FLAGS_NONE, DBUS_DEFAULT_TIMEOUT, NULL, NULL, - g_object_ref(ddl)); + G_DBUS_CALL_FLAGS_NONE, DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); } =20 static void dbus_gfx_update(DisplayChangeListener *dcl, --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071735; cv=none; d=zohomail.com; s=zohoarc; b=Mhm4B3M2cqUlWgebHvdf09JCre7w7QRk+z7EVHchQvusj+FEuPn6rgRta9BhaJloWhV0Sj2q5n7IUotJmsBSwAKm1HklVo78p6LIli2YntwVUWGnOtXf8hmGDknL7ra11s0QJ385ir3FhAh41hhQgbLeyiuH8R1ofCfL89MbvAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071735; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=z5uB+oJJAcxPuGuh1DjXOASB24mbYKaB2eXGC4gPbaY=; b=c9zJq+RUwcB40UvPiUVPIHr8h1WGORZpzwr61GBt2vYS2VpsLmVxJdKtTOWv4+pEdK7kLQvsTQI7INZy1rl8cv7nPdDE+qZRZUFcB2ACTQi0jwQNC6sLdRFjxfCOtERJtG/CuSlg0q/dVGMDIiKy2Fg2x0U7UMBKMzzrzmXuiT4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071735112855.5001035892969; Mon, 9 Mar 2026 08:55:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcx3-0000GK-Kb; Mon, 09 Mar 2026 11:55: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 1vzcw8-0007da-OU for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:31 -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 1vzcw5-0000NP-Mw for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:28 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-439aeed8a5bso9201614f8f.3 for ; Mon, 09 Mar 2026 08:54:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae3d98asm30879656f8f.30.2026.03.09.08.54.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071662; x=1773676462; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=z5uB+oJJAcxPuGuh1DjXOASB24mbYKaB2eXGC4gPbaY=; b=AR9Jfzy4NgGp2hhpMOk2vJ8fteyFzTZrTsQMv9EBad0qok5elytVn0jaYZXyvyT8+a TXmpMaZMna1Xnavqe/tmylS0N8bBAhjJCIrC0BZLetC+OjR9uyiH3DfaZKGj/2Hc8AKK D4R9e/Drgk2QOmEcpQ67H640+ZvYmNC1hI7PdSH8+uqCLll6Men8Cjp9zGe8GOKkbBGP iL/sb4k/OgxbFblHwuSw/NuW2G9XFFEpxSVJg7eWQIj8o4NouUBgKtVNvW7/Gf3gHhG6 WokVo1EG/N3LvPbB3iMOw0cHQlW7sbxMyWMYA6u7OWk4IaymNx4F14CUV3X1hEI51R7h yW5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071662; x=1773676462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=z5uB+oJJAcxPuGuh1DjXOASB24mbYKaB2eXGC4gPbaY=; b=XjjY3BrpX8SvmPm3E929swrG7Y7JohksHmkci2eSai/Ur8QM9hpqWH/BjC6R8cxs/h rGgUtYMF3Bzkchswkw5bwllv3nOA08F47ZlWuV1KwYEOHSMv/BStUcZ/gcSyT2o+u9Mu od25qHHh7o6CEdA5ksHrGVM7p9TsjyzBvJRvT8DSDgwjOVa8HD3hhI2VcyJL4SIinRG3 69iPIxa/H3wRV+rwEGkSvnsc7Qv17GjxeZxrh67XhZx3kCEp4G8JfIazQKA/y9Y8CXJO CjPEK+deRp2g+TIl2d2NjnR4DkI9ZvdzpH7UIbXV4cMUfVrk5sdFLYQJknEcRxwiVh03 Ulyw== X-Gm-Message-State: AOJu0YwVQVNt0c72/VnJrgOcuqjsYc6vMgdlbk35Vw9+6pkwzF5TG3s1 6Y5tXnpMOnNp0eekee4+iVbpZWFJi9XtAPuxMSrJYssqIgNQtN52rfJ8H8U6/5l58IU0KrqgBet TsTCn9oU= X-Gm-Gg: ATEYQzxDh6rZ4nv4j/GgHTJwr0D56neoxw+hccuhfV3AHMf/Q8M68xd7VZlGIAA3dRG 6adHksO22wn6arxRlLHaSrHVBte5JGm7VRpYqiqe8Sdhl1o4p1yBXEMzzi5BYJ1mcpX888pZB99 X0ZaT6HVs9O3HBVwqxXqadB15MUytQKPO9i5Eorc99BS0rD8ycUT4E5w0KaOggyc9YjKj2/Qx6q FNoyAdpZGAuEqh589uT3LNew1hCkctdyT0flLHyoGBg3/yiUppuTto6kzHD4VO2G4j3C1MFUG+F kAGFAWGkAbUSoO1aGChkQhCTi9Sfdg+4hG8NzLuikqBKDIuchOPwqI+b0We2vpe3ryl2y2Q54aL ZM90moviwvV55yvEQ1JX3996/h+iqYt58iWRKFI3qC31+IH2xsBUfBgIscVn+3zeboTNdDCkzZd dhsK6SgxO4no1haDd5/8nznNYerm/CJzpxf8AkQQvxJa+t2dK1YmkhyptEg508wNWnauMKb0uk X-Received: by 2002:a05:6000:4205:b0:439:c9d0:5fd4 with SMTP id ffacd0b85a97d-439da656affmr20384401f8f.16.1773071662253; Mon, 09 Mar 2026 08:54:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 18/49] ui/dbus: fix Unix.Map proxy leak Date: Mon, 9 Mar 2026 16:51:48 +0100 Message-ID: <20260309155219.62400-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071736771158500 From: Marc-Andr=C3=A9 Lureau Fixes: commit 48b7ef0f0 ("ui/dbus: implement Unix.Map") Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Peter Maydell Message-ID: <20260122113144.2046899-4-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- ui/dbus-listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 407719fc1e0..46264839d86 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -960,8 +960,8 @@ dbus_display_listener_dispose(GObject *object) g_clear_object(&ddl->conn); g_clear_pointer(&ddl->bus_name, g_free); g_clear_object(&ddl->proxy); -#ifdef WIN32 g_clear_object(&ddl->map_proxy); +#ifdef WIN32 g_clear_object(&ddl->d3d11_proxy); g_clear_pointer(&ddl->peer_process, CloseHandle); #ifdef CONFIG_PIXMAN --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071736; cv=none; d=zohomail.com; s=zohoarc; b=bTbSyzOjM2vwzRt04MrU+hN3k8R3FSDvWBZqwHpfIS9oe+JFvSXMqug4S+KvaeOy6YPzyXPfz18uShDE4tyNZ0RlwVllrRmjQfGu+pEjkegPIO8kt+qwfm3AZYhtt4qgvlMyhHDqE9JNlnzxaNJHUdC78wgMjLyyRz6mIJV3rmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071736; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=OOvqoe7ybjz/sXWQnNO0nCuNJc5Dn+3Dmj9lVQ+2j/0=; b=IjznJ0pzTqRYgol3j1LOreG/ayaS/Gtd1WOruY3mr0ZG845U4MIcbl8XHXrwJbjAhKLpsOmAOtiAO8ex0BreKhBkdjl0WCtNkrxIEt7ROQDsCjavcLke1PddiShGZsX2yXdvOLMF8UyRdvUZnRq3S1UV8SpcncA1xPgA11YZees= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071736081874.153144056946; Mon, 9 Mar 2026 08:55:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcwj-00087c-N1; Mon, 09 Mar 2026 11:55:05 -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 1vzcwF-0007lD-4N for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:36 -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 1vzcwB-0000Nr-F2 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:34 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4852ff06541so21303825e9.2 for ; Mon, 09 Mar 2026 08:54:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a7f20csm926495e9.6.2026.03.09.08.54.28 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071669; x=1773676469; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OOvqoe7ybjz/sXWQnNO0nCuNJc5Dn+3Dmj9lVQ+2j/0=; b=CZFAPIM1U7BRbKfLjxqyrd1NwTzPsDIT+9DqxMH8vuY78O2pT4Gkt1ieiNfJSfNude XrTUY/Fsu7PQpct7Ljj3xzXdfeJn5F+uRB64BAa2tzRUNdhwKMeIS3UgPCRYPJzW4hHC 1WveRcKuw4QFBdLbwHdAxYRw8ceQXIXY13aJLwUfAeVFF7L97OyU1hwP5p6z7SID/l8n sqlJ82UGTDX91xnz4KQMKqr+FMN60z+pHQoldMmlCrBey6KpuepcmOfrpfTAVaxcAlLF yN/ubFzR6jQvLHI1z6l3VRvoDFM3xNTjEirgONDHDwcnNc1m7v7GvsAjI/R/GAkZvhei YKHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071669; x=1773676469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OOvqoe7ybjz/sXWQnNO0nCuNJc5Dn+3Dmj9lVQ+2j/0=; b=QlN/P3bCnbbooT8tvjNqSwybA53MQfA8KBlYLw+afIDpvu74qlA/9Ok3QbMIhsRUuv liLDj3ebgSmzPlTBond0zHCJSvjk5o50jDOx9gaQmDAdeosCOwCS6Uj9ENltsG9t7463 0I6Es2NR1+wT3S0wx9CyiqVpmmLpKixYt4C+69r+Yi0g2z25sMcdk72nvZoOG177GzRN VbWBUk129pDBPxSFOsS63h7mxFsjdtmxcVsD+RqcueFDakt634RqM9esxhNxHWZlO/r0 +65RamJBxQYh3leVLqICUA6Uh10y9baV5ikzB+1uJ+fQsbz+P9M7pdQYBDJDnM6z/IxH WHQA== X-Gm-Message-State: AOJu0YxYjEPGeXJDwMvcOysXrW7HoaPweBY/AHgiJAvVVkEvjgM1v6ks Hp5zGLmKAAKx1vFiwbYvsgifsg3881S7ZJgBF+pfPVIn9Cmj4xpaqv6xq0D/uAnMmolboZEen7Z gh9lSxqw= X-Gm-Gg: ATEYQzxK/z/B0bcnDRuZFxCXo+WGwTvIXVZRxEUNBM8oIDZYHM0b9mSWUkaAkXuXidW ESVxSTOvrD+064VUVgBXIwnlQ355YNvbL4UWZiZBRNk1NFDFCKbdAI3Lsf9xBLGvRW4MIJZC9X/ /YBpJy8//myd0FFvcKws939dazGTjbJxn8AxMjr4asH1SNvsgHcCcCuCiExn+Bgk2+zHb73ViHp /D6ZEX5vATbF1Fmp0Pc5IeZWxw4G1NTiW0k9jkrIxrsjqVAQv3qCyjp5RM2wge1XAmgdjeAmg6f 9i/Sqrzdu8RQxuA9+8TJ3ne0J0RrnJ5IM6dgeAw1mQzcIU8x30LeKJoWMfapYVrBuboJTYmInQ+ jZx151h+ykfbCFPUtf+JRhZ45F7RAmRCJK+eDNH4M1BjatT0sMsMAbWjBJ3+7bBkh59vYM1f/+V WifVfnhkhP3Qlrri3NVOttyjcn18NqutYixnIoiNz5PNWgIRkDKx4J2sVCgT4eV+C3MLo9OYmx X-Received: by 2002:a05:600c:350e:b0:480:4a90:1afe with SMTP id 5b1f17b1804b1-485269785afmr180347865e9.34.1773071668993; Mon, 09 Mar 2026 08:54:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 19/49] ui/dbus: fix pixman cleanup Date: Mon, 9 Mar 2026 16:51:49 +0100 Message-ID: <20260309155219.62400-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071738327154100 From: Marc-Andr=C3=A9 Lureau Moved pixman_region32_fini() outside the WIN32 block so it's called on all platforms. Fixes: commit 7007e98c ("ui/dbus: implement damage regions for GL") Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Peter Maydell Message-ID: <20260122113144.2046899-5-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- ui/dbus-listener.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 46264839d86..3e2b4adf41f 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -964,15 +964,15 @@ dbus_display_listener_dispose(GObject *object) #ifdef WIN32 g_clear_object(&ddl->d3d11_proxy); g_clear_pointer(&ddl->peer_process, CloseHandle); -#ifdef CONFIG_PIXMAN - pixman_region32_fini(&ddl->gl_damage); -#endif #ifdef CONFIG_OPENGL egl_fb_destroy(&ddl->fb); #endif #else /* !WIN32 */ g_clear_object(&ddl->scanout_dmabuf_v2_proxy); #endif +#ifdef CONFIG_PIXMAN + pixman_region32_fini(&ddl->gl_damage); +#endif =20 G_OBJECT_CLASS(dbus_display_listener_parent_class)->dispose(object); } --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071756; cv=none; d=zohomail.com; s=zohoarc; b=GOkNa73a96Rk2BTC9uZCk1JrOxKBDn9ETMo5ArEue68nML8yUO4JUXAa3fRPnCi1HFq9OW3o9NFS+mtI/YruOzazG6/5hMbRKIeI2761xyiP0xnMaLJ/BONsJuA7A5CEB3kFXRiJ3zNNHGQE8p198CdTj8aINpm0OjAWLHQrwR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071756; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=7lJ49HVs4Gy01kmm0B1/+3vVeTk1ijRg1tNGB25SQmQ=; b=Vt4GZjo+wYc4LyJhuNZLH5jllKiEQpDxQj7hDVBwcumpjqdeL6qMRwfguXrtas7NFjG1b3ZJ1QlwSWMSpspfKpPmxpS7eHRSvkMIlNEMQPAKMwVGWyQyjVwOlHbpzJrDlxdvXTqemvXhnD+ZzIZh0y6PZIae3ZUFETAvnrIvZwY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071756038213.44547188767672; Mon, 9 Mar 2026 08:55:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxB-0000o8-Ek; Mon, 09 Mar 2026 11:55: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 1vzcwK-0007qj-Jy for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:44 -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 1vzcwI-0000OQ-I7 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:40 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so10334655e9.3 for ; Mon, 09 Mar 2026 08:54:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae483desm26243502f8f.34.2026.03.09.08.54.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071676; x=1773676476; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7lJ49HVs4Gy01kmm0B1/+3vVeTk1ijRg1tNGB25SQmQ=; b=jwUflGDYk5rNzdew7hWNoEzV2Llyct+ICVKC2cCjSHRzdU11bg8Jt77S39uCC4Du6c R5e5PbwcOmx1RUAqr1eGK+FcPGPpW5VFJICiQoly6wYCpfqACIpdgD6K7glBH36geA8H 8hjUogQ30zUG+7/YBh4ZCIaisefi/2yO9EbAXBtzz5NzK0acrJQzrAlN16CRbO+MnZnM Rjpkk9efEuom07C3V2Febqmd/48vWMNJBznI16eX4ger6oZLvFDIJe65sihhB4bAOe10 VbJdArJibi7tx6db+Lc1qLqMexLdwLw+Fd5gk+R0EqdY+3+ecZpkBHTIc9RVE7tfMuuf n7kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071676; x=1773676476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7lJ49HVs4Gy01kmm0B1/+3vVeTk1ijRg1tNGB25SQmQ=; b=jogmp+ZH4xp9qQaauOHwCblmX6s8kxPeSmUl6rDUfdsEvg1RcbCi6FZ+RbaTHzeFSa ZZAGAobT5mkWIBzGM7V6o4yV4AUwBeX1uCxx3TwFNcWWK8tLkShiiSlv2BlO7sul/WnF QfkBda7tLCQGC1NA6N1rv8992GaYXAFQ/HRPVHd5XyJCDm7Ppjh6iIQhyDNfx6J947Qq baO2CAS7S0ZnKhvMD0voddi7MGrXd4E3JaGovR2IU/8oDY+Q5Li/kmLql0O9jm6NntR5 oLruELzTFOj7n+hph5tcbGrj0BMFNdRp1m6OjuD/NkDHcBaPBbrGlB3e1v7DHR+ndl/+ sTUA== X-Gm-Message-State: AOJu0YxrVH87b07OgYvIHSVjwLSxn7Ka31wnWVtXVOMHpJHUdow3a6Tj nbMKqsANmUG6jRS466g+zt7/QHRP0zBqr+nkaIAKwSZmmCWv+NVM/hvkGub6TetND3dNxBenGpR UZ//bFfg= X-Gm-Gg: ATEYQzz8yCbUXjG67tZtlDu7A1a0O1ESAH/Uk5ubZBi3gO+KwzhjYAdFghyRRt53zlc hVTvIE1brJ+hbF1R4zYDTLhkXIlavqMw/+CBi42GzwvXPZzDzax9ZeN46FRiEKNYd+CfmlCixDu iVtP22hScQG3LSzxwX8YZHb9gGx6udQuUuSGFbOLd+0e12q0rjvXKJSJlUczKZ0t3nLo1CSpnlD k6w9ZmcTBIfo5keor7IHbH0cId2VvrGz6QgCG9ApwSSFIWP3oZLGFC1qxN+2QvgjJ7lNK50+5Zn u5Yu+3hgZnT6t2zCjKsvsNv9+F/K8t6icXtCyRdke/nRMXcGMZ6NHtma0NZ0G+ALUt3RcHn1ubF F+UKwZx4PKF/PrMtRVBM1axRDjEj2OOFjFIrqzTnF2h9Cwts+ESP7Xvj3Tu/QYQVYt81hM+fyNQ vRe552kp0odTj25dANB/6m/xpZOVCvHgsgJ0S0KA64h6L8GlYjlyFANUJCmAJV5zdOobU4tKJy X-Received: by 2002:a05:600c:1c0d:b0:485:39d4:2dd9 with SMTP id 5b1f17b1804b1-48539d42ea2mr87280135e9.33.1773071675728; Mon, 09 Mar 2026 08:54:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 20/49] coreaudio: Remove unnecessary explicit casts Date: Mon, 9 Mar 2026 16:51:50 +0100 Message-ID: <20260309155219.62400-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071758678154100 From: Akihiko Odaki coreaudio had unnecessary explicit casts and they had extra whitespaces around them so remove them. Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260304-coreaudio-v8-1-bf1d40731e73@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- audio/coreaudio.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/coreaudio.m b/audio/coreaudio.m index a28fa77d73f..cbda4f14369 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -310,7 +310,7 @@ static OSStatus audioDeviceIOProc( UInt32 frameCount, pending_frames; void *out =3D outOutputData->mBuffers[0].mData; HWVoiceOut *hw =3D hwptr; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hwptr; + coreaudioVoiceOut *core =3D hwptr; size_t len; =20 if (coreaudio_buf_lock (core, "audioDeviceIOProc")) { @@ -394,11 +394,11 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) } =20 if (frameRange.mMinimum > core->frameSizeSetting) { - core->audioDevicePropertyBufferFrameSize =3D (UInt32) frameRange.m= Minimum; + core->audioDevicePropertyBufferFrameSize =3D frameRange.mMinimum; warn_report("coreaudio: Upsizing buffer frames to %f", frameRange.mMinimum); } else if (frameRange.mMaximum < core->frameSizeSetting) { - core->audioDevicePropertyBufferFrameSize =3D (UInt32) frameRange.m= Maximum; + core->audioDevicePropertyBufferFrameSize =3D frameRange.mMaximum; warn_report("coreaudio: Downsizing buffer frames to %f", frameRange.mMaximum); } else { --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071715; cv=none; d=zohomail.com; s=zohoarc; b=fqxOqO/KItHk/tLWeN+yfEgSsuhxFXkmvwLW4c+cKgsVh29UWW1rYNMt9D8lFlqQxvKzAgoPKrkQJmR+/VB0Il8/99F4peYiEQjTbAgLblGKIEeiv58Wc0pZPPCkIyQUVa/2I0z78P38rHa3cA9oUbQXf3nkXPZOqT4Cx5vnuSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071715; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=R4mjnc6tXY+cKbc3ib7GxWhkvz4lXXEfF9utxwY+JMc=; b=UVjv5Wb6CnSw6mCAA/n6JSRoBo76cSZ13frEHm0gGx+BK0+U93g1S3ZezJ2r1qPxLDhyupg66CNtd3TXZQJHKs5NOtZjeRBXheYAQBDsn67BwMycgiFteUGrpveEF8ju4kwh8GvRgpg7cZQKI4+t7g/FfWtTBYD6nRsj3i5No7E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071715436395.6675260982497; Mon, 9 Mar 2026 08:55:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcwm-0008Fu-4a; Mon, 09 Mar 2026 11:55:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcwQ-0007wZ-B8 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:52 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcwO-0000PJ-NT for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:46 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-439aa2f8ebaso5672921f8f.2 for ; Mon, 09 Mar 2026 08:54:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2bdf8sm28802948f8f.25.2026.03.09.08.54.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071682; x=1773676482; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=R4mjnc6tXY+cKbc3ib7GxWhkvz4lXXEfF9utxwY+JMc=; b=szCc/nNyqCG/yAP6TVF998kQi+RLqcq94LtRz9VgkDFDpD/T2TZzEMpT7CJEXzIojm 6JIddnC5HMaZBTuSX8jMbpQeqS+Y/M4yJH5cyigmJS1uegYju4FvgpjCi9CHPtErKMHw IrxN4ZMZlT0NV0a3+n9UMbG4b2hwDIqy5lNf6vuPDeXM/pRRLblAfneYu336leJTL7oV Nx6lyGSRaER0Ms40T8uMIHsUqvwSyvh6RXZnAzup79Qiuxdwm3RCYw23h1uKOVxoVd9H lygW8q4xZkTXsxj5FAB0bj+zRKOSqWA2SXPX33Dx4yIq9Tvu0NjokD5d2fwQaUK8r6uy XgqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071682; x=1773676482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=R4mjnc6tXY+cKbc3ib7GxWhkvz4lXXEfF9utxwY+JMc=; b=cLnHBEBeO5tTMdF3+YHIdQSFqd+WkCcgs/3s93uyUpDrVcy6cOc/cXhaNG6t5MFxS9 EQWxo9LFL3hB346VnK2CWFkkszRGSA/6kBSCOacqw1b8haVmsnqDubOKG597Gaql4+MM Bcuxic65Gq3eKCEWIVhkJmrK7SbHACfHF5VEt+/PdVRkcfPmnyMQwl19tlBf3vYGOC+w m7d73F1wbT2YJHG8svmk5Akqk38HpGK+J14pcXAidTY5eUIFblWmpPN1FS7Wah1iUitk G9XzD56heedpA0aEvl7QgMkjV0E5JAew3FVBBV+2MMHZeoWRpyxvqOhLPVK10jbBsMxw 9y7g== X-Gm-Message-State: AOJu0YxnBH/9f25zq2S0mnjsAs6KAxT43VKF1FMYPDufwEqxqnq/jjS4 tYuEvfsqtwRpVqsMDN/hZXcNc9fCWA6ENJA9ulTxc/iEsYpzEQE2Een0nO1xneOQJtKQBq2hltR O1cQn6og= X-Gm-Gg: ATEYQzw6Mc6zzXqNdjlmxrI6TTfSx8SNaTHMEfnVOjWXR8S8YujmxlQ7gkWP3ygVjks 96wSzMKiyza3cv+zHUyKXduIvbTXOlxbNotROZbPQQbu41sYXjECGx29lqdIhPlfEgQ5kNmK0CZ qfzWWCJG+WVBonEnAXCYcCRSV7sDGfMMY6Tiv58GdJtspQUGxnyZ3+/LWUiH6o16u9lSuCVCvda TnvJt00XoHjgL1BSL8Jm+5m2xpqtBgjI1b8JIMkyyYreRAs+7dt09nYpANxEzhTr4ZsFD/uPKFd nCtrklkaTC/WD+fnq53ngn6mMWawwNCWkGs/u1GiKHUdOEU5IlpC23ePzJ9Ba/cxoa8x9icNRnO u6ltyp9ODSi6ETDxFSSUt2mRWsH54tXj6Ff7jbf1EgCyQcdh55kde+urHWQR/t0U87J6w5GiQ0O bG9nEkRScbQiV++/DIBC4LvSM4jgbCKeRcFFHrB9cVhx5OzdBTJXDcPzlah1OmaTXMmTkWeKsjK WmA/P+Xl3I= X-Received: by 2002:a5d:64e7:0:b0:439:af81:1b21 with SMTP id ffacd0b85a97d-439da118cbamr19063337f8f.0.1773071682485; Mon, 09 Mar 2026 08:54:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 21/49] coreaudio: Remove extra whitespaces Date: Mon, 9 Mar 2026 16:51:51 +0100 Message-ID: <20260309155219.62400-22-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071718190154100 From: Akihiko Odaki Remove extra whitespaces around parentheses. Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260304-coreaudio-v8-2-bf1d40731e73@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- audio/coreaudio.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/audio/coreaudio.m b/audio/coreaudio.m index cbda4f14369..bc9ab7477b6 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -272,7 +272,7 @@ static int coreaudio_buf_unlock(coreaudioVoiceOut *core= , const char *fn_name) #define COREAUDIO_WRAPPER_FUNC(name, ret_type, args_decl, args) \ static ret_type glue(coreaudio_, name)args_decl \ { \ - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; \ + coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; \ ret_type ret; \ \ if (coreaudio_buf_lock(core, "coreaudio_" #name)) { \ @@ -313,13 +313,13 @@ static OSStatus audioDeviceIOProc( coreaudioVoiceOut *core =3D hwptr; size_t len; =20 - if (coreaudio_buf_lock (core, "audioDeviceIOProc")) { + if (coreaudio_buf_lock(core, "audioDeviceIOProc")) { inInputTime =3D 0; return 0; } =20 if (inDevice !=3D core->outputDeviceID) { - coreaudio_buf_unlock (core, "audioDeviceIOProc(old device)"); + coreaudio_buf_unlock(core, "audioDeviceIOProc(old device)"); return 0; } =20 @@ -329,7 +329,7 @@ static OSStatus audioDeviceIOProc( /* if there are not enough samples, set signal and return */ if (pending_frames < frameCount) { inInputTime =3D 0; - coreaudio_buf_unlock (core, "audioDeviceIOProc(empty)"); + coreaudio_buf_unlock(core, "audioDeviceIOProc(empty)"); return 0; } =20 @@ -349,7 +349,7 @@ static OSStatus audioDeviceIOProc( out +=3D write_len; } =20 - coreaudio_buf_unlock (core, "audioDeviceIOProc"); + coreaudio_buf_unlock(core, "audioDeviceIOProc"); return 0; } =20 @@ -563,7 +563,7 @@ static OSStatus handle_voice_change( static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as) { OSStatus status; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; + coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; int err; Audiodev *dev =3D hw->s->dev; AudiodevCoreaudioPerDirectionOptions *cpdo =3D dev->u.coreaudio.out; @@ -579,7 +579,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct au= dsettings *as) obt_as =3D *as; as =3D &obt_as; as->fmt =3D AUDIO_FORMAT_F32; - audio_pcm_init_info (&hw->info, as); + audio_pcm_init_info(&hw->info, as); =20 core->frameSizeSetting =3D audio_buffer_frames( qapi_AudiodevCoreaudioPerDirectionOptions_base(cpdo), as, 11610); @@ -615,7 +615,7 @@ static void coreaudio_fini_out (HWVoiceOut *hw) { OSStatus status; int err; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; + coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; =20 status =3D AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &voice_addr, @@ -636,7 +636,7 @@ static void coreaudio_fini_out (HWVoiceOut *hw) =20 static void coreaudio_enable_out(HWVoiceOut *hw, bool enable) { - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; + coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; =20 core->enabled =3D enable; update_device_playback_state(core); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071737; cv=none; d=zohomail.com; s=zohoarc; b=WMw80U2no9fCEZLLh1FPwPqjHI2sZ1rUGq0dSg0Tjoj6DKWGO1j0olHjI+pB6DzA9da50emJHO1tjixaMm+TDegcA6rNrsZSSU6/uSLa8xbMgjNQSPiStyk3uEDyOV7kG+tiklwqcMafyEjM4Fb3gQIlUcZSvmCnJVM1QYuEnHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071737; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xRjEhQJtjZMDsvFKB7U/z4AeDldYrLH9CdDk4sJlXaI=; b=Q0Lm70M9g9qfaJoPiM5M2lTnURR1lKqZT091cTUEFnAoNJ6Eqb+TnZe6kcfZp88iJAhvm1QB+6E6GlMBo5tyZN8T0TLfKv+8OrpC2wQiyoU6yIHXuuDa0cDzkpIV66XYEMJNOoWtZJDYQJlt89OPK8glr9vgEpfwFeUZzxr8Y4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071737152884.3882837921949; Mon, 9 Mar 2026 08:55:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxA-0000n6-W3; Mon, 09 Mar 2026 11:55: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 1vzcwZ-0007zu-T8 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcwV-0000Ps-HO for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:54:54 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-48540355459so5922965e9.3 for ; Mon, 09 Mar 2026 08:54:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853f8f9938sm11894425e9.23.2026.03.09.08.54.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071689; x=1773676489; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xRjEhQJtjZMDsvFKB7U/z4AeDldYrLH9CdDk4sJlXaI=; b=e9AzbE4IDOJcEZ3uSnUYnwuZ1Qf5dwRpQqUztDrZM7JGMjXwdxHj1tyBJwSTLxoYjl Gr1oF9XYtNCpBCAEFZtPxuzxwtxb9UmcIoY/K+tgbCd4VY/yh4HpKWHW/dQYxpZ9O9y7 13UtrY3CrKH/7PA+F7yX0x5Arz12zRFLa7iZd46zui3twfqJzeqvo5vfeO/qfThnJNys mFs8iU0mgNh67bJs3jGUotwtzqxBaJKWFLVwQysQaUap01W65K3ta1D5K34BgKsp3266 oYtaMQuZQGkeInROtASuGsFoRJjyDatm4EChJiIr9r5rzo8HdOHNEZpBqiYHLaitUAxy vhZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071689; x=1773676489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xRjEhQJtjZMDsvFKB7U/z4AeDldYrLH9CdDk4sJlXaI=; b=lzHdwLaRCIYg+PeC+/gsvBaFtHOgiCzF70a4Brv0oBqcAgRlQ2q2zyK5dJHRRUv9vh 2Nugk3ee/DI9tjvOFYZswqb6Pa+0mFac28zZWCndRIJkQQ4GDyaKnOx0g0vc7y0GtWHi QqjxQxFC0eTl4xkonKBQVkpFvLetyIQulzDfS+FeFasGMdwUNLwjHad3DLn4ctezzC52 8GF+L6Cp9hJnGVgDldz9Zg7OYfRPSm101ENjS/Sb40O4yXF01cf+7vU03iKYD84aT5iu l4lWUjWS5kwCUtViTqCMXeY4Zf+zNrqzKF9Ht5UYoNTB5iL/sihkeNAJBrmcbRRwoocr twTA== X-Gm-Message-State: AOJu0YzXR4qLZNWCYeoApGIA4aSkAJs5z8X0RQMfNlBNHtavWcmysit9 kH3HC1c9Elc36HI/LTMHlee2kC8SZmJLgesvGyeZBr1rn1/cJrkvCmTckk8RVoxIBX7GvOEdGat mX+XklYQ= X-Gm-Gg: ATEYQzw/lPfd0gNz4pWEI8L7/KJbExqZSJ8pr2iYGfbpaYCg8oo+dmxp9/q5vGhLsRq iqirsKy4qDR4CdHZr3rmVmMAUDIS2t4Bp5o1/sNO+kclxX26M3aFzhEGTXsMp7kuY6KUj+whJ/n qEUNitUtXDqrFZfKUiP2wWuMi2OH4uSls1Cw2AiXtbIIqFEA3q0ZZgZMARKNcVtDwn1PGpoFau2 pqlo1+NUCjf+N0c45SBWl/iHHJyHAGDYMecJvcQOn5o3jzhYJXB8nGYptj+dBeMQn8beINw8hL2 TfMhf/77pPaaW410EkN97vPRMBUcr1NMBz+tC6zKq05SsRVutrYbcPrsW6hg3/DJYcL/F5wOefh F+u2EIpyUNP/3Gglb02oAeizwGJe+Uys7ScKBvD1n3pi4rCy0I2VkUeJBL0D7A9kqPVsizQSSON QQOvoVu6twGvq5oXqwWnp2sbGkz/HLvZyJVNITDDqy0JAn8Pu5WMhfu2fy6np/I/TWibAaNFW5 X-Received: by 2002:a05:600c:3510:b0:485:3c05:24cd with SMTP id 5b1f17b1804b1-4853c0527dfmr52218495e9.33.1773071689229; Mon, 09 Mar 2026 08:54:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 22/49] virtio-snd: remove a redundant memory allocation Date: Mon, 9 Mar 2026 16:51:52 +0100 Message-ID: <20260309155219.62400-23-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071738862158500 From: Roman Kiryanov This change also makes its lifetime explicit and prevents NULL dereferences. Signed-off-by: Roman Kiryanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305042523.335493-1-rkir@google.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/audio/virtio-snd.h | 2 +- hw/audio/virtio-snd.c | 53 ++++++++++++++++------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/include/hw/audio/virtio-snd.h b/include/hw/audio/virtio-snd.h index 9560bac8b15..da2ba9675e1 100644 --- a/include/hw/audio/virtio-snd.h +++ b/include/hw/audio/virtio-snd.h @@ -216,7 +216,7 @@ struct VirtIOSound { =20 VirtQueue *queues[VIRTIO_SND_VQ_MAX]; uint64_t features; - VirtIOSoundPCM *pcm; + VirtIOSoundPCM pcm; AudioBackend *audio_be; VMChangeStateEntry *vmstate; virtio_snd_config snd_conf; diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index b8376433f7d..0f78cec967d 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -130,7 +130,7 @@ static VirtIOSoundPCMStream *virtio_snd_pcm_get_stream(= VirtIOSound *s, uint32_t stream_id) { return stream_id >=3D s->snd_conf.streams ? NULL : - s->pcm->streams[stream_id]; + s->pcm.streams[stream_id]; } =20 /* @@ -143,7 +143,7 @@ static virtio_snd_pcm_set_params *virtio_snd_pcm_get_pa= rams(VirtIOSound *s, uint32_t strea= m_id) { return stream_id >=3D s->snd_conf.streams ? NULL - : &s->pcm->pcm_params[stream_id]; + : &s->pcm.pcm_params[stream_id]; } =20 /* @@ -260,7 +260,7 @@ uint32_t virtio_snd_set_pcm_params(VirtIOSound *s, { virtio_snd_pcm_set_params *st_params; =20 - if (stream_id >=3D s->snd_conf.streams || s->pcm->pcm_params =3D=3D NU= LL) { + if (stream_id >=3D s->snd_conf.streams || s->pcm.pcm_params =3D=3D NUL= L) { virtio_error(VIRTIO_DEVICE(s), "Streams have not been initialized.= \n"); return cpu_to_le32(VIRTIO_SND_S_BAD_MSG); } @@ -424,8 +424,8 @@ static uint32_t virtio_snd_pcm_prepare(VirtIOSound *s, = uint32_t stream_id) virtio_snd_pcm_set_params *params; VirtIOSoundPCMStream *stream; =20 - if (s->pcm->streams =3D=3D NULL || - s->pcm->pcm_params =3D=3D NULL || + if (s->pcm.streams =3D=3D NULL || + s->pcm.pcm_params =3D=3D NULL || stream_id >=3D s->snd_conf.streams) { return cpu_to_le32(VIRTIO_SND_S_BAD_MSG); } @@ -440,7 +440,7 @@ static uint32_t virtio_snd_pcm_prepare(VirtIOSound *s, = uint32_t stream_id) stream =3D g_new0(VirtIOSoundPCMStream, 1); stream->active =3D false; stream->id =3D stream_id; - stream->pcm =3D s->pcm; + stream->pcm =3D &s->pcm; stream->s =3D s; stream->latency_bytes =3D 0; qemu_mutex_init(&stream->queue_mutex); @@ -450,7 +450,7 @@ static uint32_t virtio_snd_pcm_prepare(VirtIOSound *s, = uint32_t stream_id) * stream_id >=3D s->snd_conf.streams was checked before so this is * in-bounds */ - s->pcm->streams[stream_id] =3D stream; + s->pcm.streams[stream_id] =3D stream; } =20 virtio_snd_get_qemu_audsettings(&as, params); @@ -884,11 +884,11 @@ static void virtio_snd_handle_tx_xfer(VirtIODevice *v= dev, VirtQueue *vq) stream_id =3D le32_to_cpu(hdr.stream_id); =20 if (stream_id >=3D vsnd->snd_conf.streams - || vsnd->pcm->streams[stream_id] =3D=3D NULL) { + || vsnd->pcm.streams[stream_id] =3D=3D NULL) { goto tx_err; } =20 - stream =3D vsnd->pcm->streams[stream_id]; + stream =3D vsnd->pcm.streams[stream_id]; if (stream->info.direction !=3D VIRTIO_SND_D_OUTPUT) { goto tx_err; } @@ -966,11 +966,11 @@ static void virtio_snd_handle_rx_xfer(VirtIODevice *v= dev, VirtQueue *vq) stream_id =3D le32_to_cpu(hdr.stream_id); =20 if (stream_id >=3D vsnd->snd_conf.streams - || !vsnd->pcm->streams[stream_id]) { + || !vsnd->pcm.streams[stream_id]) { goto rx_err; } =20 - stream =3D vsnd->pcm->streams[stream_id]; + stream =3D vsnd->pcm.streams[stream_id]; if (stream =3D=3D NULL || stream->info.direction !=3D VIRTIO_SND_D= _INPUT) { goto rx_err; } @@ -1064,11 +1064,10 @@ static void virtio_snd_realize(DeviceState *dev, Er= ror **errp) vsnd->vmstate =3D qemu_add_vm_change_state_handler(virtio_snd_vm_state_change, vsnd); =20 - vsnd->pcm =3D g_new0(VirtIOSoundPCM, 1); - vsnd->pcm->snd =3D vsnd; - vsnd->pcm->streams =3D + vsnd->pcm.snd =3D vsnd; + vsnd->pcm.streams =3D g_new0(VirtIOSoundPCMStream *, vsnd->snd_conf.streams); - vsnd->pcm->pcm_params =3D + vsnd->pcm.pcm_params =3D g_new0(virtio_snd_pcm_set_params, vsnd->snd_conf.streams); =20 virtio_init(vdev, VIRTIO_ID_SOUND, sizeof(virtio_snd_config)); @@ -1335,23 +1334,19 @@ static void virtio_snd_unrealize(DeviceState *dev) qemu_del_vm_change_state_handler(vsnd->vmstate); trace_virtio_snd_unrealize(vsnd); =20 - if (vsnd->pcm) { - if (vsnd->pcm->streams) { - for (uint32_t i =3D 0; i < vsnd->snd_conf.streams; i++) { - stream =3D vsnd->pcm->streams[i]; - if (stream) { - virtio_snd_process_cmdq(stream->s); - virtio_snd_pcm_close(stream); - qemu_mutex_destroy(&stream->queue_mutex); - g_free(stream); - } + if (vsnd->pcm.streams) { + for (uint32_t i =3D 0; i < vsnd->snd_conf.streams; i++) { + stream =3D vsnd->pcm.streams[i]; + if (stream) { + virtio_snd_process_cmdq(stream->s); + virtio_snd_pcm_close(stream); + qemu_mutex_destroy(&stream->queue_mutex); + g_free(stream); } - g_free(vsnd->pcm->streams); } - g_free(vsnd->pcm->pcm_params); - g_free(vsnd->pcm); - vsnd->pcm =3D NULL; + g_free(vsnd->pcm.streams); } + g_free(vsnd->pcm.pcm_params); qemu_mutex_destroy(&vsnd->cmdq_mutex); virtio_delete_queue(vsnd->queues[VIRTIO_SND_VQ_CONTROL]); virtio_delete_queue(vsnd->queues[VIRTIO_SND_VQ_EVENT]); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071812; cv=none; d=zohomail.com; s=zohoarc; b=Ye0KReyxrAOyzKJVPdG/C538MKGAkDFLRqhMQpCDsT6QVeFS/lsh4U7OMTjhVnmj+XJTU7mgA92NRuRLQuNfirvLZpJNh14mOy4zkGvty/D9qK6Pszq1EhmZOnG8T86ILDX2d6ZZ90WCCDP9+faXOpR5XFGgIhiWfDkeIVMYoQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071812; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=sRCFEGQuPtiHC3VwnDLK81Jf/zv4v7LzPgcsCWptTAo=; b=NimfBQruol8cojscJPCsPLQKo3X3fRBMXcqwBr3kGGuw+oYL9PNI3m6rcqB3qveC80D7n+kPTzr20g39agwY2rNPutAAXuVT8U6VVpvBGwbD3dSD2+S88Da1pZaOa9F9wGbqqmRO5RV0KOz/WOqYbIuKCPYkGOnf9xXqfqTxtgk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071812452118.99248068569648; Mon, 9 Mar 2026 08:56:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxB-0000oD-Gg; Mon, 09 Mar 2026 11:55: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 1vzcwe-00086D-Go for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcwc-0000R2-1H for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:00 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-485409ab264so3751895e9.1 for ; Mon, 09 Mar 2026 08:54:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237f354esm92111355e9.5.2026.03.09.08.54.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071696; x=1773676496; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sRCFEGQuPtiHC3VwnDLK81Jf/zv4v7LzPgcsCWptTAo=; b=Mgu4I8kNgnrQPuqmu5uFpM9KHZzjjA9mgn1T5ETa6j/UntaxVA4aoJM9v1v2z+EI36 UbtQlUDAO4q4fbtQ/2V1TE2obsMoUC7tbkdwbV414Ev3Qt/Cn+Oeg1TOXsiZ+hW7Wu34 DkLC3yhiic9rlsEoKS6hfLo5mZcj1jWDnmHBg8wBscedvcgAijl+dfBAeqUbBt9rxDt/ APWZ3rsY1vZGf0oRevaxhOYGYjOaYv9uiDJt3L5xXGisdYOkmBqLSTgaW695Wh2AVTjo wOclhcxh4OIXccGTT0rR8LWwyJcik4/dvuxkLo/eghAhouBCA3BHXSUnByGFE3LhQoSV YCww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071696; x=1773676496; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=sRCFEGQuPtiHC3VwnDLK81Jf/zv4v7LzPgcsCWptTAo=; b=KnAbV3EjBE8Tx0G42RCfuzCDrIWM428OlxYplcddPvv5OYY+VmNyops5ShKQG6FQS8 PjzxY2GEEVG4TN1zDGehOXrn33o5k4N30GyGDtlAVbo2UoEewd4sVC4jNSwjmvd8dtRZ dL9eOUtHwV4Ygf90mdRBp3tdu+ZQjS8RTbl/FtIopuZ+xx1+Bo2MRf8QInIuaapc8ila mrNPZzssm7f4RE2K1DCxIYRFyDNz41iLkaA4C7tDmacC0eSkR6ARgk6OR5w5C+6Uv5Jy yZHmJ0X8Lzc9R7bIzYwh8LLyMpAq6dlCfmZCc56lK71fpPE9VRBsT5z5Q4fz5Zm17ST+ Inzg== X-Gm-Message-State: AOJu0YwEHKVMpeS/Elz5PP9YQt+8n9EBkfJE4xLrbtAdJhKP9vVjvwnR z0FKaBjNW/Ig9WuQYXYcOXWPJb1NybBfBDLLD1PKAzGLvY6dOkG7wB3pPeGlLZkPRevVfN1omkq 2gAxlBIk= X-Gm-Gg: ATEYQzzZoRZThX54MUW75CNpQuNPfnIy/n6wOmuVbfRjaR5tfnVXpWBKRkhSFzXLaYT ysoXiKiPldlu5fxikNrcdk6kPGx6eI6CD67IzAKREoQSgOrUmUGwyXzEuAga/6j0a3uA7b0Gswt 9CFg1k7GD2elYllG0ASuBgK4/gtmUrEO4Kg88Ivbvir7tB9KE0ythnQgLCkyIZsukJ+J3mJvqSc fW5G77fj8C36XM0jtYzTrbINYtz5qhWMQsQOZvN5Q1n5H0bckhpscpY1XP7AruSTA8P8bXSQweW mkXqC5YGwsIyHwDOFpusaG8nunPxV5+wMzfkaKo9b+6A1l95dyZ71Kiyt0gjPLowxxKDdH5S4Ix ETCM2NpXqUzkKhRQ+uP0PE003YwPejO/mQ7Gtwl4HNTvcnP+QdkCO/dcNC9CS/cAOh+xB6gwtC9 fDwmjmACqPARBLGIA30JCpk9rcYePgoCIm119bPCpN/r9RLfB2E7olUNHunpBD7ib2biAdLVyd X-Received: by 2002:a05:600c:138e:b0:485:3e00:944a with SMTP id 5b1f17b1804b1-485419d759amr1574105e9.9.1773071695970; Mon, 09 Mar 2026 08:54:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 23/49] virtio-snd: remove redundant fields Date: Mon, 9 Mar 2026 16:51:53 +0100 Message-ID: <20260309155219.62400-24-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071813599154100 From: Roman Kiryanov VirtIOSoundPCM does not need a pointer to VirtIOSound because each VirtIOSoundPCMStream already carries a pointer to it. Signed-off-by: Roman Kiryanov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260305042523.335493-2-rkir@google.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/audio/virtio-snd.h | 2 -- hw/audio/virtio-snd.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/hw/audio/virtio-snd.h b/include/hw/audio/virtio-snd.h index da2ba9675e1..e28f1be5db9 100644 --- a/include/hw/audio/virtio-snd.h +++ b/include/hw/audio/virtio-snd.h @@ -122,7 +122,6 @@ struct VirtIOSoundPCMBuffer { }; =20 struct VirtIOSoundPCM { - VirtIOSound *snd; /* * PCM parameters are a separate field instead of a VirtIOSoundPCMStre= am * field, because the operation of PCM control requests is first @@ -135,7 +134,6 @@ struct VirtIOSoundPCM { }; =20 struct VirtIOSoundPCMStream { - VirtIOSoundPCM *pcm; virtio_snd_pcm_info info; virtio_snd_pcm_set_params params; uint32_t id; diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index 0f78cec967d..fb5cff38660 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -402,10 +402,10 @@ static void virtio_snd_pcm_close(VirtIOSoundPCMStream= *stream) if (stream) { virtio_snd_pcm_flush(stream); if (stream->info.direction =3D=3D VIRTIO_SND_D_OUTPUT) { - audio_be_close_out(stream->pcm->snd->audio_be, stream->voice.o= ut); + audio_be_close_out(stream->s->audio_be, stream->voice.out); stream->voice.out =3D NULL; } else if (stream->info.direction =3D=3D VIRTIO_SND_D_INPUT) { - audio_be_close_in(stream->pcm->snd->audio_be, stream->voice.in= ); + audio_be_close_in(stream->s->audio_be, stream->voice.in); stream->voice.in =3D NULL; } } @@ -440,7 +440,6 @@ static uint32_t virtio_snd_pcm_prepare(VirtIOSound *s, = uint32_t stream_id) stream =3D g_new0(VirtIOSoundPCMStream, 1); stream->active =3D false; stream->id =3D stream_id; - stream->pcm =3D &s->pcm; stream->s =3D s; stream->latency_bytes =3D 0; qemu_mutex_init(&stream->queue_mutex); @@ -1064,7 +1063,6 @@ static void virtio_snd_realize(DeviceState *dev, Erro= r **errp) vsnd->vmstate =3D qemu_add_vm_change_state_handler(virtio_snd_vm_state_change, vsnd); =20 - vsnd->pcm.snd =3D vsnd; vsnd->pcm.streams =3D g_new0(VirtIOSoundPCMStream *, vsnd->snd_conf.streams); vsnd->pcm.pcm_params =3D --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072056; cv=none; d=zohomail.com; s=zohoarc; b=ghDRglQoGAl41xBCYT9VkrCEUHkyhdYn73ng50yXKuEkgr6iJuacMvkBGmeQXWHwNRVdx64b0jxs097mDY0KyrQ3i2TWHjZvsZxRB8Vvr80yGrCsqqsR7nsoYTfcLF//L/4y09qiQtGt5y3W8PqgCnU3kArXMauxHAMIxzbFBTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072056; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=VCt2tniDnmnYi733EQKIyxEHA7/z296v1/90TDxGuK0=; b=Yfv4o6MUGNQJ9KacMuCOFYzOzzvuEmhQO4lNR5cfpCVrUQ8HVFf7vpw/GXmMN+AgddimDMepe9J8uoxDafiphUgcJ8Vb+P/ZuM+2+K9cblTOMAh4o5Z1Al+Fd6OKWyqaHqv+8NHoQYyo9M+q+ZG1SG7j7zOcEo6omyh4kS6Z+L8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773072056376881.3356528210929; Mon, 9 Mar 2026 09:00:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcx9-0000WS-4S; Mon, 09 Mar 2026 11:55:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcwk-0008I1-EW for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:08 -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 1vzcwi-0000WF-Cp for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:06 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4852ff06541so21311445e9.2 for ; Mon, 09 Mar 2026 08:55:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d840sm30519981f8f.8.2026.03.09.08.55.01 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071703; x=1773676503; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VCt2tniDnmnYi733EQKIyxEHA7/z296v1/90TDxGuK0=; b=sjn9hX9Wo3MitLl2YzrPWybZhVcH0DPjpJndEOv4UW7YfbpWdq9rbW/JlUPPfh0iL4 ScIrDeFejte+xt45AWIqigyNPGERK6Igg7xmgXn3zVVqixPUK3y8aMTr6we6T1aEw8V6 hM+FCLu+NvE8YzfXAD8AwzjlV+6X7R1Jc6G13fmFAeP0+COqtmzM7pJaB7sF9QTBZk2x xE34McA36cvDLvHcuIqUVhCRIzX5xV12P+sW/nWeCe+6uEplLYUKq6f4QrYDzhmXX6F+ Vpxp2oHwEk4USx33pYkLG8cyULJ/r4kfjfsP85HYGnr1yOa5i0jpTu2Vt5BFjb0AybqE 5u+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071703; x=1773676503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VCt2tniDnmnYi733EQKIyxEHA7/z296v1/90TDxGuK0=; b=E34SWhohT2P0DrTDHL3WyK5KAAH6N0iK9Cw2V8Prz4pifUw+7TQ82tU+UhRNE3WlRD FN0PmCDHHrLumKROuSLp1QEGlqRprNWApOZM2DrVW7h7YOV8Zv9xLa1FV3xRkVDq4TIj Uy06clSl+hO1APD62kZ6isIp/+/bn09E3pWBKyibglvj42S1LAXTs4mItqpKAuoD6uSA aNpOpspAIgSmPx7VmAhOX5n6BZ6copfRLFe4GxinXyN5JglfwyIxpwLdlS3CTQFxxci/ WDjdDaEGPnRZAy/LOYVK0kuBhga20FAxf1y7viQ6vv9QNxhMvU643if6jzKIvxGEC3wd zSyA== X-Gm-Message-State: AOJu0YxWnEpZNM1BuYeGGx5idH341DPEMWzq0rA8KUxbKA/CT9Kf6NAa TDHa59CzXVFdj3X2ktGS4vYTpOMLEJz26k8h9cF5gEBlwftN7Rz9FcsvIkuGNJhnuSSTFkoRq1i MShNjIRQ= X-Gm-Gg: ATEYQzzigLxLIOq1E0APjJ2Nn6xgjHd8iaKI2AzapgTVI26x/ounp75NOqUEtuc9CPF FcV60wgT5+thSVooOEww3i2c+aHcAzWSvywkvoNi4KfLqxWIQFanmfi3fJvC5YgLun5/Lmg6wTv n6VjVNTVA+216Qqavar/wczg7BKojpiBEbN50llu+josR4SLI7Zb1+so3LlRVkeNlJLQhCPygIx jI6fpWP9YdG/WCH0s7p2GNSNl/yvltte0TqLwxvInfi+JK2FaSY7GbYocemci+Z9xzdCr7Rth0S dBkbt0ZKwVSTcCZ8ue2Qed4KtOGmiD1RX7cV3vy9YRPxJeT4+hHLg+6wzcXn/uLfaMzsd9aVFIB 3GdxZCjBJh62BYQ9XJwFJv9+WaJXOysiMrDlpFCDDyAgV4/h27O754re50bPFAdMxjuVgUrF+G0 r4IdNIqp4Y+20xgg0vX4c1BH5YLd8YGOz2ekpaIuSZMulUhb/Tc/74cpHm9aMjb4xh2HclNXqJ X-Received: by 2002:a05:600c:4510:b0:485:3c8f:e4ce with SMTP id 5b1f17b1804b1-4853c8fe68amr47206855e9.18.1773071702437; Mon, 09 Mar 2026 08:55:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 24/49] contrib/elf2dmp: Grow PDB URL buffer Date: Mon, 9 Mar 2026 16:51:54 +0100 Message-ID: <20260309155219.62400-25-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072059289154100 From: Akihiko Odaki The buffers used to construct a PDB URL overflow when the "age" property is greater than 0xf, so grow it. This also simplifies the logic of the URL construction to use one buffer instead of two to avoid the chore to synchronize the sizes of two buffers. Signed-off-by: Akihiko Odaki Reviewed-by: Peter Maydell Message-ID: <20260305-nvme-v4-1-b65b9de1839f@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- contrib/elf2dmp/main.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c index d046a72ae67..a62abadcc04 100644 --- a/contrib/elf2dmp/main.c +++ b/contrib/elf2dmp/main.c @@ -494,18 +494,6 @@ static bool pe_check_pdb_name(uint64_t base, void *sta= rt_addr, return !strcmp(pdb_name, PDB_NAME); } =20 -static void pe_get_pdb_symstore_hash(OMFSignatureRSDS *rsds, char *hash) -{ - sprintf(hash, "%.08x%.04x%.04x%.02x%.02x", rsds->guid.a, rsds->guid.b, - rsds->guid.c, rsds->guid.d[0], rsds->guid.d[1]); - hash +=3D 20; - for (unsigned int i =3D 0; i < 6; i++, hash +=3D 2) { - sprintf(hash, "%.02x", rsds->guid.e[i]); - } - - sprintf(hash, "%.01x", rsds->age); -} - int main(int argc, char *argv[]) { int err =3D 1; @@ -517,9 +505,7 @@ int main(int argc, char *argv[]) uint64_t KernBase; void *nt_start_addr =3D NULL; WinDumpHeader64 header; - char pdb_hash[34]; - char pdb_url[] =3D SYM_URL_BASE PDB_NAME - "/0123456789ABCDEF0123456789ABCDEFx/" PDB_NAME; + g_autofree char *pdb_url =3D NULL; struct pdb_reader pdb; uint64_t KdDebuggerDataBlock; KDDEBUGGER_DATA64 *kdbg; @@ -583,9 +569,21 @@ int main(int argc, char *argv[]) printf("KernBase =3D 0x%016"PRIx64", signature is \'%.2s\'\n", KernBas= e, (char *)nt_start_addr); =20 - pe_get_pdb_symstore_hash(&rsds, pdb_hash); + pdb_url =3D g_strdup_printf("%s" + "%.08x%.04x%.04x" + "%.02x%.02x" + "%.02x%.02x" + "%.02x%.02x" + "%.02x%.02x%.01x" + "%s", + SYM_URL_BASE PDB_NAME "/", + rsds.guid.a, rsds.guid.b, rsds.guid.c, + rsds.guid.d[0], rsds.guid.d[1], + rsds.guid.e[0], rsds.guid.e[1], + rsds.guid.e[2], rsds.guid.e[3], + rsds.guid.e[4], rsds.guid.e[5], rsds.age, + "/" PDB_NAME); =20 - sprintf(pdb_url, "%s%s/%s/%s", SYM_URL_BASE, PDB_NAME, pdb_hash, PDB_N= AME); printf("PDB URL is %s\n", pdb_url); =20 if (!download_url(PDB_NAME, pdb_url)) { --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071737; cv=none; d=zohomail.com; s=zohoarc; b=OnXA5mmsE9BtF6hPghs3Krds+RgQ8ucHWKgpjNzW3s6eAyB8VJdGQGC1WdKp+vj2ik7B97gQVlBPWPR7yaTLV1lDXkV1sof/egh9ET4GLIK47uh+9JLZa1cWHwwia3/JdwEl7HNKoM1oqlt3Ft70ASjtlPUYhhQMmmtVN7zDQvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071737; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=NCORoNPQHDOcsEAMIb/xmUVZv8e+uBI25ItL/f7mOyY=; b=OkGBlRHvpJRt3g14sWWne06HactK/1YaUfwBPm9pF+atBGL5zrh7lZ3zcv6v9Mwy+VDLPotDDhX3SqVsluZz09mM39H4W6vcGSm4Vzj8vd1fV8iE7vBdGda0kB/2JsiMPzFOosTDNBSMoKjMyGAotDu/4YLPyqkz6ZxAl1tKkRc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071737026566.2903494996721; Mon, 9 Mar 2026 08:55:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcx8-0000UP-SZ; Mon, 09 Mar 2026 11:55: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 1vzcwq-0008W1-PW for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:18 -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 1vzcwp-0000e8-A8 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:12 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-439d8dc4ae4so1793656f8f.2 for ; Mon, 09 Mar 2026 08:55:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae57401sm22872051f8f.38.2026.03.09.08.55.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071709; x=1773676509; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NCORoNPQHDOcsEAMIb/xmUVZv8e+uBI25ItL/f7mOyY=; b=MG2UuKGiBV+XkBOXqUzjbT7qWYSGRLJCfihtVabTAhgfQ/BDrQKH1ylQK2c4oo3haZ UOKZCTeyHQ7L6KKLmk2te+Qw3yI0kB50s6a2a6HluIX8+b10/fFHPilHYTd0MuRZndNH TooEUv0m+bISn7EJvr2JrzVRLvA++XMBqNSkC1/3d/0nAKR0tQ2K8tAxJQQd3UnCfSTV vLM4B0s/BZFo56S1epgEjzWhB6MOU3lVTGk0M6ti+1STbAlO4v3s2bVoKLZgmUNkB5TA dcJPQRyAYLdJMfkBHGy4DYouQ9PVZi9wc7hI9osqMW11RH2BlPWk+0B1/8UK8gumYvHv wZ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071709; x=1773676509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NCORoNPQHDOcsEAMIb/xmUVZv8e+uBI25ItL/f7mOyY=; b=Ax/uZd7n7EzbnP/BAtywwDvWRPFxz0rEGx558JXE6epIdYHPJOn07Kwz3Bo4SXA1P9 bS6FvI7vW3msw7mfEtTpOm8BA/ceX/tvpyVPgU00KBoLY3keWYeMckL0AAVkCCrw59Hu CgCTT7v33vTDocIJ/w6UlVv79lsZN2/blI83wSKhiAmPOh41db+2xvrHz+LwAKSGmcua hiI4/gDD7VrhN8E5pBHE1JeeMb8BIe201KZiyi9qaJ0MOMXNUXgjL+g7ptRwasdE+f75 FpnOt9Dw8xnxjenMt3fiLhLQOcgEDHv9+fW9CusGyFXyEu+VTFH/wzZHxoR+92oknPC7 uNwg== X-Gm-Message-State: AOJu0YzayKCwIkxVtKLIsO9bSXjkoaclSO9XY6k9G80OVrGzA1u6N2an tQZZSzv3xpLeDi0tYReDNMWiUfdxF1VaFhTeLYVW88XlwfCuAC+Eb8Mtb+k1JaeAnCfweuLwvf8 k/aA083Y= X-Gm-Gg: ATEYQzxLY0zMta8x6MHs2qaneGSIaLcdV44IibQ0NO3tOfCMiZj+XMR9jAg2BJfFgy4 JKKsfk9Hy3bfT0oZ6NVv9JNlwUrImrnw0bueg/RDN3dzyU5+0+aJA7w5JbEfwM1p9woW9aQyOFV nqv0kAd0+zKdRYttbNSwkLNJxVbiyWL5LFKtbydkw3dTAq5MBAZp0I3UcPRK4npTKFj7j0Kl9QN CvxUr5nW5QFakaY5fklk8jx5btKu8qRwNIBYvd1BfqvqbsoJbaGMSNm5S4YBaUuekVN9kIh5Z4v lXrTHRNYaoGWogD9etjV88SkAqyKPovk6OZPq2CZ7DuAggVpCUUqTfXyhHLXjd31fD+VW+U8qJZ N1snRSma65GWPozoVI8ZQM9qhY21iOoWrMLBqZtTJXXi6kunvzXHhHxJ6rQ99Okww+NZPvc7tpW +Mii5FOXXRswhvdvMOafxi5cuFmsnRS284Qmdq+/BY+MpSpIp6E13OzE0COTuEUH575DzueS7Cw TvxScnvXbQ= X-Received: by 2002:a05:6000:49:b0:439:be67:a02d with SMTP id ffacd0b85a97d-439da67c0c9mr16614261f8f.31.1773071709488; Mon, 09 Mar 2026 08:55:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 25/49] vfio/pci: Grow buffer in vfio_pci_host_match() Date: Mon, 9 Mar 2026 16:51:55 +0100 Message-ID: <20260309155219.62400-26-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071738349154100 From: Akihiko Odaki Each field of PCIHostDeviceAddress is an unsigned int, therefore while a valid address is limited to 13 characters, an invalid address could exceed the specified format, up to: ffffffff:ffffffff:ffffffff.ffffffff This requires 36 characters with the terminator. Signed-off-by: Akihiko Odaki Reviewed-by: Alex Williamson Message-ID: <20260305-nvme-v4-2-b65b9de1839f@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index c89f3fbea34..94c174a773f 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2739,7 +2739,7 @@ void vfio_pci_post_reset(VFIOPCIDevice *vdev) =20 bool vfio_pci_host_match(PCIHostDeviceAddress *addr, const char *name) { - char tmp[13]; + char tmp[36]; =20 sprintf(tmp, "%04x:%02x:%02x.%1x", addr->domain, addr->bus, addr->slot, addr->function); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071741; cv=none; d=zohomail.com; s=zohoarc; b=JBSmWRBrbBvV4GOyvXn62mNJdTHJFgz4ArWRWkr5xIi3p/72wpkUsO3f9p/mKbE6/F44OpkhhJcup2a5nBY2l/2s62MMWKphvJUH4k+CYmJ9BSWlkzcglZ+hhtJHVbTwMl2xEAIv21jP9+Bomj5OkhvEObzYxVCg7dOudqstBx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071741; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=8/T06OpHJH5m9fii5ifmkMMsmok/9oyj+L/ZSYDiSkw=; b=lvP+jOfzDlYYjAlHgNan4b/bUZem1ARQGgpqSEXlCdO98igFyCQ3Dr3RxeFofzeZGRR/gK9vhz6rVGoKLVKtMmB7C1mA42JNTAxD/gNGdTk6ToNhAG0erXFjbA8Ha0+4x/b/fRN7J5kZGMfBFwaq6/+HhSYxkW3Q6Rw/3FWxpbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071741507130.3866997902852; Mon, 9 Mar 2026 08:55:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxD-000123-IH; Mon, 09 Mar 2026 11:55: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 1vzcwy-0000EO-G8 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:20 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcww-0000er-RN for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:20 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4838c15e3cbso108445445e9.3 for ; Mon, 09 Mar 2026 08:55:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852470a654sm88786445e9.29.2026.03.09.08.55.15 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071717; x=1773676517; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8/T06OpHJH5m9fii5ifmkMMsmok/9oyj+L/ZSYDiSkw=; b=FzxdbZ7yfZdgQs9pF2q1/tTxoFejPWElGYWqYDdx8uUVPqjjPSQseWStxaafNX7qoE /Zeb92+BQY54mnWTVJ2rGfvttVeK/6Qkhx4fqV6avnEtlUJCeFjuc9y8JeKRnEN6YLny uIlX7W8hLcWQCUprOqgjQgbNDqxKovvzGqCuyHJ72YsEQGeUTRHWssKc5pv6BlaalqNM 27/SV4H69GZoZZbK9QjsiPc+0284kaIM+8BecmIcE8VKpbm0yFHXN3eAEnfege/0h1H9 GLPiYqvRPXLNKLbT5i84p4puBj0RUz6K96r6BIlxsuf3np3+UDZ2hFhIUHbu/sA2V6yj RJkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071717; x=1773676517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8/T06OpHJH5m9fii5ifmkMMsmok/9oyj+L/ZSYDiSkw=; b=alkWsQWlfNGuJ0qk8C/besDJK5MBXHvWYOP0icYREZqXX7cPvTVHrBqU3F6fpkt7aN kbhOMSZHRhnXU8HWXn7REbZDhyC3ZA2GgZG7oeQIL0tFagtfgJs4O/9H9gv2tfy0TV7k 0lQBSHEug+i/y07Cv6I7mEgZNhcryGmhax7qB2uPzHaKJ59+J5zm40hLC6bteoH0Ghlk zQWh9v0RqpXj9SIzf3bJtb4Uq4Xj+vvXmlYthCw4ufz5p9vLHhlSjA5vxlp5rb0pOV20 bU+/NX3imkwW9gr7VYsv2620loLHjnlSocCZM4gvgACkTiQhul3oBDDwxh00e3Rqe4IO 7A1w== X-Gm-Message-State: AOJu0Yx3YsZxdYBb9McqZAK8JevDki9NJJwH1YHMJlJ3lJGNVHGK23MO iLxShWvK4WC/BAieYkQjnQPDkZv/LV1NBWBbyx2KTfAjk8mX3kdkZW9TxhaC3YoYjIdmu5DAT1m DnpNOwFU= X-Gm-Gg: ATEYQzz/MJK8mEZA6WaWOhwRv+sbko0tHS5LcRWxlIt0d2yTqnuAtKko30hb6+ZXxT7 Fba0LSLWQqQnO9jsbypTiq1QKtlE9yw2WUwbBib5aeXF+KoEq+lNHlet/Bgv7Ij5MLURh/lCvhp ztTWYQ6Vw83gl07fyX0S7xbbLk2rrjEAuM1SYd830hhGM8qMiamdE+f454JVkzzcihkWEK7p1ZS 8FokXG7GZY/WQyoM0771ioi547JtNgn2xCc6X/9ceYrrsMpiNkxOIxzLVnCQ7GxZhGBkm1Z/boX 4NvCf1Fj17fqMF7XDHcUeianYWieAXEx4s3KfOVzOyRTbmE/glfapjoIsDLUOb+LAF8NSQtSHlc A5Rdr+gz1mFQWsD1IW0QpKStEcBna1WVlzK5NY2Wc5PYfgXtsqXEc4/Vc7QnBr+SAqM6sGf+PLn uthJRvVELWbw/p7nZjEKk1c0+lLKxT+R7yDjotOGT+qEzaY/sv05rczYZtdIak5QAp0mwbTYYu X-Received: by 2002:a05:600c:8b68:b0:485:3991:5d4 with SMTP id 5b1f17b1804b1-48539910730mr77717675e9.31.1773071716958; Mon, 09 Mar 2026 08:55:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/49] tests: Clean up double comparisons to avoid compiler warning Date: Mon, 9 Mar 2026 16:51:56 +0100 Message-ID: <20260309155219.62400-27-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071744503154100 From: Akihiko Odaki To enable -Wformat-overflow=3D2, we need to clean up a couple of false positives: [2/5] Compiling C object tests/unit/test-qobject-output-visitor.p/test-qobj= ect-output-visitor.c.o ../tests/unit/test-qobject-output-visitor.c: In function =E2=80=98test_visi= tor_out_list_struct=E2=80=99: ../tests/unit/test-qobject-output-visitor.c:577:28: error: =E2=80=98%.6f=E2= =80=99 directive writing between 3 and 317 bytes into a region of size 32 [= -Werror=3Dformat-overflow=3D] 577 | sprintf(expected, "%.6f", (double)i / 3); | ^~~~ ../tests/unit/test-qobject-output-visitor.c:577:27: note: assuming directiv= e output of 8 bytes 577 | sprintf(expected, "%.6f", (double)i / 3); | ^~~~~~ In file included from /usr/include/stdio.h:970, from /home/me/q/var/qemu/include/qemu/osdep.h:114, from ../tests/unit/test-qobject-output-visitor.c:13: In function =E2=80=98sprintf=E2=80=99, inlined from =E2=80=98test_visitor_out_list_struct=E2=80=99 at ../tests= /unit/test-qobject-output-visitor.c:577:9: /usr/include/bits/stdio2.h:30:10: note: =E2=80=98__builtin___sprintf_chk=E2= =80=99 output between 4 and 318 bytes into a destination of size 32 30 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 | __glibc_objsize (__s), __fmt, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 | __va_arg_pack ()); | ~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors FAILED: tests/unit/test-qobject-output-visitor.p/test-qobject-output-visito= r.c.o These buffers cannot actually overflow because the doubles are between 0 and 31.0/3 inclusive. However, formatting doubles just to compare them is silly. Compare them directly instead. To avoid potential rounding trouble, change the numbers tested to be representable exactly in double. Signed-off-by: Akihiko Odaki Reviewed-by: Markus Armbruster Message-ID: <20260305-nvme-v4-3-b65b9de1839f@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/unit/test-qobject-input-visitor.c | 8 ++------ tests/unit/test-qobject-output-visitor.c | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobj= ect-input-visitor.c index 84bdcdf702e..beee11db4e4 100644 --- a/tests/unit/test-qobject-input-visitor.c +++ b/tests/unit/test-qobject-input-visitor.c @@ -500,7 +500,7 @@ static void test_visitor_in_list_struct(TestInputVisito= rData *data, g_string_append_printf(json, "'number': ["); sep =3D ""; for (i =3D 0; i < 32; i++) { - g_string_append_printf(json, "%s%f", sep, (double)i / 3); + g_string_append_printf(json, "%s%f", sep, (double)i / FLT_RADIX); sep =3D ", "; } g_string_append_printf(json, "], "); @@ -583,11 +583,7 @@ static void test_visitor_in_list_struct(TestInputVisit= orData *data, =20 i =3D 0; for (num_list =3D arrs->number; num_list; num_list =3D num_list->next)= { - char expected[32], actual[32]; - - sprintf(expected, "%.6f", (double)i / 3); - sprintf(actual, "%.6f", num_list->value); - g_assert_cmpstr(expected, =3D=3D, actual); + g_assert_cmpfloat(num_list->value, =3D=3D, (double)i / FLT_RADIX); i++; } =20 diff --git a/tests/unit/test-qobject-output-visitor.c b/tests/unit/test-qob= ject-output-visitor.c index 407ab9ed505..3c47b28f663 100644 --- a/tests/unit/test-qobject-output-visitor.c +++ b/tests/unit/test-qobject-output-visitor.c @@ -538,7 +538,7 @@ static void test_visitor_out_list_struct(TestOutputVisi= torData *data, } =20 for (i =3D 31; i >=3D 0; i--) { - QAPI_LIST_PREPEND(arrs->number, (double)i / 3); + QAPI_LIST_PREPEND(arrs->number, (double)i / FLT_RADIX); } =20 for (i =3D 31; i >=3D 0; i--) { @@ -571,12 +571,9 @@ static void test_visitor_out_list_struct(TestOutputVis= itorData *data, i =3D 0; QLIST_FOREACH_ENTRY(qlist, e) { QNum *qvalue =3D qobject_to(QNum, qlist_entry_obj(e)); - char expected[32], actual[32]; =20 g_assert(qvalue); - sprintf(expected, "%.6f", (double)i / 3); - sprintf(actual, "%.6f", qnum_get_double(qvalue)); - g_assert_cmpstr(actual, =3D=3D, expected); + g_assert_cmpfloat(qnum_get_double(qvalue), =3D=3D, (double)i / FLT= _RADIX); i++; } =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071794; cv=none; d=zohomail.com; s=zohoarc; b=VzlhxUimA/mclIxtcE8COLx3847fHbgMpn2BiTP9Df/U0KNtqniuMNpribaZhB9aTSWmufv0KunmbUS7TUsFHtRP9op4squigcUfI9CXXkoNt5UUcC35J6G8Ulh8qGzP+5YZxgawDjmP9YgwskC3Ety7cdaLlNs6hO2GNeFYmZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071794; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=I9pkSl+RPDpscWwr+MPBejtK4wJPWeiMCO/OxsmQACQ=; b=QmaoV+Z6rXbl/ims4pstEuItBuwB+lr1K2rG7sAJEfwJD6deQl7WK6NarVvryAknH/Tnj90JeCaheY1nSvEKE/ELEIZslBj4W7sIp3621+O7rRygRnAk35Mzj7hLfTdxYNEaGAs1uINP6s3WiK8gE0lYw9By0J77zVnQH2/uo3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071794454611.9721178841204; Mon, 9 Mar 2026 08:56:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxx-0002A0-GM; Mon, 09 Mar 2026 11:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcx5-0000QF-FM for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:29 -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 1vzcx3-0000fh-NW for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:27 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so10345355e9.3 for ; Mon, 09 Mar 2026 08:55:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a7f1f5sm1813545e9.4.2026.03.09.08.55.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071724; x=1773676524; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=I9pkSl+RPDpscWwr+MPBejtK4wJPWeiMCO/OxsmQACQ=; b=Xknk/5cbaUM7nkMUs3RuT64Eg3nicr3X6pCwFAdkdFZtFSWPa4rjQySmqBJUo5E5Es V4LtTOdSsGmLzL8GFHquIggZ2lJZq7+kxytT7CjZ06EuE4J8dUs7snoLYChCdSB8ZJuD p5HBIjGeScoPioxsYvTcLrsxoV/eB6osYbYCT9Ei2bJJPzwuoLscM+8s5XFn5wq0v2Xv 4F7aQYeY2zBZWDAB92YqwRmq0nnDt0J5NItaQ9Lm+kAZrY3G6jxmEVIJESeVsHkRfi0v /UNnpjFu4JBMUttlVf1PDbykm1s91b20AYDfUcWc34sxlviziMsZGLEuBuYewcPN4inr QjaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071724; x=1773676524; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=I9pkSl+RPDpscWwr+MPBejtK4wJPWeiMCO/OxsmQACQ=; b=faztHXO7u/Lsc7iwKigheuWu23whlK2I9nKiO1Pyo1dkVMiAxIngYAb6tlTbrCkBi3 rISN0jikVHFMzezMw9WfVeEJNO9NKm46defwQ/LJA3NYjNLgmTuGtwU4gJAm+VrGSn5J h1HqSvN39R+Xiu3VmX/BtTLn0xk1B5IYxxyzFjb+QZPWWy8S42G8uFwTebYzlGTS0UiE SXpXyQIsCwktUX6zc+5J2DpXJfIsGnLUAwrVMWhfc8r7RVLQi/p/SidK3EDXv0JdHCd6 jiroKON/gDSi5dEFSPwKu3in9x6mSMX5rR2AT4r5Rj3fEO7F6BL0RWtLoQH6pySNZSTK MEow== X-Gm-Message-State: AOJu0YyhY0Sn8niZUaT5oVBVsGsw4IOm8ZoOpWly8xg4awK37Odp1b8m e2RDuuDz2RMY3D7tf65HcuDNlBwvq0ALbv6hYY53ndpvaLcigFPGbbjwIY5kPfUdoP/rW797Rgo /ExCCrQ4= X-Gm-Gg: ATEYQzxOI7EFie4AcO9GPy2v6oTy2w9WAKTAxPOvWykQXzTgOrDa5fY1X/4gwa8I7rS wl9Fh9dQSCj8EF1QvY5eq9nP3Tlnv1n0JJCavxOAbS9QGA5SYG6WyjwBe25cVuna8Qf7jK5GInq 8hVm082RuKO2fS1WqLr6PkG1ROc3ZnBBYlQHEqulOCxSs1fiEPTy0VeS7cuIx5U9/Jf/Rss9OD2 KcIn7XXfunJBTzByM3UDjM87d+ayy1doCpooUyqTy/N5B++L5+F1bwF/qylG2KX1jUGmPnVJQgv rrOljI7ve8gIclCW4kqaH6nxHv7jesENU8LPi+tGj7zpP0AmsEQml9883jRnG/x5WYILBraQN/D XayRsHZtXb4QjadX1J73saU+4KFsNZlZzlo12ss6o08iGRPWGcOZFvWPcaYIMnino/+IqtavdOw 5fMDXe9Ef13pdFEksTGas4oQAa/JH3Pgcx2STUCGpMgryLvkf43QDElPEVbC3Su+W74jxhhDJtO PkDuA//6f0= X-Received: by 2002:a05:600c:4446:b0:485:34b3:8589 with SMTP id 5b1f17b1804b1-48534b3882emr105247085e9.31.1773071723721; Mon, 09 Mar 2026 08:55:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/49] meson: Add -Wformat-overflow=2 Date: Mon, 9 Mar 2026 16:51:57 +0100 Message-ID: <20260309155219.62400-28-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071795262154100 From: Akihiko Odaki https://gcc.gnu.org/onlinedocs/gcc-15.2.0/gcc/Warning-Options.html > Level 2 warns also about calls that might overflow the destination > buffer given an argument of sufficient length or magnitude. At level > 2, unknown numeric arguments are assumed to have the minimum > representable value for signed types with a precision greater than 1, > and the maximum representable value otherwise. Unknown string > arguments whose length cannot be assumed to be bounded either by the > directive=E2=80=99s precision, or by a finite set of string literals they= may > evaluate to, or the character array they may point to, are assumed to > be 1 character long. Signed-off-by: Akihiko Odaki Reviewed-by: Peter Maydell Message-ID: <20260305-nvme-v4-4-b65b9de1839f@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 102f0cbb13e..f45885f05a1 100644 --- a/meson.build +++ b/meson.build @@ -694,6 +694,7 @@ warn_flags =3D [ '-Wempty-body', '-Wendif-labels', '-Wexpansion-to-defined', + '-Wformat-overflow=3D2', '-Wformat-security', '-Wformat-y2k', '-Wignored-qualifiers', --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071809; cv=none; d=zohomail.com; s=zohoarc; b=JmLZpgbuGNQzay/3TfcGOFedsDWwbYY4J7DLzXigojhnlZx8Qf0XBkgqFsw4/L7v0kNt6cCDjX0AqKIMLKaul5vhcR2EakhB2hZr7Hp6IDAbHoC5Rtm5mMR7Tokz3Ymfj4oHZODncHGBi8dMnTKzoCJUXXjVLjxu9wH5goE+gLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071809; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=v9qodVqSzhxy9EFNfzaSmBMIOfVE8pcU0DSadNCtLco=; b=SwrMHWXGB+RcmLliFLx0tAhrQ7OcnkCjTaLoMikKOhDZFMMTseheKR40zV0B6U7MptES6AFih2alXMNwp9kcTm9NdsyTEn7Qgp3WgDnxHVmjROR9eSLjTWGvT48GB5/2YYkjDcuRqzCTPHsAHwvxGyT85CDqSCqV36oFREXz/k0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071809080774.9669668589651; Mon, 9 Mar 2026 08:56:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxN-0001Wi-7D; Mon, 09 Mar 2026 11:55:47 -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 1vzcxC-0000uB-2S for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:34 -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 1vzcxA-0000g2-Cr for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:33 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-485345e1013so11881745e9.1 for ; Mon, 09 Mar 2026 08:55:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a9e549sm745355e9.12.2026.03.09.08.55.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071730; x=1773676530; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v9qodVqSzhxy9EFNfzaSmBMIOfVE8pcU0DSadNCtLco=; b=LRxf7P1a4Cj1arDq3Ki3HXLlAGgnvOtn5MVtt++5rC4tZ4F8r8ZhpyKUOc+opvyzjz 7b8G4cPMFXSAatKQqCYbXWJ6vHmhxf4ZBjSpsi24nK5TJxKu981DBGL5361PH+U1k97n NGhb2ux8aHViYfZKgDy43Ck6zKUDfwnXHvn1GinGl70MGAGLUYljii8WGsUyuDQ+4k0C f9W7krtGGmiIlAecHPe1rnQEeHGb8qNzxNw6bB+N6so1raEWUcrBTP0FLCpLPWWV4x1D icIq4LstFeXxIBWVwmFCJYDESBLXupTiYWuy3RRR6IlI7vJ7OCmRzXD4rKOVCrsGoHs0 75cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071730; x=1773676530; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=v9qodVqSzhxy9EFNfzaSmBMIOfVE8pcU0DSadNCtLco=; b=PddrxUL0UerTpak1iJ9d1QhOy6VQybLe9FJiYY7MoyfNLzKuqFZ+1CjvyZRy4HVTnW /tZyDK9C6Ju0tJ8UXZEmL93ZVT4q9aWs1OAlX6PDxWowv3BRNLJmOU9vY4ekjqlGamEm OK29x0WP2gncdzfCXeFfyABz5Qv1t6yL60+4L848JN3lECc7EOtw6QKAA158enili8SF qBelvP1t/0IJ5JuMnpSEwFGy4a909lPYbrayvztDffNLBrGx59ajw+mmIGkEKsnhFQxM kDvgdk4Lt6ESXT8+HOax9ttN9JjCGgHQcbMjZ+LkMPcqGxzPRhFx9cFNQq6KgDBX1dhh Rk6Q== X-Gm-Message-State: AOJu0YyrSeqfmAtg1Lw8oEtnnR9gwzv6q9J+cHDx29e99BmxNq6mbZj7 nRfIp3ABhuU3kfbxxNb/xDSpEB5uNtg99mBlSlwwgmygyMIH+Q29GXekrF8vXxuSknCdG4GW7Wf DdRRCkSo= X-Gm-Gg: ATEYQzwML85UeP3HpJt5EaetWUYxnC186fCRasanuKXDPJKnbuVyLFvnTAz+hOfJvHn tTW0TgM3xCfTUYgOAstUdseY5jsCiozf61s1wxof+6DgHFuaIFHeY4QFMy13ZhKCAYWD3/Trd3g Cxx5W/INAWEuS83FzidLcNopNBd5O3rzTL5BIgFnDGwZtrGmKNtyOEFza/Ukm1Jh3QBdNyp4W87 mSEIo1YS0vfffy3FGjwCZqDvDRj1pHHqQ0vRnEWB9+cGyHQ+70JiciBXSnF6bHjAk5OPHno81e4 F0ZFcPmQfOYnzsBNnRA0Jiy/KH7cV/QQn5v9+nDUy7WcOk7giLpDjRTXkUeECHGAS6t3zqC6uj+ 3Zr3zieYgLmoOcw54izmi63vpZzxQR+oZTgkfGDVPndibG90IjnUQiIcYEFEk5dwUs/ksnwF/t8 cAOY2UkLY3nw2xxlw7YJ53kftN6fR9ipQgohoAGQKWc1GVQiFCtXhQTC7kDcuE8WQ3jjy09WNMF B68DDYWpqM= X-Received: by 2002:a05:600c:4509:b0:485:3b4a:f707 with SMTP id 5b1f17b1804b1-485419de2fdmr1830225e9.10.1773071730518; Mon, 09 Mar 2026 08:55:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 28/49] net/passt: Only kill passt if it wrote a pidfile Date: Mon, 9 Mar 2026 16:51:58 +0100 Message-ID: <20260309155219.62400-29-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071811181158500 From: Peter Foley Avoid killing qemu if passt failed before writing a pidfile. pid is initialized to 0, so calling pid in this scenario would kill the entire process group. Reviewed-by: Laurent Vivier Signed-off-by: Peter Foley Message-ID: <20260305-passt-v2-1-f0582198afc0@google.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- net/passt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/passt.c b/net/passt.c index 9ed811a5142..b3d4b713140 100644 --- a/net/passt.c +++ b/net/passt.c @@ -102,7 +102,9 @@ static void net_passt_cleanup(NetClientState *nc) } #endif =20 - kill(s->pid, SIGTERM); + if (s->pid > 0) { + kill(s->pid, SIGTERM); + } if (g_remove(s->pidfile) !=3D 0) { warn_report("Failed to remove passt pidfile %s: %s", s->pidfile, strerror(errno)); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072155; cv=none; d=zohomail.com; s=zohoarc; b=TA5xkuVAyypsWajGBQayIzlORE8fItY3xTGzghqTRE4stCPWePZRjjpl3uU5PVnkuoesRzhRCt9qY/045JKbfJ8WmzwnaB3/4sDLZiarycnDQ9ZsxjjBAhJKyt0e80Omp3Qb3er7Vo7s2VxK2e+O1EbhkjsNlbIaWyLcnTavuD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072155; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=KlFX7pvMsJ8IE89oNifNcpYvuqCaxg303tu068sYy1A=; b=fdWUXaR3rhc474u6ZSZtVh0u13byHUZDNljiJA071q2xLwzDPA1u/B6jdbZDEoyVqiGBzLf7YSKGQS4LeSDkwgZDDOmFQneoxgM+K8SZ3eE+D2sMpbDx1n7OjnOtGaE6/SSkxT9ZURn2pD58jgLp+VymXBnuiMTYM6aPtnwDRX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773072155889893.428747606974; Mon, 9 Mar 2026 09:02:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyi-0003fh-RK; Mon, 09 Mar 2026 11:57: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 1vzcxK-0001cR-2O for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:45 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcxI-0000gX-EM for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:41 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-439b8a3f2bcso6217043f8f.3 for ; Mon, 09 Mar 2026 08:55:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d95dsm29921110f8f.7.2026.03.09.08.55.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071737; x=1773676537; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KlFX7pvMsJ8IE89oNifNcpYvuqCaxg303tu068sYy1A=; b=S1LvLNv6yqFPy22lIIHk99Y9WmXTZDpv9PC3F+2cM0RMEiDt6Zk0xRwZPxeSf4hN8M +sIjyYoVO1iwBarRN8L00gOC8A5K1L+B5nL+o/zA9bFgEF5wjhDp3CfurgraipHL10LI QM0NjgT8TdT4h6TDPi2i19+mHYdoRyk9HJHTG7Xij+y9BO5iayqyFF+OUJpZhLEwVlv2 RxbTyzDl3j/QzQhBWo3k6nNEceoo4WSF4haQYglkJy9+CqSZn3lRLWQzPt2Pa4G7lOQe GtLrwtNeSsv6ihOjX90L0jyuaL9opiQjMe4m4YALlM789UPHZA8PTxMw5ET+HMm28v5n Cd4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071737; x=1773676537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=KlFX7pvMsJ8IE89oNifNcpYvuqCaxg303tu068sYy1A=; b=HE637+0xcQaD64k3r3QkyCdsanwt1JSlafY1yj2a8b07rV5DAxc1pNn3HAnUzDgKUx KX25CSehDdigCG/6I94Bweagm7TCGuJDwp38YxR0kI0+miUg73UT1dDSBu20kivGB8Jz dIm8I3Jd/4FzkHWZcDiKpWKmvNsKkTGc7QYl1M56JUB2VLdOR1WMDcS+7j/fQDxuVj5M XctlS/3YySQxTrENSuQX9dzjlewJ1A9DEQJs9tWJsOPGlFlpmLPHKodmg4Phdw2hkQ2p LewS2qIz8tBbbAaJz3wtKuOFVaUJ0FQ4WSn+QURq25G3IArhmBY5hukomnsxEbJtFheA fzSQ== X-Gm-Message-State: AOJu0YwGVz8lM3Z42QHEbHc6XnlRxlQsFcJE6XjoIU4pPN1/l+AClxcS NZxXPw5OlfUb+ss8fERVOoQFt06GJdsxzASM/4HgLzqlqBACX5lbCLLUcvHkO7BM9/zQjGC1DPM pHAurdJ0= X-Gm-Gg: ATEYQzzM/ckecE/I40EaF4XKB5a5aBGjggxwupoqtL9LqXwjDrewi8mT8dAjQmFC3Ps z03E7d5nupqAglI+Y7CO8+lxqhAx8oaES43m4rGIAgYJRDbbDM7UiTD0Hw/zl7ogEBsiGplWz+k rrO2ym+GT5gVL+o4IMR7Soa9Yxxor2GyEykyS619woSXBBAqV+XdiJz0WOv0q7gOB255hWqsj6v XtziPULORILxdcouNKM6HzHUk5h08oG5Tk7WECprEziGiOHTw3QMrkPUcZf5gbK5pikGUASG/1M zbj24MwHSyZqQG4XNJQPgll1vdD8dqZYqaJEcprFqWuvnRwc09W2G5piT6KDnzZbKMtnAAK1W77 QWZUIoOKwWTtWYSrrZX58kd0RieziY9cAROxT7mx4/rS0EtkBR8+MABk6Wkgeo0k2tMXWcfZiN7 7IX+B7MqXX99ROopu/b57/BJusnmYmLmhlKawykkqa0jS6r6HDBD8gLWXWkLxPm00Qu4cGfZOQ X-Received: by 2002:a05:6000:2c03:b0:439:af96:29ea with SMTP id ffacd0b85a97d-439da895476mr19914333f8f.41.1773071737161; Mon, 09 Mar 2026 08:55:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/49] net/passt: Don't try to read the pidfile if passt got a signal Date: Mon, 9 Mar 2026 16:51:59 +0100 Message-ID: <20260309155219.62400-30-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072157844158500 From: Peter Foley g_subprocess_get_if_exited returns false if passt was killed by a signal, s= o we fall through to trying to read the pidfile. Update the error when passt exits to include the exit code. Reviewed-by: Laurent Vivier Signed-off-by: Peter Foley Message-ID: <20260305-passt-v2-2-f0582198afc0@google.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- net/passt.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/passt.c b/net/passt.c index b3d4b713140..4ff94ee509d 100644 --- a/net/passt.c +++ b/net/passt.c @@ -270,8 +270,17 @@ static int net_passt_start_daemon(NetPasstState *s, in= t sock, Error **errp) return -1; } =20 - if (g_subprocess_get_if_exited(daemon) && - g_subprocess_get_exit_status(daemon)) { + if (g_subprocess_get_if_exited(daemon)) { + gint status =3D g_subprocess_get_exit_status(daemon); + if (status) { + error_setg(errp, "Passt exited with code %d", status); + return -1; + } + } + + if (g_subprocess_get_if_signaled(daemon)) { + error_setg(errp, "Passt killed with signal %d", + g_subprocess_get_term_sig(daemon)); return -1; } =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071959; cv=none; d=zohomail.com; s=zohoarc; b=RWw1aFrTngqGhV+LOykpDhiCTYJngTOnkQRYY+337l8SXgzWVKZDUrnz+KJVitaCNV5GJEkzoWhAmGCcLfsACNympeZ0QV/X4KN27BNEUghYcqxlEH3KnzECID5V7cHLhlfXZtP+at7x+OSvGtZY00zg+tOzjblvzB8IJ2tTS44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071959; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=VWGvuis3N+sXRHcI3R/rDoWuInMgEzwzqaLHB5LkS+o=; b=mdyTOTpduU8oZ3hhgLkJ1jG0O0bL2WHwZw+L695rnfeln2Z45fdvHbbhF5GENdXkO0WBqttZnNpLh/Jtr22eB98fQY7qFVlpXi1I+1zOy9XUDiNE58Xk4vnoTrRu4K0U4UxXXAiqP5PCp47Am2ABFHqKC7Q/SQ/T/zXn93hdnVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071959013796.7956617761402; Mon, 9 Mar 2026 08:59:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcxy-0002J1-Cl; Mon, 09 Mar 2026 11:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcxP-0001fl-AS for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:49 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcxN-0000gt-Jp for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:47 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-439b73f4ab4so8416134f8f.1 for ; Mon, 09 Mar 2026 08:55:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae3c80esm24659298f8f.29.2026.03.09.08.55.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071744; x=1773676544; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VWGvuis3N+sXRHcI3R/rDoWuInMgEzwzqaLHB5LkS+o=; b=AguU+c01rnGMBk2kADrNhsVNu9eLJevM/dK5hWQ0ejU1sdXZvRfd/Xqo1rCMsfBI4e i4raFrPtEBgTeFjZwWRcBXHMrNl85KNeW64uGiZBE66ReYehkYFRzDFOHKmENCcBbV5n 2YrDtGUl37iMQi7nBYauQyxgV3e1CgNpoZkfrEJcnaxSXgenb2l9UJP0+SFfIxnwJPk6 7PxWQ9yGSlQEusNXwawBu25S//jE57/cb0ifIKfnnzQCOl+xMpr5XyRCR9p4lY3HFuhN Bti+9Px+H7hLPRac2rJkKU2/9aC7Huq9HMJxCoGv9cvYuQeXjj6554fkGqgtW1Ga+WMl 7Ndw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071744; x=1773676544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VWGvuis3N+sXRHcI3R/rDoWuInMgEzwzqaLHB5LkS+o=; b=LGvpnxXlEUcINvoS9rupcNIBlr5pKq522fgF/Zg2wlfUYhcuiONe3qqN84UUhbrssf YMDHXknEzYkOFrvhtlecSH1CSHrbySafbmJfO9Y02/rMEtu1tkn41b0dy81DowlCU1qH SmOZsHD6vLU3LYjO6dwiWIM+Dar3zeox9BUwaIm/Q6RcDTCV7Ss8TdHp5cFKUvEg7TG2 ZdELPhRZEupW7/yaX50ZaOYnv2wc3yleFkxE3FHE6xbLtqQkxHB87rLeAVAxX9JVYleH IGSIdcf76O2r8ZWNlx5uYJhobn5JemTfXU8cmbvnC0n0rVhfML8+mmR0ny9pKlN/reZ7 +eiA== X-Gm-Message-State: AOJu0YxNQInCSAHVnWZTT8Twjo+Uvw8Yn1JJk6c9tlE7YbH68ctwdS7V Fd5+yn4P1Tkup2wA/0xhwaa5USBqZuSHMdX/DT9fhyI0C6f6yeukr/+abFhMqRo6XP4GYzu+uer lgIi23jU= X-Gm-Gg: ATEYQzwr5WsadWb1rSX06BS7qqv4nLvfBFV5IEal2ZU+Loxx90Ng8eaFnbjPtIMN4OA 601BoQP2CcccxaGvIdzF1A7Rvm4h8xWTdFCzXnyTJkyaYykAkFIEgLSb5C/YK4e64kgfM0Yxxgr CA848iR4vhnR1Gx5NPmzfas04oBgtWIYGc4Vqc4qlevui6pDAhVm2CHc1Orgea8yDAri+vvE8CN cMEaUwxzpEgezCTbgVzrWRK9OvF5D2oWv/ORLU3VmvmRXzzQeEvzsyyAla3v/TBGGi/cTx7hO2v qfhqFJQXrmyRvi56YS8xmqyQmYvwGqQtX8UtHKx9N1maagGx0t+qb4iKKxqqI9N+teQRRN3l8Fo NhiSbeOBlZ5XIZPSHrz6RpU7HUfIgPktiTO3pbca76QWCzFHOeJ1PTl6ObjuD3i8ODiPu10204d MGpWKdiaaTxZEPaAcXKInW/OH/uDc3GgHjGkMDgNSrqyox2p+d/uLHz365P6s44u3McmNqCJH1f t5WU+YIhPk= X-Received: by 2002:a05:6000:2383:b0:439:b736:bd0e with SMTP id ffacd0b85a97d-439da891b21mr21835619f8f.44.1773071743670; Mon, 09 Mar 2026 08:55:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 30/49] hw/net/npcm_gmac: Catch accesses off the end of the register array Date: Mon, 9 Mar 2026 16:52:00 +0100 Message-ID: <20260309155219.62400-31-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071960167158500 From: Peter Maydell In the npcm_gmac device, we create the iomem MemoryRegion with a size of 8KB, but NPCM_GMAC_NR_REGS is only 0x1060 / 4. This means there's a range of offsets that the guest can access that don't have gmac->regs[] entries. We weren't catching this, so the guest could get us to index off the end of the regs array. Catch and log these invalid accesses. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3316 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260306154016.2194091-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/net/npcm_gmac.h | 3 ++- hw/net/npcm_gmac.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h index d4fe49ada57..23b9841a80e 100644 --- a/include/hw/net/npcm_gmac.h +++ b/include/hw/net/npcm_gmac.h @@ -24,7 +24,8 @@ #include "hw/core/sysbus.h" #include "net/net.h" =20 -#define NPCM_GMAC_NR_REGS (0x1060 / sizeof(uint32_t)) +#define NPCM_GMAC_REG_SIZE 0x1060 +#define NPCM_GMAC_NR_REGS (NPCM_GMAC_REG_SIZE / sizeof(uint32_t)) =20 #define NPCM_GMAC_MAX_PHYS 32 #define NPCM_GMAC_MAX_PHY_REGS 32 diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c index 123fb92ca40..d9902d9ab5d 100644 --- a/hw/net/npcm_gmac.c +++ b/hw/net/npcm_gmac.c @@ -700,6 +700,13 @@ static uint64_t npcm_gmac_read(void *opaque, hwaddr of= fset, unsigned size) NPCMGMACState *gmac =3D opaque; uint32_t v =3D 0; =20 + if (offset >=3D NPCM_GMAC_REG_SIZE) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid register offset: 0x%04" HWADDR_PRIx"\n", + DEVICE(gmac)->canonical_path, offset); + return v; + } + switch (offset) { /* Write only registers */ case A_NPCM_DMA_XMT_POLL_DEMAND: @@ -724,6 +731,13 @@ static void npcm_gmac_write(void *opaque, hwaddr offse= t, =20 trace_npcm_gmac_reg_write(DEVICE(gmac)->canonical_path, offset, v); =20 + if (offset >=3D NPCM_GMAC_REG_SIZE) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid register offset: 0x%04" HWADDR_PRIx"\n", + DEVICE(gmac)->canonical_path, offset); + return; + } + switch (offset) { /* Read only registers */ case A_NPCM_GMAC_VERSION: --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072323; cv=none; d=zohomail.com; s=zohoarc; b=ev9qk3gDuJqeQ581J4HpKHI5mip9l69l7jJW/o63yuW0WPwzczL26YGw62Qc6xP4jo3guq2P3VYSna9M0Q+B6748tLVOebu/Shq0tro23RkseBh427nqu45dlwarvkZ3L+5hpWt+IvbN8sDgZ5CjXsNexnRC3puzp95VfoxeJ04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072323; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=7zwtW9IWQF9xqKnStppovSkYASlgGiUn9sqSyXCNFBc=; b=fGO1TTvHVQTQamhe5c2Ehn/z5f/zovYz34nPXD/wFCQIPM9NgEsmbydCa3hmdw4KheGPFghbi+FGTmq1cY82/XwalxCQxQc0KqQMvVFyFNx7qA5E9hVcdz1fLRTbMrRsrhBGe3ADhsmwDwlUDFsVhcrCkc0cepezW2XB6+x4GiE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773072323571774.0491189125468; Mon, 9 Mar 2026 09:05:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcy9-0002ZV-BO; Mon, 09 Mar 2026 11:56: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 1vzcxW-0001pB-I8 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:56 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcxU-0000i4-J2 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:55:54 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so27301895e9.1 for ; Mon, 09 Mar 2026 08:55:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48523803b5fsm92346795e9.7.2026.03.09.08.55.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071750; x=1773676550; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7zwtW9IWQF9xqKnStppovSkYASlgGiUn9sqSyXCNFBc=; b=dAW9C6tM/XUvJEMbRe7KxM8mJ4imQWDrOS/Bd53gQASo0R1v6WSYaQvKGU1pE8yGW4 nGf+kdYLiX6iipzAg0OL3ytiDLGdx05WEg+XF/QkTeOnW/dUChU9hFWkNwcL++KYD4H1 IAXz/57onR0nXS3FsPZ0RFISMC3Gvz+XmOgjpj6SOfCnyOO6i9bFZcSs9c1qOtp369Ql fQWY401e53/8rAeVncwwDH+ap+kSq8ID1cytvuMp3ye/0qxvFqP/RuTBEqOOQyMmLb1s ylSBw/0X0jPmAY/2g0+gb3TXyhwADCE6MHi+0XUdGUTGZtJNShchCDPyCaKVVXDgF2yK Vr0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071750; x=1773676550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7zwtW9IWQF9xqKnStppovSkYASlgGiUn9sqSyXCNFBc=; b=hOdWdj6SPfJDxUCFl/F+BOCmhj6khWbgsSqexAg6lev6QGzME/ndg79J2TRlHqmwvR SyhT2IKUgPuv8a68tb3oXv1JZI4w8cqJct/I41z/+WniPcGOo4hqtnQBXStUNQVX5m7w xB9aKlqf2sMaOcqVDUwuB+Kh0Pavc0/Y2gYepsjfhog3ctVB2JotFpbYD9UjPzxDKvXf PIuZrqynHd8cUK0h6gyxpSGYHf2RtUMQzfWHbj8UPh5PGO0Uwbe9uFtX+MFC4LmX6FFH fH9bZtaeXjHe2MrG9NJOD9ynZ+OvaO2drlWlAEvGA8ABIBmHluWcJqz+OIIUjHBNxxk2 6nyQ== X-Gm-Message-State: AOJu0Yzs/xMahZH/kddSiwH1g7vkp6thdtVSYgLEmRPomaJps7naDzOd zY3TRj4s9q575G83//nSgMWN/zuE9K4CV3/LYTdZ+eeMpzDTD2DwP4MZp+NWKwl6C++9f3cmn9O 4DQO7nBU= X-Gm-Gg: ATEYQzxxuVLVaggPn/D0yHhUQJVWLqu+cyjyFwG0NqRIlGoYMpcbjtLYdMLGIliMOEV AFMXUh1XjDb5H4NT1+iMLkSrpYJo+4tA57RcUmjmOydw2FhVVHI9HD2N4TYMd06F6mcvuQO9cUU eU+I8M3bhfEEz4gVLdUMOVvCLwuRuT7Pu6Ce8ldrHFdF14vAA17nxBrVJ13aV2wBfa89hMu2q0V gJdYlg12EZs591qFhgUBdC9dYkS+vDMRuIg/IvHCaL//WPZj0RJ16GfrbegJkgrD6jMBrbB88am pCD9jnq8JbgeMXw3QEvc2SeQtFgEcec5mC4IYAfvySawdd9kbv0h4ciQJ0WR19dIg9zAearMynO f/OzcnVgFKvD8OSYIcURc8uGuW1X7D01z+UHrSFswlY26dCJe8XHEOXTv16fZldCJAz8DNCSQiH OFwK/J5xnmRj9nIV3teIMHN1Gz7eodFk6xkNx0uH3CjutdvdDVbBh5VQV9Q8mTFoSNUDjQ/kEw X-Received: by 2002:a05:600c:1395:b0:485:2fc5:3b0 with SMTP id 5b1f17b1804b1-4852fc506a5mr135763805e9.27.1773071750239; Mon, 09 Mar 2026 08:55:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 31/49] hw/sparc/sun4m: Don't set up dummy cpu interrupts Date: Mon, 9 Mar 2026 16:52:01 +0100 Message-ID: <20260309155219.62400-32-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072325542154100 From: Peter Maydell In the sun4m machine init, we set up the cpu_irqs[] array with the real inbound IRQs for each CPU, followed by some dummy IRQs for the remaining slots from smp_cpus up to MAX_CPUS. These dummy IRQs do nothing when set/cleared because the dummy_cpu_set_irq() function does nothing. Instead of creating these "do nothing" qemu_irqs, instead pass the number of CPUs to slavio_intctl_init() so that it can only wire up the interrupt controller's interrupts for the CPUs that actually exist. Calling qemu_set_irq() on an irq that isn't connected does nothing, so this is a simpler way to achieve the same result. This cleanup fixes an unimportant memory leak reported by the address sanitizer that happens because we allocate these dummy IRQs with qemu_allocate_irqs(): Direct leak of 1920 byte(s) in 15 object(s) allocated from: #0 0x5cb7b120cf63 in malloc (/home/pm215/qemu/build/san/qemu-system-spa= rc+0xe0bf63) (BuildId: d27f9230a7cc82ebfaf0cf9e439dc215ddd7ac68) #1 0x743cd6dc5ac9 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62ac9) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5cb7b1a42fb4 in qemu_extend_irqs /home/pm215/qemu/build/san/../../= hw/core/irq.c:77:51 #3 0x5cb7b19e7e72 in sun4m_hw_init /home/pm215/qemu/build/san/../../hw/= sparc/sun4m.c:845:23 #4 0x5cb7b141d3dd in machine_run_board_init /home/pm215/qemu/build/san/= ../../hw/core/machine.c:1709:5 #5 0x5cb7b1542895 in qemu_init_board /home/pm215/qemu/build/san/../../s= ystem/vl.c:2717:5 #6 0x5cb7b1542895 in qmp_x_exit_preconfig /home/pm215/qemu/build/san/..= /../system/vl.c:2811:5 #7 0x5cb7b15493ac in qemu_init /home/pm215/qemu/build/san/../../system/= vl.c:3849:9 #8 0x5cb7b1f3f201 in main /home/pm215/qemu/build/san/../../system/main.= c:71:5 #9 0x743cd4a2a1c9 in __libc_start_call_main csu/../sysdeps/nptl/libc_st= art_call_main.h:58:16 #10 0x743cd4a2a28a in __libc_start_main csu/../csu/libc-start.c:360:3 #11 0x5cb7b1172114 in _start (/home/pm215/qemu/build/san/qemu-system-sp= arc+0xd71114) (BuildId: d27f9230a7cc82ebfaf0cf9e439dc215ddd7ac68) Signed-off-by: Peter Maydell Reviewed-by: Mark Cave-Ayland Message-ID: <20260307112931.3322532-2-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a17bdb36927..29bc26ebcb7 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -196,10 +196,6 @@ static void cpu_set_irq(void *opaque, int irq, int lev= el) } } =20 -static void dummy_cpu_set_irq(void *opaque, int irq, int level) -{ -} - static void sun4m_cpu_reset(void *opaque) { SPARCCPU *cpu =3D opaque; @@ -344,6 +340,7 @@ static void *sparc32_dma_init(hwaddr dma_base, =20 static DeviceState *slavio_intctl_init(hwaddr addr, hwaddr addrg, + unsigned int smp_cpus, qemu_irq **parent_irq) { DeviceState *dev; @@ -355,7 +352,7 @@ static DeviceState *slavio_intctl_init(hwaddr addr, s =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); =20 - for (i =3D 0; i < MAX_CPUS; i++) { + for (i =3D 0; i < smp_cpus; i++) { for (j =3D 0; j < MAX_PILS; j++) { sysbus_connect_irq(s, i * MAX_PILS + j, parent_irq[i][j]); } @@ -841,9 +838,6 @@ static void sun4m_hw_init(MachineState *machine) cpu_devinit(machine->cpu_type, i, hwdef->slavio_base, &cpu_irqs[i]= ); } =20 - for (i =3D smp_cpus; i < MAX_CPUS; i++) - cpu_irqs[i] =3D qemu_allocate_irqs(dummy_cpu_set_irq, NULL, MAX_PI= LS); - /* Create and map RAM frontend */ dev =3D qdev_new("memory"); object_property_set_link(OBJECT(dev), "memdev", OBJECT(ram_memdev), &e= rror_fatal); @@ -860,6 +854,7 @@ static void sun4m_hw_init(MachineState *machine) =20 slavio_intctl =3D slavio_intctl_init(hwdef->intctl_base, hwdef->intctl_base + 0x10000ULL, + smp_cpus, cpu_irqs); =20 for (i =3D 0; i < 32; i++) { --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071811; cv=none; d=zohomail.com; s=zohoarc; b=OvMg/zqPX7fKoTjJVXMi/UD/uL8JQ34Buhm+1maJgVl8Zf0RtPxO2Bahnb/9kn5AyXmmNCB+I9LMu60fxY1q/Pn9mMDB/McU7TsmXhRwLcbdw5+gM7tjs7rWgI0k1y94vu49I1/J4CBhd7QV5r3m4cXop20H4d3c9BaoB9uBCJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071811; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=kLmnoVlDOq/MIF/zxycxp2Fm6cRvz4pHc+1xO/ulX7k=; b=ZZFX7vE2kdeKSNHI5HUUkUBQRkFFfVYo8CSctaiWoJ2XJr2Uj8Kzcd+IpQEBmNG9vp+tZ1I9OkH17RhQbox+tXMWdUTUY8K5QlJ4S+TMK8LU9TZ2dDHOevUhs4snimh1xQvLYXQitdN5w6uTp7qdmbsp4PqNWPT3lRe/TXIlplo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071810994672.0517129569726; Mon, 9 Mar 2026 08:56:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyM-00039E-Hq; Mon, 09 Mar 2026 11:56:46 -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 1vzcxd-000243-0U for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:04 -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 1vzcxb-0000il-1D for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:00 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-439b78b638eso9039480f8f.2 for ; Mon, 09 Mar 2026 08:55:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2ba66sm24259491f8f.20.2026.03.09.08.55.56 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071757; x=1773676557; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kLmnoVlDOq/MIF/zxycxp2Fm6cRvz4pHc+1xO/ulX7k=; b=Hu4jsRuQe1wpaOfda2y/hLmcTUwY62kEpMgc2/omH4m0iDMOrKLoqiOSjnnO+D/1Q9 kQvVkbN45hFd2RUls203pjWCWTSfFU8KAfmzeVPCHuEkXA/UP3Dg2jp3Fkwst8nkgr+x oJTo9ocWXWHXg5wXrRPQ5gPHeLpWkh6T8ap9aMZuURMVNdTctZtyF55rNODFwcgd9Exr zIlVGDdprxBD+Ceah6J8T2hQXq0XwatSyBkisw3GRHMSo9bnv2jp5sWDGUQCI8krBzJH wIQD6KCe3j0DDTILOLmqu60FCOT286CtpaukgvACc+OA/Zb7KPvQVcPAaOGM0whPKg9y nI3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071757; x=1773676557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kLmnoVlDOq/MIF/zxycxp2Fm6cRvz4pHc+1xO/ulX7k=; b=QUS5y43F3k0M/E8Xm2hmjnjHmJJrV01ntA9Tbo88oTcYp6uWbDzQMa6EHixUDujbXn qI+SPYDKhS91EZP8PITD9XSbBIHpvdJVHDBGrE/Jo1yEZ5hw/f1p9lGXBJhTJcW8FCUw XTgQL1556zFuRiYqnos1otYxXfVYV+1Rey6NI51gV/jE1Ato0S66hqBzPvMhiCPXSoKF nBgEI1E0tKZj1ej048iCONg0FFi1QSFwmQ/LB10h6YyalDE3dEejJ6VCb+9osDuH9HcB 1BSp63rFBU8ws1yfuyBTmyHAK7AMPWMroDJnjH9IESMv3sRzC9M2YbYD2aIoSgEYI5Im ZaPA== X-Gm-Message-State: AOJu0YwGJe+IW4yaL0fP+1jzRrSoiFYZosvOVM9BWyR7jNQjrxSWDSmx MWXFvB5iAgyGCwMz+vk4vVmMU/0ka9M5HbKjDibmcLeoSJcfvPtV2wFTsZW/BqSqkWAJY2wWi6J 32ga3pJE= X-Gm-Gg: ATEYQzyXlbg+g1wpjC1W1lPIkE6khgEoBTLXM+wWlUUtu62QR+/xNNGX9xfbaPxeFI9 ObMWZnrvly8HpBio7ye40a/n9s7d/UcqotUUWrT4hLp+URcKNU45edVUZJ6u7wvr4Hca/czw4DL ziUde1YEBUnBfBiSM5KeLgtJ+YZ3tWBmXeET1ZWZVcbdiIz1susRZs0TqXSuFOidkEhIL207FII rrFqpRsxV2lo3oYR8BCY/WPSB6zhFzBukqoR3oHFDxrvTVmA6wF3P4xjCi4Uia1cVoHxKc6J3CZ +dN1gKUCg9xXAk42Oo6h4xRb5klTroQ55+N0j6GXYySU+7G2B4i+/eC/s3U9UkGDC1KKPJZq9Ik FxhitP/w8fJl+njtrGeYMElfwkw08NoJjDdFIJCDBIzOOah+FzXH9SAOKBx8rOMODpISroGdw+9 4anaIPXnQVAVA+LePVChYRb9CMjklvaL7ZUMEFIz/rfdcbO96Y9sVsJJIZye542PPyZpE5C76vP 98Su+tYJk0= X-Received: by 2002:a05:6000:430b:b0:439:b671:1d8f with SMTP id ffacd0b85a97d-439da89c078mr17588122f8f.45.1773071756919; Mon, 09 Mar 2026 08:55:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 32/49] hw/sparc/sun4m: Use qdev GPIOs rather than qemu_allocate_irqs() Date: Mon, 9 Mar 2026 16:52:02 +0100 Message-ID: <20260309155219.62400-33-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071813474158500 From: Peter Maydell In the sun4m machine creation code, we currently use qemu_allocate_irqs() to set up the IRQ lines that act as the inbound IRQ lines to the CPUs. This results in a memory leak: Direct leak of 128 byte(s) in 1 object(s) allocated from: #0 0x5a23c1281ec3 in malloc (/home/pm215/qemu/build/sparc-san/qemu-syst= em-sparc+0xdf1ec3) (BuildId: e6aa10be01feb5524656dd083997bc82b85e3e93) #1 0x79e8f78f0ac9 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62ac9) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5a23c1a94e54 in qemu_extend_irqs /home/pm215/qemu/build/sparc-san/= ../../hw/core/irq.c:77:51 #3 0x5a23c1a39e03 in cpu_devinit /home/pm215/qemu/build/sparc-san/../..= /hw/sparc/sun4m.c:802:17 #4 0x5a23c1a39e03 in sun4m_hw_init /home/pm215/qemu/build/sparc-san/../= ../hw/sparc/sun4m.c:838:9 The leak is unimportant as it is a "once at startup" leak, but fixing it helps in getting a clean leak-sanitizer test run. Switch the sun4m code to handle CPU interrupt lines in the same way as the leon3 machine does: the machine init code uses qdev_init_gpio_in to create GPIO lines on the CPU objects. This is a little bit odd as ideally the CPU would do that itself, but for these 32-bit SPARC machines the machine and the CPU are very closely coupled already (the functions handling the IRQ lines modify data fields inside the CPU). Signed-off-by: Peter Maydell Reviewed-by: Mark Cave-Ayland Message-ID: <20260307112931.3322532-3-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 29bc26ebcb7..b9f8236be54 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -341,7 +341,7 @@ static void *sparc32_dma_init(hwaddr dma_base, static DeviceState *slavio_intctl_init(hwaddr addr, hwaddr addrg, unsigned int smp_cpus, - qemu_irq **parent_irq) + DeviceState **cpus) { DeviceState *dev; SysBusDevice *s; @@ -354,7 +354,8 @@ static DeviceState *slavio_intctl_init(hwaddr addr, =20 for (i =3D 0; i < smp_cpus; i++) { for (j =3D 0; j < MAX_PILS; j++) { - sysbus_connect_irq(s, i * MAX_PILS + j, parent_irq[i][j]); + sysbus_connect_irq(s, i * MAX_PILS + j, + qdev_get_gpio_in_named(cpus[i], "pil", j)); } } sysbus_mmio_map(s, 0, addrg); @@ -785,22 +786,25 @@ static const TypeInfo ram_info =3D { .class_init =3D ram_class_init, }; =20 -static void cpu_devinit(const char *cpu_type, unsigned int id, - uint64_t prom_addr, qemu_irq **cpu_irqs) +static DeviceState *cpu_devinit(const char *cpu_type, unsigned int id, + uint64_t prom_addr) { SPARCCPU *cpu; CPUSPARCState *env; + DeviceState *cpudev; =20 cpu =3D SPARC_CPU(object_new(cpu_type)); env =3D &cpu->env; + cpudev =3D DEVICE(cpu); =20 qemu_register_reset(sun4m_cpu_reset, cpu); object_property_set_bool(OBJECT(cpu), "start-powered-off", id !=3D 0, &error_abort); - qdev_realize_and_unref(DEVICE(cpu), NULL, &error_fatal); + qdev_init_gpio_in_named(cpudev, cpu_set_irq, "pil", MAX_PILS); + qdev_realize_and_unref(cpudev, NULL, &error_fatal); cpu_sparc_set_id(env, id); - *cpu_irqs =3D qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS); env->prom_addr =3D prom_addr; + return cpudev; } =20 static void dummy_fdc_tc(void *opaque, int irq, int level) @@ -813,13 +817,14 @@ static void sun4m_hw_init(MachineState *machine) DeviceState *slavio_intctl; unsigned int i; Nvram *nvram; - qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS]; + qemu_irq slavio_irq[32], slavio_cpu_irq[MAX_CPUS]; qemu_irq fdc_tc; unsigned long kernel_size; uint32_t initrd_size; DriveInfo *fd[MAX_FD]; FWCfgState *fw_cfg; DeviceState *dev, *ms_kb_orgate, *serial_orgate; + DeviceState *cpus[MAX_CPUS]; SysBusDevice *s; unsigned int smp_cpus =3D machine->smp.cpus; unsigned int max_cpus =3D machine->smp.max_cpus; @@ -835,7 +840,7 @@ static void sun4m_hw_init(MachineState *machine) =20 /* init CPUs */ for(i =3D 0; i < smp_cpus; i++) { - cpu_devinit(machine->cpu_type, i, hwdef->slavio_base, &cpu_irqs[i]= ); + cpus[i] =3D cpu_devinit(machine->cpu_type, i, hwdef->slavio_base); } =20 /* Create and map RAM frontend */ @@ -855,7 +860,7 @@ static void sun4m_hw_init(MachineState *machine) slavio_intctl =3D slavio_intctl_init(hwdef->intctl_base, hwdef->intctl_base + 0x10000ULL, smp_cpus, - cpu_irqs); + cpus); =20 for (i =3D 0; i < 32; i++) { slavio_irq[i] =3D qdev_get_gpio_in(slavio_intctl, i); --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071879; cv=none; d=zohomail.com; s=zohoarc; b=Lw8BRz1B7jx7T5eAq0mUcyq2aGnsWf9tf/aRJ1A+a9R87aus5TxHlK2CyK7Q2CaxXfMrykpQToA9PwE/OLYpWs19V+kDriUB9qwlUKjPT7e5cXqLaZkpniKp+izbQtL9taLxP9XE+o2K9/m+QKYib9eZlF4FFSlLFjuQjC9HSBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071879; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=mwB/3Msc370kfGVtYpqiHsadhvF99jZZ70nFea4elt8=; b=QvGANnhv+gyRrvYfDbxmdHm0ejmmz1PC+mblVCqg4lN9/BFk99RskdOLC01fLfO1ZvjmEgOBIPQx9QXQh9XvnnV40vuu60tKwZOTf2Ra4t8PL6ci7o1IypATypkCrGpDNjdap4FZ/ebJ80wmRgvQ6QoQ+7nI6w9ORYQv+8NzGgs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071879085512.1352460696465; Mon, 9 Mar 2026 08:57:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyC-0002qo-IU; Mon, 09 Mar 2026 11:56:37 -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 1vzcxk-00029V-Vk for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:13 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcxj-0000jM-3w for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:08 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so24444475e9.0 for ; Mon, 09 Mar 2026 08:56:05 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237f2d2bsm93213115e9.4.2026.03.09.08.56.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071764; x=1773676564; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mwB/3Msc370kfGVtYpqiHsadhvF99jZZ70nFea4elt8=; b=GJFkTGedpz+KcVypRVGTOTmL3ReUDUw6GttwioDU0RGyOqAf5/jJO/+WIxznKV1m3a AhrLNFWLBfs68tJ/EHIn/Fn+9WHqg6S3njyaseQUKrUtmf6oqs8zmxrXYtJNtKtourL/ YatoV5docgy/ccFwadO5j+SqXGNGP22yI1vKmaeq3xco1MnTNEGkuKh8QPctzwdbCW/4 wXnMe+Y0PgahfdCkKcb+RA0+yQhTrglwayvltpqIDnYGYf7MUFX0YwlaRZTC+4RX49SC XjNlFmiHecDaGGZo8v4h0TCWTH92NNubRysma5bbaGdUPr25zmOESSvlaPO7UDx+uBKg lsSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071764; x=1773676564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=mwB/3Msc370kfGVtYpqiHsadhvF99jZZ70nFea4elt8=; b=jyG3hfStHqqzIvbuwUfL9yx+bZm+vCJi6r2xRYHuamhoIBtYIMYHKe3UsAvk52aYGK 9UgVfsCM3FP7MKTEh8u2l7i8sw71AtdgFw9rKpr27HlS2p3pehwvttDFSytuDyUWy1a9 yHC8v+DElle8DXhtda2+TTf+3pcWVSqTsCJQRnMxBohA6ru/4tVuP8x9pJbVb+IZReet AenhBAyt+edm697Z/fuGQSQut3eYYz7ZlqwLyTAZkfRkiiNOO9jZzaba9M1DyGEq9aKV /6OdcaaRV3TzoxlLS39SHdSwVVjK5mvDD9XakxtN4jc7TKrRVUjmQgeqifliO+I2ix/u 66+w== X-Gm-Message-State: AOJu0YzWSw/rKYXVIo7wT5ab/NfmfSY6tqnPjYG8II0yGepG+DUr1MTM yGm7Hn+HntQC7lXarnjVcRs4JJePj0e4aCn8q0ih+iNw4MTGj4g6wRS/XqCqUlAK6p2/JeyhBOV RsLv4J5Y= X-Gm-Gg: ATEYQzzeSXvIZO4fljll1GO7VOdCxIiTcoDsCcL6bMfjWG8TNUynH0Z3B8AiSoioEQJ DpNE8zT7TtNNTionNKjcd7KfvHkG8PcSAbSS20wDr90a4iejxnmps+96eMnMuApsBUUjjAI0g3L ohRoCjcjCNJOkp5QzbdqHDbmUaIv0fsCG+dnIprBnuLKmuD5cxHpdEdGeaxl8zxj+YhBJF0dqvs xGxSWUTs0a5Lm7Udrm0UMccLr64zo3hTAT+XFyYmStZhj1MUxvNggP07lmhCCPMGA6E1z85HvRi DaFNlxZYrQQf/ZIIu1tVqmvhs2XAbr61AOpq6pn76gkbqIl+epFy/80qMQef9LXOzSk3exo8xIf 7Cng9+7fFvy8uWLzhszSTFYytwXtbyXztP0T3M1ws+LW5GfUfeDy2T/MLwBqzVYq/R5UbW+mkSb +l+ji+555UdJhN4Kp+QftGAghzZk1GWyVblqE9LfjyVV7TRusfzOpMAqqBynjLb2TJUDojB68y X-Received: by 2002:a05:600c:4443:b0:485:410c:119b with SMTP id 5b1f17b1804b1-485410c1bfemr13282775e9.13.1773071763930; Mon, 09 Mar 2026 08:56:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 33/49] hw/timer/slavio_timer: Free resources allocated in instance_init Date: Mon, 9 Mar 2026 16:52:03 +0100 Message-ID: <20260309155219.62400-34-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071880586154100 From: Peter Maydell The slavio_timer device's instance_init function allocates memory for TimerContext structs and a ptimer, but it never frees this memory, so we will leak it if the QMP interface does introspection of this device type, as reported by the clang address sanitizer: Indirect leak of 4896 byte(s) in 17 object(s) allocated from: #0 0x5f2948d9b14d in calloc (/home/pm215/qemu/build/san/qemu-system-spa= rc+0xe0c14d) (BuildId: 7210711bdf6f7fbd0b863bd2dfcc7c42c7175db1) #1 0x758584b11771 in g_malloc0 (/lib/x86_64-linux-gnu/libglib-2.0.so.0+= 0x63771) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5f2949097b8a in slavio_timer_init /home/pm215/qemu/build/san/../..= /hw/timer/slavio_timer.c:403:14 #3 0x5f29495d790f in object_initialize_with_type /home/pm215/qemu/build= /san/../../qom/object.c:570:5 #4 0x5f29495d96ef in object_new_with_type /home/pm215/qemu/build/san/..= /../qom/object.c:774:5 #5 0x5f2949a30a26 in qmp_device_list_properties /home/pm215/qemu/build/= san/../../qom/qom-qmp-cmds.c:206:11 Indirect leak of 1632 byte(s) in 17 object(s) allocated from: #0 0x5f2948d9b14d in calloc (/home/pm215/qemu/build/san/qemu-system-spa= rc+0xe0c14d) (BuildId: 7210711bdf6f7fbd0b863bd2dfcc7c42c7175db1) #1 0x758584b11771 in g_malloc0 (/lib/x86_64-linux-gnu/libglib-2.0.so.0+= 0x63771) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5f2948f7c65a in ptimer_init /home/pm215/qemu/build/san/../../hw/co= re/ptimer.c:464:9 #3 0x5f2949097c1f in slavio_timer_init /home/pm215/qemu/build/san/../..= /hw/timer/slavio_timer.c:407:32 #4 0x5f29495d790f in object_initialize_with_type /home/pm215/qemu/build= /san/../../qom/object.c:570:5 #5 0x5f29495d96ef in object_new_with_type /home/pm215/qemu/build/san/..= /../qom/object.c:774:5 #6 0x5f2949a30a26 in qmp_device_list_properties /home/pm215/qemu/build/= san/../../qom/qom-qmp-cmds.c:206:11 Avoid the TimerContext leaks by making them an array inside the SLAVIO_TimerState struct instead of allocating a compile-time-fixed number of them each individually with g_new0() and then throwing away the pointer. Avoid the ptimer() leak by calling ptimer_free in instance_finalize(). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Message-ID: <20260307112931.3322532-4-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/slavio_timer.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 4a3e227fbab..eccdc532fb1 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -62,20 +62,21 @@ typedef struct CPUTimerState { #define TYPE_SLAVIO_TIMER "slavio_timer" OBJECT_DECLARE_SIMPLE_TYPE(SLAVIO_TIMERState, SLAVIO_TIMER) =20 +typedef struct TimerContext { + MemoryRegion iomem; + SLAVIO_TIMERState *s; + unsigned int timer_index; /* 0 for system, 1 ... MAX_CPUS for CPU time= rs */ +} TimerContext; + struct SLAVIO_TIMERState { SysBusDevice parent_obj; =20 uint32_t num_cpus; uint32_t cputimer_mode; CPUTimerState cputimer[MAX_CPUS + 1]; + TimerContext timer_context[MAX_CPUS + 1]; }; =20 -typedef struct TimerContext { - MemoryRegion iomem; - SLAVIO_TIMERState *s; - unsigned int timer_index; /* 0 for system, 1 ... MAX_CPUS for CPU time= rs */ -} TimerContext; - #define SYS_TIMER_SIZE 0x14 #define CPU_TIMER_SIZE 0x10 =20 @@ -400,7 +401,7 @@ static void slavio_timer_init(Object *obj) uint64_t size; char timer_name[20]; =20 - tc =3D g_new0(TimerContext, 1); + tc =3D &s->timer_context[i]; tc->s =3D s; tc->timer_index =3D i; =20 @@ -420,6 +421,15 @@ static void slavio_timer_init(Object *obj) } } =20 +static void slavio_timer_finalize(Object *obj) +{ + SLAVIO_TIMERState *s =3D SLAVIO_TIMER(obj); + + for (int i =3D 0; i <=3D MAX_CPUS; i++) { + ptimer_free(s->cputimer[i].timer); + } +} + static const Property slavio_timer_properties[] =3D { DEFINE_PROP_UINT32("num_cpus", SLAVIO_TIMERState, num_cpus, 0), }; @@ -438,6 +448,7 @@ static const TypeInfo slavio_timer_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SLAVIO_TIMERState), .instance_init =3D slavio_timer_init, + .instance_finalize =3D slavio_timer_finalize, .class_init =3D slavio_timer_class_init, }; =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071879; cv=none; d=zohomail.com; s=zohoarc; b=W5HGo02RDV01hzl41zk4036CRUAws6VPuRcONjGNpAtdSK0hVcFrXh8dVacI+kS+Oo6LU32aqRd9xwLdj7VPd1paIyTca97OnK/dN2fhiCWoyfVBJ2JzR0AVUhwssZBS2l4m19Vd2QauWWXsO7r0UAx4weyFjc0OhWJWPPPU87o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071879; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=fw6wBvS/jWBCT8CzgmaAoObQ5XjTTwGmshMvHdDMLrQ=; b=jrPZKEpE01GknNOTTSKR2ztB1ec6PUt4oXfIW+dpd9SF0koxVXH7kjflDXtdxMjTAnyYHm8M/exhUAohwdZ5Lu27ngOV0GAdNppjmS5Ecc7An+uJkc1bBmlcQ6ulim/DOJ5lHC+k46sV2X8t6W9HgHEPc6Y7LGALCbxeKAHDHSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071879397654.312689800002; Mon, 9 Mar 2026 08:57:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyP-0003Ja-F3; Mon, 09 Mar 2026 11:56:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcxq-0002CG-21 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:17 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcxo-0000jm-GZ for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:13 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-439b6d9c981so5669492f8f.1 for ; Mon, 09 Mar 2026 08:56:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae49177sm26636875f8f.35.2026.03.09.08.56.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071771; x=1773676571; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fw6wBvS/jWBCT8CzgmaAoObQ5XjTTwGmshMvHdDMLrQ=; b=NjlYGLXXcIkHzKRxUBeXB67HDc2ggmNtUxgWSDcxYU6SzSzBN788YRdXbHcbVjKD3i V9Ibr14ucTBuUxklPz8pjl1PL6AN/q7vE3WG9OGezmQjR12AHq85ikySlFb+HnMOIBFf s39m15OUVDPxNnIxzjIeMakDwjAC72xR0SSO/OQnT0CRKgFM8E4fX0KewE5t+bTNm9VI 5lPRhCdB6mml3Nud7WEqaZRW1oZPnadZZH7utPfcnTp5Of4I59c5CpJr20bdq802vjtM F8W1Wsg1hox+JvplTPa3MsfUwcmHsQajAkK/oYUUU0PA7+lHqOnePS0PQyb0df4OhuMt XUfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071771; x=1773676571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=fw6wBvS/jWBCT8CzgmaAoObQ5XjTTwGmshMvHdDMLrQ=; b=BLeJgNX72bF0znwTcrZGbbwsWC6OWcvbMQ79laOblDePfM7Yxauuul4J2LNeNg05M9 aUl3xttU2KN8Z8MbJMDrXYUsUFWXWh7ru2eAy8s+7gklkr9kIa3Ii2f0qPipEfMp+CBU ii6uKiJ99SrRviqgmlqFvi6pwxoIC1wcuoQS9i1MtDGGe0DPA0IMDCAOlq88UxJQEMLi gCRZWjYv7L/EY9jQaFmI3t6n7fsbMYcQghBMAV+XwFrCdUSAr988b4vInwF/obgpTuQc RTfuCJ1SBF1YqxkIJ4Kj7WmZ6GiM/zgt333y54plwr0x1V1v/fEkuVkrhWaq9Ycx6a80 bLDQ== X-Gm-Message-State: AOJu0YywX8yvvW9H4djA7K4qEh7hh3zxN8mGQE0sfMIg9CYg5D4A59Py LDH+rNXnfBsVu3Z+/FiYsk14GYQ6uELLnUEaSDTTicgAK6lFoKwYCz3cNJh09H81PgbnCRWVYvG qd+C9JMw= X-Gm-Gg: ATEYQzwJqLTC1G5owCpwQp595qFNo2Z9MUp9tA1br7EaMFzYuyXT0XNp4Z29Rsva8vg u+Sd5ZXbsjr92iYGLayfy+Y7ePVwzs06rYKXmJ3KJs28UROERIpCFsFO7/j7MLoajdNH+1lSlai k/GKTCiwcgLUfwNENRLyPPJLPSUbxWIreozURrIe7ukTkxK5mJ8+3ciQvXS37LaaariqvvorrR6 KJUEY9EXoPp2iJnsz5ONssqsI/gOo6dXy0FtBfG23WwctAaB8mU+xAARB0GmY3lFP7tIUaB8azo LbcauCLTNaDg4FVrbd1qn4FgVnOVulAPxMLJwlgQeniJ5rR+x+u1UwYOKTBRkVCEEgp408O7Yyt qh7b2snUOiPDk+gKU13Z83oDV0M9Uu5mSDma+/IMyXX5Y8Xxwp2W14/ZryZcuKgKzH9tgwpGljp Lv6eWfHs14olnyQQcZA/5+V3K2sGrgBR7ksAwvZEd2OQkbnqwH7Raa2ejidfhzTAsmSyt+hB16 X-Received: by 2002:a05:6000:430a:b0:439:bee4:8a93 with SMTP id ffacd0b85a97d-439eff38bcdmr213588f8f.12.1773071770619; Mon, 09 Mar 2026 08:56:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 34/49] hw/qdev: Document qdev_get_dev_path() Date: Mon, 9 Mar 2026 16:52:04 +0100 Message-ID: <20260309155219.62400-35-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071879598158500 From: Peter Maydell We don't document qdev_get_dev_path() at all; in particular we do not mention that it returns a string that the caller must free. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260307155046.3940197-2-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/qdev.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/hw/core/qdev.h b/include/hw/core/qdev.h index 4b2730e9d8e..29083bc9078 100644 --- a/include/hw/core/qdev.h +++ b/include/hw/core/qdev.h @@ -324,6 +324,10 @@ struct BusClass { =20 /* FIXME first arg should be BusState */ void (*print_dev)(Monitor *mon, DeviceState *dev, int indent); + /* + * Return a newly allocated string containing the path of the + * device on this bus. + */ char *(*get_dev_path)(DeviceState *dev); =20 /* @@ -1060,6 +1064,25 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState = *bus, Error **errp); =20 extern bool qdev_hot_removed; =20 +/** + * qdev_get_dev_path(): Return the path of a device on its bus + * @dev: device to get the path of + * + * Returns: A newly allocated string containing the dev path of + * @dev. The caller must free this with g_free(). + * The format of the string depends on the bus; for instance a + * PCI device's path will be in the format:: + * + * Domain:00:Slot.Function:Slot.Function....:Slot.Function + * + * and a SCSI device's path will be:: + * + * channel:ID:LUN + * + * (possibly prefixed by the path of the SCSI controller). + * + * If @dev is NULL or not on a bus, returns NULL. + */ char *qdev_get_dev_path(DeviceState *dev); const char *qdev_get_printable_name(DeviceState *dev); =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071880; cv=none; d=zohomail.com; s=zohoarc; b=YYvAxJV6rUaJ8ZeEYW0XRP0hZQXsQkyJ54cK12fTOl1Q4bM3ca0hYkmR81gnxnNWQpsTLiGOhSzjtayNJRMJwWM3BNadpxT4IWVFUzCEU+QXoT5zDZSTPkewfXqAk5Wu+9fJMmx6gDKcca4zPo2scdYZAYvB7gSaYQqlBmWME8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071880; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IYwq/x5k8YzSo5nefHb2YOgR15RYyHxfIiTIwO06Ijw=; b=fdqhIiJV9HCBVcgfOtoS39icYfrLtf5vbSzVKTfvsGnayMEcwIG4o+FFskbndTm3KtRq8eI1Sw0sxAI47QuCnwX3DjgwC9bvwX7pPp1m2FREdizTxGpPkvGpe97sW608y1/Acu5LTiSTUs+GBAnfawebZE0fXBPdMSCR44HYK5s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071880457907.9754180397025; Mon, 9 Mar 2026 08:58:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcz7-0004AN-0u; Mon, 09 Mar 2026 11:57: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 1vzcy4-0002kr-Ou for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcxx-0000k7-G4 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:24 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-48540d21f7dso4105495e9.0 for ; Mon, 09 Mar 2026 08:56:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4853927825csm39166875e9.9.2026.03.09.08.56.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071778; x=1773676578; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IYwq/x5k8YzSo5nefHb2YOgR15RYyHxfIiTIwO06Ijw=; b=rkkyZkuhRPsS7UNbX1WJNeHURgdjDt9+kADXwixPY907TZUihNtLm790KZd8D2WJtw lCj1KSINZ89x5i948kXREIh4MK5G31MSCqUetMUHhnZmXMR+hfNEWgW7JwtoLRITZdOt /75+u0TIu/TobR/wP4L5oVZ6w4vXE/kD8g1EYrEiY/Ac/WfYlQQh5LwEb+aTd6A6mfkD J/NDm5LxInaSzoLnX15RWjxc04PXiAPVFZ/kQMdYVGjKn6RIDRxFeX9XZosv1+PBOJgJ Skdn13wxqgZSfwOrrMBLyUvPkjAKSmPHn6s5IFbAguYBYgYv/b7G+GF2lg8Kb9+ET46X Y2PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071778; x=1773676578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IYwq/x5k8YzSo5nefHb2YOgR15RYyHxfIiTIwO06Ijw=; b=RnFXSo9Jyth+2YYf7yZJ3pIMGWsUFB/hDQgET+iAJtazaBhZW0g3OZLH4o46LL3H7d AZ8CJBNF450SrWiYwWb/pu6bWzhd/3kwhx4upLXxiPhWyTbuFun8Xs7tBpNLW4LuKEIR nKO3OtjUGmPodACFPRXtBS/wZZH63l9M6vOlSl1DaHVMxR1CrvktBf/fEqLFnAu2smhT XyKpJM+qWW+fEFCicosSahr+8V9Ho9mu2P72Eh3vSW9ig3ZTklpYDbqykKAo4at7XJD5 +6f3NFqFGCXWrDQG85lXscVm11+BOOozTfOjZb8efiklGpasyH+9v4LtC0hWKnocDsdF nKtg== X-Gm-Message-State: AOJu0YyDVl+qnX2Yf6l1cnXpZzlD5+Ct90LKGJ+TgSOcn0UIciysk5a1 rPGcD47RBkQKNOQLNIN/i+s9tKhRqqooqhnwaNsrMkuoCMbUFBjG0wykABTrBD6mxQQMmF6ydxg hTZJvjBc= X-Gm-Gg: ATEYQzwuSV962wHDXLUQREJjlncrxgOc0IHjtkA2zgVNWoIsMYRvGpcFxdiZxsr7OE4 nJy8rRvsGmVMD/cSgvmWY1FPZcFdczTlEk9b410XG7/bibh9DnzTOxyuLB2IPz3ah8AHII0y2HC eLHGWpiDN7E16tkZl3zVLyCNK+bd3SKcJCq21D1V6x1LltWNXdLRE17Z4Ivmq3+fwbkBNjCu7dW Dh5/8XxABNeeXSFuD5rVqGzqaen4VqyOxaKVl4smFqfwKAu0qeyvidZqCrqnPSEylIduU52/U6i 7vIVOqEuHTNsTBmaB4GIgu/O3y2n+/nQsRhCOSwl04f/vNDw4wZbAABsA4VRi4kWIx52uJDaikd /40gDk5qJJ8WNseTBwj6Vp5cv2orqezNbN67TllHNZmZFTUr+R166vHd0pZLmGcaW5gOPynqPsp hGlAncBhwJ86UXPTxSmQIY3b5n8kbI608rK01hK8IXq6iwn3fpxTwsDGa3N5A35gFzgPikmBB1 X-Received: by 2002:a05:600c:c8f:b0:483:703e:4ad9 with SMTP id 5b1f17b1804b1-4852695b63emr201283305e9.19.1773071777730; Mon, 09 Mar 2026 08:56:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 35/49] hw: Make qdev_get_printable_name() consistently return freeable string Date: Mon, 9 Mar 2026 16:52:05 +0100 Message-ID: <20260309155219.62400-36-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071881667158500 From: Peter Maydell The current implementation of qdev_get_printable_name() sometimes returns a string that must not be freed (vdev->id or the fixed fallback string "" and sometimes returns a string that must be freed (the return value of qdev_get_dev_path()). This forces callers to leak the string in the "must be freed" case. Make the function consistent that it always returns a string that the caller must free, and make the three callsites free it. This fixes leaks like this that show up when running "make check" with the address sanitizer enabled: Direct leak of 13 byte(s) in 1 object(s) allocated from: #0 0x5561de21f293 in malloc (/home/pm215/qemu/build/san/qemu-system-i38= 6+0x1a2d293) (BuildId: 6d6fad7130fd5c8dbbc03401df554f68b8034936) #1 0x767ad7a82ac9 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0= x62ac9) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5561deaf34f2 in pcibus_get_dev_path /home/pm215/qemu/build/san/../= ../hw/pci/pci.c:2792:12 #3 0x5561df9d8830 in qdev_get_printable_name /home/pm215/qemu/build/san= /../../hw/core/qdev.c:431:24 #4 0x5561deebdca2 in virtio_init_region_cache /home/pm215/qemu/build/sa= n/../../hw/virtio/virtio.c:298:17 #5 0x5561df05f842 in memory_region_write_accessor /home/pm215/qemu/buil= d/san/../../system/memory.c:491:5 #6 0x5561df05ed1b in access_with_adjusted_size /home/pm215/qemu/build/s= an/../../system/memory.c:567:18 #7 0x5561df05e3fa in memory_region_dispatch_write /home/pm215/qemu/buil= d/san/../../system/memory.c #8 0x5561df0aa805 in address_space_stm_internal /home/pm215/qemu/build/= san/../../system/memory_ldst.c.inc:85:13 #9 0x5561df0bcad3 in qtest_process_command /home/pm215/qemu/build/san/.= ./../system/qtest.c:480:13 Cc: qemu-stable@nongnu.org Fixes: e209d4d7a31b9 ("virtio: improve virtqueue mapping error messages") Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260307155046.3940197-3-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/qdev.h | 16 ++++++++++++++++ hw/core/qdev.c | 4 ++-- hw/virtio/virtio.c | 12 +++++++++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/hw/core/qdev.h b/include/hw/core/qdev.h index 29083bc9078..f99a8979ccb 100644 --- a/include/hw/core/qdev.h +++ b/include/hw/core/qdev.h @@ -1084,6 +1084,22 @@ extern bool qdev_hot_removed; * If @dev is NULL or not on a bus, returns NULL. */ char *qdev_get_dev_path(DeviceState *dev); + +/** + * qdev_get_printable_name: Return human readable name for device + * @dev: Device to get name of + * + * Returns: A newly allocated string containing some human + * readable name for the device, suitable for printing in + * user-facing error messages. The function will never return NULL, + * so the name can be used without further checking or fallbacks. + * + * If the device has an explicitly set ID (e.g. by the user on the + * command line via "-device thisdev,id=3Dmyid") this is preferred. + * Otherwise we try the canonical QOM device path (which will be + * the PCI ID for PCI devices, for example). If all else fails + * we will return the placeholder ". + */ const char *qdev_get_printable_name(DeviceState *dev); =20 void qbus_set_hotplug_handler(BusState *bus, Object *handler); diff --git a/hw/core/qdev.c b/hw/core/qdev.c index fc3425a8fe1..e48616b2c6f 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -420,7 +420,7 @@ const char *qdev_get_printable_name(DeviceState *vdev) * names. */ if (vdev->id) { - return vdev->id; + return g_strdup(vdev->id); } /* * Fall back to the canonical QOM device path (eg. ID for PCI @@ -437,7 +437,7 @@ const char *qdev_get_printable_name(DeviceState *vdev) * Final fallback: if all else fails, return a placeholder string. * This ensures the error message always contains a valid string. */ - return ""; + return g_strdup(""); } =20 void qdev_add_unplug_blocker(DeviceState *dev, Error *reason) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 4c5a4479bfa..0ba734d0bc6 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -281,10 +281,12 @@ void virtio_init_region_cache(VirtIODevice *vdev, int= n) len =3D address_space_cache_init(&new->desc, vdev->dma_as, addr, size, packed); if (len < size) { + g_autofree const char *devname =3D qdev_get_printable_name(DEVICE(= vdev)); + virtio_error(vdev, "Failed to map descriptor ring for device %s: " "invalid guest physical address or corrupted queue setup", - qdev_get_printable_name(DEVICE(vdev))); + devname); goto err_desc; } =20 @@ -292,10 +294,12 @@ void virtio_init_region_cache(VirtIODevice *vdev, int= n) len =3D address_space_cache_init(&new->used, vdev->dma_as, vq->vring.used, size, true); if (len < size) { + g_autofree const char *devname =3D qdev_get_printable_name(DEVICE(= vdev)); + virtio_error(vdev, "Failed to map used ring for device %s: " "possible guest misconfiguration or insufficient memory", - qdev_get_printable_name(DEVICE(vdev))); + devname); goto err_used; } =20 @@ -303,10 +307,12 @@ void virtio_init_region_cache(VirtIODevice *vdev, int= n) len =3D address_space_cache_init(&new->avail, vdev->dma_as, vq->vring.avail, size, false); if (len < size) { + g_autofree const char *devname =3D qdev_get_printable_name(DEVICE(= vdev)); + virtio_error(vdev, "Failed to map avalaible ring for device %s: " "possible queue misconfiguration or overlapping memory reg= ion", - qdev_get_printable_name(DEVICE(vdev))); + devname); goto err_avail; } =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071998; cv=none; d=zohomail.com; s=zohoarc; b=Kee0xvQeMXqcZ+KQS4cm9eU+G6hJG6UIi3hKOerY0artBYbDJZHBXSJf9pPHfdvdzHKV/VEF0cAGWDb1d2SRsLB1oCnFq1KRCKz9YHYKgiHQP1A2sMS2S4cb7m0l+oHXgNkjkDkfCJP7sBlfZiccFR81W25kotB7NqiZpDNjVCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071998; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=JtkKw13Vk9HzOzHG7UMYz97Jnsnp+coU48cy74dU8ts=; b=dD4HsnITxTXZkCwGdfMI/EvAiyzgWIPBFpSwy7VdqfrvcMtBfCWmAo9gWgMoMMHimyg2zrzfeXYetYD7OHpKOOZZvmdaldeHQnuYKxni5lpjmLTdkpKcZAzyO5Qfq35oQX1ECEHOPk6Xfr7OD41fI1J8rfwSJ6hFnb/lkRDfEHQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071998282113.68971794495917; Mon, 9 Mar 2026 08:59:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyi-0003ff-Rh; Mon, 09 Mar 2026 11:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcy6-0002oJ-5e for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:33 -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 1vzcy2-0000kt-Ij for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:29 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48374014a77so140993645e9.3 for ; Mon, 09 Mar 2026 08:56:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541acea11sm657235e9.7.2026.03.09.08.56.23 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071784; x=1773676584; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JtkKw13Vk9HzOzHG7UMYz97Jnsnp+coU48cy74dU8ts=; b=VRAK83Wwsmf2Ct3ZS4hkBREzAMZcPYZCuBg7yFqRRNhjrz6XLsrha1rA9AB39xf4hc NlS28kjflmYu0ZzEdXQVlrCcW5Dw+Udj/HTmqeFVH45Jo68QQsl/JskEtmfHOoe4GiWe kX8VxCoK9G2LExjxhJT5TH1eU55u6R6SsDiXrGiDaT7siCl6z6cHbVsQuKj33CEA9WV+ RaQniknVIMNztIPSk0x7rjlirOMg+Xx50FZx1TelMGqzsUizyCZfoujDBD5eMyo5Srrx IJc+BN2y+AmtlyIn8/BPMSd7xPkr5Pi+sLmL5zpiqC+SGsBlpipDMWAvgFaX76gYsKL1 6p9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071784; x=1773676584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=JtkKw13Vk9HzOzHG7UMYz97Jnsnp+coU48cy74dU8ts=; b=trEj3QUNylgYDxdkbqFlrjzI8aS+t46e95Izfe97TyfvXvbAd1jkIKNFc3CZy8sP/w 7SxEtwjbxdikojs3hlRqDMd9gRaAi+XShdf8lznARjqnatUP9Me0w0pAFaBxn1j5TIjK 750CMxUNYhu/JyhoGZryiWGIPYQeoBQRKZbydLr0K7yVZj9N7srsuzE2NuudmQwwbXUu vxM+mEgqr4SV233Qxvar5sTSkUXFxgHqDLjRdGUmtBWLyHbmyJ62AR5DpMnXmggeJZvc gANBzXMfUhFg4Ews6FC+96/S3fWeELngHFo54C08Rv+aY+kXoAKttWEt5ENPxIKCx2H5 eKyw== X-Gm-Message-State: AOJu0YyqztEc8q066RLdXEvmkYjMdLGROUKS6/lwBooVcCdQQJ+nXwFm 5YbrUCCg05xc8n+WwDSZEmoJCCtjMvcGzPWsOi6VAUCN7E1Y8dBFcSUsmw51paVvGNZQYib+fEC BQ58fMDA= X-Gm-Gg: ATEYQzwTXOsknCMa0QbssC9iA9Jbi6WCkr63bT6pAwwpcrgu5RNKb6mjULDPmFCoKTW QRM2dB3qtA8XQLrVhDdiJVxS7JMbmxoS1cRmUVrwWT5lUQhX/6OXgNDCtQGZAoMFzaOWWeH0yly NY2QhkHZarpzBnUWON75WPQ8W3VziQTqECB5YNIeYcla3tf6pyyTZKUzrWSleKv9KjZxZh3NTZk gRCUksTBoTg8XhR1ewJYsqw94LBprLdpxvbCeHWfVGZYsEc7R8/57vX46k+7L2Ioca8ZVt2pqYH 3JNo7q3CVkePW/MMSqfzvUAfb3MF17QFLwDMPS2FgTDZaczPETZP7K+B2QlFINot87Cn41wIP7Y iL5cT9aOQUnzykrpAbqSDeRiv/sTNYAa3kliXzgxsuZA0fpA/oUSlT5r31VEHhS5BoKm2sXEtP2 T3t5yyCdvEbIdSX1Xdeod/6dOYRAML6kCIosw0LBXmSHnNDNcbMAWmnMu65GA7tY7acvjeoipz X-Received: by 2002:a05:600c:8b88:b0:485:30d4:6b98 with SMTP id 5b1f17b1804b1-48530d46ef4mr129177685e9.15.1773071784322; Mon, 09 Mar 2026 08:56:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 36/49] ati-vga: Remove src and dst stride mutation in ati_2d_blt Date: Mon, 9 Mar 2026 16:52:06 +0100 Message-ID: <20260309155219.62400-37-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072000428154100 From: Chad Jablonski Pixman requires stride in words. So over the course of the ati_2d_blt function both src and dst stride were mutated before being passed to pixman and then back afterwards. This creates local variables holding src and dst stride in words avoiding the potentially confusing mutation. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <7ab2227b96b73a63cb4fc61d0e6921e01900a4ee.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 48 +++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 8e192802d3a..a5b475ee18d 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -126,34 +126,34 @@ void ati_2d_blt(ATIVGAState *s) return; } =20 - src_stride /=3D sizeof(uint32_t); - dst_stride /=3D sizeof(uint32_t); - DPRINTF("pixman_blt(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d= )\n", - src_bits, dst_bits, src_stride, dst_stride, bpp, bpp, - src_x, src_y, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height); + DPRINTF("pixman_blt(%p, %p, %ld, %ld, %d, %d, %d, %d, %d, %d, %d, = %d)\n", + src_bits, dst_bits, src_stride / sizeof(uint32_t), + dst_stride / sizeof(uint32_t), bpp, bpp, src_x, src_y, dst= _x, + dst_y, s->regs.dst_width, s->regs.dst_height); #ifdef CONFIG_PIXMAN + int src_stride_words =3D src_stride / sizeof(uint32_t); + int dst_stride_words =3D dst_stride / sizeof(uint32_t); if ((s->use_pixman & BIT(1)) && s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT && s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { fallback =3D !pixman_blt((uint32_t *)src_bits, (uint32_t *)dst= _bits, - src_stride, dst_stride, bpp, bpp, + src_stride_words, dst_stride_words, bpp= , bpp, src_x, src_y, dst_x, dst_y, s->regs.dst_width, s->regs.dst_height); } else if (s->use_pixman & BIT(1)) { /* FIXME: We only really need a temporary if src and dst overl= ap */ int llb =3D s->regs.dst_width * (bpp / 8); - int tmp_stride =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); - uint32_t *tmp =3D g_malloc(tmp_stride * sizeof(uint32_t) * + int tmp_stride_words =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); + uint32_t *tmp =3D g_malloc(tmp_stride_words * sizeof(uint32_t)= * s->regs.dst_height); fallback =3D !pixman_blt((uint32_t *)src_bits, tmp, - src_stride, tmp_stride, bpp, bpp, + src_stride_words, tmp_stride_words, bpp= , bpp, src_x, src_y, 0, 0, s->regs.dst_width, s->regs.dst_height); if (!fallback) { fallback =3D !pixman_blt(tmp, (uint32_t *)dst_bits, - tmp_stride, dst_stride, bpp, bpp, - 0, 0, dst_x, dst_y, + tmp_stride_words, dst_stride_words, + bpp, bpp, 0, 0, dst_x, dst_y, s->regs.dst_width, s->regs.dst_heig= ht); } g_free(tmp); @@ -164,18 +164,15 @@ void ati_2d_blt(ATIVGAState *s) } if (fallback) { unsigned int y, i, j, bypp =3D bpp / 8; - unsigned int src_pitch =3D src_stride * sizeof(uint32_t); - unsigned int dst_pitch =3D dst_stride * sizeof(uint32_t); - for (y =3D 0; y < s->regs.dst_height; y++) { i =3D dst_x * bypp; j =3D src_x * bypp; if (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { - i +=3D (dst_y + y) * dst_pitch; - j +=3D (src_y + y) * src_pitch; + i +=3D (dst_y + y) * dst_stride; + j +=3D (src_y + y) * src_stride; } else { - i +=3D (dst_y + s->regs.dst_height - 1 - y) * dst_pitc= h; - j +=3D (src_y + s->regs.dst_height - 1 - y) * src_pitc= h; + i +=3D (dst_y + s->regs.dst_height - 1 - y) * dst_stri= de; + j +=3D (src_y + s->regs.dst_height - 1 - y) * src_stri= de; } memmove(&dst_bits[i], &src_bits[j], s->regs.dst_width * by= pp); } @@ -202,21 +199,20 @@ void ati_2d_blt(ATIVGAState *s) break; } =20 - dst_stride /=3D sizeof(uint32_t); - DPRINTF("pixman_fill(%p, %d, %d, %d, %d, %d, %d, %x)\n", - dst_bits, dst_stride, bpp, dst_x, dst_y, + DPRINTF("pixman_fill(%p, %ld, %d, %d, %d, %d, %d, %x)\n", + dst_bits, dst_stride / sizeof(uint32_t), bpp, dst_x, dst_y, s->regs.dst_width, s->regs.dst_height, filler); #ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || - !pixman_fill((uint32_t *)dst_bits, dst_stride, bpp, dst_x, dst= _y, - s->regs.dst_width, s->regs.dst_height, filler)) + !pixman_fill((uint32_t *)dst_bits, dst_stride / sizeof(uint32_= t), + bpp, dst_x, dst_y, s->regs.dst_width, + s->regs.dst_height, filler)) #endif { /* fallback when pixman failed or we don't want to call it */ unsigned int x, y, i, bypp =3D bpp / 8; - unsigned int dst_pitch =3D dst_stride * sizeof(uint32_t); for (y =3D 0; y < s->regs.dst_height; y++) { - i =3D dst_x * bypp + (dst_y + y) * dst_pitch; + i =3D dst_x * bypp + (dst_y + y) * dst_stride; for (x =3D 0; x < s->regs.dst_width; x++, i +=3D bypp) { stn_he_p(&dst_bits[i], bypp, filler); } --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071974; cv=none; d=zohomail.com; s=zohoarc; b=EAepBdlLyLzTJmM+mhC6XKxXmGtzAMTq0FmF/RP5gXeE/N93ZsrQEO9yLiDhfnS3K8r4yNhcC+0o9VYyXtctnrec6LNPsyE/q0rKVL0CfcPnetgjMh1eeR7FeU+ygg6yInHhNaz+lCG2KMsUvS7JWO82Yry87dI34bJbHf28br8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071974; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=23TZl0n+F48uCiWVu1Gf9PEGdFnR308e5jPHPWmn/as=; b=E+mq04eWO2UCBgdVwoLnTJyWrpGYz4cP+P7FmKh5ja04zwcjhRSn3p0V5siU9wDmgzRTK6inTAIO6KalmBb/txsH+WAz2wC1wUBztnmRB2eyny+vX8KVLiSvYNqfytoj82E1pDXTqTH+QwOUjv4YqdDu81FXhWDIIv8wxpuRqWE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071974485219.00292238065822; Mon, 9 Mar 2026 08:59:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyR-0003PY-7n; Mon, 09 Mar 2026 11:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcyB-0002vI-NG for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:36 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcy9-0000lm-41 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:35 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4852ff06541so21332095e9.2 for ; Mon, 09 Mar 2026 08:56:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485419b8526sm2161625e9.0.2026.03.09.08.56.30 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071791; x=1773676591; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=23TZl0n+F48uCiWVu1Gf9PEGdFnR308e5jPHPWmn/as=; b=YgZ0uo/YTetUxRByRcrB07eY7PM9sahQtAXUsru/mCH1Xo16qJic0ltpOH2kvt5k0Z krx42XCzj5OGbM8dUGRNfrxJV9b444eA/Mhz9QaL1ea0NYYeD5sh+oBeUcmC/+ABhysT IKNBd8rTsay712gZO9nhnaaOblYQHNMczEgeJOS5ZPiqIZeMLttxDPAgdg1djzCheMST 62Ihzy0aeMhlUgSOFyHvI0l2c/Cr+yGELYWj/Cqsaxz5Pgq3N2Dr8wxDrZuECzgaS/UF Ga79lIkDZ407Z2Ya28M+/8iC3Dg6/5y0roQapzvMBpfHutrwck7ejPnZdaFcA6d6lIMs jCsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071791; x=1773676591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=23TZl0n+F48uCiWVu1Gf9PEGdFnR308e5jPHPWmn/as=; b=ExOVr62FGPiXXbH0WzskvmrUInmoEoafdhAWOp9044ecw2D1AefYYhnQrkxsn7wEjg 9DL3861QGbp0lnz2FzF46kzXLTmWmpdKdAfDx4ythbmY+MlTBxBj4hGT+UWJV0MvnL4x mopqJrzmtbtcV/g6kf+wghPvZniQ6XfQ39XqO6Oyv1AgbWlrjLvzdd6u4V3HERY1rCbe NrnqqXPLvJdX97ry8RwWLqd+SLpfximtUqNXNiTpJzaHvxljnJjNN8qBbeaKW4GVXlTF HSJQTCRnkITmcXsBI95lwSqqGxjmiYQFu+Et97mkOcikoSKItuXQ5AmwSZJZb1wqtjUW VtGg== X-Gm-Message-State: AOJu0YzDItdiFtwvaZMlY5tZaoPBVH9xmLhI5vM5GXWUFSaFdS9lRYWe ZV/BBY6J1fQ0+TzupDJrfg0k8Z6j2/L60xJEFSsacPtWdfTowD+e0gZqU8NfBs7vw50qQ3Av6I/ jUtm4HXU= X-Gm-Gg: ATEYQzzZkJ5KkODCaL0/wu36FCVuWqSn7FtG7z+M0PJtpV9WVlG2VTyIe/BLf/fvOA7 9DPt2w4fY9yAcBNnlmD2zAQXNQAPmZ056oOO02QbwnnT9MuN116xnXuRRM+IQl1Et/ibLCdYcy5 5DSwV4KeIRS6+jxpqAAJahwAg0vMGHflbHp/Qw4BcQE90n1sIpjBY/IAe5ehy9P2vd7f/A80OUc /JtEFsbRORmwlrDcdSC5EI33zz6YW4nat49EgzIIE0AwesqtFKKtZemwOgf/pdoYqYhSWxf90ch NKNC7CfFvfnH//qtO46SNES3Go/5EAwQbTvTITxL3SofXI4hEReQlpBndsGYXq4HQdlXkQklgDc cEuwn2r7gwFMmJ/ECpKYfgQGYLJ7WkEk1GJfW0VG8mjOrioeNOwR4J/HSqXIG5yUT3CMmYev9YM b5SU2zQ+A1fGnXFcxcqLdwUMK2I6KqQ3Ociw5EpBjix4+MtkP4XmG7mDe0Og07KNg9yFTze6iF7 9cmEj2RjT0= X-Received: by 2002:a05:600c:3492:b0:485:3e19:9e01 with SMTP id 5b1f17b1804b1-4853e19a14cmr43253335e9.28.1773071791116; Mon, 09 Mar 2026 08:56:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 37/49] ati-vga: Use local variables for register values in ati_2d_blt Date: Mon, 9 Mar 2026 16:52:07 +0100 Message-ID: <20260309155219.62400-38-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071976056154100 From: Chad Jablonski ati_2d_blt uses a mixture of locals and direct register access of needed state. This assigns all values derived from register state to local variables. It prepares the function for a larger refactor that removes the dependency on the full device and direct register access entirely. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <2c7f8fdc527e8c5bad237933a1c8a7a8e5068a3d.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 92 +++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index a5b475ee18d..cdca7518638 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -66,10 +66,18 @@ void ati_2d_blt(ATIVGAState *s) { /* FIXME it is probably more complex than this and may need to be */ /* rewritten but for now as a start just to get some output: */ - unsigned dst_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? - s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_widt= h); - unsigned dst_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_heig= ht); + uint32_t rop3 =3D s->regs.dp_mix & GMC_ROP3_MASK; + bool left_to_right =3D s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT; + bool top_to_bottom =3D s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM; + uint32_t frgd_clr =3D s->regs.dp_brush_frgd_clr; + uint8_t *palette =3D s->vga.palette; + unsigned dst_offset =3D s->regs.dst_offset; + unsigned dst_width =3D s->regs.dst_width; + unsigned dst_height =3D s->regs.dst_height; + unsigned dst_x =3D (left_to_right ? + s->regs.dst_x : s->regs.dst_x + 1 - dst_width); + unsigned dst_y =3D (top_to_bottom ? + s->regs.dst_y : s->regs.dst_y + 1 - dst_height); int bpp =3D ati_bpp_from_datatype(s); if (!bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); @@ -80,7 +88,7 @@ void ati_2d_blt(ATIVGAState *s) qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); return; } - uint8_t *dst_bits =3D s->vga.vram_ptr + s->regs.dst_offset; + uint8_t *dst_bits =3D s->vga.vram_ptr + dst_offset; =20 if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { dst_bits +=3D s->regs.crtc_offset & 0x07ffffff; @@ -88,26 +96,25 @@ void ati_2d_blt(ATIVGAState *s) } uint8_t *end =3D s->vga.vram_ptr + s->vga.vram_size; if (dst_x > 0x3fff || dst_y > 0x3fff || dst_bits >=3D end - || dst_bits + dst_x - + (dst_y + s->regs.dst_height) * dst_stride >=3D end) { + || dst_bits + dst_x + (dst_y + dst_height) * dst_stride >=3D end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n", - s->regs.src_offset, s->regs.dst_offset, s->regs.default_offset, - s->regs.src_pitch, s->regs.dst_pitch, s->regs.default_pitch, + s->regs.src_offset, dst_offset, s->regs.default_offset, + s->regs.src_pitch, dst_stride, s->regs.default_pitch, s->regs.src_x, s->regs.src_y, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height, - (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? '>' : '<'), - (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? 'v' : '^')); - switch (s->regs.dp_mix & GMC_ROP3_MASK) { + dst_width, dst_height, + (left_to_right ? '>' : '<'), + (top_to_bottom ? 'v' : '^')); + switch (rop3) { case ROP3_SRCCOPY: { bool fallback =3D false; - unsigned src_x =3D (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? - s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_wid= th); - unsigned src_y =3D (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? - s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_hei= ght); + unsigned src_x =3D (left_to_right ? + s->regs.src_x : s->regs.src_x + 1 - dst_width); + unsigned src_y =3D (top_to_bottom ? + s->regs.src_y : s->regs.src_y + 1 - dst_height); int src_stride =3D s->regs.src_pitch; if (!src_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); @@ -121,7 +128,7 @@ void ati_2d_blt(ATIVGAState *s) } if (src_x > 0x3fff || src_y > 0x3fff || src_bits >=3D end || src_bits + src_x - + (src_y + s->regs.dst_height) * src_stride >=3D end) { + + (src_y + dst_height) * src_stride >=3D end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } @@ -129,32 +136,30 @@ void ati_2d_blt(ATIVGAState *s) DPRINTF("pixman_blt(%p, %p, %ld, %ld, %d, %d, %d, %d, %d, %d, %d, = %d)\n", src_bits, dst_bits, src_stride / sizeof(uint32_t), dst_stride / sizeof(uint32_t), bpp, bpp, src_x, src_y, dst= _x, - dst_y, s->regs.dst_width, s->regs.dst_height); + dst_y, dst_width, dst_height); #ifdef CONFIG_PIXMAN int src_stride_words =3D src_stride / sizeof(uint32_t); int dst_stride_words =3D dst_stride / sizeof(uint32_t); - if ((s->use_pixman & BIT(1)) && - s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT && - s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { + if ((s->use_pixman & BIT(1)) && left_to_right && top_to_bottom) { fallback =3D !pixman_blt((uint32_t *)src_bits, (uint32_t *)dst= _bits, src_stride_words, dst_stride_words, bpp= , bpp, src_x, src_y, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height); + dst_width, dst_height); } else if (s->use_pixman & BIT(1)) { /* FIXME: We only really need a temporary if src and dst overl= ap */ - int llb =3D s->regs.dst_width * (bpp / 8); + int llb =3D dst_width * (bpp / 8); int tmp_stride_words =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D g_malloc(tmp_stride_words * sizeof(uint32_t)= * - s->regs.dst_height); + dst_height); fallback =3D !pixman_blt((uint32_t *)src_bits, tmp, src_stride_words, tmp_stride_words, bpp= , bpp, src_x, src_y, 0, 0, - s->regs.dst_width, s->regs.dst_height); + dst_width, dst_height); if (!fallback) { fallback =3D !pixman_blt(tmp, (uint32_t *)dst_bits, tmp_stride_words, dst_stride_words, bpp, bpp, 0, 0, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_heig= ht); + dst_width, dst_height); } g_free(tmp); } else @@ -164,17 +169,17 @@ void ati_2d_blt(ATIVGAState *s) } if (fallback) { unsigned int y, i, j, bypp =3D bpp / 8; - for (y =3D 0; y < s->regs.dst_height; y++) { + for (y =3D 0; y < dst_height; y++) { i =3D dst_x * bypp; j =3D src_x * bypp; - if (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM) { + if (top_to_bottom) { i +=3D (dst_y + y) * dst_stride; j +=3D (src_y + y) * src_stride; } else { - i +=3D (dst_y + s->regs.dst_height - 1 - y) * dst_stri= de; - j +=3D (src_y + s->regs.dst_height - 1 - y) * src_stri= de; + i +=3D (dst_y + dst_height - 1 - y) * dst_stride; + j +=3D (src_y + dst_height - 1 - y) * src_stride; } - memmove(&dst_bits[i], &src_bits[j], s->regs.dst_width * by= pp); + memmove(&dst_bits[i], &src_bits[j], dst_width * bypp); } } break; @@ -185,35 +190,34 @@ void ati_2d_blt(ATIVGAState *s) { uint32_t filler =3D 0; =20 - switch (s->regs.dp_mix & GMC_ROP3_MASK) { + switch (rop3) { case ROP3_PATCOPY: - filler =3D s->regs.dp_brush_frgd_clr; + filler =3D frgd_clr; break; case ROP3_BLACKNESS: - filler =3D 0xffUL << 24 | rgb_to_pixel32(s->vga.palette[0], - s->vga.palette[1], s->vga.palette[2]); + filler =3D 0xffUL << 24 | rgb_to_pixel32(palette[0], palette[1= ], + palette[2]); break; case ROP3_WHITENESS: - filler =3D 0xffUL << 24 | rgb_to_pixel32(s->vga.palette[3], - s->vga.palette[4], s->vga.palette[5]); + filler =3D 0xffUL << 24 | rgb_to_pixel32(palette[3], palette[4= ], + palette[5]); break; } =20 DPRINTF("pixman_fill(%p, %ld, %d, %d, %d, %d, %d, %x)\n", dst_bits, dst_stride / sizeof(uint32_t), bpp, dst_x, dst_y, - s->regs.dst_width, s->regs.dst_height, filler); + dst_width, dst_height, filler); #ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || !pixman_fill((uint32_t *)dst_bits, dst_stride / sizeof(uint32_= t), - bpp, dst_x, dst_y, s->regs.dst_width, - s->regs.dst_height, filler)) + bpp, dst_x, dst_y, dst_width, dst_height, filler)) #endif { /* fallback when pixman failed or we don't want to call it */ unsigned int x, y, i, bypp =3D bpp / 8; - for (y =3D 0; y < s->regs.dst_height; y++) { + for (y =3D 0; y < dst_height; y++) { i =3D dst_x * bypp + (dst_y + y) * dst_stride; - for (x =3D 0; x < s->regs.dst_width; x++, i +=3D bypp) { + for (x =3D 0; x < dst_width; x++, i +=3D bypp) { stn_he_p(&dst_bits[i], bypp, filler); } } @@ -222,7 +226,7 @@ void ati_2d_blt(ATIVGAState *s) } default: qemu_log_mask(LOG_UNIMP, "Unimplemented ati_2d blt op %x\n", - (s->regs.dp_mix & GMC_ROP3_MASK) >> 16); + rop3 >> 16); return; } =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071999; cv=none; d=zohomail.com; s=zohoarc; b=XHR5JY+/Fx5FxVquVeN8RLu/1wVJ0CmBbpekehGZBIgJj9E4pOmgl26VhLpwA24Lk62AysEGbiRRa0dN6/mKVjVMCw9bGvrBGOrMYt2mKR6fF+aSYrz525Fz0/SPLrvjbXm2irEupiAknCSVVQbfBFc63yPiWKBkWSTdtjQhMH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071999; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=8gJDO7Yr875H/NgTqMu/kDtq/V4d2dhaU/mmLxABGCA=; b=NnNtitmOYILkYzT8SNEs+dp1HCfTY0tN9GOcurQd2Lg2jJsJjSzLtT4+f4qiFfNdPnMXta99kzEmLy7rBPWGHeFeHdPcVKWt2k4OV6h96psWebf6wbf3YnTIlhXmbvFaL5xq66Vp8O1eAqqI0CrFyLN3BkU3rlrDMP6HqWace7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071999024189.39825906099543; Mon, 9 Mar 2026 08:59:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcyR-0003Ls-4f; Mon, 09 Mar 2026 11:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcyJ-00037a-Rv for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:44 -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 1vzcyH-0000mW-HF for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:43 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-439b94a19fdso7601529f8f.0 for ; Mon, 09 Mar 2026 08:56:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadac2a7sm27774343f8f.15.2026.03.09.08.56.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071799; x=1773676599; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8gJDO7Yr875H/NgTqMu/kDtq/V4d2dhaU/mmLxABGCA=; b=P8hhancIO+plH24eajvi9bPXc0pIlXOCwvjGDCqOgb3+477Vr73zmOA5ok+LuznwkB 19TfeVNIO/w6revVpc+jq2dUTa5mS7+5Jpmasv+K78+0Am8sVTXKwrJE2Vw/OQ4Un/JH x7l9TMv/K9JIwhugAOsfHrjs0NA3yl+mhEjLcPT4L8GEwwpCMhAwvYWrQSx3gwwedRbt oOuPYEMVq0pkZdXT8dLpvTXiFzv7dt+Gl6Rd8UT8igHum5F13NCkrovtGCVu35sLAQlj 6rewr6qCbJxlrXnCiCNj89Fkh6NTO8ri+2gATUCpMrTAht1AMsbcMQcMpi3qDbINPIbu zdOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071799; x=1773676599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8gJDO7Yr875H/NgTqMu/kDtq/V4d2dhaU/mmLxABGCA=; b=KZ0qlhkfEFVvc8J92EiupYEwiE0mpHKu0gfvWRsUgLEgpX6IlZYTf1KimSEGPwAn6K OdiwEdn7iD471EIp6W2gIRmKG94nHZMrhmkj60G4aZC+Pm6W1AGBY6a6E0iGxpR+v20a SWSQ3n+ko7c8m1i5UE0E1B+pCOYuWd5OqU0GVVe0Gufv7YrQznlvlVlRL9nh+drfF+AP cvpIDQ2C0qQkiu3t0oFaNo5r9NhKsvysxmGt/Cwh/tPzDGmHd8HxBlZMygdWIzLyrw9U 2RWxLRoXPqnfrDojNTXngumo+I7F0B7rcJ/zrzncDCpj0Ze9j9hBQC4DxNyw1TTIHb+5 vswA== X-Gm-Message-State: AOJu0YwMASX2b4hhR5YQ/LkCutARWCSPn9oNpAk5CtC0xqQ1++afJHym iKRxijW2vWHVC6Tseay6EZBBvicrb/gcoEctYNbEbaSBt9Nbvj7Ep7uecCi+RqbFCHZlsoZHX4u rQP8deL4= X-Gm-Gg: ATEYQzyP9OLoZNkgVCiv2OXAamokCja+aN01qKleNdWQVcfRFOfoKgWs3llKCKHimc1 uv2ZjfE0hbRdc6lxHY2ewemgcX+/Gh4KH4ojNWU7igrZ3QLG31AWxGSAeRpFAJoDMNNIV6KX9X8 hsrd/vSQQtvTt6+xxSix3zxLfisUgjDA3THK7XfzJ52ZYiTnBAqqot4Mf9Kj35Gg+l1c9YUeb3H U2Ehs7Uf/2rl9ds72tiNEEvJMNXBBtcREQZaMkax+YAZpkm8mo93V2xUzG8LJ4MNp2mWe1wC0se hw23uL/Jh/bkLR0BBLf95Mm0xL+HkkJj8ckJoTFTYlIMnDBJqE528SMNRwX7jqlH2OGpouSYpl7 eygSpKgNM7LzCHLStWkZ6JS8E/p+uo77y5D7IAWj7ADj05D1MbKGZUVE7tHVHnJ3uJ5SWmaX3eS lu7l1zlADeIz3iAKK/QWhv5PWZycyQoJSHLxtL486K/gR3p9aHH1QW0c1pKjbonyc35LkuNEHz X-Received: by 2002:a05:6000:26c7:b0:439:b636:1fa7 with SMTP id ffacd0b85a97d-439da8a7f2cmr20836335f8f.54.1773071798441; Mon, 09 Mar 2026 08:56:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 38/49] ati-vga: Introduce ATI2DCtx struct for 2D blit context Date: Mon, 9 Mar 2026 16:52:08 +0100 Message-ID: <20260309155219.62400-39-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072000502154100 From: Chad Jablonski Previously all state derived from registers was moved to locals. Now we can mechanically replace those locals with fields on the new ATI2DCtx struct. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <20260309130926.942145969E5@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 229 +++++++++++++++++++++++++------------------- 1 file changed, 132 insertions(+), 97 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index cdca7518638..1ae2fbc5f89 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -13,6 +13,7 @@ #include "qemu/log.h" #include "ui/pixel_ops.h" #include "ui/console.h" +#include "ui/rect.h" =20 /* * NOTE: @@ -43,22 +44,39 @@ static int ati_bpp_from_datatype(ATIVGAState *s) } } =20 -static void ati_set_dirty(ATIVGAState *s, - const uint8_t *dst_bits, unsigned dst_y) +typedef struct { + int bpp; + uint32_t rop3; + bool left_to_right; + bool top_to_bottom; + uint32_t frgd_clr; + const uint8_t *palette; + const uint8_t *vram_end; + + QemuRect dst; + int dst_stride; + uint8_t *dst_bits; + uint32_t dst_offset; + + QemuRect src; + int src_stride; + const uint8_t *src_bits; +} ATI2DCtx; + +static void ati_set_dirty(VGACommonState *vga, const ATI2DCtx *ctx) { - VGACommonState *vga =3D &s->vga; DisplaySurface *ds =3D qemu_console_surface(vga->con); =20 DPRINTF("%p %u ds: %p %d %d rop: %x\n", vga->vram_ptr, vga->vbe_start_= addr, surface_data(ds), surface_stride(ds), surface_bits_per_pixel(d= s), - (s->regs.dp_mix & GMC_ROP3_MASK) >> 16); - if (dst_bits >=3D vga->vram_ptr + vga->vbe_start_addr && - dst_bits < vga->vram_ptr + vga->vbe_start_addr + - vga->vbe_regs[VBE_DISPI_INDEX_YRES] * vga->vbe_line_off= set) { + ctx->rop3 >> 16); + if (ctx->dst_bits >=3D vga->vram_ptr + vga->vbe_start_addr && + ctx->dst_bits < vga->vram_ptr + vga->vbe_start_addr + + vga->vbe_regs[VBE_DISPI_INDEX_YRES] * vga->vbe_line_offset) { memory_region_set_dirty(&vga->vram, - vga->vbe_start_addr + s->regs.dst_offset - + dst_y * surface_stri= de(ds), - s->regs.dst_height * surface_stride(ds)); + vga->vbe_start_addr + ctx->dst_offset + + ctx->dst.y * surface_stride(ds), + ctx->dst.height * surface_stride(ds)); } } =20 @@ -66,100 +84,109 @@ void ati_2d_blt(ATIVGAState *s) { /* FIXME it is probably more complex than this and may need to be */ /* rewritten but for now as a start just to get some output: */ - uint32_t rop3 =3D s->regs.dp_mix & GMC_ROP3_MASK; - bool left_to_right =3D s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT; - bool top_to_bottom =3D s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM; - uint32_t frgd_clr =3D s->regs.dp_brush_frgd_clr; - uint8_t *palette =3D s->vga.palette; - unsigned dst_offset =3D s->regs.dst_offset; - unsigned dst_width =3D s->regs.dst_width; - unsigned dst_height =3D s->regs.dst_height; - unsigned dst_x =3D (left_to_right ? - s->regs.dst_x : s->regs.dst_x + 1 - dst_width); - unsigned dst_y =3D (top_to_bottom ? - s->regs.dst_y : s->regs.dst_y + 1 - dst_height); - int bpp =3D ati_bpp_from_datatype(s); - if (!bpp) { + ATI2DCtx ctx_; + ATI2DCtx *ctx =3D &ctx_; + ctx->rop3 =3D s->regs.dp_mix & GMC_ROP3_MASK; + ctx->left_to_right =3D s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT; + ctx->top_to_bottom =3D s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM; + ctx->frgd_clr =3D s->regs.dp_brush_frgd_clr; + ctx->palette =3D s->vga.palette; + ctx->dst_offset =3D s->regs.dst_offset; + ctx->dst.width =3D s->regs.dst_width; + ctx->dst.height =3D s->regs.dst_height; + ctx->dst.x =3D (ctx->left_to_right ? + s->regs.dst_x : s->regs.dst_x + 1 - ctx->dst.width); + ctx->dst.y =3D (ctx->top_to_bottom ? + s->regs.dst_y : s->regs.dst_y + 1 - ctx->dst.height); + ctx->bpp =3D ati_bpp_from_datatype(s); + if (!ctx->bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); return; } - int dst_stride =3D s->regs.dst_pitch; - if (!dst_stride) { + ctx->dst_stride =3D s->regs.dst_pitch; + if (!ctx->dst_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); return; } - uint8_t *dst_bits =3D s->vga.vram_ptr + dst_offset; + ctx->dst_bits =3D s->vga.vram_ptr + ctx->dst_offset; =20 if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - dst_bits +=3D s->regs.crtc_offset & 0x07ffffff; - dst_stride *=3D bpp; + ctx->dst_bits +=3D s->regs.crtc_offset & 0x07ffffff; + ctx->dst_stride *=3D ctx->bpp; } - uint8_t *end =3D s->vga.vram_ptr + s->vga.vram_size; - if (dst_x > 0x3fff || dst_y > 0x3fff || dst_bits >=3D end - || dst_bits + dst_x + (dst_y + dst_height) * dst_stride >=3D end) { + ctx->vram_end =3D s->vga.vram_ptr + s->vga.vram_size; + if (ctx->dst.x > 0x3fff || ctx->dst.y > 0x3fff || + ctx->dst_bits >=3D ctx->vram_end || ctx->dst_bits + ctx->dst.x + + (ctx->dst.y + ctx->dst.height) * ctx->dst_stride >=3D ctx->vram_en= d) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n", - s->regs.src_offset, dst_offset, s->regs.default_offset, - s->regs.src_pitch, dst_stride, s->regs.default_pitch, - s->regs.src_x, s->regs.src_y, dst_x, dst_y, - dst_width, dst_height, - (left_to_right ? '>' : '<'), - (top_to_bottom ? 'v' : '^')); - switch (rop3) { + s->regs.src_offset, ctx->dst_offset, s->regs.default_offset, + ctx->src_stride, ctx->dst_stride, s->regs.default_pitch, + ctx->src.x, ctx->src.y, ctx->dst.x, ctx->dst.y, + ctx->dst.width, ctx->dst.height, + (ctx->left_to_right ? '>' : '<'), + (ctx->top_to_bottom ? 'v' : '^')); + switch (ctx->rop3) { case ROP3_SRCCOPY: { bool fallback =3D false; - unsigned src_x =3D (left_to_right ? - s->regs.src_x : s->regs.src_x + 1 - dst_width); - unsigned src_y =3D (top_to_bottom ? - s->regs.src_y : s->regs.src_y + 1 - dst_height); - int src_stride =3D s->regs.src_pitch; - if (!src_stride) { + ctx->src.x =3D (ctx->left_to_right ? + s->regs.src_x : s->regs.src_x + 1 - ctx->dst.width); + ctx->src.y =3D (ctx->top_to_bottom ? + s->regs.src_y : s->regs.src_y + 1 - ctx->dst.height); + ctx->src_stride =3D s->regs.src_pitch; + if (!ctx->src_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); return; } - uint8_t *src_bits =3D s->vga.vram_ptr + s->regs.src_offset; + ctx->src_bits =3D s->vga.vram_ptr + s->regs.src_offset; =20 if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - src_bits +=3D s->regs.crtc_offset & 0x07ffffff; - src_stride *=3D bpp; + ctx->src_bits +=3D s->regs.crtc_offset & 0x07ffffff; + ctx->src_stride *=3D ctx->bpp; } - if (src_x > 0x3fff || src_y > 0x3fff || src_bits >=3D end - || src_bits + src_x - + (src_y + dst_height) * src_stride >=3D end) { + if (ctx->src.x > 0x3fff || ctx->src.y > 0x3fff || + ctx->src_bits >=3D ctx->vram_end || + ctx->src_bits + ctx->src.x + (ctx->src.y + ctx->dst.height) * + ctx->src_stride >=3D ctx->vram_end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } =20 DPRINTF("pixman_blt(%p, %p, %ld, %ld, %d, %d, %d, %d, %d, %d, %d, = %d)\n", - src_bits, dst_bits, src_stride / sizeof(uint32_t), - dst_stride / sizeof(uint32_t), bpp, bpp, src_x, src_y, dst= _x, - dst_y, dst_width, dst_height); + ctx->src_bits, ctx->dst_bits, + ctx->src_stride / sizeof(uint32_t), + ctx->dst_stride / sizeof(uint32_t), + ctx->bpp, ctx->bpp, ctx->src.x, ctx->src.y, ctx->dst.x, + ctx->dst.y, ctx->dst.width, ctx->dst.height); #ifdef CONFIG_PIXMAN - int src_stride_words =3D src_stride / sizeof(uint32_t); - int dst_stride_words =3D dst_stride / sizeof(uint32_t); - if ((s->use_pixman & BIT(1)) && left_to_right && top_to_bottom) { - fallback =3D !pixman_blt((uint32_t *)src_bits, (uint32_t *)dst= _bits, - src_stride_words, dst_stride_words, bpp= , bpp, - src_x, src_y, dst_x, dst_y, - dst_width, dst_height); + int src_stride_words =3D ctx->src_stride / sizeof(uint32_t); + int dst_stride_words =3D ctx->dst_stride / sizeof(uint32_t); + if ((s->use_pixman & BIT(1)) && + ctx->left_to_right && ctx->top_to_bottom) { + fallback =3D !pixman_blt((uint32_t *)ctx->src_bits, + (uint32_t *)ctx->dst_bits, src_stride_w= ords, + dst_stride_words, ctx->bpp, ctx->bpp, + ctx->src.x, ctx->src.y, ctx->dst.x, + ctx->dst.y, ctx->dst.width, ctx->dst.he= ight); } else if (s->use_pixman & BIT(1)) { /* FIXME: We only really need a temporary if src and dst overl= ap */ - int llb =3D dst_width * (bpp / 8); + int llb =3D ctx->dst.width * (ctx->bpp / 8); int tmp_stride_words =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D g_malloc(tmp_stride_words * sizeof(uint32_t)= * - dst_height); - fallback =3D !pixman_blt((uint32_t *)src_bits, tmp, - src_stride_words, tmp_stride_words, bpp= , bpp, - src_x, src_y, 0, 0, - dst_width, dst_height); + ctx->dst.height); + fallback =3D !pixman_blt((uint32_t *)ctx->src_bits, tmp, + src_stride_words, tmp_stride_words, ctx= ->bpp, + ctx->bpp, ctx->src.x, ctx->src.y, 0, 0, + ctx->dst.width, ctx->dst.height); if (!fallback) { - fallback =3D !pixman_blt(tmp, (uint32_t *)dst_bits, + fallback =3D !pixman_blt(tmp, (uint32_t *)ctx->dst_bits, tmp_stride_words, dst_stride_words, - bpp, bpp, 0, 0, dst_x, dst_y, - dst_width, dst_height); + ctx->bpp, ctx->bpp, 0, 0, + ctx->dst.x, ctx->dst.y, + ctx->dst.width, ctx->dst.height); } g_free(tmp); } else @@ -168,18 +195,21 @@ void ati_2d_blt(ATIVGAState *s) fallback =3D true; } if (fallback) { - unsigned int y, i, j, bypp =3D bpp / 8; - for (y =3D 0; y < dst_height; y++) { - i =3D dst_x * bypp; - j =3D src_x * bypp; - if (top_to_bottom) { - i +=3D (dst_y + y) * dst_stride; - j +=3D (src_y + y) * src_stride; + unsigned int y, i, j, bypp =3D ctx->bpp / 8; + for (y =3D 0; y < ctx->dst.height; y++) { + i =3D ctx->dst.x * bypp; + j =3D ctx->src.x * bypp; + if (ctx->top_to_bottom) { + i +=3D (ctx->dst.y + y) * ctx->dst_stride; + j +=3D (ctx->src.y + y) * ctx->src_stride; } else { - i +=3D (dst_y + dst_height - 1 - y) * dst_stride; - j +=3D (src_y + dst_height - 1 - y) * src_stride; + i +=3D (ctx->dst.y + ctx->dst.height - 1 - y) + * ctx->dst_stride; + j +=3D (ctx->src.y + ctx->dst.height - 1 - y) + * ctx->src_stride; } - memmove(&dst_bits[i], &src_bits[j], dst_width * bypp); + memmove(&ctx->dst_bits[i], &ctx->src_bits[j], + ctx->dst.width * bypp); } } break; @@ -190,35 +220,40 @@ void ati_2d_blt(ATIVGAState *s) { uint32_t filler =3D 0; =20 - switch (rop3) { + switch (ctx->rop3) { case ROP3_PATCOPY: - filler =3D frgd_clr; + filler =3D ctx->frgd_clr; break; case ROP3_BLACKNESS: - filler =3D 0xffUL << 24 | rgb_to_pixel32(palette[0], palette[1= ], - palette[2]); + filler =3D 0xffUL << 24 | rgb_to_pixel32(ctx->palette[0], + ctx->palette[1], + ctx->palette[2]); break; case ROP3_WHITENESS: - filler =3D 0xffUL << 24 | rgb_to_pixel32(palette[3], palette[4= ], - palette[5]); + filler =3D 0xffUL << 24 | rgb_to_pixel32(ctx->palette[3], + ctx->palette[4], + ctx->palette[5]); break; } =20 DPRINTF("pixman_fill(%p, %ld, %d, %d, %d, %d, %d, %x)\n", - dst_bits, dst_stride / sizeof(uint32_t), bpp, dst_x, dst_y, - dst_width, dst_height, filler); + ctx->dst_bits, ctx->dst_stride / sizeof(uint32_t), ctx->bp= p, + ctx->dst.x, ctx->dst.y, ctx->dst.width, ctx->dst.height, + filler); #ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || - !pixman_fill((uint32_t *)dst_bits, dst_stride / sizeof(uint32_= t), - bpp, dst_x, dst_y, dst_width, dst_height, filler)) + !pixman_fill((uint32_t *)ctx->dst_bits, + ctx->dst_stride / sizeof(uint32_t), ctx->bpp, + ctx->dst.x, ctx->dst.y, + ctx->dst.width, ctx->dst.height, filler)) #endif { /* fallback when pixman failed or we don't want to call it */ - unsigned int x, y, i, bypp =3D bpp / 8; - for (y =3D 0; y < dst_height; y++) { - i =3D dst_x * bypp + (dst_y + y) * dst_stride; - for (x =3D 0; x < dst_width; x++, i +=3D bypp) { - stn_he_p(&dst_bits[i], bypp, filler); + unsigned int x, y, i, bypp =3D ctx->bpp / 8; + for (y =3D 0; y < ctx->dst.height; y++) { + i =3D ctx->dst.x * bypp + (ctx->dst.y + y) * ctx->dst_stri= de; + for (x =3D 0; x < ctx->dst.width; x++, i +=3D bypp) { + stn_he_p(&ctx->dst_bits[i], bypp, filler); } } } @@ -226,9 +261,9 @@ void ati_2d_blt(ATIVGAState *s) } default: qemu_log_mask(LOG_UNIMP, "Unimplemented ati_2d blt op %x\n", - rop3 >> 16); + ctx->rop3 >> 16); return; } =20 - ati_set_dirty(s, dst_bits, dst_y); + ati_set_dirty(&s->vga, ctx); } --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071974; cv=none; d=zohomail.com; s=zohoarc; b=Xb+uPPldQjdxWZrX8Dtygn2czPLMymiFnMUkJz8D6nkDGEmNTjlQgp/N9g1gEAbhmxeykWic93QG8I/tbJkGXFDgNkFD4gk/uldB71z+9DGNycXNhuICleXy27mSBrcMOPSFi7jjB6V9aHt0WYd8n6LvqwMZUvg7Ntup1uKCPTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071974; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=tTti1wy5ozk2OtX7KUAlckip7ivw9FflaAIgql8dEYQ=; b=XWzOtHo5BBwVJ2mIQm8n0u49bNkvbjMgay3mnX/S8k3qyGi27GGr/qcMZRLsWY0UWmtcwKoCNMNhfzgHqGlf0GWh1gmczOw8BaxGf093TIZZ1xMPJcIaLj2ZPqWaDlKht7NjD2oKfBvdzZTj9TaYnl+KrS3PvR5q7VpL6ckIzis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071974234429.4248067884952; Mon, 9 Mar 2026 08:59:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcz3-00045i-M5; Mon, 09 Mar 2026 11:57:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcyQ-0003PJ-Ax for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:50 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcyO-0000nC-CM for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:50 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-439b611274bso5422011f8f.3 for ; Mon, 09 Mar 2026 08:56:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d95dsm29929682f8f.7.2026.03.09.08.56.44 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071806; x=1773676606; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tTti1wy5ozk2OtX7KUAlckip7ivw9FflaAIgql8dEYQ=; b=nfDyATixxcaMLjwl9e3XWIKtpTITKVPejpR/A8V6WdQWRB2wZOAG64K9ZpTEJR3Zc6 LuKIXTvvMWPnVd+/hfyA3SxSR7FghaZe9P8NqQhGoX0K79Q2K8Wavw6eWo8rATR1Ff9p fqejs4jIdX4XvCbeTiXF9q172YYXrXa1G1mf+qL5uOlPbtOem08AHiXKaXaIZWVQwQEt T1nsar4+tQkCjiYVXPTC9M9VK2yF9Q6/oMxijmFJ8Hyi4L2DCD0bVA+ykT+wCbx72TkU nbAYNw0ZiEfgelWm43pXe+ZdeWTcePPl/fxoXyd+8MBw1U1ZhUe0tHRNdWBKEjzzU3wH TBZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071806; x=1773676606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=tTti1wy5ozk2OtX7KUAlckip7ivw9FflaAIgql8dEYQ=; b=KVBxNvi2qtGdhAK9ORmpYrPCEAk9poe1/IRCEvd59sTZXTGjgO1xs2K1r1rJC92kLf H3Zp67sgXNYt9KOdlpkAq3BcKiLuROJSc7UQg4AvP45CHW0xVOTbJcol5v7jP5Ooh2W7 newFDQKFAcWcPnFt0upIcen/vZpYicrbkkfIanhiXS2Q/zQXnEoif85UIxMePwZXIz9O fekEFY3peCXGhdjab/eimJyleJDZdTv+LenrBQtDDDYVrmLwv6P4rhI8zIKBYX6SS+T2 +12OT2UB66SU1Uwg7gmFCmFX12J5jwWz9VUgPmutEtncfqDG4qMckKHdXtiXHBmJ+sMC XhDg== X-Gm-Message-State: AOJu0YwbiXaauZTwFa6Zm+NG9AQcRMMeXujnTDjLl/b6sXX3KCBw3BWb dlzVpFDdH9g0fMlrpQa4mWz71gQugY3pMEd3O6PxZkhCzlssynMiyBjEqY775XOAkPlVm3Kvp2k zoEapPIg= X-Gm-Gg: ATEYQzyeFTC6zhnEv1vuAmhKNztoXWMUTW9A1TQH3sMzNurtGp+piWBLCNSjFxrniOn rYQz08C839uudFmPHlrP49vb1doBYU33fR7HECOyjf2P26xWeaJ7rb1SnStw+umqwIs5mvafStX Yi6sOHyVueZ1L1p9hraCIXsDojwpAQFF89RNOcL4ijXn0Lc08O5IGtZyFbNoTUUhlkBfwnbQ0v8 i/279R0jVidrLCQ74w8dhWZ721qQkjeVTEA6/QKFY/sHte61XWvSEGhUZMQeYIrSBEjYrwC012M 3Nk98soT0/53J6QSNfgVAgWEyjZ/Mt+krqvyzKobcBjxO51sgVlIo42N7l2V8g29s6yYfDSuqKq TmXCE05o0itY323zw8WzTXzgxoDWsZjs//BHpSXi3jqHpsxIQ5ksxz3MLUJQnIDJIuNRgJ2npiw Bs3elxqGsFjz0uAjsHx99XquZj6cX1F3MkJEyI377VjKbY9XS5W2LC4vZiaHQHdLTtfc5qpg/V7 XsiC/RQLZI= X-Received: by 2002:a05:6000:2013:b0:439:ac98:7520 with SMTP id ffacd0b85a97d-439da885b37mr19209632f8f.37.1773071805442; Mon, 09 Mar 2026 08:56:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 39/49] ati-vga: Extract setup_2d_blt_ctx from ati_2d_blt Date: Mon, 9 Mar 2026 16:52:09 +0100 Message-ID: <20260309155219.62400-40-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071976048154100 From: Chad Jablonski setup_2d_blt_ctx is responsible for knowing how to retrieve the state needed by ati_2d_blt from the registers and assigning it to the ATI2DCtx. This will be useful in a future patch when HOST_DATA needs to make small modifications to the ctx. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <6e2dccba65d9b369e0db633c0149a77351827222.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 75 +++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 1ae2fbc5f89..ef4d2e21b5e 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -25,7 +25,7 @@ * possible. */ =20 -static int ati_bpp_from_datatype(ATIVGAState *s) +static int ati_bpp_from_datatype(const ATIVGAState *s) { switch (s->regs.dp_datatype & 0xf) { case 2: @@ -80,73 +80,76 @@ static void ati_set_dirty(VGACommonState *vga, const AT= I2DCtx *ctx) } } =20 -void ati_2d_blt(ATIVGAState *s) +static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DCtx *ctx) { - /* FIXME it is probably more complex than this and may need to be */ - /* rewritten but for now as a start just to get some output: */ - ATI2DCtx ctx_; - ATI2DCtx *ctx =3D &ctx_; + ctx->bpp =3D ati_bpp_from_datatype(s); ctx->rop3 =3D s->regs.dp_mix & GMC_ROP3_MASK; ctx->left_to_right =3D s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT; ctx->top_to_bottom =3D s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM; ctx->frgd_clr =3D s->regs.dp_brush_frgd_clr; ctx->palette =3D s->vga.palette; ctx->dst_offset =3D s->regs.dst_offset; + ctx->vram_end =3D s->vga.vram_ptr + s->vga.vram_size; + ctx->dst.width =3D s->regs.dst_width; ctx->dst.height =3D s->regs.dst_height; ctx->dst.x =3D (ctx->left_to_right ? s->regs.dst_x : s->regs.dst_x + 1 - ctx->dst.width); ctx->dst.y =3D (ctx->top_to_bottom ? s->regs.dst_y : s->regs.dst_y + 1 - ctx->dst.height); - ctx->bpp =3D ati_bpp_from_datatype(s); - if (!ctx->bpp) { - qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); - return; - } ctx->dst_stride =3D s->regs.dst_pitch; - if (!ctx->dst_stride) { - qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); - return; - } - ctx->dst_bits =3D s->vga.vram_ptr + ctx->dst_offset; - + ctx->dst_bits =3D s->vga.vram_ptr + s->regs.dst_offset; if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { ctx->dst_bits +=3D s->regs.crtc_offset & 0x07ffffff; ctx->dst_stride *=3D ctx->bpp; } - ctx->vram_end =3D s->vga.vram_ptr + s->vga.vram_size; + + ctx->src.x =3D (ctx->left_to_right ? + s->regs.src_x : s->regs.src_x + 1 - ctx->dst.width); + ctx->src.y =3D (ctx->top_to_bottom ? + s->regs.src_y : s->regs.src_y + 1 - ctx->dst.height); + ctx->src_stride =3D s->regs.src_pitch; + ctx->src_bits =3D s->vga.vram_ptr + s->regs.src_offset; + if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { + ctx->src_bits +=3D s->regs.crtc_offset & 0x07ffffff; + ctx->src_stride *=3D ctx->bpp; + } + DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n", + s->regs.src_offset, s->regs.dst_offset, s->regs.default_offset, + ctx->src_stride, ctx->dst_stride, s->regs.default_pitch, + ctx->src.x, ctx->src.y, ctx->dst.x, ctx->dst.y, + ctx->dst.width, ctx->dst.height, + (ctx->left_to_right ? '>' : '<'), + (ctx->top_to_bottom ? 'v' : '^')); +} + +void ati_2d_blt(ATIVGAState *s) +{ + ATI2DCtx ctx_; + ATI2DCtx *ctx =3D &ctx_; + setup_2d_blt_ctx(s, ctx); + if (!ctx->bpp) { + qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); + return; + } + if (!ctx->dst_stride) { + qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); + return; + } if (ctx->dst.x > 0x3fff || ctx->dst.y > 0x3fff || ctx->dst_bits >=3D ctx->vram_end || ctx->dst_bits + ctx->dst.x + (ctx->dst.y + ctx->dst.height) * ctx->dst_stride >=3D ctx->vram_en= d) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return; } - DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n", - s->regs.src_offset, ctx->dst_offset, s->regs.default_offset, - ctx->src_stride, ctx->dst_stride, s->regs.default_pitch, - ctx->src.x, ctx->src.y, ctx->dst.x, ctx->dst.y, - ctx->dst.width, ctx->dst.height, - (ctx->left_to_right ? '>' : '<'), - (ctx->top_to_bottom ? 'v' : '^')); switch (ctx->rop3) { case ROP3_SRCCOPY: { bool fallback =3D false; - ctx->src.x =3D (ctx->left_to_right ? - s->regs.src_x : s->regs.src_x + 1 - ctx->dst.width); - ctx->src.y =3D (ctx->top_to_bottom ? - s->regs.src_y : s->regs.src_y + 1 - ctx->dst.height); - ctx->src_stride =3D s->regs.src_pitch; if (!ctx->src_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); return; } - ctx->src_bits =3D s->vga.vram_ptr + s->regs.src_offset; - - if (s->dev_id =3D=3D PCI_DEVICE_ID_ATI_RAGE128_PF) { - ctx->src_bits +=3D s->regs.crtc_offset & 0x07ffffff; - ctx->src_stride *=3D ctx->bpp; - } if (ctx->src.x > 0x3fff || ctx->src.y > 0x3fff || ctx->src_bits >=3D ctx->vram_end || ctx->src_bits + ctx->src.x + (ctx->src.y + ctx->dst.height) * --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071998; cv=none; d=zohomail.com; s=zohoarc; b=HneyjGFqZBvKfprNDVQQrtNoOkl+B6r41Sx0kMJm+EpC/B4+G9kGcomIoRstzkCjMQ2TVOFJ4SDIhjZh1sbXYHkADchMnywkwN6l/2qYdecoMcyPqmziMj6qhEV3aaOvAcRfJr0Z4CTnWjPfHQXP2+7T8hdOT1+6Rt4ZYSfgMOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071998; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=oxfOws3Bamemn9Q2Htt4dbPST3MdqkFHwhKudwpIJYA=; b=VSy5P11QoyFUoWB7QweKcbrhAZu+1Z8CZ9uqfP9+AHvDoe8daLS63FUHMRk+iAu872A+24VZ933Gf6/a9J1FgF42S2NO5/0aji/7BIhlXdB3NO0++9f8TZmIHc5gtbhuSiS6O6HjJ4iizY++k48gBWgvOyXLUiaRL5VmBopNH6s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071998847670.0097937211393; Mon, 9 Mar 2026 08:59:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzczO-00053J-NZ; Mon, 09 Mar 2026 11:57:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcyW-0003Zs-Vi for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:59 -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 1vzcyU-0000nl-2e for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:56:56 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-439b790af67so4879094f8f.0 for ; Mon, 09 Mar 2026 08:56:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadac2a7sm27776223f8f.15.2026.03.09.08.56.51 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071812; x=1773676612; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oxfOws3Bamemn9Q2Htt4dbPST3MdqkFHwhKudwpIJYA=; b=w1VWyrFQalRmRLJz8NvKau4XyFq7zkwJ1y+7wMonUnmqoKCm6TYFeng5xF4IKeBpEY GSYXhivTkC1wqftHIr8gw3McajqCLuflvRRU9sCYyUKZRaSfO/iGaPclMUo3MmXQqEmX PHNz2NLTPGd3MU7z6JGCby5nZdfMsfw/5xp+FEsqDtEnLkr843Keg4uasdJmdnmpHmi4 0Eq9YSXKQNy2BZGllfMvbAbbH4Bry9LlL7YP8rVcsTVTU2z+O/F1phiTpD6DtzLwE1M2 oTyCYckTpzLBWA4wfCz1clndj6NM+FUAB+VxdsWyIxu6LlvLszMe3zwXJ/FYldcoiQky eFUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071812; x=1773676612; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=oxfOws3Bamemn9Q2Htt4dbPST3MdqkFHwhKudwpIJYA=; b=sKL3j6t/bmSOQ0MUsNvVBd+16EPJAGwen0XflVKwoqIe/ZumKT9gk9c8op8JOQncN7 B0luUJwkFPMH3R/4IL9Bs6J5wRSlYdo3RlbAZSLq2lLta8Ni1EzpmiKUPMLThporT4Qh xfJDqGZ3fi0uV3lH5zf4iWzqkZSv8idPD4YfHy7yDDXGekORGZ8escTSX3ikUUStKuY6 NeYcAFmfvsDk87BOZcuFz5jSOcmh7YTByV630j8jPLN1emlsN2Zv4gE8AXf9dGu6U/ZW L4r8msWdCAgT5ziAieIjHM5/RgI4jvT8JTkU5/TMijfAcAGXS/oGb1gKj9XyjeLKxL5x 3PAA== X-Gm-Message-State: AOJu0YzOA/3kO0FFFE2V4+q9tjygA+qC3m+f1QNRRwXY9d91JyzH5uUd nWWzOzovXJol/rGl7xnTA/U2oyLcqhVJ8nDHYrgbnu7LFDqggAJgp9oQ+sxEG8w1WekFYzdiH+5 5wfYm/jE= X-Gm-Gg: ATEYQzzyilvCFYhYmUKbgs2+aYODgJnbozU/7WNUI80IxZ9YseoxFspxcrl04K+ZNFQ pBXgoUqH4htF+4l9WdeVGrHd6/DONIp5Dv7vAAUqj9Nt1j+T3QCiuEFa5W6u4MZVeYoyrmlhr8R oYc+mCwKBrLqwfTaPUTRglorpliz2+UtFdEseAx6p6Jx8RlhEOk2yursbG7hxyj8BCu92qlXjFV /KN5v8chHEiZMeYGye7bgVZ4GzrRT0/OacRBa3e4fPeBkmhLMstmwaS5JBCaTEau19GBzlWaFuQ flJQ8OfFit6c4Y+MpDOlDMhOICkQ+yAKVEuYoOQKU4aNNP2AMjCxhcFGyqiQL9EghpgwypFXcgI fs4Wr1kfFHk7uhYpnye/Sf3sK5kmpMZY2hsdcRxrUu2PbCzO/sZaBNLi66Uq2FnsISqimrNj6U+ jjNZoFjig+rI4KuDde7f4AvoJdUj7park1Wx9h+T6on5a3DRBNy4LD6Hgmy5ia9INeOaOhuQz8 X-Received: by 2002:a05:6000:2307:b0:439:c1a7:9dee with SMTP id ffacd0b85a97d-439efeb0512mr310744f8f.0.1773071812078; Mon, 09 Mar 2026 08:56:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 40/49] ati-vga: Split ati_2d_do_blt from ati_2d_blt Date: Mon, 9 Mar 2026 16:52:10 +0100 Message-ID: <20260309155219.62400-41-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072000385158500 From: Chad Jablonski ati_2d_blt remains the public interface to the blitter but the bulk of the implementation is moved down into ati_2d_do_blt which is passed an ATI2DCtx. ati_2d_do_blt returns a bool that is true when the blit succeeded, which means that a screen region will need to be set dirty. Otherwise false is returned. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <367949c50ca140a2d18ae66234dafbbc586b553c.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index ef4d2e21b5e..aa2e540a510 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -123,24 +123,21 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, AT= I2DCtx *ctx) (ctx->top_to_bottom ? 'v' : '^')); } =20 -void ati_2d_blt(ATIVGAState *s) +static bool ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx) { - ATI2DCtx ctx_; - ATI2DCtx *ctx =3D &ctx_; - setup_2d_blt_ctx(s, ctx); if (!ctx->bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); - return; + return false; } if (!ctx->dst_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n"); - return; + return false; } if (ctx->dst.x > 0x3fff || ctx->dst.y > 0x3fff || ctx->dst_bits >=3D ctx->vram_end || ctx->dst_bits + ctx->dst.x + (ctx->dst.y + ctx->dst.height) * ctx->dst_stride >=3D ctx->vram_en= d) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); - return; + return false; } switch (ctx->rop3) { case ROP3_SRCCOPY: @@ -148,14 +145,14 @@ void ati_2d_blt(ATIVGAState *s) bool fallback =3D false; if (!ctx->src_stride) { qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); - return; + return false; } if (ctx->src.x > 0x3fff || ctx->src.y > 0x3fff || ctx->src_bits >=3D ctx->vram_end || ctx->src_bits + ctx->src.x + (ctx->src.y + ctx->dst.height) * ctx->src_stride >=3D ctx->vram_end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); - return; + return false; } =20 DPRINTF("pixman_blt(%p, %p, %ld, %ld, %d, %d, %d, %d, %d, %d, %d, = %d)\n", @@ -265,8 +262,17 @@ void ati_2d_blt(ATIVGAState *s) default: qemu_log_mask(LOG_UNIMP, "Unimplemented ati_2d blt op %x\n", ctx->rop3 >> 16); - return; + return false; } =20 - ati_set_dirty(&s->vga, ctx); + return true; +} + +void ati_2d_blt(ATIVGAState *s) +{ + ATI2DCtx ctx; + setup_2d_blt_ctx(s, &ctx); + if (ati_2d_do_blt(s, &ctx)) { + ati_set_dirty(&s->vga, &ctx); + } } --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071945; cv=none; d=zohomail.com; s=zohoarc; b=JUVhQmK+Jh43nRVawXiVTYhBBrU4se1SN9oVqyHmhnfZOAUzyDXnA2+YhRhUIzL05UhhlxAFKzSjsIivzv8AQvk+vyGqFnsizsadiQsp1U61a24X1Mym9LXjSMybDDKrUR+TTqPoYvStN3oNeCyNR3+DKCHn3IiLK9Yx3nlswC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071945; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=wXh203y0iWfmEpIZbgI0WGjeGbB3hah+KAK+PVl+7ew=; b=QB7G90nvN0heCWW6mEj4pMVcBZt7KgMEpYfcGcbtZ34ehCqcfStbBJotDU7lGMLIPIsE7rCet6Uzldr2AbUjKxFPm/j4ImDdFEQQc1s8pbmYVzMjiUwiF8vCSSnnzDQ3HzESD+CfHryv1Cgc3dikHi1/v9HHP7tPf1ajSFDKv+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071944982363.65661667361974; Mon, 9 Mar 2026 08:59:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzcz3-000450-MM; Mon, 09 Mar 2026 11:57:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcyc-0003fa-T4 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:03 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcyb-0000oV-8z for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:02 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48532925a4bso8799015e9.1 for ; Mon, 09 Mar 2026 08:57:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48533d6151esm51193065e9.10.2026.03.09.08.56.57 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071819; x=1773676619; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wXh203y0iWfmEpIZbgI0WGjeGbB3hah+KAK+PVl+7ew=; b=Y891bbPMirtCw03tTRtkNGYNUle24gB4Wf2F6LDFGDfR8Q7bt5+OrVz66IVT1Voyuf yd4acjDVSuejzfIPHbAESoOl4CDmUv+5o7E+btMNtUejmJnyA4BKt1wfkpNPYwHHM9cF gBF2Ytmft57ZBiR4hLG/sb31s2hG66TNj1Uh7kYHg4G6eo0BSBqGNJxddkgk7LqX7yi7 mFtBtMlw802oC/RaYmFptplQ3igkl+93UQTjY3x/HYtd66miAm07BF0Z4u9V+u83x9DA VkF5KcTCNose1llrZr3vLkLvD1tCsux3ylTjCvto/aErY7OagQjwIDjnypwLvr6kkzBz dNRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071819; x=1773676619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wXh203y0iWfmEpIZbgI0WGjeGbB3hah+KAK+PVl+7ew=; b=xNCk+7uY88qijOopEPP6SUerjgxCp+zV7xuqAirhlqecP19LQqwRWZ9YDy49cuNL1j hjt0NkOeocKyG86cggKR5YzWytbo6L6q6Iiy93BCERDUzxWAfWCxpbGaS71QE6KWL+We JZD77iuX8GJIUrC7vh2hBipDEs9kDXGjvA2322xM/Ier1XLig3CedOs7r6uEdbUKQzH/ /VvhWB8lc1U/EqlFWG7X1YE3BC06U3b7yPnDDgG6V+GMeXCx6K03rqxHLelV0jCyYEKV 4MQDFY8VshhOmR0ICDO5jj2jOHThiu+s/Xa+LwLwXT8BGZml0DaR5EOqF+ZhS4wfhTla t4dg== X-Gm-Message-State: AOJu0YyVnu51oqkvtXxLAEqBUpVCMeHVBghgRG9AK9msteDbyhUGf1Kl 6RQ5kEJEFJPo2AGASS+f47GWK7/VoN7hCYR21YxyMGsnhhjSwVu0YXQiaLOkAOPYbKyfer59nGq qtVjvbo4= X-Gm-Gg: ATEYQzyoFId4xEBKYAXO+ybgxpCYrqMvy3sRzyJsGgzcJUyKH66QDAVx3tyCt8ZQzFr S3Osfo0xY1E9SPxAS08cNBBQQhD7/2lGnwJzqfUoYgbdZ51qTo4DAuF3UUhzvp8PWjhorHcFWyj GtCzZXU0MoPRsdibTYSHHlXmSGT3k+QAUatPI5D5XMAj8NwZ7wsWtU8O6gCAq8bSZw1AudjFi+9 z5cn/QdUlNnMABQCqIhYefH1soodSgxYIcT8ChC1huq8Fvgxp53vy+DB3SlTL1kubzplIexZeBN Wyo422BsbDU9rg4DLKamjZ04HdRaNWIum+xPOk/rbFIq3D0D1Aw2pmNPrIC0KzGwkClUFyrMCls iorNwJo2UQwU8WZzZS+GF7UGp/xcfK30XW+Zh4SDpFBwQgd5GJ3m3zun/BFoMz1/Bzlo99uv5os bN4TMa7mlRNbqO6jeJcLDlNIyFqtKZEo+FUyJv32RZYp/GiMUCxKX0HCKp4fHo49sMiDnGlv+H X-Received: by 2002:a05:600c:529a:b0:485:365f:b4e7 with SMTP id 5b1f17b1804b1-485365fb814mr87433285e9.14.1773071818851; Mon, 09 Mar 2026 08:56:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 41/49] ati-vga: Remove ATIVGAState param from ati_2d_do_blt Date: Mon, 9 Mar 2026 16:52:11 +0100 Message-ID: <20260309155219.62400-42-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071945562154100 From: Chad Jablonski This completes the decoupling from the ATIVGAState struct. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <6e3545dea9f4522e07e91f9db885a7d74dae781a.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index aa2e540a510..be940d8ab6b 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -123,7 +123,7 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2= DCtx *ctx) (ctx->top_to_bottom ? 'v' : '^')); } =20 -static bool ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx) +static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) { if (!ctx->bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); @@ -164,14 +164,14 @@ static bool ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *c= tx) #ifdef CONFIG_PIXMAN int src_stride_words =3D ctx->src_stride / sizeof(uint32_t); int dst_stride_words =3D ctx->dst_stride / sizeof(uint32_t); - if ((s->use_pixman & BIT(1)) && + if ((use_pixman & BIT(1)) && ctx->left_to_right && ctx->top_to_bottom) { fallback =3D !pixman_blt((uint32_t *)ctx->src_bits, (uint32_t *)ctx->dst_bits, src_stride_w= ords, dst_stride_words, ctx->bpp, ctx->bpp, ctx->src.x, ctx->src.y, ctx->dst.x, ctx->dst.y, ctx->dst.width, ctx->dst.he= ight); - } else if (s->use_pixman & BIT(1)) { + } else if (use_pixman & BIT(1)) { /* FIXME: We only really need a temporary if src and dst overl= ap */ int llb =3D ctx->dst.width * (ctx->bpp / 8); int tmp_stride_words =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); @@ -241,7 +241,7 @@ static bool ati_2d_do_blt(ATIVGAState *s, ATI2DCtx *ctx) ctx->dst.x, ctx->dst.y, ctx->dst.width, ctx->dst.height, filler); #ifdef CONFIG_PIXMAN - if (!(s->use_pixman & BIT(0)) || + if (!(use_pixman & BIT(0)) || !pixman_fill((uint32_t *)ctx->dst_bits, ctx->dst_stride / sizeof(uint32_t), ctx->bpp, ctx->dst.x, ctx->dst.y, @@ -272,7 +272,7 @@ void ati_2d_blt(ATIVGAState *s) { ATI2DCtx ctx; setup_2d_blt_ctx(s, &ctx); - if (ati_2d_do_blt(s, &ctx)) { + if (ati_2d_do_blt(&ctx, s->use_pixman)) { ati_set_dirty(&s->vga, &ctx); } } --=20 2.53.0 From nobody Sat Apr 11 21:32:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071864; cv=none; d=zohomail.com; s=zohoarc; b=FoGl7zw0efzs3N3+6ujhDudTdHIGGug8iuvjnI5D4AQ08/try/5b0wgVD3uFgOMEOjveF3h73jeB8QhqGmRlyqt4hzoRPcgAWbXhulXZ90CM5a0dAQsVQ1VWwUjt8E8nUXZyQjVqymvvlD/R44Y/ouKqYxVbkB0fo8dX84PCuU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071864; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=qW66m+PTUn7D/glxz+scEcXDbtO4oFleggwjTiVmuRQ=; b=L34eDFujCr0AsePmKegpRp7/qzDMmbSddmmHG8DZbt/+sE4/PKs7BD7mvwH2n5Of7BarwWhKxV5ktAVy62yHY0IxS/FLeHCUqH9zrfFIAkEjYgpkrxz5g4FzXeTMT9iv6SOFoIy7SO17kcBI+9rGLueJUR6OGL6i/tkzbOdrulk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071864222811.6677152583045; Mon, 9 Mar 2026 08:57:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzczB-0004Li-CN; Mon, 09 Mar 2026 11:57:37 -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 1vzcyj-0003kx-Ld for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:11 -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 1vzcyh-0000oi-MJ for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:09 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-48538c5956bso14240875e9.0 for ; Mon, 09 Mar 2026 08:57:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae2b9d8sm28717166f8f.21.2026.03.09.08.57.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071826; x=1773676626; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qW66m+PTUn7D/glxz+scEcXDbtO4oFleggwjTiVmuRQ=; b=m/yk0JiSiFYlL5yXojpkbjOpIERsSzwIP0QTSXwDdCBPqyLufnCWNdKPwUyruFPbFF u4Kbhr0c0mcQaDEcDqA1eRvjaMoH+OS9JEULY2sIqOeswwW8HpAf0DK8PAN2gBxfCmEO C8pUP2zKgQrvSu+qRmkmCresZ0h0p0vVXFrtdgvN6pTJwwAsjeOCeolOeG1grJtEmKjJ cDrh9w0awuKwcrrf9A6CpUCIExkLKB6tQIUWHZLc9UDOynLFkdFGl9eryqIrh2G/4nfB WCeLu6EgHzjHIlKHyS3oN8KYvxkmJ3C5QgoAt5GHaTI3X5r05yvByboM5eIvmxRo5xGe cMag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071826; x=1773676626; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qW66m+PTUn7D/glxz+scEcXDbtO4oFleggwjTiVmuRQ=; b=utfKzHYLOaXGf+2gxVpF8pP9Iaox9CF7eAsKdpS2oHhfO6L8RZ0vjPzrGr/vMt9vye wZC2En9GXePW/1TqWXjH19ZLfabCvGbJefA2kQ0SaJVgpeHHjM1BDxwpxcmmNemVlGqN LgHbXfv3sQNHV9kfYWnTPDamb98DfSQse+HVnnzKiI3BMcgyQs6Is5eiw9/4zpOVSKBu rdBEZkBm0S7SOLohJvPL1qPpReL20klmFwDryLkbeQ197Z1EVIPBLGtEZI//MaqJkTU/ OvxErvgb/znRQpsbDql99l9c5Rgztw4sGiowMFDOz5QbUm2rDR0mf73M5j4WPJfkwH31 WGVQ== X-Gm-Message-State: AOJu0YxzLinNlQ+Q78BdX1ZXVrYE1eDjKjSNeazH2uPJp/MCKb/M/DiD FdZD4WfZNINNq/NqWEOnypibeTqhwqRtRw9hf8UrnKiezTd8BOq/yMxrAzFSsxu97Udkq70IEHJ SqJbDMwI= X-Gm-Gg: ATEYQzzK/JopzDviYK/spZtx3P2st8bJPA2qZQqKlpmlazDnOgl0BVGSWXwSXzZBfcU ZEyW1ZYqaOA9x/wYRrwBlTSYM9Ymdy6wHxxg2GUt2AionNnLMBUwyct6WxzaB3ksXG0OsFabXnC XvM9TwOBwKR1emVVavhY0Lvttgit45i6KjYIp9PG70eiWVtccsT1JsAJF2pxWA+VbzF0DOuD2Pv +6WomxGj/odFp0NhkzBZryFBYXISeCxF5M7jxQupahgBHWPEHdEbkfHhSW70qFZ/bEMghgEXdrw 4NTBOs0FmPZ43J8w/qElfF+FNfgwBwv7Lq3SiVIetn5MQYRSRLMeu0f9zLmDRaepIi7f5Z8Ommd o+VJsRNDqcNCk4DOmC5Es/mdFhiz7oIDsUk0ZNqTY1IDM4zVCia7pRFJWikh44mTPEnd/IRrP4i GZqN2ZhyLRbVcj15QnTBj3zKlj7CrWuhC5RXlHMyg2AdOcePxCzbr4XMMfxrTYKvouSAB3Imah X-Received: by 2002:a05:600c:8b83:b0:485:3bcb:8bec with SMTP id 5b1f17b1804b1-48541a5c1e4mr1629205e9.14.1773071825604; Mon, 09 Mar 2026 08:57:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 42/49] ati-vga: Implement scissor rectangle clipping for 2D operations Date: Mon, 9 Mar 2026 16:52:12 +0100 Message-ID: <20260309155219.62400-43-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071866462154100 From: Chad Jablonski Use scissor registers to clip blit operations. This is required for text rendering in X using the r128 driver. Without it overly-wide glyphs are drawn and create all sorts of chaos. The visible destination rectangle (vis_dst) is the intersection of the scissor rectangle and the destination rectangle (dst). The src also needs to be offset if clipped on the top and/or left sides to ensure that src data is read correctly and appears clipped when drawn rather than shifted. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <4752dfbe240102c2ffa1f2cdab4c9442d4f0dcfb.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_2d.c | 87 ++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 29 deletions(-) diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index be940d8ab6b..1cfd350769c 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -52,6 +52,7 @@ typedef struct { uint32_t frgd_clr; const uint8_t *palette; const uint8_t *vram_end; + QemuRect scissor; =20 QemuRect dst; int dst_stride; @@ -91,6 +92,11 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2D= Ctx *ctx) ctx->dst_offset =3D s->regs.dst_offset; ctx->vram_end =3D s->vga.vram_ptr + s->vga.vram_size; =20 + ctx->scissor.width =3D s->regs.sc_right - s->regs.sc_left + 1; + ctx->scissor.height =3D s->regs.sc_bottom - s->regs.sc_top + 1; + ctx->scissor.x =3D s->regs.sc_left; + ctx->scissor.y =3D s->regs.sc_top; + ctx->dst.width =3D s->regs.dst_width; ctx->dst.height =3D s->regs.dst_height; ctx->dst.x =3D (ctx->left_to_right ? @@ -125,6 +131,8 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2= DCtx *ctx) =20 static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman) { + QemuRect vis_src, vis_dst; + if (!ctx->bpp) { qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n"); return false; @@ -139,6 +147,29 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_p= ixman) qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return false; } + qemu_rect_intersect(&ctx->dst, &ctx->scissor, &vis_dst); + if (!vis_dst.height || !vis_dst.width) { + /* Nothing is visible, completely clipped */ + return false; + } + /* + * The src must be offset if clipping is applied to the dst. + * This is so that when the source is blit to a dst clipped + * on the top or left the src image is not shifted into the + * clipped region but actually clipped. + */ + vis_src.x =3D ctx->src.x + (vis_dst.x - ctx->dst.x); + vis_src.y =3D ctx->src.y + (vis_dst.y - ctx->dst.y); + vis_src.width =3D vis_dst.width; + vis_src.height =3D vis_dst.height; + + DPRINTF("dst: (%d,%d) %dx%d -> vis_dst: (%d,%d) %dx%d\n", + ctx->dst.x, ctx->dst.y, ctx->dst.width, ctx->dst.height, + vis_dst.x, vis_dst.y, vis_dst.width, vis_dst.height); + DPRINTF("src: (%d,%d) %dx%d -> vis_src: (%d,%d) %dx%d\n", + ctx->src.x, ctx->src.y, ctx->dst.width, ctx->dst.height, + vis_src.x, vis_src.y, vis_src.width, vis_src.height); + switch (ctx->rop3) { case ROP3_SRCCOPY: { @@ -147,10 +178,9 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_p= ixman) qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); return false; } - if (ctx->src.x > 0x3fff || ctx->src.y > 0x3fff || - ctx->src_bits >=3D ctx->vram_end || - ctx->src_bits + ctx->src.x + (ctx->src.y + ctx->dst.height) * - ctx->src_stride >=3D ctx->vram_end) { + if (vis_src.x > 0x3fff || vis_src.y > 0x3fff || + ctx->src_bits >=3D ctx->vram_end || ctx->src_bits + vis_src.x + + (vis_src.y + vis_dst.height) * ctx->src_stride >=3D ctx->vram_= end) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return false; } @@ -159,8 +189,8 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pi= xman) ctx->src_bits, ctx->dst_bits, ctx->src_stride / sizeof(uint32_t), ctx->dst_stride / sizeof(uint32_t), - ctx->bpp, ctx->bpp, ctx->src.x, ctx->src.y, ctx->dst.x, - ctx->dst.y, ctx->dst.width, ctx->dst.height); + ctx->bpp, ctx->bpp, vis_src.x, vis_src.y, vis_dst.x, vis_d= st.y, + vis_dst.width, vis_dst.height); #ifdef CONFIG_PIXMAN int src_stride_words =3D ctx->src_stride / sizeof(uint32_t); int dst_stride_words =3D ctx->dst_stride / sizeof(uint32_t); @@ -169,24 +199,24 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_= pixman) fallback =3D !pixman_blt((uint32_t *)ctx->src_bits, (uint32_t *)ctx->dst_bits, src_stride_w= ords, dst_stride_words, ctx->bpp, ctx->bpp, - ctx->src.x, ctx->src.y, ctx->dst.x, - ctx->dst.y, ctx->dst.width, ctx->dst.he= ight); + vis_src.x, vis_src.y, vis_dst.x, vis_ds= t.y, + vis_dst.width, vis_dst.height); } else if (use_pixman & BIT(1)) { /* FIXME: We only really need a temporary if src and dst overl= ap */ - int llb =3D ctx->dst.width * (ctx->bpp / 8); + int llb =3D vis_dst.width * (ctx->bpp / 8); int tmp_stride_words =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D g_malloc(tmp_stride_words * sizeof(uint32_t)= * - ctx->dst.height); + vis_dst.height); fallback =3D !pixman_blt((uint32_t *)ctx->src_bits, tmp, src_stride_words, tmp_stride_words, ctx= ->bpp, - ctx->bpp, ctx->src.x, ctx->src.y, 0, 0, - ctx->dst.width, ctx->dst.height); + ctx->bpp, vis_src.x, vis_src.y, 0, 0, + vis_dst.width, vis_dst.height); if (!fallback) { fallback =3D !pixman_blt(tmp, (uint32_t *)ctx->dst_bits, tmp_stride_words, dst_stride_words, ctx->bpp, ctx->bpp, 0, 0, - ctx->dst.x, ctx->dst.y, - ctx->dst.width, ctx->dst.height); + vis_dst.x, vis_dst.y, + vis_dst.width, vis_dst.height); } g_free(tmp); } else @@ -196,20 +226,20 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_= pixman) } if (fallback) { unsigned int y, i, j, bypp =3D ctx->bpp / 8; - for (y =3D 0; y < ctx->dst.height; y++) { - i =3D ctx->dst.x * bypp; - j =3D ctx->src.x * bypp; + for (y =3D 0; y < vis_dst.height; y++) { + i =3D vis_dst.x * bypp; + j =3D vis_src.x * bypp; if (ctx->top_to_bottom) { - i +=3D (ctx->dst.y + y) * ctx->dst_stride; - j +=3D (ctx->src.y + y) * ctx->src_stride; + i +=3D (vis_dst.y + y) * ctx->dst_stride; + j +=3D (vis_src.y + y) * ctx->src_stride; } else { - i +=3D (ctx->dst.y + ctx->dst.height - 1 - y) + i +=3D (vis_dst.y + vis_dst.height - 1 - y) * ctx->dst_stride; - j +=3D (ctx->src.y + ctx->dst.height - 1 - y) + j +=3D (vis_src.y + vis_dst.height - 1 - y) * ctx->src_stride; } memmove(&ctx->dst_bits[i], &ctx->src_bits[j], - ctx->dst.width * bypp); + vis_dst.width * bypp); } } break; @@ -238,21 +268,20 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_= pixman) =20 DPRINTF("pixman_fill(%p, %ld, %d, %d, %d, %d, %d, %x)\n", ctx->dst_bits, ctx->dst_stride / sizeof(uint32_t), ctx->bp= p, - ctx->dst.x, ctx->dst.y, ctx->dst.width, ctx->dst.height, - filler); + vis_dst.x, vis_dst.y, vis_dst.width, vis_dst.height, fille= r); #ifdef CONFIG_PIXMAN if (!(use_pixman & BIT(0)) || !pixman_fill((uint32_t *)ctx->dst_bits, ctx->dst_stride / sizeof(uint32_t), ctx->bpp, - ctx->dst.x, ctx->dst.y, - ctx->dst.width, ctx->dst.height, filler)) + vis_dst.x, vis_dst.y, vis_dst.width, vis_dst.heig= ht, + filler)) #endif { /* fallback when pixman failed or we don't want to call it */ unsigned int x, y, i, bypp =3D ctx->bpp / 8; - for (y =3D 0; y < ctx->dst.height; y++) { - i =3D ctx->dst.x * bypp + (ctx->dst.y + y) * ctx->dst_stri= de; - for (x =3D 0; x < ctx->dst.width; x++, i +=3D bypp) { + for (y =3D 0; y < vis_dst.height; y++) { + i =3D vis_dst.x * bypp + (vis_dst.y + y) * ctx->dst_stride; + for (x =3D 0; x < vis_dst.width; x++, i +=3D bypp) { stn_he_p(&ctx->dst_bits[i], bypp, filler); } } --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071938; cv=none; d=zohomail.com; s=zohoarc; b=AsDBv+AEEcGA5czNPcZD8f/6m4bAB7U7KMyYpiMHfxUubCTnM43AgKgJs1+jlLflFz1oYbBt5BPOs7tRufOCT/j7UOK5Yg0+0+JLXfG8QvadESQf+2OR61RbGCSWwsSuvlN7VVeVE6bFGAsQH5zk4eisYBlccSsg3ZNXwLipqAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071938; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=zzThGEbHDfbShZ+LqArsRWb9rcvvKyh183/KD+t4v7U=; b=HC+7Wl4kp9CxZRedSuFyJxmYvbK0lniWs+HKThtXU5H8aRL/RBNM6K6QRpcc5mOUL6uk3xpPlR5bD1eYVdIOptbPU3EAIf/y/Vem/l0iTiccEe/JW1OW04MynYDI1RQYl7bXlXmy24Enps/DQTXR7IHzwtpJQ0XiSsULyBy8NXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071938064969.4284232635633; Mon, 9 Mar 2026 08:58:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzczk-0005ZU-1M; Mon, 09 Mar 2026 11:58:12 -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 1vzcyv-00040O-4Y for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:23 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcyp-0000pI-6g for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:17 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4852fdb36a8so24371855e9.2 for ; Mon, 09 Mar 2026 08:57:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485419c2930sm3208125e9.0.2026.03.09.08.57.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071833; x=1773676633; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zzThGEbHDfbShZ+LqArsRWb9rcvvKyh183/KD+t4v7U=; b=w3AgJOl84dg9jL1OE/x53l74mCuMKnvUwf20zqcAnTawH4qfjhtzVIE5o7LYMWMp1q 0mI4HA7RTum05igyKyGfhAY0sxZ/QLhrtB/vPKu9okxNaStqCNqqQtiwGluM5SaP3Wa3 XKLS9FMWzO3Dp+llYaF0ACmupp4fZFT+g/nH+T5aXk6NoJpvxMM3DS6fdnP8NBgK88SS AShN2yP3/YRbjrjfukpptsye9toM4xxYYzBUhNGrChTH6E04jetsN0koymOqiJ8wSW2k EKEJaqMsGo8iUtHhhbI9QLJLp8Vh/VMS7mPWYnwJXsv1nxRpuc/MNbOAbWiDD2r/t7vW x0+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071833; x=1773676633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=zzThGEbHDfbShZ+LqArsRWb9rcvvKyh183/KD+t4v7U=; b=JrT3dmKaIZ+rHZR2lWHJ0nAj81vDjjidqAJ/Z9ruUO3LrNR01beOsj0v9ZqROqHyLZ t4k5ZunAJgamnv+i4OVfnIojcqtJ+y+49s+mZ54zCTdP/NQFmAnF7hgAQQzxLKm2Jed1 T0kt+OtgFpt1m40SaG0BJkghn57CiWrgol5fLttBfduLnVHeKZKpRC1WkTeZm/h8cjdD DdTG60K0/CghskOHrrgeYeau4UqfhyNcA+gYkNlNAIuPzHwqtesbug7X5XRyK8xXnLon +0y4wBYl2vvxbfQ7ExAFBXk8FKrh5o6tE2MrYitpOafOKLn6VrJydoe9VHsQEaQ9Y16N DDLQ== X-Gm-Message-State: AOJu0YzI2+3fclHuqNVX578Q3pJyMq/JAuRhgJRgbfZrthy5V65kJfN9 7uMb+wYWp9w7GtPvBMFPaZsiGMtPUuGPeld4y8L+FGVq6qiZ3v8eEFxaKoarXUi8r7Brx+H58XG XRYjEIJw= X-Gm-Gg: ATEYQzx/Cpf/wc2rg6ZY1tbK+1WNg05AATq6PKSNod3DAsYlE1OGEww7sKQHl4OBcZE trFL35klIw9I5yMO9rWb75qpTY0TBefuWdTfBsXY11sMwanYHP+BrAFyb3mY6+boAtTF97M8Biy gnj2vdOj31tTTJS5fDkJXnx2w1UrNNRLZnjgqc2JVitScUNlwh4MM493wD+gxU4Sd/odibSdmCZ Qz7+ybS2iVj9xpH684ESacF/1GqxHRZjBc/yy7OlccP1RytEroqOq5t1ljL3j7YQo2wVTf1z3PW GS1ZKjNh4sQSD7whE/n5sceueqw6eks63YqPMuK19HWc1A9U3GJJ5Rqff1UT4Z0wg5C8sxN8Cav mZB9+4XKrGiH+XEzz3E+4FpRyha5FfMiGiOw9wp9LWEUXg9/ZTDNXeOOE2GxjHOKRnb2eCvECeq CSclEXEd2HWHo65uAGav7ZqEy/wbpg0u5G/w9H6VDoePWshHycMpvxEVH1e+GK3aFQacxJXRRyC /YfHIABIfk= X-Received: by 2002:a05:600c:3ba2:b0:485:35ba:1d81 with SMTP id 5b1f17b1804b1-48535ba1ea6mr92788705e9.21.1773071832488; Mon, 09 Mar 2026 08:57:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 43/49] ati-vga: Implement HOST_DATA register writes Date: Mon, 9 Mar 2026 16:52:13 +0100 Message-ID: <20260309155219.62400-44-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071940125158500 From: Chad Jablonski Writing to any of the HOST_DATA0-7 registers pushes the written data into a 128-bit accumulator. When the accumulator is full a flush is triggered to copy it to the framebuffer. A final write to HOST_DATA_LAST will also initiate a flush. The flush itself is left for the next patch. Unaligned HOST_DATA* writes result in, from what I can tell, undefined behavior on real hardware. A well-behaved driver shouldn't be doing this anyway. For that reason they are not handled here at all. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan Signed-off-by: BALATON Zoltan Message-ID: <235adb69787c818afd023e7f32286166cc70744c.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_int.h | 9 +++++++++ hw/display/ati_regs.h | 9 +++++++++ hw/display/ati.c | 26 ++++++++++++++++++++++++++ hw/display/ati_dbg.c | 9 +++++++++ 4 files changed, 53 insertions(+) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index 874c63eb544..063efc7bbaa 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -96,6 +96,14 @@ typedef struct ATIVGARegs { uint32_t default_tile; } ATIVGARegs; =20 +typedef struct ATIHostDataState { + bool active; + uint32_t row; + uint32_t col; + uint32_t next; + uint32_t acc[4]; +} ATIHostDataState; + struct ATIVGAState { PCIDevice dev; VGACommonState vga; @@ -114,6 +122,7 @@ struct ATIVGAState { MemoryRegion io; MemoryRegion mm; ATIVGARegs regs; + ATIHostDataState host_data; }; =20 const char *ati_reg_name(int num); diff --git a/hw/display/ati_regs.h b/hw/display/ati_regs.h index 3999edb9b71..48f15e9b1da 100644 --- a/hw/display/ati_regs.h +++ b/hw/display/ati_regs.h @@ -252,6 +252,15 @@ #define DP_T12_CNTL 0x178c #define DST_BRES_T1_LNTH 0x1790 #define DST_BRES_T2_LNTH 0x1794 +#define HOST_DATA0 0x17c0 +#define HOST_DATA1 0x17c4 +#define HOST_DATA2 0x17c8 +#define HOST_DATA3 0x17cc +#define HOST_DATA4 0x17d0 +#define HOST_DATA5 0x17d4 +#define HOST_DATA6 0x17d8 +#define HOST_DATA7 0x17dc +#define HOST_DATA_LAST 0x17e0 #define SCALE_SRC_HEIGHT_WIDTH 0x1994 #define SCALE_OFFSET_0 0x1998 #define SCALE_PITCH 0x199c diff --git a/hw/display/ati.c b/hw/display/ati.c index 9a7c5703b0f..16dbb743e1a 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -1023,6 +1023,27 @@ static void ati_mm_write(void *opaque, hwaddr addr, case SRC_SC_BOTTOM: s->regs.src_sc_bottom =3D data & 0x3fff; break; + case HOST_DATA0: + case HOST_DATA1: + case HOST_DATA2: + case HOST_DATA3: + case HOST_DATA4: + case HOST_DATA5: + case HOST_DATA6: + case HOST_DATA7: + case HOST_DATA_LAST: + if (!s->host_data.active) { + break; + } + s->host_data.acc[s->host_data.next++] =3D data; + if (addr =3D=3D HOST_DATA_LAST) { + qemu_log_mask(LOG_UNIMP, "HOST_DATA finish not yet implemented= \n"); + s->host_data.next =3D 0; + } else if (s->host_data.next >=3D 4) { + qemu_log_mask(LOG_UNIMP, "HOST_DATA flush not yet implemented\= n"); + s->host_data.next =3D 0; + } + break; default: break; } @@ -1128,6 +1149,11 @@ static void ati_vga_reset(DeviceState *dev) /* reset vga */ vga_common_reset(&s->vga); s->mode =3D VGA_MODE; + + s->host_data.active =3D false; + s->host_data.next =3D 0; + s->host_data.row =3D 0; + s->host_data.col =3D 0; } =20 static void ati_vga_exit(PCIDevice *dev) diff --git a/hw/display/ati_dbg.c b/hw/display/ati_dbg.c index 3ffa7f35df9..5c799d540a9 100644 --- a/hw/display/ati_dbg.c +++ b/hw/display/ati_dbg.c @@ -252,6 +252,15 @@ static struct ati_regdesc ati_reg_names[] =3D { {"MC_SRC1_CNTL", 0x19D8}, {"TEX_CNTL", 0x1800}, {"RAGE128_MPP_TB_CONFIG", 0x01c0}, + {"HOST_DATA0", 0x17c0}, + {"HOST_DATA1", 0x17c4}, + {"HOST_DATA2", 0x17c8}, + {"HOST_DATA3", 0x17cc}, + {"HOST_DATA4", 0x17d0}, + {"HOST_DATA5", 0x17d4}, + {"HOST_DATA6", 0x17d8}, + {"HOST_DATA7", 0x17dc}, + {"HOST_DATA_LAST", 0x17e0}, {NULL, -1} }; =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072228; cv=none; d=zohomail.com; s=zohoarc; b=VriSQAzCRf7ioT/z6woUBw1Ing50NF4+f/Oq5xv1KozmIW8MF7OrrmG8Fo0Hi65TCHlASoiIaTNJmpQuNWWekusVEIT89xaOIgm0AfnkvEJ/lKRIkmtWaiYWk9bf7H//YH7EXFFI69bsP+MxVUT4fK7xWQW0BSO5aSWgSQG5Iyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072228; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=7huqZG8fYKbzFShEoa/3EqS3qxfYHPgOCMFiO0WkjF0=; b=hV2/IV8aOo5Wpj4dN1DK6YoYhYY2Gtc0VTVsj1HMQ0e+BqyEkMf+iqvQ1tQYewBjl+cciQgD6x2lsSWJKb7+deBBuSqJHQjwdtqkHyN3GrtzzaS9QAKe2yopv3hvZGePOHkZQe7QcBA/gjCGPjNsMpw9zrxI5KWQs7OZzBjcvQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773072228257695.3501643596636; Mon, 9 Mar 2026 09:03:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzczG-0004YP-Au; Mon, 09 Mar 2026 11:57:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzcyy-00043P-Px for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:28 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcyv-0000pi-Qo for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:23 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4853c3c2fe7so6847315e9.0 for ; Mon, 09 Mar 2026 08:57:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aacd81sm694945e9.14.2026.03.09.08.57.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071840; x=1773676640; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7huqZG8fYKbzFShEoa/3EqS3qxfYHPgOCMFiO0WkjF0=; b=rlxjoKTvbbtt7iQBqcO58NG8D6aKGZmHJLjgyStLjRzxsmMkLN8MgKrx9pO6G3WnCA 8kfBmKGKBQQWGHWADKbGZoMK8guGwoLHF8aByaCv/iYCwlbI5YkVmzDvSKpVf0WAQ8KG sRyrFkpj+493bSH2k08oybv3bCnson2dHDtbf83stuREWVV2e3PHvumzIRI+U9b7Z3Gq Xn7lCYrkE+tNGq3hbLt4A0Glus3PcYoirSXt2Z+yB+nhCDaxnJO4D+3hgfQpdsxDwHxS SYSgPF15NeA/Bi6qupAOgtBp6rw2FxxsdP1bR2LLK8W4JcNX8kcB7/DETPoWVn5QOLhk Vd+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071840; x=1773676640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7huqZG8fYKbzFShEoa/3EqS3qxfYHPgOCMFiO0WkjF0=; b=DHMSJ2wRZR4YuZO+OI9nv1VeJjUucfKDrbqw9b+Bml1fKfmwIdRf1MnY9M0rC9iJcE Dn0zYjUvScc2KS5khPTvJ9cAoyGwcYVnaDWeaDAsQBXZI9ANcwnKzNK2NUXGZSq9TxMQ cGdob4kcLi3KTkGWYyx1t9aBO3rvW8uWUq7V3Xo8GglrLwjDn79pE2kI7Ogti3W+5iqy XLHkNvR6kYDOIG/01BfcWuhuObqXS+P9vVHQU3YUeXu+pk3c6fZaa7P0EU+90e9w8ZIK Wz/pHndjvSN/S76t0eDdYV1T3O6QGarihWajp625YakLLhQq4oyYY/XavC+MjxoC8EtB wYhQ== X-Gm-Message-State: AOJu0YwgDarMZwgOlwLtU/+O1JYx7+U388IYDni6spVi2uOJ3tmu5hV2 xHX1X6KaTJO/efE6uCXurERPuGmExKTsw25OxLdtPEtxA/GwqQIjYQ/FtfEbM6cLLxf8Zc/seyC ZLNGidv0= X-Gm-Gg: ATEYQzwNYgFH5AT3LQVMQlA9Eq1d8NYuchYVpBPKGqqyiHG3qt38CsNSTluTZkV4tGE 1ZhbXUmDzCNZBo0zN5TqWex9IBQuKk36RyKEM+bHlnCOVQpBCWZklXSk5G0X1/v/unWVCb0ON+a qz8WLi59m5T9zSflQ2TgtuOjZB0LnKWvbDjxkVdxJTXPCbq/tckQA5KZ7aG0/SovnR54TXsSCYJ 1ynSRpKSNPsurfvejkVPF+/zQFy5Bg+tW+Z+z9sGfPUqjad0HLd/7MntUWUqnjX7w7r8Iu04WRN tm9O4+l9bnN6NVvcbOGfNiqGFCr9pmyzg9b52vkQz/N9CH8ErcUuKnbgM3Hd2CQUUOdkhOc183e u5rM4Zj4YQvEJnKuSGrloeEaO6q9Afx9CzoylrXjjvua+xpPgnJuqk62Q4FhEi6YXYHp4p7sH5K LpnjfKjbOKQMgTT/dRNUpLAbIaR70v4DNzwBCG5CSniPQNWwwp7+Jq9yCPPT/AFFA2qXOJeLe8 X-Received: by 2002:a05:600c:c0c3:20b0:485:2a85:e5ec with SMTP id 5b1f17b1804b1-4852a85e711mr122354585e9.2.1773071839426; Mon, 09 Mar 2026 08:57:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 44/49] ati-vga: Implement HOST_DATA flush to VRAM Date: Mon, 9 Mar 2026 16:52:14 +0100 Message-ID: <20260309155219.62400-45-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072230610154100 From: Chad Jablonski Implement flushing the 128-bit HOST_DATA accumulator to VRAM to enable text rendering in X. Supports all datatypes (monochrome frgd/bkgd, monochrome frgd, and color), however monochrome frgd support is partial and does not properly handle transparency/leave-alone. The flush is broken up into two steps. First, if necessary, expansion of the monochrome bits to the destination color depth. Then the expanded pixels are sent to the ati_2d_do_blt one scanline at a time. ati_2d_do_blt then clips and performs the blit. Signed-off-by: Chad Jablonski Reviewed-by: BALATON Zoltan [balaton: Fix build without pixman] Signed-off-by: BALATON Zoltan Message-ID: <8d0d4b52a16f5564e37bbc88496d7ab8d41477ac.1773020351.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati_int.h | 3 + hw/display/ati_regs.h | 4 ++ hw/display/ati.c | 6 +- hw/display/ati_2d.c | 132 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 139 insertions(+), 6 deletions(-) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index 063efc7bbaa..21b74511e08 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -33,6 +33,7 @@ =20 #define ATI_RAGE128_LINEAR_APER_SIZE (64 * MiB) #define ATI_R100_LINEAR_APER_SIZE (128 * MiB) +#define ATI_HOST_DATA_ACC_BITS 128 =20 #define TYPE_ATI_VGA "ati-vga" OBJECT_DECLARE_SIMPLE_TYPE(ATIVGAState, ATI_VGA) @@ -128,5 +129,7 @@ struct ATIVGAState { const char *ati_reg_name(int num); =20 void ati_2d_blt(ATIVGAState *s); +bool ati_host_data_flush(ATIVGAState *s); +void ati_host_data_finish(ATIVGAState *s); =20 #endif /* ATI_INT_H */ diff --git a/hw/display/ati_regs.h b/hw/display/ati_regs.h index 48f15e9b1da..b813fa119e9 100644 --- a/hw/display/ati_regs.h +++ b/hw/display/ati_regs.h @@ -397,7 +397,11 @@ #define DST_32BPP 0x00000006 #define DP_DST_DATATYPE 0x0000000f #define DP_BRUSH_DATATYPE 0x00000f00 +#define SRC_MONO_FRGD_BKGD 0x00000000 +#define SRC_MONO_FRGD 0x00010000 +#define SRC_COLOR 0x00030000 #define DP_SRC_DATATYPE 0x00030000 +#define DP_BYTE_PIX_ORDER 0x40000000 =20 #define BRUSH_SOLIDCOLOR 0x00000d00 =20 diff --git a/hw/display/ati.c b/hw/display/ati.c index 16dbb743e1a..bb9e0bba282 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -1037,11 +1037,9 @@ static void ati_mm_write(void *opaque, hwaddr addr, } s->host_data.acc[s->host_data.next++] =3D data; if (addr =3D=3D HOST_DATA_LAST) { - qemu_log_mask(LOG_UNIMP, "HOST_DATA finish not yet implemented= \n"); - s->host_data.next =3D 0; + ati_host_data_finish(s); } else if (s->host_data.next >=3D 4) { - qemu_log_mask(LOG_UNIMP, "HOST_DATA flush not yet implemented\= n"); - s->host_data.next =3D 0; + ati_host_data_flush(s); } break; default: diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index 1cfd350769c..37fe6c17ee9 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -47,6 +47,7 @@ static int ati_bpp_from_datatype(const ATIVGAState *s) typedef struct { int bpp; uint32_t rop3; + bool host_data_active; bool left_to_right; bool top_to_bottom; uint32_t frgd_clr; @@ -85,6 +86,7 @@ static void setup_2d_blt_ctx(const ATIVGAState *s, ATI2DC= tx *ctx) { ctx->bpp =3D ati_bpp_from_datatype(s); ctx->rop3 =3D s->regs.dp_mix & GMC_ROP3_MASK; + ctx->host_data_active =3D s->host_data.active; ctx->left_to_right =3D s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT; ctx->top_to_bottom =3D s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM; ctx->frgd_clr =3D s->regs.dp_brush_frgd_clr; @@ -178,9 +180,10 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_p= ixman) qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n"); return false; } - if (vis_src.x > 0x3fff || vis_src.y > 0x3fff || + if (!ctx->host_data_active && + (vis_src.x > 0x3fff || vis_src.y > 0x3fff || ctx->src_bits >=3D ctx->vram_end || ctx->src_bits + vis_src.x + - (vis_src.y + vis_dst.height) * ctx->src_stride >=3D ctx->vram_= end) { + (vis_src.y + vis_dst.height) * ctx->src_stride >=3D ctx->vram_= end)) { qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n"); return false; } @@ -300,8 +303,133 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_= pixman) void ati_2d_blt(ATIVGAState *s) { ATI2DCtx ctx; + uint32_t src_source =3D s->regs.dp_mix & DP_SRC_SOURCE; + + /* Finish any active HOST_DATA blits before starting a new blit */ + ati_host_data_finish(s); + + if (src_source =3D=3D DP_SRC_HOST || src_source =3D=3D DP_SRC_HOST_BYT= EALIGN) { + /* Begin a HOST_DATA blit */ + s->host_data.active =3D true; + s->host_data.next =3D 0; + s->host_data.col =3D 0; + s->host_data.row =3D 0; + return; + } setup_2d_blt_ctx(s, &ctx); if (ati_2d_do_blt(&ctx, s->use_pixman)) { ati_set_dirty(&s->vga, &ctx); } } + +bool ati_host_data_flush(ATIVGAState *s) +{ + ATI2DCtx ctx, chunk; + uint32_t fg =3D s->regs.dp_src_frgd_clr; + uint32_t bg =3D s->regs.dp_src_bkgd_clr; + unsigned bypp, pix_count, row, col, idx; + uint8_t pix_buf[ATI_HOST_DATA_ACC_BITS * sizeof(uint32_t)]; + uint32_t byte_pix_order =3D s->regs.dp_datatype & DP_BYTE_PIX_ORDER; + uint32_t src_source =3D s->regs.dp_mix & DP_SRC_SOURCE; + uint32_t src_datatype =3D s->regs.dp_datatype & DP_SRC_DATATYPE; + + if (!s->host_data.active) { + return false; + } + if (src_source !=3D DP_SRC_HOST) { + qemu_log_mask(LOG_GUEST_ERROR, + "host_data_blt: unsupported src_source %x\n", src_so= urce); + return false; + } + if (src_datatype !=3D SRC_MONO_FRGD_BKGD && src_datatype !=3D SRC_MONO= _FRGD && + src_datatype !=3D SRC_COLOR) { + qemu_log_mask(LOG_GUEST_ERROR, + "host_data_blt: undefined src_datatype %x\n", + src_datatype); + return false; + } + + setup_2d_blt_ctx(s, &ctx); + + if (!ctx.left_to_right || !ctx.top_to_bottom) { + qemu_log_mask(LOG_UNIMP, + "host_data_blt: unsupported blit direction %c%c\n", + ctx.left_to_right ? '>' : '<', + ctx.top_to_bottom ? 'v' : '^'); + return false; + } + + bypp =3D ctx.bpp / 8; + + if (src_datatype =3D=3D SRC_COLOR) { + pix_count =3D ATI_HOST_DATA_ACC_BITS / ctx.bpp; + memcpy(pix_buf, &s->host_data.acc[0], sizeof(s->host_data.acc)); + } else { + pix_count =3D ATI_HOST_DATA_ACC_BITS; + /* Expand monochrome bits to color pixels */ + idx =3D 0; + for (int word =3D 0; word < 4; word++) { + for (int byte =3D 0; byte < 4; byte++) { + uint8_t byte_val =3D s->host_data.acc[word] >> (byte * 8); + for (int i =3D 0; i < 8; i++) { + bool is_fg =3D byte_val & BIT(byte_pix_order ? i : 7 -= i); + uint32_t color =3D is_fg ? fg : bg; + stn_he_p(&pix_buf[idx], bypp, color); + idx +=3D bypp; + } + } + } + } + + /* Copy and then modify blit ctx for use in a chunked blit */ + chunk =3D ctx; + chunk.src_bits =3D pix_buf; + chunk.src.y =3D 0; + chunk.src_stride =3D ATI_HOST_DATA_ACC_BITS * bypp; + + /* Blit one scanline chunk at a time */ + row =3D s->host_data.row; + col =3D s->host_data.col; + idx =3D 0; + DPRINTF("blt %dpx @ row: %d, col: %d\n", pix_count, row, col); + while (idx < pix_count && row < ctx.dst.height) { + unsigned pix_in_scanline =3D MIN(pix_count - idx, + ctx.dst.width - col); + chunk.src.x =3D idx; + /* Build a rect for this scanline chunk */ + chunk.dst.x =3D ctx.dst.x + col; + chunk.dst.y =3D ctx.dst.y + row; + chunk.dst.width =3D pix_in_scanline; + chunk.dst.height =3D 1; + DPRINTF("blt %dpx span @ row: %d, col: %d to dst (%d,%d)\n", + pix_in_scanline, row, col, chunk.dst.x, chunk.dst.y); + if (ati_2d_do_blt(&chunk, s->use_pixman)) { + ati_set_dirty(&s->vga, &chunk); + } + idx +=3D pix_in_scanline; + col +=3D pix_in_scanline; + if (col >=3D ctx.dst.width) { + col =3D 0; + row +=3D 1; + } + } + + /* Track state of the overall blit for use by the next flush */ + s->host_data.next =3D 0; + s->host_data.row =3D row; + s->host_data.col =3D col; + if (s->host_data.row >=3D ctx.dst.height) { + s->host_data.active =3D false; + } + + return s->host_data.active; +} + +void ati_host_data_finish(ATIVGAState *s) +{ + if (ati_host_data_flush(s)) { + qemu_log_mask(LOG_GUEST_ERROR, + "HOST_DATA blit ended before all data was written\n"= ); + } + s->host_data.active =3D false; +} --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072074; cv=none; d=zohomail.com; s=zohoarc; b=DeLIMJPJWXjDnfhggwzNQKcXVvIQp9hBmWKuL/kN/waQQ0EFTW6nFoRCLH5QUbwPe+0jrvHLPvKhGF+FEeYk9QC32TSPpE7kfEMPCyDkS5utmIL09J5sFfKAKtN/ldHuNta18kR5T5gkc8L97KagJ5k6JIfFaCHyJaE/4MjEsPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072074; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=P6b3kfLb5C5KN4L7wqKNdzZRULJ5wfyOi/20ivvG1AI=; b=m/ZSKUgItaMP4aZacQALlYqhw5PhAsjBnXFZ1KMOdhUd6ia08CQjBeUm8ZkRyPcT+f48ltZyMSXSSgcuDtvcj89PynpZeOxfMkU63mVAM/vtu5qbjcJt+va14Z14sabqx7cbdFmPtniskYGSosZOaXE28vz3IJECwJ6SSOhxk9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773072074978169.48944522219938; Mon, 9 Mar 2026 09:01:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzd0P-0006S9-Fh; Mon, 09 Mar 2026 11:58: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 1vzcz3-00047V-KR for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57: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 1vzcz2-0000ql-3W for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:29 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4806cc07ce7so136747335e9.1 for ; Mon, 09 Mar 2026 08:57:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a6bbcesm1188195e9.3.2026.03.09.08.57.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071846; x=1773676646; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=P6b3kfLb5C5KN4L7wqKNdzZRULJ5wfyOi/20ivvG1AI=; b=LTJUrE4CmWjr1+YPTN6B78TZZ3SIFc34tDtynKAezn5ERp37ctwxIXn1h4jHOWN2E0 41kkHIGKXr82Nvh1jJENacP+konTC90CcMkFtUqZNJ1aazMqSlyX5Ufsp8ncnyy6rnvw Or7jYcujAa05DpqobiiU3r0yuALcGlfd+PVO/Up/0GFClX292qAjfUxdz1q6imO9EM7O ppYL4/mjWDutwvYdSxow7B0oiAJYdHQsYLjjHmSQ+v1iSuCxrr2IE1DhOXa1YZBtLRfP 3xEDT8KzAMp8k7yeJXYsMtZ/arYqjFjLo3okkoRV6X+zq3J52ePvMZo5+GyL8rdY94qT VBlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071846; x=1773676646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=P6b3kfLb5C5KN4L7wqKNdzZRULJ5wfyOi/20ivvG1AI=; b=LPR/O4Ua6DtRN9xa/maT80EK9uDotRreKwdLFKRiFpuJpDgG+8fQuB8UhL/FeBpDBp ubggmIgZvpsoptiazjiRPkw1iOFG6N91MPrfla1vg74lI8LEiYWjCGqwYyvyALjU3Z0s 4ysIdRbVIhJHSnXsGVmtmEIrRL12ytdkFkKnztZFRTqkBxNTGyYDv1ilh35QfMgj4KhK 2YJNBDEnnV8GZT/0EZlHpdes81598zP+20BQpoKtpp4kUI0kWnUjgaHidDTnhdr1sUA5 +kPd1RGnEw9KZQd1zVKbEJ00uuHPSNj3YnDAqVJhFOTRWOfXL+MlXQkmM4tGt/4+CdL5 BYKA== X-Gm-Message-State: AOJu0YyAvOZEGPrv69vROo17ud5N/FVyzlWMI+vhRI4fFa9uwQ4QZRcv QxYTYQ18ZaOtLqflctB1QfvpDmCJNDMNDcKXUXxDRDLULQi0F4cTpW9sBkTKi3e6r6XOoxUbQyv oxOvQ1OE= X-Gm-Gg: ATEYQzwsCaFt8uDD6HyHMTWCQOVp+chljzqXRI8mm4Z67ADcY0aE4br2V8dTTUUB03v Tj6i3KNnWMmiK5DxQwtmrKRE9j8Q4auhA95grXcywQ+qxbveRYz7sSKT3qLh5Ucs1WZrcPcUEjN UJDcZRHRK2BVjC/7ZVsY2crQqgNDZrbr2guDxTQ0zNeWNPXPxvXZNO1KxteF0ebbNmV0ZUF3zzq Jtlldm2DYBs6GsQAqnmJhHlCFVtOM5vIURZzWfKvxcn6OyatE6Eh1JlbDU0oGU20D8mEtwLfcBq yk6dVlbmc9CH3e5jEjAibAq47WiGjDVDoQC18NC9IMglKC+jr74znlgB25yTJW/FHnaNU4jL8f9 HNDcIsYPr22Qh0oYxpEkhQt5stQJFJ3m/qEafo80+gWBeoFLfm3BesEltNdb71T7ia4WixZ4kPM W2qZHdpi67Zz2hTUzSjcCUjFKSakx7Fur49EX1RplZ2pAc5WcVUSvK+JCtW9+doSXAeNg45AGtC Z8kciso9YQ= X-Received: by 2002:a05:600c:b93:b0:479:1b0f:dfff with SMTP id 5b1f17b1804b1-48526923bd3mr183562405e9.10.1773071846251; Mon, 09 Mar 2026 08:57:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 45/49] ati-vga: Simplify hw cursor drawing Date: Mon, 9 Mar 2026 16:52:15 +0100 Message-ID: <20260309155219.62400-46-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072077104158500 From: BALATON Zoltan Avoid calculating index at every step when we can just count the position. Signed-off-by: BALATON Zoltan Reviewed-by: Chad Jablonski Message-ID: <90b49357b6bf80bcf8962331575ffd16a96b706a.1773009887.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index bb9e0bba282..2c649e940b3 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -198,7 +198,7 @@ static void ati_cursor_draw_line(VGACommonState *vga, u= int8_t *d, int scr_y) ATIVGAState *s =3D container_of(vga, ATIVGAState, vga); uint32_t srcoff; uint32_t *dp =3D (uint32_t *)d; - int i, j, h; + int i, j, h, idx =3D 0; =20 if (!(s->regs.crtc_gen_cntl & CRTC2_CUR_EN) || scr_y < vga->hw_cursor_y || scr_y >=3D vga->hw_cursor_y + 64 || @@ -213,10 +213,10 @@ static void ati_cursor_draw_line(VGACommonState *vga,= uint8_t *d, int scr_y) uint32_t color; uint8_t abits =3D vga_read_byte(vga, srcoff + i); uint8_t xbits =3D vga_read_byte(vga, srcoff + i + 8); - for (j =3D 0; j < 8; j++, abits <<=3D 1, xbits <<=3D 1) { + for (j =3D 0; j < 8; j++, abits <<=3D 1, xbits <<=3D 1, idx++) { if (abits & BIT(7)) { if (xbits & BIT(7)) { - color =3D dp[i * 8 + j] ^ 0xffffffff; /* complement */ + color =3D dp[idx] ^ 0xffffffff; /* complement */ } else { continue; /* transparent, no change */ } @@ -224,10 +224,10 @@ static void ati_cursor_draw_line(VGACommonState *vga,= uint8_t *d, int scr_y) color =3D (xbits & BIT(7) ? s->regs.cur_color1 : s->regs.cur_color0) | 0xff000000; } - if (vga->hw_cursor_x + i * 8 + j >=3D h) { + if (vga->hw_cursor_x + idx >=3D h) { return; /* end of screen, don't span to next line */ } - dp[i * 8 + j] =3D color; + dp[idx] =3D color; } } } --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071994; cv=none; d=zohomail.com; s=zohoarc; b=kJ5z8AS9hLBjGdXWBkA8CWwwedSIEMCfTRTp449LSe9uVZnsvKi3k6X1j8v//Si1dMPD3kuw5+wBi6fZPW/HRQPoIQo29cWRBMwP88BZ2XC012dc4jV9y+r6gQZB0Q9UFGTzx7Km+KH5p9kwklltBWXgE/1QPOWXY/ZkOLr+3IA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071994; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=QpWkjwMhJW7fy/PrD8/KH6aDfGrjV4YP9KEmKtnuVuY=; b=hbRNLdlDY/TjUVEyk9j2n8D+eUfzDfCYQI76OHVWyRLPcYpUpbkw0ux58wX1SRag/QcJtBxrMLeb5tijTVXiMgDmUDyuXaCHLHjsBvdQWSurvv+se4LDeWQrSXeJjLTLU9yiKu7sYm3PcCfp4qQCIraqRJfgdwF8eQhZRRC71EQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071994071791.6001708234783; Mon, 9 Mar 2026 08:59:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzczV-0005KY-Io; Mon, 09 Mar 2026 11:57: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 1vzczA-0004M1-OK for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:36 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzcz9-0000r6-6F for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:36 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4853510b4f3so22819515e9.0 for ; Mon, 09 Mar 2026 08:57:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485245dc298sm93876405e9.15.2026.03.09.08.57.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071853; x=1773676653; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QpWkjwMhJW7fy/PrD8/KH6aDfGrjV4YP9KEmKtnuVuY=; b=dkgAr0hWb2/IVpjVxBXfRuZpcL/dWCmHC3G3TrAVXsSXcPAtcAZFTSIDcEEvkcC4VM Ux4afpt9yzdBkJP8sEPU16R6LMwEY8V1uEdupB0gPSGGJwvWg4zrXBW9Wd/yJhNJZXjD gD2RdGrj4B1Dc4KAAwnr6rn+lw0uVhZ1GkhHMiUOGn4bXcNGcVNeiikDfxAfpugQZgoH iYq5jnBvu+My+mAeafI3QRGjcrQk5P9T1A6p4gj+PGJ8TlYeAiIkARt4ldmZFxod/Fgn +WYFgex1r/heWRRdLsjvOmSXaCdc1hVcXgELn08HEhv/c7swUAtT0DYtx0gWmt0AnJ94 1gOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071853; x=1773676653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QpWkjwMhJW7fy/PrD8/KH6aDfGrjV4YP9KEmKtnuVuY=; b=WMe7rF4TQvXCAMZ1lJ5Y4v072s/84XiT1lSjBOG0Wku97IDMzdmq56yKN6hSN3ZBxY a6rJk/DpCQAkyXFxvkBaY51w+0vgLA981MlDO72tjDK816GwohZaD20mWZ9vUlV/+0Ne siudjVdgTs8EehnVO2DzsKHiDA/4BEmbLhvV45KS0hoWfvn7iWupbCtFqCyhlEA6gW5k WHSkc9p2QiGon1Jjn8elFzwpBirVn1ra7XzUJlkd2nuphr+1kuknTXg+Zif6VmLNuOhX cDxpQJAeM/xY/hsm8w6nW4mtNZAzLK7X1xTKOmaRlilXit6fGHd7Pc4jGAWRWLNZEDFN SCXw== X-Gm-Message-State: AOJu0Yy98zqqOuvkUpLff5hLUNDAvnYklV6q6utmtZs1vezMHCMfZAEM C3JBNTHQBk2uGTrSan94Mn53HA468fkW0Rq+QBoqtXF3/KI+mvB34/iBiT++XSldAu9bFdDQhOu 7Nkr08oI= X-Gm-Gg: ATEYQzyrJKCIJ/apzc5BM16niPULIrOHEiebjNrK2SjHv85mcJkXVHFYRqxYplB8SnM cFFqLPTLy4lhSFxO3l1dbhbn/1xGwL7GrEOVi/0SSLpnCI7A/HomfD77bWw3GIbGmkn/jkVwGLs bJjPDbApL4UGp9+0IZ0yNgRrU5TGedk6KjAoSK3h8Lg5be0C6UCDS0nsuCV6Z40n96FKI8VMOSr jdEbh/6/It2kWOHZgje5k3HokeXuDUScn5dPrCBiXgXpk2T+HtiSkRo44VH0iZKgh7Xp+UuoHLt tG751JIOglWG8MXImfxqabjOe55PiZqjsBwKHl9M4l6AgX5MB1p2aI81pPdF7QYspcGfdjLQzXQ MDsbdDemgok+jqHuXrpLBPpFfWLXa8uQc9zbaD8G7rPHOJGrXfeGvRNjzsywdQRU9/2GAU6Epr8 srAGFIe04elolkjSaEcoxW4ZPhY37bcP4wlR3RnMc8BFF0tYPm/pjybzlkUyS9/VT/h+9QUEnG X-Received: by 2002:a05:600c:1d24:b0:485:39b9:96a1 with SMTP id 5b1f17b1804b1-48539b998d8mr84484145e9.19.1773071853316; Mon, 09 Mar 2026 08:57:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 46/49] ati-vga: Do not access pixel outside the screen Date: Mon, 9 Mar 2026 16:52:16 +0100 Message-ID: <20260309155219.62400-47-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071996275154100 From: BALATON Zoltan We check end of screen before writing the pixel but before that complement color also accesses screen pixel so we have to check before that. This fixes a segmentation fault with guest_hwcursor when pointer is partially out of screen at lower right corner. Signed-off-by: BALATON Zoltan Reviewed-by: Chad Jablonski Message-ID: <26db0715a6b9f6504f394010513facc9a37882ad.1773009887.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ati.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/display/ati.c b/hw/display/ati.c index 2c649e940b3..05cf507bd47 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -214,6 +214,9 @@ static void ati_cursor_draw_line(VGACommonState *vga, u= int8_t *d, int scr_y) uint8_t abits =3D vga_read_byte(vga, srcoff + i); uint8_t xbits =3D vga_read_byte(vga, srcoff + i + 8); for (j =3D 0; j < 8; j++, abits <<=3D 1, xbits <<=3D 1, idx++) { + if (vga->hw_cursor_x + idx >=3D h) { + return; /* end of screen, don't span to next line */ + } if (abits & BIT(7)) { if (xbits & BIT(7)) { color =3D dp[idx] ^ 0xffffffff; /* complement */ @@ -224,9 +227,6 @@ static void ati_cursor_draw_line(VGACommonState *vga, u= int8_t *d, int scr_y) color =3D (xbits & BIT(7) ? s->regs.cur_color1 : s->regs.cur_color0) | 0xff000000; } - if (vga->hw_cursor_x + idx >=3D h) { - return; /* end of screen, don't span to next line */ - } dp[idx] =3D color; } } --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773071975; cv=none; d=zohomail.com; s=zohoarc; b=mwdaxoH1Dhx5YcbryxTCVz++IGWo/F8DQ+tLjE5J+PncSqLUn3s7ydjlmLCgIkdKwIHIcRZUZeF1lE27wzJ/y5CoUfYk0GdyqNo8vT7Ce5W16+X6rMCjpGO8yKrdoUhj8LZe6kvO816SXsh+j++KmgNgBvlAR6dPmMZe0kKnTm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773071975; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=AuRv8v324tCQUkX/bfQ3Ovg91hb7uk1tmN4rCfz01G8=; b=LGRduX4J7wFEn3MkfOBXh2iuA4Oijl4+675qzlEvll+A5dNB83n7ArF8uEf55ZIkSZ2wA2KHm1d1O2Kdu9kQe2S3ANeo12rEjfbibIvXU8I7VsSDSfCYB0KVQdr7fB1GYIdt4Wv1LHpBaniqMMG/fMiUg2UkuLbGWM/qA8iQIvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773071975169869.7674862600492; Mon, 9 Mar 2026 08:59:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzd0c-0006c2-82; Mon, 09 Mar 2026 11:59: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 1vzczJ-0004wy-Je for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:46 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzczG-0000rj-Ni for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:45 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48539cbb7b1so9380455e9.3 for ; Mon, 09 Mar 2026 08:57:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aad45fsm802025e9.15.2026.03.09.08.57.39 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071861; x=1773676661; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AuRv8v324tCQUkX/bfQ3Ovg91hb7uk1tmN4rCfz01G8=; b=cjPojoAKSdHK3d38fbW2sF5VV9BYbZCObjG8QCJr4nztSN2/qu241NHN+h8eSJvdqg ww48v5tiZ5Uu4rgyrOm1kKNGu+M667Qrtt/XqvxG7JDdsvT8WwBxESTYhyxf8OGxeTGQ Shcg1ctI1aV+rF2z8EZv5EnNY06aira2xAzs8S/ysBOaZgJsOe6SPtX+KTSkuPX/iOqH pmHkJV7IY3MiHeXmzPhwQLgtxOWvO2sWlryw4rsxam4WNDiTHBZnwKI3L+ojkwt/ubL4 MjH+it4MBrORfckkDClKchT2SpFtgzggLhgIDhPYeKsHJeKv3oi5KI/dmvYSVX9inN66 WfQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071861; x=1773676661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=AuRv8v324tCQUkX/bfQ3Ovg91hb7uk1tmN4rCfz01G8=; b=apkoeCR3r6aKNvGD+q+7eZ85YAgb9WpzhS4R1BMmTVMtjYcX5m80smi1k2jzu9qAYZ ywqTA+wHzfUzrdgJI8MdiFYT6s1BoOaZbZdsvxfzCi9kV3BEU5KgvNNxnSWgKOkKR6KI GePw82Dtpo0zIbzt31yr2mgkGheeY2nri681pe5bq69ob7ghzjUv5LA8InTjULNJg5H9 vBSEOE2l06CjlYNkUHAz6tdmThjBjH5o0Zdm/X/R3/DJ+Sj2EuG1vgxS3dwzhMNVtPpy hTdl3Lz32so00XvRCkE9qIe5OSSkHo7wNviKsZ54jo+ZE5K97N/OOUq27olU9CZVu8W6 lVlQ== X-Gm-Message-State: AOJu0Yzf/HErMuEqznZKdbXqFBBah1c4Ma9u+tSHrA4iKJJFDGG7XQGG OEVq/XUsR4xZR7eClUJqAXjYR6NNovFkwFzuxbLfqUpQnKHZnoaq2XcM54gx6BXDLZot444gsfO SIFRD0Mo= X-Gm-Gg: ATEYQzzKOlm9rTOhmICYOJr4uY48zczFGNWpw/u+VScC3chPAvQN6Ltvj1uob0RF0pa ZnmIFcKQJAak/Z8p0lZOH7nvvHJm3tTLV1bgqs1WadjKX36sN+H1g55idmwQhmNQK2jNccsgiTu /KefBDGM87VQGU9+cYuNfr7L2A0tHcpA2AN2HQDHKR8z192ahaiASso0uQHU3f1/3F1rnbzswwu GDUKuKovt2+2vfD3alRegxfpyrjLq6N2uImFfU5Oh97uFVCXz88TecpdPqToOQShGmcojGJOdbc OxHzQ7FIM5ranj6kcygBNwz2nuHiC4k0Ve4CScBFl2/ABC7bRFzRabrA1t+n8CP+4ym9ctFG7WC wV/J+Agj7eNnlmtAZZxRUVVg+bpY8ieHI522pLqoXTR4FYbmdQmGNVVi1wtDXPQd3UTTqm5Kc40 Qdpvs6/A72me/+ySZLnJie4G/zy0MitCzqzMGQ48vR0FNY8+1BxjNSWcMWmw4yLwPFqjILMGp2 X-Received: by 2002:a05:600c:4f55:b0:485:3c66:e230 with SMTP id 5b1f17b1804b1-4853c66e4eamr55050955e9.29.1773071860592; Mon, 09 Mar 2026 08:57:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 47/49] hw/i3c/dw-i3c: Fix memory leaks in error logging paths Date: Mon, 9 Mar 2026 16:52:17 +0100 Message-ID: <20260309155219.62400-48-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773071976271158500 From: C=C3=A9dric Le Goater object_get_canonical_path() returns an allocated string that must be freed by the caller. Use g_autofree variables to ensure that memory is not leaked. Resolves: Coverity CID 1645550 Resolves: Coverity CID 1645553 Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260309093838.364126-1-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i3c/dw-i3c.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/i3c/dw-i3c.c b/hw/i3c/dw-i3c.c index 3d8b95a14c4..e9bdfd6af2a 100644 --- a/hw/i3c/dw-i3c.c +++ b/hw/i3c/dw-i3c.c @@ -490,8 +490,9 @@ static int dw_i3c_recv_data(DWI3C *s, bool is_i2c, uint= 8_t *data, /* I3C devices can NACK if the controller sends an unsupported CCC. */ ret =3D i3c_recv(s->bus, data, num_to_read, num_read); if (ret) { + g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); qemu_log_mask(LOG_GUEST_ERROR, "%s: NACKed receiving byte\n", - object_get_canonical_path(OBJECT(s))); + path); ARRAY_FIELD_DP32(s->regs, PRESENT_STATE, CM_TFR_ST_STATUS, DW_I3C_TRANSFER_STATE_HALT); ARRAY_FIELD_DP32(s->regs, PRESENT_STATE, CM_TFR_STATUS, @@ -1107,8 +1108,9 @@ static void dw_i3c_resp_queue_push(DWI3C *s, uint8_t = err, uint8_t tid, static void dw_i3c_push_tx(DWI3C *s, uint32_t val) { if (fifo32_is_full(&s->tx_queue)) { + g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); qemu_log_mask(LOG_GUEST_ERROR, "%s: Tried to push to TX FIFO when " - "full\n", object_get_canonical_path(OBJECT(s))); + "full\n", path); return; } =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072063; cv=none; d=zohomail.com; s=zohoarc; b=Zf1hLJdKnYE356yz7qnYldy6ZXNgZFdyq4/CstrkouGjIIWhf02fI9dqkTmsnKpQDd7Ho6kT9Kt5lF4X/5Wk15Vz0CVq9ozbfgvWE0WlmyUyW8CyUby44lY7mnmXvwRHVqz3pMYJYPoPRUV3q1xHgizDaCGoTsw5nBj9bQ60mfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072063; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IzmpeICsmhHpjzqq103V8NsIYXc7xyq7TsCvvhiVxQY=; b=IO2XudG2wOyVVM2bIlW+Fz0tfI9sv2JlEg0agKKfStchy7i9xUemNWx9Uyh7fvLK9OMb7IEXPTZF1IAlst5U/5zIBgcl9ax93yXXe6clysa/Sbh9HELD2sozlKNnuSLx+ywu0+yN2X/UUP0d17MnOOAuDdzICLMQHfGo6TjaNwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773072063085134.32336540135873; Mon, 9 Mar 2026 09:01:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzczr-0005ky-K0; Mon, 09 Mar 2026 11:58:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzczP-0005EI-7p for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:52 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzczN-0000se-JG for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:50 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4852ff06541so21347415e9.2 for ; Mon, 09 Mar 2026 08:57:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a9c293sm781845e9.10.2026.03.09.08.57.46 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071868; x=1773676668; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IzmpeICsmhHpjzqq103V8NsIYXc7xyq7TsCvvhiVxQY=; b=B6glUdxU6nqHySWDZaI/zBB52NzAaDREW6N1dSwEg/qy4Q/qDaX0HnOORO+W9FPTBt iq4vHddObCX+5bs7KtRmXjDvOxihQkNuUiXfuKzlmwQPrMajX5pEgeEz4JqPUz3jxp6M WMTdeh+8eHdHzUOtqrK1aDBw6VjyF/cOOa1qjvMmiC6OSyQQwTeV6DbcoqAQFmFi0hzS IQHJJanzBaqo/7yzXT+3TMGh0BO++gGPjmNB3aaUBaRtvs6rOLs/EezS6SBe8Flcg6J0 JGPyG1OVm+v3PVGmXOyIdqS+TNRCfI3oj2hvI9OJ4KUMDomBV2yZ8PbT03bXmevbDweS uaVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071868; x=1773676668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IzmpeICsmhHpjzqq103V8NsIYXc7xyq7TsCvvhiVxQY=; b=jnmHJ93Zmq6ng7Pkv0ZP1g8sP5m4oKO6Mii6BYcQJigVQIPHO2X83gRRYwzr2Jvgaz Dr0Ri63wTLxwTQkLPAxcTIW6g0ygmV1xmjQIrT4+q2hxEZkr0YSq3b55eP9zzTlssiBG KLQE1zb0iK9rtt4/KyUkSfiGfBPf7vyekXoIPLMGHGuqnmyQRBfkkapbHIv/9eOVdl0M iBl8BFQwJTJ0L7L2dNWj6Kib+Ge6LSIhS9g4vSLwcC8hQCpR3A+u5Pkiup3DGdegPTTr FEz3V8EneFIL/OK4DfN7Wr/KDv261S8lzwUq7VeJKxFpumSU5qKx8baKpnexBh8GCEfG XWAQ== X-Gm-Message-State: AOJu0YwUsqRkDxMJL6gugaVEFiUeaMMNLAqFCCspdiube3YjkOcwGPxR ZtXPOOPIVdR7+Pq5zVh5TD7eP7UuZoXy6qHmzBBQT5yghWXbb9kVqtAzgeZ2CTGbDCPNYrc/Swf +Mp6WGJI= X-Gm-Gg: ATEYQzxDkmSO1DhxO2Sso6mI03blAlzHIOulLSJLisL7UMnjNdj1Qh3/W9bdBDENypY Ze544TybOJFrDZepBEMRP3WHVoTLCz+Q7Upm83IJIzNBbIDL2uAAtQRSZd+R6d1qpyNbx2onzuX eyvQdT4NxtpGhcDBz4elVuYO4n8NBTQIZKtzLT42tfWWJvH3hk7bZhPNiB1pSaaemVXQPuhKTKO XdBppQ0mhdPGx+48d46polcHev5d8jZfjOov6i9RH2B1abbzUqHKB+081nbzSFtVGGLzQ1cgdSS sKe6Fo1kUxs0RhBPAAIb0asJX1WkGnG3BWDJzldECilzBkHTQMZdXdMHJ/TTWooJoJ+4NXxyhLJ X24fRg1y6BPMW3+WDbxiC/Lts41Ajvvpx5WBXh3iY+nLLgbVDBaw+t69A7Hx+ybq6dp4Mep/+DT WBpSe4zN4Fop+mL5s4fVADHiIB3zYR6ZFJuTcwPIj2TUbJ5cA1kBKXcMzHVCZQdK2N0Tcgi4E6 X-Received: by 2002:a05:600c:350e:b0:480:4a90:1afe with SMTP id 5b1f17b1804b1-485269785afmr180533195e9.34.1773071867588; Mon, 09 Mar 2026 08:57:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 48/49] hw/misc/sifive_e_aon: Don't leak timer Date: Mon, 9 Mar 2026 16:52:18 +0100 Message-ID: <20260309155219.62400-49-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072065317154100 From: Peter Maydell The sifive_e_aon watchdog creates a timer with timer_new_ns() in its instance_init method, but does not free it in instance_finalize. This means that QMP introspection of the device leaks it: Direct leak of 48 byte in 1 object allocated from: #0 in calloc #1 in g_malloc0 #2 in timer_new_full /home/pm215/qemu/include/qemu/timer.h:520:21 #3 in timer_new /home/pm215/qemu/include/qemu/timer.h:543:12 #4 in timer_new_ns /home/pm215/qemu/include/qemu/timer.h:563:12 #5 in sifive_e_aon_init /home/pm215/qemu/build/san/../../hw/misc/sifiv= e_e_aon.c:286:21 #6 in object_initialize_with_type /home/pm215/qemu/build/san/../../qom= /object.c:570:5 #7 in object_initialize /home/pm215/qemu/build/san/../../qom/object.c:= 578:5 #8 in object_initialize_child_with_propsv /home/pm215/qemu/build/san/.= ./../qom/object.c:608:5 #9 in object_initialize_child_with_props /home/pm215/qemu/build/san/..= /../qom/object.c:591:10 #10 in object_initialize_child_internal /home/pm215/qemu/build/san/../= ../qom/object.c:645:5 #11 in object_initialize_with_type /home/pm215/qemu/build/san/../../qo= m/object.c:570:5 #12 in object_new_with_type /home/pm215/qemu/build/san/../../qom/objec= t.c:774:5 #13 in qmp_device_list_properties /home/pm215/qemu/build/san/../../qom= /qom-qmp-cmds.c:206:11 Allocating a separate QEMUTimer with timer_new() is not the preferred interface (per the comments in include/qemu/timer.h); switch to an inline struct initialized with timer_init(), which we can clean up with timer_del() in finalize. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260309095129.1406506-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/misc/sifive_e_aon.h | 2 +- hw/misc/sifive_e_aon.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/hw/misc/sifive_e_aon.h b/include/hw/misc/sifive_e_aon.h index efa2c3023f6..e907aa7869d 100644 --- a/include/hw/misc/sifive_e_aon.h +++ b/include/hw/misc/sifive_e_aon.h @@ -46,7 +46,7 @@ struct SiFiveEAONState { MemoryRegion mmio; =20 /*< watchdog timer >*/ - QEMUTimer *wdog_timer; + QEMUTimer wdog_timer; qemu_irq wdog_irq; uint64_t wdog_restart_time; uint64_t wdogclk_freq; diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c index 0e82ae3758b..e78f4f56725 100644 --- a/hw/misc/sifive_e_aon.c +++ b/hw/misc/sifive_e_aon.c @@ -94,9 +94,9 @@ static void sifive_e_aon_wdt_update_state(SiFiveEAONState= *r) next +=3D muldiv64((r->wdogcmp0 - wdogs) << FIELD_EX32(r->wdogcfg, AON_WDT_WDOGCFG, SCALE), NANOSECONDS_PER_SECOND, r->wdogclk_freq); - timer_mod(r->wdog_timer, next); + timer_mod(&r->wdog_timer, next); } else { - timer_mod(r->wdog_timer, INT64_MAX); + timer_mod(&r->wdog_timer, INT64_MAX); } } =20 @@ -283,12 +283,19 @@ static void sifive_e_aon_init(Object *obj) sysbus_init_mmio(sbd, &r->mmio); =20 /* watchdog timer */ - r->wdog_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, - sifive_e_aon_wdt_expired_cb, r); + timer_init_ns(&r->wdog_timer, QEMU_CLOCK_VIRTUAL, + sifive_e_aon_wdt_expired_cb, r); r->wdogclk_freq =3D SIFIVE_E_LFCLK_DEFAULT_FREQ; sysbus_init_irq(sbd, &r->wdog_irq); } =20 +static void sifive_e_aon_finalize(Object *obj) +{ + SiFiveEAONState *r =3D SIFIVE_E_AON(obj); + + timer_del(&r->wdog_timer); +} + static const Property sifive_e_aon_properties[] =3D { DEFINE_PROP_UINT64("wdogclk-frequency", SiFiveEAONState, wdogclk_freq, SIFIVE_E_LFCLK_DEFAULT_FREQ), @@ -307,6 +314,7 @@ static const TypeInfo sifive_e_aon_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SiFiveEAONState), .instance_init =3D sifive_e_aon_init, + .instance_finalize =3D sifive_e_aon_finalize, .class_init =3D sifive_e_aon_class_init, }; =20 --=20 2.53.0 From nobody Sat Apr 11 21:32:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773072049; cv=none; d=zohomail.com; s=zohoarc; b=Qxr0lWKjnejnmOqTloHRk47z6/plI/NjtI7pL/hNVH+CxMXDyys5p6tTVGaaY/YUG9AxSC+FTRG6N7JrWe6YRqXKXvUXsU/SUI3c0G0eGFScW9qEKy3lgM+jGwd3w5aRPoy1e4JECOZ/nMcDeABCCqIxCwZB0XuMyTa7qZdc0Mo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773072049; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=FT88LR+eo72/LXYlYp0i0a+oKJzqOg43I+KETtJ6zlI=; b=BnTgP2gRYWs0qH5jVOWzzkWmOe1eqAuUdqSwlkwGoF/Yevm2IRc6KG6TIk55EQos8VUB0FLCsxUeXitkjY8ezWWFj3SXIIig+o5gglaVdzZaSE3ozKdWYVXtHQp/bv2pSanGTmibIE01A5FXXcoQA7YYZUzLsSCzFR/VAvOQLHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177307204941335.59334895690097; Mon, 9 Mar 2026 09:00:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzd0u-000750-8c; Mon, 09 Mar 2026 11:59: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 1vzczW-0005RT-0v for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:59 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzczU-0000tf-Dc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 11:57:57 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48534b59cf3so12037715e9.2 for ; Mon, 09 Mar 2026 08:57:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541a9e6aesm799245e9.11.2026.03.09.08.57.53 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 08:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773071875; x=1773676675; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FT88LR+eo72/LXYlYp0i0a+oKJzqOg43I+KETtJ6zlI=; b=iKHTeKiaqXVy/tFipIryo2XrGn+cN7LQG0HAXLRbh7ZNGqs1rp+0LtbhC8MfnZtL0B 4TbaZgETeYDc1ffXUDK+BxC3azU8XmmIqBIiP22SOkooS/9ZsdAqwfVkgncD0ai5V9um E8b3RgGnJnvEgcQx32kKjpnxVrcvEZOu557I1nd9dJGCU3NusHbrSTwaYGNj/RmOyQpl 4ydBmuPbACAWV8UyznODFfBQJxo1JcCJOvtwtYgA3d91cI7EPQFSKnDz2H1TyCLvcHgW e++rgTL5X3ig3Ku/yPktNIBT1njOB1VEqLYTOt/pXk4Ts3uNvUTTNSWgDxHaGAFC8+Y1 xisQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773071875; x=1773676675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FT88LR+eo72/LXYlYp0i0a+oKJzqOg43I+KETtJ6zlI=; b=J4sRQr+TVGlzjGYJ1mn/GwZgsjK2soQEzs/GeR2JakvNX5adPkpShEltFcPP45avnV d+UwbqfsU+Q3WHuW1MtSE78VEpa/PuloSrGNYcaZaVnHcqEUqxQhUpoILtMmJzTBr8mb qdc/QDQhGMG6xYMo86jbGYgZK57cWmuou+JHzkuOgmSVify4Hm2Tkw/pZ1EfreHvkuRU mXFnpop1UBxHmYO8eQd8c+pL+5nFyhsmCxtKY//jQmsEKuRuAQqU2EVhGk41k2oAsRvq nHyLBXpP8QVZD1gYuXQN9fMj8zOZN5ZHvNKVFIpn6vyO8GNo0wx4Z8QQA+7K4YLpQJVh xMOg== X-Gm-Message-State: AOJu0YwxyHvI55LJm3Ng5J0UV4QkeD5tHUVLrA7Ewx0DMT3we2zdjZvF HfI72GMF+z6XRmtc4BKWobhrLRk6/Mqf27wQaYoOEjiaDGXOoEx3tmwwlaxGlHLhUBeg3kEaVYn /hV61uFU= X-Gm-Gg: ATEYQzzdQ5kRf6aOJDPDAqNr+cECJrU4Q65Tn9+VVyeY/6ASC59MXsDZifVcaIRLdWc DTnSbE58/MORYkuuIQpYiOkMrgd0hdokVsnPFk+3RLbjrPpqs0s6sXS9anMqNi7zeqYqAs9/4QB KpHSIVeE+Hkt5fIpgG8tjjg3QOK7rxB7lyzbbbpcBupKM3sAavuicKJ0ECqYVD4/fMTXOwrf2or Ujw4SGc9dufNhXOSo+lLNtx7fa/KeR7rtxM+nQPlklWFdni3Kms/dxdEDwnqmo6FyxFEbEa0Ybu XR+DxZqPsiEyu/04fJ0ngqsMzxHz261hUcDvhkFjqonSml1HWpjZQnXYbBWSoNdKdYFuh8MDxhk 7X/Eh+8eHcepGUdQx1+/0RPEnZPLUAzLQcLaArkn2PjNa/9p6FOukH7kHlgHVGyzxRP/B5nVNmy q4+AwcZKfbInYIjnJ8qUaRRw2HoRdG7GE7l9X6ZGstDtSToBBJb1MrZ4WRrw90mhfANbt0Bh7s X-Received: by 2002:a05:600c:64ce:b0:485:3ca4:4ef4 with SMTP id 5b1f17b1804b1-4853ca451d9mr47071325e9.9.1773071874580; Mon, 09 Mar 2026 08:57:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 49/49] hw/misc/riscv_cpc: Free CPU array in instance_finalize Date: Mon, 9 Mar 2026 16:52:19 +0100 Message-ID: <20260309155219.62400-50-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309155219.62400-1-philmd@linaro.org> References: <20260309155219.62400-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773072051129154100 From: Peter Maydell The TYPE_RISCV_CPC device allocates an array in its instance_init, but does not free this, leading to leaks like this from QOM/QMP introspection: Direct leak of 512 byte in 1 object allocated from: #0 in calloc #1 in g_malloc0 #2 in riscv_cpc_init /home/pm215/qemu/build/san/../../hw/misc/riscv_cp= c.c:175:15 #3 in object_initialize_with_type /home/pm215/qemu/build/san/../../qom= /object.c:570:5 #4 in object_new_with_type /home/pm215/qemu/build/san/../../qom/object= .c:774:5 #5 in qmp_device_list_properties /home/pm215/qemu/build/san/../../qom/= qom-qmp-cmds.c:206:11 #6 in qdev_device_help /home/pm215/qemu/build/san/../../system/qdev-mo= nitor.c:313:17 #7 in hmp_device_add /home/pm215/qemu/build/san/../../system/qdev-moni= tor.c:1005:9 Free the array in instance_finalize. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260309095328.1406779-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/riscv_cpc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/misc/riscv_cpc.c b/hw/misc/riscv_cpc.c index 231a419062f..4bf2fd8db16 100644 --- a/hw/misc/riscv_cpc.c +++ b/hw/misc/riscv_cpc.c @@ -185,6 +185,13 @@ static void riscv_cpc_init(Object *obj) } } =20 +static void riscv_cpc_finalize(Object *obj) +{ + RISCVCPCState *s =3D RISCV_CPC(obj); + + g_free(s->cpus); +} + static void riscv_cpc_realize(DeviceState *dev, Error **errp) { RISCVCPCState *s =3D RISCV_CPC(dev); @@ -254,6 +261,7 @@ static const TypeInfo riscv_cpc_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(RISCVCPCState), .instance_init =3D riscv_cpc_init, + .instance_finalize =3D riscv_cpc_finalize, .class_init =3D riscv_cpc_class_init, }; =20 --=20 2.53.0