mirror of
https://github.com/qemu/qemu.git
synced 2024-11-30 23:33:51 +08:00
ui: add precondition for dpy_get_ui_info()
Ensure that it only get called when dpy_ui_info_supported(). The function should always return a result. There should be a non-null console or active_console. Modify the argument to be const as well. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Albert Esteve <aesteve@redhat.com>
This commit is contained in:
parent
48a35e12fa
commit
a92e7bb4ca
@ -329,7 +329,7 @@ void update_displaychangelistener(DisplayChangeListener *dcl,
|
||||
uint64_t interval);
|
||||
void unregister_displaychangelistener(DisplayChangeListener *dcl);
|
||||
|
||||
bool dpy_ui_info_supported(QemuConsole *con);
|
||||
bool dpy_ui_info_supported(const QemuConsole *con);
|
||||
const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con);
|
||||
int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info, bool delay);
|
||||
|
||||
|
@ -801,7 +801,7 @@ static void dpy_set_ui_info_timer(void *opaque)
|
||||
con->hw_ops->ui_info(con->hw, head, &con->ui_info);
|
||||
}
|
||||
|
||||
bool dpy_ui_info_supported(QemuConsole *con)
|
||||
bool dpy_ui_info_supported(const QemuConsole *con)
|
||||
{
|
||||
if (con == NULL) {
|
||||
con = active_console;
|
||||
@ -815,6 +815,8 @@ bool dpy_ui_info_supported(QemuConsole *con)
|
||||
|
||||
const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con)
|
||||
{
|
||||
assert(dpy_ui_info_supported(con));
|
||||
|
||||
if (con == NULL) {
|
||||
con = active_console;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user