Use machine_init() to register virtfs config options.

This commit is contained in:
Gerd Hoffmann 2010-08-25 12:19:49 +02:00
parent 6b62dc2dd7
commit 526c523781
2 changed files with 9 additions and 5 deletions

View File

@ -16,6 +16,7 @@
#include "qemu-queue.h" #include "qemu-queue.h"
#include "osdep.h" #include "osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-config.h"
static QTAILQ_HEAD(FsTypeEntry_head, FsTypeListEntry) fstype_entries = static QTAILQ_HEAD(FsTypeEntry_head, FsTypeListEntry) fstype_entries =
QTAILQ_HEAD_INITIALIZER(fstype_entries); QTAILQ_HEAD_INITIALIZER(fstype_entries);
@ -75,3 +76,11 @@ FsTypeEntry *get_fsdev_fsentry(char *id)
} }
return NULL; return NULL;
} }
static void fsdev_register_config(void)
{
qemu_add_opts(&qemu_fsdev_opts);
qemu_add_opts(&qemu_virtfs_opts);
}
machine_init(fsdev_register_config);

5
vl.c
View File

@ -1863,11 +1863,6 @@ int main(int argc, char **argv, char **envp)
tb_size = 0; tb_size = 0;
autostart= 1; autostart= 1;
#ifdef CONFIG_VIRTFS
qemu_add_opts(&qemu_fsdev_opts);
qemu_add_opts(&qemu_virtfs_opts);
#endif
/* first pass of option parsing */ /* first pass of option parsing */
optind = 1; optind = 1;
while (optind < argc) { while (optind < argc) {