Patchwork [1/8] add pc-{i440fx,q35}-2.0 machine types

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 2, 2013, 12:24 p.m.
Message ID <1385987083-19917-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/295907/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 2, 2013, 12:24 p.m.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/pc_piix.c | 14 ++++++++++++--
 hw/i386/pc_q35.c  | 11 ++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)
Igor Mammedov - Dec. 2, 2013, 2:30 p.m.
On Mon,  2 Dec 2013 13:24:36 +0100
Gerd Hoffmann <kraxel@redhat.com> wrote:
why 2.0, are we jumping from 1.7 strait to 2.0?

> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/i386/pc_piix.c | 14 ++++++++++++--
>  hw/i386/pc_q35.c  | 11 ++++++++++-
>  2 files changed, 22 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 2111f01..9329f04 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -339,13 +339,22 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
>      .desc = "Standard PC (i440FX + PIIX, 1996)", \
>      .hot_add_cpu = pc_hot_add_cpu
>  
> +#define PC_I440FX_2_0_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> +
> +static QEMUMachine pc_i440fx_machine_v2_0 = {
> +    PC_I440FX_2_0_MACHINE_OPTIONS,
> +    .name = "pc-i440fx-2.0",
> +    .alias = "pc",
> +    .init = pc_init_pci,
> +    .is_default = 1,
> +};
> +
>  #define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> +
>  static QEMUMachine pc_i440fx_machine_v1_7 = {
>      PC_I440FX_1_7_MACHINE_OPTIONS,
>      .name = "pc-i440fx-1.7",
> -    .alias = "pc",
>      .init = pc_init_pci,
> -    .is_default = 1,
>  };
>  
>  #define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> @@ -747,6 +756,7 @@ static QEMUMachine xenfv_machine = {
>  
>  static void pc_machine_init(void)
>  {
> +    qemu_register_machine(&pc_i440fx_machine_v2_0);
>      qemu_register_machine(&pc_i440fx_machine_v1_7);
>      qemu_register_machine(&pc_i440fx_machine_v1_6);
>      qemu_register_machine(&pc_i440fx_machine_v1_5);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 600fc02..ac69e5d 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -259,12 +259,20 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
>      .desc = "Standard PC (Q35 + ICH9, 2009)", \
>      .hot_add_cpu = pc_hot_add_cpu
>  
> +#define PC_Q35_2_0_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +
> +static QEMUMachine pc_q35_machine_v2_0 = {
> +    PC_Q35_2_0_MACHINE_OPTIONS,
> +    .name = "pc-q35-2.0",
> +    .alias = "q35",
> +    .init = pc_q35_init,
> +};
> +
>  #define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
>  
>  static QEMUMachine pc_q35_machine_v1_7 = {
>      PC_Q35_1_7_MACHINE_OPTIONS,
>      .name = "pc-q35-1.7",
> -    .alias = "q35",
>      .init = pc_q35_init,
>  };
>  
> @@ -306,6 +314,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
>  
>  static void pc_q35_machine_init(void)
>  {
> +    qemu_register_machine(&pc_q35_machine_v2_0);
>      qemu_register_machine(&pc_q35_machine_v1_7);
>      qemu_register_machine(&pc_q35_machine_v1_6);
>      qemu_register_machine(&pc_q35_machine_v1_5);
Gerd Hoffmann - Dec. 2, 2013, 2:44 p.m.
On Mo, 2013-12-02 at 15:30 +0100, Igor Mammedov wrote:
> On Mon,  2 Dec 2013 13:24:36 +0100
> Gerd Hoffmann <kraxel@redhat.com> wrote:
> why 2.0, are we jumping from 1.7 strait to 2.0?

Looks like this is the plan ...

nilsson kraxel ~/projects/qemu# git show master
commit 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e
Author: Anthony Liguori <aliguori@amazon.com>
Date:   Wed Nov 27 14:02:45 2013 -0800

    Open 2.0 development tree
    
    Signed-off-by: Anthony Liguori <aliguori@amazon.com>

cheers,
  Gerd
Andreas Färber - Dec. 2, 2013, 9:50 p.m.
Am 02.12.2013 15:44, schrieb Gerd Hoffmann:
> On Mo, 2013-12-02 at 15:30 +0100, Igor Mammedov wrote:
>> why 2.0, are we jumping from 1.7 strait to 2.0?
> 
> Looks like this is the plan ...
> 
> nilsson kraxel ~/projects/qemu# git show master
> commit 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e
> Author: Anthony Liguori <aliguori@amazon.com>
> Date:   Wed Nov 27 14:02:45 2013 -0800
> 
>     Open 2.0 development tree
>     
>     Signed-off-by: Anthony Liguori <aliguori@amazon.com>

Yes, Anthony announced at QEMU Summit to do regular major version
updates, and in theory that should be in the minutes posted to the list
after KVM Forum...

Regards,
Andreas

Patch

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 2111f01..9329f04 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -339,13 +339,22 @@  static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
     .desc = "Standard PC (i440FX + PIIX, 1996)", \
     .hot_add_cpu = pc_hot_add_cpu
 
+#define PC_I440FX_2_0_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
+
+static QEMUMachine pc_i440fx_machine_v2_0 = {
+    PC_I440FX_2_0_MACHINE_OPTIONS,
+    .name = "pc-i440fx-2.0",
+    .alias = "pc",
+    .init = pc_init_pci,
+    .is_default = 1,
+};
+
 #define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
+
 static QEMUMachine pc_i440fx_machine_v1_7 = {
     PC_I440FX_1_7_MACHINE_OPTIONS,
     .name = "pc-i440fx-1.7",
-    .alias = "pc",
     .init = pc_init_pci,
-    .is_default = 1,
 };
 
 #define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
@@ -747,6 +756,7 @@  static QEMUMachine xenfv_machine = {
 
 static void pc_machine_init(void)
 {
+    qemu_register_machine(&pc_i440fx_machine_v2_0);
     qemu_register_machine(&pc_i440fx_machine_v1_7);
     qemu_register_machine(&pc_i440fx_machine_v1_6);
     qemu_register_machine(&pc_i440fx_machine_v1_5);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 600fc02..ac69e5d 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -259,12 +259,20 @@  static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
     .desc = "Standard PC (Q35 + ICH9, 2009)", \
     .hot_add_cpu = pc_hot_add_cpu
 
+#define PC_Q35_2_0_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
+
+static QEMUMachine pc_q35_machine_v2_0 = {
+    PC_Q35_2_0_MACHINE_OPTIONS,
+    .name = "pc-q35-2.0",
+    .alias = "q35",
+    .init = pc_q35_init,
+};
+
 #define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
 
 static QEMUMachine pc_q35_machine_v1_7 = {
     PC_Q35_1_7_MACHINE_OPTIONS,
     .name = "pc-q35-1.7",
-    .alias = "q35",
     .init = pc_q35_init,
 };
 
@@ -306,6 +314,7 @@  static QEMUMachine pc_q35_machine_v1_4 = {
 
 static void pc_q35_machine_init(void)
 {
+    qemu_register_machine(&pc_q35_machine_v2_0);
     qemu_register_machine(&pc_q35_machine_v1_7);
     qemu_register_machine(&pc_q35_machine_v1_6);
     qemu_register_machine(&pc_q35_machine_v1_5);