diff --git a/Makefile.target b/Makefile.target index 95c9d23..ad3e595 100644 --- a/Makefile.target +++ b/Makefile.target @@ -194,6 +194,7 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o obj-i386-y += vmmouse.o vmport.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o +obj-i386-$(CONFIG_SPICE) += spice.o # shared objects obj-ppc-y = ppc.o diff --git a/qemu-config.c b/qemu-config.c index 150157c..ed08d75 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -306,6 +306,9 @@ static QemuOptsList *lists[] = { &qemu_global_opts, &qemu_mon_opts, &qemu_cpudef_opts, +#ifdef CONFIG_SPICE + &qemu_spice_opts, +#endif NULL, }; diff --git a/qemu-config.h b/qemu-config.h index f217c58..e743efa 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -10,6 +10,7 @@ extern QemuOptsList qemu_rtc_opts; extern QemuOptsList qemu_global_opts; extern QemuOptsList qemu_mon_opts; extern QemuOptsList qemu_cpudef_opts; +extern QemuOptsList qemu_spice_opts; QemuOptsList *qemu_find_opts(const char *group); int qemu_set_option(const char *str); diff --git a/qemu-options.hx b/qemu-options.hx index f4b3bfe..d1624e7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -594,6 +594,14 @@ STEXI Enable SDL. ETEXI +#ifdef CONFIG_SPICE +DEF("spice", HAS_ARG, QEMU_OPTION_spice, + "-spice use spice\n", QEMU_ARCH_ALL) +STEXI +Use Spice. +ETEXI +#endif + DEF("portrait", 0, QEMU_OPTION_portrait, "-portrait rotate graphical output 90 deg left (only PXA LCD)\n", QEMU_ARCH_ALL) diff --git a/qemu-spice.h b/qemu-spice.h new file mode 100644 index 0000000..5597576 --- /dev/null +++ b/qemu-spice.h @@ -0,0 +1,22 @@ +#ifndef QEMU_SPICE_H +#define QEMU_SPICE_H + +#ifdef CONFIG_SPICE + +#include + +#include "qemu-option.h" +#include "qemu-config.h" + +extern SpiceServer *spice_server; +extern int using_spice; + +void qemu_spice_init(void); + +#else /* CONFIG_SPICE */ + +#define using_spice 0 + +#endif /* CONFIG_SPICE */ + +#endif /* QEMU_SPICE_H */ diff --git a/spice.c b/spice.c new file mode 100644 index 0000000..5315b18 --- /dev/null +++ b/spice.c @@ -0,0 +1,170 @@ +#include +#include +#include + +#include + +#include "qemu-common.h" +#include "qemu-spice.h" +#include "qemu-timer.h" +#include "qemu-queue.h" +#include "monitor.h" + +/* core bits */ + +SpiceServer *spice_server; +int using_spice = 0; + +struct SpiceTimer { + QEMUTimer *timer; + QTAILQ_ENTRY(SpiceTimer) next; +}; +static QTAILQ_HEAD(, SpiceTimer) timers = QTAILQ_HEAD_INITIALIZER(timers); + +static SpiceTimer *timer_add(SpiceTimerFunc func, void *opaque) +{ + SpiceTimer *timer; + + timer = qemu_mallocz(sizeof(*timer)); + timer->timer = qemu_new_timer(rt_clock, func, opaque); + QTAILQ_INSERT_TAIL(&timers, timer, next); + return timer; +} + +static void timer_start(SpiceTimer *timer, uint32_t ms) +{ + qemu_mod_timer(timer->timer, qemu_get_clock(rt_clock) + ms); +} + +static void timer_cancel(SpiceTimer *timer) +{ + qemu_del_timer(timer->timer); +} + +static void timer_remove(SpiceTimer *timer) +{ + qemu_del_timer(timer->timer); + qemu_free_timer(timer->timer); + QTAILQ_REMOVE(&timers, timer, next); + free(timer); +} + +struct SpiceWatch { + int fd; + int event_mask; + SpiceWatchFunc func; + void *opaque; + QTAILQ_ENTRY(SpiceWatch) next; +}; +static QTAILQ_HEAD(, SpiceWatch) watches = QTAILQ_HEAD_INITIALIZER(watches); + +static void watch_read(void *opaque) +{ + SpiceWatch *watch = opaque; + watch->func(watch->fd, SPICE_WATCH_EVENT_READ, watch->opaque); +} + +static void watch_write(void *opaque) +{ + SpiceWatch *watch = opaque; + watch->func(watch->fd, SPICE_WATCH_EVENT_WRITE, watch->opaque); +} + +static void watch_update_mask(SpiceWatch *watch, int event_mask) +{ + IOHandler *on_read = NULL; + IOHandler *on_write = NULL; + + watch->event_mask = event_mask; + if (watch->event_mask & SPICE_WATCH_EVENT_READ) + on_read = watch_read; + if (watch->event_mask & SPICE_WATCH_EVENT_WRITE) + on_read = watch_write; + qemu_set_fd_handler(watch->fd, on_read, on_write, watch); +} + +static SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *opaque) +{ + SpiceWatch *watch; + + watch = qemu_mallocz(sizeof(*watch)); + watch->fd = fd; + watch->func = func; + watch->opaque = opaque; + QTAILQ_INSERT_TAIL(&watches, watch, next); + fprintf(stderr, "%s: watch %p, fd %d\n", __FUNCTION__, watch, fd); + + watch_update_mask(watch, event_mask); + return watch; +} + +static void watch_remove(SpiceWatch *watch) +{ + fprintf(stderr, "%s: watch %p\n", __FUNCTION__, watch); + watch_update_mask(watch, 0); + QTAILQ_REMOVE(&watches, watch, next); + qemu_free(watch); +} + +static SpiceCoreInterface core_interface = { + .base.type = SPICE_INTERFACE_CORE, + .base.description = "qemu core services", + .base.major_version = SPICE_INTERFACE_CORE_MAJOR, + .base.minor_version = SPICE_INTERFACE_CORE_MINOR, + + .timer_add = timer_add, + .timer_start = timer_start, + .timer_cancel = timer_cancel, + .timer_remove = timer_remove, + + .watch_add = watch_add, + .watch_update_mask = watch_update_mask, + .watch_remove = watch_remove, +}; + +/* functions for the rest of qemu */ + +QemuOptsList qemu_spice_opts = { + .name = "spice", + .head = QTAILQ_HEAD_INITIALIZER(qemu_spice_opts.head), + .desc = { + { + .name = "port", + .type = QEMU_OPT_NUMBER, + },{ + .name = "password", + .type = QEMU_OPT_STRING, + },{ + .name = "disable-ticketing", + .type = QEMU_OPT_BOOL, + }, + { /* end if list */ } + }, +}; + +void qemu_spice_init(void) +{ + QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head); + const char *password; + int port; + + if (!opts) + return; + port = qemu_opt_get_number(opts, "port", 0); + if (!port) + return; + password = qemu_opt_get(opts, "password"); + + spice_server = spice_server_new(); + spice_server_set_port(spice_server, port); + if (password) + spice_server_set_ticket(spice_server, password, 0, 0, 0); + if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) + spice_server_set_noauth(spice_server); + + /* TODO: make configurable via cmdline */ + spice_server_set_image_compression(spice_server, SPICE_IMAGE_COMPRESS_GLZ); + + spice_server_init(spice_server, &core_interface); + using_spice = 1; +} diff --git a/vl.c b/vl.c index 4fb55b8..c1b12a6 100644 --- a/vl.c +++ b/vl.c @@ -160,6 +160,8 @@ int main(int argc, char **argv) #include "cpus.h" #include "arch_init.h" +#include "qemu-spice.h" + //#define DEBUG_NET //#define DEBUG_SLIRP @@ -3348,6 +3350,15 @@ int main(int argc, char **argv, char **envp) fclose(fp); break; } +#ifdef CONFIG_SPICE + case QEMU_OPTION_spice: + opts = qemu_opts_parse(&qemu_spice_opts, optarg, 1); + if (!opts) { + fprintf(stderr, "parse error: %s\n", optarg); + exit(1); + } + break; +#endif case QEMU_OPTION_writeconfig: { FILE *fp; @@ -3660,6 +3671,10 @@ int main(int argc, char **argv, char **envp) } qemu_add_globals(); +#ifdef CONFIG_SPICE + qemu_spice_init(); +#endif + machine->init(ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model);