Message ID | 20190425200051.19906-4-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
On 25/04/19 22:00, Eduardo Habkost wrote: > diff --git a/hw/core/qdev-hotplug-stubs.c b/hw/core/qdev-hotplug-stubs.c > new file mode 100644 > index 0000000000..c710f23388 > --- /dev/null > +++ b/hw/core/qdev-hotplug-stubs.c > @@ -0,0 +1,44 @@ > +/* > + * qdev hotplug handler stubs (for user-mode emulation and unit tests) Can you explain the issue with unit tests in the commit message? > + * Copyright (c) 2019 Red Hat Inc > + * > + * Authors: > + * Eduardo Habkost <ehabkost@redhat.com> > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/qdev-core.h" > +#include "hw/hotplug.h" > + > +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) > +{ > + return NULL; > +} > + > +void hotplug_handler_pre_plug(HotplugHandler *plug_handler, > + DeviceState *plugged_dev, > + Error **errp) > +{ > + assert(plug_handler == NULL); > +} > + > +void hotplug_handler_plug(HotplugHandler *plug_handler, > + DeviceState *plugged_dev, > + Error **errp) > +{ > + assert(plug_handler == NULL); > +} Would it work if you instead make these functions (and the others in hw/core/hotplug.c) inlines in include/hw/hotplug.h? Then all that remains is qdev_get_hotplug_handler. Paolo
On Fri, Apr 26, 2019 at 10:27:58AM +0200, Paolo Bonzini wrote: > On 25/04/19 22:00, Eduardo Habkost wrote: > > diff --git a/hw/core/qdev-hotplug-stubs.c b/hw/core/qdev-hotplug-stubs.c > > new file mode 100644 > > index 0000000000..c710f23388 > > --- /dev/null > > +++ b/hw/core/qdev-hotplug-stubs.c > > @@ -0,0 +1,44 @@ > > +/* > > + * qdev hotplug handler stubs (for user-mode emulation and unit tests) > > Can you explain the issue with unit tests in the commit message? I don't think there are issues with unit tests. I just thought it was pointless to link qdev-hotplug.o into unit tests binaries if no hotplug handler object is created by them. What do you think? Should I keep qdev-hotplug.o and hotplug.o in the unit tests binaries? > > > + * Copyright (c) 2019 Red Hat Inc > > + * > > + * Authors: > > + * Eduardo Habkost <ehabkost@redhat.com> > > + * > > + * This library is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU Lesser General Public > > + * License as published by the Free Software Foundation; either > > + * version 2 of the License, or (at your option) any later version. > > + * > > + * This library is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > + * Lesser General Public License for more details. > > + * > > + * You should have received a copy of the GNU Lesser General Public > > + * License along with this library; if not, see <http://www.gnu.org/licenses/>. > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "hw/qdev-core.h" > > +#include "hw/hotplug.h" > > + > > +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) > > +{ > > + return NULL; > > +} > > + > > +void hotplug_handler_pre_plug(HotplugHandler *plug_handler, > > + DeviceState *plugged_dev, > > + Error **errp) > > +{ > > + assert(plug_handler == NULL); > > +} > > + > > +void hotplug_handler_plug(HotplugHandler *plug_handler, > > + DeviceState *plugged_dev, > > + Error **errp) > > +{ > > + assert(plug_handler == NULL); > > +} > > Would it work if you instead make these functions (and the others in > hw/core/hotplug.c) inlines in include/hw/hotplug.h? > > Then all that remains is qdev_get_hotplug_handler. I think that would work. I'll do that in v2, thanks!
diff --git a/hw/core/qdev-hotplug-stubs.c b/hw/core/qdev-hotplug-stubs.c new file mode 100644 index 0000000000..c710f23388 --- /dev/null +++ b/hw/core/qdev-hotplug-stubs.c @@ -0,0 +1,44 @@ +/* + * qdev hotplug handler stubs (for user-mode emulation and unit tests) + * + * Copyright (c) 2019 Red Hat Inc + * + * Authors: + * Eduardo Habkost <ehabkost@redhat.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "qemu/osdep.h" +#include "hw/qdev-core.h" +#include "hw/hotplug.h" + +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) +{ + return NULL; +} + +void hotplug_handler_pre_plug(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp) +{ + assert(plug_handler == NULL); +} + +void hotplug_handler_plug(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp) +{ + assert(plug_handler == NULL); +} diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 9c4f953716..284fc306c5 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -1,11 +1,10 @@ # core qdev-related obj files, also used by *-user: common-obj-y += qdev.o qdev-properties.o -common-obj-y += bus.o reset.o qdev-hotplug.o +common-obj-y += bus.o reset.o common-obj-$(CONFIG_SOFTMMU) += qdev-fw.o common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o # irq.o needed for qdev GPIO handling: common-obj-y += irq.o -common-obj-y += hotplug.o common-obj-$(CONFIG_SOFTMMU) += nmi.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o @@ -13,6 +12,7 @@ common-obj-$(CONFIG_XILINX_AXI) += stream.o common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o +common-obj-$(CONFIG_SOFTMMU) += hotplug.o qdev-hotplug.o common-obj-$(CONFIG_SOFTMMU) += gpio.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_FITLOADER) += loader-fit.o @@ -23,3 +23,5 @@ common-obj-$(CONFIG_SOFTMMU) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o common-obj-$(CONFIG_SOFTMMU) += generic-loader.o common-obj-$(CONFIG_SOFTMMU) += null-machine.o + +common-obj-$(CONFIG_USER_ONLY) += qdev-hotplug-stubs.o diff --git a/tests/Makefile.include b/tests/Makefile.include index e2432d5e77..fd5e7e0c77 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -568,7 +568,8 @@ tests/fp/%: $(MAKE) -C $(dir $@) $(notdir $@) tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ - hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\ + hw/core/qdev.o hw/core/qdev-properties.o \ + hw/core/qdev-hotplug-stubs.o \ hw/core/bus.o \ hw/core/irq.o \ hw/core/fw-path-provider.o \
Move qdev-hotplug.o and hotplug.o to CONFIG_SOFTMMU because the code is not necessary for *-user. Provide a few stubs in qdev-hotplug-stubs.c to replace initialization functions that are called from qdev.c. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/core/qdev-hotplug-stubs.c | 44 ++++++++++++++++++++++++++++++++++++ hw/core/Makefile.objs | 6 +++-- tests/Makefile.include | 3 ++- 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 hw/core/qdev-hotplug-stubs.c