On 1/22/21 9:18 PM, Matt Coleman wrote: Well, you don't need to clear them if they'd be declared inside the loop :-) Michal

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 | 113 ++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.c | 20 +++++ src/hyperv/hyperv_wmi.h | 8 ++ src/hyperv/hyperv_wmi_classes.h | 12 +++ src/hyperv/hyperv_wmi_generator.input | 109 +++++++++++++++++++++++++ 5 files changed, 262 insertions(+) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 9394794c8f..ca75de98a9 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1388,6 +1388,107 @@ hypervDomainDefParseSerial(virDomainDefPtr def, Msvm_ResourceAllocationSettingDa } +static int +hypervDomainDefParseEthernetAdapter(virDomainDefPtr def, + Msvm_EthernetPortAllocationSettingData *net, + hypervPrivate *priv) +{ + virDomainNetDefPtr ndef = NULL; + g_autoptr(Msvm_SyntheticEthernetPortSettingData) sepsd = NULL; + g_autoptr(Msvm_VirtualEthernetSwitch) vSwitch = NULL; + char **switchConnection = NULL; + g_autofree char *switchConnectionEscaped = NULL; + char *sepsdPATH = NULL; + g_autofree char *sepsdEscaped = NULL; + g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; + + VIR_DEBUG("Parsing ethernet adapter '%s'", net->data->InstanceID); + + ndef = g_new0(virDomainNetDef, 1); + + ndef->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + + /* + * If there's no switch port connection or the EnabledState is disabled, + * then the adapter isn't hooked up to anything and we don't have to + * do anything more. + */ + switchConnection = net->data->HostResource.data; + if (net->data->HostResource.count < 1 || !*switchConnection || + net->data->EnabledState == MSVM_ETHERNETPORTALLOCATIONSETTINGDATA_ENABLEDSTATE_DISABLED) { + VIR_DEBUG("Adapter not connected to switch"); + return 0; + } + + /* + * Now we retrieve the associated Msvm_SyntheticEthernetPortSettingData and + * Msvm_VirtualEthernetSwitch objects and use them to build the XML definition. + */ + + /* begin by getting the Msvm_SyntheticEthernetPortSettingData object */ + sepsdPATH = net->data->Parent; + sepsdEscaped = virStringReplace(sepsdPATH, "\\", "\\\\"); + virBufferAsprintf(&query, + MSVM_SYNTHETICETHERNETPORTSETTINGDATA_WQL_SELECT "WHERE __PATH = '%s'", + sepsdEscaped); + + if (hypervGetWmiClass(Msvm_SyntheticEthernetPortSettingData, &sepsd) < 0) + return -1; + + if (!sepsd) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve NIC settings")); + return -1; + } + + /* set mac address */ + if (virMacAddrParseHex(sepsd->data->Address, &ndef->mac) < 0) + return -1; + + /* now we get the Msvm_VirtualEthernetSwitch */ + virBufferFreeAndReset(&query); + switchConnectionEscaped = virStringReplace(*switchConnection, "\\", "\\\\"); + virBufferAsprintf(&query, + MSVM_VIRTUALETHERNETSWITCH_WQL_SELECT "WHERE __PATH = '%s'", + switchConnectionEscaped); + + if (hypervGetWmiClass(Msvm_VirtualEthernetSwitch, &vSwitch) < 0) + return -1; + + if (!vSwitch) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve virtual switch")); + return -1; + } + + /* get bridge name */ + ndef->data.bridge.brname = g_strdup(vSwitch->data->Name); + + if (VIR_APPEND_ELEMENT(def->nets, def->nnets, ndef) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not append definition to domain")); + return -1; + } + + return 0; +} + +static int +hypervDomainDefParseEthernet(virDomainPtr domain, + virDomainDefPtr def, + Msvm_EthernetPortAllocationSettingData *nets) +{ + Msvm_EthernetPortAllocationSettingData *entry = nets; + hypervPrivate *priv = domain->conn->privateData; + + while (entry) { + if (hypervDomainDefParseEthernetAdapter(def, entry, priv) < 0) + return -1; + + entry = entry->next; + } + + return 0; +} + + /* * Driver functions */ @@ -2249,6 +2350,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) g_autoptr(Msvm_StorageAllocationSettingData) sasd = NULL; g_autoptr(Msvm_SerialPortSettingData) spsd = NULL; Msvm_ResourceAllocationSettingData *serialDevices = NULL; + g_autoptr(Msvm_EthernetPortAllocationSettingData) nets = NULL; virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); @@ -2290,6 +2392,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) if (hypervGetSerialPortSD(priv, virtualSystemSettingData->data->InstanceID, &spsd) < 0) return NULL; + if (hypervGetEthernetPortAllocationSD(priv, + virtualSystemSettingData->data->InstanceID, &nets) < 0) + return NULL; + /* Fill struct */ def->virtType = VIR_DOMAIN_VIRT_HYPERV; @@ -2351,6 +2457,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) def->controllers = g_new0(virDomainControllerDefPtr, 5); def->ncontrollers = 0; + /* 8 synthetic + 4 legacy NICs */ + def->nets = g_new0(virDomainNetDefPtr, 12); + def->nnets = 0; + if (hypervDomainDefParseStorage(priv, def, rasd, sasd) < 0) return NULL; @@ -2362,6 +2472,9 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) if (hypervDomainDefParseSerial(def, serialDevices) < 0) return NULL; + if (hypervDomainDefParseEthernet(domain, def, nets) < 0) + return NULL; + /* XXX xmlopts must be non-NULL */ return virDomainDefFormat(def, NULL, virDomainDefFormatConvertXMLFlags(flags)); } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index f5f0797605..4c1bd5e0d2 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -1498,6 +1498,26 @@ hypervGetSerialPortSD(hypervPrivate *priv, } +int +hypervGetSyntheticEthernetPortSD(hypervPrivate *priv, + const char *id, + Msvm_SyntheticEthernetPortSettingData **data) +{ + hypervGetSettingData(Msvm_SyntheticEthernetPortSettingData, id, data); + return 0; +} + + +int +hypervGetEthernetPortAllocationSD(hypervPrivate *priv, + const char *id, + Msvm_EthernetPortAllocationSettingData **data) +{ + hypervGetSettingData(Msvm_EthernetPortAllocationSettingData, id, data); + return 0; +} + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Msvm_VirtualSystemManagementService */ diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index 2b0d0e4a3f..6021a46f3e 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -258,6 +258,14 @@ int hypervGetSerialPortSD(hypervPrivate *priv, const char *id, Msvm_SerialPortSettingData **data); +int hypervGetSyntheticEthernetPortSD(hypervPrivate *priv, + const char *id, + Msvm_SyntheticEthernetPortSettingData **data); + +int hypervGetEthernetPortAllocationSD(hypervPrivate *priv, + const char *id, + Msvm_EthernetPortAllocationSettingData **data); + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Msvm_VirtualSystemManagementService */ diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h index 2f813bedb3..eea24235a5 100644 --- a/src/hyperv/hyperv_wmi_classes.h +++ b/src/hyperv/hyperv_wmi_classes.h @@ -119,6 +119,18 @@ enum _Msvm_ResourceAllocationSettingData_ResourceType { +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Msvm_EthernetPortAllocationSettingData + */ + +/* https://docs.microsoft.com/en-us/windows/win32/hyperv_v2/msvm-ethernetpor... */ +enum _Msvm_EthernetPortAllocationSettingData_EnabledState { + MSVM_ETHERNETPORTALLOCATIONSETTINGDATA_ENABLEDSTATE_ENABLED = 2, + MSVM_ETHERNETPORTALLOCATIONSETTINGDATA_ENABLEDSTATE_DISABLED = 3, +}; + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * WMI */ diff --git a/src/hyperv/hyperv_wmi_generator.input b/src/hyperv/hyperv_wmi_generator.input index 765ffba169..df240361e6 100644 --- a/src/hyperv/hyperv_wmi_generator.input +++ b/src/hyperv/hyperv_wmi_generator.input @@ -827,3 +827,112 @@ class Msvm_StorageAllocationSettingData string IOPSAllocationUnits boolean PersistentReservationsSupported end + + +class Msvm_SyntheticEthernetPortSettingData + string InstanceID + string Caption + string Description + string ElementName + uint16 ResourceType + string OtherResourceType + string ResourceSubType + string PoolID + uint16 ConsumerVisibility + string HostResource[] + string AllocationUnits + uint64 VirtualQuantity + uint64 Reservation + uint64 Limit + uint32 Weight + boolean AutomaticAllocation + boolean AutomaticDeallocation + string Parent + string Connection[] + string Address + uint16 MappingBehavior + string AddressOnParent + string VirtualQuantityUnits + uint16 DesiredVLANEndpointMode + string OtherEndpointMode + string VirtualSystemIdentifiers[] +# DeviceNamingEnabled and AllowPacketDirect are not present in Windows Server 2012R2. +# They were added in Windows 10 and Windows Server 2016. +# They have been omitted to retain compatibility with Windows Server 2012R2. +# boolean DeviceNamingEnabled +# boolean AllowPacketDirect + boolean StaticMacAddress + boolean ClusterMonitored +end + + +class Msvm_EthernetPortAllocationSettingData + string InstanceID + string Caption + string Description + string ElementName + uint16 ResourceType + string OtherResourceType + string ResourceSubType + string PoolID + uint16 ConsumerVisibility + string HostResource[] + string AllocationUnits + uint64 VirtualQuantity + uint64 Reservation + uint64 Limit + uint32 Weight + boolean AutomaticAllocation + boolean AutomaticDeallocation + string Parent + string Connection[] + string Address + uint16 MappingBehavior + string AddressOnParent + string VirtualQuantityUnits + uint16 DesiredVLANEndpointMode + string OtherEndpointMode + uint16 EnabledState + string RequiredFeatures[] + string RequiredFeatureHints[] + string TestReplicaPoolID + string TestReplicaSwitchName +end + + +class Msvm_VirtualEthernetSwitch + string InstanceID + string Caption + string Description + string ElementName + datetime InstallDate + 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 CreationClassName + string Name + string PrimaryOwnerName + string PrimaryOwnerContact + string Roles[] + string NameFormat + string OtherIdentifyingInfo[] + string IdentifyingDescriptions[] + uint16 Dedicated[] + string OtherDedicatedDescriptions[] + uint16 ResetCapability + uint16 PowerManagementCapabilities[] + uint32 MaxVMQOffloads + uint32 MaxIOVOffloads +end -- 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 ca75de98a9..8c34f5addd 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 */ @@ -2685,6 +2811,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: @@ -2788,6 +2922,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 22cfe6657d..0fe01f13b5 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 */ @@ -2322,6 +2393,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, @@ -3483,6 +3689,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 7a2d6649b4..cc8ac4e6eb 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -18,6 +18,18 @@ v7.1.0 (unreleased) The virtio-pmem is a virtio variant of NVDIMM and just like NVDIMM virtio-pmem also allows accessing host pages bypassing guest page cache. + * 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