Remove the deprecated -nodefconfig option
It's the same as -no-user-config and marked as deprecated since three releases already. Time to remove it now. Acked-by: Peter Krempa <pkrempa@redhat.com> Acked-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
1d9cb42c56
commit
2feac451d2
|
@ -129,7 +129,7 @@ To show some example invocations of command-line, we will use the
|
||||||
following invocation of QEMU, with a QMP server running over UNIX
|
following invocation of QEMU, with a QMP server running over UNIX
|
||||||
socket::
|
socket::
|
||||||
|
|
||||||
$ ./x86_64-softmmu/qemu-system-x86_64 -display none -nodefconfig \
|
$ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \
|
||||||
-M q35 -nodefaults -m 512 \
|
-M q35 -nodefaults -m 512 \
|
||||||
-blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \
|
-blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \
|
||||||
-device virtio-blk,drive=node-A,id=virtio0 \
|
-device virtio-blk,drive=node-A,id=virtio0 \
|
||||||
|
@ -694,7 +694,7 @@ instance, with the following invocation. (As noted earlier, for
|
||||||
simplicity's sake, the destination QEMU is started on the same host, but
|
simplicity's sake, the destination QEMU is started on the same host, but
|
||||||
it could be located elsewhere)::
|
it could be located elsewhere)::
|
||||||
|
|
||||||
$ ./x86_64-softmmu/qemu-system-x86_64 -display none -nodefconfig \
|
$ ./x86_64-softmmu/qemu-system-x86_64 -display none -no-user-config \
|
||||||
-M q35 -nodefaults -m 512 \
|
-M q35 -nodefaults -m 512 \
|
||||||
-blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \
|
-blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \
|
||||||
-device virtio-blk,drive=node-TargetDisk,id=virtio0 \
|
-device virtio-blk,drive=node-TargetDisk,id=virtio0 \
|
||||||
|
|
|
@ -82,10 +82,6 @@ would automatically enable USB support on the machine type.
|
||||||
If using the new syntax, USB support must be explicitly
|
If using the new syntax, USB support must be explicitly
|
||||||
enabled via the ``-machine usb=on'' argument.
|
enabled via the ``-machine usb=on'' argument.
|
||||||
|
|
||||||
@subsection -nodefconfig (since 2.11.0)
|
|
||||||
|
|
||||||
The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.
|
|
||||||
|
|
||||||
@subsection -fsdev handle (since 2.12.0)
|
@subsection -fsdev handle (since 2.12.0)
|
||||||
|
|
||||||
The ``handle'' fsdev backend does not support symlinks and causes the 9p
|
The ``handle'' fsdev backend does not support symlinks and causes the 9p
|
||||||
|
|
|
@ -3833,8 +3833,7 @@ Write device configuration to @var{file}. The @var{file} can be either filename
|
||||||
command line and device configuration into file or dash @code{-}) character to print the
|
command line and device configuration into file or dash @code{-}) character to print the
|
||||||
output to stdout. This can be later used as input file for @code{-readconfig} option.
|
output to stdout. This can be later used as input file for @code{-readconfig} option.
|
||||||
ETEXI
|
ETEXI
|
||||||
HXCOMM Deprecated, same as -no-user-config
|
|
||||||
DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "", QEMU_ARCH_ALL)
|
|
||||||
DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
|
DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
|
||||||
"-no-user-config\n"
|
"-no-user-config\n"
|
||||||
" do not load default user-provided config files at startup\n",
|
" do not load default user-provided config files at startup\n",
|
||||||
|
@ -3845,6 +3844,7 @@ STEXI
|
||||||
The @code{-no-user-config} option makes QEMU not load any of the user-provided
|
The @code{-no-user-config} option makes QEMU not load any of the user-provided
|
||||||
config files on @var{sysconfdir}.
|
config files on @var{sysconfdir}.
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
DEF("trace", HAS_ARG, QEMU_OPTION_trace,
|
DEF("trace", HAS_ARG, QEMU_OPTION_trace,
|
||||||
"-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
|
"-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
|
||||||
" specify tracing options\n",
|
" specify tracing options\n",
|
||||||
|
|
2
vl.c
2
vl.c
|
@ -2999,7 +2999,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
|
|
||||||
popt = lookup_opt(argc, argv, &optarg, &optind);
|
popt = lookup_opt(argc, argv, &optarg, &optind);
|
||||||
switch (popt->index) {
|
switch (popt->index) {
|
||||||
case QEMU_OPTION_nodefconfig:
|
|
||||||
case QEMU_OPTION_nouserconfig:
|
case QEMU_OPTION_nouserconfig:
|
||||||
userconfig = false;
|
userconfig = false;
|
||||||
break;
|
break;
|
||||||
|
@ -3927,7 +3926,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
case QEMU_OPTION_enable_sync_profile:
|
case QEMU_OPTION_enable_sync_profile:
|
||||||
qsp_enable();
|
qsp_enable();
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_nodefconfig:
|
|
||||||
case QEMU_OPTION_nouserconfig:
|
case QEMU_OPTION_nouserconfig:
|
||||||
/* Nothing to be parsed here. Especially, do not error out below. */
|
/* Nothing to be parsed here. Especially, do not error out below. */
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue