From 940d2371eaf7cd539057fdb0c69da8b422d06ea3 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 9 Mar 2018 14:25:51 -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/hw/i386/pc_piix.c   | 10 ----------
 qemu/include/hw/boards.h |  2 --
 2 files changed, 12 deletions(-)

diff --git a/qemu/hw/i386/pc_piix.c b/qemu/hw/i386/pc_piix.c
index 1f2cd1bd..bc7e2cd1 100644
--- a/qemu/hw/i386/pc_piix.c
+++ b/qemu/hw/i386/pc_piix.c
@@ -59,14 +59,4 @@ static int pc_init_pci_2_2(struct uc_struct *uc, MachineState *machine)
     return pc_init_pci(uc, machine);
 }
 
-static QEMUMachine pc_i440fx_machine_v2_2 = {
-    "pc_piix",
-    "pc-i440fx-2.2",
-    pc_init_pci,
-    NULL,
-    255,
-    1,
-    UC_ARCH_X86,    // X86
-};
-
 DEFINE_PC_MACHINE(v2_2, "pc-i440fx-2.2", pc_init_pci_2_2);
diff --git a/qemu/include/hw/boards.h b/qemu/include/hw/boards.h
index 66c6aaee..1f10643a 100644
--- a/qemu/include/hw/boards.h
+++ b/qemu/include/hw/boards.h
@@ -15,10 +15,8 @@ typedef int QEMUMachineInitFunc(struct uc_struct *uc, MachineState *ms);
 typedef void QEMUMachineResetFunc(void);
 
 struct QEMUMachine {
-    const char *family; /* NULL iff @name identifies a standalone machtype */
     const char *name;
     QEMUMachineInitFunc *init;
-    QEMUMachineResetFunc *reset;
     int max_cpus;
     int is_default;
     int arch;