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 | |
| parent | 741bdeb1d5a4024a2c54c6abb2de493a27b61953 (diff) | |
| parent | 58d7d4c7869cb3addb0714aa7b6bd88f2b6b7edf (diff) | |
| download | qemu-58b647616451c1c56a56a8b340a4e91ccc276097.zip qemu-58b647616451c1c56a56a8b340a4e91ccc276097.tar.gz qemu-58b647616451c1c56a56a8b340a4e91ccc276097.tar.bz2 | |
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')
| -rw-r--r-- | include/hw/i386/microvm.h | 4 | ||||
| -rw-r--r-- | include/hw/usb/msd.h | 2 | ||||
| -rw-r--r-- | include/ui/console.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index f25f837..4d9c732 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") diff --git a/include/hw/usb/msd.h b/include/hw/usb/msd.h index 7538c54..54e9f38 100644 --- a/include/hw/usb/msd.h +++ b/include/hw/usb/msd.h @@ -17,7 +17,7 @@ enum USBMSDMode { USB_MSDM_CSW /* Command Status. */ }; -struct usb_msd_csw { +struct QEMU_PACKED usb_msd_csw { uint32_t sig; uint32_t tag; uint32_t residue; diff --git a/include/ui/console.h b/include/ui/console.h index 244664d..b6bedc5 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -171,6 +171,7 @@ typedef struct QemuDmaBuf { void *sync; int fence_fd; bool allow_fences; + bool draw_submitted; } QemuDmaBuf; typedef struct DisplayState DisplayState; |