[vmware] Expose GuestRPC mechanism in 64-bit builds

The GuestRPC mechanism (used for VMWARE_SETTINGS and CONSOLE_VMWARE)
does not use any real-mode code and so can be exposed in both 64-bit
and 32-bit builds.

Reported-by: Matthew Helton <mwhelton@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 7f706a5a466e5b32c43ceb54f0a7f38e8c59885c..478e0634c7947422716faf2cf311827f07889356 100644 (file)
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -115,7 +115,6 @@ SRCDIRS             += arch/i386/interface/pcbios
 SRCDIRS                += arch/i386/interface/pxe
 SRCDIRS                += arch/i386/interface/pxeparent
 SRCDIRS        += arch/i386/interface/syslinux
-SRCDIRS                += arch/i386/interface/vmware
 SRCDIRS                += arch/i386/hci/commands
 
 # Include common x86 Makefile

diff --git a/src/arch/x86/Makefile b/src/arch/x86/Makefile
index 98c49b98d90f0587cd80d978ee210bf89e1335b7..4ab741db76664c37aca9ff10eda3282f2c25ee97 100644 (file)
--- a/src/arch/x86/Makefile
+++ b/src/arch/x86/Makefile
@@ -6,6 +6,7 @@ INCDIRS         += arch/x86/include
 #
 SRCDIRS                += arch/x86/core
 SRCDIRS                += arch/x86/interface/efi
+SRCDIRS                += arch/x86/interface/vmware
 SRCDIRS                += arch/x86/prefix
 SRCDIRS                += arch/x86/hci/commands
 SRCDIRS                += arch/x86/drivers/xen

diff --git a/src/arch/i386/include/ipxe/guestrpc.h b/src/arch/x86/include/ipxe/guestrpc.h
similarity index 100%
rename from src/arch/i386/include/ipxe/guestrpc.h
rename to src/arch/x86/include/ipxe/guestrpc.h

diff --git a/src/arch/i386/include/ipxe/vmware.h b/src/arch/x86/include/ipxe/vmware.h
similarity index 100%
rename from src/arch/i386/include/ipxe/vmware.h
rename to src/arch/x86/include/ipxe/vmware.h

diff --git a/src/arch/i386/interface/vmware/guestinfo.c b/src/arch/x86/interface/vmware/guestinfo.c
similarity index 100%
rename from src/arch/i386/interface/vmware/guestinfo.c
rename to src/arch/x86/interface/vmware/guestinfo.c

diff --git a/src/arch/i386/interface/vmware/guestrpc.c b/src/arch/x86/interface/vmware/guestrpc.c
similarity index 100%
rename from src/arch/i386/interface/vmware/guestrpc.c
rename to src/arch/x86/interface/vmware/guestrpc.c

diff --git a/src/arch/i386/interface/vmware/vmconsole.c b/src/arch/x86/interface/vmware/vmconsole.c
similarity index 100%
rename from src/arch/i386/interface/vmware/vmconsole.c
rename to src/arch/x86/interface/vmware/vmconsole.c

diff --git a/src/arch/i386/interface/vmware/vmware.c b/src/arch/x86/interface/vmware/vmware.c
similarity index 100%
rename from src/arch/i386/interface/vmware/vmware.c
rename to src/arch/x86/interface/vmware/vmware.c