2003-06-24 17:42:40 +04:00
|
|
|
/*
|
2004-03-14 15:20:30 +03:00
|
|
|
* QEMU System Emulator
|
2007-09-17 01:08:06 +04:00
|
|
|
*
|
2008-01-06 20:21:48 +03:00
|
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
2007-09-17 01:08:06 +04:00
|
|
|
*
|
2003-06-25 20:20:35 +04:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
2003-06-24 17:42:40 +04:00
|
|
|
*/
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <errno.h>
|
2004-04-01 03:37:16 +04:00
|
|
|
#include <sys/time.h>
|
2006-08-06 17:36:11 +04:00
|
|
|
#include <zlib.h>
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/bitmap.h"
|
2004-04-01 03:37:16 +04:00
|
|
|
|
2009-07-27 18:12:56 +04:00
|
|
|
/* Needed early for CONFIG_BSD etc. */
|
2009-03-07 19:52:02 +03:00
|
|
|
#include "config-host.h"
|
|
|
|
|
2004-04-01 03:37:16 +04:00
|
|
|
#ifndef _WIN32
|
2009-05-30 03:52:44 +04:00
|
|
|
#include <libgen.h>
|
2004-04-01 03:37:16 +04:00
|
|
|
#include <sys/times.h>
|
2003-06-25 04:07:40 +04:00
|
|
|
#include <sys/wait.h>
|
2004-04-01 03:37:16 +04:00
|
|
|
#include <termios.h>
|
|
|
|
#include <sys/mman.h>
|
2003-06-25 04:07:40 +04:00
|
|
|
#include <sys/ioctl.h>
|
2008-11-07 19:55:48 +03:00
|
|
|
#include <sys/resource.h>
|
2003-06-25 04:07:40 +04:00
|
|
|
#include <sys/socket.h>
|
2004-09-14 01:37:34 +04:00
|
|
|
#include <netinet/in.h>
|
2008-11-07 19:55:48 +03:00
|
|
|
#include <net/if.h>
|
|
|
|
#include <arpa/inet.h>
|
2004-09-06 03:09:03 +04:00
|
|
|
#include <dirent.h>
|
2005-11-16 01:16:05 +03:00
|
|
|
#include <netdb.h>
|
2007-09-13 16:39:35 +04:00
|
|
|
#include <sys/select.h>
|
2010-08-09 14:48:32 +04:00
|
|
|
|
2009-07-27 18:12:56 +04:00
|
|
|
#ifdef CONFIG_BSD
|
2004-05-12 23:32:15 +04:00
|
|
|
#include <sys/stat.h>
|
2009-11-29 20:00:41 +03:00
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
2010-03-26 00:07:12 +03:00
|
|
|
#include <sys/sysctl.h>
|
2008-11-07 19:55:48 +03:00
|
|
|
#else
|
|
|
|
#include <util.h>
|
2008-08-15 22:33:42 +04:00
|
|
|
#endif
|
2009-11-30 17:42:59 +03:00
|
|
|
#else
|
2008-09-30 22:12:18 +04:00
|
|
|
#ifdef __linux__
|
2004-05-12 23:32:15 +04:00
|
|
|
#include <malloc.h>
|
2007-09-17 00:03:23 +04:00
|
|
|
|
2005-11-11 02:58:52 +03:00
|
|
|
#include <linux/ppdev.h>
|
2007-02-18 02:44:43 +03:00
|
|
|
#include <linux/parport.h>
|
2008-09-30 22:12:18 +04:00
|
|
|
#endif
|
2012-08-15 01:44:07 +04:00
|
|
|
|
|
|
|
#ifdef CONFIG_SECCOMP
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/seccomp.h"
|
2012-08-15 01:44:07 +04:00
|
|
|
#endif
|
|
|
|
|
2008-09-30 22:12:18 +04:00
|
|
|
#ifdef __sun__
|
2007-02-18 01:54:49 +03:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/ethernet.h>
|
|
|
|
#include <sys/sockio.h>
|
|
|
|
#include <netinet/arp.h>
|
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
#include <netinet/ip.h>
|
|
|
|
#include <netinet/ip_icmp.h> // must come after ip.h
|
|
|
|
#include <netinet/udp.h>
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#include <net/if.h>
|
|
|
|
#include <syslog.h>
|
|
|
|
#include <stropts.h>
|
2004-04-01 03:37:16 +04:00
|
|
|
#endif
|
2004-05-12 23:32:15 +04:00
|
|
|
#endif
|
2006-04-26 02:36:06 +04:00
|
|
|
#endif
|
2004-04-01 03:37:16 +04:00
|
|
|
|
2008-07-19 13:56:24 +04:00
|
|
|
#if defined(CONFIG_VDE)
|
|
|
|
#include <libvdeplug.h>
|
|
|
|
#endif
|
|
|
|
|
2004-04-01 03:37:16 +04:00
|
|
|
#ifdef _WIN32
|
2009-03-08 19:26:59 +03:00
|
|
|
#include <windows.h>
|
2004-04-01 03:37:16 +04:00
|
|
|
#endif
|
|
|
|
|
2004-04-05 00:22:28 +04:00
|
|
|
#ifdef CONFIG_SDL
|
2009-06-18 22:11:03 +04:00
|
|
|
#if defined(__APPLE__) || defined(main)
|
2009-06-13 15:19:11 +04:00
|
|
|
#include <SDL.h>
|
2009-02-15 23:18:41 +03:00
|
|
|
int qemu_main(int argc, char **argv, char **envp);
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
2009-06-18 22:11:03 +04:00
|
|
|
return qemu_main(argc, argv, NULL);
|
2009-02-15 23:18:41 +03:00
|
|
|
}
|
|
|
|
#undef main
|
|
|
|
#define main qemu_main
|
2004-07-10 20:26:15 +04:00
|
|
|
#endif
|
2004-04-05 00:22:28 +04:00
|
|
|
#endif /* CONFIG_SDL */
|
2003-06-24 17:42:40 +04:00
|
|
|
|
2005-03-02 00:37:28 +03:00
|
|
|
#ifdef CONFIG_COCOA
|
|
|
|
#undef main
|
|
|
|
#define main qemu_main
|
|
|
|
#endif /* CONFIG_COCOA */
|
|
|
|
|
2011-08-22 17:12:52 +04:00
|
|
|
#include <glib.h>
|
|
|
|
|
2009-03-07 18:32:56 +03:00
|
|
|
#include "hw/hw.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/usb.h"
|
|
|
|
#include "hw/pcmcia.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/i386/pc.h"
|
|
|
|
#include "hw/isa/isa.h"
|
2009-03-07 18:32:56 +03:00
|
|
|
#include "hw/bt.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "sysemu/watchdog.h"
|
|
|
|
#include "hw/i386/smbios.h"
|
|
|
|
#include "hw/xen/xen.h"
|
2009-07-15 15:59:26 +04:00
|
|
|
#include "hw/qdev.h"
|
2009-10-01 18:42:33 +04:00
|
|
|
#include "hw/loader.h"
|
2013-02-04 14:37:52 +04:00
|
|
|
#include "monitor/qdev.h"
|
2013-04-08 18:55:25 +04:00
|
|
|
#include "sysemu/bt.h"
|
2012-10-24 10:43:34 +04:00
|
|
|
#include "net/net.h"
|
2009-11-25 21:48:54 +03:00
|
|
|
#include "net/slirp.h"
|
2012-12-17 21:19:49 +04:00
|
|
|
#include "monitor/monitor.h"
|
2012-11-28 15:06:30 +04:00
|
|
|
#include "ui/console.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/sysemu.h"
|
2012-12-17 21:19:49 +04:00
|
|
|
#include "exec/gdbstub.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/timer.h"
|
2013-04-08 18:55:25 +04:00
|
|
|
#include "sysemu/char.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/cache-utils.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/blockdev.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/block/block.h"
|
2012-12-17 21:19:50 +04:00
|
|
|
#include "migration/block.h"
|
2013-04-02 20:28:41 +04:00
|
|
|
#include "sysemu/tpm.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/dma.h"
|
2009-03-07 18:32:56 +03:00
|
|
|
#include "audio/audio.h"
|
2012-12-17 21:19:50 +04:00
|
|
|
#include "migration/migration.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/kvm.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/qjson.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/option.h"
|
|
|
|
#include "qemu/config-file.h"
|
2010-06-10 13:42:25 +04:00
|
|
|
#include "qemu-options.h"
|
2011-09-13 00:54:20 +04:00
|
|
|
#include "qmp-commands.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/main-loop.h"
|
2010-06-15 00:34:41 +04:00
|
|
|
#ifdef CONFIG_VIRTFS
|
2010-04-29 16:14:43 +04:00
|
|
|
#include "fsdev/qemu-fsdev.h"
|
|
|
|
#endif
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/qtest.h"
|
2009-03-07 18:32:56 +03:00
|
|
|
|
2012-10-24 13:12:21 +04:00
|
|
|
#include "disas/disas.h"
|
2003-06-30 14:03:06 +04:00
|
|
|
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/sockets.h"
|
2009-03-07 18:32:56 +03:00
|
|
|
|
2009-06-24 16:42:30 +04:00
|
|
|
#include "slirp/libslirp.h"
|
2009-03-07 18:32:56 +03:00
|
|
|
|
2010-11-16 15:20:25 +03:00
|
|
|
#include "trace.h"
|
2011-08-31 22:31:03 +04:00
|
|
|
#include "trace/control.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/queue.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/cpus.h"
|
|
|
|
#include "sysemu/arch_init.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/osdep.h"
|
2009-09-12 11:36:22 +04:00
|
|
|
|
2010-03-11 17:13:27 +03:00
|
|
|
#include "ui/qemu-spice.h"
|
2012-06-25 23:36:33 +04:00
|
|
|
#include "qapi/string-input-visitor.h"
|
2010-03-11 17:13:27 +03:00
|
|
|
|
2008-10-04 11:25:46 +04:00
|
|
|
//#define DEBUG_NET
|
|
|
|
//#define DEBUG_SLIRP
|
2003-07-26 22:11:40 +04:00
|
|
|
|
2004-07-09 01:17:50 +04:00
|
|
|
#define DEFAULT_RAM_SIZE 128
|
2003-08-11 01:52:11 +04:00
|
|
|
|
virtio-console: qdev conversion, new virtio-serial-bus
This commit converts the virtio-console device to create a new
virtio-serial bus that can host console and generic serial ports. The
file hosting this code is now called virtio-serial-bus.c.
The virtio console is now a very simple qdev device that sits on the
virtio-serial-bus and communicates between the bus and qemu's chardevs.
This commit also includes a few changes to the virtio backing code for
pci and s390 to spawn the virtio-serial bus.
As a result of the qdev conversion, we get rid of a lot of legacy code.
The old-style way of instantiating a virtio console using
-virtioconsole ...
is maintained, but the new, preferred way is to use
-device virtio-serial -device virtconsole,chardev=...
With this commit, multiple devices as well as multiple ports with a
single device can be supported.
For multiple ports support, each port gets an IO vq pair. Since the
guest needs to know in advance how many vqs a particular device will
need, we have to set this number as a property of the virtio-serial
device and also as a config option.
In addition, we also spawn a pair of control IO vqs. This is an internal
channel meant for guest-host communication for things like port
open/close, sending port properties over to the guest, etc.
This commit is a part of a series of other commits to get the full
implementation of multiport support. Future commits will add other
support as well as ride on the savevm version that we bump up here.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-01-19 22:06:52 +03:00
|
|
|
#define MAX_VIRTIO_CONSOLES 1
|
2013-01-24 15:18:52 +04:00
|
|
|
#define MAX_SCLP_CONSOLES 1
|
virtio-console: qdev conversion, new virtio-serial-bus
This commit converts the virtio-console device to create a new
virtio-serial bus that can host console and generic serial ports. The
file hosting this code is now called virtio-serial-bus.c.
The virtio console is now a very simple qdev device that sits on the
virtio-serial-bus and communicates between the bus and qemu's chardevs.
This commit also includes a few changes to the virtio backing code for
pci and s390 to spawn the virtio-serial bus.
As a result of the qdev conversion, we get rid of a lot of legacy code.
The old-style way of instantiating a virtio console using
-virtioconsole ...
is maintained, but the new, preferred way is to use
-device virtio-serial -device virtconsole,chardev=...
With this commit, multiple devices as well as multiple ports with a
single device can be supported.
For multiple ports support, each port gets an IO vq pair. Since the
guest needs to know in advance how many vqs a particular device will
need, we have to set this number as a property of the virtio-serial
device and also as a config option.
In addition, we also spawn a pair of control IO vqs. This is an internal
channel meant for guest-host communication for things like port
open/close, sending port properties over to the guest, etc.
This commit is a part of a series of other commits to get the full
implementation of multiport support. Future commits will add other
support as well as ride on the savevm version that we bump up here.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-01-19 22:06:52 +03:00
|
|
|
|
2013-03-08 14:42:24 +04:00
|
|
|
static const char *data_dir[16];
|
|
|
|
static int data_dir_idx;
|
2007-10-05 17:08:35 +04:00
|
|
|
const char *bios_name = NULL;
|
2008-09-28 04:42:12 +04:00
|
|
|
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
|
2009-05-22 01:54:00 +04:00
|
|
|
DisplayType display_type = DT_DEFAULT;
|
2012-10-28 15:04:47 +04:00
|
|
|
static int display_remote;
|
2004-12-12 19:56:30 +03:00
|
|
|
const char* keyboard_layout = NULL;
|
2009-10-02 01:12:16 +04:00
|
|
|
ram_addr_t ram_size;
|
2010-03-02 02:25:08 +03:00
|
|
|
const char *mem_path = NULL;
|
|
|
|
#ifdef MAP_POPULATE
|
|
|
|
int mem_prealloc = 0; /* force preallocation of physical target memory */
|
|
|
|
#endif
|
2004-03-15 00:44:30 +03:00
|
|
|
int nb_nics;
|
2005-11-16 01:16:05 +03:00
|
|
|
NICInfo nd_table[MAX_NICS];
|
2009-07-28 01:17:51 +04:00
|
|
|
int autostart;
|
2008-02-17 14:42:19 +03:00
|
|
|
static int rtc_utc = 1;
|
|
|
|
static int rtc_date_offset = -1; /* -1 means no change */
|
2009-09-15 15:36:04 +04:00
|
|
|
QEMUClock *rtc_clock;
|
2009-12-08 15:11:45 +03:00
|
|
|
int vga_interface_type = VGA_NONE;
|
2008-10-01 23:38:09 +04:00
|
|
|
static int full_screen = 0;
|
2008-11-16 14:34:07 +03:00
|
|
|
#ifdef CONFIG_SDL
|
2008-10-01 23:38:09 +04:00
|
|
|
static int no_frame = 0;
|
2008-11-16 14:34:07 +03:00
|
|
|
#endif
|
2006-12-11 05:08:05 +03:00
|
|
|
int no_quit = 0;
|
2004-08-25 01:13:40 +04:00
|
|
|
CharDriverState *serial_hds[MAX_SERIAL_PORTS];
|
2005-01-15 15:02:56 +03:00
|
|
|
CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
|
2009-01-15 23:05:25 +03:00
|
|
|
CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
|
2013-01-24 15:18:52 +04:00
|
|
|
CharDriverState *sclp_hds[MAX_SCLP_CONSOLES];
|
2005-04-30 20:10:35 +04:00
|
|
|
int win2k_install_hack = 0;
|
2009-04-06 00:08:59 +04:00
|
|
|
int singlestep = 0;
|
2005-11-22 02:25:50 +03:00
|
|
|
int smp_cpus = 1;
|
2009-07-23 19:03:42 +04:00
|
|
|
int max_cpus = 0;
|
extend -smp parsing to include cores= and threads= options
For injecting multi-core and multi-threading CPU topology into guests
extend the -smp syntax to accommodate cores and threads specification.
Syntax: -smp smp_value[,cores=nr_cores][,threads=nr_threads]\
[,socket=nr_sockets][,maxcpus=max_cpus]
smp_value is the legacy value specifying the total number of vCPUs for
the guest. If you specify one of cores, threads or sockets this value
can be omitted. Missing values will be computed to fulfill:
smp_value = nr_cores * nr_threads * nr_sockets
where it will favour sockets over cores over threads (to mimic the
current behavior, which will only inject multiple sockets.)
So -smp 4,threads=2 will inject two sockets with 2 threads each,
-smp cores=4 is an abbreviation for -smp 4,cores=4,threads=1,sockets=1.
If max_cpus (the number of hotpluggable CPUs) is omitted, it will
be set to smp_value.
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-08-19 17:42:40 +04:00
|
|
|
int smp_cores = 1;
|
|
|
|
int smp_threads = 1;
|
2011-03-16 15:33:36 +03:00
|
|
|
#ifdef CONFIG_VNC
|
2006-12-22 05:09:07 +03:00
|
|
|
const char *vnc_display;
|
2011-03-16 15:33:36 +03:00
|
|
|
#endif
|
2006-05-04 02:02:44 +04:00
|
|
|
int acpi_enabled = 1;
|
2008-12-18 02:28:44 +03:00
|
|
|
int no_hpet = 0;
|
2006-06-14 20:03:05 +04:00
|
|
|
int fd_bootchk = 1;
|
2012-10-28 15:04:47 +04:00
|
|
|
static int no_reboot;
|
2008-04-12 01:35:52 +04:00
|
|
|
int no_shutdown = 0;
|
2007-05-01 05:34:14 +04:00
|
|
|
int cursor_hide = 1;
|
2007-04-30 05:48:07 +04:00
|
|
|
int graphic_rotate = 0;
|
2009-08-21 12:31:34 +04:00
|
|
|
const char *watchdog;
|
2010-12-08 14:35:07 +03:00
|
|
|
QEMUOptionRom option_rom[MAX_OPTION_ROMS];
|
2007-01-05 20:39:04 +03:00
|
|
|
int nb_option_roms;
|
2007-01-20 20:12:09 +03:00
|
|
|
int semihosting_enabled = 0;
|
2007-07-28 02:08:46 +04:00
|
|
|
int old_param = 0;
|
2007-03-19 18:17:08 +03:00
|
|
|
const char *qemu_name;
|
2007-06-22 01:08:02 +04:00
|
|
|
int alt_grab = 0;
|
2009-09-18 00:48:04 +04:00
|
|
|
int ctrl_grab = 0;
|
2007-05-01 18:16:52 +04:00
|
|
|
unsigned int nb_prom_envs = 0;
|
|
|
|
const char *prom_envs[MAX_PROM_ENVS];
|
2009-07-02 02:19:02 +04:00
|
|
|
int boot_menu;
|
2013-03-19 10:23:27 +04:00
|
|
|
bool boot_strict;
|
2011-07-27 14:04:55 +04:00
|
|
|
uint8_t *boot_splash_filedata;
|
2013-01-23 21:25:08 +04:00
|
|
|
size_t boot_splash_filedata_size;
|
2011-07-27 14:04:55 +04:00
|
|
|
uint8_t qemu_extra_params_fw[2];
|
2003-06-24 17:42:40 +04:00
|
|
|
|
2010-12-08 14:35:05 +03:00
|
|
|
typedef struct FWBootEntry FWBootEntry;
|
|
|
|
|
|
|
|
struct FWBootEntry {
|
|
|
|
QTAILQ_ENTRY(FWBootEntry) link;
|
|
|
|
int32_t bootindex;
|
|
|
|
DeviceState *dev;
|
|
|
|
char *suffix;
|
|
|
|
};
|
|
|
|
|
2012-10-28 15:04:47 +04:00
|
|
|
static QTAILQ_HEAD(, FWBootEntry) fw_boot_order =
|
|
|
|
QTAILQ_HEAD_INITIALIZER(fw_boot_order);
|
2010-12-08 14:35:05 +03:00
|
|
|
|
2009-04-22 02:30:27 +04:00
|
|
|
int nb_numa_nodes;
|
|
|
|
uint64_t node_mem[MAX_NODES];
|
Fixes related to processing of qemu's -numa option
The -numa option to qemu is used to create [fake] numa nodes
and expose them to the guest OS instance.
There are a couple of issues with the -numa option:
a) Max VCPU's that can be specified for a guest while using
the qemu's -numa option is 64. Due to a typecasting issue
when the number of VCPUs is > 32 the VCPUs don't show up
under the specified [fake] numa nodes.
b) KVM currently has support for 160VCPUs per guest. The
qemu's -numa option has only support for upto 64VCPUs
per guest.
This patch addresses these two issues.
Below are examples of (a) and (b)
a) >32 VCPUs are specified with the -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
71:01:01 \
-net tap,ifname=tap0,script=no,downscript=no \
-vnc :4
...
Upstream qemu :
--------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59
node 2 size: 131072 MB
node 3 cpus: 30
node 3 size: 131072 MB
node 4 cpus:
node 4 size: 131072 MB
node 5 cpus: 31
node 5 size: 131072 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 131072 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 131072 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 131072 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 131072 MB
b) >64 VCPUs specified with -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
-cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4
...
Upstream qemu :
--------------
only 63 CPUs in NUMA mode supported.
only 64 CPUs in NUMA mode supported.
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61
node 2 size: 65536 MB
node 3 cpus: 30 62
node 3 size: 65536 MB
node 4 cpus:
node 4 size: 65536 MB
node 5 cpus:
node 5 size: 65536 MB
node 6 cpus: 31 63
node 6 size: 65536 MB
node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69
node 7 size: 65536 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 65536 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 65536 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 65536 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 65536 MB
node 6 cpus: 60 61 62 63 64 65 66 67 68 69
node 6 size: 65536 MB
node 7 cpus: 70 71 72 73 74 75 76 77 78 79
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2012-07-17 08:31:30 +04:00
|
|
|
unsigned long *node_cpumask[MAX_NODES];
|
2009-04-22 02:30:27 +04:00
|
|
|
|
2008-09-18 22:29:08 +04:00
|
|
|
uint8_t qemu_uuid[16];
|
|
|
|
|
2009-07-02 02:19:02 +04:00
|
|
|
static QEMUBootSetHandler *boot_set_handler;
|
|
|
|
static void *boot_set_opaque;
|
|
|
|
|
2010-06-04 16:08:07 +04:00
|
|
|
static NotifierList exit_notifiers =
|
|
|
|
NOTIFIER_LIST_INITIALIZER(exit_notifiers);
|
|
|
|
|
2010-12-08 14:35:08 +03:00
|
|
|
static NotifierList machine_init_done_notifiers =
|
|
|
|
NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers);
|
|
|
|
|
2013-01-24 09:03:27 +04:00
|
|
|
static bool tcg_allowed = true;
|
|
|
|
bool xen_allowed;
|
2010-03-29 23:23:49 +04:00
|
|
|
uint32_t xen_domid;
|
|
|
|
enum xen_mode xen_mode = XEN_EMULATE;
|
2011-08-02 18:10:21 +04:00
|
|
|
static int tcg_tb_size;
|
2010-03-29 23:23:49 +04:00
|
|
|
|
2009-12-08 15:11:41 +03:00
|
|
|
static int default_serial = 1;
|
2009-12-08 15:11:42 +03:00
|
|
|
static int default_parallel = 1;
|
2009-12-08 15:11:54 +03:00
|
|
|
static int default_virtcon = 1;
|
2013-01-24 15:18:52 +04:00
|
|
|
static int default_sclp = 1;
|
2009-12-08 15:11:43 +03:00
|
|
|
static int default_monitor = 1;
|
2009-12-16 16:25:39 +03:00
|
|
|
static int default_floppy = 1;
|
|
|
|
static int default_cdrom = 1;
|
|
|
|
static int default_sdcard = 1;
|
2012-05-10 11:39:17 +04:00
|
|
|
static int default_vga = 1;
|
2009-12-08 15:11:41 +03:00
|
|
|
|
|
|
|
static struct {
|
|
|
|
const char *driver;
|
|
|
|
int *flag;
|
|
|
|
} default_list[] = {
|
2009-12-08 15:11:42 +03:00
|
|
|
{ .driver = "isa-serial", .flag = &default_serial },
|
|
|
|
{ .driver = "isa-parallel", .flag = &default_parallel },
|
2009-12-16 16:25:40 +03:00
|
|
|
{ .driver = "isa-fdc", .flag = &default_floppy },
|
2011-05-18 20:31:02 +04:00
|
|
|
{ .driver = "ide-cd", .flag = &default_cdrom },
|
|
|
|
{ .driver = "ide-hd", .flag = &default_cdrom },
|
2009-12-16 16:25:40 +03:00
|
|
|
{ .driver = "ide-drive", .flag = &default_cdrom },
|
2011-05-18 20:31:02 +04:00
|
|
|
{ .driver = "scsi-cd", .flag = &default_cdrom },
|
2010-01-21 13:49:23 +03:00
|
|
|
{ .driver = "virtio-serial-pci", .flag = &default_virtcon },
|
|
|
|
{ .driver = "virtio-serial-s390", .flag = &default_virtcon },
|
|
|
|
{ .driver = "virtio-serial", .flag = &default_virtcon },
|
2012-05-10 11:39:17 +04:00
|
|
|
{ .driver = "VGA", .flag = &default_vga },
|
|
|
|
{ .driver = "isa-vga", .flag = &default_vga },
|
|
|
|
{ .driver = "cirrus-vga", .flag = &default_vga },
|
|
|
|
{ .driver = "isa-cirrus-vga", .flag = &default_vga },
|
|
|
|
{ .driver = "vmware-svga", .flag = &default_vga },
|
|
|
|
{ .driver = "qxl-vga", .flag = &default_vga },
|
2009-12-08 15:11:41 +03:00
|
|
|
};
|
|
|
|
|
2012-11-26 19:03:42 +04:00
|
|
|
static QemuOptsList qemu_rtc_opts = {
|
|
|
|
.name = "rtc",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_rtc_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "base",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
},{
|
|
|
|
.name = "clock",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
},{
|
|
|
|
.name = "driftfix",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_sandbox_opts = {
|
|
|
|
.name = "sandbox",
|
|
|
|
.implied_opt_name = "enable",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_sandbox_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "enable",
|
|
|
|
.type = QEMU_OPT_BOOL,
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_trace_opts = {
|
|
|
|
.name = "trace",
|
|
|
|
.implied_opt_name = "trace",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "events",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
},{
|
|
|
|
.name = "file",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_option_rom_opts = {
|
|
|
|
.name = "option-rom",
|
|
|
|
.implied_opt_name = "romfile",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_option_rom_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "bootindex",
|
|
|
|
.type = QEMU_OPT_NUMBER,
|
|
|
|
}, {
|
|
|
|
.name = "romfile",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_machine_opts = {
|
|
|
|
.name = "machine",
|
|
|
|
.implied_opt_name = "type",
|
|
|
|
.merge_lists = true,
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_machine_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "type",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "emulated machine"
|
|
|
|
}, {
|
|
|
|
.name = "accel",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "accelerator list",
|
|
|
|
}, {
|
|
|
|
.name = "kernel_irqchip",
|
|
|
|
.type = QEMU_OPT_BOOL,
|
|
|
|
.help = "use KVM in-kernel irqchip",
|
|
|
|
}, {
|
|
|
|
.name = "kvm_shadow_mem",
|
|
|
|
.type = QEMU_OPT_SIZE,
|
|
|
|
.help = "KVM shadow MMU size",
|
|
|
|
}, {
|
|
|
|
.name = "kernel",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "Linux kernel image file",
|
|
|
|
}, {
|
|
|
|
.name = "initrd",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "Linux initial ramdisk file",
|
|
|
|
}, {
|
|
|
|
.name = "append",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "Linux kernel command line",
|
|
|
|
}, {
|
|
|
|
.name = "dtb",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "Linux kernel device tree file",
|
|
|
|
}, {
|
|
|
|
.name = "dumpdtb",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "Dump current dtb to a file and quit",
|
|
|
|
}, {
|
|
|
|
.name = "phandle_start",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "The first phandle ID we may generate dynamically",
|
|
|
|
}, {
|
|
|
|
.name = "dt_compatible",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "Overrides the \"compatible\" property of the dt root node",
|
|
|
|
}, {
|
|
|
|
.name = "dump-guest-core",
|
|
|
|
.type = QEMU_OPT_BOOL,
|
|
|
|
.help = "Include guest memory in a core dump",
|
|
|
|
}, {
|
|
|
|
.name = "mem-merge",
|
|
|
|
.type = QEMU_OPT_BOOL,
|
|
|
|
.help = "enable/disable memory merge support",
|
|
|
|
},{
|
|
|
|
.name = "usb",
|
|
|
|
.type = QEMU_OPT_BOOL,
|
|
|
|
.help = "Set on/off to enable/disable usb",
|
|
|
|
},
|
|
|
|
{ /* End of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_boot_opts = {
|
|
|
|
.name = "boot-opts",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_boot_opts.head),
|
|
|
|
.desc = {
|
|
|
|
/* the three names below are not used now */
|
|
|
|
{
|
|
|
|
.name = "order",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
}, {
|
|
|
|
.name = "once",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
}, {
|
|
|
|
.name = "menu",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
/* following are really used */
|
|
|
|
}, {
|
|
|
|
.name = "splash",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
}, {
|
|
|
|
.name = "splash-time",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
}, {
|
|
|
|
.name = "reboot-timeout",
|
|
|
|
.type = QEMU_OPT_STRING,
|
2013-03-19 10:23:27 +04:00
|
|
|
}, {
|
|
|
|
.name = "strict",
|
|
|
|
.type = QEMU_OPT_STRING,
|
2012-11-26 19:03:42 +04:00
|
|
|
},
|
|
|
|
{ /*End of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_add_fd_opts = {
|
|
|
|
.name = "add-fd",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_add_fd_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "fd",
|
|
|
|
.type = QEMU_OPT_NUMBER,
|
|
|
|
.help = "file descriptor of which a duplicate is added to fd set",
|
|
|
|
},{
|
|
|
|
.name = "set",
|
|
|
|
.type = QEMU_OPT_NUMBER,
|
|
|
|
.help = "ID of the fd set to add fd to",
|
|
|
|
},{
|
|
|
|
.name = "opaque",
|
|
|
|
.type = QEMU_OPT_STRING,
|
|
|
|
.help = "free-form string used to describe fd",
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static QemuOptsList qemu_object_opts = {
|
|
|
|
.name = "object",
|
|
|
|
.implied_opt_name = "qom-type",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
Support for TPM command line options
This patch adds support for TPM command line options.
The command line options supported here are
./qemu-... -tpmdev passthrough,path=<path to TPM device>,id=<id>
-device tpm-tis,tpmdev=<id>,id=<other id>
and
./qemu-... -tpmdev help
where the latter works similar to -soundhw help and shows a list of
available TPM backends (for example 'passthrough').
Using the type parameter, the backend is chosen, i.e., 'passthrough' for the
passthrough driver. The interpretation of the other parameters along
with determining whether enough parameters were provided is pushed into
the backend driver, which needs to implement the interface function
'create' and return a TPMDriverOpts structure if the VM can be started or
'NULL' if not enough or bad parameters were provided.
Monitor support for 'info tpm' has been added. It for example prints the
following:
(qemu) info tpm
TPM devices:
tpm0: model=tpm-tis
\ tpm0: type=passthrough,path=/dev/tpm0,cancel-path=/sys/devices/pnp0/00:09/cancel
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Joel Schopp <jschopp@linux.vnet.ibm.com>
Message-id: 1361987275-26289-2-git-send-email-stefanb@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-27 21:47:49 +04:00
|
|
|
static QemuOptsList qemu_tpmdev_opts = {
|
|
|
|
.name = "tpmdev",
|
|
|
|
.implied_opt_name = "type",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_tpmdev_opts.head),
|
|
|
|
.desc = {
|
2013-04-22 18:41:39 +04:00
|
|
|
/* options are defined in the TPM backends */
|
Support for TPM command line options
This patch adds support for TPM command line options.
The command line options supported here are
./qemu-... -tpmdev passthrough,path=<path to TPM device>,id=<id>
-device tpm-tis,tpmdev=<id>,id=<other id>
and
./qemu-... -tpmdev help
where the latter works similar to -soundhw help and shows a list of
available TPM backends (for example 'passthrough').
Using the type parameter, the backend is chosen, i.e., 'passthrough' for the
passthrough driver. The interpretation of the other parameters along
with determining whether enough parameters were provided is pushed into
the backend driver, which needs to implement the interface function
'create' and return a TPMDriverOpts structure if the VM can be started or
'NULL' if not enough or bad parameters were provided.
Monitor support for 'info tpm' has been added. It for example prints the
following:
(qemu) info tpm
TPM devices:
tpm0: model=tpm-tis
\ tpm0: type=passthrough,path=/dev/tpm0,cancel-path=/sys/devices/pnp0/00:09/cancel
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Joel Schopp <jschopp@linux.vnet.ibm.com>
Message-id: 1361987275-26289-2-git-send-email-stefanb@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-27 21:47:49 +04:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2013-04-19 18:42:06 +04:00
|
|
|
static QemuOptsList qemu_realtime_opts = {
|
|
|
|
.name = "realtime",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_realtime_opts.head),
|
|
|
|
.desc = {
|
|
|
|
{
|
|
|
|
.name = "mlock",
|
|
|
|
.type = QEMU_OPT_BOOL,
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2012-08-06 12:24:55 +04:00
|
|
|
const char *qemu_get_vm_name(void)
|
|
|
|
{
|
|
|
|
return qemu_name;
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:04:55 +04:00
|
|
|
static void res_free(void)
|
|
|
|
{
|
|
|
|
if (boot_splash_filedata != NULL) {
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(boot_splash_filedata);
|
2011-07-27 14:04:55 +04:00
|
|
|
boot_splash_filedata = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:41 +03:00
|
|
|
static int default_driver_check(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
const char *driver = qemu_opt_get(opts, "driver");
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!driver)
|
|
|
|
return 0;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(default_list); i++) {
|
|
|
|
if (strcmp(default_list[i].driver, driver) != 0)
|
|
|
|
continue;
|
|
|
|
*(default_list[i].flag) = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-29 22:04:45 +04:00
|
|
|
/***********************************************************/
|
|
|
|
/* QEMU state */
|
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
static RunState current_run_state = RUN_STATE_PRELAUNCH;
|
2011-07-29 22:04:45 +04:00
|
|
|
|
2011-09-05 23:36:31 +04:00
|
|
|
typedef struct {
|
|
|
|
RunState from;
|
|
|
|
RunState to;
|
|
|
|
} RunStateTransition;
|
|
|
|
|
|
|
|
static const RunStateTransition runstate_transitions_def[] = {
|
|
|
|
/* from -> to */
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_DEBUG, RUN_STATE_RUNNING },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_INMIGRATE, RUN_STATE_RUNNING },
|
2012-10-19 18:45:24 +04:00
|
|
|
{ RUN_STATE_INMIGRATE, RUN_STATE_PAUSED },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_INTERNAL_ERROR, RUN_STATE_PAUSED },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_IO_ERROR, RUN_STATE_RUNNING },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_IO_ERROR, RUN_STATE_FINISH_MIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_PAUSED, RUN_STATE_RUNNING },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
|
|
|
|
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_RESTORE_VM, RUN_STATE_RUNNING },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_DEBUG },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_INTERNAL_ERROR },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_IO_ERROR },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_PAUSED },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_FINISH_MIGRATE },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_RESTORE_VM },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_SAVE_VM },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },
|
2013-04-26 07:24:40 +04:00
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_SHUTDOWN, RUN_STATE_FINISH_MIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2012-04-27 20:33:36 +04:00
|
|
|
{ RUN_STATE_DEBUG, RUN_STATE_SUSPENDED },
|
|
|
|
{ RUN_STATE_RUNNING, RUN_STATE_SUSPENDED },
|
|
|
|
{ RUN_STATE_SUSPENDED, RUN_STATE_RUNNING },
|
|
|
|
{ RUN_STATE_SUSPENDED, RUN_STATE_FINISH_MIGRATE },
|
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
|
2011-10-14 18:18:09 +04:00
|
|
|
{ RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
|
2011-09-05 23:36:31 +04:00
|
|
|
|
2013-04-26 07:24:40 +04:00
|
|
|
{ RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED },
|
2013-05-20 14:46:20 +04:00
|
|
|
{ RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },
|
2013-06-03 19:06:55 +04:00
|
|
|
{ RUN_STATE_GUEST_PANICKED, RUN_STATE_DEBUG },
|
2013-04-26 07:24:40 +04:00
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
{ RUN_STATE_MAX, RUN_STATE_MAX },
|
2011-09-05 23:36:31 +04:00
|
|
|
};
|
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
static bool runstate_valid_transitions[RUN_STATE_MAX][RUN_STATE_MAX];
|
|
|
|
|
2011-07-29 22:04:45 +04:00
|
|
|
bool runstate_check(RunState state)
|
|
|
|
{
|
|
|
|
return current_run_state == state;
|
|
|
|
}
|
|
|
|
|
2012-10-28 15:04:47 +04:00
|
|
|
static void runstate_init(void)
|
2011-09-05 23:36:31 +04:00
|
|
|
{
|
|
|
|
const RunStateTransition *p;
|
|
|
|
|
|
|
|
memset(&runstate_valid_transitions, 0, sizeof(runstate_valid_transitions));
|
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
for (p = &runstate_transitions_def[0]; p->from != RUN_STATE_MAX; p++) {
|
2011-09-05 23:36:31 +04:00
|
|
|
runstate_valid_transitions[p->from][p->to] = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This function will abort() on invalid state transitions */
|
2011-07-29 22:04:45 +04:00
|
|
|
void runstate_set(RunState new_state)
|
|
|
|
{
|
2011-10-13 17:59:07 +04:00
|
|
|
assert(new_state < RUN_STATE_MAX);
|
|
|
|
|
|
|
|
if (!runstate_valid_transitions[current_run_state][new_state]) {
|
|
|
|
fprintf(stderr, "ERROR: invalid runstate transition: '%s' -> '%s'\n",
|
|
|
|
RunState_lookup[current_run_state],
|
|
|
|
RunState_lookup[new_state]);
|
2011-09-05 23:36:31 +04:00
|
|
|
abort();
|
|
|
|
}
|
2013-03-22 12:26:59 +04:00
|
|
|
trace_runstate_set(new_state);
|
2011-07-29 22:04:45 +04:00
|
|
|
current_run_state = new_state;
|
|
|
|
}
|
|
|
|
|
2011-09-13 00:54:20 +04:00
|
|
|
int runstate_is_running(void)
|
2011-08-29 23:02:57 +04:00
|
|
|
{
|
2011-09-13 00:54:20 +04:00
|
|
|
return runstate_check(RUN_STATE_RUNNING);
|
2011-08-29 23:02:57 +04:00
|
|
|
}
|
|
|
|
|
2013-04-26 07:24:40 +04:00
|
|
|
bool runstate_needs_reset(void)
|
|
|
|
{
|
|
|
|
return runstate_check(RUN_STATE_INTERNAL_ERROR) ||
|
|
|
|
runstate_check(RUN_STATE_SHUTDOWN) ||
|
|
|
|
runstate_check(RUN_STATE_GUEST_PANICKED);
|
|
|
|
}
|
|
|
|
|
2011-09-13 00:54:20 +04:00
|
|
|
StatusInfo *qmp_query_status(Error **errp)
|
2011-07-29 22:36:43 +04:00
|
|
|
{
|
2011-09-13 00:54:20 +04:00
|
|
|
StatusInfo *info = g_malloc0(sizeof(*info));
|
|
|
|
|
|
|
|
info->running = runstate_is_running();
|
|
|
|
info->singlestep = singlestep;
|
|
|
|
info->status = current_run_state;
|
|
|
|
|
|
|
|
return info;
|
2011-07-29 22:36:43 +04:00
|
|
|
}
|
|
|
|
|
2010-01-13 16:05:34 +03:00
|
|
|
/***********************************************************/
|
|
|
|
/* real time host monotonic timer */
|
2006-04-13 01:09:08 +04:00
|
|
|
|
2008-02-17 14:42:19 +03:00
|
|
|
/***********************************************************/
|
|
|
|
/* host time/date access */
|
|
|
|
void qemu_get_timedate(struct tm *tm, int offset)
|
|
|
|
{
|
|
|
|
time_t ti;
|
|
|
|
|
|
|
|
time(&ti);
|
|
|
|
ti += offset;
|
|
|
|
if (rtc_date_offset == -1) {
|
|
|
|
if (rtc_utc)
|
2013-01-08 02:08:13 +04:00
|
|
|
gmtime_r(&ti, tm);
|
2008-02-17 14:42:19 +03:00
|
|
|
else
|
2013-01-08 02:08:13 +04:00
|
|
|
localtime_r(&ti, tm);
|
2008-02-17 14:42:19 +03:00
|
|
|
} else {
|
|
|
|
ti -= rtc_date_offset;
|
2013-01-08 02:08:13 +04:00
|
|
|
gmtime_r(&ti, tm);
|
2008-02-17 14:42:19 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int qemu_timedate_diff(struct tm *tm)
|
|
|
|
{
|
|
|
|
time_t seconds;
|
|
|
|
|
|
|
|
if (rtc_date_offset == -1)
|
|
|
|
if (rtc_utc)
|
|
|
|
seconds = mktimegm(tm);
|
2011-11-06 20:00:22 +04:00
|
|
|
else {
|
|
|
|
struct tm tmp = *tm;
|
|
|
|
tmp.tm_isdst = -1; /* use timezone to figure it out */
|
|
|
|
seconds = mktime(&tmp);
|
|
|
|
}
|
2008-02-17 14:42:19 +03:00
|
|
|
else
|
|
|
|
seconds = mktimegm(tm) + rtc_date_offset;
|
|
|
|
|
|
|
|
return seconds - time(NULL);
|
|
|
|
}
|
|
|
|
|
2010-02-25 18:11:44 +03:00
|
|
|
void rtc_change_mon_event(struct tm *tm)
|
|
|
|
{
|
|
|
|
QObject *data;
|
|
|
|
|
|
|
|
data = qobject_from_jsonf("{ 'offset': %d }", qemu_timedate_diff(tm));
|
|
|
|
monitor_protocol_event(QEVENT_RTC_CHANGE, data);
|
|
|
|
qobject_decref(data);
|
|
|
|
}
|
|
|
|
|
2009-09-15 15:36:04 +04:00
|
|
|
static void configure_rtc_date_offset(const char *startdate, int legacy)
|
|
|
|
{
|
|
|
|
time_t rtc_start_date;
|
|
|
|
struct tm tm;
|
|
|
|
|
|
|
|
if (!strcmp(startdate, "now") && legacy) {
|
|
|
|
rtc_date_offset = -1;
|
|
|
|
} else {
|
|
|
|
if (sscanf(startdate, "%d-%d-%dT%d:%d:%d",
|
|
|
|
&tm.tm_year,
|
|
|
|
&tm.tm_mon,
|
|
|
|
&tm.tm_mday,
|
|
|
|
&tm.tm_hour,
|
|
|
|
&tm.tm_min,
|
|
|
|
&tm.tm_sec) == 6) {
|
|
|
|
/* OK */
|
|
|
|
} else if (sscanf(startdate, "%d-%d-%d",
|
|
|
|
&tm.tm_year,
|
|
|
|
&tm.tm_mon,
|
|
|
|
&tm.tm_mday) == 3) {
|
|
|
|
tm.tm_hour = 0;
|
|
|
|
tm.tm_min = 0;
|
|
|
|
tm.tm_sec = 0;
|
|
|
|
} else {
|
|
|
|
goto date_fail;
|
|
|
|
}
|
|
|
|
tm.tm_year -= 1900;
|
|
|
|
tm.tm_mon--;
|
|
|
|
rtc_start_date = mktimegm(&tm);
|
|
|
|
if (rtc_start_date == -1) {
|
|
|
|
date_fail:
|
|
|
|
fprintf(stderr, "Invalid date format. Valid formats are:\n"
|
|
|
|
"'2006-06-17T16:01:21' or '2006-06-17'\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
rtc_date_offset = time(NULL) - rtc_start_date;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void configure_rtc(QemuOpts *opts)
|
|
|
|
{
|
|
|
|
const char *value;
|
|
|
|
|
|
|
|
value = qemu_opt_get(opts, "base");
|
|
|
|
if (value) {
|
|
|
|
if (!strcmp(value, "utc")) {
|
|
|
|
rtc_utc = 1;
|
|
|
|
} else if (!strcmp(value, "localtime")) {
|
|
|
|
rtc_utc = 0;
|
|
|
|
} else {
|
|
|
|
configure_rtc_date_offset(value, 0);
|
|
|
|
}
|
|
|
|
}
|
2009-09-15 15:36:04 +04:00
|
|
|
value = qemu_opt_get(opts, "clock");
|
|
|
|
if (value) {
|
|
|
|
if (!strcmp(value, "host")) {
|
|
|
|
rtc_clock = host_clock;
|
2012-03-30 14:31:21 +04:00
|
|
|
} else if (!strcmp(value, "rt")) {
|
|
|
|
rtc_clock = rt_clock;
|
2009-09-15 15:36:04 +04:00
|
|
|
} else if (!strcmp(value, "vm")) {
|
|
|
|
rtc_clock = vm_clock;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "qemu: invalid option value '%s'\n", value);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2009-09-15 15:36:04 +04:00
|
|
|
value = qemu_opt_get(opts, "driftfix");
|
|
|
|
if (value) {
|
2010-03-28 00:33:46 +03:00
|
|
|
if (!strcmp(value, "slew")) {
|
2012-01-23 23:15:12 +04:00
|
|
|
static GlobalProperty slew_lost_ticks[] = {
|
|
|
|
{
|
|
|
|
.driver = "mc146818rtc",
|
|
|
|
.property = "lost_tick_policy",
|
|
|
|
.value = "slew",
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
};
|
|
|
|
|
|
|
|
qdev_prop_register_global_list(slew_lost_ticks);
|
2010-03-28 00:33:46 +03:00
|
|
|
} else if (!strcmp(value, "none")) {
|
2012-01-23 23:15:12 +04:00
|
|
|
/* discard is default */
|
2009-09-15 15:36:04 +04:00
|
|
|
} else {
|
|
|
|
fprintf(stderr, "qemu: invalid option value '%s'\n", value);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-29 03:19:47 +04:00
|
|
|
/***********************************************************/
|
|
|
|
/* Bluetooth support */
|
|
|
|
static int nb_hcis;
|
|
|
|
static int cur_hci;
|
|
|
|
static struct HCIInfo *hci_table[MAX_NICS];
|
2008-11-09 03:04:26 +03:00
|
|
|
|
2008-09-29 03:19:47 +04:00
|
|
|
static struct bt_vlan_s {
|
|
|
|
struct bt_scatternet_s net;
|
|
|
|
int id;
|
|
|
|
struct bt_vlan_s *next;
|
|
|
|
} *first_bt_vlan;
|
|
|
|
|
|
|
|
/* find or alloc a new bluetooth "VLAN" */
|
2008-09-30 22:18:27 +04:00
|
|
|
static struct bt_scatternet_s *qemu_find_bt_vlan(int id)
|
2008-09-29 03:19:47 +04:00
|
|
|
{
|
|
|
|
struct bt_vlan_s **pvlan, *vlan;
|
|
|
|
for (vlan = first_bt_vlan; vlan != NULL; vlan = vlan->next) {
|
|
|
|
if (vlan->id == id)
|
|
|
|
return &vlan->net;
|
|
|
|
}
|
2011-08-21 07:09:37 +04:00
|
|
|
vlan = g_malloc0(sizeof(struct bt_vlan_s));
|
2008-09-29 03:19:47 +04:00
|
|
|
vlan->id = id;
|
|
|
|
pvlan = &first_bt_vlan;
|
|
|
|
while (*pvlan != NULL)
|
|
|
|
pvlan = &(*pvlan)->next;
|
|
|
|
*pvlan = vlan;
|
|
|
|
return &vlan->net;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void null_hci_send(struct HCIInfo *hci, const uint8_t *data, int len)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static int null_hci_addr_set(struct HCIInfo *hci, const uint8_t *bd_addr)
|
|
|
|
{
|
|
|
|
return -ENOTSUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct HCIInfo null_hci = {
|
|
|
|
.cmd_send = null_hci_send,
|
|
|
|
.sco_send = null_hci_send,
|
|
|
|
.acl_send = null_hci_send,
|
|
|
|
.bdaddr_set = null_hci_addr_set,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct HCIInfo *qemu_next_hci(void)
|
|
|
|
{
|
|
|
|
if (cur_hci == nb_hcis)
|
|
|
|
return &null_hci;
|
|
|
|
|
|
|
|
return hci_table[cur_hci++];
|
|
|
|
}
|
|
|
|
|
2008-11-09 03:04:26 +03:00
|
|
|
static struct HCIInfo *hci_init(const char *str)
|
|
|
|
{
|
|
|
|
char *endp;
|
|
|
|
struct bt_scatternet_s *vlan = 0;
|
|
|
|
|
|
|
|
if (!strcmp(str, "null"))
|
|
|
|
/* null */
|
|
|
|
return &null_hci;
|
|
|
|
else if (!strncmp(str, "host", 4) && (str[4] == '\0' || str[4] == ':'))
|
|
|
|
/* host[:hciN] */
|
|
|
|
return bt_host_hci(str[4] ? str + 5 : "hci0");
|
|
|
|
else if (!strncmp(str, "hci", 3)) {
|
|
|
|
/* hci[,vlan=n] */
|
|
|
|
if (str[3]) {
|
|
|
|
if (!strncmp(str + 3, ",vlan=", 6)) {
|
|
|
|
vlan = qemu_find_bt_vlan(strtol(str + 9, &endp, 0));
|
|
|
|
if (*endp)
|
|
|
|
vlan = 0;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
vlan = qemu_find_bt_vlan(0);
|
|
|
|
if (vlan)
|
|
|
|
return bt_new_hci(vlan);
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(stderr, "qemu: Unknown bluetooth HCI `%s'.\n", str);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bt_hci_parse(const char *str)
|
|
|
|
{
|
|
|
|
struct HCIInfo *hci;
|
2009-10-02 01:12:16 +04:00
|
|
|
bdaddr_t bdaddr;
|
2008-11-09 03:04:26 +03:00
|
|
|
|
|
|
|
if (nb_hcis >= MAX_NICS) {
|
|
|
|
fprintf(stderr, "qemu: Too many bluetooth HCIs (max %i).\n", MAX_NICS);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
hci = hci_init(str);
|
|
|
|
if (!hci)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
bdaddr.b[0] = 0x52;
|
|
|
|
bdaddr.b[1] = 0x54;
|
|
|
|
bdaddr.b[2] = 0x00;
|
|
|
|
bdaddr.b[3] = 0x12;
|
|
|
|
bdaddr.b[4] = 0x34;
|
|
|
|
bdaddr.b[5] = 0x56 + nb_hcis;
|
|
|
|
hci->bdaddr_set(hci, bdaddr.b);
|
|
|
|
|
|
|
|
hci_table[nb_hcis++] = hci;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void bt_vhci_add(int vlan_id)
|
|
|
|
{
|
|
|
|
struct bt_scatternet_s *vlan = qemu_find_bt_vlan(vlan_id);
|
|
|
|
|
|
|
|
if (!vlan->slave)
|
|
|
|
fprintf(stderr, "qemu: warning: adding a VHCI to "
|
|
|
|
"an empty scatternet %i\n", vlan_id);
|
|
|
|
|
|
|
|
bt_vhci_init(bt_new_hci(vlan));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct bt_device_s *bt_device_add(const char *opt)
|
|
|
|
{
|
|
|
|
struct bt_scatternet_s *vlan;
|
|
|
|
int vlan_id = 0;
|
|
|
|
char *endp = strstr(opt, ",vlan=");
|
|
|
|
int len = (endp ? endp - opt : strlen(opt)) + 1;
|
|
|
|
char devname[10];
|
|
|
|
|
|
|
|
pstrcpy(devname, MIN(sizeof(devname), len), opt);
|
|
|
|
|
|
|
|
if (endp) {
|
|
|
|
vlan_id = strtol(endp + 6, &endp, 0);
|
|
|
|
if (*endp) {
|
|
|
|
fprintf(stderr, "qemu: unrecognised bluetooth vlan Id\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
vlan = qemu_find_bt_vlan(vlan_id);
|
|
|
|
|
|
|
|
if (!vlan->slave)
|
|
|
|
fprintf(stderr, "qemu: warning: adding a slave device to "
|
|
|
|
"an empty scatternet %i\n", vlan_id);
|
|
|
|
|
|
|
|
if (!strcmp(devname, "keyboard"))
|
|
|
|
return bt_keyboard_init(vlan);
|
|
|
|
|
|
|
|
fprintf(stderr, "qemu: unsupported bluetooth device `%s'\n", devname);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bt_parse(const char *opt)
|
|
|
|
{
|
|
|
|
const char *endp, *p;
|
|
|
|
int vlan;
|
|
|
|
|
|
|
|
if (strstart(opt, "hci", &endp)) {
|
|
|
|
if (!*endp || *endp == ',') {
|
|
|
|
if (*endp)
|
|
|
|
if (!strstart(endp, ",vlan=", 0))
|
|
|
|
opt = endp + 1;
|
|
|
|
|
|
|
|
return bt_hci_parse(opt);
|
|
|
|
}
|
|
|
|
} else if (strstart(opt, "vhci", &endp)) {
|
|
|
|
if (!*endp || *endp == ',') {
|
|
|
|
if (*endp) {
|
|
|
|
if (strstart(endp, ",vlan=", &p)) {
|
|
|
|
vlan = strtol(p, (char **) &endp, 0);
|
|
|
|
if (*endp) {
|
|
|
|
fprintf(stderr, "qemu: bad scatternet '%s'\n", p);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "qemu: bad parameter '%s'\n", endp + 1);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
vlan = 0;
|
|
|
|
|
|
|
|
bt_vhci_add(vlan);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else if (strstart(opt, "device:", &endp))
|
|
|
|
return !bt_device_add(endp);
|
|
|
|
|
|
|
|
fprintf(stderr, "qemu: bad bluetooth parameter '%s'\n", opt);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-08-15 01:44:08 +04:00
|
|
|
static int parse_sandbox(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
/* FIXME: change this to true for 1.3 */
|
|
|
|
if (qemu_opt_get_bool(opts, "enable", false)) {
|
|
|
|
#ifdef CONFIG_SECCOMP
|
|
|
|
if (seccomp_start() < 0) {
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"failed to install seccomp syscall filter in the kernel");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"sandboxing request but seccomp is not compiled into this build");
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-02 23:25:28 +04:00
|
|
|
/*********QEMU USB setting******/
|
|
|
|
bool usb_enabled(bool default_usb)
|
|
|
|
{
|
|
|
|
QemuOpts *mach_opts;
|
|
|
|
mach_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
|
|
|
|
if (mach_opts) {
|
|
|
|
return qemu_opt_get_bool(mach_opts, "usb", default_usb);
|
|
|
|
}
|
|
|
|
return default_usb;
|
|
|
|
}
|
|
|
|
|
2012-10-18 23:19:34 +04:00
|
|
|
#ifndef _WIN32
|
|
|
|
static int parse_add_fd(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
int fd, dupfd, flags;
|
|
|
|
int64_t fdset_id;
|
|
|
|
const char *fd_opaque = NULL;
|
|
|
|
|
|
|
|
fd = qemu_opt_get_number(opts, "fd", -1);
|
|
|
|
fdset_id = qemu_opt_get_number(opts, "set", -1);
|
|
|
|
fd_opaque = qemu_opt_get(opts, "opaque");
|
|
|
|
|
|
|
|
if (fd < 0) {
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"fd option is required and must be non-negative");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fd <= STDERR_FILENO) {
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"fd cannot be a standard I/O stream");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* All fds inherited across exec() necessarily have FD_CLOEXEC
|
|
|
|
* clear, while qemu sets FD_CLOEXEC on all other fds used internally.
|
|
|
|
*/
|
|
|
|
flags = fcntl(fd, F_GETFD);
|
|
|
|
if (flags == -1 || (flags & FD_CLOEXEC)) {
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"fd is not valid or already in use");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fdset_id < 0) {
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"set option is required and must be non-negative");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef F_DUPFD_CLOEXEC
|
|
|
|
dupfd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
|
|
|
|
#else
|
|
|
|
dupfd = dup(fd);
|
|
|
|
if (dupfd != -1) {
|
|
|
|
qemu_set_cloexec(dupfd);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (dupfd == -1) {
|
|
|
|
qerror_report(ERROR_CLASS_GENERIC_ERROR,
|
|
|
|
"Error duplicating fd: %s", strerror(errno));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add the duplicate fd, and optionally the opaque string, to the fd set */
|
|
|
|
monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false,
|
|
|
|
fd_opaque, NULL);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cleanup_add_fd(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = qemu_opt_get_number(opts, "fd", -1);
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-09-29 03:19:47 +04:00
|
|
|
/***********************************************************/
|
|
|
|
/* QEMU Block devices */
|
|
|
|
|
2011-01-28 13:21:41 +03:00
|
|
|
#define HD_OPTS "media=disk"
|
|
|
|
#define CDROM_OPTS "media=cdrom"
|
|
|
|
#define FD_OPTS ""
|
|
|
|
#define PFLASH_OPTS ""
|
|
|
|
#define MTD_OPTS ""
|
|
|
|
#define SD_OPTS ""
|
2007-12-02 07:51:10 +03:00
|
|
|
|
2009-07-22 18:43:04 +04:00
|
|
|
static int drive_init_func(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
2012-11-20 18:30:34 +04:00
|
|
|
BlockInterfaceType *block_default_type = opaque;
|
2009-07-22 18:43:04 +04:00
|
|
|
|
2012-11-20 18:30:34 +04:00
|
|
|
return drive_init(opts, *block_default_type) == NULL;
|
2009-07-22 18:43:04 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int drive_enable_snapshot(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
if (NULL == qemu_opt_get(opts, "snapshot")) {
|
|
|
|
qemu_opt_set(opts, "snapshot", "on");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-23 00:02:55 +04:00
|
|
|
static void default_drive(int enable, int snapshot, BlockInterfaceType type,
|
|
|
|
int index, const char *optstr)
|
blockdev: Reject multiple definitions for the same drive
We silently ignore multiple definitions for the same drive:
$ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=ide,index=1,file=tmp.qcow2 -drive if=ide,index=1,file=nonexistant
QEMU 0.13.50 monitor - type 'help' for more information
(qemu) info block
ide0-hd1: type=hd removable=0 file=tmp.qcow2 backing_file=tmp.img ro=0 drv=qcow2 encrypted=0
With if=none, this can become quite confusing:
$ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=none,index=1,file=tmp.qcow2,id=eins -drive if=none,index=1,file=nonexistant,id=zwei -device ide-drive,drive=eins -device ide-drive,drive=zwei
qemu-system-x86_64: -device ide-drive,drive=zwei: Property 'ide-drive.drive' can't find value 'zwei'
The second -device fails, because it refers to drive zwei, which got
silently ignored.
Make multiple drive definitions fail cleanly.
Unfortunately, there's code that relies on multiple drive definitions
being silently ignored: main() merrily adds default drives even when
the user already defined these drives. Fix that up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2011-01-28 13:21:45 +03:00
|
|
|
{
|
|
|
|
QemuOpts *opts;
|
|
|
|
|
|
|
|
if (!enable || drive_get_by_index(type, index)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
opts = drive_add(type, index, NULL, optstr);
|
|
|
|
if (snapshot) {
|
|
|
|
drive_enable_snapshot(opts, NULL);
|
|
|
|
}
|
2012-11-20 18:30:34 +04:00
|
|
|
if (!drive_init(opts, type)) {
|
blockdev: Reject multiple definitions for the same drive
We silently ignore multiple definitions for the same drive:
$ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=ide,index=1,file=tmp.qcow2 -drive if=ide,index=1,file=nonexistant
QEMU 0.13.50 monitor - type 'help' for more information
(qemu) info block
ide0-hd1: type=hd removable=0 file=tmp.qcow2 backing_file=tmp.img ro=0 drv=qcow2 encrypted=0
With if=none, this can become quite confusing:
$ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=none,index=1,file=tmp.qcow2,id=eins -drive if=none,index=1,file=nonexistant,id=zwei -device ide-drive,drive=eins -device ide-drive,drive=zwei
qemu-system-x86_64: -device ide-drive,drive=zwei: Property 'ide-drive.drive' can't find value 'zwei'
The second -device fails, because it refers to drive zwei, which got
silently ignored.
Make multiple drive definitions fail cleanly.
Unfortunately, there's code that relies on multiple drive definitions
being silently ignored: main() merrily adds default drives even when
the user already defined these drives. Fix that up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2011-01-28 13:21:45 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-02 02:19:02 +04:00
|
|
|
void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque)
|
|
|
|
{
|
|
|
|
boot_set_handler = func;
|
|
|
|
boot_set_opaque = opaque;
|
|
|
|
}
|
|
|
|
|
|
|
|
int qemu_boot_set(const char *boot_devices)
|
|
|
|
{
|
|
|
|
if (!boot_set_handler) {
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return boot_set_handler(boot_set_opaque, boot_devices);
|
|
|
|
}
|
|
|
|
|
2010-04-07 02:22:08 +04:00
|
|
|
static void validate_bootdevices(char *devices)
|
2009-07-02 02:19:02 +04:00
|
|
|
{
|
|
|
|
/* We just do some generic consistency checks */
|
|
|
|
const char *p;
|
|
|
|
int bitmap = 0;
|
|
|
|
|
|
|
|
for (p = devices; *p != '\0'; p++) {
|
|
|
|
/* Allowed boot devices are:
|
|
|
|
* a-b: floppy disk drives
|
|
|
|
* c-f: IDE disk drives
|
2011-11-22 14:06:26 +04:00
|
|
|
* g-m: machine implementation dependent drives
|
2009-07-02 02:19:02 +04:00
|
|
|
* n-p: network devices
|
|
|
|
* It's up to each machine implementation to check if the given boot
|
|
|
|
* devices match the actual hardware implementation and firmware
|
|
|
|
* features.
|
|
|
|
*/
|
|
|
|
if (*p < 'a' || *p > 'p') {
|
|
|
|
fprintf(stderr, "Invalid boot device '%c'\n", *p);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (bitmap & (1 << (*p - 'a'))) {
|
|
|
|
fprintf(stderr, "Boot device '%c' was given twice\n", *p);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
bitmap |= 1 << (*p - 'a');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-02 02:19:02 +04:00
|
|
|
static void restore_boot_devices(void *opaque)
|
|
|
|
{
|
|
|
|
char *standard_boot_devices = opaque;
|
2010-05-01 01:21:11 +04:00
|
|
|
static int first = 1;
|
|
|
|
|
|
|
|
/* Restore boot order and remove ourselves after the first boot */
|
|
|
|
if (first) {
|
|
|
|
first = 0;
|
|
|
|
return;
|
|
|
|
}
|
2009-07-02 02:19:02 +04:00
|
|
|
|
|
|
|
qemu_boot_set(standard_boot_devices);
|
|
|
|
|
|
|
|
qemu_unregister_reset(restore_boot_devices, standard_boot_devices);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(standard_boot_devices);
|
2009-07-02 02:19:02 +04:00
|
|
|
}
|
|
|
|
|
2010-12-08 14:35:05 +03:00
|
|
|
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
|
|
|
|
const char *suffix)
|
|
|
|
{
|
|
|
|
FWBootEntry *node, *i;
|
|
|
|
|
|
|
|
if (bootindex < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(dev != NULL || suffix != NULL);
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
node = g_malloc0(sizeof(FWBootEntry));
|
2010-12-08 14:35:05 +03:00
|
|
|
node->bootindex = bootindex;
|
2013-05-09 11:53:49 +04:00
|
|
|
node->suffix = g_strdup(suffix);
|
2010-12-08 14:35:05 +03:00
|
|
|
node->dev = dev;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
if (i->bootindex == bootindex) {
|
|
|
|
fprintf(stderr, "Two devices with same boot index %d\n", bootindex);
|
|
|
|
exit(1);
|
|
|
|
} else if (i->bootindex < bootindex) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
QTAILQ_INSERT_BEFORE(i, node, link);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
QTAILQ_INSERT_TAIL(&fw_boot_order, node, link);
|
|
|
|
}
|
|
|
|
|
2013-04-26 06:12:49 +04:00
|
|
|
DeviceState *get_boot_device(uint32_t position)
|
|
|
|
{
|
|
|
|
uint32_t counter = 0;
|
|
|
|
FWBootEntry *i = NULL;
|
|
|
|
DeviceState *res = NULL;
|
|
|
|
|
|
|
|
if (!QTAILQ_EMPTY(&fw_boot_order)) {
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
if (counter == position) {
|
|
|
|
res = i->dev;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
counter++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2010-12-08 14:35:09 +03:00
|
|
|
/*
|
|
|
|
* This function returns null terminated string that consist of new line
|
2011-04-23 15:50:06 +04:00
|
|
|
* separated device paths.
|
2010-12-08 14:35:09 +03:00
|
|
|
*
|
|
|
|
* memory pointed by "size" is assigned total length of the array in bytes
|
|
|
|
*
|
|
|
|
*/
|
2013-01-16 17:50:29 +04:00
|
|
|
char *get_boot_devices_list(size_t *size)
|
2010-12-08 14:35:09 +03:00
|
|
|
{
|
|
|
|
FWBootEntry *i;
|
2013-01-16 17:50:29 +04:00
|
|
|
size_t total = 0;
|
2010-12-08 14:35:09 +03:00
|
|
|
char *list = NULL;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
char *devpath = NULL, *bootpath;
|
2013-01-16 17:50:29 +04:00
|
|
|
size_t len;
|
2010-12-08 14:35:09 +03:00
|
|
|
|
|
|
|
if (i->dev) {
|
|
|
|
devpath = qdev_get_fw_dev_path(i->dev);
|
|
|
|
assert(devpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i->suffix && devpath) {
|
2010-12-19 17:05:43 +03:00
|
|
|
size_t bootpathlen = strlen(devpath) + strlen(i->suffix) + 1;
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
bootpath = g_malloc(bootpathlen);
|
2010-12-19 17:05:43 +03:00
|
|
|
snprintf(bootpath, bootpathlen, "%s%s", devpath, i->suffix);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(devpath);
|
2010-12-08 14:35:09 +03:00
|
|
|
} else if (devpath) {
|
|
|
|
bootpath = devpath;
|
|
|
|
} else {
|
2011-11-08 13:58:00 +04:00
|
|
|
assert(i->suffix);
|
2011-08-21 07:09:37 +04:00
|
|
|
bootpath = g_strdup(i->suffix);
|
2010-12-08 14:35:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (total) {
|
|
|
|
list[total-1] = '\n';
|
|
|
|
}
|
|
|
|
len = strlen(bootpath) + 1;
|
2011-08-21 07:09:37 +04:00
|
|
|
list = g_realloc(list, total + len);
|
2010-12-08 14:35:09 +03:00
|
|
|
memcpy(&list[total], bootpath, len);
|
|
|
|
total += len;
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(bootpath);
|
2010-12-08 14:35:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
*size = total;
|
|
|
|
|
2013-03-19 10:23:27 +04:00
|
|
|
if (boot_strict && *size > 0) {
|
|
|
|
list[total-1] = '\n';
|
2013-03-20 14:16:34 +04:00
|
|
|
list = g_realloc(list, total + 5);
|
|
|
|
memcpy(&list[total], "HALT", 5);
|
|
|
|
*size = total + 5;
|
2013-03-19 10:23:27 +04:00
|
|
|
}
|
2010-12-08 14:35:09 +03:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2013-02-04 22:27:51 +04:00
|
|
|
static void numa_node_parse_cpus(int nodenr, const char *cpus)
|
|
|
|
{
|
|
|
|
char *endptr;
|
|
|
|
unsigned long long value, endvalue;
|
|
|
|
|
2013-02-04 22:27:52 +04:00
|
|
|
/* Empty CPU range strings will be considered valid, they will simply
|
|
|
|
* not set any bit in the CPU bitmap.
|
|
|
|
*/
|
|
|
|
if (!*cpus) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (parse_uint(cpus, &value, &endptr, 10) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2013-02-04 22:27:51 +04:00
|
|
|
if (*endptr == '-') {
|
2013-02-04 22:27:52 +04:00
|
|
|
if (parse_uint_full(endptr + 1, &endvalue, 10) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else if (*endptr == '\0') {
|
2013-02-04 22:27:51 +04:00
|
|
|
endvalue = value;
|
2013-02-04 22:27:52 +04:00
|
|
|
} else {
|
|
|
|
goto error;
|
2013-02-04 22:27:51 +04:00
|
|
|
}
|
|
|
|
|
2013-02-04 22:27:52 +04:00
|
|
|
if (endvalue >= MAX_CPUMASK_BITS) {
|
2013-02-04 22:27:51 +04:00
|
|
|
endvalue = MAX_CPUMASK_BITS - 1;
|
|
|
|
fprintf(stderr,
|
2013-02-04 22:27:52 +04:00
|
|
|
"qemu: NUMA: A max of %d VCPUs are supported\n",
|
2013-02-04 22:27:51 +04:00
|
|
|
MAX_CPUMASK_BITS);
|
|
|
|
}
|
|
|
|
|
2013-02-04 22:27:52 +04:00
|
|
|
if (endvalue < value) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2013-02-04 22:27:51 +04:00
|
|
|
bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
|
2013-02-04 22:27:52 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
error:
|
|
|
|
fprintf(stderr, "qemu: Invalid NUMA CPU range: %s\n", cpus);
|
|
|
|
exit(1);
|
2013-02-04 22:27:51 +04:00
|
|
|
}
|
|
|
|
|
2009-04-22 02:30:27 +04:00
|
|
|
static void numa_add(const char *optarg)
|
|
|
|
{
|
|
|
|
char option[128];
|
|
|
|
char *endptr;
|
2013-02-04 22:27:49 +04:00
|
|
|
unsigned long long nodenr;
|
2009-04-22 02:30:27 +04:00
|
|
|
|
vl.c: Fix off-by-one bug when handling "-numa node" argument
The numa_add() code was unconditionally adding 1 to the get_opt_name()
return value, making it point after the end of the string if no ','
separator is present.
Example of weird behavior caused by the bug:
$ qemu-img create -f qcow2 this-file-image-has,cpus=5,mem=1000,in-its-name.qcow2 5G
Formatting 'this-file-image-has,cpus=5,mem=1000,in-its-name.qcow2', fmt=qcow2 size=5368709120 encryption=off cluster_size=65536
$ ./x86_64-softmmu/qemu-system-x86_64 -S -monitor stdio -numa node 'this-file-image-has,cpus=5,mem=1000,in-its-name.qcow2'
QEMU 1.3.50 monitor - type 'help' for more information
(qemu) info numa
1 nodes
node 0 cpus: 0
node 0 size: 1000 MB
(qemu)
This changes the code to nove the pointer only if ',' is found.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-04 22:27:46 +04:00
|
|
|
optarg = get_opt_name(option, 128, optarg, ',');
|
|
|
|
if (*optarg == ',') {
|
|
|
|
optarg++;
|
|
|
|
}
|
2009-04-22 02:30:27 +04:00
|
|
|
if (!strcmp(option, "node")) {
|
2013-02-04 22:27:48 +04:00
|
|
|
|
|
|
|
if (nb_numa_nodes >= MAX_NODES) {
|
|
|
|
fprintf(stderr, "qemu: too many NUMA nodes\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2009-04-22 02:30:27 +04:00
|
|
|
if (get_param_value(option, 128, "nodeid", optarg) == 0) {
|
|
|
|
nodenr = nb_numa_nodes;
|
|
|
|
} else {
|
2013-02-04 22:27:50 +04:00
|
|
|
if (parse_uint_full(option, &nodenr, 10) < 0) {
|
|
|
|
fprintf(stderr, "qemu: Invalid NUMA nodeid: %s\n", option);
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
|
2013-02-04 22:27:49 +04:00
|
|
|
if (nodenr >= MAX_NODES) {
|
|
|
|
fprintf(stderr, "qemu: invalid NUMA nodeid: %llu\n", nodenr);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2009-04-22 02:30:27 +04:00
|
|
|
if (get_param_value(option, 128, "mem", optarg) == 0) {
|
|
|
|
node_mem[nodenr] = 0;
|
|
|
|
} else {
|
2011-01-05 13:41:02 +03:00
|
|
|
int64_t sval;
|
vl: Tighten parsing of -numa's parameter mem
strtosz_suffix() fails unless the size is followed by 0, whitespace or
','. Useless here, because we need to fail for any junk following the
size, even if it starts with whitespace or ','. Check manually.
Things like
-smp 4 -numa "node,mem=1024,cpus=0-1" -numa "node,mem=1024 cpus=2-3"
are now caught. Before, the second -numa's argument was silently
interpreted as just "node,mem=1024".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-11-22 12:46:02 +04:00
|
|
|
sval = strtosz(option, &endptr);
|
|
|
|
if (sval < 0 || *endptr) {
|
2010-10-21 19:15:46 +04:00
|
|
|
fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg);
|
|
|
|
exit(1);
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
2010-10-21 19:15:46 +04:00
|
|
|
node_mem[nodenr] = sval;
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
Fixes related to processing of qemu's -numa option
The -numa option to qemu is used to create [fake] numa nodes
and expose them to the guest OS instance.
There are a couple of issues with the -numa option:
a) Max VCPU's that can be specified for a guest while using
the qemu's -numa option is 64. Due to a typecasting issue
when the number of VCPUs is > 32 the VCPUs don't show up
under the specified [fake] numa nodes.
b) KVM currently has support for 160VCPUs per guest. The
qemu's -numa option has only support for upto 64VCPUs
per guest.
This patch addresses these two issues.
Below are examples of (a) and (b)
a) >32 VCPUs are specified with the -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
71:01:01 \
-net tap,ifname=tap0,script=no,downscript=no \
-vnc :4
...
Upstream qemu :
--------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59
node 2 size: 131072 MB
node 3 cpus: 30
node 3 size: 131072 MB
node 4 cpus:
node 4 size: 131072 MB
node 5 cpus: 31
node 5 size: 131072 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 131072 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 131072 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 131072 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 131072 MB
b) >64 VCPUs specified with -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
-cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4
...
Upstream qemu :
--------------
only 63 CPUs in NUMA mode supported.
only 64 CPUs in NUMA mode supported.
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61
node 2 size: 65536 MB
node 3 cpus: 30 62
node 3 size: 65536 MB
node 4 cpus:
node 4 size: 65536 MB
node 5 cpus:
node 5 size: 65536 MB
node 6 cpus: 31 63
node 6 size: 65536 MB
node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69
node 7 size: 65536 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 65536 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 65536 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 65536 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 65536 MB
node 6 cpus: 60 61 62 63 64 65 66 67 68 69
node 6 size: 65536 MB
node 7 cpus: 70 71 72 73 74 75 76 77 78 79
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2012-07-17 08:31:30 +04:00
|
|
|
if (get_param_value(option, 128, "cpus", optarg) != 0) {
|
2013-02-04 22:27:51 +04:00
|
|
|
numa_node_parse_cpus(nodenr, option);
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
nb_numa_nodes++;
|
2013-02-04 22:27:47 +04:00
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Invalid -numa option: %s\n", option);
|
|
|
|
exit(1);
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
extend -smp parsing to include cores= and threads= options
For injecting multi-core and multi-threading CPU topology into guests
extend the -smp syntax to accommodate cores and threads specification.
Syntax: -smp smp_value[,cores=nr_cores][,threads=nr_threads]\
[,socket=nr_sockets][,maxcpus=max_cpus]
smp_value is the legacy value specifying the total number of vCPUs for
the guest. If you specify one of cores, threads or sockets this value
can be omitted. Missing values will be computed to fulfill:
smp_value = nr_cores * nr_threads * nr_sockets
where it will favour sockets over cores over threads (to mimic the
current behavior, which will only inject multiple sockets.)
So -smp 4,threads=2 will inject two sockets with 2 threads each,
-smp cores=4 is an abbreviation for -smp 4,cores=4,threads=1,sockets=1.
If max_cpus (the number of hotpluggable CPUs) is omitted, it will
be set to smp_value.
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-08-19 17:42:40 +04:00
|
|
|
static void smp_parse(const char *optarg)
|
|
|
|
{
|
|
|
|
int smp, sockets = 0, threads = 0, cores = 0;
|
|
|
|
char *endptr;
|
|
|
|
char option[128];
|
|
|
|
|
|
|
|
smp = strtoul(optarg, &endptr, 10);
|
|
|
|
if (endptr != optarg) {
|
|
|
|
if (*endptr == ',') {
|
|
|
|
endptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (get_param_value(option, 128, "sockets", endptr) != 0)
|
|
|
|
sockets = strtoull(option, NULL, 10);
|
|
|
|
if (get_param_value(option, 128, "cores", endptr) != 0)
|
|
|
|
cores = strtoull(option, NULL, 10);
|
|
|
|
if (get_param_value(option, 128, "threads", endptr) != 0)
|
|
|
|
threads = strtoull(option, NULL, 10);
|
|
|
|
if (get_param_value(option, 128, "maxcpus", endptr) != 0)
|
|
|
|
max_cpus = strtoull(option, NULL, 10);
|
|
|
|
|
|
|
|
/* compute missing values, prefer sockets over cores over threads */
|
|
|
|
if (smp == 0 || sockets == 0) {
|
|
|
|
sockets = sockets > 0 ? sockets : 1;
|
|
|
|
cores = cores > 0 ? cores : 1;
|
|
|
|
threads = threads > 0 ? threads : 1;
|
|
|
|
if (smp == 0) {
|
|
|
|
smp = cores * threads * sockets;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (cores == 0) {
|
|
|
|
threads = threads > 0 ? threads : 1;
|
|
|
|
cores = smp / (sockets * threads);
|
|
|
|
} else {
|
2010-07-22 00:05:17 +04:00
|
|
|
threads = smp / (cores * sockets);
|
extend -smp parsing to include cores= and threads= options
For injecting multi-core and multi-threading CPU topology into guests
extend the -smp syntax to accommodate cores and threads specification.
Syntax: -smp smp_value[,cores=nr_cores][,threads=nr_threads]\
[,socket=nr_sockets][,maxcpus=max_cpus]
smp_value is the legacy value specifying the total number of vCPUs for
the guest. If you specify one of cores, threads or sockets this value
can be omitted. Missing values will be computed to fulfill:
smp_value = nr_cores * nr_threads * nr_sockets
where it will favour sockets over cores over threads (to mimic the
current behavior, which will only inject multiple sockets.)
So -smp 4,threads=2 will inject two sockets with 2 threads each,
-smp cores=4 is an abbreviation for -smp 4,cores=4,threads=1,sockets=1.
If max_cpus (the number of hotpluggable CPUs) is omitted, it will
be set to smp_value.
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-08-19 17:42:40 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
smp_cpus = smp;
|
|
|
|
smp_cores = cores > 0 ? cores : 1;
|
|
|
|
smp_threads = threads > 0 ? threads : 1;
|
|
|
|
if (max_cpus == 0)
|
|
|
|
max_cpus = smp_cpus;
|
|
|
|
}
|
|
|
|
|
2013-04-19 18:42:06 +04:00
|
|
|
static void configure_realtime(QemuOpts *opts)
|
|
|
|
{
|
|
|
|
bool enable_mlock;
|
|
|
|
|
|
|
|
enable_mlock = qemu_opt_get_bool(opts, "mlock", true);
|
|
|
|
|
|
|
|
if (enable_mlock) {
|
|
|
|
if (os_mlock() < 0) {
|
|
|
|
fprintf(stderr, "qemu: locking memory failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-06 19:13:29 +03:00
|
|
|
/***********************************************************/
|
|
|
|
/* USB devices */
|
|
|
|
|
2010-05-28 17:38:44 +04:00
|
|
|
static int usb_device_add(const char *devname)
|
2005-11-06 19:13:29 +03:00
|
|
|
{
|
|
|
|
const char *p;
|
2009-08-31 16:24:00 +04:00
|
|
|
USBDevice *dev = NULL;
|
2005-11-06 19:13:29 +03:00
|
|
|
|
2012-09-02 23:25:28 +04:00
|
|
|
if (!usb_enabled(false)) {
|
2005-11-06 19:13:29 +03:00
|
|
|
return -1;
|
2012-09-02 23:25:28 +04:00
|
|
|
}
|
2005-11-06 19:13:29 +03:00
|
|
|
|
2009-10-26 17:56:45 +03:00
|
|
|
/* drivers with .usbdevice_name entry in USBDeviceInfo */
|
|
|
|
dev = usbdevice_create(devname);
|
|
|
|
if (dev)
|
|
|
|
goto done;
|
|
|
|
|
2009-08-31 16:24:00 +04:00
|
|
|
/* the other ones */
|
2011-06-01 16:41:59 +04:00
|
|
|
#ifndef CONFIG_LINUX
|
|
|
|
/* only the linux version is qdev-ified, usb-bsd still needs this */
|
2005-11-06 19:13:29 +03:00
|
|
|
if (strstart(devname, "host:", &p)) {
|
2012-02-27 18:18:47 +04:00
|
|
|
dev = usb_host_device_open(usb_bus_find(-1), p);
|
2011-06-01 16:41:59 +04:00
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
|
2012-02-27 18:18:47 +04:00
|
|
|
dev = usb_bt_init(usb_bus_find(-1),
|
|
|
|
devname[2] ? hci_init(p)
|
|
|
|
: bt_new_hci(qemu_find_bt_vlan(0)));
|
2005-11-06 19:13:29 +03:00
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
2006-05-21 20:30:15 +04:00
|
|
|
if (!dev)
|
|
|
|
return -1;
|
|
|
|
|
2009-08-31 16:24:00 +04:00
|
|
|
done:
|
2005-11-06 19:13:29 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-21 23:27:48 +04:00
|
|
|
static int usb_device_del(const char *devname)
|
|
|
|
{
|
|
|
|
int bus_num, addr;
|
|
|
|
const char *p;
|
|
|
|
|
2012-11-30 16:02:47 +04:00
|
|
|
if (strstart(devname, "host:", &p)) {
|
|
|
|
return -1;
|
|
|
|
}
|
2008-09-14 05:07:41 +04:00
|
|
|
|
2012-09-02 23:25:28 +04:00
|
|
|
if (!usb_enabled(false)) {
|
2008-08-21 23:27:48 +04:00
|
|
|
return -1;
|
2012-09-02 23:25:28 +04:00
|
|
|
}
|
2008-08-21 23:27:48 +04:00
|
|
|
|
|
|
|
p = strchr(devname, '.');
|
|
|
|
if (!p)
|
|
|
|
return -1;
|
|
|
|
bus_num = strtoul(devname, NULL, 0);
|
|
|
|
addr = strtoul(p + 1, NULL, 0);
|
|
|
|
|
2009-08-31 16:24:00 +04:00
|
|
|
return usb_device_delete_addr(bus_num, addr);
|
2008-08-21 23:27:48 +04:00
|
|
|
}
|
|
|
|
|
2009-07-15 15:59:26 +04:00
|
|
|
static int usb_parse(const char *cmdline)
|
|
|
|
{
|
2009-12-22 23:30:18 +03:00
|
|
|
int r;
|
2010-05-28 17:38:44 +04:00
|
|
|
r = usb_device_add(cmdline);
|
2009-12-22 23:30:18 +03:00
|
|
|
if (r < 0) {
|
|
|
|
fprintf(stderr, "qemu: could not add USB device '%s'\n", cmdline);
|
|
|
|
}
|
|
|
|
return r;
|
2009-07-15 15:59:26 +04:00
|
|
|
}
|
|
|
|
|
2009-08-28 22:27:13 +04:00
|
|
|
void do_usb_add(Monitor *mon, const QDict *qdict)
|
2005-11-06 19:13:29 +03:00
|
|
|
{
|
2009-12-22 23:30:18 +03:00
|
|
|
const char *devname = qdict_get_str(qdict, "devname");
|
2010-05-28 17:38:44 +04:00
|
|
|
if (usb_device_add(devname) < 0) {
|
2010-02-18 19:25:24 +03:00
|
|
|
error_report("could not add USB device '%s'", devname);
|
2009-12-22 23:30:18 +03:00
|
|
|
}
|
2005-11-06 19:13:29 +03:00
|
|
|
}
|
|
|
|
|
2009-08-28 22:27:13 +04:00
|
|
|
void do_usb_del(Monitor *mon, const QDict *qdict)
|
2005-11-06 19:13:29 +03:00
|
|
|
{
|
2009-12-22 23:30:18 +03:00
|
|
|
const char *devname = qdict_get_str(qdict, "devname");
|
|
|
|
if (usb_device_del(devname) < 0) {
|
2010-02-18 19:25:24 +03:00
|
|
|
error_report("could not delete USB device '%s'", devname);
|
2009-12-22 23:30:18 +03:00
|
|
|
}
|
2005-11-06 19:13:29 +03:00
|
|
|
}
|
|
|
|
|
2007-04-30 04:51:09 +04:00
|
|
|
/***********************************************************/
|
|
|
|
/* PCMCIA/Cardbus */
|
|
|
|
|
|
|
|
static struct pcmcia_socket_entry_s {
|
2009-05-10 04:44:56 +04:00
|
|
|
PCMCIASocket *socket;
|
2007-04-30 04:51:09 +04:00
|
|
|
struct pcmcia_socket_entry_s *next;
|
|
|
|
} *pcmcia_sockets = 0;
|
|
|
|
|
2009-05-10 04:44:56 +04:00
|
|
|
void pcmcia_socket_register(PCMCIASocket *socket)
|
2007-04-30 04:51:09 +04:00
|
|
|
{
|
|
|
|
struct pcmcia_socket_entry_s *entry;
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
entry = g_malloc(sizeof(struct pcmcia_socket_entry_s));
|
2007-04-30 04:51:09 +04:00
|
|
|
entry->socket = socket;
|
|
|
|
entry->next = pcmcia_sockets;
|
|
|
|
pcmcia_sockets = entry;
|
|
|
|
}
|
|
|
|
|
2009-05-10 04:44:56 +04:00
|
|
|
void pcmcia_socket_unregister(PCMCIASocket *socket)
|
2007-04-30 04:51:09 +04:00
|
|
|
{
|
|
|
|
struct pcmcia_socket_entry_s *entry, **ptr;
|
|
|
|
|
|
|
|
ptr = &pcmcia_sockets;
|
|
|
|
for (entry = *ptr; entry; ptr = &entry->next, entry = *ptr)
|
|
|
|
if (entry->socket == socket) {
|
|
|
|
*ptr = entry->next;
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(entry);
|
2007-04-30 04:51:09 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-14 10:06:25 +04:00
|
|
|
void pcmcia_info(Monitor *mon, const QDict *qdict)
|
2007-04-30 04:51:09 +04:00
|
|
|
{
|
|
|
|
struct pcmcia_socket_entry_s *iter;
|
2009-03-06 02:01:23 +03:00
|
|
|
|
2007-04-30 04:51:09 +04:00
|
|
|
if (!pcmcia_sockets)
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "No PCMCIA sockets\n");
|
2007-04-30 04:51:09 +04:00
|
|
|
|
|
|
|
for (iter = pcmcia_sockets; iter; iter = iter->next)
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "%s: %s\n", iter->socket->slot_string,
|
|
|
|
iter->socket->attached ? iter->socket->card_string :
|
|
|
|
"Empty");
|
2007-04-30 04:51:09 +04:00
|
|
|
}
|
|
|
|
|
2005-06-05 18:49:17 +04:00
|
|
|
/***********************************************************/
|
|
|
|
/* machine registration */
|
|
|
|
|
2008-10-04 11:24:27 +04:00
|
|
|
static QEMUMachine *first_machine = NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
QEMUMachine *current_machine = NULL;
|
2005-06-05 18:49:17 +04:00
|
|
|
|
|
|
|
int qemu_register_machine(QEMUMachine *m)
|
|
|
|
{
|
|
|
|
QEMUMachine **pm;
|
|
|
|
pm = &first_machine;
|
|
|
|
while (*pm != NULL)
|
|
|
|
pm = &(*pm)->next;
|
|
|
|
m->next = NULL;
|
|
|
|
*pm = m;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-18 04:44:38 +03:00
|
|
|
static QEMUMachine *find_machine(const char *name)
|
2005-06-05 18:49:17 +04:00
|
|
|
{
|
|
|
|
QEMUMachine *m;
|
|
|
|
|
|
|
|
for(m = first_machine; m != NULL; m = m->next) {
|
|
|
|
if (!strcmp(m->name, name))
|
|
|
|
return m;
|
2009-07-22 13:02:50 +04:00
|
|
|
if (m->alias && !strcmp(m->alias, name))
|
|
|
|
return m;
|
2005-06-05 18:49:17 +04:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-02-22 11:18:50 +04:00
|
|
|
QEMUMachine *find_default_machine(void)
|
2009-05-22 05:41:01 +04:00
|
|
|
{
|
|
|
|
QEMUMachine *m;
|
|
|
|
|
|
|
|
for(m = first_machine; m != NULL; m = m->next) {
|
|
|
|
if (m->is_default) {
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-08-10 20:04:11 +04:00
|
|
|
MachineInfoList *qmp_query_machines(Error **errp)
|
|
|
|
{
|
|
|
|
MachineInfoList *mach_list = NULL;
|
|
|
|
QEMUMachine *m;
|
|
|
|
|
|
|
|
for (m = first_machine; m; m = m->next) {
|
|
|
|
MachineInfoList *entry;
|
|
|
|
MachineInfo *info;
|
|
|
|
|
|
|
|
info = g_malloc0(sizeof(*info));
|
|
|
|
if (m->is_default) {
|
|
|
|
info->has_is_default = true;
|
|
|
|
info->is_default = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (m->alias) {
|
|
|
|
info->has_alias = true;
|
|
|
|
info->alias = g_strdup(m->alias);
|
|
|
|
}
|
|
|
|
|
|
|
|
info->name = g_strdup(m->name);
|
2013-04-08 20:21:02 +04:00
|
|
|
info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
|
2012-08-10 20:04:11 +04:00
|
|
|
|
|
|
|
entry = g_malloc0(sizeof(*entry));
|
|
|
|
entry->value = info;
|
|
|
|
entry->next = mach_list;
|
|
|
|
mach_list = entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mach_list;
|
|
|
|
}
|
|
|
|
|
2004-03-31 23:00:16 +04:00
|
|
|
/***********************************************************/
|
|
|
|
/* main execution loop */
|
|
|
|
|
2005-11-11 03:00:47 +03:00
|
|
|
struct vm_change_state_entry {
|
|
|
|
VMChangeStateHandler *cb;
|
|
|
|
void *opaque;
|
2009-09-12 11:36:22 +04:00
|
|
|
QLIST_ENTRY (vm_change_state_entry) entries;
|
2005-11-11 03:00:47 +03:00
|
|
|
};
|
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
static QLIST_HEAD(vm_change_state_head, vm_change_state_entry) vm_change_state_head;
|
2005-11-11 03:00:47 +03:00
|
|
|
|
|
|
|
VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
VMChangeStateEntry *e;
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
e = g_malloc0(sizeof (*e));
|
2005-11-11 03:00:47 +03:00
|
|
|
|
|
|
|
e->cb = cb;
|
|
|
|
e->opaque = opaque;
|
2009-09-12 11:36:22 +04:00
|
|
|
QLIST_INSERT_HEAD(&vm_change_state_head, e, entries);
|
2005-11-11 03:00:47 +03:00
|
|
|
return e;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e)
|
|
|
|
{
|
2009-09-12 11:36:22 +04:00
|
|
|
QLIST_REMOVE (e, entries);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free (e);
|
2005-11-11 03:00:47 +03:00
|
|
|
}
|
|
|
|
|
2011-07-29 21:26:33 +04:00
|
|
|
void vm_state_notify(int running, RunState state)
|
2005-11-11 03:00:47 +03:00
|
|
|
{
|
|
|
|
VMChangeStateEntry *e;
|
|
|
|
|
2011-07-29 21:26:33 +04:00
|
|
|
trace_vm_state_notify(running, state);
|
2010-11-16 15:20:25 +03:00
|
|
|
|
2005-11-11 03:00:47 +03:00
|
|
|
for (e = vm_change_state_head.lh_first; e; e = e->entries.le_next) {
|
2011-07-29 21:26:33 +04:00
|
|
|
e->cb(e->opaque, running, state);
|
2005-11-11 03:00:47 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-31 23:00:16 +04:00
|
|
|
void vm_start(void)
|
|
|
|
{
|
2011-07-29 22:36:43 +04:00
|
|
|
if (!runstate_is_running()) {
|
2004-03-31 23:00:16 +04:00
|
|
|
cpu_enable_ticks();
|
2011-09-30 21:45:27 +04:00
|
|
|
runstate_set(RUN_STATE_RUNNING);
|
|
|
|
vm_state_notify(1, RUN_STATE_RUNNING);
|
2009-04-24 22:04:07 +04:00
|
|
|
resume_all_vcpus();
|
2010-04-28 03:35:59 +04:00
|
|
|
monitor_protocol_event(QEVENT_RESUME, NULL);
|
2004-03-31 23:00:16 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-06-20 16:37:32 +04:00
|
|
|
/* reset/shutdown handler */
|
|
|
|
|
|
|
|
typedef struct QEMUResetEntry {
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_ENTRY(QEMUResetEntry) entry;
|
2004-06-20 16:37:32 +04:00
|
|
|
QEMUResetHandler *func;
|
|
|
|
void *opaque;
|
|
|
|
} QEMUResetEntry;
|
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =
|
|
|
|
QTAILQ_HEAD_INITIALIZER(reset_handlers);
|
2004-06-20 16:37:32 +04:00
|
|
|
static int reset_requested;
|
2011-03-15 14:56:04 +03:00
|
|
|
static int shutdown_requested, shutdown_signal = -1;
|
|
|
|
static pid_t shutdown_pid;
|
2005-07-02 18:31:34 +04:00
|
|
|
static int powerdown_requested;
|
2011-02-07 14:19:16 +03:00
|
|
|
static int debug_requested;
|
2012-02-23 16:45:19 +04:00
|
|
|
static int suspend_requested;
|
2012-08-09 00:29:17 +04:00
|
|
|
static int wakeup_requested;
|
2012-09-06 01:06:21 +04:00
|
|
|
static NotifierList powerdown_notifiers =
|
|
|
|
NOTIFIER_LIST_INITIALIZER(powerdown_notifiers);
|
2012-02-23 16:45:19 +04:00
|
|
|
static NotifierList suspend_notifiers =
|
|
|
|
NOTIFIER_LIST_INITIALIZER(suspend_notifiers);
|
|
|
|
static NotifierList wakeup_notifiers =
|
|
|
|
NOTIFIER_LIST_INITIALIZER(wakeup_notifiers);
|
|
|
|
static uint32_t wakeup_reason_mask = ~0;
|
2011-09-30 21:45:27 +04:00
|
|
|
static RunState vmstop_requested = RUN_STATE_MAX;
|
2004-06-20 16:37:32 +04:00
|
|
|
|
2010-07-22 18:52:48 +04:00
|
|
|
int qemu_shutdown_requested_get(void)
|
|
|
|
{
|
|
|
|
return shutdown_requested;
|
|
|
|
}
|
|
|
|
|
|
|
|
int qemu_reset_requested_get(void)
|
|
|
|
{
|
|
|
|
return reset_requested;
|
|
|
|
}
|
|
|
|
|
2012-10-28 15:04:47 +04:00
|
|
|
static int qemu_shutdown_requested(void)
|
2008-03-18 09:53:05 +03:00
|
|
|
{
|
|
|
|
int r = shutdown_requested;
|
|
|
|
shutdown_requested = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-10-28 15:04:47 +04:00
|
|
|
static void qemu_kill_report(void)
|
2011-03-15 14:56:04 +03:00
|
|
|
{
|
2012-03-28 17:42:02 +04:00
|
|
|
if (!qtest_enabled() && shutdown_signal != -1) {
|
2011-03-31 01:03:38 +04:00
|
|
|
fprintf(stderr, "qemu: terminating on signal %d", shutdown_signal);
|
|
|
|
if (shutdown_pid == 0) {
|
|
|
|
/* This happens for eg ^C at the terminal, so it's worth
|
|
|
|
* avoiding printing an odd message in that case.
|
|
|
|
*/
|
|
|
|
fputc('\n', stderr);
|
|
|
|
} else {
|
2011-06-02 21:58:06 +04:00
|
|
|
fprintf(stderr, " from pid " FMT_pid "\n", shutdown_pid);
|
2011-03-31 01:03:38 +04:00
|
|
|
}
|
2011-03-15 14:56:04 +03:00
|
|
|
shutdown_signal = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-28 15:04:47 +04:00
|
|
|
static int qemu_reset_requested(void)
|
2008-03-18 09:53:05 +03:00
|
|
|
{
|
|
|
|
int r = reset_requested;
|
|
|
|
reset_requested = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-02-23 16:45:19 +04:00
|
|
|
static int qemu_suspend_requested(void)
|
|
|
|
{
|
|
|
|
int r = suspend_requested;
|
|
|
|
suspend_requested = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-08-09 00:29:17 +04:00
|
|
|
static int qemu_wakeup_requested(void)
|
|
|
|
{
|
|
|
|
int r = wakeup_requested;
|
|
|
|
wakeup_requested = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-10-28 15:04:47 +04:00
|
|
|
static int qemu_powerdown_requested(void)
|
2008-03-18 09:53:05 +03:00
|
|
|
{
|
|
|
|
int r = powerdown_requested;
|
|
|
|
powerdown_requested = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2009-04-24 22:03:54 +04:00
|
|
|
static int qemu_debug_requested(void)
|
|
|
|
{
|
|
|
|
int r = debug_requested;
|
|
|
|
debug_requested = 0;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2011-09-30 21:45:27 +04:00
|
|
|
/* We use RUN_STATE_MAX but any invalid value will do */
|
2011-09-30 21:27:11 +04:00
|
|
|
static bool qemu_vmstop_requested(RunState *r)
|
2009-04-24 22:04:02 +04:00
|
|
|
{
|
2011-09-30 21:45:27 +04:00
|
|
|
if (vmstop_requested < RUN_STATE_MAX) {
|
2011-09-30 21:27:11 +04:00
|
|
|
*r = vmstop_requested;
|
2011-09-30 21:45:27 +04:00
|
|
|
vmstop_requested = RUN_STATE_MAX;
|
2011-09-30 21:27:11 +04:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
2009-04-24 22:04:02 +04:00
|
|
|
}
|
|
|
|
|
2009-06-27 11:25:07 +04:00
|
|
|
void qemu_register_reset(QEMUResetHandler *func, void *opaque)
|
2004-06-20 16:37:32 +04:00
|
|
|
{
|
2011-08-21 07:09:37 +04:00
|
|
|
QEMUResetEntry *re = g_malloc0(sizeof(QEMUResetEntry));
|
2004-06-20 16:37:32 +04:00
|
|
|
|
|
|
|
re->func = func;
|
|
|
|
re->opaque = opaque;
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_INSERT_TAIL(&reset_handlers, re, entry);
|
2004-06-20 16:37:32 +04:00
|
|
|
}
|
|
|
|
|
2009-07-02 02:19:02 +04:00
|
|
|
void qemu_unregister_reset(QEMUResetHandler *func, void *opaque)
|
2004-06-20 16:37:32 +04:00
|
|
|
{
|
|
|
|
QEMUResetEntry *re;
|
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_FOREACH(re, &reset_handlers, entry) {
|
2009-07-02 02:19:02 +04:00
|
|
|
if (re->func == func && re->opaque == opaque) {
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_REMOVE(&reset_handlers, re, entry);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(re);
|
2009-07-02 02:19:02 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-07 10:41:51 +04:00
|
|
|
void qemu_devices_reset(void)
|
2009-07-02 02:19:02 +04:00
|
|
|
{
|
|
|
|
QEMUResetEntry *re, *nre;
|
|
|
|
|
|
|
|
/* reset all devices */
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
|
2004-06-20 16:37:32 +04:00
|
|
|
re->func(re->opaque);
|
|
|
|
}
|
2012-08-07 10:41:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_system_reset(bool report)
|
|
|
|
{
|
|
|
|
if (current_machine && current_machine->reset) {
|
|
|
|
current_machine->reset();
|
|
|
|
} else {
|
|
|
|
qemu_devices_reset();
|
|
|
|
}
|
2011-06-14 20:29:43 +04:00
|
|
|
if (report) {
|
|
|
|
monitor_protocol_event(QEVENT_RESET, NULL);
|
|
|
|
}
|
2010-03-01 21:10:30 +03:00
|
|
|
cpu_synchronize_all_post_reset();
|
2004-06-20 16:37:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_system_reset_request(void)
|
|
|
|
{
|
2006-10-02 23:44:22 +04:00
|
|
|
if (no_reboot) {
|
|
|
|
shutdown_requested = 1;
|
|
|
|
} else {
|
|
|
|
reset_requested = 1;
|
|
|
|
}
|
2011-02-02 00:15:43 +03:00
|
|
|
cpu_stop_current();
|
2009-04-24 22:03:11 +04:00
|
|
|
qemu_notify_event();
|
2004-06-20 16:37:32 +04:00
|
|
|
}
|
|
|
|
|
2012-02-23 16:45:19 +04:00
|
|
|
static void qemu_system_suspend(void)
|
|
|
|
{
|
|
|
|
pause_all_vcpus();
|
|
|
|
notifier_list_notify(&suspend_notifiers, NULL);
|
2012-04-27 20:33:36 +04:00
|
|
|
runstate_set(RUN_STATE_SUSPENDED);
|
2012-02-23 16:45:26 +04:00
|
|
|
monitor_protocol_event(QEVENT_SUSPEND, NULL);
|
2012-02-23 16:45:19 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_system_suspend_request(void)
|
|
|
|
{
|
2012-04-27 21:31:12 +04:00
|
|
|
if (runstate_check(RUN_STATE_SUSPENDED)) {
|
2012-02-23 16:45:19 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
suspend_requested = 1;
|
|
|
|
cpu_stop_current();
|
|
|
|
qemu_notify_event();
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_register_suspend_notifier(Notifier *notifier)
|
|
|
|
{
|
|
|
|
notifier_list_add(&suspend_notifiers, notifier);
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_system_wakeup_request(WakeupReason reason)
|
|
|
|
{
|
2012-04-27 21:31:12 +04:00
|
|
|
if (!runstate_check(RUN_STATE_SUSPENDED)) {
|
2012-02-23 16:45:19 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!(wakeup_reason_mask & (1 << reason))) {
|
|
|
|
return;
|
|
|
|
}
|
2012-04-27 20:33:36 +04:00
|
|
|
runstate_set(RUN_STATE_RUNNING);
|
2012-02-23 16:45:19 +04:00
|
|
|
notifier_list_notify(&wakeup_notifiers, &reason);
|
2012-08-09 00:29:17 +04:00
|
|
|
wakeup_requested = 1;
|
2012-02-23 16:45:19 +04:00
|
|
|
qemu_notify_event();
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_system_wakeup_enable(WakeupReason reason, bool enabled)
|
|
|
|
{
|
|
|
|
if (enabled) {
|
|
|
|
wakeup_reason_mask |= (1 << reason);
|
|
|
|
} else {
|
|
|
|
wakeup_reason_mask &= ~(1 << reason);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_register_wakeup_notifier(Notifier *notifier)
|
|
|
|
{
|
|
|
|
notifier_list_add(&wakeup_notifiers, notifier);
|
|
|
|
}
|
|
|
|
|
2011-03-15 14:56:04 +03:00
|
|
|
void qemu_system_killed(int signal, pid_t pid)
|
|
|
|
{
|
|
|
|
shutdown_signal = signal;
|
|
|
|
shutdown_pid = pid;
|
2011-09-14 17:38:40 +04:00
|
|
|
no_shutdown = 0;
|
2011-03-15 14:56:04 +03:00
|
|
|
qemu_system_shutdown_request();
|
|
|
|
}
|
|
|
|
|
2004-06-20 16:37:32 +04:00
|
|
|
void qemu_system_shutdown_request(void)
|
|
|
|
{
|
|
|
|
shutdown_requested = 1;
|
2009-04-24 22:03:11 +04:00
|
|
|
qemu_notify_event();
|
2004-06-20 16:37:32 +04:00
|
|
|
}
|
|
|
|
|
2012-09-06 01:06:25 +04:00
|
|
|
static void qemu_system_powerdown(void)
|
|
|
|
{
|
|
|
|
monitor_protocol_event(QEVENT_POWERDOWN, NULL);
|
|
|
|
notifier_list_notify(&powerdown_notifiers, NULL);
|
|
|
|
}
|
|
|
|
|
2005-07-02 18:31:34 +04:00
|
|
|
void qemu_system_powerdown_request(void)
|
|
|
|
{
|
|
|
|
powerdown_requested = 1;
|
2009-04-24 22:03:11 +04:00
|
|
|
qemu_notify_event();
|
|
|
|
}
|
|
|
|
|
2012-09-06 01:06:21 +04:00
|
|
|
void qemu_register_powerdown_notifier(Notifier *notifier)
|
|
|
|
{
|
|
|
|
notifier_list_add(&powerdown_notifiers, notifier);
|
|
|
|
}
|
|
|
|
|
2011-02-07 14:19:16 +03:00
|
|
|
void qemu_system_debug_request(void)
|
|
|
|
{
|
|
|
|
debug_requested = 1;
|
2011-02-07 14:19:17 +03:00
|
|
|
qemu_notify_event();
|
2011-02-07 14:19:16 +03:00
|
|
|
}
|
|
|
|
|
2011-07-29 21:26:33 +04:00
|
|
|
void qemu_system_vmstop_request(RunState state)
|
2011-02-07 14:19:16 +03:00
|
|
|
{
|
2011-07-29 21:26:33 +04:00
|
|
|
vmstop_requested = state;
|
2011-02-07 14:19:16 +03:00
|
|
|
qemu_notify_event();
|
|
|
|
}
|
|
|
|
|
2011-09-12 16:03:13 +04:00
|
|
|
static bool main_loop_should_exit(void)
|
|
|
|
{
|
|
|
|
RunState r;
|
|
|
|
if (qemu_debug_requested()) {
|
|
|
|
vm_stop(RUN_STATE_DEBUG);
|
|
|
|
}
|
2012-02-23 16:45:19 +04:00
|
|
|
if (qemu_suspend_requested()) {
|
|
|
|
qemu_system_suspend();
|
|
|
|
}
|
2011-09-12 16:03:13 +04:00
|
|
|
if (qemu_shutdown_requested()) {
|
|
|
|
qemu_kill_report();
|
|
|
|
monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
|
|
|
|
if (no_shutdown) {
|
|
|
|
vm_stop(RUN_STATE_SHUTDOWN);
|
|
|
|
} else {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (qemu_reset_requested()) {
|
|
|
|
pause_all_vcpus();
|
|
|
|
cpu_synchronize_all_states();
|
|
|
|
qemu_system_reset(VMRESET_REPORT);
|
|
|
|
resume_all_vcpus();
|
2013-04-26 07:24:40 +04:00
|
|
|
if (runstate_needs_reset()) {
|
2011-09-12 16:03:13 +04:00
|
|
|
runstate_set(RUN_STATE_PAUSED);
|
|
|
|
}
|
|
|
|
}
|
2012-08-09 00:29:17 +04:00
|
|
|
if (qemu_wakeup_requested()) {
|
|
|
|
pause_all_vcpus();
|
|
|
|
cpu_synchronize_all_states();
|
|
|
|
qemu_system_reset(VMRESET_SILENT);
|
|
|
|
resume_all_vcpus();
|
2012-08-09 18:27:30 +04:00
|
|
|
monitor_protocol_event(QEVENT_WAKEUP, NULL);
|
2012-08-09 00:29:17 +04:00
|
|
|
}
|
2011-09-12 16:03:13 +04:00
|
|
|
if (qemu_powerdown_requested()) {
|
2012-09-06 01:06:25 +04:00
|
|
|
qemu_system_powerdown();
|
2011-09-12 16:03:13 +04:00
|
|
|
}
|
|
|
|
if (qemu_vmstop_requested(&r)) {
|
|
|
|
vm_stop(r);
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-04-24 22:03:33 +04:00
|
|
|
static void main_loop(void)
|
|
|
|
{
|
2011-08-22 19:46:02 +04:00
|
|
|
bool nonblocking;
|
2011-09-12 16:03:13 +04:00
|
|
|
int last_io = 0;
|
2011-02-02 00:15:46 +03:00
|
|
|
#ifdef CONFIG_PROFILER
|
|
|
|
int64_t ti;
|
|
|
|
#endif
|
2011-09-12 16:03:13 +04:00
|
|
|
do {
|
2013-06-03 19:38:43 +04:00
|
|
|
nonblocking = !kvm_enabled() && !xen_enabled() && last_io > 0;
|
2006-02-09 01:46:31 +03:00
|
|
|
#ifdef CONFIG_PROFILER
|
2011-02-02 00:15:47 +03:00
|
|
|
ti = profile_getclock();
|
2006-02-09 01:46:31 +03:00
|
|
|
#endif
|
2011-08-22 19:46:02 +04:00
|
|
|
last_io = main_loop_wait(nonblocking);
|
2006-02-09 01:46:31 +03:00
|
|
|
#ifdef CONFIG_PROFILER
|
2011-02-02 00:15:47 +03:00
|
|
|
dev_time += profile_getclock() - ti;
|
2006-02-09 01:46:31 +03:00
|
|
|
#endif
|
2011-09-12 16:03:13 +04:00
|
|
|
} while (!main_loop_should_exit());
|
2003-06-27 21:34:32 +04:00
|
|
|
}
|
|
|
|
|
2009-04-08 02:58:45 +04:00
|
|
|
static void version(void)
|
|
|
|
{
|
2010-04-28 16:42:01 +04:00
|
|
|
printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
|
2009-04-08 02:58:45 +04:00
|
|
|
}
|
|
|
|
|
2007-06-30 03:26:08 +04:00
|
|
|
static void help(int exitcode)
|
2003-06-24 17:42:40 +04:00
|
|
|
{
|
2011-12-19 10:19:31 +04:00
|
|
|
version();
|
|
|
|
printf("usage: %s [options] [disk_image]\n\n"
|
|
|
|
"'disk_image' is a raw hard disk image for IDE hard disk 0\n\n",
|
|
|
|
error_get_progname());
|
|
|
|
|
2011-12-19 10:19:30 +04:00
|
|
|
#define QEMU_OPTIONS_GENERATE_HELP
|
|
|
|
#include "qemu-options-wrapper.h"
|
2011-12-19 10:19:31 +04:00
|
|
|
|
|
|
|
printf("\nDuring emulation, the following keys are useful:\n"
|
2010-02-08 12:04:56 +03:00
|
|
|
"ctrl-alt-f toggle full screen\n"
|
|
|
|
"ctrl-alt-n switch to virtual console 'n'\n"
|
|
|
|
"ctrl-alt toggle mouse and keyboard grab\n"
|
|
|
|
"\n"
|
2011-12-19 10:19:31 +04:00
|
|
|
"When using -nographic, press 'ctrl-a h' to get some help.\n");
|
|
|
|
|
2007-06-30 03:26:08 +04:00
|
|
|
exit(exitcode);
|
2003-06-24 17:42:40 +04:00
|
|
|
}
|
|
|
|
|
2004-05-14 02:02:20 +04:00
|
|
|
#define HAS_ARG 0x0001
|
|
|
|
|
|
|
|
typedef struct QEMUOption {
|
|
|
|
const char *name;
|
|
|
|
int flags;
|
|
|
|
int index;
|
2010-03-29 23:23:52 +04:00
|
|
|
uint32_t arch_mask;
|
2004-05-14 02:02:20 +04:00
|
|
|
} QEMUOption;
|
|
|
|
|
2008-10-01 23:38:09 +04:00
|
|
|
static const QEMUOption qemu_options[] = {
|
2010-03-29 23:23:52 +04:00
|
|
|
{ "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL },
|
2011-12-19 10:19:30 +04:00
|
|
|
#define QEMU_OPTIONS_GENERATE_OPTIONS
|
|
|
|
#include "qemu-options-wrapper.h"
|
2004-05-14 02:02:20 +04:00
|
|
|
{ NULL },
|
2003-06-30 14:03:06 +04:00
|
|
|
};
|
2011-09-27 23:15:42 +04:00
|
|
|
|
|
|
|
static bool vga_available(void)
|
|
|
|
{
|
2012-09-08 18:01:20 +04:00
|
|
|
return object_class_by_name("VGA") || object_class_by_name("isa-vga");
|
2011-09-27 23:15:42 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool cirrus_vga_available(void)
|
|
|
|
{
|
2012-09-08 18:01:20 +04:00
|
|
|
return object_class_by_name("cirrus-vga")
|
|
|
|
|| object_class_by_name("isa-cirrus-vga");
|
2011-09-27 23:15:42 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool vmware_vga_available(void)
|
|
|
|
{
|
2012-09-08 18:01:20 +04:00
|
|
|
return object_class_by_name("vmware-svga");
|
2011-09-27 23:15:42 +04:00
|
|
|
}
|
|
|
|
|
2012-09-08 14:01:06 +04:00
|
|
|
static bool qxl_vga_available(void)
|
|
|
|
{
|
|
|
|
return object_class_by_name("qxl-vga");
|
|
|
|
}
|
|
|
|
|
2008-09-28 04:42:05 +04:00
|
|
|
static void select_vgahw (const char *p)
|
|
|
|
{
|
|
|
|
const char *opts;
|
|
|
|
|
2009-07-30 14:15:02 +04:00
|
|
|
vga_interface_type = VGA_NONE;
|
2008-09-28 04:42:05 +04:00
|
|
|
if (strstart(p, "std", &opts)) {
|
2011-09-27 23:15:42 +04:00
|
|
|
if (vga_available()) {
|
|
|
|
vga_interface_type = VGA_STD;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Error: standard VGA not available\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
2008-09-28 04:42:05 +04:00
|
|
|
} else if (strstart(p, "cirrus", &opts)) {
|
2011-09-27 23:15:42 +04:00
|
|
|
if (cirrus_vga_available()) {
|
|
|
|
vga_interface_type = VGA_CIRRUS;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Error: Cirrus VGA not available\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
2008-09-28 04:42:05 +04:00
|
|
|
} else if (strstart(p, "vmware", &opts)) {
|
2011-09-27 23:15:42 +04:00
|
|
|
if (vmware_vga_available()) {
|
|
|
|
vga_interface_type = VGA_VMWARE;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Error: VMWare SVGA not available\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
2009-04-22 19:19:53 +04:00
|
|
|
} else if (strstart(p, "xenfb", &opts)) {
|
2009-07-30 14:15:02 +04:00
|
|
|
vga_interface_type = VGA_XENFB;
|
2010-04-27 13:50:11 +04:00
|
|
|
} else if (strstart(p, "qxl", &opts)) {
|
2012-09-08 14:01:06 +04:00
|
|
|
if (qxl_vga_available()) {
|
|
|
|
vga_interface_type = VGA_QXL;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Error: QXL VGA not available\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
2009-04-22 19:19:48 +04:00
|
|
|
} else if (!strstart(p, "none", &opts)) {
|
2008-09-28 04:42:05 +04:00
|
|
|
invalid_vga:
|
|
|
|
fprintf(stderr, "Unknown vga type: %s\n", p);
|
|
|
|
exit(1);
|
|
|
|
}
|
2008-09-28 04:42:12 +04:00
|
|
|
while (*opts) {
|
|
|
|
const char *nextopt;
|
|
|
|
|
|
|
|
if (strstart(opts, ",retrace=", &nextopt)) {
|
|
|
|
opts = nextopt;
|
|
|
|
if (strstart(opts, "dumb", &nextopt))
|
|
|
|
vga_retrace_method = VGA_RETRACE_DUMB;
|
|
|
|
else if (strstart(opts, "precise", &nextopt))
|
|
|
|
vga_retrace_method = VGA_RETRACE_PRECISE;
|
|
|
|
else goto invalid_vga;
|
|
|
|
} else goto invalid_vga;
|
|
|
|
opts = nextopt;
|
|
|
|
}
|
2008-09-28 04:42:05 +04:00
|
|
|
}
|
|
|
|
|
2011-03-16 15:33:31 +03:00
|
|
|
static DisplayType select_display(const char *p)
|
|
|
|
{
|
|
|
|
const char *opts;
|
|
|
|
DisplayType display = DT_DEFAULT;
|
|
|
|
|
|
|
|
if (strstart(p, "sdl", &opts)) {
|
|
|
|
#ifdef CONFIG_SDL
|
|
|
|
display = DT_SDL;
|
|
|
|
while (*opts) {
|
|
|
|
const char *nextopt;
|
|
|
|
|
|
|
|
if (strstart(opts, ",frame=", &nextopt)) {
|
|
|
|
opts = nextopt;
|
|
|
|
if (strstart(opts, "on", &nextopt)) {
|
|
|
|
no_frame = 0;
|
|
|
|
} else if (strstart(opts, "off", &nextopt)) {
|
|
|
|
no_frame = 1;
|
|
|
|
} else {
|
2011-03-23 06:40:57 +03:00
|
|
|
goto invalid_sdl_args;
|
2011-03-16 15:33:31 +03:00
|
|
|
}
|
|
|
|
} else if (strstart(opts, ",alt_grab=", &nextopt)) {
|
|
|
|
opts = nextopt;
|
|
|
|
if (strstart(opts, "on", &nextopt)) {
|
|
|
|
alt_grab = 1;
|
|
|
|
} else if (strstart(opts, "off", &nextopt)) {
|
|
|
|
alt_grab = 0;
|
|
|
|
} else {
|
2011-03-23 06:40:57 +03:00
|
|
|
goto invalid_sdl_args;
|
2011-03-16 15:33:31 +03:00
|
|
|
}
|
|
|
|
} else if (strstart(opts, ",ctrl_grab=", &nextopt)) {
|
|
|
|
opts = nextopt;
|
|
|
|
if (strstart(opts, "on", &nextopt)) {
|
|
|
|
ctrl_grab = 1;
|
|
|
|
} else if (strstart(opts, "off", &nextopt)) {
|
|
|
|
ctrl_grab = 0;
|
|
|
|
} else {
|
2011-03-23 06:40:57 +03:00
|
|
|
goto invalid_sdl_args;
|
2011-03-16 15:33:31 +03:00
|
|
|
}
|
|
|
|
} else if (strstart(opts, ",window_close=", &nextopt)) {
|
|
|
|
opts = nextopt;
|
|
|
|
if (strstart(opts, "on", &nextopt)) {
|
|
|
|
no_quit = 0;
|
|
|
|
} else if (strstart(opts, "off", &nextopt)) {
|
|
|
|
no_quit = 1;
|
|
|
|
} else {
|
2011-03-23 06:40:57 +03:00
|
|
|
goto invalid_sdl_args;
|
2011-03-16 15:33:31 +03:00
|
|
|
}
|
|
|
|
} else {
|
2011-03-23 06:40:57 +03:00
|
|
|
invalid_sdl_args:
|
|
|
|
fprintf(stderr, "Invalid SDL option string: %s\n", p);
|
|
|
|
exit(1);
|
2011-03-16 15:33:31 +03:00
|
|
|
}
|
|
|
|
opts = nextopt;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
fprintf(stderr, "SDL support is disabled\n");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
2011-03-16 15:33:33 +03:00
|
|
|
} else if (strstart(p, "vnc", &opts)) {
|
2011-03-16 15:33:36 +03:00
|
|
|
#ifdef CONFIG_VNC
|
2011-03-16 15:33:33 +03:00
|
|
|
display_remote++;
|
|
|
|
|
|
|
|
if (*opts) {
|
|
|
|
const char *nextopt;
|
|
|
|
|
|
|
|
if (strstart(opts, "=", &nextopt)) {
|
|
|
|
vnc_display = nextopt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!vnc_display) {
|
|
|
|
fprintf(stderr, "VNC requires a display argument vnc=<display>\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2011-03-16 15:33:36 +03:00
|
|
|
#else
|
|
|
|
fprintf(stderr, "VNC support is disabled\n");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
2011-03-16 15:33:31 +03:00
|
|
|
} else if (strstart(p, "curses", &opts)) {
|
|
|
|
#ifdef CONFIG_CURSES
|
|
|
|
display = DT_CURSES;
|
|
|
|
#else
|
|
|
|
fprintf(stderr, "Curses support is disabled\n");
|
|
|
|
exit(1);
|
2013-02-20 17:43:25 +04:00
|
|
|
#endif
|
|
|
|
} else if (strstart(p, "gtk", &opts)) {
|
|
|
|
#ifdef CONFIG_GTK
|
|
|
|
display = DT_GTK;
|
|
|
|
#else
|
|
|
|
fprintf(stderr, "GTK support is disabled\n");
|
|
|
|
exit(1);
|
2011-03-16 15:33:31 +03:00
|
|
|
#endif
|
2011-03-16 15:33:32 +03:00
|
|
|
} else if (strstart(p, "none", &opts)) {
|
|
|
|
display = DT_NONE;
|
2011-03-16 15:33:31 +03:00
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Unknown display type: %s\n", p);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return display;
|
|
|
|
}
|
|
|
|
|
2009-06-26 21:15:14 +04:00
|
|
|
static int balloon_parse(const char *arg)
|
|
|
|
{
|
2009-08-14 12:34:22 +04:00
|
|
|
QemuOpts *opts;
|
2009-06-26 21:15:14 +04:00
|
|
|
|
2009-08-14 12:34:22 +04:00
|
|
|
if (strcmp(arg, "none") == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strncmp(arg, "virtio", 6)) {
|
|
|
|
if (arg[6] == ',') {
|
|
|
|
/* have params -> parse them */
|
2010-08-20 15:52:01 +04:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("device"), arg+7, 0);
|
2009-08-14 12:34:22 +04:00
|
|
|
if (!opts)
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
/* create empty opts */
|
2012-12-06 10:47:22 +04:00
|
|
|
opts = qemu_opts_create_nofail(qemu_find_opts("device"));
|
2009-06-26 21:15:14 +04:00
|
|
|
}
|
2011-03-29 17:29:29 +04:00
|
|
|
qemu_opt_set(opts, "driver", "virtio-balloon");
|
2009-08-14 12:34:22 +04:00
|
|
|
return 0;
|
2009-06-26 21:15:14 +04:00
|
|
|
}
|
2009-08-14 12:34:22 +04:00
|
|
|
|
|
|
|
return -1;
|
2009-06-26 21:15:14 +04:00
|
|
|
}
|
|
|
|
|
2009-05-30 03:52:44 +04:00
|
|
|
char *qemu_find_file(int type, const char *name)
|
|
|
|
{
|
2013-03-08 14:42:24 +04:00
|
|
|
int i;
|
2009-05-30 03:52:44 +04:00
|
|
|
const char *subdir;
|
|
|
|
char *buf;
|
|
|
|
|
2012-05-25 16:07:01 +04:00
|
|
|
/* Try the name as a straight path first */
|
|
|
|
if (access(name, R_OK) == 0) {
|
2013-03-08 14:42:24 +04:00
|
|
|
trace_load_file(name, name);
|
2011-08-21 07:09:37 +04:00
|
|
|
return g_strdup(name);
|
2009-05-30 03:52:44 +04:00
|
|
|
}
|
2013-03-08 14:42:24 +04:00
|
|
|
|
2009-05-30 03:52:44 +04:00
|
|
|
switch (type) {
|
|
|
|
case QEMU_FILE_TYPE_BIOS:
|
|
|
|
subdir = "";
|
|
|
|
break;
|
|
|
|
case QEMU_FILE_TYPE_KEYMAP:
|
|
|
|
subdir = "keymaps/";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
2013-03-08 14:42:24 +04:00
|
|
|
|
|
|
|
for (i = 0; i < data_dir_idx; i++) {
|
|
|
|
buf = g_strdup_printf("%s/%s%s", data_dir[i], subdir, name);
|
|
|
|
if (access(buf, R_OK) == 0) {
|
|
|
|
trace_load_file(name, buf);
|
|
|
|
return buf;
|
|
|
|
}
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(buf);
|
2009-05-30 03:52:44 +04:00
|
|
|
}
|
2013-03-08 14:42:24 +04:00
|
|
|
return NULL;
|
2009-05-30 03:52:44 +04:00
|
|
|
}
|
|
|
|
|
2010-01-29 21:48:57 +03:00
|
|
|
static int device_help_func(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
return qdev_device_help(opts);
|
|
|
|
}
|
|
|
|
|
2009-07-31 14:25:37 +04:00
|
|
|
static int device_init_func(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
|
|
|
|
dev = qdev_device_add(opts);
|
|
|
|
if (!dev)
|
|
|
|
return -1;
|
2013-01-25 17:12:37 +04:00
|
|
|
object_unref(OBJECT(dev));
|
2009-07-31 14:25:37 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:36 +03:00
|
|
|
static int chardev_init_func(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
2012-10-15 11:28:05 +04:00
|
|
|
Error *local_err = NULL;
|
2009-12-08 15:11:36 +03:00
|
|
|
|
2012-10-15 11:28:05 +04:00
|
|
|
qemu_chr_new_from_opts(opts, NULL, &local_err);
|
|
|
|
if (error_is_set(&local_err)) {
|
|
|
|
fprintf(stderr, "%s\n", error_get_pretty(local_err));
|
|
|
|
error_free(local_err);
|
2009-12-08 15:11:36 +03:00
|
|
|
return -1;
|
2012-10-15 11:28:05 +04:00
|
|
|
}
|
2009-12-08 15:11:36 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-15 00:34:41 +04:00
|
|
|
#ifdef CONFIG_VIRTFS
|
2010-04-29 16:14:43 +04:00
|
|
|
static int fsdev_init_func(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
ret = qemu_fsdev_add(opts);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-12-08 15:11:50 +03:00
|
|
|
static int mon_init_func(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
CharDriverState *chr;
|
|
|
|
const char *chardev;
|
|
|
|
const char *mode;
|
|
|
|
int flags;
|
|
|
|
|
|
|
|
mode = qemu_opt_get(opts, "mode");
|
|
|
|
if (mode == NULL) {
|
|
|
|
mode = "readline";
|
|
|
|
}
|
|
|
|
if (strcmp(mode, "readline") == 0) {
|
|
|
|
flags = MONITOR_USE_READLINE;
|
|
|
|
} else if (strcmp(mode, "control") == 0) {
|
|
|
|
flags = MONITOR_USE_CONTROL;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "unknown monitor mode \"%s\"\n", mode);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2010-06-07 18:42:31 +04:00
|
|
|
if (qemu_opt_get_bool(opts, "pretty", 0))
|
|
|
|
flags |= MONITOR_USE_PRETTY;
|
|
|
|
|
2009-12-08 15:11:50 +03:00
|
|
|
if (qemu_opt_get_bool(opts, "default", 0))
|
|
|
|
flags |= MONITOR_IS_DEFAULT;
|
|
|
|
|
|
|
|
chardev = qemu_opt_get(opts, "chardev");
|
|
|
|
chr = qemu_chr_find(chardev);
|
|
|
|
if (chr == NULL) {
|
|
|
|
fprintf(stderr, "chardev \"%s\" not found\n", chardev);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2013-03-27 23:29:40 +04:00
|
|
|
qemu_chr_fe_claim_no_fail(chr);
|
2009-12-08 15:11:50 +03:00
|
|
|
monitor_init(chr, flags);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:52 +03:00
|
|
|
static void monitor_parse(const char *optarg, const char *mode)
|
2009-12-08 15:11:50 +03:00
|
|
|
{
|
|
|
|
static int monitor_device_index = 0;
|
|
|
|
QemuOpts *opts;
|
|
|
|
const char *p;
|
|
|
|
char label[32];
|
|
|
|
int def = 0;
|
|
|
|
|
|
|
|
if (strstart(optarg, "chardev:", &p)) {
|
|
|
|
snprintf(label, sizeof(label), "%s", p);
|
|
|
|
} else {
|
2010-04-06 18:55:52 +04:00
|
|
|
snprintf(label, sizeof(label), "compat_monitor%d",
|
|
|
|
monitor_device_index);
|
|
|
|
if (monitor_device_index == 0) {
|
2009-12-08 15:11:50 +03:00
|
|
|
def = 1;
|
|
|
|
}
|
|
|
|
opts = qemu_chr_parse_compat(label, optarg);
|
|
|
|
if (!opts) {
|
|
|
|
fprintf(stderr, "parse error: %s\n", optarg);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-20 22:51:57 +04:00
|
|
|
opts = qemu_opts_create(qemu_find_opts("mon"), label, 1, NULL);
|
2009-12-08 15:11:50 +03:00
|
|
|
if (!opts) {
|
|
|
|
fprintf(stderr, "duplicate chardev: %s\n", label);
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-12-08 15:11:52 +03:00
|
|
|
qemu_opt_set(opts, "mode", mode);
|
2009-12-08 15:11:50 +03:00
|
|
|
qemu_opt_set(opts, "chardev", label);
|
|
|
|
if (def)
|
|
|
|
qemu_opt_set(opts, "default", "on");
|
|
|
|
monitor_device_index++;
|
|
|
|
}
|
|
|
|
|
2009-07-15 15:59:26 +04:00
|
|
|
struct device_config {
|
|
|
|
enum {
|
2009-12-08 15:11:53 +03:00
|
|
|
DEV_USB, /* -usbdevice */
|
|
|
|
DEV_BT, /* -bt */
|
|
|
|
DEV_SERIAL, /* -serial */
|
|
|
|
DEV_PARALLEL, /* -parallel */
|
|
|
|
DEV_VIRTCON, /* -virtioconsole */
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
DEV_DEBUGCON, /* -debugcon */
|
2012-02-07 18:09:13 +04:00
|
|
|
DEV_GDB, /* -gdb, -s */
|
2013-01-24 15:18:52 +04:00
|
|
|
DEV_SCLP, /* s390 sclp */
|
2009-07-15 15:59:26 +04:00
|
|
|
} type;
|
|
|
|
const char *cmdline;
|
2012-02-07 18:09:12 +04:00
|
|
|
Location loc;
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_ENTRY(device_config) next;
|
2009-07-15 15:59:26 +04:00
|
|
|
};
|
2012-10-28 15:04:47 +04:00
|
|
|
|
|
|
|
static QTAILQ_HEAD(, device_config) device_configs =
|
|
|
|
QTAILQ_HEAD_INITIALIZER(device_configs);
|
2009-07-15 15:59:26 +04:00
|
|
|
|
|
|
|
static void add_device_config(int type, const char *cmdline)
|
|
|
|
{
|
|
|
|
struct device_config *conf;
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
conf = g_malloc0(sizeof(*conf));
|
2009-07-15 15:59:26 +04:00
|
|
|
conf->type = type;
|
|
|
|
conf->cmdline = cmdline;
|
2012-02-07 18:09:12 +04:00
|
|
|
loc_save(&conf->loc);
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_INSERT_TAIL(&device_configs, conf, next);
|
2009-07-15 15:59:26 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int foreach_device_config(int type, int (*func)(const char *cmdline))
|
|
|
|
{
|
|
|
|
struct device_config *conf;
|
|
|
|
int rc;
|
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_FOREACH(conf, &device_configs, next) {
|
2009-07-15 15:59:26 +04:00
|
|
|
if (conf->type != type)
|
|
|
|
continue;
|
2012-02-07 18:09:12 +04:00
|
|
|
loc_push_restore(&conf->loc);
|
2009-07-15 15:59:26 +04:00
|
|
|
rc = func(conf->cmdline);
|
2012-02-07 18:09:12 +04:00
|
|
|
loc_pop(&conf->loc);
|
2009-07-15 15:59:26 +04:00
|
|
|
if (0 != rc)
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:41 +03:00
|
|
|
static int serial_parse(const char *devname)
|
|
|
|
{
|
|
|
|
static int index = 0;
|
|
|
|
char label[32];
|
|
|
|
|
|
|
|
if (strcmp(devname, "none") == 0)
|
|
|
|
return 0;
|
|
|
|
if (index == MAX_SERIAL_PORTS) {
|
|
|
|
fprintf(stderr, "qemu: too many serial ports\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
snprintf(label, sizeof(label), "serial%d", index);
|
2011-08-15 20:17:36 +04:00
|
|
|
serial_hds[index] = qemu_chr_new(label, devname, NULL);
|
2009-12-08 15:11:41 +03:00
|
|
|
if (!serial_hds[index]) {
|
2012-07-09 08:28:30 +04:00
|
|
|
fprintf(stderr, "qemu: could not connect serial device"
|
|
|
|
" to character backend '%s'\n", devname);
|
2009-12-08 15:11:41 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
index++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:42 +03:00
|
|
|
static int parallel_parse(const char *devname)
|
|
|
|
{
|
|
|
|
static int index = 0;
|
|
|
|
char label[32];
|
|
|
|
|
|
|
|
if (strcmp(devname, "none") == 0)
|
|
|
|
return 0;
|
|
|
|
if (index == MAX_PARALLEL_PORTS) {
|
|
|
|
fprintf(stderr, "qemu: too many parallel ports\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
snprintf(label, sizeof(label), "parallel%d", index);
|
2011-08-15 20:17:36 +04:00
|
|
|
parallel_hds[index] = qemu_chr_new(label, devname, NULL);
|
2009-12-08 15:11:42 +03:00
|
|
|
if (!parallel_hds[index]) {
|
2012-07-09 08:28:30 +04:00
|
|
|
fprintf(stderr, "qemu: could not connect parallel device"
|
|
|
|
" to character backend '%s'\n", devname);
|
2009-12-08 15:11:42 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
index++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:53 +03:00
|
|
|
static int virtcon_parse(const char *devname)
|
|
|
|
{
|
2010-08-20 15:52:01 +04:00
|
|
|
QemuOptsList *device = qemu_find_opts("device");
|
2009-12-08 15:11:53 +03:00
|
|
|
static int index = 0;
|
|
|
|
char label[32];
|
2010-01-21 13:49:23 +03:00
|
|
|
QemuOpts *bus_opts, *dev_opts;
|
2009-12-08 15:11:53 +03:00
|
|
|
|
|
|
|
if (strcmp(devname, "none") == 0)
|
|
|
|
return 0;
|
|
|
|
if (index == MAX_VIRTIO_CONSOLES) {
|
|
|
|
fprintf(stderr, "qemu: too many virtio consoles\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2010-01-21 13:49:23 +03:00
|
|
|
|
2012-12-06 10:47:22 +04:00
|
|
|
bus_opts = qemu_opts_create_nofail(device);
|
2012-02-06 21:07:18 +04:00
|
|
|
if (arch_type == QEMU_ARCH_S390X) {
|
|
|
|
qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
|
|
|
|
} else {
|
|
|
|
qemu_opt_set(bus_opts, "driver", "virtio-serial-pci");
|
2013-03-21 03:23:13 +04:00
|
|
|
}
|
2010-01-21 13:49:23 +03:00
|
|
|
|
2012-12-06 10:47:22 +04:00
|
|
|
dev_opts = qemu_opts_create_nofail(device);
|
2010-01-21 13:49:23 +03:00
|
|
|
qemu_opt_set(dev_opts, "driver", "virtconsole");
|
|
|
|
|
2009-12-08 15:11:53 +03:00
|
|
|
snprintf(label, sizeof(label), "virtcon%d", index);
|
2011-08-15 20:17:36 +04:00
|
|
|
virtcon_hds[index] = qemu_chr_new(label, devname, NULL);
|
2009-12-08 15:11:53 +03:00
|
|
|
if (!virtcon_hds[index]) {
|
2012-07-09 08:28:30 +04:00
|
|
|
fprintf(stderr, "qemu: could not connect virtio console"
|
|
|
|
" to character backend '%s'\n", devname);
|
2009-12-08 15:11:53 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2010-01-21 13:49:23 +03:00
|
|
|
qemu_opt_set(dev_opts, "chardev", label);
|
|
|
|
|
2009-12-08 15:11:53 +03:00
|
|
|
index++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-24 15:18:52 +04:00
|
|
|
static int sclp_parse(const char *devname)
|
|
|
|
{
|
|
|
|
QemuOptsList *device = qemu_find_opts("device");
|
|
|
|
static int index = 0;
|
|
|
|
char label[32];
|
|
|
|
QemuOpts *dev_opts;
|
|
|
|
|
|
|
|
if (strcmp(devname, "none") == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (index == MAX_SCLP_CONSOLES) {
|
|
|
|
fprintf(stderr, "qemu: too many sclp consoles\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(arch_type == QEMU_ARCH_S390X);
|
|
|
|
|
|
|
|
dev_opts = qemu_opts_create(device, NULL, 0, NULL);
|
|
|
|
qemu_opt_set(dev_opts, "driver", "sclpconsole");
|
|
|
|
|
|
|
|
snprintf(label, sizeof(label), "sclpcon%d", index);
|
|
|
|
sclp_hds[index] = qemu_chr_new(label, devname, NULL);
|
|
|
|
if (!sclp_hds[index]) {
|
|
|
|
fprintf(stderr, "qemu: could not connect sclp console"
|
|
|
|
" to character backend '%s'\n", devname);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
qemu_opt_set(dev_opts, "chardev", label);
|
|
|
|
|
|
|
|
index++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
static int debugcon_parse(const char *devname)
|
2013-03-21 03:23:13 +04:00
|
|
|
{
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
QemuOpts *opts;
|
|
|
|
|
2011-08-15 20:17:36 +04:00
|
|
|
if (!qemu_chr_new("debugcon", devname, NULL)) {
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
2012-03-20 22:51:57 +04:00
|
|
|
opts = qemu_opts_create(qemu_find_opts("device"), "debugcon", 1, NULL);
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
if (!opts) {
|
|
|
|
fprintf(stderr, "qemu: already have a debugcon device\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
qemu_opt_set(opts, "driver", "isa-debugcon");
|
|
|
|
qemu_opt_set(opts, "chardev", "debugcon");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-23 14:38:37 +04:00
|
|
|
static QEMUMachine *machine_parse(const char *name)
|
|
|
|
{
|
|
|
|
QEMUMachine *m, *machine = NULL;
|
|
|
|
|
|
|
|
if (name) {
|
|
|
|
machine = find_machine(name);
|
|
|
|
}
|
|
|
|
if (machine) {
|
|
|
|
return machine;
|
|
|
|
}
|
|
|
|
printf("Supported machines are:\n");
|
|
|
|
for (m = first_machine; m != NULL; m = m->next) {
|
|
|
|
if (m->alias) {
|
2012-02-23 02:13:11 +04:00
|
|
|
printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
|
2011-07-23 14:38:37 +04:00
|
|
|
}
|
2012-02-23 02:13:11 +04:00
|
|
|
printf("%-20s %s%s\n", m->name, m->desc,
|
2011-07-23 14:38:37 +04:00
|
|
|
m->is_default ? " (default)" : "");
|
|
|
|
}
|
2012-08-02 16:45:54 +04:00
|
|
|
exit(!name || !is_help_option(name));
|
2011-07-23 14:38:37 +04:00
|
|
|
}
|
|
|
|
|
2010-09-21 23:05:31 +04:00
|
|
|
static int tcg_init(void)
|
|
|
|
{
|
2011-08-02 18:10:21 +04:00
|
|
|
tcg_exec_init(tcg_tb_size * 1024 * 1024);
|
2010-09-21 23:05:31 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct {
|
|
|
|
const char *opt_name;
|
|
|
|
const char *name;
|
|
|
|
int (*available)(void);
|
|
|
|
int (*init)(void);
|
2013-01-24 09:03:27 +04:00
|
|
|
bool *allowed;
|
2010-09-21 23:05:31 +04:00
|
|
|
} accel_list[] = {
|
|
|
|
{ "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed },
|
2010-08-19 15:27:56 +04:00
|
|
|
{ "xen", "Xen", xen_available, xen_init, &xen_allowed },
|
2010-09-21 23:05:31 +04:00
|
|
|
{ "kvm", "KVM", kvm_available, kvm_init, &kvm_allowed },
|
2012-03-28 17:42:02 +04:00
|
|
|
{ "qtest", "QTest", qtest_available, qtest_init, &qtest_allowed },
|
2010-09-21 23:05:31 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static int configure_accelerator(void)
|
|
|
|
{
|
|
|
|
const char *p = NULL;
|
|
|
|
char buf[10];
|
|
|
|
int i, ret;
|
2013-01-24 09:03:26 +04:00
|
|
|
bool accel_initialised = false;
|
|
|
|
bool init_failed = false;
|
2010-09-21 23:05:31 +04:00
|
|
|
|
|
|
|
QemuOptsList *list = qemu_find_opts("machine");
|
|
|
|
if (!QTAILQ_EMPTY(&list->head)) {
|
|
|
|
p = qemu_opt_get(QTAILQ_FIRST(&list->head), "accel");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p == NULL) {
|
|
|
|
/* Use the default "accelerator", tcg */
|
|
|
|
p = "tcg";
|
|
|
|
}
|
|
|
|
|
2012-02-08 00:57:27 +04:00
|
|
|
while (!accel_initialised && *p != '\0') {
|
2010-09-21 23:05:31 +04:00
|
|
|
if (*p == ':') {
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
p = get_opt_name(buf, sizeof (buf), p, ':');
|
|
|
|
for (i = 0; i < ARRAY_SIZE(accel_list); i++) {
|
|
|
|
if (strcmp(accel_list[i].opt_name, buf) == 0) {
|
2013-01-24 09:03:25 +04:00
|
|
|
if (!accel_list[i].available()) {
|
|
|
|
printf("%s not supported for this target\n",
|
|
|
|
accel_list[i].name);
|
|
|
|
continue;
|
|
|
|
}
|
2013-01-24 09:03:27 +04:00
|
|
|
*(accel_list[i].allowed) = true;
|
2010-09-21 23:05:31 +04:00
|
|
|
ret = accel_list[i].init();
|
|
|
|
if (ret < 0) {
|
2013-01-24 09:03:26 +04:00
|
|
|
init_failed = true;
|
2013-01-24 09:03:25 +04:00
|
|
|
fprintf(stderr, "failed to initialize %s: %s\n",
|
|
|
|
accel_list[i].name,
|
|
|
|
strerror(-ret));
|
2013-01-24 09:03:27 +04:00
|
|
|
*(accel_list[i].allowed) = false;
|
2010-09-21 23:05:31 +04:00
|
|
|
} else {
|
2013-01-24 09:03:26 +04:00
|
|
|
accel_initialised = true;
|
2010-09-21 23:05:31 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i == ARRAY_SIZE(accel_list)) {
|
|
|
|
fprintf(stderr, "\"%s\" accelerator does not exist.\n", buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-08 00:57:27 +04:00
|
|
|
if (!accel_initialised) {
|
2013-01-24 09:03:26 +04:00
|
|
|
if (!init_failed) {
|
|
|
|
fprintf(stderr, "No accelerator found!\n");
|
|
|
|
}
|
2010-09-21 23:05:31 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (init_failed) {
|
|
|
|
fprintf(stderr, "Back to %s accelerator.\n", accel_list[i].name);
|
|
|
|
}
|
|
|
|
|
2012-02-08 00:57:27 +04:00
|
|
|
return !accel_initialised;
|
2010-09-21 23:05:31 +04:00
|
|
|
}
|
|
|
|
|
2010-06-04 16:08:07 +04:00
|
|
|
void qemu_add_exit_notifier(Notifier *notify)
|
|
|
|
{
|
|
|
|
notifier_list_add(&exit_notifiers, notify);
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_remove_exit_notifier(Notifier *notify)
|
|
|
|
{
|
2012-01-13 20:34:01 +04:00
|
|
|
notifier_remove(notify);
|
2010-06-04 16:08:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void qemu_run_exit_notifiers(void)
|
|
|
|
{
|
2011-06-20 16:06:26 +04:00
|
|
|
notifier_list_notify(&exit_notifiers, NULL);
|
2010-06-04 16:08:07 +04:00
|
|
|
}
|
|
|
|
|
2010-12-08 14:35:08 +03:00
|
|
|
void qemu_add_machine_init_done_notifier(Notifier *notify)
|
|
|
|
{
|
|
|
|
notifier_list_add(&machine_init_done_notifiers, notify);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qemu_run_machine_init_done_notifiers(void)
|
|
|
|
{
|
2011-06-20 16:06:26 +04:00
|
|
|
notifier_list_notify(&machine_init_done_notifiers, NULL);
|
2010-12-08 14:35:08 +03:00
|
|
|
}
|
|
|
|
|
2010-01-22 18:18:06 +03:00
|
|
|
static const QEMUOption *lookup_opt(int argc, char **argv,
|
|
|
|
const char **poptarg, int *poptind)
|
|
|
|
{
|
|
|
|
const QEMUOption *popt;
|
|
|
|
int optind = *poptind;
|
|
|
|
char *r = argv[optind];
|
|
|
|
const char *optarg;
|
|
|
|
|
2010-02-18 22:13:51 +03:00
|
|
|
loc_set_cmdline(argv, optind, 1);
|
2010-01-22 18:18:06 +03:00
|
|
|
optind++;
|
|
|
|
/* Treat --foo the same as -foo. */
|
|
|
|
if (r[1] == '-')
|
|
|
|
r++;
|
|
|
|
popt = qemu_options;
|
|
|
|
for(;;) {
|
|
|
|
if (!popt->name) {
|
2010-02-18 22:13:51 +03:00
|
|
|
error_report("invalid option");
|
2010-01-22 18:18:06 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!strcmp(popt->name, r + 1))
|
|
|
|
break;
|
|
|
|
popt++;
|
|
|
|
}
|
|
|
|
if (popt->flags & HAS_ARG) {
|
|
|
|
if (optind >= argc) {
|
2010-02-18 22:13:51 +03:00
|
|
|
error_report("requires an argument");
|
2010-01-22 18:18:06 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
optarg = argv[optind++];
|
2010-02-18 22:13:51 +03:00
|
|
|
loc_set_cmdline(argv, optind - 2, 2);
|
2010-01-22 18:18:06 +03:00
|
|
|
} else {
|
|
|
|
optarg = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*poptarg = optarg;
|
|
|
|
*poptind = optind;
|
|
|
|
|
|
|
|
return popt;
|
|
|
|
}
|
|
|
|
|
2011-08-21 07:38:31 +04:00
|
|
|
static gpointer malloc_and_trace(gsize n_bytes)
|
|
|
|
{
|
|
|
|
void *ptr = malloc(n_bytes);
|
2011-08-31 11:25:35 +04:00
|
|
|
trace_g_malloc(n_bytes, ptr);
|
2011-08-21 07:38:31 +04:00
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gpointer realloc_and_trace(gpointer mem, gsize n_bytes)
|
|
|
|
{
|
|
|
|
void *ptr = realloc(mem, n_bytes);
|
2011-08-31 11:25:35 +04:00
|
|
|
trace_g_realloc(mem, n_bytes, ptr);
|
2011-08-21 07:38:31 +04:00
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_and_trace(gpointer mem)
|
|
|
|
{
|
2011-08-31 11:25:35 +04:00
|
|
|
trace_g_free(mem);
|
2011-08-21 07:38:31 +04:00
|
|
|
free(mem);
|
|
|
|
}
|
|
|
|
|
2012-06-25 23:36:33 +04:00
|
|
|
static int object_set_property(const char *name, const char *value, void *opaque)
|
|
|
|
{
|
|
|
|
Object *obj = OBJECT(opaque);
|
|
|
|
StringInputVisitor *siv;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
siv = string_input_visitor_new(value);
|
|
|
|
object_property_set(obj, string_input_get_visitor(siv), name, &local_err);
|
|
|
|
string_input_visitor_cleanup(siv);
|
|
|
|
|
|
|
|
if (local_err) {
|
|
|
|
qerror_report_err(local_err);
|
|
|
|
error_free(local_err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int object_create(QemuOpts *opts, void *opaque)
|
|
|
|
{
|
|
|
|
const char *type = qemu_opt_get(opts, "qom-type");
|
|
|
|
const char *id = qemu_opts_id(opts);
|
|
|
|
Object *obj;
|
|
|
|
|
|
|
|
g_assert(type != NULL);
|
|
|
|
|
|
|
|
if (id == NULL) {
|
|
|
|
qerror_report(QERR_MISSING_PARAMETER, "id");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
obj = object_new(type);
|
|
|
|
if (qemu_opt_foreach(opts, object_set_property, obj, 1) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
object_property_add_child(container_get(object_get_root(), "/objects"),
|
|
|
|
id, obj, NULL);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-12-10 22:18:40 +03:00
|
|
|
int main(int argc, char **argv, char **envp)
|
2003-06-24 17:42:40 +04:00
|
|
|
{
|
2007-12-02 07:51:10 +03:00
|
|
|
int i;
|
net: remove broken net_set_boot_mask() boot device validation
There are many problems with net_set_boot_mask():
1) It is broken when using the device model instead of "-net nic". Example:
$ qemu-system-x86_64 -device rtl8139,vlan=0,id=net0,mac=52:54:00:82:41:fd,bus=pci.0,addr=0x4 -net user,vlan=0,name=hostnet0 -vnc 0.0.0.0:0 -boot n
Cannot boot from non-existent NIC
$
2) The mask was previously used to set which boot ROMs were supposed to be
loaded, but this was changed long time ago. Now all ROM images are loaded,
and SeaBIOS takes care of jumping to the right boot entry point depending on
the boot settings.
3) Interpretation and validation of the boot parameter letters is done on
the machine type code. Examples: PC accepts only a,b,c,d,n as valid boot
device letters. mac99 accepts only a,b,c,d,e,f.
As a side-effect of this change, qemu-kvm won't abort anymore if using "-boot n"
on a machine with no network devices. Checking if the requested boot device is
valid is now a task for the BIOS or the machine-type code.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-04-07 02:22:07 +04:00
|
|
|
int snapshot, linux_boot;
|
2010-03-10 13:38:48 +03:00
|
|
|
const char *icount_option = NULL;
|
2003-10-30 04:11:23 +03:00
|
|
|
const char *initrd_filename;
|
2003-10-01 01:07:02 +04:00
|
|
|
const char *kernel_filename, *kernel_cmdline;
|
2013-01-08 11:06:30 +04:00
|
|
|
char boot_devices[33] = "";
|
2009-01-16 22:04:14 +03:00
|
|
|
DisplayState *ds;
|
2012-08-27 18:33:22 +04:00
|
|
|
int cyls, heads, secs, translation;
|
|
|
|
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
|
2010-08-20 15:52:02 +04:00
|
|
|
QemuOptsList *olist;
|
2004-05-14 02:02:20 +04:00
|
|
|
int optind;
|
2010-01-22 18:18:06 +03:00
|
|
|
const char *optarg;
|
2004-10-03 17:29:03 +04:00
|
|
|
const char *loadvm = NULL;
|
2005-06-05 18:49:17 +04:00
|
|
|
QEMUMachine *machine;
|
2007-03-05 22:44:02 +03:00
|
|
|
const char *cpu_model;
|
2012-05-10 11:39:17 +04:00
|
|
|
const char *vga_model = "none";
|
2007-03-19 18:58:31 +03:00
|
|
|
const char *pid_file = NULL;
|
2008-10-13 07:12:02 +04:00
|
|
|
const char *incoming = NULL;
|
2011-03-16 15:33:36 +03:00
|
|
|
#ifdef CONFIG_VNC
|
2009-05-22 01:54:00 +04:00
|
|
|
int show_vnc_port = 0;
|
2011-03-16 15:33:36 +03:00
|
|
|
#endif
|
2012-05-02 20:07:28 +04:00
|
|
|
bool defconfig = true;
|
2012-05-02 20:07:29 +04:00
|
|
|
bool userconfig = true;
|
2011-06-07 20:32:40 +04:00
|
|
|
const char *log_mask = NULL;
|
|
|
|
const char *log_file = NULL;
|
2011-08-21 07:38:31 +04:00
|
|
|
GMemVTable mem_trace = {
|
|
|
|
.malloc = malloc_and_trace,
|
|
|
|
.realloc = realloc_and_trace,
|
|
|
|
.free = free_and_trace,
|
|
|
|
};
|
2011-08-31 22:31:31 +04:00
|
|
|
const char *trace_events = NULL;
|
2011-08-31 22:31:03 +04:00
|
|
|
const char *trace_file = NULL;
|
2011-02-26 21:38:39 +03:00
|
|
|
|
2010-06-04 16:08:07 +04:00
|
|
|
atexit(qemu_run_exit_notifiers);
|
2010-02-24 16:37:14 +03:00
|
|
|
error_set_progname(argv[0]);
|
|
|
|
|
2011-08-21 07:38:31 +04:00
|
|
|
g_mem_set_vtable(&mem_trace);
|
2011-10-31 22:14:56 +04:00
|
|
|
if (!g_thread_supported()) {
|
2011-12-20 15:41:04 +04:00
|
|
|
#if !GLIB_CHECK_VERSION(2, 31, 0)
|
2011-10-31 22:14:56 +04:00
|
|
|
g_thread_init(NULL);
|
2011-12-20 15:41:04 +04:00
|
|
|
#else
|
|
|
|
fprintf(stderr, "glib threading failed to initialize.\n");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
2011-10-31 22:14:56 +04:00
|
|
|
}
|
2011-08-21 07:38:31 +04:00
|
|
|
|
2012-03-05 00:32:35 +04:00
|
|
|
module_call_init(MODULE_INIT_QOM);
|
|
|
|
|
2012-11-26 19:03:42 +04:00
|
|
|
qemu_add_opts(&qemu_drive_opts);
|
|
|
|
qemu_add_opts(&qemu_chardev_opts);
|
|
|
|
qemu_add_opts(&qemu_device_opts);
|
|
|
|
qemu_add_opts(&qemu_netdev_opts);
|
|
|
|
qemu_add_opts(&qemu_net_opts);
|
|
|
|
qemu_add_opts(&qemu_rtc_opts);
|
|
|
|
qemu_add_opts(&qemu_global_opts);
|
|
|
|
qemu_add_opts(&qemu_mon_opts);
|
|
|
|
qemu_add_opts(&qemu_trace_opts);
|
|
|
|
qemu_add_opts(&qemu_option_rom_opts);
|
|
|
|
qemu_add_opts(&qemu_machine_opts);
|
|
|
|
qemu_add_opts(&qemu_boot_opts);
|
|
|
|
qemu_add_opts(&qemu_sandbox_opts);
|
|
|
|
qemu_add_opts(&qemu_add_fd_opts);
|
|
|
|
qemu_add_opts(&qemu_object_opts);
|
Support for TPM command line options
This patch adds support for TPM command line options.
The command line options supported here are
./qemu-... -tpmdev passthrough,path=<path to TPM device>,id=<id>
-device tpm-tis,tpmdev=<id>,id=<other id>
and
./qemu-... -tpmdev help
where the latter works similar to -soundhw help and shows a list of
available TPM backends (for example 'passthrough').
Using the type parameter, the backend is chosen, i.e., 'passthrough' for the
passthrough driver. The interpretation of the other parameters along
with determining whether enough parameters were provided is pushed into
the backend driver, which needs to implement the interface function
'create' and return a TPMDriverOpts structure if the VM can be started or
'NULL' if not enough or bad parameters were provided.
Monitor support for 'info tpm' has been added. It for example prints the
following:
(qemu) info tpm
TPM devices:
tpm0: model=tpm-tis
\ tpm0: type=passthrough,path=/dev/tpm0,cancel-path=/sys/devices/pnp0/00:09/cancel
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Joel Schopp <jschopp@linux.vnet.ibm.com>
Message-id: 1361987275-26289-2-git-send-email-stefanb@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-27 21:47:49 +04:00
|
|
|
qemu_add_opts(&qemu_tpmdev_opts);
|
2013-04-19 18:42:06 +04:00
|
|
|
qemu_add_opts(&qemu_realtime_opts);
|
2012-11-26 19:03:42 +04:00
|
|
|
|
2011-09-05 23:36:31 +04:00
|
|
|
runstate_init();
|
|
|
|
|
2009-09-15 15:36:04 +04:00
|
|
|
init_clocks();
|
2011-09-12 18:21:44 +04:00
|
|
|
rtc_clock = host_clock;
|
2009-09-15 15:36:04 +04:00
|
|
|
|
2008-12-10 22:18:40 +03:00
|
|
|
qemu_cache_utils_init(envp);
|
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
QLIST_INIT (&vm_change_state_head);
|
2010-06-10 13:42:21 +04:00
|
|
|
os_setup_early_signal_handling();
|
2006-06-25 20:25:21 +04:00
|
|
|
|
2009-05-21 03:38:09 +04:00
|
|
|
module_call_init(MODULE_INIT_MACHINE);
|
2009-05-22 05:41:01 +04:00
|
|
|
machine = find_default_machine();
|
2007-03-05 22:44:02 +03:00
|
|
|
cpu_model = NULL;
|
2008-04-28 01:39:40 +04:00
|
|
|
ram_size = 0;
|
2003-07-06 21:15:21 +04:00
|
|
|
snapshot = 0;
|
2012-08-27 18:33:22 +04:00
|
|
|
cyls = heads = secs = 0;
|
|
|
|
translation = BIOS_ATA_TRANSLATION_AUTO;
|
2004-03-15 00:44:30 +03:00
|
|
|
|
2009-04-22 02:30:27 +04:00
|
|
|
for (i = 0; i < MAX_NODES; i++) {
|
|
|
|
node_mem[i] = 0;
|
Fixes related to processing of qemu's -numa option
The -numa option to qemu is used to create [fake] numa nodes
and expose them to the guest OS instance.
There are a couple of issues with the -numa option:
a) Max VCPU's that can be specified for a guest while using
the qemu's -numa option is 64. Due to a typecasting issue
when the number of VCPUs is > 32 the VCPUs don't show up
under the specified [fake] numa nodes.
b) KVM currently has support for 160VCPUs per guest. The
qemu's -numa option has only support for upto 64VCPUs
per guest.
This patch addresses these two issues.
Below are examples of (a) and (b)
a) >32 VCPUs are specified with the -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
71:01:01 \
-net tap,ifname=tap0,script=no,downscript=no \
-vnc :4
...
Upstream qemu :
--------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59
node 2 size: 131072 MB
node 3 cpus: 30
node 3 size: 131072 MB
node 4 cpus:
node 4 size: 131072 MB
node 5 cpus: 31
node 5 size: 131072 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 131072 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 131072 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 131072 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 131072 MB
b) >64 VCPUs specified with -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
-cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4
...
Upstream qemu :
--------------
only 63 CPUs in NUMA mode supported.
only 64 CPUs in NUMA mode supported.
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61
node 2 size: 65536 MB
node 3 cpus: 30 62
node 3 size: 65536 MB
node 4 cpus:
node 4 size: 65536 MB
node 5 cpus:
node 5 size: 65536 MB
node 6 cpus: 31 63
node 6 size: 65536 MB
node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69
node 7 size: 65536 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 65536 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 65536 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 65536 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 65536 MB
node 6 cpus: 60 61 62 63 64 65 66 67 68 69
node 6 size: 65536 MB
node 7 cpus: 70 71 72 73 74 75 76 77 78 79
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2012-07-17 08:31:30 +04:00
|
|
|
node_cpumask[i] = bitmap_new(MAX_CPUMASK_BITS);
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
nb_numa_nodes = 0;
|
2005-11-16 01:16:05 +03:00
|
|
|
nb_nics = 0;
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2013-03-21 16:07:10 +04:00
|
|
|
bdrv_init_with_whitelist();
|
|
|
|
|
2008-10-05 13:56:21 +04:00
|
|
|
autostart= 1;
|
|
|
|
|
2010-01-21 19:57:58 +03:00
|
|
|
/* first pass of option parsing */
|
|
|
|
optind = 1;
|
|
|
|
while (optind < argc) {
|
|
|
|
if (argv[optind][0] != '-') {
|
|
|
|
/* disk image */
|
2010-01-27 19:46:00 +03:00
|
|
|
optind++;
|
2010-01-21 19:57:58 +03:00
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
const QEMUOption *popt;
|
|
|
|
|
|
|
|
popt = lookup_opt(argc, argv, &optarg, &optind);
|
|
|
|
switch (popt->index) {
|
|
|
|
case QEMU_OPTION_nodefconfig:
|
2012-05-02 20:07:28 +04:00
|
|
|
defconfig = false;
|
2010-01-21 19:57:58 +03:00
|
|
|
break;
|
2012-05-02 20:07:29 +04:00
|
|
|
case QEMU_OPTION_nouserconfig:
|
|
|
|
userconfig = false;
|
|
|
|
break;
|
2010-01-21 19:57:58 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (defconfig) {
|
2010-03-05 19:25:55 +03:00
|
|
|
int ret;
|
2012-05-02 20:07:29 +04:00
|
|
|
ret = qemu_read_default_config_files(userconfig);
|
2012-05-02 20:07:25 +04:00
|
|
|
if (ret < 0) {
|
2010-03-05 19:25:55 +03:00
|
|
|
exit(1);
|
2010-01-21 19:57:58 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* second pass of option parsing */
|
2004-05-14 02:02:20 +04:00
|
|
|
optind = 1;
|
2003-06-24 17:42:40 +04:00
|
|
|
for(;;) {
|
2004-05-14 02:02:20 +04:00
|
|
|
if (optind >= argc)
|
2003-06-24 17:42:40 +04:00
|
|
|
break;
|
2010-01-22 18:18:06 +03:00
|
|
|
if (argv[optind][0] != '-') {
|
2012-08-27 18:33:22 +04:00
|
|
|
hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS);
|
2004-05-14 02:02:20 +04:00
|
|
|
} else {
|
|
|
|
const QEMUOption *popt;
|
|
|
|
|
2010-01-22 18:18:06 +03:00
|
|
|
popt = lookup_opt(argc, argv, &optarg, &optind);
|
2010-03-29 23:23:52 +04:00
|
|
|
if (!(popt->arch_mask & arch_type)) {
|
|
|
|
printf("Option %s not supported for this target\n", popt->name);
|
|
|
|
exit(1);
|
|
|
|
}
|
2004-05-14 02:02:20 +04:00
|
|
|
switch(popt->index) {
|
2005-06-05 18:49:17 +04:00
|
|
|
case QEMU_OPTION_M:
|
2011-07-23 14:38:37 +04:00
|
|
|
machine = machine_parse(optarg);
|
2005-06-05 18:49:17 +04:00
|
|
|
break;
|
2012-10-05 21:51:40 +04:00
|
|
|
case QEMU_OPTION_no_kvm_irqchip: {
|
|
|
|
olist = qemu_find_opts("machine");
|
|
|
|
qemu_opts_parse(olist, "kernel_irqchip=off", 0);
|
|
|
|
break;
|
|
|
|
}
|
2007-03-05 22:44:02 +03:00
|
|
|
case QEMU_OPTION_cpu:
|
|
|
|
/* hw initialization will check this */
|
2012-03-09 23:19:07 +04:00
|
|
|
cpu_model = optarg;
|
2007-03-05 22:44:02 +03:00
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_hda:
|
2012-08-27 18:33:22 +04:00
|
|
|
{
|
|
|
|
char buf[256];
|
|
|
|
if (cyls == 0)
|
|
|
|
snprintf(buf, sizeof(buf), "%s", HD_OPTS);
|
|
|
|
else
|
|
|
|
snprintf(buf, sizeof(buf),
|
|
|
|
"%s,cyls=%d,heads=%d,secs=%d%s",
|
|
|
|
HD_OPTS , cyls, heads, secs,
|
|
|
|
translation == BIOS_ATA_TRANSLATION_LBA ?
|
|
|
|
",trans=lba" :
|
|
|
|
translation == BIOS_ATA_TRANSLATION_NONE ?
|
|
|
|
",trans=none" : "");
|
|
|
|
drive_add(IF_DEFAULT, 0, optarg, buf);
|
|
|
|
break;
|
|
|
|
}
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_hdb:
|
2005-06-05 18:49:17 +04:00
|
|
|
case QEMU_OPTION_hdc:
|
|
|
|
case QEMU_OPTION_hdd:
|
2011-01-28 13:21:41 +03:00
|
|
|
drive_add(IF_DEFAULT, popt->index - QEMU_OPTION_hda, optarg,
|
|
|
|
HD_OPTS);
|
2003-06-30 14:03:06 +04:00
|
|
|
break;
|
2007-12-02 07:51:10 +03:00
|
|
|
case QEMU_OPTION_drive:
|
exit if -drive specified is invalid instead of ignoring the "wrong" -drive
This fixes the problem when qemu continues even if -drive specification
is somehow invalid, resulting in a mess. Applicable for both current
master and for stable-0.14 (and the same issue exist 0.13 and 0.12 too).
The prob can actually be seriuos: when you start guest with two drives
and make an error in the specification of one of them, and the guest
has something like a raid array on the two drives, guest may start failing
that array or kick "missing" drives which may result in a mess - this is
what actually happened to me, I did't want a resync at all, and a resync
resulted in re-writing (and allocating) a 4TB virtual drive I used for
testing, which in turn resulted in my filesystem filling up and whole
thing failing badly. Yes it was just testing VM, I experimented with
larger raid arrays, but the end result was quite, well, unexpected.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2011-03-30 16:31:05 +04:00
|
|
|
if (drive_def(optarg) == NULL) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2007-12-02 07:51:10 +03:00
|
|
|
break;
|
2009-07-31 14:25:36 +04:00
|
|
|
case QEMU_OPTION_set:
|
|
|
|
if (qemu_set_option(optarg) != 0)
|
|
|
|
exit(1);
|
|
|
|
break;
|
2009-12-08 15:11:34 +03:00
|
|
|
case QEMU_OPTION_global:
|
|
|
|
if (qemu_global_option(optarg) != 0)
|
|
|
|
exit(1);
|
|
|
|
break;
|
2007-04-30 06:09:25 +04:00
|
|
|
case QEMU_OPTION_mtdblock:
|
2011-01-28 13:21:41 +03:00
|
|
|
drive_add(IF_MTD, -1, optarg, MTD_OPTS);
|
2007-04-30 06:09:25 +04:00
|
|
|
break;
|
2007-04-06 20:49:48 +04:00
|
|
|
case QEMU_OPTION_sd:
|
2013-02-28 22:23:14 +04:00
|
|
|
drive_add(IF_SD, -1, optarg, SD_OPTS);
|
2007-04-06 20:49:48 +04:00
|
|
|
break;
|
2007-04-24 10:52:59 +04:00
|
|
|
case QEMU_OPTION_pflash:
|
2011-01-28 13:21:41 +03:00
|
|
|
drive_add(IF_PFLASH, -1, optarg, PFLASH_OPTS);
|
2007-04-24 10:52:59 +04:00
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_snapshot:
|
2003-07-06 21:15:21 +04:00
|
|
|
snapshot = 1;
|
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_hdachs:
|
2003-07-26 22:11:40 +04:00
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
p = optarg;
|
|
|
|
cyls = strtol(p, (char **)&p, 0);
|
2004-11-16 04:45:27 +03:00
|
|
|
if (cyls < 1 || cyls > 16383)
|
|
|
|
goto chs_fail;
|
2003-07-26 22:11:40 +04:00
|
|
|
if (*p != ',')
|
|
|
|
goto chs_fail;
|
|
|
|
p++;
|
|
|
|
heads = strtol(p, (char **)&p, 0);
|
2004-11-16 04:45:27 +03:00
|
|
|
if (heads < 1 || heads > 16)
|
|
|
|
goto chs_fail;
|
2003-07-26 22:11:40 +04:00
|
|
|
if (*p != ',')
|
|
|
|
goto chs_fail;
|
|
|
|
p++;
|
|
|
|
secs = strtol(p, (char **)&p, 0);
|
2004-11-16 04:45:27 +03:00
|
|
|
if (secs < 1 || secs > 63)
|
|
|
|
goto chs_fail;
|
|
|
|
if (*p == ',') {
|
|
|
|
p++;
|
|
|
|
if (!strcmp(p, "none"))
|
|
|
|
translation = BIOS_ATA_TRANSLATION_NONE;
|
|
|
|
else if (!strcmp(p, "lba"))
|
|
|
|
translation = BIOS_ATA_TRANSLATION_LBA;
|
|
|
|
else if (!strcmp(p, "auto"))
|
|
|
|
translation = BIOS_ATA_TRANSLATION_AUTO;
|
|
|
|
else
|
|
|
|
goto chs_fail;
|
|
|
|
} else if (*p != '\0') {
|
2004-03-15 00:44:30 +03:00
|
|
|
chs_fail:
|
2004-11-16 04:45:27 +03:00
|
|
|
fprintf(stderr, "qemu: invalid physical CHS format\n");
|
|
|
|
exit(1);
|
2004-03-15 00:44:30 +03:00
|
|
|
}
|
2012-08-27 18:33:22 +04:00
|
|
|
if (hda_opts != NULL) {
|
2009-07-22 18:43:04 +04:00
|
|
|
char num[16];
|
|
|
|
snprintf(num, sizeof(num), "%d", cyls);
|
|
|
|
qemu_opt_set(hda_opts, "cyls", num);
|
|
|
|
snprintf(num, sizeof(num), "%d", heads);
|
|
|
|
qemu_opt_set(hda_opts, "heads", num);
|
|
|
|
snprintf(num, sizeof(num), "%d", secs);
|
|
|
|
qemu_opt_set(hda_opts, "secs", num);
|
|
|
|
if (translation == BIOS_ATA_TRANSLATION_LBA)
|
|
|
|
qemu_opt_set(hda_opts, "trans", "lba");
|
|
|
|
if (translation == BIOS_ATA_TRANSLATION_NONE)
|
|
|
|
qemu_opt_set(hda_opts, "trans", "none");
|
|
|
|
}
|
2003-07-26 22:11:40 +04:00
|
|
|
}
|
|
|
|
break;
|
2009-04-22 02:30:27 +04:00
|
|
|
case QEMU_OPTION_numa:
|
|
|
|
numa_add(optarg);
|
|
|
|
break;
|
2011-03-16 15:33:31 +03:00
|
|
|
case QEMU_OPTION_display:
|
|
|
|
display_type = select_display(optarg);
|
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_nographic:
|
2009-05-22 01:54:00 +04:00
|
|
|
display_type = DT_NOGRAPHIC;
|
2003-10-01 01:07:02 +04:00
|
|
|
break;
|
2008-02-10 19:33:14 +03:00
|
|
|
case QEMU_OPTION_curses:
|
2011-03-16 15:33:35 +03:00
|
|
|
#ifdef CONFIG_CURSES
|
2009-05-22 01:54:00 +04:00
|
|
|
display_type = DT_CURSES;
|
2011-03-16 15:33:35 +03:00
|
|
|
#else
|
|
|
|
fprintf(stderr, "Curses support is disabled\n");
|
|
|
|
exit(1);
|
2008-02-10 19:33:14 +03:00
|
|
|
#endif
|
2011-03-16 15:33:35 +03:00
|
|
|
break;
|
2007-04-30 05:48:07 +04:00
|
|
|
case QEMU_OPTION_portrait:
|
2011-06-17 14:04:36 +04:00
|
|
|
graphic_rotate = 90;
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_rotate:
|
|
|
|
graphic_rotate = strtol(optarg, (char **) &optarg, 10);
|
|
|
|
if (graphic_rotate != 0 && graphic_rotate != 90 &&
|
|
|
|
graphic_rotate != 180 && graphic_rotate != 270) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"qemu: only 90, 180, 270 deg rotation is available\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2007-04-30 05:48:07 +04:00
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_kernel:
|
2012-02-08 09:41:39 +04:00
|
|
|
qemu_opts_set(qemu_find_opts("machine"), 0, "kernel", optarg);
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_initrd:
|
|
|
|
qemu_opts_set(qemu_find_opts("machine"), 0, "initrd", optarg);
|
2003-10-01 01:07:02 +04:00
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_append:
|
2012-02-08 09:41:39 +04:00
|
|
|
qemu_opts_set(qemu_find_opts("machine"), 0, "append", optarg);
|
2003-08-11 01:52:11 +04:00
|
|
|
break;
|
2012-03-02 15:56:38 +04:00
|
|
|
case QEMU_OPTION_dtb:
|
|
|
|
qemu_opts_set(qemu_find_opts("machine"), 0, "dtb", optarg);
|
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_cdrom:
|
2011-01-28 13:21:41 +03:00
|
|
|
drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS);
|
2003-11-11 16:36:08 +03:00
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_boot:
|
2007-11-11 04:50:45 +03:00
|
|
|
{
|
2009-07-02 02:19:02 +04:00
|
|
|
static const char * const params[] = {
|
2011-07-27 14:04:55 +04:00
|
|
|
"order", "once", "menu",
|
add a boot parameter to set reboot timeout
Added an option to let qemu transfer a configuration file to bios,
"etc/boot-fail-wait", which could be specified by command
-boot reboot-timeout=T
T have a max value of 0xffff, unit is ms.
With this option, guest will wait for a given time if not find
bootabled device, then reboot. If reboot-timeout is '-1', guest
will not reboot, qemu passes '-1' to bios by default.
This feature need the new seabios's support.
Seabios pulls the value from the fwcfg "file" interface, this
interface is used because SeaBIOS needs a reliable way of
obtaining a name, value size, and value. It in no way requires
that there be a real file on the user's host machine.
Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-09-07 07:11:03 +04:00
|
|
|
"splash", "splash-time",
|
2013-03-19 10:23:27 +04:00
|
|
|
"reboot-timeout", "strict", NULL
|
2009-07-02 02:19:02 +04:00
|
|
|
};
|
|
|
|
char buf[sizeof(boot_devices)];
|
2009-07-02 02:19:02 +04:00
|
|
|
char *standard_boot_devices;
|
2009-07-02 02:19:02 +04:00
|
|
|
int legacy = 0;
|
|
|
|
|
|
|
|
if (!strchr(optarg, '=')) {
|
|
|
|
legacy = 1;
|
|
|
|
pstrcpy(buf, sizeof(buf), optarg);
|
|
|
|
} else if (check_params(buf, sizeof(buf), params, optarg) < 0) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"qemu: unknown boot parameter '%s' in '%s'\n",
|
|
|
|
buf, optarg);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (legacy ||
|
|
|
|
get_param_value(buf, sizeof(buf), "order", optarg)) {
|
2010-04-07 02:22:08 +04:00
|
|
|
validate_bootdevices(buf);
|
2009-07-02 02:19:02 +04:00
|
|
|
pstrcpy(boot_devices, sizeof(boot_devices), buf);
|
2007-11-11 04:50:45 +03:00
|
|
|
}
|
2009-07-02 02:19:02 +04:00
|
|
|
if (!legacy) {
|
|
|
|
if (get_param_value(buf, sizeof(buf),
|
|
|
|
"once", optarg)) {
|
2010-04-07 02:22:08 +04:00
|
|
|
validate_bootdevices(buf);
|
2011-08-21 07:09:37 +04:00
|
|
|
standard_boot_devices = g_strdup(boot_devices);
|
2009-07-02 02:19:02 +04:00
|
|
|
pstrcpy(boot_devices, sizeof(boot_devices), buf);
|
|
|
|
qemu_register_reset(restore_boot_devices,
|
|
|
|
standard_boot_devices);
|
|
|
|
}
|
2009-07-02 02:19:02 +04:00
|
|
|
if (get_param_value(buf, sizeof(buf),
|
|
|
|
"menu", optarg)) {
|
|
|
|
if (!strcmp(buf, "on")) {
|
|
|
|
boot_menu = 1;
|
|
|
|
} else if (!strcmp(buf, "off")) {
|
|
|
|
boot_menu = 0;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr,
|
|
|
|
"qemu: invalid option value '%s'\n",
|
|
|
|
buf);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2013-03-19 10:23:27 +04:00
|
|
|
if (get_param_value(buf, sizeof(buf),
|
|
|
|
"strict", optarg)) {
|
|
|
|
if (!strcmp(buf, "on")) {
|
|
|
|
boot_strict = true;
|
|
|
|
} else if (!strcmp(buf, "off")) {
|
|
|
|
boot_strict = false;
|
|
|
|
} else {
|
|
|
|
fprintf(stderr,
|
|
|
|
"qemu: invalid option value '%s'\n",
|
|
|
|
buf);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2013-02-09 00:22:19 +04:00
|
|
|
if (!qemu_opts_parse(qemu_find_opts("boot-opts"),
|
|
|
|
optarg, 0)) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-07-02 02:19:02 +04:00
|
|
|
}
|
2003-11-11 16:36:08 +03:00
|
|
|
}
|
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_fda:
|
|
|
|
case QEMU_OPTION_fdb:
|
2011-01-28 13:21:41 +03:00
|
|
|
drive_add(IF_FLOPPY, popt->index - QEMU_OPTION_fda,
|
|
|
|
optarg, FD_OPTS);
|
2004-01-05 03:02:06 +03:00
|
|
|
break;
|
2006-06-14 20:03:05 +04:00
|
|
|
case QEMU_OPTION_no_fd_bootchk:
|
|
|
|
fd_bootchk = 0;
|
|
|
|
break;
|
2009-10-08 22:58:26 +04:00
|
|
|
case QEMU_OPTION_netdev:
|
2010-08-20 15:52:01 +04:00
|
|
|
if (net_client_parse(qemu_find_opts("netdev"), optarg) == -1) {
|
2009-10-08 22:58:26 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
2005-11-16 01:16:05 +03:00
|
|
|
case QEMU_OPTION_net:
|
2010-08-20 15:52:01 +04:00
|
|
|
if (net_client_parse(qemu_find_opts("net"), optarg) == -1) {
|
2004-03-15 00:44:30 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
2004-04-03 01:21:32 +04:00
|
|
|
break;
|
2012-01-26 02:39:02 +04:00
|
|
|
#ifdef CONFIG_LIBISCSI
|
|
|
|
case QEMU_OPTION_iscsi:
|
|
|
|
opts = qemu_opts_parse(qemu_find_opts("iscsi"), optarg, 0);
|
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
2004-08-25 01:57:12 +04:00
|
|
|
#ifdef CONFIG_SLIRP
|
|
|
|
case QEMU_OPTION_tftp:
|
2009-06-24 16:42:28 +04:00
|
|
|
legacy_tftp_prefix = optarg;
|
2004-08-26 02:12:49 +04:00
|
|
|
break;
|
2007-02-20 03:05:08 +03:00
|
|
|
case QEMU_OPTION_bootp:
|
2009-06-24 16:42:28 +04:00
|
|
|
legacy_bootp_filename = optarg;
|
2007-02-20 03:05:08 +03:00
|
|
|
break;
|
2004-08-26 02:12:49 +04:00
|
|
|
case QEMU_OPTION_redir:
|
Don't exit() in config_error()
Propagating errors up the call chain is tedious. In startup code, we
can take a shortcut: terminate the program. This is wrong elsewhere,
the monitor in particular.
config_error() tries to cater for both customers: it terminates the
program unless its mon parameter tells it it's working for the
monitor.
Its users need to return status anyway (unless passing a null mon
argument, which none do), which their users need to check. So this
automatic exit buys us exactly nothing useful. Only the dangerous
delusion that we can get away without returning status. Some of its
users fell for that. Their callers continue executing after failure
when working for the monitor.
This bites monitor command host_net_add in two places:
* net_slirp_init() continues after slirp_hostfwd(), slirp_guestfwd(),
or slirp_smb() failed, and may end up reporting success. This
happens for "host_net_add user guestfwd=foo": it complains about the
invalid guest forwarding rule, then happily creates the user network
without guest forwarding.
* net_client_init() can't detect slirp_guestfwd() failure, and gets
fooled by net_slirp_init() lying about success. Suppresses its
"Could not initialize device" message.
Add the missing error reporting, make sure errors are checked, and
drop the exit() from config_error().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-10-06 15:16:57 +04:00
|
|
|
if (net_slirp_redir(optarg) < 0)
|
|
|
|
exit(1);
|
2004-08-26 02:12:49 +04:00
|
|
|
break;
|
2004-08-25 01:57:12 +04:00
|
|
|
#endif
|
2008-11-09 03:04:26 +03:00
|
|
|
case QEMU_OPTION_bt:
|
2009-07-15 15:59:26 +04:00
|
|
|
add_device_config(DEV_BT, optarg);
|
2008-11-09 03:04:26 +03:00
|
|
|
break;
|
2005-10-30 21:58:22 +03:00
|
|
|
case QEMU_OPTION_audio_help:
|
|
|
|
AUD_help ();
|
|
|
|
exit (0);
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_soundhw:
|
|
|
|
select_soundhw (optarg);
|
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_h:
|
2007-06-30 03:26:08 +04:00
|
|
|
help(0);
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
2009-04-08 02:58:45 +04:00
|
|
|
case QEMU_OPTION_version:
|
|
|
|
version();
|
|
|
|
exit(0);
|
|
|
|
break;
|
2008-04-28 01:12:55 +04:00
|
|
|
case QEMU_OPTION_m: {
|
2011-01-05 13:41:02 +03:00
|
|
|
int64_t value;
|
2012-08-15 15:12:19 +04:00
|
|
|
uint64_t sz;
|
2011-11-22 12:46:03 +04:00
|
|
|
char *end;
|
2010-10-21 19:15:46 +04:00
|
|
|
|
2011-11-22 12:46:03 +04:00
|
|
|
value = strtosz(optarg, &end);
|
|
|
|
if (value < 0 || *end) {
|
2008-04-28 01:12:55 +04:00
|
|
|
fprintf(stderr, "qemu: invalid ram size: %s\n", optarg);
|
2004-05-14 02:02:20 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
2012-08-15 15:12:19 +04:00
|
|
|
sz = QEMU_ALIGN_UP((uint64_t)value, 8192);
|
|
|
|
ram_size = sz;
|
|
|
|
if (ram_size != sz) {
|
2008-04-28 01:12:55 +04:00
|
|
|
fprintf(stderr, "qemu: ram size too large\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
2008-04-28 01:12:55 +04:00
|
|
|
}
|
Support for TPM command line options
This patch adds support for TPM command line options.
The command line options supported here are
./qemu-... -tpmdev passthrough,path=<path to TPM device>,id=<id>
-device tpm-tis,tpmdev=<id>,id=<other id>
and
./qemu-... -tpmdev help
where the latter works similar to -soundhw help and shows a list of
available TPM backends (for example 'passthrough').
Using the type parameter, the backend is chosen, i.e., 'passthrough' for the
passthrough driver. The interpretation of the other parameters along
with determining whether enough parameters were provided is pushed into
the backend driver, which needs to implement the interface function
'create' and return a TPMDriverOpts structure if the VM can be started or
'NULL' if not enough or bad parameters were provided.
Monitor support for 'info tpm' has been added. It for example prints the
following:
(qemu) info tpm
TPM devices:
tpm0: model=tpm-tis
\ tpm0: type=passthrough,path=/dev/tpm0,cancel-path=/sys/devices/pnp0/00:09/cancel
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Joel Schopp <jschopp@linux.vnet.ibm.com>
Message-id: 1361987275-26289-2-git-send-email-stefanb@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-27 21:47:49 +04:00
|
|
|
#ifdef CONFIG_TPM
|
|
|
|
case QEMU_OPTION_tpmdev:
|
|
|
|
if (tpm_config_parse(qemu_find_opts("tpmdev"), optarg) < 0) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
2010-03-02 02:25:08 +03:00
|
|
|
case QEMU_OPTION_mempath:
|
|
|
|
mem_path = optarg;
|
|
|
|
break;
|
|
|
|
#ifdef MAP_POPULATE
|
|
|
|
case QEMU_OPTION_mem_prealloc:
|
|
|
|
mem_prealloc = 1;
|
|
|
|
break;
|
|
|
|
#endif
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_d:
|
2011-06-07 20:32:40 +04:00
|
|
|
log_mask = optarg;
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_D:
|
|
|
|
log_file = optarg;
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
|
|
|
case QEMU_OPTION_s:
|
2012-02-07 18:09:13 +04:00
|
|
|
add_device_config(DEV_GDB, "tcp::" DEFAULT_GDBSTUB_PORT);
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
2009-04-05 22:43:41 +04:00
|
|
|
case QEMU_OPTION_gdb:
|
2012-02-07 18:09:13 +04:00
|
|
|
add_device_config(DEV_GDB, optarg);
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
|
|
|
case QEMU_OPTION_L:
|
2013-03-08 14:42:24 +04:00
|
|
|
if (data_dir_idx < ARRAY_SIZE(data_dir)) {
|
|
|
|
data_dir[data_dir_idx++] = optarg;
|
|
|
|
}
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
2007-10-05 17:08:35 +04:00
|
|
|
case QEMU_OPTION_bios:
|
|
|
|
bios_name = optarg;
|
|
|
|
break;
|
2009-04-06 00:08:59 +04:00
|
|
|
case QEMU_OPTION_singlestep:
|
|
|
|
singlestep = 1;
|
|
|
|
break;
|
2004-05-14 02:02:20 +04:00
|
|
|
case QEMU_OPTION_S:
|
2007-01-21 19:47:01 +03:00
|
|
|
autostart = 0;
|
2004-05-14 02:02:20 +04:00
|
|
|
break;
|
2004-12-12 19:56:30 +03:00
|
|
|
case QEMU_OPTION_k:
|
|
|
|
keyboard_layout = optarg;
|
|
|
|
break;
|
2004-06-03 16:49:50 +04:00
|
|
|
case QEMU_OPTION_localtime:
|
|
|
|
rtc_utc = 0;
|
|
|
|
break;
|
2008-09-28 04:42:05 +04:00
|
|
|
case QEMU_OPTION_vga:
|
2011-09-27 23:15:42 +04:00
|
|
|
vga_model = optarg;
|
2012-05-10 11:39:17 +04:00
|
|
|
default_vga = 0;
|
2004-07-09 01:17:50 +04:00
|
|
|
break;
|
2004-06-21 20:46:10 +04:00
|
|
|
case QEMU_OPTION_g:
|
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
int w, h, depth;
|
|
|
|
p = optarg;
|
|
|
|
w = strtol(p, (char **)&p, 10);
|
|
|
|
if (w <= 0) {
|
|
|
|
graphic_error:
|
|
|
|
fprintf(stderr, "qemu: invalid resolution or depth\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (*p != 'x')
|
|
|
|
goto graphic_error;
|
|
|
|
p++;
|
|
|
|
h = strtol(p, (char **)&p, 10);
|
|
|
|
if (h <= 0)
|
|
|
|
goto graphic_error;
|
|
|
|
if (*p == 'x') {
|
|
|
|
p++;
|
|
|
|
depth = strtol(p, (char **)&p, 10);
|
2007-09-17 01:08:06 +04:00
|
|
|
if (depth != 8 && depth != 15 && depth != 16 &&
|
2004-06-21 20:46:10 +04:00
|
|
|
depth != 24 && depth != 32)
|
|
|
|
goto graphic_error;
|
|
|
|
} else if (*p == '\0') {
|
|
|
|
depth = graphic_depth;
|
|
|
|
} else {
|
|
|
|
goto graphic_error;
|
|
|
|
}
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2004-06-21 20:46:10 +04:00
|
|
|
graphic_width = w;
|
|
|
|
graphic_height = h;
|
|
|
|
graphic_depth = depth;
|
|
|
|
}
|
|
|
|
break;
|
2007-02-18 20:04:49 +03:00
|
|
|
case QEMU_OPTION_echr:
|
|
|
|
{
|
|
|
|
char *r;
|
|
|
|
term_escape_char = strtol(optarg, &r, 0);
|
|
|
|
if (r == optarg)
|
|
|
|
printf("Bad argument to echr\n");
|
|
|
|
break;
|
|
|
|
}
|
2004-07-14 21:28:13 +04:00
|
|
|
case QEMU_OPTION_monitor:
|
2009-12-08 15:11:52 +03:00
|
|
|
default_monitor = 0;
|
2013-05-16 20:02:55 +04:00
|
|
|
if (strncmp(optarg, "none", 4)) {
|
|
|
|
monitor_parse(optarg, "readline");
|
|
|
|
}
|
2009-12-08 15:11:52 +03:00
|
|
|
break;
|
|
|
|
case QEMU_OPTION_qmp:
|
|
|
|
monitor_parse(optarg, "control");
|
2010-03-21 22:14:38 +03:00
|
|
|
default_monitor = 0;
|
2004-07-14 21:28:13 +04:00
|
|
|
break;
|
2009-12-08 15:11:51 +03:00
|
|
|
case QEMU_OPTION_mon:
|
2010-08-20 15:52:01 +04:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("mon"), optarg, 1);
|
2009-12-08 15:11:51 +03:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2010-03-21 22:14:38 +03:00
|
|
|
default_monitor = 0;
|
2009-12-08 15:11:51 +03:00
|
|
|
break;
|
2009-09-10 12:58:35 +04:00
|
|
|
case QEMU_OPTION_chardev:
|
2010-08-20 15:52:01 +04:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("chardev"), optarg, 1);
|
2009-09-10 12:58:35 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
2010-04-29 16:14:43 +04:00
|
|
|
case QEMU_OPTION_fsdev:
|
2010-08-20 15:52:02 +04:00
|
|
|
olist = qemu_find_opts("fsdev");
|
|
|
|
if (!olist) {
|
|
|
|
fprintf(stderr, "fsdev is not supported by this qemu build.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
opts = qemu_opts_parse(olist, optarg, 1);
|
2010-04-29 16:14:43 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
Currently the commandline to create a virtual-filesystem pass-through between
the guest and the host is as follows:
#qemu -fsdev fstype,id=ID,path=path/to/share \
-device virtio-9p-pci,fsdev=ID,mount_tag=tag \
This patch provides a syntactic short-cut to achieve the same as follows:
#qemu -virtfs fstype,path=path/to/share,mount_tag=tag
This will be internally expanded as:
#qemu -fsdev fstype,id=tag,path=path/to/share, \
-device virtio-9p-pci,fsdev=tag,mount_tag=tag \
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-04-29 16:15:03 +04:00
|
|
|
case QEMU_OPTION_virtfs: {
|
2011-03-16 11:31:43 +03:00
|
|
|
QemuOpts *fsdev;
|
|
|
|
QemuOpts *device;
|
2011-12-14 12:28:47 +04:00
|
|
|
const char *writeout, *sock_fd, *socket;
|
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
Currently the commandline to create a virtual-filesystem pass-through between
the guest and the host is as follows:
#qemu -fsdev fstype,id=ID,path=path/to/share \
-device virtio-9p-pci,fsdev=ID,mount_tag=tag \
This patch provides a syntactic short-cut to achieve the same as follows:
#qemu -virtfs fstype,path=path/to/share,mount_tag=tag
This will be internally expanded as:
#qemu -fsdev fstype,id=tag,path=path/to/share, \
-device virtio-9p-pci,fsdev=tag,mount_tag=tag \
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-04-29 16:15:03 +04:00
|
|
|
|
2010-08-20 15:52:02 +04:00
|
|
|
olist = qemu_find_opts("virtfs");
|
|
|
|
if (!olist) {
|
|
|
|
fprintf(stderr, "virtfs is not supported by this qemu build.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
opts = qemu_opts_parse(olist, optarg, 1);
|
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
Currently the commandline to create a virtual-filesystem pass-through between
the guest and the host is as follows:
#qemu -fsdev fstype,id=ID,path=path/to/share \
-device virtio-9p-pci,fsdev=ID,mount_tag=tag \
This patch provides a syntactic short-cut to achieve the same as follows:
#qemu -virtfs fstype,path=path/to/share,mount_tag=tag
This will be internally expanded as:
#qemu -fsdev fstype,id=tag,path=path/to/share, \
-device virtio-9p-pci,fsdev=tag,mount_tag=tag \
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-04-29 16:15:03 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2011-10-13 10:58:04 +04:00
|
|
|
if (qemu_opt_get(opts, "fsdriver") == NULL ||
|
2011-12-14 12:18:59 +04:00
|
|
|
qemu_opt_get(opts, "mount_tag") == NULL) {
|
|
|
|
fprintf(stderr, "Usage: -virtfs fsdriver,mount_tag=tag.\n");
|
2010-06-15 00:34:40 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
2011-03-16 11:31:43 +03:00
|
|
|
fsdev = qemu_opts_create(qemu_find_opts("fsdev"),
|
2012-03-20 22:51:57 +04:00
|
|
|
qemu_opt_get(opts, "mount_tag"),
|
|
|
|
1, NULL);
|
2011-03-16 11:31:43 +03:00
|
|
|
if (!fsdev) {
|
|
|
|
fprintf(stderr, "duplicate fsdev id: %s\n",
|
|
|
|
qemu_opt_get(opts, "mount_tag"));
|
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
Currently the commandline to create a virtual-filesystem pass-through between
the guest and the host is as follows:
#qemu -fsdev fstype,id=ID,path=path/to/share \
-device virtio-9p-pci,fsdev=ID,mount_tag=tag \
This patch provides a syntactic short-cut to achieve the same as follows:
#qemu -virtfs fstype,path=path/to/share,mount_tag=tag
This will be internally expanded as:
#qemu -fsdev fstype,id=tag,path=path/to/share, \
-device virtio-9p-pci,fsdev=tag,mount_tag=tag \
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-04-29 16:15:03 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
2011-10-12 17:41:23 +04:00
|
|
|
|
|
|
|
writeout = qemu_opt_get(opts, "writeout");
|
|
|
|
if (writeout) {
|
|
|
|
#ifdef CONFIG_SYNC_FILE_RANGE
|
|
|
|
qemu_opt_set(fsdev, "writeout", writeout);
|
|
|
|
#else
|
|
|
|
fprintf(stderr, "writeout=immediate not supported on "
|
|
|
|
"this platform\n");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
|
|
|
}
|
2011-10-13 10:58:04 +04:00
|
|
|
qemu_opt_set(fsdev, "fsdriver", qemu_opt_get(opts, "fsdriver"));
|
2011-03-16 11:31:43 +03:00
|
|
|
qemu_opt_set(fsdev, "path", qemu_opt_get(opts, "path"));
|
|
|
|
qemu_opt_set(fsdev, "security_model",
|
|
|
|
qemu_opt_get(opts, "security_model"));
|
2011-12-14 12:28:47 +04:00
|
|
|
socket = qemu_opt_get(opts, "socket");
|
|
|
|
if (socket) {
|
|
|
|
qemu_opt_set(fsdev, "socket", socket);
|
|
|
|
}
|
2011-12-14 12:19:28 +04:00
|
|
|
sock_fd = qemu_opt_get(opts, "sock_fd");
|
|
|
|
if (sock_fd) {
|
|
|
|
qemu_opt_set(fsdev, "sock_fd", sock_fd);
|
|
|
|
}
|
2011-03-16 11:31:43 +03:00
|
|
|
|
2011-10-25 10:40:39 +04:00
|
|
|
qemu_opt_set_bool(fsdev, "readonly",
|
|
|
|
qemu_opt_get_bool(opts, "readonly", 0));
|
2012-12-06 10:47:22 +04:00
|
|
|
device = qemu_opts_create_nofail(qemu_find_opts("device"));
|
2011-03-16 11:31:43 +03:00
|
|
|
qemu_opt_set(device, "driver", "virtio-9p-pci");
|
|
|
|
qemu_opt_set(device, "fsdev",
|
|
|
|
qemu_opt_get(opts, "mount_tag"));
|
|
|
|
qemu_opt_set(device, "mount_tag",
|
|
|
|
qemu_opt_get(opts, "mount_tag"));
|
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
Currently the commandline to create a virtual-filesystem pass-through between
the guest and the host is as follows:
#qemu -fsdev fstype,id=ID,path=path/to/share \
-device virtio-9p-pci,fsdev=ID,mount_tag=tag \
This patch provides a syntactic short-cut to achieve the same as follows:
#qemu -virtfs fstype,path=path/to/share,mount_tag=tag
This will be internally expanded as:
#qemu -fsdev fstype,id=tag,path=path/to/share, \
-device virtio-9p-pci,fsdev=tag,mount_tag=tag \
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-04-29 16:15:03 +04:00
|
|
|
break;
|
|
|
|
}
|
2011-10-25 10:40:40 +04:00
|
|
|
case QEMU_OPTION_virtfs_synth: {
|
|
|
|
QemuOpts *fsdev;
|
|
|
|
QemuOpts *device;
|
|
|
|
|
2012-03-20 22:51:57 +04:00
|
|
|
fsdev = qemu_opts_create(qemu_find_opts("fsdev"), "v_synth",
|
|
|
|
1, NULL);
|
2011-10-25 10:40:40 +04:00
|
|
|
if (!fsdev) {
|
|
|
|
fprintf(stderr, "duplicate option: %s\n", "virtfs_synth");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
qemu_opt_set(fsdev, "fsdriver", "synth");
|
|
|
|
|
2012-12-06 10:47:22 +04:00
|
|
|
device = qemu_opts_create_nofail(qemu_find_opts("device"));
|
2011-10-25 10:40:40 +04:00
|
|
|
qemu_opt_set(device, "driver", "virtio-9p-pci");
|
|
|
|
qemu_opt_set(device, "fsdev", "v_synth");
|
|
|
|
qemu_opt_set(device, "mount_tag", "v_synth");
|
|
|
|
break;
|
|
|
|
}
|
2004-07-14 21:28:13 +04:00
|
|
|
case QEMU_OPTION_serial:
|
2009-12-08 15:11:41 +03:00
|
|
|
add_device_config(DEV_SERIAL, optarg);
|
|
|
|
default_serial = 0;
|
2010-03-07 13:28:40 +03:00
|
|
|
if (strncmp(optarg, "mon:", 4) == 0) {
|
|
|
|
default_monitor = 0;
|
|
|
|
}
|
2004-07-14 21:28:13 +04:00
|
|
|
break;
|
2009-04-25 16:56:19 +04:00
|
|
|
case QEMU_OPTION_watchdog:
|
2009-08-21 12:31:34 +04:00
|
|
|
if (watchdog) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"qemu: only one watchdog option may be given\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
watchdog = optarg;
|
2009-04-25 16:56:19 +04:00
|
|
|
break;
|
|
|
|
case QEMU_OPTION_watchdog_action:
|
|
|
|
if (select_watchdog_action(optarg) == -1) {
|
|
|
|
fprintf(stderr, "Unknown -watchdog-action parameter\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
2009-01-15 23:06:40 +03:00
|
|
|
case QEMU_OPTION_virtiocon:
|
2009-12-08 15:11:53 +03:00
|
|
|
add_device_config(DEV_VIRTCON, optarg);
|
|
|
|
default_virtcon = 0;
|
2010-03-07 13:28:40 +03:00
|
|
|
if (strncmp(optarg, "mon:", 4) == 0) {
|
|
|
|
default_monitor = 0;
|
|
|
|
}
|
2009-01-15 23:06:40 +03:00
|
|
|
break;
|
2005-01-15 15:02:56 +03:00
|
|
|
case QEMU_OPTION_parallel:
|
2009-12-08 15:11:42 +03:00
|
|
|
add_device_config(DEV_PARALLEL, optarg);
|
|
|
|
default_parallel = 0;
|
2010-03-07 13:28:40 +03:00
|
|
|
if (strncmp(optarg, "mon:", 4) == 0) {
|
|
|
|
default_monitor = 0;
|
|
|
|
}
|
2005-01-15 15:02:56 +03:00
|
|
|
break;
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
case QEMU_OPTION_debugcon:
|
|
|
|
add_device_config(DEV_DEBUGCON, optarg);
|
|
|
|
break;
|
2004-10-03 17:29:03 +04:00
|
|
|
case QEMU_OPTION_loadvm:
|
|
|
|
loadvm = optarg;
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_full_screen:
|
|
|
|
full_screen = 1;
|
|
|
|
break;
|
2007-02-18 21:19:32 +03:00
|
|
|
case QEMU_OPTION_no_frame:
|
|
|
|
no_frame = 1;
|
|
|
|
break;
|
2007-06-22 01:08:02 +04:00
|
|
|
case QEMU_OPTION_alt_grab:
|
|
|
|
alt_grab = 1;
|
|
|
|
break;
|
2009-09-18 00:48:04 +04:00
|
|
|
case QEMU_OPTION_ctrl_grab:
|
|
|
|
ctrl_grab = 1;
|
|
|
|
break;
|
2006-12-11 05:08:05 +03:00
|
|
|
case QEMU_OPTION_no_quit:
|
|
|
|
no_quit = 1;
|
|
|
|
break;
|
2013-06-11 12:55:08 +04:00
|
|
|
#ifdef CONFIG_SDL
|
2009-01-16 01:14:11 +03:00
|
|
|
case QEMU_OPTION_sdl:
|
2009-05-22 01:54:00 +04:00
|
|
|
display_type = DT_SDL;
|
2009-01-16 01:14:11 +03:00
|
|
|
break;
|
2011-03-16 15:33:34 +03:00
|
|
|
#else
|
|
|
|
case QEMU_OPTION_sdl:
|
|
|
|
fprintf(stderr, "SDL support is disabled\n");
|
|
|
|
exit(1);
|
2006-12-11 05:08:05 +03:00
|
|
|
#endif
|
2004-12-09 01:21:25 +03:00
|
|
|
case QEMU_OPTION_pidfile:
|
2007-03-19 18:58:31 +03:00
|
|
|
pid_file = optarg;
|
2004-12-09 01:21:25 +03:00
|
|
|
break;
|
2005-04-30 20:10:35 +04:00
|
|
|
case QEMU_OPTION_win2k_hack:
|
|
|
|
win2k_install_hack = 1;
|
|
|
|
break;
|
2012-01-23 23:15:12 +04:00
|
|
|
case QEMU_OPTION_rtc_td_hack: {
|
|
|
|
static GlobalProperty slew_lost_ticks[] = {
|
|
|
|
{
|
|
|
|
.driver = "mc146818rtc",
|
|
|
|
.property = "lost_tick_policy",
|
|
|
|
.value = "slew",
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
};
|
|
|
|
|
|
|
|
qdev_prop_register_global_list(slew_lost_ticks);
|
2009-01-15 23:11:34 +03:00
|
|
|
break;
|
2012-01-23 23:15:12 +04:00
|
|
|
}
|
2009-02-27 23:12:36 +03:00
|
|
|
case QEMU_OPTION_acpitable:
|
2013-03-21 03:23:17 +04:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("acpi"), optarg, 1);
|
|
|
|
g_assert(opts != NULL);
|
|
|
|
do_acpitable_option(opts);
|
2009-02-27 23:12:36 +03:00
|
|
|
break;
|
qemu: Add support for SMBIOS command line otions (Alex Williamson)
Create a new -smbios option (x86-only) to allow binary SMBIOS entries
to be passed through to the BIOS or modify the default values of
individual fields of type 0 and 1 entries on the command line.
Binary SMBIOS entries can be generated as follows:
dmidecode -t 1 -u | grep $'^\t\t[^"]' | xargs -n1 | \
perl -lne 'printf "%c", hex($_)' > smbios_type_1.bin
These can then be passed to the BIOS using this switch:
-smbios file=smbios_type_1.bin
Command line generation supports the following syntax:
-smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d]
-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]
[,uuid=$(uuidgen)][,sku=str][,family=str]
For instance, to add a serial number to the type 1 table:
-smbios type=1,serial=0123456789
Interface is extensible to support more fields/tables as needed.
aliguori: remove texi formatting from help output
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7163 c046a42c-6fe2-441c-8c8c-71466251a162
2009-04-17 22:59:56 +04:00
|
|
|
case QEMU_OPTION_smbios:
|
2010-03-29 23:23:50 +04:00
|
|
|
do_smbios_option(optarg);
|
qemu: Add support for SMBIOS command line otions (Alex Williamson)
Create a new -smbios option (x86-only) to allow binary SMBIOS entries
to be passed through to the BIOS or modify the default values of
individual fields of type 0 and 1 entries on the command line.
Binary SMBIOS entries can be generated as follows:
dmidecode -t 1 -u | grep $'^\t\t[^"]' | xargs -n1 | \
perl -lne 'printf "%c", hex($_)' > smbios_type_1.bin
These can then be passed to the BIOS using this switch:
-smbios file=smbios_type_1.bin
Command line generation supports the following syntax:
-smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d]
-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]
[,uuid=$(uuidgen)][,sku=str][,family=str]
For instance, to add a serial number to the type 1 table:
-smbios type=1,serial=0123456789
Interface is extensible to support more fields/tables as needed.
aliguori: remove texi formatting from help output
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7163 c046a42c-6fe2-441c-8c8c-71466251a162
2009-04-17 22:59:56 +04:00
|
|
|
break;
|
2008-11-05 19:04:33 +03:00
|
|
|
case QEMU_OPTION_enable_kvm:
|
2010-09-21 23:05:31 +04:00
|
|
|
olist = qemu_find_opts("machine");
|
|
|
|
qemu_opts_parse(olist, "accel=kvm", 0);
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_machine:
|
|
|
|
olist = qemu_find_opts("machine");
|
2011-07-23 14:38:37 +04:00
|
|
|
opts = qemu_opts_parse(olist, optarg, 1);
|
2010-09-21 23:05:31 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2011-07-25 20:11:20 +04:00
|
|
|
optarg = qemu_opt_get(opts, "type");
|
|
|
|
if (optarg) {
|
|
|
|
machine = machine_parse(optarg);
|
|
|
|
}
|
2008-11-05 19:04:33 +03:00
|
|
|
break;
|
2012-10-05 21:51:45 +04:00
|
|
|
case QEMU_OPTION_no_kvm:
|
|
|
|
olist = qemu_find_opts("machine");
|
|
|
|
qemu_opts_parse(olist, "accel=tcg", 0);
|
|
|
|
break;
|
2012-10-05 21:51:41 +04:00
|
|
|
case QEMU_OPTION_no_kvm_pit: {
|
|
|
|
fprintf(stderr, "Warning: KVM PIT can no longer be disabled "
|
|
|
|
"separately.\n");
|
|
|
|
break;
|
|
|
|
}
|
2012-10-05 21:51:42 +04:00
|
|
|
case QEMU_OPTION_no_kvm_pit_reinjection: {
|
|
|
|
static GlobalProperty kvm_pit_lost_tick_policy[] = {
|
|
|
|
{
|
|
|
|
.driver = "kvm-pit",
|
|
|
|
.property = "lost_tick_policy",
|
|
|
|
.value = "discard",
|
|
|
|
},
|
|
|
|
{ /* end of list */ }
|
|
|
|
};
|
|
|
|
|
|
|
|
fprintf(stderr, "Warning: option deprecated, use "
|
|
|
|
"lost_tick_policy property of kvm-pit instead.\n");
|
|
|
|
qdev_prop_register_global_list(kvm_pit_lost_tick_policy);
|
|
|
|
break;
|
|
|
|
}
|
2005-11-05 17:22:28 +03:00
|
|
|
case QEMU_OPTION_usb:
|
2012-11-22 20:48:45 +04:00
|
|
|
olist = qemu_find_opts("machine");
|
|
|
|
qemu_opts_parse(olist, "usb=on", 0);
|
2005-11-05 17:22:28 +03:00
|
|
|
break;
|
2005-11-06 19:13:29 +03:00
|
|
|
case QEMU_OPTION_usbdevice:
|
2012-11-22 20:48:45 +04:00
|
|
|
olist = qemu_find_opts("machine");
|
|
|
|
qemu_opts_parse(olist, "usb=on", 0);
|
2009-07-15 15:59:26 +04:00
|
|
|
add_device_config(DEV_USB, optarg);
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_device:
|
2010-08-20 15:52:01 +04:00
|
|
|
if (!qemu_opts_parse(qemu_find_opts("device"), optarg, 1)) {
|
2009-07-31 14:25:37 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
2005-11-06 19:13:29 +03:00
|
|
|
break;
|
2005-11-22 02:25:50 +03:00
|
|
|
case QEMU_OPTION_smp:
|
extend -smp parsing to include cores= and threads= options
For injecting multi-core and multi-threading CPU topology into guests
extend the -smp syntax to accommodate cores and threads specification.
Syntax: -smp smp_value[,cores=nr_cores][,threads=nr_threads]\
[,socket=nr_sockets][,maxcpus=max_cpus]
smp_value is the legacy value specifying the total number of vCPUs for
the guest. If you specify one of cores, threads or sockets this value
can be omitted. Missing values will be computed to fulfill:
smp_value = nr_cores * nr_threads * nr_sockets
where it will favour sockets over cores over threads (to mimic the
current behavior, which will only inject multiple sockets.)
So -smp 4,threads=2 will inject two sockets with 2 threads each,
-smp cores=4 is an abbreviation for -smp 4,cores=4,threads=1,sockets=1.
If max_cpus (the number of hotpluggable CPUs) is omitted, it will
be set to smp_value.
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-08-19 17:42:40 +04:00
|
|
|
smp_parse(optarg);
|
2008-10-08 00:39:39 +04:00
|
|
|
if (smp_cpus < 1) {
|
2005-11-22 02:25:50 +03:00
|
|
|
fprintf(stderr, "Invalid number of CPUs\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-07-23 19:03:42 +04:00
|
|
|
if (max_cpus < smp_cpus) {
|
|
|
|
fprintf(stderr, "maxcpus must be equal to or greater than "
|
|
|
|
"smp\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (max_cpus > 255) {
|
|
|
|
fprintf(stderr, "Unsupported number of maxcpus\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2005-11-22 02:25:50 +03:00
|
|
|
break;
|
2006-05-01 01:28:36 +04:00
|
|
|
case QEMU_OPTION_vnc:
|
2011-03-16 15:33:36 +03:00
|
|
|
#ifdef CONFIG_VNC
|
2010-08-25 12:51:06 +04:00
|
|
|
display_remote++;
|
2011-03-16 15:33:36 +03:00
|
|
|
vnc_display = optarg;
|
|
|
|
#else
|
|
|
|
fprintf(stderr, "VNC support is disabled\n");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
|
|
|
break;
|
2006-05-04 02:02:44 +04:00
|
|
|
case QEMU_OPTION_no_acpi:
|
|
|
|
acpi_enabled = 0;
|
|
|
|
break;
|
2008-12-18 02:28:44 +03:00
|
|
|
case QEMU_OPTION_no_hpet:
|
|
|
|
no_hpet = 1;
|
|
|
|
break;
|
2009-06-26 21:15:14 +04:00
|
|
|
case QEMU_OPTION_balloon:
|
|
|
|
if (balloon_parse(optarg) < 0) {
|
|
|
|
fprintf(stderr, "Unknown -balloon argument %s\n", optarg);
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-06-10 23:34:08 +04:00
|
|
|
break;
|
2006-10-02 23:44:22 +04:00
|
|
|
case QEMU_OPTION_no_reboot:
|
|
|
|
no_reboot = 1;
|
|
|
|
break;
|
2008-04-12 01:35:52 +04:00
|
|
|
case QEMU_OPTION_no_shutdown:
|
|
|
|
no_shutdown = 1;
|
|
|
|
break;
|
2007-05-01 05:34:14 +04:00
|
|
|
case QEMU_OPTION_show_cursor:
|
|
|
|
cursor_hide = 0;
|
|
|
|
break;
|
2008-09-18 22:29:08 +04:00
|
|
|
case QEMU_OPTION_uuid:
|
|
|
|
if(qemu_uuid_parse(optarg, qemu_uuid) < 0) {
|
|
|
|
fprintf(stderr, "Fail to parse UUID string."
|
|
|
|
" Wrong format.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
2007-01-05 20:39:04 +03:00
|
|
|
case QEMU_OPTION_option_rom:
|
|
|
|
if (nb_option_roms >= MAX_OPTION_ROMS) {
|
|
|
|
fprintf(stderr, "Too many option ROMs\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2010-12-08 14:35:07 +03:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("option-rom"), optarg, 1);
|
2013-02-09 00:22:19 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2010-12-08 14:35:07 +03:00
|
|
|
option_rom[nb_option_roms].name = qemu_opt_get(opts, "romfile");
|
|
|
|
option_rom[nb_option_roms].bootindex =
|
|
|
|
qemu_opt_get_number(opts, "bootindex", -1);
|
|
|
|
if (!option_rom[nb_option_roms].name) {
|
|
|
|
fprintf(stderr, "Option ROM file is not specified\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2007-01-05 20:39:04 +03:00
|
|
|
nb_option_roms++;
|
|
|
|
break;
|
2007-01-20 20:12:09 +03:00
|
|
|
case QEMU_OPTION_semihosting:
|
|
|
|
semihosting_enabled = 1;
|
|
|
|
break;
|
2012-10-05 21:51:44 +04:00
|
|
|
case QEMU_OPTION_tdf:
|
|
|
|
fprintf(stderr, "Warning: user space PIT time drift fix "
|
|
|
|
"is no longer supported.\n");
|
|
|
|
break;
|
2007-03-19 18:17:08 +03:00
|
|
|
case QEMU_OPTION_name:
|
2011-08-21 07:09:37 +04:00
|
|
|
qemu_name = g_strdup(optarg);
|
2009-07-02 11:34:17 +04:00
|
|
|
{
|
|
|
|
char *p = strchr(qemu_name, ',');
|
|
|
|
if (p != NULL) {
|
|
|
|
*p++ = 0;
|
|
|
|
if (strncmp(p, "process=", 8)) {
|
2010-12-27 20:29:20 +03:00
|
|
|
fprintf(stderr, "Unknown subargument %s to -name\n", p);
|
2009-07-02 11:34:17 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
p += 8;
|
2010-06-10 13:42:31 +04:00
|
|
|
os_set_proc_name(p);
|
2013-03-21 03:23:13 +04:00
|
|
|
}
|
|
|
|
}
|
2007-03-19 18:17:08 +03:00
|
|
|
break;
|
2007-05-01 18:16:52 +04:00
|
|
|
case QEMU_OPTION_prom_env:
|
|
|
|
if (nb_prom_envs >= MAX_PROM_ENVS) {
|
|
|
|
fprintf(stderr, "Too many prom variables\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
prom_envs[nb_prom_envs] = optarg;
|
|
|
|
nb_prom_envs++;
|
|
|
|
break;
|
2007-07-28 02:08:46 +04:00
|
|
|
case QEMU_OPTION_old_param:
|
|
|
|
old_param = 1;
|
2008-01-08 22:32:16 +03:00
|
|
|
break;
|
2007-08-24 05:26:02 +04:00
|
|
|
case QEMU_OPTION_clock:
|
|
|
|
configure_alarms(optarg);
|
|
|
|
break;
|
2007-11-07 19:24:33 +03:00
|
|
|
case QEMU_OPTION_startdate:
|
2009-09-15 15:36:04 +04:00
|
|
|
configure_rtc_date_offset(optarg, 1);
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_rtc:
|
2010-08-20 15:52:01 +04:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("rtc"), optarg, 0);
|
2009-09-15 15:36:04 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
2007-11-07 19:24:33 +03:00
|
|
|
}
|
2009-09-15 15:36:04 +04:00
|
|
|
configure_rtc(opts);
|
2007-11-07 19:24:33 +03:00
|
|
|
break;
|
2008-05-28 16:30:31 +04:00
|
|
|
case QEMU_OPTION_tb_size:
|
2011-08-02 18:10:21 +04:00
|
|
|
tcg_tb_size = strtol(optarg, NULL, 0);
|
|
|
|
if (tcg_tb_size < 0) {
|
|
|
|
tcg_tb_size = 0;
|
|
|
|
}
|
2008-05-28 16:30:31 +04:00
|
|
|
break;
|
2008-06-29 05:03:05 +04:00
|
|
|
case QEMU_OPTION_icount:
|
2010-03-10 13:38:48 +03:00
|
|
|
icount_option = optarg;
|
2008-06-29 05:03:05 +04:00
|
|
|
break;
|
2008-10-13 07:12:02 +04:00
|
|
|
case QEMU_OPTION_incoming:
|
|
|
|
incoming = optarg;
|
2012-01-18 16:23:13 +04:00
|
|
|
runstate_set(RUN_STATE_INMIGRATE);
|
2008-10-13 07:12:02 +04:00
|
|
|
break;
|
2009-12-08 15:11:46 +03:00
|
|
|
case QEMU_OPTION_nodefaults:
|
|
|
|
default_serial = 0;
|
|
|
|
default_parallel = 0;
|
2009-12-08 15:11:53 +03:00
|
|
|
default_virtcon = 0;
|
2013-01-25 10:00:19 +04:00
|
|
|
default_sclp = 0;
|
2009-12-08 15:11:46 +03:00
|
|
|
default_monitor = 0;
|
2009-12-08 15:11:47 +03:00
|
|
|
default_net = 0;
|
2009-12-16 16:25:39 +03:00
|
|
|
default_floppy = 0;
|
|
|
|
default_cdrom = 0;
|
|
|
|
default_sdcard = 0;
|
2012-05-10 11:39:17 +04:00
|
|
|
default_vga = 0;
|
2009-12-08 15:11:46 +03:00
|
|
|
break;
|
2009-04-22 19:19:10 +04:00
|
|
|
case QEMU_OPTION_xen_domid:
|
2010-03-29 23:23:52 +04:00
|
|
|
if (!(xen_available())) {
|
|
|
|
printf("Option %s not supported for this target\n", popt->name);
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-04-22 19:19:10 +04:00
|
|
|
xen_domid = atoi(optarg);
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_xen_create:
|
2010-03-29 23:23:52 +04:00
|
|
|
if (!(xen_available())) {
|
|
|
|
printf("Option %s not supported for this target\n", popt->name);
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-04-22 19:19:10 +04:00
|
|
|
xen_mode = XEN_CREATE;
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_xen_attach:
|
2010-03-29 23:23:52 +04:00
|
|
|
if (!(xen_available())) {
|
|
|
|
printf("Option %s not supported for this target\n", popt->name);
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-04-22 19:19:10 +04:00
|
|
|
xen_mode = XEN_ATTACH;
|
|
|
|
break;
|
2010-08-09 14:48:32 +04:00
|
|
|
case QEMU_OPTION_trace:
|
2011-08-31 22:31:03 +04:00
|
|
|
{
|
2010-08-09 14:48:32 +04:00
|
|
|
opts = qemu_opts_parse(qemu_find_opts("trace"), optarg, 0);
|
2011-08-31 22:31:03 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
2010-08-09 14:48:32 +04:00
|
|
|
}
|
2011-08-31 22:31:31 +04:00
|
|
|
trace_events = qemu_opt_get(opts, "events");
|
2011-08-31 22:31:03 +04:00
|
|
|
trace_file = qemu_opt_get(opts, "file");
|
2010-08-09 14:48:32 +04:00
|
|
|
break;
|
2011-08-31 22:31:03 +04:00
|
|
|
}
|
2009-10-14 12:39:28 +04:00
|
|
|
case QEMU_OPTION_readconfig:
|
|
|
|
{
|
2010-03-05 19:25:55 +03:00
|
|
|
int ret = qemu_read_config_file(optarg);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "read config %s: %s\n", optarg,
|
|
|
|
strerror(-ret));
|
2009-10-14 12:39:28 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2010-03-11 17:13:27 +03:00
|
|
|
case QEMU_OPTION_spice:
|
|
|
|
olist = qemu_find_opts("spice");
|
|
|
|
if (!olist) {
|
|
|
|
fprintf(stderr, "spice is not supported by this qemu build.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
opts = qemu_opts_parse(olist, optarg, 0);
|
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2013-02-25 19:02:30 +04:00
|
|
|
display_remote++;
|
2010-03-11 17:13:27 +03:00
|
|
|
break;
|
2009-10-14 12:39:28 +04:00
|
|
|
case QEMU_OPTION_writeconfig:
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
if (strcmp(optarg, "-") == 0) {
|
|
|
|
fp = stdout;
|
|
|
|
} else {
|
|
|
|
fp = fopen(optarg, "w");
|
|
|
|
if (fp == NULL) {
|
|
|
|
fprintf(stderr, "open %s: %s\n", optarg, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
qemu_config_write(fp);
|
|
|
|
fclose(fp);
|
|
|
|
break;
|
|
|
|
}
|
2012-03-28 17:42:02 +04:00
|
|
|
case QEMU_OPTION_qtest:
|
|
|
|
qtest_chrdev = optarg;
|
|
|
|
break;
|
|
|
|
case QEMU_OPTION_qtest_log:
|
|
|
|
qtest_log = optarg;
|
|
|
|
break;
|
2012-08-15 01:44:08 +04:00
|
|
|
case QEMU_OPTION_sandbox:
|
|
|
|
opts = qemu_opts_parse(qemu_find_opts("sandbox"), optarg, 1);
|
|
|
|
if (!opts) {
|
2013-02-09 00:22:19 +04:00
|
|
|
exit(1);
|
2012-08-15 01:44:08 +04:00
|
|
|
}
|
|
|
|
break;
|
2012-10-18 23:19:34 +04:00
|
|
|
case QEMU_OPTION_add_fd:
|
|
|
|
#ifndef _WIN32
|
|
|
|
opts = qemu_opts_parse(qemu_find_opts("add-fd"), optarg, 0);
|
|
|
|
if (!opts) {
|
2013-02-09 00:22:19 +04:00
|
|
|
exit(1);
|
2012-10-18 23:19:34 +04:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
error_report("File descriptor passing is disabled on this "
|
|
|
|
"platform");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
|
|
|
break;
|
2012-06-25 23:36:33 +04:00
|
|
|
case QEMU_OPTION_object:
|
|
|
|
opts = qemu_opts_parse(qemu_find_opts("object"), optarg, 1);
|
2013-02-09 00:22:19 +04:00
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2012-06-25 23:36:33 +04:00
|
|
|
break;
|
2013-04-19 18:42:06 +04:00
|
|
|
case QEMU_OPTION_realtime:
|
|
|
|
opts = qemu_opts_parse(qemu_find_opts("realtime"), optarg, 0);
|
|
|
|
if (!opts) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
configure_realtime(opts);
|
|
|
|
break;
|
2010-06-10 13:42:25 +04:00
|
|
|
default:
|
|
|
|
os_parse_cmd_args(popt->index, optarg);
|
2004-05-14 02:02:20 +04:00
|
|
|
}
|
2003-06-24 17:42:40 +04:00
|
|
|
}
|
|
|
|
}
|
2010-02-18 22:13:51 +03:00
|
|
|
loc_set_none();
|
2011-06-07 20:32:40 +04:00
|
|
|
|
2012-10-30 03:17:12 +04:00
|
|
|
if (qemu_init_main_loop()) {
|
|
|
|
fprintf(stderr, "qemu_init_main_loop failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-08-15 01:44:08 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("sandbox"), parse_sandbox, NULL, 0)) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-10-18 23:19:34 +04:00
|
|
|
#ifndef _WIN32
|
|
|
|
if (qemu_opts_foreach(qemu_find_opts("add-fd"), parse_add_fd, NULL, 1)) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (qemu_opts_foreach(qemu_find_opts("add-fd"), cleanup_add_fd, NULL, 1)) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-07-23 20:42:20 +04:00
|
|
|
if (machine == NULL) {
|
|
|
|
fprintf(stderr, "No machine found.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-05-30 07:35:51 +04:00
|
|
|
if (machine->hw_version) {
|
|
|
|
qemu_set_version(machine->hw_version);
|
|
|
|
}
|
|
|
|
|
2012-06-25 23:36:33 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("object"),
|
|
|
|
object_create, NULL, 0) != 0) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-03-09 23:19:07 +04:00
|
|
|
/* Init CPU def lists, based on config
|
|
|
|
* - Must be called after all the qemu_read_config_file() calls
|
|
|
|
* - Must be called before list_cpus()
|
|
|
|
* - Must be called before machine->init()
|
|
|
|
*/
|
|
|
|
cpudef_init();
|
|
|
|
|
2012-08-02 16:45:54 +04:00
|
|
|
if (cpu_model && is_help_option(cpu_model)) {
|
2012-03-21 16:33:40 +04:00
|
|
|
list_cpus(stdout, &fprintf, cpu_model);
|
2012-03-09 23:19:07 +04:00
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2011-06-07 20:32:40 +04:00
|
|
|
/* Open the logfile at this point, if necessary. We can't open the logfile
|
|
|
|
* when encountering either of the logging options (-d or -D) because the
|
|
|
|
* other one may be encountered later on the command line, changing the
|
|
|
|
* location or level of logging.
|
|
|
|
*/
|
|
|
|
if (log_mask) {
|
2013-02-11 20:41:24 +04:00
|
|
|
int mask;
|
2011-06-07 20:32:40 +04:00
|
|
|
if (log_file) {
|
2013-02-11 20:41:20 +04:00
|
|
|
qemu_set_log_filename(log_file);
|
2011-06-07 20:32:40 +04:00
|
|
|
}
|
2013-02-11 20:41:24 +04:00
|
|
|
|
|
|
|
mask = qemu_str_to_log_mask(log_mask);
|
|
|
|
if (!mask) {
|
|
|
|
qemu_print_log_usage(stdout);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
qemu_set_log(mask);
|
2011-06-07 20:32:40 +04:00
|
|
|
}
|
2003-07-26 22:11:40 +04:00
|
|
|
|
2011-08-31 22:31:31 +04:00
|
|
|
if (!trace_backend_init(trace_events, trace_file)) {
|
2011-08-31 22:31:03 +04:00
|
|
|
exit(1);
|
2011-03-13 23:14:30 +03:00
|
|
|
}
|
2011-02-26 21:38:39 +03:00
|
|
|
|
2009-05-30 03:52:44 +04:00
|
|
|
/* If no data_dir is specified then try to find it relative to the
|
|
|
|
executable path. */
|
2013-03-08 14:42:24 +04:00
|
|
|
if (data_dir_idx < ARRAY_SIZE(data_dir)) {
|
|
|
|
data_dir[data_dir_idx] = os_find_datadir(argv[0]);
|
|
|
|
if (data_dir[data_dir_idx] != NULL) {
|
|
|
|
data_dir_idx++;
|
|
|
|
}
|
2009-05-30 03:52:44 +04:00
|
|
|
}
|
2011-09-04 17:17:46 +04:00
|
|
|
/* If all else fails use the install path specified when building. */
|
2013-03-08 14:42:24 +04:00
|
|
|
if (data_dir_idx < ARRAY_SIZE(data_dir)) {
|
|
|
|
data_dir[data_dir_idx++] = CONFIG_QEMU_DATADIR;
|
2009-05-30 03:52:44 +04:00
|
|
|
}
|
|
|
|
|
2009-07-23 19:03:42 +04:00
|
|
|
/*
|
|
|
|
* Default to max_cpus = smp_cpus, in case the user doesn't
|
|
|
|
* specify a max_cpus value.
|
|
|
|
*/
|
|
|
|
if (!max_cpus)
|
|
|
|
max_cpus = smp_cpus;
|
|
|
|
|
2008-10-28 13:59:59 +03:00
|
|
|
machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */
|
2008-10-08 00:39:39 +04:00
|
|
|
if (smp_cpus > machine->max_cpus) {
|
|
|
|
fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "
|
|
|
|
"supported by machine `%s' (%d)\n", smp_cpus, machine->name,
|
|
|
|
machine->max_cpus);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2010-11-22 18:44:15 +03:00
|
|
|
/*
|
|
|
|
* Get the default machine options from the machine if it is not already
|
|
|
|
* specified either by the configuration file or by the command line.
|
|
|
|
*/
|
|
|
|
if (machine->default_machine_opts) {
|
2012-01-27 22:55:43 +04:00
|
|
|
qemu_opts_set_defaults(qemu_find_opts("machine"),
|
|
|
|
machine->default_machine_opts, 0);
|
2010-11-22 18:44:15 +03:00
|
|
|
}
|
|
|
|
|
2010-08-20 15:52:01 +04:00
|
|
|
qemu_opts_foreach(qemu_find_opts("device"), default_driver_check, NULL, 0);
|
|
|
|
qemu_opts_foreach(qemu_find_opts("global"), default_driver_check, NULL, 0);
|
2009-12-08 15:11:41 +03:00
|
|
|
|
2009-12-08 15:11:54 +03:00
|
|
|
if (machine->no_serial) {
|
|
|
|
default_serial = 0;
|
|
|
|
}
|
|
|
|
if (machine->no_parallel) {
|
|
|
|
default_parallel = 0;
|
|
|
|
}
|
|
|
|
if (!machine->use_virtcon) {
|
|
|
|
default_virtcon = 0;
|
|
|
|
}
|
2013-01-24 15:18:52 +04:00
|
|
|
if (!machine->use_sclp) {
|
|
|
|
default_sclp = 0;
|
|
|
|
}
|
2009-12-16 16:25:39 +03:00
|
|
|
if (machine->no_floppy) {
|
|
|
|
default_floppy = 0;
|
|
|
|
}
|
|
|
|
if (machine->no_cdrom) {
|
|
|
|
default_cdrom = 0;
|
|
|
|
}
|
|
|
|
if (machine->no_sdcard) {
|
|
|
|
default_sdcard = 0;
|
|
|
|
}
|
2009-12-08 15:11:54 +03:00
|
|
|
|
disallow -daemonize usage of stdio (curses display, -nographic, -serial stdio etc)
Curses display requires stdin/out to stay on the terminal,
so -daemonize makes no sense in this case. Instead of
leaving display uninitialized like is done since 995ee2bf469de6bb,
explicitly detect this case earlier and error out.
-nographic can actually be used with -daemonize, by redirecting
everything to a null device, but the problem is that according
to documentation and historical behavour, -nographic redirects
guest ports to stdin/out, which, again, makes no sense in case
of -daemonize. Since -nographic is a legacy option, don't bother
fixing this case (to allow -nographic and -daemonize by redirecting
guest ports to null instead of stdin/out in this case), but disallow
it completely instead, to stop garbling host terminal.
If no display display needed and user wants to use -nographic,
the right way to go is to use
-serial null -parallel null -monitor none -display none -vga none
instead of -nographic.
Also prevent the same issue -- it was possible to get garbled
host tty after
-nographic -daemonize
and it is still possible to have it by using
-serial stdio -daemonize
Fix this by disallowing opening stdio chardev when -daemonize
is specified.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-12-30 12:48:14 +04:00
|
|
|
if (is_daemonized()) {
|
|
|
|
/* According to documentation and historically, -nographic redirects
|
|
|
|
* serial port, parallel port and monitor to stdio, which does not work
|
|
|
|
* with -daemonize. We can redirect these to null instead, but since
|
|
|
|
* -nographic is legacy, let's just error out.
|
|
|
|
* We disallow -nographic only if all other ports are not redirected
|
|
|
|
* explicitly, to not break existing legacy setups which uses
|
|
|
|
* -nographic _and_ redirects all ports explicitly - this is valid
|
|
|
|
* usage, -nographic is just a no-op in this case.
|
|
|
|
*/
|
|
|
|
if (display_type == DT_NOGRAPHIC
|
|
|
|
&& (default_parallel || default_serial
|
|
|
|
|| default_monitor || default_virtcon)) {
|
|
|
|
fprintf(stderr, "-nographic can not be used with -daemonize\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#ifdef CONFIG_CURSES
|
|
|
|
if (display_type == DT_CURSES) {
|
|
|
|
fprintf(stderr, "curses display can not be used with -daemonize\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-05-22 01:54:00 +04:00
|
|
|
if (display_type == DT_NOGRAPHIC) {
|
2009-12-08 15:11:42 +03:00
|
|
|
if (default_parallel)
|
|
|
|
add_device_config(DEV_PARALLEL, "null");
|
2009-12-08 15:11:44 +03:00
|
|
|
if (default_serial && default_monitor) {
|
|
|
|
add_device_config(DEV_SERIAL, "mon:stdio");
|
2009-12-08 15:11:54 +03:00
|
|
|
} else if (default_virtcon && default_monitor) {
|
|
|
|
add_device_config(DEV_VIRTCON, "mon:stdio");
|
2013-01-24 15:18:52 +04:00
|
|
|
} else if (default_sclp && default_monitor) {
|
|
|
|
add_device_config(DEV_SCLP, "mon:stdio");
|
2009-12-08 15:11:44 +03:00
|
|
|
} else {
|
|
|
|
if (default_serial)
|
|
|
|
add_device_config(DEV_SERIAL, "stdio");
|
2009-12-08 15:11:54 +03:00
|
|
|
if (default_virtcon)
|
|
|
|
add_device_config(DEV_VIRTCON, "stdio");
|
2013-01-24 15:18:52 +04:00
|
|
|
if (default_sclp) {
|
|
|
|
add_device_config(DEV_SCLP, "stdio");
|
|
|
|
}
|
2009-12-08 15:11:44 +03:00
|
|
|
if (default_monitor)
|
2009-12-08 15:11:52 +03:00
|
|
|
monitor_parse("stdio", "readline");
|
2009-12-08 15:11:44 +03:00
|
|
|
}
|
2009-12-08 15:11:41 +03:00
|
|
|
} else {
|
|
|
|
if (default_serial)
|
|
|
|
add_device_config(DEV_SERIAL, "vc:80Cx24C");
|
2009-12-08 15:11:42 +03:00
|
|
|
if (default_parallel)
|
|
|
|
add_device_config(DEV_PARALLEL, "vc:80Cx24C");
|
2009-12-08 15:11:43 +03:00
|
|
|
if (default_monitor)
|
2009-12-08 15:11:52 +03:00
|
|
|
monitor_parse("vc:80Cx24C", "readline");
|
2009-12-17 15:06:08 +03:00
|
|
|
if (default_virtcon)
|
|
|
|
add_device_config(DEV_VIRTCON, "vc:80Cx24C");
|
2013-01-24 15:18:52 +04:00
|
|
|
if (default_sclp) {
|
|
|
|
add_device_config(DEV_SCLP, "vc:80Cx24C");
|
|
|
|
}
|
2008-08-01 19:12:34 +04:00
|
|
|
}
|
|
|
|
|
2013-02-20 17:43:25 +04:00
|
|
|
if (display_type == DT_DEFAULT && !display_remote) {
|
|
|
|
#if defined(CONFIG_GTK)
|
|
|
|
display_type = DT_GTK;
|
|
|
|
#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
|
|
|
|
display_type = DT_SDL;
|
|
|
|
#elif defined(CONFIG_VNC)
|
|
|
|
vnc_display = "localhost:0,to=99";
|
|
|
|
show_vnc_port = 1;
|
|
|
|
#else
|
|
|
|
display_type = DT_NONE;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2013-06-11 12:55:08 +04:00
|
|
|
if ((no_frame || alt_grab || ctrl_grab) && display_type != DT_SDL) {
|
|
|
|
fprintf(stderr, "-no-frame, -alt-grab and -ctrl-grab are only valid "
|
|
|
|
"for SDL, ignoring option\n");
|
|
|
|
}
|
|
|
|
if (no_quit && (display_type != DT_GTK && display_type != DT_SDL)) {
|
|
|
|
fprintf(stderr, "-no-quit is only valid for GTK and SDL, "
|
|
|
|
"ignoring option\n");
|
|
|
|
}
|
|
|
|
|
2013-02-20 17:43:25 +04:00
|
|
|
#if defined(CONFIG_GTK)
|
|
|
|
if (display_type == DT_GTK) {
|
|
|
|
early_gtk_display_init();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-04-15 08:37:55 +04:00
|
|
|
socket_init();
|
|
|
|
|
2010-08-20 15:52:01 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, 1) != 0)
|
2009-12-08 15:11:36 +03:00
|
|
|
exit(1);
|
2010-06-15 00:34:41 +04:00
|
|
|
#ifdef CONFIG_VIRTFS
|
2010-08-20 15:52:01 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("fsdev"), fsdev_init_func, NULL, 1) != 0) {
|
2010-04-29 16:14:43 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#endif
|
2009-12-08 15:11:36 +03:00
|
|
|
|
2010-06-10 13:42:28 +04:00
|
|
|
os_daemonize();
|
2006-12-22 05:11:31 +03:00
|
|
|
|
2007-03-26 01:33:06 +04:00
|
|
|
if (pid_file && qemu_create_pidfile(pid_file) != 0) {
|
2010-06-10 13:42:28 +04:00
|
|
|
os_pidfile_error();
|
2007-03-19 18:58:31 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2011-08-16 03:18:57 +04:00
|
|
|
/* init the memory */
|
|
|
|
if (ram_size == 0) {
|
|
|
|
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
|
|
|
|
}
|
|
|
|
|
2012-08-09 22:47:40 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0)
|
|
|
|
!= 0) {
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2010-09-21 23:05:31 +04:00
|
|
|
configure_accelerator();
|
2009-09-18 09:41:23 +04:00
|
|
|
|
2013-04-15 23:28:17 +04:00
|
|
|
if (!qtest_enabled() && qtest_chrdev) {
|
|
|
|
qtest_init();
|
|
|
|
}
|
|
|
|
|
2012-02-23 02:40:00 +04:00
|
|
|
machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
|
|
|
|
if (machine_opts) {
|
|
|
|
kernel_filename = qemu_opt_get(machine_opts, "kernel");
|
|
|
|
initrd_filename = qemu_opt_get(machine_opts, "initrd");
|
|
|
|
kernel_cmdline = qemu_opt_get(machine_opts, "append");
|
|
|
|
} else {
|
|
|
|
kernel_filename = initrd_filename = kernel_cmdline = NULL;
|
|
|
|
}
|
|
|
|
|
2012-02-08 09:41:39 +04:00
|
|
|
if (!kernel_cmdline) {
|
|
|
|
kernel_cmdline = "";
|
|
|
|
}
|
|
|
|
|
2003-10-01 01:07:02 +04:00
|
|
|
linux_boot = (kernel_filename != NULL);
|
2007-11-17 15:12:29 +03:00
|
|
|
|
2008-07-03 14:01:15 +04:00
|
|
|
if (!linux_boot && *kernel_cmdline != '\0') {
|
|
|
|
fprintf(stderr, "-append only allowed with -kernel option\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!linux_boot && initrd_filename != NULL) {
|
|
|
|
fprintf(stderr, "-initrd only allowed with -kernel option\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-03-02 15:56:38 +04:00
|
|
|
if (!linux_boot && machine_opts && qemu_opt_get(machine_opts, "dtb")) {
|
|
|
|
fprintf(stderr, "-dtb only allowed with -kernel option\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2010-06-10 13:42:30 +04:00
|
|
|
os_set_line_buffering();
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2012-11-02 18:43:24 +04:00
|
|
|
qemu_init_cpu_loop();
|
|
|
|
qemu_mutex_lock_iothread();
|
|
|
|
|
2012-03-14 22:33:37 +04:00
|
|
|
#ifdef CONFIG_SPICE
|
|
|
|
/* spice needs the timers to be initialized by this point */
|
|
|
|
qemu_spice_init();
|
|
|
|
#endif
|
|
|
|
|
2011-11-10 15:38:42 +04:00
|
|
|
if (icount_option && (kvm_enabled() || xen_enabled())) {
|
|
|
|
fprintf(stderr, "-icount is not allowed with kvm or xen\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2010-03-10 13:38:48 +03:00
|
|
|
configure_icount(icount_option);
|
2006-07-15 21:40:09 +04:00
|
|
|
|
2012-12-11 18:20:15 +04:00
|
|
|
/* clean up network at qemu process termination */
|
|
|
|
atexit(&net_cleanup);
|
|
|
|
|
2009-10-06 15:17:16 +04:00
|
|
|
if (net_init_clients() < 0) {
|
|
|
|
exit(1);
|
2004-04-03 01:21:32 +04:00
|
|
|
}
|
2003-06-25 04:07:40 +04:00
|
|
|
|
Support for TPM command line options
This patch adds support for TPM command line options.
The command line options supported here are
./qemu-... -tpmdev passthrough,path=<path to TPM device>,id=<id>
-device tpm-tis,tpmdev=<id>,id=<other id>
and
./qemu-... -tpmdev help
where the latter works similar to -soundhw help and shows a list of
available TPM backends (for example 'passthrough').
Using the type parameter, the backend is chosen, i.e., 'passthrough' for the
passthrough driver. The interpretation of the other parameters along
with determining whether enough parameters were provided is pushed into
the backend driver, which needs to implement the interface function
'create' and return a TPMDriverOpts structure if the VM can be started or
'NULL' if not enough or bad parameters were provided.
Monitor support for 'info tpm' has been added. It for example prints the
following:
(qemu) info tpm
TPM devices:
tpm0: model=tpm-tis
\ tpm0: type=passthrough,path=/dev/tpm0,cancel-path=/sys/devices/pnp0/00:09/cancel
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Joel Schopp <jschopp@linux.vnet.ibm.com>
Message-id: 1361987275-26289-2-git-send-email-stefanb@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-27 21:47:49 +04:00
|
|
|
#ifdef CONFIG_TPM
|
|
|
|
if (tpm_init() < 0) {
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-11-09 03:04:26 +03:00
|
|
|
/* init the bluetooth world */
|
2009-07-15 15:59:26 +04:00
|
|
|
if (foreach_device_config(DEV_BT, bt_parse))
|
|
|
|
exit(1);
|
2008-11-09 03:04:26 +03:00
|
|
|
|
2011-07-20 12:17:44 +04:00
|
|
|
if (!xen_enabled()) {
|
|
|
|
/* On 32-bit hosts, QEMU is limited by virtual address space */
|
|
|
|
if (ram_size > (2047 << 20) && HOST_LONG_BITS == 32) {
|
|
|
|
fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2007-01-05 20:39:04 +03:00
|
|
|
|
2011-08-02 18:10:21 +04:00
|
|
|
cpu_exec_init_all();
|
2008-05-28 16:30:31 +04:00
|
|
|
|
2009-11-02 16:40:58 +03:00
|
|
|
blk_mig_init();
|
|
|
|
|
2007-12-02 07:51:10 +03:00
|
|
|
/* open the virtual block devices */
|
2009-07-22 18:43:04 +04:00
|
|
|
if (snapshot)
|
2010-08-20 15:52:01 +04:00
|
|
|
qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot, NULL, 0);
|
2012-11-20 18:30:34 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
|
|
|
|
&machine->block_default_type, 1) != 0) {
|
2009-07-22 18:43:04 +04:00
|
|
|
exit(1);
|
2012-11-20 18:30:34 +04:00
|
|
|
}
|
2007-04-30 06:09:25 +04:00
|
|
|
|
2012-11-23 00:02:55 +04:00
|
|
|
default_drive(default_cdrom, snapshot, machine->block_default_type, 2,
|
|
|
|
CDROM_OPTS);
|
|
|
|
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
|
|
|
|
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
|
blockdev: Reject multiple definitions for the same drive
We silently ignore multiple definitions for the same drive:
$ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=ide,index=1,file=tmp.qcow2 -drive if=ide,index=1,file=nonexistant
QEMU 0.13.50 monitor - type 'help' for more information
(qemu) info block
ide0-hd1: type=hd removable=0 file=tmp.qcow2 backing_file=tmp.img ro=0 drv=qcow2 encrypted=0
With if=none, this can become quite confusing:
$ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=none,index=1,file=tmp.qcow2,id=eins -drive if=none,index=1,file=nonexistant,id=zwei -device ide-drive,drive=eins -device ide-drive,drive=zwei
qemu-system-x86_64: -device ide-drive,drive=zwei: Property 'ide-drive.drive' can't find value 'zwei'
The second -device fails, because it refers to drive zwei, which got
silently ignored.
Make multiple drive definitions fail cleanly.
Unfortunately, there's code that relies on multiple drive definitions
being silently ignored: main() merrily adds default drives even when
the user already defined these drives. Fix that up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2011-01-28 13:21:45 +03:00
|
|
|
|
2012-06-26 20:46:10 +04:00
|
|
|
register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);
|
2004-03-31 23:00:16 +04:00
|
|
|
|
2009-04-22 02:30:27 +04:00
|
|
|
if (nb_numa_nodes > 0) {
|
|
|
|
int i;
|
|
|
|
|
2011-06-30 07:29:39 +04:00
|
|
|
if (nb_numa_nodes > MAX_NODES) {
|
|
|
|
nb_numa_nodes = MAX_NODES;
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If no memory size if given for any node, assume the default case
|
|
|
|
* and distribute the available memory equally across all nodes
|
|
|
|
*/
|
|
|
|
for (i = 0; i < nb_numa_nodes; i++) {
|
|
|
|
if (node_mem[i] != 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i == nb_numa_nodes) {
|
|
|
|
uint64_t usedmem = 0;
|
|
|
|
|
|
|
|
/* On Linux, the each node's border has to be 8MB aligned,
|
|
|
|
* the final node gets the rest.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < nb_numa_nodes - 1; i++) {
|
|
|
|
node_mem[i] = (ram_size / nb_numa_nodes) & ~((1 << 23UL) - 1);
|
|
|
|
usedmem += node_mem[i];
|
|
|
|
}
|
|
|
|
node_mem[i] = ram_size - usedmem;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nb_numa_nodes; i++) {
|
Fixes related to processing of qemu's -numa option
The -numa option to qemu is used to create [fake] numa nodes
and expose them to the guest OS instance.
There are a couple of issues with the -numa option:
a) Max VCPU's that can be specified for a guest while using
the qemu's -numa option is 64. Due to a typecasting issue
when the number of VCPUs is > 32 the VCPUs don't show up
under the specified [fake] numa nodes.
b) KVM currently has support for 160VCPUs per guest. The
qemu's -numa option has only support for upto 64VCPUs
per guest.
This patch addresses these two issues.
Below are examples of (a) and (b)
a) >32 VCPUs are specified with the -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
71:01:01 \
-net tap,ifname=tap0,script=no,downscript=no \
-vnc :4
...
Upstream qemu :
--------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59
node 2 size: 131072 MB
node 3 cpus: 30
node 3 size: 131072 MB
node 4 cpus:
node 4 size: 131072 MB
node 5 cpus: 31
node 5 size: 131072 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 131072 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 131072 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 131072 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 131072 MB
b) >64 VCPUs specified with -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
-cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4
...
Upstream qemu :
--------------
only 63 CPUs in NUMA mode supported.
only 64 CPUs in NUMA mode supported.
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61
node 2 size: 65536 MB
node 3 cpus: 30 62
node 3 size: 65536 MB
node 4 cpus:
node 4 size: 65536 MB
node 5 cpus:
node 5 size: 65536 MB
node 6 cpus: 31 63
node 6 size: 65536 MB
node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69
node 7 size: 65536 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 65536 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 65536 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 65536 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 65536 MB
node 6 cpus: 60 61 62 63 64 65 66 67 68 69
node 6 size: 65536 MB
node 7 cpus: 70 71 72 73 74 75 76 77 78 79
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2012-07-17 08:31:30 +04:00
|
|
|
if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) {
|
2009-04-22 02:30:27 +04:00
|
|
|
break;
|
Fixes related to processing of qemu's -numa option
The -numa option to qemu is used to create [fake] numa nodes
and expose them to the guest OS instance.
There are a couple of issues with the -numa option:
a) Max VCPU's that can be specified for a guest while using
the qemu's -numa option is 64. Due to a typecasting issue
when the number of VCPUs is > 32 the VCPUs don't show up
under the specified [fake] numa nodes.
b) KVM currently has support for 160VCPUs per guest. The
qemu's -numa option has only support for upto 64VCPUs
per guest.
This patch addresses these two issues.
Below are examples of (a) and (b)
a) >32 VCPUs are specified with the -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
71:01:01 \
-net tap,ifname=tap0,script=no,downscript=no \
-vnc :4
...
Upstream qemu :
--------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59
node 2 size: 131072 MB
node 3 cpus: 30
node 3 size: 131072 MB
node 4 cpus:
node 4 size: 131072 MB
node 5 cpus: 31
node 5 size: 131072 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 131072 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 131072 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 131072 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 131072 MB
b) >64 VCPUs specified with -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
-cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4
...
Upstream qemu :
--------------
only 63 CPUs in NUMA mode supported.
only 64 CPUs in NUMA mode supported.
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61
node 2 size: 65536 MB
node 3 cpus: 30 62
node 3 size: 65536 MB
node 4 cpus:
node 4 size: 65536 MB
node 5 cpus:
node 5 size: 65536 MB
node 6 cpus: 31 63
node 6 size: 65536 MB
node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69
node 7 size: 65536 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 65536 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 65536 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 65536 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 65536 MB
node 6 cpus: 60 61 62 63 64 65 66 67 68 69
node 6 size: 65536 MB
node 7 cpus: 70 71 72 73 74 75 76 77 78 79
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2012-07-17 08:31:30 +04:00
|
|
|
}
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
/* assigning the VCPUs round-robin is easier to implement, guest OSes
|
|
|
|
* must cope with this anyway, because there are BIOSes out there in
|
|
|
|
* real machines which also use this scheme.
|
|
|
|
*/
|
|
|
|
if (i == nb_numa_nodes) {
|
2011-10-26 16:19:00 +04:00
|
|
|
for (i = 0; i < max_cpus; i++) {
|
Fixes related to processing of qemu's -numa option
The -numa option to qemu is used to create [fake] numa nodes
and expose them to the guest OS instance.
There are a couple of issues with the -numa option:
a) Max VCPU's that can be specified for a guest while using
the qemu's -numa option is 64. Due to a typecasting issue
when the number of VCPUs is > 32 the VCPUs don't show up
under the specified [fake] numa nodes.
b) KVM currently has support for 160VCPUs per guest. The
qemu's -numa option has only support for upto 64VCPUs
per guest.
This patch addresses these two issues.
Below are examples of (a) and (b)
a) >32 VCPUs are specified with the -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
71:01:01 \
-net tap,ifname=tap0,script=no,downscript=no \
-vnc :4
...
Upstream qemu :
--------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59
node 2 size: 131072 MB
node 3 cpus: 30
node 3 size: 131072 MB
node 4 cpus:
node 4 size: 131072 MB
node 5 cpus: 31
node 5 size: 131072 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
6 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 131072 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 131072 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 131072 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 131072 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 131072 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 131072 MB
b) >64 VCPUs specified with -numa option:
/usr/local/bin/qemu-system-x86_64 \
-enable-kvm \
-cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4
...
Upstream qemu :
--------------
only 63 CPUs in NUMA mode supported.
only 64 CPUs in NUMA mode supported.
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61
node 2 size: 65536 MB
node 3 cpus: 30 62
node 3 size: 65536 MB
node 4 cpus:
node 4 size: 65536 MB
node 5 cpus:
node 5 size: 65536 MB
node 6 cpus: 31 63
node 6 size: 65536 MB
node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69
node 7 size: 65536 MB
With the patch applied :
-----------------------
QEMU 1.1.50 monitor - type 'help' for more information
(qemu) info numa
8 nodes
node 0 cpus: 0 1 2 3 4 5 6 7 8 9
node 0 size: 65536 MB
node 1 cpus: 10 11 12 13 14 15 16 17 18 19
node 1 size: 65536 MB
node 2 cpus: 20 21 22 23 24 25 26 27 28 29
node 2 size: 65536 MB
node 3 cpus: 30 31 32 33 34 35 36 37 38 39
node 3 size: 65536 MB
node 4 cpus: 40 41 42 43 44 45 46 47 48 49
node 4 size: 65536 MB
node 5 cpus: 50 51 52 53 54 55 56 57 58 59
node 5 size: 65536 MB
node 6 cpus: 60 61 62 63 64 65 66 67 68 69
node 6 size: 65536 MB
node 7 cpus: 70 71 72 73 74 75 76 77 78 79
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2012-07-17 08:31:30 +04:00
|
|
|
set_bit(i, node_cpumask[i % nb_numa_nodes]);
|
2009-04-22 02:30:27 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-08-20 15:52:01 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("mon"), mon_init_func, NULL, 1) != 0) {
|
2010-04-06 18:55:53 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2009-12-08 15:11:41 +03:00
|
|
|
if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)
|
|
|
|
exit(1);
|
2009-12-08 15:11:42 +03:00
|
|
|
if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0)
|
|
|
|
exit(1);
|
2009-12-08 15:11:53 +03:00
|
|
|
if (foreach_device_config(DEV_VIRTCON, virtcon_parse) < 0)
|
|
|
|
exit(1);
|
2013-01-24 15:18:52 +04:00
|
|
|
if (foreach_device_config(DEV_SCLP, sclp_parse) < 0) {
|
|
|
|
exit(1);
|
|
|
|
}
|
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Add generic support for debugging consoles (simple I/O ports which
when written to cause debugging output to be written to a target.)
The current implementation matches Bochs' port 0xe9, allowing the same
debugging code to be used for both Bochs and Qemu.
There is no vm state associated with the debugging port, simply
because it has none -- the entire interface is a single, stateless,
write-only port.
Most of the code was cribbed from the serial port driver.
v2: removed non-ISA variants (they can be introduced when/if someone
wants them, using code from the serial port); added configurable
readback (Bochs returns 0xe9 on a read from this register, mimic that
by default) This retains the apparently somewhat controversial user
friendly option, however.
v3: reimplemented the user friendly option as a synthetic option
("-debugcon foo" basically ends up being a parser-level shorthand for
"-chardev stdio,id=debugcon -device isa-debugcon,chardev=debugcon") --
this dramatically reduced the complexity while keeping the same level
of user friendliness.
v4: spaces, not tabs.
v5: update to match current top of tree. Calling qemu_chr_open()
already during parsing no longer works; defer until we are parsing the
other console-like devices.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-12-30 00:51:36 +03:00
|
|
|
if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
|
|
|
|
exit(1);
|
2009-01-16 23:23:27 +03:00
|
|
|
|
2012-05-10 11:39:17 +04:00
|
|
|
/* If no default VGA is requested, the default is "none". */
|
2012-09-10 03:01:44 +04:00
|
|
|
if (default_vga) {
|
|
|
|
if (cirrus_vga_available()) {
|
|
|
|
vga_model = "cirrus";
|
|
|
|
} else if (vga_available()) {
|
|
|
|
vga_model = "std";
|
|
|
|
}
|
2011-09-27 23:15:42 +04:00
|
|
|
}
|
2012-05-10 11:39:17 +04:00
|
|
|
select_vgahw(vga_model);
|
2011-09-27 23:15:42 +04:00
|
|
|
|
2009-08-21 12:31:34 +04:00
|
|
|
if (watchdog) {
|
|
|
|
i = select_watchdog(watchdog);
|
|
|
|
if (i > 0)
|
|
|
|
exit (i == 1 ? 1 : 0);
|
|
|
|
}
|
|
|
|
|
2009-07-15 15:48:21 +04:00
|
|
|
if (machine->compat_props) {
|
2009-12-08 15:11:33 +03:00
|
|
|
qdev_prop_register_global_list(machine->compat_props);
|
2009-07-15 15:48:21 +04:00
|
|
|
}
|
2009-12-08 15:11:34 +03:00
|
|
|
qemu_add_globals();
|
|
|
|
|
2011-12-20 02:37:46 +04:00
|
|
|
qdev_machine_init();
|
|
|
|
|
2012-10-16 00:22:02 +04:00
|
|
|
QEMUMachineInitArgs args = { .ram_size = ram_size,
|
2013-01-08 11:06:30 +04:00
|
|
|
.boot_device = (boot_devices[0] == '\0') ?
|
|
|
|
machine->boot_order :
|
|
|
|
boot_devices,
|
2012-10-16 00:22:02 +04:00
|
|
|
.kernel_filename = kernel_filename,
|
|
|
|
.kernel_cmdline = kernel_cmdline,
|
|
|
|
.initrd_filename = initrd_filename,
|
|
|
|
.cpu_model = cpu_model };
|
|
|
|
machine->init(&args);
|
2009-01-16 22:04:14 +03:00
|
|
|
|
2013-04-18 20:44:04 +04:00
|
|
|
audio_init();
|
|
|
|
|
2010-03-01 21:10:30 +03:00
|
|
|
cpu_synchronize_all_post_init();
|
2009-04-22 02:30:27 +04:00
|
|
|
|
2010-03-27 21:24:45 +03:00
|
|
|
set_numa_modes();
|
2009-04-22 02:30:27 +04:00
|
|
|
|
2009-02-11 18:21:54 +03:00
|
|
|
current_machine = machine;
|
|
|
|
|
2009-01-16 22:04:14 +03:00
|
|
|
/* init USB devices */
|
2012-09-02 23:25:28 +04:00
|
|
|
if (usb_enabled(false)) {
|
Don't exit() in config_error()
Propagating errors up the call chain is tedious. In startup code, we
can take a shortcut: terminate the program. This is wrong elsewhere,
the monitor in particular.
config_error() tries to cater for both customers: it terminates the
program unless its mon parameter tells it it's working for the
monitor.
Its users need to return status anyway (unless passing a null mon
argument, which none do), which their users need to check. So this
automatic exit buys us exactly nothing useful. Only the dangerous
delusion that we can get away without returning status. Some of its
users fell for that. Their callers continue executing after failure
when working for the monitor.
This bites monitor command host_net_add in two places:
* net_slirp_init() continues after slirp_hostfwd(), slirp_guestfwd(),
or slirp_smb() failed, and may end up reporting success. This
happens for "host_net_add user guestfwd=foo": it complains about the
invalid guest forwarding rule, then happily creates the user network
without guest forwarding.
* net_client_init() can't detect slirp_guestfwd() failure, and gets
fooled by net_slirp_init() lying about success. Suppresses its
"Could not initialize device" message.
Add the missing error reporting, make sure errors are checked, and
drop the exit() from config_error().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2009-10-06 15:16:57 +04:00
|
|
|
if (foreach_device_config(DEV_USB, usb_parse) < 0)
|
|
|
|
exit(1);
|
2009-01-16 22:04:14 +03:00
|
|
|
}
|
|
|
|
|
2009-07-15 15:59:26 +04:00
|
|
|
/* init generic devices */
|
2010-08-20 15:52:01 +04:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, 1) != 0)
|
2009-07-15 15:59:26 +04:00
|
|
|
exit(1);
|
|
|
|
|
2010-02-11 16:44:58 +03:00
|
|
|
net_check_clients();
|
|
|
|
|
2013-03-07 20:08:29 +04:00
|
|
|
ds = init_displaystate();
|
2009-05-22 01:54:00 +04:00
|
|
|
|
2010-08-25 12:51:06 +04:00
|
|
|
/* init local displays */
|
2009-05-22 01:54:00 +04:00
|
|
|
switch (display_type) {
|
|
|
|
case DT_NOGRAPHIC:
|
|
|
|
break;
|
2008-02-10 19:33:14 +03:00
|
|
|
#if defined(CONFIG_CURSES)
|
2009-05-22 01:54:00 +04:00
|
|
|
case DT_CURSES:
|
disallow -daemonize usage of stdio (curses display, -nographic, -serial stdio etc)
Curses display requires stdin/out to stay on the terminal,
so -daemonize makes no sense in this case. Instead of
leaving display uninitialized like is done since 995ee2bf469de6bb,
explicitly detect this case earlier and error out.
-nographic can actually be used with -daemonize, by redirecting
everything to a null device, but the problem is that according
to documentation and historical behavour, -nographic redirects
guest ports to stdin/out, which, again, makes no sense in case
of -daemonize. Since -nographic is a legacy option, don't bother
fixing this case (to allow -nographic and -daemonize by redirecting
guest ports to null instead of stdin/out in this case), but disallow
it completely instead, to stop garbling host terminal.
If no display display needed and user wants to use -nographic,
the right way to go is to use
-serial null -parallel null -monitor none -display none -vga none
instead of -nographic.
Also prevent the same issue -- it was possible to get garbled
host tty after
-nographic -daemonize
and it is still possible to have it by using
-serial stdio -daemonize
Fix this by disallowing opening stdio chardev when -daemonize
is specified.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-12-30 12:48:14 +04:00
|
|
|
curses_display_init(ds, full_screen);
|
2009-05-22 01:54:00 +04:00
|
|
|
break;
|
2008-02-10 19:33:14 +03:00
|
|
|
#endif
|
2005-03-02 00:37:28 +03:00
|
|
|
#if defined(CONFIG_SDL)
|
2009-05-22 01:54:00 +04:00
|
|
|
case DT_SDL:
|
|
|
|
sdl_display_init(ds, full_screen, no_frame);
|
|
|
|
break;
|
2005-03-02 00:37:28 +03:00
|
|
|
#elif defined(CONFIG_COCOA)
|
2009-05-22 01:54:00 +04:00
|
|
|
case DT_SDL:
|
|
|
|
cocoa_display_init(ds, full_screen);
|
|
|
|
break;
|
2013-02-20 17:43:25 +04:00
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_GTK)
|
|
|
|
case DT_GTK:
|
2013-06-10 22:04:43 +04:00
|
|
|
gtk_display_init(ds, full_screen);
|
2013-02-20 17:43:25 +04:00
|
|
|
break;
|
2003-08-11 01:52:11 +04:00
|
|
|
#endif
|
2010-08-25 12:51:06 +04:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-03-31 13:27:23 +04:00
|
|
|
/* must be after terminal init, SDL library changes signal handlers */
|
|
|
|
os_setup_signal_handling();
|
|
|
|
|
2011-03-16 15:33:36 +03:00
|
|
|
#ifdef CONFIG_VNC
|
2010-08-25 12:51:06 +04:00
|
|
|
/* init remote displays */
|
|
|
|
if (vnc_display) {
|
2012-10-02 12:17:21 +04:00
|
|
|
Error *local_err = NULL;
|
2009-05-22 01:54:00 +04:00
|
|
|
vnc_display_init(ds);
|
2012-10-02 12:17:21 +04:00
|
|
|
vnc_display_open(ds, vnc_display, &local_err);
|
|
|
|
if (local_err != NULL) {
|
|
|
|
fprintf(stderr, "Failed to start VNC server on `%s': %s\n",
|
|
|
|
vnc_display, error_get_pretty(local_err));
|
|
|
|
error_free(local_err);
|
2009-05-22 01:54:00 +04:00
|
|
|
exit(1);
|
2012-06-30 06:02:20 +04:00
|
|
|
}
|
2009-05-20 22:01:02 +04:00
|
|
|
|
2009-05-22 01:54:00 +04:00
|
|
|
if (show_vnc_port) {
|
|
|
|
printf("VNC server running on `%s'\n", vnc_display_local_addr(ds));
|
2009-05-20 22:01:02 +04:00
|
|
|
}
|
2003-08-11 01:52:11 +04:00
|
|
|
}
|
2011-03-16 15:33:36 +03:00
|
|
|
#endif
|
2010-08-25 17:32:06 +04:00
|
|
|
#ifdef CONFIG_SPICE
|
2010-04-27 13:50:11 +04:00
|
|
|
if (using_spice && !qxl_enabled) {
|
2010-08-25 17:32:06 +04:00
|
|
|
qemu_spice_display_init(ds);
|
|
|
|
}
|
|
|
|
#endif
|
2008-08-22 00:08:03 +04:00
|
|
|
|
2012-02-07 18:09:13 +04:00
|
|
|
if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {
|
2009-04-05 22:43:41 +04:00
|
|
|
exit(1);
|
2007-07-02 17:20:17 +04:00
|
|
|
}
|
|
|
|
|
2009-09-25 23:42:41 +04:00
|
|
|
qdev_machine_creation_done();
|
|
|
|
|
2009-12-14 18:07:35 +03:00
|
|
|
if (rom_load_all() != 0) {
|
|
|
|
fprintf(stderr, "rom loading failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2009-10-01 18:42:33 +04:00
|
|
|
|
2010-12-20 08:33:35 +03:00
|
|
|
/* TODO: once all bus devices are qdevified, this should be done
|
|
|
|
* when bus is created by qdev.c */
|
|
|
|
qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
|
2010-12-08 14:35:08 +03:00
|
|
|
qemu_run_machine_init_done_notifiers();
|
|
|
|
|
2011-06-14 20:29:43 +04:00
|
|
|
qemu_system_reset(VMRESET_SILENT);
|
2009-08-20 21:42:22 +04:00
|
|
|
if (loadvm) {
|
2010-02-17 18:24:10 +03:00
|
|
|
if (load_vmstate(loadvm) < 0) {
|
2009-08-20 21:42:22 +04:00
|
|
|
autostart = 0;
|
|
|
|
}
|
|
|
|
}
|
2004-10-03 17:29:03 +04:00
|
|
|
|
2009-07-25 00:20:23 +04:00
|
|
|
if (incoming) {
|
2012-10-02 20:21:18 +04:00
|
|
|
Error *local_err = NULL;
|
|
|
|
qemu_start_incoming_migration(incoming, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
fprintf(stderr, "-incoming %s: %s\n", incoming, error_get_pretty(local_err));
|
|
|
|
error_free(local_err);
|
|
|
|
exit(1);
|
2010-06-09 16:10:54 +04:00
|
|
|
}
|
2009-08-09 15:39:20 +04:00
|
|
|
} else if (autostart) {
|
2009-03-06 02:01:01 +03:00
|
|
|
vm_start();
|
2009-08-09 15:39:20 +04:00
|
|
|
}
|
2006-12-21 22:46:43 +03:00
|
|
|
|
2010-06-10 13:42:28 +04:00
|
|
|
os_setup_post();
|
2006-12-22 05:11:31 +03:00
|
|
|
|
2004-03-31 23:00:16 +04:00
|
|
|
main_loop();
|
2011-09-12 16:03:13 +04:00
|
|
|
bdrv_close_all();
|
|
|
|
pause_all_vcpus();
|
2011-07-27 14:04:55 +04:00
|
|
|
res_free();
|
Support for TPM command line options
This patch adds support for TPM command line options.
The command line options supported here are
./qemu-... -tpmdev passthrough,path=<path to TPM device>,id=<id>
-device tpm-tis,tpmdev=<id>,id=<other id>
and
./qemu-... -tpmdev help
where the latter works similar to -soundhw help and shows a list of
available TPM backends (for example 'passthrough').
Using the type parameter, the backend is chosen, i.e., 'passthrough' for the
passthrough driver. The interpretation of the other parameters along
with determining whether enough parameters were provided is pushed into
the backend driver, which needs to implement the interface function
'create' and return a TPMDriverOpts structure if the VM can be started or
'NULL' if not enough or bad parameters were provided.
Monitor support for 'info tpm' has been added. It for example prints the
following:
(qemu) info tpm
TPM devices:
tpm0: model=tpm-tis
\ tpm0: type=passthrough,path=/dev/tpm0,cancel-path=/sys/devices/pnp0/00:09/cancel
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Joel Schopp <jschopp@linux.vnet.ibm.com>
Message-id: 1361987275-26289-2-git-send-email-stefanb@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-02-27 21:47:49 +04:00
|
|
|
#ifdef CONFIG_TPM
|
|
|
|
tpm_cleanup();
|
|
|
|
#endif
|
2007-10-22 03:20:45 +04:00
|
|
|
|
2003-06-24 17:42:40 +04:00
|
|
|
return 0;
|
|
|
|
}
|