- Devel - libvirt List Archives

[libvirt] [PATCH] vz: correct error message
by Mikhail Feoktistov 06 Mar '17

06 Mar '17

--- src/vz/vz_sdk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index e16bb0c..84e89a5 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2601,8 +2601,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) def->onCrash != VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("on_reboot, on_poweroff and on_crash parameters " - "are not supported by vz driver")); + _("The following parameters must be " + "on_reboot = restart, on_poweroff = destroy, " + "on_crash = destroy. " + "Different actions are not supported by vz driver")); return -1; } -- 1.8.3.1

2 1

[libvirt] [PATCH] Document preferred naming conventions
by Daniel P. Berrange 06 Mar '17

06 Mar '17

This documents the preferred conventions for naming files, structs, enums, typedefs and functions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- HACKING | 71 ++++++++++++++++++++++++++++++++++++++++++++ docs/hacking.html.in | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/hacking2.xsl | 4 +++ 3 files changed, 158 insertions(+) diff --git a/HACKING b/HACKING index fff003b..16be5cf 100644 --- a/HACKING +++ b/HACKING @@ -239,6 +239,77 @@ on the subject, on Richard Jones' guide to working with open source projects <http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/>. +Naming conventions +================== +When reading libvirt code, a number of different naming conventions will be +evident due to various changes in thinking over the course of the project's +lifetime. The conventions documented below should be followed when creating +any entirely new files in libvirt. When working on existing files, while it is +desirable to apply these conventions, keeping a consistent style with existing +code in that particular file is generally more important. The overall guiding +rule is that every file, enum, struct, function, and typedef name must have a +'vir' or 'VIR' prefix. All local scope variable names are exempt, and global +variables are exempt, unless exported in a header file. + +*File names* + +File naming varies depending on the subdirectory. The preferred style is to +have a 'vir' prefix, followed by a name which matches the name of the +functions / objects inside the file. For example, a file containing an object +'virHashtable' is stored in files 'virhashtable.c' and 'virhashtable.h'. +Sometimes, methods which would otherwise be declared 'static' need to be +exported for use by a test suite. For this purpose a second header file should +be added with a suffix of 'priv'. e.g. 'virhashtablepriv.h'. USe of +underscores in file names is discouraged when using the 'vir' prefix style. +The 'vir' prefix naming applies to src/util, src/rpc and tests/ directories. +Most other directories do not follow this convention. + + + +*Enum type & field names* + +All enums should have a 'vir' prefix in their typedef name, and each following +word should have its first letter in uppercase. The enum name should match the +typedef name with a leading underscore. The enum member names should be in all +uppercase, and use an underscore to separate each word. The enum member name +prefix should match the enum typedef name. + + typedef enum _virSocketType virSocketType; + enum _virSocketType { + VIR_SOCKET_TYPE_IPV4, + VIR_SOCKET_TYPE_IPV6, + }; + + +*Struct type names* + +All structs should have a 'vir' prefix in their typedef name, and each +following word should have its first letter in uppercase. The struct name +should be the same as the typedef name with a leading underscore. A second +typedef should be given for a pointer to the struct with a 'Ptr' suffix. + + typedef struct _virHashTable virHashTable; + typedef virHashTable *virHashTablePtr; + struct _virHashTable { + ... + }; + + +*Function names* + +All functions should have a 'vir' prefix in their name, followed by one or +more words with first letter of each word capitalized. Underscores should not +be used in function names. If the function is operating on an object, then the +function name prefix should match the object typedef name. For example, given +an object 'virHashTable', all functions should have a name 'virHashTableXXXX' +e.g. 'virHashTableLookup'. If there is no object associated with the function, +then its name prefix should match the filename. For example, given a filename +of 'virfile.h', all functions should have a name 'virFileXXXX' e.g. +'virFileTouch'. + + + + Code indentation ================ Libvirt's C source code generally adheres to some basic code-formatting diff --git a/docs/hacking.html.in b/docs/hacking.html.in index b1bb149..028536d 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -314,6 +314,89 @@ Richard Jones' guide to working with open source projects</a>. </p> + <h2><a name="naming">Naming conventions</a></h2> + + <p> + When reading libvirt code, a number of different naming conventions will + be evident due to various changes in thinking over the course of the + project's lifetime. The conventions documented below should be followed + when creating any entirely new files in libvirt. When working on existing + files, while it is desirable to apply these conventions, keeping a + consistent style with existing code in that particular file is generally + more important. The overall guiding rule is that every file, enum, struct, + function, and typedef name must have a 'vir' or 'VIR' prefix. All local + scope variable names are exempt, and global variables are exempt, unless + exported in a header file. + </p> + + <dl> + <dt>File names</dt> + <dd> + <p> + File naming varies depending on the subdirectory. The preferred + style is to have a 'vir' prefix, followed by a name which matches + the name of the functions / objects inside the file. For example, + a file containing an object 'virHashtable' is stored in files + 'virhashtable.c' and 'virhashtable.h'. Sometimes, methods which + would otherwise be declared 'static' need to be exported for use + by a test suite. For this purpose a second header file should be + added with a suffix of 'priv'. e.g. 'virhashtablepriv.h'. USe of + underscores in file names is discouraged when using the 'vir' + prefix style. The 'vir' prefix naming applies to src/util, + src/rpc and tests/ directories. Most other directories do not + follow this convention. + </p> + </dd> + <dt>Enum type & field names</dt> + <dd> + <p> + All enums should have a 'vir' prefix in their typedef name, + and each following word should have its first letter in + uppercase. The enum name should match the typedef name with + a leading underscore. The enum member names should be in all + uppercase, and use an underscore to separate each word. The + enum member name prefix should match the enum typedef name. + </p> + <pre> + typedef enum _virSocketType virSocketType; + enum _virSocketType { + VIR_SOCKET_TYPE_IPV4, + VIR_SOCKET_TYPE_IPV6, + };</pre> + </dd> + <dt>Struct type names</dt> + <dd> + <p> + All structs should have a 'vir' prefix in their typedef name, + and each following word should have its first letter in + uppercase. The struct name should be the same as the typedef + name with a leading underscore. A second typedef should be + given for a pointer to the struct with a 'Ptr' suffix. + </p> + <pre> + typedef struct _virHashTable virHashTable; + typedef virHashTable *virHashTablePtr; + struct _virHashTable { + ... + };</pre> + </dd> + <dt>Function names</dt> + <dd> + <p> + All functions should have a 'vir' prefix in their name, + followed by one or more words with first letter of each + word capitalized. Underscores should not be used in function + names. If the function is operating on an object, then the + function name prefix should match the object typedef name. + For example, given an object 'virHashTable', all functions + should have a name 'virHashTableXXXX' e.g. 'virHashTableLookup'. + If there is no object associated with the function, then its + name prefix should match the filename. For example, given a + filename of 'virfile.h', all functions should have a name + 'virFileXXXX' e.g. 'virFileTouch'. + </p> + </dd> + </dl> <h2><a name="indent">Code indentation</a></h2> <p> diff --git a/docs/hacking2.xsl b/docs/hacking2.xsl index 3595b7e..7e5ac82 100644 --- a/docs/hacking2.xsl +++ b/docs/hacking2.xsl @@ -114,6 +114,10 @@ from docs/hacking.html.in! <xsl:template match="html:li/html:ul/html:li">-- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> </xsl:template> +<xsl:template match="html:dl/html:dt">*<xsl:apply-templates/>*<xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> +</xsl:template> +<xsl:template match="html:dl/html:dd"><xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> +</xsl:template>  -- 2.9.3

6 10

[libvirt] [PATCH] make all struct typedefs comply with proposed coding conventions
by Laine Stump 06 Mar '17

06 Mar '17

Proposed formal coding conventions encourage defining typedefs for vir[Blah] and vir[Blah]Ptr separately from the associated struct named _vir[Blah]: typedef struct _virBlah virBlah; typedef virBlah *virBlahPtr; struct _virBlah { ... }; At some point in the past, I had submitted several patches using a more compact style that I prefer, and they were accepted: typedef struct _virBlah { ... } virBlah, *virBlahPtr; Since these are by far a minority among all struct definitions, this patch changes all those definitions to reflect the style prefered by the proposal so that there is 100% consistency. --- https://www.redhat.com/archives/libvir-list/2017-March/msg00215.html Now that we're talking about formalizing the format of struct definitions, since it was me who tried to make this catch on, it should be me who takes the time to fix them when they don't catch on :-P src/conf/device_conf.h | 60 ++++++++++++++++++++++++++++++--------------- src/conf/network_conf.h | 6 +++-- src/conf/node_device_conf.h | 6 +++-- src/util/virnetdev.h | 6 +++-- src/util/virnetdevip.h | 18 +++++++++----- 5 files changed, 64 insertions(+), 32 deletions(-) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index f435fb5..a20de85 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -51,46 +51,58 @@ typedef enum { VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST } virDomainDeviceAddressType; -typedef struct _virDomainDeviceDriveAddress { +typedef struct _virDomainDeviceDriveAddress virDomainDeviceDriveAddress; +typedef virDomainDeviceDriveAddress *virDomainDeviceDriveAddressPtr; +struct _virDomainDeviceDriveAddress { unsigned int controller; unsigned int bus; unsigned int target; unsigned int unit; -} virDomainDeviceDriveAddress, *virDomainDeviceDriveAddressPtr; +}; -typedef struct _virDomainDeviceVirtioSerialAddress { +typedef struct _virDomainDeviceVirtioSerialAddress virDomainDeviceVirtioSerialAddress; +typedef virDomainDeviceVirtioSerialAddress *virDomainDeviceVirtioSerialAddressPtr; +struct _virDomainDeviceVirtioSerialAddress { unsigned int controller; unsigned int bus; unsigned int port; -} virDomainDeviceVirtioSerialAddress, *virDomainDeviceVirtioSerialAddressPtr; +}; # define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID 254 # define VIR_DOMAIN_DEVICE_CCW_MAX_SSID 3 # define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO 65535 -typedef struct _virDomainDeviceCCWAddress { +typedef struct _virDomainDeviceCCWAddress virDomainDeviceCCWAddress; +typedef virDomainDeviceCCWAddress *virDomainDeviceCCWAddressPtr; +struct _virDomainDeviceCCWAddress { unsigned int cssid; unsigned int ssid; unsigned int devno; bool assigned; -} virDomainDeviceCCWAddress, *virDomainDeviceCCWAddressPtr; +}; -typedef struct _virDomainDeviceCcidAddress { +typedef struct _virDomainDeviceCcidAddress virDomainDeviceCcidAddress; +typedef virDomainDeviceCcidAddress *virDomainDeviceCcidAddressPtr; +struct _virDomainDeviceCcidAddress { unsigned int controller; unsigned int slot; -} virDomainDeviceCcidAddress, *virDomainDeviceCcidAddressPtr; +}; # define VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH 4 -typedef struct _virDomainDeviceUSBAddress { +typedef struct _virDomainDeviceUSBAddress virDomainDeviceUSBAddress; +typedef virDomainDeviceUSBAddress *virDomainDeviceUSBAddressPtr; +struct _virDomainDeviceUSBAddress { unsigned int bus; unsigned int port[VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH]; -} virDomainDeviceUSBAddress, *virDomainDeviceUSBAddressPtr; +}; -typedef struct _virDomainDeviceSpaprVioAddress { +typedef struct _virDomainDeviceSpaprVioAddress virDomainDeviceSpaprVioAddress; +typedef virDomainDeviceSpaprVioAddress *virDomainDeviceSpaprVioAddressPtr; +struct _virDomainDeviceSpaprVioAddress { unsigned long long reg; bool has_reg; -} virDomainDeviceSpaprVioAddress, *virDomainDeviceSpaprVioAddressPtr; +}; typedef enum { VIR_DOMAIN_CONTROLLER_MASTER_NONE, @@ -99,21 +111,29 @@ typedef enum { VIR_DOMAIN_CONTROLLER_MASTER_LAST } virDomainControllerMaster; -typedef struct _virDomainDeviceUSBMaster { +typedef struct _virDomainDeviceUSBMaster virDomainDeviceUSBMaster; +typedef virDomainDeviceUSBMaster *virDomainDeviceUSBMasterPtr; +struct _virDomainDeviceUSBMaster { unsigned int startport; -} virDomainDeviceUSBMaster, *virDomainDeviceUSBMasterPtr; +}; -typedef struct _virDomainDeviceISAAddress { +typedef struct _virDomainDeviceISAAddress virDomainDeviceISAAddress; +typedef virDomainDeviceISAAddress *virDomainDeviceISAAddressPtr; +struct _virDomainDeviceISAAddress { unsigned int iobase; unsigned int irq; -} virDomainDeviceISAAddress, *virDomainDeviceISAAddressPtr; +}; -typedef struct _virDomainDeviceDimmAddress { +typedef struct _virDomainDeviceDimmAddress virDomainDeviceDimmAddress; +typedef virDomainDeviceDimmAddress *virDomainDeviceDimmAddressPtr; +struct _virDomainDeviceDimmAddress { unsigned int slot; unsigned long long base; -} virDomainDeviceDimmAddress, *virDomainDeviceDimmAddressPtr; +}; -typedef struct _virDomainDeviceInfo { +typedef struct _virDomainDeviceInfo virDomainDeviceInfo; +typedef virDomainDeviceInfo *virDomainDeviceInfoPtr; +struct _virDomainDeviceInfo { /* If adding to this struct, ensure that * virDomainDeviceInfoIsSet() is updated * to consider the new fields @@ -147,7 +167,7 @@ typedef struct _virDomainDeviceInfo { * assignment, never saved and never reported. */ int pciConnectFlags; /* enum virDomainPCIConnectFlags */ -} virDomainDeviceInfo, *virDomainDeviceInfoPtr; +}; int virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 9e4ae71..dec809e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -127,10 +127,12 @@ struct _virNetworkDNSHostDef { }; -typedef struct _virNetworkDNSForwarder { +typedef struct _virNetworkDNSForwarder virNetworkDNSForwarder; +typedef virNetworkDNSForwarder *virNetworkDNSForwarderPtr; +struct _virNetworkDNSForwarder { virSocketAddr addr; char *domain; -} virNetworkDNSForwarder, *virNetworkDNSForwarderPtr; +}; typedef struct _virNetworkDNSDef virNetworkDNSDef; typedef virNetworkDNSDef *virNetworkDNSDefPtr; diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 7aed1f4..cf51c69 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -243,7 +243,9 @@ struct _virNodeDevCapDRM { virNodeDevDRMType type; }; -typedef struct _virNodeDevCapData { +typedef struct _virNodeDevCapData virNodeDevCapData; +typedef virNodeDevCapData *virNodeDevCapDataPtr; +struct _virNodeDevCapData { virNodeDevCapType type; union { virNodeDevCapSystem system; @@ -258,7 +260,7 @@ typedef struct _virNodeDevCapData { virNodeDevCapSCSIGeneric sg; virNodeDevCapDRM drm; }; -} virNodeDevCapData, *virNodeDevCapDataPtr; +}; typedef struct _virNodeDevCapsDef virNodeDevCapsDef; typedef virNodeDevCapsDef *virNodeDevCapsDefPtr; diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index c3e8ffc..236cf83 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -86,10 +86,12 @@ typedef enum { VIR_ENUM_DECL(virNetDevIfState) -typedef struct { +typedef struct _virNetDevIfLink virNetDevIfLink; +typedef virNetDevIfLink *virNetDevIfLinkPtr; +struct _virNetDevIfLink { virNetDevIfState state; /* link state */ unsigned int speed; /* link speed in Mbits per second */ -} virNetDevIfLink, *virNetDevIfLinkPtr; +}; typedef enum { VIR_NET_DEV_FEAT_GRXCSUM, diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 8277654..b7abdf9 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -25,13 +25,17 @@ # include "virsocketaddr.h" -typedef struct { +typedef struct _virNetDevIPAddr virNetDevIPAddr; +typedef virNetDevIPAddr *virNetDevIPAddrPtr; +struct _virNetDevIPAddr { virSocketAddr address; /* ipv4 or ipv6 address */ virSocketAddr peer; /* ipv4 or ipv6 address of peer */ unsigned int prefix; /* number of 1 bits in the netmask */ -} virNetDevIPAddr, *virNetDevIPAddrPtr; +}; -typedef struct { +typedef struct _virNetDevIPRoute virNetDevIPRoute; +typedef virNetDevIPRoute *virNetDevIPRoutePtr; +struct _virNetDevIPRoute { char *family; /* ipv4 or ipv6 - default is ipv4 */ virSocketAddr address; /* Routed Network IP address */ @@ -46,15 +50,17 @@ typedef struct { unsigned int metric; /* value for metric (defaults to 1) */ bool has_metric; /* metric= was specified */ virSocketAddr gateway; /* gateway IP address for ip-route */ -} virNetDevIPRoute, *virNetDevIPRoutePtr; +}; /* A full set of all IP config info for a network device */ -typedef struct { +typedef struct _virNetDevIPInfo virNetDevIPInfo; +typedef virNetDevIPInfo *virNetDevIPInfoPtr; + struct _virNetDevIPInfo { size_t nips; virNetDevIPAddrPtr *ips; size_t nroutes; virNetDevIPRoutePtr *routes; -} virNetDevIPInfo, *virNetDevIPInfoPtr; +}; /* manipulating/querying the netdev */ int virNetDevIPAddrAdd(const char *ifname, -- 2.9.3

2 1

[libvirt] [PATCH] qemu_capabilities: report SATA bus in domain capabilities
by Pavel Hrdina 06 Mar '17

06 Mar '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++++ tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 + 11 files changed, 14 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 359a0d87a1..5a3b4ac503 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5422,6 +5422,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_USB); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_AHCI)) + VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_SATA); + return 0; } diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml index 4aa475c1e7..1eadba393f 100644 --- a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml @@ -64,6 +64,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml index 76aee83ba1..1fa7f6dff8 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml @@ -68,6 +68,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml index 104c29fabb..d60fc1df98 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml @@ -68,6 +68,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml index ca511f48d8..fcc6f50e0e 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml @@ -68,6 +68,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml index b3d2d2a7e4..755c4f4475 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml @@ -41,6 +41,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml index a8975e8e53..843bdc2b73 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml @@ -68,6 +68,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml index dd9285311c..962cd0557f 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml @@ -69,6 +69,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml index 4c5fffcad4..7d5ac063fa 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml @@ -69,6 +69,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml index 573eb4bb6e..413f3fa7ce 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml @@ -98,6 +98,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml index b361475d7e..a4ab74dcaf 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml @@ -77,6 +77,7 @@ <value>scsi</value> <value>virtio</value> <value>usb</value> + <value>sata</value> </enum> </disk> <graphics supported='yes'> -- 2.12.0

2 1

[libvirt] [PATCH] Add virsystemdpriv.h to UTIL_SOURCES
by Daniel P. Berrange 06 Mar '17

06 Mar '17

Ensure virsystemdpriv.h gets included in dist tarballs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed to fix RPM builds src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index c85927f..62c8743 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -174,7 +174,7 @@ UTIL_SOURCES = \ util/virstoragefile.c util/virstoragefile.h \ util/virstring.h util/virstring.c \ util/virsysinfo.c util/virsysinfo.h \ - util/virsystemd.c util/virsystemd.h \ + util/virsystemd.c util/virsystemd.h util/virsystemdpriv.h \ util/virthread.c util/virthread.h \ util/virthreadjob.c util/virthreadjob.h \ util/virthreadpool.c util/virthreadpool.h \ -- 2.9.3

1 0

[libvirt] [PATCH v2] Don't print extra newline in virsh domstats output
by Nitesh Konkar 06 Mar '17

06 Mar '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- virsh domstats --perf Domain: 'Fedora123' perf.cache_misses=394986 Domain: 'Fedora' perf.cache_misses=447017 virsh domstats Domain: 'Fedora123' state.state=1 state.reason=1 cpu.time=562472167198 cpu.user=228340000000 cpu.system=303250000000 balloon.current=1048576 balloon.maximum=1048576 perf.cache_misses=634012 Domain: 'Fedora' state.state=1 state.reason=1 cpu.time=19303277561180 cpu.user=5634250000000 cpu.system=9536140000000 balloon.current=1048576 balloon.maximum=1048576 perf.cache_misses=699207 tools/virsh-domain-monitor.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 77aa272..901a6eb 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2047,7 +2047,6 @@ virshDomainStatsPrintRecord(vshControl *ctl ATTRIBUTE_UNUSED, VIR_FREE(param); } - vshPrint(ctl, "\n"); return true; } @@ -2145,9 +2144,13 @@ cmdDomstats(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - for (next = records; *next; next++) { + next = records; + while (*next) { if (!virshDomainStatsPrintRecord(ctl, *next, raw)) goto cleanup; + + if (*(++next)) + vshPrint(ctl, "\n"); } ret = true; -- 1.9.3

2 2

[libvirt] [PATCH v2.1] qemu_capabilities: introduce QEMU_CAPS_SD_CARD to probe sd-card drivers
by Chen Hanxiao 06 Mar '17

06 Mar '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch introduces QEMU_CAPS_SD_CARD for probing whether qemu support SD card by: {"execute": "device-list-properties", "arguments":{"typename":"sd-card"}} It will be helpful for apps which used cmd 'virsh domcaps` etc. Also helpful for: https://bugzilla.redhat.com/show_bug.cgi?id=1387218 Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: rebased on upstream v2.1: add doc/news.xml description rebased on upstream docs/news.xml | 9 +++++++++ src/qemu/qemu_capabilities.c | 9 +++++++-- src/qemu/qemu_capabilities.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 584c9af..b218463 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -26,6 +26,15 @@ don't start it with unsupported features. </description> </change> + <change> + <summary> + qemu_capabilities: introduce QEMU_CAPS_SD_CARD to probe sd-card drivers + </summary> + <description> + The new QEMU capability flag will allow libvirt to probe sd-card + drivers. + </description> + </change> </section> <section title="Bug fixes"> <change/> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5694d0b..1828b30 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -359,6 +359,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "query-cpu-model-expansion", /* 245 */ "virtio-net.host_mtu", "spice-rendernode", + "sd-card", ); @@ -1626,6 +1627,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "ivshmem-plain", QEMU_CAPS_DEVICE_IVSHMEM_PLAIN }, { "ivshmem-doorbell", QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL }, { "vhost-scsi", QEMU_CAPS_DEVICE_VHOST_SCSI }, + { "sd-card", QEMU_CAPS_SD_CARD }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { @@ -5425,8 +5427,7 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, - VIR_DOMAIN_DISK_BUS_VIRTIO, - /* VIR_DOMAIN_DISK_BUS_SD */); + VIR_DOMAIN_DISK_BUS_VIRTIO); /* PowerPC pseries based VMs do not support floppy device */ if (!ARCH_IS_PPC64(qemuCaps->arch) || @@ -5435,6 +5436,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_USB); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SD_CARD)) + VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_SD); + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cc9f46e..decca12 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -394,6 +394,7 @@ typedef enum { QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ + QEMU_CAPS_SD_CARD, /* -sd SD-card.img */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -- 2.7.4

2 1

[libvirt] [PATCH] qemu: Enforce qemuSecurity wrappers
by Michal Privoznik 06 Mar '17

06 Mar '17

Now that we have some qemuSecurity wrappers over virSecurityManager APIs, lets make sure everybody sticks with them. We have them for a reason and calling virSecurityManager API directly instead of wrapper may lead into accidentally labelling a file on the host instead of namespace. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is an alternative approach to: https://www.redhat.com/archives/libvir-list/2017-February/msg00271.html cfg.mk | 5 ++++ src/qemu/qemu_command.c | 7 +++--- src/qemu/qemu_conf.c | 9 ++++--- src/qemu/qemu_domain.c | 17 ++++++------- src/qemu/qemu_driver.c | 63 ++++++++++++++++++++++------------------------- src/qemu/qemu_hotplug.c | 4 +-- src/qemu/qemu_migration.c | 13 +++++----- src/qemu/qemu_process.c | 61 ++++++++++++++++++++++----------------------- src/qemu/qemu_security.h | 32 ++++++++++++++++++++++++ 9 files changed, 122 insertions(+), 89 deletions(-) diff --git a/cfg.mk b/cfg.mk index 69e3f3a1a..489fda8ea 100644 --- a/cfg.mk +++ b/cfg.mk @@ -983,6 +983,11 @@ sc_prohibit_sysconf_pagesize: halt='use virGetSystemPageSize[KB] instead of sysconf(_SC_PAGESIZE)' \ $(_sc_search_regexp) +sc_prohibit_virSecurity: + @grep -P 'virSecurityManager(?!Ptr)' $$($(VC_LIST_EXCEPT) | grep '^src/qemu/' | \ + grep -v '^src/qemu/qemu_security') && \ + { echo '$(ME): prefer qemuSecurity wrappers' 1>&2; exit 1; } || : + sc_prohibit_pthread_create: @prohibit='\bpthread_create\b' \ exclude='sc_prohibit_pthread_create' \ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c00a47a91..110540ba7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -28,6 +28,7 @@ #include "qemu_capabilities.h" #include "qemu_interface.h" #include "qemu_alias.h" +#include "qemu_security.h" #include "cpu/cpu.h" #include "dirname.h" #include "viralloc.h" @@ -8321,8 +8322,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, } for (i = 0; i < tapfdSize; i++) { - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - def, tapfd[i]) < 0) + if (qemuSecuritySetTapFDLabel(driver->securityManager, + def, tapfd[i]) < 0) goto cleanup; virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -8403,7 +8404,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, /* NOTE: Not using const virDomainDef here since eventually a call is made - * into virSecurityManagerSetTapFDLabel which calls it's driver + * into qemuSecuritySetTapFDLabel which calls it's driver * API domainSetSecurityTapFDLabel that doesn't use the const format. */ static int diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0223a95d2..4fc0dee39 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -38,6 +38,7 @@ #include "qemu_conf.h" #include "qemu_capabilities.h" #include "qemu_domain.h" +#include "qemu_security.h" #include "viruuid.h" #include "virbuffer.h" #include "virconf.h" @@ -904,7 +905,7 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) } /* access sec drivers and create a sec model for each one */ - if (!(sec_managers = virSecurityManagerGetNested(driver->securityManager))) + if (!(sec_managers = qemuSecurityGetNested(driver->securityManager))) goto error; /* calculate length */ @@ -917,14 +918,14 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) for (i = 0; sec_managers[i]; i++) { virCapsHostSecModelPtr sm = &caps->host.secModels[i]; - doi = virSecurityManagerGetDOI(sec_managers[i]); - model = virSecurityManagerGetModel(sec_managers[i]); + doi = qemuSecurityGetDOI(sec_managers[i]); + model = qemuSecurityGetModel(sec_managers[i]); if (VIR_STRDUP(sm->model, model) < 0 || VIR_STRDUP(sm->doi, doi) < 0) goto error; for (j = 0; j < ARRAY_CARDINALITY(virtTypes); j++) { - lbl = virSecurityManagerGetBaseLabel(sec_managers[i], virtTypes[j]); + lbl = qemuSecurityGetBaseLabel(sec_managers[i], virtTypes[j]); type = virDomainVirtTypeToString(virtTypes[j]); if (lbl && virCapabilitiesHostSecModelAddBaseLabel(sm, type, lbl) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f62bf8f1d..2c827ea2c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -588,8 +588,8 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetPathLabel(driver->securityManager, - vm->def, path) < 0) + if (qemuSecurityDomainSetPathLabel(driver->securityManager, + vm->def, path) < 0) goto cleanup; ret = 0; @@ -2688,7 +2688,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (qemuDomainRecheckInternalPaths(def, cfg, parseFlags) < 0) goto cleanup; - if (virSecurityManagerVerify(driver->securityManager, def) < 0) + if (qemuSecurityVerify(driver->securityManager, def) < 0) goto cleanup; if (qemuDomainDefVcpusPostParse(def) < 0) @@ -7257,8 +7257,7 @@ qemuDomainSetupDev(virQEMUDriverPtr driver, VIR_DEBUG("Setting up /dev/ for domain %s", vm->def->name); - mount_options = virSecurityManagerGetMountOptions(driver->securityManager, - vm->def); + mount_options = qemuSecurityGetMountOptions(driver->securityManager, vm->def); if (!mount_options && VIR_STRDUP(mount_options, "") < 0) @@ -7679,7 +7678,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, bool delDevice = false; bool isLink = S_ISLNK(data->sb.st_mode); - virSecurityManagerPostFork(data->driver->securityManager); + qemuSecurityPostFork(data->driver->securityManager); if (virFileMakeParentPath(data->file) < 0) { virReportSystemError(errno, @@ -7841,16 +7840,16 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, #endif if (STRPREFIX(file, DEVPREFIX)) { - if (virSecurityManagerPreFork(driver->securityManager) < 0) + if (qemuSecurityPreFork(driver->securityManager) < 0) goto cleanup; if (virProcessRunInMountNamespace(vm->pid, qemuDomainAttachDeviceMknodHelper, &data) < 0) { - virSecurityManagerPostFork(driver->securityManager); + qemuSecurityPostFork(driver->securityManager); goto cleanup; } - virSecurityManagerPostFork(driver->securityManager); + qemuSecurityPostFork(driver->securityManager); } if (isLink && diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89bc833de..096fe36fe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -405,26 +405,26 @@ qemuSecurityInit(virQEMUDriverPtr driver) cfg->securityDriverNames[0]) { names = cfg->securityDriverNames; while (names && *names) { - if (!(mgr = virSecurityManagerNew(*names, - QEMU_DRIVER_NAME, - flags))) + if (!(mgr = qemuSecurityNew(*names, + QEMU_DRIVER_NAME, + flags))) goto error; if (!stack) { - if (!(stack = virSecurityManagerNewStack(mgr))) + if (!(stack = qemuSecurityNewStack(mgr))) goto error; } else { - if (virSecurityManagerStackAddNested(stack, mgr) < 0) + if (qemuSecurityStackAddNested(stack, mgr) < 0) goto error; } mgr = NULL; names++; } } else { - if (!(mgr = virSecurityManagerNew(NULL, - QEMU_DRIVER_NAME, - flags))) + if (!(mgr = qemuSecurityNew(NULL, + QEMU_DRIVER_NAME, + flags))) goto error; - if (!(stack = virSecurityManagerNewStack(mgr))) + if (!(stack = qemuSecurityNewStack(mgr))) goto error; mgr = NULL; } @@ -432,17 +432,17 @@ qemuSecurityInit(virQEMUDriverPtr driver) if (virQEMUDriverIsPrivileged(driver)) { if (cfg->dynamicOwnership) flags |= VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP; - if (!(mgr = virSecurityManagerNewDAC(QEMU_DRIVER_NAME, - cfg->user, - cfg->group, - flags, - qemuSecurityChownCallback))) + if (!(mgr = qemuSecurityNewDAC(QEMU_DRIVER_NAME, + cfg->user, + cfg->group, + flags, + qemuSecurityChownCallback))) goto error; if (!stack) { - if (!(stack = virSecurityManagerNewStack(mgr))) + if (!(stack = qemuSecurityNewStack(mgr))) goto error; } else { - if (virSecurityManagerStackAddNested(stack, mgr) < 0) + if (qemuSecurityStackAddNested(stack, mgr) < 0) goto error; } mgr = NULL; @@ -3088,7 +3088,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (fd < 0) goto cleanup; - if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) + if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0) goto cleanup; if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) @@ -3553,8 +3553,7 @@ static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, return -1; } - if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, - fd) < 0) + if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0) return -1; VIR_FREE(priv->job.current); @@ -3846,7 +3845,7 @@ qemuDomainScreenshot(virDomainPtr dom, } unlink_tmp = true; - virSecurityManagerSetSavedStateLabel(driver->securityManager, vm->def, tmp); + qemuSecuritySetSavedStateLabel(driver->securityManager, vm->def, tmp); qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorScreendump(priv->mon, tmp) < 0) { @@ -5928,8 +5927,8 @@ static int qemuDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secl * QEMU monitor hasn't seen SIGHUP/ERR on poll(). */ if (virDomainObjIsActive(vm)) { - if (virSecurityManagerGetProcessLabel(driver->securityManager, - vm->def, vm->pid, seclabel) < 0) { + if (qemuSecurityGetProcessLabel(driver->securityManager, + vm->def, vm->pid, seclabel) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get security label")); goto cleanup; @@ -5973,8 +5972,7 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, ret = 0; } else { int len = 0; - virSecurityManagerPtr* mgrs = virSecurityManagerGetNested( - driver->securityManager); + virSecurityManagerPtr* mgrs = qemuSecurityGetNested(driver->securityManager); if (!mgrs) goto cleanup; @@ -5990,8 +5988,8 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, /* Fill the array */ for (i = 0; i < len; i++) { - if (virSecurityManagerGetProcessLabel(mgrs[i], vm->def, vm->pid, - &(*seclabels)[i]) < 0) { + if (qemuSecurityGetProcessLabel(mgrs[i], vm->def, vm->pid, + &(*seclabels)[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get security label")); VIR_FREE(mgrs); @@ -6369,8 +6367,8 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, cleanup: virCommandFree(cmd); VIR_FREE(errbuf); - if (virSecurityManagerRestoreSavedStateLabel(driver->securityManager, - vm->def, path) < 0) + if (qemuSecurityRestoreSavedStateLabel(driver->securityManager, + vm->def, path) < 0) VIR_WARN("failed to restore save state label on %s", path); virObjectUnref(cfg); return ret; @@ -11196,7 +11194,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, goto endjob; } - virSecurityManagerSetSavedStateLabel(driver->securityManager, vm->def, tmp); + qemuSecuritySetSavedStateLabel(driver->securityManager, vm->def, tmp); priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); @@ -17064,8 +17062,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, goto endjob; } - if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, - fd) < 0) + if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0) goto endjob; qemuDomainObjEnterMonitor(driver, vm); @@ -17129,13 +17126,13 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, goto cleanup; } - if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) + if (qemuSecuritySetSocketLabel(driver->securityManager, vm->def) < 0) goto cleanup; if (socketpair(PF_UNIX, SOCK_STREAM, 0, pair) < 0) goto cleanup; - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0) + if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) goto cleanup; if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2f209f12b..b99b0e9fb 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1134,8 +1134,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } for (i = 0; i < tapfdSize; i++) { - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - vm->def, tapfd[i]) < 0) + if (qemuSecuritySetTapFDLabel(driver->securityManager, + vm->def, tapfd[i]) < 0) goto cleanup; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0f4a6cf21..c40cb1391 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -40,6 +40,7 @@ #include "qemu_cgroup.h" #include "qemu_hotplug.h" #include "qemu_blockjob.h" +#include "qemu_security.h" #include "domain_audit.h" #include "virlog.h" @@ -4597,7 +4598,7 @@ qemuMigrationConnect(virQEMUDriverPtr driver, spec->destType = MIGRATION_DEST_FD; spec->dest.fd.qemu = -1; - if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) + if (qemuSecuritySetSocketLabel(driver->securityManager, vm->def) < 0) goto cleanup; if (virNetSocketNewConnectTCP(host, port, AF_UNSPEC, @@ -4605,7 +4606,7 @@ qemuMigrationConnect(virQEMUDriverPtr driver, spec->dest.fd.qemu = virNetSocketDupFD(sock, true); virObjectUnref(sock); } - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0 || + if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0 || spec->dest.fd.qemu == -1) goto cleanup; @@ -5076,8 +5077,8 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, spec.dest.fd.local = fds[0]; } if (spec.dest.fd.qemu == -1 || - virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, - spec.dest.fd.qemu) < 0) { + qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, + spec.dest.fd.qemu) < 0) { virReportSystemError(errno, "%s", _("cannot create pipe for tunnelled migration")); goto cleanup; @@ -6463,8 +6464,8 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, * doesn't have to open() the file, so while we still have to * grant SELinux access, we can do it on fd and avoid cleanup * later, as well as skip futzing with cgroup. */ - if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, - compressor ? pipeFD[1] : fd) < 0) + if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, + compressor ? pipeFD[1] : fd) < 0) goto cleanup; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 92fa69b3c..5c44e565b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -221,8 +221,7 @@ qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm) return 0; } - if (virSecurityManagerSetDaemonSocketLabel(driver->securityManager, - vm->def) < 0) { + if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to set security context for agent for %s"), vm->def->name); goto cleanup; @@ -250,8 +249,7 @@ qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm) return -1; } - if (virSecurityManagerClearSocketLabel(driver->securityManager, - vm->def) < 0) { + if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to clear security context for agent for %s"), vm->def->name); qemuAgentClose(agent); @@ -1657,8 +1655,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, int ret = -1; qemuMonitorPtr mon = NULL; - if (virSecurityManagerSetDaemonSocketLabel(driver->securityManager, - vm->def) < 0) { + if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); return -1; @@ -1695,7 +1692,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, } priv->mon = mon; - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0) { + if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to clear security context for monitor for %s"), vm->def->name); return -1; @@ -2638,7 +2635,7 @@ static int qemuProcessHook(void *data) * protected across fork() */ - virSecurityManagerPostFork(h->driver->securityManager); + qemuSecurityPostFork(h->driver->securityManager); /* Some later calls want pid present */ h->vm->pid = getpid(); @@ -2651,7 +2648,7 @@ static int qemuProcessHook(void *data) * sockets the lock driver opens that we don't want * labelled. So far we're ok though. */ - if (virSecurityManagerSetSocketLabel(h->driver->securityManager, h->vm->def) < 0) + if (qemuSecuritySetSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; if (virDomainLockProcessStart(h->driver->lockManager, h->cfg->uri, @@ -2660,7 +2657,7 @@ static int qemuProcessHook(void *data) true, &fd) < 0) goto cleanup; - if (virSecurityManagerClearSocketLabel(h->driver->securityManager, h->vm->def) < 0) + if (qemuSecurityClearSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; if (qemuDomainBuildNamespace(h->driver, h->vm) < 0) @@ -3260,8 +3257,8 @@ qemuProcessBuildDestroyHugepagesPath(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetPathLabel(driver->securityManager, - vm->def, hugepagePath) < 0) { + if (qemuSecurityDomainSetPathLabel(driver->securityManager, + vm->def, hugepagePath) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to set huge path in security driver")); goto cleanup; @@ -3437,13 +3434,13 @@ qemuProcessReconnect(void *opaque) /* if domain requests security driver we haven't loaded, report error, but * do not kill the domain */ - ignore_value(virSecurityManagerCheckAllLabel(driver->securityManager, - obj->def)); + ignore_value(qemuSecurityCheckAllLabel(driver->securityManager, + obj->def)); if (qemuDomainRefreshVcpuInfo(driver, obj, QEMU_ASYNC_JOB_NONE, true) < 0) goto error; - if (virSecurityManagerReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) + if (qemuSecurityReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; if (qemuProcessNotifyNets(obj->def) < 0) @@ -4451,8 +4448,8 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetPathLabel(driver->securityManager, - vm->def, path) < 0) + if (qemuSecurityDomainSetPathLabel(driver->securityManager, + vm->def, path) < 0) goto cleanup; ret = 0; @@ -4647,7 +4644,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, } VIR_DEBUG("Checking domain and device security labels"); - if (virSecurityManagerCheckAllLabel(driver->securityManager, vm->def) < 0) + if (qemuSecurityCheckAllLabel(driver->securityManager, vm->def) < 0) return -1; } @@ -5202,7 +5199,7 @@ qemuProcessPrepareDomain(virConnectPtr conn, /* If you are using a SecurityDriver with dynamic labelling, then generate a security label for isolation */ VIR_DEBUG("Generating domain security label (if required)"); - if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0) { + if (qemuSecurityGenLabel(driver->securityManager, vm->def) < 0) { virDomainAuditSecurityLabel(vm, false); goto cleanup; } @@ -5513,8 +5510,8 @@ qemuProcessLaunch(virConnectPtr conn, virCommandSetUmask(cmd, 0x002); VIR_DEBUG("Setting up security labelling"); - if (virSecurityManagerSetChildProcessLabel(driver->securityManager, - vm->def, cmd) < 0) + if (qemuSecuritySetChildProcessLabel(driver->securityManager, + vm->def, cmd) < 0) goto cleanup; virCommandSetOutputFD(cmd, &logfile); @@ -5524,10 +5521,10 @@ qemuProcessLaunch(virConnectPtr conn, virCommandDaemonize(cmd); virCommandRequireHandshake(cmd); - if (virSecurityManagerPreFork(driver->securityManager) < 0) + if (qemuSecurityPreFork(driver->securityManager) < 0) goto cleanup; rv = virCommandRun(cmd, NULL); - virSecurityManagerPostFork(driver->securityManager); + qemuSecurityPostFork(driver->securityManager); /* wait for qemu process to show up */ if (rv == 0) { @@ -5604,8 +5601,8 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; } if (S_ISFIFO(stdin_sb.st_mode) && - virSecurityManagerSetImageFDLabel(driver->securityManager, - vm->def, incoming->fd) < 0) + qemuSecuritySetImageFDLabel(driver->securityManager, + vm->def, incoming->fd) < 0) goto cleanup; } @@ -6122,7 +6119,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuSecurityRestoreAllLabel(driver, vm, !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED)); - virSecurityManagerReleaseLabel(driver->securityManager, vm->def); + qemuSecurityReleaseLabel(driver->securityManager, vm->def); for (i = 0; i < vm->def->ndisks; i++) { virDomainDeviceDef dev; @@ -6366,13 +6363,13 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, vm->pid = pid; VIR_DEBUG("Detect security driver config"); - sec_managers = virSecurityManagerGetNested(driver->securityManager); + sec_managers = qemuSecurityGetNested(driver->securityManager); if (sec_managers == NULL) goto error; for (i = 0; sec_managers[i]; i++) { seclabelgen = false; - model = virSecurityManagerGetModel(sec_managers[i]); + model = qemuSecurityGetModel(sec_managers[i]); seclabeldef = virDomainDefGetSecurityLabelDef(vm->def, model); if (seclabeldef == NULL) { if (!(seclabeldef = virSecurityLabelDefNew(model))) @@ -6382,8 +6379,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, seclabeldef->type = VIR_DOMAIN_SECLABEL_STATIC; if (VIR_ALLOC(seclabel) < 0) goto error; - if (virSecurityManagerGetProcessLabel(sec_managers[i], - vm->def, vm->pid, seclabel) < 0) + if (qemuSecurityGetProcessLabel(sec_managers[i], vm->def, + vm->pid, seclabel) < 0) goto error; if (VIR_STRDUP(seclabeldef->model, model) < 0) @@ -6400,9 +6397,9 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, } } - if (virSecurityManagerCheckAllLabel(driver->securityManager, vm->def) < 0) + if (qemuSecurityCheckAllLabel(driver->securityManager, vm->def) < 0) goto error; - if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0) + if (qemuSecurityGenLabel(driver->securityManager, vm->def) < 0) goto error; if (qemuDomainPerfRestart(vm) < 0) diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 54638908d..d86db3f6b 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -28,6 +28,7 @@ # include "qemu_conf.h" # include "domain_conf.h" +# include "security/security_manager.h" int qemuSecuritySetAllLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -60,4 +61,35 @@ int qemuSecuritySetHostdevLabel(virQEMUDriverPtr driver, int qemuSecurityRestoreHostdevLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev); + +/* Please note that for these APIs there is no wrapper yet. Do NOT blindly add + * new APIs here. If an API can touch a /dev file add a proper wrapper instead. + */ +# define qemuSecurityCheckAllLabel virSecurityManagerCheckAllLabel +# define qemuSecurityClearSocketLabel virSecurityManagerClearSocketLabel +# define qemuSecurityDomainSetPathLabel virSecurityManagerDomainSetPathLabel +# define qemuSecurityGenLabel virSecurityManagerGenLabel +# define qemuSecurityGetBaseLabel virSecurityManagerGetBaseLabel +# define qemuSecurityGetDOI virSecurityManagerGetDOI +# define qemuSecurityGetModel virSecurityManagerGetModel +# define qemuSecurityGetMountOptions virSecurityManagerGetMountOptions +# define qemuSecurityGetNested virSecurityManagerGetNested +# define qemuSecurityGetProcessLabel virSecurityManagerGetProcessLabel +# define qemuSecurityNew virSecurityManagerNew +# define qemuSecurityNewDAC virSecurityManagerNewDAC +# define qemuSecurityNewStack virSecurityManagerNewStack +# define qemuSecurityPostFork virSecurityManagerPostFork +# define qemuSecurityPreFork virSecurityManagerPreFork +# define qemuSecurityReleaseLabel virSecurityManagerReleaseLabel +# define qemuSecurityReserveLabel virSecurityManagerReserveLabel +# define qemuSecurityRestoreSavedStateLabel virSecurityManagerRestoreSavedStateLabel +# define qemuSecuritySetChildProcessLabel virSecurityManagerSetChildProcessLabel +# define qemuSecuritySetDaemonSocketLabel virSecurityManagerSetDaemonSocketLabel +# define qemuSecuritySetImageFDLabel virSecurityManagerSetImageFDLabel +# define qemuSecuritySetSavedStateLabel virSecurityManagerSetSavedStateLabel +# define qemuSecuritySetSocketLabel virSecurityManagerSetSocketLabel +# define qemuSecuritySetTapFDLabel virSecurityManagerSetTapFDLabel +# define qemuSecurityStackAddNested virSecurityManagerStackAddNested +# define qemuSecurityVerify virSecurityManagerVerify + #endif /* __QEMU_SECURITY_H__ */ -- 2.11.0

4 6

[libvirt] 'make check' fails (qemuhotplugTest) with libvirt fakeroot build, starting with 3.1.0 release
by Predrag Ivanovic 06 Mar '17

06 Mar '17

Hello. I am not sure if this is a bug, but fakerot build of libvirt-3.1.0 reliably fails at 'make check' stage, always with the same error (qemuhotplugTest). 3.0.0 builds fine, 3.2.0 (git master dec6d9df5feeb768381dd1b010d8030b44ea1a9a) fails at the same spot. If I build as root, libvirt-3.1.0 'make check' passes without errors, and the build is successful. Is this the expected behaviour, bug in the fakeroot(1.21), or? Qemu is 2.8.0 test-suite.log -- ========================================= libvirt 3.1.0: tests/test-suite.log ========================================= # TOTAL: 114 # PASS: 113 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: qemuhotplugtest ===================== TEST: qemuhotplugtest ........................................ 40 ...!!!...!...!.. 56 FAIL FAIL qemuhotplugtest (exit status: 1) Pedja

3 6

[libvirt] [PATCH 0/4] Split out interface object into its own module
by John Ferlan 06 Mar '17

06 Mar '17

Feedback from the initial pass at RFC for making a common pool object was that it got really confusing trying to manage the multitude of changes. See patch 3 of the series: http://www.redhat.com/archives/libvir-list/2017-February/msg00519.html So while I figure out what it'll take to make a better object framework, I figure I could start splitting out things a bit to make future work a bit easier to understand. Also rather than trying to do them all in one massive series, I'm working through shorter series contained to each of the driver conf's - this one is for interface and if follows the same pattern as node device. John Ferlan (4): conf: Introduce virinterfaceobj conf: Adjust coding style for interface conf sources conf: Use consistent function name prefixes for virinterfaceobj conf: Alter coding style of interface function prototypes po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/interface_conf.c | 239 ++++++++------------------------ src/conf/interface_conf.h | 60 ++------ src/conf/virinterfaceobj.c | 217 +++++++++++++++++++++++++++++ src/conf/virinterfaceobj.h | 84 +++++++++++ src/interface/interface_backend_netcf.c | 1 + src/interface/interface_backend_udev.c | 1 + src/libvirt_private.syms | 19 +-- src/test/test_driver.c | 26 ++-- 10 files changed, 396 insertions(+), 255 deletions(-) create mode 100644 src/conf/virinterfaceobj.c create mode 100644 src/conf/virinterfaceobj.h -- 2.9.3

2 5

[libvirt] [PATH v9 00/12] Support cache tune in libvirt
by Eli Qiao 06 Mar '17

06 Mar '17

Addressed comment from v9 -> v8 Marcelo: * New public API to query cache usage Eli: * Fix core dump while multiple tasks are added. Addressed comment from v8 -> v7 Martin: * Patch subject prefix. * Move some of cpu related information to virhostcpu.c. * Fix some memory leak in src/utils/resctrl.c Martin & Marcelo: * Don't remove directories which are not maintained by libvirt. Addressed comment from v7 -> v6 Marcelo: * Fix flock usage while VM initialization. Addressed comment from v6 -> v5 Marcelo: * Support other APPs to operate /sys/fs/resctrl at same time Libvirt will scan /sys/fs/resctrl again before doing cache allocation. patch 10 will address this. Addressed comment from v4 -> v5: Marcelo: * Several typos * Use flock instead of virFileLock Addressed comment from v3 -> v4: Daniel & Marcelo: * Added concurrence support Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's system fs. There are still one TODO left: 1. Expose a new public interface to set cachetune lively. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (12): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interfaces to operate cache bank Qemu: Set cache tune while booting a new domain. Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled Resctrl: concurrence support Resctrl: Scan resctrl before doing cache allocation Resctrl: Add Public API for nodecachestats Resctrl: Add nodecachestats daemon/remote.c | 67 +++ docs/schemas/domaincommon.rng | 46 ++ include/libvirt/libvirt-host.h | 32 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 +++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 +++++++ src/conf/domain_conf.h | 19 + src/driver-hypervisor.h | 7 + src/libvirt-host.c | 41 ++ src/libvirt_private.syms | 12 + src/libvirt_public.syms | 1 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 18 + src/qemu/qemu_process.c | 54 ++ src/remote/remote_driver.c | 52 ++ src/remote/remote_protocol.x | 25 +- src/remote_protocol-structs | 16 + src/util/virerror.c | 1 + src/util/virhostcpu.c | 186 ++++++- src/util/virhostcpu.h | 6 + src/util/virresctrl.c | 1082 ++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 96 ++++ tools/virsh-host.c | 49 ++ 28 files changed, 2129 insertions(+), 18 deletions(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

3 16

[libvirt] [PATCH 0/3] Clean
by John Ferlan 06 Mar '17

06 Mar '17

More "fallout" from the RFC series to make a common pool object: http://www.redhat.com/archives/libvir-list/2017-February/msg00519.html were changes made along the way in the test_driver code to "commonalize" the various vir*ObjFindBy{Name|UUID} callers. This series will do the same for the existing code. Not even attempted was making test_driver to have updated coding style (maybe another day for that)! John Ferlan (3): test: Make common test*ObjFindByName helpers test: Make a common testNetworkObjFindByName test: Make common test*ObjFindByUUID helpers src/test/test_driver.c | 499 ++++++++++++++++--------------------------------- 1 file changed, 166 insertions(+), 333 deletions(-) -- 2.9.3

2 5

[libvirt] [RFC PATCH 00/12] Support multiple PHBs on pSeries guests
by Andrea Bolognani 06 Mar '17

06 Mar '17

Note: if you want to try this out, you'll need to make sure your QEMU binary includes this commit[1]; moreover, that commit is missing a way for libvirt to detect whether the new naming scheme is in place, so this will have to remain an RFC until the QEMU side has been sorted out. Patches 1-3 are just setting up the stage. Patch 4 starts actually introducing the feature, by relaxing some checks that can no longer be as strict. Patches 5-10 puts all the boring bits (XML parsing and formatting, QEMU capabilities) in place. Patch 11 enables the feature at last. Patch 12 introduces a single test, a bunch more will be added before posting this for real (not as RFC). [1] https://github.com/dgibson/qemu/commit/0a6a9ba2adc48a9a5ea7406d1a5fb3c36f00… Andrea Bolognani (12): qemu: Allow qemuBuildControllerDevStr() to return NULL qemu: Tweak index number checking conf: Move index number checking to drivers qemu: Relax pci-root index requirement for pSeries guests schema: Allow <target index='...'/> schema: Add 'spapr-pci-host-bridge' controller model conf: Parse and format <target index='...'/> conf: Add 'spapr-pci-host-bridge' controller model qemu: Automatically pick index and model for pci-root controllers qemu: Introduce QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE qemu: Use multiple PHBs for pSeries guests tests: Add tests for pSeries guests with multiple PHBs docs/schemas/domaincommon.rng | 7 ++ src/bhyve/bhyve_domain.c | 15 +++ src/conf/domain_conf.c | 34 ++++-- src/conf/domain_conf.h | 2 + src/libxl/libxl_domain.c | 14 +++ src/lxc/lxc_domain.c | 14 +++ src/openvz/openvz_driver.c | 14 +++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 126 +++++++++++++++++---- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 13 +++ src/qemu/qemu_domain_address.c | 47 +++++++- src/qemu/qemu_hotplug.c | 5 +- src/uml/uml_driver.c | 14 +++ src/vz/vz_driver.c | 14 +++ src/xen/xen_driver.c | 14 +++ .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 5 +- .../qemuargv2xml-pseries-nvram.xml | 5 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemuxml2argv-pseries-phb-simple.args | 26 +++++ .../qemuxml2argv-pseries-phb-simple.xml | 20 ++++ tests/qemuxml2argvtest.c | 5 + .../qemuxml2xmlout-panic-pseries.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller-legacy.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller.xml | 5 +- .../qemuxml2xmlout-pseries-nvram.xml | 5 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 5 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 5 +- ...g.xml => qemuxml2xmlout-pseries-phb-simple.xml} | 13 ++- tests/qemuxml2xmltest.c | 4 + 31 files changed, 407 insertions(+), 47 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-phb-simple.xml} (69%) -- 2.7.4

3 17

[libvirt] [PATCH] news: Fix typo
by Jiri Denemark 06 Mar '17

06 Mar '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 584c9afac..97393b3aa 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -21,7 +21,7 @@ </summary> <description> Previously, libvirt detected the host CPU model using CPUID - instruction, which cased libvirt to detect a lot of CPU features + instruction, which caused libvirt to detect a lot of CPU features that are not supported by QEMU/KVM. Asking QEMU makes sure we don't start it with unsupported features. </description> -- 2.12.0

1 0

[libvirt] [PATCH] qemu: Drop virQEMUCapsFreeStringList
by Jiri Denemark 06 Mar '17

06 Mar '17

The implementation matches virStringListFreeCount. The only difference between the two functions is the ordering of their parameters. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5694d0ba4..359a0d87a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1881,19 +1881,6 @@ virQEMUCapsProcessProps(virQEMUCapsPtr qemuCaps, } -static void -virQEMUCapsFreeStringList(size_t len, - char **values) -{ - size_t i; - if (!values) - return; - for (i = 0; i < len; i++) - VIR_FREE(values[i]); - VIR_FREE(values); -} - - #define OBJECT_TYPE_PREFIX "name \"" static int @@ -1928,7 +1915,7 @@ virQEMUCapsParseDeviceStrObjectTypes(const char *str, cleanup: if (ret < 0) - virQEMUCapsFreeStringList(ntypelist, typelist); + virStringListFreeCount(typelist, ntypelist); return ret; } @@ -1981,7 +1968,7 @@ virQEMUCapsParseDeviceStrObjectProps(const char *str, cleanup: if (ret < 0) - virQEMUCapsFreeStringList(nproplist, proplist); + virStringListFreeCount(proplist, nproplist); return ret; } @@ -1999,7 +1986,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str) ARRAY_CARDINALITY(virQEMUCapsObjectTypes), virQEMUCapsObjectTypes, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { const char *type = virQEMUCapsObjectProps[i].type; @@ -2011,7 +1998,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str) virQEMUCapsObjectProps[i].nprops, virQEMUCapsObjectProps[i].props, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); } /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ @@ -2665,7 +2652,7 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsCommands), virQEMUCapsCommands, ncommands, commands); - virQEMUCapsFreeStringList(ncommands, commands); + virStringListFreeCount(commands, ncommands); /* QMP add-fd was introduced in 1.2, but did not support * management control of set numbering, and did not have a @@ -2707,7 +2694,7 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents), virQEMUCapsEvents, nevents, events); - virQEMUCapsFreeStringList(nevents, events); + virStringListFreeCount(events, nevents); return 0; } @@ -2727,7 +2714,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsObjectTypes), virQEMUCapsObjectTypes, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { const char *type = virQEMUCapsObjectProps[i].type; @@ -2743,7 +2730,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsPropObjects), virQEMUCapsPropObjects, type, nvalues, values); - virQEMUCapsFreeStringList(nvalues, values); + virStringListFreeCount(values, nvalues); } /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ @@ -3043,7 +3030,7 @@ virQEMUCapsProbeQMPMigrationCapabilities(virQEMUCapsPtr qemuCaps, ARRAY_CARDINALITY(virQEMUCapsMigration), virQEMUCapsMigration, ncaps, caps); - virQEMUCapsFreeStringList(ncaps, caps); + virStringListFreeCount(caps, ncaps); return 0; } -- 2.12.0

2 1

[libvirt] [PATCH] node: Replace variable named 'system' with 'syscap'
by John Ferlan 04 Mar '17

04 Mar '17

Changes in commit id 'dec6d9df' caused a compilation failure on a RHEL6 CI build environment. So just replace 'system' with 'syscap' as a name. cc1: warnings being treated as errors ../../src/conf/node_device_conf.c: In function 'virNodeDevCapSystemParseXML': ../../src/conf/node_device_conf.c:1415: error: declaration of 'system' shadows a global declaration [-Wshadow] Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as a build breaker src/conf/node_device_conf.c | 8 ++++---- src/node_device/node_device_udev.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d60f69d..3565aec 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1412,10 +1412,10 @@ static int virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, virNodeDeviceDefPtr def, xmlNodePtr node, - virNodeDevCapSystemPtr system) + virNodeDevCapSystemPtr syscap) { - virNodeDevCapSystemHardwarePtr hardware = &system->hardware; - virNodeDevCapSystemFirmwarePtr firmware = &system->firmware; + virNodeDevCapSystemHardwarePtr hardware = &syscap->hardware; + virNodeDevCapSystemFirmwarePtr firmware = &syscap->firmware; xmlNodePtr orignode; int ret = -1; char *tmp; @@ -1423,7 +1423,7 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - system->product_name = virXPathString("string(./product[1])", ctxt); + syscap->product_name = virXPathString("string(./product[1])", ctxt); hardware->vendor_name = virXPathString("string(./hardware/vendor[1])", ctxt); hardware->version = virXPathString("string(./hardware/version[1])", ctxt); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index af44604..bcae444 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1420,12 +1420,12 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, /* DMI is intel-compatible specific */ #if defined(__x86_64__) || defined(__i386__) || defined(__amd64__) static void -udevGetDMIData(virNodeDevCapSystemPtr system) +udevGetDMIData(virNodeDevCapSystemPtr syscap) { struct udev *udev = NULL; struct udev_device *device = NULL; - virNodeDevCapSystemHardwarePtr hardware = &system->hardware; - virNodeDevCapSystemFirmwarePtr firmware = &system->firmware; + virNodeDevCapSystemHardwarePtr hardware = &syscap->hardware; + virNodeDevCapSystemFirmwarePtr firmware = &syscap->firmware; udev = udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driver)); @@ -1441,7 +1441,7 @@ udevGetDMIData(virNodeDevCapSystemPtr system) } if (udevGetStringSysfsAttr(device, "product_name", - &system->product_name) < 0) + &syscap->product_name) < 0) goto cleanup; if (udevGetStringSysfsAttr(device, "sys_vendor", &hardware->vendor_name) < 0) -- 2.9.3

1 0

[libvirt] [PATCH v2] Document preferred naming conventions
by Daniel P. Berrange 03 Mar '17

03 Mar '17

This documents the preferred conventions for naming files, structs, enums, typedefs and functions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Fix typo - Add macro docs - Clarify that $VERB is always last in function/macro names HACKING | 81 ++++++++++++++++++++++++++++++++++++++++++++ docs/hacking.html.in | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/hacking2.xsl | 4 +++ 3 files changed, 179 insertions(+) diff --git a/HACKING b/HACKING index fff003b..5077304 100644 --- a/HACKING +++ b/HACKING @@ -239,6 +239,87 @@ on the subject, on Richard Jones' guide to working with open source projects <http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/>. +Naming conventions +================== +When reading libvirt code, a number of different naming conventions will be +evident due to various changes in thinking over the course of the project's +lifetime. The conventions documented below should be followed when creating +any entirely new files in libvirt. When working on existing files, while it is +desirable to apply these conventions, keeping a consistent style with existing +code in that particular file is generally more important. The overall guiding +rule is that every file, enum, struct, function, and typedef name must have a +'vir' or 'VIR' prefix. All local scope variable names are exempt, and global +variables are exempt, unless exported in a header file. + +*File names* + +File naming varies depending on the subdirectory. The preferred style is to +have a 'vir' prefix, followed by a name which matches the name of the +functions / objects inside the file. For example, a file containing an object +'virHashtable' is stored in files 'virhashtable.c' and 'virhashtable.h'. +Sometimes, methods which would otherwise be declared 'static' need to be +exported for use by a test suite. For this purpose a second header file should +be added with a suffix of 'priv'. e.g. 'virhashtablepriv.h'. Use of +underscores in file names is discouraged when using the 'vir' prefix style. +The 'vir' prefix naming applies to src/util, src/rpc and tests/ directories. +Most other directories do not follow this convention. + + + +*Enum type & field names* + +All enums should have a 'vir' prefix in their typedef name, and each following +word should have its first letter in uppercase. The enum name should match the +typedef name with a leading underscore. The enum member names should be in all +uppercase, and use an underscore to separate each word. The enum member name +prefix should match the enum typedef name. + + typedef enum _virSocketType virSocketType; + enum _virSocketType { + VIR_SOCKET_TYPE_IPV4, + VIR_SOCKET_TYPE_IPV6, + }; + + +*Struct type names* + +All structs should have a 'vir' prefix in their typedef name, and each +following word should have its first letter in uppercase. The struct name +should be the same as the typedef name with a leading underscore. A second +typedef should be given for a pointer to the struct with a 'Ptr' suffix. + + typedef struct _virHashTable virHashTable; + typedef virHashTable *virHashTablePtr; + struct _virHashTable { + ... + }; + + +*Function names* + +All functions should have a 'vir' prefix in their name, followed by one or +more words with first letter of each word capitalized. Underscores should not +be used in function names. If the function is operating on an object, then the +function name prefix should match the object typedef name. When naming +functions the verb should always be the last part of the name. For example, +given an object 'virHashTable', all functions should have a name +'virHashTable$VERB' e.g. 'virHashTableLookup'. If there is no object +associated with the function, then its name prefix should match the filename. +For example, given a filename of 'virfile.h', all functions should have a name +'virFile$VERB' e.g. 'virFileTouch'. + + + +*Macro names* + +All macros should have a "VIR" prefix in their name, followed by one or more +uppercase words separated by underscores. The macro argument names should be +in lowercase. As with functions, the verb should always be the last part of +the name. For example "VIR_FILE_CLOSE". + + + + Code indentation ================ Libvirt's C source code generally adheres to some basic code-formatting diff --git a/docs/hacking.html.in b/docs/hacking.html.in index b1bb149..1001f49 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -314,6 +314,100 @@ Richard Jones' guide to working with open source projects</a>. </p> + <h2><a name="naming">Naming conventions</a></h2> + + <p> + When reading libvirt code, a number of different naming conventions will + be evident due to various changes in thinking over the course of the + project's lifetime. The conventions documented below should be followed + when creating any entirely new files in libvirt. When working on existing + files, while it is desirable to apply these conventions, keeping a + consistent style with existing code in that particular file is generally + more important. The overall guiding rule is that every file, enum, struct, + function, and typedef name must have a 'vir' or 'VIR' prefix. All local + scope variable names are exempt, and global variables are exempt, unless + exported in a header file. + </p> + + <dl> + <dt>File names</dt> + <dd> + <p> + File naming varies depending on the subdirectory. The preferred + style is to have a 'vir' prefix, followed by a name which matches + the name of the functions / objects inside the file. For example, + a file containing an object 'virHashtable' is stored in files + 'virhashtable.c' and 'virhashtable.h'. Sometimes, methods which + would otherwise be declared 'static' need to be exported for use + by a test suite. For this purpose a second header file should be + added with a suffix of 'priv'. e.g. 'virhashtablepriv.h'. Use of + underscores in file names is discouraged when using the 'vir' + prefix style. The 'vir' prefix naming applies to src/util, + src/rpc and tests/ directories. Most other directories do not + follow this convention. + </p> + </dd> + <dt>Enum type & field names</dt> + <dd> + <p> + All enums should have a 'vir' prefix in their typedef name, + and each following word should have its first letter in + uppercase. The enum name should match the typedef name with + a leading underscore. The enum member names should be in all + uppercase, and use an underscore to separate each word. The + enum member name prefix should match the enum typedef name. + </p> + <pre> + typedef enum _virSocketType virSocketType; + enum _virSocketType { + VIR_SOCKET_TYPE_IPV4, + VIR_SOCKET_TYPE_IPV6, + };</pre> + </dd> + <dt>Struct type names</dt> + <dd> + <p> + All structs should have a 'vir' prefix in their typedef name, + and each following word should have its first letter in + uppercase. The struct name should be the same as the typedef + name with a leading underscore. A second typedef should be + given for a pointer to the struct with a 'Ptr' suffix. + </p> + <pre> + typedef struct _virHashTable virHashTable; + typedef virHashTable *virHashTablePtr; + struct _virHashTable { + ... + };</pre> + </dd> + <dt>Function names</dt> + <dd> + <p> + All functions should have a 'vir' prefix in their name, + followed by one or more words with first letter of each + word capitalized. Underscores should not be used in function + names. If the function is operating on an object, then the + function name prefix should match the object typedef name. + When naming functions the verb should always be the last + part of the name. For example, given an object 'virHashTable', + all functions should have a name 'virHashTable$VERB' + e.g. 'virHashTableLookup'. If there is no object associated + with the function, then its name prefix should match the + filename. For example, given a filename of 'virfile.h', all + functions should have a name 'virFile$VERB' e.g. 'virFileTouch'. + </p> + </dd> + <dt>Macro names</dt> + <dd> + <p> + All macros should have a "VIR" prefix in their name, followed + by one or more uppercase words separated by underscores. The + macro argument names should be in lowercase. As with functions, + the verb should always be the last part of the name. For example + "VIR_FILE_CLOSE". + </p> + </dd> + </dl> <h2><a name="indent">Code indentation</a></h2> <p> diff --git a/docs/hacking2.xsl b/docs/hacking2.xsl index 3595b7e..7e5ac82 100644 --- a/docs/hacking2.xsl +++ b/docs/hacking2.xsl @@ -114,6 +114,10 @@ from docs/hacking.html.in! <xsl:template match="html:li/html:ul/html:li">-- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> </xsl:template> +<xsl:template match="html:dl/html:dt">*<xsl:apply-templates/>*<xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> +</xsl:template> +<xsl:template match="html:dl/html:dd"><xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> +</xsl:template>  -- 2.9.3

3 4

[libvirt] [PATCH RESEND] qdev: Make "hotplugged" property read-only
by Eduardo Habkost 03 Mar '17

03 Mar '17

The "hotplugged" property is user visible, but it was never meant to be set by the user. There are probably multiple ways to break or crash device code by overriding the property. For example, we recently fixed a crash in rtc_set_memory() related to the property (commit 26ef65beab852caf2b1ef4976e3473f2d525164d). There has been some discussion about making management software use "hotplugged=on" on migration, to indicate devices that were hotplugged in the migration source. There were other suggestions to address this, like including the "hotplugged" field in the migration stream instead of requiring it to be set propertly. Whatever solution we choose in the future, this patch disables setting "hotplugged" explicitly in the command-line by now, because the ability to set the property is unused, untested, and undocumented. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- hw/core/qdev.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 06ba02e2a3..800c9ca23f 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1016,13 +1016,6 @@ static bool device_get_hotplugged(Object *obj, Error **err) return dev->hotplugged; } -static void device_set_hotplugged(Object *obj, bool value, Error **err) -{ - DeviceState *dev = DEVICE(obj); - - dev->hotplugged = value; -} - static void device_initfn(Object *obj) { DeviceState *dev = DEVICE(obj); @@ -1042,7 +1035,7 @@ static void device_initfn(Object *obj) object_property_add_bool(obj, "hotpluggable", device_get_hotpluggable, NULL, NULL); object_property_add_bool(obj, "hotplugged", - device_get_hotplugged, device_set_hotplugged, + device_get_hotplugged, NULL, &error_abort); class = object_get_class(OBJECT(dev)); -- 2.11.0.259.g40922b1

3 4

[libvirt] [PATCH] news: Move host CPU model improvement to 3.2.0
by Jiri Denemark 03 Mar '17

03 Mar '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. docs/news.xml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index e4b5a9d31..584c9afac 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -15,7 +15,17 @@ <change/> </section> <section title="Improvements"> - <change/> + <change> + <summary> + qemu: Detect host CPU model by asking QEMU on x86_64 + </summary> + <description> + Previously, libvirt detected the host CPU model using CPUID + instruction, which cased libvirt to detect a lot of CPU features + that are not supported by QEMU/KVM. Asking QEMU makes sure we + don't start it with unsupported features. + </description> + </change> </section> <section title="Bug fixes"> <change/> @@ -141,17 +151,6 @@ driver with all backends which may pull in too many dependencies. </description> </change> - <change> - <summary> - qemu: Detect host CPU model by asking QEMU on x86_64 - </summary> - <description> - Previously, libvirt detected the host CPU model using CPUID - instruction, which cased libvirt to detect a lot of CPU features - that are not supported by QEMU/KVM. Asking QEMU makes sure we - don't start it with unsupported features. - </description> - </change> </section> <section title="Bug fixes"> <change> -- 2.12.0

1 0

[libvirt] [PATCH 0/2] cpu_x86: Disable TSX on broken models
by Jiri Denemark 03 Mar '17

03 Mar '17

This series applies on top of "qemu: Detect host CPU model by asking QEMU on x86_64". https://bugzilla.redhat.com/show_bug.cgi?id=1406791 Jiri Denemark (2): cpu_x86: Disable TSX on broken models cputest: Add CPUID data for Haswell with TSX src/cpu/cpu_x86.c | 72 ++++++++++++++++++++-- tests/cputest.c | 1 + .../x86_64-cpuid-Core-i5-4670T-guest.xml | 2 +- .../x86_64-cpuid-Core-i5-4670T-host.xml | 2 +- .../x86_64-cpuid-Core-i5-4670T-json.xml | 2 +- .../x86_64-cpuid-Xeon-E7-8890-guest.xml | 32 ++++++++++ .../cputestdata/x86_64-cpuid-Xeon-E7-8890-host.xml | 32 ++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml | 37 +++++++++++ 8 files changed, 172 insertions(+), 8 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml -- 2.11.1

2 4

[libvirt] [PATCH v3 00/28] qemu: Detect host CPU model by asking QEMU on x86_64
by Jiri Denemark 03 Mar '17

03 Mar '17

Until now host-model CPU mode tried to enable all CPU features supported by the host CPU even if QEMU/KVM did not support them. This caused a number of issues and made host-model quite unreliable. Asking QEMU for the CPU it can provide and the current host makes host-model much more robust. This series fixes the following bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1018251 https://bugzilla.redhat.com/show_bug.cgi?id=1371617 https://bugzilla.redhat.com/show_bug.cgi?id=1372581 https://bugzilla.redhat.com/show_bug.cgi?id=1404627 https://bugzilla.redhat.com/show_bug.cgi?id=870071 In addition to that, the following bug should be mostly limited to cases when an unsupported feature is explicitly requested: https://bugzilla.redhat.com/show_bug.cgi?id=1335534 The series relies on features which are not in QEMU yet, but should be hopefully close enough to be pushed in 2.9.0. In the meantime, Eduardo's work/x86-query-cpu-expansion-full branch can be used to play with them. Version 3: - a few patches which were ACKed in v2 and didn't have any dependencies were pushed to make the series a bit smaller - review comments addressed (see individual patches for more details) Version 2: - properly set vendor property in converted test data files - fix cpu-parse.sh to use "x86_64" prefix for the generated files Jiri Denemark (28): qemucapstest: Update test data for QEMU 2.9.0 domaincapstest: Add test data for QEMU 2.9.0 qemu: Refactor virQEMUCapsInitHostCPUModel qemu: Fix CPU model fallback in domain capabilities docs: Update description of the host-model CPU mode qemu: Rename hostCPU/feature element in capabilities cache qemu: Prepare for more types in qemuMonitorCPUModelInfo qemu: Store more types in qemuMonitorCPUModelInfo qemu: Probe "max" CPU model in TCG cpu_x86: Drop virCPUx86MakeData and use virCPUDataNew cpu_x86: Make virCPUx86DataClear static cpu: Rework cpuDataFree cpu_x86: Make virCPUx86DataAddCPUID work with virCPUDataPtr cpu_x86: Introduce virCPUx86DataSetSignature cpu_x86: Introduce virCPUx86DataSetVendor cpu_x86: Introduce virCPUx86DataAddFeature qemu: Get host CPU model from QEMU on x86_64 qemu: Use enum for CPU model expansion type qemu: Use full CPU model expansion on x86 qemu: Make virQEMUCapsInitCPUModel testable cputest: Rename x86 data files cputest: Use virArch enum rather then strings cputest: Switch host CPU data scripts to model expansion cputest: Convert all json data files to query-cpu-model-expansion cputest: Test virQEMUCapsInitCPUModel cputest: Drop obsolete CPU test data files cputest: Drop .new suffix from CPU test data files news: Detect host CPU model by asking QEMU on x86_64 docs/formatdomain.html.in | 37 +- docs/news.xml | 11 + src/bhyve/bhyve_capabilities.c | 2 +- src/cpu/cpu.c | 21 +- src/cpu/cpu.h | 4 +- src/cpu/cpu_arm.c | 7 - src/cpu/cpu_ppc64.c | 6 +- src/cpu/cpu_s390.c | 7 - src/cpu/cpu_x86.c | 280 ++++--- src/cpu/cpu_x86.h | 13 +- src/libvirt_private.syms | 7 +- src/libxl/libxl_capabilities.c | 18 +- src/qemu/qemu_capabilities.c | 463 ++++++++--- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_capspriv.h | 13 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 29 +- src/qemu/qemu_monitor.h | 35 +- src/qemu/qemu_monitor_json.c | 107 ++- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 7 +- src/vmware/vmware_conf.c | 2 +- src/vz/vz_driver.c | 2 +- tests/cputest.c | 324 ++++---- tests/cputestdata/cpu-convert.py | 249 ++++++ tests/cputestdata/cpu-gather.sh | 39 +- tests/cputestdata/cpu-parse.sh | 5 +- tests/cputestdata/x86-cpuid-A10-5800K.json | 77 -- tests/cputestdata/x86-cpuid-Core-i5-2500.json | 88 --- tests/cputestdata/x86-cpuid-Core-i5-2540M.json | 82 -- tests/cputestdata/x86-cpuid-Core-i5-4670T.json | 77 -- tests/cputestdata/x86-cpuid-Core-i5-6600.json | 82 -- tests/cputestdata/x86-cpuid-Core-i7-2600.json | 77 -- tests/cputestdata/x86-cpuid-Core-i7-3740QM.json | 77 -- tests/cputestdata/x86-cpuid-Core-i7-3770.json | 77 -- tests/cputestdata/x86-cpuid-Core-i7-4600U.json | 82 -- tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml | 12 - tests/cputestdata/x86-cpuid-Core-i7-5600U.json | 88 --- tests/cputestdata/x86-cpuid-Core2-E6850.json | 77 -- tests/cputestdata/x86-cpuid-Opteron-2350.json | 71 -- tests/cputestdata/x86-cpuid-Opteron-6234.json | 88 --- tests/cputestdata/x86-cpuid-Phenom-B95.json | 77 -- tests/cputestdata/x86-cpuid-Xeon-E3-1245.json | 88 --- tests/cputestdata/x86-cpuid-Xeon-E5-2630.json | 77 -- tests/cputestdata/x86-cpuid-Xeon-E5-2650.json | 71 -- tests/cputestdata/x86-cpuid-Xeon-E7-4820.json | 77 -- tests/cputestdata/x86-cpuid-Xeon-W3520.json | 77 -- ...ack.xml => x86_64-Haswell-noTSX-nofallback.xml} | 0 ...-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} | 0 .../{x86-Haswell.xml => x86_64-Haswell.xml} | 0 ...e-1-result.xml => x86_64-baseline-1-result.xml} | 0 .../{x86-baseline-1.xml => x86_64-baseline-1.xml} | 0 ...e-2-result.xml => x86_64-baseline-2-result.xml} | 0 .../{x86-baseline-2.xml => x86_64-baseline-2.xml} | 0 ...expanded.xml => x86_64-baseline-3-expanded.xml} | 0 ...e-3-result.xml => x86_64-baseline-3-result.xml} | 0 .../{x86-baseline-3.xml => x86_64-baseline-3.xml} | 0 ...expanded.xml => x86_64-baseline-4-expanded.xml} | 0 ...e-4-result.xml => x86_64-baseline-4-result.xml} | 0 .../{x86-baseline-4.xml => x86_64-baseline-4.xml} | 0 ...expanded.xml => x86_64-baseline-5-expanded.xml} | 0 ...e-5-result.xml => x86_64-baseline-5-result.xml} | 0 .../{x86-baseline-5.xml => x86_64-baseline-5.xml} | 0 ...atable.xml => x86_64-baseline-6-migratable.xml} | 0 ...e-6-result.xml => x86_64-baseline-6-result.xml} | 0 .../{x86-baseline-6.xml => x86_64-baseline-6.xml} | 0 ...e-7-result.xml => x86_64-baseline-7-result.xml} | 0 .../{x86-baseline-7.xml => x86_64-baseline-7.xml} | 0 ...e-8-result.xml => x86_64-baseline-8-result.xml} | 0 .../{x86-baseline-8.xml => x86_64-baseline-8.xml} | 0 ...ml => x86_64-baseline-incompatible-vendors.xml} | 0 ...lt.xml => x86_64-baseline-no-vendor-result.xml} | 0 ...no-vendor.xml => x86_64-baseline-no-vendor.xml} | 0 ...xml => x86_64-baseline-some-vendors-result.xml} | 0 ...endors.xml => x86_64-baseline-some-vendors.xml} | 0 ...-bogus-feature.xml => x86_64-bogus-feature.xml} | 0 ...{x86-bogus-model.xml => x86_64-bogus-model.xml} | 0 ...86-bogus-vendor.xml => x86_64-bogus-vendor.xml} | 0 ...-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} | 0 ...0K-host.xml => x86_64-cpuid-A10-5800K-host.xml} | 0 ...0K-json.xml => x86_64-cpuid-A10-5800K-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-A10-5800K.json | 203 +++++ ...id-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} | 0 ...-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} | 0 ...10-host.xml => x86_64-cpuid-Atom-D510-host.xml} | 0 ...id-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} | 0 ...-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} | 0 ...50-host.xml => x86_64-cpuid-Atom-N450-host.xml} | 0 ...id-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} | 0 ...est.xml => x86_64-cpuid-Core-i5-2500-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i5-2500-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i5-2500-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-2500.json | 203 +++++ ...e-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} | 0 ...st.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i5-2540M-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i5-2540M-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json | 203 +++++ ...i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} | 0 ...st.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i5-4670T-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i5-4670T-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json | 203 +++++ ...i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} | 0 ...est.xml => x86_64-cpuid-Core-i5-6600-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i5-6600-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i5-6600-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-6600.json | 203 +++++ ...e-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} | 0 ...est.xml => x86_64-cpuid-Core-i7-2600-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i7-2600-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i7-2600-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 203 +++++ ...e-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-3520M-host.xml} | 0 ...i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} | 0 ...t.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} | 0 ...on.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json | 203 +++++ ...-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} | 0 ...est.xml => x86_64-cpuid-Core-i7-3770-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i7-3770-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i7-3770-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-3770.json | 203 +++++ ...e-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-4600U-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i7-4600U-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json | 203 +++++ ...i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-5600U-host.xml} | 0 .../x86_64-cpuid-Core-i7-5600U-json.xml | 16 + tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json | 203 +++++ ...i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} | 0 ...uest.xml => x86_64-cpuid-Core2-E6850-guest.xml} | 0 ...-host.xml => x86_64-cpuid-Core2-E6850-host.xml} | 0 ...-json.xml => x86_64-cpuid-Core2-E6850-json.xml} | 5 +- tests/cputestdata/x86_64-cpuid-Core2-E6850.json | 203 +++++ ...ore2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} | 0 ...uest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} | 0 ...-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} | 0 ...ore2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} | 0 ...50-guest.xml => x86_64-cpuid-FX-8150-guest.xml} | 0 ...8150-host.xml => x86_64-cpuid-FX-8150-host.xml} | 0 ...-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-1352-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-1352-host.xml} | 0 ...eron-1352.xml => x86_64-cpuid-Opteron-1352.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-2350-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-2350-host.xml} | 0 ...json.xml => x86_64-cpuid-Opteron-2350-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Opteron-2350.json | 203 +++++ ...eron-2350.xml => x86_64-cpuid-Opteron-2350.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-6234-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-6234-host.xml} | 0 ...json.xml => x86_64-cpuid-Opteron-6234-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Opteron-6234.json | 203 +++++ ...eron-6234.xml => x86_64-cpuid-Opteron-6234.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-6282-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-6282-host.xml} | 0 ...eron-6282.xml => x86_64-cpuid-Opteron-6282.xml} | 0 ...st.xml => x86_64-cpuid-Pentium-P6100-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Pentium-P6100-host.xml} | 0 ...um-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} | 0 ...guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} | 0 ...5-host.xml => x86_64-cpuid-Phenom-B95-host.xml} | 0 ...5-json.xml => x86_64-cpuid-Phenom-B95-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Phenom-B95.json | 203 +++++ ...-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} | 0 ...-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} | 0 ...10-host.xml => x86_64-cpuid-Xeon-5110-host.xml} | 0 ...id-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json | 203 +++++ ...n-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json | 203 +++++ ...n-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json | 203 +++++ ...n-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json | 203 +++++ ...n-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} | 0 ...guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} | 0 ...0-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} | 0 ...0-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-W3520.json | 203 +++++ ...-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} | 0 ...guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} | 0 ...0-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} | 0 ...-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} | 0 ...le-extra.xml => x86_64-exact-disable-extra.xml} | 0 ...-exact-disable.xml => x86_64-exact-disable.xml} | 0 ...xact-disable2.xml => x86_64-exact-disable2.xml} | 0 ...bid-extra.xml => x86_64-exact-forbid-extra.xml} | 0 ...86-exact-forbid.xml => x86_64-exact-forbid.xml} | 0 ...-Haswell.xml => x86_64-exact-force-Haswell.xml} | 0 ...{x86-exact-force.xml => x86_64-exact-force.xml} | 0 ...re-extra.xml => x86_64-exact-require-extra.xml} | 0 ...-exact-require.xml => x86_64-exact-require.xml} | 0 .../{x86-exact.xml => x86_64-exact.xml} | 0 ...-nofallback.xml => x86_64-guest-nofallback.xml} | 0 .../{x86-guest.xml => x86_64-guest.xml} | 0 ...t.xml => x86_64-host+guest,model486-result.xml} | 0 ...ult.xml => x86_64-host+guest,models-result.xml} | 0 ...est-result.xml => x86_64-host+guest-result.xml} | 0 .../{x86-host+guest.xml => x86_64-host+guest.xml} | 0 ... x86_64-host+host+host-model,models-result.xml} | 0 ...k.xml => x86_64-host+host-model-nofallback.xml} | 0 ...t+host-model.xml => x86_64-host+host-model.xml} | 0 ...l => x86_64-host+host-passthrough-features.xml} | 0 ...hrough.xml => x86_64-host+host-passthrough.xml} | 0 .../{x86-host+min.xml => x86_64-host+min.xml} | 0 ...ult.xml => x86_64-host+penryn-force-result.xml} | 0 ...-host+pentium3.xml => x86_64-host+pentium3.xml} | 0 ...l => x86_64-host+strict-force-extra-result.xml} | 0 ...-host-Haswell-noTSX+Haswell,haswell-result.xml} | 0 ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 0 ...64-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 0 ...ell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} | 0 ...SandyBridge.xml => x86_64-host-SandyBridge.xml} | 0 ...-host-amd-fake.xml => x86_64-host-amd-fake.xml} | 0 .../{x86-host-amd.xml => x86_64-host-amd.xml} | 0 ....xml => x86_64-host-better+pentium3-result.xml} | 0 ...{x86-host-better.xml => x86_64-host-better.xml} | 0 ...incomp-arch.xml => x86_64-host-incomp-arch.xml} | 0 ...model.xml => x86_64-host-invtsc+host-model.xml} | 0 ...{x86-host-invtsc.xml => x86_64-host-invtsc.xml} | 0 ...llback.xml => x86_64-host-model-nofallback.xml} | 0 .../{x86-host-model.xml => x86_64-host-model.xml} | 0 ...ost-no-vendor.xml => x86_64-host-no-vendor.xml} | 0 ...es.xml => x86_64-host-passthrough-features.xml} | 0 ...passthrough.xml => x86_64-host-passthrough.xml} | 0 ...sult.xml => x86_64-host-worse+guest-result.xml} | 0 .../{x86-host-worse.xml => x86_64-host-worse.xml} | 0 .../cputestdata/{x86-host.xml => x86_64-host.xml} | 0 tests/cputestdata/{x86-min.xml => x86_64-min.xml} | 0 ...86-penryn-force.xml => x86_64-penryn-force.xml} | 0 ...86-pentium3-amd.xml => x86_64-pentium3-amd.xml} | 0 .../{x86-pentium3.xml => x86_64-pentium3.xml} | 0 ...trict-disable.xml => x86_64-strict-disable.xml} | 0 ...rce-extra.xml => x86_64-strict-force-extra.xml} | 0 ...{x86-strict-full.xml => x86_64-strict-full.xml} | 0 .../{x86-strict.xml => x86_64-strict.xml} | 0 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 2 +- .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 145 ++++ tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 124 +++ tests/domaincapstest.c | 8 + .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 8 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 32 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 879 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 465 ++++++++++- tests/qemumonitorjsontest.c | 4 +- tests/qemuxml2argvtest.c | 3 +- 267 files changed, 6731 insertions(+), 2055 deletions(-) create mode 100755 tests/cputestdata/cpu-convert.py delete mode 100644 tests/cputestdata/x86-cpuid-A10-5800K.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-2500.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-2540M.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-4670T.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-6600.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-2600.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-3740QM.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-3770.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-5600U.json delete mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850.json delete mode 100644 tests/cputestdata/x86-cpuid-Opteron-2350.json delete mode 100644 tests/cputestdata/x86-cpuid-Opteron-6234.json delete mode 100644 tests/cputestdata/x86-cpuid-Phenom-B95.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E3-1245.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E5-2630.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E5-2650.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E7-4820.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520.json rename tests/cputestdata/{x86-Haswell-noTSX-nofallback.xml => x86_64-Haswell-noTSX-nofallback.xml} (100%) rename tests/cputestdata/{x86-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} (100%) rename tests/cputestdata/{x86-Haswell.xml => x86_64-Haswell.xml} (100%) rename tests/cputestdata/{x86-baseline-1-result.xml => x86_64-baseline-1-result.xml} (100%) rename tests/cputestdata/{x86-baseline-1.xml => x86_64-baseline-1.xml} (100%) rename tests/cputestdata/{x86-baseline-2-result.xml => x86_64-baseline-2-result.xml} (100%) rename tests/cputestdata/{x86-baseline-2.xml => x86_64-baseline-2.xml} (100%) rename tests/cputestdata/{x86-baseline-3-expanded.xml => x86_64-baseline-3-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-3-result.xml => x86_64-baseline-3-result.xml} (100%) rename tests/cputestdata/{x86-baseline-3.xml => x86_64-baseline-3.xml} (100%) rename tests/cputestdata/{x86-baseline-4-expanded.xml => x86_64-baseline-4-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-4-result.xml => x86_64-baseline-4-result.xml} (100%) rename tests/cputestdata/{x86-baseline-4.xml => x86_64-baseline-4.xml} (100%) rename tests/cputestdata/{x86-baseline-5-expanded.xml => x86_64-baseline-5-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-5-result.xml => x86_64-baseline-5-result.xml} (100%) rename tests/cputestdata/{x86-baseline-5.xml => x86_64-baseline-5.xml} (100%) rename tests/cputestdata/{x86-baseline-6-migratable.xml => x86_64-baseline-6-migratable.xml} (100%) rename tests/cputestdata/{x86-baseline-6-result.xml => x86_64-baseline-6-result.xml} (100%) rename tests/cputestdata/{x86-baseline-6.xml => x86_64-baseline-6.xml} (100%) rename tests/cputestdata/{x86-baseline-7-result.xml => x86_64-baseline-7-result.xml} (100%) rename tests/cputestdata/{x86-baseline-7.xml => x86_64-baseline-7.xml} (100%) rename tests/cputestdata/{x86-baseline-8-result.xml => x86_64-baseline-8-result.xml} (100%) rename tests/cputestdata/{x86-baseline-8.xml => x86_64-baseline-8.xml} (100%) rename tests/cputestdata/{x86-baseline-incompatible-vendors.xml => x86_64-baseline-incompatible-vendors.xml} (100%) rename tests/cputestdata/{x86-baseline-no-vendor-result.xml => x86_64-baseline-no-vendor-result.xml} (100%) rename tests/cputestdata/{x86-baseline-no-vendor.xml => x86_64-baseline-no-vendor.xml} (100%) rename tests/cputestdata/{x86-baseline-some-vendors-result.xml => x86_64-baseline-some-vendors-result.xml} (100%) rename tests/cputestdata/{x86-baseline-some-vendors.xml => x86_64-baseline-some-vendors.xml} (100%) rename tests/cputestdata/{x86-bogus-feature.xml => x86_64-bogus-feature.xml} (100%) rename tests/cputestdata/{x86-bogus-model.xml => x86_64-bogus-model.xml} (100%) rename tests/cputestdata/{x86-bogus-vendor.xml => x86_64-bogus-vendor.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-host.xml => x86_64-cpuid-A10-5800K-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-json.xml => x86_64-cpuid-A10-5800K-json.xml} (96%) create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K.json rename tests/cputestdata/{x86-cpuid-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510-host.xml => x86_64-cpuid-Atom-D510-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450-host.xml => x86_64-cpuid-Atom-N450-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-guest.xml => x86_64-cpuid-Core-i5-2500-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-host.xml => x86_64-cpuid-Core-i5-2500-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-json.xml => x86_64-cpuid-Core-i5-2500-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500.json rename tests/cputestdata/{x86-cpuid-Core-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-guest.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-host.xml => x86_64-cpuid-Core-i5-2540M-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-json.xml => x86_64-cpuid-Core-i5-2540M-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json rename tests/cputestdata/{x86-cpuid-Core-i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-guest.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-host.xml => x86_64-cpuid-Core-i5-4670T-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-json.xml => x86_64-cpuid-Core-i5-4670T-json.xml} (95%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json rename tests/cputestdata/{x86-cpuid-Core-i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-guest.xml => x86_64-cpuid-Core-i5-6600-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-host.xml => x86_64-cpuid-Core-i5-6600-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-json.xml => x86_64-cpuid-Core-i5-6600-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600.json rename tests/cputestdata/{x86-cpuid-Core-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-guest.xml => x86_64-cpuid-Core-i7-2600-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-host.xml => x86_64-cpuid-Core-i7-2600-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-json.xml => x86_64-cpuid-Core-i7-2600-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600.json rename tests/cputestdata/{x86-cpuid-Core-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-guest.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-host.xml => x86_64-cpuid-Core-i7-3520M-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-guest.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-host.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-json.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-guest.xml => x86_64-cpuid-Core-i7-3770-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-host.xml => x86_64-cpuid-Core-i7-3770-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-json.xml => x86_64-cpuid-Core-i7-3770-json.xml} (92%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770.json rename tests/cputestdata/{x86-cpuid-Core-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-guest.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-host.xml => x86_64-cpuid-Core-i7-4600U-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-json.xml => x86_64-cpuid-Core-i7-4600U-json.xml} (95%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json rename tests/cputestdata/{x86-cpuid-Core-i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-guest.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-host.xml => x86_64-cpuid-Core-i7-5600U-host.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json rename tests/cputestdata/{x86-cpuid-Core-i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-guest.xml => x86_64-cpuid-Core2-E6850-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-host.xml => x86_64-cpuid-Core2-E6850-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-json.xml => x86_64-cpuid-Core2-E6850-json.xml} (75%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850.json rename tests/cputestdata/{x86-cpuid-Core2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500-guest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150-guest.xml => x86_64-cpuid-FX-8150-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150-host.xml => x86_64-cpuid-FX-8150-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352-guest.xml => x86_64-cpuid-Opteron-1352-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352-host.xml => x86_64-cpuid-Opteron-1352-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352.xml => x86_64-cpuid-Opteron-1352.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-guest.xml => x86_64-cpuid-Opteron-2350-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-host.xml => x86_64-cpuid-Opteron-2350-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-json.xml => x86_64-cpuid-Opteron-2350-json.xml} (97%) create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350.json rename tests/cputestdata/{x86-cpuid-Opteron-2350.xml => x86_64-cpuid-Opteron-2350.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-guest.xml => x86_64-cpuid-Opteron-6234-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-host.xml => x86_64-cpuid-Opteron-6234-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-json.xml => x86_64-cpuid-Opteron-6234-json.xml} (96%) create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234.json rename tests/cputestdata/{x86-cpuid-Opteron-6234.xml => x86_64-cpuid-Opteron-6234.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282-guest.xml => x86_64-cpuid-Opteron-6282-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282-host.xml => x86_64-cpuid-Opteron-6282-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282.xml => x86_64-cpuid-Opteron-6282.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100-guest.xml => x86_64-cpuid-Pentium-P6100-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100-host.xml => x86_64-cpuid-Pentium-P6100-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-host.xml => x86_64-cpuid-Phenom-B95-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-json.xml => x86_64-cpuid-Phenom-B95-json.xml} (97%) create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95.json rename tests/cputestdata/{x86-cpuid-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110-host.xml => x86_64-cpuid-Xeon-5110-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-guest.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-guest.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} (95%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-guest.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-guest.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520.json rename tests/cputestdata/{x86-cpuid-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460-guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} (100%) rename tests/cputestdata/{x86-exact-disable-extra.xml => x86_64-exact-disable-extra.xml} (100%) rename tests/cputestdata/{x86-exact-disable.xml => x86_64-exact-disable.xml} (100%) rename tests/cputestdata/{x86-exact-disable2.xml => x86_64-exact-disable2.xml} (100%) rename tests/cputestdata/{x86-exact-forbid-extra.xml => x86_64-exact-forbid-extra.xml} (100%) rename tests/cputestdata/{x86-exact-forbid.xml => x86_64-exact-forbid.xml} (100%) rename tests/cputestdata/{x86-exact-force-Haswell.xml => x86_64-exact-force-Haswell.xml} (100%) rename tests/cputestdata/{x86-exact-force.xml => x86_64-exact-force.xml} (100%) rename tests/cputestdata/{x86-exact-require-extra.xml => x86_64-exact-require-extra.xml} (100%) rename tests/cputestdata/{x86-exact-require.xml => x86_64-exact-require.xml} (100%) rename tests/cputestdata/{x86-exact.xml => x86_64-exact.xml} (100%) rename tests/cputestdata/{x86-guest-nofallback.xml => x86_64-guest-nofallback.xml} (100%) rename tests/cputestdata/{x86-guest.xml => x86_64-guest.xml} (100%) rename tests/cputestdata/{x86-host+guest,model486-result.xml => x86_64-host+guest,model486-result.xml} (100%) rename tests/cputestdata/{x86-host+guest,models-result.xml => x86_64-host+guest,models-result.xml} (100%) rename tests/cputestdata/{x86-host+guest-result.xml => x86_64-host+guest-result.xml} (100%) rename tests/cputestdata/{x86-host+guest.xml => x86_64-host+guest.xml} (100%) rename tests/cputestdata/{x86-host+host+host-model,models-result.xml => x86_64-host+host+host-model,models-result.xml} (100%) rename tests/cputestdata/{x86-host+host-model-nofallback.xml => x86_64-host+host-model-nofallback.xml} (100%) rename tests/cputestdata/{x86-host+host-model.xml => x86_64-host+host-model.xml} (100%) rename tests/cputestdata/{x86-host+host-passthrough-features.xml => x86_64-host+host-passthrough-features.xml} (100%) rename tests/cputestdata/{x86-host+host-passthrough.xml => x86_64-host+host-passthrough.xml} (100%) rename tests/cputestdata/{x86-host+min.xml => x86_64-host+min.xml} (100%) rename tests/cputestdata/{x86-host+penryn-force-result.xml => x86_64-host+penryn-force-result.xml} (100%) rename tests/cputestdata/{x86-host+pentium3.xml => x86_64-host+pentium3.xml} (100%) rename tests/cputestdata/{x86-host+strict-force-extra-result.xml => x86_64-host+strict-force-extra-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} (100%) rename tests/cputestdata/{x86-host-SandyBridge.xml => x86_64-host-SandyBridge.xml} (100%) rename tests/cputestdata/{x86-host-amd-fake.xml => x86_64-host-amd-fake.xml} (100%) rename tests/cputestdata/{x86-host-amd.xml => x86_64-host-amd.xml} (100%) rename tests/cputestdata/{x86-host-better+pentium3-result.xml => x86_64-host-better+pentium3-result.xml} (100%) rename tests/cputestdata/{x86-host-better.xml => x86_64-host-better.xml} (100%) rename tests/cputestdata/{x86-host-incomp-arch.xml => x86_64-host-incomp-arch.xml} (100%) rename tests/cputestdata/{x86-host-invtsc+host-model.xml => x86_64-host-invtsc+host-model.xml} (100%) rename tests/cputestdata/{x86-host-invtsc.xml => x86_64-host-invtsc.xml} (100%) rename tests/cputestdata/{x86-host-model-nofallback.xml => x86_64-host-model-nofallback.xml} (100%) rename tests/cputestdata/{x86-host-model.xml => x86_64-host-model.xml} (100%) rename tests/cputestdata/{x86-host-no-vendor.xml => x86_64-host-no-vendor.xml} (100%) rename tests/cputestdata/{x86-host-passthrough-features.xml => x86_64-host-passthrough-features.xml} (100%) rename tests/cputestdata/{x86-host-passthrough.xml => x86_64-host-passthrough.xml} (100%) rename tests/cputestdata/{x86-host-worse+guest-result.xml => x86_64-host-worse+guest-result.xml} (100%) rename tests/cputestdata/{x86-host-worse.xml => x86_64-host-worse.xml} (100%) rename tests/cputestdata/{x86-host.xml => x86_64-host.xml} (100%) rename tests/cputestdata/{x86-min.xml => x86_64-min.xml} (100%) rename tests/cputestdata/{x86-penryn-force.xml => x86_64-penryn-force.xml} (100%) rename tests/cputestdata/{x86-pentium3-amd.xml => x86_64-pentium3-amd.xml} (100%) rename tests/cputestdata/{x86-pentium3.xml => x86_64-pentium3.xml} (100%) rename tests/cputestdata/{x86-strict-disable.xml => x86_64-strict-disable.xml} (100%) rename tests/cputestdata/{x86-strict-force-extra.xml => x86_64-strict-force-extra.xml} (100%) rename tests/cputestdata/{x86-strict-full.xml => x86_64-strict-full.xml} (100%) rename tests/cputestdata/{x86-strict.xml => x86_64-strict.xml} (100%) create mode 100644 tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml create mode 100644 tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml -- 2.11.1

3 54

[libvirt] [PATCH] Fix location of blkid.h in include header
by Nehal J Wani 03 Mar '17

03 Mar '17

The build system for libvirt correctly detects the location of blkid using PKG_CONFIG_PATH environment variable. The file blkid.pc states that the include flags should be: 'Cflags: -I${includedir}/blkid' but libvirt searches for blkid.h inside ${includedir}/blkid/blkid, which is wrong. Until now, the compilation for libvirt succeeded because of pure luck, as it had -I/usr/include as a CFLAG. This issue was faced while compiling libvirt on Ubuntu 16.04.2 with bare minimum dev packages and a custom compiled blkid kept in a non-standard $prefix. Signed-off-by: Nehal J Wani <nehaljw.kkd1(a)gmail.com> --- src/lxc/lxc_container.c | 2 +- src/storage/storage_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 99bd7e9..e306b6e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -49,7 +49,7 @@ #endif #if WITH_BLKID -# include <blkid/blkid.h> +# include <blkid.h> #endif #if WITH_SELINUX diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a665bac..41253b9 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -39,7 +39,7 @@ #endif #if WITH_BLKID -# include <blkid/blkid.h> +# include <blkid.h> #endif #if WITH_SELINUX -- 2.7.4

2 1

[libvirt] [PATCH v2 0/6] Split out node device object into its own module
by John Ferlan 03 Mar '17

03 Mar '17

v1: http://www.redhat.com/archives/libvir-list/2017-March/msg00046.html Differences... patch 1 and 3 are the same and both were ACK'd patch 2 removes the lower case function name changes (a/k/a "vir" removal) patch 4 is new adding modifications as requested by Pavel from patch 1 comment patch 5 & 6 are new based on a type A reaction to seeing a deeply nested structure and picking it apart to allow for more direct access to the data fields via pointers which patch6 dutify does for virNodeDevCapDataPtr John Ferlan (6): conf: Introduce virnodedeviceobj conf: Adjust coding style for nodedev conf sources conf: Use consistent function name prefixes for virnodedeviceobj conf: Alter coding style of nodedev function prototypes conf: Clean up the _virNodeDevCapData nodedev: Reduce virNodeDevCapDataPtr usage po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/node_device_conf.c | 757 ++++++------------------------ src/conf/node_device_conf.h | 316 ++++++------- src/conf/virnodedeviceobj.c | 558 ++++++++++++++++++++++ src/conf/virnodedeviceobj.h | 92 ++++ src/libvirt_private.syms | 23 +- src/node_device/node_device_driver.c | 30 +- src/node_device/node_device_driver.h | 2 +- src/node_device/node_device_hal.c | 14 +- src/node_device/node_device_linux_sysfs.c | 134 +++--- src/node_device/node_device_linux_sysfs.h | 4 +- src/node_device/node_device_udev.c | 198 ++++---- src/test/test_driver.c | 29 +- 14 files changed, 1164 insertions(+), 997 deletions(-) create mode 100644 src/conf/virnodedeviceobj.c create mode 100644 src/conf/virnodedeviceobj.h -- 2.9.3

3 10

[libvirt] [PATCH RFC 0/4] libxl: qemu agent support
by Joao Martins 03 Mar '17

03 Mar '17

Hey! Back when channels were introduced in libxl (in answer to Michal[0]) I suggested the idea of integrating qemu guest agent (which currently lives qemu driver). This series is an attempt at pulling qemu agent from qemu driver into util in using it in libxl in subsequent patches. What do folks think of the idea? Note that this is still all very RFC because 1) there's a lot of code we could potentially share between qemu and libxl with respect to finding guest agent config and keeping some of its state (see patch 3); 2) also we need to ignore "execute" messages to be able to query the agent and see it's returned data (patch 2). Which despite the commit not being incorrect I am not sure yet why we need it yet. As PoC I only implemented domainQemuAgentCommand/domainInterfaceAddresses, but there's a lot more driver APIs we can potentially introduce after this. Tracing all driver APIs that might require a guest agent: * domainFSThaw, domainFSFreeze, domainFSTrim, domainGetFSInfo * domainSetUserPassword * domainGetTime, domainSetTime * domainShutdown (with VIR_DOMAIN_SHUTDOWN_GUEST_AGENT) * domainReboot (with VIR_DOMAIN_REBOOT_GUEST_AGENT) * domainGetGuestVcpus * domainSetGuestVcpus * domainSetVcpusFlags (with VIR_DOMAIN_VCPU_GUEST) * domainGetVcpusFlags (with VIR_DOMAIN_VCPU_GUEST) Comments/Feedback is appreciated :) Cheers, Joao [0] https://www.spinics.net/linux/fedora/libvir/msg136685.html Joao Martins (4): qemu_agent: move agent into util qemu_agent: ignore requests echoed back by guest libxl: implement qemu-agent-command libxl: domainInterfaceAddresses agent support po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/libvirt_private.syms | 21 + src/libxl/libxl_domain.c | 239 ++++- src/libxl/libxl_domain.h | 16 + src/libxl/libxl_driver.c | 69 ++ src/qemu/qemu_agent.c | 2248 ----------------------------------------- src/qemu/qemu_agent.h | 123 --- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/util/virqemuagent.c | 2249 ++++++++++++++++++++++++++++++++++++++++++ src/util/virqemuagent.h | 123 +++ tests/qemuagenttest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemumonitortestutils.h | 2 +- 15 files changed, 2723 insertions(+), 2379 deletions(-) delete mode 100644 src/qemu/qemu_agent.c delete mode 100644 src/qemu/qemu_agent.h create mode 100644 src/util/virqemuagent.c create mode 100644 src/util/virqemuagent.h -- 2.1.4

3 17

[libvirt] [PATCH] news: Add an empty <change> to each <section>
by Andrea Bolognani 03 Mar '17

03 Mar '17

The generated HTML will contain <ul></ul> otherwise, which triggers an error during 'make check'. The proper fix would be not to generate the problematic HTML in the first place but, while I'm working on it, this workaround will do. --- Pushed as build-breaker. Sorry for the noise. docs/news.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index bb67619..675faa7 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -12,10 +12,13 @@ <libvirt> <release version="v3.2.0" date="unreleased"> <section title="New features"> + <change/> </section> <section title="Improvements"> + <change/> </section> <section title="Bug fixes"> + <change/> </section> </release> <release version="v3.1.0" date="2017-03-03"> -- 2.7.4

1 0

[libvirt] [PATCH] Post-release version bump to 3.2.0
by Andrea Bolognani 03 Mar '17

03 Mar '17

--- Pushed as trivial. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ed49daa..e61ab7b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [3.1.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [3.2.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 3cb93c3..bb67619 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -10,6 +10,14 @@ and optionally a description where it's explained in more detail --> <libvirt> + <release version="v3.2.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v3.1.0" date="2017-03-03"> <section title="New features"> <change> -- 2.7.4

1 0

[libvirt] Availability of libvirt-3.1.0
by Daniel Veillard 03 Mar '17

03 Mar '17

I'm a bit late but I finally pushed the release, the signed tarball and rpms are at the usual place: ftp://libvirt.org/libvirt/ I also pushed a libvirt-python release that one can find at ftp://libvirt.org/libvirt/python/ * New features - storage: Add Virtuozzo storage backend storage pool Add new storage backend to support pool and volume management within the Virtuozzo Storage environment. Virtuozzo Storage is a highly available distributed software defined storage with built-in replication and disaster recovery. - qemu: Add support for memory backing with file source Add support in numa topology for file source inside memory backing (hugepages are not needed) Three new elements <source/>,<access/> and <allocation/> were added to <memoryBacking/> element. Also new configuration parameter memory_backing_dir was added to qemu.conf. - network: make openvswitch call timeout configurable Adding the ability to specify the timeout value in seconds for openvswitch calls in the libvirtd configuration file. - bhyve: add e1000 NIC support Add support for e1000 NIC. Previously, the only available option was virtio-net. - libxl: add tunneled migration support Add tunneled migration to libxl driver, which is always capable of strong encryption and doesn't require any extra network connection other than what's required for remote access of libvirtd. - qemu: add rendernode argument Add a new attribute 'rendernode' to <gl> spice element. - nodedev: add drm capability Add a new 'drm' capability for Direct Rendering Manager (DRM) devices, providing device type information. - Add API for individual/specific vCPU hotplug The new API allows selecting specific vCPUs to be added/removed from the VM. The existing APIs allowed only adding/removing from the end which did not play well with NUMA. * Improvements - virsh: pool-list: allow both --uuid and --name in one command Adjust the virsh-pool command to support the --uuid and/or --name options in order to print just the --name and/or --uuid of pools. - Introduce MTU to domain <interface/> and <network> Allow setting MTU size for some types of domain interface and network. - libxl: improve support for <timer> configurations Add support for multiple timers. Extend the tsc timer to support the emulate mode. Improve conversion of timer XML to/from xl.cfg. - storage: modularize the storage driver Split up the storage driver backends into loadable modules so that binary distributions don't have to compromise on shipping the storage driver with all backends which may pull in too many dependencies. * Bug fixes - nodedev: Fabric name must not be required for fc_host capability fabric_name is one of many fc_host attributes in Linux that is optional and left to the low-level driver to decide if it is implemented. For example the zfcp device driver does not provide a fabric name for an fcp host. The requirement for the existence of a fabric name has been removed by making it optional. - bhyve: change address allocation schema for SATA disks Previously, the bhyve driver assigned PCI addresses to SATA disks directly rather than assigning that to a controller and using SATA addresses for disks. It was implemented this way because bhyve has no notion of an explicit SATA controller. However, as this doesn't match libvirt's understanding of disk addresses, the bhyve driver was changed to follow the common schema and have PCI addresses for SATA controllers and SATA addresses for disks. If you're having issues because of this, it's recommended to edit the domain's XML and remove <address type='pci'> from the <disk> elements with <target bus='sata'/> and let libvirt regenerate it properly. - libxl: maximum memory fixes Fix reporting of domain maximum memory. Fix setting dom0 maximum memory. - libxl: fix disk detach when <driver> not specified - libxl: fix dom0 autoballooning with Xen 4.8 - qemu: Allow empty script path to <interface/> Historically, this was always allowed. Unfortunately, due to some rework done for 1.3.2 release a bug was dragged in which suddenly stop allowing domain with such configuration to start. Thanks everybody for your contributions for this release, be it with code, bug reports, ideas, etc.... Enjoy the release ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [RFC v2 0/2] vireventpoll implimentation using epoll
by Derbyshev Dmitriy 03 Mar '17

03 Mar '17

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> Provides about 20% boost on local machine with 35 vms. virEventPollDispatchHandles can also be split to pass cb via epoll data field. Should start sending as PATCH instead? Changes since v1: * ifdef supstituded by 2 .c files with vireventpollinternal.h implementations * PROBE purged Derbyshev Dmitry (2): vireventpoll: isolate common code vireventpoll implimentation using epoll configure.ac | 28 + src/Makefile.am | 12 +- src/util/vireventepoll.c | 201 +++++++ src/util/vireventpoll.c | 700 ++-------------------- src/util/{vireventpoll.c => vireventpollcommon.c} | 231 ++----- src/util/vireventpollinternal.h | 91 +++ tests/commanddata/{test14.log => test3epoll.log} | 2 + tests/commandtest.c | 4 + 8 files changed, 451 insertions(+), 818 deletions(-) create mode 100644 src/util/vireventepoll.c copy src/util/{vireventpoll.c => vireventpollcommon.c} (78%) create mode 100644 src/util/vireventpollinternal.h copy tests/commanddata/{test14.log => test3epoll.log} (94%) -- 1.9.5.msysgit.0

3 4

[libvirt] [PATCH 0/2] qemu: Tiny cleanups
by Andrea Bolognani 02 Mar '17

02 Mar '17

Andrea Bolognani (2): qemu: Don't omit parentheses qemu: Use ARCH_IS_X86() more src/qemu/qemu_capabilities.c | 17 ++++++----------- src/qemu/qemu_parse_command.c | 6 ++---- 2 files changed, 8 insertions(+), 15 deletions(-) -- 2.7.4

2 4

[libvirt] [PATCH 0/2] Test suite fixes and small cleanups
by Andrea Bolognani 02 Mar '17

02 Mar '17

Andrea Bolognani (2): qemu: Drop QEMU_CAPS_PCI_MULTIBUS tests: Fix aliases for pSeries buses src/qemu/qemu_capabilities.c | 36 ++++++++-------------- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_capspriv.h | 4 +++ tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-ppc64-usb-controller-legacy.args | 2 +- .../qemuxml2argv-ppc64-usb-controller.args | 4 +-- .../qemuxml2argv-ppce500-serial.args | 2 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 4 +-- tests/qemuxml2argvtest.c | 8 +++-- 25 files changed, 32 insertions(+), 51 deletions(-) -- 2.7.4

2 3

[libvirt] [PATCH] Add aarch64 to virArch
by Matwey V. Kornilov 02 Mar '17

02 Mar '17

Hello, This patch is for allowing 32-bit ARMs for aarch64 hosts. Exact 32-bit personality for aarch64 is aarch32, but there is no such arch in libvirt, so we use arvm7l instead. Matwey V. Kornilov (1): Add aarch64 to virArch src/lxc/lxc_container.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.1.4

2 2

[libvirt] [PATCH 0/3] Split out node device object into its own module
by John Ferlan 02 Mar '17

02 Mar '17

Feedback from the initial pass at RFC for making a common pool object was that it got really confusing trying to manage the multitude of changes. See patch 3 of the series: http://www.redhat.com/archives/libvir-list/2017-February/msg00519.html So while I figure out what it'll take to make a better object framework, I figure I could start splitting out things a bit to make future work a bit easier to understand. Also rather than trying to do them all in one massive series, I can do shorter series contained to each of the driver conf's. Besides let's figure out whether all the thoughts and ideas are good. I would think moving to virnodedeviceobj wouldn't be an issue (other than needing to deal with backports). However, I'm sure there could be some "alternate opinions" over whether to make static functions not start with vir[DriverSubsystem] and rather go with driverSubsystem. Changing the API's to use the Obj is mainly a consistency thing. Let's see what falls out of this before I start queuing up other ones as it's a lot of rote work! John Ferlan (3): conf: Introduce virnodedeviceobj conf: Clean up nodedev code conf: Use consistent function name prefixes for virnodedeviceobj po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/node_device_conf.c | 981 +++++++++-------------------------- src/conf/node_device_conf.h | 50 -- src/conf/virnodedeviceobj.c | 558 ++++++++++++++++++++ src/conf/virnodedeviceobj.h | 78 +++ src/libvirt_private.syms | 23 +- src/node_device/node_device_driver.c | 24 +- src/node_device/node_device_driver.h | 2 +- src/node_device/node_device_hal.c | 10 +- src/node_device/node_device_udev.c | 12 +- src/test/test_driver.c | 29 +- 12 files changed, 940 insertions(+), 831 deletions(-) create mode 100644 src/conf/virnodedeviceobj.c create mode 100644 src/conf/virnodedeviceobj.h -- 2.9.3

5 19

[libvirt] [PATCH] util: switch over to use keycodemapdb GIT submodule
by Daniel P. Berrange 02 Mar '17

02 Mar '17

A long time ago we imported the keymaps.csv file from GTK-VNC so we can do conversions between keycode sets. Meanwhile lots of bug fixes have gone into this CSV file and libvirt hasn't kept in sync. The keymaps.csv file and associated generator script has been pulled out of GTK-VNC into a dedicated GIT repo for use as a submodule. This allows GTK-VNC, SPICE-GTK, QEMU and libvirt to share the same master database and tools and pushing updates merely requires a submodule commit update as with gnulib. The test suite is updated to cover some extra boundary conditions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 3 +- .gitmodules | 3 + src/Makefile.am | 41 ++-- src/keycodemapdb | 1 + src/util/keymaps.csv | 464 ------------------------------------------ src/util/virkeycode-mapgen.py | 97 --------- src/util/virkeycode.c | 94 ++++----- tests/virkeycodetest.c | 5 + 8 files changed, 85 insertions(+), 623 deletions(-) create mode 160000 src/keycodemapdb delete mode 100644 src/util/keymaps.csv delete mode 100755 src/util/virkeycode-mapgen.py diff --git a/.gitignore b/.gitignore index 7b71bd1..6892885 100644 --- a/.gitignore +++ b/.gitignore @@ -159,7 +159,8 @@ /src/test_libvirt*.aug /src/test_virtlockd.aug /src/test_virtlogd.aug -/src/util/virkeymaps.h +/src/util/virkeycodetable*.h +/src/util/virkeynametable*.h /src/virt-aa-helper /src/virtlockd /src/virtlogd diff --git a/.gitmodules b/.gitmodules index 7acb1ea..cae8f18 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "gnulib"] path = .gnulib url = git://git.sv.gnu.org/gnulib.git +[submodule "src/keycodemapdb"] + path = src/keycodemapdb + url = https://gitlab.com/keycodemap/keycodemapdb.git diff --git a/src/Makefile.am b/src/Makefile.am index a85cd0d..88a0622 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) -EXTRA_DIST = $(conf_DATA) util/keymaps.csv +EXTRA_DIST = $(conf_DATA) BUILT_SOURCES = CLEANFILES = @@ -132,7 +132,6 @@ UTIL_SOURCES = \ util/virjson.c util/virjson.h \ util/virkeycode.c util/virkeycode.h \ util/virkeyfile.c util/virkeyfile.h \ - util/virkeymaps.h \ util/virlease.c util/virlease.h \ util/virlockspace.c util/virlockspace.h \ util/virlog.c util/virlog.h \ @@ -190,16 +189,34 @@ UTIL_SOURCES = \ util/virxml.c util/virxml.h \ $(NULL) -EXTRA_DIST += $(srcdir)/util/keymaps.csv $(srcdir)/util/virkeycode-mapgen.py - -BUILT_SOURCES += util/virkeymaps.h -MAINTAINERCLEANFILES += util/virkeymaps.h - -util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ - $(srcdir)/util/virkeycode-mapgen.py - $(MKDIR_P) util/ - $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h +EXTRA_DIST += $(srcdir)/keycodemapdb/data/keymaps.csv $(srcdir)/keycodemapdb/tools/keymap-gen + +util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycodetable_,,' -e 's,\.h,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang stdc --varname virKeyCodeTable_$$NAME code-table \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ + $@-tmp && mv $@-tmp $@ || rm $@-tmp + +util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeynametable_,,' -e 's,\.h,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang stdc --varname virKeyNameTable_$$NAME name-table \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ + $@-tmp && mv $@-tmp $@ || rm $@-tmp + +KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb +KEYNAMES = linux osx win32 + +KEYTABLES = $(KEYCODES:%=util/virkeycodetable_%.h) $(KEYNAMES:%=util/virkeynametable_%.h) + +UTIL_SOURCES += $(KEYTABLES) +BUILT_SOURCES += $(KEYTABLES) +MAINTAINERCLEANFILES += $(KEYTABLES) # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c diff --git a/src/keycodemapdb b/src/keycodemapdb new file mode 160000 index 0000000..b2976e7 --- /dev/null +++ b/src/keycodemapdb @@ -0,0 +1 @@ +Subproject commit b2976e7ed714400a3967ebb430bda45d1c253c20 diff --git a/src/util/keymaps.csv b/src/util/keymaps.csv deleted file mode 100644 index 98c723b..0000000 --- a/src/util/keymaps.csv +++ /dev/null @@ -1,464 +0,0 @@ -"Linux Name","Linux Keycode","OS-X Name","OS-X Keycode","AT set1 keycode","AT set2 keycode","AT set3 keycode",XT,"XT KBD","USB Keycodes","Win32 Name","Win32 Keycode","Xwin XT","Xfree86 KBD XT" -KEY_RESERVED,0,,,,,,,,,,,, -KEY_ESC,1,Escape,0x35,1,118,8,1,1,41,VK_ESCAPE,0x1b,1,1 -KEY_1,2,ANSI_1,0x12,2,22,22,2,2,30,VK_1,0x31,2,2 -KEY_2,3,ANSI_2,0x13,3,30,30,3,3,31,VK_2,0x32,3,3 -KEY_3,4,ANSI_3,0x14,4,38,38,4,4,32,VK_3,0x33,4,4 -KEY_4,5,ANSI_4,0x15,5,37,37,5,5,33,VK_4,0x34,5,5 -KEY_5,6,ANSI_5,0x17,6,46,46,6,6,34,VK_5,0x35,6,6 -KEY_6,7,ANSI_6,0x16,7,54,54,7,7,35,VK_6,0x36,7,7 -KEY_7,8,ANSI_7,0x1a,8,61,61,8,8,36,VK_7,0x37,8,8 -KEY_8,9,ANSI_8,0x1c,9,62,62,9,9,37,VK_8,0x38,9,9 -KEY_9,10,ANSI_9,0x19,10,70,70,10,10,38,VK_9,0x39,10,10 -KEY_0,11,ANSI_0,0x1d,11,69,69,11,11,39,VK_0,0x30,11,11 -KEY_MINUS,12,ANSI_Minus,0x1b,12,78,78,12,12,45,VK_OEM_MINUS,0xbd,12,12 -KEY_EQUAL,13,ANSI_Equal,0x18,13,85,85,13,13,46,VK_OEM_PLUS,0xbb,13,13 -KEY_BACKSPACE,14,Delete,0x33,14,102,102,14,14,42,VK_BACK,0x08,14,14 -KEY_TAB,15,Tab,0x30,15,13,13,15,15,43,VK_TAB,0x09,15,15 -KEY_Q,16,ANSI_Q,0xc,16,21,21,16,16,20,VK_Q,0x51,16,16 -KEY_W,17,ANSI_W,0xd,17,29,29,17,17,26,VK_W,0x57,17,17 -KEY_E,18,ANSI_E,0xe,18,36,36,18,18,8,VK_E,0x45,18,18 -KEY_R,19,ANSI_R,0xf,19,45,45,19,19,21,VK_R,0x52,19,19 -KEY_T,20,ANSI_T,0x11,20,44,44,20,20,23,VK_T,0x54,20,20 -KEY_Y,21,ANSI_Y,0x10,21,53,53,21,21,28,VK_Y,0x59,21,21 -KEY_U,22,ANSI_U,0x20,22,60,60,22,22,24,VK_U,0x55,22,22 -KEY_I,23,ANSI_I,0x22,23,67,67,23,23,12,VK_I,0x49,23,23 -KEY_O,24,ANSI_O,0x1f,24,68,68,24,24,18,VK_O,0x4f,24,24 -KEY_P,25,ANSI_P,0x23,25,77,77,25,25,19,VK_P,0x50,25,25 -KEY_LEFTBRACE,26,ANSI_LeftBracket,0x21,26,84,84,26,26,47,VK_OEM_4,0xdb,26,26 -KEY_RIGHTBRACE,27,ANSI_RightBracket,0x1e,27,91,91,27,27,48,VK_OEM_6,0xdd,27,27 -KEY_ENTER,28,Return,0x24,28,90,90,28,28,40,VK_RETURN,0x0d,28,28 -KEY_LEFTCTRL,29,Control,0x3b,29,20,17,29,29,224,VK_LCONTROL,0xa2,29,29 -KEY_LEFTCTRL,29,Control,0x3b,29,20,17,29,29,224,VK_CONTROL,0x11,29,29 -KEY_A,30,ANSI_A,0x0,30,28,28,30,30,4,VK_A,0x41,30,30 -KEY_S,31,ANSI_S,0x1,31,27,27,31,31,22,VK_S,0x53,31,31 -KEY_D,32,ANSI_D,0x2,32,35,35,32,32,7,VK_D,0x44,32,32 -KEY_F,33,ANSI_F,0x3,33,43,43,33,33,9,VK_F,0x46,33,33 -KEY_G,34,ANSI_G,0x5,34,52,52,34,34,10,VK_G,0x47,34,34 -KEY_H,35,ANSI_H,0x4,35,51,51,35,35,11,VK_H,0x48,35,35 -KEY_J,36,ANSI_J,0x26,36,59,59,36,36,13,VK_J,0x4a,36,36 -KEY_K,37,ANSI_K,0x28,37,66,66,37,37,14,VK_K,0x4b,37,37 -KEY_L,38,ANSI_L,0x25,38,75,75,38,38,15,VK_L,0x4c,38,38 -KEY_SEMICOLON,39,ANSI_Semicolon,0x29,39,76,76,39,39,51,VK_OEM_1,0xba,39,39 -KEY_APOSTROPHE,40,ANSI_Quote,0x27,40,82,82,40,40,52,VK_OEM_2,0xbf,40,40 -KEY_GRAVE,41,ANSI_Grave,0x32,41,14,14,41,41,53,VK_OEM_3,0xc0,41,41 -KEY_SHIFT,42,Shift,0x38,42,18,18,42,42,225,VK_SHIFT,0x10,42,42 -KEY_LEFTSHIFT,42,Shift,0x38,42,18,18,42,42,225,VK_LSHIFT,0xa0,42,42 -KEY_BACKSLASH,43,ANSI_Backslash,0x2a,43,93,93,43,43,50,VK_OEM_5,0xdc,43,43 -KEY_Z,44,ANSI_Z,0x6,44,26,26,44,44,29,VK_Z,0x5a,44,44 -KEY_X,45,ANSI_X,0x7,45,34,34,45,45,27,VK_X,0x58,45,45 -KEY_C,46,ANSI_C,0x8,46,33,33,46,46,6,VK_C,0x43,46,46 -KEY_V,47,ANSI_V,0x9,47,42,42,47,47,25,VK_V,0x56,47,47 -KEY_B,48,ANSI_B,0xb,48,50,50,48,48,5,VK_B,0x42,48,48 -KEY_N,49,ANSI_N,0x2d,49,49,49,49,49,17,VK_N,0x4e,49,49 -KEY_M,50,ANSI_M,0x2e,50,58,58,50,50,16,VK_M,0x4d,50,50 -KEY_COMMA,51,ANSI_Comma,0x2b,51,65,65,51,51,54,VK_OEM_COMMA,0xbc,51,51 -KEY_DOT,52,ANSI_Period,0x2f,52,73,73,52,52,55,VK_OEM_PERIOD,0xbe,52,52 -KEY_SLASH,53,ANSI_Slash,0x2c,53,74,74,53,53,56,VK_OEM_2,0xbf,53,53 -KEY_RIGHTSHIFT,54,RightShift,0x3c,54,89,89,54,54,229,VK_RSHIFT,0xa1,54,54 -KEY_KPASTERISK,55,ANSI_KeypadMultiply,0x43,55,124,126,55,55,85,VK_MULTIPLY,0x6a,55,55 -KEY_LEFTALT,56,Option,0x3a,56,17,25,56,56,226,VK_LMENU,0xa4,56,56 -KEY_LEFTALT,56,Option,0x3a,56,17,25,56,56,226,VK_MENU,0x12,56,56 -KEY_SPACE,57,Space,0x31,57,41,41,57,57,44,VK_SPACE,0x20,57,57 -KEY_CAPSLOCK,58,CapsLock,0x39,58,88,20,58,58,57,VK_CAPITAL,0x14,58,58 -KEY_F1,59,F1,0x7a,59,5,7,59,59,58,VK_F1,0x70,59,59 -KEY_F2,60,F2,0x78,60,6,15,60,60,59,VK_F2,0x71,60,60 -KEY_F3,61,F3,0x63,61,4,23,61,61,60,VK_F3,0x72,61,61 -KEY_F4,62,F4,0x76,62,12,31,62,62,61,VK_F4,0x73,62,62 -KEY_F5,63,F5,0x60,63,3,39,63,63,62,VK_F5,0x74,63,63 -KEY_F6,64,F6,0x61,64,11,47,64,64,63,VK_F6,0x75,64,64 -KEY_F7,65,F7,0x62,65,259,55,65,65,64,VK_F7,0x76,65,65 -KEY_F8,66,F8,0x64,66,10,63,66,66,65,VK_F8,0x77,66,66 -KEY_F9,67,F9,0x65,67,1,71,67,67,66,VK_F9,0x78,67,67 -KEY_F10,68,F10,0x6d,68,9,79,68,68,67,VK_F10,0x79,68,68 -KEY_NUMLOCK,69,,,69,119,118,69,69,83,VK_NUMLOCK,0x90,69,69 -KEY_SCROLLLOCK,70,,,70,126,95,70,70,71,VK_SCROLL,0x91,70,70 -KEY_KP7,71,ANSI_Keypad7,0x59,71,108,108,71,71,95,VK_NUMPAD7,0x67,71,71 -KEY_KP8,72,ANSI_Keypad8,0x5b,72,117,117,72,72,96,VK_NUMPAD8,0x68,72,72 -KEY_KP9,73,ANSI_Keypad9,0x5c,73,125,125,73,73,97,VK_NUMPAD9,0x69,73,73 -KEY_KPMINUS,74,ANSI_KeypadMinus,0x4e,74,123,132,74,74,86,VK_SUBTRACT,0x6d,74,74 -KEY_KP4,75,ANSI_Keypad4,0x56,75,107,107,75,75,92,VK_NUMPAD4,0x64,75,75 -KEY_KP5,76,ANSI_Keypad5,0x57,76,115,115,76,76,93,VK_NUMPAD5,0x65,76,76 -KEY_KP6,77,ANSI_Keypad6,0x58,77,116,116,77,77,94,VK_NUMPAD6,0x66,77,77 -KEY_KPPLUS,78,ANSI_KeypadPlus,0x45,78,121,124,78,78,87,VK_ADD,0x6b,78,78 -KEY_KP1,79,ANSI_Keypad1,0x53,79,105,105,79,79,89,VK_NUMPAD1,0x61,79,79 -KEY_KP2,80,ANSI_Keypad2,0x54,80,114,114,80,80,90,VK_NUMPAD2,0x62,80,80 -KEY_KP3,81,ANSI_Keypad3,0x55,81,122,122,81,81,91,VK_NUMPAD3,0x63,81,81 -KEY_KP0,82,ANSI_Keypad0,0x52,82,112,112,82,82,98,VK_NUMPAD0,0x60,82,82 -KEY_KPDOT,83,ANSI_KeypadDecimal,0x41,83,113,113,83,83,99,VK_DECIMAL,0x6e,83,83 -,84,,,,,,,84,,,,, -KEY_ZENKAKUHANKAKU,85,,,118,95,,,118,148,,,, -KEY_102ND,86,,,86,97,19,,86,100,VK_OEM_102,0xe1,, -KEY_F11,87,F11,0x67,87,120,86,101,87,68,VK_F11,0x7a,, -KEY_F12,88,F12,0x6f,88,7,94,102,88,69,VK_F12,0x7b,, -KEY_RO,89,,,115,81,,,115,135,,,, -KEY_KATAKANA,90,JIS_Kana????,0x68,120,99,,,120,146,VK_KANA,0x15,, -KEY_HIRAGANA,91,,,119,98,,,119,147,,,, -KEY_HENKAN,92,,,121,100,134,,121,138,,,, -KEY_KATAKANAHIRAGANA,93,,,112,19,135,,112,136,,,0xc8,0xc8 -KEY_MUHENKAN,94,,,123,103,133,,123,139,,,, -KEY_KPJPCOMMA,95,JIS_KeypadComma,0x5f,92,39,,,92,140,,,, -KEY_KPENTER,96,ANSI_KeypadEnter,0x4c,,158,121,,284,88,,,0x64,0x64 -KEY_RIGHTCTRL,97,RightControl,0x3e,,,88,,285,228,VK_RCONTROL,0xa3,0x65,0x65 -KEY_KPSLASH,98,ANSI_KeypadDivide,0x4b,,181,119,,309,84,VK_DIVIDE,0x6f,0x68,0x68 -KEY_SYSRQ,99,,,84,260,87,,84,70,"VK_SNAPSHOT ???",0x2c,0x67,0x67 -KEY_RIGHTALT,100,RightOption,0x3d,,,57,,312,230,VK_RMENU,0xa5,0x69,0x69 -KEY_LINEFEED,101,,,,,,,91,,,,, -KEY_HOME,102,Home,0x73,,224,110,,327,74,VK_HOME,0x24,0x59,0x59 -KEY_UP,103,UpArrow,0x7e,,236,99,109,328,82,VK_UP,0x26,0x5a,0x5a -KEY_PAGEUP,104,PageUp,0x74,,201,111,,329,75,VK_PRIOR,0x21,0x5b,0x5b -KEY_LEFT,105,LeftArrow,0x7b,,203,97,111,331,80,VK_LEFT,0x25,0x5c,0x5c -KEY_RIGHT,106,RightArrow,0x7c,,205,106,112,333,79,VK_RIGHT,0x27,0x5e,0x5e -KEY_END,107,End,0x77,,225,101,,335,77,VK_END,0x23,0x5f,0x5f -KEY_DOWN,108,DownArrow,0x7d,,254,96,110,336,81,VK_DOWN,0x28,0x60,0x60 -KEY_PAGEDOWN,109,PageDown,0x79,,243,109,,337,78,VK_NEXT,0x22,0x61,0x61 -KEY_INSERT,110,,,,210,103,107,338,73,VK_INSERT,0x2d,0x62,0x62 -KEY_DELETE,111,ForwardDelete,0x75,,244,100,108,339,76,VK_DELETE,0x2e,0x63,0x63 -KEY_MACRO,112,,,,239,142,,367,,,,, -KEY_MUTE,113,Mute,0x4a,,251,156,,288,239,VK_VOLUME_MUTE,0xad,, -KEY_VOLUMEDOWN,114,VolumeDown,0x49,,,157,,302,238,VK_VOLUME_DOWN,0xae,, -KEY_VOLUMEUP,115,VolumeUp,0x48,,233,149,,304,237,VK_VOLUME_UP,0xaf,, -KEY_POWER,116,,,,,,,350,102,,,, -KEY_KPEQUAL,117,ANSI_KeypadEquals,0x51,89,15,,,89,103,,,0x76,0x76 -KEY_KPPLUSMINUS,118,,,,206,,,334,,,,, -KEY_PAUSE,119,,,,198,98,,326,72,VK_PAUSE,0x013,0x66,0x66 -KEY_SCALE,120,,,,,,,267,,,,, -KEY_KPCOMMA,121,ANSI_KeypadClear????,0x47,126,109,,,126,133,VK_SEPARATOR??,0x6c,, -KEY_HANGEUL,122,,,,,,,,144,VK_HANGEUL,0x15,, -KEY_HANJA,123,,,,,,,269,145,VK_HANJA,0x19,, -KEY_YEN,124,JIS_Yen,0x5d,125,106,,,125,137,,,0x7d,0x7d -KEY_LEFTMETA,125,Command,0x37,,,139,,347,227,VK_LWIN,0x5b,0x6b,0x6b -KEY_RIGHTMETA,126,,,,,140,,348,231,VK_RWIN,0x5c,0x6c,0x6c -KEY_COMPOSE,127,Function,0x3f,,,141,,349,101,VK_APPS,0x5d,0x6d,0x6d -KEY_STOP,128,,,,,10,,360,243,VK_BROWSER_STOP,0xa9,, -KEY_AGAIN,129,,,,,11,,261,121,,,, -KEY_PROPS,130,,,,,12,,262,118,,,, -KEY_UNDO,131,,,,,16,,263,122,,,, -KEY_FRONT,132,,,,,,,268,119,,,, -KEY_COPY,133,,,,,24,,376,124,,,, -KEY_OPEN,134,,,,,32,,100,116,,,, -KEY_PASTE,135,,,,,40,,101,125,,,, -KEY_FIND,136,,,,,48,,321,244,,,, -KEY_CUT,137,,,,,56,,316,123,,,, -KEY_HELP,138,,,,,9,,373,117,VK_HELP,0x2f,, -KEY_MENU,139,,,,,145,,286,,,,, -KEY_CALC,140,,,,174,163,,289,251,,,, -KEY_SETUP,141,,,,,,,102,,,,, -KEY_SLEEP,142,,,,,,,351,248,VK_SLEEP,0x5f,, -KEY_WAKEUP,143,,,,,,,355,,,,, -KEY_FILE,144,,,,,,,103,,,,, -KEY_SENDFILE,145,,,,,,,104,,,,, -KEY_DELETEFILE,146,,,,,,,105,,,,, -KEY_XFER,147,,,,,162,,275,,,,, -KEY_PROG1,148,,,,,160,,287,,,,, -KEY_PROG2,149,,,,,161,,279,,,,, -KEY_WWW,150,,,,,,,258,240,,,, -KEY_MSDOS,151,,,,,,,106,,,,, -KEY_SCREENLOCK,152,,,,,150,,274,249,,,, -KEY_DIRECTION,153,,,,,,,107,,,,, -KEY_CYCLEWINDOWS,154,,,,,155,,294,,,,, -KEY_MAIL,155,,,,,,,364,,,,, -KEY_BOOKMARKS,156,,,,,,,358,,,,, -KEY_COMPUTER,157,,,,,,,363,,,,, -KEY_BACK,158,,,,,,,362,241,VK_BROWSER_BACK,0xa6,, -KEY_FORWARD,159,,,,,,,361,242,VK_BROWSER_FORWARD,0xa7,, -KEY_CLOSECD,160,,,,,154,,291,,,,, -KEY_EJECTCD,161,,,,,,,108,236,,,, -KEY_EJECTCLOSECD,162,,,,,,,381,,,,, -KEY_NEXTSONG,163,,,,241,147,,281,235,VK_MEDIA_NEXT_TRACK,0xb0,, -KEY_PLAYPAUSE,164,,,,173,,,290,232,VK_MEDIA_PLAY_PAUSE,0xb3,, -KEY_PREVIOUSSONG,165,,,,250,148,,272,234,VK_MEDIA_PREV_TRACK,0xb1,, -KEY_STOPCD,166,,,,164,152,,292,233,VK_MEDIA_STOP,0xb2,, -KEY_RECORD,167,,,,,158,,305,,,,, -KEY_REWIND,168,,,,,159,,280,,,,, -KEY_PHONE,169,,,,,,,99,,,,, -KEY_ISO,170,ISO_Section,0xa,,,,,112,,,,, -KEY_CONFIG,171,,,,,,,257,,,,, -KEY_HOMEPAGE,172,,,,178,151,,306,,VK_BROWSER_HOME,0xac,, -KEY_REFRESH,173,,,,,,,359,250,VK_BROWSER_REFRESH,0xa8,, -KEY_EXIT,174,,,,,,,113,,,,, -KEY_MOVE,175,,,,,,,114,,,,, -KEY_EDIT,176,,,,,,,264,247,,,, -KEY_SCROLLUP,177,,,,,,,117,245,,,, -KEY_SCROLLDOWN,178,,,,,,,271,246,,,, -KEY_KPLEFTPAREN,179,,,,,,,374,182,,,, -KEY_KPRIGHTPAREN,180,,,,,,,379,183,,,, -KEY_NEW,181,,,,,,,265,,,,, -KEY_REDO,182,,,,,,,266,,,,, -KEY_F13,183,F13,0x69,93,47,127,,93,104,VK_F13,0x7c,0x6e,0x6e -KEY_F14,184,F14,0x6b,94,55,128,,94,105,VK_F14,0x7d,0x6f,0x6f -KEY_F15,185,F15,0x71,95,63,129,,95,106,VK_F15,0x7e,0x70,0x70 -KEY_F16,186,F16,0x6a,,,130,,85,107,VK_F16,0x7f,0x71,0x71 -KEY_F17,187,F17,0x40,,,131,,259,108,VK_F17,0x80,0x72,0x72 -KEY_F18,188,F18,0x4f,,,,,375,109,VK_F18,0x81,, -KEY_F19,189,F19,0x50,,,,,260,110,VK_F19,0x82,, -KEY_F20,190,F20,0x5a,,,,,90,111,VK_F20,0x83,, -KEY_F21,191,,,,,,,116,112,VK_F21,0x84,, -KEY_F22,192,,,,,,,377,113,VK_F22,0x85,, -KEY_F23,193,,,,,,,109,114,VK_F23,0x86,, -KEY_F24,194,,,,,,,111,115,VK_F24,0x87,, -,195,,,,,,,277,,,,, -,196,,,,,,,278,,,,, -,197,,,,,,,282,,,,, -,198,,,,,,,283,,,,, -,199,,,,,,,295,,,,, -KEY_PLAYCD,200,,,,,,,296,,,,, -KEY_PAUSECD,201,,,,,,,297,,,,, -KEY_PROG3,202,,,,,,,299,,,,, -KEY_PROG4,203,,,,,,,300,,,,, -KEY_DASHBOARD,204,,,,,,,301,,,,, -KEY_SUSPEND,205,,,,,,,293,,,,, -KEY_CLOSE,206,,,,,,,303,,,,, -KEY_PLAY,207,,,,,,,307,,VK_PLAY,0xfa,, -KEY_FASTFORWARD,208,,,,,,,308,,,,, -KEY_BASSBOOST,209,,,,,,,310,,,,, -KEY_PRINT,210,,,,,,,313,,VK_PRINT,0x2a,, -KEY_HP,211,,,,,,,314,,,,, -KEY_CAMERA,212,,,,,,,315,,,,, -KEY_SOUND,213,,,,,,,317,,,,, -KEY_QUESTION,214,,,,,,,318,,,,, -KEY_EMAIL,215,,,,,,,319,,VK_LAUNCH_MAIL,0xb4,, -KEY_CHAT,216,,,,,,,320,,,,, -KEY_SEARCH,217,,,,,,,357,,VK_BROWSER_SEARCH,0xaa,, -KEY_CONNECT,218,,,,,,,322,,,,, -KEY_FINANCE,219,,,,,,,323,,,,, -KEY_SPORT,220,,,,,,,324,,,,, -KEY_SHOP,221,,,,,,,325,,,,, -KEY_ALTERASE,222,,,,,,,276,,,,, -KEY_CANCEL,223,,,,,,,330,,,,, -KEY_BRIGHTNESSDOWN,224,,,,,,,332,,,,, -KEY_BRIGHTNESSUP,225,,,,,,,340,,,,, -KEY_MEDIA,226,,,,,,,365,,,,, -KEY_SWITCHVIDEOMODE,227,,,,,,,342,,,,, -KEY_KBDILLUMTOGGLE,228,,,,,,,343,,,,, -KEY_KBDILLUMDOWN,229,,,,,,,344,,,,, -KEY_KBDILLUMUP,230,,,,,,,345,,,,, -KEY_SEND,231,,,,,,,346,,,,, -KEY_REPLY,232,,,,,,,356,,,,, -KEY_FORWARDMAIL,233,,,,,,,270,,,,, -KEY_SAVE,234,,,,,,,341,,,,, -KEY_DOCUMENTS,235,,,,,,,368,,,,, -KEY_BATTERY,236,,,,,,,369,,,,, -KEY_BLUETOOTH,237,,,,,,,370,,,,, -KEY_WLAN,238,,,,,,,371,,,,, -KEY_UWB,239,,,,,,,372,,,,, -KEY_UNKNOWN,240,,,,,,,,,,,, -KEY_VIDEO_NEXT,241,,,,,,,,,,,, -KEY_VIDEO_PREV,242,,,,,,,,,,,, -KEY_BRIGHTNESS_CYCLE,243,,,,,,,,,,,, -KEY_BRIGHTNESS_ZERO,244,,,,,,,,,,,, -KEY_DISPLAY_OFF,245,,,,,,,,,,,, -KEY_WIMAX,246,,,,,,,,,,,, -,247,,,,,,,,,,,, -,248,,,,,,,,,,,, -,249,,,,,,,,,,,, -,250,,,,,,,,,,,, -,251,,,,,,,,,,,, -,252,,,,,,,,,,,, -,253,,,,,,,,,,,, -,254,,,,,,,,,,,, -,255,,,,182,,,,,,,, -BTN_MISC,0x100,,,,,,,,,,,, -BTN_0,0x100,,,,,,,,,VK_LBUTTON,0x01,, -BTN_1,0x101,,,,,,,,,VK_RBUTTON,0x02,, -BTN_2,0x102,,,,,,,,,VK_MBUTTON,0x04,, -BTN_3,0x103,,,,,,,,,VK_XBUTTON1,0x05,, -BTN_4,0x104,,,,,,,,,VK_XBUTTON2,0x06,, -BTN_5,0x105,,,,,,,,,,,, -BTN_6,0x106,,,,,,,,,,,, -BTN_7,0x107,,,,,,,,,,,, -BTN_8,0x108,,,,,,,,,,,, -BTN_9,0x109,,,,,,,,,,,, -BTN_MOUSE,0x110,,,,,,,,,,,, -BTN_LEFT,0x110,,,,,,,,,,,, -BTN_RIGHT,0x111,,,,,,,,,,,, -BTN_MIDDLE,0x112,,,,,,,,,,,, -BTN_SIDE,0x113,,,,,,,,,,,, -BTN_EXTRA,0x114,,,,,,,,,,,, -BTN_FORWARD,0x115,,,,,,,,,,,, -BTN_BACK,0x116,,,,,,,,,,,, -BTN_TASK,0x117,,,,,,,,,,,, -BTN_JOYSTICK,0x120,,,,,,,,,,,, -BTN_TRIGGER,0x120,,,,,,,,,,,, -BTN_THUMB,0x121,,,,,,,,,,,, -BTN_THUMB2,0x122,,,,,,,,,,,, -BTN_TOP,0x123,,,,,,,,,,,, -BTN_TOP2,0x124,,,,,,,,,,,, -BTN_PINKIE,0x125,,,,,,,,,,,, -BTN_BASE,0x126,,,,,,,,,,,, -BTN_BASE2,0x127,,,,,,,,,,,, -BTN_BASE3,0x128,,,,,,,,,,,, -BTN_BASE4,0x129,,,,,,,,,,,, -BTN_BASE5,0x12a,,,,,,,,,,,, -BTN_BASE6,0x12b,,,,,,,,,,,, -BTN_DEAD,0x12f,,,,,,,,,,,, -BTN_GAMEPAD,0x130,,,,,,,,,,,, -BTN_A,0x130,,,,,,,,,,,, -BTN_B,0x131,,,,,,,,,,,, -BTN_C,0x132,,,,,,,,,,,, -BTN_X,0x133,,,,,,,,,,,, -BTN_Y,0x134,,,,,,,,,,,, -BTN_Z,0x135,,,,,,,,,,,, -BTN_TL,0x136,,,,,,,,,,,, -BTN_TR,0x137,,,,,,,,,,,, -BTN_TL2,0x138,,,,,,,,,,,, -BTN_TR2,0x139,,,,,,,,,,,, -BTN_SELECT,0x13a,,,,,,,,,,,, -BTN_START,0x13b,,,,,,,,,,,, -BTN_MODE,0x13c,,,,,,,,,,,, -BTN_THUMBL,0x13d,,,,,,,,,,,, -BTN_THUMBR,0x13e,,,,,,,,,,,, -BTN_DIGI,0x140,,,,,,,,,,,, -BTN_TOOL_PEN,0x140,,,,,,,,,,,, -BTN_TOOL_RUBBER,0x141,,,,,,,,,,,, -BTN_TOOL_BRUSH,0x142,,,,,,,,,,,, -BTN_TOOL_PENCIL,0x143,,,,,,,,,,,, -BTN_TOOL_AIRBRUSH,0x144,,,,,,,,,,,, -BTN_TOOL_FINGER,0x145,,,,,,,,,,,, -BTN_TOOL_MOUSE,0x146,,,,,,,,,,,, -BTN_TOOL_LENS,0x147,,,,,,,,,,,, -BTN_TOUCH,0x14a,,,,,,,,,,,, -BTN_STYLUS,0x14b,,,,,,,,,,,, -BTN_STYLUS2,0x14c,,,,,,,,,,,, -BTN_TOOL_DOUBLETAP,0x14d,,,,,,,,,,,, -BTN_TOOL_TRIPLETAP,0x14e,,,,,,,,,,,, -BTN_TOOL_QUADTAP,0x14f,,,,,,,,,,,, -BTN_WHEEL,0x150,,,,,,,,,,,, -BTN_GEAR_DOWN,0x150,,,,,,,,,,,, -BTN_GEAR_UP,0x151,,,,,,,,,,,, -KEY_OK,0x160,,,,,,,,,,,, -KEY_SELECT,0x161,,,,,,,,,VK_SELECT,0x29,, -KEY_GOTO,0x162,,,,,,,,,,,, -KEY_CLEAR,0x163,,,,,,,,,,,, -KEY_POWER2,0x164,,,,,,,,,,,, -KEY_OPTION,0x165,,,,,,,,,,,, -KEY_INFO,0x166,,,,,,,,,,,, -KEY_TIME,0x167,,,,,,,,,,,, -KEY_VENDOR,0x168,,,,,,,,,,,, -KEY_ARCHIVE,0x169,,,,,,,,,,,, -KEY_PROGRAM,0x16a,,,,,,,,,,,, -KEY_CHANNEL,0x16b,,,,,,,,,,,, -KEY_FAVORITES,0x16c,,,,,,,,,VK_BROWSER_FAVOURITES,0xab,, -KEY_EPG,0x16d,,,,,,,,,,,, -KEY_PVR,0x16e,,,,,,,,,,,, -KEY_MHP,0x16f,,,,,,,,,,,, -KEY_LANGUAGE,0x170,,,,,,,,,,,, -KEY_TITLE,0x171,,,,,,,,,,,, -KEY_SUBTITLE,0x172,,,,,,,,,,,, -KEY_ANGLE,0x173,,,,,,,,,,,, -KEY_ZOOM,0x174,,,,,,,,,VK_ZOOM,0xfb,, -KEY_MODE,0x175,,,,,,,,,,,, -KEY_KEYBOARD,0x176,,,,,,,,,,,, -KEY_SCREEN,0x177,,,,,,,,,,,, -KEY_PC,0x178,,,,,,,,,,,, -KEY_TV,0x179,,,,,,,,,,,, -KEY_TV2,0x17a,,,,,,,,,,,, -KEY_VCR,0x17b,,,,,,,,,,,, -KEY_VCR2,0x17c,,,,,,,,,,,, -KEY_SAT,0x17d,,,,,,,,,,,, -KEY_SAT2,0x17e,,,,,,,,,,,, -KEY_CD,0x17f,,,,,,,,,,,, -KEY_TAPE,0x180,,,,,,,,,,,, -KEY_RADIO,0x181,,,,,,,,,,,, -KEY_TUNER,0x182,,,,,,,,,,,, -KEY_PLAYER,0x183,,,,,,,,,,,, -KEY_TEXT,0x184,,,,,,,,,,,, -KEY_DVD,0x185,,,,,,,,,,,, -KEY_AUX,0x186,,,,,,,,,,,, -KEY_MP3,0x187,,,,,,,,,,,, -KEY_AUDIO,0x188,,,,,,,,,,,, -KEY_VIDEO,0x189,,,,,,,,,,,, -KEY_DIRECTORY,0x18a,,,,,,,,,,,, -KEY_LIST,0x18b,,,,,,,,,,,, -KEY_MEMO,0x18c,,,,,,,,,,,, -KEY_CALENDAR,0x18d,,,,,,,,,,,, -KEY_RED,0x18e,,,,,,,,,,,, -KEY_GREEN,0x18f,,,,,,,,,,,, -KEY_YELLOW,0x190,,,,,,,,,,,, -KEY_BLUE,0x191,,,,,,,,,,,, -KEY_CHANNELUP,0x192,,,,,,,,,,,, -KEY_CHANNELDOWN,0x193,,,,,,,,,,,, -KEY_FIRST,0x194,,,,,,,,,,,, -KEY_LAST,0x195,,,,,,,,,,,, -KEY_AB,0x196,,,,,,,,,,,, -KEY_NEXT,0x197,,,,,,,,,,,, -KEY_RESTART,0x198,,,,,,,,,,,, -KEY_SLOW,0x199,,,,,,,,,,,, -KEY_SHUFFLE,0x19a,,,,,,,,,,,, -KEY_BREAK,0x19b,,,,,,,,,,,, -KEY_PREVIOUS,0x19c,,,,,,,,,,,, -KEY_DIGITS,0x19d,,,,,,,,,,,, -KEY_TEEN,0x19e,,,,,,,,,,,, -KEY_TWEN,0x19f,,,,,,,,,,,, -KEY_VIDEOPHONE,0x1a0,,,,,,,,,,,, -KEY_GAMES,0x1a1,,,,,,,,,,,, -KEY_ZOOMIN,0x1a2,,,,,,,,,,,, -KEY_ZOOMOUT,0x1a3,,,,,,,,,,,, -KEY_ZOOMRESET,0x1a4,,,,,,,,,,,, -KEY_WORDPROCESSOR,0x1a5,,,,,,,,,,,, -KEY_EDITOR,0x1a6,,,,,,,,,,,, -KEY_SPREADSHEET,0x1a7,,,,,,,,,,,, -KEY_GRAPHICSEDITOR,0x1a8,,,,,,,,,,,, -KEY_PRESENTATION,0x1a9,,,,,,,,,,,, -KEY_DATABASE,0x1aa,,,,,,,,,,,, -KEY_NEWS,0x1ab,,,,,,,,,,,, -KEY_VOICEMAIL,0x1ac,,,,,,,,,,,, -KEY_ADDRESSBOOK,0x1ad,,,,,,,,,,,, -KEY_MESSENGER,0x1ae,,,,,,,,,,,, -KEY_DISPLAYTOGGLE,0x1af,,,,,,,,,,,, -KEY_SPELLCHECK,0x1b0,,,,,,,,,,,, -KEY_LOGOFF,0x1b1,,,,,,,,,,,, -KEY_DOLLAR,0x1b2,,,,,,,,,,,, -KEY_EURO,0x1b3,,,,,,,,,,,, -KEY_FRAMEBACK,0x1b4,,,,,,,,,,,, -KEY_FRAMEFORWARD,0x1b5,,,,,,,,,,,, -KEY_CONTEXT_MENU,0x1b6,,,,,,,,,,,, -KEY_MEDIA_REPEAT,0x1b7,,,,,,,,,,,, -KEY_DEL_EOL,0x1c0,,,,,,,,,,,, -KEY_DEL_EOS,0x1c1,,,,,,,,,,,, -KEY_INS_LINE,0x1c2,,,,,,,,,,,, -KEY_DEL_LINE,0x1c3,,,,,,,,,,,, -KEY_FN,0x1d0,,,,,,,,,,,, -KEY_FN_ESC,0x1d1,,,,,,,,,,,, -KEY_FN_F1,0x1d2,,,,,,,,,,,, -KEY_FN_F2,0x1d3,,,,,,,,,,,, -KEY_FN_F3,0x1d4,,,,,,,,,,,, -KEY_FN_F4,0x1d5,,,,,,,,,,,, -KEY_FN_F5,0x1d6,,,,,,,,,,,, -KEY_FN_F6,0x1d7,,,,,,,,,,,, -KEY_FN_F7,0x1d8,,,,,,,,,,,, -KEY_FN_F8,0x1d9,,,,,,,,,,,, -KEY_FN_F9,0x1da,,,,,,,,,,,, -KEY_FN_F10,0x1db,,,,,,,,,,,, -KEY_FN_F11,0x1dc,,,,,,,,,,,, -KEY_FN_F12,0x1dd,,,,,,,,,,,, -KEY_FN_1,0x1de,,,,,,,,,,,, -KEY_FN_2,0x1df,,,,,,,,,,,, -KEY_FN_D,0x1e0,,,,,,,,,,,, -KEY_FN_E,0x1e1,,,,,,,,,,,, -KEY_FN_F,0x1e2,,,,,,,,,,,, -KEY_FN_S,0x1e3,,,,,,,,,,,, -KEY_FN_B,0x1e4,,,,,,,,,,,, -KEY_BRL_DOT1,0x1f1,,,,,,,,,,,, -KEY_BRL_DOT2,0x1f2,,,,,,,,,,,, -KEY_BRL_DOT3,0x1f3,,,,,,,,,,,, -KEY_BRL_DOT4,0x1f4,,,,,,,,,,,, -KEY_BRL_DOT5,0x1f5,,,,,,,,,,,, -KEY_BRL_DOT6,0x1f6,,,,,,,,,,,, -KEY_BRL_DOT7,0x1f7,,,,,,,,,,,, -KEY_BRL_DOT8,0x1f8,,,,,,,,,,,, -KEY_BRL_DOT9,0x1f9,,,,,,,,,,,, -KEY_BRL_DOT10,0x1fa,,,,,,,,,,,, -KEY_NUMERIC_0,0x200,,,,,,,,,,,, -KEY_NUMERIC_1,0x201,,,,,,,,,,,, -KEY_NUMERIC_2,0x202,,,,,,,,,,,, -KEY_NUMERIC_3,0x203,,,,,,,,,,,, -KEY_NUMERIC_4,0x204,,,,,,,,,,,, -KEY_NUMERIC_5,0x205,,,,,,,,,,,, -KEY_NUMERIC_6,0x206,,,,,,,,,,,, -KEY_NUMERIC_7,0x207,,,,,,,,,,,, -KEY_NUMERIC_8,0x208,,,,,,,,,,,, -KEY_NUMERIC_9,0x209,,,,,,,,,,,, -KEY_NUMERIC_STAR,0x20a,,,,,,,,,,,, -KEY_NUMERIC_POUND,0x20b,,,,,,,,,,,, -KEY_RFKILL,0x20c,,,,,,,,,,,, diff --git a/src/util/virkeycode-mapgen.py b/src/util/virkeycode-mapgen.py deleted file mode 100755 index 8360bfe..0000000 --- a/src/util/virkeycode-mapgen.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/python - -""" -Generate the big keycodes table for virkeys. -It read keymaps.csv from stdin and put the generated code to stdout. - -Please keep keymaps.csv be exactly the same as: -http://git.gnome.org/browse/gtk-vnc/plain/src/keymaps.csv. -If anything inconsistent happens, please change this file -instead of keymaps.csv which is a mirror. -""" - -import sys -import re - -cols = ( - ["linux", True], - ["linux", False], - ["os_x", True], - ["os_x", False], - ["atset1", False], - - ["atset2", False], - ["atset3", False], - ["xt", False], - ["xt_kbd", False], - ["usb", False], - - ["win32", True], - ["win32", False], - [None, False], - [None, False], - ["rfb", False], -) - -xtkbdkey_index = 8 - -def quotestring(str): - if str[0] != '"': - return '"' + str + '"' - return str - -print ''' -/* Generated file, DON'T edit it */ - -#ifndef VIRT_KEY_INTERNAL -# error do not use this; it is not a public header -#endif - -''' - -sys.stdin.readline() # eat the fist line. - -keycodes = [] - -max = 0 - -for line in sys.stdin.xreadlines(): - values = re.match("([^,]*)," * 13 + "([^,]*)$", line[0:-1]).groups() - - data = [] - for v in values: - data.append(v) - - # RFB keycodes are XT kbd keycodes with a slightly - # different encoding of 0xe0 scan codes. RFB uses - # the high bit of the first byte, instead of the low - # bit of the second byte. - rfbkey = int(data[xtkbdkey_index] or '0') - rfbkey = (rfbkey & 0x100) >> 1 | (rfbkey & 0x7f) - data.append("%d" % rfbkey) - - keycodes.append(data) - max = max + 1 - -print "#define VIR_KEYMAP_ENTRY_MAX " + str(max) - -for i in range(len(cols)): - col=cols[i] - name=col[0] - isname=col[1] - - if name is None: - continue - - if isname: - print "const char *virKeymapNames_" + name + "[] = {" - else: - print "int virKeymapValues_" + name + "[] = {" - - for entry in keycodes: - if isname: - print " " + quotestring(entry[i] or "NULL") + "," - else: - print " " + (entry[i] or "-1") + "," - - print "};\n" diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 7880a0a..b50d917 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -22,57 +22,53 @@ #include <string.h> #include <stddef.h> - -#define VIRT_KEY_INTERNAL -#include "virkeymaps.h" - -static const char **virKeymapNames[] = { - [VIR_KEYCODE_SET_LINUX] = - virKeymapNames_linux, - [VIR_KEYCODE_SET_XT] = - NULL, - [VIR_KEYCODE_SET_ATSET1] = - NULL, - [VIR_KEYCODE_SET_ATSET2] = - NULL, - [VIR_KEYCODE_SET_ATSET3] = - NULL, - [VIR_KEYCODE_SET_OSX] = - virKeymapNames_os_x, - [VIR_KEYCODE_SET_XT_KBD] = - NULL, - [VIR_KEYCODE_SET_USB] = - NULL, - [VIR_KEYCODE_SET_WIN32] = - virKeymapNames_win32, - [VIR_KEYCODE_SET_RFB] = - NULL, +#include "virkeycodetable_atset1.h" +#include "virkeycodetable_atset2.h" +#include "virkeycodetable_atset3.h" +#include "virkeycodetable_linux.h" +#include "virkeycodetable_osx.h" +#include "virkeycodetable_rfb.h" +#include "virkeycodetable_usb.h" +#include "virkeycodetable_win32.h" +#include "virkeycodetable_xt.h" +#include "virkeycodetable_xtkbd.h" +#include "virkeynametable_linux.h" +#include "virkeynametable_osx.h" +#include "virkeynametable_win32.h" + +static const char **virKeymapNames[VIR_KEYCODE_SET_LAST] = { + [VIR_KEYCODE_SET_LINUX] = virKeyNameTable_linux, + [VIR_KEYCODE_SET_OSX] = virKeyNameTable_osx, + [VIR_KEYCODE_SET_WIN32] = virKeyNameTable_win32, }; -verify(ARRAY_CARDINALITY(virKeymapNames) == VIR_KEYCODE_SET_LAST); - -static int *virKeymapValues[] = { - [VIR_KEYCODE_SET_LINUX] = - virKeymapValues_linux, - [VIR_KEYCODE_SET_XT] = - virKeymapValues_xt, - [VIR_KEYCODE_SET_ATSET1] = - virKeymapValues_atset1, - [VIR_KEYCODE_SET_ATSET2] = - virKeymapValues_atset2, - [VIR_KEYCODE_SET_ATSET3] = - virKeymapValues_atset3, - [VIR_KEYCODE_SET_OSX] = - virKeymapValues_os_x, - [VIR_KEYCODE_SET_XT_KBD] = - virKeymapValues_xt_kbd, - [VIR_KEYCODE_SET_USB] = - virKeymapValues_usb, - [VIR_KEYCODE_SET_WIN32] = - virKeymapValues_win32, - [VIR_KEYCODE_SET_RFB] = - virKeymapValues_rfb, + +static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { + [VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux, + [VIR_KEYCODE_SET_XT] = virKeyCodeTable_xt, + [VIR_KEYCODE_SET_ATSET1] = virKeyCodeTable_atset1, + [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2, + [VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3, + [VIR_KEYCODE_SET_OSX] = virKeyCodeTable_osx, + [VIR_KEYCODE_SET_XT_KBD] = virKeyCodeTable_xtkbd, + [VIR_KEYCODE_SET_USB] = virKeyCodeTable_usb, + [VIR_KEYCODE_SET_WIN32] = virKeyCodeTable_win32, + [VIR_KEYCODE_SET_RFB] = virKeyCodeTable_rfb, }; -verify(ARRAY_CARDINALITY(virKeymapValues) == VIR_KEYCODE_SET_LAST); + +#define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux) + +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_xt)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_atset1)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_atset2)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_atset3)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_osx)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_xtkbd)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_usb)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_win32)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_rfb)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyNameTable_linux)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyNameTable_osx)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyNameTable_win32)); VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST, "linux", diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index d092209..a9781df 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -57,6 +57,9 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) TRANSLATE(LINUX, RFB, 88, 88); TRANSLATE(LINUX, RFB, 160, 163); TRANSLATE(ATSET2, ATSET3, 259, 55); + TRANSLATE(OSX, WIN32, 90, 131); + TRANSLATE(OSX, ATSET1, 90, 0); + TRANSLATE(OSX, ATSET1, 3200, -1); #undef TRANSLATE @@ -82,6 +85,8 @@ static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED) } while (0) TRANSLATE(LINUX, "KEY_DELETE", 111); + TRANSLATE(LINUX, "KEY_RFKILL", 524); + TRANSLATE(LINUX, "KEY_WIBBLE", -1); TRANSLATE(OSX, "Function", 0x3f); TRANSLATE(WIN32, "VK_UP", 0x26); -- 2.9.3

1 0

[libvirt] [PATCH v2 00/14] Add TLS support for migration
by John Ferlan 02 Mar '17

02 Mar '17

v1: http://www.redhat.com/archives/libvir-list/2017-February/msg00897.html v1 cover letter reiterated: Patches 1, 3 -> 9 are primarily quite a bit of code motion in order to allow reuse of the "core" of the chardev TLS code. Theoretically speaking of course, these patches should work - I don't have a TLS and migration environment to test with, so between following the qemu command model on Daniel's blog and prior experience with the chardev TLS would I added the saving of a flag to the private qemu domain state, although I'm not 100% sure it was necessary. At one time I created the source TLS objects during the Begin phase, but later decided to wait until just before the migration is run. I think the main reason to have the flag would be a restart of libvirtd to let 'something' know migration using TLS was configured. I think it may only be "necessary" in order to repopulate the migSecinfo after libvirtd restart, but it's not entirely clear. By the time I started thinking more about while writing this cover letter it was too late to just remove. Also rather than create the destination host TLS objects on the fly, I modified the command line generation. That model could change to adding the TLS objects once the destination is started and before the params are set for the migration. This 'model' is also going to be used for the NBD, but I figured I'd get this posted now since it was already too long of a series. v2: Changes Reorder the patches to put the reused 'chardev' code up front. Most of these patches were "ok" along the way, but only one was officially ACK'd (and that was pushed). Patch1 is new - based off code review comment to create a common New function for secinfo allocation Patch2 is adjusted to use Patch1 Patch3 is new based on review comment and having ExitMonitor outside the virSaveLastError ... virSetError Patch4 mainly follows older logic with adjustments as suggested during code review Patch5 -> Patch8 had minor changes as a result of other suggestions Patch9 just removed the _set logic Patch10 fixed the order/placement of VIR_MIGRATE_TLS Patch11 is the old patch1 w/ the fixed #undef Patch12 is the old patch2 w/o changes Patch13 Alters the server logic to create the objects on the fly rather that via command line. It also introduces 3 helpers to perform the migration TLS manipulation Patch14 similarly uses those API's AFAIU - removal of the objects would remove the migration tls-creds, tls-hostname settings. NB: I left the cfg->migrateTLS in for now - it's very simple to remove, but there would still need to be a key on something to ensure the migrateTLS environment has been properly configured since that would mean the default environment would need to be used/configured. Setting up the default environment is keyed off having the migrateTLS defined. That's all part of the qemu_conf reading logic. John Ferlan (14): qemu: Introduce qemuDomainSecretInfoNew qemu: Introduce qemuDomainSecretMigratePrepare qemu: Move exit monitor calls in failure paths qemu: Refactor hotplug to introduce qemuDomain{Add|Del}TLSObjects qemu: Refactor qemuDomainGetChardevTLSObjects to converge code qemu: Move qemuDomainSecretChardevPrepare call qemu: Move qemuDomainPrepareChardevSourceTLS call qemu: Introduce qemuDomainGetTLSObjects qemu: Add TLS params to _qemuMonitorMigrationParams Add new migration flag VIR_MIGRATE_TLS qemu: Create #define for TLS configuration setup. conf: Introduce migrate_tls_x509_cert_dir qemu: Set up the migrate TLS objects for target qemu: Set up the migration TLS objects for source include/libvirt/libvirt-domain.h | 8 + src/qemu/libvirtd_qemu.aug | 6 + src/qemu/qemu.conf | 39 +++++ src/qemu/qemu_conf.c | 45 +++-- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_domain.c | 195 +++++++++++++-------- src/qemu/qemu_domain.h | 89 ++++++---- src/qemu/qemu_hotplug.c | 343 ++++++++++++++++++++----------------- src/qemu/qemu_hotplug.h | 24 +++ src/qemu/qemu_migration.c | 200 +++++++++++++++++++++ src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 11 +- src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 10 ++ src/qemu/test_libvirtd_qemu.aug.in | 4 + tools/virsh-domain.c | 7 + 16 files changed, 705 insertions(+), 287 deletions(-) -- 2.9.3

5 39

[libvirt] [PATCH] qemu: command: Truncate the chardev logging file even if append is not present
by Peter Krempa 02 Mar '17

02 Mar '17

Our documentation states that the chardev logging file is truncated unless append='on' is specified. QEMU also behaves the same way and truncates the file unless we provide the argument. The new virlogd implementation did not honor if the argument was missing and continued to append to the file. Truncate the file even when the 'append' attribute is present to behave the same with both implementations and adhere to the docs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1420205 --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 41eecfd18..46bd2e268 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4827,7 +4827,8 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, int flags = 0; int logfd; - if (appendval == VIR_TRISTATE_SWITCH_OFF) + if (appendval == VIR_TRISTATE_SWITCH_ABSENT || + appendval == VIR_TRISTATE_SWITCH_OFF) flags |= VIR_LOG_MANAGER_PROTOCOL_DOMAIN_OPEN_LOG_FILE_TRUNCATE; if ((logfd = virLogManagerDomainOpenLogFile(logManager, -- 2.11.0

2 1

[libvirt] [PATCH v2 0/6] Converge Storage Pool vHBA logic with Node Device
by John Ferlan 01 Mar '17

01 Mar '17

v1: http://www.redhat.com/archives/libvir-list/2017-February/msg00963.html Changes since v1: NB: Former Patch 1 - was pushed Patch 1 - Was the old patch 2... Similar for rest of series... Altered to match the adjusted testNodeDeviceMockCreateVport from commit 2a862092 Patch 2 - reworked the code to not place the new module in src/util, but rather in src/conf as storage_adapter_conf.{c,h}. The concepts didn't change - only the name/location. Removed the changes for util/virvirscsi.c since virSCSIHostGetNameByParentaddr wouldn't be allowed to use virStorageAdapterSCSIHostPtr since it's a conf definition. Patch 3 - Unchanged, ACK'd in v1 Patch 4 - Unchanged, ACK'd in v1 Patch 5 - Unchanged... Even though there is concern over usage of API's in this manner (e.g. calling virNodeDeviceLookupSCSIHostByWWN as well as virNodeDeviceCreateXML) - the "purpose" of the exercise is a means to have the StoragePool code use the same algorithms as the node device code instead of what could be a potentially long slow journey through the sysfs file system. The key piece being the replication of the API's that find the parent in the node device object list. I suppose it would be possible to add even more API's to get that answer, but I'm not sure it'd be worthwhile at this point. As for the concern about deadlock - I understand it, but since the whole purpose of the API is to essentially utilize the nodedev create algorithm there'd be no reason for nodedev to call it. If it doesn't get ACK'd - that's OK - I can hold onto it and reconsider some other means at some point in time in the future (probably distant future too). Patch 6 - Unchanged The former patch 8 is dropped for now - needs some more "discussion" as to viability and/or need. John Ferlan (6): tests: Add createVHBAByStoragePool-by-parent to fchosttest conf: Convert virStoragePoolSourceAdapter to virStorageAdapter util: Rename virFileWaitForDevices conf: Move/rename createVport and deleteVport util: Alter virNodeDevice{Create|Delete}Vport to use nodedev APIs tests: Add more storage pool vHBA tests po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/node_device_conf.c | 332 +++++++++++++++++++++++++++++++++ src/conf/node_device_conf.h | 9 + src/conf/storage_adapter_conf.c | 291 +++++++++++++++++++++++++++++ src/conf/storage_adapter_conf.h | 89 +++++++++ src/conf/storage_conf.c | 333 ++++++++-------------------------- src/conf/storage_conf.h | 35 +--- src/libvirt_private.syms | 20 +- src/node_device/node_device_driver.c | 2 +- src/phyp/phyp_driver.c | 3 +- src/storage/storage_backend_disk.c | 6 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 4 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 267 +++++---------------------- src/storage/storage_util.c | 2 +- src/test/test_driver.c | 99 +++++++++- src/util/virfile.h | 2 - src/util/virutil.c | 4 +- src/util/virutil.h | 2 + tests/fchosttest.c | 111 ++++++++++++ 22 files changed, 1087 insertions(+), 530 deletions(-) create mode 100644 src/conf/storage_adapter_conf.c create mode 100644 src/conf/storage_adapter_conf.h -- 2.9.3

1 6

[libvirt] [PATCH 0/3] libxl: implement virDomainObjCheckIsActive
by Sagar Ghuge 01 Mar '17

01 Mar '17

Add function which raises error if domain is not active. This is BiteSizedTask. http://wiki.libvirt.org/page/BiteSizedTasks#Add_function_that_raises_error_… Sagar Ghuge (3): libxl: Implement virDomainObjCheckIsActive change virDomainObjIsActive with virDomainObjCheckIsActive libxl: Change virDomainObjIsActive to virDomainObjCheckIsActive ...libxl-Implement-virDomainObjCheckIsActive.patch | 55 ++++ ...omainObjIsActive-with-virDomainObjCheckIs.patch | 109 ++++++++ ...e-virDomainObjIsActive-to-virDomainObjChe.patch | 298 +++++++++++++++++++++ patch1 | 52 ++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 1 + src/libxl/libxl_driver.c | 102 ++----- src/test/test_driver.c | 35 +-- 8 files changed, 560 insertions(+), 107 deletions(-) create mode 100644 0001-libxl-Implement-virDomainObjCheckIsActive.patch create mode 100644 0002-change-virDomainObjIsActive-with-virDomainObjCheckIs.patch create mode 100644 0003-libxl-Change-virDomainObjIsActive-to-virDomainObjChe.patch create mode 100644 patch1 -- 2.9.3

3 8

[libvirt] Schedule for next release
by Daniel Veillard 01 Mar '17

01 Mar '17

Hi everybody, it's about time to think about 3.1.0, I think to be on the safe side for a March 1st release we should enter freeze at the end of the week, most likely on Friday, so if you have patches that need to get in, please make sure they are approved and pushed in time. Hope this works for everybody, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH RFC 0/9] Introduce virPoolObj[Table]Ptr data/API's
by John Ferlan 01 Mar '17

01 Mar '17

Based of current top of git commit id '5620c6095'... I imagine things will change while this is on-list, so if there is the desire to create your own branch that's your starting point! This is perhaps more than an RFC considering I've added comments already (at least one reason why the insertions count is high). Still it's not really complete and ready for prime time, but I figured I'd put it out there for feedback. Essentially I've tried to follow the domainobj 'model' by creating an API to manage the "objects" various drivers have the need to manage. Currently there are 4 drivers using linked lists of some sort and 4 using hash tables in some manner. This implementation modifies the linked list abusers to use a common hash table. The common hash table will have uuid/name accessors. The preference remains uuid for uniqueness, but there are a couple of tables (node device, nwfilter) that don't have a uuid and thus name is unique enough for them. The genesis for this was recent patches to the storage driver that were essentially copying many lines of code and just changing the names to do the same thing. As I looked deeper at that - I found a mish-mash of object management throughout the drivers, so this is my attempt to unify that. The "goal" is to have a common look and feel to the API's so there's less thought over how a specific implementation does things. Each trip into the driver and exit can be handled in a common manner especially with respect to locks/refcnt's. Since I was splitting things apart - I also split out the object code/data *_conf.{c,h} into separate vir*obj.{c,h} files. I took some liberties with adjusting some names, modifying some other things along the way since the type A personality took over to try and follow more current coding conventions while I was in the middle of changing things. While the ultimate goal is to finish with the domain code - that's just too busy in order to make adjustments right now. Still at least that code does use a similar hash table model - so while it will be painful - it can be done later if/when this is accepted (and perhaps when we know there's a slow period for posting changes). John Ferlan (9): conf: Modify gendispatch.pl to make ACL argument opaque conf: Introduce virPoolObj and virPoolTableObj and PoolObj API's nodedev: Convert virNodeDevObj[List] to use virPoolObj[Table] interface: Convert virInterfaceObj[List] to use virPoolObj[Table] nwfilter: Convert virNWFilterObj[List] to use virPoolObj[Table] secret: Convert virSecretObj[List] to use virPoolObj[Table] volume: Convert virStorageVolObj[List] to use virPoolObj[Table] storage: Convert virStoragePoolObj[List] to use virPoolObj[Table] network: Convert virNetworkObj[List] to use virPoolObj[Table] include/libvirt/virterror.h | 1 + po/POTFILES.in | 5 + src/Makefile.am | 18 +- src/conf/domain_conf.h | 3 +- src/conf/interface_conf.c | 170 +-- src/conf/interface_conf.h | 47 +- src/conf/network_conf.c | 1308 +----------------- src/conf/network_conf.h | 133 +- src/conf/node_device_conf.c | 497 +------ src/conf/node_device_conf.h | 86 +- src/conf/nwfilter_conf.c | 381 +----- src/conf/nwfilter_conf.h | 69 +- src/conf/secret_conf.c | 3 +- src/conf/secret_conf.h | 2 +- src/conf/storage_conf.c | 925 +------------ src/conf/storage_conf.h | 128 +- src/conf/virinterfaceobj.c | 205 +++ src/conf/virinterfaceobj.h | 46 + src/conf/virnetworkobj.c | 1166 ++++++++++++++++ src/conf/virnetworkobj.h | 121 ++ src/conf/virnodedeviceobj.c | 570 ++++++++ src/conf/virnodedeviceobj.h | 86 ++ src/conf/virnwfilterobj.c | 373 +++++ src/conf/virnwfilterobj.h | 64 + src/conf/virpoolobj.c | 1184 ++++++++++++++++ src/conf/virpoolobj.h | 222 +++ src/conf/virsecretobj.c | 782 ++++------- src/conf/virsecretobj.h | 92 +- src/conf/virstorageobj.c | 1206 +++++++++++++++++ src/conf/virstorageobj.h | 143 ++ src/interface/interface_backend_netcf.c | 6 +- src/interface/interface_backend_udev.c | 5 +- src/libvirt_private.syms | 217 +-- src/network/bridge_driver.c | 1812 +++++++++++++------------ src/network/bridge_driver.h | 11 +- src/network/bridge_driver_platform.h | 3 +- src/node_device/node_device_driver.c | 388 +++--- src/node_device/node_device_driver.h | 2 +- src/node_device/node_device_hal.c | 82 +- src/node_device/node_device_udev.c | 76 +- src/nwfilter/nwfilter_driver.c | 225 ++- src/nwfilter/nwfilter_gentech_driver.c | 111 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/nwfilter/nwfilter_tech_driver.h | 2 +- src/rpc/gendispatch.pl | 5 +- src/secret/secret_driver.c | 187 +-- src/storage/storage_backend.h | 32 +- src/storage/storage_backend_disk.c | 309 +++-- src/storage/storage_backend_fs.c | 145 +- src/storage/storage_backend_gluster.c | 52 +- src/storage/storage_backend_iscsi.c | 65 +- src/storage/storage_backend_logical.c | 177 +-- src/storage/storage_backend_mpath.c | 37 +- src/storage/storage_backend_rbd.c | 115 +- src/storage/storage_backend_scsi.c | 57 +- src/storage/storage_backend_sheepdog.c | 89 +- src/storage/storage_backend_vstorage.c | 47 +- src/storage/storage_backend_zfs.c | 109 +- src/storage/storage_driver.c | 1952 +++++++++++++------------- src/storage/storage_driver.h | 6 +- src/storage/storage_util.c | 234 ++-- src/storage/storage_util.h | 31 +- src/test/test_driver.c | 2257 ++++++++++++++----------------- src/util/virerror.c | 1 + tests/networkxml2conftest.c | 18 +- tests/storagevolxml2argvtest.c | 16 +- 66 files changed, 10145 insertions(+), 8774 deletions(-) create mode 100644 src/conf/virinterfaceobj.c create mode 100644 src/conf/virinterfaceobj.h create mode 100644 src/conf/virnetworkobj.c create mode 100644 src/conf/virnetworkobj.h create mode 100644 src/conf/virnodedeviceobj.c create mode 100644 src/conf/virnodedeviceobj.h create mode 100644 src/conf/virnwfilterobj.c create mode 100644 src/conf/virnwfilterobj.h create mode 100644 src/conf/virpoolobj.c create mode 100644 src/conf/virpoolobj.h create mode 100644 src/conf/virstorageobj.c create mode 100644 src/conf/virstorageobj.h -- 2.7.4

6 28

[libvirt] [PATCH] testNodeDeviceMockCreateVport: Don't call public APIs
by Michal Privoznik 01 Mar '17

01 Mar '17

This function is calling public APIs (virNodeDeviceLookupByName etc.). That requires the driver lock to be unlocked and locked again. If we, however, replace the public APIs calls with the internal calls (that public APIs call anyway), we can drop the lock/unlock exercise. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/test/test_driver.c | 59 ++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5fef3f10b..8495443db 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5626,17 +5626,16 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) } -static virNodeDeviceDefPtr +static virNodeDeviceObjPtr testNodeDeviceMockCreateVport(virConnectPtr conn, const char *wwnn, const char *wwpn) { testDriverPtr driver = conn->privateData; - virNodeDevicePtr devcpy = NULL; char *xml = NULL; virNodeDeviceDefPtr def = NULL; virNodeDevCapsDefPtr caps; - virNodeDeviceObjPtr obj = NULL; + virNodeDeviceObjPtr obj = NULL, objcopy = NULL; virObjectEventPtr event = NULL; /* In the real code, we'd call virVHBAManageVport which would take the @@ -5648,9 +5647,15 @@ testNodeDeviceMockCreateVport(virConnectPtr conn, * using the scsi_host11 definition, changing the name and the * scsi_host capability fields before calling virNodeDeviceAssignDef * to add the def to the node device objects list. */ - if (!(devcpy = virNodeDeviceLookupByName(conn, "scsi_host11")) || - !(xml = virNodeDeviceGetXMLDesc(devcpy, 0)) || - !(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL))) + if (!(objcopy = virNodeDeviceFindByName(&driver->devs, "scsi_host11"))) + goto cleanup; + + xml = virNodeDeviceDefFormat(objcopy->def); + virNodeDeviceObjUnlock(objcopy); + if (!xml) + goto cleanup; + + if (!(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL))) goto cleanup; VIR_FREE(def->name); @@ -5684,23 +5689,17 @@ testNodeDeviceMockCreateVport(virConnectPtr conn, if (!(obj = virNodeDeviceAssignDef(&driver->devs, def))) goto cleanup; - virNodeDeviceObjUnlock(obj); + def = NULL; - event = virNodeDeviceEventLifecycleNew(def->name, + event = virNodeDeviceEventLifecycleNew(obj->def->name, VIR_NODE_DEVICE_EVENT_CREATED, 0); testObjectEventQueue(driver, event); cleanup: VIR_FREE(xml); - if (!obj) { - virNodeDeviceDefFree(def); - def = NULL; - } - if (devcpy) - virNodeDeviceFree(devcpy); - - return def; + virNodeDeviceDefFree(def); + return obj; } @@ -5712,8 +5711,8 @@ testNodeDeviceCreateXML(virConnectPtr conn, testDriverPtr driver = conn->privateData; virNodeDeviceDefPtr def = NULL; char *wwnn = NULL, *wwpn = NULL; - virNodeDevicePtr dev = NULL; - virNodeDeviceDefPtr newdef = NULL; + virNodeDevicePtr dev = NULL, ret = NULL; + virNodeDeviceObjPtr obj = NULL; virCheckFlags(0, NULL); @@ -5739,20 +5738,28 @@ testNodeDeviceCreateXML(virConnectPtr conn, * mocking udev. The mock routine will copy an existing vHBA and * rename a few fields to mock that. So in order to allow that to * work properly, we need to drop our lock */ - testDriverUnlock(driver); - if ((newdef = testNodeDeviceMockCreateVport(conn, wwnn, wwpn))) { - if ((dev = virNodeDeviceLookupByName(conn, newdef->name))) - ignore_value(VIR_STRDUP(dev->parent, def->parent)); - } - testDriverLock(driver); - newdef = NULL; + if (!(obj = testNodeDeviceMockCreateVport(conn, wwnn, wwpn))) + goto cleanup; + + if (!(dev = virGetNodeDevice(conn, obj->def->name))) + goto cleanup; + + VIR_FREE(dev->parent); + if (VIR_STRDUP(dev->parent, def->parent) < 0) + goto cleanup; + + ret = dev; + dev = NULL; cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); testDriverUnlock(driver); virNodeDeviceDefFree(def); + virObjectUnref(dev); VIR_FREE(wwnn); VIR_FREE(wwpn); - return dev; + return ret; } static int -- 2.11.0

2 2

[libvirt] A question for external snapshots with flag“VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE”
by lizhengui 28 Feb '17

28 Feb '17

Hello, I got a question here. When we create consistent active external snapshots with flag “VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE” , the qemuDomainSnapshotFSFreeze will be called firstly to freeze all filesystems in vm, and then create snapshots. For windows vm, freezing filesystems used by vss service. If IO pressure in vm is too big or internal error happened in vss , freezing filesytems will failed , and qemuDomainSnapshotFSFreeze returns 0 which meaning that no filesystems are frozen. In the function qemuDomainSnapshotCreateActiveExternal, libvirt creates external snapshots all the same in such a situation that qemuDomainSnapshotFSFreeze returns 0, but the created snapshots are not consistent snapshots in such a situation . So shouldn't we abandon creating snapshots and goto cleanup in the situation that qemuDomainSnapshotFSFreeze returns 0? The code below: static int qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainSnapshotObjPtr snap, unsigned int flags) { virObjectEventPtr event; bool resume = false; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *xml = NULL; bool memory = snap->def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; bool memory_unlink = false; bool atomic = !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC); bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed; char *compressedpath = NULL; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent * is not running, or is already quiesced. */ if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) { int freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); if (freeze < 0) { /* the helper reported the error */ if (freeze == -2) thaw = -1; /* the command is sent but agent failed */ goto cleanup; } thaw = 1; } ...... ......

3 2

[libvirt] ANNOUNCE: libguestfs 1.36 released
by Richard W.M. Jones 28 Feb '17

28 Feb '17

I'm please to announce libguestfs 1.36, a library and a set of tools for accessing and modifying virtual machine disk images. This release represents about 7 months of work by many contributors. I'd like to call out in particular substantial code contributions from: Pino Toscano, Tomáš Golembiovský, Cédric Bosdonnat, Roman Kagan, Dawid Zamirski and Matteo Cafasso. Also our testing team: Tingting Zheng, Xiang Hua Chen, Ming Xie, Junquin Zhou and Xiaodai Wang. Amongst the new features are substantial enhancements to virt-v2v including support for Debian and Ubuntu guest conversions, and conversions from AWS; a new "virt-tail" command for following log files in guests; even more support for encrypted guests; robustness when handling Windows guests with corrupted registries; ExFAT support; GCC 7 support; and considerable internal code refactoring to make things more maintainable. Of course dozens of other features have been added, and many bugs fixed. See the release notes below for full details. You can get libguestfs 1.36 from here: Main website: http://libguestfs.org/ Source: http://libguestfs.org/download/1.36-stable/ Fedora: https://koji.fedoraproject.org/koji/packageinfo?packageID=8391 Debian/experimental: https://packages.debian.org/libguestfs0 Note for distro packagers: libmagic (part of the 'file' command line tool) is now a required build dependency. It was previously optional. Rich. ---------------------------------------------------------------------- Release notes for libguestfs 1.36 These are also available online at: http://libguestfs.org/guestfs-release-notes.1.html New features New tools Virt-tail is a new tool for following (tailing) log files within a guest, similar to the regular "tail -f" command. New features in existing tools Virt-customize, virt-get-kernel, virt-sparsify and virt-sysprep can now handle encrypted guests (Pino Toscano). Virt-builder and virt-customize now support --append-line, which is useful for adding lines to the end of configuration files. Virt-resize can now shrink and expand swap partitions (Pino Toscano). Virt-resize can now output to non-local disks (Pino Toscano). Virt-sysprep has a new operation called "backup-files" for removing editor backups, and "passwd-backups" for removing /etc/passwd- and similar. Virt-dib can now create checksums using the new --checksum option (Pino Toscano). Virt-dib can now create tgz files. In addition, extended attributes and SELinux labels are preserved in the output tar file (Pino Toscano). Virt-dib can now create squashfs files (Pino Toscano). Bash tab-completion is now available in every command line tool that is shipped. virt-v2v and virt-p2v Conversions of Debian (6+) and Ubuntu (10.04+) guests are now supported (Tomáš Golembiovský, Pino Toscano). Conversions from SUSE Xen hypervisor have now been tested (Cédric Bosdonnat). Windows conversions may now install a program "pnp_wait.exe" which prevents conflicts between the Windows Plug-and-Play Manager and our own scripts that install virtio device drivers. Enabling this requires the "pnp_wait.exe" program to be built separately (Roman Kagan). OVA files exported from AWS can now be converted (Shahar Havivi). When converting OVA files, in some circumstances virt-v2v can now read disk images directly from the OVA input file instead of needing to unpack the OVA file to a temporary directory. This can save large amounts of disk space, and is quicker (Tomáš Golembiovský). Virt-p2v can now be built on RHEL 5 (2007-era) Linux and RHEL 6, which means that 32 bit and hardware with ancient fakeraid disks can be virtualized. Binaries of virt-p2v based on these old versions of RHEL can be found at http://oirase.annexia.org/virt-p2v/ Virt-p2v can now use nbdkit (an NBD server) as an alternative to qemu- nbd. In addition, virt-p2v can use "socket activation" which is a more robust method for opening the NBD listening socket. Socket activation works with qemu-nbd or nbdkit, but requires the most up to date versions. To prevent timeouts during P2V conversions, virt-p2v inhibits power saving on the physical machine, and also sends ping packets over the ssh control and data connections. Virt-v2v no longer removes the "Processor" and "Intelppm" nodes from the Windows Registry. Xen and vCenter conversions can now be done using the libvirt backend, provided libvirt ≥ 2.1.0 is used. /dev/srX (SCSI CD-ROM) devices are ignored (Tomáš Golembiovský). When converting SUSE Linux guests, use /etc/modprobe.conf.local if it exists. Removing VMware tools from Linux guests should now work reliably (Pino Toscano). When converting OVA files, virt-v2v now checks the disk image hash contained in the manifest file, whereas previously it was ignored because of a mistake in the code. In addition, SHA256 hashes are now supported (Tomáš Golembiovský). When converting OVA files that contain compressed disk images, we now trust the "ovf:compression" attribute from the metadata instead of using content sniffing on the disk image (Tomáš Golembiovský). A new flag --vdsm-compat has been added to -o vdsm mode, allowing more efficient qcow2 images to be generated. Since the RHEV product [commercially supported version of oVirt] has now been renamed to RHV, "RHEV" was changed to "RHV" throughout the tooling. In particular, -o rhev becomes -o rhv, although the old name can be used for backwards compatibility. The "RHEV-APT" utility is only installed when the output hypervisor is oVirt or RHV. A problem with virt-v2v running out of memory when doing an SELinux relabel of the guest filesystem should now be resolved. Language bindings Setting "EXTRA_JAVAC_FLAGS" before ./configure allows you to add arbitrary flags to "javac" when compiling the Java bindings. Use of any libguestfs API which returned a single struct, from Perl or Java bindings, would have leaked memory. This has now been fixed (Pino Toscano). Inspection Inspection of Windows guests with mildly corrupted Windows Registry hives should now work instead of failing with an error. This feature requires hivex ≥ 1.3.14 (Dawid Zamirski). For Debian guests, we can now read the URL, source name, summary and full description of installed packages. For RPM-based guests we can read the URL, summary and description (Pino Toscano). Inspection of guest operating systems that use a separate /usr partition should now work more reliably (Pino Toscano). When parsing guest /etc/fstab, paths are reduced to a canonical form (eg. "///usr//local//" → "/usr/local"). Inspection of btrfs subvolumes now works where the /etc/fstab options field contains commas. /dev/cdN devices in guest /etc/fstab are ignored (Pino Toscano). Architectures and platforms Stable releases are now tested on aarch64, ppc64 and ppc64le architectures. The RISC-V architecture is now handled as a guest, and libguestfs will now at least compile on RISC-V (but probably not work as there is no usable qemu at the time of writing). Detection of S/390 and S/390x binaries and guests is now supported. Other ExFAT filesystems are now supported (Miles Wolbe). Security See also guestfs-security(1). There were no CVEs reported in this development cycle. However some security-related hardening was carried out as described below. Temporary filenames are now always generated using randomness from /dev/urandom (previously the C function random(3) was used in one case). The $TERM environment variable is now validated before passing it through to the appliance kernel command line. API New APIs "guestfs_aug_transform" Exposes the Augeas "aug_transform" API (Pino Toscano). "guestfs_find_inode" Find files by inode number (Matteo Cafasso). "guestfs_inspect_get_windows_software_hive" "guestfs_inspect_get_windows_system_hive" Return the path to the Windows "HKLM\SYSTEM" and "HKLM\SOFTWARE" hives computed during inspection. "guestfs_mksquashfs" Create a squashfs filesystem from a path (Pino Toscano). Other API changes "guestfs_add_domain" This call now handles libvirt file-based volumes correctly, where previously these would have been ignored. Also handled are disks which require libvirt authentication secrets to open (Pino Toscano). "guestfs_canonical_device_name" This call will no longer incorrectly modify Linux software RAID device names (like /dev/mdX). "guestfs_file_architecture" Previously the "file_architecture" API could return either of the strings "i386" or "i486" for 32 bit x86 binaries. It now only returns "i386" (as documented). This API can now return the following new values: "riscv32", "riscv64", "riscv128", "s390", "s390x". "guestfs_hivex_open" This now has an optional "GUESTFS_HIVEX_OPEN_UNSAFE" flag which allows certain corrupted Windows Registry hives to be opened. This feature requires hivex ≥ 1.3.14 (Dawid Zamirski). "guestfs_list_partitions" This call now returns Linux software RAID partitions. "guestfs_part_to_dev" This call now correctly handles partition names which include "p<N>" (Pino Toscano). "guestfs_set_label" This call can now change the labels of swap partitions (Pino Toscano). Build changes libmagic, the library part of the "file" command, is now required at build time (previously optional). GCC 7 is now supported. "Silent rules" are now used for OCaml programs, Java bindings. To show the full command line executed, add "V=1" on the make command line (Pino Toscano). Slow testing ("make check-slow") now covers: firstboot scripts in Linux guests; v2v conversion of a selection of real Linux guests; the virt- customize --hostname and --timezone settings; the --root-password parameter; that the serial console works in virt-builder guests. Large generated C source files, eg. the list of commands found in fish/cmds.c (and many more), have been split into smaller files to speed parallel compilation. "make maintainer-check-extra-dist" now checks that all generated files are included in the tarball. The tests no longer assume that "." is in Perl's @INC, as it is going to be removed soon (Pino Toscano). Debian hosts using UsrMerge are now supported (Pino Toscano). Header files and C structs can now have internal documentation using the special "/** ... */" comments. "@VAR@" subtitutions in "./run" are now fully quoted. This is necessary so that (eg) "./configure PYTHON=/some/path" works robustly if "/some/path" contains characters that need to be quoted (Hilko Bengen). gperf ≥ 3.1 is now supported. Kraxel's old edk2 builds can no longer be used for UEFI support. UEFI code is now fully free software, so use the versions bundled with your Linux distro instead. Virt-p2v can now be compiled on RHEL 5 (2007-era) Linux with Gtk 2.10. Internals The generator and mllib "Common_utils" modules are now shared from the same source file. A considerable amount of common code has been moved into the common directory in the source and is now compiled only once. The mini- libraries located under here are: common/edit, common/errnostring, common/miniexpect, common/options, common/parallel, common/progress, common/protocol, common/utils, common/visit, common/windows. The directory containing the main library code has moved from src → lib. All tests written in shell script now use a common file of utility functions (tests/test-functions.sh). There are several new utility functions, mainly for skipping tests. Also these test scripts can now use autoconf-like path variables like $abs_top_srcdir. UEFI paths are now stored in the generator (generator/uefi.ml). The way the generator handles actions and procedure numbers was changed quite substantially. See generator/actions_*.ml and generator/proc_nr.ml. The gnulib "getprogname" module is now used everywhere when needing/printing the program name (Pino Toscano). perl/Guestfs.c is not translatable (Nikos Skalkotos). Virt-builder templates moved from builder/website to builder/templates and there is now a single unified program which can build any template. All Windows registry utilities used by virt-customize and virt-v2v have been moved to a common module called "Registry" under mllib. All POSIX bindings have been moved to a new module called "Unix_utils" under mllib. Inspection, virt-customize and virt-v2v no longer recompute the Windows "%systemroot%", "CurrentControlSet" or paths to the "HKLM\SYSTEM" and "HKLM\SOFTWARE" hives in multiple places. Instead these are all computed once (during inspection) and passed to the other tools through various "guestfs_inspect_get_windows_*" APIs. "/dev/pts" is now available inside the appliance, so any tools we run which require a pty will now work (Pino Toscano). Most OCaml warnings have been fixed. There is now a single common function for creating temporary files ("guestfs_int_make_temp_path") (Matteo Cafasso). The $TERM environment variable is now validated before passing it through to the appliance kernel command line. Useless USB and memballoon devices are no longer created in the appliance (Laine Stump). On aarch64 we now use virtio-pci for the appliance. This is somewhat faster than virtio-mmio. Use of srandom(3) and random(3) has been minimized. In particular, temporary filenames are no longer created based on randomness returned by random(3), but /dev/urandom is used instead. Bugs fixed https://bugzilla.redhat.com/1425306 typo error in virt-tail man page https://bugzilla.redhat.com/1418283 virt-v2v: appliance runs out of memory running setfiles command https://bugzilla.redhat.com/1417549 /usr/bin/x86_64-linux-gnu-ld.bfd.real: ../common/progress/.libs/libprogress.a(libprogress_la-progress.o): undefined reference to symbol 'UP@@NCURSES_TINFO_5.0.19991023' https://bugzilla.redhat.com/1417444 *** No rule to make target '../perl/lib/Sys/Guestfs.c', needed by 'libguestfs.pot' https://bugzilla.redhat.com/1416941 compile of 1.34.3 fails with gperf 3.1 https://bugzilla.redhat.com/1414682 guestfs_canonical_device_name incorrectly returns /dev/sd0 for MD devices (/dev/md0) https://bugzilla.redhat.com/1414510 guestfs_list_filesystems does not recognize ddf partitions https://bugzilla.redhat.com/1409023 [Debian] ldmtool not installed in the appliance https://bugzilla.redhat.com/1404287 qemu-kvm cannot boot RHEL 7 kernel with TCG, hangs at "Probing EDD (edd=off to disable)..." https://bugzilla.redhat.com/1404182 RFE: virt-resize should support a URL as the outdisk https://bugzilla.redhat.com/1401474 Importing VMs from VMware is failing with error "Inspection field 'i_arch' was 'unknown'" https://bugzilla.redhat.com/1401320 RFE: Increate virt-sysprep coverage a bit https://bugzilla.redhat.com/1400205 Add --vdsm-compat=1.1 flag for VDSM https://bugzilla.redhat.com/1398070 typo error in man page https://bugzilla.redhat.com/1392798 secrets from libvirt domains are not read https://bugzilla.redhat.com/1390876 "--machine-readable" info should be updated in virt-v2v manual page https://bugzilla.redhat.com/1379289 RFE: virt-p2v should support mnemonic operations https://bugzilla.redhat.com/1378022 There is virt-v2v warning about <listen type='none'> during converting a guest which has listen type='none' in XML https://bugzilla.redhat.com/1377081 virt-p2v manual should update the new dialog information https://bugzilla.redhat.com/1375157 virt-v2v: -i ova: Permission denied when using libvirt and running as root https://bugzilla.redhat.com/1374651 Can't install qxl driver for display device in win7 guest after converting to glance by virt-v2v https://bugzilla.redhat.com/1374405 There is HTTP 404 error info when convert guest to glance by virt-v2v https://bugzilla.redhat.com/1374232 selinux relabel fails on RHEL 6.2 guests with "libguestfs error: selinux_relabel: : Success" https://bugzilla.redhat.com/1372668 Process status is not normal in windows guest after converted from kvm to rhev by virt-v2v https://bugzilla.redhat.com/1372269 Builder does not set hostname properly for Debian 8 (Jessie) https://bugzilla.redhat.com/1371843 Improve OVA import compatibility https://bugzilla.redhat.com/1370424 virt-manager coredump when vm with gluster image exists https://bugzilla.redhat.com/1367839 Cannot import VMs from Xen and VMware when using RHEL7.3 host. https://bugzilla.redhat.com/1367738 Missing bash completion scripts for: virt-diff guestunmount virt- copy-in virt-copy-out virt-customize virt-get-kernel virt-p2v-make-disk virt-p2v-make-kickstart virt-tar-in virt-tar-out virt-v2v-copy-to-local virt-win-reg https://bugzilla.redhat.com/1367615 OVMF file which is built for rhel7.3 can't be used for virt-v2v uefi conversion https://bugzilla.redhat.com/1366456 Converting rhel7 host installed on RAID:warning: fstrim: fstrim: /sysroot/: the discard operation is not supported https://bugzilla.redhat.com/1366049 RFE: libvirt backend: support handling disks stored as volume name in a pool https://bugzilla.redhat.com/1365005 Guest name is incorrect if convert guest from disk image by virt-v2v https://bugzilla.redhat.com/1362649 RFE: virt-sysprep does not utilize libguestfs encryption support https://bugzilla.redhat.com/1354507 virt-v2v conversions from vCenter do not consistently obey the proxy environment variables https://bugzilla.redhat.com/1168144 warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server https://bugzilla.redhat.com/1161019 RFE: Only install RHEV-APT if virt-v2v -o rhev/-o vdsm option is used https://bugzilla.redhat.com/1152369 virt-v2v failed to convert RHEL 6.7 UEFI guest: no grub1/grub-legacy or grub2 configuration file was found https://bugzilla.redhat.com/1141631 [RFE] virt-v2v should support convert a guest to a dir-pool with using pool's uuid https://bugzilla.redhat.com/1134878 libvirt reports json "backing file" is missing https://bugzilla.redhat.com/1019388 firstboot scripts (virt-builder, virt-sysprep) don't work for Debian 6 & 7 guests https://bugzilla.redhat.com/737600 virt-v2v windows xp - machine dies BSOD - processr,sys - workaround provided -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

1 0

[libvirt] [PATCH] qemuDomainAttachNetDevice: Support attach of type="user"
by Michal Privoznik 28 Feb '17

28 Feb '17

https://bugzilla.redhat.com/show_bug.cgi?id=1420668 This has worked in previous releases. My commit c266b60440 broke it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 97fb272f6..0c0885695 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1104,6 +1104,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, break; case VIR_DOMAIN_NET_TYPE_USER: + /* No preparation needed. */ + break; + case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: -- 2.11.0

2 1

[libvirt] A question for external snapshots with flag“VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE”
by WangJie (Captain) 28 Feb '17

28 Feb '17

Hello, I got a question here. When we create consistent active external snapshots with flag “VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE” , the qemuDomainSnapshotFSFreeze will be called firstly to freeze all filesystems in vm, and then create snapshots. For windows vm, freezing filesystems used by vss service. If IO pressure in vm is too big or internal error happened in vss , freezing filesytems will failed , and qemuDomainSnapshotFSFreeze returns 0 which meaning that no filesystems are frozen. In the function qemuDomainSnapshotCreateActiveExternal, libvirt creates external snapshots all the same in such a situation that qemuDomainSnapshotFSFreeze returns 0, but the created snapshots are not consistent snapshots in such a situation . So shouldn't we abandon creating snapshots and goto cleanup in the situation that qemuDomainSnapshotFSFreeze returns 0? The code below: static int qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainSnapshotObjPtr snap, unsigned int flags) { virObjectEventPtr event; bool resume = false; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *xml = NULL; bool memory = snap->def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; bool memory_unlink = false; bool atomic = !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC); bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed; char *compressedpath = NULL; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent * is not running, or is already quiesced. */ if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) { int freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); if (freeze < 0) { /* the helper reported the error */ if (freeze == -2) thaw = -1; /* the command is sent but agent failed */ goto cleanup; } thaw = 1; } ...... ......

2 2

[libvirt] [PATCH 0/4] Cache systemd presence
by Ján Tomko 28 Feb '17

28 Feb '17

Reduce the number of DBus calls required, and possibly the number of timeouts. Ján Tomko (4): Unify checking for machine1 systemd service Use macros for testing virSystemd APIs Cache the presence of machine1 service Test virSystemd APIs twice to check the cache effects src/libvirt_private.syms | 1 + src/util/virsystemd.c | 55 +++++++++++++++++++++++++++++++++++------------ src/util/virsystemdpriv.h | 33 ++++++++++++++++++++++++++++ tests/virsystemdtest.c | 40 ++++++++++++++++++---------------- 4 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 src/util/virsystemdpriv.h -- 2.10.2

3 6

[libvirt] [PATCH 0/8] Converge Storage Pool vHBA logic with Node Device
by John Ferlan 28 Feb '17

28 Feb '17

Similar to the recent node device focused vHBA patches, but these focus more on adjustments to the Storage Pool vHBA logic and finally the mechanism to define a vHBA for a domain. The first patch fixes a leak found by coverity that showed up because node_device_conf had enough changes so that coverity looked harder... The second patch creates a mechanism to mock creation of the vHBA in order to test the ability for the storage pool to create a vHBA. As much as I dislike forward refs for testNodeDeviceMockCreateVport, it was better than moving all the code.... The third patch extracts out storage device mgmt into it's own set of src/util API's - similar to the existing virstoragefile, but for devices. The fourth patch was uncovered while moving code from storage_backend_scsi into node_device_conf (the fifth patch)... The fifth patch moves the createVport/deleteVport guts into the node_device_conf (although they could have moved to virvhba)... The sixth patch alters the logic to use the node_device API's as the "preferred" mechanism to create/delete the vport... The seventh patch tests the storage pool vHBA creation algorithms. The eigth patch is the reason for all this stirring of the pot. Alter the domain <controller> XML in order to allow definition of a vHBA which more or less sits between a "scsi_hostX" host device and a controller. This is in preparation for https://bugzilla.redhat.com/show_bug.cgi?id=1404962 which can take that created vHBA and automagically add the LUNs from the vHBA to the domain although that requires a bit more magic for which there are already onlist patches to let qemu driver know when a node device has been added/removed. Once all that's in place - the next step will be to converge the two sets of patches. It's a chicken/egg type problem - one has to exist before the other can truly work. John Ferlan (8): conf: Fix leak in virNodeDeviceDefParseXML tests: Add createVHBAByStoragePool-by-parent to fchosttest util: Convert virStoragePoolSourceAdapter to virStorageAdapter util: Rename virFileWaitForDevices storage: Move/rename createVport and deleteVport util: Alter virNodeDevice{Create|Delete}Vport to use nodedev APIs tests: Add more storage pool vHBA tests conf: Add vHBA controller definition to domain docs/schemas/basictypes.rng | 66 ++-- docs/schemas/domaincommon.rng | 12 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 32 ++ src/conf/domain_conf.c | 180 ++++++++++- src/conf/domain_conf.h | 2 + src/conf/node_device_conf.c | 342 ++++++++++++++++++++- src/conf/node_device_conf.h | 9 + src/conf/storage_conf.c | 338 +++++--------------- src/conf/storage_conf.h | 35 +-- src/libvirt_private.syms | 20 +- src/libxl/libxl_conf.c | 1 + src/node_device/node_device_driver.c | 2 +- src/phyp/phyp_driver.c | 3 +- src/qemu/qemu_alias.c | 5 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_hotplug.c | 16 + src/storage/storage_backend_disk.c | 6 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 4 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 267 +++------------- src/storage/storage_util.c | 2 +- src/test/test_driver.c | 101 +++++- src/util/virfile.h | 2 - src/util/virscsihost.c | 28 +- src/util/virscsihost.h | 8 +- src/util/virstoragedevice.c | 292 ++++++++++++++++++ src/util/virstoragedevice.h | 89 ++++++ src/util/virutil.c | 4 +- src/util/virutil.h | 2 + tests/fchosttest.c | 111 +++++++ .../qemuxml2argv-vhba-no-parent.xml | 38 +++ .../qemuxml2argv-vhba-parent-fabric.xml | 38 +++ .../qemuxml2argv-vhba-parent-name.xml | 38 +++ .../qemuxml2argv-vhba-parent-wwns.xml | 38 +++ .../qemuxml2xmlout-vhba-no-parent.xml | 47 +++ .../qemuxml2xmlout-vhba-parent-fabric.xml | 47 +++ .../qemuxml2xmlout-vhba-parent-name.xml | 47 +++ .../qemuxml2xmlout-vhba-parent-wwns.xml | 47 +++ tests/qemuxml2xmltest.c | 9 + 42 files changed, 1727 insertions(+), 611 deletions(-) create mode 100644 src/util/virstoragedevice.c create mode 100644 src/util/virstoragedevice.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-no-parent.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-parent-fabric.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-parent-name.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-parent-wwns.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-no-parent.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-parent-fabric.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-parent-name.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-parent-wwns.xml -- 2.9.3

3 24

[libvirt] [PATCH go v2] domain.go: wrong calculation of bitmask in PinVcpuFlags()
by Leonid Podolny 28 Feb '17

28 Feb '17

--- domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain.go b/domain.go index 2bd9852..7276ef8 100644 --- a/domain.go +++ b/domain.go @@ -1768,7 +1768,7 @@ func (d *Domain) PinVcpuFlags(vcpu uint, cpuMap []bool, flags DomainModification ccpumap := make([]C.uchar, maplen) for i := 0; i < len(cpuMap); i++ { if cpuMap[i] { - byte := (i + 7) / 8 + byte := i / 8 bit := i % 8 ccpumap[byte] |= (1 << uint(bit)) } -- 2.11.1

2 1

Re: [libvirt] [Qemu-devel] Question regarding Snapshots
by Stefan Hajnoczi 27 Feb '17

27 Feb '17

On Wed, Feb 22, 2017 at 03:06:41PM -0600, Tim Cusack wrote: > I have a scenario that perhaps not many have attempted, but I still hope > that it is possible. > > Scenario: > > I would like to have a Base Windows 7 VM in KVM/QEMU. > > I would follow the following process (confirmed it works) > > 1. Shutdown running domain > - virsh shutdown <Domain> > 2. Remove existing disk from Domain XML: > - virt-xml BASE --remove-device --disk target=hda > 3. Add Correct Disk image for Snapshot to Domain XML: > - virt-xml BASE --add-device --disk > /var/lib/libvirt/images/BASE.qcow2,format=qcow2,target=hda,bus=ide > 4. Create the snapshot with description > - virsh snapshot-create-as BASE <Model>.qcow2 "OEM, Model" --disk-only > --atomic > 5. Start Snapshot > - virsh start FA2BASE This process uses libvirt instead of QEMU commands. Adding libvirt mailing list. > > All that works, but my question and issue is this: > > Can you make a snapshot, then go back to the base and ignore that snapshot > like a closed branch, make another snapshot, and then go back and forth > from each to each? > > My reasons for needing this are that I have tools and software that doesnt > play nice together, and would like to keep them separated on different > snapshots, but never really need to have more than one up at a time. > > This would allow me to have only 1 windows license per computer, and the > ability to just change from tool to tool with simple front end to virsh to > remove the disk from the .xml and add the other one. > > So like this: > Tool A is on snapshot A > Tool B is on snapshot B > go through steps 1-5 above to go back and forth. > > I know that I can not merge things back into the base, but I really don't > need to do that, in fact, I can throw away the tool snapshots when new > tools come out, by making new snapshots from the base when new tools come > out. > > We have done this already, but we had an issue where the ability to write > to the snapshots seemed to stop. > > Reason unknown, everything worked one day and next could not write to any > snapshot, but could still load the base and work on it fine. > > This might be the wrong mailing list to post to, if so, could anyone point > out a more appropriate one? > > Tim

3 3

[libvirt] [PULL 10/11] i386: Implement query-cpu-model-expansion QMP command
by Eduardo Habkost 27 Feb '17

27 Feb '17

Implement query-cpu-model-expansion for target-i386. This should meet all the requirements while being simple. In the case of static expansion, it will use the new "base" CPU model, and in the case of full expansion, it will keep the original CPU model name+props, and append extra properties. A future follow-up should improve the implementation of type=full, so that it returns more detailed data, including every writable QOM property in the CPU object. Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Message-Id: <20170222190029.17243-3-ehabkost(a)redhat.com> Tested-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- monitor.c | 4 +- target/i386/cpu.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 193 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index f8f4a07cfb..b68944d93c 100644 --- a/monitor.c +++ b/monitor.c @@ -984,8 +984,10 @@ static void qmp_unregister_commands_hack(void) #ifndef TARGET_ARM qmp_unregister_command("query-gic-capabilities"); #endif -#if !defined(TARGET_S390X) +#if !defined(TARGET_S390X) && !defined(TARGET_I386) qmp_unregister_command("query-cpu-model-expansion"); +#endif +#if !defined(TARGET_S390X) qmp_unregister_command("query-cpu-model-baseline"); qmp_unregister_command("query-cpu-model-comparison"); #endif diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0a71594445..139b7ea12e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -29,10 +29,16 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qint.h" +#include "qapi/qmp/qfloat.h" #include "qapi-types.h" #include "qapi-visit.h" #include "qapi/visitor.h" +#include "qom/qom-qobject.h" #include "sysemu/arch_init.h" #if defined(CONFIG_KVM) @@ -2288,7 +2294,7 @@ static void x86_cpu_apply_props(X86CPU *cpu, PropValue *props) } } -/* Load data from X86CPUDefinition +/* Load data from X86CPUDefinition into a X86CPU object */ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) { @@ -2297,6 +2303,11 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) char host_vendor[CPUID_VENDOR_SZ + 1]; FeatureWord w; + /*NOTE: any property set by this function should be returned by + * x86_cpu_static_props(), so static expansion of + * query-cpu-model-expansion is always complete. + */ + /* CPU models only set _minimum_ values for level/xlevel: */ object_property_set_int(OBJECT(cpu), def->level, "min-level", errp); object_property_set_int(OBJECT(cpu), def->xlevel, "min-xlevel", errp); @@ -2341,6 +2352,184 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) } +/* Return a QDict containing keys for all properties that can be included + * in static expansion of CPU models. All properties set by x86_cpu_load_def() + * must be included in the dictionary. + */ +static QDict *x86_cpu_static_props(void) +{ + FeatureWord w; + int i; + static const char *props[] = { + "min-level", + "min-xlevel", + "family", + "model", + "stepping", + "model-id", + "vendor", + "lmce", + NULL, + }; + static QDict *d; + + if (d) { + return d; + } + + d = qdict_new(); + for (i = 0; props[i]; i++) { + qdict_put_obj(d, props[i], qnull()); + } + + for (w = 0; w < FEATURE_WORDS; w++) { + FeatureWordInfo *fi = &feature_word_info[w]; + int bit; + for (bit = 0; bit < 32; bit++) { + if (!fi->feat_names[bit]) { + continue; + } + qdict_put_obj(d, fi->feat_names[bit], qnull()); + } + } + + return d; +} + +/* Add an entry to @props dict, with the value for property. */ +static void x86_cpu_expand_prop(X86CPU *cpu, QDict *props, const char *prop) +{ + QObject *value = object_property_get_qobject(OBJECT(cpu), prop, + &error_abort); + + qdict_put_obj(props, prop, value); +} + +/* Convert CPU model data from X86CPU object to a property dictionary + * that can recreate exactly the same CPU model. + */ +static void x86_cpu_to_dict(X86CPU *cpu, QDict *props) +{ + QDict *sprops = x86_cpu_static_props(); + const QDictEntry *e; + + for (e = qdict_first(sprops); e; e = qdict_next(sprops, e)) { + const char *prop = qdict_entry_key(e); + x86_cpu_expand_prop(cpu, props, prop); + } +} + +static void object_apply_props(Object *obj, QDict *props, Error **errp) +{ + const QDictEntry *prop; + Error *err = NULL; + + for (prop = qdict_first(props); prop; prop = qdict_next(props, prop)) { + object_property_set_qobject(obj, qdict_entry_value(prop), + qdict_entry_key(prop), &err); + if (err) { + break; + } + } + + error_propagate(errp, err); +} + +/* Create X86CPU object according to model+props specification */ +static X86CPU *x86_cpu_from_model(const char *model, QDict *props, Error **errp) +{ + X86CPU *xc = NULL; + X86CPUClass *xcc; + Error *err = NULL; + + xcc = X86_CPU_CLASS(cpu_class_by_name(TYPE_X86_CPU, model)); + if (xcc == NULL) { + error_setg(&err, "CPU model '%s' not found", model); + goto out; + } + + xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + if (props) { + object_apply_props(OBJECT(xc), props, &err); + if (err) { + goto out; + } + } + + x86_cpu_expand_features(xc, &err); + if (err) { + goto out; + } + +out: + if (err) { + error_propagate(errp, err); + object_unref(OBJECT(xc)); + xc = NULL; + } + return xc; +} + +CpuModelExpansionInfo * +arch_query_cpu_model_expansion(CpuModelExpansionType type, + CpuModelInfo *model, + Error **errp) +{ + X86CPU *xc = NULL; + Error *err = NULL; + CpuModelExpansionInfo *ret = g_new0(CpuModelExpansionInfo, 1); + QDict *props = NULL; + const char *base_name; + + xc = x86_cpu_from_model(model->name, + model->has_props ? + qobject_to_qdict(model->props) : + NULL, &err); + if (err) { + goto out; + } + + + switch (type) { + case CPU_MODEL_EXPANSION_TYPE_STATIC: + /* Static expansion will be based on "base" only */ + base_name = "base"; + break; + case CPU_MODEL_EXPANSION_TYPE_FULL: + /* As we don't return every single property, full expansion needs + * to keep the original model name+props, and add extra + * properties on top of that. + */ + base_name = model->name; + if (model->has_props && model->props) { + props = qdict_clone_shallow(qobject_to_qdict(model->props)); + } + break; + default: + error_setg(&err, "Unsupportted expansion type"); + goto out; + } + + if (!props) { + props = qdict_new(); + } + x86_cpu_to_dict(xc, props); + + ret->model = g_new0(CpuModelInfo, 1); + ret->model->name = g_strdup(base_name); + ret->model->props = QOBJECT(props); + ret->model->has_props = true; + +out: + object_unref(OBJECT(xc)); + if (err) { + error_propagate(errp, err); + qapi_free_CpuModelExpansionInfo(ret); + ret = NULL; + } + return ret; +} + X86CPU *cpu_x86_init(const char *cpu_model) { return X86_CPU(cpu_generic_init(TYPE_X86_CPU, cpu_model)); -- 2.11.0.259.g40922b1

1 0

Re: [libvirt] Redhat 7: cgroup CPUACCT controller is not mounted
by youssef.elfathi＠orange.com 27 Feb '17

27 Feb '17

Sorry , please ignore my message I used the wrong mailing-list! -----Original Message----- From: EL FATHI Youssef OBS/OINIS Sent: Monday, February 27, 2017 14:40 To: 'libvir-list(a)redhat.com' Subject: Redhat 7: cgroup CPUACCT controller is not mounted Hi, With a non-root user account, I am launching virtual machines and would like to get CPU stats for each Core (using python API or not) but face the following problem: - When I issue the command "virsh --readonly cpu-stats MY_DOMAIN" I got the following error: error: Failed to retrieve CPU statistics for domain 'MY_DOMAIN' error: Requested operation is not valid: cgroup CPUACCT controller is not mounted - I checked that cgroup is well mounted: $ cat /proc/mounts | grep cgroup tmpfs /sys/fs/cgroup tmpfs ro,nosuid,nodev,noexec,mode=755 0 0 cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 cgroup /sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0 cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 cgroup /sys/fs/cgroup/net_cls,net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio,net_cls 0 0 cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 $ cat /proc/cgroups #subsys_name hierarchy num_cgroups enabled cpuset 6 1 1 cpu 7 1 1 cpuacct 7 1 1 memory 11 1 1 devices 2 1 1 freezer 5 1 1 net_cls 8 1 1 blkio 10 1 1 perf_event 9 1 1 hugetlb 3 1 1 pids 4 1 1 net_prio 8 1 1 - I checked the system-cgtop but don't have no CPU info for my VMs (first line starting with /): Path Tasks %CPU Memory Input/s Output/s / 332 808.0 21.3G - - /system.slice/auditd.service 1 - - - - /system.slice/crond.service 1 - - - - /system.slice/dbus.service 1 - - - - /system.slice/gssproxy.service 1 - - - - /system.slice/irqbalance.service 1 - - - - /system.slice/ksmtuned.service 2 - - - - /system.slice/libvirtd.service 1 - - - - /system.slice/lvm2-lvmetad.service 1 - - - - /system.slice/polkit.service 1 - - - - /system.slice/rhnsd.service 1 - - - - /system.slice/rhsmcertd.service 1 - - - - /system.slice/rsyslog.service 1 - - - - /system.slice/sshd.service 1 - - - - /system.slice/system-getty.slice/getty(a)tty1.service 1 - - - - /system.slice/systemd-journald.service 1 - - - - /system.slice/systemd-logind.service 1 - - - - /system.slice/systemd-udevd.service 1 - - - - /system.slice/tuned.service 1 - - - - /user.slice/user-3972.slice/session-15191.scope 3 - - - - /user.slice/user-3972.slice/session-16005.scope 4 - - - - /user.slice/user-3972.slice/session-16019.scope 10 - - - - Thanks by advance for your help! Regards, Youssef _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you.

1 0

[libvirt] Redhat 7: cgroup CPUACCT controller is not mounted
by youssef.elfathi＠orange.com 27 Feb '17

27 Feb '17

Hi, With a non-root user account, I am launching virtual machines and would like to get CPU stats for each Core (using python API or not) but face the following problem: - When I issue the command "virsh --readonly cpu-stats MY_DOMAIN" I got the following error: error: Failed to retrieve CPU statistics for domain 'MY_DOMAIN' error: Requested operation is not valid: cgroup CPUACCT controller is not mounted - I checked that cgroup is well mounted: $ cat /proc/mounts | grep cgroup tmpfs /sys/fs/cgroup tmpfs ro,nosuid,nodev,noexec,mode=755 0 0 cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 cgroup /sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0 cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 cgroup /sys/fs/cgroup/net_cls,net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio,net_cls 0 0 cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 $ cat /proc/cgroups #subsys_name hierarchy num_cgroups enabled cpuset 6 1 1 cpu 7 1 1 cpuacct 7 1 1 memory 11 1 1 devices 2 1 1 freezer 5 1 1 net_cls 8 1 1 blkio 10 1 1 perf_event 9 1 1 hugetlb 3 1 1 pids 4 1 1 net_prio 8 1 1 - I checked the system-cgtop but don't have no CPU info for my VMs (first line starting with /): Path Tasks %CPU Memory Input/s Output/s / 332 808.0 21.3G - - /system.slice/auditd.service 1 - - - - /system.slice/crond.service 1 - - - - /system.slice/dbus.service 1 - - - - /system.slice/gssproxy.service 1 - - - - /system.slice/irqbalance.service 1 - - - - /system.slice/ksmtuned.service 2 - - - - /system.slice/libvirtd.service 1 - - - - /system.slice/lvm2-lvmetad.service 1 - - - - /system.slice/polkit.service 1 - - - - /system.slice/rhnsd.service 1 - - - - /system.slice/rhsmcertd.service 1 - - - - /system.slice/rsyslog.service 1 - - - - /system.slice/sshd.service 1 - - - - /system.slice/system-getty.slice/getty(a)tty1.service 1 - - - - /system.slice/systemd-journald.service 1 - - - - /system.slice/systemd-logind.service 1 - - - - /system.slice/systemd-udevd.service 1 - - - - /system.slice/tuned.service 1 - - - - /user.slice/user-3972.slice/session-15191.scope 3 - - - - /user.slice/user-3972.slice/session-16005.scope 4 - - - - /user.slice/user-3972.slice/session-16019.scope 10 - - - - Thanks by advance for your help! Regards, Youssef _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you.

1 0

Re: [libvirt] Fail to start 2nd guest
by Stefan Hajnoczi 27 Feb '17

27 Feb '17

On Mon, Feb 27, 2017 at 08:50:03PM +0800, Xiong Zhou wrote: > On Mon, Feb 27, 2017 at 10:11:04AM +0000, Stefan Hajnoczi wrote: > > On Mon, Feb 27, 2017 at 05:40:50PM +0800, Xiong Zhou wrote: > > > It worked fine on Linus tree commit: > > > 7bb0338 Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/.. > > > > > > failed to start 2nd domain on this commit: > > > 37c8596 Merge tag 'tty-4.11-rc1' of git://git.kernel.org/pub/scm/.. > > > (this commit probably is not the first bad, i didn't do the bisecting) > > > > > > > > > sh-4.2# uname -r > > > 4.10.0-master-37c8596+ > > > sh-4.2# rpm -qv qemu > > > qemu-2.0.0-1.el7.6.x86_64 > > > sh-4.2# ps ajxf | grep qemu > > > ... > > > sh-4.2# virsh list > > > Id Name State > > > ---------------------------------------------------- > > > 1 73h running > > > > > > sh-4.2# virsh start 73us > > > error: Failed to start domain 73us > > > error: internal error: qemu unexpectedly closed the monitor: ((null):11497): Spice-Warning **: reds.c:2499:reds_init_socket: listen: Address already in use > > > 2017-02-27T09:33:42.335708Z qemu-kvm: failed to initialize spice server > > > > The error message says that the spice remote desktop cannot listen on > > -spice port=5900,addr=127.0.0.1. > > > > Did you hardcode port 5900 in the domain XML? That could explain why > No. > > the second guest fails to launch - you need to use unique port numbers > > or let libvirt automatically assign them. Check the domain XML: > > > > <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> > > It looks like: > > <graphics type='spice' autoport='yes'> > <listen type='address'/> > <image compression='off'/> > </graphics> > > > > > > Another possibility is that a process running on the host is already > > using port 5900. Perhaps a guest or VNC server that was launched > > outside of libvirt? You can check this with: > > > > netstat -alpn | grep 5900 > # netstat -alpn | grep 5900 > tcp 0 0 127.0.0.1:5900 0.0.0.0:* LISTEN 11065/qemu-kvm Please check that 11065/qemu-kvm was launched by the same libvirtd and its domain XML also uses autoport='yes'. I have CCed the libvirt mailing list because they may be able to explain why there is a collision on TCP port 5900. Stefan

2 1

[libvirt] [PATCH 0/2] qemu: Small fix and validate the domain that actually will be started
by Marc Hartmayer 27 Feb '17

27 Feb '17

Marc Hartmayer (2): qemu: Fix incorrect jump labels in error paths qemu: Validate the domain after marking the current domain as transient src/qemu/qemu_process.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -- 2.5.5

4 11

[libvirt] [PATCH 00/14] Introduce NVDIMM support
by Michal Privoznik 27 Feb '17

27 Feb '17

NVDIMMs are new type of ultra fast storage that's plugged into DIMM slot and can hold the stored info throughout reboots. After all, NV stands for non-volatile. In virtualization world, this has an awesome advantage - less VM_EXITs on 'disk' IO. https://nvdimm.wiki.kernel.org/ Currently, there is no NVDIMM namespace support. I think qemu does not support it either. Michal Privoznik (14): qemu_cgroup: Only try to allow devices if devices CGroup's available qemuBuildMemoryBackendStr: Reorder args and update comment Introduce NVDIMM memory model qemu: Introduce QEMU_CAPS_DEVICE_NVDIMM qemu: Implement NVDIMM conf: Introduce @access to <memory/> qemu: Implement @access for <memory/> banks security_dac: Label host side of NVDIMM security_selinux: Label host side of NVDIMM security: Introduce internal APIs for memdev labelling secdrivers: Implement memdev relabel APIs qemu_hotplug: Relabel memdev qemu: Allow nvdimm in devices CGroups qemu: Namespaces for NVDIMM docs/formatdomain.html.in | 70 +++++++--- docs/schemas/domaincommon.rng | 40 ++++-- src/conf/domain_conf.c | 112 +++++++++++---- src/conf/domain_conf.h | 4 + src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 70 ++++++++++ src/qemu/qemu_cgroup.h | 4 + src/qemu/qemu_command.c | 152 ++++++++++++++------- src/qemu/qemu_command.h | 16 ++- src/qemu/qemu_domain.c | 105 +++++++++++++- src/qemu/qemu_domain.h | 8 ++ src/qemu/qemu_hotplug.c | 42 +++++- src/qemu/qemu_security.c | 56 ++++++++ src/qemu/qemu_security.h | 8 ++ src/security/security_dac.c | 76 +++++++++++ src/security/security_driver.h | 9 ++ src/security/security_manager.c | 56 ++++++++ src/security/security_manager.h | 7 + src/security/security_nop.c | 19 +++ src/security/security_selinux.c | 69 ++++++++++ src/security/security_stack.c | 38 ++++++ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-memory-hotplug-nvdimm-access.args | 26 ++++ .../qemuxml2argv-memory-hotplug-nvdimm-access.xml | 49 +++++++ .../qemuxml2argv-memory-hotplug-nvdimm.args | 26 ++++ .../qemuxml2argv-memory-hotplug-nvdimm.xml | 56 ++++++++ tests/qemuxml2argvtest.c | 6 +- .../qemuxml2xmlout-memory-hotplug-nvdimm.xml | 1 + tests/qemuxml2xmltest.c | 1 + 35 files changed, 1025 insertions(+), 120 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml -- 2.11.0

3 24

[libvirt] [PATCH RESEND] vz: make more accurate closing connection to sdk
by Nikolay Shirokovskiy 27 Feb '17

27 Feb '17

Current code for example can call unsubscribe if connection succeeds but subscribing fails. This will probabaly lead only to spurious error messages without any actual inconsistencies but nevertheless. --- src/vz/vz_driver.c | 9 ++------ src/vz/vz_sdk.c | 65 +++++++++++++++++++++++++++--------------------------- src/vz/vz_sdk.h | 2 -- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6aade90..4408591 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -163,11 +163,7 @@ static void vzDriverDispose(void * obj) { vzDriverPtr driver = obj; - if (driver->server) { - prlsdkUnsubscribeFromPCSEvents(driver); - prlsdkDisconnect(driver); - } - + prlsdkDisconnect(driver); virObjectUnref(driver->domains); virObjectUnref(driver->caps); virObjectUnref(driver->xmlopt); @@ -348,8 +344,7 @@ vzDriverObjNew(void) !(driver->domains = virDomainObjListNew()) || !(driver->domainEventState = virObjectEventStateNew()) || (vzInitVersion(driver) < 0) || - (prlsdkConnect(driver) < 0) || - (prlsdkSubscribeToPCSEvents(driver) < 0)) { + (prlsdkConnect(driver) < 0)) { virObjectUnref(driver); return NULL; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 3f46de7..4c6c3a2 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -43,6 +43,8 @@ static int prlsdkUUIDParse(const char *uuidstr, unsigned char *uuid); static void prlsdkConvertError(PRL_RESULT pret); +static PRL_RESULT +prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque); VIR_LOG_INIT("parallels.sdk"); @@ -363,41 +365,62 @@ prlsdkConnect(vzDriverPtr driver) job = PrlSrv_LoginLocalEx(driver->server, NULL, 0, PSL_HIGH_SECURITY, PACF_NON_INTERACTIVE_MODE); if (PRL_FAILED(getJobResult(job, &result))) - goto cleanup; + goto destroy; pret = PrlResult_GetParam(result, &response); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetGoto(pret, logoff); pret = prlsdkGetStringParamBuf(PrlLoginResponse_GetSessionUuid, response, session_uuid, sizeof(session_uuid)); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetGoto(pret, logoff); if (prlsdkUUIDParse(session_uuid, driver->session_uuid) < 0) - goto cleanup; + goto logoff; + + pret = PrlSrv_RegEventHandler(driver->server, + prlsdkEventsHandler, + driver); + prlsdkCheckRetGoto(pret, logoff); ret = 0; cleanup: - if (ret < 0) { - PrlHandle_Free(driver->server); - driver->server = PRL_INVALID_HANDLE; - } - PrlHandle_Free(result); PrlHandle_Free(response); return ret; + + logoff: + job = PrlSrv_Logoff(driver->server); + waitJob(job); + + destroy: + PrlHandle_Free(driver->server); + driver->server = PRL_INVALID_HANDLE; + + goto cleanup; } void prlsdkDisconnect(vzDriverPtr driver) { PRL_HANDLE job; + PRL_RESULT ret; + + if (driver->server == PRL_INVALID_HANDLE) + return; + + ret = PrlSrv_UnregEventHandler(driver->server, + prlsdkEventsHandler, + driver); + if (PRL_FAILED(ret)) + logPrlError(ret); job = PrlSrv_Logoff(driver->server); waitJob(job); PrlHandle_Free(driver->server); + driver->server = PRL_INVALID_HANDLE; } static int @@ -2334,30 +2357,6 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) return PRL_ERR_SUCCESS; } -int prlsdkSubscribeToPCSEvents(vzDriverPtr driver) -{ - PRL_RESULT pret = PRL_ERR_UNINITIALIZED; - - pret = PrlSrv_RegEventHandler(driver->server, - prlsdkEventsHandler, - driver); - prlsdkCheckRetGoto(pret, error); - return 0; - - error: - return -1; -} - -void prlsdkUnsubscribeFromPCSEvents(vzDriverPtr driver) -{ - PRL_RESULT ret = PRL_ERR_UNINITIALIZED; - ret = PrlSrv_UnregEventHandler(driver->server, - prlsdkEventsHandler, - driver); - if (PRL_FAILED(ret)) - logPrlError(ret); -} - int prlsdkStart(virDomainObjPtr dom) { PRL_HANDLE job = PRL_INVALID_HANDLE; diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index 7e34cbf..f8da2ad 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -35,8 +35,6 @@ prlsdkAddDomainByUUID(vzDriverPtr driver, const unsigned char *uuid); virDomainObjPtr prlsdkAddDomainByName(vzDriverPtr driver, const char *name); int prlsdkUpdateDomain(vzDriverPtr driver, virDomainObjPtr dom); -int prlsdkSubscribeToPCSEvents(vzDriverPtr driver); -void prlsdkUnsubscribeFromPCSEvents(vzDriverPtr driver); int prlsdkStart(virDomainObjPtr dom); int prlsdkKill(virDomainObjPtr dom); -- 1.8.3.1

2 2

[libvirt] [PATCH v2 0/2] tests: Reduce QEMU_CAPS_DEVICE_{DMI_TO_, }PCI_BRIDGE usage
by Andrea Bolognani 24 Feb '17

24 Feb '17

Changes from v1: * don't drop capabilities for a bunch of test cases, so that potential regressions will be still caught. Andrea Bolognani (2): tests: Sync tests between qemuxml2argv and qemuxml2xml tests: Reduce QEMU_CAPS_DEVICE_{DMI_TO_, }PCI_BRIDGE usage .../qemuxml2argvdata/qemuxml2argv-pci-bridge.args | 90 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 97 +++------- .../qemuxml2argv-vcpu-placement-static.args | 20 ++ tests/qemuxml2argvtest.c | 109 +++++------ .../qemuxml2xmlout-boot-floppy-q35.xml | 32 +++ .../qemuxml2xmlout-bootindex-floppy-q35.xml | 32 +++ .../qemuxml2xmlout-intel-iommu-machine.xml | 26 +++ .../qemuxml2xmlout-pci-bridge.xml | 98 ++++------ .../qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml | 214 +++++++++++++++++++++ ...qemuxml2xmlout-video-device-pciaddr-default.xml | 51 +++++ tests/qemuxml2xmltest.c | 130 +++++++++---- 11 files changed, 665 insertions(+), 234 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-device-pciaddr-default.xml -- 2.7.4

3 4

[libvirt] RFC: Making storage vol upload/download more useful
by Daniel P. Berrange 24 Feb '17

24 Feb '17

The virStorageVolUpload/Download APIs currently require that you upload the physical disk image content, rather than the virtual disk image content. ie the entire qcow2 file, not just its payload. While this is certainly useful in some scenarios, it is rather unhelpful, if not dangerous, in others. For example, a qcow2 file can contain a backing file that points to anything on the host filesystem and libvirt happily accepts it. The best you can do is to query the volume XML again after upload and see if it now reports a backing file. It would be highly desirable to block this kind of thing before upload, because you don't want the act of uploading to cause libvirt to open these arbitrary files. In fact no matter what format you're storage volume currently is, when you're uploading new content at a physical level, it can change to any other format. If uploading non-raw files, there's also no way to restrict the size of the files uploaded. ie you can upload a 256 KB sized qcow2 file whose logical disk size is 4 exabytes. Again you can only detect this after you've uploaded it, unless you're willing to run qemu-img manually before upload, or write your own parser to validate upfront. I would probably ok to just ignore this problem - checking after the fact doesn't cause security problems, as the large logical size is an issue until the disk is given to a guest for use. Finally, you might not even have the file in the desired format. For example, someone might have given you a raw file,but you want to store everything as qcow2 files. Currently you would have to create a new volume, upload the content to a new volume, delete the existing volume and use virStorageVolCreateFrom to re-create it again with a forkmat conversion, before finally deleting the temporary upload. It would be very nice to be able to upload straight into the payload of an existing file in one go - even if libvirt has to do a qemu-img conversion in the process. Some of these problems can be fixed with adding flags. For example I would suggest - VIR_STORAGE_VOL_UPLOAD_VIRTUAL => the stream provides the virtual disk image payload, not a physical disk image container - VIR_STORAGE_VOL_UPLOAD_FIXED_FORMAT => when VIRTUAL is not set, this indicates that the physical source format, must match the current storage vol format. ie don't allow the upload to change the image format by uploading a raw file into a qcow2 file or vica-verca - VIR_STORAGE_VOL_UPLOAD_NO_BACKING_FILE => when VIRUTAL is not set this indicates that the uploaded content must not be permitted to have any backing file set. To allow on the fly conversion of data when using the VIRTUAL flag though, we need a new API to expose the stream data format, otherwise libvirt would have to probe stream format to know what to convert from, and that is unsafe from a security POV: virStorageVolUploadConvert(virStorageVolPtr vol, virStreamPtr stream, int srcFormat, unsigned long long offset, unsigned long long length, unsigned int flags); The srcFormat parameter would map to virStorageFileFormat enum, which would need to become public. It says what format the stream is providing data in. In terms of implementation we would have to write the data into a temporary file, and then use qemu-img convert to get it into the actual file we want. We can't feed straight into qemu-img convert, since it needs a seekable file as input & output. If we had this functionality, then I think it would be possible for apps to deal with storage uploads from end users, without having to run qemu-img manually to validate data outside libvirt. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|

1 0

[libvirt] Entering freeze for libvirt 3.1.0
by Daniel Veillard 24 Feb '17

24 Feb '17

Hi everybody, as planned I just tagged the RC1 in git and uploded the signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work fine in my limited testing, but more testing especially on different platforms and system is needed. https://ci.centos.org/view/libvirt/ is all green except for on small test so it looks like in good shape ATM, but please give it a try ! I hope to be able to make RC2 on Tuesday which would allow a final release on Thursday 2nd if everything goes well, thanks in advance, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] virfile: Fix virFileExists commentary
by Erik Skultety 24 Feb '17

24 Feb '17

Arguably though, function returning only on success is a very interesting, although quite impractical concept. Also, the errno isn't and shouldn't be preserved in this case, since the errno can be directly fed to the virReportSystemError. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. src/util/virfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 6ba67bf..41cdca9 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1820,7 +1820,8 @@ virFileIsDir(const char *path) * virFileExists: Check for presence of file * @path: Path of file to check * - * Returns if the file exists. Preserves errno in case it does not exist. + * Returns true if the file exists, false if it doesn't, setting errno + * appropriately. */ bool virFileExists(const char *path) -- 2.10.2

1 0

[libvirt] [PATCH v2 0/3] introduce virBufferEscapeN and fix escape bug
by Pavel Hrdina 24 Feb '17

24 Feb '17

I've dropped the STRCAT patches in v2. The whole purpose of the STRCAT was to avoid calling *strcspn* several times but it was probably a bad call. Now we call that function for each pair but if no escaping is required we at least don't allocate the structure for that pair and later in the *virBufferEscapeN* we only iterate over the pairs that will escape at least one character. Pavel Hrdina (3): util: virbuffer: introduce virBufferEscapeN util: virqemu: introduce virQEMUBuildBufferEscape qemu: properly escape socket path for graphics src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 6 +- src/util/virbuffer.c | 101 +++++++++++++++++++++ src/util/virbuffer.h | 2 + src/util/virqemu.c | 17 ++++ src/util/virqemu.h | 1 + .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.xml | 7 +- tests/qemuxml2argvtest.c | 3 +- tests/virbuftest.c | 41 +++++++++ 10 files changed, 179 insertions(+), 6 deletions(-) -- 2.11.1

2 6

Re: [libvirt] A question for external snapshots with flag“VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE”
by Richard W.M. Jones 24 Feb '17

24 Feb '17

[Adding the correct mailing list, removing libvirt-list-owner] On Fri, Feb 24, 2017 at 05:35:31PM +0800, WangJie (Captain) wrote: > Hello, I got a question here. When we create consistent active external snapshots with flag “VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE” , the qemuDomainSnapshotFSFreeze will be called firstly to freeze all filesystems in vm, and then create snapshots. For windows vm, freezing filesystems used by vss service. If IO pressure in vm is too big or internal error happened in vss , freezing filesytems will failed , and qemuDomainSnapshotFSFreeze returns 0 which meaning that no filesystems are frozen. In the function qemuDomainSnapshotCreateActiveExternal, libvirt creates external snapshots all the same in such a situation that qemuDomainSnapshotFSFreeze returns 0, but the created snapshots are not consistent snapshots in such a situation . So shouldn't we abandon creating snapshots and goto cleanup in the situation that qemuDomainSnapshotFSFreeze returns 0? > > > The code below: > > > static int > qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, > virQEMUDriverPtr driver, > virDomainObjPtr vm, > virDomainSnapshotObjPtr snap, > unsigned int flags) > { > virObjectEventPtr event; > bool resume = false; > int ret = -1; > qemuDomainObjPrivatePtr priv = vm->privateData; > char *xml = NULL; > bool memory = snap->def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; > bool memory_unlink = false; > bool atomic = !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC); > bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); > int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ > bool pmsuspended = false; > virQEMUDriverConfigPtr cfg = NULL; > int compressed; > char *compressedpath = NULL; > > /* If quiesce was requested, then issue a freeze command, and a > * counterpart thaw command when it is actually sent to agent. > * The command will fail if the guest is paused or the guest agent > * is not running, or is already quiesced. */ > if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) { > int freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); > if (freeze < 0) { > /* the helper reported the error */ > if (freeze == -2) > thaw = -1; /* the command is sent but agent failed */ > goto cleanup; > } > thaw = 1; > } > > ...... > ...... -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

1 0

[libvirt] [PATCH] qemuProcessInit: Jump onto correct label in case of error
by Michal Privoznik 24 Feb '17

24 Feb '17

After eca76884ea in case of error in qemuDomainSetPrivatePaths() in pretended start we jump to stop. I've changed this during review from 'cleanup' which turned out to be correct. Well, sort of. We can't call qemuProcessStop() as it decrements driver->nactive and we did not increment it. However, it calls virDomainObjRemoveTransientDef() which is basically the only function we need to call. So call that function and goto cleanup; Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index df1fa0371..9306e0e18 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4758,8 +4758,10 @@ qemuProcessInit(virQEMUDriverPtr driver, goto cleanup; if (flags & VIR_QEMU_PROCESS_START_PRETEND) { - if (qemuDomainSetPrivatePaths(driver, vm) < 0) - goto stop; + if (qemuDomainSetPrivatePaths(driver, vm) < 0) { + virDomainObjRemoveTransientDef(vm); + goto cleanup; + } } else { vm->def->id = qemuDriverAllocateID(driver); qemuDomainSetFakeReboot(driver, vm, false); -- 2.11.0

3 4

[libvirt] [PATCH go v2] Add support for perf events
by Nitesh Konkar 24 Feb '17

24 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- connect.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain_compat.h | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/connect.go b/connect.go index 3c53485..e24cf66 100644 --- a/connect.go +++ b/connect.go @@ -2264,6 +2264,24 @@ type DomainStatsPerf struct { StalledCyclesBackend uint64 RefCpuCyclesSet bool RefCpuCycles uint64 + CpuClockSet bool + CpuClock uint64 + TaskClockSet bool + TaskClock uint64 + PageFaultsSet bool + PageFaults uint64 + ContextSwitchesSet bool + ContextSwitches uint64 + CpuMigrationsSet bool + CpuMigrations uint64 + PageFaultsMinSet bool + PageFaultsMin uint64 + PageFaultsMajSet bool + PageFaultsMaj uint64 + AlignmentFaultsSet bool + AlignmentFaults uint64 + EmulationFaultsSet bool + EmulationFaults uint64 } func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParamsFieldInfo { @@ -2320,6 +2338,42 @@ func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParams set: &params.RefCpuCyclesSet, ul: &params.RefCpuCycles, }, + "perf.cpu_clock": typedParamsFieldInfo{ + set: &params.CpuClockSet, + ul: &params.CpuClock, + }, + "perf.task_clock": typedParamsFieldInfo{ + set: &params.TaskClockSet, + ul: &params.TaskClock, + }, + "perf.page_faults": typedParamsFieldInfo{ + set: &params.PageFaultsSet, + ul: &params.PageFaults, + }, + "perf.context_switches": typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + ul: &params.ContextSwitches, + }, + "perf.cpu_migrations": typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + ul: &params.CpuMigrations, + }, + "perf.page_faults_min": typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + ul: &params.PageFaultsMin, + }, + "perf.page_faults_maj": typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + ul: &params.PageFaultsMaj, + }, + "perf.alignment_faults": typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + ul: &params.AlignmentFaults, + }, + "perf.emulation_faults": typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + ul: &params.EmulationFaults, + }, } } diff --git a/domain.go b/domain.go index 2bd9852..1cb0b95 100644 --- a/domain.go +++ b/domain.go @@ -3195,6 +3195,24 @@ type DomainPerfEvents struct { StalledCyclesBackend bool RefCpuCyclesSet bool RefCpuCycles bool + CpuClockSet bool + CpuClock bool + TaskClockSet bool + TaskClock bool + PageFaultsSet bool + PageFaults bool + ContextSwitchesSet bool + ContextSwitches bool + CpuMigrationsSet bool + CpuMigrations bool + PageFaultsMinSet bool + PageFaultsMin bool + PageFaultsMajSet bool + PageFaultsMaj bool + AlignmentFaultsSet bool + AlignmentFaults bool + EmulationFaultsSet bool + EmulationFaults bool } /* Remember to also update DomainStatsPerf in connect.go when adding to the stuct above */ @@ -3253,6 +3271,42 @@ func getDomainPerfEventsFieldInfo(params *DomainPerfEvents) map[string]typedPara set: &params.RefCpuCyclesSet, b: &params.RefCpuCycles, }, + C.VIR_PERF_PARAM_CPU_CLOCK: typedParamsFieldInfo{ + set: &params.CpuClockSet, + b: &params.CpuClock, + }, + C.VIR_PERF_PARAM_TASK_CLOCK: typedParamsFieldInfo{ + set: &params.TaskClockSet, + b: &params.TaskClock, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS: typedParamsFieldInfo{ + set: &params.PageFaultsSet, + b: &params.PageFaults, + }, + C.VIR_PERF_PARAM_CONTEXT_SWITCHES: typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + b: &params.ContextSwitches, + }, + C.VIR_PERF_PARAM_CPU_MIGRATIONS: typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + b: &params.CpuMigrations, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MIN: typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + b: &params.PageFaultsMin, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MAJ: typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + b: &params.PageFaultsMaj, + }, + C.VIR_PERF_PARAM_ALIGNMENT_FAULTS: typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + b: &params.AlignmentFaults, + }, + C.VIR_PERF_PARAM_REF_EMULATION_FAULTS: typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + b: &params.EmulationFaults, + }, } } diff --git a/domain_compat.h b/domain_compat.h index 9540435..a114173 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -45,6 +45,42 @@ #define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" #endif +#ifndef VIR_PERF_PARAM_CPU_CLOCK +#define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" +#endif + +#ifndef VIR_PERF_PARAM_TASK_CLOCK +#define VIR_PERF_PARAM_TASK_CLOCK "task_clock" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS +#define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" +#endif + +#ifndef VIR_PERF_PARAM_CONTEXT_SWITCHES +#define VIR_PERF_PARAM_CONTEXT_SWITCHES "context_switches" +#endif + +#ifndef VIR_PERF_PARAM_CPU_MIGRATIONS +#define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MIN +#define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MAJ +#define VIR_PERF_PARAM_PAGE_FAULTS_MAJ "page_faults_maj" +#endif + +#ifndef VIR_PERF_PARAM_ALIGNMENT_FAULTS +#define VIR_PERF_PARAM__ALIGNMENT_FAULTS "alignment_faults" +#endif + +#ifndef VIR_PERF_PARAM_EMULATION_FAULTS +#define VIR_PERF_PARAM_EMULATION_FAULTS "emulation_faults" +#endif + #ifndef VIR_DOMAIN_EVENT_ID_METADATA_CHANGE #define VIR_DOMAIN_EVENT_ID_METADATA_CHANGE 23 #endif -- 1.9.3

3 5

[libvirt] [PATCH 00/13] Add TLS support for migration
by John Ferlan 24 Feb '17

24 Feb '17

Patches 1, 3 -> 9 are primarily quite a bit of code motion in order to allow reuse of the "core" of the chardev TLS code. Theoretically speaking of course, these patches should work - I don't have a TLS and migration environment to test with, so between following the qemu command model on Daniel's blog and prior experience with the chardev TLS would I added the saving of a flag to the private qemu domain state, although I'm not 100% sure it was necessary. At one time I created the source TLS objects during the Begin phase, but later decided to wait until just before the migration is run. I think the main reason to have the flag would be a restart of libvirtd to let 'something' know migration using TLS was configured. I think it may only be "necessary" in order to repopulate the migSecinfo after libvirtd restart, but it's not entirely clear. By the time I started thinking more about while writing this cover letter it was too late to just remove. Also rather than create the destination host TLS objects on the fly, I modified the command line generation. That model could change to adding the TLS objects once the destination is started and before the params are set for the migration. This 'model' is also going to be used for the NBD, but I figured I'd get this posted now since it was already too long of a series. John Ferlan (13): qemu: Create #define for TLS configuration setup. conf: Introduce migrate_tls_x509_cert_dir qemu: Rename qemuAliasTLSObjFromChardevAlias qemu: Introduce qemuDomainSecretMigrate{Prepare|Destroy} qemu: Refactor hotplug to introduce qemuDomain{Add|Del}TLSObjects qemu: Refactor qemuDomainGetChardevTLSObjects to converge code qemu: Move qemuDomainSecretChardevPrepare call qemu: Move qemuDomainPrepareChardevSourceTLS call qemu: Introduce qemuDomainGetTLSObjects qemu: Add TLS params to _qemuMonitorMigrationParams Add new migration flag VIR_MIGRATE_TLS qemu: Set up the migrate TLS objects for target qemu: Set up the migration TLS objects for source include/libvirt/libvirt-domain.h | 8 + src/qemu/libvirtd_qemu.aug | 6 + src/qemu/qemu.conf | 39 +++++ src/qemu/qemu_alias.c | 8 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_command.c | 33 +++- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_conf.c | 43 +++-- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_domain.c | 78 ++++++++++ src/qemu/qemu_domain.h | 89 ++++++----- src/qemu/qemu_hotplug.c | 312 ++++++++++++++++++++----------------- src/qemu/qemu_hotplug.h | 24 +++ src/qemu/qemu_migration.c | 135 ++++++++++++++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_monitor.c | 12 +- src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 13 +- src/qemu/qemu_process.c | 4 + src/qemu/test_libvirtd_qemu.aug.in | 4 + tools/virsh-domain.c | 7 + 21 files changed, 625 insertions(+), 209 deletions(-) -- 2.9.3

4 48

[libvirt] [RFC PATCH 00/12] Add block write threshold event
by Peter Krempa 24 Feb '17

24 Feb '17

Since I'm a procrastinator and I wanted to do this after full node-name support is added I'm kind of late for this release here. Since oVirt is asking for this feature for a very long time I would like to deliver it ASAP though. This series adds a event which is fired once a guest writes beyond a configured offset in the backing file. The threshold offset is configurable via a new API. This series is in RFC state since I did not manage to polish few details mostly connected to node names: - currently only the top level image can be selected - some blockjobs may clear the remembered node names and thus break this ( re-detection of the backing chain needs to be connected with node name detection ) - the node name detection code is VERY crude - I'm not sure how well it plays with qcow images, since I select only the top level node (qcow protocol) rather than the file backing it - the documentation probably sucks since I did not proof-read Any feedback is welcome. Peter Krempa (12): util: storage: Split out useful bits of virStorageFileParseChainIndex util: storage: Add preliminary storage for node names into virStorageSource lib: Introduce event for tracking disk backing file write threshold qemu: monitor: Add support for BLOCK_WRITE_THRESHOLD event qemu: domain: Add helper to lookup disk by node name qemu: domain: Add helper to generate indexed backing store names qemu: process: Wire up firing of the VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD event lib: Add API for setting the threshold size for VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD virsh: Implement 'blockthreshold' command to call virDomainSetBlockThreshold qemu: domain: Add helper to look up disk soruce by the backing store string qemu: implement qemuDomainSetBlockThreshold qemu: WIP: lookup nodenames daemon/remote.c | 43 +++++++++ examples/object-events/event-test.c | 19 ++++ include/libvirt/libvirt-domain.h | 36 +++++++ src/conf/domain_event.c | 97 +++++++++++++++++++ src/conf/domain_event.h | 15 +++ src/driver-hypervisor.h | 8 ++ src/libvirt-domain.c | 51 ++++++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 103 ++++++++++++++++++++ src/qemu/qemu_domain.h | 14 +++ src/qemu/qemu_driver.c | 64 +++++++++++++ src/qemu/qemu_monitor.c | 42 ++++++++- src/qemu/qemu_monitor.h | 19 ++++ src/qemu/qemu_monitor_json.c | 65 ++++++++++++- src/qemu/qemu_monitor_json.h | 6 ++ src/qemu/qemu_process.c | 41 ++++++++ src/remote/remote_driver.c | 34 +++++++ src/remote/remote_protocol.x | 33 ++++++- src/remote_protocol-structs | 16 ++++ src/util/virstoragefile.c | 105 ++++++++++++++++++--- src/util/virstoragefile.h | 14 +++ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tools/virsh-domain.c | 84 +++++++++++++++++ tools/virsh.pod | 8 ++ 37 files changed, 922 insertions(+), 14 deletions(-) -- 2.11.1

2 20

[libvirt] [PATCH] qemu_process: spice: don't release used port
by Pavel Hrdina 24 Feb '17

24 Feb '17

The port is stored in graphics configuration and it will also get released in qemuProcessStop in case of error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1397440 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index df1fa0371d..760507d957 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3693,7 +3693,6 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, ret = 0; cleanup: - virPortAllocatorRelease(driver->remotePorts, port); virObjectUnref(cfg); return ret; } -- 2.11.1

2 1

[libvirt] [PATCH] qemu: Don't update physical storage size of empty drives
by Peter Krempa 24 Feb '17

24 Feb '17

Previously the code called virStorageSourceUpdateBlockPhysicalSize which did not do anything on empty drives since it worked only on block devices. After the refactor in c5f6151390 it's called for all devices and thus attempts to deref the NULL path of empty drives. Add a check that skips the update of the physical size if the storage source is empty. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1420718 --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6e1e3d408..77d81755a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11336,6 +11336,9 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverPtr driver, int fd = -1; struct stat sb; + if (virStorageSourceIsEmpty(src)) + return 0; + if (qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb) < 0) return -1; -- 2.11.1

2 1

[libvirt] Proposal PCI/PCIe device placement on PAPR guests
by David Gibson 23 Feb '17

23 Feb '17

There was a discussion back in November on the qemu list which spilled onto the libvirt list about how to add support for PCIe devices to POWER VMs, specifically 'pseries' machine type PAPR guests. Here's a more concrete proposal for how to handle part of this in future from the libvirt side. Strictly speaking what I'm suggesting here isn't intrinsically linked to PCIe: it will make adding PCIe support sanely easier, as well as having a number of advantages for both PCIe and plain-PCI devices on PAPR guests. Background: * Currently the pseries machine type only supports vanilla PCI buses. * This is a qemu limitation, not something inherent - PAPR guests running under PowerVM (the IBM hypervisor) can use passthrough PCIe devices (PowerVM doesn't emulate devices though). * In fact the way PCI access is para-virtalized in PAPR makes the usual distinctions between PCI and PCIe largely disappear * Presentation of PCIe devices to PAPR guests is unusual * Unlike x86 - and other "bare metal" platforms, root ports are not made visible to the guest. i.e. all devices (typically) appear as though they were integrated devices on x86 * In terms of topology all devices will appear in a way similar to a vanilla PCI bus, even PCIe devices * However PCIe extended config space is accessible * This means libvirt's usual placement of PCIe devices is not suitable for PAPR guests * PAPR has its own hotplug mechanism * This is used instead of standard PCIe hotplug * This mechanism works for both PCIe and vanilla-PCI devices * This can hotplug/unplug devices even without a root port P2P bridge between it and the root "bus * Multiple independent host bridges are routine on PAPR * Unlike PC (where all host bridges have multiplexed access to configuration space) PCI host bridges (PHBs) are truly independent for PAPR guests (disjoint MMIO regions in system address space) * PowerVM typically presents a separate PHB to the guest for each host slot passed through The Proposal: I suggest that libvirt implement a new default algorithm for placing (i.e. assigning addresses to) both PCI and PCIe devices for (only) PAPR guests. The short summary is that by default it should assign each device to a separate vPHB, creating vPHBs as necessary. * For passthrough sometimes a group of host devices can't be safely isolated from each other - this is known as a (host) Partitionable Endpoint (PE). In this case, if any device in the PE is passed through to a guest, the whole PE must be passed through to the same vPHB in the guest. From the guest POV, each vPHB has exactly one (guest) PE. * To allow for hotplugged devices, libvirt should also add a number of additional, empty vPHBs (the PAPR spec allows for hotplug of PHBs, but this is not yet implemented in qemu). When hotplugging a new device (or PE) libvirt should locate a vPHB which doesn't currently contain anything. * libvirt should only (automatically) add PHBs - never root ports or other PCI to PCI bridges In order to handle migration, the vPHBs will need to be represented in the domain XML, which will also allow the user to override this topology if they want. Advantages: There are still some details I need to figure out w.r.t. handling PCIe devices (on both the qemu and libvirt sides). However the fact that PAPR guests don't typically see PCIe root ports means that the normal libvirt PCIe allocation scheme won't work. This scheme has several advantages with or without support for PCIe devices: * Better performance for 32-bit devices With multiple devices on a single vPHB they all must share a (fairly small) 32-bit DMA/IOMMU window. With separate PHBs they each have a separate window. PAPR guests have an always-on guest visible IOMMU. * Better EEH handling for passthrough devices EEH is an IBM hardware-assisted mechanism for isolating and safely resetting devices experiencing hardware faults so they don't bring down other devices or the system at large. It's roughly similar to PCIe AER in concept, but has a different IBM specific interface, and works on both PCI and PCIe devices. Currently the kernel interfaces for handling EEH events on passthrough devices will only work if there is a single (host) iommu group in the vfio container. While lifting that restriction would be nice, it's quite difficult to do so (it requires keeping state synchronized between multiple host groups). That also means that an EEH error on one device could stop another device where that isn't required by the actual hardware. The unit of EEH isolation is a PE (Partitionable Endpoint) and currently there is only one guest PE per vPHB. Changing this might also be possible, but is again quite complex and may result in confusing and/or broken distinctions between groups for EEH isolation and IOMMU isolation purposes. Placing separate host groups in separate vPHBs sidesteps these problems. * Guest NUMA node assignment of devices PAPR does not (and can't reasonably) use the pxb device. Instead to allocate devices to different guest NUMA nodes they should be placed on different vPHBs. Placing them on different PHBs by default allows NUMA node to be assigned to those PHBs in a straightforward manner. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson

7 26

[libvirt] [PATCH v3 0/3] target-i386: Implement query-cpu-model-expansion
by Eduardo Habkost 23 Feb '17

23 Feb '17

This series implements query-cpu-model-expansion on target-i386. Changes v2 -> v3: ----------------- * Rebased on top of my x86-next branch: https://github.com/ehabkost/qemu x86-next * Added new patch that will extend type=full expansion to return every (writeable) QOM property from the CPU object Git branch for testing: https://github.com/ehabkost/qemu-hacks work/x86-query-cpu-expansion libvirt code to use the new feature already exist, and were submitted to libvir-list, at: https://www.mail-archive.com/libvir-list@redhat.com/msg142168.html Changes v1 -> v2: ----------------- This version is highly simplified compared to v1. It contains only an implementation that will return a limited set of properties. I have a follow-up series that will expend type=full expansion to return every single QOM property [note: this is now implemented in v3], but this version will return the same data for type=static and type=full expansion for simplicity (except that type=static expansion will use the "base" CPU model as base). This means this version also won't include "pmu" and "host-cache-info" in full expansion, and won't require special code for those properties. The unit test code was also removed in this version, to keep the series simple and easier to review. Most of the patches on the previous series were changes just to make the test case work. I will send the test-case-related changes as a follow-up series. --- Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: "Jason J. Herne" <jjherne(a)linux.vnet.ibm.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Richard Henderson <rth(a)twiddle.net> Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Eduardo Habkost (3): target-i386: Define static "base" CPU model target-i386: Implement query-cpu-model-expansion QMP command i386: Improve query-cpu-model-expansion full mode target/i386/cpu-qom.h | 2 + monitor.c | 4 +- target/i386/cpu.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 243 insertions(+), 2 deletions(-) -- 2.11.0.259.g40922b1

1 2

[libvirt] [PATCH 0/5] virstring and virbuffer improvements and bug fix
by Pavel Hrdina 23 Feb '17

23 Feb '17

Pavel Hrdina (5): util: virstring: introduce virStrcat and VIR_STRCAT util: use VIR_STRCAT instead of strcat util: virbuffer: introduce virBufferEscapeN util: virqemu: introduce virQEMUBuildBufferEscape qemu: properly escape socket path for graphics cfg.mk | 16 ++-- src/libvirt_private.syms | 4 + src/qemu/qemu_command.c | 6 +- src/storage/storage_backend_logical.c | 6 +- src/test/test_driver.c | 2 +- src/util/virbuffer.c | 104 +++++++++++++++++++++ src/util/virbuffer.h | 2 + src/util/vircgroup.c | 4 +- src/util/virqemu.c | 17 ++++ src/util/virqemu.h | 1 + src/util/virstring.c | 70 ++++++++++++++ src/util/virstring.h | 27 ++++++ src/xen/xend_internal.c | 2 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.xml | 7 +- tests/qemuxml2argvtest.c | 3 +- tests/virbuftest.c | 41 ++++++++ tests/virstringtest.c | 49 ++++++++++ 18 files changed, 345 insertions(+), 21 deletions(-) -- 2.11.1

3 15

[libvirt] [PATCH 0/4] Fix build with GCC 7
by Daniel P. Berrange 23 Feb '17

23 Feb '17

As always with new GCC major releases, we've tickled some new warnings. What's nice is that two of them identified genuine bugs in our code. I would push this as a build-breaker fix, but I wanted some visibility on the fourth patch before doing that, as it was not the usual type of quick fix. Daniel P. Berrange (4): Use explicit boolean comparison in OOM check libxl: fix empty string check for channel path qemu: add missing break in qemuDomainDeviceCalculatePCIConnectFlags Add ATTRIBUTE_FALLTHROUGH for switch cases without break src/conf/domain_conf.c | 7 +++++++ src/conf/network_conf.c | 3 ++- src/internal.h | 8 ++++++++ src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 6 ++++++ src/qemu/qemu_domain_address.c | 1 + src/util/viralloc.c | 2 +- tools/virsh-edit.c | 2 +- 9 files changed, 28 insertions(+), 5 deletions(-) -- 2.9.3

7 26

[libvirt] [PATCH v2 00/33] qemu: Detect host CPU model by asking QEMU on x86_64
by Jiri Denemark 23 Feb '17

23 Feb '17

Until now host-model CPU mode tried to enable all CPU features supported by the host CPU even if QEMU/KVM did not support them. This caused a number of issues and made host-model quite unreliable. Asking QEMU for the CPU it can provide and the current host makes host-model much more robust. This series fixes the following bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1018251 https://bugzilla.redhat.com/show_bug.cgi?id=1371617 https://bugzilla.redhat.com/show_bug.cgi?id=1372581 https://bugzilla.redhat.com/show_bug.cgi?id=1404627 https://bugzilla.redhat.com/show_bug.cgi?id=870071 In addition to that, the following bug should be mostly limited to cases when an unsupported feature is explicitly requested: https://bugzilla.redhat.com/show_bug.cgi?id=1335534 The series relies on features which are not in QEMU yet, but should be hopefully close enough to be pushed in 2.9.0. In the meantime, Eduardo's work/x86-query-cpu-expansion-full branch can be used to play with them. Version 2: - properly set vendor property in converted test data files - fix cpu-parse.sh to use "x86_64" prefix for the generated files Jiri Denemark (33): docs: Drop obsolete statement about CPU modes and migration docs: Fix since statement in host-model documentation qemucapstest: Add test data for QEMU 2.9.0 domaincapstest: Add test data for QEMU 2.9.0 qemu: Refactor virQEMUCapsInitHostCPUModel qemu: Skip virQEMUCapsCPUFilterFeatures on non-x86 CPUs qemu: Fix CPU model fallback in domain capabilities docs: Update description of the host-model CPU mode qemu: Introduce virQEMUCapsFormatHostCPUModelInfo qemu: Rename hostCPU/feature element in capabilities cache qemu: Store more types in qemuMonitorCPUModelInfo qemu: Probe "max" CPU model in TCG cpu: Introduce virCPUDataNew cpu_x86: Drop virCPUx86MakeData and use virCPUDataNew cpu_x86: Make virCPUx86DataClear static cpu: Rework cpuDataFree cpu_x86: Make virCPUx86DataAddCPUID work with virCPUDataPtr cpu_x86: Introduce virCPUx86DataSetSignature cpu_x86: Introduce virCPUx86DataSetVendor cpu_x86: Introduce virCPUx86DataAddFeature cpu: Use virCPUData.arch in cpuDecode qemu: Get host CPU model from QEMU on x86_64 qemu: Use enum for CPU model expansion type qemu: Use full CPU model expansion on x86 qemu: Make virQEMUCapsInitCPUModel testable cputest: Rename x86 data files cputest: Use virArch enum rather then strings cputest: Switch host CPU data scripts to model expansion cputest: Convert all json data files to query-cpu-model-expansion cputest: Test virQEMUCapsInitCPUModel cputest: Drop obsolete CPU test data files cputest: Drop .new suffix from CPU test data files news: Detect host CPU model by asking QEMU on x86_64 docs/formatdomain.html.in | 38 +- docs/news.xml | 11 + src/bhyve/bhyve_capabilities.c | 2 +- src/cpu/cpu.c | 42 +- src/cpu/cpu.h | 7 +- src/cpu/cpu_arm.c | 7 - src/cpu/cpu_ppc64.c | 6 +- src/cpu/cpu_s390.c | 7 - src/cpu/cpu_x86.c | 280 +- src/cpu/cpu_x86.h | 13 +- src/libvirt_private.syms | 8 +- src/libxl/libxl_capabilities.c | 18 +- src/qemu/qemu_capabilities.c | 452 +- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_capspriv.h | 13 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 26 +- src/qemu/qemu_monitor.h | 31 +- src/qemu/qemu_monitor_json.c | 109 +- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 7 +- src/vmware/vmware_conf.c | 2 +- src/vz/vz_driver.c | 2 +- tests/cputest.c | 324 +- tests/cputestdata/cpu-convert.py | 249 + tests/cputestdata/cpu-gather.sh | 39 +- tests/cputestdata/cpu-parse.sh | 5 +- tests/cputestdata/x86-cpuid-A10-5800K.json | 77 - tests/cputestdata/x86-cpuid-Core-i5-2500.json | 88 - tests/cputestdata/x86-cpuid-Core-i5-2540M.json | 82 - tests/cputestdata/x86-cpuid-Core-i5-4670T.json | 77 - tests/cputestdata/x86-cpuid-Core-i5-6600.json | 82 - tests/cputestdata/x86-cpuid-Core-i7-2600.json | 77 - tests/cputestdata/x86-cpuid-Core-i7-3740QM.json | 77 - tests/cputestdata/x86-cpuid-Core-i7-3770.json | 77 - tests/cputestdata/x86-cpuid-Core-i7-4600U.json | 82 - tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml | 12 - tests/cputestdata/x86-cpuid-Core-i7-5600U.json | 88 - tests/cputestdata/x86-cpuid-Core2-E6850.json | 77 - tests/cputestdata/x86-cpuid-Opteron-2350.json | 71 - tests/cputestdata/x86-cpuid-Opteron-6234.json | 88 - tests/cputestdata/x86-cpuid-Phenom-B95.json | 77 - tests/cputestdata/x86-cpuid-Xeon-E3-1245.json | 88 - tests/cputestdata/x86-cpuid-Xeon-E5-2630.json | 77 - tests/cputestdata/x86-cpuid-Xeon-E5-2650.json | 71 - tests/cputestdata/x86-cpuid-Xeon-E7-4820.json | 77 - tests/cputestdata/x86-cpuid-Xeon-W3520.json | 77 - ...ack.xml => x86_64-Haswell-noTSX-nofallback.xml} | 0 ...-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} | 0 .../{x86-Haswell.xml => x86_64-Haswell.xml} | 0 ...e-1-result.xml => x86_64-baseline-1-result.xml} | 0 .../{x86-baseline-1.xml => x86_64-baseline-1.xml} | 0 ...e-2-result.xml => x86_64-baseline-2-result.xml} | 0 .../{x86-baseline-2.xml => x86_64-baseline-2.xml} | 0 ...expanded.xml => x86_64-baseline-3-expanded.xml} | 0 ...e-3-result.xml => x86_64-baseline-3-result.xml} | 0 .../{x86-baseline-3.xml => x86_64-baseline-3.xml} | 0 ...expanded.xml => x86_64-baseline-4-expanded.xml} | 0 ...e-4-result.xml => x86_64-baseline-4-result.xml} | 0 .../{x86-baseline-4.xml => x86_64-baseline-4.xml} | 0 ...expanded.xml => x86_64-baseline-5-expanded.xml} | 0 ...e-5-result.xml => x86_64-baseline-5-result.xml} | 0 .../{x86-baseline-5.xml => x86_64-baseline-5.xml} | 0 ...atable.xml => x86_64-baseline-6-migratable.xml} | 0 ...e-6-result.xml => x86_64-baseline-6-result.xml} | 0 .../{x86-baseline-6.xml => x86_64-baseline-6.xml} | 0 ...e-7-result.xml => x86_64-baseline-7-result.xml} | 0 .../{x86-baseline-7.xml => x86_64-baseline-7.xml} | 0 ...e-8-result.xml => x86_64-baseline-8-result.xml} | 0 .../{x86-baseline-8.xml => x86_64-baseline-8.xml} | 0 ...ml => x86_64-baseline-incompatible-vendors.xml} | 0 ...lt.xml => x86_64-baseline-no-vendor-result.xml} | 0 ...no-vendor.xml => x86_64-baseline-no-vendor.xml} | 0 ...xml => x86_64-baseline-some-vendors-result.xml} | 0 ...endors.xml => x86_64-baseline-some-vendors.xml} | 0 ...-bogus-feature.xml => x86_64-bogus-feature.xml} | 0 ...{x86-bogus-model.xml => x86_64-bogus-model.xml} | 0 ...86-bogus-vendor.xml => x86_64-bogus-vendor.xml} | 0 ...-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} | 0 ...0K-host.xml => x86_64-cpuid-A10-5800K-host.xml} | 0 ...0K-json.xml => x86_64-cpuid-A10-5800K-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-A10-5800K.json | 203 + ...id-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} | 0 ...-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} | 0 ...10-host.xml => x86_64-cpuid-Atom-D510-host.xml} | 0 ...id-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} | 0 ...-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} | 0 ...50-host.xml => x86_64-cpuid-Atom-N450-host.xml} | 0 ...id-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} | 0 ...est.xml => x86_64-cpuid-Core-i5-2500-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i5-2500-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i5-2500-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-2500.json | 203 + ...e-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} | 0 ...st.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i5-2540M-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i5-2540M-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json | 203 + ...i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} | 0 ...st.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i5-4670T-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i5-4670T-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json | 203 + ...i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} | 0 ...est.xml => x86_64-cpuid-Core-i5-6600-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i5-6600-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i5-6600-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i5-6600.json | 203 + ...e-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} | 0 ...est.xml => x86_64-cpuid-Core-i7-2600-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i7-2600-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i7-2600-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 203 + ...e-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-3520M-host.xml} | 0 ...i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} | 0 ...t.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} | 0 ...on.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json | 203 + ...-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} | 0 ...est.xml => x86_64-cpuid-Core-i7-3770-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i7-3770-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i7-3770-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-3770.json | 203 + ...e-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-4600U-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i7-4600U-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json | 203 + ...i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-5600U-host.xml} | 0 .../x86_64-cpuid-Core-i7-5600U-json.xml | 16 + tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json | 203 + ...i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} | 0 ...uest.xml => x86_64-cpuid-Core2-E6850-guest.xml} | 0 ...-host.xml => x86_64-cpuid-Core2-E6850-host.xml} | 0 ...-json.xml => x86_64-cpuid-Core2-E6850-json.xml} | 5 +- tests/cputestdata/x86_64-cpuid-Core2-E6850.json | 203 + ...ore2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} | 0 ...uest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} | 0 ...-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} | 0 ...ore2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} | 0 ...50-guest.xml => x86_64-cpuid-FX-8150-guest.xml} | 0 ...8150-host.xml => x86_64-cpuid-FX-8150-host.xml} | 0 ...-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-1352-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-1352-host.xml} | 0 ...eron-1352.xml => x86_64-cpuid-Opteron-1352.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-2350-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-2350-host.xml} | 0 ...json.xml => x86_64-cpuid-Opteron-2350-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Opteron-2350.json | 203 + ...eron-2350.xml => x86_64-cpuid-Opteron-2350.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-6234-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-6234-host.xml} | 0 ...json.xml => x86_64-cpuid-Opteron-6234-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Opteron-6234.json | 203 + ...eron-6234.xml => x86_64-cpuid-Opteron-6234.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-6282-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-6282-host.xml} | 0 ...eron-6282.xml => x86_64-cpuid-Opteron-6282.xml} | 0 ...st.xml => x86_64-cpuid-Pentium-P6100-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Pentium-P6100-host.xml} | 0 ...um-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} | 0 ...guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} | 0 ...5-host.xml => x86_64-cpuid-Phenom-B95-host.xml} | 0 ...5-json.xml => x86_64-cpuid-Phenom-B95-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Phenom-B95.json | 203 + ...-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} | 0 ...-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} | 0 ...10-host.xml => x86_64-cpuid-Xeon-5110-host.xml} | 0 ...id-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json | 203 + ...n-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json | 203 + ...n-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json | 203 + ...n-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json | 203 + ...n-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} | 0 ...guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} | 0 ...0-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} | 0 ...0-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} | 1 + tests/cputestdata/x86_64-cpuid-Xeon-W3520.json | 203 + ...-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} | 0 ...guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} | 0 ...0-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} | 0 ...-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} | 0 ...le-extra.xml => x86_64-exact-disable-extra.xml} | 0 ...-exact-disable.xml => x86_64-exact-disable.xml} | 0 ...xact-disable2.xml => x86_64-exact-disable2.xml} | 0 ...bid-extra.xml => x86_64-exact-forbid-extra.xml} | 0 ...86-exact-forbid.xml => x86_64-exact-forbid.xml} | 0 ...-Haswell.xml => x86_64-exact-force-Haswell.xml} | 0 ...{x86-exact-force.xml => x86_64-exact-force.xml} | 0 ...re-extra.xml => x86_64-exact-require-extra.xml} | 0 ...-exact-require.xml => x86_64-exact-require.xml} | 0 .../{x86-exact.xml => x86_64-exact.xml} | 0 ...-nofallback.xml => x86_64-guest-nofallback.xml} | 0 .../{x86-guest.xml => x86_64-guest.xml} | 0 ...t.xml => x86_64-host+guest,model486-result.xml} | 0 ...ult.xml => x86_64-host+guest,models-result.xml} | 0 ...est-result.xml => x86_64-host+guest-result.xml} | 0 .../{x86-host+guest.xml => x86_64-host+guest.xml} | 0 ... x86_64-host+host+host-model,models-result.xml} | 0 ...k.xml => x86_64-host+host-model-nofallback.xml} | 0 ...t+host-model.xml => x86_64-host+host-model.xml} | 0 ...l => x86_64-host+host-passthrough-features.xml} | 0 ...hrough.xml => x86_64-host+host-passthrough.xml} | 0 .../{x86-host+min.xml => x86_64-host+min.xml} | 0 ...ult.xml => x86_64-host+penryn-force-result.xml} | 0 ...-host+pentium3.xml => x86_64-host+pentium3.xml} | 0 ...l => x86_64-host+strict-force-extra-result.xml} | 0 ...-host-Haswell-noTSX+Haswell,haswell-result.xml} | 0 ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 0 ...64-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 0 ...ell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} | 0 ...SandyBridge.xml => x86_64-host-SandyBridge.xml} | 0 ...-host-amd-fake.xml => x86_64-host-amd-fake.xml} | 0 .../{x86-host-amd.xml => x86_64-host-amd.xml} | 0 ....xml => x86_64-host-better+pentium3-result.xml} | 0 ...{x86-host-better.xml => x86_64-host-better.xml} | 0 ...incomp-arch.xml => x86_64-host-incomp-arch.xml} | 0 ...model.xml => x86_64-host-invtsc+host-model.xml} | 0 ...{x86-host-invtsc.xml => x86_64-host-invtsc.xml} | 0 ...llback.xml => x86_64-host-model-nofallback.xml} | 0 .../{x86-host-model.xml => x86_64-host-model.xml} | 0 ...ost-no-vendor.xml => x86_64-host-no-vendor.xml} | 0 ...es.xml => x86_64-host-passthrough-features.xml} | 0 ...passthrough.xml => x86_64-host-passthrough.xml} | 0 ...sult.xml => x86_64-host-worse+guest-result.xml} | 0 .../{x86-host-worse.xml => x86_64-host-worse.xml} | 0 .../cputestdata/{x86-host.xml => x86_64-host.xml} | 0 tests/cputestdata/{x86-min.xml => x86_64-min.xml} | 0 ...86-penryn-force.xml => x86_64-penryn-force.xml} | 0 ...86-pentium3-amd.xml => x86_64-pentium3-amd.xml} | 0 .../{x86-pentium3.xml => x86_64-pentium3.xml} | 0 ...trict-disable.xml => x86_64-strict-disable.xml} | 0 ...rce-extra.xml => x86_64-strict-force-extra.xml} | 0 ...{x86-strict-full.xml => x86_64-strict-full.xml} | 0 .../{x86-strict.xml => x86_64-strict.xml} | 0 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 2 +- .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 145 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 124 + tests/domaincapstest.c | 8 + .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 8 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 32 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 15365 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 763 + tests/qemucapabilitiestest.c | 1 + tests/qemumonitorjsontest.c | 4 +- tests/qemuxml2argvtest.c | 3 +- 268 files changed, 21519 insertions(+), 2062 deletions(-) create mode 100755 tests/cputestdata/cpu-convert.py delete mode 100644 tests/cputestdata/x86-cpuid-A10-5800K.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-2500.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-2540M.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-4670T.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-6600.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-2600.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-3740QM.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-3770.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-5600U.json delete mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850.json delete mode 100644 tests/cputestdata/x86-cpuid-Opteron-2350.json delete mode 100644 tests/cputestdata/x86-cpuid-Opteron-6234.json delete mode 100644 tests/cputestdata/x86-cpuid-Phenom-B95.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E3-1245.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E5-2630.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E5-2650.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E7-4820.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520.json rename tests/cputestdata/{x86-Haswell-noTSX-nofallback.xml => x86_64-Haswell-noTSX-nofallback.xml} (100%) rename tests/cputestdata/{x86-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} (100%) rename tests/cputestdata/{x86-Haswell.xml => x86_64-Haswell.xml} (100%) rename tests/cputestdata/{x86-baseline-1-result.xml => x86_64-baseline-1-result.xml} (100%) rename tests/cputestdata/{x86-baseline-1.xml => x86_64-baseline-1.xml} (100%) rename tests/cputestdata/{x86-baseline-2-result.xml => x86_64-baseline-2-result.xml} (100%) rename tests/cputestdata/{x86-baseline-2.xml => x86_64-baseline-2.xml} (100%) rename tests/cputestdata/{x86-baseline-3-expanded.xml => x86_64-baseline-3-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-3-result.xml => x86_64-baseline-3-result.xml} (100%) rename tests/cputestdata/{x86-baseline-3.xml => x86_64-baseline-3.xml} (100%) rename tests/cputestdata/{x86-baseline-4-expanded.xml => x86_64-baseline-4-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-4-result.xml => x86_64-baseline-4-result.xml} (100%) rename tests/cputestdata/{x86-baseline-4.xml => x86_64-baseline-4.xml} (100%) rename tests/cputestdata/{x86-baseline-5-expanded.xml => x86_64-baseline-5-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-5-result.xml => x86_64-baseline-5-result.xml} (100%) rename tests/cputestdata/{x86-baseline-5.xml => x86_64-baseline-5.xml} (100%) rename tests/cputestdata/{x86-baseline-6-migratable.xml => x86_64-baseline-6-migratable.xml} (100%) rename tests/cputestdata/{x86-baseline-6-result.xml => x86_64-baseline-6-result.xml} (100%) rename tests/cputestdata/{x86-baseline-6.xml => x86_64-baseline-6.xml} (100%) rename tests/cputestdata/{x86-baseline-7-result.xml => x86_64-baseline-7-result.xml} (100%) rename tests/cputestdata/{x86-baseline-7.xml => x86_64-baseline-7.xml} (100%) rename tests/cputestdata/{x86-baseline-8-result.xml => x86_64-baseline-8-result.xml} (100%) rename tests/cputestdata/{x86-baseline-8.xml => x86_64-baseline-8.xml} (100%) rename tests/cputestdata/{x86-baseline-incompatible-vendors.xml => x86_64-baseline-incompatible-vendors.xml} (100%) rename tests/cputestdata/{x86-baseline-no-vendor-result.xml => x86_64-baseline-no-vendor-result.xml} (100%) rename tests/cputestdata/{x86-baseline-no-vendor.xml => x86_64-baseline-no-vendor.xml} (100%) rename tests/cputestdata/{x86-baseline-some-vendors-result.xml => x86_64-baseline-some-vendors-result.xml} (100%) rename tests/cputestdata/{x86-baseline-some-vendors.xml => x86_64-baseline-some-vendors.xml} (100%) rename tests/cputestdata/{x86-bogus-feature.xml => x86_64-bogus-feature.xml} (100%) rename tests/cputestdata/{x86-bogus-model.xml => x86_64-bogus-model.xml} (100%) rename tests/cputestdata/{x86-bogus-vendor.xml => x86_64-bogus-vendor.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-host.xml => x86_64-cpuid-A10-5800K-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-json.xml => x86_64-cpuid-A10-5800K-json.xml} (96%) create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K.json rename tests/cputestdata/{x86-cpuid-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510-host.xml => x86_64-cpuid-Atom-D510-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450-host.xml => x86_64-cpuid-Atom-N450-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-guest.xml => x86_64-cpuid-Core-i5-2500-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-host.xml => x86_64-cpuid-Core-i5-2500-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-json.xml => x86_64-cpuid-Core-i5-2500-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500.json rename tests/cputestdata/{x86-cpuid-Core-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-guest.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-host.xml => x86_64-cpuid-Core-i5-2540M-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-json.xml => x86_64-cpuid-Core-i5-2540M-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json rename tests/cputestdata/{x86-cpuid-Core-i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-guest.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-host.xml => x86_64-cpuid-Core-i5-4670T-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-json.xml => x86_64-cpuid-Core-i5-4670T-json.xml} (95%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json rename tests/cputestdata/{x86-cpuid-Core-i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-guest.xml => x86_64-cpuid-Core-i5-6600-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-host.xml => x86_64-cpuid-Core-i5-6600-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-json.xml => x86_64-cpuid-Core-i5-6600-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600.json rename tests/cputestdata/{x86-cpuid-Core-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-guest.xml => x86_64-cpuid-Core-i7-2600-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-host.xml => x86_64-cpuid-Core-i7-2600-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-json.xml => x86_64-cpuid-Core-i7-2600-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600.json rename tests/cputestdata/{x86-cpuid-Core-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-guest.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-host.xml => x86_64-cpuid-Core-i7-3520M-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-guest.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-host.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-json.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-guest.xml => x86_64-cpuid-Core-i7-3770-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-host.xml => x86_64-cpuid-Core-i7-3770-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-json.xml => x86_64-cpuid-Core-i7-3770-json.xml} (92%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770.json rename tests/cputestdata/{x86-cpuid-Core-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-guest.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-host.xml => x86_64-cpuid-Core-i7-4600U-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-json.xml => x86_64-cpuid-Core-i7-4600U-json.xml} (95%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json rename tests/cputestdata/{x86-cpuid-Core-i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-guest.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-host.xml => x86_64-cpuid-Core-i7-5600U-host.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json rename tests/cputestdata/{x86-cpuid-Core-i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-guest.xml => x86_64-cpuid-Core2-E6850-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-host.xml => x86_64-cpuid-Core2-E6850-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-json.xml => x86_64-cpuid-Core2-E6850-json.xml} (75%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850.json rename tests/cputestdata/{x86-cpuid-Core2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500-guest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150-guest.xml => x86_64-cpuid-FX-8150-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150-host.xml => x86_64-cpuid-FX-8150-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352-guest.xml => x86_64-cpuid-Opteron-1352-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352-host.xml => x86_64-cpuid-Opteron-1352-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352.xml => x86_64-cpuid-Opteron-1352.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-guest.xml => x86_64-cpuid-Opteron-2350-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-host.xml => x86_64-cpuid-Opteron-2350-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-json.xml => x86_64-cpuid-Opteron-2350-json.xml} (97%) create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350.json rename tests/cputestdata/{x86-cpuid-Opteron-2350.xml => x86_64-cpuid-Opteron-2350.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-guest.xml => x86_64-cpuid-Opteron-6234-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-host.xml => x86_64-cpuid-Opteron-6234-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-json.xml => x86_64-cpuid-Opteron-6234-json.xml} (96%) create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234.json rename tests/cputestdata/{x86-cpuid-Opteron-6234.xml => x86_64-cpuid-Opteron-6234.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282-guest.xml => x86_64-cpuid-Opteron-6282-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282-host.xml => x86_64-cpuid-Opteron-6282-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282.xml => x86_64-cpuid-Opteron-6282.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100-guest.xml => x86_64-cpuid-Pentium-P6100-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100-host.xml => x86_64-cpuid-Pentium-P6100-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-host.xml => x86_64-cpuid-Phenom-B95-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-json.xml => x86_64-cpuid-Phenom-B95-json.xml} (97%) create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95.json rename tests/cputestdata/{x86-cpuid-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110-host.xml => x86_64-cpuid-Xeon-5110-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-guest.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-guest.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} (95%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-guest.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-guest.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} (94%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} (93%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520.json rename tests/cputestdata/{x86-cpuid-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460-guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} (100%) rename tests/cputestdata/{x86-exact-disable-extra.xml => x86_64-exact-disable-extra.xml} (100%) rename tests/cputestdata/{x86-exact-disable.xml => x86_64-exact-disable.xml} (100%) rename tests/cputestdata/{x86-exact-disable2.xml => x86_64-exact-disable2.xml} (100%) rename tests/cputestdata/{x86-exact-forbid-extra.xml => x86_64-exact-forbid-extra.xml} (100%) rename tests/cputestdata/{x86-exact-forbid.xml => x86_64-exact-forbid.xml} (100%) rename tests/cputestdata/{x86-exact-force-Haswell.xml => x86_64-exact-force-Haswell.xml} (100%) rename tests/cputestdata/{x86-exact-force.xml => x86_64-exact-force.xml} (100%) rename tests/cputestdata/{x86-exact-require-extra.xml => x86_64-exact-require-extra.xml} (100%) rename tests/cputestdata/{x86-exact-require.xml => x86_64-exact-require.xml} (100%) rename tests/cputestdata/{x86-exact.xml => x86_64-exact.xml} (100%) rename tests/cputestdata/{x86-guest-nofallback.xml => x86_64-guest-nofallback.xml} (100%) rename tests/cputestdata/{x86-guest.xml => x86_64-guest.xml} (100%) rename tests/cputestdata/{x86-host+guest,model486-result.xml => x86_64-host+guest,model486-result.xml} (100%) rename tests/cputestdata/{x86-host+guest,models-result.xml => x86_64-host+guest,models-result.xml} (100%) rename tests/cputestdata/{x86-host+guest-result.xml => x86_64-host+guest-result.xml} (100%) rename tests/cputestdata/{x86-host+guest.xml => x86_64-host+guest.xml} (100%) rename tests/cputestdata/{x86-host+host+host-model,models-result.xml => x86_64-host+host+host-model,models-result.xml} (100%) rename tests/cputestdata/{x86-host+host-model-nofallback.xml => x86_64-host+host-model-nofallback.xml} (100%) rename tests/cputestdata/{x86-host+host-model.xml => x86_64-host+host-model.xml} (100%) rename tests/cputestdata/{x86-host+host-passthrough-features.xml => x86_64-host+host-passthrough-features.xml} (100%) rename tests/cputestdata/{x86-host+host-passthrough.xml => x86_64-host+host-passthrough.xml} (100%) rename tests/cputestdata/{x86-host+min.xml => x86_64-host+min.xml} (100%) rename tests/cputestdata/{x86-host+penryn-force-result.xml => x86_64-host+penryn-force-result.xml} (100%) rename tests/cputestdata/{x86-host+pentium3.xml => x86_64-host+pentium3.xml} (100%) rename tests/cputestdata/{x86-host+strict-force-extra-result.xml => x86_64-host+strict-force-extra-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} (100%) rename tests/cputestdata/{x86-host-SandyBridge.xml => x86_64-host-SandyBridge.xml} (100%) rename tests/cputestdata/{x86-host-amd-fake.xml => x86_64-host-amd-fake.xml} (100%) rename tests/cputestdata/{x86-host-amd.xml => x86_64-host-amd.xml} (100%) rename tests/cputestdata/{x86-host-better+pentium3-result.xml => x86_64-host-better+pentium3-result.xml} (100%) rename tests/cputestdata/{x86-host-better.xml => x86_64-host-better.xml} (100%) rename tests/cputestdata/{x86-host-incomp-arch.xml => x86_64-host-incomp-arch.xml} (100%) rename tests/cputestdata/{x86-host-invtsc+host-model.xml => x86_64-host-invtsc+host-model.xml} (100%) rename tests/cputestdata/{x86-host-invtsc.xml => x86_64-host-invtsc.xml} (100%) rename tests/cputestdata/{x86-host-model-nofallback.xml => x86_64-host-model-nofallback.xml} (100%) rename tests/cputestdata/{x86-host-model.xml => x86_64-host-model.xml} (100%) rename tests/cputestdata/{x86-host-no-vendor.xml => x86_64-host-no-vendor.xml} (100%) rename tests/cputestdata/{x86-host-passthrough-features.xml => x86_64-host-passthrough-features.xml} (100%) rename tests/cputestdata/{x86-host-passthrough.xml => x86_64-host-passthrough.xml} (100%) rename tests/cputestdata/{x86-host-worse+guest-result.xml => x86_64-host-worse+guest-result.xml} (100%) rename tests/cputestdata/{x86-host-worse.xml => x86_64-host-worse.xml} (100%) rename tests/cputestdata/{x86-host.xml => x86_64-host.xml} (100%) rename tests/cputestdata/{x86-min.xml => x86_64-min.xml} (100%) rename tests/cputestdata/{x86-penryn-force.xml => x86_64-penryn-force.xml} (100%) rename tests/cputestdata/{x86-pentium3-amd.xml => x86_64-pentium3-amd.xml} (100%) rename tests/cputestdata/{x86-pentium3.xml => x86_64-pentium3.xml} (100%) rename tests/cputestdata/{x86-strict-disable.xml => x86_64-strict-disable.xml} (100%) rename tests/cputestdata/{x86-strict-force-extra.xml => x86_64-strict-force-extra.xml} (100%) rename tests/cputestdata/{x86-strict-full.xml => x86_64-strict-full.xml} (100%) rename tests/cputestdata/{x86-strict.xml => x86_64-strict.xml} (100%) create mode 100644 tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml create mode 100644 tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml -- 2.11.1

3 79

[libvirt] [PATCH] qemu_cgroup: Only try to allow devices if devices CGroup's available
by Michal Privoznik 23 Feb '17

23 Feb '17

When a domain needs an access to some device (be it a disk, RNG, chardev, whatever), we have to allow it in the devices CGroup (if it is available), because by default we disallow all the devices. But some of the functions that are responsible for setting up devices CGroup are lacking check whether there is any CGroup available. Thus users might be unable to hotplug some devices: virsh # attach-device fedora rng.xml error: Failed to attach device from rng.xml error: internal error: Controller 'devices' is not mounted Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_cgroup.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f0729743a..42a47a798 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -176,6 +176,9 @@ qemuSetupChrSourceCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (source->type != VIR_DOMAIN_CHR_TYPE_DEV) return 0; @@ -197,6 +200,9 @@ qemuTeardownChrSourceCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (source->type != VIR_DOMAIN_CHR_TYPE_DEV) return 0; @@ -247,6 +253,9 @@ qemuSetupInputCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int ret = 0; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); @@ -270,6 +279,9 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm, size_t i, npaths = 0; int rv, ret = -1; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (qemuDomainGetHostdevPath(NULL, dev, false, &npaths, &path, &perms) < 0) goto cleanup; @@ -344,6 +356,9 @@ qemuSetupGraphicsCgroup(virDomainObjPtr vm, const char *rendernode = gfx->data.spice.rendernode; int ret; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE || gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES || !rendernode) @@ -481,6 +496,9 @@ qemuSetupRNGCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int rv; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM) { VIR_DEBUG("Setting Cgroup ACL for RNG device"); rv = virCgroupAllowDevicePath(priv->cgroup, @@ -505,6 +523,9 @@ qemuTeardownRNGCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int rv; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM) { VIR_DEBUG("Tearing down Cgroup ACL for RNG device"); rv = virCgroupDenyDevicePath(priv->cgroup, -- 2.11.0

2 1

[libvirt] [PATCH resend v2 0/2] Allow saving QEMU libvirt state to a pipe
by Chen Hanxiao 23 Feb '17

23 Feb '17

This series introduce flag VIR_DOMAIN_SAVE_DIRECT to enable command 'save' to write to PIPE. Base upon patches from Roy Keene <rkeene(a)knightpoint.com> with some fixes. Change from original patch: 1) Check whether the specified path is a PIPE. 2) Rebase on upstream. 3) Add doc for virsh command v2-resend: rebase on upstream v2: rename VIR_DOMAIN_SAVE_PIPE to VIR_DOMAIN_SAVE_DIRECT remove S_ISFIFO check Chen Hanxiao (2): qemu: Allow saving QEMU libvirt state to a pipe virsh: introduce flage --direct for save command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++-------------- tools/virsh-domain.c | 6 +++++ tools/virsh.pod | 5 +++- 4 files changed, 47 insertions(+), 19 deletions(-) -- 2.7.4

1 2

[libvirt] [PATCH v2] qemu_capabilities: introduce QEMU_CAPS_SD_CARD to probe sd-card drivers
by Chen Hanxiao 23 Feb '17

23 Feb '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch introduces QEMU_CAPS_SD_CARD for probing whether qemu support SD card by: {"execute": "device-list-properties", "arguments":{"typename":"sd-card"}} It will be helpful for apps which used cmd 'virsh domcaps` etc. Also helpful for: https://bugzilla.redhat.com/show_bug.cgi?id=1387218 Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: rebased on upstream src/qemu/qemu_capabilities.c | 9 +++++++-- src/qemu/qemu_capabilities.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5b5e3ac..da983ff 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -358,6 +358,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "query-cpu-model-expansion", /* 245 */ "virtio-net.host_mtu", "spice-rendernode", + "sd-card", ); @@ -1625,6 +1626,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "ivshmem-plain", QEMU_CAPS_DEVICE_IVSHMEM_PLAIN }, { "ivshmem-doorbell", QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL }, { "vhost-scsi", QEMU_CAPS_DEVICE_VHOST_SCSI }, + { "sd-card", QEMU_CAPS_SD_CARD }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { @@ -5215,8 +5217,7 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, - VIR_DOMAIN_DISK_BUS_VIRTIO, - /* VIR_DOMAIN_DISK_BUS_SD */); + VIR_DOMAIN_DISK_BUS_VIRTIO); /* PowerPC pseries based VMs do not support floppy device */ if (!ARCH_IS_PPC64(qemuCaps->arch) || @@ -5225,6 +5226,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_USB); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SD_CARD)) + VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_SD); + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0f998c4..746bd9c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -394,6 +394,7 @@ typedef enum { QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ + QEMU_CAPS_SD_CARD, /* -sd abc.img */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -- 2.7.4

1 0

[libvirt] [PATCH] test: fix pcie-root-port-too-many test
by Laine Stump 23 Feb '17

23 Feb '17

While reviewing a patch from Andrea that modified this test case, I realized that although it was "properly failing" (it's a negative test), that it was failing for the wrong reason (the MULTIFUNCTION cap wasn't set in the test case, so it was saying that multifunction=on wasn't supported by the QEMU binary; instead it should have been complaining that it had run out of PCI slots of the appropriate type and couldn't automatically add any more). This improper failure had started when I added the patch to automatically aggregate pcie-root-ports onto multiple functions of each pcie-root slot, but I hadn't noticed it because the test still failed. This patch corrects the test case to 1) set the MULTIFUNCTION flag in the caps, and 2) attempt to add 241 pcie-root-ports to a domain. Since there are 30 slots available on a pcie-root (slot 0 is reserved, and slot 31 is used by the integrated SATA controller), and a pcie-root-port can only be placed on a function of a slot on pcie-root, the maximum number of pcie-root-ports in any domain is 240. --- .../qemuxml2argv-pcie-root-port-too-many.xml | 273 ++++++++++++++++++--- tests/qemuxml2argvtest.c | 1 + 2 files changed, 242 insertions(+), 32 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml index 5234e3b..d7ac64a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml @@ -20,41 +20,250 @@ <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'/> - <controller type='pci' index='2' model='pcie-root-port'/> - <controller type='pci' index='3' model='pcie-root-port'/> - <controller type='pci' index='4' model='pcie-root-port'/> - <controller type='pci' index='5' model='pcie-root-port'/> - <controller type='pci' index='6' model='pcie-root-port'/> - <controller type='pci' index='7' model='pcie-root-port'/> - <controller type='pci' index='8' model='pcie-root-port'/> - <controller type='pci' index='9' model='pcie-root-port'/> - <controller type='pci' index='10' model='pcie-root-port'/> - <controller type='pci' index='11' model='pcie-root-port'/> - <controller type='pci' index='12' model='pcie-root-port'/> - <controller type='pci' index='13' model='pcie-root-port'/> - <controller type='pci' index='14' model='pcie-root-port'/> - <controller type='pci' index='15' model='pcie-root-port'/> - <controller type='pci' index='16' model='pcie-root-port'/> - <controller type='pci' index='17' model='pcie-root-port'/> - <controller type='pci' index='18' model='pcie-root-port'/> - <controller type='pci' index='19' model='pcie-root-port'/> - <controller type='pci' index='20' model='pcie-root-port'/> - <controller type='pci' index='21' model='pcie-root-port'/> - <controller type='pci' index='22' model='pcie-root-port'/> - <controller type='pci' index='23' model='pcie-root-port'/> - <controller type='pci' index='24' model='pcie-root-port'/> - <controller type='pci' index='25' model='pcie-root-port'/> - <controller type='pci' index='26' model='pcie-root-port'/> - <controller type='pci' index='27' model='pcie-root-port'/> - <controller type='pci' index='28' model='pcie-root-port'/> - <controller type='pci' index='29' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> <controller type='sata' index='0'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <video> - <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/> - </video> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8d737fd..81217df 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2041,6 +2041,7 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, + QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); -- 2.9.3

2 1

[libvirt] [PATCH v2 0/3] Use non-blacklisted family/model/stepping for Haswell CPU model
by Eduardo Habkost 22 Feb '17

22 Feb '17

Changes v1 -> v2: * Coding style fixes * Make series simpler: * Don't use trick: char vendor[static (CPUID_VENDOR_SZ + 1)] because it confuses checkpatch.pl * Removed patch "Add explicit array size to x86_cpu_vendor_words2str()" * Rebased on top of my x86-next branch: https://github.com/ehabkost/qemu x86-next Git branch for testing: https://github.com/ehabkost/qemu-hacks work/x86-rtm-blacklist Diff from v1: diff --git a/target/i386/cpu.h b/target/i386/cpu.h index cd94726e43..647435a1d9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1431,7 +1431,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, void cpu_clear_apic_feature(CPUX86State *env); void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); -void host_vendor_fms(char vendor[static (CPUID_VENDOR_SZ + 1)], int *family, int *model, int *stepping); +void host_vendor_fms(char *vendor, int *family, int *model, int *stepping); /* helper.c */ int x86_cpu_handle_mmu_fault(CPUState *cpu, vaddr addr, diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 25c6c5e115..eab1ad7935 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -682,7 +682,7 @@ void host_cpuid(uint32_t function, uint32_t count, *edx = vec[3]; } -void host_vendor_fms(char vendor[static (CPUID_VENDOR_SZ + 1)], int *family, int *model, int *stepping) +void host_vendor_fms(char *vendor, int *family, int *model, int *stepping) { uint32_t eax, ebx, ecx, edx; @@ -1570,7 +1570,8 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data) xcc->kvm_required = true; xcc->ordering = 9; - host_vendor_fms(host_cpudef.vendor, &host_cpudef.family, &host_cpudef.model, &host_cpudef.stepping); + host_vendor_fms(host_cpudef.vendor, &host_cpudef.family, + &host_cpudef.model, &host_cpudef.stepping); cpu_x86_fill_model_id(host_cpudef.model_id); --- A recent glibc commit[1] added a blacklist to ensure it won't use TSX on hosts that are known to have a broken TSX implementation. Our existing Haswell CPU model has a blacklisted family/model/stepping combination, so it has to be updated to make sure guests will really use TSX. This is done by patch 5/5. However, to do this safely we need to ensure the host CPU is not a blacklisted one, so we won't mislead guests by exposing known-to-be-good FMS values on a known-to-be-broken host. This is done by patch 3/5. [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=2702856bf45c82cf8e69f206… --- Cc: dgilbert(a)redhat.com Cc: fweimer(a)redhat.com Cc: carlos(a)redhat.com Cc: triegel(a)redhat.com Cc: berrange(a)redhat.com Cc: jdenemar(a)redhat.com Cc: pbonzini(a)redhat.com Eduardo Habkost (3): i386: host_vendor_fms() helper function i386/kvm: Blacklist TSX on known broken hosts i386: Change stepping of Haswell to non-blacklisted value include/hw/i386/pc.h | 5 +++++ target/i386/cpu.h | 1 + target/i386/cpu.c | 31 ++++++++++++++++++++++--------- target/i386/kvm.c | 17 +++++++++++++++++ 4 files changed, 45 insertions(+), 9 deletions(-) -- 2.11.0.259.g40922b1

1 3

Re: [libvirt] [Qemu-devel] [PATCH] qdev: Make "hotplugged" property read-only
by Eduardo Habkost 22 Feb '17

22 Feb '17

(CCing libvir-list and Laine) On Tue, Jan 03, 2017 at 05:53:27PM +0100, Igor Mammedov wrote: > On Tue, 3 Jan 2017 17:10:15 +0100 > Paolo Bonzini <pbonzini(a)redhat.com> wrote: > > > > > > > On 03/01/2017 15:22, Eduardo Habkost wrote: > > >> I didn't know that. Is this documented somewhere? > > >> Is it actually used by any existing software? > > > not that I know of. But users should be fixed if they are not using it. > > > > > > I see. The problem is that the mechanism is undocumented, > > > untested, and seems very likely to trigger bugs in device code. > > > > I agree. Why can't hotplugged be migrated? > It's probably not migrated because of it's not runtime/guest modified > state so we don't have to migrate it as it's know in advance. > > For now it should set manually on CLI (-device) with the rest of > hotplugged device properties. As this recommendation has the potential to trigger hidden bugs (and known to trigger a bug in QEMU <= 2.8), I would like it to be properly documented, and the documentation/recommendations reviewed following the usual patch review process. While we don't do that, setting "hotplugged=true" on the command-line is an unused, undocumented, untested (and unsupported?) feature. -- Eduardo

1 1

[libvirt] [PATCH 0/6] qemu: PCI-related bug fixes and cleanups
by Andrea Bolognani 22 Feb '17

22 Feb '17

Patches 1-3 are straightforward code cleanups. Patch 4 is a massive reduction in the size of our test suite, achieved by removing legacy PCI controllers from test cases that don't need them. Patch 5 removes some incorrect assumptions that, for all intents and purposes, made the availablilty of pci-bridge mandatory even for guests that only used PCIe controllers and devices. Patch 6 reduces the test suite in size further by dropping the capabilities that are no longer required after patch 5: if you apply this patch before the previous one and run the test suite, you'll get a lot of failures. Andrea Bolognani (6): conf: Remove dead code qemu: Make switch statements more strict conf: Make switch statements more strict tests: Reduce usage of legacy PCI controllers on PCIe machines qemu: Allow multiple bridges when pci-bridges is not available tests: Reduce QEMU_CAPS_DEVICE_{DMI_TO_,}PCI_BRIDGE usage src/conf/domain_addr.c | 17 +- src/conf/domain_conf.c | 12 +- src/qemu/qemu_command.c | 23 +-- src/qemu/qemu_domain_address.c | 10 +- .../qemuxml2argv-boot-floppy-q35.args | 5 +- .../qemuxml2argv-boot-floppy-q35.xml | 10 +- .../qemuxml2argv-bootindex-floppy-q35.args | 5 +- .../qemuxml2argv-bootindex-floppy-q35.xml | 10 +- .../qemuxml2argv-intel-iommu-machine.args | 5 +- .../qemuxml2argv-intel-iommu-machine.xml | 13 +- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.xml | 13 +- .../qemuxml2argv-pcie-expander-bus-bad-bus.xml | 18 +- .../qemuxml2argv-pcie-expander-bus.args | 136 ++++++------- .../qemuxml2argv-pcie-expander-bus.xml | 85 ++++---- .../qemuxml2argv-pcie-root-port-too-many.xml | 6 +- .../qemuxml2argv-pcie-root-port.args | 6 +- .../qemuxml2argv-pcie-root-port.xml | 6 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 22 +- .../qemuxml2argv-pcie-switch-downstream-port.xml | 18 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 10 +- .../qemuxml2argv-pcie-switch-upstream-port.xml | 10 +- .../qemuxml2argv-pcihole64-q35.args | 2 - .../qemuxml2argv-pcihole64-q35.xml | 2 - .../qemuxml2argv-q35-dmi-bad-address1.xml | 5 +- .../qemuxml2argv-q35-dmi-bad-address2.xml | 21 +- .../qemuxml2argv-q35-wrong-root.xml | 7 - tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 - tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 7 - .../qemuxml2argv-usb-controller-default-q35.args | 2 - .../qemuxml2argv-usb-controller-default-q35.xml | 5 - .../qemuxml2argv-usb-controller-explicit-q35.args | 2 - .../qemuxml2argv-usb-controller-explicit-q35.xml | 5 - .../qemuxml2argv-vcpu-placement-static.xml | 6 - tests/qemuxml2argvtest.c | 83 ++------ .../qemuxml2xmlout-intel-iommu.xml | 13 +- .../qemuxml2xmlout-pcie-expander-bus.xml | 225 ++++++++++----------- .../qemuxml2xmlout-pcie-root-port.xml | 15 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 61 +++--- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 25 +-- .../qemuxml2xmlout-pcihole64-q35.xml | 9 - tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 9 - .../qemuxml2xmlout-usb-controller-default-q35.xml | 9 - .../qemuxml2xmlout-usb-controller-explicit-q35.xml | 9 - .../qemuxml2xmlout-vcpu-placement-static.xml | 9 - tests/qemuxml2xmltest.c | 56 ++--- 46 files changed, 354 insertions(+), 680 deletions(-) -- 2.7.4

2 16

[libvirt] [PATCH] virsh: Alter formatting a bit for output of domstats fields
by John Ferlan 22 Feb '17

22 Feb '17

Alter the formatting of each line to not give the appearance of one long run-on sentance and to be consistent between the various elements of collected/displayed data. The formatting should fit within the 80 character display. This removes the need for commas at the end of each line. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 163 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 70 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index a470409..c3cd6bb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -885,67 +885,85 @@ Note that - depending on the hypervisor type and version or the domain state - not all of the following statistics may be returned. When selecting the I<--state> group the following fields are returned: -"state.state" - state of the VM, returned as number from virDomainState enum, -"state.reason" - reason for entering given state, returned as int from -virDomain*Reason enum corresponding to given state. + + "state.state" - state of the VM, returned as number from + virDomainState enum + "state.reason" - reason for entering given state, returned + as int from virDomain*Reason enum corresponding + to given state I<--cpu-total> returns: -"cpu.time" - total cpu time spent for this domain in nanoseconds, -"cpu.user" - user cpu time spent in nanoseconds, -"cpu.system" - system cpu time spent in nanoseconds + + "cpu.time" - total cpu time spent for this domain in nanoseconds + "cpu.user" - user cpu time spent in nanoseconds + "cpu.system" - system cpu time spent in nanoseconds I<--balloon> returns: -"balloon.current" - the memory in kiB currently used, -"balloon.maximum" - the maximum memory in kiB allowed, -"balloon.swap_in" - the amount of data read from swap space (in kB), -"balloon.swap_out" - the amount of memory written out to swap space (in kB), -"balloon.major_fault" - the number of page faults then disk IO was required, -"balloon.minor_fault" - the number of other page faults, -"balloon.unused" - the amount of memory left unused by the system (in kB), -"balloon.available" - the amount of usable memory as seen by the domain (in kB), -"balloon.rss" - Resident Set Size of running domain's process (in kB), -"balloon.usable" - the amount of memory which can be reclaimed by balloon -without causing host swapping (in KB), -"balloon.last-update" - timestamp of the last update of statistics (in seconds) + + "balloon.current" - the memory in kiB currently used + "balloon.maximum" - the maximum memory in kiB allowed + "balloon.swap_in" - the amount of data read from swap space (in kB) + "balloon.swap_out" - the amount of memory written out to swap + space (in kB) + "balloon.major_fault" - the number of page faults then disk IO + was required + "balloon.minor_fault" - the number of other page faults + "balloon.unused" - the amount of memory left unused by the + system (in kB) + "balloon.available" - the amount of usable memory as seen by + the domain (in kB) + "balloon.rss" - Resident Set Size of running domain's process + (in kB) + "balloon.usable" - the amount of memory which can be reclaimed by + balloon without causing host swapping (in KB) + "balloon.last-update" - timestamp of the last update of statistics + (in seconds) I<--vcpu> returns: -"vcpu.current" - current number of online virtual CPUs, -"vcpu.maximum" - maximum number of online virtual CPUs, -"vcpu.<num>.state" - state of the virtual CPU <num>, as number -from virVcpuState enum, -"vcpu.<num>.time" - virtual cpu time spent by virtual CPU <num> - (in microseconds), -"vcpu.<num>.wait" - virtual cpu time spent by virtual CPU <num> -waiting on I/O (in microseconds), -"vcpu.<num>.halted" - virtual CPU <num> is halted: yes or no (may indicate -the processor is idle or even disabled, depending on the architecture) + + "vcpu.current" - current number of online virtual CPUs + "vcpu.maximum" - maximum number of online virtual CPUs + "vcpu.<num>.state" - state of the virtual CPU <num>, as + number from virVcpuState enum + "vcpu.<num>.time" - virtual cpu time spent by virtual + CPU <num> (in microseconds) + "vcpu.<num>.wait" - virtual cpu time spent by virtual + CPU <num> waiting on I/O (in microseconds) + "vcpu.<num>.halted" - virtual CPU <num> is halted: yes or + no (may indicate the processor is idle + or even disabled, depending on the + architecture) I<--interface> returns: -"net.count" - number of network interfaces on this domain, -"net.<num>.name" - name of the interface <num>, -"net.<num>.rx.bytes" - number of bytes received, -"net.<num>.rx.pkts" - number of packets received, -"net.<num>.rx.errs" - number of receive errors, -"net.<num>.rx.drop" - number of receive packets dropped, -"net.<num>.tx.bytes" - number of bytes transmitted, -"net.<num>.tx.pkts" - number of packets transmitted, -"net.<num>.tx.errs" - number of transmission errors, -"net.<num>.tx.drop" - number of transmit packets dropped + + "net.count" - number of network interfaces on this domain + "net.<num>.name" - name of the interface <num> + "net.<num>.rx.bytes" - number of bytes received + "net.<num>.rx.pkts" - number of packets received + "net.<num>.rx.errs" - number of receive errors + "net.<num>.rx.drop" - number of receive packets dropped + "net.<num>.tx.bytes" - number of bytes transmitted + "net.<num>.tx.pkts" - number of packets transmitted + "net.<num>.tx.errs" - number of transmission errors + "net.<num>.tx.drop" - number of transmit packets dropped I<--perf> returns the statistics of all enabled perf events: -"perf.cmt" - the cache usage in Byte currently used, -"perf.mbmt" - total system bandwidth from one level of cache, -"perf.mbml" - bandwidth of memory traffic for a memory controller, -"perf.cpu_cycles" - the count of cpu cycles (total/elapsed), -"perf.instructions" - the count of instructions, -"perf.cache_references" - the count of cache hits, -"perf.cache_misses" - the count of caches misses, -"perf.branch_instructions" - the count of branch instructions, -"perf.branch_misses" - the count of branch misses, -"perf.bus_cycles" - the count of bus cycles, -"perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, -"perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, -"perf.ref_cpu_cycles" - the count of ref cpu cycles + + "perf.cmt" - the cache usage in Byte currently used + "perf.mbmt" - total system bandwidth from one level of cache + "perf.mbml" - bandwidth of memory traffic for a memory controller + "perf.cpu_cycles" - the count of cpu cycles (total/elapsed) + "perf.instructions" - the count of instructions + "perf.cache_references" - the count of cache hits + "perf.cache_misses" - the count of caches misses + "perf.branch_instructions" - the count of branch instructions + "perf.branch_misses" - the count of branch misses + "perf.bus_cycles" - the count of bus cycles + "perf.stalled_cycles_frontend" - the count of stalled frontend + cpu cycles + "perf.stalled_cycles_backend" - the count of stalled backend + cpu cycles + "perf.ref_cpu_cycles" - the count of ref cpu cycles See the B<perf> command for more details about each event. @@ -954,25 +972,30 @@ domain. Using the I<--backing> flag extends this information to cover all resources in the backing chain, rather than the default of limiting information to the active layer for each guest disk. Information listed includes: -"block.count" - number of block devices being listed, -"block.<num>.name" - name of the target of the block device <num> (the -same name for multiple entries if I<--backing> is present), -"block.<num>.backingIndex" - when I<--backing> is present, matches up -with the <backingStore> index listed in domain XML for backing files, -"block.<num>.path" - file source of block device <num>, if it is a -local file or block device, -"block.<num>.rd.reqs" - number of read requests, -"block.<num>.rd.bytes" - number of read bytes, -"block.<num>.rd.times" - total time (ns) spent on reads, -"block.<num>.wr.reqs" - number of write requests, -"block.<num>.wr.bytes" - number of written bytes, -"block.<num>.wr.times" - total time (ns) spent on writes, -"block.<num>.fl.reqs" - total flush requests, -"block.<num>.fl.times" - total time (ns) spent on cache flushing, -"block.<num>.errors" - Xen only: the 'oo_req' value, -"block.<num>.allocation" - offset of highest written sector in bytes, -"block.<num>.capacity" - logical size of source file in bytes, -"block.<num>.physical" - physical size of source file in bytes + + "block.count" - number of block devices being listed + "block.<num>.name" - name of the target of the block + device <num> (the same name for + multiple entries if I<--backing> + is present) + "block.<num>.backingIndex" - when I<--backing> is present, + matches up with the <backingStore> + index listed in domain XML for + backing files + "block.<num>.path" - file source of block device <num>, if + it is a local file or block device + "block.<num>.rd.reqs" - number of read requests + "block.<num>.rd.bytes" - number of read bytes + "block.<num>.rd.times" - total time (ns) spent on reads + "block.<num>.wr.reqs" - number of write requests + "block.<num>.wr.bytes" - number of written bytes + "block.<num>.wr.times" - total time (ns) spent on writes + "block.<num>.fl.reqs" - total flush requests + "block.<num>.fl.times" - total time (ns) spent on cache flushing + "block.<num>.errors" - Xen only: the 'oo_req' value + "block.<num>.allocation" - offset of highest written sector in bytes + "block.<num>.capacity" - logical size of source file in bytes + "block.<num>.physical" - physical size of source file in bytes Selecting a specific statistics groups doesn't guarantee that the daemon supports the selected group of stats. Flag I<--enforce> -- 2.7.4

2 2

[libvirt] [RFC] Substitute poll by epoll in virEventPollRunOnce
by Derbyshev Dmitriy 22 Feb '17

22 Feb '17

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> This makes it possible to avoid allocations in virEventPollMakePollFDs, as well as generally reduces time spent in kernel if handles remain the same, which should generally be true. __________________________________________ Questions: 1) What to do with probe in virEventPollRunOnce? 2) Are ifdef an acceptable solution to epoll avaliability issues? 3) Is using MAX_POLL_EVENTS_AT_ONCE constant a valid solution? 4) some fds are sometimes added twice, but only once with events!=0? This complicates virEventPoll*Handle fuctions. At the very least, it is called twice in _dbus_watch_list_set_functions. Signed-off-by: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> --- configure.ac | 26 +++++ src/util/vireventpoll.c | 205 ++++++++++++++++++++++++++++++++++++--- src/util/vireventpoll.h | 5 + tests/commanddata/test3epoll.log | 15 +++ tests/commandtest.c | 4 + 5 files changed, 242 insertions(+), 13 deletions(-) create mode 100644 tests/commanddata/test3epoll.log diff --git a/configure.ac b/configure.ac index dfc536f..c985ccc 100644 --- a/configure.ac +++ b/configure.ac @@ -2695,6 +2695,32 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash] AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash]) +AC_ARG_ENABLE([epoll], + [AS_HELP_STRING([--enable-epoll],[use epoll(4) on Linux])], + [enable_epoll=$enableval], [enable_epoll=auto]) +if test x$enable_epoll = xno; then + have_linux_epoll=no +else + AC_MSG_CHECKING([for Linux epoll(4)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [ + #ifndef __linux__ + #error This is not Linux + #endif + #include <sys/epoll.h> + ], + [epoll_create1 (EPOLL_CLOEXEC);])], + [have_linux_epoll=yes], + [have_linux_epoll=no]) + AC_MSG_RESULT([$have_linux_epoll]) +fi +if test x$enable_epoll,$have_linux_epoll = xyes,no; then + AC_MSG_ERROR([epoll support explicitly enabled but not available]) +fi +if test "x$have_linux_epoll" = xyes; then + AC_DEFINE_UNQUOTED([HAVE_LINUX_EPOLL], 1, [whether epoll is supported]) +fi + AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 81ecab4..1541706 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -25,7 +25,11 @@ #include <stdlib.h> #include <string.h> -#include <poll.h> +#ifdef HAVE_LINUX_EPOLL +# include <sys/epoll.h> +#else +# include <poll.h> +#endif #include <sys/time.h> #include <errno.h> #include <unistd.h> @@ -87,6 +91,9 @@ struct virEventPollLoop { size_t timeoutsCount; size_t timeoutsAlloc; struct virEventPollTimeout *timeouts; +#ifdef HAVE_LINUX_EPOLL + int epollfd; +#endif }; /* Only have one event loop */ @@ -109,6 +116,11 @@ int virEventPollAddHandle(int fd, int events, virFreeCallback ff) { int watch; +#ifdef HAVE_LINUX_EPOLL + size_t i; + struct epoll_event ev; +#endif + int native = virEventPollToNativeEvents(events); virMutexLock(&eventLoop.lock); if (eventLoop.handlesCount == eventLoop.handlesAlloc) { EVENT_DEBUG("Used %zu handle slots, adding at least %d more", @@ -124,8 +136,7 @@ int virEventPollAddHandle(int fd, int events, eventLoop.handles[eventLoop.handlesCount].watch = watch; eventLoop.handles[eventLoop.handlesCount].fd = fd; - eventLoop.handles[eventLoop.handlesCount].events = - virEventPollToNativeEvents(events); + eventLoop.handles[eventLoop.handlesCount].events = native; eventLoop.handles[eventLoop.handlesCount].cb = cb; eventLoop.handles[eventLoop.handlesCount].ff = ff; eventLoop.handles[eventLoop.handlesCount].opaque = opaque; @@ -133,7 +144,30 @@ int virEventPollAddHandle(int fd, int events, eventLoop.handlesCount++; +#ifdef HAVE_LINUX_EPOLL + ev.events = native; + ev.data.fd = fd; + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_ADD, fd, &ev) < 0) { + if (errno == EEXIST) { + for (i = 0; i < eventLoop.handlesCount; i++) { + if (eventLoop.handles[i].fd == fd && + !eventLoop.handles[i].deleted) { + ev.events |= eventLoop.handles[i].events; + } + } + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_MOD, fd, &ev) < 0) { + virMutexUnlock(&eventLoop.lock); + return -1; + } + } + else { + virMutexUnlock(&eventLoop.lock); + return -1; + } + } +#else virEventPollInterruptLocked(); +#endif PROBE(EVENT_POLL_ADD_HANDLE, "watch=%d fd=%d events=%d cb=%p opaque=%p ff=%p", @@ -145,8 +179,14 @@ int virEventPollAddHandle(int fd, int events, void virEventPollUpdateHandle(int watch, int events) { +#ifdef HAVE_LINUX_EPOLL + struct epoll_event ev; + size_t i, j; +#else size_t i; +#endif bool found = false; + int native = virEventPollToNativeEvents(events); PROBE(EVENT_POLL_UPDATE_HANDLE, "watch=%d events=%d", watch, events); @@ -159,13 +199,34 @@ void virEventPollUpdateHandle(int watch, int events) virMutexLock(&eventLoop.lock); for (i = 0; i < eventLoop.handlesCount; i++) { if (eventLoop.handles[i].watch == watch) { - eventLoop.handles[i].events = - virEventPollToNativeEvents(events); + eventLoop.handles[i].events = native; +#ifndef HAVE_LINUX_EPOLL virEventPollInterruptLocked(); +#endif found = true; break; } } + +#ifdef HAVE_LINUX_EPOLL + ev.events = native; + for (j = 0; j < eventLoop.handlesCount; j++) { + if (eventLoop.handles[i].fd == eventLoop.handles[i].fd && + !eventLoop.handles[i].deleted && + i != j) { + ev.events |= eventLoop.handles[i].events; + } + } + ev.data.fd = eventLoop.handles[i].fd; + + if (found && epoll_ctl(eventLoop.epollfd, EPOLL_CTL_MOD, + eventLoop.handles[i].fd, &ev) < 0) { + VIR_WARN("Update for existing handle watch %d failed", watch); + virMutexUnlock(&eventLoop.lock); + return; + } +#endif + virMutexUnlock(&eventLoop.lock); if (!found) @@ -180,7 +241,12 @@ void virEventPollUpdateHandle(int watch, int events) */ int virEventPollRemoveHandle(int watch) { +#ifdef HAVE_LINUX_EPOLL + struct epoll_event ev; + size_t i, j; +#else size_t i; +#endif PROBE(EVENT_POLL_REMOVE_HANDLE, "watch=%d", watch); @@ -196,15 +262,47 @@ int virEventPollRemoveHandle(int watch) continue; if (eventLoop.handles[i].watch == watch) { - EVENT_DEBUG("mark delete %zu %d", i, eventLoop.handles[i].fd); - eventLoop.handles[i].deleted = 1; - virEventPollInterruptLocked(); + break; + } + } + + if (i == eventLoop.handlesCount) { + virMutexUnlock(&eventLoop.lock); + return -1; + } + +#ifdef HAVE_LINUX_EPOLL + ev.events = 0; + for (j = 0; j < eventLoop.handlesCount; j++) { + if (eventLoop.handles[j].fd == eventLoop.handles[i].fd && + !eventLoop.handles[j].deleted && + i != j) { + ev.events |= eventLoop.handles[i].events; + } + } + + ev.data.fd = eventLoop.handles[i].fd; + if (ev.events) { + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_MOD, eventLoop.handles[i].fd, + &ev) < 0) { virMutexUnlock(&eventLoop.lock); - return 0; + return -1; } } + else { + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_DEL, eventLoop.handles[i].fd, + &ev) < 0) { + virMutexUnlock(&eventLoop.lock); + return -1; + } + } +#endif + + EVENT_DEBUG("mark delete %zu %d", i, eventLoop.handles[i].fd); + eventLoop.handles[i].deleted = 1; + virEventPollInterruptLocked(); virMutexUnlock(&eventLoop.lock); - return -1; + return 0; } @@ -373,6 +471,7 @@ static int virEventPollCalculateTimeout(int *timeout) return 0; } +#ifndef HAVE_LINUX_EPOLL /* * Allocate a pollfd array containing data for all registered * file handles. The caller must free the returned data struct @@ -409,6 +508,7 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) { return fds; } +#endif /* @@ -472,7 +572,11 @@ static int virEventPollDispatchTimeouts(void) * * Returns 0 upon success, -1 if an error occurred */ +#ifdef HAVE_LINUX_EPOLL +static int virEventPollDispatchHandles(int nfds, struct epoll_event *events) +#else static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) +#endif { size_t i, n; VIR_DEBUG("Dispatch %d", nfds); @@ -482,7 +586,11 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) * in the fds array we've got */ for (i = 0, n = 0; n < nfds && i < eventLoop.handlesCount; n++) { while (i < eventLoop.handlesCount && +#ifdef HAVE_LINUX_EPOLL + (eventLoop.handles[i].fd != events[n].data.fd || +#else (eventLoop.handles[i].fd != fds[n].fd || +#endif eventLoop.handles[i].events == 0)) { i++; } @@ -496,16 +604,25 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) continue; } +#ifdef HAVE_LINUX_EPOLL + if (events[n].events) { + int hEvents = virEventPollFromNativeEvents(events[n].events); +#else if (fds[n].revents) { + int hEvents = virEventPollFromNativeEvents(fds[n].revents); +#endif virEventHandleCallback cb = eventLoop.handles[i].cb; int watch = eventLoop.handles[i].watch; void *opaque = eventLoop.handles[i].opaque; - int hEvents = virEventPollFromNativeEvents(fds[n].revents); PROBE(EVENT_POLL_DISPATCH_HANDLE, "watch=%d events=%d", watch, hEvents); virMutexUnlock(&eventLoop.lock); +#ifdef HAVE_LINUX_EPOLL + (cb)(watch, events[n].data.fd, hEvents, opaque); +#else (cb)(watch, fds[n].fd, hEvents, opaque); +#endif virMutexLock(&eventLoop.lock); } } @@ -618,7 +735,11 @@ static void virEventPollCleanupHandles(void) */ int virEventPollRunOnce(void) { +#ifdef HAVE_LINUX_EPOLL + struct epoll_event events[MAX_POLL_EVENTS_AT_ONCE]; +#else struct pollfd *fds = NULL; +#endif int ret, timeout, nfds; virMutexLock(&eventLoop.lock); @@ -628,17 +749,29 @@ int virEventPollRunOnce(void) virEventPollCleanupTimeouts(); virEventPollCleanupHandles(); - if (!(fds = virEventPollMakePollFDs(&nfds)) || - virEventPollCalculateTimeout(&timeout) < 0) +#ifndef HAVE_LINUX_EPOLL + if (!(fds = virEventPollMakePollFDs(&nfds))) + goto error; +#endif + if (virEventPollCalculateTimeout(&timeout) < 0) goto error; virMutexUnlock(&eventLoop.lock); retry: +#ifdef HAVE_LINUX_EPOLL +//FIXME: PROBE handles + PROBE(EVENT_POLL_RUN, + "nhandles=%d timeout=%d", + 42, timeout); + nfds = ret = epoll_wait(eventLoop.epollfd, events, + MAX_POLL_EVENTS_AT_ONCE, timeout); +#else PROBE(EVENT_POLL_RUN, "nhandles=%d timeout=%d", nfds, timeout); ret = poll(fds, nfds, timeout); +#endif if (ret < 0) { EVENT_DEBUG("Poll got error event %d", errno); if (errno == EINTR || errno == EAGAIN) @@ -653,22 +786,32 @@ int virEventPollRunOnce(void) if (virEventPollDispatchTimeouts() < 0) goto error; +#ifdef HAVE_LINUX_EPOLL + if (ret > 0 && + virEventPollDispatchHandles(nfds, events) < 0) + goto error; +#else if (ret > 0 && virEventPollDispatchHandles(nfds, fds) < 0) goto error; +#endif virEventPollCleanupTimeouts(); virEventPollCleanupHandles(); eventLoop.running = 0; virMutexUnlock(&eventLoop.lock); +#ifndef HAVE_LINUX_EPOLL VIR_FREE(fds); +#endif return 0; error: virMutexUnlock(&eventLoop.lock); error_unlocked: +#ifndef HAVE_LINUX_EPOLL VIR_FREE(fds); +#endif return -1; } @@ -698,6 +841,17 @@ int virEventPollInit(void) return -1; } +#ifdef HAVE_LINUX_EPOLL + eventLoop.epollfd = epoll_create1(0); + if (eventLoop.epollfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to initialize epoll")); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[0]); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[1]); + return -1; + } +#endif + if (virEventPollAddHandle(eventLoop.wakeupfd[0], VIR_EVENT_HANDLE_READABLE, virEventPollHandleWakeup, NULL, NULL) < 0) { @@ -706,6 +860,9 @@ int virEventPollInit(void) eventLoop.wakeupfd[0]); VIR_FORCE_CLOSE(eventLoop.wakeupfd[0]); VIR_FORCE_CLOSE(eventLoop.wakeupfd[1]); +#ifdef HAVE_LINUX_EPOLL + VIR_FORCE_CLOSE(eventLoop.epollfd); +#endif return -1; } @@ -742,6 +899,16 @@ int virEventPollToNativeEvents(int events) { int ret = 0; +#ifdef HAVE_LINUX_EPOLL + if (events & VIR_EVENT_HANDLE_READABLE) + ret |= EPOLLIN; + if (events & VIR_EVENT_HANDLE_WRITABLE) + ret |= EPOLLOUT; + if (events & VIR_EVENT_HANDLE_ERROR) + ret |= EPOLLERR; + if (events & VIR_EVENT_HANDLE_HANGUP) + ret |= EPOLLHUP; +#else if (events & VIR_EVENT_HANDLE_READABLE) ret |= POLLIN; if (events & VIR_EVENT_HANDLE_WRITABLE) @@ -750,6 +917,7 @@ virEventPollToNativeEvents(int events) ret |= POLLERR; if (events & VIR_EVENT_HANDLE_HANGUP) ret |= POLLHUP; +#endif return ret; } @@ -757,6 +925,16 @@ int virEventPollFromNativeEvents(int events) { int ret = 0; +#ifdef HAVE_LINUX_EPOLL + if (events & EPOLLIN) + ret |= VIR_EVENT_HANDLE_READABLE; + if (events & EPOLLOUT) + ret |= VIR_EVENT_HANDLE_WRITABLE; + if (events & EPOLLERR) + ret |= VIR_EVENT_HANDLE_ERROR; + if (events & EPOLLHUP) + ret |= VIR_EVENT_HANDLE_HANGUP; +#else if (events & POLLIN) ret |= VIR_EVENT_HANDLE_READABLE; if (events & POLLOUT) @@ -767,5 +945,6 @@ virEventPollFromNativeEvents(int events) ret |= VIR_EVENT_HANDLE_ERROR; if (events & POLLHUP) ret |= VIR_EVENT_HANDLE_HANGUP; +#endif return ret; } diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index 8844c9c..172009a 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -26,6 +26,11 @@ # include "internal.h" +# ifdef HAVE_LINUX_EPOLL +/* Maximum number of events that are returned by epoll in virEventPollRunOnce */ +# define MAX_POLL_EVENTS_AT_ONCE 10 +# endif + /** * virEventPollAddHandle: register a callback for monitoring file handle events * diff --git a/tests/commanddata/test3epoll.log b/tests/commanddata/test3epoll.log new file mode 100644 index 0000000..e4619b3 --- /dev/null +++ b/tests/commanddata/test3epoll.log @@ -0,0 +1,15 @@ +ENV:DISPLAY=:0.0 +ENV:HOME=/home/test +ENV:HOSTNAME=test +ENV:LANG=C +ENV:LOGNAME=testTMPDIR=/tmp +ENV:PATH=/usr/bin:/bin +ENV:USER=test +FD:0 +FD:1 +FD:2 +FD:6 +FD:8 +DAEMON:no +CWD:/tmp +UMASK:0022 diff --git a/tests/commandtest.c b/tests/commandtest.c index 7bf5447..6b23659 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -227,7 +227,11 @@ static int test3(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } +#ifdef HAVE_LINUX_EPOLL + ret = checkoutput("test3epoll", NULL); +#else ret = checkoutput("test3", NULL); +#endif cleanup: virCommandFree(cmd); -- 1.9.5.msysgit.0

4 4

[libvirt] [PATCH v2 0/4] Virtio-crypto device support
by Longpeng(Mike) 22 Feb '17

22 Feb '17

As virtio-crypto has been supported in QEMU 2.8 and the frontend driver has been merged in linux 4.10, so it's necessary to support virtio-crypto in libvirt. --- Changes since v1: - split patch [Martin] - rebase on master [Martin] - add docs/tests/schema [Martin] - fix typos [Gonglei] --- Longpeng(Mike) (4): docs: schema: Add basic documentation for the virtual crypto device support conf: Parse virtio-crypto in the domain XML qemu: Implement support for 'builtin' backend for virtio-crypto tests: Add testcase for virtio-crypto XML parsing docs/formatdomain.html.in | 60 ++++++ docs/schemas/domaincommon.rng | 27 +++ src/conf/domain_conf.c | 213 ++++++++++++++++++++- src/conf/domain_conf.h | 32 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 20 ++ src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 132 +++++++++++++ src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain_address.c | 25 +++ src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + .../qemuxml2argv-virtio-crypto-builtin.xml | 26 +++ .../qemuxml2argv-virtio-crypto.args | 22 +++ .../qemuxml2xmlout-virtio-crypto-builtin.xml | 31 +++ tests/qemuxml2xmltest.c | 2 + 21 files changed, 616 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-builtin.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto.args create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-crypto-builtin.xml -- 1.8.3.1

4 13

[libvirt] [PATCH REPOST v2 0/3] Add callback mech for qemu and nodedev
by John Ferlan 22 Feb '17

22 Feb '17

Repost: http://www.redhat.com/archives/libvir-list/2017-February/msg00501.html to update to top of branch as of commit id '5ad03b9db2' John Ferlan (3): nodedev: Add driver callback mechanism to add/remove devices qemu: Use nodedev callback mechanism to to get a nodedev data qemu: Add configuration variable to control nodedev enumeration src/check-aclrules.pl | 3 +- src/check-driverimpls.pl | 1 + src/conf/node_device_conf.c | 112 ++++++++++++++++++++++++++++++++++++- src/conf/node_device_conf.h | 18 ++++++ src/libvirt_private.syms | 3 + src/node_device/node_device_udev.c | 29 ++++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 19 +++++++ src/qemu/qemu_conf.c | 53 ++++++++++++++++++ src/qemu/qemu_conf.h | 17 ++++++ src/qemu/qemu_driver.c | 46 +++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + 12 files changed, 301 insertions(+), 2 deletions(-) -- 2.9.3

3 12

[libvirt] [PATCH 0/5] Add API for individual/specific vCPU hotplug
by Peter Krempa 22 Feb '17

22 Feb '17

The new API allows selecting specific vCPUs to be added/removed from the VM. The existing APIs allowed only adding/removing from the end which did not play well with NUMA. Peter Krempa (5): lib: Add API for specific vCPU hot(un)plug virsh: Implement command for virDomainSetVcpu called setvcpu qemu: Implement individual vcpu hotplug API test: qemuhotplugtest: Add testing of individual vcpu hotplug news: Mention specific vCPU hotplug API docs/news.xml | 10 + include/libvirt/libvirt-domain.h | 5 + src/driver-hypervisor.h | 7 + src/libvirt-domain.c | 48 ++++ src/libvirt_public.syms | 5 + src/qemu/qemu_driver.c | 74 +++++ src/qemu/qemu_hotplug.c | 153 ++++++++++ src/qemu/qemu_hotplug.h | 7 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 16 +- src/remote_protocol-structs | 7 + tests/qemuhotplugtest.c | 63 ++++ .../ppc64-modern-individual-domain.xml | 20 ++ .../ppc64-modern-individual-monitor.json | 318 +++++++++++++++++++++ .../ppc64-modern-individual-result-conf.xml | 64 +++++ .../ppc64-modern-individual-result-live.xml | 72 +++++ .../x86-modern-individual-add-domain.xml | 21 ++ .../x86-modern-individual-add-monitor.json | 299 +++++++++++++++++++ .../x86-modern-individual-add-result-conf.xml | 40 +++ .../x86-modern-individual-add-result-live.xml | 48 ++++ tools/virsh-domain.c | 88 ++++++ tools/virsh.pod | 19 ++ 22 files changed, 1384 insertions(+), 1 deletion(-) create mode 100644 tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml create mode 100644 tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json create mode 100644 tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json create mode 100644 tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml create mode 100644 tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml -- 2.11.0

3 14

[libvirt] [PATCH] conf: Allow omitting of numa node memory size
by Peter Krempa 22 Feb '17

22 Feb '17

Memory-less numa nodes could be specified by setting the memory size to 0. Allow ommiting of the parameter completely to specify the same. Partially resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1217144 --- docs/schemas/cputypes.rng | 12 ++++---- src/conf/numa_conf.c | 11 ++++--- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args | 22 ++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml | 25 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-cpu-numa4.xml | 34 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 7 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa4.xml diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index 7cc9dd3d8..fdac7878f 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -103,13 +103,15 @@ <attribute name="cpus"> <ref name="cpuset"/> </attribute> - <attribute name="memory"> - <ref name="memoryKB"/> - </attribute> <optional> - <attribute name="unit"> - <ref name="unit"/> + <attribute name="memory"> + <ref name="memoryKB"/> </attribute> + <optional> + <attribute name="unit"> + <ref name="unit"/> + </attribute> + </optional> </optional> <optional> <attribute name="memAccess"> diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index bfd37032a..ee55b421b 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -774,7 +774,7 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, ctxt->node = nodes[i]; if (virDomainParseMemory("./@memory", "./@unit", ctxt, - &def->mem_nodes[cur_cell].mem, true, false) < 0) + &def->mem_nodes[cur_cell].mem, false, false) < 0) goto cleanup; if ((tmp = virXMLPropString(nodes[i], "memAccess"))) { @@ -807,6 +807,7 @@ virDomainNumaDefCPUFormat(virBufferPtr buf, virDomainMemoryAccess memAccess; char *cpustr; size_t ncells = virDomainNumaGetNodeCount(def); + unsigned long long cellmem; size_t i; if (ncells == 0) @@ -823,9 +824,11 @@ virDomainNumaDefCPUFormat(virBufferPtr buf, virBufferAddLit(buf, "<cell"); virBufferAsprintf(buf, " id='%zu'", i); virBufferAsprintf(buf, " cpus='%s'", cpustr); - virBufferAsprintf(buf, " memory='%llu'", - virDomainNumaGetNodeMemorySize(def, i)); - virBufferAddLit(buf, " unit='KiB'"); + cellmem = virDomainNumaGetNodeMemorySize(def, i); + if (cellmem > 0) { + virBufferAsprintf(buf, " memory='%llu'", cellmem); + virBufferAddLit(buf, " unit='KiB'"); + } if (memAccess) virBufferAsprintf(buf, " memAccess='%s'", virDomainMemoryAccessTypeToString(memAccess)); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args new file mode 100644 index 000000000..db53409a4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 107 \ +-smp 1,maxcpus=16,sockets=2,cores=4,threads=2 \ +-numa node,nodeid=0,cpus=0-7,mem=107 \ +-numa node,nodeid=1,cpus=8-15,mem=0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml new file mode 100644 index 000000000..af30f785f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' current='1'>16</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='2' cores='4' threads='2'/> + <numa> + <cell id='1' cpus='8-15'/> + <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f55b04b05..7ef555736 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1521,6 +1521,7 @@ mymain(void) DO_TEST("cpu-strict1", QEMU_CAPS_KVM); DO_TEST("cpu-numa1", NONE); DO_TEST("cpu-numa2", NONE); + DO_TEST("cpu-numa4", NONE); DO_TEST("cpu-numa-no-memory-element", NONE); DO_TEST_PARSE_ERROR("cpu-numa3", NONE); DO_TEST_FAILURE("cpu-numa-disjoint", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa4.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa4.xml new file mode 100644 index 000000000..a5161a158 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa4.xml @@ -0,0 +1,34 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' current='1'>16</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='2' cores='4' threads='2'/> + <numa> + <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> + <cell id='1' cpus='8-15'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0702f581e..ae55d1d7f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -962,6 +962,7 @@ mymain(void) DO_TEST("cpu-numa1", NONE); DO_TEST("cpu-numa2", NONE); + DO_TEST("cpu-numa4", NONE); DO_TEST("cpu-numa-no-memory-element", NONE); DO_TEST("cpu-numa-disordered", NONE); DO_TEST("cpu-numa-disjoint", NONE); -- 2.11.1

2 3

[libvirt] [PATCH 0/2] Add support for 'raw' block driver to Qemu JSON backend parsing code
by Tomáš Golembiovský 22 Feb '17

22 Feb '17

The raw driver is not very interesting on its own but it can be layered on top of other block drivers. New parameters that allow using only part of the underlying file/device were recently added to Qemu. This is useful e.g. to directly access partitions inside a disk image or disks inside an archive (like OVA). This feature is utilised in OVA import in virt-v2v tool where we access the disks directly in OVA without needing to unpack the tar archive first. After implementing this in virt-v2v we noticed that it does not work when libguestfs uses libvirt as a backend because libvirt fails with error: internal error: missing parser implementation for JSON backing volume driver 'raw' Tomáš Golembiovský (2): util: storage: split function for JSON backing volume parsing in two util: storage: add JSON backing volume parser 'raw' block driver src/util/virstoragefile.c | 51 +++++++++++++++++++++++++++++++++++++---------- tests/virstoragetest.c | 6 ++++++ 2 files changed, 47 insertions(+), 10 deletions(-) -- 2.11.1

3 11

[libvirt] [v7 00/10] Support cache tune in libvirt
by Eli Qiao 22 Feb '17

22 Feb '17

Addressed comment from v7 -> v6 Marcelo: * Fix flock usage while VM initialization. Addressed comment from v6 -> v5 Marcelo: * Support other APPs to operate /sys/fs/resctrl at same time Libvirt will scan /sys/fs/resctrl again before doing cache allocation. patch 10 will address this. Addressed comment from v4 -> v5: Marcelo: * Several typos * Use flock instead of virFileLock Addressed comment from v3 -> v4: Daniel & Marcelo: * Added concurrence support Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's system fs. There are still one TODO left: 1. Expose a new public interface to get free cache information. 2. Expose a new public interface to set cachetune lively. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html *** BLURB HERE *** Eli Qiao (10): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled Resctrl: concurrence support Resctrl: Scan resctrl before doing cache allocation docs/schemas/domaincommon.rng | 46 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 ++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 +++++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 11 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_process.c | 53 ++ src/util/virerror.c | 1 + src/util/virresctrl.c | 1202 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 +++ 17 files changed, 1763 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

4 26

[libvirt] [PATH v8 00/10] Support cache tune in libvirt
by Eli Qiao 22 Feb '17

22 Feb '17

Addressed comment from v8 -> v7 Martin: * Patch subject prefix. * Move some of cpu related information to virhostcpu.c. * Fix some memory leak in src/utils/resctrl.c Martin & Marcelo: * Don't remove directories which are not maintained by libvirt. Addressed comment from v7 -> v6 Marcelo: * Fix flock usage while VM initialization. Addressed comment from v6 -> v5 Marcelo: * Support other APPs to operate /sys/fs/resctrl at same time Libvirt will scan /sys/fs/resctrl again before doing cache allocation. patch 10 will address this. Addressed comment from v4 -> v5: Marcelo: * Several typos * Use flock instead of virFileLock Addressed comment from v3 -> v4: Daniel & Marcelo: * Added concurrence support Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's system fs. There are still one TODO left: 1. Expose a new public interface to get free cache information. 2. Expose a new public interface to set cachetune lively. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (10): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interfaces to operate cache bank Qemu: Set cache tune while booting a new domain. Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled Resctrl: concurrence support Resctrl: Scan resctrl before doing cache allocation docs/schemas/domaincommon.rng | 46 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 +++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 ++++++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 11 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_process.c | 54 +++ src/util/virerror.c | 1 + src/util/virhostcpu.c | 186 +++++++- src/util/virhostcpu.h | 6 + src/util/virresctrl.c | 1027 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 ++++ 19 files changed, 1764 insertions(+), 17 deletions(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

1 10

[libvirt] [PATCH] libxl: implement virDomainObjCheckIsActive
by Sagar Ghuge 22 Feb '17

22 Feb '17

Add function which raises error if domain is not active Signed-off-by: Sagar Ghuge <ghugesss(a)gmail.com> --- src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 1 + src/libxl/libxl_driver.c | 4 +--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1bc72a4..10a69af 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2995,6 +2995,19 @@ virDomainObjWait(virDomainObjPtr vm) } +int +virDomainObjCheckIsActive(virDomainObjPtr vm) +{ + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("domain is not running")); + return -1; + } + + return 0; +} + + /** * Waits for domain condition to be triggered for a specific period of time. * diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index dd79206..b6c7826 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2559,6 +2559,7 @@ bool virDomainObjTaint(virDomainObjPtr obj, void virDomainObjBroadcast(virDomainObjPtr vm); int virDomainObjWait(virDomainObjPtr vm); +int virDomainObjCheckIsActive(virDomainObjPtr vm); int virDomainObjWaitUntil(virDomainObjPtr vm, unsigned long long whenms); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 74cb05a..3a487ac 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1183,10 +1183,8 @@ libxlDomainSuspend(virDomainPtr dom) if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { if (libxl_domain_pause(cfg->ctx, vm->def->id) != 0) { -- 2.9.3

3 4

[libvirt] [PATCH] conf: Don't accept dummy values for <memoryBacking/> attributes
by Michal Privoznik 21 Feb '17

21 Feb '17

Our virSomeEnumTypeFromString() functions return either the value of item from the enum or -1 on error. Usually however the value 0 means 'this value is not set in the domain XML, use some sensible default'. Therefore, we don't accept corresponding string in domain XML, for instance: <memoryBacking> <source mode="none"/> <access mode="default"/> <allocation mode="none"/> </memoryBacking> should be rejected as invalid XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 79bdbdf50..f718b9abc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16724,7 +16724,7 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./memoryBacking/source/@type)", ctxt); if (tmp) { - if ((def->mem.source = virDomainMemorySourceTypeFromString(tmp)) < 0) { + if ((def->mem.source = virDomainMemorySourceTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/source/type '%s'"), tmp); goto error; @@ -16734,7 +16734,7 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./memoryBacking/access/@mode)", ctxt); if (tmp) { - if ((def->mem.access = virDomainMemoryAccessTypeFromString(tmp)) < 0) { + if ((def->mem.access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/access/mode '%s'"), tmp); goto error; @@ -16744,7 +16744,7 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./memoryBacking/allocation/@mode)", ctxt); if (tmp) { - if ((def->mem.allocation = virDomainMemoryAllocationTypeFromString(tmp)) < 0) { + if ((def->mem.allocation = virDomainMemoryAllocationTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/allocation/mode '%s'"), tmp); goto error; -- 2.11.0

2 1

[libvirt] [PATCH 0/2] Couple of cleanup patches
by John Ferlan 21 Feb '17

21 Feb '17

Fix a couple of things seen while continuing work in the area... John Ferlan (2): conf: Cleanup matchFCHostToSCSIHost conf: Fix leak in virNodeDeviceObjListExport src/conf/node_device_conf.c | 1 + src/conf/storage_conf.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) -- 2.9.3

2 3

[libvirt] [PATCH] qemu: Fix deadlock across fork() in QEMU driver
by Marc Hartmayer 21 Feb '17

21 Feb '17

The functions in virCommand() after fork() must be careful with regard to accessing any mutexes that may have been locked by other threads in the parent process. It is possible that another thread in the parent process holds the lock for the virQEMUDriver while fork() is called. This leads to a deadlock in the child process when 'virQEMUDriverGetConfig(driver)' is called and therefore the handshake never completes between the child and the parent process. Ultimately the virDomainObjectPtr will never be unlocked. It gets much worse if the other thread of the parent process, that holds the lock for the virQEMUDriver, tries to lock the already locked virDomainObject. This leads to a completely unresponsive libvirtd. It's possible to reproduce this case with calling 'virsh start XXX' and 'virsh managedsave XXX' in a tight loop for multiple domains. This commit fixes the deadlock in the same way as it is described in commit 61b52d2e3813cc8c9ff3ab67f232bd0c65f7318d. Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 73 +++++++++++++++++++++++-------------------------- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_process.c | 2 +- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ea4b282..c187214 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7045,13 +7045,12 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, * Returns 0 on success, -1 otherwise (with error reported) */ static int -qemuDomainGetPreservedMounts(virQEMUDriverPtr driver, +qemuDomainGetPreservedMounts(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, char ***devPath, char ***devSavePath, size_t *ndevPath) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char **paths = NULL, **mounts = NULL; size_t i, nmounts; @@ -7092,13 +7091,11 @@ qemuDomainGetPreservedMounts(virQEMUDriverPtr driver, if (ndevPath) *ndevPath = nmounts; - virObjectUnref(cfg); return 0; error: virStringListFreeCount(mounts, nmounts); virStringListFreeCount(paths, nmounts); - virObjectUnref(cfg); return -1; } @@ -7310,11 +7307,10 @@ qemuDomainCreateDevice(const char *device, static int -qemuDomainPopulateDevices(virQEMUDriverPtr driver, +qemuDomainPopulateDevices(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm ATTRIBUTE_UNUSED, const char *path) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *const *devices = (const char *const *) cfg->cgroupDeviceACL; size_t i; int ret = -1; @@ -7329,13 +7325,13 @@ qemuDomainPopulateDevices(virQEMUDriverPtr driver, ret = 0; cleanup: - virObjectUnref(cfg); return ret; } static int -qemuDomainSetupDev(virQEMUDriverPtr driver, +qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, + virSecurityManagerPtr mgr, virDomainObjPtr vm, const char *path) { @@ -7345,7 +7341,7 @@ qemuDomainSetupDev(virQEMUDriverPtr driver, VIR_DEBUG("Setting up /dev/ for domain %s", vm->def->name); - mount_options = virSecurityManagerGetMountOptions(driver->securityManager, + mount_options = virSecurityManagerGetMountOptions(mgr, vm->def); if (!mount_options && @@ -7363,7 +7359,7 @@ qemuDomainSetupDev(virQEMUDriverPtr driver, if (virFileSetupDev(path, opts) < 0) goto cleanup; - if (qemuDomainPopulateDevices(driver, vm, path) < 0) + if (qemuDomainPopulateDevices(cfg, vm, path) < 0) goto cleanup; ret = 0; @@ -7375,7 +7371,7 @@ qemuDomainSetupDev(virQEMUDriverPtr driver, static int -qemuDomainSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk, const char *devPath) { @@ -7401,7 +7397,7 @@ qemuDomainSetupDisk(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupAllDisks(virQEMUDriverPtr driver, +qemuDomainSetupAllDisks(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, const char *devPath) { @@ -7409,7 +7405,7 @@ qemuDomainSetupAllDisks(virQEMUDriverPtr driver, VIR_DEBUG("Setting up disks"); for (i = 0; i < vm->def->ndisks; i++) { - if (qemuDomainSetupDisk(driver, + if (qemuDomainSetupDisk(cfg, vm->def->disks[i], devPath) < 0) return -1; @@ -7421,7 +7417,7 @@ qemuDomainSetupAllDisks(virQEMUDriverPtr driver, static int -qemuDomainSetupHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupHostdev(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainHostdevDefPtr dev, const char *devPath) { @@ -7447,7 +7443,7 @@ qemuDomainSetupHostdev(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupAllHostdevs(virQEMUDriverPtr driver, +qemuDomainSetupAllHostdevs(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, const char *devPath) { @@ -7455,7 +7451,7 @@ qemuDomainSetupAllHostdevs(virQEMUDriverPtr driver, VIR_DEBUG("Setting up hostdevs"); for (i = 0; i < vm->def->nhostdevs; i++) { - if (qemuDomainSetupHostdev(driver, + if (qemuDomainSetupHostdev(cfg, vm->def->hostdevs[i], devPath) < 0) return -1; @@ -7480,7 +7476,7 @@ qemuDomainSetupChardev(virDomainDefPtr def ATTRIBUTE_UNUSED, static int -qemuDomainSetupAllChardevs(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char *devPath) { @@ -7498,7 +7494,7 @@ qemuDomainSetupAllChardevs(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupTPM(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char *devPath) { @@ -7527,7 +7523,7 @@ qemuDomainSetupTPM(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupGraphics(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainGraphicsDefPtr gfx, const char *devPath) { @@ -7543,7 +7539,7 @@ qemuDomainSetupGraphics(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupAllGraphics(virQEMUDriverPtr driver, +qemuDomainSetupAllGraphics(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, const char *devPath) { @@ -7551,7 +7547,7 @@ qemuDomainSetupAllGraphics(virQEMUDriverPtr driver, VIR_DEBUG("Setting up graphics"); for (i = 0; i < vm->def->ngraphics; i++) { - if (qemuDomainSetupGraphics(driver, + if (qemuDomainSetupGraphics(cfg, vm->def->graphics[i], devPath) < 0) return -1; @@ -7563,7 +7559,7 @@ qemuDomainSetupAllGraphics(virQEMUDriverPtr driver, static int -qemuDomainSetupInput(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupInput(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainInputDefPtr input, const char *devPath) { @@ -7590,7 +7586,7 @@ qemuDomainSetupInput(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupAllInputs(virQEMUDriverPtr driver, +qemuDomainSetupAllInputs(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, const char *devPath) { @@ -7598,7 +7594,7 @@ qemuDomainSetupAllInputs(virQEMUDriverPtr driver, VIR_DEBUG("Setting up inputs"); for (i = 0; i < vm->def->ninputs; i++) { - if (qemuDomainSetupInput(driver, + if (qemuDomainSetupInput(cfg, vm->def->inputs[i], devPath) < 0) return -1; @@ -7609,7 +7605,7 @@ qemuDomainSetupAllInputs(virQEMUDriverPtr driver, static int -qemuDomainSetupRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSetupRNG(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, virDomainRNGDefPtr rng, const char *devPath) { @@ -7629,7 +7625,7 @@ qemuDomainSetupRNG(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, static int -qemuDomainSetupAllRNGs(virQEMUDriverPtr driver, +qemuDomainSetupAllRNGs(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, const char *devPath) { @@ -7637,7 +7633,7 @@ qemuDomainSetupAllRNGs(virQEMUDriverPtr driver, VIR_DEBUG("Setting up RNGs"); for (i = 0; i < vm->def->nrngs; i++) { - if (qemuDomainSetupRNG(driver, + if (qemuDomainSetupRNG(cfg, vm->def->rngs[i], devPath) < 0) return -1; @@ -7649,10 +7645,10 @@ qemuDomainSetupAllRNGs(virQEMUDriverPtr driver, int -qemuDomainBuildNamespace(virQEMUDriverPtr driver, +qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg, + virSecurityManagerPtr mgr, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *devPath = NULL; char **devMountsPath = NULL, **devMountsSavePath = NULL; size_t ndevMountsPath = 0, i; @@ -7663,7 +7659,7 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, goto cleanup; } - if (qemuDomainGetPreservedMounts(driver, vm, + if (qemuDomainGetPreservedMounts(cfg, vm, &devMountsPath, &devMountsSavePath, &ndevMountsPath) < 0) goto cleanup; @@ -7684,7 +7680,7 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, if (virProcessSetupPrivateMountNS() < 0) goto cleanup; - if (qemuDomainSetupDev(driver, vm, devPath) < 0) + if (qemuDomainSetupDev(cfg, mgr, vm, devPath) < 0) goto cleanup; /* Save some mount points because we want to share them with the host */ @@ -7703,25 +7699,25 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, goto cleanup; } - if (qemuDomainSetupAllDisks(driver, vm, devPath) < 0) + if (qemuDomainSetupAllDisks(cfg, vm, devPath) < 0) goto cleanup; - if (qemuDomainSetupAllHostdevs(driver, vm, devPath) < 0) + if (qemuDomainSetupAllHostdevs(cfg, vm, devPath) < 0) goto cleanup; - if (qemuDomainSetupAllChardevs(driver, vm, devPath) < 0) + if (qemuDomainSetupAllChardevs(cfg, vm, devPath) < 0) goto cleanup; - if (qemuDomainSetupTPM(driver, vm, devPath) < 0) + if (qemuDomainSetupTPM(cfg, vm, devPath) < 0) goto cleanup; - if (qemuDomainSetupAllGraphics(driver, vm, devPath) < 0) + if (qemuDomainSetupAllGraphics(cfg, vm, devPath) < 0) goto cleanup; - if (qemuDomainSetupAllInputs(driver, vm, devPath) < 0) + if (qemuDomainSetupAllInputs(cfg, vm, devPath) < 0) goto cleanup; - if (qemuDomainSetupAllRNGs(driver, vm, devPath) < 0) + if (qemuDomainSetupAllRNGs(cfg, vm, devPath) < 0) goto cleanup; if (virFileMoveMount(devPath, "/dev") < 0) @@ -7743,7 +7739,6 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, ret = 0; cleanup: - virObjectUnref(cfg); for (i = 0; i < ndevMountsPath; i++) rmdir(devMountsSavePath[i]); virStringListFreeCount(devMountsPath, ndevMountsPath); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8ba807c..72efa33 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -809,7 +809,8 @@ int qemuDomainGetHostdevPath(virDomainDefPtr def, char ***path, int **perms); -int qemuDomainBuildNamespace(virQEMUDriverPtr driver, +int qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg, + virSecurityManagerPtr mgr, virDomainObjPtr vm); int qemuDomainCreateNamespace(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 522f49d..e1a738c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2636,7 +2636,7 @@ static int qemuProcessHook(void *data) if (virSecurityManagerClearSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; - if (qemuDomainBuildNamespace(h->driver, h->vm) < 0) + if (qemuDomainBuildNamespace(h->cfg, h->driver->securityManager, h->vm) < 0) goto cleanup; if (virDomainNumatuneGetMode(h->vm->def->numa, -1, &mode) == 0) { -- 2.5.5

2 1

[libvirt] [PATCH 00/12] implements iothread polling feature into libvirt
by Pavel Hrdina 21 Feb '17

21 Feb '17

Pavel Hrdina (12): conf: introduce domain XML element <polling> for iothread lib: introduce an API to add new iothread with parameters lib: introduce an API to modify parameters of existing iothread virsh: extend iothreadadd to support virDomainAddIOThreadParams virsh: introduce command iothreadmod that uses virDomainModIOThreadParams qemu_capabilities: detect whether iothread polling is supported util: properly handle NULL props in virQEMUBuildObjectCommandlineFromJSON qemu_monitor: extend qemuMonitorGetIOThreads to fetch polling data qemu: implement iothread polling qemu: implement virDomainAddIOThreadParams API qemu: implement virDomainModIOThreadParams API news: add entry for for iothread polling feature docs/formatdomain.html.in | 19 +- docs/news.xml | 9 + docs/schemas/domaincommon.rng | 24 ++ include/libvirt/libvirt-domain.h | 44 ++++ src/conf/domain_conf.c | 199 +++++++++++++- src/conf/domain_conf.h | 18 +- src/driver-hypervisor.h | 16 ++ src/libvirt-domain.c | 140 ++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 78 +++++- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_domain.c | 23 +- src/qemu/qemu_domain.h | 6 + src/qemu/qemu_driver.c | 292 ++++++++++++++++++--- src/qemu/qemu_monitor.c | 25 +- src/qemu/qemu_monitor.h | 9 +- src/qemu/qemu_monitor_json.c | 51 +++- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_process.c | 14 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 34 ++- src/remote_protocol-structs | 20 ++ src/util/virqemu.c | 3 +- .../generic-iothreads-no-polling.xml | 22 ++ .../generic-iothreads-polling-disabled.xml | 24 ++ .../generic-iothreads-polling-enabled-fail.xml | 24 ++ .../generic-iothreads-polling-enabled.xml | 24 ++ tests/genericxml2xmltest.c | 6 + .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 12 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 2 +- .../qemuxml2argv-iothreads-polling-disabled.args | 23 ++ .../qemuxml2argv-iothreads-polling-disabled.xml | 36 +++ .../qemuxml2argv-iothreads-polling-enabled.args | 23 ++ .../qemuxml2argv-iothreads-polling-enabled.xml | 36 +++ ...emuxml2argv-iothreads-polling-not-supported.xml | 1 + tests/qemuxml2argvtest.c | 8 + tests/testutils.c | 3 +- tools/virsh-domain.c | 188 ++++++++++++- tools/virsh.pod | 18 ++ 43 files changed, 1442 insertions(+), 58 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-iothreads-no-polling.xml create mode 100644 tests/genericxml2xmlindata/generic-iothreads-polling-disabled.xml create mode 100644 tests/genericxml2xmlindata/generic-iothreads-polling-enabled-fail.xml create mode 100644 tests/genericxml2xmlindata/generic-iothreads-polling-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-enabled.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-not-supported.xml -- 2.11.1

3 19

[libvirt] [PATCH v2 0/5] storage: modularize storage backend drivers
by Peter Krempa 21 Feb '17

21 Feb '17

Version 2 contains one more patch that adds disables the 'zfs' and 'vstorage' backends in the spec file. The rest is the same, but I've reposted it due to it's nature. Peter Krempa (5): spec: Don't check for storage driver backends in configure script storage: Turn storage backends into dynamic modules tests: drivermodule: Make sure that all compiled storage backends can be loaded spec: Modularize the storage driver news: Mention storage driver split docs/news.xml | 10 +++ libvirt.spec.in | 188 ++++++++++++++++++++++++++++++++++++------ src/Makefile.am | 85 ++++++++++++++++++- src/storage/storage_backend.c | 70 ++++++++++++---- src/storage/storage_backend.h | 2 +- src/storage/storage_driver.c | 19 ++++- src/storage/storage_driver.h | 1 + tests/Makefile.am | 4 +- tests/virdrivermoduletest.c | 2 +- tests/virstoragetest.c | 2 +- 10 files changed, 337 insertions(+), 46 deletions(-) -- 2.11.1

2 7

[libvirt] spice-gl bug: Failed to initialize EGL render node for SPICE GL
by Paul Kek 21 Feb '17

21 Feb '17

Hello, I am having issues with getting spice-gl to work properly with libvirt. There is a bugzilla report which describes the issue but until now there is still no solution (The patch didn't work on my system.) As I also mentioned there, I tried adding the `renderD128` device to `cgroup_device_acl` in the qemu.conf file but this produced different errors: qemu-system-x86_64: egl: eglGetDisplay failed qemu-system-x86_64: egl: EGL_KHR_surfaceless_context not supported qemu-system-x86_64: Failed to initialize EGL render node for SPICE GL Paul

2 1

[libvirt] [PATCH] rpc: fix use-after-free when sending event message
by Wang King 20 Feb '17

20 Feb '17

If there is a process with a client which registers event callbacks, and it calls libvirt's API which uses the same virConnectPtr in that callback function. When this process exit abnormally lead to client disconnect, there is a possibility that the main thread is refer to virServerClient just after the virServerClient been freed by job thread of libvirtd. Following is the backtrace: #0 0x00007fda223d66d8 in virClassIsDerivedFrom (klass=0xdeadbeef,parent=0x7fda24c81b40) #1 0x00007fda223d6a1e in virObjectIsClass (anyobj=anyobj@entry=0x7fd9e575b400,klass=<optimized out>) #2 0x00007fda223d6a44 in virObjectLock (anyobj=anyobj@entry=0x7fd9e575b400) #3 0x00007fda22507f71 in virNetServerClientSendMessage (client=client@entry=0x7fd9e575b400, msg=msg@entry=0x7fd9ec30de90) #4 0x00007fda230d714d in remoteDispatchObjectEventSend (client=0x7fd9e575b400, program=0x7fda24c844e0, procnr=procnr@entry=348, proc=0x7fda2310e5e0 <xdr_remote_domain_event_callback_tunable_msg>, data=data@entry=0x7ffc3857fdb0) #5 0x00007fda230dd71b in remoteRelayDomainEventTunable (conn=<optimized out>, dom=0x7fda27cd7660, params=0x7fda27f3aae0, nparams=1, opaque=0x7fd9e6c99e00) #6 0x00007fda224484cb in virDomainEventDispatchDefaultFunc (conn=0x7fda27cd0120, event=0x7fda2736ea00, cb=0x7fda230dd610 <remoteRelayDomainEventTunable>, cbopaque=0x7fd9e6c99e00) #7 0x00007fda22446871 in virObjectEventStateDispatchCallbacks (callbacks=<optimized out>, callbacks=<optimized out>, event=0x7fda2736ea00, state=0x7fda24ca3960) #8 virObjectEventStateQueueDispatch (callbacks=0x7fda24c65800, queue=0x7ffc3857fe90, state=0x7fda24ca3960) #9 virObjectEventStateFlush (state=0x7fda24ca3960) #10 virObjectEventTimer (timer=<optimized out>, opaque=0x7fda24ca3960) #11 0x00007fda223ae8b9 in virEventPollDispatchTimeouts () #12 virEventPollRunOnce () #13 0x00007fda223ad1d2 in virEventRunDefaultImpl () #14 0x00007fda225046cd in virNetDaemonRun (dmn=dmn@entry=0x7fda24c775c0) #15 0x00007fda230d6351 in main (argc=<optimized out>, argv=<optimized out>) (gdb) p *(virNetServerClientPtr)0x7fd9e575b400 $2 = {parent = {parent = {u = {dummy_align1 = 140573849338048, dummy_align2 = 0x7fd9e65ac0c0, s = {magic = 3864707264, refs = 32729}}, klass = 0x7fda00000078}, lock = {lock = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}}}, wantClose = false, delayedClose = false, sock = 0x0, auth = 0, readonly = false, tlsCtxt = 0x0, tls = 0x0, sasl = 0x0, sockTimer = 0, identity = 0x0, nrequests = 0, nrequests_max = 0, rx = 0x0, tx = 0x0, filters = 0x0, nextFilterID = 0, dispatchFunc = 0x0, dispatchOpaque = 0x0, privateData = 0x0, privateDataFreeFunc = 0x0, privateDataPreExecRestart = 0x0, privateDataCloseFunc = 0x0, keepalive = 0x0} --- src/rpc/virnetserverclient.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 81da82c..562516f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1021,6 +1021,12 @@ void virNetServerClientClose(virNetServerClientPtr client) client->sock = NULL; } + if (client->privateData && + client->privateDataFreeFunc) { + client->privateDataFreeFunc(client->privateData); + client->privateData = NULL; + } + virObjectUnlock(client); } -- 2.8.3

2 1

[libvirt] [PATCH] conf: fix use-after-free when sending event message
by Wang King 20 Feb '17

20 Feb '17

If there is a process with a client which registers event callbacks, and it calls libvirt's API which uses the same virConnectPtr in that callback function. When this process exit abnormally lead to client disconnect, there is a possibility that the main thread is refer to virServerClient just after the virServerClient been freed by job thread of libvirtd. Following is the backtrace: #0 0x00007fda223d66d8 in virClassIsDerivedFrom (klass=0xdeadbeef,parent=0x7fda24c81b40) #1 0x00007fda223d6a1e in virObjectIsClass (anyobj=anyobj@entry=0x7fd9e575b400,klass=<optimized out>) #2 0x00007fda223d6a44 in virObjectLock (anyobj=anyobj@entry=0x7fd9e575b400) #3 0x00007fda22507f71 in virNetServerClientSendMessage (client=client@entry=0x7fd9e575b400, msg=msg@entry=0x7fd9ec30de90) #4 0x00007fda230d714d in remoteDispatchObjectEventSend (client=0x7fd9e575b400, program=0x7fda24c844e0, procnr=procnr@entry=348, proc=0x7fda2310e5e0 <xdr_remote_domain_event_callback_tunable_msg>, data=data@entry=0x7ffc3857fdb0) #5 0x00007fda230dd71b in remoteRelayDomainEventTunable (conn=<optimized out>, dom=0x7fda27cd7660, params=0x7fda27f3aae0, nparams=1, opaque=0x7fd9e6c99e00) #6 0x00007fda224484cb in virDomainEventDispatchDefaultFunc (conn=0x7fda27cd0120, event=0x7fda2736ea00, cb=0x7fda230dd610 <remoteRelayDomainEventTunable>, cbopaque=0x7fd9e6c99e00) #7 0x00007fda22446871 in virObjectEventStateDispatchCallbacks (callbacks=<optimized out>, callbacks=<optimized out>, event=0x7fda2736ea00, state=0x7fda24ca3960) #8 virObjectEventStateQueueDispatch (callbacks=0x7fda24c65800, queue=0x7ffc3857fe90, state=0x7fda24ca3960) #9 virObjectEventStateFlush (state=0x7fda24ca3960) #10 virObjectEventTimer (timer=<optimized out>, opaque=0x7fda24ca3960) #11 0x00007fda223ae8b9 in virEventPollDispatchTimeouts () #12 virEventPollRunOnce () #13 0x00007fda223ad1d2 in virEventRunDefaultImpl () #14 0x00007fda225046cd in virNetDaemonRun (dmn=dmn@entry=0x7fda24c775c0) #15 0x00007fda230d6351 in main (argc=<optimized out>, argv=<optimized out>) (gdb) p *(virNetServerClientPtr)0x7fd9e575b400 $2 = {parent = {parent = {u = {dummy_align1 = 140573849338048, dummy_align2 = 0x7fd9e65ac0c0, s = {magic = 3864707264, refs = 32729}}, klass = 0x7fda00000078}, lock = {lock = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}}}, wantClose = false, delayedClose = false, sock = 0x0, auth = 0, readonly = false, tlsCtxt = 0x0, tls = 0x0, sasl = 0x0, sockTimer = 0, identity = 0x0, nrequests = 0, nrequests_max = 0, rx = 0x0, tx = 0x0, filters = 0x0, nextFilterID = 0, dispatchFunc = 0x0, dispatchOpaque = 0x0, privateData = 0x0, privateDataFreeFunc = 0x0, privateDataPreExecRestart = 0x0, privateDataCloseFunc = 0x0, keepalive = 0x0} --- src/rpc/virnetserverclient.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 81da82c..562516f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1021,6 +1021,12 @@ void virNetServerClientClose(virNetServerClientPtr client) client->sock = NULL; } + if (client->privateData && + client->privateDataFreeFunc) { + client->privateDataFreeFunc(client->privateData); + client->privateData = NULL; + } + virObjectUnlock(client); } -- 2.8.3

2 1

[libvirt] [PATCH] Format printf format specifier used with niothreadids
by Daniel P. Berrange 20 Feb '17

20 Feb '17

The niothreadids struct field is size_t, so must use %zu not %lu with printf. While they're identical on some platforms, on others they are different, causing warnings conf/domain_conf.c: In function 'virDomainDefCheckABIStabilityFlags': conf/domain_conf.c:19575:26: error: format '%lu' expects argument of type 'long unsigned int', but argument 7 has type 'size_t {aka unsigned int}' [-Werror=format=] _("Target domain iothreads count %lu does not " ^ conf/domain_conf.c: In function 'virDomainDefFormatInternal': conf/domain_conf.c:23915:46: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'size_t {aka unsigned int}' [-Werror=format=] virBufferAsprintf(buf, "<iothreads>%lu</iothreads>\n", ^ Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed to fix Win32 builds src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea2cd0e..79bdbdf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19572,8 +19572,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, if (src->niothreadids != dst->niothreadids) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain iothreads count %lu does not " - "match source %lu"), + _("Target domain iothreads count %zu does not " + "match source %zu"), dst->niothreadids, src->niothreadids); goto error; } @@ -23912,7 +23912,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; if (def->niothreadids > 0) { - virBufferAsprintf(buf, "<iothreads>%lu</iothreads>\n", + virBufferAsprintf(buf, "<iothreads>%zu</iothreads>\n", def->niothreadids); if (virDomainDefIothreadShouldFormat(def)) { virBufferAddLit(buf, "<iothreadids>\n"); -- 2.9.3

1 0

[libvirt] [PATCH 00/13] iothread code cleanup
by Pavel Hrdina 20 Feb '17

20 Feb '17

This is a preparation for implementation of recently added iothread polling feature into QEMU. Pavel Hrdina (13): conf: fix indentation conf: remove redundant iothreads variable conf: move iothread parse code into its own function conf: store iothreads in order by iothread_id conf: always display iothread ids in the XML qemu_driver: check invalid iothread_id before we do anything else qemu_process: move capabilities check for iothreads qemu_process: remove unnecessary iothread check conf: move iothread XML validation from qemu_command qemu_driver: always check whether iothread is used by disk or not qemu_driver: move iothread existence check into one place qemu_driver: check whether iothread is used by controller qemu_driver: move iothread duplicate check into one place src/conf/domain_conf.c | 260 ++++++++++++++------- src/conf/domain_conf.h | 2 - src/qemu/qemu_command.c | 121 +--------- src/qemu/qemu_driver.c | 131 ++++++----- src/qemu/qemu_process.c | 61 ++--- .../qemuxml2argv-iothreads-ids-partial.args | 4 +- .../qemuxml2xmlout-cputune-iothreads.xml | 4 + ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 6 + .../qemuxml2xmlout-cputune-iothreadsched.xml | 6 + .../qemuxml2xmlout-cputune-numatune.xml | 4 + .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 4 + .../qemuxml2xmlout-iothreads-disk.xml | 4 + .../qemuxml2xmlout-iothreads-ids-partial.xml | 2 + .../qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml | 4 + .../qemuxml2xmlout-iothreads-virtio-scsi-pci.xml | 4 + .../qemuxml2xmlout-iothreads.xml | 4 + .../qemuxml2xmlout-vcpu-placement-static.xml | 4 + 17 files changed, 334 insertions(+), 291 deletions(-) -- 2.11.1

2 31

[libvirt] [PATCH] node_device: Check return value for udev_new()
by Marc Hartmayer 20 Feb '17

20 Feb '17

The comment was actually wrong as https://www.freedesktop.org/software/systemd/man/udev_new.html mentions that on failure NULL is returned. Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/node_device/node_device_udev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4b81312..4b0a875 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1491,13 +1491,11 @@ static int nodeStateInitialize(bool privileged, if (udevPCITranslateInit(privileged) < 0) goto cleanup; - /* - * http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev.h… - * - * indicates no return value other than success, so we don't check - * its return value. - */ udev = udev_new(); + if (!udev) { + virReportOOMError(); + goto cleanup; + } #if HAVE_UDEV_LOGGING /* cast to get rid of missing-format-attribute warning */ udev_set_log_fn(udev, (udevLogFunctionPtr) udevLogFunction); -- 2.5.5

4 10