[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/13] qdev: add -device command line option.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 05/13] qdev: add -device command line option. |
Date: |
Fri, 10 Jul 2009 13:26:11 +0200 |
Add a linked list where command line options can be saved.
Use it for the new -device and for the -usbdevice and -bt switches.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qdev.c | 9 ++++-
qemu-options.hx | 2 +
vl.c | 97 ++++++++++++++++++++++++++++++++++++-------------------
3 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index e86c896..3f8e456 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -115,6 +115,11 @@ DeviceState *qdev_device_add(const char *cmdline)
}
info = qdev_find_info(NULL, driver);
+ if (!info) {
+ fprintf(stderr, "Device \"%s\" not found. Try -device '?' for a
list.\n",
+ driver);
+ return NULL;
+ }
if (!info->bus_info->add_dev) {
fprintf(stderr, "bus \"%s\" can't add devices.\n",
info->bus_info->name);
@@ -125,8 +130,10 @@ DeviceState *qdev_device_add(const char *cmdline)
if (params) {
while (params[0]) {
- if (2 != sscanf(params, "%31[^=]=%255[^,]%n", tag, value, &n))
+ if (2 != sscanf(params, "%31[^=]=%255[^,]%n", tag, value, &n)) {
+ fprintf(stderr, "parse error at \"%s\"\n", params);
break;
+ }
params += n;
if (strcmp(tag, "addr") == 0)
continue;
diff --git a/qemu-options.hx b/qemu-options.hx
index 3f69965..a8ef373 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -362,6 +362,8 @@ Network adapter that supports CDC ethernet and RNDIS
protocols.
@end table
ETEXI
+DEF("device", HAS_ARG, QEMU_OPTION_device,
+ "-device driver[,options] add device\n")
DEF("name", HAS_ARG, QEMU_OPTION_name,
"-name string1[,process=string2] set the name of the guest\n"
" string1 sets the window title and string2 the process name
(on Linux)\n")
diff --git a/vl.c b/vl.c
index 50665cf..dddceef 100644
--- a/vl.c
+++ b/vl.c
@@ -143,6 +143,7 @@ int main(int argc, char **argv)
#include "hw/watchdog.h"
#include "hw/smbios.h"
#include "hw/xen.h"
+#include "hw/qdev.h"
#include "bt-host.h"
#include "net.h"
#include "monitor.h"
@@ -173,12 +174,6 @@ int main(int argc, char **argv)
#define DEFAULT_RAM_SIZE 128
-/* Max number of USB devices that can be specified on the commandline. */
-#define MAX_USB_CMDLINE 8
-
-/* Max number of bluetooth switches on the commandline. */
-#define MAX_BT_CMDLINE 10
-
static const char *data_dir;
const char *bios_name = NULL;
/* Note: drives_table[MAX_DRIVES] is a dummy block driver if none available
@@ -2574,6 +2569,11 @@ static int usb_device_del(const char *devname)
return usb_device_del_addr(bus_num, addr);
}
+static int usb_parse(const char *cmdline)
+{
+ return usb_device_add(cmdline, 0);
+}
+
void do_usb_add(Monitor *mon, const char *devname)
{
usb_device_add(devname, 1);
@@ -4757,6 +4757,52 @@ char *qemu_find_file(int type, const char *name)
return buf;
}
+struct device_config {
+ enum {
+ DEV_GENERIC, /* -device */
+ DEV_USB, /* -usbdevice */
+ DEV_BT, /* -bt */
+ } type;
+ const char *cmdline;
+ TAILQ_ENTRY(device_config) next;
+};
+TAILQ_HEAD(, device_config) device_configs =
TAILQ_HEAD_INITIALIZER(device_configs);
+
+static void add_device_config(int type, const char *cmdline)
+{
+ struct device_config *conf;
+
+ conf = qemu_mallocz(sizeof(*conf));
+ conf->type = type;
+ conf->cmdline = cmdline;
+ TAILQ_INSERT_TAIL(&device_configs, conf, next);
+}
+
+static int foreach_device_config(int type, int (*func)(const char *cmdline))
+{
+ struct device_config *conf;
+ int rc;
+
+ TAILQ_FOREACH(conf, &device_configs, next) {
+ if (conf->type != type)
+ continue;
+ rc = func(conf->cmdline);
+ if (0 != rc)
+ return rc;
+ }
+ return 0;
+}
+
+static int generic_parse(const char *cmdline)
+{
+ DeviceState *dev;
+
+ dev = qdev_device_add(cmdline);
+ if (!dev)
+ return -1;
+ return 0;
+}
+
int main(int argc, char **argv, char **envp)
{
const char *gdbstub_dev = NULL;
@@ -4771,8 +4817,6 @@ int main(int argc, char **argv, char **envp)
int cyls, heads, secs, translation;
const char *net_clients[MAX_NET_CLIENTS];
int nb_net_clients;
- const char *bt_opts[MAX_BT_CMDLINE];
- int nb_bt_opts;
int hda_index;
int optind;
const char *r, *optarg;
@@ -4787,8 +4831,6 @@ int main(int argc, char **argv, char **envp)
const char *loadvm = NULL;
QEMUMachine *machine;
const char *cpu_model;
- const char *usb_devices[MAX_USB_CMDLINE];
- int usb_devices_index;
#ifndef _WIN32
int fds[2];
#endif
@@ -4868,10 +4910,7 @@ int main(int argc, char **argv, char **envp)
node_cpumask[i] = 0;
}
- usb_devices_index = 0;
-
nb_net_clients = 0;
- nb_bt_opts = 0;
nb_drives = 0;
nb_drives_opt = 0;
nb_numa_nodes = 0;
@@ -5118,11 +5157,7 @@ int main(int argc, char **argv, char **envp)
break;
#endif
case QEMU_OPTION_bt:
- if (nb_bt_opts >= MAX_BT_CMDLINE) {
- fprintf(stderr, "qemu: too many bluetooth options\n");
- exit(1);
- }
- bt_opts[nb_bt_opts++] = optarg;
+ add_device_config(DEV_BT, optarg);
break;
#ifdef HAS_AUDIO
case QEMU_OPTION_audio_help:
@@ -5364,12 +5399,10 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_usbdevice:
usb_enabled = 1;
- if (usb_devices_index >= MAX_USB_CMDLINE) {
- fprintf(stderr, "Too many USB devices\n");
- exit(1);
- }
- usb_devices[usb_devices_index] = optarg;
- usb_devices_index++;
+ add_device_config(DEV_USB, optarg);
+ break;
+ case QEMU_OPTION_device:
+ add_device_config(DEV_GENERIC, optarg);
break;
case QEMU_OPTION_smp:
smp_cpus = atoi(optarg);
@@ -5692,9 +5725,8 @@ int main(int argc, char **argv, char **envp)
net_client_check();
/* init the bluetooth world */
- for (i = 0; i < nb_bt_opts; i++)
- if (bt_parse(bt_opts[i]))
- exit(1);
+ if (foreach_device_config(DEV_BT, bt_parse))
+ exit(1);
/* init the memory */
if (ram_size == 0)
@@ -5882,14 +5914,13 @@ int main(int argc, char **argv, char **envp)
/* init USB devices */
if (usb_enabled) {
- for(i = 0; i < usb_devices_index; i++) {
- if (usb_device_add(usb_devices[i], 0) < 0) {
- fprintf(stderr, "Warning: could not add USB device %s\n",
- usb_devices[i]);
- }
- }
+ foreach_device_config(DEV_USB, usb_parse);
}
+ /* init generic devices */
+ if (foreach_device_config(DEV_GENERIC, generic_parse))
+ exit(1);
+
if (!display_state)
dumb_display_init();
/* just use the first displaystate for the moment */
--
1.6.2.5
- [Qemu-devel] [PATCH 09/13] qdev/pci: hook up i440fx., (continued)
[Qemu-devel] [PATCH 10/13] qdev: add user-specified identifier to devices., Gerd Hoffmann, 2009/07/10
[Qemu-devel] [PATCH 12/13] qdev: add id= support for pci nics., Gerd Hoffmann, 2009/07/10
[Qemu-devel] [PATCH 05/13] qdev: add -device command line option.,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 11/13] switch balloon initialization to -device., Gerd Hoffmann, 2009/07/10