[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>
ipxe · Jan 5, 2016 · dd48599 · dd48599
1 parent 29cb090
commit dd48599
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 1 deletion.
diff --git 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
@@ -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 → src/arch/x86/include/ipxe/guestrpc.h b/src/arch/i386/include/ipxe/guestrpc.h → src/arch/x86/include/ipxe/guestrpc.h
diff --git a/src/arch/i386/include/ipxe/vmware.h → src/arch/x86/include/ipxe/vmware.h b/src/arch/i386/include/ipxe/vmware.h → src/arch/x86/include/ipxe/vmware.h
diff --git a/src/arch/i386/interface/vmware/guestinfo.c → src/arch/x86/interface/vmware/guestinfo.c b/src/arch/i386/interface/vmware/guestinfo.c → src/arch/x86/interface/vmware/guestinfo.c
diff --git a/src/arch/i386/interface/vmware/guestrpc.c → src/arch/x86/interface/vmware/guestrpc.c b/src/arch/i386/interface/vmware/guestrpc.c → src/arch/x86/interface/vmware/guestrpc.c
diff --git a/src/arch/i386/interface/vmware/vmconsole.c → src/arch/x86/interface/vmware/vmconsole.c b/src/arch/i386/interface/vmware/vmconsole.c → src/arch/x86/interface/vmware/vmconsole.c
diff --git a/src/arch/i386/interface/vmware/vmware.c → src/arch/x86/interface/vmware/vmware.c b/src/arch/i386/interface/vmware/vmware.c → src/arch/x86/interface/vmware/vmware.c