[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v3 1/5] pc: simplify MachineClass::get_hotplug_handler
From: |
Igor Mammedov |
Subject: |
[Qemu-arm] [PATCH v3 1/5] pc: simplify MachineClass::get_hotplug_handler handling |
Date: |
Tue, 1 May 2018 14:08:38 +0200 |
By default MachineClass::get_hotplug_handler is NULL and concrete board
should set it to it's own handler.
Considering there isn't any default handler, drop saving empty
MachineClass::get_hotplug_handler in child class and make PC code
consistent with spapr/s390x boards.
We can bring this back when actual usecase surfaces and do it
consistently across boards that use get_hotplug_handler().
Suggested-by: David Gibson <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
include/hw/i386/pc.h | 8 --------
hw/i386/pc.c | 6 +-----
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ffee841..fac6689 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -84,10 +84,6 @@ struct PCMachineState {
/**
* PCMachineClass:
*
- * Methods:
- *
- * @get_hotplug_handler: pointer to parent class callback @get_hotplug_handler
- *
* Compat fields:
*
* @enforce_aligned_dimm: check that DIMM's address/size is aligned by
@@ -107,10 +103,6 @@ struct PCMachineClass {
/*< public >*/
- /* Methods: */
- HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
- DeviceState *dev);
-
/* Device configuration: */
bool pci_enabled;
bool kvmclock_enabled;
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b297a5d..018fd8d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2056,15 +2056,12 @@ static void pc_machine_device_unplug_cb(HotplugHandler
*hotplug_dev,
static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
DeviceState *dev)
{
- PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine);
-
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) ||
object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
return HOTPLUG_HANDLER(machine);
}
- return pcmc->get_hotplug_handler ?
- pcmc->get_hotplug_handler(machine, dev) : NULL;
+ return NULL;
}
static void
@@ -2344,7 +2341,6 @@ static void pc_machine_class_init(ObjectClass *oc, void
*data)
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
NMIClass *nc = NMI_CLASS(oc);
- pcmc->get_hotplug_handler = mc->get_hotplug_handler;
pcmc->pci_enabled = true;
pcmc->has_acpi_build = true;
pcmc->rsdp_in_ram = true;
--
2.7.4
- [Qemu-arm] [PATCH v3 0/5] arm: isolate and clean up dtb generation, Igor Mammedov, 2018/05/01
- [Qemu-arm] [PATCH v3 2/5] platform-bus-device: use device plug callback instead of machine_done notifier, Igor Mammedov, 2018/05/01
- [Qemu-arm] [PATCH v3 1/5] pc: simplify MachineClass::get_hotplug_handler handling,
Igor Mammedov <=
- [Qemu-arm] [PATCH v3 4/5] arm: boot: set boot_info starting from first_cpu, Igor Mammedov, 2018/05/01
- [Qemu-arm] [PATCH v3 3/5] arm/boot: split load_dtb() from arm_load_kernel(), Igor Mammedov, 2018/05/01
- [Qemu-arm] [PATCH v3 5/5] make sure that we aren't overwriting mc->get_hotplug_handler by accident, Igor Mammedov, 2018/05/01
- Re: [Qemu-arm] [PATCH v3 0/5] arm: isolate and clean up dtb generation, Peter Maydell, 2018/05/03