qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jordan Justen <jordan.l.justen@intel.com>
To: qemu-devel@nongnu.org
Cc: Jordan Justen <jordan.l.justen@intel.com>
Subject: [Qemu-devel] [PATCH v11 8/9] hw/pc_piix: add pc-1.1
Date: Tue, 21 Feb 2012 23:18:55 -0800	[thread overview]
Message-ID: <1329895136-20494-9-git-send-email-jordan.l.justen@intel.com> (raw)
In-Reply-To: <1329895136-20494-1-git-send-email-jordan.l.justen@intel.com>

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
 hw/pc_piix.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 2fc4211..fcf0153 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -371,8 +371,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
 }
 #endif
 
-static QEMUMachine pc_machine_v1_0 = {
-    .name = "pc-1.0",
+static QEMUMachine pc_machine_v1_1 = {
+    .name = "pc-1.1",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci,
@@ -380,6 +380,13 @@ static QEMUMachine pc_machine_v1_0 = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v1_0 = {
+    .name = "pc-1.0",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+};
+
 static QEMUMachine pc_machine_v0_15 = {
     .name = "pc-0.15",
     .desc = "Standard PC",
@@ -669,6 +676,7 @@ static QEMUMachine xenfv_machine = {
 
 static void pc_machine_init(void)
 {
+    qemu_register_machine(&pc_machine_v1_1);
     qemu_register_machine(&pc_machine_v1_0);
     qemu_register_machine(&pc_machine_v0_15);
     qemu_register_machine(&pc_machine_v0_14);
-- 
1.7.1

  parent reply	other threads:[~2012-02-22  7:19 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-22  7:18 [Qemu-devel] [PATCH v11 0/9] PC system flash support Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 1/9] blockdev: allow read-only pflash devices Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 2/9] pflash_cfi01/02: support " Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 3/9] vl: make find_default_machine externally visible Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 4/9] hw/pc: move rom init to pc_sysfw.c Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 5/9] hw/pc_sysfw: enable pc-sysfw as a qdev Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 6/9] hw/pc_sysfw: support system flash memory with pflash Jordan Justen
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 7/9] hw/pc_piix: remove is_default for pc-0.15 Jordan Justen
2012-02-22  7:18 ` Jordan Justen [this message]
2012-02-22  7:18 ` [Qemu-devel] [PATCH v11 9/9] pc_piix/pc_sysfw: enable flash by default Jordan Justen
2012-02-22 18:54 ` [Qemu-devel] [PATCH v11 0/9] PC system flash support Anthony Liguori
2012-03-13 12:34 ` Paolo Bonzini
2012-03-14 17:04   ` Jordan Justen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1329895136-20494-9-git-send-email-jordan.l.justen@intel.com \
    --to=jordan.l.justen@intel.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).