From 303d4e865b74402b49f52e975c396c952f063e58 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Tue, 21 Sep 2010 20:05:31 +0100 Subject: Introduce -machine command option. This option gives the ability to switch one "accelerator" like kvm, xen or the default one tcg. We can specify more than one accelerator by separate them by a colon. QEMU will try each one and use the first whose works. So, ./qemu -machine accel=xen:kvm:tcg which would try Xen support first, then KVM and finally TCG if none of the other works. By default, QEMU will use TCG. But we can specify another default in the global configuration file. Signed-off-by: Anthony PERARD Signed-off-by: Alexander Graf --- qemu-config.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'qemu-config.c') diff --git a/qemu-config.c b/qemu-config.c index 14d3419..5d7ffa2 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -450,6 +450,19 @@ QemuOptsList qemu_option_rom_opts = { }, }; +static QemuOptsList qemu_machine_opts = { + .name = "machine", + .head = QTAILQ_HEAD_INITIALIZER(qemu_machine_opts.head), + .desc = { + { + .name = "accel", + .type = QEMU_OPT_STRING, + .help = "accelerator list", + }, + { /* End of list */ } + }, +}; + static QemuOptsList *vm_config_groups[32] = { &qemu_drive_opts, &qemu_chardev_opts, @@ -464,6 +477,7 @@ static QemuOptsList *vm_config_groups[32] = { &qemu_trace_opts, #endif &qemu_option_rom_opts, + &qemu_machine_opts, NULL, }; -- cgit v1.1 From d4970b071f698a4f3984487bbb97d1ecc36f5950 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 27 Mar 2011 16:43:54 +0200 Subject: spice: add option for disabling copy paste support Some people want to be able disable spice's guest <-> client copy paste support because of security considerations. [ kraxel: drop old-version error message ] --- qemu-config.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qemu-config.c') diff --git a/qemu-config.c b/qemu-config.c index 5d7ffa2..04c97e5 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -385,6 +385,9 @@ QemuOptsList qemu_spice_opts = { .name = "disable-ticketing", .type = QEMU_OPT_BOOL, },{ + .name = "disable-copy-paste", + .type = QEMU_OPT_BOOL, + },{ .name = "x509-dir", .type = QEMU_OPT_STRING, },{ -- cgit v1.1 From 48b3ed0a68b8c1b288b4e15743ea39b7b5b318c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 17 May 2011 10:40:33 +0200 Subject: spice: add SASL support Turn on SASL support by appending "sasl" to the spice arguments, which requires that the client use SASL to authenticate with the spice. The exact choice of authentication method used is controlled from the system / user's SASL configuration file for the 'qemu' service. This is typically found in /etc/sasl2/qemu.conf. If running QEMU as an unprivileged user, an environment variable SASL_CONF_PATH can be used to make it search alternate locations for the service config. While some SASL auth methods can also provide data encryption (eg GSSAPI), it is recommended that SASL always be combined with the 'tls' and 'x509' settings to enable use of SSL and server certificates. This ensures a data encryption preventing compromise of authentication credentials. It requires support from spice 0.8.1. [ kraxel: moved spell fix to separate commit ] Signed-off-by: Gerd Hoffmann --- qemu-config.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qemu-config.c') diff --git a/qemu-config.c b/qemu-config.c index 04c97e5..b00aa3a 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -388,6 +388,9 @@ QemuOptsList qemu_spice_opts = { .name = "disable-copy-paste", .type = QEMU_OPT_BOOL, },{ + .name = "sasl", + .type = QEMU_OPT_BOOL, + },{ .name = "x509-dir", .type = QEMU_OPT_STRING, },{ -- cgit v1.1 From 44bd6907de2018f8abb28fcee3dda8a7cfbf9c96 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 17 May 2011 10:40:43 +0200 Subject: qemu-config: comment spell fix Signed-off-by: Gerd Hoffmann --- qemu-config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qemu-config.c') diff --git a/qemu-config.c b/qemu-config.c index b00aa3a..c63741c 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -306,7 +306,7 @@ static QemuOptsList qemu_trace_opts = { .name = "file", .type = QEMU_OPT_STRING, }, - { /* end if list */ } + { /* end of list */ } }, }; #endif @@ -436,7 +436,7 @@ QemuOptsList qemu_spice_opts = { .name = "playback-compression", .type = QEMU_OPT_BOOL, }, - { /* end if list */ } + { /* end of list */ } }, }; @@ -452,7 +452,7 @@ QemuOptsList qemu_option_rom_opts = { .name = "romfile", .type = QEMU_OPT_STRING, }, - { /* end if list */ } + { /* end of list */ } }, }; -- cgit v1.1