| Message ID | 20200409134133.11339-1-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-5.0] vl.c: error out if -mem-path is used together with -M memory-backend | expand |
On Thu, Apr 9, 2020 at 3:41 PM Igor Mammedov <imammedo@redhat.com> wrote: > > the former is not actually used by explicit backend, so instead of > silently ignoring the option in non valid context, exit with error. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > softmmu/vl.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index 58a40bcfc1..32c0047889 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -4315,6 +4315,11 @@ void qemu_init(int argc, char **argv, char **envp) > "explicitly specified 'memory-backend' property"); > exit(EXIT_FAILURE); > } > + if (mem_path) { > + error_report("'-mem-path' can't be used together with" > + "'-machine memory-backend'"); > + exit(EXIT_FAILURE); > + } > ram_size = backend_size; > } > > -- > 2.18.1 > >
diff --git a/softmmu/vl.c b/softmmu/vl.c index 58a40bcfc1..32c0047889 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4315,6 +4315,11 @@ void qemu_init(int argc, char **argv, char **envp) "explicitly specified 'memory-backend' property"); exit(EXIT_FAILURE); } + if (mem_path) { + error_report("'-mem-path' can't be used together with" + "'-machine memory-backend'"); + exit(EXIT_FAILURE); + } ram_size = backend_size; }
the former is not actually used by explicit backend, so instead of silently ignoring the option in non valid context, exit with error. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- softmmu/vl.c | 5 +++++ 1 file changed, 5 insertions(+)