ext_table = v3_create_htable(0, ext_hash_fn, ext_eq_fn);
while (tmp_ext != __stop__v3_extensions) {
+
+ if (!(*tmp_ext)) {
+ PrintError(VM_NONE, VCORE_NONE, "Impossible extension\n");
+ return -1;
+ }
+
+ if ((*tmp_ext)->init && ((*tmp_ext)->init() != 0)) {
+ PrintError(VM_NONE, VCORE_NONE, "Could not initialize extension (%s)\n", (*tmp_ext)->name);
+ return -1;
+ }
+
V3_Print(VM_NONE, VCORE_NONE, "Registering Extension (%s)\n", (*tmp_ext)->name);
if (v3_htable_search(ext_table, (addr_t)((*tmp_ext)->name))) {
list_for_each_entry_safe(ext, tmp, &(ext_state->extensions), node) {
V3_Print(vm, VCORE_NONE, "Cleaning up Extension (%s)\n", ext->impl->name);
- if ((ext->impl) && (ext->impl->deinit)) {
- if (ext->impl->deinit(vm, ext->priv_data) == -1) {
- PrintError(vm, VCORE_NONE, "Error cleaning up extension (%s)\n", ext->impl->name);
- return -1;
+ if (ext->impl) {
+ if (ext->impl->vm_deinit) {
+ if (ext->impl->vm_deinit(vm, ext->priv_data) == -1) {
+ PrintError(vm, VCORE_NONE, "Error cleaning up extension (%s)\n", ext->impl->name);
+ return -1;
+ }
}
- }
-
- if (ext->impl->on_exit)
- list_del(&ext->exit_node);
-
- if (ext->impl->on_entry)
- list_del(&ext->entry_node);
-
- list_del(&ext->node);
- V3_Free(ext);
+ if (ext->impl->on_exit)
+ list_del(&ext->exit_node);
+
+ if (ext->impl->on_entry)
+ list_del(&ext->entry_node);
+ }
+
+ list_del(&ext->node);
+ V3_Free(ext);
+
}
return 0;
return -1;
}
- V3_ASSERT(vm, VCORE_NONE, impl->init);
+ V3_ASSERT(vm, VCORE_NONE, impl->vm_init);
/* this allows each extension to track its own per-core state */
ext_size = sizeof(struct v3_extension) + (sizeof(void *) * vm->num_cores);
ext->impl = impl;
- if (impl->init(vm, cfg, &(ext->priv_data)) == -1) {
+ if (impl->vm_init(vm, cfg, &(ext->priv_data)) == -1) {
PrintError(vm, VCORE_NONE, "Error initializing Extension (%s)\n", name);
V3_Free(ext);
return -1;