Commit 5013b9e4 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

cocoa: switch over to new display registry 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-4-kraxel@redhat.com
parent 5ee1718f

include/ui/console.h

+0 −12
Original line number Diff line number Diff line
@@ -444,18 +444,6 @@ void qemu_display_register(QemuDisplay *ui); 
void qemu_display_early_init(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 */

void vnc_display_init(const char *id);

void vnc_display_open(const char *id, Error **errp);

ui/cocoa.m

+13 −1
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ static void addRemovableDevicesMenuItems(void) 
    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");
@@ -1713,3 +1713,15 @@ void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) 
     */

    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);

vl.c

+0 −3
Original line number Diff line number Diff line
@@ -4667,9 +4667,6 @@ int main(int argc, char **argv, char **envp) 
    case DISPLAY_TYPE_CURSES:

        curses_display_init(ds, &dpy);

        break;

    case DISPLAY_TYPE_COCOA:

        cocoa_display_init(ds, &dpy);

        break;

    default:

        qemu_display_init(ds, &dpy);

        break;