diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-04-24 13:44:57 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-04-24 13:44:57 -0400 |
| commit | 019fbfa4bcd2d3a835c241295e22ab2b5b56129b (patch) | |
| tree | 614e89e02720feb0491fdc07daa0e9d7eae73f7e /hw/vfio | |
| parent | d9bf9713239945a5d4187593599de49da3351416 (diff) | |
| parent | abb55b1abaaa8521e93d8202dd67b9e70a4ca1a2 (diff) | |
| download | qemu-master.zip qemu-master.tar.gz qemu-master.tar.bz2 | |
Miscellaneous patches for 2025-04-24
# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmgJ7dYSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTiZIP/1PFAg/s3SoiLQwH/ZrjyUkm1kiKnjOH
# CC5Stw6I9tuYnDAhASAdSymofLv0NNydNe5ai6ZZAWRyRYjIcfNigKAGK4Di+Uhe
# nYxT0Yk8hNGwMhl6NnBp4mmCUNCwcbjT9uXdiYQxFYO/qqYR1388xJjeN3c362l3
# AaLrE5bX5sqa6TAkTeRPjeIqxlyGT7jnCrN7I1hMhDvbc3ITF3AMfYFMjnmAQgr+
# mTWGS1QogqqkloODbR1DKD1CAWOlpK+0HibhNF+lz71P0HlwVvy+HPXso505Wf0B
# dMwlSrZ1DnqNVF/y5IhMEMslahKajbjbFVhBjmrGl/8T821etCxxgB20c0vyFRy8
# qTyJGwBZaEo0VWr70unSmq45TRoeQvdHAw/e+GtilR0ci80q2ly4gbObnw7L8le+
# gqZo4IWmrwp2sbPepE57sYKQpEndwbRayf/kcFd0LPPpeINu9ZooXkYX0pOo6Cdg
# vDKMaEB1/fmPhjSlknxkKN9LZdR+nDw8162S1CKsUdWanAOjmP8haN19aoHhIekZ
# q+r2qUq/U827yNy9/qbInmsoFYDz9s6sAOE63jibd5rZZ9Anei6NOSgLzA4CqCR1
# +d0+TXp19gP9mLMFs7/ZclwkXCz47OQYhXYphjI3wM9x+xbdRcI4n+DOH5u5coKx
# AsA6+2n0GF4Y
# =GaoH
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 24 Apr 2025 03:52:54 EDT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* tag 'pull-misc-2025-04-24' of https://repo.or.cz/qemu/armbru:
cleanup: Drop pointless label at end of function
cleanup: Drop pointless return at end of function
cleanup: Re-run return_directly.cocci
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/vfio')
| -rw-r--r-- | hw/vfio/common.c | 7 | ||||
| -rw-r--r-- | hw/vfio/display.c | 1 | ||||
| -rw-r--r-- | hw/vfio/pci.c | 1 | ||||
| -rw-r--r-- | hw/vfio/platform.c | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index bae0633..9b49345 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -109,8 +109,6 @@ static bool vfio_multiple_devices_migration_is_supported(void) int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp) { - int ret; - if (vfio_multiple_devices_migration_is_supported()) { return 0; } @@ -128,9 +126,8 @@ int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp) error_setg(&multiple_devices_migration_blocker, "Multiple VFIO devices migration is supported only if all of " "them support P2P migration"); - ret = migrate_add_blocker_normal(&multiple_devices_migration_blocker, errp); - - return ret; + return migrate_add_blocker_normal(&multiple_devices_migration_blocker, + errp); } void vfio_unblock_multiple_devices_migration(void) diff --git a/hw/vfio/display.c b/hw/vfio/display.c index ea87830..4fdcef5 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -104,7 +104,6 @@ static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled, err: trace_vfio_display_edid_write_error(); - return; } static void vfio_display_edid_ui_info(void *opaque, uint32_t idx, diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 7f1532f..f87f3cc 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2383,7 +2383,6 @@ static void vfio_add_ext_cap(VFIOPCIDevice *vdev) } g_free(config); - return; } static bool vfio_add_capabilities(VFIOPCIDevice *vdev, Error **errp) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index c6edbdd..f273ae9 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -418,7 +418,6 @@ fail_vfio: abort(); fail_irqfd: vfio_start_eventfd_injection(sbdev, irq); - return; } /* VFIO skeleton */ |