Le 28/05/2019 à 18:40, Philippe Mathieu-Daudé a écrit : > Rather than looking inside the definition of a DeviceState with > "s->qdev", use the QOM prefered style: "DEVICE(s)". > > This patch was generated using the following Coccinelle script: > > // Use DEVICE() macros to access DeviceState.qdev > @use_device_macro_to_access_qdev@ > expression obj; > identifier dev; > @@ > -&obj->dev.qdev > +DEVICE(obj) > > Suggested-by: Peter Maydell <peter.mayd...@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/usb/dev-storage.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c > index cd5551d94f..0e4e93ef16 100644 > --- a/hw/usb/dev-storage.c > +++ b/hw/usb/dev-storage.c > @@ -616,7 +616,7 @@ static void usb_msd_storage_realize(USBDevice *dev, Error > **errp) > * The hack is probably a bad idea. > */ > blk_ref(blk); > - blk_detach_dev(blk, &s->dev.qdev); > + blk_detach_dev(blk, DEVICE(s)); > s->conf.blk = NULL; > > usb_desc_create_serial(dev); >
Applied to my trivial-patches branch. Thanks, Laurent
