From b65a3ece3b6ee992502d76cf293e46fb4649caa7 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 9 Mar 2018 13:29:53 -0500
Subject: [PATCH] machine: Remove unused fields from QEMUMachine

This removes the following fields from QEMUMachine: family, alias,
reset, hot_add_cpu, units_per_default_bus, no_serial, no_parallel,
use_virtcon, use_sclp, no_floppy, no_cdrom, default_display,
compat_props, and hw_version.

The only users of those fields were already converted to use QOM and
MachineClass directly, so they are not needed anymore.

Backports commit d48f4fa69eb3efb03a2efe2e4606a97a17cf222f from qemu
---
 qemu/include/hw/boards.h | 1 -
 qemu/vl.c                | 2 --
 2 files changed, 3 deletions(-)

diff --git a/qemu/include/hw/boards.h b/qemu/include/hw/boards.h
index 6794c305..66c6aaee 100644
--- a/qemu/include/hw/boards.h
+++ b/qemu/include/hw/boards.h
@@ -97,7 +97,6 @@ struct MachineClass {
     ObjectClass parent_class;
     /*< public >*/
 
-    const char *family; /* NULL iff @name identifies a standalone machtype */
     const char *name;
 
     int (*init)(struct uc_struct *uc, MachineState *state);
diff --git a/qemu/vl.c b/qemu/vl.c
index 51c9f2ea..d9b910ba 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -182,10 +182,8 @@ static void machine_class_init(struct uc_struct *uc, ObjectClass *oc, void *data
     MachineClass *mc = MACHINE_CLASS(uc, oc);
     QEMUMachine *qm = data;
 
-    mc->family = qm->family;
     mc->name = qm->name;
     mc->init = qm->init;
-    mc->reset = qm->reset;
     mc->max_cpus = qm->max_cpus;
     mc->is_default = qm->is_default;
     mc->arch = qm->arch;