diff mbox series

[2/5] hw/i386: Rename 2.13 machine types to 3.0

Message ID 20180522104000.9044-3-peter.maydell@linaro.org
State Accepted
Commit aa78a16d86453d393b0a900032b7741d3b8049fb
Headers show
Series Make the next release be 3.0 | expand

Commit Message

Peter Maydell May 22, 2018, 10:39 a.m. UTC 
Rename the 2.13 machine types to match what we're going to
use as our next release number.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/i386/pc_piix.c | 8 ++++----
 hw/i386/pc_q35.c  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

-- 
2.17.0

Comments

Cornelia Huck May 22, 2018, 11:11 a.m. UTC | #1 
On Tue, 22 May 2018 11:39:57 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machine types to match what we're going to

> use as our next release number.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>  hw/i386/pc_piix.c | 8 ++++----

>  hw/i386/pc_q35.c  | 8 ++++----

>  2 files changed, 8 insertions(+), 8 deletions(-)


Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Thomas Huth May 22, 2018, 11:45 a.m. UTC | #2 
On 22.05.2018 12:39, Peter Maydell wrote:
> Rename the 2.13 machine types to match what we're going to

> use as our next release number.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>  hw/i386/pc_piix.c | 8 ++++----

>  hw/i386/pc_q35.c  | 8 ++++----

>  2 files changed, 8 insertions(+), 8 deletions(-)


Reviewed-by: Thomas Huth <thuth@redhat.com>
Eduardo Habkost May 22, 2018, 11:46 a.m. UTC | #3 
On Tue, May 22, 2018 at 11:39:57AM +0100, Peter Maydell wrote:
> Rename the 2.13 machine types to match what we're going to

> use as our next release number.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>


-- 
Eduardo
Igor Mammedov May 30, 2018, 10:11 a.m. UTC | #4 
On Tue, 22 May 2018 11:39:57 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> Rename the 2.13 machine types to match what we're going to

> use as our next release number.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

[...]
q35 hunk of this patch for no apparent reasons causes
change of the NVDIMM's DSM page allocated by Seabios.

@ -5,13 +5,13 @@
  * 
  * Disassembling to symbolic ASL+ operators
  *
- * Disassembly of tests/acpi-test-data/q35/SSDT.dimmpxm, Wed May 30 11:20:51 2018
+ * Disassembly of /tmp/aml-3XMAJZ, Wed May 30 11:20:51 2018
  *
  * Original Table Header:
  *     Signature        "SSDT"
  *     Length           0x000002AD (685)
  *     Revision         0x01
- *     Checksum         0x50
+ *     Checksum         0x40
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "NVDIMM"
  *     OEM Revision     0x00000001 (1)
@@ -183,6 +183,6 @@ DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
         }
     }
 
-    Name (MEMA, 0x07FFE000)
+    Name (MEMA, 0x07FFF000)
 }

As far as I see it should safe wrt NVDIMMs,
but the question is what in this commit forced Seabios
to change allocated address?

Offending commit aa78a16d86:
Testcase to reproduce:
 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 tests/bios-tables-test

CLI to reproduce manually:
x86_64-softmmu/qemu-system-x86_64 -M q35 -machine nvdimm=on -smp 4,sockets=4  -m 128M,slots=3,maxmem=1G  -numa node,mem=32M,nodeid=0  -numa node,mem=32M,nodeid=1  -numa node,mem=32M,nodeid=2 -numa node,mem=32M,nodeid=3 -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 -numa cpu,node-id=2,socket-id=2 -numa cpu,node-id=3,socket-id=3 -object memory-backend-ram,id=ram0,size=128M -object memory-backend-ram,id=nvm0,size=128M -device pc-dimm,id=dimm0,memdev=ram0,node=1  -device nvdimm,id=dimm1,memdev=nvm0,node=2 

> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c

> index 2372457c6a..83d6d75efa 100644

> --- a/hw/i386/pc_q35.c

> +++ b/hw/i386/pc_q35.c

> @@ -308,18 +308,18 @@ static void pc_q35_machine_options(MachineClass *m)

>      m->max_cpus = 288;

>  }

>  

> -static void pc_q35_2_13_machine_options(MachineClass *m)

> +static void pc_q35_3_0_machine_options(MachineClass *m)

>  {

>      pc_q35_machine_options(m);

>      m->alias = "q35";

>  }

>  

> -DEFINE_Q35_MACHINE(v2_13, "pc-q35-2.13", NULL,

> -                    pc_q35_2_13_machine_options);

> +DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,

> +                    pc_q35_3_0_machine_options);

>  

>  static void pc_q35_2_12_machine_options(MachineClass *m)

>  {

> -    pc_q35_2_13_machine_options(m);

> +    pc_q35_3_0_machine_options(m);

>      m->alias = NULL;

>      SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

>  }
Paolo Bonzini May 30, 2018, 10:19 a.m. UTC | #5 
On 30/05/2018 12:11, Igor Mammedov wrote:
> -    Name (MEMA, 0x07FFE000)

> +    Name (MEMA, 0x07FFF000)

>  }

> 

> As far as I see it should safe wrt NVDIMMs,

> but the question is what in this commit forced Seabios

> to change allocated address?


Probably 2.13 is longer than 3.0 or something like that (and the planets
aligned in the right way).

Paolo
Igor Mammedov May 30, 2018, 10:53 a.m. UTC | #6 
On Wed, 30 May 2018 12:19:59 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> On 30/05/2018 12:11, Igor Mammedov wrote:

> > -    Name (MEMA, 0x07FFE000)

> > +    Name (MEMA, 0x07FFF000)

> >  }

Michael, could you update ACPI test blobs in your next pull request please?


> > As far as I see it should safe wrt NVDIMMs,

> > but the question is what in this commit forced Seabios

> > to change allocated address?  

> 

> Probably 2.13 is longer than 3.0 or something like that

looks like it's other way around (2.13 is shorter than 3.0)
since address went up.

> (and the planets aligned in the right way).

probably not the case considering that warning reproduces
the same regardless of day and time changes. :)

> 

> Paolo
diff mbox series

Patch

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index e36c7bbb40..b4c5b03274 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -425,19 +425,19 @@  static void pc_i440fx_machine_options(MachineClass *m)
     m->default_display = "std";
 }
 
-static void pc_i440fx_2_13_machine_options(MachineClass *m)
+static void pc_i440fx_3_0_machine_options(MachineClass *m)
 {
     pc_i440fx_machine_options(m);
     m->alias = "pc";
     m->is_default = 1;
 }
 
-DEFINE_I440FX_MACHINE(v2_13, "pc-i440fx-2.13", NULL,
-                      pc_i440fx_2_13_machine_options);
+DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
+                      pc_i440fx_3_0_machine_options);
 
 static void pc_i440fx_2_12_machine_options(MachineClass *m)
 {
-    pc_i440fx_2_13_machine_options(m);
+    pc_i440fx_3_0_machine_options(m);
     m->is_default = 0;
     m->alias = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 2372457c6a..83d6d75efa 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -308,18 +308,18 @@  static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
-static void pc_q35_2_13_machine_options(MachineClass *m)
+static void pc_q35_3_0_machine_options(MachineClass *m)
 {
     pc_q35_machine_options(m);
     m->alias = "q35";
 }
 
-DEFINE_Q35_MACHINE(v2_13, "pc-q35-2.13", NULL,
-                    pc_q35_2_13_machine_options);
+DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
+                    pc_q35_3_0_machine_options);
 
 static void pc_q35_2_12_machine_options(MachineClass *m)
 {
-    pc_q35_2_13_machine_options(m);
+    pc_q35_3_0_machine_options(m);
     m->alias = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
 }