Patchwork [v10,7/8] hw/pc_piix: add pc-1.1

login
register
mail settings
Submitter jordan.l.justen@intel.com
Date Jan. 8, 2012, 7:51 p.m.
Message ID <1326052300-1172-8-git-send-email-jordan.l.justen@intel.com>
Download mbox | patch
Permalink /patch/134928/
State New
Headers show

Comments

jordan.l.justen@intel.com - Jan. 8, 2012, 7:51 p.m.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
 hw/pc_piix.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
Alexander Graf - Jan. 9, 2012, 12:12 a.m.
On 08.01.2012, at 20:51, Jordan Justen wrote:

> 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",

This is missing registration of the v1.1 machine, no? Please see my -cpu best default patch I just posted.


Alex
Jordan Justen - Jan. 9, 2012, 1:11 a.m.
On Sun, Jan 8, 2012 at 16:12, Alexander Graf <agraf@suse.de> wrote:
>
> On 08.01.2012, at 20:51, Jordan Justen wrote:
>
>> 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",
>
> This is missing registration of the v1.1 machine, no? Please see my -cpu best default patch I just posted.

Yep, whoops.  I was splitting my change apart compared to v9, and it
looks like I mistakenly added the registration portion into patch 8/8.

Now that I see you are adding pc-1.1, it seems likely that I'll
probably be reworking my changeset again after yours is merged.

I also had added that pc-0.15 is_default change into my changeset, but
hopefully you'll have that change merged soon as well.

Thanks,

-Jordan

Patch

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",