> static void virtio_ccw_gpu_register(void) > { > +#ifdef CONFIG_MODULES > + type_register_static_mayfail(&virtio_ccw_gpu); > +#else > type_register_static(&virtio_ccw_gpu); > +#endif
Move the ifdef to type_register_static_mayfail, so this is not duplicated for every module which might need this? > --- a/include/hw/s390x/css.h > +++ b/include/hw/s390x/css.h Move this to a separate patch? The "add type_register_mayfail" and "modularize virtio-gpu-ccw" changes should be separate patches too. > -static TypeImpl *type_register_internal(const TypeInfo *info) > +static TypeImpl *type_register_internal(const TypeInfo *info, bool mayfail) > { > TypeImpl *ti; > ti = type_new(info); Hmm, type_register_internal seems to not look at the new mayfail flag. Patch looks incomplete ... take care, Gerd