aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-07-22 10:02:51 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-29 11:47:09 -0500
commitad6ee8fe97b2a07275cab1fe15ca6dbbddc77860 (patch)
tree4f2dd13e3548336181b5ee4e824a2cbfe2b75b1d
parent9fc1babd959abeb01001a5a507c515c34209fe84 (diff)
Add a pc-0.11 machine type and make the pc type an alias
The pc-0.11 type allows users of qemu-0.11 to use a machine type which they know will remain compatible when the upgrade to qemu-0.12. Management tools may choose to canonicalize the 'pc' machine type to 'pc-0.11' so that if the 'pc' alias changes target in future versions of qemu, the machine type used will remain compatible. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/pc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pc.c b/hw/pc.c
index a50f23d42c..c55c303bc1 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1512,7 +1512,8 @@ void cmos_set_s3_resume(void)
}
static QEMUMachine pc_machine = {
- .name = "pc",
+ .name = "pc-0.11",
+ .alias = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
.max_cpus = 255,