[Qemu-commits] [qemu/qemu] 3c47a0: gitlab: migrate the s390x custom machine to 22.04

[Daniel Berrangé]

  Branch: refs/heads/staging-9.0
  Home:   https://github.com/qemu/qemu
  Commit: 3c47a0162b509336c498d5007ed2e282ac40c64f
      
https://github.com/qemu/qemu/commit/3c47a0162b509336c498d5007ed2e282ac40c64f
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2024-09-06 (Fri, 06 Sep 2024)

  Changed paths:
    M .gitlab-ci.d/custom-runners.yml
    R .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
    A .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml

  Log Message:
  -----------
  gitlab: migrate the s390x custom machine to 22.04

20.04 is dead (from QEMU's point of view), long live 22.04!

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240426153938.1707723-3-alex.bennee@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit 108d99742af1fa6e977dcfac9d4151b7915e33a3)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 382ee888fbe9f9c7ec12214b7199dd0e6727e83c
      
https://github.com/qemu/qemu/commit/382ee888fbe9f9c7ec12214b7199dd0e6727e83c
  Author: Arman Nabiev <nabiev.arman13@gmail.com>
  Date:   2024-09-06 (Fri, 06 Sep 2024)

  Changed paths:
    M target/ppc/machine.c

  Log Message:
  -----------
  target/ppc: Fix migration of CPUs with TLB_EMB TLB type

In vmstate_tlbemb a cut-and-paste error meant we gave
this vmstate subsection the same "cpu/tlb6xx" name as
the vmstate_tlb6xx subsection. This breaks migration load
for any CPU using the TLB_EMB CPU type, because when we
see the "tlb6xx" name in the incoming data we try to
interpret it as a vmstate_tlb6xx subsection, which it
isn't the right format for:

 $ qemu-system-ppc -drive
 if=none,format=qcow2,file=/home/petmay01/test-images/virt/dummy.qcow2
 -monitor stdio -M bamboo
 QEMU 9.0.92 monitor - type 'help' for more information
 (qemu) savevm foo
 (qemu) loadvm foo
 Missing section footer for cpu
 Error: Error -22 while loading VM state

Correct the incorrect vmstate section name. Since migration
for these CPU types was completely broken before, we don't
need to care that this is a migration compatibility break.

This affects the PPC 405, 440, 460 and e200 CPU families.

Cc: qemu-stable@nongnu.org
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2522
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Arman Nabiev <nabiev.arman13@gmail.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
(cherry picked from commit 203beb6f047467a4abfc8267c234393cea3f471c)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 3742c363ec05c21f348ce1fddb4667dd1a2c3b6e
      
https://github.com/qemu/qemu/commit/3742c363ec05c21f348ce1fddb4667dd1a2c3b6e
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2024-09-06 (Fri, 06 Sep 2024)

  Changed paths:
    M .gitlab-ci.d/base.yml

  Log Message:
  -----------
  gitlab: fix logic for changing docker tag on stable branches

This fixes:

  commit e28112d00703abd136e2411d23931f4f891c9244
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Thu Jun 8 17:40:16 2023 +0100

    gitlab: stable staging branches publish containers in a separate tag

Due to a copy+paste mistake, that commit included "QEMU_JOB_SKIPPED"
in the final rule that was meant to be a 'catch all' for staging
branches.

As a result stable branches are still splattering dockers from the
primary development branch.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


Compare: https://github.com/qemu/qemu/compare/3903049d1242...3742c363ec05

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications