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 v10 7/8] hw/pc_piix: add pc-1.1
Date: Sun,  8 Jan 2012 11:51:39 -0800	[thread overview]
Message-ID: <1326052300-1172-8-git-send-email-jordan.l.justen@intel.com> (raw)
In-Reply-To: <1326052300-1172-1-git-send-email-jordan.l.justen@intel.com>

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

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 00f525e..aea95e4 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -314,8 +314,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,
@@ -323,6 +323,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",
-- 
1.7.1

  parent reply	other threads:[~2012-01-08 19:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-08 19:51 [Qemu-devel] [PATCH v10 0/8] PC system flash support Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 1/8] blockdev: allow read-only pflash devices Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 2/8] pflash_cfi01/02: support " Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 3/8] vl: make find_default_machine externally visible Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 4/8] hw/pc: move rom init to pc_sysfw.c Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 5/8] hw/pc_sysfw: Support system flash memory with pflash Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 6/8] hw/pc_piix: remove is_default for pc-0.15 Jordan Justen
2012-01-08 19:51 ` Jordan Justen [this message]
2012-01-09  0:12   ` [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 Alexander Graf
2012-01-09  1:11     ` Jordan Justen
2012-01-08 19:51 ` [Qemu-devel] [PATCH v10 8/8] pc: enable system flash for pc-1.1 Jordan Justen
2012-01-08 19:59 ` [Qemu-devel] [PATCH v10 0/8] PC system flash support 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=1326052300-1172-8-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).