Commit 8c457547 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Machine Core queue, 2016-03-16

# gpg: Signature made Wed 16 Mar 2016 18:57:34 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/machine-pull-request:
  module: Rename machine_init() to opts_init()
  machine: Use type_init() to register machine classes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 33616ace 34294e2f

fsdev/qemu-fsdev-opts.c

+1 −1
Original line number Diff line number Diff line
@@ -83,4 +83,4 @@ static void fsdev_register_config(void) 
    qemu_add_opts(&qemu_fsdev_opts);

    qemu_add_opts(&qemu_virtfs_opts);

}

machine_init(fsdev_register_config);
 
opts_init(fsdev_register_config);

hw/acpi/core.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void acpi_register_config(void) 
    qemu_add_opts(&qemu_acpi_opts);

}



machine_init(acpi_register_config);

opts_init(acpi_register_config);



static int acpi_checksum(const uint8_t *data, int len)

{

hw/arm/exynos4_boards.c

+1 −1
Original line number Diff line number Diff line
@@ -181,4 +181,4 @@ static void exynos4_machines_init(void) 
    type_register_static(&smdkc210_type);

}



machine_init(exynos4_machines_init)
 
type_init(exynos4_machines_init)

hw/arm/gumstix.c

+1 −1
Original line number Diff line number Diff line
@@ -156,4 +156,4 @@ static void gumstix_machine_init(void) 
    type_register_static(&verdex_type);

}



machine_init(gumstix_machine_init)
 
type_init(gumstix_machine_init)

hw/arm/highbank.c

+1 −1
Original line number Diff line number Diff line
@@ -437,4 +437,4 @@ static void calxeda_machines_init(void) 
    type_register_static(&midway_type);

}



machine_init(calxeda_machines_init)
 
type_init(calxeda_machines_init)