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 /include/hw/i386 | |
| parent | 741bdeb1d5a4024a2c54c6abb2de493a27b61953 (diff) | |
| parent | 58d7d4c7869cb3addb0714aa7b6bd88f2b6b7edf (diff) | |
| download | focaccia-qemu-58b647616451c1c56a56a8b340a4e91ccc276097.tar.gz focaccia-qemu-58b647616451c1c56a56a8b340a4e91ccc276097.zip | |
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 'include/hw/i386')
| -rw-r--r-- | include/hw/i386/microvm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index f25f837441..4d9c732d4b 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -104,6 +104,10 @@ struct MicrovmMachineState { Notifier machine_done; Notifier powerdown_req; struct GPEXConfig gpex; + + /* device tree */ + void *fdt; + uint32_t ioapic_phandle[2]; }; #define TYPE_MICROVM_MACHINE MACHINE_TYPE_NAME("microvm") |