From c64a364226edfbbc556523ae05bbe69380f2f6b4 Mon Sep 17 00:00:00 2001 From: Don Slutz Date: Thu, 21 Nov 2013 14:28:00 -0500 Subject: [PATCH for-4.5 v7 2/7] tools: Add vmware_hw support This is used to set HVM_PARAM_VMWARE_HW. It is set to the VMware virtual hardware version. Currently 0, 3-4, 6-11 are good values. However the code only checks for == 0 or != 0. If non-zero then default VGA to VMware's VGA. Also now allows vga=vmware Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper --- v8: Adjusted as Andrew Cooper segested. Added Reviewed-by: Andrew Cooper docs/man/xl.cfg.pod.5 | 25 +++++++++++++++++++++++-- docs/misc/hypervisor-cpuid.markdown | 33 +++++++++++++++++++++++++++++++++ tools/libxc/xc_domain_restore.c | 14 ++++++++++++++ tools/libxc/xc_domain_save.c | 11 +++++++++++ tools/libxc/xg_save_restore.h | 2 ++ tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_create.c | 12 +++++++++--- tools/libxl/libxl_dm.c | 8 ++++++++ tools/libxl/libxl_dom.c | 2 ++ tools/libxl/libxl_types.idl | 2 ++ tools/libxl/xl_cmdimpl.c | 4 ++++ 11 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 docs/misc/hypervisor-cpuid.markdown diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 8bba21c..6628cfc 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1197,6 +1197,23 @@ The viridian option can be specified as a boolean. A value of true (1) is equivalent to the list [ "defaults" ], and a value of false (0) is equivalent to an empty list. +=item B + +Turns on or off the exposure of VMware cpuid. The number is +VMware's hardware version number, where 0 is off. If not zero it +changes the default VGA to VMware's VGA. + +The hardware version number (vmware_hw) come from VMware config files. + +=over 4 + +In a .vmx it is virtualHW.version + +In a .ovf it is part of the value of vssd:VirtualSystemType. +For vssd:VirtualSystemType == vmx-07, vmware_hw = 7. + +=back + =back =head3 Emulated VGA Graphics Device @@ -1233,10 +1250,14 @@ later (e.g. Windows XP onwards) then you should enable this. stdvga supports more video ram and bigger resolutions than Cirrus. This option is deprecated, use vga="stdvga" instead. +The deprecated B prevents the usage of vmware by default +if B is non-zero. + =item B -Selects the emulated video card (none|stdvga|cirrus). -The default is cirrus. +Selects the emulated video card (none|stdvga|cirrus|vmware). +The default is cirrus unless B is non-zero in which case it +is vmware. =item B diff --git a/docs/misc/hypervisor-cpuid.markdown b/docs/misc/hypervisor-cpuid.markdown new file mode 100644 index 0000000..3d4304c --- /dev/null +++ b/docs/misc/hypervisor-cpuid.markdown @@ -0,0 +1,33 @@ +Hypervisor Cpuid +================ + +There is no agreed standard for the use of hypervisor cpuid leaves. + +AMD (Vol3, Appendix E.3.9) reserves 0x40000000 to 0x400000ff for +hypervisor use, while Intel (Vol 2a, 3.2 CPUID) guarantees that no +existing or future CPUs will use the range 0x40000000 to 0x4fffffff. + +Different hypervisors use the space as follows: + +MicroSoft Hyper-V (AKA viridian) leaves currently must be at +0x40000000. + +VMware leaves currently must be at 0x40000000. + +KVM leaves currently must be at 0x40000000 (from Seabios). + +Xen leaves can be found at the first otherwise unused 0x100 aligned +offset between 0x40000000 and 0x40010000. + +http://download.microsoft.com/download/F/B/0/FB0D01A3-8E3A-4F5F-AA59-08C8026D3B8A/requirements-for-implementing-microsoft-hypervisor-interface.docx + +http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 + +http://lwn.net/Articles/301888/ + Attempted to get this cleaned up. + +So if Viridian or VMware_hw is selected, return their format for the +range 0x40000000 to 0x400000ff. And return Xen format for the range +0x40000100 to 0x400001ff. + +Otherwise return Xen format for the range 0x40000000 to 0x400000ff. diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index d8bd9b3..d262fa0 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -743,6 +743,7 @@ typedef struct { uint64_t vm_generationid_addr; uint64_t ioreq_server_pfn; uint64_t nr_ioreq_server_pages; + uint64_t vmware_hw; struct toolstack_data_t tdata; } pagebuf_t; @@ -927,6 +928,16 @@ static int pagebuf_get_one(xc_interface *xch, struct restore_ctx *ctx, } return pagebuf_get_one(xch, ctx, buf, fd, dom); + case XC_SAVE_ID_HVM_VMWARE_HW: + /* Skip padding 4 bytes then read the vmware hw version. */ + if ( RDEXACT(fd, &buf->vmware_hw, sizeof(uint32_t)) || + RDEXACT(fd, &buf->vmware_hw, sizeof(uint64_t)) ) + { + PERROR("error read the vmware_hw value"); + return -1; + } + return pagebuf_get_one(xch, ctx, buf, fd, dom); + case XC_SAVE_ID_TOOLSTACK: { if ( RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)) ) @@ -1774,6 +1785,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } } + if (pagebuf.vmware_hw != 0) + xc_set_hvm_param(xch, dom, HVM_PARAM_VMWARE_HW, pagebuf.vmware_hw); + if (pagebuf.acpi_ioport_location == 1) { DBGPRINTF("Use new firmware ioport from the checkpoint\n"); xc_hvm_param_set(xch, dom, HVM_PARAM_ACPI_IOPORTS_LOCATION, 1); diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 254fdb3..76dc307 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -1750,6 +1750,17 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter PERROR("Error when writing the ioreq server gmfn count"); goto out; } + + chunk.id = XC_SAVE_ID_HVM_VMWARE_HW; + chunk.data = 0; + xc_hvm_param_get(xch, dom, HVM_PARAM_VMWARE_HW, &chunk.data); + + if ( (chunk.data != 0) && + wrexact(io_fd, &chunk, sizeof(chunk)) ) + { + PERROR("Error when writing the vmware_hw value"); + goto out; + } } if ( callbacks != NULL && callbacks->toolstack_save != NULL ) diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index bdd9009..d185ba9 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -262,6 +262,8 @@ /* These are a pair; it is an error for one to exist without the other */ #define XC_SAVE_ID_HVM_IOREQ_SERVER_PFN -19 #define XC_SAVE_ID_HVM_NR_IOREQ_SERVER_PAGES -20 +/* VMware data */ +#define XC_SAVE_ID_HVM_VMWARE_HW -21 /* ** We process save/restore/migrate in batches of pages; the below diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 2700cc1..09faa04 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -158,6 +158,16 @@ #define LIBXL_BUILDINFO_HVM_VIRIDIAN_ENABLE_DISABLE_WIDTH 64 /* + * The libxl_vga_interface_type has the type for vmware. + */ +#define LIBXL_HAVE_LIBXL_VGA_INTERFACE_TYPE_VMWARE 1 + +/* + * libxl_domain_build_info has the u.hvm.vmware_hw field. + */ +#define LIBXL_HAVE_BUILDINFO_HVM_VMWARE_HW 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index f7f178e..9f4e03c 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -227,8 +227,12 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; - if (!b_info->u.hvm.vga.kind) - b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + if (!b_info->u.hvm.vga.kind) { + if (b_info->u.hvm.vmware_hw) + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_VMWARE; + else + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + } switch (b_info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: @@ -428,13 +432,15 @@ int libxl__domain_build(libxl__gc *gc, vments[4] = "start_time"; vments[5] = libxl__sprintf(gc, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); - localents = libxl__calloc(gc, 7, sizeof(char *)); + localents = libxl__calloc(gc, 9, sizeof(char *)); localents[0] = "platform/acpi"; localents[1] = libxl_defbool_val(info->u.hvm.acpi) ? "1" : "0"; localents[2] = "platform/acpi_s3"; localents[3] = libxl_defbool_val(info->u.hvm.acpi_s3) ? "1" : "0"; localents[4] = "platform/acpi_s4"; localents[5] = libxl_defbool_val(info->u.hvm.acpi_s4) ? "1" : "0"; + localents[6] = "platform/vmware_hw"; + localents[7] = libxl__sprintf(gc, "%"PRId64, info->u.hvm.vmware_hw); break; case LIBXL_DOMAIN_TYPE_PV: diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 0018113..8bd6414 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -243,6 +243,9 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, case LIBXL_VGA_INTERFACE_TYPE_NONE: flexarray_append_pair(dm_args, "-vga", "none"); break; + case LIBXL_VGA_INTERFACE_TYPE_VMWARE: + flexarray_append_pair(dm_args, "-vga", "vmware"); + break; } if (b_info->u.hvm.boot) { @@ -555,6 +558,11 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, break; case LIBXL_VGA_INTERFACE_TYPE_NONE: break; + case LIBXL_VGA_INTERFACE_TYPE_VMWARE: + flexarray_append_pair(dm_args, "-device", + GCSPRINTF("vmware-svga,vgamem_mb=%d", + libxl__sizekb_to_mb(b_info->video_memkb))); + break; } if (b_info->u.hvm.boot) { diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index d63ae1b..b0f0513 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -290,6 +290,8 @@ static void hvm_set_conf_params(xc_interface *handle, uint32_t domid, #if defined(__i386__) || defined(__x86_64__) xc_hvm_param_set(handle, domid, HVM_PARAM_HPET_ENABLED, libxl_defbool_val(info->u.hvm.hpet)); + xc_set_hvm_param(handle, domid, HVM_PARAM_VMWARE_HW, + info->u.hvm.vmware_hw); #endif xc_hvm_param_set(handle, domid, HVM_PARAM_TIMER_MODE, timer_mode(info)); xc_hvm_param_set(handle, domid, HVM_PARAM_VPT_ALIGN, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index bbb03e2..5d25b77 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -175,6 +175,7 @@ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), (3, "NONE"), + (4, "VMWARE"), ], init_val = "LIBXL_VGA_INTERFACE_TYPE_CIRRUS") libxl_vendor_device = Enumeration("vendor_device", [ @@ -391,6 +392,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("timeoffset", string), ("hpet", libxl_defbool), ("vpt_align", libxl_defbool), + ("vmware_hw", uint64), ("timer_mode", libxl_timer_mode), ("nested_hvm", libxl_defbool), ("smbios_firmware", string), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c734f79..307a9a9 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1111,6 +1111,8 @@ static void parse_config_data(const char *config_source, exit(-ERROR_FAIL); } + if (!xlu_cfg_get_long(config, "vmware_hw", &l, 1)) + b_info->u.hvm.vmware_hw = l; if (!xlu_cfg_get_long(config, "timer_mode", &l, 1)) { const char *s = libxl_timer_mode_to_string(l); fprintf(stderr, "WARNING: specifying \"timer_mode\" as an integer is deprecated. " @@ -1730,6 +1732,8 @@ skip_vfb: b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; } else if (!strcmp(buf, "none")) { b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE; + } else if (!strcmp(buf, "vmware")) { + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_VMWARE; } else { fprintf(stderr, "Unknown vga \"%s\" specified\n", buf); exit(1); -- 1.8.4