From: Lan Tianyu <tianyu.lan@intel.com>
To: qemu-devel@nongnu.org
Cc: Lan Tianyu <tianyu.lan@intel.com>,
mst@redhat.com, pbonzini@redhat.com, rth@twiddle.net,
ehabkost@redhat.com, berrange@redhat.com, rkrcmar@redhat.com
Subject: [Qemu-devel] [PATCH v3 1/2] pc: add 2.11 machine type
Date: Tue, 15 Aug 2017 20:06:18 -0400 [thread overview]
Message-ID: <1502841979-6233-1-git-send-email-tianyu.lan@intel.com> (raw)
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
---
hw/i386/pc_piix.c | 14 +++++++++++---
hw/i386/pc_q35.c | 14 +++++++++++---
include/hw/compat.h | 3 +++
include/hw/i386/pc.h | 3 +++
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 11b4336..e99ec8c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -436,11 +436,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_display = "std";
}
-static void pc_i440fx_2_10_machine_options(MachineClass *m)
+static void pc_i440fx_2_11_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = 1;
+}
+
+DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
+ pc_i440fx_2_11_machine_options);
+
+static void pc_i440fx_2_10_machine_options(MachineClass *m)
+{
+ pc_i440fx_machine_options(m);
+ m->is_default = 0;
+ m->alias = NULL;
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
}
@@ -450,8 +460,6 @@ DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
static void pc_i440fx_2_9_machine_options(MachineClass *m)
{
pc_i440fx_2_10_machine_options(m);
- m->is_default = 0;
- m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 169a214..b469d05 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -302,11 +302,20 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288;
}
+static void pc_q35_2_11_machine_options(MachineClass *m)
+{
+ pc_q35_machine_options(m);
+ m->alias = "q35";
+}
+DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
+ pc_q35_2_11_machine_options);
+
static void pc_q35_2_10_machine_options(MachineClass *m)
{
- pc_q35_machine_options(m);
- m->alias = "q35";
+ pc_q35_2_11_machine_options(m);
+ m->alias = NULL;
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);
}
DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
@@ -315,7 +324,6 @@ DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
static void pc_q35_2_9_machine_options(MachineClass *m)
{
pc_q35_2_10_machine_options(m);
- m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
}
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 08f3600..3e101f8 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -1,6 +1,9 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
+#define HW_COMPAT_2_10 \
+ /* empty */
+
#define HW_COMPAT_2_9 \
{\
.driver = "pci-bridge",\
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index d80859b..8226904 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
int e820_get_num_entries(void);
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
+#define PC_COMPAT_2_10 \
+ HW_COMPAT_2_10 \
+
#define PC_COMPAT_2_9 \
HW_COMPAT_2_9 \
{\
--
1.8.3.1
next reply other threads:[~2017-08-16 6:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-16 0:06 Lan Tianyu [this message]
2017-08-16 0:06 ` [Qemu-devel] [PATCH v3 2/2] x86: Increase max vcpu number to 8192 Lan Tianyu
2017-08-18 19:01 ` [Qemu-devel] [PATCH v3 1/2] pc: add 2.11 machine type Eduardo Habkost
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=1502841979-6233-1-git-send-email-tianyu.lan@intel.com \
--to=tianyu.lan@intel.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rkrcmar@redhat.com \
--cc=rth@twiddle.net \
/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).