diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 02:28:14 -0400 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 02:28:14 -0400 |
| commit | 58b647616451c1c56a56a8b340a4e91ccc276097 (patch) | |
| tree | d7c6a630b6b8085332f246f0a722e3198ab74bdd /hw/i386/microvm.c | |
| parent | 741bdeb1d5a4024a2c54c6abb2de493a27b61953 (diff) | |
| parent | 58d7d4c7869cb3addb0714aa7b6bd88f2b6b7edf (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/misc-20211102-pull-request' into staging
MAINTAINERS: audio updates
microvm: device tree support
console: chardev fixes
misc: deprecate sga
usb: fix struct usb_msd_csw
# gpg: Signature made Tue 02 Nov 2021 12:26:07 PM EDT
# 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]
* remotes/kraxel/tags/misc-20211102-pull-request:
usb-storage: tag usb_msd_csw as packed struct
hw/misc: deprecate the 'sga' device
ui/console: remove chardev frontend connected test
ui/console: replace kbd_timer with chr_accept_input callback
ui/console: replace QEMUFIFO with Fifo8
ui/gtk: skip any extra draw of same guest scanout blob res
ui/gtk: Update the refresh rate for gl-area too
microvm: add device tree support.
MAINTAINERS: add myself as partial audio reviewer
MAINTAINERS: Add myself as a reviewer for SDL audio
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/i386/microvm.c')
| -rw-r--r-- | hw/i386/microvm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index f257ec5a0b..8d6ebea341 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -28,6 +28,7 @@ #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "acpi-microvm.h" +#include "microvm-dt.h" #include "hw/loader.h" #include "hw/irq.h" @@ -626,6 +627,7 @@ static void microvm_machine_done(Notifier *notifier, void *data) machine_done); acpi_setup_microvm(mms); + dt_setup_microvm(mms); } static void microvm_powerdown_req(Notifier *notifier, void *data) |