diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 13:43:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 13:43:35 +0100 |
| commit | 59926de9987ccdbeb65beb83974dd8f1756fcc62 (patch) | |
| tree | ea6a7039a8a160b1c783e50bb01b9a075727cb24 /hw/arm/sysbus-fdt.c | |
| parent | be33f56c76e5d54d780b402f7777c92103e32419 (diff) | |
| parent | 58d632c7ce66c272868b057491cec7ee5a6a1050 (diff) | |
| download | qemu-59926de9987ccdbeb65beb83974dd8f1756fcc62.zip qemu-59926de9987ccdbeb65beb83974dd8f1756fcc62.tar.gz qemu-59926de9987ccdbeb65beb83974dd8f1756fcc62.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180618-pull-request' into staging
vga: add ramfb, print virglrenderer version
# gpg: Signature made Mon 18 Jun 2018 10:57:38 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20180618-pull-request:
Add ramfb MAINTAINERS entry
hw/display: add standalone ramfb device
hw/display: add ramfb, a simple boot framebuffer living in guest ram
configure: print virglrenderer version
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/sysbus-fdt.c')
| -rw-r--r-- | hw/arm/sysbus-fdt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index e4c492e..277ed87 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -36,6 +36,7 @@ #include "hw/vfio/vfio-platform.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" +#include "hw/display/ramfb.h" #include "hw/arm/fdt.h" /* @@ -406,12 +407,18 @@ static int add_amd_xgbe_fdt_node(SysBusDevice *sbdev, void *opaque) #endif /* CONFIG_LINUX */ +static int no_fdt_node(SysBusDevice *sbdev, void *opaque) +{ + return 0; +} + /* list of supported dynamic sysbus devices */ static const NodeCreationPair add_fdt_node_functions[] = { #ifdef CONFIG_LINUX {TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node}, {TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node}, #endif + {TYPE_RAMFB_DEVICE, no_fdt_node}, {"", NULL}, /* last element */ }; |