[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 6985d8: vga: avoid crash if no default vga ca
|
From: |
Richard Henderson |
|
Subject: |
[Qemu-commits] [qemu/qemu] 6985d8: vga: avoid crash if no default vga card |
|
Date: |
Wed, 29 Jun 2022 17:53:51 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 6985d8ede92494f3b791de01e8ee9306eb6d5e4a
https://github.com/qemu/qemu/commit/6985d8ede92494f3b791de01e8ee9306eb6d5e4a
Author: Guo Zhi <qtxuning1999@sjtu.edu.cn>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M softmmu/vl.c
Log Message:
-----------
vga: avoid crash if no default vga card
QEMU in some arch will crash when executing -vga help command, because
there is no default vga model. Add check to this case and avoid crash.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/978
Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220503091724.970009-1-qtxuning1999@sjtu.edu.cn>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 5bba9bcfbb42e7c016626420e148a1bf1b080835
https://github.com/qemu/qemu/commit/5bba9bcfbb42e7c016626420e148a1bf1b080835
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M include/qom/object.h
Log Message:
-----------
qom/object: Remove circular include dependency
"qom/object.h" doesn't need to include itself.
Fixes: db1015e92e04 ("Move QOM typedefs and add missing includes")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220509084659.52076-1-philippe.mathieu.daude@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 832fef7cc14d65f99d523f883ef384014e6476a7
https://github.com/qemu/qemu/commit/832fef7cc14d65f99d523f883ef384014e6476a7
Author: Eugenio Pérez <eperezma@redhat.com>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M include/qemu/iova-tree.h
M util/iova-tree.c
Log Message:
-----------
util: Return void on iova_tree_remove
It always returns IOVA_OK so nobody uses it.
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Message-Id: <20220427154931.3166388-1-eperezma@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 118d4ed0453c325828e3678608cf32fd9c4a8c49
https://github.com/qemu/qemu/commit/118d4ed0453c325828e3678608cf32fd9c4a8c49
Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M hw/intc/openpic.c
M hw/net/imx_fec.c
M hw/pci/pcie_aer.c
M hw/pci/shpc.c
M hw/ppc/spapr_caps.c
M hw/scsi/spapr_vscsi.c
M qapi/net.json
M tools/virtiofsd/passthrough_ll.c
M ui/input.c
Log Message:
-----------
Trivial: 3 char repeat typos
Inspired by Julia Lawall's fixing of Linux
kernel comments, I looked at qemu, although I did it manually.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Message-Id: <20220614104045.85728-2-dgilbert@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: a0984714fb700683094a754a2320a2e150cf10a7
https://github.com/qemu/qemu/commit/a0984714fb700683094a754a2320a2e150cf10a7
Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M hw/9pfs/9p-xattr-user.c
M hw/acpi/nvdimm.c
M hw/nvme/ctrl.c
Log Message:
-----------
trivial typos: namesapce
'namespace' is misspelled in a bunch of places.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Message-Id: <20220614104045.85728-3-dgilbert@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 1a7fc0447e6312c5be2ba9cf7d11bac6caeda98b
https://github.com/qemu/qemu/commit/1a7fc0447e6312c5be2ba9cf7d11bac6caeda98b
Author: Markus Armbruster <armbru@redhat.com>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M MAINTAINERS
Log Message:
-----------
MAINTAINERS: Add softmmu/runstate.c to "Main loop"
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220615122338.340426-1-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: c92331bf04598445230e9abb5e293dacc6904240
https://github.com/qemu/qemu/commit/c92331bf04598445230e9abb5e293dacc6904240
Author: Bernhard Beschow <shentey@gmail.com>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M hw/i386/pc_piix.c
M hw/pci-host/i440fx.c
M include/hw/pci-host/i440fx.h
Log Message:
-----------
hw/pci-host/i440fx: Remove unused parameter from i440fx_init()
pi440fx_state is an out-parameter which is never read by the caller.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220612192800.40813-1-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 2296b4655694744f7c8dcdc9440c21d86e19968e
https://github.com/qemu/qemu/commit/2296b4655694744f7c8dcdc9440c21d86e19968e
Author: Thomas Huth <thuth@redhat.com>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M common-user/meson.build
Log Message:
-----------
common-user: Only compile the common user code if have_user is set
There is no need to waste cycles here if we only compile the system
binaries or tools. Additionally, this change is even a hard requirement
for building the tools on systems that do not have an entry in the
common-user/host/ folder (since common-user/meson.build is trying
to add such a path via the include_directories() command).
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Message-Id: <20220622140328.383961-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 99337bd1e3a323d07dc29da99cf3f48d3990ad81
https://github.com/qemu/qemu/commit/99337bd1e3a323d07dc29da99cf3f48d3990ad81
Author: Lev Kujawski <lkujaw@member.fsf.org>
Date: 2022-06-28 (Tue, 28 Jun 2022)
Changed paths:
M hw/ide/atapi.c
Log Message:
-----------
hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM)
Signed-off-by: Lev Kujawski <lkujaw@member.fsf.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220528204702.167912-1-lkujaw@member.fsf.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 21d87050af66f50c8d394a160e89560ceaa6bd5d
https://github.com/qemu/qemu/commit/21d87050af66f50c8d394a160e89560ceaa6bd5d
Author: Bernhard Beschow <shentey@gmail.com>
Date: 2022-06-29 (Wed, 29 Jun 2022)
Changed paths:
M hw/i386/xen/xen-hvm.c
M include/hw/xen/xen.h
M include/hw/xen/xen_common.h
M stubs/xen-hw-stub.c
Log Message:
-----------
hw/i386/xen/xen-hvm: Allow for stubbing xen_set_pci_link_route()
The only user of xen_set_pci_link_route() is
xen_piix_pci_write_config_client() which implements PIIX-specific logic in
the xen namespace. This makes xen-hvm depend on PIIX which could be
avoided if xen_piix_pci_write_config_client() was implemented in PIIX. In
order to do this, xen_set_pci_link_route() needs to be stubbable which
this patch addresses.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Message-Id: <20220626094656.15673-2-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: c379bd7551f34e42c4c935783c0c08bab41d70c1
https://github.com/qemu/qemu/commit/c379bd7551f34e42c4c935783c0c08bab41d70c1
Author: Bernhard Beschow <shentey@gmail.com>
Date: 2022-06-29 (Wed, 29 Jun 2022)
Changed paths:
M hw/i386/xen/xen-hvm.c
M hw/isa/piix3.c
M include/hw/xen/xen.h
M stubs/xen-hw-stub.c
Log Message:
-----------
hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it
xen_piix_pci_write_config_client() is implemented in the xen sub tree and
uses PIIX constants internally, thus creating a direct dependency on
PIIX. Now that xen_set_pci_link_route() is stubbable, the logic of
xen_piix_pci_write_config_client() can be moved to PIIX which resolves
the dependency.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Message-Id: <20220626094656.15673-3-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Commit: 621745c4f349ac09b72706c46febee983abca916
https://github.com/qemu/qemu/commit/621745c4f349ac09b72706c46febee983abca916
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2022-06-30 (Thu, 30 Jun 2022)
Changed paths:
M MAINTAINERS
M common-user/meson.build
M hw/9pfs/9p-xattr-user.c
M hw/acpi/nvdimm.c
M hw/i386/pc_piix.c
M hw/i386/xen/xen-hvm.c
M hw/ide/atapi.c
M hw/intc/openpic.c
M hw/isa/piix3.c
M hw/net/imx_fec.c
M hw/nvme/ctrl.c
M hw/pci-host/i440fx.c
M hw/pci/pcie_aer.c
M hw/pci/shpc.c
M hw/ppc/spapr_caps.c
M hw/scsi/spapr_vscsi.c
M include/hw/pci-host/i440fx.h
M include/hw/xen/xen.h
M include/hw/xen/xen_common.h
M include/qemu/iova-tree.h
M include/qom/object.h
M qapi/net.json
M softmmu/vl.c
M stubs/xen-hw-stub.c
M tools/virtiofsd/passthrough_ll.c
M ui/input.c
M util/iova-tree.c
Log Message:
-----------
Merge tag 'trivial-branch-for-7.1-pull-request' of
https://gitlab.com/laurent_vivier/qemu into staging
trivial patches pull request 20220629
# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmK8FmsSHGxhdXJlbnRA
# dml2aWVyLmV1AAoJEPMMOL0/L7482EkP/19M/AAUkGqIdU9Dj7H46r+LEKtrT7Xu
# jNRDDrkhVQvx42mklSB+fO/ptMKUDgxvLs4mnuZFxM7SrTOb4h5jfZzyYjk73ENQ
# YZ/TLxRtxAfRCcGwso7NGyk85mwt+sBFKZXfW6qsfc9AjDphLUOblfSieeFegz69
# BUtzbMOPSMR7e54y6azJX3gCkxLytSXYgk4otSLTrL233sT7pnwPRdxKGzCTA5vs
# fRxKb4p/R05lWepcjrL2d2lB1TabsV0kqmNkHDvubVWlgyoK3Vt/1dzD1UP7CrvF
# WghlZWmxCHrmLlBb+VSDUa22kpfv5fi/feauuug+dya+s1Mlq8HZTL8VtjUJHwLL
# 92xRPeP/RfEJdoQDuMKXP9DWAAYM03HGgR37cE5NMDCyHG0XRKOJ+i2P7DQLVDjW
# QyWX6bX1WV6FovdwwMnZR9OclvKtsZnb1jlfj+G2DdKXpLliDH6DkFm8mPQTM1L7
# w53iMtK88erEc+NP6+fPbbZmySvDVUcLmcTiBceZK6Vjo4oTGNrAWP+VgjBTJaz+
# 71ulkJ6vo39ZnEQOUlWrL/yW+8sQNaeO1tO67HZZ8dgTvAnPwyvKq88jSMzGCNpz
# Wpcf4yVAEvU+fP3KkEaqQqmQeK/Vc+H6044O00tcLVICkpCdN/FwRjgfZanX9CIJ
# xQjxW5mkb1Z3
# =fgtJ
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 29 Jun 2022 02:37:55 PM +0530
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [undefined]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [undefined]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
[undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* tag 'trivial-branch-for-7.1-pull-request' of
https://gitlab.com/laurent_vivier/qemu:
hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it
hw/i386/xen/xen-hvm: Allow for stubbing xen_set_pci_link_route()
hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM)
common-user: Only compile the common user code if have_user is set
hw/pci-host/i440fx: Remove unused parameter from i440fx_init()
MAINTAINERS: Add softmmu/runstate.c to "Main loop"
trivial typos: namesapce
Trivial: 3 char repeat typos
util: Return void on iova_tree_remove
qom/object: Remove circular include dependency
vga: avoid crash if no default vga card
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Compare: https://github.com/qemu/qemu/compare/f96d4e0f6007...621745c4f349