| Message ID | 20200620225854.31160-2-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/misc/pca9552: Trace GPIO change events | expand |
+Markus On 6/21/20 12:58 AM, Philippe Mathieu-Daudé wrote: > Extract i2c_try_create_slave() and i2c_realize_and_unref() > from i2c_create_slave(). > We can now set properties on a I2CSlave before it is realized. > > This is in line with the recent qdev/QOM changes merged > in commit 6675a653d2e. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/i2c/i2c.h | 2 ++ > hw/i2c/core.c | 18 ++++++++++++++++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h > index 4117211565..d6e3d85faf 100644 > --- a/include/hw/i2c/i2c.h > +++ b/include/hw/i2c/i2c.h > @@ -80,6 +80,8 @@ int i2c_send(I2CBus *bus, uint8_t data); > uint8_t i2c_recv(I2CBus *bus); > > DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); > +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr); > +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp); > > /* lm832x.c */ > void lm832x_key_event(DeviceState *dev, int key, int state); > diff --git a/hw/i2c/core.c b/hw/i2c/core.c > index 1aac457a2a..acf34a12d6 100644 > --- a/hw/i2c/core.c > +++ b/hw/i2c/core.c > @@ -267,13 +267,27 @@ const VMStateDescription vmstate_i2c_slave = { > } > }; > > -DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) > +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr) > { > DeviceState *dev; > > dev = qdev_new(name); > qdev_prop_set_uint8(dev, "address", addr); > - qdev_realize_and_unref(dev, &bus->qbus, &error_fatal); > + return dev; > +} > + > +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp) > +{ > + return qdev_realize_and_unref(dev, &bus->qbus, errp); > +} > + > +DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) > +{ > + DeviceState *dev; > + > + dev = i2c_try_create_slave(name, addr); > + i2c_realize_and_unref(dev, bus, &error_fatal); > + > return dev; > } > >
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > Extract i2c_try_create_slave() and i2c_realize_and_unref() > from i2c_create_slave(). > We can now set properties on a I2CSlave before it is realized. > > This is in line with the recent qdev/QOM changes merged > in commit 6675a653d2e. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/i2c/i2c.h | 2 ++ > hw/i2c/core.c | 18 ++++++++++++++++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h > index 4117211565..d6e3d85faf 100644 > --- a/include/hw/i2c/i2c.h > +++ b/include/hw/i2c/i2c.h > @@ -80,6 +80,8 @@ int i2c_send(I2CBus *bus, uint8_t data); > uint8_t i2c_recv(I2CBus *bus); > > DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); > +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr); > +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp); > > /* lm832x.c */ > void lm832x_key_event(DeviceState *dev, int key, int state); > diff --git a/hw/i2c/core.c b/hw/i2c/core.c > index 1aac457a2a..acf34a12d6 100644 > --- a/hw/i2c/core.c > +++ b/hw/i2c/core.c > @@ -267,13 +267,27 @@ const VMStateDescription vmstate_i2c_slave = { > } > }; > > -DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) > +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr) > { > DeviceState *dev; > > dev = qdev_new(name); > qdev_prop_set_uint8(dev, "address", addr); > - qdev_realize_and_unref(dev, &bus->qbus, &error_fatal); > + return dev; > +} > + > +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp) > +{ > + return qdev_realize_and_unref(dev, &bus->qbus, errp); > +} > + > +DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) > +{ > + DeviceState *dev; > + > + dev = i2c_try_create_slave(name, addr); > + i2c_realize_and_unref(dev, bus, &error_fatal); > + > return dev; > } No objections, except I want to see actual users.
On 6/22/20 5:17 PM, Markus Armbruster wrote: > Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > >> Extract i2c_try_create_slave() and i2c_realize_and_unref() >> from i2c_create_slave(). >> We can now set properties on a I2CSlave before it is realized. >> >> This is in line with the recent qdev/QOM changes merged >> in commit 6675a653d2e. >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> include/hw/i2c/i2c.h | 2 ++ >> hw/i2c/core.c | 18 ++++++++++++++++-- >> 2 files changed, 18 insertions(+), 2 deletions(-) >> >> diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h >> index 4117211565..d6e3d85faf 100644 >> --- a/include/hw/i2c/i2c.h >> +++ b/include/hw/i2c/i2c.h >> @@ -80,6 +80,8 @@ int i2c_send(I2CBus *bus, uint8_t data); >> uint8_t i2c_recv(I2CBus *bus); >> >> DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); >> +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr); >> +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp); >> >> /* lm832x.c */ >> void lm832x_key_event(DeviceState *dev, int key, int state); >> diff --git a/hw/i2c/core.c b/hw/i2c/core.c >> index 1aac457a2a..acf34a12d6 100644 >> --- a/hw/i2c/core.c >> +++ b/hw/i2c/core.c >> @@ -267,13 +267,27 @@ const VMStateDescription vmstate_i2c_slave = { >> } >> }; >> >> -DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) >> +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr) >> { >> DeviceState *dev; >> >> dev = qdev_new(name); >> qdev_prop_set_uint8(dev, "address", addr); >> - qdev_realize_and_unref(dev, &bus->qbus, &error_fatal); >> + return dev; >> +} >> + >> +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp) >> +{ >> + return qdev_realize_and_unref(dev, &bus->qbus, errp); >> +} >> + >> +DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) >> +{ >> + DeviceState *dev; >> + >> + dev = i2c_try_create_slave(name, addr); >> + i2c_realize_and_unref(dev, bus, &error_fatal); >> + >> return dev; >> } > > No objections, except I want to see actual users. You weren't Cc'ed on the whole series. User is patch #6/8 "hw/arm/aspeed: Describe each PCA9552 device": https://www.mail-archive.com/qemu-devel@nongnu.org/msg714658.html
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > On 6/22/20 5:17 PM, Markus Armbruster wrote: >> >> No objections, except I want to see actual users. > > You weren't Cc'ed on the whole series. > > User is patch #6/8 "hw/arm/aspeed: Describe each PCA9552 device": > https://www.mail-archive.com/qemu-devel@nongnu.org/msg714658.html Fat-fingered my grep, sorry for the noise.
diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 4117211565..d6e3d85faf 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -80,6 +80,8 @@ int i2c_send(I2CBus *bus, uint8_t data); uint8_t i2c_recv(I2CBus *bus); DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr); +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp); /* lm832x.c */ void lm832x_key_event(DeviceState *dev, int key, int state); diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 1aac457a2a..acf34a12d6 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -267,13 +267,27 @@ const VMStateDescription vmstate_i2c_slave = { } }; -DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) +DeviceState *i2c_try_create_slave(const char *name, uint8_t addr) { DeviceState *dev; dev = qdev_new(name); qdev_prop_set_uint8(dev, "address", addr); - qdev_realize_and_unref(dev, &bus->qbus, &error_fatal); + return dev; +} + +bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp) +{ + return qdev_realize_and_unref(dev, &bus->qbus, errp); +} + +DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) +{ + DeviceState *dev; + + dev = i2c_try_create_slave(name, addr); + i2c_realize_and_unref(dev, bus, &error_fatal); + return dev; }
Extract i2c_try_create_slave() and i2c_realize_and_unref() from i2c_create_slave(). We can now set properties on a I2CSlave before it is realized. This is in line with the recent qdev/QOM changes merged in commit 6675a653d2e. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/i2c/i2c.h | 2 ++ hw/i2c/core.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)