On 6/26/23 14:22, Michael Tokarev wrote:
25.06.2023 14:20, Helge Deller wrote:
Is this a -stable material? It applies cleanly to 8.0 and 7.2.
Yes, please.
At least for 8.0 I think it should be added.
I didn't tested 7.2, but can do and would prefer it if could be added there too.
Just tested: The patches work nicely when applied to v7.2 as well.
Could you add them to -stable (or what is the process)?
Hmm. Now I'm a bit confused.
Initially I thought it's just this patch, 1/3, "target/hppa: Fix OS reboot
issues",
to which I replied, is the one which should perhaps go to -stable. But now I
see
it is the whole series, all 3 changes, which are needed.
And for 7.2, things are a bit more interesting in this context: seabios-hppa
version
in 7.2 is 6, it changed to version 7 in qemu 8.0, and changed further by this
patchset.
There isn't much differences between seabios-hppa 6 and 7, so it's probably
okay to
have it of version 7 in qemu-7.2-stable too (esp. since the change in there is
another
bugfix, with debian 12 as a reproducer).
So, just to confirm: do we update seabios-hppa to this commit
673d2595d4f773cc266cbf
(version 8) in both stable-7.2 and stable-8.0? :)
Yes.
The changes in there seems to be okay anyway, should be good to have in -stable.
Yes.
Besides, I'm having sort of difficult time cherry-picking the commit which
updates
seabios-hppa submodule and hppa-firmware.img file, - git tells me there's a
conflict
(even when applying to stable-8.0 branch) but I see no changes to this areas in-
between (yes, a conflict when applying to 7.2 is expected). So I ended up in
doing:
starting in both branches (staging-7.2 and staging-8.0) this works for me:
git cherry-pick bb9c998ca9343d445c76b69fa15dea9db692f526
git cherry-pick 50ba97e928b44ff5bc731c9ffe68d86acbe44639
git cherry-pick 069d296669448b9eef72c6332ae84af962d9582c
git cherry-pick 34ec3aea54368a92b62a55c656335885ba8c65ef
Helge
