| Message ID | 1445189728-860-2-git-send-email-drjones@redhat.com |
|---|---|
| State | Accepted |
| Commit | 31bfa2a40004204aee503c6417fbafb5d17e0a51 |
| Headers | show |
On Sun, Oct 18, 2015 at 07:35:27PM +0200, Andrew Jones wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com> If this can go through my tree, please let me know. > --- > vl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index 7c806a2428399..9a64b75ebbd24 100644 > --- a/vl.c > +++ b/vl.c > @@ -4080,8 +4080,8 @@ int main(int argc, char **argv, char **envp) > > machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */ > if (max_cpus > machine_class->max_cpus) { > - fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus " > - "supported by machine `%s' (%d)\n", max_cpus, > + fprintf(stderr, "Number of SMP CPUs requested (%d) exceeds max CPUs " > + "supported by machine '%s' (%d)\n", max_cpus, > machine_class->name, machine_class->max_cpus); > exit(1); > } > -- > 2.4.3 >
Andrew Jones <drjones@redhat.com> writes: > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > vl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index 7c806a2428399..9a64b75ebbd24 100644 > --- a/vl.c > +++ b/vl.c > @@ -4080,8 +4080,8 @@ int main(int argc, char **argv, char **envp) > > machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */ > if (max_cpus > machine_class->max_cpus) { > - fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus " > - "supported by machine `%s' (%d)\n", max_cpus, > + fprintf(stderr, "Number of SMP CPUs requested (%d) exceeds max CPUs " > + "supported by machine '%s' (%d)\n", max_cpus, > machine_class->name, machine_class->max_cpus); > exit(1); > } While you're touching this, error_report(), please.
On 19/10/2015 20:51, Eduardo Habkost wrote: > On Sun, Oct 18, 2015 at 07:35:27PM +0200, Andrew Jones wrote: >> Signed-off-by: Andrew Jones <drjones@redhat.com> > > Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > Acked-by: Eduardo Habkost <ehabkost@redhat.com> > > If this can go through my tree, please let me know. Sure, why not. Paolo >> --- >> vl.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/vl.c b/vl.c >> index 7c806a2428399..9a64b75ebbd24 100644 >> --- a/vl.c >> +++ b/vl.c >> @@ -4080,8 +4080,8 @@ int main(int argc, char **argv, char **envp) >> >> machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */ >> if (max_cpus > machine_class->max_cpus) { >> - fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus " >> - "supported by machine `%s' (%d)\n", max_cpus, >> + fprintf(stderr, "Number of SMP CPUs requested (%d) exceeds max CPUs " >> + "supported by machine '%s' (%d)\n", max_cpus, >> machine_class->name, machine_class->max_cpus); >> exit(1); >> } >> -- >> 2.4.3 >> >
On Tue, Oct 20, 2015 at 09:12:18AM +0200, Markus Armbruster wrote: > Andrew Jones <drjones@redhat.com> writes: > > > Signed-off-by: Andrew Jones <drjones@redhat.com> > > --- > > vl.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/vl.c b/vl.c > > index 7c806a2428399..9a64b75ebbd24 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -4080,8 +4080,8 @@ int main(int argc, char **argv, char **envp) > > > > machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */ > > if (max_cpus > machine_class->max_cpus) { > > - fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus " > > - "supported by machine `%s' (%d)\n", max_cpus, > > + fprintf(stderr, "Number of SMP CPUs requested (%d) exceeds max CPUs " > > + "supported by machine '%s' (%d)\n", max_cpus, > > machine_class->name, machine_class->max_cpus); > > exit(1); > > } > > While you're touching this, error_report(), please. > Good call. Eduardo, I'll send you a v2 now. drew
diff --git a/vl.c b/vl.c index 7c806a2428399..9a64b75ebbd24 100644 --- a/vl.c +++ b/vl.c @@ -4080,8 +4080,8 @@ int main(int argc, char **argv, char **envp) machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */ if (max_cpus > machine_class->max_cpus) { - fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus " - "supported by machine `%s' (%d)\n", max_cpus, + fprintf(stderr, "Number of SMP CPUs requested (%d) exceeds max CPUs " + "supported by machine '%s' (%d)\n", max_cpus, machine_class->name, machine_class->max_cpus); exit(1); }
Signed-off-by: Andrew Jones <drjones@redhat.com> --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)