Skip to contentSkip to conversation

CI fixes and various clean-ups

GIT PULL Thomas Huth 2 participants 17 messages Oct 7, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

The following changes since commit b5ab62b3c0050612c7f9b0b4baeb44ebab42775a:

Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-10-04 19:28:37 +0100)

are available in the Git repository at:

https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-07

for you to fetch changes up to d841f720c98475c0f67695d99f27794bde69ed6e:

tests/functional: Bump timeout of some tests (2024-10-07 13:21:41 +0200)

----------------------------------------------------------------
* Mark "gluster" support as deprecated
* Update CI to use macOS 14 instead of 13, and add a macOS 15 job
* Use gitlab mirror for advent calendar test images (seems more stable)
* Bump timeouts of some tests
* Remove CRIS disassembler
* Some m68k and s390x cleanups with regards to load and store APIs

----------------------------------------------------------------
Michael Tokarev (1):
gitlab-ci/build-oss-fuzz: print FAILED marker in case the test failed and run all tests

Philippe Mathieu-Daudé (8):
.gitlab-ci.d/cirrus: Drop support for macOS 13 (Ventura) .gitlab-ci.d/cirrus: Add manual testing of macOS 15 (Sequoia)
disas: Remove CRIS disassembler
hw/m68k: Use explicit big-endian LD/ST API target/m68k: Use explicit big-endian LD/ST API hw/s390x: Use explicit big-endian LD/ST API target/s390x: Replace ldtul_p() -> ldq_p() target/s390x: Use explicit big-endian LD/ST API

Thomas Huth (3):
docs: Mark "gluster" support in QEMU as deprecated tests/functional: Switch back to the gitlab URLs for the advent calendar tests tests/functional: Bump timeout of some tests

 MAINTAINERS                                        |    5 -
 docs/about/deprecated.rst                          |    9 +
 meson.build                                        |    1 -
 qapi/block-core.json                               |    8 +-
 hw/m68k/bootinfo.h                                 |   28 +-
 include/disas/dis-asm.h                            |    6 -
 include/exec/poison.h                              |    1 -
 block/gluster.c                                    |    2 +
 disas/cris.c                                       | 2863 --------------------
 hw/m68k/mcf5208.c                                  |    2 +-
 hw/m68k/next-cube.c                                |    2 +-
 hw/m68k/q800.c                                     |    4 +-
 hw/s390x/ipl.c                                     |    4 +-
 hw/s390x/s390-pci-inst.c                           |  166 +-
 target/m68k/gdbstub.c                              |    2 +-
 target/m68k/helper.c                               |   10 +-
 target/s390x/gdbstub.c                             |   34 +-
 target/s390x/ioinst.c                              |    2 +-
 .gitlab-ci.d/buildtest.yml                         |    5 +-
 .gitlab-ci.d/cirrus.yml                            |   12 +-
 .../cirrus/{macos-13.vars => macos-15.vars}        |    2 +-
 disas/meson.build                                  |    1 -
 tests/docker/dockerfiles/opensuse-leap.docker      |    2 +-
 tests/functional/meson.build                       |    9 +-
 tests/functional/test_arm_vexpress.py              |    2 +-
 tests/functional/test_m68k_mcf5208evb.py           |    2 +-
 tests/functional/test_or1k_sim.py                  |    2 +-
 tests/functional/test_ppc64_e500.py                |    2 +-
 tests/functional/test_ppc_mac.py                   |    2 +-
 tests/functional/test_sh4_r2d.py                   |    2 +-
 tests/functional/test_sparc_sun4m.py               |    2 +-
 tests/functional/test_xtensa_lx60.py               |    2 +-
 tests/lcitool/libvirt-ci                           |    2 +-
 tests/lcitool/refresh                              |    2 +-
 34 files changed, 173 insertions(+), 3027 deletions(-)
 delete mode 100644 disas/cris.c
 rename .gitlab-ci.d/cirrus/{macos-13.vars => macos-15.vars} (95%)
#1 lore raw

[PULL 09/12] target/s390x: Replace ldtul_p() -> ldq_p()

From: Philippe Mathieu-Daudé <[email protected]>

The S390X target is only built for 64-bit.
Using ldtul_p() is pointless, replace by ldq_p().

Mechanical change doing:

  $ sed -i -e 's/ldtul_p/ldq_p/' $(git grep -wl ldtul_p target/s390x/)

Message-ID: <[email protected]>

---
 target/s390x/gdbstub.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
target/s390x/gdbstub.c +15 -15
index a9f4eb92ad..9ffec0bccb 100644
@@ -46,7 +46,7 @@ int s390_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
 int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
 {
     CPUS390XState *env = cpu_env(cs);
-    target_ulong tmpl = ldtul_p(mem_buf);
+    target_ulong tmpl = ldq_p(mem_buf);
 
     switch (n) {
     case S390_PSWM_REGNUM:
@@ -126,7 +126,7 @@ static int cpu_write_fp_reg(CPUState *cs, uint8_t *mem_buf, int n)
         env->fpc = ldl_p(mem_buf);
         return 4;
     case S390_F0_REGNUM ... S390_F15_REGNUM:
-        *get_freg(env, n - S390_F0_REGNUM) = ldtul_p(mem_buf);
+        *get_freg(env, n - S390_F0_REGNUM) = ldq_p(mem_buf);
         return 8;
     default:
         return 0;
@@ -167,11 +167,11 @@ static int cpu_write_vreg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_V0L_REGNUM ... S390_V15L_REGNUM:
-        env->vregs[n][1] = ldtul_p(mem_buf + 8);
+        env->vregs[n][1] = ldq_p(mem_buf + 8);
         return 8;
     case S390_V16_REGNUM ... S390_V31_REGNUM:
-        env->vregs[n][0] = ldtul_p(mem_buf);
-        env->vregs[n][1] = ldtul_p(mem_buf + 8);
+        env->vregs[n][0] = ldq_p(mem_buf);
+        env->vregs[n][1] = ldq_p(mem_buf + 8);
         return 16;
     default:
         return 0;
@@ -203,7 +203,7 @@ static int cpu_write_c_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_C0_REGNUM ... S390_C15_REGNUM:
-        env->cregs[n] = ldtul_p(mem_buf);
+        env->cregs[n] = ldq_p(mem_buf);
         if (tcg_enabled()) {
             tlb_flush(env_cpu(env));
         }
@@ -246,19 +246,19 @@ static int cpu_write_virt_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_VIRT_CKC_REGNUM:
-        env->ckc = ldtul_p(mem_buf);
+        env->ckc = ldq_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     case S390_VIRT_CPUTM_REGNUM:
-        env->cputm = ldtul_p(mem_buf);
+        env->cputm = ldq_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     case S390_VIRT_BEA_REGNUM:
-        env->gbea = ldtul_p(mem_buf);
+        env->gbea = ldq_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     case S390_VIRT_PREFIX_REGNUM:
-        env->psa = ldtul_p(mem_buf);
+        env->psa = ldq_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     default:
@@ -298,19 +298,19 @@ static int cpu_write_virt_kvm_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_VIRT_KVM_PP_REGNUM:
-        env->pp = ldtul_p(mem_buf);
+        env->pp = ldq_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     case S390_VIRT_KVM_PFT_REGNUM:
-        env->pfault_token = ldtul_p(mem_buf);
+        env->pfault_token = ldq_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     case S390_VIRT_KVM_PFS_REGNUM:
-        env->pfault_select = ldtul_p(mem_buf);
+        env->pfault_select = ldq_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     case S390_VIRT_KVM_PFC_REGNUM:
-        env->pfault_compare = ldtul_p(mem_buf);
+        env->pfault_compare = ldq_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     default:
@@ -338,7 +338,7 @@ static int cpu_write_gs_reg(CPUState *cs, uint8_t *mem_buf, int n)
     S390CPU *cpu = S390_CPU(cs);
     CPUS390XState *env = &cpu->env;
 
-    env->gscb[n] = ldtul_p(mem_buf);
+    env->gscb[n] = ldq_p(mem_buf);
     cpu_synchronize_post_init(env_cpu(env));
     return 8;
 }
Signature · 1 line
2.46.1
#2 lore raw

[PULL 01/12] docs: Mark "gluster" support in QEMU as deprecated

In reply to Thomas Huth

According to https://marc.info/?l=fedora-devel-list&m=171934833215726
the GlusterFS development effectively ended. Thus mark it as deprecated in QEMU, so we can remove it in a future release if the project does not gain momentum again.

Message-ID: <[email protected]>

---
 docs/about/deprecated.rst | 9 +++++++++
 qapi/block-core.json      | 8 +++++++-
 block/gluster.c           | 2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)
docs/about/deprecated.rst +9 -0
index 48b230b0a0..c02bbb66f7 100644
@@ -377,6 +377,15 @@ Specifying the iSCSI password in plain text on the command line using the
 used instead, to refer to a ``--object secret...`` instance that provides
 a password via a file, or encrypted.
 
+``gluster`` backend (since 9.2)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+According to https://marc.info/?l=fedora-devel-list&m=171934833215726
+the GlusterFS development effectively ended. Unless the development
+gains momentum again, the QEMU project will remove the gluster backend
+in a future release.
+
+
 Character device options
 ''''''''''''''''''''''''
 
qapi/block-core.json +7 -1
index 5c2b3ac0d4..2feae8e697 100644
@@ -3190,12 +3190,18 @@
 #
 # @snapshot-access: Since 7.0
 #
+# Features:
+#
+# @deprecated: Member @gluster is deprecated because GlusterFS
+#     development ceased.
+#
 # Since: 2.9
 ##
 { 'enum': 'BlockdevDriver',
   'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
             'cloop', 'compress', 'copy-before-write', 'copy-on-read', 'dmg',
-            'file', 'snapshot-access', 'ftp', 'ftps', 'gluster',
+            'file', 'snapshot-access', 'ftp', 'ftps',
+            {'name': 'gluster', 'features': [ 'deprecated' ] },
             {'name': 'host_cdrom', 'if': 'HAVE_HOST_BLOCK_DEVICE' },
             {'name': 'host_device', 'if': 'HAVE_HOST_BLOCK_DEVICE' },
             'http', 'https',
block/gluster.c +2 -0
index f8b415f381..f03d05251e 100644
@@ -809,6 +809,8 @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
         goto out;
     }
 
+    warn_report_once("'gluster' is deprecated");
+
     filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME);
 
     s->debug = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
Signature · 1 line
2.46.1
#3 lore raw

[PULL 12/12] tests/functional: Bump timeout of some tests

In reply to Thomas Huth

These tests occasionally time out when the host system is under heavy load. Increase the timeout setting to allow for more headroom here.

Message-ID: <[email protected]>

---
 tests/functional/meson.build | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
tests/functional/meson.build +6 -3
index 7713f8eb55..c90c02517a 100644
@@ -11,15 +11,18 @@ endif
 
 # Timeouts for individual tests that can be slow e.g. with debugging enabled
 test_timeouts = {
+  'aarch64_raspi4' : 120,
   'aarch64_sbsaref' : 600,
   'aarch64_virt' : 360,
   'acpi_bits' : 240,
+  'arm_raspi2' : 120,
+  'mips_malta' : 120,
   'netdev_ethtool' : 180,
   'ppc_40p' : 240,
   'ppc64_hv' : 1000,
-  'ppc64_powernv' : 120,
-  'ppc64_pseries' : 120,
-  's390x_ccw_virtio' : 180,
+  'ppc64_powernv' : 240,
+  'ppc64_pseries' : 240,
+  's390x_ccw_virtio' : 240,
 }
 
 tests_generic_system = [
Signature · 1 line
2.46.1
#4 lore raw

[PULL 08/12] hw/s390x: Use explicit big-endian LD/ST API

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

The S390X architecture uses big endianness. Directly use the big-endian LD/ST API.

Mechanical change using:

  $ end=be; \
    for acc in uw w l q tul; do \
      sed -i -e "s/ld${acc}_p(/ld${acc}_${end}_p(/" \
             -e "s/st${acc}_p(/st${acc}_${end}_p(/" \
        $(git grep -wlE '(ld|st)t?u?[wlq]_p' hw/s390x/); \
    done

Message-ID: <[email protected]>

---
 hw/s390x/ipl.c           |   4 +-
 hw/s390x/s390-pci-inst.c | 166 +++++++++++++++++++--------------------
 2 files changed, 85 insertions(+), 85 deletions(-)
hw/s390x/ipl.c +2 -2
index dd71689642..5ab7433908 100644
@@ -252,8 +252,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
              */
             romptr = rom_ptr(INITRD_PARM_START, 16);
             if (romptr) {
-                stq_p(romptr, initrd_offset);
-                stq_p(romptr + 1, initrd_size);
+                stq_be_p(romptr, initrd_offset);
+                stq_be_p(romptr + 1, initrd_size);
             }
         }
     }
hw/s390x/s390-pci-inst.c +83 -83

376 lines not on this page · raw message

Signature · 1 line
2.46.1
#5 lore raw

[PULL 06/12] hw/m68k: Use explicit big-endian LD/ST API

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

The M68K architecture uses big endianness. Directly use the big-endian LD/ST API.

Mechanical change using:

  $ end=be; \
    for acc in uw w l q tul; do \
      sed -i -e "s/ld${acc}_p(/ld${acc}_${end}_p(/" \
             -e "s/st${acc}_p(/st${acc}_${end}_p(/" \
        $(git grep -wlE '(ld|st)t?u?[wlq]_p' hw/m68k/); \
    done

Message-ID: <[email protected]>

---
 hw/m68k/bootinfo.h  | 28 ++++++++++++++--------------
 hw/m68k/mcf5208.c   |  2 +-
 hw/m68k/next-cube.c |  2 +-
 hw/m68k/q800.c      |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)
hw/m68k/bootinfo.h +14 -14
index 70c1dc0e8c..0b3e7c4ea0 100644
@@ -14,39 +14,39 @@
 
 #define BOOTINFO0(base, id) \
     do { \
-        stw_p(base, id); \
+        stw_be_p(base, id); \
         base += 2; \
-        stw_p(base, sizeof(struct bi_record)); \
+        stw_be_p(base, sizeof(struct bi_record)); \
         base += 2; \
     } while (0)
 
 #define BOOTINFO1(base, id, value) \
     do { \
-        stw_p(base, id); \
+        stw_be_p(base, id); \
         base += 2; \
-        stw_p(base, sizeof(struct bi_record) + 4); \
+        stw_be_p(base, sizeof(struct bi_record) + 4); \
         base += 2; \
-        stl_p(base, value); \
+        stl_be_p(base, value); \
         base += 4; \
     } while (0)
 
 #define BOOTINFO2(base, id, value1, value2) \
     do { \
-        stw_p(base, id); \
+        stw_be_p(base, id); \
         base += 2; \
-        stw_p(base, sizeof(struct bi_record) + 8); \
+        stw_be_p(base, sizeof(struct bi_record) + 8); \
         base += 2; \
-        stl_p(base, value1); \
+        stl_be_p(base, value1); \
         base += 4; \
-        stl_p(base, value2); \
+        stl_be_p(base, value2); \
         base += 4; \
     } while (0)
 
 #define BOOTINFOSTR(base, id, string) \
     do { \
-        stw_p(base, id); \
+        stw_be_p(base, id); \
         base += 2; \
-        stw_p(base, \
+        stw_be_p(base, \
                  (sizeof(struct bi_record) + strlen(string) + \
                   1 /* null termination */ + 3 /* padding */) & ~3); \
         base += 2; \
@@ -59,13 +59,13 @@
 
 #define BOOTINFODATA(base, id, data, len) \
     do { \
-        stw_p(base, id); \
+        stw_be_p(base, id); \
         base += 2; \
-        stw_p(base, \
+        stw_be_p(base, \
                  (sizeof(struct bi_record) + len + \
                   2 /* length field */ + 3 /* padding */) & ~3); \
         base += 2; \
-        stw_p(base, len); \
+        stw_be_p(base, len); \
         base += 2; \
         for (unsigned i_ = 0; i_ < len; ++i_) { \
             stb_p(base++, data[i_]); \
hw/m68k/mcf5208.c +1 -1
index b6677ad6bc..e37cd50d18 100644
@@ -359,7 +359,7 @@ static void mcf5208evb_init(MachineState *machine)
         /* Initial PC is always at offset 4 in firmware binaries */
         ptr = rom_ptr(0x4, 4);
         assert(ptr != NULL);
-        env->pc = ldl_p(ptr);
+        env->pc = ldl_be_p(ptr);
     }
 
     /* Load kernel.  */
hw/m68k/next-cube.c +1 -1
index 9b78767ea8..9832213e7e 100644
@@ -1036,7 +1036,7 @@ static void next_cube_init(MachineState *machine)
         /* Initial PC is always at offset 4 in firmware binaries */
         ptr = rom_ptr(0x01000004, 4);
         g_assert(ptr != NULL);
-        env->pc = ldl_p(ptr);
+        env->pc = ldl_be_p(ptr);
         if (env->pc >= 0x01020000) {
             error_report("'%s' does not seem to be a valid firmware image.",
                          bios_name);
hw/m68k/q800.c +2 -2
index fa7683bf76..556604e1dc 100644
@@ -684,9 +684,9 @@ static void q800_machine_init(MachineState *machine)
 
             ptr = rom_ptr(MACROM_ADDR, bios_size);
             assert(ptr != NULL);
-            stl_phys(cs->as, 0, ldl_p(ptr));    /* reset initial SP */
+            stl_phys(cs->as, 0, ldl_be_p(ptr));    /* reset initial SP */
             stl_phys(cs->as, 4,
-                     MACROM_ADDR + ldl_p(ptr + 4)); /* reset initial PC */
+                     MACROM_ADDR + ldl_be_p(ptr + 4)); /* reset initial PC */
         }
     }
 }
Signature · 1 line
2.46.1
#6 lore raw

[PULL 04/12] disas: Remove CRIS disassembler

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

We just removed the CRIS target, the disassembler is now dead code.

Message-ID: <[email protected]>

---
 MAINTAINERS             |    5 -
 meson.build             |    1 -
 include/disas/dis-asm.h |    6 -
 include/exec/poison.h   |    1 -
 disas/cris.c            | 2863 ---------------------------------------
 disas/meson.build       |    1 -
 6 files changed, 2877 deletions(-)
 delete mode 100644 disas/cris.c
MAINTAINERS +0 -5
index 72359066d3..d7a11fe601 100644
@@ -224,11 +224,6 @@ F: gdb-xml/avr-cpu.xml
 F: target/avr/
 F: tests/functional/test_avr_mega2560.py
 
-CRIS TCG CPUs
-M: Edgar E. Iglesias <[email protected]>
-S: Maintained
-F: disas/cris.c
-
 Hexagon TCG CPUs
 M: Brian Cain <[email protected]>
 S: Supported
meson.build +0 -1
index 67d045eb5a..33954b3eba 100644
@@ -3061,7 +3061,6 @@ config_target_mak = {}
 disassemblers = {
   'alpha' : ['CONFIG_ALPHA_DIS'],
   'avr' : ['CONFIG_AVR_DIS'],
-  'cris' : ['CONFIG_CRIS_DIS'],
   'hexagon' : ['CONFIG_HEXAGON_DIS'],
   'hppa' : ['CONFIG_HPPA_DIS'],
   'i386' : ['CONFIG_I386_DIS'],
include/disas/dis-asm.h +0 -6
index a1d26ce903..3b50ecfb54 100644
@@ -232,10 +232,6 @@ enum bfd_architecture
 #define bfd_mach_avrxmega5  105
 #define bfd_mach_avrxmega6  106
 #define bfd_mach_avrxmega7  107
-  bfd_arch_cris,       /* Axis CRIS */
-#define bfd_mach_cris_v0_v10   255
-#define bfd_mach_cris_v32      32
-#define bfd_mach_cris_v10_v32  1032
   bfd_arch_microblaze, /* Xilinx MicroBlaze.  */
   bfd_arch_moxie,      /* The Moxie core.  */
   bfd_arch_ia64,      /* HP/Intel ia64 */
@@ -448,8 +444,6 @@ int print_insn_w65              (bfd_vma, disassemble_info*);
 int print_insn_d10v             (bfd_vma, disassemble_info*);
 int print_insn_v850             (bfd_vma, disassemble_info*);
 int print_insn_tic30            (bfd_vma, disassemble_info*);
-int print_insn_crisv32          (bfd_vma, disassemble_info*);
-int print_insn_crisv10          (bfd_vma, disassemble_info*);
 int print_insn_microblaze       (bfd_vma, disassemble_info*);
 int print_insn_ia64             (bfd_vma, disassemble_info*);
 int print_insn_xtensa           (bfd_vma, disassemble_info*);
include/exec/poison.h +0 -1
index 79d7930e73..f4283f693a 100644
@@ -63,7 +63,6 @@
 #pragma GCC poison CPU_INTERRUPT_TGT_INT_2
 
 #pragma GCC poison CONFIG_ALPHA_DIS
-#pragma GCC poison CONFIG_CRIS_DIS
 #pragma GCC poison CONFIG_HPPA_DIS
 #pragma GCC poison CONFIG_I386_DIS
 #pragma GCC poison CONFIG_HEXAGON_DIS
disas/cris.c deleted +0 -2863

2,863 lines not on this page · raw message

disas/meson.build +0 -1
index 20d6aef9a7..bbfa119783 100644
@@ -1,5 +1,4 @@
 common_ss.add(when: 'CONFIG_ALPHA_DIS', if_true: files('alpha.c'))
-common_ss.add(when: 'CONFIG_CRIS_DIS', if_true: files('cris.c'))
 common_ss.add(when: 'CONFIG_HEXAGON_DIS', if_true: files('hexagon.c'))
 common_ss.add(when: 'CONFIG_HPPA_DIS', if_true: files('hppa.c'))
 common_ss.add(when: 'CONFIG_M68K_DIS', if_true: files('m68k.c'))
Signature · 1 line
2.46.1
#7 lore raw

[PULL 11/12] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

In reply to Thomas Huth

Shortly after we switched to the original URLs on qemu-advent-calendar.org, the server went offline - looks like we are better off using the gitlab URLs again instead.

Message-ID: <[email protected]>

---
 tests/functional/test_arm_vexpress.py    | 2 +-
 tests/functional/test_m68k_mcf5208evb.py | 2 +-
 tests/functional/test_or1k_sim.py        | 2 +-
 tests/functional/test_ppc64_e500.py      | 2 +-
 tests/functional/test_ppc_mac.py         | 2 +-
 tests/functional/test_sh4_r2d.py         | 2 +-
 tests/functional/test_sparc_sun4m.py     | 2 +-
 tests/functional/test_xtensa_lx60.py     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
tests/functional/test_arm_vexpress.py +1 -1
index cc6015112b..6bd6290030 100755
@@ -11,7 +11,7 @@
 class VExpressTest(LinuxKernelTest):
 
     ASSET_DAY16 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day16.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day16.tar.xz',
         '63311adb2d4c4e7a73214a86d29988add87266a909719c56acfadd026b4110a7')
 
     def test_arm_vexpressa9(self):
tests/functional/test_m68k_mcf5208evb.py +1 -1
index 869ccc88df..00c59590c3 100755
@@ -13,7 +13,7 @@
 class Mcf5208EvbTest(LinuxKernelTest):
 
     ASSET_DAY07 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day07.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day07.tar.xz',
         '753c2f3837126b7c6ba92d0b1e0b156e8a2c5131d2d576bb0b9a763fae73c08a')
 
     def test_m68k_mcf5208evb(self):
tests/functional/test_or1k_sim.py +1 -1
index aa2a1f08d2..10e0437c50 100755
@@ -13,7 +13,7 @@
 class OpenRISC1kSimTest(LinuxKernelTest):
 
     ASSET_DAY20 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day20.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz',
         'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a')
 
     def test_or1k_sim(self):
tests/functional/test_ppc64_e500.py +1 -1
index 3558ae0c8c..f1af92373e 100755
@@ -10,7 +10,7 @@
 class E500Test(LinuxKernelTest):
 
     ASSET_DAY19 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day19.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day19.tar.xz',
         '20b1bb5a8488c664defbb5d283addc91a05335a936c63b3f5ff7eee74b725755')
 
     def test_ppc64_e500(self):
tests/functional/test_ppc_mac.py +1 -1
index a6b1ca2d4c..3f45e37a45 100755
@@ -10,7 +10,7 @@
 class MacTest(LinuxKernelTest):
 
     ASSET_DAY15 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day15.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day15.tar.xz',
         '03e0757c131d2959decf293a3572d3b96c5a53587165bf05ce41b2818a2bccd5')
 
     def do_day15_test(self):
tests/functional/test_sh4_r2d.py +1 -1
index 5fe8cf9f8d..c3cfff79ad 100755
@@ -13,7 +13,7 @@
 class R2dTest(LinuxKernelTest):
 
     ASSET_DAY09 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day09.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day09.tar.xz',
         'a61b44d2630a739d1380cc4ff4b80981d47ccfd5992f1484ccf48322c35f09ac')
 
     # This test has a 6-10% failure rate on various hosts that look
tests/functional/test_sparc_sun4m.py +1 -1
index b334375820..573f85222a 100755
@@ -11,7 +11,7 @@
 class Sun4mTest(LinuxKernelTest):
 
     ASSET_DAY11 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day11.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day11.tar.xz',
         'c776533ba756bf4dd3f1fc4c024fb50ef0d853e05c5f5ddf0900a32d1eaa49e0')
 
     def test_sparc_ss20(self):
tests/functional/test_xtensa_lx60.py +1 -1
index 8ce5206a4f..d4ad92dc6c 100755
@@ -11,7 +11,7 @@
 class XTensaLX60Test(LinuxKernelTest):
 
     ASSET_DAY02 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day02.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day02.tar.xz',
         '68ff07f9b3fd3df36d015eb46299ba44748e94bfbb2d5295fddc1a8d4a9fd324')
 
     def test_xtensa_lx60(self):
Signature · 1 line
2.46.1
#8 lore raw

[PULL 07/12] target/m68k: Use explicit big-endian LD/ST API

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

The M68K architecture uses big endianness. Directly use the big-endian LD/ST API.

Mechanical change using:

  $ end=be; \
    for acc in uw w l q tul; do \
      sed -i -e "s/ld${acc}_p(/ld${acc}_${end}_p(/" \
             -e "s/st${acc}_p(/st${acc}_${end}_p(/" \
        $(git grep -wlE '(ld|st)t?u?[wlq]_p' target/m68k/); \
    done

Message-ID: <[email protected]>

---
 target/m68k/gdbstub.c |  2 +-
 target/m68k/helper.c  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
target/m68k/gdbstub.c +1 -1
index 15547e2313..136159f98f 100644
@@ -52,7 +52,7 @@ int m68k_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
     CPUM68KState *env = cpu_env(cs);
     uint32_t tmp;
 
-    tmp = ldl_p(mem_buf);
+    tmp = ldl_be_p(mem_buf);
 
     if (n < 8) {
         /* D0-D7 */
target/m68k/helper.c +5 -5
index 4c85badd5d..9d3db8419d 100644
@@ -57,15 +57,15 @@ static int cf_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     if (n < 8) {
         float_status s;
-        env->fregs[n].d = float64_to_floatx80(ldq_p(mem_buf), &s);
+        env->fregs[n].d = float64_to_floatx80(ldq_be_p(mem_buf), &s);
         return 8;
     }
     switch (n) {
     case 8: /* fpcontrol */
-        cpu_m68k_set_fpcr(env, ldl_p(mem_buf));
+        cpu_m68k_set_fpcr(env, ldl_be_p(mem_buf));
         return 4;
     case 9: /* fpstatus */
-        env->fpsr = ldl_p(mem_buf);
+        env->fpsr = ldl_be_p(mem_buf);
         return 4;
     case 10: /* fpiar, not implemented */
         return 4;
@@ -107,10 +107,10 @@ static int m68k_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n)
     }
     switch (n) {
     case 8: /* fpcontrol */
-        cpu_m68k_set_fpcr(env, ldl_p(mem_buf));
+        cpu_m68k_set_fpcr(env, ldl_be_p(mem_buf));
         return 4;
     case 9: /* fpstatus */
-        cpu_m68k_set_fpsr(env, ldl_p(mem_buf));
+        cpu_m68k_set_fpsr(env, ldl_be_p(mem_buf));
         return 4;
     case 10: /* fpiar, not implemented */
         return 4;
Signature · 1 line
2.46.1
#9 lore raw

[PULL 03/12] .gitlab-ci.d/cirrus: Add manual testing of macOS 15 (Sequoia)

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

Upgrade libvirt-ci so it covers macOS 15. Add a manual entry (QEMU_JOB_OPTIONAL: 1) to test on Sequoia release. Refresh the lci-tool generated files.

Message-ID: <[email protected]>

[thuth: Fix image names in cirrus.yml and hash for tests/lcitool/libvirt-ci]
---
 .gitlab-ci.d/cirrus.yml                       | 17 +++++++++++++++++
 .gitlab-ci.d/cirrus/macos-15.vars             | 16 ++++++++++++++++
 tests/docker/dockerfiles/opensuse-leap.docker |  2 +-
 tests/lcitool/libvirt-ci                      |  2 +-
 tests/lcitool/refresh                         |  1 +
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 .gitlab-ci.d/cirrus/macos-15.vars
.gitlab-ci.d/cirrus.yml +17 -0
index cee089be76..5708c2bbab 100644
@@ -73,4 +73,21 @@ aarch64-macos-14-base-build:
     INSTALL_COMMAND: brew install
     PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin
     PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig
+    CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblazeel-softmmu,mips64-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4-softmmu,xtensaeb-softmmu
     TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
+
+aarch64-macos-15-base-build:
+  extends: .cirrus_build_job
+  variables:
+    NAME: macos-15
+    CIRRUS_VM_INSTANCE_TYPE: macos_instance
+    CIRRUS_VM_IMAGE_SELECTOR: image
+    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sequoia-base:latest
+    CIRRUS_VM_CPUS: 12
+    CIRRUS_VM_RAM: 24G
+    UPDATE_COMMAND: brew update
+    INSTALL_COMMAND: brew install
+    PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin
+    PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig
+    TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
+    QEMU_JOB_OPTIONAL: 1
.gitlab-ci.d/cirrus/macos-15.vars new file +16 -0
new file mode 100644
index 0000000000..23b2c1d22f
@@ -0,0 +1,16 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool variables macos-15 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+CCACHE='/opt/homebrew/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
+MAKE='/opt/homebrew/bin/gmake'
+NINJA='/opt/homebrew/bin/ninja'
+PACKAGING_COMMAND='brew'
+PIP3='/opt/homebrew/bin/pip3'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
+PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
+PYTHON='/opt/homebrew/bin/python3'
tests/docker/dockerfiles/opensuse-leap.docker +1 -1
index 66143621fe..0dab4e4873 100644
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.opensuse.org/opensuse/leap:15.5
+FROM registry.opensuse.org/opensuse/leap:15.6
 
 RUN zypper update -y && \
     zypper install -y \
tests/lcitool/libvirt-ci +1 -1
index 789b4601bc..c0fc6fab5c 160000
@@ -1 +1 @@
-Subproject commit 789b4601bce4e01f43fdb6ad4ce5ab4e46674440
+Subproject commit c0fc6fab5cdc839a70d4148aa9809504bc961967
tests/lcitool/refresh +1 -0
index 5bc2edde7b..3578880706 100755
@@ -203,6 +203,7 @@ try:
     #
     generate_cirrus("freebsd-14")
     generate_cirrus("macos-14")
+    generate_cirrus("macos-15")
 
     #
     # VM packages lists
Signature · 1 line
2.46.1
#10 lore raw

[PULL 10/12] target/s390x: Use explicit big-endian LD/ST API

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

The S390X architecture uses big endianness. Directly use the big-endian LD/ST API.

Mechanical change using:

  $ end=be; \
    for acc in uw w l q tul; do \
      sed -i -e "s/ld${acc}_p(/ld${acc}_${end}_p(/" \
             -e "s/st${acc}_p(/st${acc}_${end}_p(/" \
        $(git grep -wlE '(ld|st)t?u?[wlq]_p' target/s390x/); \
    done

Message-ID: <[email protected]>

---
 target/s390x/gdbstub.c | 34 +++++++++++++++++-----------------
 target/s390x/ioinst.c  |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)
target/s390x/gdbstub.c +17 -17
index 9ffec0bccb..63373f02ce 100644
@@ -46,7 +46,7 @@ int s390_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
 int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
 {
     CPUS390XState *env = cpu_env(cs);
-    target_ulong tmpl = ldq_p(mem_buf);
+    target_ulong tmpl = ldq_be_p(mem_buf);
 
     switch (n) {
     case S390_PSWM_REGNUM:
@@ -88,7 +88,7 @@ static int cpu_write_ac_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_A0_REGNUM ... S390_A15_REGNUM:
-        env->aregs[n] = ldl_p(mem_buf);
+        env->aregs[n] = ldl_be_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 4;
     default:
@@ -123,10 +123,10 @@ static int cpu_write_fp_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_FPC_REGNUM:
-        env->fpc = ldl_p(mem_buf);
+        env->fpc = ldl_be_p(mem_buf);
         return 4;
     case S390_F0_REGNUM ... S390_F15_REGNUM:
-        *get_freg(env, n - S390_F0_REGNUM) = ldq_p(mem_buf);
+        *get_freg(env, n - S390_F0_REGNUM) = ldq_be_p(mem_buf);
         return 8;
     default:
         return 0;
@@ -167,11 +167,11 @@ static int cpu_write_vreg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_V0L_REGNUM ... S390_V15L_REGNUM:
-        env->vregs[n][1] = ldq_p(mem_buf + 8);
+        env->vregs[n][1] = ldq_be_p(mem_buf + 8);
         return 8;
     case S390_V16_REGNUM ... S390_V31_REGNUM:
-        env->vregs[n][0] = ldq_p(mem_buf);
-        env->vregs[n][1] = ldq_p(mem_buf + 8);
+        env->vregs[n][0] = ldq_be_p(mem_buf);
+        env->vregs[n][1] = ldq_be_p(mem_buf + 8);
         return 16;
     default:
         return 0;
@@ -203,7 +203,7 @@ static int cpu_write_c_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_C0_REGNUM ... S390_C15_REGNUM:
-        env->cregs[n] = ldq_p(mem_buf);
+        env->cregs[n] = ldq_be_p(mem_buf);
         if (tcg_enabled()) {
             tlb_flush(env_cpu(env));
         }
@@ -246,19 +246,19 @@ static int cpu_write_virt_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_VIRT_CKC_REGNUM:
-        env->ckc = ldq_p(mem_buf);
+        env->ckc = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     case S390_VIRT_CPUTM_REGNUM:
-        env->cputm = ldq_p(mem_buf);
+        env->cputm = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     case S390_VIRT_BEA_REGNUM:
-        env->gbea = ldq_p(mem_buf);
+        env->gbea = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     case S390_VIRT_PREFIX_REGNUM:
-        env->psa = ldq_p(mem_buf);
+        env->psa = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(cs);
         return 8;
     default:
@@ -298,19 +298,19 @@ static int cpu_write_virt_kvm_reg(CPUState *cs, uint8_t *mem_buf, int n)
 
     switch (n) {
     case S390_VIRT_KVM_PP_REGNUM:
-        env->pp = ldq_p(mem_buf);
+        env->pp = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     case S390_VIRT_KVM_PFT_REGNUM:
-        env->pfault_token = ldq_p(mem_buf);
+        env->pfault_token = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     case S390_VIRT_KVM_PFS_REGNUM:
-        env->pfault_select = ldq_p(mem_buf);
+        env->pfault_select = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     case S390_VIRT_KVM_PFC_REGNUM:
-        env->pfault_compare = ldq_p(mem_buf);
+        env->pfault_compare = ldq_be_p(mem_buf);
         cpu_synchronize_post_init(env_cpu(env));
         return 8;
     default:
@@ -338,7 +338,7 @@ static int cpu_write_gs_reg(CPUState *cs, uint8_t *mem_buf, int n)
     S390CPU *cpu = S390_CPU(cs);
     CPUS390XState *env = &cpu->env;
 
-    env->gscb[n] = ldq_p(mem_buf);
+    env->gscb[n] = ldq_be_p(mem_buf);
     cpu_synchronize_post_init(env_cpu(env));
     return 8;
 }
target/s390x/ioinst.c +1 -1
index bbe45a497a..a944f16c25 100644
@@ -603,7 +603,7 @@ static int chsc_sei_nt2_have_event(void)
 #define CHSC_SEI_NT2    (1ULL << 61)
 static void ioinst_handle_chsc_sei(ChscReq *req, ChscResp *res)
 {
-    uint64_t selection_mask = ldq_p(&req->param1);
+    uint64_t selection_mask = ldq_be_p(&req->param1);
     uint8_t *res_flags = (uint8_t *)res->data;
     int have_event = 0;
     int have_more = 0;
Signature · 1 line
2.46.1
#11 lore raw

[PULL 02/12] .gitlab-ci.d/cirrus: Drop support for macOS 13 (Ventura)

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

macOS 15 "Sequoia" was released on September 16, 2024 [1].

According to QEMU's support policy, we stop supporting the previous major release two years after the the new major release has been published. Time to remove support for macOS 13 (Ventura, released on October 2022, [2]).

Promote the macOS 14 job, which was only built manually, to be run by default.

[1] https://www.apple.com/newsroom/2024/09/macos-sequoia-is-available-today/
[2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/

Message-ID: <[email protected]>

---
 .gitlab-ci.d/cirrus.yml           | 17 -----------------
 .gitlab-ci.d/cirrus/macos-13.vars | 16 ----------------
 tests/lcitool/refresh             |  1 -
 3 files changed, 34 deletions(-)
 delete mode 100644 .gitlab-ci.d/cirrus/macos-13.vars
.gitlab-ci.d/cirrus.yml +0 -17
index e49e1b61f0..cee089be76 100644
@@ -60,22 +60,6 @@ x64-freebsd-14-build:
     CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,xtensa-softmmu
     TEST_TARGETS: check
 
-aarch64-macos-13-base-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: macos-13
-    CIRRUS_VM_INSTANCE_TYPE: macos_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
-    CIRRUS_VM_CPUS: 12
-    CIRRUS_VM_RAM: 24G
-    UPDATE_COMMAND: brew update
-    INSTALL_COMMAND: brew install
-    PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin
-    PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig
-    CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblazeel-softmmu,mips64-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4-softmmu,xtensaeb-softmmu
-    TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
-
 aarch64-macos-14-base-build:
   extends: .cirrus_build_job
   variables:
@@ -90,4 +74,3 @@ aarch64-macos-14-base-build:
     PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin
     PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig
     TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
-    QEMU_JOB_OPTIONAL: 1
.gitlab-ci.d/cirrus/macos-13.vars deleted +0 -16
deleted file mode 100644
index ac3fa3a847..0000000000
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool variables macos-13 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/opt/homebrew/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/opt/homebrew/bin/gmake'
-NINJA='/opt/homebrew/bin/ninja'
-PACKAGING_COMMAND='brew'
-PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd'
-PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli'
-PYTHON='/opt/homebrew/bin/python3'
tests/lcitool/refresh +0 -1
index a78219f7bc..5bc2edde7b 100755
@@ -202,7 +202,6 @@ try:
     # Cirrus packages lists for GitLab
     #
     generate_cirrus("freebsd-14")
-    generate_cirrus("macos-13")
     generate_cirrus("macos-14")
 
     #
Signature · 1 line
2.46.1
#12 lore raw

[PULL 05/12] gitlab-ci/build-oss-fuzz: print FAILED marker in case the test failed and run all tests

In reply to Thomas Huth

From: Michael Tokarev <[email protected]>

currently, if an oss-fuzz fails, the script does just exit 1 without any additional output, and looking at the build log in the gitlab ci it is not clear what actually failed, without looking at build-oss-fuzz script and seeing this exit 1.

Print easily recognizable error message about test failure, so it becomes obvious what exactly has failed.

While at it, continue running other tests even in case of failure, and exit non-zero if at least one test failed.

Message-ID: <[email protected]>

---
 .gitlab-ci.d/buildtest.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
.gitlab-ci.d/buildtest.yml +4 -1
index 669c980c4b..34d3f4e9ab 100644
@@ -628,12 +628,15 @@ build-oss-fuzz:
     - CC="clang" CXX="clang++" CFLAGS="-fsanitize=address"
       ./scripts/oss-fuzz/build.sh
     - export ASAN_OPTIONS="fast_unwind_on_malloc=0"
+    - failures=0
     - for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f
                       | grep -v slirp); do
         grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || continue ;
         echo Testing ${fuzzer} ... ;
-        "${fuzzer}" -runs=1 -seed=1 || exit 1 ;
+        "${fuzzer}" -runs=1 -seed=1 || { echo "FAILED:"" ${fuzzer} exit code is $?"; failures=$(($failures+1)); };
       done
+    - echo "Number of failures:"" $failures"
+    - test $failures = 0
 
 build-tci:
   extends: .native_build_job_template
Signature · 1 line
2.46.1
#13 lore raw
In reply to Thomas Huth
Quoted 21 lines · Thomas Huth

The following changes since commit b5ab62b3c0050612c7f9b0b4baeb44ebab42775a:

Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-10-04 19:28:37 +0100)

are available in the Git repository at:

https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-07

for you to fetch changes up to d841f720c98475c0f67695d99f27794bde69ed6e:

tests/functional: Bump timeout of some tests (2024-10-07 13:21:41 +0200)

----------------------------------------------------------------
* Mark "gluster" support as deprecated
* Update CI to use macOS 14 instead of 13, and add a macOS 15 job
* Use gitlab mirror for advent calendar test images (seems more stable)
* Bump timeouts of some tests
* Remove CRIS disassembler
* Some m68k and s390x cleanups with regards to load and store APIs

Quoted 1 line

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

This suggests it's moving back to the gitlab mirror for the advent calendar tests, but one CI test still failed trying to access http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz
and getting a 503 from it:

https://gitlab.com/qemu-project/qemu/-/jobs/8009902301

The clang-system test also hit a couple of timeouts:
https://gitlab.com/qemu-project/qemu/-/jobs/8009902206

61/109 qemu:qtest+qtest-alpha / qtest-alpha/qmp-cmd-test
TIMEOUT 60.10s killed by signal 15 SIGTERM
93/109 qemu:qtest+qtest-arm / qtest-arm/qmp-cmd-test
TIMEOUT 60.04s killed by signal 15 SIGTERM

which are presumably pre-existing intermittents, but I mention them here just FYI. Some of the other qmp-cmd-test runs in that job also came close to timing out:

102/109 qemu:qtest+qtest-m68k / qtest-m68k/qmp-cmd-test OK 56.56s 65 subtests passed
105/109 qemu:qtest+qtest-mips64 / qtest-mips64/qmp-cmd-test OK 53.74s 65 subtests passed
106/109 qemu:qtest+qtest-s390x / qtest-s390x/qmp-cmd-test OK 45.48s 65 subtests passed

so maybe we should add it to slow_tests with a 120s timeout...

thanks
-- PMM

#14 lore raw
Quoted 23 lines · Peter Maydell
Quoted 21 lines · Thomas Huth

The following changes since commit b5ab62b3c0050612c7f9b0b4baeb44ebab42775a:

Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-10-04 19:28:37 +0100)

are available in the Git repository at:

https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-07

for you to fetch changes up to d841f720c98475c0f67695d99f27794bde69ed6e:

tests/functional: Bump timeout of some tests (2024-10-07 13:21:41 +0200)

----------------------------------------------------------------
* Mark "gluster" support as deprecated
* Update CI to use macOS 14 instead of 13, and add a macOS 15 job
* Use gitlab mirror for advent calendar test images (seems more stable)
* Bump timeouts of some tests
* Remove CRIS disassembler
* Some m68k and s390x cleanups with regards to load and store APIs

Quoted 8 lines
Quoted 1 line

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

This suggests it's moving back to the gitlab mirror for the advent calendar tests, but one CI test still failed trying to access http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz
and getting a 503 from it:

https://gitlab.com/qemu-project/qemu/-/jobs/8009902301

On the rerun it managed to download:
https://gitlab.com/qemu-project/qemu/-/jobs/8011303154

Quoted 19 lines

The clang-system test also hit a couple of timeouts:
https://gitlab.com/qemu-project/qemu/-/jobs/8009902206

61/109 qemu:qtest+qtest-alpha / qtest-alpha/qmp-cmd-test
TIMEOUT 60.10s killed by signal 15 SIGTERM
93/109 qemu:qtest+qtest-arm / qtest-arm/qmp-cmd-test
TIMEOUT 60.04s killed by signal 15 SIGTERM

which are presumably pre-existing intermittents, but I mention them here just FYI. Some of the other qmp-cmd-test runs in that job also came close to timing out:

102/109 qemu:qtest+qtest-m68k / qtest-m68k/qmp-cmd-test OK 56.56s 65 subtests passed
105/109 qemu:qtest+qtest-mips64 / qtest-mips64/qmp-cmd-test OK 53.74s 65 subtests passed
106/109 qemu:qtest+qtest-s390x / qtest-s390x/qmp-cmd-test OK 45.48s 65 subtests passed

Quoted 2 lines

so maybe we should add it to slow_tests with a 120s timeout...

As expected, these are all intermittents; on the passing job:

https://gitlab.com/qemu-project/qemu/-/jobs/8011303114

they completed in 19s, 20s, 19s, 19s, 19s. So we're seeing factor-of-3 variation in job runtime on this k8s runner :-(

Anyway, I've pushed this pullreq; we can look at the above two things as follow-on fixes.

thanks
-- PMM

#15 lore raw
Quoted 24 lines · Peter Maydell
Quoted 23 lines · Peter Maydell
Quoted 21 lines · Thomas Huth

The following changes since commit b5ab62b3c0050612c7f9b0b4baeb44ebab42775a:

   Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-10-04 19:28:37 +0100)

are available in the Git repository at:

   https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-07

for you to fetch changes up to d841f720c98475c0f67695d99f27794bde69ed6e:

   tests/functional: Bump timeout of some tests (2024-10-07 13:21:41 +0200)

----------------------------------------------------------------
* Mark "gluster" support as deprecated
* Update CI to use macOS 14 instead of 13, and add a macOS 15 job
* Use gitlab mirror for advent calendar test images (seems more stable)
* Bump timeouts of some tests
* Remove CRIS disassembler
* Some m68k and s390x cleanups with regards to load and store APIs

Quoted 8 lines
Quoted 8 lines
Quoted 1 line

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

This suggests it's moving back to the gitlab mirror for the advent calendar tests, but one CI test still failed trying to access http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz
and getting a 503 from it:

   https://gitlab.com/qemu-project/qemu/-/jobs/8009902301

Yes, that day13.tar.gz is from 2023 which is not included in the mirror on gitlab (yet). If we continue to see failures with the original site, I can have a try to put it into the mirror repository, too.

Quoted 13 lines

On the rerun it managed to download:
https://gitlab.com/qemu-project/qemu/-/jobs/8011303154

Quoted 10 lines

The clang-system test also hit a couple of timeouts:

   https://gitlab.com/qemu-project/qemu/-/jobs/8009902206

61/109 qemu:qtest+qtest-alpha / qtest-alpha/qmp-cmd-test
TIMEOUT 60.10s killed by signal 15 SIGTERM
93/109 qemu:qtest+qtest-arm / qtest-arm/qmp-cmd-test
TIMEOUT 60.04s killed by signal 15 SIGTERM

which are presumably pre-existing intermittents, but I mention them here just FYI.

I neither had anything related to arm/alpha nor to qtests in my pull request, so yes, it's likely something pre-existing... maybe something from the previous pull requests? (or did you see these in the past already?)

Quoted 10 lines
Quoted 10 lines

Some of the other qmp-cmd-test
runs in that job also came close to timing out:

102/109 qemu:qtest+qtest-m68k / qtest-m68k/qmp-cmd-test OK 56.56s 65 subtests passed
105/109 qemu:qtest+qtest-mips64 / qtest-mips64/qmp-cmd-test OK 53.74s 65 subtests passed
106/109 qemu:qtest+qtest-s390x / qtest-s390x/qmp-cmd-test OK 45.48s 65 subtests passed

Quoted 2 lines
Quoted 2 lines

so maybe we should add it to slow_tests with a 120s timeout...

Ok, m68k and s390x have been touched by this PR ... but still, it's one qtest (qmp-cmd-test) that is failing for multiple targets, so it rather sounds like we've got a regression in one of the previous PRs?

Quoted 9 lines

As expected, these are all intermittents; on the passing job:

https://gitlab.com/qemu-project/qemu/-/jobs/8011303114

they completed in 19s, 20s, 19s, 19s, 19s. So we're seeing factor-of-3 variation in job runtime on this k8s runner :-(

Anyway, I've pushed this pullreq; we can look at the above two things as follow-on fixes.

Thanks!

Thomas

#16 lore raw
Quoted 12 lines · Thomas Huth
Quoted 10 lines · Peter Maydell
Quoted 10 lines

Some of the other qmp-cmd-test
runs in that job also came close to timing out:

102/109 qemu:qtest+qtest-m68k / qtest-m68k/qmp-cmd-test OK 56.56s 65 subtests passed
105/109 qemu:qtest+qtest-mips64 / qtest-mips64/qmp-cmd-test OK 53.74s 65 subtests passed
106/109 qemu:qtest+qtest-s390x / qtest-s390x/qmp-cmd-test OK 45.48s 65 subtests passed

Quoted 6 lines
Quoted 2 lines
Quoted 2 lines

so maybe we should add it to slow_tests with a 120s timeout...

Ok, m68k and s390x have been touched by this PR ... but still, it's one qtest (qmp-cmd-test) that is failing for multiple targets, so it rather sounds like we've got a regression in one of the previous PRs?

I think it's more likely that the k8s runners are just horrifically inconsistent about speed: they have been the flaky CI jobs in one way or another at least since I started doing pullreq handling for this release cycle.

If they reliably ran these jobs in 20s then there would be no issue, we would have tons of headroom between that and the 60s timeout. (My local dev box runs them in 13s, and it's not super high-powered.) If they reliably took 60s then we'd have fixed up the timeouts already (but that would imply a very slow CPU).

Our other option would be to use that meson "multiply all the timeouts by X" feature for the k8s jobs. Of course if it does go that slowly for the whole job then we run into the whole-job timeout...

Paolo: do you have any idea why our k8s runner jobs have such inconsistent performance ?

-- PMM