OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

compile -fsdev and -virtfs cmd line options unconditionally.

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2010-08-20 13:52:02 +02:00 committed by Anthony Liguori
parent 3329f07b7a
commit 03b0ba70ab
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu-options.hx
View File

@ -482,7 +482,6 @@ possible drivers and properties, use @code{-device ?} and
@code{-device @var{driver},?}. @code{-device @var{driver},?}.
ETEXI ETEXI
#ifdef CONFIG_LINUX
DEFHEADING(File system options:) DEFHEADING(File system options:)
DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev, DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev,
@ -515,9 +514,7 @@ Create a file-system-"device" for local-filesystem.
@end table @end table
ETEXI ETEXI
#endif
#ifdef CONFIG_LINUX
DEFHEADING(Virtual File system pass-through options:) DEFHEADING(Virtual File system pass-through options:)
DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs,
@ -554,7 +551,6 @@ Create a Virtual file-system-pass through for local-filesystem.
@end table @end table
ETEXI ETEXI
#endif
DEFHEADING() DEFHEADING()

17
vl.c
View File

@ -1811,6 +1811,7 @@ int main(int argc, char **argv, char **envp)
DisplayChangeListener *dcl; DisplayChangeListener *dcl;
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts; QemuOpts *hda_opts = NULL, *opts;
QemuOptsList *olist;
int optind; int optind;
const char *optarg; const char *optarg;
const char *loadvm = NULL; const char *loadvm = NULL;
@ -2286,9 +2287,13 @@ int main(int argc, char **argv, char **envp)
exit(1); exit(1);
} }
break; break;
#ifdef CONFIG_VIRTFS
case QEMU_OPTION_fsdev: case QEMU_OPTION_fsdev:
opts = qemu_opts_parse(qemu_find_opts("fsdev"), optarg, 1); 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);
if (!opts) { if (!opts) {
fprintf(stderr, "parse error: %s\n", optarg); fprintf(stderr, "parse error: %s\n", optarg);
exit(1); exit(1);
@ -2299,7 +2304,12 @@ int main(int argc, char **argv, char **envp)
char *arg_9p = NULL; char *arg_9p = NULL;
int len = 0; int len = 0;
opts = qemu_opts_parse(qemu_find_opts("virtfs"), optarg, 1); 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);
if (!opts) { if (!opts) {
fprintf(stderr, "parse error: %s\n", optarg); fprintf(stderr, "parse error: %s\n", optarg);
exit(1); exit(1);
@ -2350,7 +2360,6 @@ int main(int argc, char **argv, char **envp)
qemu_free(arg_9p); qemu_free(arg_9p);
break; break;
} }
#endif
case QEMU_OPTION_serial: case QEMU_OPTION_serial:
add_device_config(DEV_SERIAL, optarg); add_device_config(DEV_SERIAL, optarg);
default_serial = 0; default_serial = 0;