motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-04 16:02:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

console: zap ds arg from register_displaychangelistener

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

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-04-23 15:44:31 +02:00 • committed by Anthony Liguori
parent cdd5b93757
commit 5209089fcd
9 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/display/qxl.c
View file

@ -2058,7 +2058,6 @@ static int qxl_init_primary(PCIDevice *dev)
PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev); PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev);
VGACommonState *vga = &qxl->vga; VGACommonState *vga = &qxl->vga;
PortioList *qxl_vga_port_list = g_new(PortioList, 1); PortioList *qxl_vga_port_list = g_new(PortioList, 1);
DisplayState *ds;
int rc; int rc;
qxl->id = 0; qxl->id = 0;
@ -2079,8 +2078,7 @@ static int qxl_init_primary(PCIDevice *dev)
qxl->ssd.dcl.ops = &display_listener_ops; qxl->ssd.dcl.ops = &display_listener_ops;
qxl->ssd.dcl.con = vga->con; qxl->ssd.dcl.con = vga->con;
ds = qemu_console_displaystate(vga->con); register_displaychangelistener(&qxl->ssd.dcl);
register_displaychangelistener(ds, &qxl->ssd.dcl);
return rc; return rc;
} }

3
include/ui/console.h
View file

@ -208,8 +208,7 @@ static inline int is_buffer_shared(DisplaySurface *surface)
return !(surface->flags & QEMU_ALLOCATED_FLAG); return !(surface->flags & QEMU_ALLOCATED_FLAG);
} }
void register_displaychangelistener(DisplayState *ds, void register_displaychangelistener(DisplayChangeListener *dcl);
DisplayChangeListener *dcl);
void update_displaychangelistener(DisplayChangeListener *dcl, void update_displaychangelistener(DisplayChangeListener *dcl,
uint64_t interval); uint64_t interval);
void unregister_displaychangelistener(DisplayChangeListener *dcl); void unregister_displaychangelistener(DisplayChangeListener *dcl);

2
ui/cocoa.m
View file

@ -1030,7 +1030,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen)
// register vga output callbacks // register vga output callbacks
dcl->ops = &dcl_ops; dcl->ops = &dcl_ops;
register_displaychangelistener(ds, dcl); register_displaychangelistener(dcl);
// register cleanup function // register cleanup function
atexit(cocoa_cleanup); atexit(cocoa_cleanup);

10
ui/console.c
View file

@ -178,6 +178,7 @@ static int nb_consoles = 0;
static void text_console_do_init(CharDriverState *chr, DisplayState *ds); static void text_console_do_init(CharDriverState *chr, DisplayState *ds);
static void dpy_refresh(DisplayState *s); static void dpy_refresh(DisplayState *s);
static DisplayState *get_alloc_displaystate(void);
static void gui_update(void *opaque) static void gui_update(void *opaque)
{ {
@ -1309,15 +1310,14 @@ void qemu_free_displaysurface(DisplaySurface *surface)
g_free(surface); g_free(surface);
} }
void register_displaychangelistener(DisplayState *ds, void register_displaychangelistener(DisplayChangeListener *dcl)
DisplayChangeListener *dcl)
{ {
QemuConsole *con; QemuConsole *con;
trace_displaychangelistener_register(dcl, dcl->ops->dpy_name); trace_displaychangelistener_register(dcl, dcl->ops->dpy_name);
dcl->ds = ds; dcl->ds = get_alloc_displaystate();
QLIST_INSERT_HEAD(&ds->listeners, dcl, next); QLIST_INSERT_HEAD(&dcl->ds->listeners, dcl, next);
gui_setup_refresh(ds); gui_setup_refresh(dcl->ds);
if (dcl->con) { if (dcl->con) {
dcl->con->dcls++; dcl->con->dcls++;
con = dcl->con; con = dcl->con;

2
ui/curses.c
View file

@ -359,7 +359,7 @@ void curses_display_init(DisplayState *ds, int full_screen)
dcl = (DisplayChangeListener *) g_malloc0(sizeof(DisplayChangeListener)); dcl = (DisplayChangeListener *) g_malloc0(sizeof(DisplayChangeListener));
dcl->ops = &dcl_ops; dcl->ops = &dcl_ops;
register_displaychangelistener(ds, dcl); register_displaychangelistener(dcl);
invalidate = 1; invalidate = 1;
} }

2
ui/gtk.c
View file

@ -1470,7 +1470,7 @@ void gtk_display_init(DisplayState *ds)
gtk_widget_show_all(s->window); gtk_widget_show_all(s->window);
register_displaychangelistener(ds, &s->dcl); register_displaychangelistener(&s->dcl);
global_state = s; global_state = s;
} }

2
ui/sdl.c
View file

@ -937,7 +937,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
dcl = g_malloc0(sizeof(DisplayChangeListener)); dcl = g_malloc0(sizeof(DisplayChangeListener));
dcl->ops = &dcl_ops; dcl->ops = &dcl_ops;
register_displaychangelistener(ds, dcl); register_displaychangelistener(dcl);
mouse_mode_notifier.notify = sdl_mouse_mode_change; mouse_mode_notifier.notify = sdl_mouse_mode_change;
qemu_add_mouse_mode_change_notifier(&mouse_mode_notifier); qemu_add_mouse_mode_change_notifier(&mouse_mode_notifier);

2
ui/spice-display.c
View file

@ -625,7 +625,7 @@ void qemu_spice_display_init(DisplayState *ds)
ssd->dcl.ops = &display_listener_ops; ssd->dcl.ops = &display_listener_ops;
ssd->dcl.con = qemu_console_lookup_by_index(0); ssd->dcl.con = qemu_console_lookup_by_index(0);
register_displaychangelistener(ds, &ssd->dcl); register_displaychangelistener(&ssd->dcl);
qemu_spice_create_host_primary(ssd); qemu_spice_create_host_primary(ssd);
} }

2
ui/vnc.c
View file

@ -2832,7 +2832,7 @@ void vnc_display_init(DisplayState *ds)
vnc_start_worker_thread(); vnc_start_worker_thread();
vs->dcl.ops = &dcl_ops; vs->dcl.ops = &dcl_ops;
register_displaychangelistener(ds, &vs->dcl); register_displaychangelistener(&vs->dcl);
} }