aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2020-08-25 15:20:29 -0400
committerEduardo Habkost <ehabkost@redhat.com>2020-08-27 14:04:54 -0400
commit41ea82055c7cd5dbcdeb61236eae4272a64bb5f6 (patch)
tree5c88d45419cd0be59b49314ca63997cdd200f0ea
parentdc15d9eb419c9c27e3c76741320b5134b15f4d57 (diff)
downloadqemu-41ea82055c7cd5dbcdeb61236eae4272a64bb5f6.zip
qemu-41ea82055c7cd5dbcdeb61236eae4272a64bb5f6.tar.gz
qemu-41ea82055c7cd5dbcdeb61236eae4272a64bb5f6.tar.bz2
pckbd: Move QOM macro to header
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>
-rw-r--r--hw/input/pckbd.c2
-rw-r--r--include/hw/input/i8042.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 29d633c..dde85ba 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;
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index 8eaebf5..4569dfd 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"