mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 07:13:54 -06:00
* Replace YAML anchors by extends in the gitlab-CI yaml files
* Many small qtest fixes (e.g. to fix issues discovered by Coverity) * Poison more config switches in common code * Fix the failing Travis-CI and Cirrus-CI tasks -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmCeXFMRHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbUV7g//VRxN74v2pO6zSsSNavYTkMa3jZE1Io3l w9lsOr3DM0HIMhyEMwSJsiygj0s8TNanUtFBHfDfo1k1gmZYd5FiM1sB7ZB/sB/S 9Q9wjmeV2NMG7pcr9zLmiJaEM2LGfGbso44/m0c+gpSyxzg2TeH7sF+38AUZI9/R J6/gOzIs4WWdSV4f8kp+YPPQCyOtxZsfxDuk1z1fKsBgXE5iEBUqYyyZUm4gYJkN 4ALmqc/NVeLszt08qkPHxwXQc488nCJP31psxx6MQ7toKfCAamT07Pp3oi70cakC y+HVfsIHc7SxaZyj8sbJCU3LJHwDd8N82ydJUrv216qDffb38fNb+m6y9mcYy2MH C25uGe9mucTuTP1WIttC6nCKg/MCgi4PWIzqEhkeKj3TxpTUJJP+BUIfSubV38Gc T+XUCNkWWW8sTeRiyE3m9pEZ+gz1MFubaIr/Owephch1SjRYn4zUwJFHHi3I4PY4 7XjEo8y2M9tKckW3pCfYi+aIDzC1DcRtzvXUGtdemX5xVjTAGlKkFLWl/brdCn2U y+JrwrL8cQ3Fy7bXzmK6m9mmhcIW6PcSOBE7RnSESyKzqM5VBSBgnjMqnHcP3FrV FYzihTCDcFKy3ELUe3Kbc1TgG/07stQs9xInGXN7ZFsIwadfHgoNVQ6JpOqq1oQa fvmLPBhq+a4= =QZuG -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-05-14' into staging * Replace YAML anchors by extends in the gitlab-CI yaml files * Many small qtest fixes (e.g. to fix issues discovered by Coverity) * Poison more config switches in common code * Fix the failing Travis-CI and Cirrus-CI tasks # gpg: Signature made Fri 14 May 2021 12:17:39 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/thuth-gitlab/tags/pull-request-2021-05-14: cirrus.yml: Fix the MSYS2 task pc-bios/s390-ccw: Fix inline assembly for older versions of Clang tests/qtest/migration-test: Use g_autofree to avoid leaks on error paths configure: Poison all current target-specific #defines migration: Move populate_vfio_info() into a separate file include/sysemu: Poison all accelerator CONFIG switches in common code tests: Avoid side effects inside g_assert() arguments tests/qtest/rtc-test: Remove pointless NULL check tests/qtest/tpm-util.c: Free memory with correct free function tests/migration-test: Fix "true" vs true tests/qtest/npcm7xx_pwm-test.c: Avoid g_assert_true() for non-test assertions tests/qtest/ahci-test.c: Calculate iso_size with 64-bit arithmetic util/compatfd.c: Replaced a malloc call with g_malloc. libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm docs/devel/qgraph: add troubleshooting information libqos/qgraph: fix "UNAVAILBLE" typo gitlab-ci: Replace YAML anchors by extends (native_test_job) gitlab-ci: Replace YAML anchors by extends (native_build_job) gitlab-ci: Replace YAML anchors by extends (container_job) tests/docker/dockerfiles: Add ccache to containers where it was missing Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
9b1e81d1c2
32 changed files with 243 additions and 138 deletions
|
|
@ -9,6 +9,7 @@ ENV PACKAGES \
|
|||
alsa-lib-dev \
|
||||
bash \
|
||||
binutils \
|
||||
ccache \
|
||||
coreutils \
|
||||
curl-dev \
|
||||
g++ \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
FROM fedora:33
|
||||
ENV PACKAGES \
|
||||
bzip2 \
|
||||
ccache \
|
||||
diffutils \
|
||||
findutils \
|
||||
gcc \
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ FROM fedora:33
|
|||
ENV PACKAGES \
|
||||
bc \
|
||||
bzip2 \
|
||||
ccache \
|
||||
diffutils \
|
||||
findutils \
|
||||
gcc \
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ FROM fedora:33
|
|||
ENV PACKAGES \
|
||||
bc \
|
||||
bzip2 \
|
||||
ccache \
|
||||
diffutils \
|
||||
findutils \
|
||||
gcc \
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ ENV PACKAGES \
|
|||
bc \
|
||||
brlapi-devel \
|
||||
bzip2 \
|
||||
ccache \
|
||||
cyrus-sasl-devel \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
|
|
|
|||
|
|
@ -1491,14 +1491,14 @@ static void ahci_test_cdrom(int nsectors, bool dma, uint8_t cmd,
|
|||
char *iso;
|
||||
int fd;
|
||||
AHCIOpts opts = {
|
||||
.size = (ATAPI_SECTOR_SIZE * nsectors),
|
||||
.size = ((uint64_t)ATAPI_SECTOR_SIZE * nsectors),
|
||||
.atapi = true,
|
||||
.atapi_dma = dma,
|
||||
.post_cb = ahci_cb_cmp_buff,
|
||||
.set_bcl = override_bcl,
|
||||
.bcl = bcl,
|
||||
};
|
||||
uint64_t iso_size = ATAPI_SECTOR_SIZE * (nsectors + 1);
|
||||
uint64_t iso_size = (uint64_t)ATAPI_SECTOR_SIZE * (nsectors + 1);
|
||||
|
||||
/* Prepare ISO and fill 'tx' buffer */
|
||||
fd = prepare_iso(iso_size, &tx, &iso);
|
||||
|
|
|
|||
|
|
@ -98,7 +98,8 @@ static void bt_wait_b_busy(void)
|
|||
{
|
||||
unsigned int count = 1000;
|
||||
while (IPMI_BT_CTLREG_GET_B_BUSY() != 0) {
|
||||
g_assert(--count != 0);
|
||||
--count;
|
||||
g_assert(count != 0);
|
||||
usleep(100);
|
||||
}
|
||||
}
|
||||
|
|
@ -107,7 +108,8 @@ static void bt_wait_b2h_atn(void)
|
|||
{
|
||||
unsigned int count = 1000;
|
||||
while (IPMI_BT_CTLREG_GET_B2H_ATN() == 0) {
|
||||
g_assert(--count != 0);
|
||||
--count;
|
||||
g_assert(count != 0);
|
||||
usleep(100);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,8 @@ static void kcs_wait_ibf(void)
|
|||
{
|
||||
unsigned int count = 1000;
|
||||
while (IPMI_KCS_CMDREG_GET_IBF() != 0) {
|
||||
g_assert(--count != 0);
|
||||
--count;
|
||||
g_assert(count != 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -844,7 +844,7 @@ void qos_dump_graph(void)
|
|||
}
|
||||
qos_printf_literal("type=%d cmd_line='%s' [%s]\n",
|
||||
node->type, node->command_line,
|
||||
node->available ? "available" : "UNAVAILBLE"
|
||||
node->available ? "available" : "UNAVAILABLE"
|
||||
);
|
||||
}
|
||||
g_list_free(keys);
|
||||
|
|
|
|||
|
|
@ -907,7 +907,14 @@ const char *qtest_get_arch(void)
|
|||
|
||||
if (!end) {
|
||||
fprintf(stderr, "Can't determine architecture from binary name.\n");
|
||||
abort();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (!strstr(qemu, "-system-")) {
|
||||
fprintf(stderr, "QTEST_QEMU_BINARY must end with *-system-<arch> "
|
||||
"where 'arch' is the target\narchitecture (x86_64, aarch64, "
|
||||
"etc).\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
return end + 1;
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ static int pwm_module_index(const PWMModule *module)
|
|||
{
|
||||
ptrdiff_t diff = module - pwm_module_list;
|
||||
|
||||
g_assert_true(diff >= 0 && diff < ARRAY_SIZE(pwm_module_list));
|
||||
g_assert(diff >= 0 && diff < ARRAY_SIZE(pwm_module_list));
|
||||
|
||||
return diff;
|
||||
}
|
||||
|
|
@ -211,7 +211,7 @@ static int pwm_index(const PWM *pwm)
|
|||
{
|
||||
ptrdiff_t diff = pwm - pwm_list;
|
||||
|
||||
g_assert_true(diff >= 0 && diff < ARRAY_SIZE(pwm_list));
|
||||
g_assert(diff >= 0 && diff < ARRAY_SIZE(pwm_list));
|
||||
|
||||
return diff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ static void periodic_timer(void)
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QTestState *s = NULL;
|
||||
QTestState *s;
|
||||
int ret;
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
|
@ -712,9 +712,7 @@ int main(int argc, char **argv)
|
|||
|
||||
ret = g_test_run();
|
||||
|
||||
if (s) {
|
||||
qtest_quit(s);
|
||||
}
|
||||
qtest_quit(s);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -289,6 +289,6 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,
|
|||
|
||||
*dst_qemu = qtest_init(dst_qemu_args);
|
||||
|
||||
free(src_qemu_args);
|
||||
free(dst_qemu_args);
|
||||
g_free(src_qemu_args);
|
||||
g_free(dst_qemu_args);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue