7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- hw/net/can/sja1000: fix bug for single acceptance filter and standard frame
- tests/avocado: fix typo in replay_linux
- util/userfaultfd: Remove unused uffd_poll_events
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 185f3887a17ed6f35d67934a8583096de0713168 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Sat, 12 Oct 2024 08:53:40 +0000
|
|
Subject: [PATCH] chardev/baum: Replace magic values by X_MAX / Y_MAX
|
|
definitions mainline inclusion commit
|
|
f63a6e381c48b796c3964accaa88c0d0e229b17f category: bugfix
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---------------------------------------------------------------
|
|
|
|
Replace '84' magic value by the X_MAX definition, and '1' by Y_MAX.
|
|
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Message-id: 20220819153931.3147384-2-peter.maydell@linaro.org
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
chardev/baum.c | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/chardev/baum.c b/chardev/baum.c
|
|
index 79d618e350..6d538808a0 100644
|
|
--- a/chardev/baum.c
|
|
+++ b/chardev/baum.c
|
|
@@ -87,6 +87,9 @@
|
|
|
|
#define BUF_SIZE 256
|
|
|
|
+#define X_MAX 84
|
|
+#define Y_MAX 1
|
|
+
|
|
struct BaumChardev {
|
|
Chardev parent;
|
|
|
|
@@ -244,11 +247,11 @@ static int baum_deferred_init(BaumChardev *baum)
|
|
brlapi_perror("baum: brlapi__getDisplaySize");
|
|
return 0;
|
|
}
|
|
- if (baum->y > 1) {
|
|
- baum->y = 1;
|
|
+ if (baum->y > Y_MAX) {
|
|
+ baum->y = Y_MAX;
|
|
}
|
|
- if (baum->x > 84) {
|
|
- baum->x = 84;
|
|
+ if (baum->x > X_MAX) {
|
|
+ baum->x = X_MAX;
|
|
}
|
|
|
|
con = qemu_console_lookup_by_index(0);
|
|
--
|
|
2.41.0.windows.1
|
|
|