From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 1/8] add pc-1.3 machine type
Date: Wed, 26 Sep 2012 09:36:04 +0200 [thread overview]
Message-ID: <1348644971-3490-2-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1348644971-3490-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.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 88ff041..5a0796b 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -349,8 +349,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
}
#endif
-static QEMUMachine pc_machine_v1_2 = {
- .name = "pc-1.2",
+static QEMUMachine pc_machine_v1_3 = {
+ .name = "pc-1.3",
.alias = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
@@ -358,6 +358,13 @@ static QEMUMachine pc_machine_v1_2 = {
.is_default = 1,
};
+static QEMUMachine pc_machine_v1_2 = {
+ .name = "pc-1.2",
+ .desc = "Standard PC",
+ .init = pc_init_pci,
+ .max_cpus = 255,
+};
+
#define PC_COMPAT_1_1 \
{\
.driver = "virtio-scsi-pci",\
@@ -655,6 +662,7 @@ static QEMUMachine xenfv_machine = {
static void pc_machine_init(void)
{
+ qemu_register_machine(&pc_machine_v1_3);
qemu_register_machine(&pc_machine_v1_2);
qemu_register_machine(&pc_machine_v1_1);
qemu_register_machine(&pc_machine_v1_0);
--
1.7.1
next prev parent reply other threads:[~2012-09-26 7:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 7:36 [Qemu-devel] [PULL 0/8] usb patch queue Gerd Hoffmann
2012-09-26 7:36 ` Gerd Hoffmann [this message]
2012-09-26 7:36 ` [Qemu-devel] [PATCH 2/8] compat: turn off msi/msix on xhci for old machine types Gerd Hoffmann
2012-09-26 7:36 ` [Qemu-devel] [PATCH 3/8] xhci: tweak limits Gerd Hoffmann
2012-09-26 7:36 ` [Qemu-devel] [PATCH 4/8] xhci: route string & usb hub support Gerd Hoffmann
2012-09-26 7:36 ` [Qemu-devel] [PATCH 5/8] xhci: create a memory region for each port Gerd Hoffmann
2012-09-26 7:36 ` [Qemu-devel] [PATCH 6/8] ehci: Fix interrupt packet MULT handling Gerd Hoffmann
2012-09-26 7:36 ` [Qemu-devel] [PATCH 7/8] usb-redir: Adjust pkg-config check for usbredirparser .pc file rename (v2) Gerd Hoffmann
2012-09-26 7:36 ` [Qemu-devel] [PATCH 8/8] usb: Fix usb_packet_map() in the presence of IOMMUs Gerd Hoffmann
2012-10-05 2:13 ` [Qemu-devel] [PULL 0/8] usb patch queue Anthony Liguori
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=1348644971-3490-2-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.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).