Patchwork pc: rename machine types

login
register
mail settings
Submitter Gerd Hoffmann
Date Jan. 9, 2013, 3:30 p.m.
Message ID <1357745418-22617-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/210736/
State New
Headers show

Comments

Gerd Hoffmann - Jan. 9, 2013, 3:30 p.m.
Starting with release 1.4 we have a fully functional q35 machine type,
i.e. "qemu -M q35" JustWorks[tm].  Update machine type names to reflect
that:

  * pc-1.4 becomes pc-piix-1.4
  * q35-next becomes pc-q35-1.4

The pc-1.3 (+older) names are maintained for compatibility reasons.
For the same reason the "pc" and "q35" aliases are kept.  pc-piix-1.4
continues to be the default machine type, again for compatibility
reasons.

Also updated the description (shown by "qemu -M ?") with host bridge
name, south bridge name and chipset release year.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pc_piix.c |    8 ++++----
 hw/pc_q35.c  |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
Markus Armbruster - Jan. 10, 2013, 8:21 a.m.
Gerd Hoffmann <kraxel@redhat.com> writes:

> Starting with release 1.4 we have a fully functional q35 machine type,
> i.e. "qemu -M q35" JustWorks[tm].  Update machine type names to reflect
> that:
>
>   * pc-1.4 becomes pc-piix-1.4

Actually, it becomes pc-i440fx-1.4 (see first hunk below).

>   * q35-next becomes pc-q35-1.4
>
> The pc-1.3 (+older) names are maintained for compatibility reasons.
> For the same reason the "pc" and "q35" aliases are kept.  pc-piix-1.4
> continues to be the default machine type, again for compatibility
> reasons.

Not sure we really need q35, but it's fine with me.

> Also updated the description (shown by "qemu -M ?") with host bridge
> name, south bridge name and chipset release year.

Appreciated!

> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/pc_piix.c |    8 ++++----
>  hw/pc_q35.c  |    4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 2b3d58b..e630aea 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -282,10 +282,10 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
>  }
>  #endif
>  
> -static QEMUMachine pc_machine_v1_4 = {
> -    .name = "pc-1.4",
> +static QEMUMachine pc_i440fx_machine_v1_4 = {
> +    .name = "pc-i440fx-1.4",
>      .alias = "pc",
> -    .desc = "Standard PC",
> +    .desc = "Standard PC (i440FX + PIIX, 1996)",
>      .init = pc_init_pci_1_3,
>      .max_cpus = 255,
>      .is_default = 1,
[...]

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 2b3d58b..e630aea 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -282,10 +282,10 @@  static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
 }
 #endif
 
-static QEMUMachine pc_machine_v1_4 = {
-    .name = "pc-1.4",
+static QEMUMachine pc_i440fx_machine_v1_4 = {
+    .name = "pc-i440fx-1.4",
     .alias = "pc",
-    .desc = "Standard PC",
+    .desc = "Standard PC (i440FX + PIIX, 1996)",
     .init = pc_init_pci_1_3,
     .max_cpus = 255,
     .is_default = 1,
@@ -646,7 +646,7 @@  static QEMUMachine xenfv_machine = {
 
 static void pc_machine_init(void)
 {
-    qemu_register_machine(&pc_machine_v1_4);
+    qemu_register_machine(&pc_i440fx_machine_v1_4);
     qemu_register_machine(&pc_machine_v1_3);
     qemu_register_machine(&pc_machine_v1_2);
     qemu_register_machine(&pc_machine_v1_1);
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index ef540b6..52d9976 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -209,9 +209,9 @@  static void pc_q35_init(QEMUMachineInitArgs *args)
 }
 
 static QEMUMachine pc_q35_machine = {
-    .name = "q35-next",
+    .name = "pc-q35-1.4",
     .alias = "q35",
-    .desc = "Q35 chipset PC",
+    .desc = "Standard PC (Q35 + ICH9, 2009)",
     .init = pc_q35_init,
     .max_cpus = 255,
 };