mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trivial patches for 2024-09-20

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmbtJJUACgkQgqpKJDse
 lHjduhAAoZSS5+n2f8C4w4oboH9e5JSa6UAuVqGgju10SHm+VNgg2rQeeTD+J8uU
 vXL5lZKIb/jPNfHmsS5Q8CsuzV0M+A0wCcZJHaK5clVc1pZWMqwPPT4g4BUyjURi
 ptvQXWtTM049DDWZZXo+AHPQtko7f58EThn9fLBo/1yJe2UlBwhZwahKm3h66kkb
 aO9TI9UVt06DmXAvPBK9IfgFjYzkUJRQnLLmJDXiLx6YbuixX+J2PjKav5NtacRE
 KUArkLNfB00ouFYDOoLAnn/l+VWKIYkREeKbfQIj95BoejqAKsDztq35+oiRQbCZ
 CznKgXMIBNJCCYvKJXAoZeslE3n7Q0dlJ3RppClBjzHOiZTM46yeTofzzFot7SCN
 ERuV1WcTo53ooDvpvlP9S3d3P2i62eL5JPXgpN57Zuy7PTYQkcDq5wMTWlvm/OBy
 /hzcmIm1KHrprjf/+aNRdeCT27Rf1YD8EiTaabgtTZA4r00DrTpopAJs8ncKfbrA
 nxa8e7lNorx/PcBSJJA5iB1Q05y19eoLJcrCFMieFuG2s/oubm+bXrAuNjsSuJbS
 Lq50dIO6UIJSrV59w0CTBDrOuVXUv8/jbqRCUBMEzbXfz8mW9e8PXL+evVa8rKfk
 6EMmDqC0/CmRrHT5uKkqTLtxcYGagdww3WIUB88UgARxydRPhu8=
 =++OB
 -----END PGP SIGNATURE-----

Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

trivial patches for 2024-09-20

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmbtJJUACgkQgqpKJDse
# lHjduhAAoZSS5+n2f8C4w4oboH9e5JSa6UAuVqGgju10SHm+VNgg2rQeeTD+J8uU
# vXL5lZKIb/jPNfHmsS5Q8CsuzV0M+A0wCcZJHaK5clVc1pZWMqwPPT4g4BUyjURi
# ptvQXWtTM049DDWZZXo+AHPQtko7f58EThn9fLBo/1yJe2UlBwhZwahKm3h66kkb
# aO9TI9UVt06DmXAvPBK9IfgFjYzkUJRQnLLmJDXiLx6YbuixX+J2PjKav5NtacRE
# KUArkLNfB00ouFYDOoLAnn/l+VWKIYkREeKbfQIj95BoejqAKsDztq35+oiRQbCZ
# CznKgXMIBNJCCYvKJXAoZeslE3n7Q0dlJ3RppClBjzHOiZTM46yeTofzzFot7SCN
# ERuV1WcTo53ooDvpvlP9S3d3P2i62eL5JPXgpN57Zuy7PTYQkcDq5wMTWlvm/OBy
# /hzcmIm1KHrprjf/+aNRdeCT27Rf1YD8EiTaabgtTZA4r00DrTpopAJs8ncKfbrA
# nxa8e7lNorx/PcBSJJA5iB1Q05y19eoLJcrCFMieFuG2s/oubm+bXrAuNjsSuJbS
# Lq50dIO6UIJSrV59w0CTBDrOuVXUv8/jbqRCUBMEzbXfz8mW9e8PXL+evVa8rKfk
# 6EMmDqC0/CmRrHT5uKkqTLtxcYGagdww3WIUB88UgARxydRPhu8=
# =++OB
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 20 Sep 2024 08:30:29 BST
# gpg:                using RSA key 64AA2AB531D56903366BFEF982AA4A243B1E9478
# gpg: Good signature from "Michael Tokarev <mjt@debian.org>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@tls.msk.ru>" [full]
# Primary key fingerprint: 9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
#      Subkey fingerprint: 64AA 2AB5 31D5 6903 366B  FEF9 82AA 4A24 3B1E 9478

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: (22 commits)
  license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
  license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later
  license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later
  license: Simplify GPL-2.0-or-later license descriptions
  tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag
  tests/bench: Rename test_akcipher_keys.inc -> test_akcipher_keys.c.inc
  target/hexagon: Rename macros.inc -> macros.h.inc
  tests/functional: Put the or1k_sim test into the slow category
  tests/qemu-iotests/testenv: Use the "r2d" machine for sh4/sh4eb
  tests/qemu-iotests/testenv: Use the "virt" machine for or1k
  util/cutils: Remove unused qemu_get_exec_dir
  hw/sysbus: Remove unused sysbus_mmio_unmap
  envlist: Remove unused envlist_parse
  hw/display: Fix mirrored output in dm163
  hw/virtio/Kconfig: Include vhost-user-scmi only on arm targets
  tests/unit: Really build pbkdf test on macOS
  hw/loongarch/virt: Add description for virt machine type
  hw/mips/jazz: fix typo in in-built NIC alias
  ppc: fix incorrect spelling of PowerMac
  linux-user/syscall.c: eliminate other explicit LFS usages
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-09-25 13:56:18 +01:00
commit a53b931645
103 changed files with 149 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/vdi.c
View File

@ -3,10 +3,12 @@
*
* Copyright (c) 2009, 2012 Stefan Weil
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) version 3 or any later version.
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of

4
docs/system/ppc/powermac.rst
View File

@ -4,8 +4,8 @@ PowerMac family boards (``g3beige``, ``mac99``)
Use the executable ``qemu-system-ppc`` to simulate a complete PowerMac
PowerPC system.
- ``g3beige`` Heathrow based PowerMAC
- ``mac99`` Mac99 based PowerMAC
- ``g3beige`` Heathrow based PowerMac
- ``mac99`` Mac99 based PowerMac
Supported devices
-----------------

2
gdbstub/gdbstub.c
View File

@ -20,7 +20,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"

2
gdbstub/syscalls.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2023 Linaro Ltd
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"

2
gdbstub/system.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2022 Linaro Ltd
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"

2
gdbstub/user-target.c
View File

@ -4,7 +4,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2022 Linaro Ltd
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"

2
gdbstub/user.c
View File

@ -6,7 +6,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2022 Linaro Ltd
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"

10
hw/core/sysbus.c
View File

@ -154,16 +154,6 @@ static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr,
}
}
void sysbus_mmio_unmap(SysBusDevice *dev, int n)
{
assert(n >= 0 && n < dev->num_mmio);
if (dev->mmio[n].addr != (hwaddr)-1) {
memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory);
dev->mmio[n].addr = (hwaddr)-1;
}
}
void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr)
{
sysbus_mmio_map_common(dev, n, addr, false, 0);

2
hw/core/uboot_image.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* (C) Copyright 2008 Semihalf
*

2
hw/display/dm163.c
View File

@ -271,7 +271,7 @@ static uint32_t *update_display_of_row(DM163State *s, uint32_t *dest,
unsigned row)
{
for (unsigned _ = 0; _ < LED_SQUARE_SIZE; _++) {
for (int x = 0; x < RGB_MATRIX_NUM_COLS * LED_SQUARE_SIZE; x++) {
for (int x = RGB_MATRIX_NUM_COLS * LED_SQUARE_SIZE - 1; x >= 0; x--) {
/* UI layer guarantees that there's 32 bits per pixel (Mar 2024) */
*dest++ = s->buffer[s->buffer_idx_of_row[row]][x / LED_SQUARE_SIZE];
}

1
hw/loongarch/virt.c
View File

@ -1403,6 +1403,7 @@ static void virt_class_init(ObjectClass *oc, void *data)
mc->init = virt_init;
mc->default_cpu_type = LOONGARCH_CPU_TYPE_NAME("la464");
mc->default_ram_id = "loongarch.ram";
mc->desc = "QEMU LoongArch Virtual Machine";
mc->max_cpus = LOONGARCH_MAX_CPUS;
mc->is_default = 1;
mc->default_kernel_irqchip_split = false;

2
hw/m68k/bootinfo.h
View File

@ -1,5 +1,5 @@
/*
* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
*
* Bootinfo tags from linux bootinfo.h and bootinfo-mac.h:
* This is an easily parsable and extendable structure containing all

2
hw/mips/jazz.c
View File

@ -128,7 +128,7 @@ static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr,
uint8_t *prom;
NICInfo *nd;
nd = qemu_find_nic_info("dp8393x", true, "dp82932");
nd = qemu_find_nic_info("dp8393x", true, "dp83932");
if (!nd) {
return;
}

2
hw/net/cadence_gem.c
View File

@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
#include <zlib.h> /* For crc32 */
#include <zlib.h> /* for crc32 */
#include "hw/irq.h"
#include "hw/net/cadence_gem.h"

2
hw/net/dp8393x.c
View File

@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "qom/object.h"
#include "trace.h"

4
hw/net/eepro100.c
View File

@ -6,10 +6,12 @@
* Portions of the code are copies from grub / etherboot eepro100.c
* and linux e100.c.
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) version 3 or any later version.
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of

3
hw/net/ftgmac100.c
View File

@ -24,8 +24,7 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
/* For crc32 */
#include <zlib.h>
#include <zlib.h> /* for crc32 */
/*
* FTGMAC100 registers

2
hw/net/i82596.c
View File

@ -19,7 +19,7 @@
#include "qemu/module.h"
#include "trace.h"
#include "i82596.h"
#include <zlib.h> /* For crc32 */
#include <zlib.h> /* for crc32 */
#if defined(ENABLE_DEBUG)
#define DBG(x) x

2
hw/net/igb_regs.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* This is copied + edited from kernel header files in
* drivers/net/ethernet/intel/igb

3
hw/net/imx_fec.c
View File

@ -33,8 +33,7 @@
#include "net/eth.h"
#include "trace.h"
/* For crc32 */
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#define IMX_MAX_DESC 1024

3
hw/net/lan9118.c
View File

@ -22,8 +22,7 @@
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
/* For crc32 */
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "qom/object.h"
//#define DEBUG_LAN9118

3
hw/net/mcf_fec.c
View File

@ -16,8 +16,7 @@
#include "hw/net/mii.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
/* For crc32 */
#include <zlib.h>
#include <zlib.h> /* for crc32 */
//#define DEBUG_FEC 1

3
hw/net/npcm7xx_emc.c
View File

@ -29,8 +29,7 @@
#include "qemu/osdep.h"
/* For crc32 */
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "hw/irq.h"
#include "hw/qdev-clock.h"

4
hw/net/rtl8139.c
View File

@ -48,10 +48,8 @@
* 2011-Mar-22 Benjamin Poirier: Implemented VLAN offloading
*/
/* For crc32 */
#include "qemu/osdep.h"
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "hw/pci/pci_device.h"
#include "hw/qdev-properties.h"

3
hw/net/smc91c111.c
View File

@ -17,8 +17,7 @@
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
/* For crc32 */
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "qom/object.h"
/* Number of 2k memory pages available. */

2
hw/net/stellaris_enet.c
View File

@ -15,7 +15,7 @@
#include "net/net.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "qom/object.h"
//#define DEBUG_STELLARIS_ENET 1

2
hw/nvram/fw_cfg-acpi.c
View File

@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0+
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Add fw_cfg device in DSDT
*

2
hw/nvram/mac_nvram.c
View File

@ -35,7 +35,7 @@
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "trace.h"
#include <zlib.h>
#include <zlib.h> /* for adler32 */
#define DEF_SYSTEM_SIZE 0xc10

2
hw/ppc/mac_newworld.c
View File

@ -571,7 +571,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
mc->desc = "Mac99 based PowerMAC";
mc->desc = "Mac99 based PowerMac";
mc->init = ppc_core99_init;
mc->block_default_type = IF_IDE;
/* SMP is not supported currently */

2
hw/ppc/mac_oldworld.c
View File

@ -411,7 +411,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
mc->desc = "Heathrow based PowerMAC";
mc->desc = "Heathrow based PowerMac";
mc->init = ppc_heathrow_init;
mc->block_default_type = IF_IDE;
/* SMP is not supported currently */

4
hw/ppc/rs6000_mc.c
View File

@ -3,10 +3,12 @@
*
* Copyright (c) 2017 Hervé Poussineau
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) version 3 or any later version.
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of

2
hw/virtio/Kconfig
View File

@ -109,4 +109,4 @@ config VHOST_USER_SND
config VHOST_USER_SCMI
bool
default y
depends on VIRTIO && VHOST_USER
depends on VIRTIO && VHOST_USER && ARM

2
hw/virtio/virtio-acpi.c
View File

@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0+
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* virtio ACPI Support
*

2
include/gdbstub/syscalls.h
View File

@ -3,7 +3,7 @@
*
* Copyright (c) 2023 Linaro Ltd
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef _SYSCALLS_H_

2
include/gdbstub/user.h
View File

@ -3,7 +3,7 @@
*
* Copyright (c) 2022 Linaro Ltd
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef GDBSTUB_USER_H

2
include/hw/nvram/fw_cfg_acpi.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* ACPI support for fw_cfg
*

1
include/hw/sysbus.h
View File

@ -82,7 +82,6 @@ qemu_irq sysbus_get_connected_irq(SysBusDevice *dev, int n);
void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);
void sysbus_mmio_map_overlap(SysBusDevice *dev, int n, hwaddr addr,
int priority);
void sysbus_mmio_unmap(SysBusDevice *dev, int n);
bool sysbus_realize(SysBusDevice *dev, Error **errp);
bool sysbus_realize_and_unref(SysBusDevice *dev, Error **errp);

2
include/hw/usb/dwc2-regs.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */
/*
* Imported from the Linux kernel file drivers/usb/dwc2/hw.h, commit
* a89bae709b3492b478480a2c9734e7e9393b279c ("usb: dwc2: Move

2
include/hw/virtio/virtio-acpi.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* ACPI support for virtio
*/

2
include/qemu/crc-ccitt.h
View File

@ -8,7 +8,7 @@
*
* From Linux kernel v5.10 include/linux/crc-ccitt.h
*
* SPDX-License-Identifier: GPL-2.0
* SPDX-License-Identifier: GPL-2.0-only
*/
#ifndef CRC_CCITT_H

5
include/qemu/cutils.h
View File

@ -241,13 +241,10 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n);
int qemu_pstrcmp0(const char **str1, const char **str2);
/* Find program directory, and save it for later usage with
* qemu_get_exec_dir().
* get_relocated_path().
* Try OS specific API first, if not working, parse from argv0. */
void qemu_init_exec_dir(const char *argv0);
/* Get the saved exec dir. */
const char *qemu_get_exec_dir(void);
/**
* get_relocated_path:
* @dir: the directory (typically a `CONFIG_*DIR` variable) to be relocated.

2
include/qemu/envlist.h
View File

@ -7,8 +7,6 @@ envlist_t *envlist_create(void);
void envlist_free(envlist_t *);
int envlist_setenv(envlist_t *, const char *);
int envlist_unsetenv(envlist_t *, const char *);
int envlist_parse_set(envlist_t *, const char *);
int envlist_parse_unset(envlist_t *, const char *);
char **envlist_to_environ(const envlist_t *, size_t *);
#endif /* ENVLIST_H */

4
include/qemu/timed-average.h
View File

@ -8,10 +8,12 @@
* Benoît Canet <benoit.canet@nodalink.com>
* Alberto Garcia <berto@igalia.com>
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) version 3 or any later version.
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of

2
linux-user/alpha/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for alpha
#

2
linux-user/alpha/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/arm/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/hppa/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for parisc
#

2
linux-user/hppa/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/i386/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/m68k/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for m68k
#

2
linux-user/m68k/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/microblaze/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for microblaze
#

2
linux-user/microblaze/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/mips/syscall_o32.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for mips
#

2
linux-user/mips/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/mips64/syscall_n32.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for mips
#

2
linux-user/mips64/syscall_n64.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for mips
#

2
linux-user/mips64/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/ppc/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for powerpc
#

2
linux-user/ppc/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/s390x/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# System call table for s390
#

2
linux-user/s390x/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/sh4/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for sh
#

2
linux-user/sh4/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/sparc/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for sparc
#

2
linux-user/sparc/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

78
linux-user/syscall.c
View File

@ -759,10 +759,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff,
* the libc function.
*/
#define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__)
/* Similarly for fcntl. Note that callers must always:
* pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK
* use the flock64 struct rather than unsuffixed flock
* This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts.
/* Similarly for fcntl. Since we always build with LFS enabled,
* we should be using the 64-bit structures automatically.
*/
#ifdef __NR_fcntl64
#define safe_fcntl(...) safe_syscall(__NR_fcntl64, __VA_ARGS__)
@ -6722,13 +6720,13 @@ static int target_to_host_fcntl_cmd(int cmd)
ret = cmd;
break;
case TARGET_F_GETLK:
ret = F_GETLK64;
ret = F_GETLK;
break;
case TARGET_F_SETLK:
ret = F_SETLK64;
ret = F_SETLK;
break;
case TARGET_F_SETLKW:
ret = F_SETLKW64;
ret = F_SETLKW;
break;
case TARGET_F_GETOWN:
ret = F_GETOWN;
@ -6744,13 +6742,13 @@ static int target_to_host_fcntl_cmd(int cmd)
break;
#if TARGET_ABI_BITS == 32
case TARGET_F_GETLK64:
ret = F_GETLK64;
ret = F_GETLK;
break;
case TARGET_F_SETLK64:
ret = F_SETLK64;
ret = F_SETLK;
break;
case TARGET_F_SETLKW64:
ret = F_SETLKW64;
ret = F_SETLKW;
break;
#endif
case TARGET_F_SETLEASE:
@ -6804,8 +6802,8 @@ static int target_to_host_fcntl_cmd(int cmd)
* them to 5, 6 and 7 before making the syscall(). Since we make the
* syscall directly, adjust to what is supported by the kernel.
*/
if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
ret -= F_GETLK64 - 5;
if (ret >= F_GETLK && ret <= F_SETLKW) {
ret -= F_GETLK - 5;
}
#endif
@ -6838,7 +6836,7 @@ static int host_to_target_flock(int type)
return type;
}
static inline abi_long copy_from_user_flock(struct flock64 *fl,
static inline abi_long copy_from_user_flock(struct flock *fl,
abi_ulong target_flock_addr)
{
struct target_flock *target_fl;
@ -6863,7 +6861,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
}
static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
const struct flock64 *fl)
const struct flock *fl)
{
struct target_flock *target_fl;
short l_type;
@ -6882,8 +6880,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
return 0;
}
typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
#if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
struct target_oabi_flock64 {
@ -6894,7 +6892,7 @@ struct target_oabi_flock64 {
abi_int l_pid;
} QEMU_PACKED;
static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
abi_ulong target_flock_addr)
{
struct target_oabi_flock64 *target_fl;
@ -6919,7 +6917,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
}
static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
const struct flock64 *fl)
const struct flock *fl)
{
struct target_oabi_flock64 *target_fl;
short l_type;
@ -6939,7 +6937,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
}
#endif
static inline abi_long copy_from_user_flock64(struct flock64 *fl,
static inline abi_long copy_from_user_flock64(struct flock *fl,
abi_ulong target_flock_addr)
{
struct target_flock64 *target_fl;
@ -6964,7 +6962,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
}
static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
const struct flock64 *fl)
const struct flock *fl)
{
struct target_flock64 *target_fl;
short l_type;
@ -6985,7 +6983,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
{
struct flock64 fl64;
struct flock fl;
#ifdef F_GETOWN_EX
struct f_owner_ex fox;
struct target_f_owner_ex *target_fox;
@ -6998,45 +6996,45 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
switch(cmd) {
case TARGET_F_GETLK:
ret = copy_from_user_flock(&fl64, arg);
ret = copy_from_user_flock(&fl, arg);
if (ret) {
return ret;
}
ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
ret = get_errno(safe_fcntl(fd, host_cmd, &fl));
if (ret == 0) {
ret = copy_to_user_flock(arg, &fl64);
ret = copy_to_user_flock(arg, &fl);
}
break;
case TARGET_F_SETLK:
case TARGET_F_SETLKW:
ret = copy_from_user_flock(&fl64, arg);
ret = copy_from_user_flock(&fl, arg);
if (ret) {
return ret;
}
ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
ret = get_errno(safe_fcntl(fd, host_cmd, &fl));
break;
case TARGET_F_GETLK64:
case TARGET_F_OFD_GETLK:
ret = copy_from_user_flock64(&fl64, arg);
ret = copy_from_user_flock64(&fl, arg);
if (ret) {
return ret;
}
ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
ret = get_errno(safe_fcntl(fd, host_cmd, &fl));
if (ret == 0) {
ret = copy_to_user_flock64(arg, &fl64);
ret = copy_to_user_flock64(arg, &fl);
}
break;
case TARGET_F_SETLK64:
case TARGET_F_SETLKW64:
case TARGET_F_OFD_SETLK:
case TARGET_F_OFD_SETLKW:
ret = copy_from_user_flock64(&fl64, arg);
ret = copy_from_user_flock64(&fl, arg);
if (ret) {
return ret;
}
ret = get_errno(safe_fcntl(fd, host_cmd, &fl64));
ret = get_errno(safe_fcntl(fd, host_cmd, &fl));
break;
case TARGET_F_GETFL:
@ -7267,7 +7265,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
arg2 = arg3;
arg3 = arg4;
}
return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
}
#endif
@ -7281,7 +7279,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
arg2 = arg3;
arg3 = arg4;
}
return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
}
#endif
@ -8666,7 +8664,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
void *tdirp;
int hlen, hoff, toff;
int hreclen, treclen;
off64_t prev_diroff = 0;
off_t prev_diroff = 0;
hdirp = g_try_malloc(count);
if (!hdirp) {
@ -8719,7 +8717,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
* Return what we have, resetting the file pointer to the
* location of the first record not returned.
*/
lseek64(dirfd, prev_diroff, SEEK_SET);
lseek(dirfd, prev_diroff, SEEK_SET);
break;
}
@ -8753,7 +8751,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
void *tdirp;
int hlen, hoff, toff;
int hreclen, treclen;
off64_t prev_diroff = 0;
off_t prev_diroff = 0;
hdirp = g_try_malloc(count);
if (!hdirp) {
@ -8795,7 +8793,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
* Return what we have, resetting the file pointer to the
* location of the first record not returned.
*/
lseek64(dirfd, prev_diroff, SEEK_SET);
lseek(dirfd, prev_diroff, SEEK_SET);
break;
}
@ -11526,7 +11524,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
return -TARGET_EFAULT;
}
}
ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, ret);
return ret;
case TARGET_NR_pwrite64:
@ -11543,7 +11541,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
return -TARGET_EFAULT;
}
}
ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, 0);
return ret;
#endif
@ -12403,7 +12401,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
case TARGET_NR_fcntl64:
{
int cmd;
struct flock64 fl;
struct flock fl;
from_flock64_fn *copyfrom = copy_from_user_flock64;
to_flock64_fn *copyto = copy_to_user_flock64;

2
linux-user/x86_64/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

2
linux-user/xtensa/syscall.tbl
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
#
# system call numbers and entry vectors for xtensa
#

2
linux-user/xtensa/syscallhdr.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"

4
qemu.nsi
View File

@ -7,7 +7,7 @@
; This program is free software: you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
; the Free Software Foundation, either version 2 of the License, or
; (at your option) version 3 or any later version.
; (at your option) any later version.
;
; This program is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -16,6 +16,8 @@
;
; You should have received a copy of the GNU General Public License
; along with this program. If not, see <http://www.gnu.org/licenses/>.
;
; SPDX-License-Identifier: GPL-2.0-or-later
; NSIS_WIN32_MAKENSIS

2
scripts/kernel-doc
View File

@ -1,5 +1,5 @@
#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0-only
use warnings;
use strict;

2
target/alpha/cpu-param.h
View File

@ -2,7 +2,7 @@
* Alpha cpu parameters for qemu.
*
* Copyright (c) 2007 Jocelyn Mayer
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef ALPHA_CPU_PARAM_H

2
target/arm/cpu-param.h
View File

@ -2,7 +2,7 @@
* ARM cpu parameters for qemu.
*
* Copyright (c) 2003 Fabrice Bellard
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef ARM_CPU_PARAM_H

2
target/arm/helper.c
View File

@ -19,7 +19,7 @@
#include "qemu/crc32c.h"
#include "qemu/qemu-print.h"
#include "exec/exec-all.h"
#include <zlib.h> /* For crc32 */
#include <zlib.h> /* for crc32 */
#include "hw/irq.h"
#include "sysemu/cpu-timers.h"
#include "sysemu/kvm.h"

2
target/arm/tcg/helper-a64.c
View File

@ -33,7 +33,7 @@
#include "qemu/int128.h"
#include "qemu/atomic128.h"
#include "fpu/softfloat.h"
#include <zlib.h> /* For crc32 */
#include <zlib.h> /* for crc32 */
/* C2.4.7 Multiply and divide */
/* special cases for 0 and LLONG_MIN are mandated by the standard */

2
target/hexagon/gen_idef_parser_funcs.py
View File

@ -50,7 +50,7 @@ def main():
tagimms = hex_common.get_tagimms()
with open(sys.argv[-1], "w") as f:
f.write('#include "macros.inc"\n\n')
f.write('#include "macros.h.inc"\n\n')
for tag in hex_common.tags:
## Skip the priv instructions

4
target/hexagon/idef-parser/README.rst
View File

@ -138,7 +138,7 @@ we obtain the pseudo code
with macros such as ``fJUMPR`` intact.
The second step is to expand macros into a form suitable for our parser.
These macros are defined in ``idef-parser/macros.inc`` and the step is
These macros are defined in ``idef-parser/macros.h.inc`` and the step is
carried out by the ``prepare`` script which runs the C preprocessor on
``idef_parser_input.h.inc`` to produce
``idef_parser_input.preprocessed.h.inc``.
@ -266,7 +266,7 @@ in plain C is defined as
#define fABS(A) (((A) < 0) ? (-(A)) : (A))
and returns the absolute value of the argument ``A``. This macro is not included
in ``idef-parser/macros.inc`` and as such is not expanded and kept as a "call"
in ``idef-parser/macros.h.inc`` and as such is not expanded and kept as a "call"
``fABS(...)``. Reason being, that ``fABS`` is easier to match and map to
``tcg_gen_abs_<width>``, compared to the full ternary expression above. Loads of
macros in ``macros.h`` are kept unexpanded to aid in parsing, as seen in the

0
target/hexagon/idef-parser/macros.inc → target/hexagon/idef-parser/macros.h.inc
View File

2
target/hexagon/meson.build
View File

@ -284,7 +284,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs
'idef_parser_input.preprocessed.h.inc',
output: 'idef_parser_input.preprocessed.h.inc',
input: idef_parser_input_generated,
depend_files: [idef_parser_dir / 'macros.inc'],
depend_files: [idef_parser_dir / 'macros.h.inc'],
command: [idef_parser_dir / 'prepare', '@INPUT@', '-I' + idef_parser_dir, '-o', '@OUTPUT@'],
)

2
target/hppa/cpu-param.h
View File

@ -2,7 +2,7 @@
* PA-RISC cpu parameters for qemu.
*
* Copyright (c) 2016 Richard Henderson <rth@twiddle.net>
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef HPPA_CPU_PARAM_H

2
target/i386/cpu-param.h
View File

@ -2,7 +2,7 @@
* i386 cpu parameters for qemu.
*
* Copyright (c) 2003 Fabrice Bellard
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef I386_CPU_PARAM_H

2
target/loongarch/tcg/op_helper.c
View File

@ -14,7 +14,7 @@
#include "exec/cpu_ldst.h"
#include "internals.h"
#include "qemu/crc32c.h"
#include <zlib.h>
#include <zlib.h> /* for crc32 */
#include "cpu-csr.h"
/* Exceptions helpers */

2
target/m68k/cpu-param.h
View File

@ -2,7 +2,7 @@
* m68k cpu parameters for qemu.
*
* Copyright (c) 2005-2007 CodeSourcery
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef M68K_CPU_PARAM_H

2
target/microblaze/cpu-param.h
View File

@ -2,7 +2,7 @@
* MicroBlaze cpu parameters for qemu.
*
* Copyright (c) 2009 Edgar E. Iglesias
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef MICROBLAZE_CPU_PARAM_H

2
target/mips/cpu-param.h
View File

@ -1,7 +1,7 @@
/*
* MIPS cpu parameters for qemu.
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef MIPS_CPU_PARAM_H

2
target/openrisc/cpu-param.h
View File

@ -2,7 +2,7 @@
* OpenRISC cpu parameters for qemu.
*
* Copyright (c) 2011-2012 Jia Liu <proljc@gmail.com>
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef OPENRISC_CPU_PARAM_H

2
target/ppc/cpu-param.h
View File

@ -2,7 +2,7 @@
* PowerPC cpu parameters for qemu.
*
* Copyright (c) 2007 Jocelyn Mayer
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef PPC_CPU_PARAM_H

2
target/riscv/cpu-param.h
View File

@ -2,7 +2,7 @@
* RISC-V cpu parameters for qemu.
*
* Copyright (c) 2017-2018 SiFive, Inc.
* SPDX-License-Identifier: GPL-2.0+
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef RISCV_CPU_PARAM_H

2
target/s390x/cpu-param.h
View File

@ -2,7 +2,7 @@
* S/390 cpu parameters for qemu.
*
* Copyright (c) 2009 Ulrich Hecht
* SPDX-License-Identifier: GPL-2.0+
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef S390_CPU_PARAM_H

2
target/sh4/cpu-param.h
View File

@ -2,7 +2,7 @@
* SH4 cpu parameters for qemu.
*
* Copyright (c) 2005 Samuel Tardieu
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef SH4_CPU_PARAM_H

2
target/sparc/cpu-param.h
View File

@ -1,7 +1,7 @@
/*
* Sparc cpu parameters for qemu.
*
* SPDX-License-Identifier: LGPL-2.0+
* SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef SPARC_CPU_PARAM_H

2
target/sparc/insns.decode
View File

@ -1,4 +1,4 @@
# SPDX-License-Identifier: LGPL-2.0+
# SPDX-License-Identifier: LGPL-2.0-or-later
#
# Sparc instruction decode definitions.
# Copyright (c) 2023 Richard Henderson <rth@twiddle.net>

2
tests/bench/benchmark-crypto-akcipher.c
View File

@ -16,7 +16,7 @@
#include "crypto/akcipher.h"
#include "standard-headers/linux/virtio_crypto.h"
#include "test_akcipher_keys.inc"
#include "test_akcipher_keys.c.inc"
static QCryptoAkCipher *create_rsa_akcipher(const uint8_t *priv_key,
size_t keylen,

0
tests/bench/test_akcipher_keys.inc → tests/bench/test_akcipher_keys.c.inc
View File

2
tests/functional/meson.build
View File

@ -92,7 +92,7 @@ tests_mips64el_system_thorough = [
'mips64el_malta',
]
tests_or1k_system_quick = [
tests_or1k_system_thorough = [
'or1k_sim',
]

2
tests/functional/test_netdev_ethtool.py
View File

@ -5,7 +5,7 @@
# This test leverages ethtool's --test sequence to validate network
# device behaviour.
#
# SPDX-License-Identifier: GPL-2.0-or-late
# SPDX-License-Identifier: GPL-2.0-or-later
from unittest import skip
from qemu_test import QemuSystemTest, Asset

3
tests/qemu-iotests/testenv.py
View File

@ -240,9 +240,12 @@ class TestEnv(ContextManager['TestEnv']):
('aarch64', 'virt'),
('avr', 'mega2560'),
('m68k', 'virt'),
('or1k', 'virt'),
('riscv32', 'virt'),
('riscv64', 'virt'),
('rx', 'gdbsim-r5f562n8'),
('sh4', 'r2d'),
('sh4eb', 'r2d'),
('tricore', 'tricore_testboard')
)
for suffix, machine in machine_map:

2
tests/tcg/loongarch64/system/regdef.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2021 Loongson Technology Corporation Limited
*/

2
tests/unit/test-crypto-pbkdf.c
View File

@ -25,7 +25,7 @@
#include <sys/resource.h>
#endif
#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWNI)
#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWIN)
#include "crypto/pbkdf.h"
typedef struct QCryptoPbkdfTestData QCryptoPbkdfTestData;

Some files were not shown because too many files have changed in this diff Show More