Skip to contentSkip to conversation

Misc patches for 2026-04-07

PATCH Applied Philippe Mathieu-Daudé 3 participants 11 messages Apr 8 – Apr 9

lore
Share & tools
lore
#0 lore raw

cover Misc patches for 2026-04-07

The following changes since commit b6a7d06213e5d2f7d124d16418bc289c4a8a4b82:

Update version for v11.0.0-rc2 release (2026-04-01 20:48:02 +0100)

are available in the Git repository at:

https://github.com/philmd/qemu.git tags/hw-misc-20260407

for you to fetch changes up to 992e01e838733c8063f8a17e92034c5f35e34963:

ati-vga: Do not crash on 24 bits per pixel (2026-04-07 22:40:29 +0200)

----------------------------------------------------------------
Misc HW patches

Few fixes, mostly for VGA display models.
----------------------------------------------------------------

BALATON Zoltan (4):
cirrus-vga: Make frame buffer endianness little endian by default
ati-vga: Fix setting CRTC_OFFSET
ati-vga: Update mode on CRTC_PITCH change
ati-vga: Do not crash on 24 bits per pixel

GuoHan Zhao (1):
hw/arm/omap_sx1: map CS3 at the correct base

Philippe Mathieu-Daudé (1):
docs/about/removed-features: Replace 'since' -> 'removed in'

 docs/about/removed-features.rst | 32 +++++++++++++-------------
 hw/arm/omap_sx1.c               |  2 +-
 hw/display/ati.c                | 40 ++++++++++++++++++---------------
 hw/display/ati_2d.c             |  9 ++++++++
 hw/display/cirrus_vga.c         |  2 ++
 5 files changed, 50 insertions(+), 35 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH 1/6 docs/about/removed-features: Replace 'since' -> 'removed in'

We use "deprecated since ..." and "removed in ...". Replace "since" by "removed in" for removed features.

Fixes 762c8554394 ("vfio: Remove 'vfio-platform'")
Fixes aeb1a50d4a7 ("vfio: Remove 'vfio-amd-xgbe' device")
Fixes e50a021a451 ("hw/arm: Remove ast2700a0-evb machine")
Fixes 4af2433a81b ("docs: Mention 32-bit PPC host as removed")
Fixes 8ebc416ac17 ("vfio: Remove 'vfio-calxeda-xgmac' device")
Fixes a80151c9da1 ("hw/sd/sdcard: Remove support for spec v1.10")
Fixes 269ffaabc84 ("buildsys: Remove support for 32-bit MIPS hosts")
Fixes fc37c122fff ("migration: Drop deprecated QMP migrate argument @detach")

Message-Id: <[email protected]>

---
 docs/about/removed-features.rst | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
docs/about/removed-features.rst +16 -16
index 557a24679a1..e75db084108 100644
@@ -782,8 +782,8 @@ without reporting any destination threads, or non-multifd source
 threads).  For debugging purpose, please use ``-name
 $VM,debug-threads=on`` instead.
 
-``migrate`` argument ``detach`` (since 11.0)
-''''''''''''''''''''''''''''''''''''''''''''
+``migrate`` argument ``detach`` (removed in 11.0)
+''''''''''''''''''''''''''''''''''''''''''''''''''
 
 This argument has always been ignored.
 
@@ -932,14 +932,14 @@ work around the atomicity issues in system mode by running all vCPUs
 in a single thread context; in user mode atomicity was simply broken.
 From 10.0, QEMU has disabled configuration of 64-bit guests on 32-bit hosts.
 
-32-bit MIPS (since 10.2)
-''''''''''''''''''''''''
+32-bit MIPS (removed in 10.2)
+'''''''''''''''''''''''''''''
 
 Debian 12 "Bookworm" removed support for 32-bit MIPS, making it hard to
 maintain our cross-compilation CI tests of the architecture.
 
-32-bit PPC (since 10.2)
-'''''''''''''''''''''''
+32-bit PPC (removed in 10.2)
+''''''''''''''''''''''''''''
 
 The QEMU project no longer supports 32-bit host builds.
 
@@ -1172,8 +1172,8 @@ Mips ``mipssim`` machine (removed in 10.2)
 Linux dropped support for this virtual machine type in kernel v3.7, and
 there was also no binary available online to use with that board.
 
-Arm ``ast2700a0-evb`` machine (since 11.0)
-''''''''''''''''''''''''''''''''''''''''''
+Arm ``ast2700a0-evb`` machine (removed in 11.0)
+'''''''''''''''''''''''''''''''''''''''''''''''
 
 The ``ast2700a0-evb`` machine represents the first revision of the AST2700
 and serves as the initial engineering sample rather than a production version.
@@ -1290,8 +1290,8 @@ by using ``-machine graphics=off``.
 
 The 'pvrdma' device and the whole RDMA subsystem have been removed.
 
-``-device sd-card,spec_version=1`` (since 10.2)
-'''''''''''''''''''''''''''''''''''''''''''''''
+``-device sd-card,spec_version=1`` (removed in 10.2)
+''''''''''''''''''''''''''''''''''''''''''''''''''''
 
 SD physical layer specification v2.00 supersedes the v1.10 one.
 
@@ -1396,21 +1396,21 @@ device driver such as RBD.
 VFIO devices
 ------------
 
-``-device vfio-calxeda-xgmac`` (since 10.2)
-'''''''''''''''''''''''''''''''''''''''''''
+``-device vfio-calxeda-xgmac`` (removed in 10.2)
+''''''''''''''''''''''''''''''''''''''''''''''''
 The vfio-calxeda-xgmac device allows to assign a host Calxeda Highbank
 10Gb XGMAC Ethernet controller device ("calxeda,hb-xgmac" compatibility
 string) to a guest. Calxeda HW has been ewasted now and there is no point
 keeping that device.
 
-``-device vfio-amd-xgbe`` (since 10.2)
-''''''''''''''''''''''''''''''''''''''
+``-device vfio-amd-xgbe`` (removed in 10.2)
+'''''''''''''''''''''''''''''''''''''''''''
 The vfio-amd-xgbe device allows to assign a host AMD 10GbE controller
 to a guest ("amd,xgbe-seattle-v1a" compatibility string). AMD "Seattle"
 is not supported anymore and there is no point keeping that device.
 
-``-device vfio-platform`` (since 10.2)
-''''''''''''''''''''''''''''''''''''''
+``-device vfio-platform`` (removed in 10.2)
+'''''''''''''''''''''''''''''''''''''''''''
 The vfio-platform device allows to assign a host platform device
 to a guest in a generic manner. Integrating a new device into
 the vfio-platform infrastructure requires some adaptation at
Signature · 1 line
2.53.0
#2 lore raw

PATCH 2/6 cirrus-vga: Make frame buffer endianness little endian by default

In reply to Philippe Mathieu-Daudé

From: BALATON Zoltan <[email protected]>

QEMU VGA defaults to target endianness but real Cirrus VGA is little endian so set it explicitly in cirrus_init_common() to fix it on big endian machines.

Message-ID: <[email protected]>

---
 hw/display/cirrus_vga.c | 2 ++
 1 file changed, 2 insertions(+)
hw/display/cirrus_vga.c +2 -0
index 629b34fc68d..48be3c8a932 100644
@@ -2930,6 +2930,8 @@ void cirrus_init_common(CirrusVGAState *s, Object *owner,
     s->vga.cursor_invalidate = cirrus_cursor_invalidate;
     s->vga.cursor_draw_line = cirrus_cursor_draw_line;
 
+    s->vga.big_endian_fb = false;
+
     qemu_register_reset(cirrus_reset, s);
 }
 
Signature · 1 line
2.53.0
#3 lore raw

PATCH 3/6 hw/arm/omap_sx1: map CS3 at the correct base

In reply to Philippe Mathieu-Daudé

From: GuoHan Zhao <[email protected]>

omap_sx1 wires the "sx1.cs3" region to OMAP_CS2_BASE instead of OMAP_CS3_BASE.

That places both CS2 and CS3 at the same address and leaves the real CS3 window unmapped. Point the CS3 region at OMAP_CS3_BASE so the static chip-select layout matches the OMAP address definitions.

Fixes ba1580299d0 ("omap_sx1: convert to memory API")

Message-ID: <[email protected]>

---
 hw/arm/omap_sx1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/omap_sx1.c +1 -1
index d858dab3253..bcb7105323f 100644
@@ -146,7 +146,7 @@ static void sx1_init(MachineState *machine, const int version)
     memory_region_init_io(&cs[3], NULL, &static_ops, &cs3val,
                           "sx1.cs3", OMAP_CS3_SIZE);
     memory_region_add_subregion(address_space,
-                                OMAP_CS2_BASE, &cs[3]);
+                                OMAP_CS3_BASE, &cs[3]);
 
     fl_idx = 0;
     if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
Signature · 1 line
2.53.0
#4 lore raw

PATCH 4/6 ati-vga: Fix setting CRTC_OFFSET

In reply to Philippe Mathieu-Daudé

From: BALATON Zoltan <[email protected]>

Offset (display start address) should also be updated when changing the register value not only on mode change. Fix the register write mask to hard code bits 0:2 to 0 as the chip docs say and update the start address on register write. This fixes virtual screen panning for screens larger than displayed resolution.

As this register allows values that cannot be handled by the VBE_DISPI X and Y offsets (which is restricted by line length) we add a function to set it directly not through the VBE offsets.

Message-ID: <2b8af6022aba06aa98a249ae67922de29d82d86f.1775228029.git.balaton@eik.bme.hu>

---
 hw/display/ati.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
hw/display/ati.c +17 -17
index 97d871b1e22..a283afbfff5 100644
@@ -48,6 +48,19 @@ static const struct {
 
 enum { VGA_MODE, EXT_MODE };
 
+static void ati_vga_set_offset(VGACommonState *vga, uint32_t offs)
+{
+    int bypp = DIV_ROUND_UP(vga->vbe_regs[VBE_DISPI_INDEX_BPP], BITS_PER_BYTE);
+
+    if (!bypp ||
+        vga->vbe_regs[VBE_DISPI_INDEX_YRES] *
+        vga->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] * bypp + offs >
+        vga->vbe_size) {
+        return;
+    }
+    vga->vbe_start_addr = offs / 4;
+}
+
 static void ati_vga_switch_mode(ATIVGAState *s)
 {
     DPRINTF("%d -> %d\n",
@@ -109,26 +122,12 @@ static void ati_vga_switch_mode(ATIVGAState *s)
             vbe_ioport_write_data(&s->vga, 0, VBE_DISPI_ENABLED |
                 VBE_DISPI_LFB_ENABLED | VBE_DISPI_NOCLEARMEM |
                 (s->regs.dac_cntl & DAC_8BIT_EN ? VBE_DISPI_8BIT_DAC : 0));
-            /* now set offset and stride after enable as that resets these */
+            /* now set offset and stride because enable resets these */
             if (stride) {
-                int bypp = DIV_ROUND_UP(bpp, BITS_PER_BYTE);
-
                 vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_VIRT_WIDTH);
                 vbe_ioport_write_data(&s->vga, 0, stride);
-                stride *= bypp;
-                if (offs % stride) {
-                    DPRINTF("CRTC offset is not multiple of pitch\n");
-                    vbe_ioport_write_index(&s->vga, 0,
-                                           VBE_DISPI_INDEX_X_OFFSET);
-                    vbe_ioport_write_data(&s->vga, 0, offs % stride / bypp);
-                }
-                vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_Y_OFFSET);
-                vbe_ioport_write_data(&s->vga, 0, offs / stride);
-                DPRINTF("VBE offset (%d,%d), vbe_start_addr=%x\n",
-                        s->vga.vbe_regs[VBE_DISPI_INDEX_X_OFFSET],
-                        s->vga.vbe_regs[VBE_DISPI_INDEX_Y_OFFSET],
-                        s->vga.vbe_start_addr);
             }
+            ati_vga_set_offset(&s->vga, offs);
         }
     } else {
         /* VGA mode enabled */
@@ -737,7 +736,8 @@ static void ati_mm_write(void *opaque, hwaddr addr,
         s->regs.crtc_v_sync_strt_wid = data & 0x9f0fff;
         break;
     case CRTC_OFFSET:
-        s->regs.crtc_offset = data & 0xc7ffffff;
+        s->regs.crtc_offset = data & 0x87fffff8;
+        ati_vga_set_offset(&s->vga, s->regs.crtc_offset & 0x07ffffff);
         break;
     case CRTC_OFFSET_CNTL:
         s->regs.crtc_offset_cntl = data; /* FIXME */
Signature · 1 line
2.53.0
#5 lore raw

PATCH 5/6 ati-vga: Update mode on CRTC_PITCH change

In reply to Philippe Mathieu-Daudé

From: BALATON Zoltan <[email protected]>

When changing line length we need to update display parameters so call mode change when changing CRTC_PITCH if the value has changed.

Message-ID: <3f54ff54a873a8f8a0cc5f14660703b4025a69e2.1775228029.git.balaton@eik.bme.hu>

---
 hw/display/ati.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
hw/display/ati.c +5 -1
index a283afbfff5..7bb57c44d95 100644
@@ -743,7 +743,11 @@ static void ati_mm_write(void *opaque, hwaddr addr,
         s->regs.crtc_offset_cntl = data; /* FIXME */
         break;
     case CRTC_PITCH:
-        s->regs.crtc_pitch = data & 0x07ff07ff;
+        data &= 0x07ff07ff;
+        if (s->regs.crtc_pitch != data) {
+            s->regs.crtc_pitch = data;
+            ati_vga_switch_mode(s);
+        }
         break;
     case 0xf00 ... 0xfff:
         /* read-only copy of PCI config space so ignore writes */
Signature · 1 line
2.53.0
#6 lore raw

PATCH 6/6 ati-vga: Do not crash on 24 bits per pixel

In reply to Philippe Mathieu-Daudé

From: BALATON Zoltan <[email protected]>

The stn_he_p function only supports power of two sizes so it will assert if we call it with size 3 that happens with 24 bits per pixel. It's not clear from the documentation if this should be supported or not and drivers tested so far don't use it so refuse the parameters that would crash QEMU for now.

Message-ID: <[email protected]>

---
 hw/display/ati_2d.c | 9 +++++++++
 1 file changed, 9 insertions(+)
hw/display/ati_2d.c +9 -0
index 9baf6ff37b0..f0f77cecc65 100644
@@ -265,6 +265,10 @@ static bool ati_2d_do_blt(ATI2DCtx *ctx, uint8_t use_pixman)
     {
         uint32_t filler = 0;
 
+        if (ctx->bpp == 24) {
+            qemu_log_mask(LOG_UNIMP, "Fill blt unsupported in 24 bits\n");
+            return false;
+        }
         switch (ctx->rop3) {
         case ROP3_PATCOPY:
             filler = make_filler(ctx->bpp, ctx->frgd_clr);
@@ -362,6 +366,11 @@ bool ati_host_data_flush(ATIVGAState *s)
 
     setup_2d_blt_ctx(s, &ctx);
 
+    if (ctx.bpp == 24) {
+        qemu_log_mask(LOG_UNIMP,
+                      "host_data_blt: unsupported in 24 bits mode\n");
+        return false;
+    }
     if (!ctx.left_to_right || !ctx.top_to_bottom) {
         qemu_log_mask(LOG_UNIMP,
                       "host_data_blt: unsupported blit direction %c%c\n",
Signature · 1 line
2.53.0
#7 lore raw
In reply to Philippe Mathieu-Daudé

Cc'ing Peter directly due to mailing-list issues.

Quoted 37 lines · Philippe Mathieu-Daudé

The following changes since commit b6a7d06213e5d2f7d124d16418bc289c4a8a4b82:

   Update version for v11.0.0-rc2 release (2026-04-01 20:48:02 +0100)

are available in the Git repository at:

   https://github.com/philmd/qemu.git tags/hw-misc-20260407

for you to fetch changes up to 992e01e838733c8063f8a17e92034c5f35e34963:

   ati-vga: Do not crash on 24 bits per pixel (2026-04-07 22:40:29 +0200)

----------------------------------------------------------------
Misc HW patches

Few fixes, mostly for VGA display models.
----------------------------------------------------------------

BALATON Zoltan (4):
cirrus-vga: Make frame buffer endianness little endian by default
ati-vga: Fix setting CRTC_OFFSET
ati-vga: Update mode on CRTC_PITCH change
ati-vga: Do not crash on 24 bits per pixel

GuoHan Zhao (1):
hw/arm/omap_sx1: map CS3 at the correct base

Philippe Mathieu-Daudé (1):

   docs/about/removed-features: Replace 'since' -> 'removed in'
  docs/about/removed-features.rst | 32 +++++++++++++-------------
  hw/arm/omap_sx1.c               |  2 +-
  hw/display/ati.c                | 40 ++++++++++++++++++---------------
  hw/display/ati_2d.c             |  9 ++++++++
  hw/display/cirrus_vga.c         |  2 ++
  5 files changed, 50 insertions(+), 35 deletions(-)
#8 lore raw
Quoted 1 line · Philippe Mathieu-Daudé

Cc'ing Peter directly due to mailing-list issues.

Thanks a lot for taking care of these. I think you meant to send PULL instead of PATCH. Here's one more:
https://patchew.org/QEMU/[email protected]/
the v1 of which had a review by Marc-André that might stand for v2 too as that makes the check even mode strict.

Regards,
BALATON Zoltan

Quoted 41 lines · Philippe Mathieu-Daudé
Quoted 37 lines

The following changes since commit b6a7d06213e5d2f7d124d16418bc289c4a8a4b82:

   Update version for v11.0.0-rc2 release (2026-04-01 20:48:02 +0100)

are available in the Git repository at:

   https://github.com/philmd/qemu.git tags/hw-misc-20260407

for you to fetch changes up to 992e01e838733c8063f8a17e92034c5f35e34963:

   ati-vga: Do not crash on 24 bits per pixel (2026-04-07 22:40:29 +0200)

----------------------------------------------------------------
Misc HW patches

Few fixes, mostly for VGA display models.
----------------------------------------------------------------

BALATON Zoltan (4):
cirrus-vga: Make frame buffer endianness little endian by default
ati-vga: Fix setting CRTC_OFFSET
ati-vga: Update mode on CRTC_PITCH change
ati-vga: Do not crash on 24 bits per pixel

GuoHan Zhao (1):
hw/arm/omap_sx1: map CS3 at the correct base

Philippe Mathieu-Daudé (1):

   docs/about/removed-features: Replace 'since' -> 'removed in'
  docs/about/removed-features.rst | 32 +++++++++++++-------------
  hw/arm/omap_sx1.c               |  2 +-
  hw/display/ati.c                | 40 ++++++++++++++++++---------------
  hw/display/ati_2d.c             |  9 ++++++++
  hw/display/cirrus_vga.c         |  2 ++
  5 files changed, 50 insertions(+), 35 deletions(-)
#9 lore raw
Quoted 6 lines · BALATON Zoltan
Quoted 1 line · Philippe Mathieu-Daudé

Cc'ing Peter directly due to mailing-list issues.

Thanks a lot for taking care of these. I think you meant to send PULL instead of PATCH. Here's one more:
https://patchew.org/QEMU/[email protected]/
the v1 of which had a review by Marc-André that might stand for v2 too as that makes the check even mode strict.

And this one seems to have been missed:
https://patchew.org/QEMU/[email protected]/
I'd need this in 11.0 too.

Regards,
BALATON Zoltan

Quoted 41 lines
Quoted 40 lines · Philippe Mathieu-Daudé
Quoted 37 lines

The following changes since commit b6a7d06213e5d2f7d124d16418bc289c4a8a4b82:

   Update version for v11.0.0-rc2 release (2026-04-01 20:48:02 +0100)

are available in the Git repository at:

   https://github.com/philmd/qemu.git tags/hw-misc-20260407

for you to fetch changes up to 992e01e838733c8063f8a17e92034c5f35e34963:

   ati-vga: Do not crash on 24 bits per pixel (2026-04-07 22:40:29 +0200)

----------------------------------------------------------------
Misc HW patches

Few fixes, mostly for VGA display models.
----------------------------------------------------------------

BALATON Zoltan (4):
cirrus-vga: Make frame buffer endianness little endian by default
ati-vga: Fix setting CRTC_OFFSET
ati-vga: Update mode on CRTC_PITCH change
ati-vga: Do not crash on 24 bits per pixel

GuoHan Zhao (1):
hw/arm/omap_sx1: map CS3 at the correct base

Philippe Mathieu-Daudé (1):

   docs/about/removed-features: Replace 'since' -> 'removed in'
  docs/about/removed-features.rst | 32 +++++++++++++-------------
  hw/arm/omap_sx1.c               |  2 +-
  hw/display/ati.c                | 40 ++++++++++++++++++---------------
  hw/display/ati_2d.c             |  9 ++++++++
  hw/display/cirrus_vga.c         |  2 ++
  5 files changed, 50 insertions(+), 35 deletions(-)
#10 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 11 lines · Philippe Mathieu-Daudé

The following changes since commit b6a7d06213e5d2f7d124d16418bc289c4a8a4b82:

Update version for v11.0.0-rc2 release (2026-04-01 20:48:02 +0100)

are available in the Git repository at:

https://github.com/philmd/qemu.git tags/hw-misc-20260407

for you to fetch changes up to 992e01e838733c8063f8a17e92034c5f35e34963:

Quoted 7 lines

ati-vga: Do not crash on 24 bits per pixel (2026-04-07 22:40:29 +0200)

----------------------------------------------------------------
Misc HW patches

Few fixes, mostly for VGA display models.
----------------------------------------------------------------

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.0
for any user-visible changes.

-- PMM