mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cocoa: switch over to new display registry

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-4-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:37 +01:00
parent 5ee1718f92
commit 5013b9e46a
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/ui/console.h
View File

@ -444,18 +444,6 @@ void qemu_display_register(QemuDisplay *ui);
void qemu_display_early_init(DisplayOptions *opts); void qemu_display_early_init(DisplayOptions *opts);
void qemu_display_init(DisplayState *ds, DisplayOptions *opts); void qemu_display_init(DisplayState *ds, DisplayOptions *opts);
/* cocoa.m */
#ifdef CONFIG_COCOA
void cocoa_display_init(DisplayState *ds, DisplayOptions *opts);
#else
static inline void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
{
/* This must never be called if CONFIG_COCOA is disabled */
error_report("Cocoa support is disabled");
abort();
}
#endif
/* vnc.c */ /* vnc.c */
void vnc_display_init(const char *id); void vnc_display_init(const char *id);
void vnc_display_open(const char *id, Error **errp); void vnc_display_open(const char *id, Error **errp);

14
ui/cocoa.m
View File

@ -1683,7 +1683,7 @@ static void addRemovableDevicesMenuItems(void)
qapi_free_BlockInfoList(pointerToFree); qapi_free_BlockInfoList(pointerToFree);
} }
void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
{ {
COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n"); COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n");
@ -1713,3 +1713,15 @@ void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
*/ */
addRemovableDevicesMenuItems(); addRemovableDevicesMenuItems();
} }
static QemuDisplay qemu_display_cocoa = {
.type = DISPLAY_TYPE_COCOA,
.init = cocoa_display_init,
};
static void register_cocoa(void)
{
qemu_display_register(&qemu_display_cocoa);
}
type_init(register_cocoa);

3
vl.c
View File

@ -4667,9 +4667,6 @@ int main(int argc, char **argv, char **envp)
case DISPLAY_TYPE_CURSES: case DISPLAY_TYPE_CURSES:
curses_display_init(ds, &dpy); curses_display_init(ds, &dpy);
break; break;
case DISPLAY_TYPE_COCOA:
cocoa_display_init(ds, &dpy);
break;
default: default:
qemu_display_init(ds, &dpy); qemu_display_init(ds, &dpy);
break; break;