Some work on the hdimage plugin support.

- Renamed vpc-img.* files to vpc.* and removed hack for image mode name conversion. - Added suffix "_img" to all disk image mode plugin base names. This is important for the future implementation of a plugin enumeration at Bochs startup.
2020-12-30 17:56:27 +00:00 · 2020-12-30 17:56:27 +00:00 · c99bd49f34
commit c99bd49f34
parent c8eec65f04
9 changed files with 64 additions and 54 deletions
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@ -245,8 +245,8 @@ bochs_plugins:
 	$(MAKE) plugins
 	@CD_UP_TWO@

-bximage@EXE@: misc/bximage.o misc/hdimage.o misc/vmware3.o misc/vmware4.o misc/vpc-img.o misc/vbox.o
-	@LINK_CONSOLE@ $(BXIMAGE_LINK_OPTS) misc/bximage.o misc/hdimage.o misc/vmware3.o misc/vmware4.o misc/vpc-img.o misc/vbox.o
+bximage@EXE@: misc/bximage.o misc/hdimage.o misc/vmware3.o misc/vmware4.o misc/vpc.o misc/vbox.o
+	@LINK_CONSOLE@ $(BXIMAGE_LINK_OPTS) misc/bximage.o misc/hdimage.o misc/vmware3.o misc/vmware4.o misc/vpc.o misc/vbox.o

 niclist@EXE@: misc/niclist.o
 	@LINK_CONSOLE@ misc/niclist.o
@ -271,9 +271,9 @@ misc/vmware4.o: $(srcdir)/iodev/hdimage/vmware4.cc $(srcdir)/iodev/hdimage/vmwar
  $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
 	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vmware4.cc @OFP@$@

-misc/vpc-img.o: $(srcdir)/iodev/hdimage/vpc-img.cc $(srcdir)/iodev/hdimage/vpc-img.h \
+misc/vpc.o: $(srcdir)/iodev/hdimage/vpc.cc $(srcdir)/iodev/hdimage/vpc.h \
  $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vpc-img.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vpc.cc @OFP@$@

 misc/vbox.o: $(srcdir)/iodev/hdimage/vbox.cc $(srcdir)/iodev/hdimage/vbox.h \
  $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
--- a/bochs/configure
+++ b/bochs/configure
@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 14010 2020-11-25 07:56:32Z vruppert .
+# From configure.in Id: configure.in 14039 2020-12-27 17:26:33Z vruppert .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@ -807,6 +807,7 @@ CD_UP_THREE
 CD_UP_TWO
 CD_UP_ONE
 COMMAND_SEPARATOR
+IMG_PLUGIN_NAME_TRANSFORMATION
 PLUGIN_LIBNAME_TRANSFORMATION
 OPTIONAL_TARGET
 PRIMARY_TARGET
@ -5198,7 +5199,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5201 "configure"' > conftest.$ac_ext
+  echo '#line 5202 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -6886,11 +6887,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6889: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6890: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6893: \$? = $ac_status" >&5
+   echo "$as_me:6894: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -7119,11 +7120,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7122: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7123: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7126: \$? = $ac_status" >&5
+   echo "$as_me:7127: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -7186,11 +7187,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7190: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7193: \$? = $ac_status" >&5
+   echo "$as_me:7194: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -8976,7 +8977,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 8979 "configure"
+#line 8980 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -9074,7 +9075,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 9077 "configure"
+#line 9078 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -11189,11 +11190,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11192: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11193: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:11196: \$? = $ac_status" >&5
+   echo "$as_me:11197: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -11256,11 +11257,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11259: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11260: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:11263: \$? = $ac_status" >&5
+   echo "$as_me:11264: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -12281,7 +12282,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 12284 "configure"
+#line 12285 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -12379,7 +12380,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 12382 "configure"
+#line 12383 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -13202,11 +13203,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13205: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13206: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:13209: \$? = $ac_status" >&5
+   echo "$as_me:13210: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -13269,11 +13270,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13272: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13273: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:13276: \$? = $ac_status" >&5
+   echo "$as_me:13277: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -15234,11 +15235,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15237: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15238: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:15241: \$? = $ac_status" >&5
+   echo "$as_me:15242: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -15467,11 +15468,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15470: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15471: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:15474: \$? = $ac_status" >&5
+   echo "$as_me:15475: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -15534,11 +15535,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15537: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15538: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:15541: \$? = $ac_status" >&5
+   echo "$as_me:15542: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -17324,7 +17325,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 17327 "configure"
+#line 17328 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -17422,7 +17423,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 17425 "configure"
+#line 17426 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -19109,7 +19110,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 19112 "configure"
+#line 19113 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -24344,6 +24345,7 @@ fi

 PRIMARY_TARGET='bochs'
 PLUGIN_LIBNAME_TRANSFORMATION='%.o=libbx_%.la'
+IMG_PLUGIN_NAME_TRANSFORMATION='%.o=libbx_%_img.la'

 if test "$bx_plugins" = 0; then
  DISPLAY_LIB_VAR='iodev/display/libdisplay.a'
@ -25260,6 +25262,7 @@ case $target in
      # set variables for building DLL plugins
      PLUGIN_VAR=""
      PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
+      IMG_PLUGIN_NAME_TRANSFORMATION='%.o=bx_%_img.dll'
      INSTALL_PLUGINS_VAR=install_dll_plugins
      WIN32_DLL_IMPORT_LIB="bochs.lib"
      LINK_DLL="link /dll /nologo /subsystem:console /incremental:no /out:\$@"
@ -25298,6 +25301,7 @@ case $target in
      # set variables for building DLL plugins
      PRIMARY_TARGET=".win32_dll_plugin_target"
      PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
+      IMG_PLUGIN_NAME_TRANSFORMATION='%.o=bx_%_img.dll'
      INSTALL_PLUGINS_VAR=install_dll_plugins
      WIN32_DLL_IMPORT_LIB="dllexports.a"
      LINK_DLL="\$(CXX) \$(CXXFLAGS) -shared -o \$@"
@ -26181,6 +26185,7 @@ if test ! -d build/win32/nsis; then mkdir build/win32/nsis; fi



+


 # Extract the first word of "gzip", so it can be a program name with args.
--- a/bochs/configure.in
+++ b/bochs/configure.in
@ -2177,6 +2177,7 @@ AC_SUBST(DOCBOOK2HTML)

 PRIMARY_TARGET='bochs'
 PLUGIN_LIBNAME_TRANSFORMATION='%.o=libbx_%.la'
+IMG_PLUGIN_NAME_TRANSFORMATION='%.o=libbx_%_img.la'

 if test "$bx_plugins" = 0; then
  DISPLAY_LIB_VAR='iodev/display/libdisplay.a'
@ -2872,6 +2873,7 @@ case $target in
      # set variables for building DLL plugins
      PLUGIN_VAR=""
      PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
+      IMG_PLUGIN_NAME_TRANSFORMATION='%.o=bx_%_img.dll'
      INSTALL_PLUGINS_VAR=install_dll_plugins
      WIN32_DLL_IMPORT_LIB="bochs.lib"
      LINK_DLL="link /dll /nologo /subsystem:console /incremental:no /out:\$@"
@ -2910,6 +2912,7 @@ case $target in
      # set variables for building DLL plugins
      PRIMARY_TARGET=".win32_dll_plugin_target"
      PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
+      IMG_PLUGIN_NAME_TRANSFORMATION='%.o=bx_%_img.dll'
      INSTALL_PLUGINS_VAR=install_dll_plugins
      WIN32_DLL_IMPORT_LIB="dllexports.a"
      LINK_DLL="\$(CXX) \$(CXXFLAGS) -shared -o \$@"
@ -3264,6 +3267,7 @@ AC_SUBST(EXE)
 AC_SUBST(PRIMARY_TARGET)
 AC_SUBST(OPTIONAL_TARGET)
 AC_SUBST(PLUGIN_LIBNAME_TRANSFORMATION)
+AC_SUBST(IMG_PLUGIN_NAME_TRANSFORMATION)
 AC_SUBST(COMMAND_SEPARATOR)
 AC_SUBST(CD_UP_ONE)
 AC_SUBST(CD_UP_TWO)
--- a/bochs/iodev/hdimage/Makefile.in
+++ b/bochs/iodev/hdimage/Makefile.in
@ -50,7 +50,7 @@ LIBTOOL=@LIBTOOL@
 WIN32_DLL_IMPORT_LIBRARY=../../@WIN32_DLL_IMPORT_LIB@

 CDROM_OBJS = @CDROM_OBJS@
-HDIMAGE_EXTRA_OBJS = vbox.o vmware3.o vmware4.o vpc-img.o vvfat.o
+HDIMAGE_EXTRA_OBJS = vbox.o vmware3.o vmware4.o vpc.o vvfat.o

 HDIMAGE_LINK_OPTS =
 HDIMAGE_LINK_OPTS_VCPP = user32.lib
@ -67,13 +67,13 @@ OBJS_THAT_CAN_BE_PLUGINS = \

 NONPLUGIN_OBJS = @IODEV_EXT_NON_PLUGIN_OBJS@
 PLUGIN_OBJS = @IODEV_EXT_PLUGIN_OBJS@
-HDIMAGE_DLL_TARGETS = bx_vbox.dll bx_vmware3.dll bx_vmware4.dll bx_vpc-img.dll bx_vvfat.dll
+HDIMAGE_DLL_TARGETS = bx_vbox_img.dll bx_vmware3_img.dll bx_vmware4_img.dll bx_vpc_img.dll bx_vvfat_img.dll

 all: libhdimage.a

 plugins: @PLUGIN_TARGET_2@

-plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
+plugins_gcc: $(PLUGIN_OBJS:@IMG_PLUGIN_NAME_TRANSFORMATION@)

 plugins_msvc: $(HDIMAGE_DLL_TARGETS)

@ -90,26 +90,26 @@ libhdimage.a: $(NONPLUGIN_OBJS)
 %.lo: %.@CPP_SUFFIX@
 	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@

-libbx_%.la: %.lo
+libbx_%_img.la: %.lo
 	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)

 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
-bx_%.dll: %.o
+bx_%_img.dll: %.o
 	$(CXX) $(CXXFLAGS) -shared -o $@ $< $(WIN32_DLL_IMPORT_LIBRARY)

-bx_vbox.dll: vbox.o
+bx_vbox_img.dll: vbox.o
 	@LINK_DLL@ vbox.o $(WIN32_DLL_IMPORT_LIBRARY)

-bx_vmware3.dll: vmware3.o
+bx_vmware3_img.dll: vmware3.o
 	@LINK_DLL@ vmware3.o $(WIN32_DLL_IMPORT_LIBRARY)

-bx_vmware4.dll: vmware4.o
+bx_vmware4_img.dll: vmware4.o
 	@LINK_DLL@ vmware4.o $(WIN32_DLL_IMPORT_LIBRARY)

-bx_vpc-img.dll: vpc-img.o
+bx_vpc_img.dll: vpc-img.o
 	@LINK_DLL@ vpc-img.o $(WIN32_DLL_IMPORT_LIBRARY)

-bx_vvfat.dll: vvfat.o
+bx_vvfat_img.dll: vvfat.o
 	@LINK_DLL@ vvfat.o $(WIN32_DLL_IMPORT_LIBRARY) $(HDIMAGE_LINK_OPTS@LINK_VAR@)

 ##### end DLL section
@ -162,7 +162,7 @@ hdimage.o: hdimage.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
 ../../memory/memory-bochs.h ../../pc_system.h ../../gui/gui.h \
 ../../instrument/stubs/instrument.h ../../plugin.h ../../extplugin.h \
 ../../param_names.h cdrom.h cdrom_amigaos.h cdrom_misc.h cdrom_osx.h \
- cdrom_win32.h hdimage.h vmware3.h vmware4.h vvfat.h vpc-img.h vbox.h
+ cdrom_win32.h hdimage.h vmware3.h vmware4.h vvfat.h vpc.h vbox.h
 vbox.o: vbox.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
 ../../bx_debug/debug.h ../../config.h ../../osdep.h \
 ../../gui/siminterface.h ../../cpudb.h ../../gui/paramtree.h \
@ -181,12 +181,12 @@ vmware4.o: vmware4.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
 ../../memory/memory-bochs.h ../../pc_system.h ../../gui/gui.h \
 ../../instrument/stubs/instrument.h ../../plugin.h ../../extplugin.h \
 ../../param_names.h hdimage.h vmware4.h
-vpc-img.o: vpc-img.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
+vpc.o: vpc.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
 ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
 ../../gui/siminterface.h ../../cpudb.h ../../gui/paramtree.h \
 ../../memory/memory-bochs.h ../../pc_system.h ../../gui/gui.h \
 ../../instrument/stubs/instrument.h ../../plugin.h ../../extplugin.h \
- ../../param_names.h hdimage.h vpc-img.h
+ ../../param_names.h hdimage.h vpc.h
 vvfat.o: vvfat.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
 ../../bx_debug/debug.h ../../config.h ../../osdep.h \
 ../../gui/siminterface.h ../../cpudb.h ../../gui/paramtree.h \
@ -225,7 +225,7 @@ hdimage.lo: hdimage.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
 ../../memory/memory-bochs.h ../../pc_system.h ../../gui/gui.h \
 ../../instrument/stubs/instrument.h ../../plugin.h ../../extplugin.h \
 ../../param_names.h cdrom.h cdrom_amigaos.h cdrom_misc.h cdrom_osx.h \
- cdrom_win32.h hdimage.h vmware3.h vmware4.h vvfat.h vpc-img.h vbox.h
+ cdrom_win32.h hdimage.h vmware3.h vmware4.h vvfat.h vpc.h vbox.h
 vbox.lo: vbox.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
 ../../bx_debug/debug.h ../../config.h ../../osdep.h \
 ../../gui/siminterface.h ../../cpudb.h ../../gui/paramtree.h \
@ -244,12 +244,12 @@ vmware4.lo: vmware4.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
 ../../memory/memory-bochs.h ../../pc_system.h ../../gui/gui.h \
 ../../instrument/stubs/instrument.h ../../plugin.h ../../extplugin.h \
 ../../param_names.h hdimage.h vmware4.h
-vpc-img.lo: vpc-img.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
+vpc.lo: vpc.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
 ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
 ../../gui/siminterface.h ../../cpudb.h ../../gui/paramtree.h \
 ../../memory/memory-bochs.h ../../pc_system.h ../../gui/gui.h \
 ../../instrument/stubs/instrument.h ../../plugin.h ../../extplugin.h \
- ../../param_names.h hdimage.h vpc-img.h
+ ../../param_names.h hdimage.h vpc.h
 vvfat.lo: vvfat.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
 ../../bx_debug/debug.h ../../config.h ../../osdep.h \
 ../../gui/siminterface.h ../../cpudb.h ../../gui/paramtree.h \
--- a/bochs/iodev/hdimage/hdimage.cc
+++ b/bochs/iodev/hdimage/hdimage.cc
@ -37,7 +37,7 @@
 #include "vbox.h"
 #include "vmware3.h"
 #include "vmware4.h"
-#include "vpc-img.h"
+#include "vpc.h"
 #include "vvfat.h"
 #endif

--- a/bochs/iodev/hdimage/vpc-img.cc
+++ b/bochs/iodev/hdimage/vpc-img.cc
--- a/bochs/iodev/hdimage/vpc-img.h
+++ b/bochs/iodev/hdimage/vpc-img.h
--- a/bochs/misc/bximage.cc
+++ b/bochs/misc/bximage.cc
@ -74,7 +74,7 @@
 #include "iodev/hdimage/hdimage.h"
 #include "iodev/hdimage/vmware3.h"
 #include "iodev/hdimage/vmware4.h"
-#include "iodev/hdimage/vpc-img.h"
+#include "iodev/hdimage/vpc.h"

 #define BXIMAGE_MODE_NULL            0
 #define BXIMAGE_MODE_CREATE_IMAGE    1
--- a/bochs/plugin.cc
+++ b/bochs/plugin.cc
@ -54,10 +54,12 @@
 #define PLUGIN_FILENAME_FORMAT       "libbx_%s.so"
 #define SOUND_PLUGIN_FILENAME_FORMAT "libbx_sound%s.so"
 #define NET_PLUGIN_FILENAME_FORMAT   "libbx_eth_%s.so"
+#define IMG_PLUGIN_FILENAME_FORMAT   "libbx_%s_img.so"
 #else
 #define PLUGIN_FILENAME_FORMAT       "bx_%s.dll"
 #define SOUND_PLUGIN_FILENAME_FORMAT "bx_sound%s.dll"
 #define NET_PLUGIN_FILENAME_FORMAT   "bx_eth_%s.dll"
+#define IMG_PLUGIN_FILENAME_FORMAT   "bx_%s_img.dll"
 #endif

 logfunctions *pluginlog;
@ -325,9 +327,8 @@ void plugin_load(char *name, plugintype_t type)
    sprintf(tmpname, SOUND_PLUGIN_FILENAME_FORMAT, name);
  } else if (type == PLUGTYPE_NETWORK) {
    sprintf(tmpname, NET_PLUGIN_FILENAME_FORMAT, name);
-  } else if ((type == PLUGTYPE_HDIMAGE) && !strcmp(name, "vpc")) {
-    // FIXME: HACK!!!
-    sprintf(tmpname, PLUGIN_FILENAME_FORMAT, "vpc-img");
+  } else if (type == PLUGTYPE_HDIMAGE) {
+    sprintf(tmpname, IMG_PLUGIN_FILENAME_FORMAT, name);
  } else {
    sprintf(tmpname, PLUGIN_FILENAME_FORMAT, name);
  }