Commit 5209089f authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

console: zap ds arg from register_displaychangelistener 



We don't have multiple DisplayStates any more,
so passing it in as argument is not needed.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent cdd5b937

hw/display/qxl.c

+1 −3
Original line number Diff line number Diff line
@@ -2058,7 +2058,6 @@ static int qxl_init_primary(PCIDevice *dev) 
    PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev);

    VGACommonState *vga = &qxl->vga;

    PortioList *qxl_vga_port_list = g_new(PortioList, 1);

    DisplayState *ds;

    int rc;



    qxl->id = 0;
@@ -2079,8 +2078,7 @@ static int qxl_init_primary(PCIDevice *dev) 


    qxl->ssd.dcl.ops = &display_listener_ops;

    qxl->ssd.dcl.con = vga->con;

    ds = qemu_console_displaystate(vga->con);

    register_displaychangelistener(ds, &qxl->ssd.dcl);

    register_displaychangelistener(&qxl->ssd.dcl);

    return rc;

}

include/ui/console.h

+1 −2
Original line number Diff line number Diff line
@@ -208,8 +208,7 @@ static inline int is_buffer_shared(DisplaySurface *surface) 
    return !(surface->flags & QEMU_ALLOCATED_FLAG);

}



void register_displaychangelistener(DisplayState *ds,

                                    DisplayChangeListener *dcl);

void register_displaychangelistener(DisplayChangeListener *dcl);

void update_displaychangelistener(DisplayChangeListener *dcl,

                                  uint64_t interval);

void unregister_displaychangelistener(DisplayChangeListener *dcl);

ui/cocoa.m

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen) 


    // register vga output callbacks

    dcl->ops = &dcl_ops;

    register_displaychangelistener(ds, dcl);

    register_displaychangelistener(dcl);



    // register cleanup function

    atexit(cocoa_cleanup);

ui/console.c

+5 −5
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static int nb_consoles = 0; 


static void text_console_do_init(CharDriverState *chr, DisplayState *ds);

static void dpy_refresh(DisplayState *s);

static DisplayState *get_alloc_displaystate(void);



static void gui_update(void *opaque)

{
@@ -1309,15 +1310,14 @@ void qemu_free_displaysurface(DisplaySurface *surface) 
    g_free(surface);

}



void register_displaychangelistener(DisplayState *ds,

                                    DisplayChangeListener *dcl)

void register_displaychangelistener(DisplayChangeListener *dcl)

{

    QemuConsole *con;



    trace_displaychangelistener_register(dcl, dcl->ops->dpy_name);

    dcl->ds = ds;

    QLIST_INSERT_HEAD(&ds->listeners, dcl, next);

    gui_setup_refresh(ds);

    dcl->ds = get_alloc_displaystate();

    QLIST_INSERT_HEAD(&dcl->ds->listeners, dcl, next);

    gui_setup_refresh(dcl->ds);

    if (dcl->con) {

        dcl->con->dcls++;

        con = dcl->con;

ui/curses.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ void curses_display_init(DisplayState *ds, int full_screen) 


    dcl = (DisplayChangeListener *) g_malloc0(sizeof(DisplayChangeListener));

    dcl->ops = &dcl_ops;

    register_displaychangelistener(ds, dcl);

    register_displaychangelistener(dcl);



    invalidate = 1;

}