|
 |
eff9421 |
From 9aa404a57823c9fbf2bf2e0189d31a2b0d8bf3b9 Mon Sep 17 00:00:00 2001
|
|
|
eff9421 |
From: Amit Shah <amit.shah@redhat.com>
|
|
|
eff9421 |
Date: Thu, 25 Feb 2010 18:41:13 +0530
|
|
|
eff9421 |
Subject: [PATCH] pc: Add a Fedora-13 machine type that contains backports from upstream
|
|
|
eff9421 |
|
|
|
eff9421 |
We have a few features backported from the upstream 0.13 machine type
|
|
|
eff9421 |
in the repo here.
|
|
|
eff9421 |
|
|
|
eff9421 |
Add a 'fedora-13' machine type and use that by default so that users can
|
|
|
eff9421 |
fall back to a released upstream machine type if desired.
|
|
|
eff9421 |
|
|
|
eff9421 |
The fedora-13 machine type has the new multiport-supported virtio-serial
|
|
|
eff9421 |
and vhost-net patches as of now not present in the 0.12 machine type.
|
|
|
eff9421 |
|
|
|
eff9421 |
This is based on upstream commit
|
|
|
eff9421 |
d76fa62dba54a156ca0f5e79eb33756c9015e02c
|
|
|
eff9421 |
|
|
|
eff9421 |
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
|
eff9421 |
---
|
|
|
eff9421 |
hw/pc.c | 19 +++++++++++++++++--
|
|
|
eff9421 |
1 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
eff9421 |
|
|
|
eff9421 |
diff --git a/hw/pc.c b/hw/pc.c
|
|
|
eff9421 |
index 56be728..26c65c1 100644
|
|
|
eff9421 |
--- a/hw/pc.c
|
|
|
eff9421 |
+++ b/hw/pc.c
|
|
|
eff9421 |
@@ -1327,11 +1327,9 @@ void cmos_set_s3_resume(void)
|
|
|
eff9421 |
|
|
|
eff9421 |
static QEMUMachine pc_machine = {
|
|
|
eff9421 |
.name = "pc-0.12",
|
|
|
eff9421 |
- .alias = "pc",
|
|
|
eff9421 |
.desc = "Standard PC",
|
|
|
eff9421 |
.init = pc_init_pci,
|
|
|
eff9421 |
.max_cpus = 255,
|
|
|
eff9421 |
- .is_default = 1,
|
|
|
eff9421 |
};
|
|
|
eff9421 |
|
|
|
eff9421 |
static QEMUMachine pc_machine_v0_11 = {
|
|
|
eff9421 |
@@ -1416,3 +1414,20 @@ static void pc_machine_init(void)
|
|
|
eff9421 |
}
|
|
|
eff9421 |
|
|
|
eff9421 |
machine_init(pc_machine_init);
|
|
|
eff9421 |
+
|
|
|
eff9421 |
+/* Fedora machine types */
|
|
|
eff9421 |
+static QEMUMachine pc_machine_f13 = {
|
|
|
eff9421 |
+ .name = "fedora-13",
|
|
|
eff9421 |
+ .alias = "pc",
|
|
|
eff9421 |
+ .desc = "Standard PC",
|
|
|
eff9421 |
+ .init = pc_init_pci,
|
|
|
eff9421 |
+ .max_cpus = 255,
|
|
|
eff9421 |
+ .is_default = 1,
|
|
|
eff9421 |
+};
|
|
|
eff9421 |
+
|
|
|
eff9421 |
+static void fedora_machine_init(void)
|
|
|
eff9421 |
+{
|
|
|
eff9421 |
+ qemu_register_machine(&pc_machine_f13);
|
|
|
eff9421 |
+}
|
|
|
eff9421 |
+
|
|
|
eff9421 |
+machine_init(fedora_machine_init);
|
|
|
eff9421 |
--
|
|
|
eff9421 |
1.6.6.1
|
|
|
eff9421 |
|