- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: auto-add generic xhci rather than NEC xhci to Q35 domains
by Laine Stump 22 Jan '18

22 Jan '18

We recently added a generic XHCI USB3 controller to QEMU, and libvirt supports adding that controller rather than the NEC XHCI USB3 controller, but when auto-adding a USB controller to Q35 domains we were still adding the vendor-specific NEC controller. This patch changes to add the generic controller instead, if it's available in the QEMU binary that will be used. --- src/qemu/qemu_domain.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1676c03fc..6b4bd3cca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2660,12 +2660,13 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, addPCIeRoot = true; addImplicitSATA = true; - /* Prefer adding USB3 controller if supported - * (nec-usb-xhci). Failing that, add a USB2 controller set - * if the ich9-usb-ehci1 device is supported. Otherwise - * don't add anything. + /* Prefer adding a USB3 controller if supported, fall back + * to USB2 if there is no USB3 available, and if that's + * unavailable don't add anything. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) + usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_USB_EHCI1)) usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1; -- 2.14.3

2 1

[libvirt] [PATCH v2] libvirtd: clarify the TLS conf default vaule setting
by Chen Hanxiao 22 Jan '18

22 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As the description of daemon/libvirtd.conf, setting key_file, cert_file or key_file will override the default value. But if we set any one of them, we need to set all the rest of them. This patch clarify that description. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: fix a typo daemon/libvirtd.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8e0c0d96d..7040ff26b 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -183,6 +183,9 @@ # +# NB, if the default value of 'key_file', 'cert_file' or +# 'ca_file' would be changed, +# all of them should be changed together. # Override the default server key file path # #key_file = "/etc/pki/libvirt/private/serverkey.pem" -- 2.14.3

3 2

[libvirt] [PATCH] add support of iSER transport type in qemu with libiscsi
by lichstor＠gmail.com 20 Jan '18

20 Jan '18

From: zhangshengyu <zhangshengyu(a)fusionstack.cn> --- docs/schemas/domaincommon.rng | 28 +++++++++++++ src/conf/domain_conf.c | 8 ++++ src/qemu/qemu_block.c | 24 ++++++++++- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_parse_command.c | 10 ++++- src/storage/storage_backend_gluster.c | 1 + src/util/virstoragefile.c | 3 +- src/util/virstoragefile.h | 1 + .../disk-drive-network-iser-auth.args | 25 ++++++++++++ .../disk-drive-network-iser-auth.xml | 44 ++++++++++++++++++++ .../qemuargv2xmldata/disk-drive-network-iser.args | 25 ++++++++++++ tests/qemuargv2xmldata/disk-drive-network-iser.xml | 41 +++++++++++++++++++ tests/qemuargv2xmltest.c | 2 + ...-drive-network-iser-auth-secrettype-invalid.xml | 33 +++++++++++++++ ...sk-drive-network-iser-auth-wrong-secrettype.xml | 33 +++++++++++++++ .../disk-drive-network-iser-auth.args | 31 ++++++++++++++ .../disk-drive-network-iser-auth.xml | 43 ++++++++++++++++++++ .../disk-drive-network-iser-lun.args | 27 +++++++++++++ .../disk-drive-network-iser-lun.xml | 28 +++++++++++++ .../qemuxml2argvdata/disk-drive-network-iser.args | 29 +++++++++++++ tests/qemuxml2argvdata/disk-drive-network-iser.xml | 37 +++++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++ .../disk-drive-network-iser-auth.xml | 47 ++++++++++++++++++++++ .../qemuxml2xmloutdata/disk-drive-network-iser.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 25 files changed, 569 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser-auth.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-lun.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f22c932f6..819a8791d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1534,6 +1534,7 @@ <choice> <value>tcp</value> <value>rdma</value> + <value>iser</value> </choice> </attribute> </optional> @@ -1613,6 +1614,15 @@ <optional> <ref name="encryption"/> </optional> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> </element> </define> @@ -4386,6 +4396,15 @@ <attribute name="name"> <text/> </attribute> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> <interleave> <oneOrMore> <element name='host'> @@ -4397,6 +4416,15 @@ <ref name="PortNumber"/> </attribute> </optional> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> <empty/> </element> </oneOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1c25060f..8aa193ac2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7075,6 +7075,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, virStorageNetHostDefPtr *hosts, size_t *nhosts) { + char *transport = NULL; xmlNodePtr child; for (child = node->children; child; child = child->next) { @@ -7086,6 +7087,9 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, } } + if ((*hosts) && (transport = virXMLPropString(node, "transport"))) + (*hosts)->transport = virStorageNetHostTransportTypeFromString(transport); + return 0; } @@ -8490,6 +8494,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) goto cleanup; + virStorageSourceNetworkAssignDefaultPorts(src); ret = 0; @@ -22371,6 +22376,9 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, VIR_FREE(path); + if (src->hosts && src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) + virBufferEscapeString(attrBuf, " transport='%s'", "iser"); + if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT && !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && src->tlsFromConfig)) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255e..49837205f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -433,6 +433,12 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (VIR_STRDUP(uri->scheme, virStorageNetProtocolTypeToString(src->protocol)) < 0) goto cleanup; + } else if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) { + uri->port = src->hosts->port; + + if (VIR_STRDUP(uri->scheme, + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) + goto cleanup; } else { if (virAsprintf(&uri->scheme, "%s+%s", virStorageNetProtocolTypeToString(src->protocol), @@ -506,6 +512,19 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, goto cleanup; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: + transport = "iser"; + if (virAsprintf(&port, "%u", host->port) < 0) + goto cleanup; + + if (virJSONValueObjectCreate(&server, + "s:type", transport, + "s:host", host->name, + "s:port", port, + NULL) < 0) + goto cleanup; + break; + case VIR_STORAGE_NET_HOST_TRANS_UNIX: if (virJSONValueObjectCreate(&server, "s:type", "unix", @@ -590,7 +609,8 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) virJSONValuePtr ret = NULL; char *port = NULL; - if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP && + host->transport != VIR_STORAGE_NET_HOST_TRANS_ISER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only TCP protocol can be converted to InetSocketAddress")); return NULL; @@ -831,7 +851,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", virStorageNetHostTransportTypeToString(src->hosts->transport), "S:user", username, "S:password-secret", objalias, NULL)); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b8aede32d..dd6e3be9a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -883,6 +883,8 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, if (!((src->hosts->name && strchr(src->hosts->name, ':')) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP && !src->hosts->name) || + (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER && + !src->hosts->name) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && src->hosts->socket && src->hosts->socket[0] != '/'))) { @@ -891,6 +893,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, switch (src->hosts->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: + case VIR_STORAGE_NET_HOST_TRANS_ISER: virBufferAsprintf(&buf, "%s:%u", src->hosts->name, src->hosts->port); break; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 5fe3f97d0..d376af208 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -70,7 +70,9 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (STRNEQ(uri->scheme, scheme)) { + if (STREQ(uri->scheme, "iser")) { + transp = (char *)"iser"; + } else if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -709,6 +711,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (qemuParseISCSIString(def) < 0) goto error; + } else if (STRPREFIX(def->src->path, "iser:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI; + + if (qemuParseISCSIString(def) < 0) + goto error; } else if (STRPREFIX(def->src->path, "sheepdog:")) { char *p = def->src->path; char *port, *vdi; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 5eea84f16..1452fa0cd 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -608,6 +608,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPrivPtr priv, hoststr = host->socket; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_LAST: break; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 5780180a9..63253a9c4 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -92,7 +92,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", "unix", - "rdma") + "rdma", + "iser") VIR_ENUM_IMPL(virStorageSourcePoolMode, VIR_STORAGE_SOURCE_POOL_MODE_LAST, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ecd806c93..5a6ec7776 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -147,6 +147,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, + VIR_STORAGE_NET_HOST_TRANS_ISER, VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args new file mode 100644 index 000000000..aaf10d8c8 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\ +format=raw,if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..7226443fb --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='qemuargv2xml_usage'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <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='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.args b/tests/qemuargv2xmldata/disk-drive-network-iser.args new file mode 100644 index 000000000..c476e759e --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example,format=raw,\ +if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.xml b/tests/qemuargv2xmldata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <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='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index cb010268c..59b26c647 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -213,6 +213,8 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix"); DO_TEST("disk-drive-network-iscsi"); DO_TEST("disk-drive-network-iscsi-auth"); + DO_TEST("disk-drive-network-iser"); + DO_TEST("disk-drive-network-iser-auth"); DO_TEST("disk-drive-network-gluster"); DO_TEST("disk-drive-network-rbd"); DO_TEST("disk-drive-network-rbd-auth"); diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml new file mode 100644 index 000000000..dbcf484dc --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml new file mode 100644 index 000000000..5525e9d86 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args new file mode 100644 index 000000000..5fa7a04bb --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args @@ -0,0 +1,31 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..fbcb6b4f1 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args new file mode 100644 index 000000000..d9428533b --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args @@ -0,0 +1,27 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=iser://example.org:3260/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-scsi0-0-0-0 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml new file mode 100644 index 000000000..25fa76140 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='3260' transport='iser'/> + </source> + <target dev='sda' bus='scsi'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.args b/tests/qemuxml2argvdata/disk-drive-network-iser.args new file mode 100644 index 000000000..49ea467ff --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.xml b/tests/qemuxml2argvdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..b1634555c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be32d891e..dcb35f017 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -939,6 +939,13 @@ mymain(void) DO_TEST("disk-drive-network-iscsi-lun", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); + DO_TEST("disk-drive-network-iser", NONE); + DO_TEST("disk-drive-network-iser-auth", NONE); + DO_TEST_PARSE_ERROR("disk-drive-network-iser-auth-secrettype-invalid", NONE); + DO_TEST_PARSE_ERROR("disk-drive-network-iser-auth-wrong-secrettype", NONE); + DO_TEST("disk-drive-network-iser-lun", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-drive-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST("disk-drive-network-rbd", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..1b27fdea2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <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='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <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='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2be8eb2c1..aeeda2dd1 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -515,6 +515,8 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix", NONE); DO_TEST("disk-drive-network-iscsi", NONE); DO_TEST("disk-drive-network-iscsi-auth", NONE); + DO_TEST("disk-drive-network-iser", NONE); + DO_TEST("disk-drive-network-iser-auth", NONE); DO_TEST("disk-drive-network-gluster", NONE); DO_TEST("disk-drive-network-rbd", NONE); DO_TEST("disk-drive-network-rbd-auth", NONE); -- 2.13.6 (Apple Git-96)

3 4

[libvirt] [PATCH V3] nodedev: Fix failing to parse PCI address for non-PCI network devices
by Jim Fehlig 19 Jan '18

19 Jan '18

Commit 8708ca01c added virNetDevSwitchdevFeature() to check if a network device has Switchdev capabilities. virNetDevSwitchdevFeature() attempts to retrieve the PCI device associated with the network device, ignoring non-PCI devices. It does so via the following call chain virNetDevSwitchdevFeature()->virNetDevGetPCIDevice()-> virPCIGetDeviceAddressFromSysfsLink() For non-PCI network devices (qeth, Xen vif, etc), virPCIGetDeviceAddressFromSysfsLink() will report an error when virPCIDeviceAddressParse() fails. virPCIDeviceAddressParse() also logs an error. After commit 8708ca01c there are now two errors reported for each non-PCI network device even though the errors are harmless. To avoid the errors, introduce virNetDevIsPCIDevice() and use it in virNetDevGetPCIDevice() before attempting to retrieve the associated PCI device. virNetDevIsPCIDevice() uses the 'subsystem' property of the device to determine if it is PCI. See the sysfs rules in kernel documentation for more details https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html --- V2: https://www.redhat.com/archives/libvir-list/2018-January/msg00233.html Changes in V3: Implement checking if netdev is PCI in virnetdev.c instead of virpci.c Addressed other comments from eskultet src/util/virnetdev.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index eb2d119bf..baf4a71fe 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -22,6 +22,7 @@ #include <config.h> +#include "dirname.h" #include "virnetdev.h" #include "virnetlink.h" #include "virmacaddr.h" @@ -1147,6 +1148,48 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, return 0; } +/** + * Determine if the device path specified in devpath is a PCI Device + * by resolving the 'subsystem'-link in devpath and looking for + * 'pci' in the last component. For more information see the rules + * for accessing sysfs in the kernel docs + * + * https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html + * + * Returns true if devpath's susbsystem is pci, false otherwise. + */ +static bool +virNetDevIsPCIDevice(const char *devpath) +{ + char *subsys_link = NULL; + char *abs_path = NULL; + char *subsys = NULL; + bool ret = false; + + if (virAsprintf(&subsys_link, "%s/subsystem", devpath) < 0) + return false; + + if (!virFileExists(subsys_link)) + goto cleanup; + + if (virFileIsLink(subsys_link) != 1) + goto cleanup; + + if (virFileResolveLink(subsys_link, &abs_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to resolve device subsystem symlink %s"), + subsys_link); + goto cleanup; + } + + subsys = last_component(abs_path); + ret = STRPREFIX(subsys, "pci"); + + cleanup: + VIR_FREE(subsys_link); + VIR_FREE(abs_path); + return ret; +} static virPCIDevicePtr virNetDevGetPCIDevice(const char *devName) @@ -1158,6 +1201,9 @@ virNetDevGetPCIDevice(const char *devName) if (virNetDevSysfsFile(&vfSysfsDevicePath, devName, "device") < 0) goto cleanup; + if (!virNetDevIsPCIDevice(vfSysfsDevicePath)) + goto cleanup; + vfPCIAddr = virPCIGetDeviceAddressFromSysfsLink(vfSysfsDevicePath); if (!vfPCIAddr) goto cleanup; -- 2.15.1

2 2

[libvirt] [PATCH] virt-aa-helper: Allow parsing supported features for qemu/kvm
by Shivaprasad G Bhat 19 Jan '18

19 Jan '18

The virt-aa-helper fails to parse the xmls with the memory/cpu hotplug features or user assigned aliases. Set the features in xmlopt->config for the parsing to succeed. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 21 --------------------- src/conf/domain_conf.h | 21 +++++++++++++++++++++ src/security/virt-aa-helper.c | 7 +++++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1c2506..20ce83e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -64,27 +64,6 @@ VIR_LOG_INIT("conf.domain_conf"); -/* This structure holds various callbacks and data needed - * while parsing and creating domain XMLs */ -struct _virDomainXMLOption { - virObject parent; - - /* XML parser callbacks and defaults */ - virDomainDefParserConfig config; - - /* domain private data management callbacks */ - virDomainXMLPrivateDataCallbacks privateData; - - /* XML namespace callbacks */ - virDomainXMLNamespace ns; - - /* ABI stability callbacks */ - virDomainABIStability abi; - - /* Private data for save image stored in snapshot XML */ - virSaveCookieCallbacks saveCookie; -}; - #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ VIR_DOMAIN_DEF_FORMAT_INACTIVE | \ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6f7f96b..aacb88a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2662,6 +2662,27 @@ struct _virDomainABIStability { virDomainABIStabilityDomain domain; }; +/* This structure holds various callbacks and data needed + * while parsing and creating domain XMLs */ +struct _virDomainXMLOption { + virObject parent; + + /* XML parser callbacks and defaults */ + virDomainDefParserConfig config; + + /* domain private data management callbacks */ + virDomainXMLPrivateDataCallbacks privateData; + + /* XML namespace callbacks */ + virDomainXMLNamespace ns; + + /* ABI stability callbacks */ + virDomainABIStability abi; + + /* Private data for save image stored in snapshot XML */ + virSaveCookieCallbacks saveCookie; +}; + virDomainXMLOptionPtr virDomainXMLOptionNew(virDomainDefParserConfigPtr config, virDomainXMLPrivateDataCallbacksPtr priv, virDomainXMLNamespacePtr xmlns, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index f7ccae0..8b0ca46 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -699,6 +699,13 @@ get_definition(vahControl * ctl, const char *xmlStr) goto exit; } + if (virtType == VIR_DOMAIN_VIRT_QEMU || virtType == VIR_DOMAIN_VIRT_KVM) { + ctl->xmlopt->config.features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | + VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN | + VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS | + VIR_DOMAIN_DEF_FEATURE_USER_ALIAS; + } + if (virCapabilitiesAddGuestDomain(guest, virtType, NULL,

3 2

[libvirt] Release of libvirt-4.0.0
by Daniel Veillard 19 Jan '18

19 Jan '18

First release of the year ! A bit late but it is now tagged in git and signed tarball and rpms are at the usual place: ftp://libvirt.org/libvirt/ I also pushed a release of the python bindings in git and at ftp://libvirt.org/libvirt/python/ This is a relatively small release, probably due to the end of year slowdown though there is some notable addition: * New features - tools: Provide bash completion support. Both virsh and virt-admin now implement basic bash completion support. - qemu: Refresh capabilities on host microcode update A microcode update can cause the CPUID bits to change; therefore, the capabilities cache should be rebuilt when such an update is detected on the host. - lxc: Set hostname based on container name * Improvements - CPU frequency reporting improvements The CPU frequency will now be reported by virsh nodeinfo and other tools for s390 hosts; at the same time; CPU frequency has been disabled on aarch64 hosts because there's no way to detect it reliably. - libxl: Mark domain0 as persistent - Xen: Add support for multiple IP addresses on interface devices - qemu: Add support for hot unplugging redirdev device * Bug fixes - qemu: Enforce vCPU hotplug granularity constraints QEMU 2.7 and newer don't allow guests to start unless the initial vCPUs count is a multiple of the vCPU hotplug granularity, so validate it and report an error if needed. thanks everybody for your help with this release, be it code, bug reports reviews, documentation, etc ... Enjoy the new 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] [PATCH] Revert "qemu: monitor: do not report error on shutdown"
by Michal Privoznik 19 Jan '18

19 Jan '18

This reverts commit aeda1b8c56dc58b0a413acc61bbea938b40499e1. Problem is that we need mon->lastError to be set because it's used all over the place. Also, there's nothing wrong with reporting error if one occurred. I mean, if there's a thread executing an API and which currently is talking on monitor it definitely wants the error reported. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 85c7d68a1..fc146bdbf 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -78,7 +78,6 @@ struct _qemuMonitor { * < 0: an error occurred during the registration of @fd */ int watch; int hasSendFD; - int willhangup; virDomainObjPtr vm; @@ -716,10 +715,8 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) if (events & VIR_EVENT_HANDLE_HANGUP) { hangup = true; if (!error) { - if (!mon->willhangup) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); - } + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("End of file from qemu monitor")); eof = true; events &= ~VIR_EVENT_HANDLE_HANGUP; } @@ -758,7 +755,7 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) if (mon->lastError.code != VIR_ERR_OK) { /* Already have an error, so clear any new error */ virResetLastError(); - } else if (!mon->willhangup) { + } else { virErrorPtr err = virGetLastError(); if (!err) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1352,7 +1349,6 @@ qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; VIR_DEBUG("mon=%p guest=%u", mon, guest); - mon->willhangup = 1; QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; -- 2.13.6

2 2

[libvirt] [PATCH] qemu: Don't send any monitor commands afer SHUTDOWN event
by Michal Privoznik 19 Jan '18

19 Jan '18

After aeda1b8c56dc5 we tried to stop reporting I/O errors on expected monitor HUP. We've achieved that by not setting mon->lastError once we've received SHUTDOWN event. However, this makes us to deadlock in case there's thread that enters the monitor after the event is received. The problem is, we're no longer setting mon->lastError and therefore qemuMonitorSend() does not return early and continues execution until virCondWait() (which will never wake up). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 85c7d68a1..9f3e3eb14 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1063,7 +1063,7 @@ qemuMonitorSend(qemuMonitorPtr mon, { int ret = -1; - /* Check whether qemu quit unexpectedly */ + /* Check whether qemu quit unexpectedly, */ if (mon->lastError.code != VIR_ERR_OK) { VIR_DEBUG("Attempt to send command while error is set %s", NULLSTR(mon->lastError.message)); @@ -1071,6 +1071,12 @@ qemuMonitorSend(qemuMonitorPtr mon, return -1; } + /* or expectedly. */ + if (mon->willhangup) { + VIR_DEBUG("Attempt to send command while domain is shutting down"); + return -1; + } + mon->msg = msg; qemuMonitorUpdateWatch(mon); -- 2.13.6

2 2

[libvirt] [PATCH] qemu: Fix crash in offline migration
by Jiri Denemark 19 Jan '18

19 Jan '18

When migrating a shutoff domain (i.e., offline migration), we have no statistics to report and thus jobInfo will be NULL in qemuMigrationFinish. Broken by me in v3.10.0-183-ge8784e7868. https://bugzilla.redhat.com/show_bug.cgi?id=1536351 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a56bc596ff..1854900c9a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5481,8 +5481,10 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (dom) { - VIR_STEAL_PTR(priv->job.completed, jobInfo); - priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; + if (jobInfo) { + VIR_STEAL_PTR(priv->job.completed, jobInfo); + priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; + } if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, QEMU_MIGRATION_COOKIE_STATS) < 0) -- 2.16.0

2 1

[libvirt] [PATCH 00/17] CPU models and features for Spectre, CVE-2017-5715
by Jiri Denemark 18 Jan '18

18 Jan '18

This is the libvirt's part of the changes related to CVE-2017-5715. The new models can be used to pass the protective CPU features to guests. But remember, the host CPU microcode, host kernel, QEMU, and libvirt all need to be updated for this to be any useful. Based on a patch from Paolo Bonzini. See QEMU patches from Eduardo for more details: https://patchew.org/QEMU/20180109154519.25634-1-ehabkost@redhat.com/ Jiri Denemark (16): cputest: Add data for Intel(R) Xeon(R) CPU E5-2609 v3 cputest: Add data for Intel(R) Xeon(R) CPU E5-2623 v4 cputest: Add data for Intel(R) Xeon(R) Gold 5115 CPU cputest: Add data for updated AMD EPYC 7601 32-Core Processor cputest: Add data for updated Intel(R) Core(TM) i7-5600U CPU cpu: Add Nehalem-IBRS CPU model cpu: Add Westmere-IBRS CPU model cpu: Add SandyBridge-IBRS CPU model cpu: Add IvyBridge-IBRS CPU model cpu: Add Haswell-noTSX-IBRS CPU model cpu: Add Haswell-IBRS CPU model cpu: Add Broadwell-noTSX-IBRS CPU model cpu: Add Broadwell-IBRS CPU model cpu: Add Skylake-Client-IBRS CPU model cpu: Add Skylake-Server-IBRS CPU model cpu: Add EPYC-IBPB CPU model Paolo Bonzini (1): cpu: add CPU features for indirect branch prediction protection src/cpu/cpu_map.xml | 622 ++++++++++++++++++ tests/cputest.c | 5 + .../x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 6 + .../x86_64-cpuid-Core-i7-5600U-ibrs-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 29 + .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 30 + .../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml | 15 + .../x86_64-cpuid-Core-i7-5600U-ibrs.json | 525 +++++++++++++++ .../x86_64-cpuid-Core-i7-5600U-ibrs.xml | 41 ++ ...86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml | 7 + ...x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml | 9 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 17 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 17 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 12 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb.json | 722 ++++++++++++++++++++ .../x86_64-cpuid-EPYC-7601-32-Core-ibpb.xml | 54 ++ .../x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml | 6 + .../x86_64-cpuid-Xeon-E5-2609-v3-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 31 + .../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 32 + .../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 14 + .../cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json | 726 +++++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.xml | 37 ++ .../x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml | 7 + .../x86_64-cpuid-Xeon-E5-2623-v4-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 30 + .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 34 + .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 11 + .../cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json | 662 +++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.xml | 43 ++ .../x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 8 + .../x86_64-cpuid-Xeon-Gold-5115-enabled.xml | 8 + .../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 29 + .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 30 + .../x86_64-cpuid-Xeon-Gold-5115-json.xml | 8 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json | 614 +++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.xml | 54 ++ 37 files changed, 4519 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.xml -- 2.15.1

4 24

[libvirt] Test failures in libvirt RHEL-6.2.AUS errata job
by Jingjing Shao 18 Jan '18

18 Jan '18

Hi admin, I met the error as below in the in libvirt RHEL-6.2.AUS errata job, can you help to check it ? ======================================= 1 of 54 tests failed (2 tests were not run) Please report to libvir-list(a)redhat.com ======================================= make[1]: *** [check-TESTS] Error 1 make[1]: Leaving directory `/home/test/rpmbuild/BUILD/libvirt-0.9.4/tests' make: *** [check-am] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.FOpZXU (%check) Details can be seen in attachment. Reference: http://nest.test.redhat.com/mnt/qa/scratch/x86-64-6s-2aus-v1/2017:32031/tps… -- Regards, Jingjing Shao

2 1

[libvirt] [PATCH] Add Eduardo Otubo to Planet Virt-Tools
by Eduardo Otubo 18 Jan '18

18 Jan '18

Adding Eduardo Otubo's blog information and avatar to config.ini at Planet Virt-Tools. Signed-ff-by: Eduardo Otubo <otubo(a)redhat.com> --- updater/virt-tools/config.ini | 6 ++++++ updater/virt-tools/images/otubo.png | Bin 0 -> 10597 bytes 2 files changed, 6 insertions(+) create mode 100644 updater/virt-tools/images/otubo.png diff --git a/updater/virt-tools/config.ini b/updater/virt-tools/config.ini index 988e572..d47e82f 100644 --- a/updater/virt-tools/config.ini +++ b/updater/virt-tools/config.ini @@ -167,3 +167,9 @@ name = Nathan Gauër [https://virtualpenguins.blogspot.com/feeds/posts/default] name = Cornelia Huck + +[http://www.otubo.net/feeds/posts/default/-/virt/?alt=rss] +name = Eduardo Otubo +face = otubo.png +facewidth = 80 +faceheight = 80 diff --git a/updater/virt-tools/images/otubo.png b/updater/virt-tools/images/otubo.png new file mode 100644 index 0000000000000000000000000000000000000000..9dfd30fce1c7b06bac5ad9b07052ad170bbe768a GIT binary patch literal 10597 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 literal 0 HcmV?d00001 -- 2.14.3

2 1

[libvirt] [RFC PATCH 00/10] Resolve libvirtd hang on termination with connected long running client
by John Ferlan 17 Jan '18

17 Jan '18

This RFC is a combination of a couple of different patch postings that I've combined into one central "stream" of patches that can be discussed for their relative importance or need to fix the problem. Although a bit long winded, I think I've captured enough history for anyone so inclined to walk through the history to understand the maze of twisty patches that it takes to hopefully resolve the issue. The first two patches were presented previously, but not accepted: https://www.redhat.com/archives/libvir-list/2017-November/msg00296.html https://www.redhat.com/archives/libvir-list/2017-November/msg00297.html However since that time, it seems "some form" of the patches is necessary. Most importantly making sure the virObjectUnref for @srv and @srvAdm occurs *prior to* the virNetDaemonClose(dmn); at cleanup (IOW: out of order for a reason). Doing that also requires any program started on the servers also has the virObjectUnref prior to daemon close. The 3rd and 4th patches are a result of discussions held in mid December related to libvirtd crashes/hangs and some possible adjustments to help. Discussion starts here: https://www.redhat.com/archives/libvir-list/2017-December/msg00515.html This led to suggestions to move the toggling of services from Dispose to Close *and* to split the virThreadPoolFree into a Drain function that could also be called during the Close function rather than waiting for the Dispose to occur. Still testing showed that just those 4 patches it still wasn't enough as libvirtd ended up just "hung" because of some patches Nikolay posted that add a new shutdown state, see: https://www.redhat.com/archives/libvir-list/2017-October/msg01134.html Those patches languished mainly because it wasn't clear (at the time) the relationship between them and another series dealing with libvirtd crashes that was partially accepted and pushed: https://www.redhat.com/archives/libvir-list/2017-October/msg01347.html and followup discussion starting here: https://www.redhat.com/archives/libvir-list/2017-November/msg00023.html The 9th patch can be used to test that the first 8 do the job. The details on how I set up the test environment is in the patch. If the sequence is run before the first 8 patches, you will end up with a couple of different hang scenarios. So if you're compelled to see what the big deal is, then apply this one alone and have fun playing. The 10th patch is the one patch from the partially pushed series that wasn't pushed as it was not deemed necessary. It's presented here mainly for completeness. John Ferlan (5): libvirtd: Alter refcnt processing for domain server objects libvirtd: Alter refcnt processing for server program objects netserver: Toggle service off during close qemu: Introduce virTheadPoolDrain APPLY ONLY FOR TESTING PURPOSES Nikolay Shirokovskiy (5): libvirt: introduce hypervisor driver shutdown function qemu: implement state driver shutdown function qemu: agent: fix monitor close during first sync qemu: monitor: check monitor not closed upon send libvirtd: fix crash on termination daemon/libvirtd.c | 46 ++++++++++++++++++++++++++++++++----------- src/driver-state.h | 4 ++++ src/libvirt.c | 18 +++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_agent.c | 14 ++++++------- src/qemu/qemu_driver.c | 44 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 27 ++++++++++++------------- src/rpc/virnetdaemon.c | 1 + src/rpc/virnetserver.c | 5 ++--- src/rpc/virnetserverservice.c | 2 ++ src/util/virthreadpool.c | 19 ++++++++++++------ src/util/virthreadpool.h | 2 ++ 13 files changed, 143 insertions(+), 42 deletions(-) -- 2.13.6

3 19

[libvirt] [PATCH V2] nodedev: Fix failing to parse PCI address for non-PCI network devices
by Jim Fehlig 17 Jan '18

17 Jan '18

Based loosely on a patch from Fei Li <fli(a)suse.com>. Commit 8708ca01c added virNetDevSwitchdevFeature() to check if a network device has Switchdev capabilities. virNetDevSwitchdevFeature() attempts to retrieve the PCI device associated with the network device, ignoring non-PCI devices. It does so via the following call chain virNetDevSwitchdevFeature()->virNetDevGetPCIDevice()-> virPCIGetDeviceAddressFromSysfsLink() For non-PCI network devices (qeth, Xen vif, etc), virPCIGetDeviceAddressFromSysfsLink() will report an error when virPCIDeviceAddressParse() fails. virPCIDeviceAddressParse() also logs an error. After commit 8708ca01c there are now two errors reported for each non-PCI network device even though the errors are harmless. To avoid changing virPCIGetDeviceAddressFromSysfsLink(), virPCIDeviceAddressParse() and related code that has quite a few call sites, add a function to check if a network device is a PCI device and use it in virNetDevSwitchdevFeature() before attempting to retrieve the PCI device. --- Suggestions welcome on a better name for virPCIIsPCIDevice, or even a better approach to solving this issue. Currently virPCIIsPCIDevice assumes the device is PCI if its subsystem starts with 'pci'. I'd be happy to hear if there is a better way to determine if a network device is PCI. src/libvirt_private.syms | 1 + src/util/virnetdev.c | 25 ++++++++++++++++++++++--- src/util/virpci.c | 32 ++++++++++++++++++++++++++++++++ src/util/virpci.h | 3 +++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a705fa846..bdf98ded1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2458,6 +2458,7 @@ virPCIGetVirtualFunctionInfo; virPCIGetVirtualFunctions; virPCIHeaderTypeFromString; virPCIHeaderTypeToString; +virPCIIsPCIDevice; virPCIIsVirtualFunction; virPCIStubDriverTypeFromString; virPCIStubDriverTypeToString; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index eb2d119bf..a9af08797 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1148,6 +1148,21 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, } +static bool +virNetDevIsPCIDevice(const char *devName) +{ + char *vfSysfsDevicePath = NULL; + bool ret; + + if (virNetDevSysfsFile(&vfSysfsDevicePath, devName, "device/subsystem") < 0) + return false; + + ret = virPCIIsPCIDevice(vfSysfsDevicePath); + VIR_FREE(vfSysfsDevicePath); + return ret; +} + + static virPCIDevicePtr virNetDevGetPCIDevice(const char *devName) { @@ -3236,14 +3251,18 @@ virNetDevSwitchdevFeature(const char *ifname, if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0) goto cleanup; - pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : - virNetDevGetPCIDevice(ifname); + if (pfname == NULL && VIR_STRDUP(pfname, ifname) < 0) + goto cleanup; + /* No PCI device, then no feature bit to check/add */ - if (pci_device_ptr == NULL) { + if (!virNetDevIsPCIDevice(pfname)) { ret = 0; goto cleanup; } + if ((pci_device_ptr = virNetDevGetPCIDevice(pfname)) == NULL) + goto cleanup; + if (!(nl_msg = nlmsg_alloc_simple(family_id, NLM_F_REQUEST | NLM_F_ACK))) { virReportOOMError(); diff --git a/src/util/virpci.c b/src/util/virpci.c index fe57bef32..f22d89cd7 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2651,6 +2651,38 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) return bdf; } +/** + * virPCIIsPCIDevice: + * @device_link: sysfs path for the device + * + * Returns true if the device specified in @device_link sysfs + * path is a PCI device, otherwise returns false. + */ +bool +virPCIIsPCIDevice(const char *device_link) +{ + char *device_path = NULL; + char *subsys = NULL; + bool ret; + + if (!virFileExists(device_link)) { + VIR_DEBUG("'%s' does not exist", device_link); + return false; + } + + device_path = canonicalize_file_name(device_link); + if (device_path == NULL) { + VIR_DEBUG("Failed to resolve device link '%s'", device_link); + return false; + } + + subsys = last_component(device_path); + ret = STRPREFIX(subsys, "pci"); + + VIR_FREE(device_path); + return ret; +} + /** * virPCIGetPhysicalFunction: * @vf_sysfs_path: sysfs path for the virtual function diff --git a/src/util/virpci.h b/src/util/virpci.h index f1fbe39e6..489d8a777 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -190,6 +190,9 @@ int virPCIDeviceWaitForCleanup(virPCIDevicePtr dev, const char *matcher); virPCIDeviceAddressPtr virPCIGetDeviceAddressFromSysfsLink(const char *device_link); +bool +virPCIIsPCIDevice(const char *device_link); + int virPCIGetPhysicalFunction(const char *vf_sysfs_path, virPCIDeviceAddressPtr *pf); -- 2.15.1

2 2

[libvirt] [PATCH] news: Update for 4.0.0
by Andrea Bolognani 17 Jan '18

17 Jan '18

As usual, a bunch of changes slipped through the cracks during the development cycle. Update the release notes to include at least the most notable. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- I'll push this tomorrow morning under the "can't possibly be worse than leaving it alone" rule, so that it makes it into the release, unless I get feedback earlier. docs/news.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 064b9ae83..d034be99a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -35,8 +35,48 @@ <libvirt> <release version="v4.0.0" date="unreleased"> <section title="New features"> + <change> + <summary> + tools: Provide bash completion support + </summary> + <description> + Both <code>virsh</code> and <code>virt-admin</code> now implement + basic bash completion support. + </description> + </change> + <change> + <summary> + qemu: Refresh capabilities on host microcode update + </summary> + <description> + A microcode update can cause the CPUID bits to change; therefore, + the capabilities cache should be rebuilt when such an update is + detected on the host. + </description> + </change> + <change> + <summary> + lxc: Set hostname based on container name + </summary> + </change> </section> <section title="Improvements"> + <change> + <summary> + CPU frequency reporting improvements + </summary> + <description> + The CPU frequency will now be reported by <code>virsh nodeinfo</code> + and other tools for s390 hosts; at the same time; CPU frequency has + been disabled on aarch64 hosts because there's no way to detect it + reliably. + </description> + </change> + <change> + <summary> + libxl: Mark domain0 as persistent + </summary> + </change> <change> <summary> Xen: Add support for multiple IP addresses on interface devices @@ -49,6 +89,16 @@ </change> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Enforce vCPU hotplug granularity constraints + </summary> + <description> + QEMU 2.7 and newer don't allow guests to start unless the initial + vCPUs count is a multiple of the vCPU hotplug granularity, so + validate it and report an error if needed. + </description> + </change> </section> </release> <release version="v3.10.0" date="2017-12-04"> -- 2.14.3

2 3

[libvirt] [PATCH] qemu: avoid denial of service reading from QEMU monitor (CVE-2018-xxxx)
by Daniel P. Berrange 17 Jan '18

17 Jan '18

We read from QEMU until seeing a \r\n pair to indicate a completed reply or event. To avoid memory denial-of-service though, we must have a size limit on amount of data we buffer. 10 MB is large enough that it ought to cope with normal QEMU replies, and small enough that we're not consuming unreasonable mem. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_monitor.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 046caf001c..85c7d68a13 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -55,6 +55,15 @@ VIR_LOG_INIT("qemu.qemu_monitor"); #define DEBUG_IO 0 #define DEBUG_RAW_IO 0 +/* We read from QEMU until seeing a \r\n pair to indicate a + * completed reply or event. To avoid memory denial-of-service + * though, we must have a size limit on amount of data we + * buffer. 10 MB is large enough that it ought to cope with + * normal QEMU replies, and small enough that we're not + * consuming unreasonable mem. + */ +#define QEMU_MONITOR_MAX_RESPONSE (10 * 1024 * 1024) + struct _qemuMonitor { virObjectLockable parent; @@ -575,6 +584,12 @@ qemuMonitorIORead(qemuMonitorPtr mon) int ret = 0; if (avail < 1024) { + if (mon->bufferLength >= QEMU_MONITOR_MAX_RESPONSE) { + virReportSystemError(ERANGE, + _("No complete monitor response found in %d bytes"), + QEMU_MONITOR_MAX_RESPONSE); + return -1; + } if (VIR_REALLOC_N(mon->buffer, mon->bufferLength + 1024) < 0) return -1; -- 2.14.3

3 3

[libvirt] [PATCH] qemu: qemuDomainNamespaceUnlinkPaths: Return 0 in case of success
by Marc Hartmayer 17 Jan '18

17 Jan '18

Commit 7a931a4204af refactored the code and probably forgot to add this line. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5c171e4cbd6c..441bf5935b14 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10212,7 +10212,7 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, goto cleanup; } - + ret = 0; cleanup: virStringListFreeCount(devMountsPath, ndevMountsPath); virObjectUnref(cfg); -- 2.13.4

2 1

[libvirt] [PATCH] AppArmor: Allow libvirtd to kill unconfined processes
by intrigeri+libvirt＠boum.org 17 Jan '18

17 Jan '18

From: intrigeri <intrigeri+libvirt(a)boum.org> On startup libvirtd runs a number of QEMU processes unconfined such as: /usr/bin/qemu-system-x86_64 -S -no-user-config -nodefaults -nographic -machine none,accel=kvm:tcg -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize libvirtd needs to be allowed to kill these processes, otherwise they remain running. --- examples/apparmor/usr.sbin.libvirtd | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index a1083b0410..0ddec3f6e2 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -63,6 +63,7 @@ signal (send) peer=/usr/sbin/dnsmasq, signal (read, send) peer=libvirt-*, + signal (send) set=("kill") peer=unconfined, # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. -- 2.15.1

4 3

[libvirt] [PATCH libvirt] qemu: Fix segmentation fault when attaching a non iSCSI host device
by Marc Hartmayer 17 Jan '18

17 Jan '18

Add a check if it's a iSCSI hostdev and if it's not then don't use the union member 'iscsi'. The segmentation fault occured when accessing secinfo->type, but this can vary from case to case. 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/qemu/qemu_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6dc16a1054af..83d0e1c71a8e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2343,8 +2343,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, bool secobjAdded = false; virJSONValuePtr secobjProps = NULL; virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; - qemuDomainStorageSourcePrivatePtr srcPriv; + qemuDomainStorageSourcePrivatePtr srcPriv = NULL; qemuDomainSecretInfoPtr secinfo = NULL; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) { @@ -2386,7 +2385,8 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, if (qemuDomainSecretHostdevPrepare(conn, priv, hostdev) < 0) goto cleanup; - srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) + srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(scsisrc->u.iscsi.src); if (srcPriv) secinfo = srcPriv->secinfo; if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) { -- 2.13.4

2 2

[libvirt] [PATCH] remove bogus casts of arg to g_object_ref
by Daniel P. Berrange 17 Jan '18

17 Jan '18

Latest version of glib uses typeof() magic to cast the return value of g_object_ref to match its argument, instead of returning a 'void *'. A few places in the code were casting the arg to G_OBJECT() which was then incompatible with the variable we assigned the result to. The parameter casts were always redundant so just remove them. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 851e35c..ca2c6e6 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -572,7 +572,7 @@ gvir_config_object_set_node_content(GVirConfigObject *object, node = gvir_config_object_replace_child(object, node_name); g_return_if_fail(node != NULL); } else { - node = g_object_ref(G_OBJECT(object)); + node = g_object_ref(object); } encoded_data = xmlEncodeEntitiesReentrant(node->priv->node->doc, (xmlChar *)value); @@ -896,7 +896,7 @@ gvir_config_object_attach(GVirConfigObject *parent, GVirConfigObject *child, gbo child->priv->doc = NULL; } if (parent->priv->doc != NULL) { - child->priv->doc = g_object_ref(G_OBJECT(parent->priv->doc)); + child->priv->doc = g_object_ref(parent->priv->doc); } } -- 2.14.3

1 1

[libvirt] New GIT repos for libvirt wiki & virt tools planet
by Daniel P. Berrange 17 Jan '18

17 Jan '18

Hi Folks, Just let you all know that I've moved various libvirt related websites over to hosting on Red Hat's OpenShift v3 infrastructure. With the new v3 that is based on Kubernetes, I'm able to publish the GIT repos containing the core content & software setup. For wiki.libvirt.org: https://libvirt.org/git/?p=libvirt-wiki.git;a=summary For planet.virt-tools.org: https://libvirt.org/git/?p=virttools-planet.git;a=summary For www.virt-tools.org: https://libvirt.org/git/?p=virttools-web.git;a=summary These are setup to mirror to github, and with a github webhook installed. So if when changes to the *content*, it will get automatically deployed to the live site by OpenShift. NB, auto-deploy doesn't apply to the actual OpenShift configuration, only the static config. I still need to manualy deploy OpenShift config changes for security reasons :-) The key benefit here is that adding people to the blog aggregator on planet.virt-tools.org is now easier. Just send a patch for this file: https://libvirt.org/git/?p=virttools-planet.git;a=blob;f=updater/virt-tools… Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] rpm: updates wrt min required fedora version
by Daniel P. Berrange 17 Jan '18

17 Jan '18

Update the min fedora to 25. Use a macro to record the min versions so that the later error message is always in sync with the earlier version check. Clarify the comment that refers to guessing of dist which does not actually happen. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7e1b6a27d3..713961573a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1,10 +1,12 @@ # -*- rpm-spec -*- # This spec file assumes you are building on a Fedora or RHEL version -# that's still supported by the vendor: that means Fedora 23 or newer, -# or RHEL 6 or newer. It may need some tweaks for other distros. -# If neither fedora nor rhel was defined, try to guess them from dist -%if (0%{?fedora} && 0%{?fedora} >= 23) || (0%{?rhel} && 0%{?rhel} >= 6) +# that's still supported by the vendor. It may work on other distros +# or versions, but no effort will be made to ensure that going forward. +%define min_rhel 6 +%define min_fedora 25 + +%if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel}) %define supported_platform 1 %else %define supported_platform 0 @@ -1132,7 +1134,7 @@ rm -rf .git %build %if ! %{supported_platform} -echo "This RPM requires either Fedora >= 20 or RHEL >= 6" +echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" exit 1 %endif -- 2.14.3

3 2

[libvirt] [PATCH] spec: enable bash completion only on new enough distros
by Pavel Hrdina 17 Jan '18

17 Jan '18

RHEL-6 doesn't have bash-completion package by default, it has to be installed from EPEL. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt.spec.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index d4ef116b2d..ef96888d09 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -87,6 +87,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_libssh 0%{!?_without_libssh:0} +%define with_bash_completion 0%{!?_without_bash_completion:0} %define with_pm_utils 1 # Finally set the OS / architecture specific special cases @@ -190,6 +191,11 @@ %define with_libssh 0%{!?_without_libssh:1} %endif +# Enable bash-completion for new enough distros +%if 0%{?fedora} || 0%{?rhel} >= 7 + %define with_bash_completion 0%{!?_without_bash_completion:1} +%endif + %if %{with_qemu} || %{with_lxc} || %{with_uml} # numad is used to manage the CPU and memory placement dynamically, @@ -306,7 +312,9 @@ BuildRequires: xen-devel BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: readline-devel +%if %{with_bash_completion} BuildRequires: bash-completion >= 2.0 +%endif BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: libtasn1-devel @@ -2048,7 +2056,9 @@ exit 0 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_bash_completion} %{_datadir}/bash-completion/completions/vsh +%endif %if %{with_systemd} -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH] guests: install bash-completion when building libvirt
by Pavel Hrdina 17 Jan '18

17 Jan '18

Libvirt recently added bash-completion support. On CentOS6 the package is available only from EPEL repositories. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index e669b6c..440123c 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -53,6 +53,10 @@ mappings: pkg: avahi rpm: avahi-devel + bash-completion: + default: bash-completion + CentOS6: + ccache: default: ccache CentOS: diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 598dfc4..9f027f8 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -3,6 +3,7 @@ packages: - apparmor - augeas - avahi + - bash-completion - cyrus-sasl - device-mapper - dnsmasq -- 2.14.3

2 1

[libvirt] Entering freeze for libvirt-4.0.0
by Daniel Veillard 17 Jan '18

17 Jan '18

Hi all, as planned I just tagged the Release Candidate 1 in git for 4.0.0, I also pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ No issue found in my limited testing, weirdly the CI says master is red for 4 days but it build just fine here so there has to be something on jenkins: https://ci.centos.org/view/libvirt/ Please give it a try, I will likely push an RC2 end of Monday, and then we can have the final release around Wed if everything looks fine. Feedback on other architectures and OSes always welcome :-) 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/

2 2

[libvirt] [PATCH 0/3] Couple of build fixes for readline stuff
by Michal Privoznik 16 Jan '18

16 Jan '18

After I've merged bash completion patches, couple of build problems emerged. Michal Privoznik (3): vsh: Mark cmdComplete arguments as unused tools: Always compile {virsh,virt-admin}-completer.c m4: Check for rl_completion_quote_character m4/virt-readline.m4 | 13 +++++++++++++ tools/Makefile.am | 20 ++------------------ tools/vsh.c | 3 ++- 3 files changed, 17 insertions(+), 19 deletions(-) -- 2.13.6

4 14

[libvirt] [PATCH] check/add for mdev_types capability
by Dan Zheng 16 Jan '18

16 Jan '18

>From be62ea5394d52fa168079edc3aa7e558363a3026 Mon Sep 17 00:00:00 2001 From: Dan Zheng <dzheng(a)redhat.com> Date: Tue, 16 Jan 2018 12:21:21 +0800 Subject: [PATCH] nodedev: check/add for mdev_types capability This is similar to commit f44ec9c1. Commit id '500cbc06' introduced a new nested capability element of type 'mdev_types' and the ability to use the flag as a way to search for a specific subset of a 'pci' device - namely a 'mdev_types'. The code modified the virNodeDeviceCapMatch whichs allows for searching using the 'virsh nodedev-list [cap]' via virConnectListAllNodeDevices. However, the original patches did not account for other searches for the same capability key from virNodeDeviceNumOfCaps and virNodeDeviceListCaps using nodeDeviceNumOfCaps and nodeDeviceListCaps. This patch adds the check for the 'mdev_types' bits within a 'pci' device and allows the following python code to find the capabilities for the device: import libvirt conn = libvirt.openReadOnly('qemu:///system') devs = conn.listAllDevices() for dev in devs: if 'mdev_types' in dev.listCaps(): print dev.name(),dev.numOfCaps(),dev.listCaps() Signed-off-by: Dan Zheng <dzheng(a)redhat.com> --- src/node_device/node_device_driver.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index facfeb6..6216a69 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -382,6 +382,12 @@ nodeDeviceNumOfCaps(virNodeDevicePtr device) VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS) ncaps++; } + if (caps->data.type == VIR_NODE_DEV_CAP_PCI_DEV) { + if (caps->data.pci_dev.flags & + VIR_NODE_DEV_CAP_FLAG_PCI_MDEV) + ncaps++; + } + } ret = ncaps; @@ -432,6 +438,15 @@ nodeDeviceListCaps(virNodeDevicePtr device, goto cleanup; } } + if (caps->data.type == VIR_NODE_DEV_CAP_PCI_DEV) { + if (ncaps < maxnames && + caps->data.pci_dev.flags & + VIR_NODE_DEV_CAP_FLAG_PCI_MDEV) { + if (VIR_STRDUP(names[ncaps++], + virNodeDevCapTypeToString(VIR_NODE_DEV_CAP_MDEV_TYPES)) < 0) + goto cleanup; + } + } } ret = ncaps; -- 1.8.3.1 -- Best Regards, Dan Zheng(郑丹) Red Hat Software (Beijing) Co. 9/F, North Tower C, Raycom Infotech Park No.2 Ke Xueyuan Nanlu, Haidian District Beijing 100190

2 1

[libvirt] [libvirt-tck] [PATCH] Add new option for virt-builder
by Dan Zheng 16 Jan '18

16 Jan '18

>From 0cbe381e782a18cfa9730e8791a80ff01497d8fc Mon Sep 17 00:00:00 2001 From: Dan Zheng <dzheng(a)redhat.com> Date: Tue, 16 Jan 2018 13:39:50 +0800 Subject: [PATCH] Add new option for virt-builder Using --selinux-relabel is required by Fedora and RHEL guests to ensure SELinux labels correctly in the disk image. Signed-off-by: Dan Zheng <dzheng(a)redhat.com> --- lib/Sys/Virt/TCK.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index e9da8d2..1621342 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -405,7 +405,7 @@ sub create_virt_builder_disk { } print "# running virt-builder $osname\n"; - system "virt-builder", "--install", "dsniff", "--root-password", "password:$password", "--output", $target, $osname; + system "virt-builder", "--install", "dsniff", "--root-password", "password:$password", "--output", $target, $osname, "--selinux-relabel"; die "cannot run virt-builder: $?" if $? != 0; -- 1.8.3.1 -- Best Regards, Dan Zheng(郑丹) Red Hat Software (Beijing) Co. 9/F, North Tower C, Raycom Infotech Park No.2 Ke Xueyuan Nanlu, Haidian District Beijing 100190

1 0

[libvirt] [PATCH perl] block_stats: Fix rd_req and wr_req compat hash keys
by Ville Skyttä 15 Jan '18

15 Jan '18

When virDomainBlockStatsFlags with NULL params fails, the returned read and write requests hash keys are said to be backwards compatible with the key names success case. However, they were rd_reqs and wr_reqs (in plural) as opposed to the success case's rd_req and wr_req. There is also a similar flush_reqs key, but that one does not have a corresponding value in the success case's hash, so it is left unmodified here. --- Virt.xs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Virt.xs b/Virt.xs index c47b915..a6f0477 100644 --- a/Virt.xs +++ b/Virt.xs @@ -5611,9 +5611,9 @@ block_stats(dom, path, flags=0) field = NULL; /* For back compat with previous hash above */ if (strcmp(params[i].field, "rd_operations") == 0) - field = "rd_reqs"; + field = "rd_req"; else if (strcmp(params[i].field, "wr_operations") == 0) - field = "wr_reqs"; + field = "wr_req"; else if (strcmp(params[i].field, "flush_operations") == 0) field = "flush_reqs"; if (field) { -- 2.14.1

2 1

[libvirt] [PATCH perl] Spelling fixes
by Ville Skyttä 15 Jan '18

15 Jan '18

--- Changes | 4 ++-- HACKING | 4 ++-- lib/Sys/Virt.pm | 6 +++--- lib/Sys/Virt/Domain.pm | 14 +++++++------- lib/Sys/Virt/Interface.pm | 2 +- lib/Sys/Virt/NWFilter.pm | 2 +- lib/Sys/Virt/Network.pm | 4 ++-- lib/Sys/Virt/NodeDevice.pm | 4 ++-- lib/Sys/Virt/Secret.pm | 4 ++-- lib/Sys/Virt/StoragePool.pm | 4 ++-- lib/Sys/Virt/StorageVol.pm | 8 ++++---- lib/Sys/Virt/Stream.pm | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Changes b/Changes index 96b42f8..0571cf8 100644 --- a/Changes +++ b/Changes @@ -472,7 +472,7 @@ Revision history for perl module Sys::Virt 0.2.6 2011-02-16 - Fix build with 0.8.7 libvirt by removing reference to - non-existant constant only introduced in libvirt > 0.8.7 + non-existent constant only introduced in libvirt > 0.8.7 - Fix test script when hostname is undefined 0.2.5 2011-02-04 @@ -533,7 +533,7 @@ Revision history for perl module Sys::Virt - Added networking APIs - Added APIs for host capabilities - Added APIs for inactive domains - - Switch licensse to GPLv2+ or Artistic for CPAN compatability + - Switch licensse to GPLv2+ or Artistic for CPAN compatibility - Fix return values for reboot/shutdown/undefine/create APIs - Expanded documentation coverage diff --git a/HACKING b/HACKING index bb8b0f0..bfd1212 100644 --- a/HACKING +++ b/HACKING @@ -15,7 +15,7 @@ Additions to the libvirt C API will require changes to a minimum of two parts of the Sys::Virt codebase. - Virt.xs - this provides the C glue code to access the libvirt C - library APIs and constants from the Perl interpretor. As a general + library APIs and constants from the Perl interpreter. As a general rule, every new function and header file constant/enum requires an addition to this file. The exceptions are functions that are only provided for the benefit of language bindings and not intended for @@ -93,7 +93,7 @@ effective way to update the Perl binding. - For each missing item reported in the test suite... - Edit Virt.xs to add the C binding - - Edit lib/*.pm to add the POD documentation (and occassionally Perl glue code) + - Edit lib/*.pm to add the POD documentation (and occasionally Perl glue code) - Edit Changes to document the addition - Run the test suite (without maintainer mode) to verify POD docs # ../libvirt/run make test diff --git a/lib/Sys/Virt.pm b/lib/Sys/Virt.pm index 2ce7ed5..faaf668 100644 --- a/lib/Sys/Virt.pm +++ b/lib/Sys/Virt.pm @@ -135,7 +135,7 @@ types that will be supported. The credential constants in this module can be used as values in this list. The C<callback> parameter should be a subroutine reference containing the code necessary to gather the credentials. When invoked it -will be supplied with a single parameter, a array reference +will be supplied with a single parameter, an array reference of requested credentials. The elements of the array are hash references, with keys C<type> giving the type of credential, C<prompt> giving a user descriptive user @@ -1164,7 +1164,7 @@ pool sources. =item my @stats = $vmm->get_all_domain_stats($stats, \@doms=undef, $flags=0); -Get an list of all statistics for domains known to the hypervisor. +Get a list of all statistics for domains known to the hypervisor. The C<$stats> parameter controls which data fields to return and should be a combination of the DOMAIN STATS FIELD CONSTANTS. @@ -1469,7 +1469,7 @@ how long the node is suspended for before waking up. =item $conn->domain_event_register($callback) -Register a callback to received notificaitons of domain state change +Register a callback to received notifications of domain state change events. Only a single callback can be registered with each connection instance. The callback will be invoked with four parameters, an instance of C<Sys::Virt> for the connection, an instance of C<Sys::Virt::Domain> diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index 38b9c9b..7b90b68 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -45,7 +45,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{name}) { $self = Sys::Virt::Domain::_lookup_by_name($con, $params{name}); @@ -490,7 +490,7 @@ One of the CONTROL INFO constants listed later =item C<details> -Currently unsed, always 0. +Currently unused, always 0. =item C<stateTime> @@ -658,7 +658,7 @@ later. =item $dom->detach_device($xml[, $flags]) -Hotunplug a existing device whose configuration is given by C<$xml>, +Hotunplug an existing device whose configuration is given by C<$xml>, from the running guest. The optional <$flags> parameter defaults to 0, but can accept one of the device hotplug flags described later. @@ -1719,7 +1719,7 @@ instead of MB/s. Abort the current job that is executing for the block device associated with C<$path> -=item $dom->block_pull($path, $bandwith, $flags=0) +=item $dom->block_pull($path, $bandwidth, $flags=0) Merge the backing files associated with C<$path> into the top level file. The C<$bandwidth> parameter specifies the @@ -1735,7 +1735,7 @@ instead of MB/s. =back -=item $dom->block_rebase($path, $base, $bandwith, $flags=0) +=item $dom->block_rebase($path, $base, $bandwidth, $flags=0) Switch the backing path associated with C<$path> to instead use C<$base>. The C<$bandwidth> parameter specifies the @@ -1774,7 +1774,7 @@ The maximum amount of data in flight in bytes. =back -=item $dom->block_commit($path, $base, $top, $bandwith, $flags=0) +=item $dom->block_commit($path, $base, $top, $bandwidth, $flags=0) Commit changes there were made to the temporary top level file C<$top>. Takes all the differences between C<$top> and C<$base> and merge them @@ -3827,7 +3827,7 @@ The host storage has run out of free space =item Sys::Virt::Domain::DISK_ERROR_UNSPEC -An unspecified error has ocurred. +An unspecified error has occurred. =back diff --git a/lib/Sys/Virt/Interface.pm b/lib/Sys/Virt/Interface.pm index 58fa2af..8f6112a 100644 --- a/lib/Sys/Virt/Interface.pm +++ b/lib/Sys/Virt/Interface.pm @@ -45,7 +45,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{name}) { $self = Sys::Virt::Interface::_lookup_by_name($con, $params{name}); diff --git a/lib/Sys/Virt/NWFilter.pm b/lib/Sys/Virt/NWFilter.pm index 927b038..8ede8a0 100644 --- a/lib/Sys/Virt/NWFilter.pm +++ b/lib/Sys/Virt/NWFilter.pm @@ -45,7 +45,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{name}) { $self = Sys::Virt::NWFilter::_lookup_by_name($con, $params{name}); diff --git a/lib/Sys/Virt/Network.pm b/lib/Sys/Virt/Network.pm index d90b58b..415e629 100644 --- a/lib/Sys/Virt/Network.pm +++ b/lib/Sys/Virt/Network.pm @@ -45,7 +45,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{name}) { $self = Sys::Virt::Network::_lookup_by_name($con, $params{name}); @@ -363,7 +363,7 @@ Network lifecycle events The following constants allow network lifecycle change events to be interpreted. The events contain both a state change, and a -reason though the reason is currently unsed. +reason though the reason is currently unused. =over 4 diff --git a/lib/Sys/Virt/NodeDevice.pm b/lib/Sys/Virt/NodeDevice.pm index 0539b9e..1ca3fa3 100644 --- a/lib/Sys/Virt/NodeDevice.pm +++ b/lib/Sys/Virt/NodeDevice.pm @@ -47,7 +47,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{name}) { $self = Sys::Virt::NodeDevice::_lookup_by_name($con, $params{name}); @@ -201,7 +201,7 @@ Node device config update events The following constants allow node device lifecycle change events to be interpreted. The events contain both a state change, and a -reason though the reason is currently unsed. +reason though the reason is currently unused. =over 4 diff --git a/lib/Sys/Virt/Secret.pm b/lib/Sys/Virt/Secret.pm index 0c6a021..a5ae9eb 100644 --- a/lib/Sys/Virt/Secret.pm +++ b/lib/Sys/Virt/Secret.pm @@ -45,7 +45,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{usageID} || exists $params{usageType}) { @@ -200,7 +200,7 @@ Secret value change events The following constants allow secret lifecycle change events to be interpreted. The events contain both a state change, and a -reason though the reason is currently unsed. +reason though the reason is currently unused. =over 4 diff --git a/lib/Sys/Virt/StoragePool.pm b/lib/Sys/Virt/StoragePool.pm index f4d5696..3c8abda 100644 --- a/lib/Sys/Virt/StoragePool.pm +++ b/lib/Sys/Virt/StoragePool.pm @@ -47,7 +47,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self; if (exists $params{name}) { $self = Sys::Virt::StoragePool::_lookup_by_name($con, $params{name}); @@ -496,7 +496,7 @@ Storage pool volume refresh events The following constants allow storage pool lifecycle change events to be interpreted. The events contain both a state change, and a -reason though the reason is currently unsed. +reason though the reason is currently unused. =over 4 diff --git a/lib/Sys/Virt/StorageVol.pm b/lib/Sys/Virt/StorageVol.pm index 82c3df2..917eb82 100644 --- a/lib/Sys/Virt/StorageVol.pm +++ b/lib/Sys/Virt/StorageVol.pm @@ -48,16 +48,16 @@ sub _new { my $self; if (exists $params{name}) { - my $pool = exists $params{pool} ? $params{pool} : die "pool parameter is requried"; + my $pool = exists $params{pool} ? $params{pool} : die "pool parameter is required"; $self = Sys::Virt::StorageVol::_lookup_by_name($pool, $params{name}); } elsif (exists $params{key}) { - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; $self = Sys::Virt::StorageVol::_lookup_by_key($con, $params{key}); } elsif (exists $params{path}) { - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; $self = Sys::Virt::StorageVol::_lookup_by_path($con, $params{path}); } elsif (exists $params{xml}) { - my $pool = exists $params{pool} ? $params{pool} : die "pool parameter is requried"; + my $pool = exists $params{pool} ? $params{pool} : die "pool parameter is required"; if ($params{clone}) { $self = Sys::Virt::StorageVol::_create_xml_from($pool, $params{xml}, $params{clone}, 0); } else { diff --git a/lib/Sys/Virt/Stream.pm b/lib/Sys/Virt/Stream.pm index a2fbc2b..9e4855e 100644 --- a/lib/Sys/Virt/Stream.pm +++ b/lib/Sys/Virt/Stream.pm @@ -44,7 +44,7 @@ sub _new { my $class = ref($proto) || $proto; my %params = @_; - my $con = exists $params{connection} ? $params{connection} : die "connection parameter is requried"; + my $con = exists $params{connection} ? $params{connection} : die "connection parameter is required"; my $self = Sys::Virt::Stream::_new_obj($con, $params{flags}); bless $self, $class; -- 2.14.1

2 1

[libvirt] [PATCH] libvirt-guests: make async stop work with transient guest domains
by Vincent Bernat 15 Jan '18

15 Jan '18

After being stopped, a transient guest domain doesn't appear in the list of guests anymore. Therefore, we can't get its state anymore. The branch handling this case displays an error message on stdout. This error message confuses the script which expects to get a list of "still up" guests. We just remove the message. Also, since we can't get a name, display the UUID of the stopped domain. --- tools/libvirt-guests.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 8a158cca434d..e272325f7d5d 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -337,8 +337,6 @@ check_guests_shutdown() guests_up= for guest in $guests; do if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then - eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." - echo continue fi if "$guest_running"; then @@ -363,6 +361,7 @@ print_guests_shutdown() esac name=$(guest_name "$uri" "$guest") + [ -n "$name" ] || name="$guest" eval_gettext "Shutdown of guest \$name complete." echo done -- 2.15.1

1 0

[libvirt] [PATCH] vshReadlineOptionsGenerator: Don't add already specified options to the list
by Michal Privoznik 15 Jan '18

15 Jan '18

The current state of art is as follows: 1) vshReadlineOptionsGenerator() generate all possible --options for given command, and then 2) vshReadlineOptionsPrune() clears out already provided ones from the list. Not only this brings needless memory complexity it is also not trivial to get right. We can switch to easier approach: just don't add already specified --options in the first step. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 80 +++++++++++++++---------------------------------------------- 1 file changed, 19 insertions(+), 61 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 4426c08d6..a99d47bfc 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2663,7 +2663,9 @@ vshReadlineCommandGenerator(const char *text) } static char ** -vshReadlineOptionsGenerator(const char *text, const vshCmdDef *cmd) +vshReadlineOptionsGenerator(const char *text, + const vshCmdDef *cmd, + vshCmd *last) { size_t list_index = 0; size_t len = strlen(text); @@ -2678,6 +2680,8 @@ vshReadlineOptionsGenerator(const char *text, const vshCmdDef *cmd) return NULL; while ((name = cmd->opts[list_index].name)) { + bool exists = false; + vshCmdOpt *opt = last->opts; size_t name_len; list_index++; @@ -2692,6 +2696,18 @@ vshReadlineOptionsGenerator(const char *text, const vshCmdDef *cmd) return NULL; } + while (opt) { + if (STREQ(opt->def->name, name)) { + exists = true; + break; + } + + opt = opt->next; + } + + if (exists) + continue; + if (VIR_REALLOC_N(ret, ret_size + 2) < 0) { virStringListFree(ret); return NULL; @@ -2772,60 +2788,6 @@ vshCompleterFilter(char ***list, } -static int -vshReadlineOptionsPrune(char ***list, - vshCmd *last) -{ - char **newList = NULL; - size_t newList_len = 0; - size_t list_len; - size_t i; - - if (!list || !*list) - return -1; - - if (!last->opts) - return 0; - - list_len = virStringListLength((const char **) *list); - - if (VIR_ALLOC_N(newList, list_len + 1) < 0) - return -1; - - for (i = 0; i < list_len; i++) { - const char *list_opt = STRSKIP((*list)[i], "--"); - bool exist = false; - vshCmdOpt *opt = last->opts; - - /* Should never happen (TM) */ - if (!list_opt) - return -1; - - while (opt) { - if (STREQ(opt->def->name, list_opt)) { - exist = true; - break; - } - - opt = opt->next; - } - - if (exist) { - VIR_FREE((*list)[i]); - continue; - } - - VIR_STEAL_PTR(newList[newList_len], (*list)[i]); - newList_len++; - } - - ignore_value(VIR_REALLOC_N_QUIET(newList, newList_len + 1)); - VIR_FREE(*list); - *list = newList; - return 0; -} - - static char * vshReadlineParse(const char *text, int state) { @@ -2874,12 +2836,8 @@ vshReadlineParse(const char *text, int state) if (!cmd) { list = vshReadlineCommandGenerator(text); } else { - if (!opt || (opt->type != VSH_OT_DATA && opt->type != VSH_OT_STRING)) { - list = vshReadlineOptionsGenerator(text, cmd); - - if (vshReadlineOptionsPrune(&list, partial) < 0) - goto cleanup; - } + if (!opt || (opt->type != VSH_OT_DATA && opt->type != VSH_OT_STRING)) + list = vshReadlineOptionsGenerator(text, cmd, partial); if (opt && opt->completer) { char **completer_list = opt->completer(autoCompleteOpaque, -- 2.13.6

2 1

[libvirt] [jenkins-ci PATCH] guests: Enable readline compat on FreeBSD CURRENT
by Andrea Bolognani 15 Jan '18

15 Jan '18

FreeBSD 10 is the only version *not* to need the compat hack, so special-case it instead of the other way around. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/compat.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guests/tasks/compat.yml b/guests/tasks/compat.yml index 001b5c6..d48834b 100644 --- a/guests/tasks/compat.yml +++ b/guests/tasks/compat.yml @@ -15,8 +15,8 @@ when: - os_name == 'FreeBSD' -# Same as above, except we only need to do it on FreeBSD 11 because -# FreeBSD 10 shipped (an old version of) readline in the base system +# Same as above, except we only need to do it on FreeBSD 11 and later +# because FreeBSD 10 shipped (an old version of) readline in the base system - name: Create compatibility symlinks file: src: '/usr/local/{{ item }}' @@ -28,4 +28,4 @@ - lib/libreadline.so when: - os_name == 'FreeBSD' - - os_version == '11' + - os_version != '10' -- 2.14.3

1 0

[libvirt] [PATCH v2] virsh: fix build without readline
by Roman Bogorodskiy 15 Jan '18

15 Jan '18

Completion in virsh is enabled when readline is available. In order to fix build when it's not available, do the following: * Unconditionally add virsh-completer.[ch] and virt-admin-completer.[ch] to the build, and provide stub functions for when readline is not available. This way virsh builds without complaining about missing symbols used for 'completer' in vshCmdOptDef; * In cmdComplete(), mark unused arguments when there's no readline with ATTRIBUTE_UNUSED. --- tools/Makefile.am | 20 ++------------------ tools/virsh-completer.c | 23 +++++++++++++++++++++++ tools/virt-admin-completer.c | 12 ++++++++++++ tools/vsh.c | 2 +- 4 files changed, 38 insertions(+), 19 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 48125f516..8cb66db7d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -229,17 +229,9 @@ virsh_SOURCES = \ virsh-snapshot.c virsh-snapshot.h \ virsh-util.c virsh-util.h \ virsh-volume.c virsh-volume.h \ + virsh-completer.c virsh-completer.h \ $(NULL) -VIRSH_COMPLETER = \ - virsh-completer.c virsh-completer.h - -if WITH_READLINE -virsh_SOURCES += $(VIRSH_COMPLETER) -else ! WITH_READLINE -EXTRA_DIST += $(VIRSH_COMPLETER) -endif ! WITH_READLINE - virsh_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ @@ -256,17 +248,9 @@ virsh_CFLAGS = \ virt_admin_SOURCES = \ virt-admin.c virt-admin.h \ + virt-admin-completer.c virt-admin-completer.h \ $(NULL) -VIRT_ADMIN_COMPLETER = \ - virt-admin-completer.c virt-admin-completer.h - -if WITH_READLINE -virt_admin_SOURCES += $(VIRT_ADMIN_COMPLETER) -else ! WITH_READLINE -EXTRA_DIST += $(VIRT_ADMIN_COMPLETER) -endif ! WITH_READLINE - virt_admin_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 48dd9fbc2..fd92ee8db 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -31,6 +31,7 @@ #include "virxml.h" +#ifdef WITH_READLINE char ** virshDomainNameCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, @@ -147,3 +148,25 @@ virshDomainInterfaceCompleter(vshControl *ctl, virStringListFree(ret); return NULL; } +#else +char ** +virshDomainNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(-1, NULL); + + return NULL; +} + + +char ** +virshDomainInterfaceCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(-1, NULL); + + return NULL; +} +#endif /* WITH_READLINE */ diff --git a/tools/virt-admin-completer.c b/tools/virt-admin-completer.c index 2cd471f32..a432f0977 100644 --- a/tools/virt-admin-completer.c +++ b/tools/virt-admin-completer.c @@ -30,6 +30,7 @@ #include "virstring.h" +#ifdef WITH_READLINE char ** vshAdmServerCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, @@ -74,3 +75,14 @@ vshAdmServerCompleter(vshControl *ctl, VIR_FREE(ret); return ret; } +#else +char ** +vshAdmServerCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(-1, NULL); + + return NULL; +} +#endif /* WITH_READLINE */ diff --git a/tools/vsh.c b/tools/vsh.c index 4426c08d6..59c8a440e 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3500,7 +3500,7 @@ const vshCmdInfo info_complete[] = { }; bool -cmdComplete(vshControl *ctl, const vshCmd *cmd) +cmdComplete(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd ATTRIBUTE_UNUSED) { bool ret = false; #ifdef WITH_READLINE -- 2.15.1

2 2

[libvirt] [jenkins-ci PATCH] guests: Install libtirpc when building libvirt
by Andrea Bolognani 15 Jan '18

15 Jan '18

Recent glibc versions don't include an RPC library anymore, so we need to make sure an alternative implementation is available for libvirt to use. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 9c194d0..e669b6c 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -279,6 +279,10 @@ mappings: pkg: libssh2 rpm: libssh2-devel + libtirpc: + deb: libtirpc-dev + rpm: libtirpc-devel + libtool: default: libtool Debian: libtool-bin diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index ba1e4c3..598dfc4 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -32,6 +32,7 @@ packages: - libselinux - libssh - libssh2 + - libtirpc - libudev - libxml2 - lvm2 -- 2.14.3

2 1

[libvirt] [PATCH] vshReadlineOptionsPrune: Fix possible leak
by Michal Privoznik 15 Jan '18

15 Jan '18

The function should prune list of --options so that options already specified are not offered to user for completion again. However, if the list of offered options contains a string that doesn't start with double dash the function returns leaking partially constructed list. There's not much benefit from trying to roll back. Just free everything up - our only caller would do that anyway. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 4426c08d6..7db0a16f1 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2798,8 +2798,17 @@ vshReadlineOptionsPrune(char ***list, vshCmdOpt *opt = last->opts; /* Should never happen (TM) */ - if (!list_opt) + if (!list_opt) { + /* But in case it does, we're in a tough situation + * because @list[0..i-1] is possibly sparse. That + * means if caller were to call virStringListFree + * over it some memory is definitely going to be + * leaked. The best we can do is to free from list[i] + * as our only caller is just fine with it. */ + virStringListFree(list[i]); + virStringListFree(newList); return -1; + } while (opt) { if (STREQ(opt->def->name, list_opt)) { -- 2.13.6

2 2

[libvirt] [PATCH] virsh: fix build without readline
by Roman Bogorodskiy 13 Jan '18

13 Jan '18

Completion in virsh is enabled when readline is available. However, when it's not available, we should: * avoid defining completers with completion functions; * in cmdComplete(), mark unused arguments when there's no readline with ATTRIBUTE_UNUSED. --- tools/virsh-domain-monitor.c | 6 ++++++ tools/virsh-domain.c | 6 ++++++ tools/virsh.h | 11 ++++++++++- tools/virt-admin.c | 14 ++++++++++++++ tools/vsh.c | 2 +- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 32a42707e..0df20eea0 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -659,7 +659,9 @@ static const vshCmdOptDef opts_domif_getlink[] = { {.name = "interface", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#if WITH_READLINE .completer = virshDomainInterfaceCompleter, +#endif .help = N_("interface device (MAC Address)") }, {.name = "persistent", @@ -996,7 +998,9 @@ static const vshCmdOptDef opts_domifstat[] = { {.name = "interface", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = virshDomainInterfaceCompleter, +#endif .help = N_("interface device specified by name or MAC Address") }, {.name = NULL} @@ -2151,7 +2155,9 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "interface", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, +#ifdef WITH_READLINE .completer = virshDomainInterfaceCompleter, +#endif .help = N_("network interface name")}, {.name = "full", .type = VSH_OT_BOOL, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0f329d6d7..c5511adbf 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2977,7 +2977,9 @@ static const vshCmdOptDef opts_domif_setlink[] = { {.name = "interface", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = virshDomainInterfaceCompleter, +#endif .help = N_("interface device (MAC Address)") }, {.name = "state", @@ -3148,7 +3150,9 @@ static const vshCmdOptDef opts_domiftune[] = { {.name = "interface", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = virshDomainInterfaceCompleter, +#endif .help = N_("interface device (MAC Address)") }, {.name = "inbound", @@ -11985,8 +11989,10 @@ static const vshCmdOptDef opts_detach_interface[] = { }, {.name = "mac", .type = VSH_OT_STRING, +#ifdef WITH_READLINE .completer = virshDomainInterfaceCompleter, .completer_flags = VIRSH_DOMAIN_INTERFACE_COMPLETER_MAC, +#endif .help = N_("MAC address") }, VIRSH_COMMON_OPT_DOMAIN_PERSISTENT, diff --git a/tools/virsh.h b/tools/virsh.h index 528e04558..b3cb15ac4 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -71,7 +71,8 @@ .help = _helpstr \ } -# define VIRSH_COMMON_OPT_DOMAIN(_helpstr, cflags) \ +# ifdef WITH_READLINE +# define VIRSH_COMMON_OPT_DOMAIN(_helpstr, cflags) \ {.name = "domain", \ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ @@ -79,6 +80,14 @@ .completer = virshDomainNameCompleter, \ .completer_flags = cflags, \ } +# else +# define VIRSH_COMMON_OPT_DOMAIN(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_DATA, \ + .flags = VSH_OFLAG_REQ, \ + .help = _helpstr, \ + } +# endif # define VIRSH_COMMON_OPT_CONFIG(_helpstr) \ {.name = "config", \ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index c86b5763a..ac4d00dd7 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -429,7 +429,9 @@ static const vshCmdOptDef opts_srv_threadpool_info[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("Server to retrieve threadpool attributes from."), }, {.name = NULL} @@ -491,7 +493,9 @@ static const vshCmdOptDef opts_srv_threadpool_set[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("Server to alter threadpool attributes on."), }, {.name = "min-workers", @@ -598,7 +602,9 @@ static const vshCmdOptDef opts_srv_clients_list[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("server which to list connected clients from"), }, {.name = NULL} @@ -680,7 +686,9 @@ static const vshCmdOptDef opts_client_info[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("server to which <client> is connected to"), }, {.name = "client", @@ -768,7 +776,9 @@ static const vshCmdOptDef opts_client_disconnect[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("server which the client is currently connected to"), }, {.name = "client", @@ -834,7 +844,9 @@ static const vshCmdOptDef opts_srv_clients_info[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("Server to retrieve the client limits from."), }, {.name = NULL} @@ -894,7 +906,9 @@ static const vshCmdOptDef opts_srv_clients_set[] = { {.name = "server", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, +#ifdef WITH_READLINE .completer = vshAdmServerCompleter, +#endif .help = N_("Server to alter the client-related configuration limits on."), }, {.name = "max-clients", diff --git a/tools/vsh.c b/tools/vsh.c index 4426c08d6..59c8a440e 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3500,7 +3500,7 @@ const vshCmdInfo info_complete[] = { }; bool -cmdComplete(vshControl *ctl, const vshCmd *cmd) +cmdComplete(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd ATTRIBUTE_UNUSED) { bool ret = false; #ifdef WITH_READLINE -- 2.15.1

2 2

[libvirt] [resend][PATCH] deamon: use default value if ca_file, cert_file or key_file not set
by Chen Hanxiao 13 Jan '18

13 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As the description of daemon/libvirtd.conf, setting key_file, cert_file or key_file will override the default value. But if we set any one of them, we need to set all the rest of them. This patch set default value to them as daemon/libvirtd.conf described. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- daemon/libvirtd.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 6d3b83355..93983f63b 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -493,19 +493,28 @@ daemonSetupNetworking(virNetServerPtr srv, config->cert_file || config->key_file) { if (!config->ca_file) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No CA certificate path set to match server key/cert")); - goto cleanup; + VIR_WARN("Using default path for ca_file"); + if (VIR_STRDUP(config->ca_file, LIBVIRT_CACERT) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No CA certificate path set to match server key/cert")); + goto cleanup; + } } if (!config->cert_file) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No server certificate path set to match server key")); - goto cleanup; + VIR_WARN("Using default path for cert_file"); + if (VIR_STRDUP(config->cert_file, LIBVIRT_SERVERCERT) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No server certificate path set to match server key")); + goto cleanup; + } } if (!config->key_file) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No server key path set to match server cert")); - goto cleanup; + VIR_WARN("Using default path for key_file"); + if (VIR_STRDUP(config->key_file, LIBVIRT_SERVERKEY) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No server key path set to match server cert")); + goto cleanup; + } } VIR_DEBUG("Using CA='%s' cert='%s' key='%s'", config->ca_file, config->cert_file, config->key_file); -- 2.14.3

3 3

[libvirt] [PATCH v2] domain_conf: skip boot order check of CD-ROM or floppy device when change-media
by Chen Hanxiao 12 Jan '18

12 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> If we insert or eject a CD-ROM/floppy device by: 'virsh change-media VM --eject/--insert some.iso --live', and the original CD-ROM device was configed with a boot order, we may get: unsupported configuration: boot order 2 is already used by another device We just updated 'source file' section rather than hotplug a new device. This check should be skipped in this case. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: commit message updated remove ATTRIBUTE_UNUSED from @device src/conf/domain_conf.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1c25060f..e006cea0a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26881,17 +26881,26 @@ virDomainDeviceIsUSB(virDomainDeviceDefPtr dev) static int virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, + virDomainDeviceDefPtr device, virDomainDeviceInfoPtr info, void *opaque) { virDomainDeviceInfoPtr newinfo = opaque; + virDomainDiskDefPtr disk = device->data.disk; + int disk_device = disk->device; if (info->bootIndex == newinfo->bootIndex) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("boot order %u is already used by another device"), - newinfo->bootIndex); - return -1; + /* Skip check for insert or eject CD-ROM device */ + if (disk_device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || + disk_device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + VIR_DEBUG("Skip boot index check for floppy or CDROM"); + return 0; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("boot order %u is already used by another device"), + newinfo->bootIndex); + return -1; + } } return 0; } -- 2.14.3

2 2

[libvirt] [PATCH v2 0/2] qemu_hotplug: introduce VIR_ERR_DEVICE_MISSING for failing to find the desired device
by Chen Hanxiao 12 Jan '18

12 Jan '18

We used VIR_ERR_OPERATION_INVALID for failing to find the desired device. But this error code is widely used. This brings troubles to the project(i.e nova) powered by libvirt, they had to analyze error messages to find out what had happened. Chen Hanxiao (2): qemu_hotplug: more proper error messages when target detaching device is not found qemu_hotplug: introduce VIR_ERR_DEVICE_MISSING for failing to find desired device include/libvirt/virterror.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_hotplug.c | 54 +++++++++++++++++++++++++++++---------------- src/util/virerror.c | 6 +++++ 4 files changed, 44 insertions(+), 19 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH python v2 0/9] Various improvements to RPM spec
by Daniel P. Berrange 12 Jan '18

12 Jan '18

Daniel P. Berrange (9): Allow disabling of python2 RPM build Allow override of which sub-RPMs to build Add checks for min supported distros Add emacs mode marker to activate rpm-spec highlighting Adapt to rename of py2 RPMs from python- to python2- prefix Turn on python3 sub-RPMs for RHEL > 7 Require libvirt native version matching py version by default Fix filtering of RPM provides for .so files Use python*_sitearch macros instead of manually defining the dir libvirt-python.spec.in | 89 +++++++++++++++++++++++++++++++++++++++----------- setup.py | 3 +- 2 files changed, 71 insertions(+), 21 deletions(-) -- 2.14.3

2 10

[libvirt] [PATCH python 0/7] Misc improvements to RPM spec
by Daniel P. Berrange 12 Jan '18

12 Jan '18

Various improvements to the RPM spec to help future Fedora/RHEL maint Daniel P. Berrange (7): Allow disabling of python2 RPM build Allow override of which sub-RPMs to build Add checks for min supported distros Add emacs mode marker to activate rpm-spec highlighting Adapt to rename of py2 RPMs from python- to python2- prefix Turn on python3 sub-RPMs for RHEL > 7 Require libvirt native version matching py version by default libvirt-python.spec.in | 54 ++++++++++++++++++++++++++++++++++++++++++++++---- setup.py | 3 +-- 2 files changed, 51 insertions(+), 6 deletions(-) -- 2.14.3

4 23

[libvirt] [PATCH] fixed bug:if expand thread pool, will lose some one
by Di Wei 12 Jan '18

12 Jan '18

--- src/util/virthreadpool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 10f2bd2..0983ee2 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -186,6 +186,7 @@ virThreadPoolExpand(virThreadPoolPtr pool, size_t gain, bool priority) size_t *curWorkers = priority ? &pool->nPrioWorkers : &pool->nWorkers; size_t i = 0; struct virThreadPoolWorkerData *data = NULL; + size_t oldNWorkers = *curWorkers; if (VIR_EXPAND_N(*workers, *curWorkers, gain) < 0) return -1; @@ -198,7 +199,7 @@ virThreadPoolExpand(virThreadPoolPtr pool, size_t gain, bool priority) data->cond = priority ? &pool->prioCond : &pool->cond; data->priority = priority; - if (virThreadCreateFull(&(*workers)[i], + if (virThreadCreateFull(&(*workers)[i + oldNWorkers], false, virThreadPoolWorker, pool->jobFuncName, -- 2.9.3

3 2

[libvirt] [PATCH 00/18] Make bash completion great again
by Michal Privoznik 12 Jan '18

12 Jan '18

Technically, this is a v2 of [1], but this implements the feature from different angle and therefore it's a start of new series. What's implemented? =================== Auto completion for both interactive and non-interactive virsh/virt-admin. Known limitations ================= Currently, just options completers work. I mean, to bring up list of domains you have to: virsh # start --domain <TAB><TAB> Doing bare: virsh # start <TAB><TAB> brings up list of --options. With the new approach implemented here it should be easy to implement this. But that can be saved for later. How to test this? ================= Interactive completion should work out of the box. Just make sure you're connected. Completers don't connect! You certainly don't want ssh's 'Password:' prompt show on <TAB><TAB>, do you? Non-interactive completers do connect, but in order to avoid any password prompts, /dev/stdin is closed before anything else is done. In order to test it, just: libvirt.git $ source tools/bash-completion/vsh Now, bash completion should work: libvirt.git $ ./tools/virsh -c qemu:///system start --domain <TAB><TAB> Notes ===== As usual, you can find all the patches on my github [2]. I've tried to work in all the review suggestions from v1. Due to changes in design (reusing parse code instead of duplicating it) not all suggestions were possible to work in though. Michal 1: https://www.redhat.com/archives/libvir-list/2017-November/msg00213.html 2: https://github.com/zippy2/libvirt/tree/bash_autocomplete_v3 (yeah v3, don't ask) Michal Privoznik (18): vsh: Drop useless check for opts != NULL vsh: Drop useless check for cmd != NULL vshCommandParse: Don't leak @tkdata vshCommandStringParse: Allow retrieving partial result vshReadlineParse: Drop code duplication vshReadlineParse: Escape returned results if needed vshReadlineParse: Use string list vshCommandOpt: Allow caller avoiding assert() util: Introduce virStringListMerge vsh: Fix vshCompleter signature vsh: Call vshCmdOptDef completer vsh: Prune string list returned by completer vsh: Filter --options vsh: Introduce complete command tools: Provide bash autompletion file virsh: Introduce virshDomainNameCompleter virsh: Introduce virshDomainInterfaceCompleter virt-admin: Introduce vshAdmServerCompleter configure.ac | 3 + libvirt.spec.in | 3 + m4/virt-bash-completion.m4 | 74 +++++ src/libvirt_private.syms | 1 + src/util/virstring.c | 36 +++ src/util/virstring.h | 3 + tools/Makefile.am | 40 ++- tools/bash-completion/vsh | 67 +++++ tools/virsh-completer.c | 150 ++++++++++ tools/virsh-completer.h | 41 +++ tools/virsh-domain-monitor.c | 33 ++- tools/virsh-domain.c | 186 ++++++------ tools/virsh-snapshot.c | 24 +- tools/virsh.c | 5 +- tools/virsh.h | 7 +- tools/virt-admin-completer.c | 76 +++++ tools/virt-admin-completer.h | 33 +++ tools/virt-admin.c | 13 +- tools/vsh.c | 663 ++++++++++++++++++++++++++----------------- tools/vsh.h | 23 +- 20 files changed, 1097 insertions(+), 384 deletions(-) create mode 100644 m4/virt-bash-completion.m4 create mode 100644 tools/bash-completion/vsh create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h create mode 100644 tools/virt-admin-completer.c create mode 100644 tools/virt-admin-completer.h -- 2.13.6

3 33

[libvirt] [jenkins-ci PATCH v2 0/2] guests: Make rpcgen mapping more future-proof
by Andrea Bolognani 12 Jan '18

12 Jan '18

Changes from [v1]: * use the rpcgen name instead of glibc-rpcgen, which is a just temporary hack and will go away. [v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00422.html Andrea Bolognani (2): guests: Fix package name for rpcgen guests: Make rpcgen mapping more future-proof guests/vars/mappings.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.14.3

2 3

[libvirt] [PATCH v2 0/2] processor frequency information on S390
by Bjoern Walk 12 Jan '18

12 Jan '18

Since kernel version 4.7, processor frequency information is available on S390. This patch series extends the parser for system information. Let's also add a testcase to the test suite for a S390 CPU configuration running kernel version 4.14 on LPAR. This is basically patch 3 of this series: https://www.redhat.com/archives/libvir-list/2017-December/msg00633.html v1 -> v2: - add debug logging - don't discard the whole hostsysinfo when the parsing fails - don't try to parse a value for external_clock, that information is not available on S390 - add test case for to sysinfotest.c Bjoern Walk (2): util: virsysinfo: parse frequency information on S390 tests: sysinfotest: add new test case for S390 src/util/virsysinfo.c | 41 ++++++- tests/sysinfodata/s390-freqcpuinfo.data | 52 +++++++++ tests/sysinfodata/s390-freqsysinfo.data | 173 ++++++++++++++++++++++++++++++ tests/sysinfodata/s390-freqsysinfo.expect | 63 +++++++++++ tests/sysinfotest.c | 1 + 5 files changed, 325 insertions(+), 5 deletions(-) create mode 100644 tests/sysinfodata/s390-freqcpuinfo.data create mode 100644 tests/sysinfodata/s390-freqsysinfo.data create mode 100644 tests/sysinfodata/s390-freqsysinfo.expect -- 2.13.4

3 9

[libvirt] [jenkins-ci PATCH] guests: Make rpcgen mapping more future-proof
by Andrea Bolognani 12 Jan '18

12 Jan '18

Since whatever is in Fedora Rawhide will end up in future Fedora releases, it makes sense to use the newer package as default and override it for existing releases (as well as CentOS), so that no tweaking will be needed when Fedora 28 and later are added to the CI setup. Suggested-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index b79757e..0b32f90 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -606,8 +606,10 @@ mappings: rpcgen: deb: libc-dev-bin - rpm: glibc-common - FedoraRawhide: glibc-rpcgen + rpm: glibc-rpcgen + CentOS: glibc-common + Fedora26: glibc-common + Fedora27: glibc-common FreeBSD: rpmbuild: -- 2.14.3

2 2

[libvirt] [PATCH 0/2] travis: Fix build failure
by Andrea Bolognani 12 Jan '18

12 Jan '18

It would be nice to have all greens before the release :) Andrea Bolognani (2): travis: Sync packages with libvirt-jenkins-ci travis: Skip nfs-common installation .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.14.3

2 3

[libvirt] [PATCH V4] blockjob: Fix error checking of blockjob status
by Jie Wang 12 Jan '18

12 Jan '18

offset and len can also be equal to 0 on failed if blockjob return status:"BLOCK_JOB_COMPLETED" with error:"File descriptor in bad state", so we need to check 'error' in this case. --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e45868b..39c0909 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -886,7 +886,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); /* Make sure the whole device has been processed */ - if (offset != len) + if (offset != len || error) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: -- 1.8.3.1

2 2

[libvirt] [jenkins-ci PATCH] guests: Install rpcgen when building libvirt
by Andrea Bolognani 12 Jan '18

12 Jan '18

The dependency on rpcgen had not been made explicit up until now because the command was part of the base glibc development packages; however, Fedora Rawhide now ships it in a separate package, so we need to list it along with all other dependencies in order for it to get installed. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index eca8dbe..b79757e 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -604,6 +604,12 @@ mappings: pkg: readline rpm: readline-devel + rpcgen: + deb: libc-dev-bin + rpm: glibc-common + FedoraRawhide: glibc-rpcgen + FreeBSD: + rpmbuild: rpm: rpm-build diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 407881d..ba1e4c3 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -67,6 +67,7 @@ packages: - qemu-img - radvd - readline + - rpcgen - sanlock - scrub - sheepdog -- 2.14.3

2 1