| Message ID | 20200902224311.1321159-54-ehabkost@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qom: Rename macros for consistency | expand |
On 9/3/20 12:43 AM, Eduardo Habkost wrote: > Make the type checking macro name consistent with the TYPE_* > constant. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> > Cc: qemu-devel@nongnu.org > --- > hw/usb/dev-serial.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c > index 1a58851d4b..1a038a222e 100644 > --- a/hw/usb/dev-serial.c > +++ b/hw/usb/dev-serial.c > @@ -113,7 +113,7 @@ struct USBSerialState { > typedef struct USBSerialState USBSerialState; > > #define TYPE_USB_SERIAL "usb-serial-dev" > -DECLARE_INSTANCE_CHECKER(USBSerialState, USB_SERIAL_DEV, > +DECLARE_INSTANCE_CHECKER(USBSerialState, USB_SERIAL, > TYPE_USB_SERIAL) > > enum { > @@ -517,7 +517,7 @@ static void usb_serial_event(void *opaque, QEMUChrEvent event) > > static void usb_serial_realize(USBDevice *dev, Error **errp) > { > - USBSerialState *s = USB_SERIAL_DEV(dev); > + USBSerialState *s = USB_SERIAL(dev); > Error *local_err = NULL; > > usb_desc_create_serial(dev); >
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 1a58851d4b..1a038a222e 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -113,7 +113,7 @@ struct USBSerialState { typedef struct USBSerialState USBSerialState; #define TYPE_USB_SERIAL "usb-serial-dev" -DECLARE_INSTANCE_CHECKER(USBSerialState, USB_SERIAL_DEV, +DECLARE_INSTANCE_CHECKER(USBSerialState, USB_SERIAL, TYPE_USB_SERIAL) enum { @@ -517,7 +517,7 @@ static void usb_serial_event(void *opaque, QEMUChrEvent event) static void usb_serial_realize(USBDevice *dev, Error **errp) { - USBSerialState *s = USB_SERIAL_DEV(dev); + USBSerialState *s = USB_SERIAL(dev); Error *local_err = NULL; usb_desc_create_serial(dev);
Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Cc: qemu-devel@nongnu.org --- hw/usb/dev-serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)