Commit bd4e4a38 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging 



Machine queue, 2018-06-25

* Don't support --daemonize and --preconfig together
* Deprecate machine types pc-0.10 and pc-0.11

# gpg: Signature made Mon 25 Jun 2018 23:37:59 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  hw/i386: Deprecate the machine types pc-0.10 and pc-0.11
  vl.c: do not allow --daemonize in combination with --preconfig CLI option

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e409d9a1 08fe6824

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -956,6 +956,7 @@ 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);

}

include/hw/boards.h

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ typedef struct { 


/**

 * MachineClass:

 * @deprecation_reason: If set, the machine is marked as deprecated. The

 *    string should provide some clear information about what to use instead.

 * @max_cpus: maximum number of CPUs supported. Default: 1

 * @min_cpus: minimum number of CPUs supported. Default: 1

 * @default_cpus: number of CPUs instantiated if none are specified. Default: 1
@@ -166,6 +168,7 @@ struct MachineClass { 
    char *name;

    const char *alias;

    const char *desc;

    const char *deprecation_reason;



    void (*init)(MachineState *state);

    void (*reset)(void);

qemu-doc.texi

+5 −0
Original line number Diff line number Diff line
@@ -2943,6 +2943,11 @@ support page sizes < 4096 any longer. 


@section System emulator machines



@subsection pc-0.10 and pc-0.11 (since 3.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.



@section Device options



@subsection Block device options

vl.c

+14 −2
Original line number Diff line number Diff line
@@ -2560,8 +2560,9 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) 
            if (mc->alias) {

                printf("%-20s %s (alias of %s)\n", mc->alias, mc->desc, mc->name);

            }

            printf("%-20s %s%s\n", mc->name, mc->desc,

                   mc->is_default ? " (default)" : "");

            printf("%-20s %s%s%s\n", mc->name, mc->desc,

                   mc->is_default ? " (default)" : "",

                   mc->deprecation_reason ? " (deprecated)" : "");

        }

    }
@@ -4134,6 +4135,12 @@ int main(int argc, char **argv, char **envp) 
    }



    if (is_daemonized()) {

        if (!preconfig_exit_requested) {

            error_report("'preconfig' and 'daemonize' options are "

                         "mutually exclusive");

            exit(EXIT_FAILURE);

        }



        /* According to documentation and historically, -nographic redirects

         * serial port, parallel port and monitor to stdio, which does not work

         * with -daemonize.  We can redirect these to null instead, but since
@@ -4257,6 +4264,11 @@ int main(int argc, char **argv, char **envp) 


    configure_accelerator(current_machine);



    if (!qtest_enabled() && machine_class->deprecation_reason) {

        error_report("Machine type '%s' is deprecated: %s",

                     machine_class->name, machine_class->deprecation_reason);

    }



    /*

     * Register all the global properties, including accel properties,

     * machine properties, and user-specified ones.