2007-11-17 18:14:51 +01:00
|
|
|
#ifndef CONSOLE_H
|
|
|
|
#define CONSOLE_H
|
|
|
|
|
|
|
|
#include "qemu-char.h"
|
2009-08-28 20:27:13 +02:00
|
|
|
#include "qdict.h"
|
2010-03-09 20:25:00 +01:00
|
|
|
#include "notify.h"
|
2011-03-16 13:33:36 +01:00
|
|
|
#include "monitor.h"
|
2012-03-11 17:11:26 +01:00
|
|
|
#include "trace.h"
|
2007-11-17 18:14:51 +01:00
|
|
|
|
|
|
|
/* keyboard/mouse support */
|
|
|
|
|
|
|
|
#define MOUSE_EVENT_LBUTTON 0x01
|
|
|
|
#define MOUSE_EVENT_RBUTTON 0x02
|
|
|
|
#define MOUSE_EVENT_MBUTTON 0x04
|
|
|
|
|
2010-02-26 17:17:36 +01:00
|
|
|
/* identical to the ps/2 keyboard bits */
|
|
|
|
#define QEMU_SCROLL_LOCK_LED (1 << 0)
|
|
|
|
#define QEMU_NUM_LOCK_LED (1 << 1)
|
|
|
|
#define QEMU_CAPS_LOCK_LED (1 << 2)
|
|
|
|
|
2008-08-21 22:12:05 +02:00
|
|
|
/* in ms */
|
|
|
|
#define GUI_REFRESH_INTERVAL 30
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
typedef void QEMUPutKBDEvent(void *opaque, int keycode);
|
2010-02-26 17:17:36 +01:00
|
|
|
typedef void QEMUPutLEDEvent(void *opaque, int ledstate);
|
2007-11-17 18:14:51 +01:00
|
|
|
typedef void QEMUPutMouseEvent(void *opaque, int dx, int dy, int dz, int buttons_state);
|
|
|
|
|
|
|
|
typedef struct QEMUPutMouseEntry {
|
|
|
|
QEMUPutMouseEvent *qemu_put_mouse_event;
|
|
|
|
void *qemu_put_mouse_event_opaque;
|
|
|
|
int qemu_put_mouse_event_absolute;
|
|
|
|
char *qemu_put_mouse_event_name;
|
|
|
|
|
2010-03-10 03:52:22 +01:00
|
|
|
int index;
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
/* used internally by qemu for handling mice */
|
2010-03-10 03:52:22 +01:00
|
|
|
QTAILQ_ENTRY(QEMUPutMouseEntry) node;
|
2007-11-17 18:14:51 +01:00
|
|
|
} QEMUPutMouseEntry;
|
|
|
|
|
2010-02-26 17:17:36 +01:00
|
|
|
typedef struct QEMUPutLEDEntry {
|
|
|
|
QEMUPutLEDEvent *put_led;
|
|
|
|
void *opaque;
|
|
|
|
QTAILQ_ENTRY(QEMUPutLEDEntry) next;
|
|
|
|
} QEMUPutLEDEntry;
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque);
|
2010-06-08 15:12:18 +02:00
|
|
|
void qemu_remove_kbd_event_handler(void);
|
2007-11-17 18:14:51 +01:00
|
|
|
QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
|
|
|
|
void *opaque, int absolute,
|
|
|
|
const char *name);
|
|
|
|
void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry);
|
2010-03-10 03:52:22 +01:00
|
|
|
void qemu_activate_mouse_event_handler(QEMUPutMouseEntry *entry);
|
|
|
|
|
2010-02-26 17:17:36 +01:00
|
|
|
QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func, void *opaque);
|
|
|
|
void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
|
2007-11-17 18:14:51 +01:00
|
|
|
|
|
|
|
void kbd_put_keycode(int keycode);
|
2010-02-26 17:17:36 +01:00
|
|
|
void kbd_put_ledstate(int ledstate);
|
2007-11-17 18:14:51 +01:00
|
|
|
void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);
|
2010-03-09 21:26:40 +01:00
|
|
|
|
|
|
|
/* Does the current mouse generate absolute events */
|
2007-11-17 18:14:51 +01:00
|
|
|
int kbd_mouse_is_absolute(void);
|
2010-03-09 20:25:00 +01:00
|
|
|
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
|
|
|
|
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
|
2007-11-17 18:14:51 +01:00
|
|
|
|
2010-03-09 21:26:40 +01:00
|
|
|
/* Of all the mice, is there one that generates absolute events */
|
|
|
|
int kbd_mouse_has_absolute(void);
|
|
|
|
|
2009-05-10 02:44:56 +02:00
|
|
|
struct MouseTransformInfo {
|
2008-04-14 23:28:11 +02:00
|
|
|
/* Touchscreen resolution */
|
|
|
|
int x;
|
|
|
|
int y;
|
|
|
|
/* Calibration values as used/generated by tslib */
|
|
|
|
int a[7];
|
|
|
|
};
|
|
|
|
|
2009-08-28 20:27:13 +02:00
|
|
|
void do_mouse_set(Monitor *mon, const QDict *qdict);
|
2007-11-17 18:14:51 +01:00
|
|
|
|
|
|
|
/* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
|
|
|
|
constants) */
|
|
|
|
#define QEMU_KEY_ESC1(c) ((c) | 0xe100)
|
|
|
|
#define QEMU_KEY_BACKSPACE 0x007f
|
|
|
|
#define QEMU_KEY_UP QEMU_KEY_ESC1('A')
|
|
|
|
#define QEMU_KEY_DOWN QEMU_KEY_ESC1('B')
|
|
|
|
#define QEMU_KEY_RIGHT QEMU_KEY_ESC1('C')
|
|
|
|
#define QEMU_KEY_LEFT QEMU_KEY_ESC1('D')
|
|
|
|
#define QEMU_KEY_HOME QEMU_KEY_ESC1(1)
|
|
|
|
#define QEMU_KEY_END QEMU_KEY_ESC1(4)
|
|
|
|
#define QEMU_KEY_PAGEUP QEMU_KEY_ESC1(5)
|
|
|
|
#define QEMU_KEY_PAGEDOWN QEMU_KEY_ESC1(6)
|
|
|
|
#define QEMU_KEY_DELETE QEMU_KEY_ESC1(3)
|
|
|
|
|
|
|
|
#define QEMU_KEY_CTRL_UP 0xe400
|
|
|
|
#define QEMU_KEY_CTRL_DOWN 0xe401
|
|
|
|
#define QEMU_KEY_CTRL_LEFT 0xe402
|
|
|
|
#define QEMU_KEY_CTRL_RIGHT 0xe403
|
|
|
|
#define QEMU_KEY_CTRL_HOME 0xe404
|
|
|
|
#define QEMU_KEY_CTRL_END 0xe405
|
|
|
|
#define QEMU_KEY_CTRL_PAGEUP 0xe406
|
|
|
|
#define QEMU_KEY_CTRL_PAGEDOWN 0xe407
|
|
|
|
|
|
|
|
void kbd_put_keysym(int keysym);
|
|
|
|
|
|
|
|
/* consoles */
|
|
|
|
|
2009-01-15 23:14:11 +01:00
|
|
|
#define QEMU_BIG_ENDIAN_FLAG 0x01
|
|
|
|
#define QEMU_ALLOCATED_FLAG 0x02
|
2009-06-24 12:58:25 +02:00
|
|
|
#define QEMU_REALPIXELS_FLAG 0x04
|
2009-01-15 23:14:11 +01:00
|
|
|
|
|
|
|
struct PixelFormat {
|
|
|
|
uint8_t bits_per_pixel;
|
|
|
|
uint8_t bytes_per_pixel;
|
|
|
|
uint8_t depth; /* color depth in bits */
|
|
|
|
uint32_t rmask, gmask, bmask, amask;
|
|
|
|
uint8_t rshift, gshift, bshift, ashift;
|
|
|
|
uint8_t rmax, gmax, bmax, amax;
|
2009-01-26 16:37:30 +01:00
|
|
|
uint8_t rbits, gbits, bbits, abits;
|
2009-01-15 23:14:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct DisplaySurface {
|
|
|
|
uint8_t flags;
|
2007-11-17 18:14:51 +01:00
|
|
|
int width;
|
|
|
|
int height;
|
2009-01-15 23:14:11 +01:00
|
|
|
int linesize; /* bytes per line */
|
|
|
|
uint8_t *data;
|
|
|
|
|
|
|
|
struct PixelFormat pf;
|
|
|
|
};
|
|
|
|
|
2010-05-21 11:54:32 +02:00
|
|
|
/* cursor data format is 32bit RGBA */
|
|
|
|
typedef struct QEMUCursor {
|
|
|
|
int width, height;
|
|
|
|
int hot_x, hot_y;
|
|
|
|
int refcount;
|
|
|
|
uint32_t data[];
|
|
|
|
} QEMUCursor;
|
|
|
|
|
|
|
|
QEMUCursor *cursor_alloc(int width, int height);
|
|
|
|
void cursor_get(QEMUCursor *c);
|
|
|
|
void cursor_put(QEMUCursor *c);
|
|
|
|
QEMUCursor *cursor_builtin_hidden(void);
|
|
|
|
QEMUCursor *cursor_builtin_left_ptr(void);
|
|
|
|
void cursor_print_ascii_art(QEMUCursor *c, const char *prefix);
|
|
|
|
int cursor_get_mono_bpl(QEMUCursor *c);
|
|
|
|
void cursor_set_mono(QEMUCursor *c,
|
|
|
|
uint32_t foreground, uint32_t background, uint8_t *image,
|
|
|
|
int transparent, uint8_t *mask);
|
|
|
|
void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask);
|
|
|
|
void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask);
|
|
|
|
|
2009-01-15 23:14:11 +01:00
|
|
|
struct DisplayChangeListener {
|
|
|
|
int idle;
|
2008-03-13 20:20:33 +01:00
|
|
|
uint64_t gui_timer_interval;
|
2007-11-17 18:14:51 +01:00
|
|
|
|
|
|
|
void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h);
|
2009-01-15 23:14:11 +01:00
|
|
|
void (*dpy_resize)(struct DisplayState *s);
|
|
|
|
void (*dpy_setdata)(struct DisplayState *s);
|
2007-11-17 18:14:51 +01:00
|
|
|
void (*dpy_refresh)(struct DisplayState *s);
|
|
|
|
void (*dpy_copy)(struct DisplayState *s, int src_x, int src_y,
|
|
|
|
int dst_x, int dst_y, int w, int h);
|
|
|
|
void (*dpy_fill)(struct DisplayState *s, int x, int y,
|
|
|
|
int w, int h, uint32_t c);
|
2008-02-10 17:33:14 +01:00
|
|
|
void (*dpy_text_cursor)(struct DisplayState *s, int x, int y);
|
2009-01-15 23:14:11 +01:00
|
|
|
|
|
|
|
struct DisplayChangeListener *next;
|
|
|
|
};
|
|
|
|
|
2009-03-13 16:02:13 +01:00
|
|
|
struct DisplayAllocator {
|
|
|
|
DisplaySurface* (*create_displaysurface)(int width, int height);
|
|
|
|
DisplaySurface* (*resize_displaysurface)(DisplaySurface *surface, int width, int height);
|
|
|
|
void (*free_displaysurface)(DisplaySurface *surface);
|
|
|
|
};
|
|
|
|
|
2009-01-15 23:14:11 +01:00
|
|
|
struct DisplayState {
|
|
|
|
struct DisplaySurface *surface;
|
|
|
|
void *opaque;
|
|
|
|
struct QEMUTimer *gui_timer;
|
|
|
|
|
2009-03-13 16:02:13 +01:00
|
|
|
struct DisplayAllocator* allocator;
|
2009-01-15 23:14:11 +01:00
|
|
|
struct DisplayChangeListener* listeners;
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
void (*mouse_set)(int x, int y, int on);
|
2010-05-21 11:54:32 +02:00
|
|
|
void (*cursor_define)(QEMUCursor *cursor);
|
2009-01-16 20:04:14 +01:00
|
|
|
|
|
|
|
struct DisplayState *next;
|
2007-11-17 18:14:51 +01:00
|
|
|
};
|
|
|
|
|
2009-01-16 20:04:14 +01:00
|
|
|
void register_displaystate(DisplayState *ds);
|
|
|
|
DisplayState *get_displaystate(void);
|
2009-01-15 23:14:11 +01:00
|
|
|
DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,
|
|
|
|
int linesize, uint8_t *data);
|
2011-03-16 13:33:30 +01:00
|
|
|
void qemu_alloc_display(DisplaySurface *surface, int width, int height,
|
|
|
|
int linesize, PixelFormat pf, int newflags);
|
2009-01-23 20:56:19 +01:00
|
|
|
PixelFormat qemu_different_endianness_pixelformat(int bpp);
|
|
|
|
PixelFormat qemu_default_pixelformat(int bpp);
|
2009-01-15 23:14:11 +01:00
|
|
|
|
2009-03-13 16:02:13 +01:00
|
|
|
DisplayAllocator *register_displayallocator(DisplayState *ds, DisplayAllocator *da);
|
|
|
|
|
|
|
|
static inline DisplaySurface* qemu_create_displaysurface(DisplayState *ds, int width, int height)
|
|
|
|
{
|
|
|
|
return ds->allocator->create_displaysurface(width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline DisplaySurface* qemu_resize_displaysurface(DisplayState *ds, int width, int height)
|
|
|
|
{
|
2012-03-11 17:11:26 +01:00
|
|
|
trace_displaysurface_resize(ds, ds->surface, width, height);
|
2009-03-13 16:02:13 +01:00
|
|
|
return ds->allocator->resize_displaysurface(ds->surface, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void qemu_free_displaysurface(DisplayState *ds)
|
|
|
|
{
|
2012-03-11 17:11:26 +01:00
|
|
|
trace_displaysurface_free(ds, ds->surface);
|
2009-03-13 16:02:13 +01:00
|
|
|
ds->allocator->free_displaysurface(ds->surface);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int is_surface_bgr(DisplaySurface *surface)
|
|
|
|
{
|
|
|
|
if (surface->pf.bits_per_pixel == 32 && surface->pf.rshift == 0)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-15 23:14:11 +01:00
|
|
|
static inline int is_buffer_shared(DisplaySurface *surface)
|
|
|
|
{
|
2009-06-24 12:58:25 +02:00
|
|
|
return (!(surface->flags & QEMU_ALLOCATED_FLAG) &&
|
|
|
|
!(surface->flags & QEMU_REALPIXELS_FLAG));
|
2009-01-15 23:14:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void register_displaychangelistener(DisplayState *ds, DisplayChangeListener *dcl)
|
|
|
|
{
|
|
|
|
dcl->next = ds->listeners;
|
|
|
|
ds->listeners = dcl;
|
|
|
|
}
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
static inline void dpy_update(DisplayState *s, int x, int y, int w, int h)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
dcl->dpy_update(s, x, y, w, h);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
2007-11-17 18:14:51 +01:00
|
|
|
}
|
|
|
|
|
2009-01-15 23:14:11 +01:00
|
|
|
static inline void dpy_resize(DisplayState *s)
|
2007-11-17 18:14:51 +01:00
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
dcl->dpy_resize(s);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
2007-11-17 18:14:51 +01:00
|
|
|
}
|
|
|
|
|
2009-01-15 23:14:11 +01:00
|
|
|
static inline void dpy_setdata(DisplayState *s)
|
2008-02-10 17:33:14 +01:00
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
if (dcl->dpy_setdata) dcl->dpy_setdata(s);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dpy_refresh(DisplayState *s)
|
|
|
|
{
|
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
if (dcl->dpy_refresh) dcl->dpy_refresh(s);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dpy_copy(struct DisplayState *s, int src_x, int src_y,
|
|
|
|
int dst_x, int dst_y, int w, int h) {
|
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
if (dcl->dpy_copy)
|
|
|
|
dcl->dpy_copy(s, src_x, src_y, dst_x, dst_y, w, h);
|
|
|
|
else /* TODO */
|
|
|
|
dcl->dpy_update(s, dst_x, dst_y, w, h);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dpy_fill(struct DisplayState *s, int x, int y,
|
|
|
|
int w, int h, uint32_t c) {
|
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
if (dcl->dpy_fill) dcl->dpy_fill(s, x, y, w, h, c);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void dpy_cursor(struct DisplayState *s, int x, int y) {
|
|
|
|
struct DisplayChangeListener *dcl = s->listeners;
|
|
|
|
while (dcl != NULL) {
|
|
|
|
if (dcl->dpy_text_cursor) dcl->dpy_text_cursor(s, x, y);
|
|
|
|
dcl = dcl->next;
|
|
|
|
}
|
2008-02-10 17:33:14 +01:00
|
|
|
}
|
|
|
|
|
2008-11-24 20:29:13 +01:00
|
|
|
static inline int ds_get_linesize(DisplayState *ds)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
return ds->surface->linesize;
|
2008-11-24 20:29:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline uint8_t* ds_get_data(DisplayState *ds)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
return ds->surface->data;
|
2008-11-24 20:29:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ds_get_width(DisplayState *ds)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
return ds->surface->width;
|
2008-11-24 20:29:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ds_get_height(DisplayState *ds)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
return ds->surface->height;
|
2008-11-24 20:29:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int ds_get_bits_per_pixel(DisplayState *ds)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
return ds->surface->pf.bits_per_pixel;
|
2008-11-24 20:29:13 +01:00
|
|
|
}
|
|
|
|
|
2009-01-15 23:07:16 +01:00
|
|
|
static inline int ds_get_bytes_per_pixel(DisplayState *ds)
|
|
|
|
{
|
2009-01-15 23:14:11 +01:00
|
|
|
return ds->surface->pf.bytes_per_pixel;
|
2009-01-15 23:07:16 +01:00
|
|
|
}
|
|
|
|
|
2011-09-07 21:44:36 +02:00
|
|
|
#ifdef CONFIG_CURSES
|
|
|
|
#include <curses.h>
|
|
|
|
typedef chtype console_ch_t;
|
|
|
|
#else
|
2009-10-01 23:12:16 +02:00
|
|
|
typedef unsigned long console_ch_t;
|
2011-09-07 21:44:36 +02:00
|
|
|
#endif
|
2009-10-01 23:12:16 +02:00
|
|
|
static inline void console_write_ch(console_ch_t *dest, uint32_t ch)
|
2008-02-10 17:33:14 +01:00
|
|
|
{
|
2010-05-21 14:05:55 +02:00
|
|
|
if (!(ch & 0xff))
|
|
|
|
ch |= ' ';
|
2011-01-04 21:58:24 +01:00
|
|
|
*dest = ch;
|
2008-02-10 17:33:14 +01:00
|
|
|
}
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
typedef void (*vga_hw_update_ptr)(void *);
|
|
|
|
typedef void (*vga_hw_invalidate_ptr)(void *);
|
2012-02-24 12:43:45 +01:00
|
|
|
typedef void (*vga_hw_screen_dump_ptr)(void *, const char *, bool cswitch);
|
2009-10-01 23:12:16 +02:00
|
|
|
typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *);
|
2007-11-17 18:14:51 +01:00
|
|
|
|
2009-01-16 20:04:14 +01:00
|
|
|
DisplayState *graphic_console_init(vga_hw_update_ptr update,
|
|
|
|
vga_hw_invalidate_ptr invalidate,
|
|
|
|
vga_hw_screen_dump_ptr screen_dump,
|
|
|
|
vga_hw_text_update_ptr text_update,
|
|
|
|
void *opaque);
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
void vga_hw_update(void);
|
|
|
|
void vga_hw_invalidate(void);
|
|
|
|
void vga_hw_screen_dump(const char *filename);
|
2009-10-01 23:12:16 +02:00
|
|
|
void vga_hw_text_update(console_ch_t *chardata);
|
2007-11-17 18:14:51 +01:00
|
|
|
|
|
|
|
int is_graphic_console(void);
|
2008-09-24 05:32:33 +02:00
|
|
|
int is_fixedsize_console(void);
|
Revert "qemu-char: Print strerror message on failure" and deps
The commit's purpose is laudable:
The only way for chardev drivers to communicate an error was to
return a NULL pointer, which resulted in an error message that
said _that_ something went wrong, but not _why_.
It attempts to achieve it by changing the interface to return 0/-errno
and update qemu_chr_open_opts() to use strerror() to display a more
helpful error message. Unfortunately, it has serious flaws:
1. Backends "socket" and "udp" return bogus error codes, because
qemu_chr_open_socket() and qemu_chr_open_udp() assume that
unix_listen_opts(), unix_connect_opts(), inet_listen_opts(),
inet_connect_opts() and inet_dgram_opts() fail with errno set
appropriately. That assumption is wrong, and the commit turns
unspecific error messages into misleading error messages. For
instance:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: No such file or directory
ENOENT is what happens to be in my errno when the backend returns
-errno. Let's put ERANGE there just for giggles:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx -drive if=none,iops=99999999999999999999
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: Numerical result out of range
Worse: when errno happens to be zero, return -errno erroneously
signals success, and qemu_chr_new_from_opts() dies dereferencing
uninitialized chr. I observe this with "-serial unix:".
2. All qemu_chr_open_opts() knows about the error is an errno error
code. That's simply not enough for a decent message. For instance,
when inet_dgram() can't resolve the parameter host, which errno code
should it use? What if it can't resolve parameter localaddr?
Clue: many backends already report errors in their open methods.
Let's revert the flawed commit along with its dependencies, and fix up
the silent error paths instead.
This reverts commit 6e1db57b2ac9025c2443c665a0d9e78748637b26.
Conflicts:
console.c
hw/baum.c
qemu-char.c
This reverts commit aad04cd024f0c59f0b96f032cde2e24eb3abba6d.
The parts of commit db418a0a "Add stdio char device on windows" that
depend on the reverted change fixed up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-02-07 15:09:08 +01:00
|
|
|
CharDriverState *text_console_init(QemuOpts *opts);
|
2009-01-16 21:23:27 +01:00
|
|
|
void text_consoles_set_display(DisplayState *ds);
|
2007-11-17 18:14:51 +01:00
|
|
|
void console_select(unsigned int index);
|
|
|
|
void console_color_init(DisplayState *ds);
|
2009-01-16 20:04:14 +01:00
|
|
|
void qemu_console_resize(DisplayState *ds, int width, int height);
|
|
|
|
void qemu_console_copy(DisplayState *ds, int src_x, int src_y,
|
|
|
|
int dst_x, int dst_y, int w, int h);
|
2007-11-17 18:14:51 +01:00
|
|
|
|
|
|
|
/* sdl.c */
|
|
|
|
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
|
|
|
|
|
|
|
|
/* cocoa.m */
|
|
|
|
void cocoa_display_init(DisplayState *ds, int full_screen);
|
|
|
|
|
|
|
|
/* vnc.c */
|
|
|
|
void vnc_display_init(DisplayState *ds);
|
|
|
|
void vnc_display_close(DisplayState *ds);
|
|
|
|
int vnc_display_open(DisplayState *ds, const char *display);
|
Introduce a 'client_add' monitor command accepting an open FD
Allow client connections for VNC and socket based character
devices to be passed in over the monitor using SCM_RIGHTS.
One intended usage scenario is to start QEMU with VNC on a
UNIX domain socket. An unprivileged user which cannot access
the UNIX domain socket, can then connect to QEMU's VNC server
by passing an open FD to libvirt, which passes it onto QEMU.
{ "execute": "get_fd", "arguments": { "fdname": "myclient" } }
{ "return": {} }
{ "execute": "add_client", "arguments": { "protocol": "vnc",
"fdname": "myclient",
"skipauth": true } }
{ "return": {} }
In this case 'protocol' can be 'vnc' or 'spice', or the name
of a character device (eg from -chardev id=XXXX)
The 'skipauth' parameter can be used to skip any configured
VNC authentication scheme, which is useful if the mgmt layer
talking to the monitor has already authenticated the client
in another way.
* console.h: Define 'vnc_display_add_client' method
* monitor.c: Implement 'client_add' command
* qemu-char.c, qemu-char.h: Add 'qemu_char_add_client' method
* qerror.c, qerror.h: Add QERR_ADD_CLIENT_FAILED
* qmp-commands.hx: Declare 'client_add' command
* ui/vnc.c: Implement 'vnc_display_add_client' method
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-06-23 14:31:42 +02:00
|
|
|
void vnc_display_add_client(DisplayState *ds, int csock, int skipauth);
|
2011-01-31 21:27:36 +01:00
|
|
|
int vnc_display_disable_login(DisplayState *ds);
|
2011-03-16 13:33:36 +01:00
|
|
|
char *vnc_display_local_addr(DisplayState *ds);
|
|
|
|
#ifdef CONFIG_VNC
|
|
|
|
int vnc_display_password(DisplayState *ds, const char *password);
|
2010-10-07 11:50:45 +02:00
|
|
|
int vnc_display_pw_expire(DisplayState *ds, time_t expires);
|
2011-03-16 13:33:36 +01:00
|
|
|
#else
|
|
|
|
static inline int vnc_display_password(DisplayState *ds, const char *password)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
};
|
|
|
|
#endif
|
2007-11-17 18:14:51 +01:00
|
|
|
|
2008-02-10 17:33:14 +01:00
|
|
|
/* curses.c */
|
|
|
|
void curses_display_init(DisplayState *ds, int full_screen);
|
|
|
|
|
2007-11-17 18:14:51 +01:00
|
|
|
#endif
|