[1/3] hw/i386: Remove the deprecated machines 0.12 up to 0.15
diff mbox series

Message ID 20191205160652.23493-2-thuth@redhat.com
State New
Headers show
Series
  • Remove deprecated pc-0.x machine types and related hacks
Related show

Commit Message

Thomas Huth Dec. 5, 2019, 4:06 p.m. UTC
They can't be used reliable for live-migration anymore (see
https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg04516.html
for details) and have been marked as deprecated since QEMU v4.0,
so time to remove them now.

And while we're at it, mark the remaining pc-1.x machine types
as deprecated now, too, so that we finally only have "pc-i440fx"
and "pc-q35" machine types left (apart from the non-versioned
"isapc" and "microvm") once we removed them in a couple of releases.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/i386/pc_piix.c     | 82 -------------------------------------------
 qemu-deprecated.texi  |  2 +-
 tests/cpu-plug-test.c |  6 +---
 3 files changed, 2 insertions(+), 88 deletions(-)

Comments

Eric Blake Dec. 5, 2019, 10 p.m. UTC | #1
On 12/5/19 10:06 AM, Thomas Huth wrote:
> They can't be used reliable for live-migration anymore (see
> https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg04516.html
> for details) and have been marked as deprecated since QEMU v4.0,
> so time to remove them now.
> 
> And while we're at it, mark the remaining pc-1.x machine types
> as deprecated now, too, so that we finally only have "pc-i440fx"
> and "pc-q35" machine types left (apart from the non-versioned
> "isapc" and "microvm") once we removed them in a couple of releases.

Did you mean s/removed/remove/ ?
Thomas Huth Dec. 6, 2019, 5:04 a.m. UTC | #2
On 05/12/2019 23.00, Eric Blake wrote:
> On 12/5/19 10:06 AM, Thomas Huth wrote:
>> They can't be used reliable for live-migration anymore (see
>> https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg04516.html
>> for details) and have been marked as deprecated since QEMU v4.0,
>> so time to remove them now.
>>
>> And while we're at it, mark the remaining pc-1.x machine types
>> as deprecated now, too, so that we finally only have "pc-i440fx"
>> and "pc-q35" machine types left (apart from the non-versioned
>> "isapc" and "microvm") once we removed them in a couple of releases.
> 
> Did you mean s/removed/remove/ ?

Yes :-)

 Thomas
Philippe Mathieu-Daudé Dec. 6, 2019, 5:51 a.m. UTC | #3
On 12/5/19 5:06 PM, Thomas Huth wrote:
> They can't be used reliable for live-migration anymore (see
> https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg04516.html

"reliably"?

I'd keep the reference, but also paste Paolo's 7 lines here.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> for details) and have been marked as deprecated since QEMU v4.0,
> so time to remove them now.
> 
> And while we're at it, mark the remaining pc-1.x machine types
> as deprecated now, too, so that we finally only have "pc-i440fx"
> and "pc-q35" machine types left (apart from the non-versioned
> "isapc" and "microvm") once we removed them in a couple of releases.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   hw/i386/pc_piix.c     | 82 -------------------------------------------
>   qemu-deprecated.texi  |  2 +-
>   tests/cpu-plug-test.c |  6 +---
>   3 files changed, 2 insertions(+), 88 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 1bd70d1abb..59ac9d82c9 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -364,12 +364,6 @@ static void pc_compat_1_2(MachineState *machine)
>       x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);
>   }
>   
> -/* PC compat function for pc-0.12 and pc-0.13 */
> -static void pc_compat_0_13(MachineState *machine)
> -{
> -    pc_compat_1_2(machine);
> -}
> -
>   static void pc_init_isa(MachineState *machine)
>   {
>       pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE);
> @@ -800,82 +794,6 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
>                         pc_i440fx_1_0_machine_options);
>   
>   
> -static void pc_i440fx_0_15_machine_options(MachineClass *m)
> -{
> -    static GlobalProperty compat[] = {
> -        PC_CPU_MODEL_IDS("0.15")
> -    };
> -
> -    pc_i440fx_1_0_machine_options(m);
> -    m->hw_version = "0.15";
> -    m->deprecation_reason = "use a newer machine type instead";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -
> -DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2,
> -                      pc_i440fx_0_15_machine_options);
> -
> -
> -static void pc_i440fx_0_14_machine_options(MachineClass *m)
> -{
> -    static GlobalProperty compat[] = {
> -        PC_CPU_MODEL_IDS("0.14")
> -        { "virtio-blk-pci", "event_idx", "off" },
> -        { "virtio-serial-pci", "event_idx", "off" },
> -        { "virtio-net-pci", "event_idx", "off" },
> -        { "virtio-balloon-pci", "event_idx", "off" },
> -        { "qxl", "revision", "2" },
> -        { "qxl-vga", "revision", "2" },
> -    };
> -
> -    pc_i440fx_0_15_machine_options(m);
> -    m->hw_version = "0.14";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -
> -DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2,
> -                      pc_i440fx_0_14_machine_options);
> -
> -static void pc_i440fx_0_13_machine_options(MachineClass *m)
> -{
> -    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_CPU_MODEL_IDS("0.13")
> -        { TYPE_PCI_DEVICE, "command_serr_enable", "off" },
> -        { "AC97", "use_broken_id", "1" },
> -        { "virtio-9p-pci", "vectors", "0" },
> -        { "VGA", "rombar", "0" },
> -        { "vmware-svga", "rombar", "0" },
> -    };
> -
> -    pc_i440fx_0_14_machine_options(m);
> -    m->hw_version = "0.13";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> -    pcmc->kvmclock_enabled = false;
> -}
> -
> -DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13,
> -                      pc_i440fx_0_13_machine_options);
> -
> -static void pc_i440fx_0_12_machine_options(MachineClass *m)
> -{
> -    static GlobalProperty compat[] = {
> -        PC_CPU_MODEL_IDS("0.12")
> -        { "virtio-serial-pci", "max_ports", "1" },
> -        { "virtio-serial-pci", "vectors", "0" },
> -        { "usb-mouse", "serial", "1" },
> -        { "usb-tablet", "serial", "1" },
> -        { "usb-kbd", "serial", "1" },
> -    };
> -
> -    pc_i440fx_0_13_machine_options(m);
> -    m->hw_version = "0.12";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -
> -DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13,
> -                      pc_i440fx_0_12_machine_options);
> -
>   typedef struct {
>       uint16_t gpu_device_id;
>       uint16_t pch_device_id;
> diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
> index e407cc085e..2850f9a520 100644
> --- a/qemu-deprecated.texi
> +++ b/qemu-deprecated.texi
> @@ -261,7 +261,7 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or
>   
>   @section System emulator machines
>   
> -@subsection pc-0.12, pc-0.13, pc-0.14 and pc-0.15 (since 4.0)
> +@subsection pc-1.0, pc-1.1, pc-1.2 and pc-1.3 (since 5.0)
>   
>   These machine types are very old and likely can not be used for live migration
>   from old QEMU versions anymore. A newer machine type should be used instead.
> diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
> index 30e514bbfb..e8ffbbce4b 100644
> --- a/tests/cpu-plug-test.c
> +++ b/tests/cpu-plug-test.c
> @@ -148,11 +148,7 @@ static void add_pc_test_case(const char *mname)
>           (strcmp(mname, "pc-1.3") == 0) ||
>           (strcmp(mname, "pc-1.2") == 0) ||
>           (strcmp(mname, "pc-1.1") == 0) ||
> -        (strcmp(mname, "pc-1.0") == 0) ||
> -        (strcmp(mname, "pc-0.15") == 0) ||
> -        (strcmp(mname, "pc-0.14") == 0) ||
> -        (strcmp(mname, "pc-0.13") == 0) ||
> -        (strcmp(mname, "pc-0.12") == 0)) {
> +        (strcmp(mname, "pc-1.0") == 0)) {
>           path = g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=%u",
>                                  mname, data->sockets, data->cores,
>                                  data->threads, data->maxcpus);
>

Patch
diff mbox series

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 1bd70d1abb..59ac9d82c9 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -364,12 +364,6 @@  static void pc_compat_1_2(MachineState *machine)
     x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);
 }
 
-/* PC compat function for pc-0.12 and pc-0.13 */
-static void pc_compat_0_13(MachineState *machine)
-{
-    pc_compat_1_2(machine);
-}
-
 static void pc_init_isa(MachineState *machine)
 {
     pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE);
@@ -800,82 +794,6 @@  DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
                       pc_i440fx_1_0_machine_options);
 
 
-static void pc_i440fx_0_15_machine_options(MachineClass *m)
-{
-    static GlobalProperty compat[] = {
-        PC_CPU_MODEL_IDS("0.15")
-    };
-
-    pc_i440fx_1_0_machine_options(m);
-    m->hw_version = "0.15";
-    m->deprecation_reason = "use a newer machine type instead";
-    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
-}
-
-DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2,
-                      pc_i440fx_0_15_machine_options);
-
-
-static void pc_i440fx_0_14_machine_options(MachineClass *m)
-{
-    static GlobalProperty compat[] = {
-        PC_CPU_MODEL_IDS("0.14")
-        { "virtio-blk-pci", "event_idx", "off" },
-        { "virtio-serial-pci", "event_idx", "off" },
-        { "virtio-net-pci", "event_idx", "off" },
-        { "virtio-balloon-pci", "event_idx", "off" },
-        { "qxl", "revision", "2" },
-        { "qxl-vga", "revision", "2" },
-    };
-
-    pc_i440fx_0_15_machine_options(m);
-    m->hw_version = "0.14";
-    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
-}
-
-DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2,
-                      pc_i440fx_0_14_machine_options);
-
-static void pc_i440fx_0_13_machine_options(MachineClass *m)
-{
-    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
-    static GlobalProperty compat[] = {
-        PC_CPU_MODEL_IDS("0.13")
-        { TYPE_PCI_DEVICE, "command_serr_enable", "off" },
-        { "AC97", "use_broken_id", "1" },
-        { "virtio-9p-pci", "vectors", "0" },
-        { "VGA", "rombar", "0" },
-        { "vmware-svga", "rombar", "0" },
-    };
-
-    pc_i440fx_0_14_machine_options(m);
-    m->hw_version = "0.13";
-    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
-    pcmc->kvmclock_enabled = false;
-}
-
-DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13,
-                      pc_i440fx_0_13_machine_options);
-
-static void pc_i440fx_0_12_machine_options(MachineClass *m)
-{
-    static GlobalProperty compat[] = {
-        PC_CPU_MODEL_IDS("0.12")
-        { "virtio-serial-pci", "max_ports", "1" },
-        { "virtio-serial-pci", "vectors", "0" },
-        { "usb-mouse", "serial", "1" },
-        { "usb-tablet", "serial", "1" },
-        { "usb-kbd", "serial", "1" },
-    };
-
-    pc_i440fx_0_13_machine_options(m);
-    m->hw_version = "0.12";
-    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
-}
-
-DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13,
-                      pc_i440fx_0_12_machine_options);
-
 typedef struct {
     uint16_t gpu_device_id;
     uint16_t pch_device_id;
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index e407cc085e..2850f9a520 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -261,7 +261,7 @@  The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or
 
 @section System emulator machines
 
-@subsection pc-0.12, pc-0.13, pc-0.14 and pc-0.15 (since 4.0)
+@subsection pc-1.0, pc-1.1, pc-1.2 and pc-1.3 (since 5.0)
 
 These machine types are very old and likely can not be used for live migration
 from old QEMU versions anymore. A newer machine type should be used instead.
diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
index 30e514bbfb..e8ffbbce4b 100644
--- a/tests/cpu-plug-test.c
+++ b/tests/cpu-plug-test.c
@@ -148,11 +148,7 @@  static void add_pc_test_case(const char *mname)
         (strcmp(mname, "pc-1.3") == 0) ||
         (strcmp(mname, "pc-1.2") == 0) ||
         (strcmp(mname, "pc-1.1") == 0) ||
-        (strcmp(mname, "pc-1.0") == 0) ||
-        (strcmp(mname, "pc-0.15") == 0) ||
-        (strcmp(mname, "pc-0.14") == 0) ||
-        (strcmp(mname, "pc-0.13") == 0) ||
-        (strcmp(mname, "pc-0.12") == 0)) {
+        (strcmp(mname, "pc-1.0") == 0)) {
         path = g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=%u",
                                mname, data->sockets, data->cores,
                                data->threads, data->maxcpus);