The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:

  Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)

are available in the Git repository at:

  https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request

for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:

  seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)

----------------------------------------------------------------
seabios: update to 1.17.0 release

----------------------------------------------------------------

Gerd Hoffmann (2):
  seabios: update submodule to 1.17.0
  seabios: update binaries to 1.17.0

 pc-bios/bios-256k.bin             | Bin 262144 -> 262144 bytes
 pc-bios/bios-microvm.bin          | Bin 131072 -> 131072 bytes
 pc-bios/bios.bin                  | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-ati.bin           | Bin 39424 -> 39424 bytes
 pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes
 pc-bios/vgabios-cirrus.bin        | Bin 38912 -> 39424 bytes
 pc-bios/vgabios-qxl.bin           | Bin 39424 -> 39424 bytes
 pc-bios/vgabios-ramfb.bin         | Bin 28672 -> 28672 bytes
 pc-bios/vgabios-stdvga.bin        | Bin 39424 -> 39424 bytes
 pc-bios/vgabios-virtio.bin        | Bin 39424 -> 39424 bytes
 pc-bios/vgabios-vmware.bin        | Bin 39424 -> 39424 bytes
 pc-bios/vgabios.bin               | Bin 38912 -> 38912 bytes
 roms/seabios                      |   2 +-
 13 files changed, 1 insertion(+), 1 deletion(-)

-- 
2.49.0

On 11/06/2025 09.50, Gerd Hoffmann wrote:
> The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
> 
>    Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
> 
> for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
> 
>    seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
> 
> ----------------------------------------------------------------
> seabios: update to 1.17.0 release
> 
> ----------------------------------------------------------------
> 
> Gerd Hoffmann (2):
>    seabios: update submodule to 1.17.0
>    seabios: update binaries to 1.17.0

  Hi Gerd, hi Stefan,

I'm now getting this when doing a git pull:

Fetching submodule roms/seabios
fatal: remote error: upload-pack: not our ref 
b52ca86e094d19b58e2304417787e96b940e39c6
Errors during submodule fetch:
	roms/seabios

Looking at 
https://gitlab.com/qemu-project/seabios/-/commits/master?ref_type=HEADS 
there is a problem with the mirroring:

"This project is mirrored from https://review.coreboot.org/seabios. Pull 
mirroring failed 4 months ago.
Repository mirroring has been paused due to too many failed attempts. It can 
be resumed by a project maintainer or owner.
Last successful update 4 months ago. This branch has diverged from upstream. "

Could you please fix this?

  Thanks,
   Thomas

On Wed, Jun 11, 2025 at 2:36 PM Thomas Huth <thuth@redhat.com> wrote:
>
> On 11/06/2025 09.50, Gerd Hoffmann wrote:
> > The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
> >
> >    Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
> >
> > are available in the Git repository at:
> >
> >    https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
> >
> > for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
> >
> >    seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
> >
> > ----------------------------------------------------------------
> > seabios: update to 1.17.0 release
> >
> > ----------------------------------------------------------------
> >
> > Gerd Hoffmann (2):
> >    seabios: update submodule to 1.17.0
> >    seabios: update binaries to 1.17.0
>
>   Hi Gerd, hi Stefan,
>
> I'm now getting this when doing a git pull:
>
> Fetching submodule roms/seabios
> fatal: remote error: upload-pack: not our ref
> b52ca86e094d19b58e2304417787e96b940e39c6
> Errors during submodule fetch:
>         roms/seabios

GitLab CI didn't detect this, probably because the tests don't build
SeaBIOS from source and use the binaries instead. Given infinite CI
resources we should rebuild all ROMs from source to catch problems
like this one.

I wanted to mention this in case anyone wants to tighten up the CI to
catch these issues for SeaBIOS and other ROMs.

> Looking at
> https://gitlab.com/qemu-project/seabios/-/commits/master?ref_type=HEADS
> there is a problem with the mirroring:
>
> "This project is mirrored from https://review.coreboot.org/seabios. Pull
> mirroring failed 4 months ago.
> Repository mirroring has been paused due to too many failed attempts. It can
> be resumed by a project maintainer or owner.
> Last successful update 4 months ago. This branch has diverged from upstream. "
>
> Could you please fix this?

`git clone https://review.coreboot.org/seabios` works on my machine,
but I manually clicked the "update" button and GitLab failed again.

In the GitLab UI there is a button to add a new mirror repo. I thought
maybe we can delete the old repo and add a new one, but the push/pull
direction dropdown list is disabled. Maybe that's because only 1 repo
can be a mirror source for pull, I'm worried that deleting the
existing failed repo will leave us with no way to add a new repo that
supports pull.

Does anyone know how to go about fixing this failed mirror?

Stefan

On 11/06/2025 21.09, Stefan Hajnoczi wrote:
> On Wed, Jun 11, 2025 at 2:36 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 11/06/2025 09.50, Gerd Hoffmann wrote:
>>> The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
>>>
>>>     Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
>>>
>>> are available in the Git repository at:
>>>
>>>     https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
>>>
>>> for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
>>>
>>>     seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
>>>
>>> ----------------------------------------------------------------
>>> seabios: update to 1.17.0 release
>>>
>>> ----------------------------------------------------------------
>>>
>>> Gerd Hoffmann (2):
>>>     seabios: update submodule to 1.17.0
>>>     seabios: update binaries to 1.17.0
>>
>>    Hi Gerd, hi Stefan,
>>
>> I'm now getting this when doing a git pull:
>>
>> Fetching submodule roms/seabios
>> fatal: remote error: upload-pack: not our ref
>> b52ca86e094d19b58e2304417787e96b940e39c6
>> Errors during submodule fetch:
>>          roms/seabios
> 
> GitLab CI didn't detect this, probably because the tests don't build
> SeaBIOS from source and use the binaries instead. Given infinite CI
> resources we should rebuild all ROMs from source to catch problems
> like this one.
> 
> I wanted to mention this in case anyone wants to tighten up the CI to
> catch these issues for SeaBIOS and other ROMs.
> 
>> Looking at
>> https://gitlab.com/qemu-project/seabios/-/commits/master?ref_type=HEADS
>> there is a problem with the mirroring:
>>
>> "This project is mirrored from https://review.coreboot.org/seabios. Pull
>> mirroring failed 4 months ago.
>> Repository mirroring has been paused due to too many failed attempts. It can
>> be resumed by a project maintainer or owner.
>> Last successful update 4 months ago. This branch has diverged from upstream. "
>>
>> Could you please fix this?
> 
> `git clone https://review.coreboot.org/seabios` works on my machine,
> but I manually clicked the "update" button and GitLab failed again.
> 
> In the GitLab UI there is a button to add a new mirror repo. I thought
> maybe we can delete the old repo and add a new one, but the push/pull
> direction dropdown list is disabled. Maybe that's because only 1 repo
> can be a mirror source for pull, I'm worried that deleting the
> existing failed repo will leave us with no way to add a new repo that
> supports pull.
> 
> Does anyone know how to go about fixing this failed mirror?

Maybe do a manual push --force to our mirror to sync them again? ... but it 
would be good to know how this could have happened at all - maybe seabios 
force-pushed their master branch at one point in time? Or did we commit 
something to the mirror that was not in the upstream repository?

Anyway, I just noticed that it seems to be working now again - how did you 
fix it?

  Thomas

On Thu, Jun 12, 2025 at 12:36 AM Thomas Huth <thuth@redhat.com> wrote:
>
> On 11/06/2025 21.09, Stefan Hajnoczi wrote:
> > On Wed, Jun 11, 2025 at 2:36 PM Thomas Huth <thuth@redhat.com> wrote:
> >>
> >> On 11/06/2025 09.50, Gerd Hoffmann wrote:
> >>> The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
> >>>
> >>>     Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
> >>>
> >>> are available in the Git repository at:
> >>>
> >>>     https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
> >>>
> >>> for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
> >>>
> >>>     seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
> >>>
> >>> ----------------------------------------------------------------
> >>> seabios: update to 1.17.0 release
> >>>
> >>> ----------------------------------------------------------------
> >>>
> >>> Gerd Hoffmann (2):
> >>>     seabios: update submodule to 1.17.0
> >>>     seabios: update binaries to 1.17.0
> >>
> >>    Hi Gerd, hi Stefan,
> >>
> >> I'm now getting this when doing a git pull:
> >>
> >> Fetching submodule roms/seabios
> >> fatal: remote error: upload-pack: not our ref
> >> b52ca86e094d19b58e2304417787e96b940e39c6
> >> Errors during submodule fetch:
> >>          roms/seabios
> >
> > GitLab CI didn't detect this, probably because the tests don't build
> > SeaBIOS from source and use the binaries instead. Given infinite CI
> > resources we should rebuild all ROMs from source to catch problems
> > like this one.
> >
> > I wanted to mention this in case anyone wants to tighten up the CI to
> > catch these issues for SeaBIOS and other ROMs.
> >
> >> Looking at
> >> https://gitlab.com/qemu-project/seabios/-/commits/master?ref_type=HEADS
> >> there is a problem with the mirroring:
> >>
> >> "This project is mirrored from https://review.coreboot.org/seabios. Pull
> >> mirroring failed 4 months ago.
> >> Repository mirroring has been paused due to too many failed attempts. It can
> >> be resumed by a project maintainer or owner.
> >> Last successful update 4 months ago. This branch has diverged from upstream. "
> >>
> >> Could you please fix this?
> >
> > `git clone https://review.coreboot.org/seabios` works on my machine,
> > but I manually clicked the "update" button and GitLab failed again.
> >
> > In the GitLab UI there is a button to add a new mirror repo. I thought
> > maybe we can delete the old repo and add a new one, but the push/pull
> > direction dropdown list is disabled. Maybe that's because only 1 repo
> > can be a mirror source for pull, I'm worried that deleting the
> > existing failed repo will leave us with no way to add a new repo that
> > supports pull.
> >
> > Does anyone know how to go about fixing this failed mirror?
>
> Maybe do a manual push --force to our mirror to sync them again? ... but it
> would be good to know how this could have happened at all - maybe seabios
> force-pushed their master branch at one point in time? Or did we commit
> something to the mirror that was not in the upstream repository?
>
> Anyway, I just noticed that it seems to be working now again - how did you
> fix it?

I didn't fix it. GitLab's mirror operation is still failing. Your
suggestion of force pushing should fix it, but I want to understand
why a commit was lost first.

The issue is that QEMU's mirror and upstream have diverged. The
following commit is only in QEMU's mirror repo:

commit 44693a974cd90917f81a7d0310df4b592edd7e09
Author: Christopher Lentocha <christopherericlentocha@gmail.com>
Date:   Tue Jan 21 11:59:14 2025 -0500

    Fix AHCI Disk Detection when using EDK2 CSM

It is not possible to fast-forward to upstream's master due to this difference.

Gerd: Do you know what happened to this commit upstream? According to
the mailing list archives you merged it, but I don't see it on the
master branch:
https://patchew.org/Seabios/clqcnplppk34e7eyiquorweq5dvmbsgm2qrk7ozhzybvxviboa@4i2yfqplktar/

Stefan

On 12/06/2025 15.08, Stefan Hajnoczi wrote:
> On Thu, Jun 12, 2025 at 12:36 AM Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 11/06/2025 21.09, Stefan Hajnoczi wrote:
>>> On Wed, Jun 11, 2025 at 2:36 PM Thomas Huth <thuth@redhat.com> wrote:
>>>>
>>>> On 11/06/2025 09.50, Gerd Hoffmann wrote:
>>>>> The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
>>>>>
>>>>>      Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>>      https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
>>>>>
>>>>> for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
>>>>>
>>>>>      seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> seabios: update to 1.17.0 release
>>>>>
>>>>> ----------------------------------------------------------------
>>>>>
>>>>> Gerd Hoffmann (2):
>>>>>      seabios: update submodule to 1.17.0
>>>>>      seabios: update binaries to 1.17.0
>>>>
>>>>     Hi Gerd, hi Stefan,
>>>>
>>>> I'm now getting this when doing a git pull:
>>>>
>>>> Fetching submodule roms/seabios
>>>> fatal: remote error: upload-pack: not our ref
>>>> b52ca86e094d19b58e2304417787e96b940e39c6
>>>> Errors during submodule fetch:
>>>>           roms/seabios
>>>
>>> GitLab CI didn't detect this, probably because the tests don't build
>>> SeaBIOS from source and use the binaries instead. Given infinite CI
>>> resources we should rebuild all ROMs from source to catch problems
>>> like this one.
>>>
>>> I wanted to mention this in case anyone wants to tighten up the CI to
>>> catch these issues for SeaBIOS and other ROMs.
>>>
>>>> Looking at
>>>> https://gitlab.com/qemu-project/seabios/-/commits/master?ref_type=HEADS
>>>> there is a problem with the mirroring:
>>>>
>>>> "This project is mirrored from https://review.coreboot.org/seabios. Pull
>>>> mirroring failed 4 months ago.
>>>> Repository mirroring has been paused due to too many failed attempts. It can
>>>> be resumed by a project maintainer or owner.
>>>> Last successful update 4 months ago. This branch has diverged from upstream. "
>>>>
>>>> Could you please fix this?
>>>
>>> `git clone https://review.coreboot.org/seabios` works on my machine,
>>> but I manually clicked the "update" button and GitLab failed again.
>>>
>>> In the GitLab UI there is a button to add a new mirror repo. I thought
>>> maybe we can delete the old repo and add a new one, but the push/pull
>>> direction dropdown list is disabled. Maybe that's because only 1 repo
>>> can be a mirror source for pull, I'm worried that deleting the
>>> existing failed repo will leave us with no way to add a new repo that
>>> supports pull.
>>>
>>> Does anyone know how to go about fixing this failed mirror?
>>
>> Maybe do a manual push --force to our mirror to sync them again? ... but it
>> would be good to know how this could have happened at all - maybe seabios
>> force-pushed their master branch at one point in time? Or did we commit
>> something to the mirror that was not in the upstream repository?
>>
>> Anyway, I just noticed that it seems to be working now again - how did you
>> fix it?
> 
> I didn't fix it. GitLab's mirror operation is still failing. 

Oh, ok! Maybe the error message only pops up if I pull changes into my local 
master branch, and during my last fetch there were only changes coming in 
for the "origin/staging", and those didn't trigger the error message. 
Anyway, I'll keep my eyes open!

  Thanks,
   Thomas

On Thu, Jun 12, 2025 at 11:05 AM Thomas Huth <thuth@redhat.com> wrote:
>
> On 12/06/2025 15.08, Stefan Hajnoczi wrote:
> > On Thu, Jun 12, 2025 at 12:36 AM Thomas Huth <thuth@redhat.com> wrote:
> >>
> >> On 11/06/2025 21.09, Stefan Hajnoczi wrote:
> >>> On Wed, Jun 11, 2025 at 2:36 PM Thomas Huth <thuth@redhat.com> wrote:
> >>>>
> >>>> On 11/06/2025 09.50, Gerd Hoffmann wrote:
> >>>>> The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
> >>>>>
> >>>>>      Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
> >>>>>
> >>>>> are available in the Git repository at:
> >>>>>
> >>>>>      https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
> >>>>>
> >>>>> for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
> >>>>>
> >>>>>      seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
> >>>>>
> >>>>> ----------------------------------------------------------------
> >>>>> seabios: update to 1.17.0 release
> >>>>>
> >>>>> ----------------------------------------------------------------
> >>>>>
> >>>>> Gerd Hoffmann (2):
> >>>>>      seabios: update submodule to 1.17.0
> >>>>>      seabios: update binaries to 1.17.0
> >>>>
> >>>>     Hi Gerd, hi Stefan,
> >>>>
> >>>> I'm now getting this when doing a git pull:
> >>>>
> >>>> Fetching submodule roms/seabios
> >>>> fatal: remote error: upload-pack: not our ref
> >>>> b52ca86e094d19b58e2304417787e96b940e39c6
> >>>> Errors during submodule fetch:
> >>>>           roms/seabios
> >>>
> >>> GitLab CI didn't detect this, probably because the tests don't build
> >>> SeaBIOS from source and use the binaries instead. Given infinite CI
> >>> resources we should rebuild all ROMs from source to catch problems
> >>> like this one.
> >>>
> >>> I wanted to mention this in case anyone wants to tighten up the CI to
> >>> catch these issues for SeaBIOS and other ROMs.
> >>>
> >>>> Looking at
> >>>> https://gitlab.com/qemu-project/seabios/-/commits/master?ref_type=HEADS
> >>>> there is a problem with the mirroring:
> >>>>
> >>>> "This project is mirrored from https://review.coreboot.org/seabios. Pull
> >>>> mirroring failed 4 months ago.
> >>>> Repository mirroring has been paused due to too many failed attempts. It can
> >>>> be resumed by a project maintainer or owner.
> >>>> Last successful update 4 months ago. This branch has diverged from upstream. "
> >>>>
> >>>> Could you please fix this?
> >>>
> >>> `git clone https://review.coreboot.org/seabios` works on my machine,
> >>> but I manually clicked the "update" button and GitLab failed again.
> >>>
> >>> In the GitLab UI there is a button to add a new mirror repo. I thought
> >>> maybe we can delete the old repo and add a new one, but the push/pull
> >>> direction dropdown list is disabled. Maybe that's because only 1 repo
> >>> can be a mirror source for pull, I'm worried that deleting the
> >>> existing failed repo will leave us with no way to add a new repo that
> >>> supports pull.
> >>>
> >>> Does anyone know how to go about fixing this failed mirror?
> >>
> >> Maybe do a manual push --force to our mirror to sync them again? ... but it
> >> would be good to know how this could have happened at all - maybe seabios
> >> force-pushed their master branch at one point in time? Or did we commit
> >> something to the mirror that was not in the upstream repository?
> >>
> >> Anyway, I just noticed that it seems to be working now again - how did you
> >> fix it?
> >
> > I didn't fix it. GitLab's mirror operation is still failing.
>
> Oh, ok! Maybe the error message only pops up if I pull changes into my local
> master branch, and during my last fetch there were only changes coming in
> for the "origin/staging", and those didn't trigger the error message.
> Anyway, I'll keep my eyes open!

Hi Thomas,
I force pushed upstream SeaBIOS to QEMU's mirror repo and now the
GitLab mirroring feature is operational again.

Thanks for your help getting to the bottom of this!

Stefan

  Hi,

> I didn't fix it. GitLab's mirror operation is still failing. Your
> suggestion of force pushing should fix it, but I want to understand
> why a commit was lost first.
> 
> The issue is that QEMU's mirror and upstream have diverged. The
> following commit is only in QEMU's mirror repo:
> 
> commit 44693a974cd90917f81a7d0310df4b592edd7e09
> Author: Christopher Lentocha <christopherericlentocha@gmail.com>
> Date:   Tue Jan 21 11:59:14 2025 -0500
> 
>     Fix AHCI Disk Detection when using EDK2 CSM
> 
> It is not possible to fast-forward to upstream's master due to this difference.
> 
> Gerd: Do you know what happened to this commit upstream?

Hmm, no idea.  Didn't notice it got lost until now.  Also can't remember
having seen a non-ff update on the seabios master branch when pulling.

Either me or Kevin must have deleted it by accident, or something went
wrong with the coreboot git server (where seabios git repo is hosted).

Guess we must do a forced update once to get them back in sync.

take care,
  Gerd

On Thu, Jun 12, 2025 at 10:16 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
>   Hi,
>
> > I didn't fix it. GitLab's mirror operation is still failing. Your
> > suggestion of force pushing should fix it, but I want to understand
> > why a commit was lost first.
> >
> > The issue is that QEMU's mirror and upstream have diverged. The
> > following commit is only in QEMU's mirror repo:
> >
> > commit 44693a974cd90917f81a7d0310df4b592edd7e09
> > Author: Christopher Lentocha <christopherericlentocha@gmail.com>
> > Date:   Tue Jan 21 11:59:14 2025 -0500
> >
> >     Fix AHCI Disk Detection when using EDK2 CSM
> >
> > It is not possible to fast-forward to upstream's master due to this difference.
> >
> > Gerd: Do you know what happened to this commit upstream?
>
> Hmm, no idea.  Didn't notice it got lost until now.  Also can't remember
> having seen a non-ff update on the seabios master branch when pulling.
>
> Either me or Kevin must have deleted it by accident, or something went
> wrong with the coreboot git server (where seabios git repo is hosted).
>
> Guess we must do a forced update once to get them back in sync.

Do you still want me to go ahead with the SeaBIOS update you posted?

I'm asking because if QEMU drops the commit I mentioned above, then I
guess EDK2 CSM AHCI detection will break. That would be a regression.

Stefan

On Thu, Jun 12, 2025 at 10:33:03AM -0400, Stefan Hajnoczi wrote:
> On Thu, Jun 12, 2025 at 10:16 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> >   Hi,
> >
> > > I didn't fix it. GitLab's mirror operation is still failing. Your
> > > suggestion of force pushing should fix it, but I want to understand
> > > why a commit was lost first.
> > >
> > > The issue is that QEMU's mirror and upstream have diverged. The
> > > following commit is only in QEMU's mirror repo:
> > >
> > > commit 44693a974cd90917f81a7d0310df4b592edd7e09
> > > Author: Christopher Lentocha <christopherericlentocha@gmail.com>
> > > Date:   Tue Jan 21 11:59:14 2025 -0500
> > >
> > >     Fix AHCI Disk Detection when using EDK2 CSM
> > >
> > > It is not possible to fast-forward to upstream's master due to this difference.
> > >
> > > Gerd: Do you know what happened to this commit upstream?
> >
> > Hmm, no idea.  Didn't notice it got lost until now.  Also can't remember
> > having seen a non-ff update on the seabios master branch when pulling.
> >
> > Either me or Kevin must have deleted it by accident, or something went
> > wrong with the coreboot git server (where seabios git repo is hosted).
> >
> > Guess we must do a forced update once to get them back in sync.
> 
> Do you still want me to go ahead with the SeaBIOS update you posted?
> 
> I'm asking because if QEMU drops the commit I mentioned above, then I
> guess EDK2 CSM AHCI detection will break. That would be a regression.

AFAICT it wouldn't be a regression from QEMU's POV.

The original git submodule hash pre-dates this EDK2 CSM commit, and
the new git submodule hash references a history that doesn't include
this EDK2 CSM commit. So nothing in qemu ever referenced this commit.

The only way anyone would have ever used this EDK2 CSM commit is
if they built directly from our mirrored seabios.git, instead of
using our git submodule with roms/Makefile, or the official
upstream seabios.git

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

  Hi,

> > I'm asking because if QEMU drops the commit I mentioned above, then I
> > guess EDK2 CSM AHCI detection will break. That would be a regression.

It was broken before too, so we are "only" missing a fix,
for a rather esoteric use case.

And it could very well be that this fix is not needed any more
given that seabios got a ahci controller reset so possibly things
are working now even without a ahci port reset.

> AFAICT it wouldn't be a regression from QEMU's POV.

Also not when looking at seabios release tags.

take care,
  Gerd

On Thu, Jun 12, 2025 at 10:53 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
>   Hi,
>
> > > I'm asking because if QEMU drops the commit I mentioned above, then I
> > > guess EDK2 CSM AHCI detection will break. That would be a regression.
>
> It was broken before too, so we are "only" missing a fix,
> for a rather esoteric use case.
>
> And it could very well be that this fix is not needed any more
> given that seabios got a ahci controller reset so possibly things
> are working now even without a ahci port reset.
>
> > AFAICT it wouldn't be a regression from QEMU's POV.
>
> Also not when looking at seabios release tags.

Okay, thanks Gerd and Daniel. The SeaBIOS update has been merged and
will not be reverted.

Stefan

Applied, thanks.

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

FYI, this seabios 1.17.0 release appears to have broken the
ability to use virtio-pci with libguestfs+QEMU:

  https://bugzilla.redhat.com/show_bug.cgi?id=2372329

so I'd suggest we hold off on this pull request until
the regression is diagnosed.

On Wed, Jun 11, 2025 at 09:50:35AM +0200, Gerd Hoffmann wrote:
> The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
> 
>   Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
> 
> for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
> 
>   seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
> 
> ----------------------------------------------------------------
> seabios: update to 1.17.0 release
> 
> ----------------------------------------------------------------
> 
> Gerd Hoffmann (2):
>   seabios: update submodule to 1.17.0
>   seabios: update binaries to 1.17.0
> 
>  pc-bios/bios-256k.bin             | Bin 262144 -> 262144 bytes
>  pc-bios/bios-microvm.bin          | Bin 131072 -> 131072 bytes
>  pc-bios/bios.bin                  | Bin 131072 -> 131072 bytes
>  pc-bios/vgabios-ati.bin           | Bin 39424 -> 39424 bytes
>  pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes
>  pc-bios/vgabios-cirrus.bin        | Bin 38912 -> 39424 bytes
>  pc-bios/vgabios-qxl.bin           | Bin 39424 -> 39424 bytes
>  pc-bios/vgabios-ramfb.bin         | Bin 28672 -> 28672 bytes
>  pc-bios/vgabios-stdvga.bin        | Bin 39424 -> 39424 bytes
>  pc-bios/vgabios-virtio.bin        | Bin 39424 -> 39424 bytes
>  pc-bios/vgabios-vmware.bin        | Bin 39424 -> 39424 bytes
>  pc-bios/vgabios.bin               | Bin 38912 -> 38912 bytes
>  roms/seabios                      |   2 +-
>  13 files changed, 1 insertion(+), 1 deletion(-)
> 
> -- 
> 2.49.0
> 
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Wed, Jun 11, 2025 at 2:03 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> FYI, this seabios 1.17.0 release appears to have broken the
> ability to use virtio-pci with libguestfs+QEMU:
>
>   https://bugzilla.redhat.com/show_bug.cgi?id=2372329
>
> so I'd suggest we hold off on this pull request until
> the regression is diagnosed.

Thanks, Daniel. I have pushed a revert to staging.

Stefan

>
> On Wed, Jun 11, 2025 at 09:50:35AM +0200, Gerd Hoffmann wrote:
> > The following changes since commit bc98ffdc7577e55ab8373c579c28fe24d600c40f:
> >
> >   Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging (2025-06-07 15:08:55 -0400)
> >
> > are available in the Git repository at:
> >
> >   https://gitlab.com/kraxel/qemu.git tags/seabios-1.17.0-20250611-pull-request
> >
> > for you to fetch changes up to cba36cf3881e907553ba2de38abd5edf7f952de1:
> >
> >   seabios: update binaries to 1.17.0 (2025-06-11 09:45:00 +0200)
> >
> > ----------------------------------------------------------------
> > seabios: update to 1.17.0 release
> >
> > ----------------------------------------------------------------
> >
> > Gerd Hoffmann (2):
> >   seabios: update submodule to 1.17.0
> >   seabios: update binaries to 1.17.0
> >
> >  pc-bios/bios-256k.bin             | Bin 262144 -> 262144 bytes
> >  pc-bios/bios-microvm.bin          | Bin 131072 -> 131072 bytes
> >  pc-bios/bios.bin                  | Bin 131072 -> 131072 bytes
> >  pc-bios/vgabios-ati.bin           | Bin 39424 -> 39424 bytes
> >  pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes
> >  pc-bios/vgabios-cirrus.bin        | Bin 38912 -> 39424 bytes
> >  pc-bios/vgabios-qxl.bin           | Bin 39424 -> 39424 bytes
> >  pc-bios/vgabios-ramfb.bin         | Bin 28672 -> 28672 bytes
> >  pc-bios/vgabios-stdvga.bin        | Bin 39424 -> 39424 bytes
> >  pc-bios/vgabios-virtio.bin        | Bin 39424 -> 39424 bytes
> >  pc-bios/vgabios-vmware.bin        | Bin 39424 -> 39424 bytes
> >  pc-bios/vgabios.bin               | Bin 38912 -> 38912 bytes
> >  roms/seabios                      |   2 +-
> >  13 files changed, 1 insertion(+), 1 deletion(-)
> >
> > --
> > 2.49.0
> >
> >
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>
>

On Wed, Jun 11, 2025 at 03:21:38PM -0400, Stefan Hajnoczi wrote:
> On Wed, Jun 11, 2025 at 2:03 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > FYI, this seabios 1.17.0 release appears to have broken the
> > ability to use virtio-pci with libguestfs+QEMU:
> >
> >   https://bugzilla.redhat.com/show_bug.cgi?id=2372329
> >
> > so I'd suggest we hold off on this pull request until
> > the regression is diagnosed.
> 
> Thanks, Daniel. I have pushed a revert to staging.

This has been diagnosed now.

Old SeaBIOS would unconditionally add ACPI tables, even when QEMU
machine type had acpi=off. libguestfs forgot to ask for ACPI in
its libvirt XML, so was getting acpi=off as far as QEMU was
concerned, but SeaBIOS was none the less creating ACPI tables.

It was a miracle this worked because the ACPI tables were
designed for i440fx, but somehow Linux still booted with
them under q35.

So, the SeaBIOS update has a functional change, but that
was intentional & desirable, and the root bug was the lack
of request for ACPI in libguestfs.

So no need to revert anything

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Thu, Jun 12, 2025 at 6:16 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Wed, Jun 11, 2025 at 03:21:38PM -0400, Stefan Hajnoczi wrote:
> > On Wed, Jun 11, 2025 at 2:03 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> > >
> > > FYI, this seabios 1.17.0 release appears to have broken the
> > > ability to use virtio-pci with libguestfs+QEMU:
> > >
> > >   https://bugzilla.redhat.com/show_bug.cgi?id=2372329
> > >
> > > so I'd suggest we hold off on this pull request until
> > > the regression is diagnosed.
> >
> > Thanks, Daniel. I have pushed a revert to staging.
>
> This has been diagnosed now.
>
> Old SeaBIOS would unconditionally add ACPI tables, even when QEMU
> machine type had acpi=off. libguestfs forgot to ask for ACPI in
> its libvirt XML, so was getting acpi=off as far as QEMU was
> concerned, but SeaBIOS was none the less creating ACPI tables.
>
> It was a miracle this worked because the ACPI tables were
> designed for i440fx, but somehow Linux still booted with
> them under q35.
>
> So, the SeaBIOS update has a functional change, but that
> was intentional & desirable, and the root bug was the lack
> of request for ACPI in libguestfs.
>
> So no need to revert anything

Thanks for the update!

Stefan