Commit 03b0ba70 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

compile -fsdev and -virtfs cmd line options unconditionally. 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 3329f07b

qemu-options.hx

+0 −4
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ possible drivers and properties, use @code{-device ?} and 
@code{-device @var{driver},?}.

ETEXI



#ifdef CONFIG_LINUX

DEFHEADING(File system options:)



DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev,
@@ -515,9 +514,7 @@ Create a file-system-"device" for local-filesystem. 


@end table

ETEXI

#endif



#ifdef CONFIG_LINUX

DEFHEADING(Virtual File system pass-through options:)



DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs,
@@ -554,7 +551,6 @@ Create a Virtual file-system-pass through for local-filesystem. 


@end table

ETEXI

#endif



DEFHEADING()

vl.c

+13 −4
Original line number Diff line number Diff line
@@ -1811,6 +1811,7 @@ int main(int argc, char **argv, char **envp) 
    DisplayChangeListener *dcl;

    int cyls, heads, secs, translation;

    QemuOpts *hda_opts = NULL, *opts;

    QemuOptsList *olist;

    int optind;

    const char *optarg;

    const char *loadvm = NULL;
@@ -2286,9 +2287,13 @@ int main(int argc, char **argv, char **envp) 
                    exit(1);

                }

                break;

#ifdef CONFIG_VIRTFS

            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) {

                    fprintf(stderr, "parse error: %s\n", optarg);

                    exit(1);
@@ -2299,7 +2304,12 @@ int main(int argc, char **argv, char **envp) 
                char *arg_9p = NULL;

                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) {

                    fprintf(stderr, "parse error: %s\n", optarg);

                    exit(1);
@@ -2350,7 +2360,6 @@ int main(int argc, char **argv, char **envp) 
                qemu_free(arg_9p);

                break;

            }

#endif

            case QEMU_OPTION_serial:

                add_device_config(DEV_SERIAL, optarg);

                default_serial = 0;