- Devel - libvirt List Archives

[libvirt] [go PATCH] Add support for virNetworkPort object and APIs
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- network.go | 80 ++++++++++++++ network_port.go | 233 ++++++++++++++++++++++++++++++++++++++++ network_port_compat.h | 67 ++++++++++++ network_port_wrapper.go | 197 +++++++++++++++++++++++++++++++++ network_port_wrapper.h | 79 ++++++++++++++ network_wrapper.go | 73 +++++++++++++ network_wrapper.h | 23 ++++ 7 files changed, 752 insertions(+) create mode 100644 network_port.go create mode 100644 network_port_compat.h create mode 100644 network_port_wrapper.go create mode 100644 network_port_wrapper.h diff --git a/network.go b/network.go index 99954aa..a0bc361 100644 --- a/network.go +++ b/network.go @@ -34,6 +34,7 @@ package libvirt import "C" import ( + "fmt" "reflect" "time" "unsafe" @@ -333,3 +334,82 @@ func (n *Network) GetDHCPLeases() ([]NetworkDHCPLease, error) { C.free(unsafe.Pointer(cLeases)) return leases, nil } + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortLookupB… +func (n *Network) LookupNetworkPortByUUIDString(uuid string) (*NetworkPort, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return nil, makeNotImplementedError("virNetworkPortLookupByUUIDString") + } + + cUuid := C.CString(uuid) + defer C.free(unsafe.Pointer(cUuid)) + var err C.virError + ptr := C.virNetworkPortLookupByUUIDStringWrapper(n.ptr, cUuid, &err) + if ptr == nil { + return nil, makeError(&err) + } + return &NetworkPort{ptr: ptr}, nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortLookupB… +func (n *Network) LookupNetworkPortByUUID(uuid []byte) (*NetworkPort, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return nil, makeNotImplementedError("virNetworkPortLookupByUUID") + } + + if len(uuid) != C.VIR_UUID_BUFLEN { + return nil, fmt.Errorf("UUID must be exactly %d bytes in size", + int(C.VIR_UUID_BUFLEN)) + } + cUuid := make([]C.uchar, C.VIR_UUID_BUFLEN) + for i := 0; i < C.VIR_UUID_BUFLEN; i++ { + cUuid[i] = C.uchar(uuid[i]) + } + var err C.virError + ptr := C.virNetworkPortLookupByUUIDWrapper(n.ptr, &cUuid[0], &err) + if ptr == nil { + return nil, makeError(&err) + } + return &NetworkPort{ptr: ptr}, nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortCreateX… +func (n *Network) PortCreateXML(xmlConfig string, flags uint) (*NetworkPort, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return nil, makeNotImplementedError("virNetworkPortCreateXML") + } + cXml := C.CString(string(xmlConfig)) + defer C.free(unsafe.Pointer(cXml)) + var err C.virError + ptr := C.virNetworkPortCreateXMLWrapper(n.ptr, cXml, C.uint(flags), &err) + if ptr == nil { + return nil, makeError(&err) + } + return &NetworkPort{ptr: ptr}, nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkListAllPorts +func (n *Network) ListAllPorts(flags uint) ([]NetworkPort, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return []NetworkPort{}, makeNotImplementedError("virNetworkListAllPorts") + } + + var cList *C.virNetworkPortPtr + var err C.virError + numPorts := C.virNetworkListAllPortsWrapper(n.ptr, (**C.virNetworkPortPtr)(&cList), C.uint(flags), &err) + if numPorts == -1 { + return []NetworkPort{}, makeError(&err) + } + hdr := reflect.SliceHeader{ + Data: uintptr(unsafe.Pointer(cList)), + Len: int(numPorts), + Cap: int(numPorts), + } + var ports []NetworkPort + slice := *(*[]C.virNetworkPortPtr)(unsafe.Pointer(&hdr)) + for _, ptr := range slice { + ports = append(ports, NetworkPort{ptr}) + } + C.free(unsafe.Pointer(cList)) + return ports, nil +} diff --git a/network_port.go b/network_port.go new file mode 100644 index 0000000..e701c2d --- /dev/null +++ b/network_port.go @@ -0,0 +1,233 @@ +/* + * This file is part of the libvirt-go project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2019 Red Hat, Inc. + * + */ + +package libvirt + +/* +#cgo pkg-config: libvirt +#include <stdlib.h> +#include "network_port_wrapper.h" +*/ +import "C" + +import ( + "unsafe" +) + +type NetworkPortCreateFlags int + +const ( + NETWORK_PORT_CREATE_RECLAIM = NetworkPortCreateFlags(C.VIR_NETWORK_PORT_CREATE_RECLAIM) +) + +type NetworkPort struct { + ptr C.virNetworkPortPtr +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortFree +func (n *NetworkPort) Free() error { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return makeNotImplementedError("virNetworkPortFree") + } + + var err C.virError + ret := C.virNetworkPortFreeWrapper(n.ptr, &err) + if ret == -1 { + return makeError(&err) + } + return nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortRef +func (c *NetworkPort) Ref() error { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return makeNotImplementedError("virNetworkPortRef") + } + + var err C.virError + ret := C.virNetworkPortRefWrapper(c.ptr, &err) + if ret == -1 { + return makeError(&err) + } + return nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortGetUUID +func (n *NetworkPort) GetUUID() ([]byte, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return []byte{}, makeNotImplementedError("virNetworkPortGetUUID") + } + + var cUuid [C.VIR_UUID_BUFLEN](byte) + cuidPtr := unsafe.Pointer(&cUuid) + var err C.virError + result := C.virNetworkPortGetUUIDWrapper(n.ptr, (*C.uchar)(cuidPtr), &err) + if result != 0 { + return []byte{}, makeError(&err) + } + return C.GoBytes(cuidPtr, C.VIR_UUID_BUFLEN), nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortGetUUID… +func (n *NetworkPort) GetUUIDString() (string, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return "", makeNotImplementedError("virNetworkPortGetUUIDString") + } + + var cUuid [C.VIR_UUID_STRING_BUFLEN](C.char) + cuidPtr := unsafe.Pointer(&cUuid) + var err C.virError + result := C.virNetworkPortGetUUIDStringWrapper(n.ptr, (*C.char)(cuidPtr), &err) + if result != 0 { + return "", makeError(&err) + } + return C.GoString((*C.char)(cuidPtr)), nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortDelete +func (n *NetworkPort) Delete(flags uint) error { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return makeNotImplementedError("virNetworkPortDelete") + } + + var err C.virError + result := C.virNetworkPortDeleteWrapper(n.ptr, C.uint(flags), &err) + if result == -1 { + return makeError(&err) + } + return nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortGetXMLD… +func (d *NetworkPort) GetXMLDesc(flags uint) (string, error) { + var err C.virError + result := C.virNetworkPortGetXMLDescWrapper(d.ptr, C.uint(flags), &err) + if result == nil { + return "", makeError(&err) + } + xml := C.GoString(result) + C.free(unsafe.Pointer(result)) + return xml, nil +} + +type NetworkPortParameters struct { + BandwidthInAverageSet bool + BandwidthInAverage uint + BandwidthInPeakSet bool + BandwidthInPeak uint + BandwidthInBurstSet bool + BandwidthInBurst uint + BandwidthInFloorSet bool + BandwidthInFloor uint + BandwidthOutAverageSet bool + BandwidthOutAverage uint + BandwidthOutPeakSet bool + BandwidthOutPeak uint + BandwidthOutBurstSet bool + BandwidthOutBurst uint +} + +func getNetworkPortParametersFieldInfo(params *NetworkPortParameters) map[string]typedParamsFieldInfo { + return map[string]typedParamsFieldInfo{ + C.VIR_NETWORK_PORT_BANDWIDTH_IN_AVERAGE: typedParamsFieldInfo{ + set: &params.BandwidthInAverageSet, + ui: &params.BandwidthInAverage, + }, + C.VIR_NETWORK_PORT_BANDWIDTH_IN_PEAK: typedParamsFieldInfo{ + set: &params.BandwidthInPeakSet, + ui: &params.BandwidthInPeak, + }, + C.VIR_NETWORK_PORT_BANDWIDTH_IN_BURST: typedParamsFieldInfo{ + set: &params.BandwidthInBurstSet, + ui: &params.BandwidthInBurst, + }, + C.VIR_NETWORK_PORT_BANDWIDTH_IN_FLOOR: typedParamsFieldInfo{ + set: &params.BandwidthInFloorSet, + ui: &params.BandwidthInFloor, + }, + C.VIR_NETWORK_PORT_BANDWIDTH_OUT_AVERAGE: typedParamsFieldInfo{ + set: &params.BandwidthOutAverageSet, + ui: &params.BandwidthOutAverage, + }, + C.VIR_NETWORK_PORT_BANDWIDTH_OUT_PEAK: typedParamsFieldInfo{ + set: &params.BandwidthOutPeakSet, + ui: &params.BandwidthOutPeak, + }, + C.VIR_NETWORK_PORT_BANDWIDTH_OUT_BURST: typedParamsFieldInfo{ + set: &params.BandwidthOutBurstSet, + ui: &params.BandwidthOutBurst, + }, + } +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortGetPara… +func (d *NetworkPort) GetParameters(flags uint) (*NetworkPortParameters, error) { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return nil, makeNotImplementedError("virNetworkPortGetParameters") + } + + params := &NetworkPortParameters{} + info := getNetworkPortParametersFieldInfo(params) + + var cparams C.virTypedParameterPtr + var cnparams C.int + var err C.virError + ret := C.virNetworkPortGetParametersWrapper(d.ptr, &cparams, &cnparams, C.uint(flags), &err) + if ret == -1 { + return nil, makeError(&err) + } + + defer C.virTypedParamsFree(cparams, cnparams) + + _, gerr := typedParamsUnpack(cparams, cnparams, info) + if gerr != nil { + return nil, gerr + } + + return params, nil +} + +// See also https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkPortSetPara… +func (d *NetworkPort) SetParameters(params *NetworkPortParameters, flags uint) error { + if C.LIBVIR_VERSION_NUMBER < 5005000 { + return makeNotImplementedError("virNetworkPortSetParameters") + } + + info := getNetworkPortParametersFieldInfo(params) + + cparams, cnparams, gerr := typedParamsPackNew(info) + if gerr != nil { + return gerr + } + defer C.virTypedParamsFree(cparams, cnparams) + + var err C.virError + ret := C.virNetworkPortSetParametersWrapper(d.ptr, cparams, cnparams, C.uint(flags), &err) + if ret == -1 { + return makeError(&err) + } + + return nil +} diff --git a/network_port_compat.h b/network_port_compat.h new file mode 100644 index 0000000..77f541b --- /dev/null +++ b/network_port_compat.h @@ -0,0 +1,67 @@ +/* + * This file is part of the libvirt-go project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2019 Red Hat, Inc. + * + */ + +#ifndef LIBVIRT_GO_NETWORK_PORT_COMPAT_H__ +#define LIBVIRT_GO_NETWORK_PORT_COMPAT_H__ + +/* 5.5.0 */ + +#if LIBVIR_VERSION_NUMBER < 5005000 +typedef struct _virNetworkPort *virNetworkPortPtr; +#endif + +#ifndef VIR_NETWORK_PORT_CREATE_RECLAIM +#define VIR_NETWORK_PORT_CREATE_RECLAIM (1 << 0) +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_IN_AVERAGE +#define VIR_NETWORK_PORT_BANDWIDTH_IN_AVERAGE "inbound.average" +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_IN_PEAK +#define VIR_NETWORK_PORT_BANDWIDTH_IN_PEAK "inbound.peak" +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_IN_BURST +#define VIR_NETWORK_PORT_BANDWIDTH_IN_BURST "inbound.burst" +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_IN_FLOOR +#define VIR_NETWORK_PORT_BANDWIDTH_IN_FLOOR "inbound.floor" +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_OUT_AVERAGE +#define VIR_NETWORK_PORT_BANDWIDTH_OUT_AVERAGE "outbound.average" +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_OUT_PEAK +#define VIR_NETWORK_PORT_BANDWIDTH_OUT_PEAK "outbound.peak" +#endif + +#ifndef VIR_NETWORK_PORT_BANDWIDTH_OUT_BURST +#define VIR_NETWORK_PORT_BANDWIDTH_OUT_BURST "outbound.burst" +#endif + +#endif /* LIBVIRT_GO_NETWORK_PORT_COMPAT_H__ */ diff --git a/network_port_wrapper.go b/network_port_wrapper.go new file mode 100644 index 0000000..2b69167 --- /dev/null +++ b/network_port_wrapper.go @@ -0,0 +1,197 @@ +/* + * This file is part of the libvirt-go project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2019 Red Hat, Inc. + * + */ + +package libvirt + +/* +#cgo pkg-config: libvirt +#include <assert.h> +#include "network_port_wrapper.h" + +virNetworkPtr +virNetworkPortGetNetworkWrapper(virNetworkPortPtr port, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + virNetworkPtr ret; + ret = virNetworkPortGetNetwork(port); + if (!ret) { + virCopyLastError(err); + } + return ret; +#endif +} + + +char * +virNetworkPortGetXMLDescWrapper(virNetworkPortPtr port, + unsigned int flags, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + char *ret; + ret = virNetworkPortGetXMLDesc(port, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortGetUUIDWrapper(virNetworkPortPtr port, + unsigned char *uuid, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortGetUUID(port, uuid); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortGetUUIDStringWrapper(virNetworkPortPtr port, + char *buf, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortGetUUIDString(port, buf); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortSetParametersWrapper(virNetworkPortPtr port, + virTypedParameterPtr params, + int nparams, + unsigned int flags, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortSetParameters(port, params, nparams, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortGetParametersWrapper(virNetworkPortPtr port, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortGetParameters(port, params, nparams, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortDeleteWrapper(virNetworkPortPtr port, + unsigned int flags, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortDelete(port, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortFreeWrapper(virNetworkPortPtr port, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortFree(port); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkPortRefWrapper(virNetworkPortPtr port, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkPortRef(port); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + +*/ +import "C" diff --git a/network_port_wrapper.h b/network_port_wrapper.h new file mode 100644 index 0000000..054d459 --- /dev/null +++ b/network_port_wrapper.h @@ -0,0 +1,79 @@ +/* + * This file is part of the libvirt-go project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2019 Red Hat, Inc. + * + */ + +#ifndef LIBVIRT_GO_NETWORK_PORT_WRAPPER_H__ +#define LIBVIRT_GO_NETWORK_PORT_WRAPPER_H__ + +#include <libvirt/libvirt.h> +#include <libvirt/virterror.h> +#include "network_port_compat.h" + + +virNetworkPtr +virNetworkPortGetNetworkWrapper(virNetworkPortPtr port, + virErrorPtr err); + +char * +virNetworkPortGetXMLDescWrapper(virNetworkPortPtr port, + unsigned int flags, + virErrorPtr err); + +int +virNetworkPortGetUUIDWrapper(virNetworkPortPtr port, + unsigned char *uuid, + virErrorPtr err); +int +virNetworkPortGetUUIDStringWrapper(virNetworkPortPtr port, + char *buf, + virErrorPtr err); + +int +virNetworkPortSetParametersWrapper(virNetworkPortPtr port, + virTypedParameterPtr params, + int nparams, + unsigned int flags, + virErrorPtr err); +int +virNetworkPortGetParametersWrapper(virNetworkPortPtr port, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags, + virErrorPtr err); + +int +virNetworkPortDeleteWrapper(virNetworkPortPtr port, + unsigned int flags, + virErrorPtr err); + +int +virNetworkPortFreeWrapper(virNetworkPortPtr port, + virErrorPtr err); + +int +virNetworkPortRefWrapper(virNetworkPortPtr port, + virErrorPtr err); + + +#endif /* LIBVIRT_GO_NETWORK_PORT_WRAPPER_H__ */ diff --git a/network_wrapper.go b/network_wrapper.go index 2fc443f..6105612 100644 --- a/network_wrapper.go +++ b/network_wrapper.go @@ -263,5 +263,78 @@ virNetworkUpdateWrapper(virNetworkPtr network, } +virNetworkPortPtr +virNetworkPortLookupByUUIDWrapper(virNetworkPtr net, + const unsigned char *uuid, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + virNetworkPortPtr ret; + ret = virNetworkPortLookupByUUID(net, uuid); + if (!ret) { + virCopyLastError(err); + } + return ret; +#endif +} + +virNetworkPortPtr +virNetworkPortLookupByUUIDStringWrapper(virNetworkPtr net, + const char *uuidstr, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + virNetworkPortPtr ret; + ret = virNetworkPortLookupByUUIDString(net, uuidstr); + if (!ret) { + virCopyLastError(err); + } + return ret; +#endif +} + + +virNetworkPortPtr +virNetworkPortCreateXMLWrapper(virNetworkPtr net, + const char *xmldesc, + unsigned int flags, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + virNetworkPortPtr ret; + ret = virNetworkPortCreateXML(net, xmldesc, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +#endif +} + + +int +virNetworkListAllPortsWrapper(virNetworkPtr network, + virNetworkPortPtr **ports, + unsigned int flags, + virErrorPtr err) +{ +#if LIBVIR_VERSION_NUMBER < 5005000 + assert(0); // Caller should have checked version +#else + int ret; + ret = virNetworkListAllPorts(network, ports, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +#endif +} + + */ import "C" diff --git a/network_wrapper.h b/network_wrapper.h index 405bf89..d76167b 100644 --- a/network_wrapper.h +++ b/network_wrapper.h @@ -30,6 +30,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> #include "network_compat.h" +#include "network_port_compat.h" int virNetworkCreateWrapper(virNetworkPtr network, @@ -115,5 +116,27 @@ virNetworkUpdateWrapper(virNetworkPtr network, unsigned int flags, virErrorPtr err); +virNetworkPortPtr +virNetworkPortLookupByUUIDWrapper(virNetworkPtr net, + const unsigned char *uuid, + virErrorPtr err); + +virNetworkPortPtr +virNetworkPortLookupByUUIDStringWrapper(virNetworkPtr net, + const char *uuidstr, + virErrorPtr err); + +virNetworkPortPtr +virNetworkPortCreateXMLWrapper(virNetworkPtr net, + const char *xmldesc, + unsigned int flags, + virErrorPtr err); + +int +virNetworkListAllPortsWrapper(virNetworkPtr network, + virNetworkPortPtr **ports, + unsigned int flags, + virErrorPtr err); + #endif /* LIBVIRT_GO_NETWORK_WRAPPER_H__ */ -- 2.21.0

2 6

[libvirt] [PATCH 0/3] qemu: Introduce 'features' QMP query (blockdev-add saga)
by Peter Krempa 19 Jun '19

19 Jun '19

qemu introduced a new field in the QMP schema which allows to query features for a schema entry. Add the support to libvirt for querying it. Patch 3/3 is part of my blockdev series and I don't mind holding on to it until I post patches which make use of it. It's posted here mostly for demonstration purpose. Peter Krempa (3): tests: qemucaps: Introduce test data for qemu 4.1.0 qemu: qapi: Implement support for 'features' qemu: caps: Add capability for dynamic 'auto-read-only' support for files src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_qapi.c | 41 + .../caps_4.1.0.x86_64.replies | 23482 ++++++++++++++++ .../caps_4.1.0.x86_64.xml | 1388 + 5 files changed, 24914 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml -- 2.21.0

2 7

[libvirt] [PATCH] network: add virNetworkPortRef API
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

Normal practice is to provide a Ref API for all objects, but this was forgotten for the virNetworkPortPtr object. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- include/libvirt/libvirt-network.h | 3 +++ src/libvirt-network.c | 32 +++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + 3 files changed, 36 insertions(+) diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h index 97eceef754..c9ff0a49ed 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -455,4 +455,7 @@ virNetworkListAllPorts(virNetworkPtr network, int virNetworkPortFree(virNetworkPortPtr port); +int +virNetworkPortRef(virNetworkPortPtr port); + #endif /* LIBVIRT_NETWORK_H */ diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 6ed32c8ba2..c182064c0f 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1690,3 +1690,35 @@ virNetworkPortFree(virNetworkPortPtr port) virObjectUnref(port); return 0; } + + +/** + * virNetworkPortRef: + * @port: a network port object + * + * Increment the reference count on the network port. For each + * additional call to this method, there shall be a corresponding + * call to virNetworkPortFree to release the reference count, once + * the caller no longer needs the reference to this object. + * + * This method is typically useful for applications where multiple + * threads are using a network port, and it is required that the + * port remain resident until all threads have finished using + * it. ie, each new thread using a network port would increment + * the reference count. + * + * Returns 0 in case of success, -1 in case of failure. + */ +int +virNetworkPortRef(virNetworkPortPtr port) +{ + VIR_DEBUG("port=%p refs=%d", port, + port ? port->parent.u.s.refs : 0); + + virResetLastError(); + + virCheckNetworkPortReturn(port, -1); + + virObjectRef(port); + return 0; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 46c32a081b..75f7fdfb0c 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -831,6 +831,7 @@ LIBVIRT_5.5.0 { virNetworkPortGetUUIDString; virNetworkPortDelete; virNetworkPortFree; + virNetworkPortRef; virNetworkPortSetParameters; } LIBVIRT_5.2.0; -- 2.21.0

2 1

[libvirt] [security-notice PATCH 0/9] various improvements to script for finding broken/fixed branches/tags
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

This series provides for much greater automation when publishing details of security flaws. It is now possible to just provide the broken and fixed commit hash on the master branch. All the tag info and details of branches are now filled in automatically. Daniel P. Berrangé (9): scripts: change data structures used to track branches & tags scripts: report vulnerable branches which don't have any tags too scripts: add ability to handle a fixed commit hash scripts: change to update notice files inplace scripts: allow for notices to have multiple commit hashes scripts: optimize tag to branch mapping scripts: add detection of cherry-picks in branches scripts: fuzzy matching on subject to identify unannotated cherry picks notices: re-generate all branch/tag info notices/2008/0001.xml | 6 - notices/2009/0001.xml | 2 + notices/2010/0001.xml | 3 - notices/2010/0002.xml | 3 - notices/2010/0004.xml | 2 +- notices/2011/0001.xml | 10 +- notices/2011/0002.xml | 4 + notices/2012/0001.xml | 14 +- notices/2012/0002.xml | 2 +- notices/2012/0003.xml | 4 + notices/2013/0001.xml | 8 + notices/2013/0002.xml | 8 + notices/2013/0003.xml | 21 ++ notices/2013/0005.xml | 2 +- notices/2013/0006.xml | 1 + notices/2013/0007.xml | 2 +- notices/2013/0010.xml | 16 +- notices/2013/0012.xml | 28 ++- notices/2013/0015.xml | 2 +- notices/2013/0016.xml | 22 ++- notices/2013/0018.xml | 102 +++++----- notices/2013/0020.xml | 68 ++++--- notices/2013/0021.xml | 2 +- notices/2014/0001.xml | 8 + notices/2014/0003.xml | 107 ++++++++-- notices/2014/0004.xml | 25 ++- notices/2014/0005.xml | 21 +- notices/2014/0006.xml | 22 ++- notices/2014/0007.xml | 18 +- notices/2014/0008.xml | 6 +- notices/2014/0009.xml | 5 +- notices/2014/0010.xml | 8 +- notices/2015/0001.xml | 10 +- notices/2015/0002.xml | 6 +- notices/2015/0003.xml | 14 +- notices/2015/0004.xml | 13 +- notices/2016/0001.xml | 4 +- notices/2016/0002.xml | 1 + notices/2017/0001.xml | 4 +- notices/2017/0002.xml | 6 +- notices/2018/0001.xml | 159 ++++++++++++++- notices/2018/0002.xml | 158 ++++++++++++++- notices/2018/0003.xml | 161 ++++++++++++++- notices/2018/0004.xml | 159 ++++++++++++++- notices/2018/0005.xml | 162 ++++++++++++++- notices/2019/0001.xml | 2 +- notices/2019/0002.xml | 2 +- scripts/report-vulnerable-tags.pl | 319 ++++++++++++++++++++++++++---- 48 files changed, 1507 insertions(+), 225 deletions(-) -- 2.21.0

2 19

[libvirt] [PATCH] conf: remove unused class_id variable
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix src/conf/virnetworkportdef.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 5dfa3a3583..29ecf5b178 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -88,7 +88,6 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) VIR_AUTOFREE(char *) plugtype = NULL; VIR_AUTOFREE(char *) managed = NULL; VIR_AUTOFREE(char *) driver = NULL; - VIR_AUTOFREE(char *) class_id = NULL; if (VIR_ALLOC(def) < 0) return NULL; -- 2.21.0

1 0

[libvirt] [PATCH v2 0/4] Misc fixes to network port code
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Fixes for bugs spotted by coverity Daniel P. Berrangé (4): conf: fix leak when parsing network port XML conf: fix leak of directory handle when loading network ports conf: fix NULL deref when exporting ports conf: add error checking of UUID generation src/conf/domain_conf.c | 12 ++++++++++-- src/conf/virnetworkobj.c | 9 ++++++--- src/conf/virnetworkportdef.c | 26 +++++++++----------------- 3 files changed, 25 insertions(+), 22 deletions(-) -- 2.21.0

2 6

[libvirt] [go-xml PATCH] Add support for network filter binding XML schema
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- nwfilter_binding.go | 73 +++++++++++++++++++++++++++++++++++++++++++++ xml_test.go | 3 ++ 2 files changed, 76 insertions(+) create mode 100644 nwfilter_binding.go diff --git a/nwfilter_binding.go b/nwfilter_binding.go new file mode 100644 index 0000000..918ab71 --- /dev/null +++ b/nwfilter_binding.go @@ -0,0 +1,73 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Lian Duan <blazeblue(a)gmail.com> + * + */ + +package libvirtxml + +import ( + "encoding/xml" +) + +type NWFilterBinding struct { + XMLName xml.Name `xml:"filterbinding"` + Owner *NWFilterBindingOwner `xml:"owner"` + PortDev *NWFilterBindingPortDev `xml:"portdev"` + MAC *NWFilterBindingMAC `xml:"mac"` + FilterRef *NWFilterBindingFilterRef `xml:"filterref"` +} + +type NWFilterBindingOwner struct { + UUID string `xml:"uuid,omitempty"` + Name string `xml:"name,omitempty"` +} + +type NWFilterBindingPortDev struct { + Name string `xml:"name,attr"` +} + +type NWFilterBindingMAC struct { + Address string `xml:"address,attr"` +} + +type NWFilterBindingFilterRef struct { + Filter string `xml:"filter,attr"` + Parameters []NWFilterBindingFilterParam `xml:"parameter"` +} + +type NWFilterBindingFilterParam struct { + Name string `xml:"name,attr"` + Value string `xml:"value,attr"` +} + +func (s *NWFilterBinding) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), s) +} + +func (s *NWFilterBinding) Marshal() (string, error) { + doc, err := xml.MarshalIndent(s, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/xml_test.go b/xml_test.go index 320c248..d1da879 100644 --- a/xml_test.go +++ b/xml_test.go @@ -83,6 +83,7 @@ var xmldirs = []string{ "testdata/libvirt/tests/storagevolxml2xmlin", "testdata/libvirt/tests/storagevolxml2xmlout", "testdata/libvirt/tests/vircaps2xmldata", + "testdata/libvirt/tests/virnwfilterbindingxml2xmldata", "testdata/libvirt/tests/virstorageutildata", "testdata/libvirt/tests/vmx2xmldata", "testdata/libvirt/tests/xlconfigdata", @@ -325,6 +326,8 @@ func testRoundTrip(t *testing.T, xml string, filename string) { } else { doc = &CapsHostCPU{} } + } else if strings.HasPrefix(xml, "<filterbinding") { + doc = &NWFilterBinding{} } else if strings.HasPrefix(xml, "<filter") { doc = &NWFilter{} } else if strings.HasPrefix(xml, "<interface") { -- 2.21.0

1 0

[libvirt] [go-xml PATCH] Add support for network port XML schema
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- domain.go | 1 + network.go | 1 + network_port.go | 200 ++++++++++++++++++++++++++++++++++++++++++++++++ xml_test.go | 3 + 4 files changed, 205 insertions(+) create mode 100644 network_port.go diff --git a/domain.go b/domain.go index 0757048..a7cbdcf 100644 --- a/domain.go +++ b/domain.go @@ -440,6 +440,7 @@ type DomainInterfaceSourceNetwork struct { Network string `xml:"network,attr,omitempty"` PortGroup string `xml:"portgroup,attr,omitempty"` Bridge string `xml:"bridge,attr,omitempty"` + PortID string `xml:"portid,attr,omitempty"` } type DomainInterfaceSourceBridge struct { diff --git a/network.go b/network.go index d4faf46..61c1af0 100644 --- a/network.go +++ b/network.go @@ -282,6 +282,7 @@ type NetworkBandwidthParams struct { } type NetworkBandwidth struct { + ClassID uint `xml:"classID,attr,omitempty"` Inbound *NetworkBandwidthParams `xml:"inbound"` Outbound *NetworkBandwidthParams `xml:"outbound"` } diff --git a/network_port.go b/network_port.go new file mode 100644 index 0000000..3cbc7fb --- /dev/null +++ b/network_port.go @@ -0,0 +1,200 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2019 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" + "fmt" +) + +type NetworkPort struct { + XMLName xml.Name `xml:"networkport"` + UUID string `xml:"uuid,omitempty"` + Owner *NetworkPortOwner `xml:"owner",` + MAC *NetworkPortMAC `xml:"mac"` + Group string `xml:"group,omitempty"` + Bandwidth *NetworkBandwidth `xml:"bandwidth"` + VirtualPort *NetworkVirtualPort `xml:"virtualport"` + RXFilters *NetworkPortRXFilters `xml:"rxfilters"` + Plug *NetworkPortPlug `xml:"plug"` +} + +type NetworkPortOwner struct { + UUID string `xml:"uuid,omitempty"` + Name string `xml:"name,omitempty"` +} + +type NetworkPortMAC struct { + Address string `xml:"address,attr"` +} + +type NetworkPortRXFilters struct { + TrustGuest string `xml:"trustGuest,attr"` +} + +type NetworkPortPlug struct { + Bridge *NetworkPortPlugBridge `xml:"-"` + Network *NetworkPortPlugNetwork `xml:"-"` + Direct *NetworkPortPlugDirect `xml:"-"` + HostDevPCI *NetworkPortPlugHostDevPCI `xml:"-"` +} + +type NetworkPortPlugBridge struct { + Bridge string `xml:"bridge,attr"` + MacTableManager string `xml:"macTableManager,attr,omitempty"` +} + +type NetworkPortPlugNetwork struct { + Bridge string `xml:"bridge,attr"` + MacTableManager string `xml:"macTableManager,attr,omitempty"` +} + +type NetworkPortPlugDirect struct { + Dev string `xml:"dev,attr"` + Mode string `xml:"mode,attr"` +} + +type NetworkPortPlugHostDevPCI struct { + Managed string `xml:"managed,attr,omitempty"` + Driver *NetworkPortPlugHostDevPCIDriver `xml:"driver"` + Address *NetworkPortPlugHostDevPCIAddress `xml:"address"` +} + +type NetworkPortPlugHostDevPCIDriver struct { + Name string `xml:"name,attr"` +} + +type NetworkPortPlugHostDevPCIAddress struct { + Domain *uint `xml:"domain,attr"` + Bus *uint `xml:"bus,attr"` + Slot *uint `xml:"slot,attr"` + Function *uint `xml:"function,attr"` +} + +func (a *NetworkPortPlugHostDevPCIAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error { + marshalUintAttr(&start, "domain", a.Domain, "0x%04x") + marshalUintAttr(&start, "bus", a.Bus, "0x%02x") + marshalUintAttr(&start, "slot", a.Slot, "0x%02x") + marshalUintAttr(&start, "function", a.Function, "0x%x") + e.EncodeToken(start) + e.EncodeToken(start.End()) + return nil +} + +func (a *NetworkPortPlugHostDevPCIAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + for _, attr := range start.Attr { + if attr.Name.Local == "domain" { + if err := unmarshalUintAttr(attr.Value, &a.Domain, 0); err != nil { + return err + } + } else if attr.Name.Local == "bus" { + if err := unmarshalUintAttr(attr.Value, &a.Bus, 0); err != nil { + return err + } + } else if attr.Name.Local == "slot" { + if err := unmarshalUintAttr(attr.Value, &a.Slot, 0); err != nil { + return err + } + } else if attr.Name.Local == "function" { + if err := unmarshalUintAttr(attr.Value, &a.Function, 0); err != nil { + return err + } + } + } + d.Skip() + return nil +} + +func (p *NetworkPortPlug) MarshalXML(e *xml.Encoder, start xml.StartElement) error { + start.Name.Local = "plug" + if p.Bridge != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "bridge", + }) + return e.EncodeElement(p.Bridge, start) + } else if p.Network != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "network", + }) + return e.EncodeElement(p.Network, start) + } else if p.Direct != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "direct", + }) + return e.EncodeElement(p.Direct, start) + } else if p.HostDevPCI != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "hostdev-pci", + }) + return e.EncodeElement(p.HostDevPCI, start) + } + return nil +} + +func (p *NetworkPortPlug) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + typ, ok := getAttr(start.Attr, "type") + if !ok { + return fmt.Errorf("Missing type attribute on plug") + } else if typ == "bridge" { + var pb NetworkPortPlugBridge + if err := d.DecodeElement(&pb, &start); err != nil { + return err + } + p.Bridge = &pb + } else if typ == "network" { + var pn NetworkPortPlugNetwork + if err := d.DecodeElement(&pn, &start); err != nil { + return err + } + p.Network = &pn + } else if typ == "direct" { + var pd NetworkPortPlugDirect + if err := d.DecodeElement(&pd, &start); err != nil { + return err + } + p.Direct = &pd + } else if typ == "hostdev-pci" { + var ph NetworkPortPlugHostDevPCI + if err := d.DecodeElement(&ph, &start); err != nil { + return err + } + p.HostDevPCI = &ph + } + d.Skip() + return nil +} + +func (s *NetworkPort) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), s) +} + +func (s *NetworkPort) Marshal() (string, error) { + doc, err := xml.MarshalIndent(s, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/xml_test.go b/xml_test.go index 320c248..7e3876a 100644 --- a/xml_test.go +++ b/xml_test.go @@ -83,6 +83,7 @@ var xmldirs = []string{ "testdata/libvirt/tests/storagevolxml2xmlin", "testdata/libvirt/tests/storagevolxml2xmlout", "testdata/libvirt/tests/vircaps2xmldata", + "testdata/libvirt/tests/virnetworkportxml2xmldata", "testdata/libvirt/tests/virstorageutildata", "testdata/libvirt/tests/vmx2xmldata", "testdata/libvirt/tests/xlconfigdata", @@ -306,6 +307,8 @@ func testRoundTrip(t *testing.T, xml string, filename string) { doc = &Domain{} } else if strings.HasPrefix(xml, "<capabilities") { doc = &Caps{} + } else if strings.HasPrefix(xml, "<networkport") { + doc = &NetworkPort{} } else if strings.HasPrefix(xml, "<network") { doc = &Network{} } else if strings.HasPrefix(xml, "<secret") { -- 2.21.0

1 0

[libvirt] ANNOUNCE: virt-manager 2.2.0 released
by Cole Robinson 18 Jun '19

18 Jun '19

I'm happy to announce the release of virt-manager 2.2.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks - virt-install: libosinfo --unattended support (Fabiano Fidêncio, Cole Robinson) - Improve CPU model security defaults (Pavel Hrdina) - virt-install: new --install option. Ex: virt-install --install fedora29 - virt-install: new --install kernel=,initrd= - virt-install: --disk, --memory, --name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson) - virt-install: add device suboption aliases which consistently match libvirt XML naming - virt-xml: new --start, --no-define options (Marc Hartmayer) - virt-install: Add driver_queues argument to --controller (Vasudeva Kamath) - RISC-V support (Andrea Bolognani) - Device default improvements for non-x86 KVM (Andrea Bolognani) - Redesigned 'New Network' wizard - libguestfs inspection improvements (Pino Toscano) - virt-install: Add support for xenbus controller (Jim Fehlig) - cli: Add --disk wwn=,rawio= (Athina Plaskasoviti) - cli: Add --memballoon autodeflate=,stats.period= (Athina Plaskasoviti) - cli: Add --iothreads (Athina Plaskasoviti) - cli: Add --numatune memory.placement (Athina Plaskasoviti) - cli: Add --launchSecurity option (Erik Skultety) - cli: Fill in --memorybacking options - cli: --smartcard: support database= and certificate[0-9]*= - cli: --sysinfo: Add chasis suboptions - cli: --metadata: add genid= and genid_enable= - cli: --vcpus: add vcpus.vcpu[0-9]* config - cli: fill in all common char source options for --serial, --parellel, --console, --channel, --smartcard, --rng, --redirdev Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 1

[libvirt] [PATCH v6 00/23] network: refactor to decouple virt drivers from network driver
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

An update to v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00681.html v2: https://www.redhat.com/archives/libvir-list/2019-February/msg01581.html v3: https://www.redhat.com/archives/libvir-list/2019-March/msg01259.html v4: https://www.redhat.com/archives/libvir-list/2019-April/msg01186.html v5: https://www.redhat.com/archives/libvir-list/2019-May/msg00358.html Currently the network driver registers a set of callbacks with the virt driver in order to handle allocating/releasing network ports associated with guest NICs. This series introduces a virNetworkPortPtr object and associated XML that describes a network port. The virt drivers now call public APIs associated with this new object to create/delete ports for guest NICs. Changed in v6: - Fixed mistakes in RNG schema & example XML - Fix docs typos Changed in v5: - Separately track ports with type=network vs type=bridge to deal with fallout after reverting patches which merged them - Add RNG schema and XML format docs - Change to use classID attr on <bandwidth> isntead of of separate <class id="xx"/> element - Drop obsolete driver deps from RPM spec - Other misc bug fixes found during testing Changed in v4: - Merged the ACKd patches which didn't depend on other un-acked parts - Improve bandwidth error messages - Ensure we set floor sum to zero when starting network - Misc fixes for previous review comments NB, I have not added missing docs for the new XML doc format yet. This is work in progress. Changed in v3: - Remove unused API symbol - Fix dist of test data files Changed in v2: - Fix many bugs related to upgrades with running VMs - Convert over bandwidth controls to the new APIs - Handle reconnecting VIFs to bridges during startup - Much much more that I can't remember Daniel P. Berrangé (23): conf: allow bandwidth parsing / formatting to include class ID conf: introduce virNetworkPortDefPtr struct and XML support network: make networkLogAllocation independent of domain conf conf: add APIs to convert virDomainNetDef to virNetworkPortDef network: convert networkAllocateActualDevice to virNetworkPortDef network: convert networkNotifyActualDevice to virNetworkPortDef network: convert networkReleaseActualDevice to virNetworkPortDef network: convert hook script to take a network port XML network: remove the virDomainNetBandwidthChangeAllowed callback network: introduce networkAllocatePort network: introduce networkNotifyPort network: introduce networkReleasePort network: introduce networkUpdatePortBandwidth network: add public APIs for network port object access: add permissions for network port objects remote: add support for new network port APIs virsh: add support for network port APIs conf: support recording ports against virNetworkObjPtr network: add implementation of network port APIs lxc, libxl: notify network driver of NICs during reconnect lxc, libxl: save domain status after reconnect conf: record a portid against the domain conf conf: switch over to use network port APIs for virt drivers docs/docs.html.in | 1 + docs/formatdomain.html.in | 8 + docs/formatnetworkport.html.in | 212 +++ docs/hooks.html.in | 24 +- docs/schemas/domaincommon.rng | 5 + docs/schemas/networkcommon.rng | 5 + docs/schemas/networkport.rng | 154 +++ include/libvirt/libvirt-network.h | 122 ++ include/libvirt/virterror.h | 3 + libvirt.spec.in | 1 + src/access/genpolkit.pl | 2 +- src/access/viraccessdriver.h | 6 + src/access/viraccessdrivernop.c | 11 + src/access/viraccessdriverpolkit.c | 26 + src/access/viraccessdriverstack.c | 25 + src/access/viraccessmanager.c | 16 + src/access/viraccessmanager.h | 6 + src/access/viraccessperm.c | 6 + src/access/viraccessperm.h | 44 + src/conf/Makefile.inc.am | 2 + src/conf/domain_conf.c | 531 +++++++- src/conf/domain_conf.h | 49 +- src/conf/netdev_bandwidth_conf.c | 30 +- src/conf/netdev_bandwidth_conf.h | 2 + src/conf/network_conf.c | 8 +- src/conf/virnetworkobj.c | 303 +++++ src/conf/virnetworkobj.h | 34 + src/conf/virnetworkportdef.c | 508 +++++++ src/conf/virnetworkportdef.h | 113 ++ src/datatypes.c | 60 + src/datatypes.h | 41 + src/driver-network.h | 41 + src/libvirt-network.c | 444 +++++++ src/libvirt_private.syms | 23 +- src/libvirt_public.syms | 15 + src/libxl/libxl_driver.c | 33 + src/lxc/lxc_process.c | 35 + src/network/bridge_driver.c | 1182 ++++++++++------- src/qemu/qemu_driver.c | 8 +- src/remote/remote_daemon_dispatch.c | 73 + src/remote/remote_driver.c | 69 + src/remote/remote_protocol.x | 124 +- src/remote_protocol-structs | 69 + src/rpc/gendispatch.pl | 18 +- src/util/virerror.c | 9 + src/util/virhook.c | 4 +- src/util/virhook.h | 4 +- tests/Makefile.am | 7 + .../net-virtio-network-portgroup.xml | 6 +- tests/virnetdevbandwidthtest.c | 1 + .../plug-bridge-mactbl.xml | 9 + .../virnetworkportxml2xmldata/plug-bridge.xml | 15 + .../virnetworkportxml2xmldata/plug-direct.xml | 12 + .../plug-hostdev-pci.xml | 12 + .../plug-network.xml | 15 + tests/virnetworkportxml2xmldata/plug-none.xml | 8 + tests/virnetworkportxml2xmltest.c | 104 ++ tests/virschematest.c | 1 + tools/virsh-completer.c | 50 + tools/virsh-completer.h | 4 + tools/virsh-network.c | 399 +++++- tools/virsh-network.h | 5 + 62 files changed, 4499 insertions(+), 658 deletions(-) create mode 100644 docs/formatnetworkport.html.in create mode 100644 docs/schemas/networkport.rng create mode 100644 src/conf/virnetworkportdef.c create mode 100644 src/conf/virnetworkportdef.h create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-mactbl.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-direct.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-network.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-none.xml create mode 100644 tests/virnetworkportxml2xmltest.c -- 2.21.0

3 44

Re: [libvirt] [PATCH] storage: escape ipv6 for ceph mon hosts to librados
by Yi Li 18 Jun '19

18 Jun '19

> >Hosts for rbd are ceph monitor daemons. These have fixed IP addresses, > >so they are often referenced by IP rather than hostname for > >convenience, or to avoid relying on DNS. Using IPv4 addresses as the > >host name works already, but IPv6 addresses require rbd-specific > > If you include the escaping in the XML, does it currently work? > <host name='[2205::192:168:205:141]' port='6789'/> Yes, It works. > > > >escaping because the colon is used as an option separator in the > >string passed to librados. > > > >Escape these colons, and enclose the IPv6 address in square brackets > >so it is distinguished from the port, which is currently mandatory. > > > >Signed-off-by: Yi Li <yili(a)winhong.com> > >--- > > docs/schemas/storagepool.rng | 5 ++++- > > src/storage/storage_backend_rbd.c | 13 ++++++++++--- > > tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml | 13 +++++++++++++ > > tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml | 16 ++++++++++++++++ > > tests/storagepoolxml2xmltest.c | 1 + > > 5 files changed, 44 insertions(+), 4 deletions(-) > > create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml > > create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml > > > >diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c > >index f8c968e..3056563 100644 > >--- a/src/storage/storage_backend_rbd.c > >+++ b/src/storage/storage_backend_rbd.c > >@@ -268,9 +268,16 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, > > source->hosts[i].name); > > } else if (source->hosts[i].name != NULL && > > source->hosts[i].port) { > >- virBufferAsprintf(&mon_host, "%s:%d,", > >- source->hosts[i].name, > >- source->hosts[i].port); > >+ /* assume host containing : is ipv6 */ > >+ if (strchr(source->hosts[i].name, ':')) { > > if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) > > By using this helper function, we won't try to escape an address that is > already escaped. > > Also, instead of copying the whole virBuffer call twice, it would be > nicer to assign the format to a temporary variable like we do in qemuMigrationDstPrepare > > Jano Good point. I'd sending a v2. > > > >+ virBufferAsprintf(&mon_host, "[%s]:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } else { > >+ virBufferAsprintf(&mon_host, "%s:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } > > } else { > > virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > > _("received malformed monitor, check the XML definition")); On Sun, Apr 28, 2019 at 1:10 PM winhong-yili <yili(a)winhong.com> wrote: > > >Hosts for rbd are ceph monitor daemons. These have fixed IP addresses, > >so they are often referenced by IP rather than hostname for > >convenience, or to avoid relying on DNS. Using IPv4 addresses as the > >host name works already, but IPv6 addresses require rbd-specific > > If you include the escaping in the XML, does it currently work? > <host name='[2205::192:168:205:141]' port='6789'/> > > >escaping because the colon is used as an option separator in the > >string passed to librados. > > > >Escape these colons, and enclose the IPv6 address in square brackets > >so it is distinguished from the port, which is currently mandatory. > > > >Signed-off-by: Yi Li <yili(a)winhong.com> > >--- > > docs/schemas/storagepool.rng | 5 ++++- > > src/storage/storage_backend_rbd.c | 13 ++++++++++--- > > tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml | 13 +++++++++++++ > > tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml | 16 ++++++++++++++++ > > tests/storagepoolxml2xmltest.c | 1 + > > 5 files changed, 44 insertions(+), 4 deletions(-) > > create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml > > create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml > > > >diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c > >index f8c968e..3056563 100644 > >--- a/src/storage/storage_backend_rbd.c > >+++ b/src/storage/storage_backend_rbd.c > >@@ -268,9 +268,16 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, > > source->hosts[i].name); > > } else if (source->hosts[i].name != NULL && > > source->hosts[i].port) { > >- virBufferAsprintf(&mon_host, "%s:%d,", > >- source->hosts[i].name, > >- source->hosts[i].port); > >+ /* assume host containing : is ipv6 */ > >+ if (strchr(source->hosts[i].name, ':')) { > > if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) > > By using this helper function, we won't try to escape an address that is > already escaped. > > Also, instead of copying the whole virBuffer call twice, it would be > nicer to assign the format to a temporary variable like we do in qemuMigrationDstPrepare > > Jano > > >+ virBufferAsprintf(&mon_host, "[%s]:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } else { > >+ virBufferAsprintf(&mon_host, "%s:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } > > } else { > > virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > > _("received malformed monitor, check the XML definition"));

2 2

[libvirt] [PATCH v3 00/15] implement cgroups v2 support
by Pavel Hrdina 18 Jun '19

18 Jun '19

In cgroups v2 there is no devices controller, eBPF should be used instead. Changes in v3: - removed workaround for kernel bug [1] - added documentation how to get the eBPF program Changes in v2: - fixed build on bsd and older kernels without cgroup BPF - cgroup bpf devices code moved to separate file Documentation for eBPF: <http://man7.org/linux/man-pages/man2/bpf.2.html> <https://www.kernel.org/doc/Documentation/networking/filter.txt> <https://docs.cilium.io/en/v1.3/bpf/> [1] <https://bugzilla.redhat.com/show_bug.cgi?id=1656432> Pavel Hrdina (15): util: introduce virbpf helpers vircgroup: introduce virCgroupV2DevicesAvailable vircgroup: introduce virCgroupV2DevicesAttachProg vircgroup: introduce virCgroupV2DevicesDetectProg vircgroup: introduce virCgroupV2DevicesCreateProg vircgroup: introduce virCgroupV2DevicesPrepareProg vircgroup: introduce virCgroupV2DevicesRemoveProg vircgroup: introduce virCgroupV2DeviceGetPerms vircgroup: introduce virCgroupV2DevicesGetKey vircgroup: introduce virCgroupV2AllowDevice vircgroup: introduce virCgroupV2DenyDevice vircgroup: introduce virCgroupV2AllowAllDevices vircgroup: introduce virCgroupV2DenyAllDevices vircgroup: workaround devices in hybrid mode vircgroupmock: mock virCgroupV2DevicesAvailable configure.ac | 6 + include/libvirt/virterror.h | 2 + src/Makefile.am | 2 + src/libvirt_private.syms | 26 ++ src/util/Makefile.inc.am | 4 + src/util/virbpf.c | 438 +++++++++++++++++++ src/util/virbpf.h | 259 ++++++++++++ src/util/vircgroup.c | 3 +- src/util/vircgroupbackend.h | 3 +- src/util/vircgrouppriv.h | 10 + src/util/vircgroupv1.c | 9 +- src/util/vircgroupv2.c | 117 +++++- src/util/vircgroupv2devices.c | 670 ++++++++++++++++++++++++++++++ src/util/vircgroupv2devices.h | 57 +++ src/util/virerror.c | 2 + tests/vircgroupdata/hybrid.parsed | 2 +- tests/vircgroupmock.c | 7 + tests/vircgrouptest.c | 4 +- 18 files changed, 1613 insertions(+), 8 deletions(-) create mode 100644 src/util/virbpf.c create mode 100644 src/util/virbpf.h create mode 100644 src/util/vircgroupv2devices.c create mode 100644 src/util/vircgroupv2devices.h -- 2.20.1

2 33

[libvirt] [PATCH RFC 0/1] mdevctl: further config for vfio-ap
by Cornelia Huck 18 Jun '19

18 Jun '19

This patch adds a very rough implementation of additional config data for mdev devices. The idea is to make it possible to specify some type-specific key=value pairs in the config file for an mdev device. If a device is started automatically, the device is stopped and restarted after applying the config. The code has still some problems, like not doing a lot of error handling and being ugly in general; but most importantly, I can't really test it, as I don't have the needed hardware. Feedback welcome; would be good to know if the direction is sensible in general. Also available at https://github.com/cohuck/mdevctl conf-data Cornelia Huck (1): allow to specify additional config data mdevctl.libexec | 25 ++++++++++++++++++++++ mdevctl.sbin | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) -- 2.20.1

5 16

[libvirt] [perl PATCH] Add support for virNetworkPortPtr and its APIs
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changes | 2 +- lib/Sys/Virt.pm | 1 + lib/Sys/Virt.xs | 179 ++++++++++++++++++++++++++++++++++++ lib/Sys/Virt/Error.pm | 12 +++ lib/Sys/Virt/Network.pm | 39 ++++++++ lib/Sys/Virt/NetworkPort.pm | 177 +++++++++++++++++++++++++++++++++++ t/030-api-coverage.t | 2 +- typemap | 14 +++ 8 files changed, 424 insertions(+), 2 deletions(-) create mode 100644 lib/Sys/Virt/NetworkPort.pm diff --git a/Changes b/Changes index 0fb13d5..e13c3b3 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 5.5.0 2019-07-00 - - XXX + - Add support for virNetworkPortPtr object and its APIs 5.4.0 2019-06-12 diff --git a/lib/Sys/Virt.pm b/lib/Sys/Virt.pm index b6553aa..2e01fd6 100644 --- a/lib/Sys/Virt.pm +++ b/lib/Sys/Virt.pm @@ -69,6 +69,7 @@ use warnings; use Sys::Virt::Error; use Sys::Virt::Domain; use Sys::Virt::Network; +use Sys::Virt::NetworkPort; use Sys::Virt::StoragePool; use Sys::Virt::StorageVol; use Sys::Virt::NodeDevice; diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs index 9586be8..ccd5ba0 100644 --- a/lib/Sys/Virt.xs +++ b/lib/Sys/Virt.xs @@ -6828,6 +6828,27 @@ PREINIT: free(leases); +void +list_all_ports(net, flags=0) + virNetworkPtr net; + unsigned int flags; + PREINIT: + virNetworkPortPtr *ports; + int i, nport; + SV *portrv; + PPCODE: + if ((nport = virNetworkListAllPorts(net, &ports, flags)) < 0) + _croak_error(); + + EXTEND(SP, nport); + for (i = 0 ; i < nport ; i++) { + portrv = sv_newmortal(); + sv_setref_pv(portrv, "Sys::Virt::NetworkPort", ports[i]); + PUSHs(portrv); + } + free(ports); + + void destroy(net_rv) SV *net_rv; @@ -6852,6 +6873,150 @@ DESTROY(net_rv) } +MODULE = Sys::Virt::NetworkPort PACKAGE = Sys::Virt::NetworkPort + + +virNetworkPortPtr +_create_xml(net, xml, flags=0) + virNetworkPtr net; + const char *xml; + unsigned int flags; + CODE: + if (!(RETVAL = virNetworkPortCreateXML(net, xml, flags))) + _croak_error(); + OUTPUT: + RETVAL + + +virNetworkPortPtr +_lookup_by_uuid(net, uuid) + virNetworkPtr net; + const unsigned char *uuid; + CODE: + if (!(RETVAL = virNetworkPortLookupByUUID(net, uuid))) + _croak_error(); + OUTPUT: + RETVAL + + +virNetworkPortPtr +_lookup_by_uuid_string(net, uuid) + virNetworkPtr net; + const char *uuid; + CODE: + if (!(RETVAL = virNetworkPortLookupByUUIDString(net, uuid))) + _croak_error(); + + OUTPUT: + RETVAL + + +SV * +get_uuid(port) + virNetworkPortPtr port; + PREINIT: + unsigned char rawuuid[VIR_UUID_BUFLEN]; + CODE: + if ((virNetworkPortGetUUID(port, rawuuid)) < 0) + _croak_error(); + + RETVAL = newSVpv((char*)rawuuid, sizeof(rawuuid)); + OUTPUT: + RETVAL + + +SV * +get_uuid_string(port) + virNetworkPortPtr port; + PREINIT: + char uuid[VIR_UUID_STRING_BUFLEN]; + CODE: + if ((virNetworkPortGetUUIDString(port, uuid)) < 0) + _croak_error(); + + RETVAL = newSVpv(uuid, 0); + OUTPUT: + RETVAL + + +SV * +get_xml_description(port, flags=0) + virNetworkPortPtr port; + unsigned int flags; + PREINIT: + char *xml; + CODE: + if (!(xml = virNetworkPortGetXMLDesc(port, flags))) + _croak_error(); + + RETVAL = newSVpv(xml, 0); + free(xml); + OUTPUT: + RETVAL + + +HV * +get_parameters(port, flags=0) + virNetworkPortPtr port; + unsigned int flags; + PREINIT: + virTypedParameterPtr params = NULL; + int nparams = 0; + CODE: + if (virNetworkPortGetParameters(port, &params, &nparams, flags) < 0) { + vir_typed_param_safe_free(params, nparams); + _croak_error(); + } + + RETVAL = vir_typed_param_to_hv(params, nparams); + vir_typed_param_safe_free(params, nparams); + OUTPUT: + RETVAL + + +void +set_parameters(port, newparams, flags=0) + virNetworkPortPtr port; + HV *newparams; + unsigned int flags; + PREINIT: + virTypedParameterPtr params = NULL; + int nparams = 0; + PPCODE: + if (virNetworkPortGetParameters(port, &params, &nparams, 0) < 0) { + vir_typed_param_safe_free(params, nparams); + _croak_error(); + } + + nparams = vir_typed_param_from_hv(newparams, params, nparams); + + if (virNetworkPortSetParameters(port, params, nparams, flags) < 0) + _croak_error(); + vir_typed_param_safe_free(params, nparams); + + +void +delete(port, flags=0) + virNetworkPortPtr port; + unsigned int flags; + PPCODE: + if (virNetworkPortDelete(port, flags) < 0) + _croak_error(); + + +void +DESTROY(port_rv) + SV *port_rv; + PREINIT: + virNetworkPortPtr port; + PPCODE: + port = (virNetworkPortPtr)SvIV((SV*)SvRV(port_rv)); + if (port) { + virNetworkPortFree(port); + sv_setiv((SV*)SvRV(port_rv), 0); + } + + MODULE = Sys::Virt::StoragePool PACKAGE = Sys::Virt::StoragePool @@ -9577,6 +9742,17 @@ BOOT: REGISTER_CONSTANT(VIR_NETWORK_EVENT_STOPPED, EVENT_STOPPED); + stash = gv_stashpv( "Sys::Virt::NetworkPort", TRUE ); + REGISTER_CONSTANT(VIR_NETWORK_PORT_CREATE_RECLAIM, CREATE_RECLAIM); + + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_AVERAGE, BANDWIDTH_IN_AVERAGE); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_BURST, BANDWIDTH_IN_BURST); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_FLOOR, BANDWIDTH_IN_FLOOR); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_PEAK, BANDWIDTH_IN_PEAK); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_OUT_AVERAGE, BANDWIDTH_OUT_AVERAGE); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_OUT_BURST, BANDWIDTH_OUT_BURST); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_OUT_PEAK, BANDWIDTH_OUT_PEAK); + stash = gv_stashpv( "Sys::Virt::Interface", TRUE ); REGISTER_CONSTANT(VIR_INTERFACE_XML_INACTIVE, XML_INACTIVE); @@ -9863,4 +10039,7 @@ BOOT: REGISTER_CONSTANT(VIR_ERR_INVALID_DOMAIN_CHECKPOINT, ERR_INVALID_DOMAIN_CHECKPOINT); REGISTER_CONSTANT(VIR_ERR_NO_DOMAIN_BACKUP, ERR_NO_DOMAIN_BACKUP); REGISTER_CONSTANT(VIR_ERR_NO_DOMAIN_CHECKPOINT, ERR_NO_DOMAIN_CHECKPOINT); + REGISTER_CONSTANT(VIR_ERR_NO_NETWORK_PORT, ERR_NO_NETWORK_PORT); + REGISTER_CONSTANT(VIR_ERR_INVALID_NETWORK_PORT, ERR_INVALID_NETWORK_PORT); + REGISTER_CONSTANT(VIR_ERR_NETWORK_PORT_EXIST, ERR_NETWORK_PORT_EXIST); } diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index d65ceb5..3f48769 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -844,6 +844,18 @@ Domain checkpoint not found Domain backup job id not found +=item Sys::Virt::Error::ERR_NO_NETWORK_PORT + +No matching network port + +=item Sys::Virt::Error::ERR_INVALID_NETWORK_PORT + +Invalid network port object + +=item Sys::Virt::Error::ERR_NETWORK_PORT_EXIST + +Network port already exists + =back =head1 AUTHORS diff --git a/lib/Sys/Virt/Network.pm b/lib/Sys/Virt/Network.pm index 415e629..e4b54da 100644 --- a/lib/Sys/Virt/Network.pm +++ b/lib/Sys/Virt/Network.pm @@ -193,6 +193,45 @@ The client ID or DUID =back +=item @port = $net->list_all_ports($flags=0) + +List all ports associated with the network. The return array elements +are instances of the C<Sys::Virt::NetworkPort> class. + +=item $port = $net->create_port($xml, $flags=0) + +Create a new network port from the given C<$xml> description. The C<$flags> +parameter can optionally taken one or more of the network port creation +constants. The returned C<$port> object is an instance of the +C<Sys::Virt::NetworkPort> class. + +=cut + +sub create_port { + my $self = shift; + my $xml = shift; + my $flags = shift || 0; + + return Sys::Virt::NetworkPort->_new(net => $self, xml => $xml, flags => $flags); +} + + +=item $port = $net->get_port_by_uuid($uuid); + +Lookup a network port from a raw or printable UUID. +The returned C<$port> object is an instance of the C<Sys::Virt::NetworkPort> +class. + +=cut + +sub get_port_by_uuid { + my $self = shift; + my $uuid = shift; + + return Sys::Virt::NetworkPort->_new(net => $self, uuid => $uuid); +} + + =back =head1 CONSTANTS diff --git a/lib/Sys/Virt/NetworkPort.pm b/lib/Sys/Virt/NetworkPort.pm new file mode 100644 index 0000000..9e9bf37 --- /dev/null +++ b/lib/Sys/Virt/NetworkPort.pm @@ -0,0 +1,177 @@ +# -*- perl -*- +# +# Copyright (C) 2019 Red Hat +# +# This program is free software; You can redistribute it and/or modify +# it under either: +# +# a) the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version, +# +# or +# +# b) the "Artistic License" +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions of the two licenses. + +=pod + +=head1 NAME + +Sys::Virt::NetworkPort - Represent & manage a libvirt virtual network port + +=head1 DESCRIPTION + +The C<Sys::Virt::NetworkPort> module represents a port in a virtual network. + +=head1 METHODS + +=over 4 + +=cut + +package Sys::Virt::NetworkPort; + +use strict; +use warnings; + + +sub _new { + my $proto = shift; + my $class = ref($proto) || $proto; + my %params = @_; + + my $net = exists $params{network} ? $params{network} : die "network parameter is required"; + my $self; + if (exists $params{uuid}) { + if (length($params{uuid}) == 16) { + $self = Sys::Virt::NetworkPort::_lookup_by_uuid($net, $params{uuid}); + } elsif (length($params{uuid}) == 32 || + length($params{uuid}) == 36) { + $self = Sys::Virt::NetworkPort::_lookup_by_uuid_string($net, $params{uuid}); + } else { + die "UUID must be either 16 unsigned bytes, or 32/36 hex characters long"; + } + } elsif (exists $params{xml}) { + my $flags = $params{flags} || 0; + $self = Sys::Virt::NetworkPort::_create_xml($net, $params{xml}, $flags); + } else { + die "uuid or xml parameters are required"; + } + + bless $self, $class; + + return $self; +} + + +=item my $uuid = $net->get_uuid() + +Returns a 16 byte long string containing the raw globally unique identifier +(UUID) for the network port. + +=item my $uuid = $net->get_uuid_string() + +Returns a printable string representation of the raw UUID, in the format +'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'. + +=item my $xml = $net->get_xml_description() + +Returns an XML document containing a complete description of +the network port's configuration + +=item $net->delete() + +Delete the network port from the managed network. + +=item my $params = $net->get_parameters($flags=0); + +Get tunable parameters associated with the network port. The C<$flags> +parameter is currently unused and defaults to zero. The returned +C<$params> is a hash reference whose keys are one or more of the +following constants: + +=over 4 + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_AVERAGE + +The average inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_BURST + +The burstable inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_FLOOR + +The minimum inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_PEAK + +The peak inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_OUT_AVERAGE + +The average outbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_OUT_BURST + +The burstable outbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_OUT_PEAK + +The peak outbound bandwidth + +=back + +=item $net->set_parameters($params, $flags=0); + +Set tunable parameters associated with the network port. The C<$flags> +parameter is currently unused and defaults to zero. The C<$params> +parameter is a hash reference whose keys are one or more of the +constants listed for C<get_parameters>. + +=back + +=head2 NETWORK PORT CREATION CONSTANTS + +When creating network ports zero or more of the following +constants may be used + +=over 4 + +=item Sys::Virt::NetworkPort::CREATE_RECLAIM + +Providing configuration reclaiming a pre-existing network port. + +=back + + +=cut + + +1; + + +=head1 AUTHORS + +Daniel P. Berrange <berrange(a)redhat.com> + +=head1 COPYRIGHT + +Copyright (C) 2019 Red Hat + +=head1 LICENSE + +This program is free software; you can redistribute it and/or modify +it under the terms of either the GNU General Public License as published +by the Free Software Foundation (either version 2 of the License, or at +your option any later version), or, the Artistic License, as specified +in the Perl README file. + +=head1 SEE ALSO + +L<Sys::Virt>, L<Sys::Virt::Network>, L<Sys::Virt::Error>, C<http://libvirt.org> + +=cut diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 15d4a77..0b6592a 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -152,7 +152,7 @@ virNetworkDHCPLeaseFree ); foreach my $func (sort { $a cmp $b } @functions) { - if ($func =~ /(GetConnect|Ref|GetDomain)$/ || + if ($func =~ /(GetConnect|Ref|GetDomain|GetNetwork)$/ || grep {/$func/ } @blacklist) { ok(1, $func); next; diff --git a/typemap b/typemap index 9784094..b316aa2 100644 --- a/typemap +++ b/typemap @@ -4,6 +4,7 @@ const unsigned char * T_PV virConnectPtr O_OBJECT_connect virDomainPtr O_OBJECT_domain virNetworkPtr O_OBJECT_network +virNetworkPortPtr O_OBJECT_network_port virNWFilterPtr O_OBJECT_nwfilter virNWFilterBindingPtr O_OBJECT_nwfilter_binding virInterfacePtr O_OBJECT_interface @@ -55,6 +56,19 @@ OUTPUT O_OBJECT_network sv_setref_pv( $arg, "Sys::Virt::Network", (void*)$var ); +INPUT +O_OBJECT_network_port + if (sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVMG)) + $var = INT2PTR($type, SvIV((SV*)SvRV( $arg ))); + else { + warn( \"${Package}::$func_name() -- $var is not a blessed SV reference\" ); + XSRETURN_UNDEF; + } + +OUTPUT +O_OBJECT_network_port + sv_setref_pv( $arg, "Sys::Virt::NetworkPort", (void*)$var ); + INPUT O_OBJECT_storagepool -- 2.21.0

2 1

[libvirt] [PATCH 0/4] docs: Use CDNJS, update JavaScript libraries
by Andrea Bolognani 18 Jun '19

18 Jun '19

We're carrying around embedded copies of a few JavaScript libraries for use in our homepage, and we've been unforgivably bad at keeping them up to date. Instead of serving JavaScript from libvirt.org, use CDNJS so that users will get better performance and the load on our Web server will decrease (win-win!); at the same time, move from the positively ancient versions we're currently using to the freshest ones available. Andrea Bolognani (4): docs: Use CDNJS for Moment.js docs: Use CDNJS for jquery.rss docs: Use CDNJS for jQuery docs: Update JavaScript libraries docs/Makefile.am | 4 +--- docs/index.html.in | 6 +++--- docs/js/jquery-3.1.1.min.js | 4 ---- docs/js/jquery.rss.min.js | 11 ----------- docs/js/moment.min.js | 7 ------- 5 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 docs/js/jquery-3.1.1.min.js delete mode 100644 docs/js/jquery.rss.min.js delete mode 100644 docs/js/moment.min.js -- 2.21.0

4 15

[libvirt] [PATCH 0/5] docs: drvqemu: Clean up documentation regarding XML<->native conversion
by Peter Krempa 18 Jun '19

18 Jun '19

This is a follow up to the series for dropping qemu command line parsing. This fixes the qemu driver documentation. Note that the patches removing the outdated examples can be skipped if we wish to keep them around. I did not see a point in doing so though. Peter Krempa (5): docs: drvqemu: Clarify caveats of domxml-to-native docs: drvqemu: Remove outdated example of virsh domxml-from-native docs: css: Add style for ... docs: drvqemu: Add note about deprecation of domxml-from-native docs: drvqemu: Drop old example for domxml-to-native docs/drvqemu.html.in | 77 +++++--------------------------------------- docs/libvirt.css | 6 ++++ 2 files changed, 14 insertions(+), 69 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH] test_driver: implement virNetworkGetDHCPLeases
by Ilias Stamatis 18 Jun '19

18 Jun '19

Return infinite time DHCP leases for fixed IPV4 addresses. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 118 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..b7f8f6ecf2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3831,6 +3831,123 @@ testNetworkSetAutostart(virNetworkPtr net, } +static int +testNetworkGetDHCPLeases(virNetworkPtr net, + const char *mac, + virNetworkDHCPLeasePtr **leases, + unsigned int flags) +{ + int ret = -1; + int ndomains = 0; + size_t i, j; + size_t nleases = 0; + bool need_results = !!leases; + char *hostname = NULL; + char mac_str[VIR_MAC_STRING_BUFLEN]; + virMacAddr mac_addr; + virDomainObjPtr vm = NULL; + virDomainPtr *domains = NULL; + virDomainNetDefPtr inf = NULL; + virNetworkObjPtr obj = NULL; + virNetworkDefPtr obj_def = NULL; + virNetworkDHCPLeasePtr lease = NULL; + virNetworkDHCPLeasePtr *leases_ret = NULL; + testDriverPtr privconn = net->conn->privateData; + + virCheckFlags(0, -1); + + if (mac && virMacAddrParse(mac, &mac_addr) < 0) { + virReportError(VIR_ERR_INVALID_MAC, "%s", mac); + return -1; + } + + if (!(obj = testNetworkObjFindByName(privconn, net->name))) + goto cleanup; + obj_def = virNetworkObjGetDef(obj); + + ndomains = virDomainObjListExport(privconn->domains, net->conn, &domains, + NULL, VIR_CONNECT_LIST_DOMAINS_ACTIVE); + if (ndomains < 0) + goto cleanup; + + for (i = 0; i < ndomains; i++) { + /* the following must be called before testDomObjFromDomain */ + hostname = testDomainGetHostname(domains[i], 0); + + if (!(vm = testDomObjFromDomain(domains[i]))) + continue; + + for (j = 0; j < vm->def->nnets; j++) { + inf = vm->def->nets[j]; + if (STRNEQ(inf->data.network.name, obj_def->name)) + continue; + + virMacAddrFormat(&inf->mac, mac_str); + if (mac && virMacAddrCompare(mac, mac_str)) + continue; + + if (!need_results) { + nleases++; + continue; + } + + if (VIR_ALLOC(lease) < 0) + goto error; + + /* the lease is for infinite time */ + lease->expirytime = 0; + + if ((VIR_STRDUP(lease->mac, mac_str) < 0) || + (VIR_STRDUP(lease->iface, obj_def->bridge) < 0) || + (VIR_STRDUP(lease->hostname, hostname) < 0)) + goto error; + + lease->prefix = 24; + lease->type = VIR_IP_ADDR_TYPE_IPV4; + if (virAsprintf(&lease->ipaddr, "192.168.0.%zu", 1 + j) < 0) + goto error; + + lease->iaid = lease->clientid = NULL; + + if (VIR_INSERT_ELEMENT(leases_ret, nleases, nleases, lease) < 0) + goto error; + } + + VIR_FREE(hostname); + virDomainObjEndAPI(&vm); + } + + if (leases_ret) { + /* NULL terminated array */ + ignore_value(VIR_REALLOC_N(leases_ret, nleases + 1)); + VIR_STEAL_PTR(*leases, leases_ret); + } + + ret = nleases; + + cleanup: + for (i = 0; i < ndomains; i++) + virDomainFree(domains[i]); + VIR_FREE(domains); + + VIR_FREE(hostname); + virNetworkObjEndAPI(&obj); + return ret; + + error: + VIR_FREE(lease); + + if (leases_ret) { + for (i = 0; i < nleases; i++) + virNetworkDHCPLeaseFree(leases_ret[i]); + VIR_FREE(leases_ret); + } + + virDomainObjEndAPI(&vm); + goto cleanup; +} + + /* * Physical host interface routines */ @@ -7114,6 +7231,7 @@ static virNetworkDriver testNetworkDriver = { .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ .networkGetAutostart = testNetworkGetAutostart, /* 0.3.2 */ .networkSetAutostart = testNetworkSetAutostart, /* 0.3.2 */ + .networkGetDHCPLeases = testNetworkGetDHCPLeases, /* 5.5.0 */ .networkIsActive = testNetworkIsActive, /* 0.7.3 */ .networkIsPersistent = testNetworkIsPersistent, /* 0.7.3 */ }; -- 2.21.0

3 4

[libvirt] [PATCH v3] Produce more verbose error if cppi not found
by Michal Privoznik 18 Jun '19

18 Jun '19

It's fairly easy (especially for new contributors) to not spot the 'cppi not installed' line in the syntax-check output. Turn it into a banner that is more visible and at the same time add it as a build dependency. Unfortunately, RHEL doesn't ship cppi so we can add the dependency only for Fedora. Since it's v1 this has effectively became code copied over from Andrea's review suggestions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 5 +++++ libvirt.spec.in | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/cfg.mk b/cfg.mk index 5074ef611a..c0c240b2c0 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1145,6 +1145,11 @@ ifneq ($(_gl-Makefile),) syntax-check: spacing-check test-wrap-argv \ prohibit-duplicate-header mock-noinline group-qemu-caps \ header-ifdef + @if ! cppi --version >/dev/null 2>&1; then \ + echo "*****************************************************" >&2; \ + echo "* cppi not installed, some checks have been skipped *" >&2; \ + echo "*****************************************************" >&2; \ + fi endif # Don't include duplicate header in the source (either *.c or *.h) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3b5b4925fd..7019488711 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -271,6 +271,10 @@ BuildRequires: perl %endif BuildRequires: %{python} BuildRequires: systemd-units +# For 'make syntax-check' +%if 0%{?fedora} +BuildRequires: cppi +%endif %if %{with_libxl} BuildRequires: xen-devel %endif -- 2.21.0

3 4

[libvirt] [PATCH] test_driver: implement virDomainInterfaceAddresses
by Ilias Stamatis 17 Jun '19

17 Jun '19

Ignore @source in the case of the test driver and return fixed private IPv4 addresses for all the interfaces defined in the domain. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- The default config of the test driver has no guest interfaces defined, so this must be tested with a custom config. Maybe it would be a good idea to add one or more guest interfaces in the default config. I could send an additional patch for this. src/test/test_driver.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a4c17ef0df..3a81f51a88 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3220,6 +3220,76 @@ static int testDomainBlockStats(virDomainPtr domain, return ret; } +static int +testDomainInterfaceAddresses(virDomainPtr dom, + virDomainInterfacePtr **ifaces, + unsigned int source ATTRIBUTE_UNUSED, + unsigned int flags) +{ + size_t i; + size_t ifaces_count = 0; + int ret = -1; + char ipaddr[32]; + char macaddr[VIR_MAC_STRING_BUFLEN]; + virDomainObjPtr vm = NULL; + virDomainInterfacePtr iface = NULL; + virDomainInterfacePtr *ifaces_ret = NULL; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + if (VIR_ALLOC_N(ifaces_ret, vm->def->nnets) < 0) + goto cleanup; + + for (i = 0; i < vm->def->nnets; i++) { + if (VIR_ALLOC(iface) < 0) + goto cleanup; + + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) + goto cleanup; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) + goto cleanup; + + if (VIR_ALLOC(iface->addrs) < 0) + goto cleanup; + + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; + iface->addrs[0].prefix = 24; + + sprintf(ipaddr, "192.168.0.%ld", 100 + (i % 155)); + if (VIR_STRDUP(iface->addrs[0].addr, ipaddr) < 0) + goto cleanup; + + iface->naddrs = 1; + + VIR_STEAL_PTR(ifaces_ret[i], iface); + ifaces_count++; + } + + VIR_STEAL_PTR(*ifaces, ifaces_ret); + ret = ifaces_count; + + cleanup: + virDomainObjEndAPI(&vm); + + if (ifaces_ret) { + for (i = 0; i < ifaces_count; i++) + virDomainInterfaceFree(ifaces_ret[i]); + } + virDomainInterfaceFree(iface); + + VIR_FREE(ifaces_ret); + + return ret; +} + static int testDomainInterfaceStats(virDomainPtr domain, const char *device, @@ -6876,6 +6946,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSetSchedulerParameters = testDomainSetSchedulerParameters, /* 0.3.2 */ .domainSetSchedulerParametersFlags = testDomainSetSchedulerParametersFlags, /* 0.9.2 */ .domainBlockStats = testDomainBlockStats, /* 0.7.0 */ + .domainInterfaceAddresses = testDomainInterfaceAddresses, /* 5.4.0 */ .domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */ .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */ .connectDomainEventRegister = testConnectDomainEventRegister, /* 0.6.0 */ -- 2.21.0

3 5

[libvirt] [PATCH] docs: fix some typos in networkport documentation
by Ján Tomko 17 Jun '19

17 Jun '19

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/formatdomain.html.in | 4 ++-- docs/formatnetworkport.html.in | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 73a9cb6205..cf585d8e99 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5310,12 +5310,12 @@ connections. Since 0.9.4. - When a guest is running and interface of type <code>network</code> + When a guest is running an interface of type <code>network</code> may include a <code>portid</code> attribute. This provides the UUID of an associated virNetworkPortPtr object that records the association between the domain interface and the network. This attribute is read-only since port objects are create and deleted automatically - during startup and shutdown. Since 5.1.0/ + during startup and shutdown. Since 5.1.0 Also, similar to <code>direct</code> network connections diff --git a/docs/formatnetworkport.html.in b/docs/formatnetworkport.html.in index 554e5c65fc..0425e069ce 100644 --- a/docs/formatnetworkport.html.in +++ b/docs/formatnetworkport.html.in @@ -9,8 +9,8 @@ This page provides an introduction to the network port XML format. - This stores information about the connection between an virtual - interface on a virtual domain's, and the virtual network it is + This stores information about the connection between a virtual + interface of a virtual domain, and the virtual network it is attached to. @@ -73,7 +73,7 @@ <h3><a id="elementsCommon">Common elements</a></h3> - The following elements are common to one of more of the plug + The following elements are common to one or more of the plug types listed later @@ -96,7 +96,7 @@ The <code>bandwidth</code> element and its child elements are described in the <a href="formatnetwork.html#elementQoS">QoS</a> section of the Network XML. In addition the <code>classID</code> attribute may - exist provide the ID of the traffic shaping class that is active. + exist to provide the ID of the traffic shaping class that is active. </dd> <dt><code>rxfilters</code></dt> <dd>The <code>rxfilters</code> element property @@ -136,7 +136,7 @@ <pre> ... - <plug type='network' bridge='virbr0'> + <plug type='network' bridge='virbr0'/> ...</pre> @@ -154,7 +154,7 @@ <pre> ... - <plug type='bridge' bridge='br2'> + <plug type='bridge' bridge='br2'/> ...</pre> -- 2.19.2

2 1

[libvirt] [PATCH v2] Produce more verbose error if cppi not found
by Michal Privoznik 17 Jun '19

17 Jun '19

It's fairly easy (especially for new contributors) to not spot the 'cppi not installed' line in the syntax-check output. Turn it into a banner that is more visible and at the same time add it as a build dependency. Unfortunately, RHEL doesn't ship cppi so we can add the dependency only for Fedora. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - Instead of requiring cppi, produce more visible error - Require cppi in specfile cfg.mk | 9 +++++++-- libvirt.spec.in | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5074ef611a..2ee860a2c5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -695,6 +695,11 @@ sc_require_whitespace_in_translation: { echo '$(ME): missing whitespace at line split' 1>&2; \ exit 1; } || : +cppi_banner = \ + " *****************************************************\n" \ + "* cppi not installed, some checks have been skipped *\n" \ + "*****************************************************" + # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: @if cppi --version >/dev/null 2>&1; then \ @@ -702,7 +707,7 @@ sc_preprocessor_indentation: || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ exit 1; }; \ else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ + echo -e "$(ME): skipping test $@:\n"$(cppi_banner) 1>&2; \ fi # Enforce similar spec file indentation style, by running cppi on a @@ -719,7 +724,7 @@ sc_spec_indentation: || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ exit 1; }; \ else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ + echo -e "$(ME): skipping test $@:\n"$(cppi_banner) 1>&2; \ fi # Nested conditionals are easier to understand if we enforce that endifs diff --git a/libvirt.spec.in b/libvirt.spec.in index 59a2a0cb24..1a9e92c4bc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -271,6 +271,10 @@ BuildRequires: perl %endif BuildRequires: %{python} BuildRequires: systemd-units +# For 'make syntax-check' +%if 0%{?fedora} +BuildRequires: cppi +%endif %if %{with_libxl} BuildRequires: xen-devel %endif -- 2.21.0

2 2

[libvirt] [PATCH] virpcitest: Separate two functions properly
by Michal Privoznik 17 Jun '19

17 Jun '19

There is a missing empty line between two functions since its introduction in v1.2.0-rc1~150. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. tests/virpcimock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 7f9cdaa9b8..beb5e1490d 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -696,6 +696,7 @@ pci_driver_handle_unbind(const char *path) cleanup: return ret; } + static int pci_driver_handle_new_id(const char *path) { -- 2.21.0

1 0

[libvirt] [PATCH v4 0/3] numa: deprecate '-numa node, mem' and default memory distribution
by Igor Mammedov 17 Jun '19

17 Jun '19

Changes since v3: - simplify series by dropping idea of showing property values in "qom-list-properties" and use MachineInfo in QAPI schema instead Changes since v2: - taking in account previous review, implement a way for mgmt to intospect if '-numa node,mem' is supported by machine type as suggested by Daniel at https://www.mail-archive.com/qemu-devel@nongnu.org/msg601220.html * ammend "qom-list-properties" to show property values * add "numa-mem-supported" machine property to reflect if '-numa node,mem=SZ' is supported. It culd be used with '-machine none' or at runtime with --preconfig before numa memory mapping are configured * minor fixes to deprecation documentation mentioning "numa-mem-supported" property 1) "I'm considering to deprecating -mem-path/prealloc CLI options and replacing them with a single memdev Machine property to allow interested users to pick used backend for initial RAM (fixes mixed -mem-path+hostmem backends issues) and as a transition step to modeling initial RAM as a Device instead of (ab)using MemoryRegion APIs." (for more details see: https://www.mail-archive.com/qemu-devel@nongnu.org/msg596314.html) However there is a couple of roadblocks on the way (s390x and numa memory handling). I think I finally thought out a way to hack s390x in migration compatible manner, but I don't see any way to do it for -numa node,mem and default RAM assignement to nodes. Considering both numa usecases aren't meaningfully using NUMA (aside guest side testing) and could be replaced with explicitly used memdev parameter, I'd like to propose removing these fake NUMA friends on new machine types, hence this deprecation. And once the last machie type that supported the option is removed we would be able to remove option altogether. As result of removing deprecated options and replacing initial RAM allocation with 'memdev's (1), QEMU will allocate guest RAM in consistent way, fixing mixed use-case and allowing boards to move towards modelling initial RAM as Device(s). Which in its own turn should allow to cleanup NUMA/HMP/memory accounting code more by dropping ad-hoc node_mem tracking and reusing memory device enumeration instead. Reference to previous versions: * https://www.mail-archive.com/qemu-devel@nongnu.org/msg617694.html CC: libvir-list(a)redhat.com CC: ehabkost(a)redhat.com CC: pbonzini(a)redhat.com CC: berrange(a)redhat.com CC: armbru(a)redhat.com Igor Mammedov (3): machine: show if CLI option '-numa node,mem' is supported in QAPI schema numa: deprecate 'mem' parameter of '-numa node' option numa: deprecate implict memory distribution between nodes include/hw/boards.h | 3 +++ hw/arm/virt.c | 1 + hw/i386/pc.c | 1 + hw/ppc/spapr.c | 1 + numa.c | 5 +++++ qapi/misc.json | 5 ++++- qemu-deprecated.texi | 24 ++++++++++++++++++++++++ vl.c | 1 + 8 files changed, 40 insertions(+), 1 deletion(-) -- 2.7.4

4 15

[libvirt] [PATCH] build: Require cppi for syntax-check
by Michal Privoznik 17 Jun '19

17 Jun '19

Since its introduction in v0.8.0~314 we allowed for cppi to be not present for 'syntax-check' because the package did exist in Fedora Core 12. Well, we don't care anymore ¯\_(ツ)_/¯ All recent distros have it. Moreover, it's fairly easy to miss 'cppi not installed' message in sea of syntax-check output (esp. for newbies who probably benefit from it the most). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5074ef611a..dd0a177fb3 100644 --- a/cfg.mk +++ b/cfg.mk @@ -697,30 +697,22 @@ sc_require_whitespace_in_translation: # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: - @if cppi --version >/dev/null 2>&1; then \ - $(VC_LIST_EXCEPT) | $(GREP) -E '\.[ch](\.in)?$$' | xargs cppi -a -c \ - || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ - exit 1; }; \ - else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ - fi + @$(VC_LIST_EXCEPT) | $(GREP) -E '\.[ch](\.in)?$$' | xargs cppi -a -c \ + || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ + exit 1; }; # Enforce similar spec file indentation style, by running cppi on a # (comment-only) C file that mirrors the same layout as the spec file. sc_spec_indentation: - @if cppi --version >/dev/null 2>&1; then \ - for f in $$($(VC_LIST_EXCEPT) | $(GREP) '\.spec\.in$$'); do \ - $(SED) -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ - -e 's/%$else\|endif\|define$/#\1/' \ - -e 's/^$ *$\1\1\1#/#\1/' \ - -e 's|^$ *[^#/ ]$|// \1|; s|^$ */[^/]$|// \1|' $$f \ - | cppi -a -c 2>&1 | $(SED) "s|standard input|$$f|"; \ - done | { if $(GREP) . >&2; then false; else :; fi; } \ - || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ - exit 1; }; \ - else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ - fi + @for f in $$($(VC_LIST_EXCEPT) | $(GREP) '\.spec\.in$$'); do \ + $(SED) -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ + -e 's/%$else\|endif\|define$/#\1/' \ + -e 's/^$ *$\1\1\1#/#\1/' \ + -e 's|^$ *[^#/ ]$|// \1|; s|^$ */[^/]$|// \1|' $$f \ + | cppi -a -c 2>&1 | $(SED) "s|standard input|$$f|"; \ + done | { if $(GREP) . >&2; then false; else :; fi; } \ + || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ + exit 1; }; # Nested conditionals are easier to understand if we enforce that endifs # can be paired back to the if -- 2.21.0

6 7

[libvirt] [PATCH 0/7] Validate spapr-vio addresses as 32-bit
by Andrea Bolognani 17 Jun '19

17 Jun '19

An alternative take on David Gibson's patch https://www.redhat.com/archives/libvir-list/2019-June/msg00061.html from earlier this month. Andrea Bolognani (7): docs: Fix validation of spapr-vio addresses qemu: Rework qemuDomainDeviceDefValidateAddress() qemu: Validate spapr-vio addresses tests: Add pseries-spaprvio-invalid conf: Format spapr-vio addresses as 32-bit qemu: Format spapr-vio addresses as 32-bit docs: Update documentation for spapr-vio addresses docs/formatdomain.html.in | 6 +-- docs/schemas/domaincommon.rng | 2 +- src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 41 ++++++++++++++++++- tests/qemuargv2xmldata/nomachine-ppc64.xml | 2 +- tests/qemuargv2xmldata/pseries-disk.xml | 2 +- tests/qemuargv2xmldata/pseries-nvram.xml | 2 +- .../disk-scsi.x86_64-latest.args | 2 +- .../pseries-spaprvio-invalid.xml | 17 ++++++++ .../pseries-vio-user-assigned.args | 2 +- tests/qemuxml2argvdata/pseries-vio.args | 4 +- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-scsi.xml | 2 +- tests/qemuxml2xmloutdata/pseries-nvram.xml | 2 +- 15 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/pseries-spaprvio-invalid.xml -- 2.21.0

2 8

[libvirt] [PATCH 0/3] docs: storage: document 'lvm2' disk fun
by Ján Tomko 17 Jun '19

17 Jun '19

Ján Tomko (3): docs: storage: fix spacing when enumerating volume formats docs: storage: type out two docs: storage: document the 'lvm2' disk format oddness docs/storage.html.in | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 2.20.1

2 4

[libvirt] [RFC PATCH 0/5] qemu: drop command line parsing
by Peter Krempa 17 Jun '19

17 Jun '19

All the code is mostly outdated and does not really help in most cases. Since this was already proposed and I did not see anything against here are the patches. As a follow up I'll refactor and move the rest of qemu_parse_command.c once this is out of the way. you can fetch this by git fetch https://github.com/pipo/libvirt.git parse-command-delete Peter Krempa (5): qemu: driver: Drop support for qemu-attach qemu: parse: Drop qemuParseCommandLinePid and friends qemu: driver: Remove support for native->XML conversion tests: Drop qemuargv2xmltest qemu: parse: Drop unused qemu command line parsing infrastructure src/check-aclrules.pl | 1 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 125 +- src/qemu/qemu_parse_command.c | 2714 +---------------- src/qemu/qemu_parse_command.h | 23 - tests/Makefile.am | 11 +- tests/qemuargv2xmldata/boot-cdrom.args | 22 - tests/qemuargv2xmldata/boot-cdrom.xml | 35 - tests/qemuargv2xmldata/boot-floppy.args | 23 - tests/qemuargv2xmldata/boot-floppy.xml | 41 - tests/qemuargv2xmldata/boot-network.args | 22 - tests/qemuargv2xmldata/boot-network.xml | 34 - tests/qemuargv2xmldata/clock-localtime.args | 23 - tests/qemuargv2xmldata/clock-localtime.xml | 34 - tests/qemuargv2xmldata/clock-utc.args | 22 - tests/qemuargv2xmldata/clock-utc.xml | 34 - tests/qemuargv2xmldata/console-compat.args | 22 - tests/qemuargv2xmldata/console-compat.xml | 42 - tests/qemuargv2xmldata/disk-cdrom-empty.args | 23 - tests/qemuargv2xmldata/disk-cdrom-empty.xml | 40 - tests/qemuargv2xmldata/disk-cdrom.args | 23 - tests/qemuargv2xmldata/disk-cdrom.xml | 41 - .../disk-drive-boot-cdrom.args | 23 - .../disk-drive-boot-cdrom.xml | 41 - .../disk-drive-boot-disk.args | 23 - .../qemuargv2xmldata/disk-drive-boot-disk.xml | 41 - .../disk-drive-cache-directsync.args | 24 - .../disk-drive-cache-directsync.xml | 41 - .../disk-drive-cache-unsafe.args | 24 - .../disk-drive-cache-unsafe.xml | 41 - .../disk-drive-cache-v2-none.args | 23 - .../disk-drive-cache-v2-none.xml | 41 - .../disk-drive-cache-v2-wb.args | 24 - .../disk-drive-cache-v2-wb.xml | 41 - .../disk-drive-cache-v2-wt.args | 24 - .../disk-drive-cache-v2-wt.xml | 41 - .../disk-drive-error-policy-enospace.args | 24 - .../disk-drive-error-policy-enospace.xml | 41 - .../disk-drive-error-policy-stop.args | 24 - .../disk-drive-error-policy-stop.xml | 41 - ...sk-drive-error-policy-wreport-rignore.args | 24 - ...isk-drive-error-policy-wreport-rignore.xml | 41 - .../qemuargv2xmldata/disk-drive-fmt-qcow.args | 23 - .../qemuargv2xmldata/disk-drive-fmt-qcow.xml | 41 - .../disk-drive-network-gluster.args | 25 - .../disk-drive-network-gluster.xml | 41 - .../disk-drive-network-iscsi-auth.args | 25 - .../disk-drive-network-iscsi-auth.xml | 44 - .../disk-drive-network-iscsi.args | 25 - .../disk-drive-network-iscsi.xml | 41 - .../disk-drive-network-nbd-export.args | 23 - .../disk-drive-network-nbd-export.xml | 42 - .../disk-drive-network-nbd-ipv6-export.args | 23 - .../disk-drive-network-nbd-ipv6-export.xml | 42 - .../disk-drive-network-nbd-ipv6.args | 23 - .../disk-drive-network-nbd-ipv6.xml | 42 - .../disk-drive-network-nbd-unix.args | 23 - .../disk-drive-network-nbd-unix.xml | 42 - .../disk-drive-network-nbd.args | 23 - .../disk-drive-network-nbd.xml | 42 - .../disk-drive-network-rbd-auth.args | 26 - .../disk-drive-network-rbd-auth.xml | 47 - .../disk-drive-network-rbd-ceph-env.args | 25 - .../disk-drive-network-rbd-ceph-env.xml | 44 - .../disk-drive-network-rbd-ipv6.args | 25 - .../disk-drive-network-rbd-ipv6.xml | 45 - .../disk-drive-network-rbd.args | 29 - .../disk-drive-network-rbd.xml | 72 - .../disk-drive-network-sheepdog.args | 23 - .../disk-drive-network-sheepdog.xml | 42 - tests/qemuargv2xmldata/disk-floppy.args | 24 - tests/qemuargv2xmldata/disk-floppy.xml | 47 - tests/qemuargv2xmldata/disk-many.args | 25 - tests/qemuargv2xmldata/disk-many.xml | 52 - tests/qemuargv2xmldata/disk-usb.args | 23 - tests/qemuargv2xmldata/disk-usb.xml | 39 - tests/qemuargv2xmldata/disk-virtio.args | 25 - tests/qemuargv2xmldata/disk-virtio.xml | 53 - .../graphics-sdl-fullscreen.args | 25 - .../graphics-sdl-fullscreen.xml | 39 - tests/qemuargv2xmldata/graphics-sdl.args | 24 - tests/qemuargv2xmldata/graphics-sdl.xml | 39 - .../qemuargv2xmldata/graphics-vnc-policy.args | 23 - .../qemuargv2xmldata/graphics-vnc-policy.xml | 41 - tests/qemuargv2xmldata/graphics-vnc-sasl.args | 24 - tests/qemuargv2xmldata/graphics-vnc-sasl.xml | 41 - .../qemuargv2xmldata/graphics-vnc-socket.args | 23 - .../qemuargv2xmldata/graphics-vnc-socket.xml | 41 - tests/qemuargv2xmldata/graphics-vnc-tls.args | 24 - tests/qemuargv2xmldata/graphics-vnc-tls.xml | 41 - .../graphics-vnc-websocket.args | 22 - .../graphics-vnc-websocket.xml | 32 - tests/qemuargv2xmldata/graphics-vnc.args | 23 - tests/qemuargv2xmldata/graphics-vnc.xml | 41 - .../qemuargv2xmldata/hostdev-pci-address.args | 23 - .../qemuargv2xmldata/hostdev-pci-address.xml | 40 - .../qemuargv2xmldata/hostdev-usb-address.args | 23 - .../qemuargv2xmldata/hostdev-usb-address.xml | 39 - tests/qemuargv2xmldata/hyperv-panic.args | 21 - tests/qemuargv2xmldata/hyperv-panic.xml | 29 - tests/qemuargv2xmldata/hyperv.args | 21 - tests/qemuargv2xmldata/hyperv.xml | 33 - tests/qemuargv2xmldata/input-usbmouse.args | 23 - tests/qemuargv2xmldata/input-usbmouse.xml | 35 - tests/qemuargv2xmldata/input-usbtablet.args | 23 - tests/qemuargv2xmldata/input-usbtablet.xml | 35 - tests/qemuargv2xmldata/kvm-features.args | 21 - tests/qemuargv2xmldata/kvm-features.xml | 31 - tests/qemuargv2xmldata/kvmclock.args | 22 - tests/qemuargv2xmldata/kvmclock.xml | 30 - .../machine-aeskeywrap-off-argv.args | 18 - .../machine-aeskeywrap-off-argv.xml | 23 - .../machine-aeskeywrap-on-argv.args | 18 - .../machine-aeskeywrap-on-argv.xml | 23 - tests/qemuargv2xmldata/machine-core-off.args | 22 - tests/qemuargv2xmldata/machine-core-off.xml | 34 - tests/qemuargv2xmldata/machine-core-on.args | 22 - tests/qemuargv2xmldata/machine-core-on.xml | 34 - .../machine-deakeywrap-off-argv.args | 18 - .../machine-deakeywrap-off-argv.xml | 23 - .../machine-deakeywrap-on-argv.args | 18 - .../machine-deakeywrap-on-argv.xml | 23 - .../machine-keywrap-none-argv.args | 18 - .../machine-keywrap-none-argv.xml | 20 - .../qemuargv2xmldata/mem-scale-maxmemory.args | 22 - .../qemuargv2xmldata/mem-scale-maxmemory.xml | 38 - tests/qemuargv2xmldata/mem-scale.args | 22 - tests/qemuargv2xmldata/mem-scale.xml | 37 - tests/qemuargv2xmldata/migrate.args | 23 - tests/qemuargv2xmldata/migrate.xml | 34 - tests/qemuargv2xmldata/misc-acpi.args | 21 - tests/qemuargv2xmldata/misc-acpi.xml | 37 - tests/qemuargv2xmldata/misc-disable-s3.args | 23 - tests/qemuargv2xmldata/misc-disable-s3.xml | 37 - .../misc-disable-suspends.args | 24 - .../misc-disable-suspends.xml | 38 - tests/qemuargv2xmldata/misc-enable-s4.args | 23 - tests/qemuargv2xmldata/misc-enable-s4.xml | 37 - tests/qemuargv2xmldata/misc-no-reboot.args | 23 - tests/qemuargv2xmldata/misc-no-reboot.xml | 34 - tests/qemuargv2xmldata/misc-uuid.args | 21 - tests/qemuargv2xmldata/misc-uuid.xml | 37 - tests/qemuargv2xmldata/net-eth-ifname.args | 23 - tests/qemuargv2xmldata/net-eth-ifname.xml | 41 - tests/qemuargv2xmldata/net-eth.args | 23 - tests/qemuargv2xmldata/net-eth.xml | 40 - tests/qemuargv2xmldata/net-user.args | 23 - tests/qemuargv2xmldata/net-user.xml | 39 - tests/qemuargv2xmldata/net-virtio.args | 23 - tests/qemuargv2xmldata/net-virtio.xml | 39 - .../nographics-vga-display.args | 23 - .../nographics-vga-display.xml | 34 - tests/qemuargv2xmldata/nographics-vga.args | 23 - tests/qemuargv2xmldata/nographics-vga.xml | 34 - tests/qemuargv2xmldata/nomachine-ppc64.args | 11 - tests/qemuargv2xmldata/nomachine-ppc64.xml | 50 - tests/qemuargv2xmldata/nomachine-x86_64.args | 11 - tests/qemuargv2xmldata/nomachine-x86_64.xml | 49 - tests/qemuargv2xmldata/nosharepages.args | 22 - tests/qemuargv2xmldata/nosharepages.xml | 37 - tests/qemuargv2xmldata/parallel-tcp.args | 22 - tests/qemuargv2xmldata/parallel-tcp.xml | 39 - tests/qemuargv2xmldata/pseries-disk.args | 18 - tests/qemuargv2xmldata/pseries-disk.xml | 50 - tests/qemuargv2xmldata/pseries-nvram.args | 22 - tests/qemuargv2xmldata/pseries-nvram.xml | 30 - tests/qemuargv2xmldata/qemu-ns-no-env.args | 23 - tests/qemuargv2xmldata/qemu-ns-no-env.xml | 38 - .../reboot-timeout-disabled.args | 21 - .../reboot-timeout-disabled.xml | 26 - .../reboot-timeout-enabled.args | 21 - .../reboot-timeout-enabled.xml | 26 - tests/qemuargv2xmldata/restore-v2.args | 23 - tests/qemuargv2xmldata/restore-v2.xml | 34 - tests/qemuargv2xmldata/serial-dev.args | 22 - tests/qemuargv2xmldata/serial-dev.xml | 44 - tests/qemuargv2xmldata/serial-file.args | 22 - tests/qemuargv2xmldata/serial-file.xml | 44 - tests/qemuargv2xmldata/serial-many.args | 23 - tests/qemuargv2xmldata/serial-many.xml | 48 - tests/qemuargv2xmldata/serial-pty.args | 22 - tests/qemuargv2xmldata/serial-pty.xml | 42 - tests/qemuargv2xmldata/serial-tcp-telnet.args | 22 - tests/qemuargv2xmldata/serial-tcp-telnet.xml | 46 - tests/qemuargv2xmldata/serial-tcp.args | 22 - tests/qemuargv2xmldata/serial-tcp.xml | 46 - tests/qemuargv2xmldata/serial-udp.args | 23 - tests/qemuargv2xmldata/serial-udp.xml | 52 - tests/qemuargv2xmldata/serial-unix.args | 22 - tests/qemuargv2xmldata/serial-unix.xml | 44 - tests/qemuargv2xmldata/serial-vc.args | 22 - tests/qemuargv2xmldata/serial-vc.xml | 42 - tests/qemuargv2xmldata/smp.args | 22 - tests/qemuargv2xmldata/smp.xml | 37 - tests/qemuargv2xmldata/sound.args | 23 - tests/qemuargv2xmldata/sound.xml | 42 - tests/qemuargv2xmldata/watchdog.args | 24 - tests/qemuargv2xmldata/watchdog.xml | 35 - tests/qemuargv2xmltest.c | 323 -- tests/virschematest.c | 2 +- 200 files changed, 18 insertions(+), 9093 deletions(-) delete mode 100644 tests/qemuargv2xmldata/boot-cdrom.args delete mode 100644 tests/qemuargv2xmldata/boot-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/boot-floppy.args delete mode 100644 tests/qemuargv2xmldata/boot-floppy.xml delete mode 100644 tests/qemuargv2xmldata/boot-network.args delete mode 100644 tests/qemuargv2xmldata/boot-network.xml delete mode 100644 tests/qemuargv2xmldata/clock-localtime.args delete mode 100644 tests/qemuargv2xmldata/clock-localtime.xml delete mode 100644 tests/qemuargv2xmldata/clock-utc.args delete mode 100644 tests/qemuargv2xmldata/clock-utc.xml delete mode 100644 tests/qemuargv2xmldata/console-compat.args delete mode 100644 tests/qemuargv2xmldata/console-compat.xml delete mode 100644 tests/qemuargv2xmldata/disk-cdrom-empty.args delete mode 100644 tests/qemuargv2xmldata/disk-cdrom-empty.xml delete mode 100644 tests/qemuargv2xmldata/disk-cdrom.args delete mode 100644 tests/qemuargv2xmldata/disk-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-cdrom.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-disk.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-disk.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-directsync.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-unsafe.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-none.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-stop.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-fmt-qcow.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-gluster.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-gluster.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-export.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-sheepdog.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml delete mode 100644 tests/qemuargv2xmldata/disk-floppy.args delete mode 100644 tests/qemuargv2xmldata/disk-floppy.xml delete mode 100644 tests/qemuargv2xmldata/disk-many.args delete mode 100644 tests/qemuargv2xmldata/disk-many.xml delete mode 100644 tests/qemuargv2xmldata/disk-usb.args delete mode 100644 tests/qemuargv2xmldata/disk-usb.xml delete mode 100644 tests/qemuargv2xmldata/disk-virtio.args delete mode 100644 tests/qemuargv2xmldata/disk-virtio.xml delete mode 100644 tests/qemuargv2xmldata/graphics-sdl-fullscreen.args delete mode 100644 tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml delete mode 100644 tests/qemuargv2xmldata/graphics-sdl.args delete mode 100644 tests/qemuargv2xmldata/graphics-sdl.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-policy.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-policy.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-sasl.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-sasl.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-socket.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-socket.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-tls.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-tls.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-websocket.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-websocket.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc.xml delete mode 100644 tests/qemuargv2xmldata/hostdev-pci-address.args delete mode 100644 tests/qemuargv2xmldata/hostdev-pci-address.xml delete mode 100644 tests/qemuargv2xmldata/hostdev-usb-address.args delete mode 100644 tests/qemuargv2xmldata/hostdev-usb-address.xml delete mode 100644 tests/qemuargv2xmldata/hyperv-panic.args delete mode 100644 tests/qemuargv2xmldata/hyperv-panic.xml delete mode 100644 tests/qemuargv2xmldata/hyperv.args delete mode 100644 tests/qemuargv2xmldata/hyperv.xml delete mode 100644 tests/qemuargv2xmldata/input-usbmouse.args delete mode 100644 tests/qemuargv2xmldata/input-usbmouse.xml delete mode 100644 tests/qemuargv2xmldata/input-usbtablet.args delete mode 100644 tests/qemuargv2xmldata/input-usbtablet.xml delete mode 100644 tests/qemuargv2xmldata/kvm-features.args delete mode 100644 tests/qemuargv2xmldata/kvm-features.xml delete mode 100644 tests/qemuargv2xmldata/kvmclock.args delete mode 100644 tests/qemuargv2xmldata/kvmclock.xml delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-core-off.args delete mode 100644 tests/qemuargv2xmldata/machine-core-off.xml delete mode 100644 tests/qemuargv2xmldata/machine-core-on.args delete mode 100644 tests/qemuargv2xmldata/machine-core-on.xml delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-keywrap-none-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-keywrap-none-argv.xml delete mode 100644 tests/qemuargv2xmldata/mem-scale-maxmemory.args delete mode 100644 tests/qemuargv2xmldata/mem-scale-maxmemory.xml delete mode 100644 tests/qemuargv2xmldata/mem-scale.args delete mode 100644 tests/qemuargv2xmldata/mem-scale.xml delete mode 100644 tests/qemuargv2xmldata/migrate.args delete mode 100644 tests/qemuargv2xmldata/migrate.xml delete mode 100644 tests/qemuargv2xmldata/misc-acpi.args delete mode 100644 tests/qemuargv2xmldata/misc-acpi.xml delete mode 100644 tests/qemuargv2xmldata/misc-disable-s3.args delete mode 100644 tests/qemuargv2xmldata/misc-disable-s3.xml delete mode 100644 tests/qemuargv2xmldata/misc-disable-suspends.args delete mode 100644 tests/qemuargv2xmldata/misc-disable-suspends.xml delete mode 100644 tests/qemuargv2xmldata/misc-enable-s4.args delete mode 100644 tests/qemuargv2xmldata/misc-enable-s4.xml delete mode 100644 tests/qemuargv2xmldata/misc-no-reboot.args delete mode 100644 tests/qemuargv2xmldata/misc-no-reboot.xml delete mode 100644 tests/qemuargv2xmldata/misc-uuid.args delete mode 100644 tests/qemuargv2xmldata/misc-uuid.xml delete mode 100644 tests/qemuargv2xmldata/net-eth-ifname.args delete mode 100644 tests/qemuargv2xmldata/net-eth-ifname.xml delete mode 100644 tests/qemuargv2xmldata/net-eth.args delete mode 100644 tests/qemuargv2xmldata/net-eth.xml delete mode 100644 tests/qemuargv2xmldata/net-user.args delete mode 100644 tests/qemuargv2xmldata/net-user.xml delete mode 100644 tests/qemuargv2xmldata/net-virtio.args delete mode 100644 tests/qemuargv2xmldata/net-virtio.xml delete mode 100644 tests/qemuargv2xmldata/nographics-vga-display.args delete mode 100644 tests/qemuargv2xmldata/nographics-vga-display.xml delete mode 100644 tests/qemuargv2xmldata/nographics-vga.args delete mode 100644 tests/qemuargv2xmldata/nographics-vga.xml delete mode 100644 tests/qemuargv2xmldata/nomachine-ppc64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-ppc64.xml delete mode 100644 tests/qemuargv2xmldata/nomachine-x86_64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-x86_64.xml delete mode 100644 tests/qemuargv2xmldata/nosharepages.args delete mode 100644 tests/qemuargv2xmldata/nosharepages.xml delete mode 100644 tests/qemuargv2xmldata/parallel-tcp.args delete mode 100644 tests/qemuargv2xmldata/parallel-tcp.xml delete mode 100644 tests/qemuargv2xmldata/pseries-disk.args delete mode 100644 tests/qemuargv2xmldata/pseries-disk.xml delete mode 100644 tests/qemuargv2xmldata/pseries-nvram.args delete mode 100644 tests/qemuargv2xmldata/pseries-nvram.xml delete mode 100644 tests/qemuargv2xmldata/qemu-ns-no-env.args delete mode 100644 tests/qemuargv2xmldata/qemu-ns-no-env.xml delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-disabled.args delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-disabled.xml delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-enabled.args delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-enabled.xml delete mode 100644 tests/qemuargv2xmldata/restore-v2.args delete mode 100644 tests/qemuargv2xmldata/restore-v2.xml delete mode 100644 tests/qemuargv2xmldata/serial-dev.args delete mode 100644 tests/qemuargv2xmldata/serial-dev.xml delete mode 100644 tests/qemuargv2xmldata/serial-file.args delete mode 100644 tests/qemuargv2xmldata/serial-file.xml delete mode 100644 tests/qemuargv2xmldata/serial-many.args delete mode 100644 tests/qemuargv2xmldata/serial-many.xml delete mode 100644 tests/qemuargv2xmldata/serial-pty.args delete mode 100644 tests/qemuargv2xmldata/serial-pty.xml delete mode 100644 tests/qemuargv2xmldata/serial-tcp-telnet.args delete mode 100644 tests/qemuargv2xmldata/serial-tcp-telnet.xml delete mode 100644 tests/qemuargv2xmldata/serial-tcp.args delete mode 100644 tests/qemuargv2xmldata/serial-tcp.xml delete mode 100644 tests/qemuargv2xmldata/serial-udp.args delete mode 100644 tests/qemuargv2xmldata/serial-udp.xml delete mode 100644 tests/qemuargv2xmldata/serial-unix.args delete mode 100644 tests/qemuargv2xmldata/serial-unix.xml delete mode 100644 tests/qemuargv2xmldata/serial-vc.args delete mode 100644 tests/qemuargv2xmldata/serial-vc.xml delete mode 100644 tests/qemuargv2xmldata/smp.args delete mode 100644 tests/qemuargv2xmldata/smp.xml delete mode 100644 tests/qemuargv2xmldata/sound.args delete mode 100644 tests/qemuargv2xmldata/sound.xml delete mode 100644 tests/qemuargv2xmldata/watchdog.args delete mode 100644 tests/qemuargv2xmldata/watchdog.xml delete mode 100644 tests/qemuargv2xmltest.c -- 2.21.0

3 12

[libvirt] [PATCH 00/12] tests: remove text monitor testing infrastructure
by Ján Tomko 17 Jun '19

17 Jun '19

Ján Tomko (12): tests: assume JSON monitor in qemuMonitorTestNewSimple tests: always assume JSON in qemuMonitorTestNew tests: qemuMonitorTestAddErrorResponse: use VIR_AUTOFREE tests: qemuMonitorTestProcessCommandDefaultValidate: simplify condition tests: assume JSON in qemuMonitorTestIO tests: qemuMonitorReportError: use tmp variable properly tests: remove text monitor testing infrastructure tests: qemuMonitorReportError: use VIR_AUTOFREE tests: refactor qemuMonitorTestProcessCommandDefault tests: refactor qemuMonitorTestProcessCommandDefaultValidate tests: qemuMonitorTestAddUnexpectedErrorResponse: VIR_AUTOFREE tests: qemuMonitorTestAddInvalidCommandResponse: VIR_AUTOFREE tests/qemuhotplugtest.c | 2 +- tests/qemumonitortestutils.c | 235 ++++++++++++----------------------- tests/qemumonitortestutils.h | 9 +- 3 files changed, 84 insertions(+), 162 deletions(-) -- 2.20.1

2 16

[libvirt] [PATCH 00/19] Use '#pragma once' in headers
by Jonathon Jongsma 14 Jun '19

14 Jun '19

Hi all, I'm trying to get up to speed with libvirt code, so I decided to start out with a slightly "mindless" task. I grabbed the '#pragma once' task from https://wiki.libvirt.org/page/BiteSizedTasks. This series covers the first part of the conversion. I chatted with Daniel Berrange briefly on IRC before starting, and he suggested that I should try to keep patches under 100k, and maybe each driver's source files as a single patch. I had a bit of difficulty deciding where to split the src/conf/ and src/util/ directories. So some of the files with more changes ended up being single-file patches. I tried to combine some related source files into patches, but at a certain point I ran out of obvious files to combine, so I combined a bunch of smaller miscellaneous files into one larger patch. It may not be ideal, but it's the best I could come up with. Alternative suggestions welcome. I'll follow up with the remaining changes if this division looks acceptable. Jonathon Jongsma (19): Use #pragma once in driver headers src/access: use #pragma once in headers src/admin: use #pragma once in headers src/bhyve: use #pragma once in headers conf: domain: use #pragma once in headers conf: network: use #pragma once in headers conf: nwfilter: use #pragma once in headers conf: node device: use #pragma once in headers conf: storage: use #pragma once in headers conf: misc: use #pragma once in headers src/cpu: use #pragma once in headers src/datatypes.h: use #pragma once src/esx: use #pragma once in headers src/hyperv: use #pragma once in headers src/interface: use #pragma once in headers src/internal.h: use #pragma once src/libvirt_internal.h: use #pragma once src/libxl: use #pragma once in headers src/logging: use #pragma once in headers src/access/viraccessdriver.h | 10 +- src/access/viraccessdrivernop.h | 7 +- src/access/viraccessdriverpolkit.h | 7 +- src/access/viraccessdriverstack.h | 7 +- src/access/viraccessmanager.h | 26 +-- src/access/viraccessperm.h | 11 +- src/admin/admin_server.h | 9 +- src/admin/admin_server_dispatch.h | 11 +- src/bhyve/bhyve_capabilities.h | 11 +- src/bhyve/bhyve_command.h | 15 +- src/bhyve/bhyve_conf.h | 7 +- src/bhyve/bhyve_device.h | 11 +- src/bhyve/bhyve_domain.h | 11 +- src/bhyve/bhyve_driver.h | 9 +- src/bhyve/bhyve_monitor.h | 11 +- src/bhyve/bhyve_parse_command.h | 5 +- src/bhyve/bhyve_process.h | 7 +- src/bhyve/bhyve_utils.h | 31 ++- src/conf/capabilities.h | 23 +-- src/conf/cpu_conf.h | 23 +-- src/conf/device_conf.h | 33 ++- src/conf/domain_addr.h | 16 +- src/conf/domain_audit.h | 10 +- src/conf/domain_capabilities.h | 15 +- src/conf/domain_conf.h | 91 ++++----- src/conf/domain_event.h | 11 +- src/conf/domain_nwfilter.h | 5 +- src/conf/interface_conf.h | 23 +-- src/conf/moment_conf.h | 11 +- src/conf/netdev_bandwidth_conf.h | 15 +- src/conf/netdev_vlan_conf.h | 13 +- src/conf/netdev_vport_profile_conf.h | 14 +- src/conf/network_conf.h | 52 +++-- src/conf/network_event.h | 11 +- src/conf/networkcommon_conf.h | 17 +- src/conf/node_device_conf.h | 31 ++- src/conf/node_device_event.h | 11 +- src/conf/node_device_util.h | 7 +- src/conf/numa_conf.h | 18 +- src/conf/nwfilter_conf.h | 93 ++++----- src/conf/nwfilter_ipaddrmap.h | 5 +- src/conf/nwfilter_params.h | 28 ++- src/conf/object_event.h | 11 +- src/conf/object_event_private.h | 7 +- src/conf/secret_conf.h | 15 +- src/conf/secret_event.h | 11 +- src/conf/snapshot_conf.h | 13 +- src/conf/storage_adapter_conf.h | 11 +- src/conf/storage_capabilities.h | 8 +- src/conf/storage_conf.h | 41 ++-- src/conf/storage_event.h | 11 +- src/conf/virchrdev.h | 9 +- src/conf/virconftypes.h | 5 +- src/conf/virdomainmomentobjlist.h | 17 +- src/conf/virdomainobjlist.h | 21 +- src/conf/virdomainsnapshotobjlist.h | 21 +- src/conf/virinterfaceobj.h | 7 +- src/conf/virnetworkobj.h | 9 +- src/conf/virnodedeviceobj.h | 13 +- src/conf/virnwfilterbindingdef.h | 13 +- src/conf/virnwfilterbindingobj.h | 11 +- src/conf/virnwfilterbindingobjlist.h | 8 +- src/conf/virnwfilterobj.h | 11 +- src/conf/virsavecookie.h | 13 +- src/conf/virsecretobj.h | 11 +- src/conf/virstorageobj.h | 11 +- src/cpu/cpu.h | 19 +- src/cpu/cpu_arm.h | 7 +- src/cpu/cpu_map.h | 7 +- src/cpu/cpu_ppc64.h | 7 +- src/cpu/cpu_ppc64_data.h | 8 +- src/cpu/cpu_s390.h | 7 +- src/cpu/cpu_x86.h | 9 +- src/cpu/cpu_x86_data.h | 58 +++--- src/datatypes.h | 89 ++++---- src/driver-hypervisor.h | 12 +- src/driver-interface.h | 12 +- src/driver-network.h | 12 +- src/driver-nodedev.h | 12 +- src/driver-nwfilter.h | 12 +- src/driver-secret.h | 12 +- src/driver-state.h | 12 +- src/driver-storage.h | 12 +- src/driver-stream.h | 12 +- src/driver.h | 37 ++-- src/esx/esx_driver.h | 5 +- src/esx/esx_interface_driver.h | 7 +- src/esx/esx_network_driver.h | 7 +- src/esx/esx_private.h | 15 +- src/esx/esx_storage_backend_iscsi.h | 7 +- src/esx/esx_storage_backend_vmfs.h | 7 +- src/esx/esx_storage_driver.h | 7 +- src/esx/esx_stream.h | 9 +- src/esx/esx_util.h | 13 +- src/esx/esx_vi.h | 37 ++-- src/esx/esx_vi_methods.h | 11 +- src/esx/esx_vi_types.h | 13 +- src/hyperv/hyperv_driver.h | 5 +- src/hyperv/hyperv_private.h | 13 +- src/hyperv/hyperv_util.h | 9 +- src/hyperv/hyperv_wmi.h | 21 +- src/hyperv/hyperv_wmi_classes.h | 27 ++- src/hyperv/openwsman.h | 35 ++-- src/interface/interface_driver.h | 5 +- src/internal.h | 295 +++++++++++++-------------- src/libvirt_internal.h | 7 +- src/libxl/libxl_capabilities.h | 29 ++- src/libxl/libxl_conf.h | 101 +++++---- src/libxl/libxl_domain.h | 29 ++- src/libxl/libxl_driver.h | 5 +- src/libxl/libxl_logger.h | 7 +- src/libxl/libxl_migration.h | 11 +- src/logging/log_daemon.h | 9 +- src/logging/log_daemon_config.h | 7 +- src/logging/log_daemon_dispatch.h | 7 +- src/logging/log_handler.h | 9 +- src/logging/log_manager.h | 9 +- 117 files changed, 928 insertions(+), 1296 deletions(-) -- 2.20.1

3 26

[libvirt] [PATCH] virNodeDeviceCapPCIDefFormat: Drop useless space before end of tags
by Michal Privoznik 14 Jun '19

14 Jun '19

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/conf/node_device_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 1db045d9ac..4ef92d5129 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -227,14 +227,14 @@ virNodeDeviceCapPCIDefFormat(virBufferPtr buf, virBufferEscapeString(buf, ">%s</product>\n", data->pci_dev.product_name); else - virBufferAddLit(buf, " />\n"); + virBufferAddLit(buf, "/>\n"); virBufferAsprintf(buf, "<vendor id='0x%04x'", data->pci_dev.vendor); if (data->pci_dev.vendor_name) virBufferEscapeString(buf, ">%s</vendor>\n", data->pci_dev.vendor_name); else - virBufferAddLit(buf, " />\n"); + virBufferAddLit(buf, "/>\n"); if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION) { virBufferAddLit(buf, "<capability type='phys_function'>\n"); virBufferAdjustIndent(buf, 2); -- 2.21.0

1 0

[libvirt] [PATCH v2] qemu: fix pr-helper0 remain
by Jie Wang 13 Jun '19

13 Jun '19

If libvirt receive DISCONNECTED event and set prDaemonRunning to false, and qemuDomainRemoveDiskDevice is performing in the meantime. qemuDomainRemoveDiskDevice will return directly by prDaemonRunning check, so the pr-helper0 object will remain. In that case we should try harder and also kill the pr-helper process, so qemuProcessKillManagedPRDaemon could use the same treatment. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- src/qemu/qemu_hotplug.c | 3 +-- src/qemu/qemu_process.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 34249bd..5e4a929 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -465,8 +465,7 @@ qemuHotplugRemoveManagedPR(virQEMUDriverPtr driver, virErrorPtr orig_err; int ret = -1; - if (!priv->prDaemonRunning || - virDomainDefHasManagedPR(vm->def)) + if (virDomainDefHasManagedPR(vm->def)) return 0; virErrorPreserveLast(&orig_err); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 47d8ca2..8070a09 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2746,9 +2746,6 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) virErrorPtr orig_err; char *pidfile; - if (!priv->prDaemonRunning) - return; - if (!(pidfile = qemuProcessBuildPRHelperPidfilePath(vm))) { VIR_WARN("Unable to construct pr-helper pidfile path"); return; -- 2.8.3.windows.1

2 1

[libvirt] [PATCH] qemu: domain: Log some useful data in qemuDomainStorageSourceAccessModify
by Peter Krempa 13 Jun '19

13 Jun '19

Log the flags passed to the function in a exploded state so that it's easily visible what's happening to the image. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2095191cde..d28cfa4f42 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9339,6 +9339,9 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, int ret = -1; virErrorPtr orig_err = NULL; bool chain = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN; + bool force_ro = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_ONLY; + bool force_rw = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_WRITE; + bool revoke = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE; int rc; bool was_readonly = src->readonly; bool revoke_cgroup = false; @@ -9346,14 +9349,18 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, bool revoke_namespace = false; bool revoke_lockspace = false; - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_ONLY) + VIR_DEBUG("VM: '%s', src: '%s', readonly: '%d, force_ro: '%d', force_rw: '%d', revoke: '%d', chain: '%d'", + vm->def->name, NULLSTR(src->path), src->readonly, force_ro, + force_rw, revoke, chain); + + if (force_ro) src->readonly = true; - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_WRITE) + if (force_rw) src->readonly = false; /* just tear down the disk access */ - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { + if (revoke) { virErrorPreserveLast(&orig_err); revoke_cgroup = true; revoke_label = true; -- 2.21.0

3 4

[libvirt] [PATCH 0/3] tests: Include LDADDS in qemu_LDADDS
by Andrea Bolognani 12 Jun '19

12 Jun '19

Finally got around to implement the suggestion I made in https://www.redhat.com/archives/libvir-list/2019-May/msg00894.html Andrea Bolognani (3): tests: Tweak cputest_LDADDS tests: Tweak vircapstest_LDADD tests: Include LDADDS in qemu_LDADDS tests/Makefile.am | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH] qemu: Add support for overriding max threads per process limit
by Jim Fehlig 12 Jun '19

12 Jun '19

Some VM configurations may result in a large number of threads created by the associated qemu process which can exceed the system default limit. The maximum number of threads allowed per process is controlled by the pids cgroup controller and is set to 16k when creating VMs with systemd's machined service. The maximum number of threads per process is recorded in the pids.max file under the machine's pids controller cgroup hierarchy, e.g. $cgrp-mnt/pids/machine.slice/machine-qemu\\x2d1\\x2dtest.scope/pids.max Maximum threads per process is controlled with the TasksMax property of the systemd scope for the machine. This patch adds an option to qemu.conf which can be used to override the maximum number of threads allowed per qemu process. If the value of option is greater than zero, it will be set in the TasksMax property of the machine's scope after creating the machine. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/lxc/lxc_cgroup.c | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircgroup.c | 6 +++++- src/util/vircgroup.h | 1 + src/util/virsystemd.c | 24 +++++++++++++++++++++++- src/util/virsystemd.h | 3 ++- tests/virsystemdtest.c | 12 ++++++------ 12 files changed, 54 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index d93a19d684..76014f3bfd 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -455,6 +455,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, nnicindexes, nicindexes, def->resource->partition, -1, + 0, &cgroup) < 0) goto cleanup; diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index b311f02da6..c70b903fed 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -94,6 +94,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "max_threads_per_process" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 5a85789d81..ab044c9cf3 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -608,6 +608,16 @@ #max_processes = 0 #max_files = 0 +# If max_threads_per_process is set to a positive integer, libvirt +# will use it to set the maximum number of threads that can be +# created by a qemu process. Some VM configurations can result in +# qemu processes with tens of thousands of threads. systemd-based +# systems typically limit the number of threads per process to +# 16k. max_threads_per_process can be used to override default +# limits in the host OS. +# +#max_threads_per_process = 0 + # If max_core is set to a non-zero integer, then QEMU will be # permitted to create core dumps when it crashes, provided its # RAM size is smaller than the limit set. diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ca76c4fdfa..9603f33e8a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -930,6 +930,7 @@ qemuInitCgroup(virDomainObjPtr vm, nnicindexes, nicindexes, vm->def->resource->partition, cfg->cgroupControllers, + cfg->maxThreadsPerProc, &priv->cgroup) < 0) { if (virCgroupNewIgnoreError()) goto done; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index daea11dacb..8ac2dc92b5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -687,6 +687,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, return -1; if (virConfGetValueUInt(conf, "max_files", &cfg->maxFiles) < 0) return -1; + if (virConfGetValueUInt(conf, "max_threads_per_process", &cfg->maxThreadsPerProc) < 0) + return -1; if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) { if (virConfGetValueString(conf, "max_core", &corestr) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 983e74a3cf..48b8711cbd 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -171,6 +171,7 @@ struct _virQEMUDriverConfig { unsigned int maxProcesses; unsigned int maxFiles; + unsigned int maxThreadsPerProc; unsigned long long maxCore; bool dumpGuestCore; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index fea1d308b7..ac7ad59ba8 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -75,6 +75,7 @@ module Test_libvirtd_qemu = { "set_process_name" = "1" } { "max_processes" = "0" } { "max_files" = "0" } +{ "max_threads_per_process" = "0" } { "max_core" = "unlimited" } { "dump_guest_core" = "1" } { "mac_filter" = "1" } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f58e336404..c31c34e5f8 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1106,6 +1106,7 @@ virCgroupNewMachineSystemd(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) { int rv; @@ -1122,7 +1123,8 @@ virCgroupNewMachineSystemd(const char *name, isContainer, nnicindexes, nicindexes, - partition)) < 0) + partition, + maxthreads)) < 0) return rv; if (controllers != -1) @@ -1234,6 +1236,7 @@ virCgroupNewMachine(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) { int rv; @@ -1250,6 +1253,7 @@ virCgroupNewMachine(const char *name, nicindexes, partition, controllers, + maxthreads, group)) == 0) return 0; diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 377e0fd870..3fb99f70ef 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -99,6 +99,7 @@ int virCgroupNewMachine(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3f03e3bd63..497d100a5c 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -238,12 +238,14 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, size_t nnicindexes, int *nicindexes, - const char *partition) + const char *partition, + unsigned int maxthreads) { int ret; DBusConnection *conn; char *creatorname = NULL; char *slicename = NULL; + char *scopename = NULL; static int hasCreateWithNetwork = 1; if ((ret = virSystemdHasMachined()) < 0) @@ -389,11 +391,31 @@ int virSystemdCreateMachine(const char *name, goto cleanup; } + if (maxthreads > 0) { + if (!(scopename = virSystemdMakeScopeName(name, drivername, false))) + goto cleanup; + + if (virDBusCallMethod(conn, + NULL, + NULL, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "SetUnitProperties", + "sba(sv)", + scopename, + true, + 1, + "TasksMax", "t", maxthreads) < 0) + goto cleanup; + } + ret = 0; cleanup: VIR_FREE(creatorname); VIR_FREE(slicename); + VIR_FREE(scopename); return ret; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7d9c0ebd62..bdce3b2e9d 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -37,7 +37,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, size_t nnicindexes, int *nicindexes, - const char *partition); + const char *partition, + unsigned int maxthreads); int virSystemdTerminateMachine(const char *name); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 82c02decd1..478fa844fa 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -172,7 +172,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) 123, true, 0, NULL, - "highpriority.slice") < 0) { + "highpriority.slice", 0) < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; } @@ -205,7 +205,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL) < 0) { + NULL, 0) < 0) { fprintf(stderr, "%s", "Failed to create KVM machine\n"); return -1; } @@ -242,7 +242,7 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_NO_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -276,7 +276,7 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_NOT_REGISTERED"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -310,7 +310,7 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_BAD_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -345,7 +345,7 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) 123, true, nnicindexes, nicindexes, - "highpriority.slice") < 0) { + "highpriority.slice", 0) < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; } -- 2.21.0

1 1

[libvirt] [PATCH] build: fix linking libqemutestdriver with LTO enabled
by Jim Fehlig 12 Jun '19

12 Jun '19

openSUSE Factory is in the process of enabling Link Time Optimization [0] and stumbled upon missing symbols when linking libqemutestdriver libtool: link: gcc -shared -fPIC -DPIC ../src/libvirt_qemu_probes.o \ -Wl,--whole-archive ../src/.libs/libvirt_driver_qemu_impl.a \ ../src/.libs/libvirt_driver_network_impl.a \ ../src/.libs/libvirt_driver_storage_impl.a -Wl,--no-whole-archive \ -lcap-ng -lgnutls -lnl-route-3 -lnl-3 -ldbus-1 -lselinux -lapparmor \ /usr/lib/libxml2.so -ldl -lz -llzma -lm -lblkid -ltirpc \ -fstack-protector-strong -O2 -fstack-protector-strong -flto=16 -g -O2 \ -fstack-protector-strong -flto=16 -g \ -Wl,-soname -Wl,libqemutestdriver.so -o .libs/libqemutestdriver.so ... /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `mdir_name' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `rpl_ioctl' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `rpl_pipe2' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `recvfd' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `c_strcasecmp' The missing symbols are provided by GNUlib. Add it when linking libqemutestdriver. [0] https://en.opensuse.org/openSUSE:LTO Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 46d94d2236..1d80647c9f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -557,7 +557,7 @@ endif WITH_DTRACE_PROBES libqemutestdriver_la_SOURCES = libqemutestdriver_la_LDFLAGS = $(DRIVERLIB_LDFLAGS) -libqemutestdriver_la_LIBADD = $(qemu_LDADDS) +libqemutestdriver_la_LIBADD = $(qemu_LDADDS) $(GNULIB_LIBS) qemucpumock_la_SOURCES = \ qemucpumock.c testutilshostcpus.h @@ -729,7 +729,7 @@ lxcconf2xmltest_SOURCES = \ lxcconf2xmltest_LDADD = $(lxc_LDADDS) else ! WITH_LXC EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h -endif ! WITH_LXC +-endif ! WITH_LXC if WITH_OPENVZ openvzutilstest_SOURCES = \ -- 2.21.0

3 8

[libvirt] [PATCH] test_driver: implement virDomainGetLaunchSecurityInfo
by Ilias Stamatis 12 Jun '19

12 Jun '19

Since this is the test driver and this is tied to AMD CPUs at the moment, we can pretend that the domain doesn't have launch security and always return 0 parameters. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..213f17808b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2284,6 +2284,18 @@ testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) } +static int +testDomainGetLaunchSecurityInfo(virDomainPtr domain ATTRIBUTE_UNUSED, + virTypedParameterPtr *params ATTRIBUTE_UNUSED, + int *nparams, + unsigned int flags) +{ + virCheckFlags(0, -1); + *nparams = 0; + return 0; +} + + static unsigned long long testDomainGetMaxMemory(virDomainPtr domain) { @@ -7011,6 +7023,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainDestroy = testDomainDestroy, /* 0.1.1 */ .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ + .domainGetLaunchSecurityInfo = testDomainGetLaunchSecurityInfo, /* 5.5.0 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ -- 2.21.0

2 1

[libvirt] [PATCH] tests: qemumonitorjson: Replace use of virReportError
by Peter Krempa 12 Jun '19

12 Jun '19

Use VIR_TEST_VERBOSE instead. This fixes the following syntax check problem: tests/qemumonitorjsontest.c:1409: virReportError(VIR_ERR_INTERNAL_ERROR, "arr should have been cleared"); Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. tests/qemumonitorjsontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 68b115fa89..e087d1c256 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1406,7 +1406,7 @@ testQemuMonitorJSONqemuMonitorJSONMergeBitmaps(const void *opaque) return -1; if (arr) { - virReportError(VIR_ERR_INTERNAL_ERROR, "arr should have been cleared"); + VIR_TEST_VERBOSE("arr should have been cleared"); return -1; } -- 2.21.0

1 0

[libvirt] [PATCH 0/3] tests: uri: Improve uri testing and add test for urlencoded uris
by Peter Krempa 11 Jun '19

11 Jun '19

Peter Krempa (3): tests: uri: Use VIR_TEST_DEBUG instead of VIR_DEBUG tests: uri: Run all test cases on a single URI tests: uri: Add test for urlencoded URIs tests/viruritest.c | 80 +++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 33 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH 0/3] qemu: Fix two block-job related regressions (blockdev-add saga)
by Peter Krempa 11 Jun '19

11 Jun '19

Peter Krempa (3): qemu: domain: Fix logic bug in qemuDomainStorageSourceAccessAllow qemu: domain: Allow overriding images to read-write in qemuDomainStorageSourceAccessAllow qemu: Use proper block job name when reconnecting to VM src/qemu/qemu_domain.c | 21 ++++++++++++++------- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 7 ++++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 12 ++++++++---- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/qemu_process.c | 2 +- 7 files changed, 32 insertions(+), 18 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH v2 0/4] test_driver: implement virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML
by Ilias Stamatis 11 Jun '19

11 Jun '19

Changed in v2: * in testDomainSaveImageDefineXML check first that a saved image already exists before parsing the new file * reordered the arguments of testDomainSaveImageWrite in order for its signature to be consistent with testDomainSaveImageOpen While implementing virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML for the test driver, I realized that there exists already code for saving and loading test images which can be reused. However, it needed to be extracted from testDomainSaveFlags and testDomainRestoreFlags into separate functions. The new functions are inspired by the corresponding QEMU driver code where e.g. qemuDomainSaveImageOpen serves as a helper used by other functions. This series of patches initially extracts the code mentioned above into separate functions and then provides the test driver with implementations for virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML which make use of the newly introduced functions. Ilias Stamatis (4): test_driver: extract image saving code into a separate function test_driver: extract image loading code into a separate function test_driver: implement virDomainSaveImageDefineXML test_driver: implement virDomainSaveImageGetXMLDesc src/test/test_driver.c | 293 ++++++++++++++++++++++++++++------------- 1 file changed, 205 insertions(+), 88 deletions(-) -- 2.21.0

2 6

[libvirt] [jenkins-ci PATCH] lcitool: Don't warn when using package manager directly
by Andrea Bolognani 11 Jun '19

11 Jun '19

We only do this when performing operations that the corresponding Ansible module doesn't support, so we know what we're doing and don't want warnings to show up. Note that while only the dnf and yum modules complain at the moment, we might as well use warn=no everywhere so that we're already covered in case in the future the pkgng module starts detecting this as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/update/tasks/base.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 8fe114e..e0efe5d 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -52,11 +52,15 @@ - name: Update installed packages shell: '{{ package_manager }} update && {{ package_manager }} upgrade -y' + args: + warn: no when: - package_format == 'pkg' - name: Clean up packages after update shell: '{{ package_manager }} clean packages -y && {{ package_manager }} autoremove -y' + args: + warn: no when: - package_format == 'rpm' @@ -69,6 +73,8 @@ - name: Clean up packages after update shell: '{{ package_manager }} clean -y && {{ package_manager }} autoremove -y' + args: + warn: no when: - package_format == 'pkg' -- 2.21.0

2 4

Re: [libvirt] [Qemu-devel] PCI(e): Documentation "io-reserve" and related properties?
by Andrea Bolognani 11 Jun '19

11 Jun '19

On Thu, 2019-06-06 at 14:20 -0400, Michael S. Tsirkin wrote: > On Thu, Jun 06, 2019 at 06:19:43PM +0200, Kashyap Chamarthy wrote: > > Hi folks, > > > > Today I learnt about some obscure PCIe-related properties, in context of > > the adding PCIe root ports to a guest, namely: > > > > io-reserve > > mem-reserve > > bus-reserve > > pref32-reserve > > pref64-reserve > > > > Unfortunately, the commit[*] that added them provided no documentation > > whatsover. > > > > In my scenario, I was specifically wondering about what does > > "io-reserve" mean, in what context to use it, etc. (But documentation > > about other properties is also welcome.) > > > > Anyone more well-versed in this area care to shed some light? > > > > > > [*] 6755e618d0 (hw/pci: add PCI resource reserve capability to legacy > > PCI bridge, 2018-08-21) > > So normally bios would reserve just enough io space to satisfy all > devices behind a bridge. What if you intend to hotplug more devices? > These properties allow you to ask bios to reserve extra space. Is it fair to say that setting io-reserve=0 for a pcie-root-port would be a way to implement the requirements set forth in https://bugzilla.redhat.com/show_bug.cgi?id=1408810 ? I tested this on aarch64 and it seems to work as expected, but then again without documentation it's hard to tell. More specifically, I created an aarch64/virt guest with several pcie-root-ports and it couldn't boot much further than GRUB when the number of ports exceeded 24, but as soon as I added the io-reserve=0 option I could get the same guest to boot fine with 32 or even 64 pcie-root-ports. I'm attaching the boot log for reference: there are a bunch of messages about the topic but they would appear to be benign. Hotplug seemed to work too: I tried with a single virtio-net-pci and I could access the network. My understanding is that PCIe devices are required to work without IO space, so this behavior matches my expectations. I wonder, though, what would happen if I had something like -device pcie-root-port,io-reserve=0,id=pci.1 -device pcie-pci-bridge,bus=pci.1 Would I be able to hotplug conventional PCI devices into the pcie-pci-bridge, or would the lack of IO space reservation for the pcie-root-port cause issues with that? -- Andrea Bolognani / Red Hat / Virtualization

2 1

[libvirt] Question about Windows builds
by Christopher Loyd Nugent 11 Jun '19

11 Jun '19

My name is Christopher Nugent. This is my first time posting to the mailing list, and I am still adjusting to the community norms. If I do anything out of line, please let me know. Anyway, on to the question: I am attempting to use libvirt in a Windows application I am developing, and came upon the following in the documentation: Libvirt is known to work as a client (not server) on Windows XP (32-bit), and Windows 7 (64-bit). I am a bit confused as to what this means. Does it mean that I won't be able to use libvirt in a host configuration, Hyper-V acting as the underlying hypervisor? I am posting to the development list because, if I am right, I would like to donate my time to amend the situation. My application will be cross-platform and will support multiple hypervisors, so using libvirt will help me not have to duplicate functionality. Thank you for your time. --Chris Nugent.

2 1

[libvirt] [PATCH]daemon: Fix a crash during virNetlinkEventServiceStopAll
by Liu Haitao 11 Jun '19

11 Jun '19

The virNetlinkEventServiceStopAll() should be executed behind virStateCleanup(), for some important resources like(static virNetlinkEventSrvPrivatePtr server) are freed unexpected. However virStateCleanup() need to use this variable(server). The call trace of virNetlinkEventServiceStopAll: virNetlinkEventServiceStopAll() --> virNetlinkEventServiceStop() --> server[protocol] = NULL; // set server to null The call trace of virStateCleanup(): virStateCleanup() -->qemuStateCleanup() -->qemuProcessStop() -->virNetDevMacVLanDeleteWithVPortProfile() -->virNetlinkEventRemoveClient() --> srv = server[protocol] In virNetlinkEventRemoveClient() the variable server is used again, but now it is null that is freed by virNetlinkEventServiceStopAll().So it would case a crash . The call trace of crash: (gdb) bt 0 __GI___pthread_mutex_lock (mutex=0x0) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_mutex_lock.c:67 1 0x00007fb0d555d0f9 in virNetlinkEventRemoveClient () from /usr/lib64/libvirt.so.0 2 0x00007fb0d55551df in virNetDevMacVLanDeleteWithVPortProfile () from /usr/lib64/libvirt.so.0 3 0x00007fb0c1131251 in qemuProcessStop () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 4 0x00007fb0c11995ea in ?? () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 5 0x00007fb0d5588c5b in ?? () from /usr/lib64/libvirt.so.0 6 0x00007fb0d5587fe8 in ?? () from /usr/lib64/libvirt.so.0 7 0x00007fb0d19533f4 in start_thread (arg=0x7fb0be17b700) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_create.c:456 8 0x00007fb0d128f10f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:105 Signed-off-by: Liu Haitao <haitao.liu(a)windriver.com> --- src/remote/remote_daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index c3782971f1..7da20a6644 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -1464,8 +1464,6 @@ int main(int argc, char **argv) { /* Keep cleanup order in inverse order of startup */ virNetDaemonClose(dmn); - virNetlinkEventServiceStopAll(); - if (driversInitialized) { /* NB: Possible issue with timing window between driversInitialized * setting if virNetlinkEventServerStart fails */ @@ -1473,6 +1471,8 @@ int main(int argc, char **argv) { virStateCleanup(); } + virNetlinkEventServiceStopAll(); + virObjectUnref(adminProgram); virObjectUnref(srvAdm); virObjectUnref(qemuProgram); -- 2.21.0

3 2

[libvirt] [PATCH 0/4] incremental backup: QMP interactions
by Eric Blake 11 Jun '19

11 Jun '19

I'm trying to break my incremental backup work into smaller pieces so I can make progress and actually get some code committed, while I continue to hammer away at preparing a v9 series that addresses even more review comments and things learned during testing. These few patches represent the bulk of 14-15/21 from v8, except that the operation to update Checkpoint size must come later in the series when checkpoint_conf.h is ready. Another reason to commit this now, even without the incremental backup clients of the new capabilities, is that capability additions tend to be a conflict magnet, so I'd rather stabilize this and reduce the amount of rebase work I have been doing. Changes from v8: - improve testing of nbd-server-start - split up QMP changes into more manageable pieces - address formatting review comments Eric Blake (4): backup: Prepare for Unix sockets in QMP nbd-server-start backup: Add two new qemu capabilities backup: Add new qemu monitor bitmap backup: Add new parameters to qemu monitor nbd-server-add src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_monitor.h | 29 +++- src/qemu/qemu_monitor_json.h | 24 ++- src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_migration.c | 9 +- src/qemu/qemu_monitor.c | 74 ++++++++- src/qemu/qemu_monitor_json.c | 149 +++++++++++++++++- .../caps_4.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 + .../caps_4.0.0.riscv32.xml | 2 + .../caps_4.0.0.riscv64.xml | 2 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 + .../caps_4.0.0.x86_64.xml | 2 + tests/qemumonitorjsontest.c | 60 ++++++- 14 files changed, 341 insertions(+), 26 deletions(-) -- 2.20.1

2 19

[libvirt] [RFC PATCH] qemumonitorjsontest: Use VIR_AUTOPTR for test cleanup
by Eric Blake 11 Jun '19

11 Jun '19

Everywhere else is switching, we might as well use it here, too. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Partial patch - is it worth me continuing the cleanups on the rest of the file? --- tests/qemumonitortestutils.h | 3 +++ tests/qemumonitorjsontest.c | 35 +++++++++++++++-------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 8461c80caa..a2d2d30820 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -24,6 +24,7 @@ # include "qemu/qemu_conf.h" # include "qemu/qemu_monitor.h" # include "qemu/qemu_agent.h" +# include "virautoclean.h" typedef struct _qemuMonitorTest qemuMonitorTest; typedef qemuMonitorTest *qemuMonitorTestPtr; @@ -102,4 +103,6 @@ qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test); qemuAgentPtr qemuMonitorTestGetAgent(qemuMonitorTestPtr test); virDomainObjPtr qemuMonitorTestGetDomainObj(qemuMonitorTestPtr test); +VIR_DEFINE_AUTOPTR_FUNC(qemuMonitorTest, qemuMonitorTestFree); + #endif /* LIBVIRT_QEMUMONITORTESTUTILS_H */ diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index a7f64058d4..10bffce2a3 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -152,12 +152,11 @@ testQemuMonitorJSONGetStatus(const void *opaque) { const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; - qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); - int ret = -1; + VIR_AUTOPTR(qemuMonitorTest) test = NULL; bool running = false; virDomainPausedReason reason = 0; - if (!test) + if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; if (qemuMonitorTestAddItem(test, "query-status", @@ -168,7 +167,7 @@ testQemuMonitorJSONGetStatus(const void *opaque) " \"running\": true " " } " "}") < 0) - goto cleanup; + return -1; if (qemuMonitorTestAddItem(test, "query-status", "{ " " \"return\": { " @@ -176,7 +175,7 @@ testQemuMonitorJSONGetStatus(const void *opaque) " \"running\": false " " } " "}") < 0) - goto cleanup; + return -1; if (qemuMonitorTestAddItem(test, "query-status", "{ " " \"return\": { " @@ -185,61 +184,57 @@ testQemuMonitorJSONGetStatus(const void *opaque) " \"running\": false " " } " "}") < 0) - goto cleanup; + return -1; if (qemuMonitorGetStatus(qemuMonitorTestGetMonitor(test), &running, &reason) < 0) - goto cleanup; + return -1; if (!running) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Running was not true"); - goto cleanup; + return -1; } if (reason != VIR_DOMAIN_PAUSED_UNKNOWN) { virReportError(VIR_ERR_INTERNAL_ERROR, "Reason was unexpectedly set to %d", reason); - goto cleanup; + return -1; } if (qemuMonitorGetStatus(qemuMonitorTestGetMonitor(test), &running, &reason) < 0) - goto cleanup; + return -1; if (running) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Running was not false"); - goto cleanup; + return -1; } if (reason != VIR_DOMAIN_PAUSED_UNKNOWN) { virReportError(VIR_ERR_INTERNAL_ERROR, "Reason was unexpectedly set to %d", reason); - goto cleanup; + return -1; } if (qemuMonitorGetStatus(qemuMonitorTestGetMonitor(test), &running, &reason) < 0) - goto cleanup; + return -1; if (running) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Running was not false"); - goto cleanup; + return -1; } if (reason != VIR_DOMAIN_PAUSED_MIGRATION) { virReportError(VIR_ERR_INTERNAL_ERROR, "Reason was unexpectedly set to %d", reason); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - qemuMonitorTestFree(test); - return ret; + return 0; } static int -- 2.20.1

2 1

[libvirt] [PATCH] qemumonitorjsontest: Validate more commands against schema
by Eric Blake 11 Jun '19

11 Jun '19

The DO_TEST() macro in qemumonitorjsontest.c was not passing the schema through, which meant that we were not validating any of those tests for correct usage according to the schema. Tested by using this hack, where the test mistakenly passed pre-patch, but correctly diagnosed the garbage post-patch: | diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c | index 53a7de8b77..86d8450814 100644 | --- i/src/qemu/qemu_monitor_json.c | +++ w/src/qemu/qemu_monitor_json.c | @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, | if (reason) | *reason = VIR_DOMAIN_PAUSED_UNKNOWN; | | - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL))) | + if (!(cmd = qemuMonitorJSONMakeCommand("query-status", | + "s:garbage", "foo", NULL))) | return -1; | | if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) Suggested-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/qemumonitorjsontest.c | 251 +++++++++++++++++++++--------------- 1 file changed, 149 insertions(+), 102 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 0894e748ae..a7f64058d4 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -48,6 +48,12 @@ struct _testQemuMonitorJSONSimpleFuncData { virHashTablePtr schema; }; +typedef struct _testGenericData testGenericData; +struct _testGenericData { + virDomainXMLOptionPtr xmlopt; + virHashTablePtr schema; +}; + const char *queryBlockReply = "{" " \"return\": [" @@ -142,10 +148,11 @@ const char *queryBlockReply = "}"; static int -testQemuMonitorJSONGetStatus(const void *data) +testQemuMonitorJSONGetStatus(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; bool running = false; virDomainPausedReason reason = 0; @@ -236,10 +243,11 @@ testQemuMonitorJSONGetStatus(const void *data) } static int -testQemuMonitorJSONGetVersion(const void *data) +testQemuMonitorJSONGetVersion(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; int major; int minor; @@ -339,10 +347,11 @@ testQemuMonitorJSONGetVersion(const void *data) } static int -testQemuMonitorJSONGetMachines(const void *data) +testQemuMonitorJSONGetMachines(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorMachineInfoPtr *info; int ninfo = 0; @@ -421,10 +430,11 @@ testQemuMonitorJSONGetMachines(const void *data) static int -testQemuMonitorJSONGetCPUDefinitions(const void *data) +testQemuMonitorJSONGetCPUDefinitions(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorCPUDefInfoPtr *cpus = NULL; int ncpus = 0; @@ -504,10 +514,11 @@ testQemuMonitorJSONGetCPUDefinitions(const void *data) static int -testQemuMonitorJSONGetCommands(const void *data) +testQemuMonitorJSONGetCommands(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **commands = NULL; int ncommands = 0; @@ -569,10 +580,11 @@ testQemuMonitorJSONGetCommands(const void *data) static int -testQemuMonitorJSONGetTPMModels(const void *data) +testQemuMonitorJSONGetTPMModels(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **tpmmodels = NULL; int ntpmmodels = 0; @@ -622,10 +634,11 @@ testQemuMonitorJSONGetTPMModels(const void *data) static int -testQemuMonitorJSONGetCommandLineOptionParameters(const void *data) +testQemuMonitorJSONGetCommandLineOptionParameters(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **params = NULL; int nparams = 0; @@ -776,6 +789,7 @@ testQemuMonitorJSONAttachChardev(const void *opaque) static int qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, + virHashTablePtr schema, const char *label, virDomainChrSourceDefPtr chr, const char *expectargs, @@ -801,7 +815,7 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, data.chr = chr; data.fail = fail; data.expectPty = expectPty; - if (!(data.test = qemuMonitorTestNewSimple(true, xmlopt))) + if (!(data.test = qemuMonitorTestNewSchema(xmlopt, schema))) goto cleanup; if (qemuMonitorTestAddItemExpect(data.test, "chardev-add", @@ -821,14 +835,15 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, } static int -qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) +qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt, + virHashTablePtr schema) { virDomainChrSourceDef chr; int ret = 0; #define CHECK(label, fail, expectargs) \ - if (qemuMonitorJSONTestAttachOneChardev(xmlopt, label, &chr, expectargs, \ - NULL, NULL, fail) < 0) \ + if (qemuMonitorJSONTestAttachOneChardev(xmlopt, schema, label, &chr, \ + expectargs, NULL, NULL, fail) < 0) \ ret = -1 chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_NULL }; @@ -840,7 +855,7 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) "{'id':'alias','backend':{'type':'null','data':{}}}"); chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_PTY }; - if (qemuMonitorJSONTestAttachOneChardev(xmlopt, "pty", &chr, + if (qemuMonitorJSONTestAttachOneChardev(xmlopt, schema, "pty", &chr, "{'id':'alias'," "'backend':{'type':'pty'," "'data':{}}}", @@ -938,10 +953,11 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) static int -testQemuMonitorJSONDetachChardev(const void *data) +testQemuMonitorJSONDetachChardev(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; if (!test) @@ -971,10 +987,11 @@ testQemuMonitorJSONDetachChardev(const void *data) * {"name": "type", "type": "string"}]} */ static int -testQemuMonitorJSONGetListPaths(const void *data) +testQemuMonitorJSONGetListPaths(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorJSONListPathPtr *paths; int npaths = 0; @@ -1049,10 +1066,11 @@ testQemuMonitorJSONGetListPaths(const void *data) * {"return": true} */ static int -testQemuMonitorJSONGetObjectProperty(const void *data) +testQemuMonitorJSONGetObjectProperty(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorJSONObjectProperty prop; @@ -1092,10 +1110,11 @@ testQemuMonitorJSONGetObjectProperty(const void *data) * false is not a good idea... */ static int -testQemuMonitorJSONSetObjectProperty(const void *data) +testQemuMonitorJSONSetObjectProperty(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorJSONObjectProperty prop; @@ -1144,10 +1163,11 @@ testQemuMonitorJSONSetObjectProperty(const void *data) static int -testQemuMonitorJSONGetDeviceAliases(const void *data) +testQemuMonitorJSONGetDeviceAliases(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **aliases = NULL; const char **alias; @@ -1204,10 +1224,11 @@ testQemuMonitorJSONGetDeviceAliases(const void *data) } static int -testQemuMonitorJSONCPU(const void *data) +testQemuMonitorJSONCPU(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; bool running = false; virDomainPausedReason reason = 0; @@ -1407,10 +1428,11 @@ testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qemuMonitorTestPtr test, static int -testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *data) +testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; struct qemuMonitorQueryCpusEntry expect_slow[] = { {0, 17622, (char *) "/machine/unattached/device[0]", true}, @@ -1501,10 +1523,11 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned long long currmem; @@ -1537,10 +1560,11 @@ testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virDomainVirtType virtType; @@ -1614,10 +1638,11 @@ testHashEqualQemuDomainDiskInfo(const void *value1, const void *value2) } static int -testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virHashTablePtr blockDevices = NULL, expectedBlockDevices = NULL; struct qemuDomainDiskInfo *info; @@ -1693,10 +1718,11 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); virHashTablePtr blockstats = NULL; qemuBlockStatsPtr stats; int ret = -1; @@ -1855,10 +1881,11 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *data) static int -testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned long long cacheSize; @@ -1891,10 +1918,11 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorMigrationStats stats, expectedStats; char *error = NULL; @@ -1986,10 +2014,11 @@ testHashEqualChardevInfo(const void *value1, const void *value2) static int -testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virHashTablePtr info = NULL, expectedInfo = NULL; qemuMonitorChardevInfo info0 = { NULL, VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT }; @@ -2107,10 +2136,11 @@ testValidateGetBlockIoThrottle(const virDomainBlockIoTuneInfo *info, static int -testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *data) +testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virDomainBlockIoTuneInfo info, expectedInfo; @@ -2162,10 +2192,11 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char *arch; @@ -2199,10 +2230,11 @@ testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; const char *cap; char **caps = NULL; @@ -2259,10 +2291,11 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONSendKey(const void *data) +testQemuMonitorJSONqemuMonitorJSONSendKey(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned int keycodes[] = {43, 26, 46, 32}; @@ -2284,10 +2317,11 @@ testQemuMonitorJSONqemuMonitorJSONSendKey(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *data) +testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned int keycodes[] = {43, 26, 46, 32}; @@ -2316,10 +2350,11 @@ testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *data) } static int -testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *data) +testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; const char *error1 = "{" @@ -2362,10 +2397,11 @@ testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; int cap; const char *reply = @@ -2407,6 +2443,7 @@ testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *data) struct testCPUData { const char *name; virDomainXMLOptionPtr xmlopt; + virHashTablePtr schema; }; @@ -2414,7 +2451,8 @@ static int testQemuMonitorJSONGetCPUData(const void *opaque) { const struct testCPUData *data = opaque; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, data->xmlopt); + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(data->xmlopt, + data->schema); virCPUDataPtr cpuData = NULL; char *jsonFile = NULL; char *dataFile = NULL; @@ -2480,8 +2518,9 @@ testQemuMonitorJSONGetCPUData(const void *opaque) static int testQemuMonitorJSONGetNonExistingCPUData(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr) opaque; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); virCPUDataPtr cpuData = NULL; int rv, ret = -1; @@ -2522,10 +2561,11 @@ testQemuMonitorJSONGetNonExistingCPUData(const void *opaque) } static int -testQemuMonitorJSONGetIOThreads(const void *data) +testQemuMonitorJSONGetIOThreads(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); qemuMonitorIOThreadInfoPtr *info; int ninfo = 0; int ret = -1; @@ -2596,6 +2636,7 @@ struct testCPUInfoData { size_t maxvcpus; virDomainXMLOptionPtr xmlopt; bool fast; + virHashTablePtr schema; }; @@ -2664,7 +2705,8 @@ static int testQemuMonitorCPUInfo(const void *opaque) { const struct testCPUInfoData *data = opaque; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, data->xmlopt); + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(data->xmlopt, + data->schema); virDomainObjPtr vm = NULL; char *queryCpusFile = NULL; char *queryHotpluggableFile = NULL; @@ -2921,8 +2963,11 @@ mymain(void) } #define DO_TEST(name) \ - if (virTestRun(# name, testQemuMonitorJSON ## name, driver.xmlopt) < 0) \ - ret = -1 + do { \ + testGenericData data = { driver.xmlopt, qapiData.schema }; \ + if (virTestRun(# name, testQemuMonitorJSON ## name, &data) < 0) \ + ret = -1; \ + } while (0) #define DO_TEST_SIMPLE(CMD, FNC, ...) \ simpleFunc = (testQemuMonitorJSONSimpleFuncData) {.cmd = CMD, .func = FNC, \ @@ -2941,7 +2986,7 @@ mymain(void) #define DO_TEST_CPU_DATA(name) \ do { \ - struct testCPUData data = { name, driver.xmlopt }; \ + struct testCPUData data = { name, driver.xmlopt, qapiData.schema }; \ const char *label = "GetCPUData(" name ")"; \ if (virTestRun(label, testQemuMonitorJSONGetCPUData, &data) < 0) \ ret = -1; \ @@ -2949,7 +2994,8 @@ mymain(void) #define DO_TEST_CPU_INFO(name, maxvcpus) \ do { \ - struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, false}; \ + struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, false, \ + qapiData.schema}; \ if (virTestRun("GetCPUInfo(" name ")", testQemuMonitorCPUInfo, \ &data) < 0) \ ret = -1; \ @@ -2957,7 +3003,8 @@ mymain(void) #define DO_TEST_CPU_INFO_FAST(name, maxvcpus) \ do { \ - struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, true}; \ + struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, true, \ + qapiData.schema }; \ if (virTestRun("GetCPUInfo(" name ")", testQemuMonitorCPUInfo, \ &data) < 0) \ ret = -1; \ @@ -2970,7 +3017,7 @@ mymain(void) DO_TEST(GetCommands); DO_TEST(GetTPMModels); DO_TEST(GetCommandLineOptionParameters); - if (qemuMonitorJSONTestAttachChardev(driver.xmlopt) < 0) + if (qemuMonitorJSONTestAttachChardev(driver.xmlopt, qapiData.schema) < 0) ret = -1; DO_TEST(DetachChardev); DO_TEST(GetListPaths); -- 2.20.1

2 1

[libvirt] [PATCH] test_driver: implement virConnectGetLibVersion
by Ilias Stamatis 10 Jun '19

10 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..dc267b6ecd 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1453,6 +1453,14 @@ static char *testConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) } +static int testConnectGetLibVersion(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned long *libVer) +{ + *libVer = LIBVIR_VERSION_NUMBER; + return 0; +} + + static int testConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; @@ -6988,6 +6996,7 @@ static virHypervisorDriver testHypervisorDriver = { .connectClose = testConnectClose, /* 0.1.1 */ .connectGetVersion = testConnectGetVersion, /* 0.1.1 */ .connectGetHostname = testConnectGetHostname, /* 0.6.3 */ + .connectGetLibVersion = testConnectGetLibVersion, /* 5.5.0 */ .connectGetMaxVcpus = testConnectGetMaxVcpus, /* 0.3.2 */ .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ .nodeGetCPUStats = testNodeGetCPUStats, /* 2.3.0 */ -- 2.21.0

3 4

[libvirt] [PATCHv2] virt-xml-validate: Allow input to be read from stdin
by Johannes Holmberg 10 Jun '19

10 Jun '19

Signed-off-by: Johannes Holmberg <johannes.holmberg(a)dataductus.se> --- Changes from v1: - Quotes around $TMPFILE everywhere. - Explicit -n checks in if statements - Fixed one instance of incorrect indentation - Signed-off-by line in commit message tools/virt-xml-validate.in | 46 ++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 64aeaaaa33..5cb7dcd276 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -16,7 +16,17 @@ set -e -case $1 in +TMPFILE= + +cleanup() { + if [ -n "$TMPFILE" ]; then + rm -f "$TMPFILE" + fi +} + +trap cleanup EXIT + +case "$1" in -h | --h | --he | --hel | --help) cat <<EOF Usage: @@ -34,7 +44,7 @@ $0 (libvirt) @VERSION@ EOF exit ;; --) shift ;; - -*) + -?*) echo "$0: unrecognized option '$1'" >&2 exit 1 ;; esac @@ -42,18 +52,27 @@ esac XMLFILE="$1" TYPE="$2" -if [ -z "$XMLFILE" ]; then - echo "syntax: $0 XMLFILE [TYPE]" >&2 - exit 1 -fi +if [ "$XMLFILE" = "-" ]; then + TMPFILE=`mktemp --tmpdir virt-xml.XXXX` + cat > "$TMPFILE" +else + if [ -z "$XMLFILE" ]; then + echo "syntax: $0 XMLFILE [TYPE]" >&2 + exit 1 + fi -if [ ! -f "$XMLFILE" ]; then - echo "$0: document $XMLFILE does not exist" >&2 - exit 2 + if [ ! -f "$XMLFILE" ]; then + echo "$0: document $XMLFILE does not exist" >&2 + exit 2 + fi fi if [ -z "$TYPE" ]; then - ROOT=`xmllint --stream --debug "$XMLFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + if [ -n "$TMPFILE" ]; then + ROOT=`xmllint --stream --debug - < "$TMPFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + else + ROOT=`xmllint --stream --debug "$XMLFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + fi case "$ROOT" in *domainsnapshot*) # Must come first, since *domain* is a substring TYPE="domainsnapshot" @@ -101,6 +120,9 @@ if [ ! -f "$SCHEMA" ]; then exit 4 fi -xmllint --noout --relaxng "$SCHEMA" "$XMLFILE" - +if [ -n "$TMPFILE" ]; then + xmllint --noout --relaxng "$SCHEMA" - < "$TMPFILE" +else + xmllint --noout --relaxng "$SCHEMA" "$XMLFILE" +fi exit -- 2.17.1

2 1

[libvirt] [PATCH 8.5/13] qemu: Rename qemuDomainSnapshotDiskDataFree to qemuDomainSnapshotDiskDataCleanup
by Peter Krempa 10 Jun '19

10 Jun '19

In commit cbb4d229de30b5 I named the function with 'free' suffix, but at that time it already did some non-freeing tasks. Rename it to make it obvious that it's not just memory managemet. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9736933143..f1886e37b6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15035,10 +15035,10 @@ typedef qemuDomainSnapshotDiskData *qemuDomainSnapshotDiskDataPtr; static void -qemuDomainSnapshotDiskDataFree(qemuDomainSnapshotDiskDataPtr data, - size_t ndata, - virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data, + size_t ndata, + virQEMUDriverPtr driver, + virDomainObjPtr vm) { size_t i; @@ -15145,7 +15145,7 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver, ret = 0; cleanup: - qemuDomainSnapshotDiskDataFree(data, ndata, driver, vm); + qemuDomainSnapshotDiskDataCleanup(data, ndata, driver, vm); return ret; } @@ -15322,7 +15322,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, ret = -1; cleanup: - qemuDomainSnapshotDiskDataFree(diskdata, ndiskdata, driver, vm); + qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm); virErrorRestore(&orig_err); return ret; -- 2.21.0

2 1