Message ID | 1466169069-29375-4-git-send-email-real@ispras.ru (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 17/06/2016 15:10, Efimov Vasily wrote: > Currently vmport device is identified by the string literal. Using a > preprocessor alias instead is preferable. > > Signed-off-by: Efimov Vasily <real@ispras.ru> > --- > hw/misc/vmport.c | 1 - > include/hw/i386/pc.h | 3 ++- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c > index 6896789..c763811 100644 > --- a/hw/misc/vmport.c > +++ b/hw/misc/vmport.c > @@ -36,7 +36,6 @@ > #define VMPORT_ENTRIES 0x2c > #define VMPORT_MAGIC 0x564D5868 > > -#define TYPE_VMPORT "vmport" > #define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT) > > typedef struct VMPortState > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 9ca2309..aab3a53 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -199,11 +199,12 @@ typedef struct GSIState { > void gsi_handler(void *opaque, int n, int level); > > /* vmport.c */ > +#define TYPE_VMPORT "vmport" > typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address); > > static inline void vmport_init(ISABus *bus) > { > - isa_create_simple(bus, "vmport"); > + isa_create_simple(bus, TYPE_VMPORT); > } > > void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque); > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c index 6896789..c763811 100644 --- a/hw/misc/vmport.c +++ b/hw/misc/vmport.c @@ -36,7 +36,6 @@ #define VMPORT_ENTRIES 0x2c #define VMPORT_MAGIC 0x564D5868 -#define TYPE_VMPORT "vmport" #define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT) typedef struct VMPortState diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9ca2309..aab3a53 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -199,11 +199,12 @@ typedef struct GSIState { void gsi_handler(void *opaque, int n, int level); /* vmport.c */ +#define TYPE_VMPORT "vmport" typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address); static inline void vmport_init(ISABus *bus) { - isa_create_simple(bus, "vmport"); + isa_create_simple(bus, TYPE_VMPORT); } void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque);
Currently vmport device is identified by the string literal. Using a preprocessor alias instead is preferable. Signed-off-by: Efimov Vasily <real@ispras.ru> --- hw/misc/vmport.c | 1 - include/hw/i386/pc.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)