On 2/2/21 1:48 AM, Matt Coleman wrote: I think we can save one level of indendation if this was: if (rasd->data->ResourceType != MSVM_RASD_RESOURCETYPE_SERIAL_PORT) { rasd = rasd->next; continue; } and to avoid having to advance pointer in every path, let's just use for() loop. Sorry for not spotting this earlier. I'll fix this locally before pushing. Michal

Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- src/conf/domain_conf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0a5d151150..f9ea31d48c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3099,6 +3099,7 @@ virDomainVsockDefPtr virDomainVsockDefNew(virDomainXMLOptionPtr xmlopt); void virDomainVsockDefFree(virDomainVsockDefPtr vsock); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVsockDef, virDomainVsockDefFree); void virDomainNetDefFree(virDomainNetDefPtr def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainNetDef, virDomainNetDefFree); void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSmartcardDef, virDomainSmartcardDefFree); void virDomainChrDefFree(virDomainChrDefPtr def); -- 2.30.0

Co-authored-by: Sri Ramanujam <sramanujam(a)datto.com&gt; Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- src/hyperv/hyperv_driver.c | 138 ++++++++++++++++++++++++++ src/hyperv/hyperv_wmi_classes.h | 2 + src/hyperv/hyperv_wmi_generator.input | 32 ++++++ 3 files changed, 172 insertions(+) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index e94fbff87b..29908f2e75 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -978,6 +978,132 @@ hypervDomainAttachSerial(virDomainPtr domain, virDomainChrDefPtr serial) } +static int +hypervDomainAttachSyntheticEthernetAdapter(virDomainPtr domain, + virDomainNetDefPtr net, + char *hostname) +{ + hypervPrivate *priv = domain->conn->privateData; + g_autofree char *portResourceType = NULL; + unsigned char vsiGuid[VIR_UUID_BUFLEN]; + char guidString[VIR_UUID_STRING_BUFLEN]; + g_autofree char *virtualSystemIdentifiers = NULL; + char macString[VIR_MAC_STRING_BUFLEN]; + g_autofree char *macAddressNoColons = NULL; + g_autoptr(GHashTable) portResource = NULL; + g_auto(WsXmlDocH) sepsdResponse = NULL; + g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; + g_autoptr(Msvm_VirtualEthernetSwitch) vSwitch = NULL; + g_autofree char *enabledState = NULL; + g_autofree char *switch__PATH = NULL; + g_autofree char *sepsd__PATH = NULL; + g_autofree char *sepsdInstanceID = NULL; + g_autofree char *sepsdInstanceEscaped = NULL; + g_autofree char *connectionResourceType = NULL; + g_autoptr(GHashTable) connectionResource = NULL; + + /* + * Step 1: Create the Msvm_SyntheticEthernetPortSettingData object + * that holds half the settings for the new adapter we are creating + */ + portResourceType = g_strdup_printf("%d", MSVM_RASD_RESOURCETYPE_ETHERNET_ADAPTER); + + virUUIDGenerate(vsiGuid); + virUUIDFormat(vsiGuid, guidString); + virtualSystemIdentifiers = g_strdup_printf("{%s}", guidString); + + virMacAddrFormat(&net->mac, macString); + macAddressNoColons = virStringReplace(macString, ":", ""); + + /* prepare embedded param */ + portResource = hypervCreateEmbeddedParam(Msvm_SyntheticEthernetPortSettingData_WmiInfo); + if (!portResource) + return -1; + + if (hypervSetEmbeddedProperty(portResource, "ResourceType", portResourceType) < 0) + return -1; + + if (hypervSetEmbeddedProperty(portResource, "ResourceSubType", + "Microsoft:Hyper-V:Synthetic Ethernet Port") < 0) + return -1; + + if (hypervSetEmbeddedProperty(portResource, + "VirtualSystemIdentifiers", virtualSystemIdentifiers) < 0) + return -1; + + if (hypervSetEmbeddedProperty(portResource, "Address", macAddressNoColons) < 0) + return -1; + + if (hypervSetEmbeddedProperty(portResource, "StaticMacAddress", "true") < 0) + return -1; + + if (hypervMsvmVSMSAddResourceSettings(domain, &portResource, + Msvm_SyntheticEthernetPortSettingData_WmiInfo, + &sepsdResponse) < 0) + return -1; + + /* + * Step 2: Get the Msvm_VirtualEthernetSwitch object + */ + virBufferAsprintf(&query, + MSVM_VIRTUALETHERNETSWITCH_WQL_SELECT "WHERE Name='%s'", + net->data.bridge.brname); + + if (hypervGetWmiClass(Msvm_VirtualEthernetSwitch, &vSwitch) < 0) + return -1; + + if (!vSwitch) + return -1; + + /* + * Step 3: Create the Msvm_EthernetPortAllocationSettingData object that + * holds the other half of the network configuration + */ + enabledState = g_strdup_printf("%d", MSVM_ETHERNETPORTALLOCATIONSETTINGDATA_ENABLEDSTATE_ENABLED); + + /* build the two __PATH variables */ + switch__PATH = g_strdup_printf("\\\\%s\\Root\\Virtualization\\V2:" + "Msvm_VirtualEthernetSwitch.CreationClassName=\"Msvm_VirtualEthernetSwitch\"," + "Name=\"%s\"", + hostname, vSwitch->data->Name); + + /* Get the sepsd instance ID out of the XML response */ + sepsdInstanceID = hypervGetInstanceIDFromXMLResponse(sepsdResponse); + sepsdInstanceEscaped = virStringReplace(sepsdInstanceID, "\\", "\\\\"); + sepsd__PATH = g_strdup_printf("\\\\%s\\root\\virtualization\\v2:" + "Msvm_SyntheticEthernetPortSettingData.InstanceID=\"%s\"", + hostname, sepsdInstanceEscaped); + + connectionResourceType = g_strdup_printf("%d", MSVM_RASD_RESOURCETYPE_ETHERNET_CONNECTION); + + connectionResource = hypervCreateEmbeddedParam(Msvm_EthernetPortAllocationSettingData_WmiInfo); + if (!connectionResource) + return -1; + + if (hypervSetEmbeddedProperty(connectionResource, "EnabledState", enabledState) < 0) + return -1; + + if (hypervSetEmbeddedProperty(connectionResource, "HostResource", switch__PATH) < 0) + return -1; + + if (hypervSetEmbeddedProperty(connectionResource, "Parent", sepsd__PATH) < 0) + return -1; + + if (hypervSetEmbeddedProperty(connectionResource, "ResourceType", connectionResourceType) < 0) + return -1; + + if (hypervSetEmbeddedProperty(connectionResource, + "ResourceSubType", "Microsoft:Hyper-V:Ethernet Connection") < 0) + return -1; + + if (hypervMsvmVSMSAddResourceSettings(domain, &connectionResource, + Msvm_EthernetPortAllocationSettingData_WmiInfo, NULL) < 0) + return -1; + + return 0; +} + + /* * Functions for deserializing device entries */ @@ -2676,6 +2802,14 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) } } + /* Attach networks */ + for (i = 0; i < def->nnets; i++) { + if (hypervDomainAttachSyntheticEthernetAdapter(domain, def->nets[i], hostname) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %lu"), i); + goto error; + } + } + return domain; error: @@ -2779,6 +2913,10 @@ hypervDomainAttachDeviceFlags(virDomainPtr domain, const char *xml, unsigned int if (hypervDomainAttachSerial(domain, dev->data.chr) < 0) return -1; break; + case VIR_DOMAIN_DEVICE_NET: + if (hypervDomainAttachSyntheticEthernetAdapter(domain, dev->data.net, hostname) < 0) + return -1; + break; default: /* unsupported device type */ virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h index eea24235a5..86a7124799 100644 --- a/src/hyperv/hyperv_wmi_classes.h +++ b/src/hyperv/hyperv_wmi_classes.h @@ -108,6 +108,7 @@ enum _Msvm_ResourceAllocationSettingData_ResourceType { MSVM_RASD_RESOURCETYPE_OTHER = 1, MSVM_RASD_RESOURCETYPE_IDE_CONTROLLER = 5, MSVM_RASD_RESOURCETYPE_PARALLEL_SCSI_HBA = 6, + MSVM_RASD_RESOURCETYPE_ETHERNET_ADAPTER = 10, MSVM_RASD_RESOURCETYPE_DISKETTE_DRIVE = 14, MSVM_RASD_RESOURCETYPE_CD_DRIVE = 15, MSVM_RASD_RESOURCETYPE_DVD_DRIVE = 16, @@ -115,6 +116,7 @@ enum _Msvm_ResourceAllocationSettingData_ResourceType { MSVM_RASD_RESOURCETYPE_STORAGE_EXTENT = 19, MSVM_RASD_RESOURCETYPE_SERIAL_PORT = 21, MSVM_RASD_RESOURCETYPE_LOGICAL_DISK = 31, + MSVM_RASD_RESOURCETYPE_ETHERNET_CONNECTION = 33, }; diff --git a/src/hyperv/hyperv_wmi_generator.input b/src/hyperv/hyperv_wmi_generator.input index df240361e6..f9d486bd4c 100644 --- a/src/hyperv/hyperv_wmi_generator.input +++ b/src/hyperv/hyperv_wmi_generator.input @@ -936,3 +936,35 @@ class Msvm_VirtualEthernetSwitch uint32 MaxVMQOffloads uint32 MaxIOVOffloads end + + +class Msvm_VirtualEthernetSwitchManagementService + string InstanceID + string Caption + string Description + string ElementName + datetime InstallDate + string Name + uint16 OperationalStatus[] + string StatusDescriptions[] + string Status + uint16 HealthState + uint16 CommunicationStatus + uint16 DetailedStatus + uint16 OperatingStatus + uint16 PrimaryStatus + uint16 EnabledState + string OtherEnabledState + uint16 RequestedState + uint16 EnabledDefault + datetime TimeOfLastStateChange + uint16 AvailableRequestedStates[] + uint16 TransitioningToState + string SystemCreationClassName + string SystemName + string CreationClassName + string PrimaryOwnerName + string PrimaryOwnerContact + string StartMode + boolean Started +end -- 2.30.0

Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- src/hyperv/hyperv_network_driver.c | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index 3931e548f5..25755f2525 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -49,6 +49,29 @@ hypervMsvmVirtualSwitchToNetwork(virConnectPtr conn, Msvm_VirtualEthernetSwitch } +static virNetworkPtr +hypervNetworkLookup(virConnectPtr conn, const char *property, const char *value) +{ + hypervPrivate *priv = conn->privateData; + g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; + g_autoptr(Msvm_VirtualEthernetSwitch) virtualSwitch = NULL; + + virBufferAsprintf(&query, MSVM_VIRTUALETHERNETSWITCH_WQL_SELECT "WHERE %s", property); + virBufferEscapeSQL(&query, " = '%s'", value); + + if (hypervGetWmiClass(Msvm_VirtualEthernetSwitch, &virtualSwitch) < 0) + return NULL; + + if (!virtualSwitch) { + virReportError(VIR_ERR_NO_NETWORK, + _("No network found with property '%s' = '%s'"), property, value); + return NULL; + } + + return hypervMsvmVirtualSwitchToNetwork(conn, virtualSwitch); +} + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Exported API functions */ @@ -121,7 +144,27 @@ hypervConnectNumOfNetworks(virConnectPtr conn) } +static virNetworkPtr +hypervNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) +{ + char uuid_string[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(uuid, uuid_string); + + return hypervNetworkLookup(conn, "Name", uuid_string); +} + + +static virNetworkPtr +hypervNetworkLookupByName(virConnectPtr conn, const char *name) +{ + return hypervNetworkLookup(conn, "ElementName", name); +} + + virNetworkDriver hypervNetworkDriver = { .connectNumOfNetworks = hypervConnectNumOfNetworks, /* 7.1.0 */ .connectListAllNetworks = hypervConnectListAllNetworks, /* 7.1.0 */ + .networkLookupByUUID = hypervNetworkLookupByUUID, /* 7.1.0 */ + .networkLookupByName = hypervNetworkLookupByName, /* 7.1.0 */ }; -- 2.30.0

Co-authored-by: Dawid Zamirski <dzamirski(a)datto.com&gt; Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- src/hyperv/hyperv_network_driver.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index f85dea31fe..d6407ac591 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -180,6 +180,31 @@ hypervNetworkLookupByName(virConnectPtr conn, const char *name) } +static int +hypervNetworkGetAutostart(virNetworkPtr network G_GNUC_UNUSED, int *autostart) +{ + /* Hyper-V networks are always active */ + *autostart = 1; + return 0; +} + + +static int +hypervNetworkIsActive(virNetworkPtr network G_GNUC_UNUSED) +{ + /* Hyper-V networks are always active */ + return 1; +} + + +static int +hypervNetworkIsPersistent(virNetworkPtr network G_GNUC_UNUSED) +{ + /* Hyper-V networks are always persistent */ + return 1; +} + + virNetworkDriver hypervNetworkDriver = { .connectNumOfNetworks = hypervConnectNumOfNetworks, /* 7.1.0 */ .connectNumOfDefinedNetworks = hypervConnectNumOfDefinedNetworks, /* 7.1.0 */ @@ -187,4 +212,7 @@ virNetworkDriver hypervNetworkDriver = { .connectListAllNetworks = hypervConnectListAllNetworks, /* 7.1.0 */ .networkLookupByUUID = hypervNetworkLookupByUUID, /* 7.1.0 */ .networkLookupByName = hypervNetworkLookupByName, /* 7.1.0 */ + .networkGetAutostart = hypervNetworkGetAutostart, /* 7.1.0 */ + .networkIsActive = hypervNetworkIsActive, /* 7.1.0 */ + .networkIsPersistent = hypervNetworkIsPersistent, /* 7.1.0 */ }; -- 2.30.0

Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- src/hyperv/hyperv_driver.c | 207 ++++++++++++++++++++++++++ src/hyperv/hyperv_wmi_classes.h | 21 +++ src/hyperv/hyperv_wmi_generator.input | 163 ++++++++++++++++++++ 3 files changed, 391 insertions(+) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index c99d2a4e79..419ca96828 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -22,6 +22,8 @@ #include <config.h> +#include <fcntl.h> + #include "internal.h" #include "datatypes.h" #include "virdomainobjlist.h" @@ -38,6 +40,8 @@ #include "virstring.h" #include "virkeycode.h" #include "domain_conf.h" +#include "virfdstream.h" +#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_HYPERV @@ -294,6 +298,73 @@ hypervCapsInit(hypervPrivate *priv) return NULL; } + +static int +hypervGetVideoResolution(hypervPrivate *priv, + char *vm_uuid, + int *xRes, + int *yRes, + bool fallback) +{ + g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; + g_autoptr(Msvm_S3DisplayController) s3Display = NULL; + g_autoptr(Msvm_SyntheticDisplayController) synthetic = NULL; + g_autoptr(Msvm_VideoHead) heads = NULL; + const char *wmiClass = NULL; + char *deviceId = NULL; + g_autofree char *enabledStateString = NULL; + + if (fallback) { + wmiClass = "Msvm_S3DisplayController"; + + virBufferEscapeSQL(&query, + MSVM_S3DISPLAYCONTROLLER_WQL_SELECT "WHERE SystemName = '%s'", + vm_uuid); + + if (hypervGetWmiClass(Msvm_S3DisplayController, &s3Display) < 0 || !s3Display) + return -1; + + deviceId = s3Display->data->DeviceID; + } else { + wmiClass = "Msvm_SyntheticDisplayController"; + + virBufferEscapeSQL(&query, + MSVM_SYNTHETICDISPLAYCONTROLLER_WQL_SELECT "WHERE SystemName = '%s'", + vm_uuid); + + if (hypervGetWmiClass(Msvm_SyntheticDisplayController, &synthetic) < 0 || !synthetic) + return -1; + + deviceId = synthetic->data->DeviceID; + } + + virBufferFreeAndReset(&query); + + virBufferAsprintf(&query, + "ASSOCIATORS OF {%s." + "CreationClassName='%s'," + "DeviceID='%s'," + "SystemCreationClassName='Msvm_ComputerSystem'," + "SystemName='%s'" + "} WHERE AssocClass = Msvm_VideoHeadOnController " + "ResultClass = Msvm_VideoHead", + wmiClass, wmiClass, deviceId, vm_uuid); + + if (hypervGetWmiClass(Msvm_VideoHead, &heads) < 0) + return -1; + + enabledStateString = g_strdup_printf("%d", CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_ENABLED); + if (heads && STREQ(heads->data->EnabledState, enabledStateString)) { + *xRes = heads->data->CurrentHorizontalResolution; + *yRes = heads->data->CurrentVerticalResolution; + + return 0; + } + + return -1; +} + + /* * Virtual device functions */ @@ -2313,6 +2384,141 @@ hypervDomainGetState(virDomainPtr domain, int *state, int *reason, } +static char * +hypervDomainScreenshot(virDomainPtr domain, + virStreamPtr stream, + unsigned int screen G_GNUC_UNUSED, + unsigned int flags) +{ + char uuid_string[VIR_UUID_STRING_BUFLEN]; + hypervPrivate *priv = domain->conn->privateData; + g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; + g_autoptr(hypervInvokeParamsList) params = NULL; + g_auto(WsXmlDocH) ret_doc = NULL; + int xRes = 640; + int yRes = 480; + g_autofree char *width = NULL; + g_autofree char *height = NULL; + g_autofree char *imageDataText = NULL; + g_autofree unsigned char *imageDataBuffer = NULL; + size_t imageDataBufferSize; + const char *temporaryDirectory = NULL; + g_autofree char *temporaryFile = NULL; + g_autofree uint8_t *ppmBuffer = NULL; + char *result = NULL; + const char *xpath = "/s:Envelope/s:Body/p:GetVirtualSystemThumbnailImage_OUTPUT/p:ImageData"; + int pixelCount; + int pixelByteCount; + size_t i = 0; + int fd = -1; + bool unlinkTemporaryFile = false; + + virCheckFlags(0, NULL); + + virUUIDFormat(domain->uuid, uuid_string); + + /* Hyper-V Generation 1 VMs use two video heads: + * - S3DisplayController is used for early boot screens. + * - SyntheticDisplayController takes over when the guest OS initializes its video driver. + * + * This attempts to get the resolution from the SyntheticDisplayController first. + * If that fails, it falls back to S3DisplayController. */ + if (hypervGetVideoResolution(priv, uuid_string, &xRes, &yRes, false) < 0) { + if (hypervGetVideoResolution(priv, uuid_string, &xRes, &yRes, true) < 0) + goto cleanup; + } + + /* prepare params */ + params = hypervCreateInvokeParamsList("GetVirtualSystemThumbnailImage", + MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR, + Msvm_VirtualSystemManagementService_WmiInfo); + if (!params) + goto cleanup; + + width = g_strdup_printf("%d", xRes); + hypervAddSimpleParam(params, "WidthPixels", width); + + height = g_strdup_printf("%d", yRes); + hypervAddSimpleParam(params, "HeightPixels", height); + + virBufferAsprintf(&query, + "ASSOCIATORS OF " + "{Msvm_ComputerSystem.CreationClassName='Msvm_ComputerSystem',Name='%s'} " + "WHERE ResultClass = Msvm_VirtualSystemSettingData", + uuid_string); + hypervAddEprParam(params, "TargetSystem", &query, Msvm_VirtualSystemSettingData_WmiInfo); + + /* capture and parse the screenshot */ + if (hypervInvokeMethod(priv, &params, &ret_doc) < 0) + goto cleanup; + + if (!ws_xml_get_soap_envelope(ret_doc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve screenshot")); + goto cleanup; + } + + imageDataText = ws_xml_get_xpath_value(ret_doc, (char *)xpath); + + if (!imageDataText) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to retrieve image data")); + goto cleanup; + } + + imageDataBuffer = g_base64_decode(imageDataText, &imageDataBufferSize); + + pixelCount = imageDataBufferSize / 2; + pixelByteCount = pixelCount * 3; + + ppmBuffer = g_new0(uint8_t, pixelByteCount); + + /* convert rgb565 to rgb888 */ + for (i = 0; i < pixelCount; i++) { + const uint16_t pixel = imageDataBuffer[i * 2] + (imageDataBuffer[i * 2 + 1] << 8); + const uint16_t redMask = 0xF800; + const uint16_t greenMask = 0x7E0; + const uint16_t blueMask = 0x1F; + const uint8_t redFive = (pixel & redMask) >> 11; + const uint8_t greenSix = (pixel & greenMask) >> 5; + const uint8_t blueFive = pixel & blueMask; + ppmBuffer[i * 3] = (redFive * 527 + 23) >> 6; + ppmBuffer[i * 3 + 1] = (greenSix * 259 + 33) >> 6; + ppmBuffer[i * 3 + 2] = (blueFive * 527 + 23) >> 6; + } + + temporaryDirectory = getenv("TMPDIR"); + if (!temporaryDirectory) + temporaryDirectory = "/tmp"; + temporaryFile = g_strdup_printf("%s/libvirt.hyperv.screendump.XXXXXX", temporaryDirectory); + if ((fd = g_mkstemp_full(temporaryFile, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)) == -1) { + virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), temporaryFile); + goto cleanup; + } + unlinkTemporaryFile = true; + + /* write image data */ + dprintf(fd, "P6\n%d %d\n255\n", xRes, yRes); + if (safewrite(fd, ppmBuffer, pixelByteCount) != pixelByteCount) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to write pixel data")); + goto cleanup; + } + + if (VIR_CLOSE(fd) < 0) + virReportSystemError(errno, "%s", _("failed to close screenshot file")); + + if (virFDStreamOpenFile(stream, temporaryFile, 0, 0, O_RDONLY) < 0) + goto cleanup; + + result = g_strdup("image/x-portable-pixmap"); + + cleanup: + VIR_FORCE_CLOSE(fd); + if (unlinkTemporaryFile) + unlink(temporaryFile); + + return result; +} + + static int hypervDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, @@ -3474,6 +3680,7 @@ static virHypervisorDriver hypervHypervisorDriver = { .domainSetMemoryFlags = hypervDomainSetMemoryFlags, /* 3.6.0 */ .domainGetInfo = hypervDomainGetInfo, /* 0.9.5 */ .domainGetState = hypervDomainGetState, /* 0.9.5 */ + .domainScreenshot = hypervDomainScreenshot, /* 7.1.0 */ .domainSetVcpus = hypervDomainSetVcpus, /* 6.10.0 */ .domainSetVcpusFlags = hypervDomainSetVcpusFlags, /* 6.10.0 */ .domainGetVcpusFlags = hypervDomainGetVcpusFlags, /* 6.10.0 */ diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h index 86a7124799..faf98077eb 100644 --- a/src/hyperv/hyperv_wmi_classes.h +++ b/src/hyperv/hyperv_wmi_classes.h @@ -133,6 +133,27 @@ enum _Msvm_EthernetPortAllocationSettingData_EnabledState { +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * CIM_EnabledLogicalElement + */ + +/* https://docs.microsoft.com/en-us/windows/win32/hyperv_v2/cim-enabledlogic... */ +enum _CIM_EnabledLogicalElement_EnabledState { + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_UNKNOWN = 0, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_OTHER = 1, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_ENABLED = 2, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_DISABLED = 3, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_SHUTTING_DOWN = 4, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_NOT_APPLICABLE = 5, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_ENABLED_BUT_OFFLINE = 6, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_IN_TEST = 7, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_DEFERRED = 8, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_QUIESCE = 9, + CIM_ENABLEDLOGICALELEMENT_ENABLEDSTATE_STARTING = 10, +}; + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * WMI */ diff --git a/src/hyperv/hyperv_wmi_generator.input b/src/hyperv/hyperv_wmi_generator.input index f9d486bd4c..0b342cbfa6 100644 --- a/src/hyperv/hyperv_wmi_generator.input +++ b/src/hyperv/hyperv_wmi_generator.input @@ -968,3 +968,166 @@ class Msvm_VirtualEthernetSwitchManagementService string StartMode boolean Started end + + +class Msvm_SyntheticDisplayController + string InstanceID + string Caption + string Description + string ElementName + datetime InstallDate + string Name + uint16 OperationalStatus[] + string StatusDescriptions[] + string Status + uint16 HealthState + uint16 CommunicationStatus + uint16 DetailedStatus + uint16 OperatingStatus + uint16 PrimaryStatus + string EnabledState + string OtherEnabledState + uint16 RequestedState + uint16 EnabledDefault + datetime TimeOfLastStateChange + uint16 AvailableRequestedStates[] + uint16 TransitioningToState + string SystemCreationClassName + string SystemName + string CreationClassName + string DeviceID + boolean PowerManagementSupported + uint16 PowerManagementCapabilities[] + uint16 Availability + uint16 StatusInfo + uint32 LastErrorCode + string ErrorDescription + boolean ErrorCleared + uint64 PowerOnHours + uint64 TotalPowerOnHours + string OtherIdentifyingInfo[] + string IdentifyingDescriptions[] + uint16 AdditionalAvailability[] + uint64 MaxQuiesceTime + datetime TimeOfLastReset + uint16 ProtocolSupported + uint32 MaxNumberControlled + string ProtocolDescription + string VideoProcessor + uint16 VideoMemoryType + string OtherVideoMemoryType + uint32 NumberOfVideoPages + uint32 MaxMemorySupported + uint16 AcceleratorCapabilities[] + string CapabilityDescriptions[] + string OtherVideoArchitecture + uint16 VideoArchitecture +end + + +class Msvm_S3DisplayController + string InstanceID + string Caption + string Description + string ElementName + datetime InstallDate + string Name + uint16 OperationalStatus[] + string StatusDescriptions[] + string Status + uint16 HealthState + uint16 CommunicationStatus + uint16 DetailedStatus + uint16 OperatingStatus + uint16 PrimaryStatus + string EnabledState + string OtherEnabledState + uint16 RequestedState + uint16 EnabledDefault + datetime TimeOfLastStateChange + uint16 AvailableRequestedStates[] + uint16 TransitioningToState + string SystemCreationClassName + string SystemName + string CreationClassName + string DeviceID + boolean PowerManagementSupported + uint16 PowerManagementCapabilities[] + uint16 Availability + uint16 StatusInfo + uint32 LastErrorCode + string ErrorDescription + boolean ErrorCleared + string OtherIdentifyingInfo[] + uint64 PowerOnHours + uint64 TotalPowerOnHours + string IdentifyingDescriptions[] + uint16 AdditionalAvailability[] + uint64 MaxQuiesceTime + datetime TimeOfLastReset + uint16 ProtocolSupported + uint32 MaxNumberControlled + string ProtocolDescription + string VideoProcessor + uint16 VideoMemoryType + string OtherVideoMemoryType + uint32 NumberOfVideoPages + uint32 MaxMemorySupported + uint16 AcceleratorCapabilities[] + string CapabilityDescriptions[] + string OtherVideoArchitecture + uint16 VideoArchitecture +end + + +class Msvm_VideoHead + string InstanceID + string Caption + string Description + string ElementName + datetime InstallDate + string Name + uint16 OperationalStatus[] + string StatusDescriptions[] + string Status + uint16 HealthState + uint16 CommunicationStatus + uint16 DetailedStatus + uint16 OperatingStatus + uint16 PrimaryStatus + string EnabledState + string OtherEnabledState + uint16 RequestedState + uint16 EnabledDefault + datetime TimeOfLastStateChange + uint16 AvailableRequestedStates[] + uint16 TransitioningToState + string SystemCreationClassName + string SystemName + string CreationClassName + string DeviceID + boolean PowerManagementSupported + uint16 PowerManagementCapabilities[] + uint16 Availability + uint16 StatusInfo + uint32 LastErrorCode + string ErrorDescription + boolean ErrorCleared + string OtherIdentifyingInfo[] + uint64 PowerOnHours + uint64 TotalPowerOnHours + string IdentifyingDescriptions[] + uint16 AdditionalAvailability[] + uint64 MaxQuiesceTime + uint32 CurrentBitsPerPixel + uint32 CurrentHorizontalResolution + uint32 CurrentVerticalResolution + uint32 MaxRefreshRate + uint32 MinRefreshRate + uint32 CurrentRefreshRate + uint16 CurrentScanMode + string OtherCurrentScanMode + uint32 CurrentNumberOfRows + uint32 CurrentNumberOfColumns + uint64 CurrentNumberOfColors +end -- 2.30.0

Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- NEWS.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 8b8a132e41..c6ae6a6c60 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -23,6 +23,18 @@ v7.1.0 (unreleased) Booting is possible from virtiofs filesystems. Introduce an option to control the boot order, like we do for other bootable devices. + * hyperv: implement new APIs + + The ``virDomainUndefine()``, ``virDomainUndefineFlags()``, + ``virDomainDefineXML()``, ``virDomainAttachDevice()``, and + ``virDomainAttachDeviceFlags()``, ``virConnectListAllNetworks()``, + ``virConnectNumOfNetworks()``, ``virNetworkLookupByName()``, + ``virNetworkLookupByUUID()``, ``virConnectNumOfDefinedNetworks()``, + ``virConnectListDefinedNetworks()``, ``virNetworkGetAutostart()``, + ``virNetworkIsActive()``, ``virNetworkIsPersistent()``, + ``virNetworkGetXMLDesc()``, and ``virDomainScreenshot()``, APIs have been + implemented in the Hyper-V driver. + * **Improvements** * **Bug fixes** -- 2.30.0