ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/i386: Deprecate the machine types pc-0.10 and pc-0.11 

The oldest machine type which is still used in a still maintained distro
is a pc-0.12 based machine type in RHEL6, so everything that is older
than pc-0.12 should not be used anymore. Thus let's deprecate pc-0.10
and pc-0.11 so that we can finally remove them in a future release.

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1529917512-10528-1-git-send-email-thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Thomas Huth 2018-06-25 11:05:12 +02:00 committed by Eduardo Habkost
parent 2ee3518b53
commit 08fe68244e
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/i386/pc_piix.c
View File

@ -956,6 +956,7 @@ static void pc_i440fx_0_11_machine_options(MachineClass *m)
{ {
pc_i440fx_0_12_machine_options(m); pc_i440fx_0_12_machine_options(m);
m->hw_version = "0.11"; m->hw_version = "0.11";
m->deprecation_reason = "use a newer machine type instead";
SET_MACHINE_COMPAT(m, PC_COMPAT_0_11); SET_MACHINE_COMPAT(m, PC_COMPAT_0_11);
} }

3
include/hw/boards.h
View File

@ -107,6 +107,8 @@ typedef struct {
/** /**
* MachineClass: * MachineClass:
* @deprecation_reason: If set, the machine is marked as deprecated. The
* string should provide some clear information about what to use instead.
* @max_cpus: maximum number of CPUs supported. Default: 1 * @max_cpus: maximum number of CPUs supported. Default: 1
* @min_cpus: minimum number of CPUs supported. Default: 1 * @min_cpus: minimum number of CPUs supported. Default: 1
* @default_cpus: number of CPUs instantiated if none are specified. Default: 1 * @default_cpus: number of CPUs instantiated if none are specified. Default: 1
@ -166,6 +168,7 @@ struct MachineClass {
char *name; char *name;
const char *alias; const char *alias;
const char *desc; const char *desc;
const char *deprecation_reason;
void (*init)(MachineState *state); void (*init)(MachineState *state);
void (*reset)(void); void (*reset)(void);

5
qemu-doc.texi
View File

@ -2943,6 +2943,11 @@ support page sizes < 4096 any longer.
@section System emulator machines @section System emulator machines
@subsection pc-0.10 and pc-0.11 (since 3.0)
These machine types are very old and likely can not be used for live migration
from old QEMU versions anymore. A newer machine type should be used instead.
@section Device options @section Device options
@subsection Block device options @subsection Block device options

10
vl.c
View File

@ -2560,8 +2560,9 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b)
if (mc->alias) { if (mc->alias) {
printf("%-20s %s (alias of %s)\n", mc->alias, mc->desc, mc->name); printf("%-20s %s (alias of %s)\n", mc->alias, mc->desc, mc->name);
} }
printf("%-20s %s%s\n", mc->name, mc->desc, printf("%-20s %s%s%s\n", mc->name, mc->desc,
mc->is_default ? " (default)" : ""); mc->is_default ? " (default)" : "",
mc->deprecation_reason ? " (deprecated)" : "");
} }
} }
@ -4263,6 +4264,11 @@ int main(int argc, char **argv, char **envp)
configure_accelerator(current_machine); configure_accelerator(current_machine);
if (!qtest_enabled() && machine_class->deprecation_reason) {
error_report("Machine type '%s' is deprecated: %s",
machine_class->name, machine_class->deprecation_reason);
}
/* /*
* Register all the global properties, including accel properties, * Register all the global properties, including accel properties,
* machine properties, and user-specified ones. * machine properties, and user-specified ones.