[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/53] pckbd: Move QOM macro to header
From: |
Eduardo Habkost |
Subject: |
[PULL 32/53] pckbd: Move QOM macro to header |
Date: |
Thu, 27 Aug 2020 15:21:01 -0400 |
Move the I8042 macro close to the TYPE_I8042 define.
This will make future conversion to OBJECT_DECLARE* easier.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-34-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/input/i8042.h | 1 +
hw/input/pckbd.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index 8eaebf50ce..4569dfddd9 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -11,6 +11,7 @@
#include "hw/isa/isa.h"
#define TYPE_I8042 "i8042"
+#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
#define I8042_A20_LINE "a20"
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 29d633ca94..dde85ba6c6 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -481,8 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
qemu_register_reset(kbd_reset, s);
}
-#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
-
struct ISAKBDState {
ISADevice parent_obj;
--
2.26.2
- [PULL 21/53] can_emu: Delete macros for non-existing typedef, (continued)
- [PULL 21/53] can_emu: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/27
- [PULL 23/53] platform-bus: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/27
- [PULL 25/53] xen-legacy-backend: Add missing typedef XenLegacyDevice, Eduardo Habkost, 2020/08/27
- [PULL 26/53] spapr: Move typedef SpaprMachineState to spapr.h, Eduardo Habkost, 2020/08/27
- [PULL 27/53] s390x: Move typedef SCLPEventFacility to event-facility.h, Eduardo Habkost, 2020/08/27
- [PULL 28/53] vhost-user-gpu: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 29/53] ahci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 24/53] armsse: Rename QOM macros to avoid conflicts, Eduardo Habkost, 2020/08/27
- [PULL 30/53] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 31/53] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 32/53] pckbd: Move QOM macro to header,
Eduardo Habkost <=
- [PULL 33/53] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/27
- [PULL 37/53] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 34/53] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 36/53] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 35/53] piix: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 38/53] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 39/53] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 41/53] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 40/53] kvm: Move QOM macros to kvm.h, Eduardo Habkost, 2020/08/27
- [PULL 43/53] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro, Eduardo Habkost, 2020/08/27