| Message ID | 1345226022-21654-2-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, 17 Aug 2012 14:53:37 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > Make source code lines shorter. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 96ec9e6..519a104 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1500,20 +1500,23 @@ void x86_cpudef_setup(void) > static const char *model_with_versions[] = { "qemu32", "qemu64", > "athlon" }; > for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) { > - builtin_x86_defs[i].next = x86_defs; > - builtin_x86_defs[i].flags = 1; > + x86_def_t *def = &builtin_x86_defs[i]; > + def->next = x86_defs; > + def->flags = 1; > > /* Look for specific "cpudef" models that */ > /* have the QEMU version in .model_id */ > for (j = 0; j < ARRAY_SIZE(model_with_versions); j++) { > - if (strcmp(model_with_versions[j], builtin_x86_defs[i].name) > == 0) { > - pstrcpy(builtin_x86_defs[i].model_id, > sizeof(builtin_x86_defs[i].model_id), "QEMU Virtual CPU version "); > - pstrcat(builtin_x86_defs[i].model_id, > sizeof(builtin_x86_defs[i].model_id), qemu_get_version()); > + if (strcmp(model_with_versions[j], def->name) == 0) { > + pstrcpy(def->model_id, sizeof(def->model_id), > + "QEMU Virtual CPU version "); > + pstrcat(def->model_id, sizeof(def->model_id), > + qemu_get_version()); > break; > } > } > > - x86_defs = &builtin_x86_defs[i]; > + x86_defs = def; > } > #if !defined(CONFIG_USER_ONLY) > qemu_opts_foreach(qemu_find_opts("cpudef"), cpudef_register, NULL, 0); Reviewed-By: Igor Mammedov <imammedo@redhat.com>
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 96ec9e6..519a104 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1500,20 +1500,23 @@ void x86_cpudef_setup(void) static const char *model_with_versions[] = { "qemu32", "qemu64", "athlon" }; for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) { - builtin_x86_defs[i].next = x86_defs; - builtin_x86_defs[i].flags = 1; + x86_def_t *def = &builtin_x86_defs[i]; + def->next = x86_defs; + def->flags = 1; /* Look for specific "cpudef" models that */ /* have the QEMU version in .model_id */ for (j = 0; j < ARRAY_SIZE(model_with_versions); j++) { - if (strcmp(model_with_versions[j], builtin_x86_defs[i].name) == 0) { - pstrcpy(builtin_x86_defs[i].model_id, sizeof(builtin_x86_defs[i].model_id), "QEMU Virtual CPU version "); - pstrcat(builtin_x86_defs[i].model_id, sizeof(builtin_x86_defs[i].model_id), qemu_get_version()); + if (strcmp(model_with_versions[j], def->name) == 0) { + pstrcpy(def->model_id, sizeof(def->model_id), + "QEMU Virtual CPU version "); + pstrcat(def->model_id, sizeof(def->model_id), + qemu_get_version()); break; } } - x86_defs = &builtin_x86_defs[i]; + x86_defs = def; } #if !defined(CONFIG_USER_ONLY) qemu_opts_foreach(qemu_find_opts("cpudef"), cpudef_register, NULL, 0);
Make source code lines shorter. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)