diff options
| author | Michael Brown | 2016-01-05 18:20:36 +0100 |
|---|---|---|
| committer | Michael Brown | 2016-01-05 18:20:36 +0100 |
| commit | dd485992dc213dc19876a331f3a044dcb2e7560b (patch) | |
| tree | bed08bb9d09a1ab0ee96c9f1e8ad447487bf7ea3 | |
| parent | [crypto] Dual-license more selected DRBG files (diff) | |
| download | ipxe-dd485992dc213dc19876a331f3a044dcb2e7560b.tar.gz ipxe-dd485992dc213dc19876a331f3a044dcb2e7560b.tar.xz ipxe-dd485992dc213dc19876a331f3a044dcb2e7560b.zip | |
[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>
| -rw-r--r-- | src/arch/i386/Makefile | 1 | ||||
| -rw-r--r-- | src/arch/x86/Makefile | 1 | ||||
| -rw-r--r-- | src/arch/x86/include/ipxe/guestrpc.h (renamed from src/arch/i386/include/ipxe/guestrpc.h) | 0 | ||||
| -rw-r--r-- | src/arch/x86/include/ipxe/vmware.h (renamed from src/arch/i386/include/ipxe/vmware.h) | 0 | ||||
| -rw-r--r-- | src/arch/x86/interface/vmware/guestinfo.c (renamed from src/arch/i386/interface/vmware/guestinfo.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/interface/vmware/guestrpc.c (renamed from src/arch/i386/interface/vmware/guestrpc.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/interface/vmware/vmconsole.c (renamed from src/arch/i386/interface/vmware/vmconsole.c) | 0 | ||||
| -rw-r--r-- | src/arch/x86/interface/vmware/vmware.c (renamed from src/arch/i386/interface/vmware/vmware.c) | 0 |
8 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index 7f706a5a4..478e0634c 100644 --- 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 98c49b98d..4ab741db7 100644 --- 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 index bc3d85506..bc3d85506 100644 --- a/src/arch/i386/include/ipxe/guestrpc.h +++ b/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 index 24f60a03a..24f60a03a 100644 --- a/src/arch/i386/include/ipxe/vmware.h +++ b/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 index a0530c8d1..a0530c8d1 100644 --- a/src/arch/i386/interface/vmware/guestinfo.c +++ b/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 index ef7ee8151..ef7ee8151 100644 --- a/src/arch/i386/interface/vmware/guestrpc.c +++ b/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 index f7df4f75b..f7df4f75b 100644 --- a/src/arch/i386/interface/vmware/vmconsole.c +++ b/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 index a415465fb..a415465fb 100644 --- a/src/arch/i386/interface/vmware/vmware.c +++ b/src/arch/x86/interface/vmware/vmware.c |