From 04c52c7c18633bdf63e00d0b0cc533e182860190 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 6 Mar 2024 06:44:32 -0500 Subject: [PATCH] New release qemu 8.2.2 Signed-off-by: Cole Robinson --- ...ke-s-mem_region_alignment-be-64-bits.patch | 43 ----- ....h-fix-qemu_rect_init-mis-assignment.patch | 36 ---- ...-not-re-compute-new-pc-with-CF_PCREL.patch | 167 ------------------ qemu.spec | 19 +- sources | 4 +- 5 files changed, 7 insertions(+), 262 deletions(-) delete mode 100644 0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch delete mode 100644 0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch delete mode 100644 0001-target-i386-do-not-re-compute-new-pc-with-CF_PCREL.patch diff --git a/0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch b/0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch deleted file mode 100644 index 05c6f18..0000000 --- a/0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 500f3a81652dcefa79a4864c1f3fa6747c16952e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 29 Jan 2024 18:20:46 +0000 -Subject: [PATCH] block/blkio: Make s->mem_region_alignment be 64 bits -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 14 the code failed to compile on i686 (and was wrong for any -version of GCC): - -../block/blkio.c: In function ‘blkio_file_open’: -../block/blkio.c:857:28: error: passing argument 3 of ‘blkio_get_uint64’ from incompatible pointer type [-Wincompatible-pointer-types] - 857 | &s->mem_region_alignment); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - | | - | size_t * {aka unsigned int *} -In file included from ../block/blkio.c:12: -/usr/include/blkio.h:49:67: note: expected ‘uint64_t *’ {aka ‘long long unsigned int *’} but argument is of type ‘size_t *’ {aka ‘unsigned int *’} - 49 | int blkio_get_uint64(struct blkio *b, const char *name, uint64_t *value); - | ~~~~~~~~~~^~~~~ - -Signed-off-by: Richard W.M. Jones ---- - block/blkio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/block/blkio.c b/block/blkio.c -index 0a0a6c0f5fd..bc2f21784c7 100644 ---- a/block/blkio.c -+++ b/block/blkio.c -@@ -68,7 +68,7 @@ typedef struct { - CoQueue bounce_available; - - /* The value of the "mem-region-alignment" property */ -- size_t mem_region_alignment; -+ uint64_t mem_region_alignment; - - /* Can we skip adding/deleting blkio_mem_regions? */ - bool needs_mem_regions; --- -2.43.0 - diff --git a/0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch b/0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch deleted file mode 100644 index 9ca46b6..0000000 --- a/0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9d5b42beb6978dc6219d5dc029c9d453c6b8d503 Mon Sep 17 00:00:00 2001 -From: Elen Avan -Date: Fri, 22 Dec 2023 22:17:21 +0300 -Subject: [PATCH] include/ui/rect.h: fix qemu_rect_init() mis-assignment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Elen Avan -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2051 -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2050 -Fixes: a200d53b1fde "virtio-gpu: replace PIXMAN for region/rect test" -Cc: qemu-stable@nongnu.org -Reviewed-by: Michael Tokarev -Reviewed-by: Marc-André Lureau -Signed-off-by: Michael Tokarev ---- - include/ui/rect.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/ui/rect.h b/include/ui/rect.h -index 94898f92d0..68f05d78a8 100644 ---- a/include/ui/rect.h -+++ b/include/ui/rect.h -@@ -19,7 +19,7 @@ static inline void qemu_rect_init(QemuRect *rect, - uint16_t width, uint16_t height) - { - rect->x = x; -- rect->y = x; -+ rect->y = y; - rect->width = width; - rect->height = height; - } --- -2.43.0 - diff --git a/0001-target-i386-do-not-re-compute-new-pc-with-CF_PCREL.patch b/0001-target-i386-do-not-re-compute-new-pc-with-CF_PCREL.patch deleted file mode 100644 index 2b4cc98..0000000 --- a/0001-target-i386-do-not-re-compute-new-pc-with-CF_PCREL.patch +++ /dev/null @@ -1,167 +0,0 @@ -From nobody Fri Jan 12 11:43:01 2024 -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=1704150435; cv=none; - d=zohomail.com; s=zohoarc; - b=WuuXzKFWal2lWtDkRW1hyD3JeOc+SWN52QHBHapuNgK1+I2+cPYMj5+cN4Zjw5A7mvf00GT1vtuKEVQlfbQSdQAabRvUm1IApyvu/IScVt/y4bgJZtJkcM5aIIBT037PWrprtRBiC9NpSYfZNMYJYHp5uvh2KAr4S98QWMlhafM= -ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; - s=zohoarc; - t=1704150435; - h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; - bh=Fc7w6qm1lcKkOSX/aWlQDZG20+2gOdT5iAy2c8bZOd8=; - b=QMgOfOfOQAWcCWBO+IO/NBDK5btCFlibal5JOy2X4uS9kOBwvViipo6SvZjrO2SptH2Bi+pLPhRpPU1O+ubVU7cY0GoFzzM0Wawd0XkZ9kzDzY/fvhog49o5nYI6cX46rt18qOXLWvvY702wGVdiMHoKrhRrIaJJE75z3jI9Bj4= -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 1704150435302898.4215703047593; - Mon, 1 Jan 2024 15:07:15 -0800 (PST) -Received: from localhost ([::1] helo=lists1p.gnu.org) - by lists.gnu.org with esmtp (Exim 4.90_1) - (envelope-from ) - id 1rKRMd-0001OI-9C; Mon, 01 Jan 2024 18:06:31 -0500 -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 1rKRMa-0001NR-Rr - for qemu-devel@nongnu.org; Mon, 01 Jan 2024 18:06:28 -0500 -Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) - by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) - (Exim 4.90_1) (envelope-from ) - id 1rKRMZ-0000Uc-9F - for qemu-devel@nongnu.org; Mon, 01 Jan 2024 18:06:28 -0500 -Received: by mail-pg1-x52f.google.com with SMTP id - 41be03b00d2f7-53fbf2c42bfso6436343a12.3 - for ; Mon, 01 Jan 2024 15:06:26 -0800 (PST) -Received: from stoup.. (124-149-254-207.tpgi.com.au. [124.149.254.207]) - by smtp.gmail.com with ESMTPSA id - h12-20020a63df4c000000b005bd2b3a03eesm19672386pgj.6.2024.01.01.15.06.21 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Mon, 01 Jan 2024 15:06:24 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=linaro.org; s=google; t=1704150385; x=1704755185; darn=nongnu.org; - h=content-transfer-encoding:mime-version:message-id:date:subject:cc - :to:from:from:to:cc:subject:date:message-id:reply-to; - bh=Fc7w6qm1lcKkOSX/aWlQDZG20+2gOdT5iAy2c8bZOd8=; - b=dNkcO41+f8tEqtfO4CNEK3dzzuYmU72bWdyd57epmAhewzLeLt7RHz7f8a67QcEMtj - ogk6TnzY9C5YB3hC95BjYoWhfUSIRC+4LS6Z0RwjdR/VKwliPovopIgOnnCJgr11M6gq - x0Oo7AV6+ydX2/CJ/vi7CdysfcZZNdnlX5DkwVtTI296PMIfJhRN/SIHiqDfABCFrw8B - Nf+VpbYc91syKadTGBPzmOtamcAqx3MD7ndkVEI1eFkiejeGu9jawdqrAxz+jrFJJMby - 3/j4e+hqiQjlRVHVrpiQEM6ip7BsHqaMXlc6glQyIRph/u6yRDewnRTojoIGcUN84nFm - mbCg== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20230601; t=1704150385; x=1704755185; - h=content-transfer-encoding:mime-version:message-id:date:subject:cc - :to:from:x-gm-message-state:from:to:cc:subject:date:message-id - :reply-to; - bh=Fc7w6qm1lcKkOSX/aWlQDZG20+2gOdT5iAy2c8bZOd8=; - b=hZafAFg/VkyIycwdF4otV76XBU2LSrOJf6IQXXrHMfYC6VpDcmh6U6unnnNrhV1rJc - Frk0If2lK+nqHlo6ygJZVRdtRCln267V28VDpSD/lTZPO9vgZZYtmILeAjt4/L6mtPUf - 43iW7kR8zjBT8Uf80ld5qRodyuJS5bo86Asuzg/WgRfMGqBs9Im+w+MqwqKrTxSjPAvs - Psix/WKTNvKR6XHuyVDA17fTVJiGIsDUQp1InHF1ExsF2gG4wPI3hVMjTj+F2hs0SeY6 - Ivqs1RMAKbe9i581Wo6tIM2Jw/MHxL8fKN1SVC7klk4HpF516HBS8u/gQQE9vunYup05 - ccyQ== -X-Gm-Message-State: AOJu0Yy5sdlKUW0PNOmXX9aF7N5+gfVMCk21pUVv8dRCuvQamjzIYvYj - bSbNjV179B0oOyVl1t2lm1MwjDSpugfXsoz2rrpo8m8NOcc= -X-Google-Smtp-Source: - AGHT+IEE8RrF8uJO+68mSKODXu7giWx4EOgGGw+lT4v5lrdoFoZHlM0SU92PKHZ7B7CK5Dh1q82oRg== -X-Received: by 2002:a05:6a20:111f:b0:194:9578:9ba8 with SMTP id - x31-20020a056a20111f00b0019495789ba8mr14471419pze.16.1704150384447; - Mon, 01 Jan 2024 15:06:24 -0800 (PST) -From: Richard Henderson -To: qemu-devel@nongnu.org -Cc: pbonzini@redhat.com, qemu-stable@nongnu.org, - Michael Tokarev -Subject: [PATCH] target/i386: Do not re-compute new pc with CF_PCREL -Date: Tue, 2 Jan 2024 10:06:17 +1100 -Message-Id: <20240101230617.129349-1-richard.henderson@linaro.org> -X-Mailer: git-send-email 2.34.1 -MIME-Version: 1.0 -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=2607:f8b0:4864:20::52f; - envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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, - T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no -X-Spam_action: no action -X-BeenThere: qemu-devel@nongnu.org -X-Mailman-Version: 2.1.29 -Precedence: list -List-Id: -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org -Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org -X-ZohoMail-DKIM: pass (identity @linaro.org) -X-ZM-MESSAGEID: 1704150436325100001 -Content-Type: text/plain; charset="utf-8" - -With PCREL, we have a page-relative view of EIP, and an -approximation of PC =3D EIP+CSBASE that is good enough to -detect page crossings. If we try to recompute PC after -masking EIP, we will mess up that approximation and write -a corrupt value to EIP. - -We already handled masking properly for PCREL, so the -fix in b5e0d5d2 was only needed for the !PCREL path. - -Cc: qemu-stable@nongnu.org -Fixes: b5e0d5d22fbf ("target/i386: Fix 32-bit wrapping of pc/eip computatio= -n") -Reported-by: Michael Tokarev -Signed-off-by: Richard Henderson ---- - target/i386/tcg/translate.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c -index 037bc47e7c..e68375b19d 100644 ---- a/target/i386/tcg/translate.c -+++ b/target/i386/tcg/translate.c -@@ -2845,10 +2845,6 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, i= -nt diff, int tb_num) - } - } - new_eip &=3D mask; -- new_pc =3D new_eip + s->cs_base; -- if (!CODE64(s)) { -- new_pc =3D (uint32_t)new_pc; -- } -=20 - gen_update_cc_op(s); - set_cc_op(s, CC_OP_DYNAMIC); -@@ -2864,6 +2860,8 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, in= -t diff, int tb_num) - tcg_gen_andi_tl(cpu_eip, cpu_eip, mask); - use_goto_tb =3D false; - } -+ } else if (!CODE64(s)) { -+ new_pc =3D (uint32_t)(new_eip + s->cs_base); - } -=20 - if (use_goto_tb && translator_use_goto_tb(&s->base, new_pc)) { ---=20 -2.34.1 \ No newline at end of file diff --git a/qemu.spec b/qemu.spec index df42a64..c58042e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -361,11 +361,11 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 9 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 8.2.0 +Version: 8.2.2 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0 @@ -382,18 +382,6 @@ Source2: gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg # https://patchwork.kernel.org/project/qemu-devel/patch/20231128143647.847668-1-crobinso@redhat.com/ Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=2256884 -Patch: 0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch - -# https://gitlab.com/qemu-project/qemu/-/issues/2070 -# https://patchew.org/QEMU/20240101230617.129349-1-richard.henderson@linaro.org -Patch: 0001-target-i386-do-not-re-compute-new-pc-with-CF_PCREL.patch - -# Fix builds on i686. -# Sent upstream 29-01-2024 -Patch: 0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch - # Fix user-emulation of FIFREEZE and FITHAW ioctls # Posted upstream 20-02-2024 # https://lists.nongnu.org/archive/html/qemu-devel/2024-02/msg03971.html @@ -3169,6 +3157,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Mar 06 2024 Cole Robinson - 8.2.2-1 +- New release qemu 8.2.2 + * Mon Feb 26 2024 Richard W.M. Jones - 2:8.2.0-9 - ppc/spapr: Initialize max_cpus limit to SPAPR_IRQ_NR_IPIS (RHBZ#2265982) diff --git a/sources b/sources index ce81ee2..6517d45 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c -SHA512 (qemu-8.2.0.tar.xz.sig) = 05412219ab0ff145f56708f99bc60b378b2b9ef6fbf3c48bffd32a2952188b2ee34a798949b09d6d8fc9f2483094fa0e3b488f52f69508604747ad4e2960f302 +SHA512 (qemu-8.2.2.tar.xz) = dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41 +SHA512 (qemu-8.2.2.tar.xz.sig) = 2a2dac01cc8f1aff8fbc4e6bfd13d7dd80b7bf6505388c04605a76a27aff870e1520d9879a5781508e65d1feb74e8c036d9cd4f21ab1e35fb7a845c2d66476de