Commit cc425b5d authored by Thomas Huth's avatar Thomas Huth Committed by Michael S. Tsirkin
Browse files

hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 



They've been deprecated for two releases and nobody complained that they
are still required anymore, so it's time to remove these now.
And while we're at it, mark the other remaining old 0.x machine types
as deprecated (since they can not properly be used for live-migration
anyway).

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent d6caf363

hw/i386/pc_piix.c

+2 −68
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static void pc_compat_1_2(MachineState *machine) 
    x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);

}



/* PC compat function for pc-0.10 to pc-0.13 */

/* PC compat function for pc-0.12 and pc-0.13 */

static void pc_compat_0_13(MachineState *machine)

{

    pc_compat_1_2(machine);
@@ -834,6 +834,7 @@ static void pc_i440fx_0_15_machine_options(MachineClass *m) 
{

    pc_i440fx_1_0_machine_options(m);

    m->hw_version = "0.15";

    m->deprecation_reason = "use a newer machine type instead";

    SET_MACHINE_COMPAT(m, PC_COMPAT_0_15);

}
@@ -951,73 +952,6 @@ static void pc_i440fx_0_12_machine_options(MachineClass *m) 
DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13,

                      pc_i440fx_0_12_machine_options);





#define PC_COMPAT_0_11 \

        PC_CPU_MODEL_IDS("0.11") \

        {\

            .driver   = "virtio-blk-pci",\

            .property = "vectors",\

            .value    = stringify(0),\

        },{\

            .driver   = TYPE_PCI_DEVICE,\

            .property = "rombar",\

            .value    = stringify(0),\

        },{\

            .driver   = "ide-drive",\

            .property = "ver",\

            .value    = "0.11",\

        },{\

            .driver   = "scsi-disk",\

            .property = "ver",\

            .value    = "0.11",\

        },



static void pc_i440fx_0_11_machine_options(MachineClass *m)

{

    pc_i440fx_0_12_machine_options(m);

    m->hw_version = "0.11";

    m->deprecation_reason = "use a newer machine type instead";

    SET_MACHINE_COMPAT(m, PC_COMPAT_0_11);

}



DEFINE_I440FX_MACHINE(v0_11, "pc-0.11", pc_compat_0_13,

                      pc_i440fx_0_11_machine_options);





#define PC_COMPAT_0_10 \

    PC_CPU_MODEL_IDS("0.10") \

    {\

        .driver   = "virtio-blk-pci",\

        .property = "class",\

        .value    = stringify(PCI_CLASS_STORAGE_OTHER),\

    },{\

        .driver   = "virtio-serial-pci",\

        .property = "class",\

        .value    = stringify(PCI_CLASS_DISPLAY_OTHER),\

    },{\

        .driver   = "virtio-net-pci",\

        .property = "vectors",\

        .value    = stringify(0),\

    },{\

        .driver   = "ide-drive",\

        .property = "ver",\

        .value    = "0.10",\

    },{\

        .driver   = "scsi-disk",\

        .property = "ver",\

        .value    = "0.10",\

    },



static void pc_i440fx_0_10_machine_options(MachineClass *m)

{

    pc_i440fx_0_11_machine_options(m);

    m->hw_version = "0.10";

    SET_MACHINE_COMPAT(m, PC_COMPAT_0_10);

}



DEFINE_I440FX_MACHINE(v0_10, "pc-0.10", pc_compat_0_13,

                      pc_i440fx_0_10_machine_options);



typedef struct {

    uint16_t gpu_device_id;

    uint16_t pch_device_id;

qemu-deprecated.texi

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ their usecases. 


@section System emulator machines



@subsection pc-0.10 and pc-0.11 (since 3.0)

@subsection pc-0.12, pc-0.13, pc-0.14 and pc-0.15 (since 4.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.

tests/cpu-plug-test.c

+1 −3
Original line number Diff line number Diff line
@@ -157,9 +157,7 @@ static void add_pc_test_case(const char *mname) 
        (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-0.11") == 0) ||

        (strcmp(mname, "pc-0.10") == 0)) {

        (strcmp(mname, "pc-0.12") == 0)) {

        path = g_strdup_printf("cpu-plug/%s/init/%ux%ux%u&maxcpus=%u",

                               mname, data->sockets, data->cores,

                               data->threads, data->maxcpus);