diff options
| author | Peter Maydell | 2022-03-19 12:28:54 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-03-19 12:28:54 +0100 |
| commit | 2058fdbe81e2985c226a026851dd26b146d3395c (patch) | |
| tree | 2a9ad1887e77a9e0de8ff52ae28d7b5e23940f09 /hw/display/vga-pci.c | |
| parent | Merge tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent... (diff) | |
| parent | hw/display/vga: Report a proper error when adding a 2nd ISA VGA (diff) | |
| download | qemu-2058fdbe81e2985c226a026851dd26b146d3395c.tar.gz qemu-2058fdbe81e2985c226a026851dd26b146d3395c.tar.xz qemu-2058fdbe81e2985c226a026851dd26b146d3395c.zip | |
Merge tag 'fixes-20220318-pull-request' of git://git.kraxel.org/qemu into staging
bugfixes for vga, audio, vnc
# gpg: Signature made Fri 18 Mar 2022 13:56:22 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* tag 'fixes-20220318-pull-request' of git://git.kraxel.org/qemu:
hw/display/vga: Report a proper error when adding a 2nd ISA VGA
hw/display: Allow vga_common_init() to return errors
hw/display/cirrus_vga: Clean up indentation in pci_cirrus_vga_realize()
audio/mixeng: Do not declare unused variables
ui: avoid unnecessary memory operations in vnc_refresh_server_surface()
ui/gtk: Ignore 2- and 3-button press events
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/vga-pci.c')
| -rw-r--r-- | hw/display/vga-pci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 62fb5c38c1..3e5bc259f7 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -239,7 +239,9 @@ static void pci_std_vga_realize(PCIDevice *dev, Error **errp) bool edid = false; /* vga + console init */ - vga_common_init(s, OBJECT(dev)); + if (!vga_common_init(s, OBJECT(dev), errp)) { + return; + } vga_init(s, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev), true); @@ -275,7 +277,9 @@ static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp) bool edid = false; /* vga + console init */ - vga_common_init(s, OBJECT(dev)); + if (!vga_common_init(s, OBJECT(dev), errp)) { + return; + } s->con = graphic_console_init(DEVICE(dev), 0, s->hw_ops, s); /* mmio bar */ |