[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 63ba5e: system/qtest: Clean up global variabl
|
From: |
Alex Bennée |
|
Subject: |
[Qemu-commits] [qemu/qemu] 63ba5e: system/qtest: Clean up global variable shadowing i... |
|
Date: |
Sun, 29 Oct 2023 16:13:01 -0700 |
Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: 63ba5e13b9943ea6ab228126ccf4ca3c97b7b66b
https://github.com/qemu/qemu/commit/63ba5e13b9943ea6ab228126ccf4ca3c97b7b66b
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M system/qtest.c
Log Message:
-----------
system/qtest: Clean up global variable shadowing in qtest_server_init()
Rename the variable to fix:
softmmu/qtest.c:869:13: error: declaration shadows a variable in the global
scope [-Werror,-Wshadow]
Object *qtest;
^
softmmu/qtest.c:53:15: note: previous declaration is here
static QTest *qtest;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: e9894bc95afba5d5e8422b723fcf7d658cba1fea
https://github.com/qemu/qemu/commit/e9894bc95afba5d5e8422b723fcf7d658cba1fea
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/unit/test-throttle.c
Log Message:
-----------
tests/throttle: Clean up global variable shadowing
Follow all other tests pattern from this file, use the
global 'cfg' variable to fix:
tests/unit/test-throttle.c:621:20: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
ThrottleConfig cfg;
^
tests/unit/test-throttle.c:28:23: note: previous declaration is here
static ThrottleConfig cfg;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Alberto Garcia <berto@igalia.com>
Message-ID: <20231009100251.56019-3-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 79a8d000732a967e554c0d726aaffdb08f70061b
https://github.com/qemu/qemu/commit/79a8d000732a967e554c0d726aaffdb08f70061b
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/qtest/virtio-scsi-test.c
Log Message:
-----------
tests/virtio-scsi: Clean up global variable shadowing
Rename the (unused) 'allow' argument, following the pattern
used by the other tests in this file. This fixes:
tests/qtest/virtio-scsi-test.c:159:61: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static void hotplug(void *obj, void *data, QGuestAllocator *alloc)
^
tests/qtest/virtio-scsi-test.c:37:25: note: previous declaration is here
static QGuestAllocator *alloc;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-By: Emmanouil Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: e33ba60bdb4729b6a2531a7d964550e27f3c100e
https://github.com/qemu/qemu/commit/e33ba60bdb4729b6a2531a7d964550e27f3c100e
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/qtest/cdrom-test.c
Log Message:
-----------
tests/cdrom-test: Clean up global variable shadowing in prepare_image()
Rename the variable to fix:
tests/qtest/cdrom-test.c:40:50: error: declaration shadows a variable in the
global scope [-Werror,-Wshadow]
static int prepare_image(const char *arch, char *isoimage)
^
tests/qtest/cdrom-test.c:18:13: note: previous declaration is here
static char isoimage[] = "cdrom-boot-iso-XXXXXX";
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-ID: <20231009100251.56019-5-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: a186fedbef01c79bf6c1ca0e9d170fb56f867882
https://github.com/qemu/qemu/commit/a186fedbef01c79bf6c1ca0e9d170fb56f867882
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/qtest/rtl8139-test.c
Log Message:
-----------
tests/rtl8139: Clean up global variable shadowing
Rename the variable to fix:
tests/qtest/rtl8139-test.c:28:33: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
static void save_fn(QPCIDevice *dev, int devfn, void *data)
^
tests/qtest/rtl8139-test.c:37:17: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
QPCIDevice *dev;
^
tests/qtest/rtl8139-test.c:25:20: note: previous declaration is here
static QPCIDevice *dev;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-7-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: ec3ad0face736a48fc6d77e65f0e53ae5a5cd0d1
https://github.com/qemu/qemu/commit/ec3ad0face736a48fc6d77e65f0e53ae5a5cd0d1
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/qtest/npcm7xx_adc-test.c
Log Message:
-----------
tests/npcm7xx_adc: Clean up global variable shadowing
Rename the global 'adc' variable in order to avoid:
tests/qtest/npcm7xx_adc-test.c:98:58: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static uint32_t adc_read_con(QTestState *qts, const ADC *adc)
^
tests/qtest/npcm7xx_adc-test.c:103:55: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static void adc_write_con(QTestState *qts, const ADC *adc, uint32_t value)
^
tests/qtest/npcm7xx_adc-test.c:108:59: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static uint32_t adc_read_data(QTestState *qts, const ADC *adc)
^
tests/qtest/npcm7xx_adc-test.c:119:53: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static void adc_qom_set(QTestState *qts, const ADC *adc,
^
tests/qtest/npcm7xx_adc-test.c:135:57: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static void adc_write_input(QTestState *qts, const ADC *adc,
^
tests/qtest/npcm7xx_adc-test.c:144:56: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static void adc_write_vref(QTestState *qts, const ADC *adc, uint32_t value)
^
tests/qtest/npcm7xx_adc-test.c:162:59: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static uint32_t adc_prescaler(QTestState *qts, const ADC *adc)
^
tests/qtest/npcm7xx_adc-test.c:175:64: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
static void adc_wait_conv_finished(QTestState *qts, const ADC *adc,
^
tests/qtest/npcm7xx_adc-test.c:196:16: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
const ADC *adc = adc_p;
^
tests/qtest/npcm7xx_adc-test.c:207:16: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
const ADC *adc = adc_p;
^
tests/qtest/npcm7xx_adc-test.c:235:16: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
const ADC *adc = adc_p;
^
tests/qtest/npcm7xx_adc-test.c:267:16: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
const ADC *adc = adc_p;
^
tests/qtest/npcm7xx_adc-test.c:293:16: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
const ADC *adc = adc_p;
^
tests/qtest/npcm7xx_adc-test.c:311:16: error: declaration shadows a variable
in the global scope [-Werror,-Wshadow]
const ADC *adc = adc_p;
^
tests/qtest/npcm7xx_adc-test.c:93:5: note: previous declaration is here
ADC adc = {
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-8-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 0c2c2932a97e73fa400af6ab4e4f6625ead3e4a1
https://github.com/qemu/qemu/commit/0c2c2932a97e73fa400af6ab4e4f6625ead3e4a1
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/unit/test-aio.c
Log Message:
-----------
tests/aio: Clean up global variable shadowing
Rename the argument to fix:
tests/unit/test-aio.c:130:44: error: declaration shadows a variable in the
global scope [-Werror,-Wshadow]
static void set_event_notifier(AioContext *ctx, EventNotifier *notifier,
^
tests/unit/test-aio.c:22:20: note: previous declaration is here
static AioContext *ctx;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-9-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 89c90405648d34470b7f19120e6bf9cc054ad8b2
https://github.com/qemu/qemu/commit/89c90405648d34470b7f19120e6bf9cc054ad8b2
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/unit/test-coroutine.c
Log Message:
-----------
tests/coroutine: Clean up global variable shadowing
Rename the global variable to avoid:
tests/unit/test-coroutine.c:430:11: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
bool *done = opaque;
^
tests/unit/test-coroutine.c:438:10: error: declaration shadows a variable in
the global scope [-Werror,-Wshadow]
bool done = false;
^
tests/unit/test-coroutine.c:198:12: note: previous declaration is here
static int done;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-11-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: c7437f0ddb8ee45bf96d949ddfcbb7697ae3d415
https://github.com/qemu/qemu/commit/c7437f0ddb8ee45bf96d949ddfcbb7697ae3d415
Author: Thomas Huth <thuth@redhat.com>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M docs/about/deprecated.rst
M hw/i386/pc_piix.c
Log Message:
-----------
docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated
As we've seen in the past, it's useful for deprecating old machine
types to finally be able to get of legacy code or do other clean-ups
(see e.g. commit ea985d235b868047 that was used to drop the PCI code in
the 128k bios binaries to free some precious space in those binaries).
So let's continue deprecating the oldest pc machine types. QEMU 2.3
has been released 8 years ago, so that's plenty of time since such
machine types have been used by default, thus deprecating pc-i440fx-2.0
up to pc-i440fx-2.3 should be fine nowadays.
Message-ID: <20231006075247.403364-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: c73272f52fc0e7614e4110b147b9d6efb589854b
https://github.com/qemu/qemu/commit/c73272f52fc0e7614e4110b147b9d6efb589854b
Author: Thomas Huth <thuth@redhat.com>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/vm/freebsd
Log Message:
-----------
tests/vm/freebsd: Add additional library paths for libfdt
libfdt is installed in /usr/local on FreeBSD, and since this
library does not have a pkg-config file, we have to specify the
paths manually. This way we can avoid that Meson has to recompile
the dtc subproject each time.
Message-ID: <20231016161053.39150-1-thuth@redhat.com>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: 1aa84a4b6e2cd3f0969101f1e608415e5381d9a2
https://github.com/qemu/qemu/commit/1aa84a4b6e2cd3f0969101f1e608415e5381d9a2
Author: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Date: 2023-10-27 (Fri, 27 Oct 2023)
Changed paths:
M tests/qtest/ipmi-bt-test.c
Log Message:
-----------
ipmi-bt-test: force ipv4
We open ipv4 listening socket. But "localhost" in qemu parameters may
load to Qemu trying to connect with ipv6 and fail with "Connection
refused". Force ipv4 by using ipv4 ip address.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20231018191123.1176602-1-vsementsov@yandex-team.ru>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Commit: f09cc2b50c41842da521a14fe6d245ee0fa84a6a
https://github.com/qemu/qemu/commit/f09cc2b50c41842da521a14fe6d245ee0fa84a6a
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2023-10-30 (Mon, 30 Oct 2023)
Changed paths:
M docs/about/deprecated.rst
M hw/i386/pc_piix.c
M system/qtest.c
M tests/qtest/cdrom-test.c
M tests/qtest/ipmi-bt-test.c
M tests/qtest/npcm7xx_adc-test.c
M tests/qtest/rtl8139-test.c
M tests/qtest/virtio-scsi-test.c
M tests/unit/test-aio.c
M tests/unit/test-coroutine.c
M tests/unit/test-throttle.c
M tests/vm/freebsd
Log Message:
-----------
Merge tag 'pull-request-2023-10-27' of https://gitlab.com/thuth/qemu into
staging
* Fix global variable shadowing in test code
* Avoid recompiling libfdt in the FreeBSD VM
* Mark old pc machine types as deprecated
* Force IPv4 in the ipmi-bt-test
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmU7g+wRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbWzIQ//WkiEtXAB4zn/b8H0KfRF283FoFMstBPu
# xrF90WcXMidAPRK8iFhwlae0rVyo40V6A3+/0rntMZ6WPJ3pVvFhmM4zIQgX+1+F
# HT8To7ngngeEey5gJNbOs9GdAFSmF8HwB+HWnEGf2fjWsUvIWgm458ikPUWvhXaJ
# 08wH4V+bmEAKYgny8/ys70E1iFeMwfg+LKXHzVAavaQ8GjM9xFXOjRe8XEq2P7/8
# T99O+hn1iGJfrvZTdJ01awRuOUzA1YTKLCYNSzfRc/j0eYwI28CBm12/sZn4dUA8
# 4rV33ISPw55QmxdVLCfGhAJ6Ih0trOgf8eDBkhcgqWt26ymcKyVL/7kJHcuoY9Q2
# onaN3XT39lVz/HmcuTl9a0sePsZd4d7p0vRsccwTSisX8RpLDab8I8oU8Nvs3VQG
# t23K3XLrdSyMbxsbi9b5BdXJVgkz4irEKG1dX8laIGMGD5zVi/LX2BWjP6QaIOZi
# OyopRQN2uTi6cry5NmblpeLDNJwQdQVxJKlqcvDQQl8TjPXleNtIXL4dr+IpNC5T
# Uo8GJ6+b+AzUI4EaNFybVDPAYHFMJKxvN/QUEjExKV1QTP3V2V9jCbGCF8nio8pp
# ISo11Lo/Z4Z39NwDBH13UuSOdD1rlrU2uuq6LaiRTBfCOTYumzUMvlDTNYqGuSLr
# +1q1GTGsHO0=
# =A6CT
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 27 Oct 2023 18:33:32 JST
# 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
* tag 'pull-request-2023-10-27' of https://gitlab.com/thuth/qemu:
ipmi-bt-test: force ipv4
tests/vm/freebsd: Add additional library paths for libfdt
docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated
tests/coroutine: Clean up global variable shadowing
tests/aio: Clean up global variable shadowing
tests/npcm7xx_adc: Clean up global variable shadowing
tests/rtl8139: Clean up global variable shadowing
tests/cdrom-test: Clean up global variable shadowing in prepare_image()
tests/virtio-scsi: Clean up global variable shadowing
tests/throttle: Clean up global variable shadowing
system/qtest: Clean up global variable shadowing in qtest_server_init()
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Compare: https://github.com/qemu/qemu/compare/c60be6e3e38c...f09cc2b50c41
- [Qemu-commits] [qemu/qemu] 63ba5e: system/qtest: Clean up global variable shadowing i...,
Alex Bennée <=