From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMl-0008Te-0z for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMj-0006f3-To for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:40428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMj-0006eq-JA for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:30 +0200 Message-Id: <1442673810-2679-22-git-send-email-afaerber@suse.de> In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de> References: <1442673810-2679-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 21/21] machine: Eliminate QEMUMachine and qemu_register_machine() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost The struct is not used anymore and can be eliminated. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- include/hw/boards.h | 27 --------------------------- include/qemu/typedefs.h | 1 - include/sysemu/blockdev.h | 2 +- include/sysemu/sysemu.h | 2 +- vl.c | 36 ------------------------------------ 5 files changed, 2 insertions(+), 66 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 4fe2ce5..3e9a92c 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -9,36 +9,10 @@ #include "hw/qdev.h" #include "qom/object.h" =20 - -typedef void QEMUMachineInitFunc(MachineState *ms); - -typedef void QEMUMachineResetFunc(void); - -typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp); - -typedef int QEMUMachineGetKvmtypeFunc(const char *arg); - -struct QEMUMachine { - const char *name; - const char *desc; - QEMUMachineInitFunc *init; - QEMUMachineGetKvmtypeFunc *kvm_type; - BlockInterfaceType block_default_type; - int max_cpus; - unsigned int - no_sdcard:1, - has_dynamic_sysbus:1; - int is_default; - const char *default_machine_opts; - const char *default_boot_order; -}; - void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owne= r, const char *name, uint64_t ram_size); =20 -int qemu_register_machine(QEMUMachine *m); - #define TYPE_MACHINE_SUFFIX "-machine" =20 /* Machine class name that needs to be used for class-name-based machine @@ -69,7 +43,6 @@ bool machine_mem_merge(MachineState *machine); =20 /** * MachineClass: - * @qemu_machine: #QEMUMachine * @get_hotplug_handler: this function is called during bus-less * device hotplug. If defined it returns pointer to an instance * of HotplugHandler object, which handles hotplug operation diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 97ac727..ce82c64 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -67,7 +67,6 @@ typedef struct Property Property; typedef struct QEMUBH QEMUBH; typedef struct QemuConsole QemuConsole; typedef struct QEMUFile QEMUFile; -typedef struct QEMUMachine QEMUMachine; typedef struct QEMUSGList QEMUSGList; typedef struct QEMUSizedBuffer QEMUSizedBuffer; typedef struct QEMUTimerListGroup QEMUTimerListGroup; diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h index 3104150..a00be94 100644 --- a/include/sysemu/blockdev.h +++ b/include/sysemu/blockdev.h @@ -20,7 +20,7 @@ void blockdev_auto_del(BlockBackend *blk); typedef enum { IF_DEFAULT =3D -1, /* for use with drive_add() only */ /* - * IF_IDE must be zero, because we want QEMUMachine member + * IF_IDE must be zero, because we want MachineClass member * block_default_type to default-initialize to IF_IDE */ IF_IDE =3D 0, diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 1f6ff8f..c439975 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -195,7 +195,7 @@ void device_add_bootindex_property(Object *obj, int32= _t *bootindex, void restore_boot_order(void *opaque); void validate_bootdevices(const char *devices, Error **errp); =20 -/* handler to set the boot_device order for a specific type of QEMUMachi= ne */ +/* handler to set the boot_device order for a specific type of MachineCl= ass */ typedef void QEMUBootSetHandler(void *opaque, const char *boot_order, Error **errp); void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque); diff --git a/vl.c b/vl.c index 3b92635..e211f6a 100644 --- a/vl.c +++ b/vl.c @@ -1429,42 +1429,6 @@ void hmp_usb_del(Monitor *mon, const QDict *qdict) =20 MachineState *current_machine; =20 -/* - * Transitional class registration/init used for converting from - * legacy QEMUMachine to MachineClass. - */ -static void qemu_machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - QEMUMachine *qm =3D data; - mc->desc =3D qm->desc; - mc->init =3D qm->init; - mc->kvm_type =3D qm->kvm_type; - mc->block_default_type =3D qm->block_default_type; - mc->max_cpus =3D qm->max_cpus; - mc->no_sdcard =3D qm->no_sdcard; - mc->has_dynamic_sysbus =3D qm->has_dynamic_sysbus; - mc->is_default =3D qm->is_default; - mc->default_machine_opts =3D qm->default_machine_opts; - mc->default_boot_order =3D qm->default_boot_order; -} - -int qemu_register_machine(QEMUMachine *m) -{ - char *name =3D g_strdup_printf(MACHINE_TYPE_NAME("%s"), m->name); - TypeInfo ti =3D { - .name =3D name, - .parent =3D TYPE_MACHINE, - .class_init =3D qemu_machine_class_init, - .class_data =3D (void *)m, - }; - - type_register(&ti); - g_free(name); - - return 0; -} - static MachineClass *find_machine(const char *name) { GSList *el, *machines =3D object_class_get_list(TYPE_MACHINE, false)= ; --=20 2.1.4