Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
* new round of audio cleanups * various shadowed local variable fixes in vl, mptsas, pm_smbus, target/i386 * remove deprecated pc-i440fx-1.4 up to pc-i440fx-1.7 * remove PCI drivers from 128K bios.bin * remove unused variable in user-exec-stub.c * small fixes for ui/vnc * scsi-disk: Disallow block sizes smaller than 512 [CVE-2023-42467] # -----BEGIN PGP SIGNATURE----- # # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmUTDaoUHHBib256aW5p # QHJlZGhhdC5jb20ACgkQv/vSX3jHroMvEgf+NrSaP4pmHrYcVtm43fnKXoLHFrCx # KYfoK9Lke/DDkTff6rrcfW/Wyqid6Pp9Ch4Rrpr/X71X5gi+c6xb5klC8cpSfLg4 # gtuGctj7WL7KR/067EsLqHvzBob/iebFhZwhtsBrI+z65X+J9pOK78efBTdhezq4 # EEHTWohMAg1I/MWBK5VnOk2fI4+9z9K9zP5AtWmJzwwJkQUoEyl+YDkVmIhMYoGn # CapRO7i2wIvtoF4wuQUCGsOLmrcWTvRIOcV13k3b6PYCPC40/N9AOpiiyg3XqNah # UKKM9CcgVnCzCc4Jar2QD+MzkTDxhmQSyLFJgtzrW7CQSE5YB3sUHj3CXg== # =8nvs # -----END PGP SIGNATURE----- # gpg: Signature made Tue 26 Sep 2023 12:58:18 EDT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * tag 'for-upstream' of https://gitlab.com/bonzini/qemu : audio: remove shadowed locals compiler: introduce QEMU_ANNOTATE block: mark mixed functions that can suspend target/i386/svm_helper: eliminate duplicate local variable target/i386/seg_helper: remove shadowed variable target/i386/seg_helper: introduce tss_set_busy target/i386/translate: avoid shadowed local variables target/i386/cpu: avoid shadowed local variables target/i386/kvm: eliminate shadowed local variables m48t59-test: avoid possible overflow on ABS pm_smbus: rename variable to avoid shadowing mptsas: avoid shadowed local variables ui/vnc: fix handling of VNC_FEATURE_XVP ui/vnc: fix debug output for invalid audio message vl: remove shadowed local variables hw/scsi/scsi-disk: Disallow block sizes smaller than 512 [CVE-2023-42467] user-exec-stub: remove unused variable seabios: remove PCI drivers from bios.bin pc_piix: remove pc-i440fx-1.4 up to pc-i440fx-1.7 Signed-off-by:Stefan Hajnoczi <stefanha@redhat.com>
No related branches found
No related tags found
Showing
- accel/tcg/user-exec-stub.c 0 additions, 2 deletionsaccel/tcg/user-exec-stub.c
- audio/audio.c 5 additions, 6 deletionsaudio/audio.c
- block/io.c 3 additions, 2 deletionsblock/io.c
- block/qcow2.c 1 addition, 1 deletionblock/qcow2.c
- block/qed.c 2 additions, 2 deletionsblock/qed.c
- block/throttle-groups.c 2 additions, 2 deletionsblock/throttle-groups.c
- docs/about/deprecated.rst 0 additions, 8 deletionsdocs/about/deprecated.rst
- docs/about/removed-features.rst 2 additions, 2 deletionsdocs/about/removed-features.rst
- hw/i2c/pm_smbus.c 2 additions, 2 deletionshw/i2c/pm_smbus.c
- hw/i386/pc.c 3 additions, 57 deletionshw/i386/pc.c
- hw/i386/pc_piix.c 0 additions, 73 deletionshw/i386/pc_piix.c
- hw/scsi/mptsas.c 3 additions, 3 deletionshw/scsi/mptsas.c
- hw/scsi/scsi-disk.c 3 additions, 2 deletionshw/scsi/scsi-disk.c
- include/qemu/compiler.h 6 additions, 0 deletionsinclude/qemu/compiler.h
- include/qemu/osdep.h 3 additions, 3 deletionsinclude/qemu/osdep.h
- pc-bios/bios.bin 0 additions, 0 deletionspc-bios/bios.bin
- roms/config.seabios-128k 18 additions, 9 deletionsroms/config.seabios-128k
- softmmu/vl.c 4 additions, 5 deletionssoftmmu/vl.c
- target/i386/cpu.c 2 additions, 1 deletiontarget/i386/cpu.c
- target/i386/kvm/kvm.c 1 addition, 6 deletionstarget/i386/kvm/kvm.c
Loading
Please register or sign in to comment