[Qemu-devel] [PULL 0/1] [for -rc2] pc-*-3.1 machine-types

[Qemu-devel] [PULL 0/1] [for -rc2] pc-*-3.1 machine-types

[Eduardo Habkost]

Hopefully in time for -rc2.

commit 9b4cf107 ("hyperv: only add SynIC in compatible configurations") breaks
compatibility on pc-*-3.0, so this is required as a bug fix.

The following changes since commit 46cabfb41e9cb269affc14c8188f0c8745f8cd55:

  Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2018-11-20 12:24:09 +0000)

are available in the Git repository at:

  git://github.com/ehabkost/qemu.git tags/x86-for-3.1-pull-request

for you to fetch changes up to 4a93722f9c279184e95b1e1ad775c01deec05065:

  hw/i386: add pc-i440fx-3.1 & pc-q35-3.1 (2018-11-20 11:42:32 -0200)

----------------------------------------------------------------
pc-*-3.1 machine-types

----------------------------------------------------------------

Marc-André Lureau (1):
  hw/i386: add pc-i440fx-3.1 & pc-q35-3.1

 hw/i386/pc_piix.c | 15 ++++++++++++---
 hw/i386/pc_q35.c  | 13 +++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

-- 
2.18.0.rc1.1.g3f1ff2140

[Qemu-devel] [PULL 1/1] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1

[Eduardo Habkost]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

We have a couple of PC_COMPAT_3_0, so we should have 3.1 PC machines,
and update the 3.0 machines to make use of those.

Fixes a "Known issue" from https://wiki.qemu.org/Planning/3.1.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20181120132604.22854-1-marcandre.lureau@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/i386/pc_piix.c | 15 ++++++++++++---
 hw/i386/pc_q35.c  | 13 +++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index dc09466b3e..7092d6d13f 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass *m)
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
 }
 
-static void pc_i440fx_3_0_machine_options(MachineClass *m)
+static void pc_i440fx_3_1_machine_options(MachineClass *m)
 {
     pc_i440fx_machine_options(m);
     m->alias = "pc";
     m->is_default = 1;
 }
 
+DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
+                      pc_i440fx_3_1_machine_options);
+
+static void pc_i440fx_3_0_machine_options(MachineClass *m)
+{
+    pc_i440fx_3_1_machine_options(m);
+    m->is_default = 0;
+    m->alias = NULL;
+    SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);
+}
+
 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_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 532241e3f8..4702bb13c4 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
-static void pc_q35_3_0_machine_options(MachineClass *m)
+static void pc_q35_3_1_machine_options(MachineClass *m)
 {
     pc_q35_machine_options(m);
     m->alias = "q35";
 }
 
+DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
+                   pc_q35_3_1_machine_options);
+
+static void pc_q35_3_0_machine_options(MachineClass *m)
+{
+    pc_q35_3_1_machine_options(m);
+    m->alias = NULL;
+    SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);
+}
+
 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_3_0_machine_options(m);
-    m->alias = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
 }
 
-- 
2.18.0.rc1.1.g3f1ff2140

Re: [Qemu-devel] [PULL 1/1] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1

[Peter Maydell]

On 20 November 2018 at 13:49, Eduardo Habkost <ehabkost@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> We have a couple of PC_COMPAT_3_0, so we should have 3.1 PC machines,
> and update the 3.0 machines to make use of those.

As a side note, we should have 3.1 machines regardless.
Every versioned machine should have a new -x.y type
every version of QEMU. (We should also try to remember
to do this at the start of the release cycle rather than
the end :-))

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/1] [for -rc2] pc-*-3.1 machine-types

[Peter Maydell]

On 20 November 2018 at 13:49, Eduardo Habkost <ehabkost@redhat.com> wrote:
> Hopefully in time for -rc2.
>
> commit 9b4cf107 ("hyperv: only add SynIC in compatible configurations") breaks
> compatibility on pc-*-3.0, so this is required as a bug fix.
>
> The following changes since commit 46cabfb41e9cb269affc14c8188f0c8745f8cd55:
>
>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2018-11-20 12:24:09 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/x86-for-3.1-pull-request
>
> for you to fetch changes up to 4a93722f9c279184e95b1e1ad775c01deec05065:
>
>   hw/i386: add pc-i440fx-3.1 & pc-q35-3.1 (2018-11-20 11:42:32 -0200)
>
> ----------------------------------------------------------------
> pc-*-3.1 machine-types
>
> ----------------------
Applied, thanks.

-- PMM