- Devel - libvirt List Archives

[libvirt] [PATCH] build: link virstoragetest with libxml
by Martin Kletzander 26 Jun '14

26 Jun '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: To be honest, I have no idea why this fails for me in one situation, but it prevents the following error during compilation: /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.0/../../../../x86_64-pc-linux-gnu/bin/ld: ../src/.libs/libvirt_driver_storage_impl.a(libvirt_driver_storage_impl_la-storage_backend.o): undefined reference to symbol 'xmlFreeDoc@@LIBXML2_2.4.30' /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.0/../../../../lib64/libxml2.so: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Makefile:4228: recipe for target 'virstoragetest' failed Therefore I'm not pushing it as a build-breaker since this might not be the root cause or the best solution. The other fix (and probably more appropriate one) would be to add LIBXML_LIBS into libvirt_conf_la_LIBADD since the xmlFreeDoc() is called in storage_conf.c. Any other preferred way is accepted as well, feel free to comment. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 025b847..457eb99 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -899,6 +899,7 @@ virstoragetest_LDADD = $(LDADDS) \ ../src/libvirt_util.la \ ../src/libvirt_driver_storage_impl.la \ ../gnulib/lib/libgnu.la \ + $(LIBXML_LIBS) \ $(NULL) viridentitytest_SOURCES = \ -- 2.0.0

1 1

[libvirt] [PATCH 0/6] Support for per-guest-node binding
by Martin Kletzander 26 Jun '14

26 Jun '14

Currently we are only able to bind the whole domain to some host nodes using the /domain/numatune/memory element. Numerous requests were made to support host<->guest numa node bindings, so this series tries to pinch an idea on how to do that using /domain/numatune/memnode elements. That is incompatible with automatic numa placement (numad) since that makes no sense. Also this disables any live changes to numa parameters (the /domain/numatune/memory settings) since we cannot change the settings given to qemu. Martin Kletzander (6): conf, schema: add 'id' field for cells conf, schema: add support for numatune memnode element conf: add virDomainGetMemsForGuestCpu() qemu: purely a code movement qemu: memory-ram capability probing qemu: pass numa node binding preferences to qemu docs/formatdomain.html.in | 26 ++- docs/schemas/domaincommon.rng | 22 ++ src/conf/cpu_conf.c | 39 +++- src/conf/domain_conf.c | 259 ++++++++++++++++++--- src/conf/domain_conf.h | 4 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 18 +- src/qemu/qemu_command.c | 160 +++++++++++-- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 23 +- src/qemu/qemu_driver.c | 23 +- src/qemu/qemu_process.c | 3 +- src/util/virnuma.h | 14 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml | 25 ++ .../qemuxml2argv-numatune-auto-prefer.xml | 29 +++ .../qemuxml2argv-numatune-auto.args | 6 + .../qemuxml2argv-numatune-auto.xml | 26 +++ .../qemuxml2argv-numatune-memnode-nocpu.xml | 25 ++ .../qemuxml2argv-numatune-memnodes-problematic.xml | 31 +++ .../qemuxml2argv-numatune-memnodes.args | 8 + .../qemuxml2argv-numatune-memnodes.xml | 31 +++ .../qemuxml2argv-numatune-prefer.args | 6 + .../qemuxml2argv-numatune-prefer.xml | 29 +++ tests/qemuxml2argvtest.c | 51 ++-- .../qemuxml2xmlout-cpu-numa1.xml | 28 +++ .../qemuxml2xmlout-cpu-numa2.xml | 28 +++ tests/qemuxml2xmltest.c | 4 + tests/qemuxmlnstest.c | 2 +- 32 files changed, 845 insertions(+), 94 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-nocpu.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-prefer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-prefer.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml -- 2.0.0

3 17

[libvirt] broken api.xml file
by Eric Blake 26 Jun '14

26 Jun '14

Nehal discovered by accident that our libvirt-api.xml file is broken, which in turn leads to broken python bindings. Right now, if you look at docs/libvirt-api.xml, you'll find: <enum name='VIR_IP_ADDR_TYPE_IPV4' file='libvirt' value='1' type='virIPAddrType'/> but if you look at the libvirt.h.in file, you see: typedef enum { VIR_IP_ADDR_TYPE_IPV4, VIR_IP_ADDR_TYPE_IPV6, which, by C rules, means that the enum is value 0, not 1. We need to fix whatever in libvirt is generating the api.xml file, because that in turn is leading to incorrect code in the python bindings. We could, of course, work around the bug by adding explicit 'VIR_IP_ADDR_TYPE_IPV4 = 0,' in our libvirt.h.in file, but I'd rather fix the root cause. It's not my area of expertise, so I'd appreciate a hand in finding the problem spot, although I'm still trying to take a look. We'll probably need to backport the patch to stable branches, and any distro that has picked up broken definitions will want to respin python bindings. In a quick audit, I found three impacted enums: virDomainCoreDumpFormat (such as VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) virDomainEventGraphicsAddressType (such as VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_IPV4) virIPAddrType (such as VIR_IP_ADDR_TYPE_IPV4) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [PATCH] domain conf: Fix whitespace around judgement operation when parsing 'managed' attribute.
by Chen Fan 26 Jun '14

26 Jun '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 02c394f..b7aa4f5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4261,7 +4261,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, * element that might be (pure hostdev, or higher level device * (e.g. <interface>) with type='hostdev') */ - if ((managed = virXMLPropString(node, "managed"))!= NULL) { + if ((managed = virXMLPropString(node, "managed")) != NULL) { if (STREQ(managed, "yes")) def->managed = true; } -- 1.9.3

3 2

[libvirt] [PATCH 0/2] Add support for reporting failure on incompatible CPUs
by Jiri Denemark 26 Jun '14

26 Jun '14

When CPU virConnectCompareCPU returns VIR_CPU_COMPARE_INCOMPATIBLE, the caller has no clue why the CPU is considered incompatible with host CPU. And in some cases, it would be nice to be able to get such info in a client rather than having to look in logs. Jiri Denemark (2): cpuCompare*: Add support for reporting failure on incompatible CPUs virConnectCompareCPU: Introduce FAIL_INCOMPATIBLE flag include/libvirt/libvirt.h.in | 5 +++++ include/libvirt/virterror.h | 2 ++ src/bhyve/bhyve_driver.c | 17 +++++++++++++---- src/cpu/cpu.c | 10 ++++++---- src/cpu/cpu.h | 9 ++++++--- src/cpu/cpu_aarch64.c | 3 ++- src/cpu/cpu_arm.c | 3 ++- src/cpu/cpu_generic.c | 15 +++++++++++---- src/cpu/cpu_powerpc.c | 10 ++++++++-- src/cpu/cpu_x86.c | 20 ++++++++++++++++++-- src/libvirt.c | 9 +++++++-- src/qemu/qemu_driver.c | 17 +++++++++++++---- src/util/virerror.c | 6 ++++++ tests/cputest.c | 4 ++-- tools/virsh-domain.c | 11 +++++++++-- 15 files changed, 110 insertions(+), 31 deletions(-) -- 2.0.0

3 6

[libvirt] [python PATCH] Implement new virNetworkGetDHCPLeases{ForMAC} APIs
by Nehal J Wani 26 Jun '14

26 Jun '14

These APIs return a list of dhcp leases for all network interfaces connected to the given virtual network or limited output just for one interface if mac is specified. Example Output: [{'iface': 'virbr3', 'ipaddr': '192.168.150.181', 'hostname': 'ubuntu14', 'expirytime': 1403737495L, 'prefix': 24, 'clientid': None, 'mac': '52:54:00:e8:73:eb', 'iaid': None, 'type': 0}, {'iface': 'virbr3', 'ipaddr': '2001:db8:ca2:2:1::bd', 'hostname': 'fedora20-test', 'expirytime': 1403738587L, 'prefix': 64, 'clientid': '00:04:b1:d8:86:42:e1:6a:aa:cf:d5:86:94:23:6f:94:04:cd', 'mac': '52:54:00:5b:40:98', 'iaid': '5980312', 'type': 1}] --- examples/README | 1 + examples/dhcpleases.py | 53 +++++++++++++++ generator.py | 5 ++ libvirt-override-api.xml | 14 ++++ libvirt-override.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 6 ++ 6 files changed, 245 insertions(+) create mode 100755 examples/dhcpleases.py diff --git a/examples/README b/examples/README index f4db76c..5b5d405 100644 --- a/examples/README +++ b/examples/README @@ -10,6 +10,7 @@ domsave.py - save all running domU's into a directory domrestore.py - restore domU's from their saved files in a directory esxlist.py - list active domains of an VMware ESX host and print some info. also demonstrates how to use the libvirt.openAuth() method +dhcpleases.py - list dhcp leases for a given virtual network The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py new file mode 100755 index 0000000..c172dc2 --- /dev/null +++ b/examples/dhcpleases.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# netdhcpleases - print leases info for given virtual network + +import libvirt +import sys +import time + +def usage(): + print "Usage: %s [URI] NETWORK" % sys.argv[0] + print " Print leases info for a given virtual network" + +uri = None +network = None +args = len(sys.argv) + +if args == 2: + network = sys.argv[1] +elif args == 3: + uri = sys.argv[1] + network = sys.argv[2] +else: + usage() + sys.exit(2) + +conn = libvirt.open(uri) +if conn == None: + print "Unable to open connection to libvirt" + sys.exit(1) + +try: + net = conn.networkLookupByName(network) +except libvirt.libvirtError: + print "Network %s not found" % network + sys.exit(0) + +leases = net.DHCPLeases(); +if (leases == None): + print "Failed to get leases for %s" % net.name() + sys.exit(0) + +def toIPAddrType(addrType): + if addrType == libvirt.VIR_IP_ADDR_TYPE_IPV4: + return "ipv4" + elif addrType == libvirt.VIR_IP_ADDR_TYPE_IPV6: + return "ipv6" + +print " {0:20} {1:18} {2:9} {3:25} {4:15} {5}".format("Expiry Time", "MAC address", "Protocol", "IP address", "Hostname", "Client ID or DUID") +print "-"*115 + +for lease in leases: + print " {0:20}".format(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(lease['expirytime']))), + print "{0:18} {1:9}".format(lease['mac'], toIPAddrType(lease['type'])), + print "{0:<25} {1:15} {2}".format("{}/{}".format(lease['ipaddr'], lease['prefix']), lease['hostname'], lease['clientid']) diff --git a/generator.py b/generator.py index 03027c6..a053022 100755 --- a/generator.py +++ b/generator.py @@ -463,6 +463,8 @@ skip_impl = ( 'virDomainMigrateToURI3', 'virConnectGetCPUModelNames', 'virNodeGetFreePages', + 'virNetworkGetDHCPLeases', + 'virNetworkGetDHCPLeasesForMAC', ) lxc_skip_impl = ( @@ -568,6 +570,8 @@ skip_function = ( "virTypedParamsGetString", "virTypedParamsGetUInt", "virTypedParamsGetULLong", + + 'virNetworkDHCPLeaseFree', # only useful in C, python code uses list ) lxc_skip_function = ( @@ -1115,6 +1119,7 @@ def nameFixup(name, classe, type, file): elif name[0:13] == "virNetworkGet": func = name[13:] func = func[0:1].lower() + func[1:] + func = func.replace("dHCP", "DHCP") elif name[0:10] == "virNetwork": func = name[10:] func = func[0:1].lower() + func[1:] diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index bbf0ab1..a1d7c03 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -633,5 +633,19 @@ <arg name='flags' type='int' info='unused, pass 0'/> <return type='char *' info='the list available memory in the cells'/> </function> + <function name="virNetworkGetDHCPLeases" file='python'> + <info>Returns a list of dhcp leases for interfaces connected to the given virtual network</info> + <arg name='network' type='virNetworkPtr' info='a network object'/> + <arg name='flags' type='unsigned int' info='unused, pass 0'/> + <return type='char *' info="list of leases"/> + </function> + <function name="virNetworkGetDHCPLeasesForMAC" file='python'> + <info>Returns a list of dhcp leases for a particular interface + (specified by mac) connected to the given virtual network</info> + <arg name='network' type='virNetworkPtr' info='a network object'/> + <arg name='mac' type='const char *' info='mac address'/> + <arg name='flags' type='unsigned int' info='unused, pass 0'/> + <return type='char *' info="list of leases"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 40aefcc..b345b21 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7866,6 +7866,170 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(counts); return py_retval; } + +static PyObject * +libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = VIR_PY_NONE; + virNetworkPtr network; + PyObject *pyobj_network; + unsigned int flags; + virNetworkDHCPLeasePtr *leases = NULL; + int leases_count = 0; + size_t i; + int ret; + + bool full_free = true; + + if (!PyArg_ParseTuple(args, (char *) "Oi:virNetworkDHCPLeasePtr", + &pyobj_network, &flags)) + return NULL; + + network = (virNetworkPtr) PyvirNetwork_Get(pyobj_network); + + LIBVIRT_BEGIN_ALLOW_THREADS; + leases_count = virNetworkGetDHCPLeases(network, &leases, flags); + ret = leases_count; + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) + goto cleanup; + + if (!(py_retval = PyList_New(leases_count))) + goto no_memory; + + for (i = 0; i < leases_count; i++) { + virNetworkDHCPLeasePtr lease = leases[i]; + PyObject *py_lease = NULL; + + if ((py_lease = PyDict_New()) == NULL) + goto no_memory; + + PyDict_SetItem(py_lease, libvirt_charPtrWrap("iface"), + libvirt_charPtrWrap(lease->iface)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("expirytime"), + libvirt_longlongWrap(lease->expirytime)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("type"), + libvirt_intWrap(lease->type)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("mac"), + libvirt_charPtrWrap(lease->mac)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("ipaddr"), + libvirt_charPtrWrap(lease->ipaddr)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("prefix"), + libvirt_uintWrap(lease->prefix)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("hostname"), + libvirt_charPtrWrap(lease->hostname)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("clientid"), + libvirt_charPtrWrap(lease->clientid)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("iaid"), + libvirt_charPtrWrap(lease->iaid)); + + PyList_SetItem(py_retval, i, py_lease); + } + + full_free = false; + + cleanup: + if (leases) { + for (i = 0; full_free && i < leases_count; i++) + virNetworkDHCPLeaseFree(leases[i]); + } + VIR_FREE(leases); + + return py_retval; + + no_memory: + Py_XDECREF(py_retval); + py_retval = PyErr_NoMemory(); + goto cleanup; +} + +static PyObject * +libvirt_virNetworkGetDHCPLeasesForMAC(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = VIR_PY_NONE; + virNetworkPtr network; + PyObject *pyobj_network; + PyObject *pyobj_mac; + unsigned int flags; + virNetworkDHCPLeasePtr *leases = NULL; + int leases_count = 0; + char *mac = NULL; + size_t i; + int ret; + + bool full_free = true; + + if (!PyArg_ParseTuple(args, (char *) "OOi:virNetworkDHCPLeasePtr", + &pyobj_network, &pyobj_mac, &flags)) + return NULL; + + libvirt_charPtrUnwrap(pyobj_mac, &mac); + + network = (virNetworkPtr) PyvirNetwork_Get(pyobj_network); + + LIBVIRT_BEGIN_ALLOW_THREADS; + leases_count = virNetworkGetDHCPLeasesForMAC(network, mac, &leases, flags); + ret = leases_count; + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) + goto cleanup; + + if (!(py_retval = PyList_New(leases_count))) + goto no_memory; + + for (i = 0; i < leases_count; i++) { + virNetworkDHCPLeasePtr lease = leases[i]; + PyObject *py_lease = NULL; + + if (!STREQ(mac, lease->mac)) + continue; + + if ((py_lease = PyDict_New()) == NULL) + goto no_memory; + + PyDict_SetItem(py_lease, libvirt_charPtrWrap("iface"), + libvirt_charPtrWrap(lease->iface)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("expirytime"), + libvirt_longlongWrap(lease->expirytime)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("type"), + libvirt_intWrap(lease->type)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("mac"), + libvirt_charPtrWrap(lease->mac)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("ipaddr"), + libvirt_charPtrWrap(lease->ipaddr)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("prefix"), + libvirt_uintWrap(lease->prefix)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("hostname"), + libvirt_charPtrWrap(lease->hostname)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("clientid"), + libvirt_charPtrWrap(lease->clientid)); + PyDict_SetItem(py_lease, libvirt_charPtrWrap("iaid"), + libvirt_charPtrWrap(lease->iaid)); + + PyList_SetItem(py_retval, i, py_lease); + } + + full_free = false; + + cleanup: + if (leases) { + for (i = 0; full_free && i < leases_count; i++) + virNetworkDHCPLeaseFree(leases[i]); + } + VIR_FREE(leases); + + return py_retval; + + no_memory: + Py_XDECREF(py_retval); + py_retval = PyErr_NoMemory(); + goto cleanup; +} + #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ /************************************************************************ @@ -8051,6 +8215,8 @@ static PyMethodDef libvirtMethods[] = { #endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ #if LIBVIR_CHECK_VERSION(1, 2, 6) {(char *) "virNodeGetFreePages", libvirt_virNodeGetFreePages, METH_VARARGS, NULL}, + {(char *) "virNetworkGetDHCPLeases", libvirt_virNetworkGetDHCPLeases, METH_VARARGS, NULL}, + {(char *) "virNetworkGetDHCPLeasesForMAC", libvirt_virNetworkGetDHCPLeasesForMAC, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ {NULL, NULL, 0, NULL} }; diff --git a/sanitytest.py b/sanitytest.py index 6067a3f..4f4a648 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -78,6 +78,9 @@ for cname in wantfunctions: if name[0:14] == "virTypedParams": continue + if name[0:23] == "virNetworkDHCPLeaseFree": + continue + # These aren't functions, they're callback signatures if name in ["virConnectAuthCallbackPtr", "virConnectCloseFunc", "virStreamSinkFunc", "virStreamSourceFunc", "virStreamEventCallback", @@ -210,6 +213,9 @@ for name in sorted(basicklassmap): if func[0:8] == "fSFreeze" or func[0:6] == "fSThaw": func = "fs" + func[2:] + if klass == "virNetwork": + func = func.replace("dHCP", "DHCP") + # ...except when they don't. More stupid naming # decisions we can't fix if func == "iD": -- 1.9.3

1 0

[libvirt] [PATCH] cpu: Cleanup coding style in generic CPU driver
by Jiri Denemark 26 Jun '14

26 Jun '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_generic.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c index 314d1e1..f115c40 100644 --- a/src/cpu/cpu_generic.c +++ b/src/cpu/cpu_generic.c @@ -64,8 +64,8 @@ genericCompare(virCPUDefPtr host, size_t i; unsigned int reqfeatures; - if (((cpu->arch != VIR_ARCH_NONE) && - (host->arch != cpu->arch)) || + if ((cpu->arch != VIR_ARCH_NONE && + host->arch != cpu->arch) || STRNEQ(host->model, cpu->model)) return VIR_CPU_COMPARE_INCOMPATIBLE; @@ -83,13 +83,10 @@ genericCompare(virCPUDefPtr host, goto cleanup; } reqfeatures++; - } - else { - if (cpu->type == VIR_CPU_TYPE_HOST || - cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE) { - ret = VIR_CPU_COMPARE_INCOMPATIBLE; - goto cleanup; - } + } else if (cpu->type == VIR_CPU_TYPE_HOST || + cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE) { + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } } @@ -99,9 +96,9 @@ genericCompare(virCPUDefPtr host, ret = VIR_CPU_COMPARE_INCOMPATIBLE; else ret = VIR_CPU_COMPARE_SUPERSET; - } - else + } else { ret = VIR_CPU_COMPARE_IDENTICAL; + } cleanup: virHashFree(hash); -- 2.0.0

2 2

[libvirt] [PATCH] Remove redundant docs from libvirt.h
by Jiri Denemark 26 Jun '14

26 Jun '14

Only types and macros are documented in libvirt.h, APIs are documented in the *.c file they are implemented in. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- include/libvirt/libvirt.h.in | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 7e695a3..3f7a201 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4122,17 +4122,6 @@ typedef enum { #endif } virCPUCompareResult; -/** - * virConnectCompareCPU: - * - * @conn: virConnect connection - * @xmlDesc: XML description of either guest or host cpu with <cpu> root tag - * @flags: comparison flags - * - * Compares given CPU with host cpu. - * - * Returns virCPUCompareResult. - */ int virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags); @@ -4151,19 +4140,6 @@ typedef enum { VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES = (1 << 0), /* show all features */ } virConnectBaselineCPUFlags; -/** - * virConnectBaselineCPU: - * - * @conn: virConnect connection - * @ncpus: number of CPUs in xmlCPUs - * @xmlCPUs: array of XML descriptions of host CPUs - * @flags: fine-tuning flags - * - * Computes the most feature-rich CPU which is compatible with all given - * host CPUs. - * - * Returns XML description of the computed CPU or NULL on error. - */ char *virConnectBaselineCPU(virConnectPtr conn, const char **xmlCPUs, unsigned int ncpus, -- 2.0.0

2 2

[libvirt] [PATCH] virsh: Remove bogus stat on log file
by Jiri Denemark 26 Jun '14

26 Jun '14

Let's just open the file right away and deal with errors. Moreover, there's no reason to forbid logging to, e.g., a pipe. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1bac842..3927120 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2794,29 +2794,9 @@ vshInit(vshControl *ctl) void vshOpenLogFile(vshControl *ctl) { - struct stat st; - if (ctl->logfile == NULL) return; - /* check log file */ - if (stat(ctl->logfile, &st) == -1) { - switch (errno) { - case ENOENT: - break; - default: - vshError(ctl, "%s", - _("failed to get the log file information")); - exit(EXIT_FAILURE); - } - } else { - if (!S_ISREG(st.st_mode)) { - vshError(ctl, "%s", _("the log path is not a file")); - exit(EXIT_FAILURE); - } - } - - /* log file open */ if ((ctl->log_fd = open(ctl->logfile, LOGFILE_FLAGS, FILE_MODE)) < 0) { vshError(ctl, "%s", _("failed to open the log file. check the log file path")); -- 2.0.0

2 2

[libvirt] [PATCHv5 00/19] block pull/commit on gluster volumes with relative backing
by Peter Krempa 25 Jun '14

25 Jun '14

This version is based on Eric's "[PATCH v3 0/5] Next round of active commit support". Otherwise I've fixed a few nits and just rebased it on top of the said series. Peter Krempa (19): util: string: Add helper to free non-NULL terminated string arrays util: storagefile: Introduce universal function to canonicalize paths storage: gluster: Add backend to return unique storage file path util: storage: Add helper to resolve relative path difference tests: virstoragetest: Remove "expBackingStore" field storage: Store relative path only for relatively backed storage tests: virstoragetest: Remove now unused pathAbs util: storage: Remove now redundant backingRelative from virStorageSource tests: virstoragetest: Don't test relative start of backing chains tests: virstoragetest: Remove unneeded relative test plumbing storage: Don't canonicalize paths unnecessarily storage: Don't store parent directory of an image explicitly qemu: caps: Add capability for change-backing-file command qemu: monitor: Add argument for specifying backing name for block commit qemu: monitor: Add support for backing name specification for block-stream lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE qemu: Add support for networked disks for block commit qemu: Add support for networked disks for block pull/block rebase include/libvirt/libvirt.h.in | 6 + src/libvirt.c | 10 + src/libvirt_private.syms | 3 + src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 87 ++++++- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_monitor.c | 20 +- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 17 ++ src/qemu/qemu_monitor_json.h | 2 + src/storage/storage_backend_gluster.c | 80 ++++++ src/storage/storage_driver.c | 15 +- src/util/virstoragefile.c | 392 ++++++++++++++++++++++++------ src/util/virstoragefile.h | 20 +- src/util/virstring.c | 20 ++ src/util/virstring.h | 1 + tests/qemumonitorjsontest.c | 6 +- tests/virstoragetest.c | 444 +++++++++++++++++++++------------- tools/virsh-domain.c | 29 ++- tools/virsh.pod | 9 +- 21 files changed, 882 insertions(+), 294 deletions(-) -- 1.9.3

3 47

[libvirt] [PATCH 0/5] Expose IOMMU and VFIO host capabilities
by Michal Privoznik 25 Jun '14

25 Jun '14

This is basically a v2 of one of my previous attempts, but that was a different set. So practically it's still a v1. Michal Privoznik (5): virhostdev: Move IOMMU and VFIO funcs from qemu conf: Introduce viremulator_capabilities Introduce virConnectGetEmulatorCapabilities virsh: Expose virConnectGetEmulatorCapabilities qemu: Implement virConnectGetEmulatorCapabilities docs/formatemulatorcaps.html.in | 115 +++++++++++++ docs/schemas/Makefile.am | 1 + docs/schemas/emulatorcapability.rng | 75 +++++++++ docs/sitemap.html.in | 4 + include/libvirt/libvirt.h.in | 6 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/Makefile.am | 3 +- src/conf/viremulator_capabilities.c | 139 +++++++++++++++ src/conf/viremulator_capabilities.h | 47 ++++++ src/driver.h | 7 + src/libvirt.c | 52 ++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 2 + src/qemu/qemu_capabilities.c | 78 +++++---- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_capabilitiespriv.h | 55 ++++++ src/qemu/qemu_driver.c | 96 ++++++++++- src/qemu/qemu_hostdev.c | 76 +-------- src/qemu/qemu_hostdev.h | 2 - src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 19 ++- src/remote_protocol-structs | 10 ++ src/util/virhostdev.c | 73 ++++++++ src/util/virhostdev.h | 4 + tests/Makefile.am | 28 ++- .../viremulatorcaps-basic.xml | 5 + .../viremulatorcaps-qemu-kvm-vfio.xml | 17 ++ tests/viremulatorcapabilitiesschematest | 11 ++ tests/viremulatorcapabilitiestest.c | 187 +++++++++++++++++++++ tests/virhostdevmock.c | 40 +++++ tools/virsh-host.c | 74 ++++++++ tools/virsh.pod | 13 ++ 33 files changed, 1143 insertions(+), 112 deletions(-) create mode 100644 docs/formatemulatorcaps.html.in create mode 100644 docs/schemas/emulatorcapability.rng create mode 100644 src/conf/viremulator_capabilities.c create mode 100644 src/conf/viremulator_capabilities.h create mode 100644 src/qemu/qemu_capabilitiespriv.h create mode 100644 tests/viremulatorcapabilitiesdata/viremulatorcaps-basic.xml create mode 100644 tests/viremulatorcapabilitiesdata/viremulatorcaps-qemu-kvm-vfio.xml create mode 100755 tests/viremulatorcapabilitiesschematest create mode 100644 tests/viremulatorcapabilitiestest.c create mode 100644 tests/virhostdevmock.c -- 1.8.5.5

4 17

Re: [libvirt] [Xen-devel] [PATCH RFC OSSTEST 7/9] Toolstack: Abstract away migration support check.
by Jim Fehlig 25 Jun '14

25 Jun '14

Jim Fehlig wrote: > Ian Campbell wrote: > >> Jim, >> >> What would be the right thing to do for this? The intention is for >> osstest to skip migration tests when that feature is unimplemented by >> the toolstack/xen/arch combination. >> >> It looks like the output of "virsh capabilities" indicates migration: >> <migration_features> >> <live/> >> <uri_transports> >> <uri_transport>tcp</uri_transport> >> </uri_transports> >> </migration_features> >> is that the right place to look? >> >> > > Yes. > > >> Will this capability be automagically suppressed on ARM until we >> implement it? >> > > Unfortunately, no :-/. Currently, the libvirt libxl driver will include > <migration_features> and call save, restore, and migrate regardless of arch. > > >> FYI xl uses LIBXL_HAVE_NO_SUSPEND_RESUME to figure this >> out... >> >> > > Ah, interesting. Thanks for the tip. I'll need to add similar logic in > the libxl driver. > Something like the attached patch (compile-tested only). You'll need an updated libvirt.git master to apply cleanly. Regards, Jim

2 4

[libvirt] [PATCH V4] enhance hostdev mode 'capabilities' process
by Jincheng Miao 25 Jun '14

25 Jun '14

Currently, only LXC has hostdev mode 'capabilities' support, so the other drivers should forbid to define it in XML. The hostdev mode check is added to devicesPostParseCallback() for each hypervisor driver. But there are some drivers lack function devicesPostParseCallback(), so only add check for qemu, libxl, openvz, uml, xen, xenapi. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/libxl/libxl_domain.c | 9 +++++++++ src/openvz/openvz_driver.c | 10 ++++++++++ src/qemu/qemu_domain.c | 10 ++++++++++ src/uml/uml_driver.c | 10 ++++++++++ src/xen/xen_driver.c | 10 ++++++++++ src/xenapi/xenapi_driver.c | 10 ++++++++++ 6 files changed, 59 insertions(+), 0 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 73242ac..3bcbd3d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -485,6 +485,15 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { virDomainHostdevDefPtr hostdev = dev->data.hostdev; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev mode 'capabilities' mode is not " + "supported in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 4c815ed..5019e62 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -113,6 +113,16 @@ openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev mode 'capabilities' mode is not " + "supported in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2e55c99..339b35d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -940,6 +940,16 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->source.data.nix.listen = true; } + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev mode 'capabilities' mode is not " + "supported in %s"), + virDomainVirtTypeToString(def->virtType)); + goto cleanup; + } + ret = 0; cleanup: diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 5ccd443..7397689 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -430,6 +430,16 @@ umlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev mode 'capabilities' mode is not " + "supported in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index bd51909..e938abc 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -343,6 +343,16 @@ xenDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, STRNEQ(def->os.type, "hvm")) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev mode 'capabilities' mode is not " + "supported in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 908448b..0113de8 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -55,6 +55,16 @@ xenapiDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, STRNEQ(def->os.type, "hvm")) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + /* forbid capabilities mode hostdev in this kind of hypervisor */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev mode 'capabilities' mode is not " + "supported in %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + } + return 0; } -- 1.7.1

2 1

[libvirt] [PATCH] Fix compiler warning while un-wraping python object to uint in libvirt_virNodeGetFreePages
by Nehal J Wani 25 Jun '14

25 Jun '14

Introduced by commit c8ba859bc78f5e3b0ed2590f4e8a7fa6c26ac08f On compiling libvirt-python against libvirt 1.2.6, we get: libvirt-override.c: In function ‘libvirt_virNodeGetFreePages’: libvirt-override.c:7811:9: warning: pointer targets in passing argument 2 of ‘libvirt_intUnwrap’ differ in signedness [-Wpointer-sign] if (libvirt_intUnwrap(tmp, &pages[i]) < 0) ^ In file included from libvirt-override.c:24:0: typewrappers.h:169:5: note: expected ‘int *’ but argument is of type ‘unsigned int *’ int libvirt_intUnwrap(PyObject *obj, int *val); ^ --- libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index 04fb4cd..40aefcc 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7808,7 +7808,7 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, for (i = 0; i < pyobj_pagesize_size; i++) { PyObject *tmp = PyList_GetItem(pyobj_pagesize, i); - if (libvirt_intUnwrap(tmp, &pages[i]) < 0) + if (libvirt_uintUnwrap(tmp, &pages[i]) < 0) goto cleanup; } -- 1.9.3

2 1

[libvirt] [PATCHv2 0/3] LXC drop/keep capabilities feature
by Cédric Bosdonnat 25 Jun '14

25 Jun '14

Changes since the previous version are: * add 'b *:* m' and 'c *:* m' to the device white list is CAP_MKNOD is requested instead of setting 'a *:* rwm'. * Add a policy='default|allow|deny' for the features/capabilities element. Cédric Bosdonnat (3): lxc: allow to keep or drop capabilities lxc domain from xml: convert lxc.cap.drop lxc: update doc to mention features/capabilities/* domain configuration docs/drvlxc.html.in | 47 +++++ docs/schemas/domaincommon.rng | 207 +++++++++++++++++++++ src/conf/domain_conf.c | 126 ++++++++++++- src/conf/domain_conf.h | 56 ++++++ src/libvirt_private.syms | 3 + src/lxc/lxc_cgroup.c | 8 + src/lxc/lxc_container.c | 123 ++++++++++-- src/lxc/lxc_native.c | 25 +++ src/util/vircgroup.c | 74 +++++++- src/util/vircgroup.h | 2 + tests/domainschemadata/domain-caps-features.xml | 28 +++ tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 2 + .../lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 8 + tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 4 + 22 files changed, 710 insertions(+), 25 deletions(-) create mode 100644 tests/domainschemadata/domain-caps-features.xml -- 1.8.4.5

1 3

[libvirt] [PATCH 0/8] storage_scsi: Stable SCSI host addressing
by John Ferlan 25 Jun '14

25 Jun '14

Just over a year ago, Osier Yang submitted some patches to provide stable SCSI host addressing support: http://www.redhat.com/archives/libvir-list/2013-June/msg00396.html Although reviewed - none of the patches were ever pushed and Osier never got back to the work. I eventually inherited the changes and now after languishing in the todo list - I took the time to rework things. There is a bz associated: https://bugzilla.redhat.com/show_bug.cgi?id=963817 Prior to leaving Red Hat, Osier and I spent some time revisiting the patch series and hashing out new/different ideas to come up with the same answer. My focus was to avoid the "generic recursive directory search" (patch 3), to not require having to know whether the scsi_host was using udev or hal, and to simplify as much as possible using existing data/information. The generic directory search I believe was less generic than intended and over complicated things. The old patches essentially used the output of a 'virsh nodedev-list scsi_host' and then selecting a resulting entry ran a 'virsh nodedev-dumpxml' to grab/use the resulting <parent> value. Taking that value and optionally adding a unique_id value was the basis for the design that would generate a PCI address (either in udev or hal format) and recursively search through /sys/devices looking for a matching address in either udev or hal format. These patches replace the bulk of the directory traversal logic with a more direct (and already in use) approach to scan the /sys/class/scsi_host directories looking for a matching PCI address found in the symlink of the files in the directory. The changed logic will add a new XML element 'parentaddr' to describe the scsi_host by it's PCI address. Additionally, the 'unique_id' has become a required attribute. The code reuses the virDevicePCIAddressParseXML() in order parse the required 'address' element. The 'address' will be in the expect PCI Address format like other described host devices. In order to help view the required unique_id value, the nodedev-dumpxml output has been adjusted to provide the <unique_id> value. This value will be an optional value on input. The documentation is updated to describe how to generate the address from the nodedev-dumpxml output. The new scsihosttest creates the expected PCI infrastructure on the fly since adding files with colons (':') is prohibited. There are multiple directories and hosts within each to ensure the search logic worked as expected. Reviewer notes: Patch 1 is new - it's just forcing the specific adapter.type checking Patches 2 & 3 are the former patches 1 & 2 with some edits to adjust for new XML syntax (and changed associated structure) Patch 4 is new - it's just utilizing the 'LINUX_SYSFS_SCSI_HOST_PREFIX' definition rather than using the hardcoded value Patches 5 & 6 are new. They handle the optional unique_id value (including using the new virNodeDevCapsDefParseIntOptional()) Patch 7 is similar to the former patch 5 insomuch as it's where the comparison of the PCI directory path and unique_id file is made. Patch 8 is similar to the former patch 7 insomuch as it's where the link is made between the scsi_host host# and the loading/refreshing of the scsi_host adapter. Former patches 3, 4, 6, and 8-11 are no longer used Please check my XML schema (patch 3) - I think I figured out the right syntax to use regarding using either "<name>" or "<parentaddr>" where "<parentaddr>" is an element. The syntax passes the make check, but it's not an area of expertise for me. Using parentaddr was preferred over overloading the parent attribute. John Ferlan (6): getAdapterName: check for SCSI_HOST scsi_backend: Use existing LINUX_SYSFS_SCSI_HOST_PREFIX definition virutil: Introduce virReadSCSIUniqueId Add unique_id to nodedev output scsi_host: Introduce virFindSCSIHostByPCI getAdapterName: Lookup stable scsi_host Osier Yang (2): virStoragePoolSourceAdapter: Refine the SCSI_HOST adapter name storage: Introduce parentaddr into virStoragePoolSourceAdapter docs/formatnode.html.in | 11 + docs/formatstorage.html.in | 130 +++++++-- docs/schemas/basictypes.rng | 24 +- docs/schemas/nodedev.rng | 6 + src/conf/node_device_conf.c | 23 +- src/conf/node_device_conf.h | 1 + src/conf/storage_conf.c | 111 +++++++- src/conf/storage_conf.h | 8 +- src/libvirt_private.syms | 2 + src/node_device/node_device_linux_sysfs.c | 6 + src/phyp/phyp_driver.c | 8 +- src/storage/storage_backend_scsi.c | 53 +++- src/test/test_driver.c | 5 +- src/util/virutil.c | 154 +++++++++++ src/util/virutil.h | 8 + tests/Makefile.am | 7 + .../pci_8086_27c5_scsi_host_0_unique_id.xml | 8 + tests/nodedevxml2xmltest.c | 1 + tests/scsihosttest.c | 308 +++++++++++++++++++++ .../pool-scsi-type-scsi-host-stable.xml | 19 ++ .../pool-scsi-type-scsi-host-stable.xml | 22 ++ tests/storagepoolxml2xmltest.c | 1 + 22 files changed, 855 insertions(+), 61 deletions(-) create mode 100644 tests/nodedevschemadata/pci_8086_27c5_scsi_host_0_unique_id.xml create mode 100644 tests/scsihosttest.c create mode 100644 tests/storagepoolxml2xmlin/pool-scsi-type-scsi-host-stable.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi-type-scsi-host-stable.xml -- 1.9.3

2 15

[libvirt] plan for libvirt-1.2.6 next release
by Daniel Veillard 25 Jun '14

25 Jun '14

In a nutshell, I went on vacations and forgot the freeze, oops sorry ! :-) So I'm suggesting to enter freeze for 1.2.6 tomorrow, then try to release still around the 1st next week, sorry for the late announcement, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] QEMU: Fix virtio-serial device support on PPC.
by Olivia Yin 25 Jun '14

25 Jun '14

Patch fd0f22ed414e114664f4140306834bedd19f52c9 discard virtio-serial device support on PPC machine. Most PPC boards don't use -chardev with non-virtio serial device except pseries which uses -device spapr-vty with -chardev. Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/qemu/qemu_capabilities.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e0a550..4541f52 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3493,19 +3493,18 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) return false; - if ((def->os.arch == VIR_ARCH_PPC) || (def->os.arch == VIR_ARCH_PPC64)) { - /* only pseries need -device spapr-vty with -chardev */ - return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && - chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO); - } - - if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64) && + (def->os.arch != VIR_ARCH_PPC) && (def->os.arch != VIR_ARCH_PPC64)) return true; /* This may not be true for all ARM machine types, but at least * the only supported non-virtio serial devices of vexpress and versatile * don't have the -chardev property wired up. */ + /* Currently PPC boards don't use -chardev for non-virtio serial device + * except pseries which uses -device spapr-vty with -chardev. */ return (chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO || (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO)); + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) || + (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO)); } -- 1.8.5

3 2

[libvirt] [PATCH 0/3] add binding guest numa nodes to host numa nodes support
by Chen Fan 25 Jun '14

25 Jun '14

Since qemu has supported numa option -memdev config: -object memory-backend-ram,size=1024M,policy=membind,host-nodes=0,id=ram-node0 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ for binding guest numa nodes to host numa nodes. So we introduce this capability in libvirt by configuration domain XML like: ... <cpu> <numa> <cell cpus='0-1' memdev='ram0'/> </numa> </cpu> ... <devices> <memdev type='ram' merge='yes' dump='yes' prealloc='yes'> <name>ram0</name> <capacity unit='MiB'>1000</capacity> <source host-nodes='0-1' policy='bind' /> </memdev> </devices> Chen Fan (3): numa: add '-numa memdev=' support conf: add memdev device in <devices> XML tests: add numa -memdev testing and docs support docs/formatdomain.html.in | 71 ++++++- docs/schemas/domaincommon.rng | 76 +++++++- src/conf/cpu_conf.c | 73 ++++++-- src/conf/cpu_conf.h | 13 +- src/conf/domain_conf.c | 203 ++++++++++++++++++++- src/conf/domain_conf.h | 42 +++++ src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 84 ++++++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_hotplug.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.args | 9 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml | 35 ++++ tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args | 10 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml | 35 ++++ tests/qemuxml2argvtest.c | 2 + 17 files changed, 644 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml -- 1.9.3

2 4

[libvirt] [libvirt-glib] [PATCH 0/2] Add API to fetch the snapshots of a GVirDomain
by Timm Bäder 25 Jun '14

25 Jun '14

The following two patches add gvir_domain_fetch_snapshots which uses virDomainListAllSnapshots to fetch snapshots from the virDomain (using the given GVirDomainSnapshotListFlags) and gvir_domain_get_snapshots which returns a GList of containing all of the snapshots last fetched. Timm Bäder (2): libvirt-gobject-domain: Add _fetch_snapshots libvirt-gobject-domain: Add _get_snapshots libvirt-gobject/libvirt-gobject-domain.c | 80 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 40 ++++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 3 ++ 3 files changed, 123 insertions(+) -- 2.0.0

2 4

[libvirt] [PATCH] libxl: prefer qdisk for <driver name='file'>
by Jim Fehlig 25 Jun '14

25 Jun '14

The libxl driver currently sets the disk backend to LIBXL_DISK_BACKEND_TAP when <driver name='file'> is specified in the <disk> config. qdisk should be prefered with this configuration, otherwise existing configuration such as the following, which worked with the old Xen driver, will not work with the libxl driver <disk type='file' device='cdrom'> <driver name='file'/> <source file='/path/to/some/iso'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> In addition, tap performs poorly compared to qdisk. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index fdbb522..4b6b5c0 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -796,7 +796,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) return -1; } x_disk->format = LIBXL_DISK_FORMAT_RAW; - x_disk->backend = LIBXL_DISK_BACKEND_TAP; + x_disk->backend = LIBXL_DISK_BACKEND_QDISK; } else if (STREQ(driver, "phy")) { if (format != VIR_STORAGE_FILE_NONE && format != VIR_STORAGE_FILE_RAW) { -- 1.8.4.5

3 5

[libvirt] [PATCH v4] Only set SELinux seclabel if supported by the host.
by Cédric Bosdonnat 25 Jun '14

25 Jun '14

This code depends on new API in libvirt-gconfig to extract the secmodels handled by the host. --- Diff to v3: * Added yet another missing g_object_unref. * Fixed the logic for supportsSelinux libvirt-sandbox/libvirt-sandbox-builder.c | 49 +++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index 48b3acc..d6b5735 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -322,12 +322,10 @@ static gboolean gvir_sandbox_builder_construct_devices(GVirSandboxBuilder *build return TRUE; } - -static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder G_GNUC_UNUSED, - GVirSandboxConfig *config G_GNUC_UNUSED, - const gchar *statedir G_GNUC_UNUSED, - GVirConfigDomain *domain, - GError **error G_GNUC_UNUSED) +static gboolean gvir_sandbox_builder_construct_security_selinux (GVirSandboxBuilder *builder, + GVirSandboxConfig *config, + GVirConfigDomain *domain, + GError **error) { GVirConfigDomainSeclabel *sec = gvir_config_domain_seclabel_new(); const char *label = gvir_sandbox_config_get_security_label(config); @@ -360,6 +358,45 @@ static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *buil return TRUE; } +static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder, + GVirSandboxConfig *config, + const gchar *statedir G_GNUC_UNUSED, + GVirConfigDomain *domain, + GError **error) +{ + GVirConnection *connection = gvir_sandbox_builder_get_connection(builder); + GVirConfigCapabilities *configCapabilities; + GVirConfigCapabilitiesHost *hostCapabilities; + GList *secmodels, *iter; + gboolean supportsSelinux = FALSE; + + /* What security models are available on the host? */ + if (!(configCapabilities = gvir_connection_get_capabilities(connection, error))) { + return FALSE; + } + + hostCapabilities = gvir_config_capabilities_get_host(configCapabilities); + + secmodels = gvir_config_capabilities_host_get_secmodels(hostCapabilities); + for (iter = secmodels; iter != NULL; iter = iter->next) { + if (g_str_equal(gvir_config_capabilities_host_secmodel_get_model( + GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL(iter->data)), "selinux")) + supportsSelinux = TRUE; + g_object_unref(iter->data); + } + + g_list_free(secmodels); + g_object_unref(hostCapabilities); + g_object_unref(configCapabilities); + g_object_unref(connection); + + if (supportsSelinux) + return gvir_sandbox_builder_construct_security_selinux(builder, config, + domain, error); + + return TRUE; +} + static gboolean gvir_sandbox_builder_clean_post_start_default(GVirSandboxBuilder *builder G_GNUC_UNUSED, GVirSandboxConfig *config G_GNUC_UNUSED, -- 1.8.4.5

3 3

[libvirt] [PATCH] LXC: check whether we get MemSwap[Total|Usage]
by Chen Hanxiao 25 Jun '14

25 Jun '14

Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_cgroup.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 8dfdc60..39e30ad 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -288,8 +288,11 @@ int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo) if (virLXCCgroupGetMemUsage(cgroup, meminfo) < 0) goto cleanup; - virLXCCgroupGetMemSwapTotal(cgroup, meminfo); - virLXCCgroupGetMemSwapUsage(cgroup, meminfo); + if (virLXCCgroupGetMemSwapTotal(cgroup, meminfo) < 0) + goto cleanup; + + if (virLXCCgroupGetMemSwapUsage(cgroup, meminfo) < 0) + goto cleanup; ret = 0; cleanup: -- 1.9.0

2 1

[libvirt] [PATCH] LXC: update comments of lxcDomainCreateXMLWithFiles() and lxcDomainCreateXML()
by Wangrui (K) 25 Jun '14

25 Jun '14

update comments of lxcDomainCreateXMLWithFiles() and lxcDomainCreateXML() Signed-off-by: Yue wenyuan <yuewenyuan(a)huawei.com> Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/lxc/lxc_driver.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 06f3e18..11bfb80 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1122,14 +1122,16 @@ static int lxcDomainCreateWithFlags(virDomainPtr dom, } /** - * lxcDomainCreateXML: + * lxcDomainCreateXMLWithFiles: * @conn: pointer to connection + * @nfiles: number of file descriptors passed + * @files: list of file descriptors passed * @xml: XML definition of domain * @flags: Must be 0 for now * * Creates a domain based on xml and starts it * - * Returns 0 on success or -1 in case of error + * Returns a new domain object or NULL in case of failure. */ static virDomainPtr lxcDomainCreateXMLWithFiles(virConnectPtr conn, @@ -1209,7 +1211,16 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, return dom; } - +/** + * lxcDomainCreateXML: + * @conn: pointer to connection + * @xml: XML definition of domain + * @flags: Must be 0 for now + * + * Creates a domain based on xml and starts it + * + * Returns a new domain object or NULL in case of failure. + */ static virDomainPtr lxcDomainCreateXML(virConnectPtr conn, const char *xml, -- 1.7.12.4

2 2

[libvirt] libvirt domblkstat result is quite different from the info acquired from "/proc/[pid]/io"
by coperd 24 Jun '14

24 Jun '14

Hi, all. I’m current doing monitoring jobs(CPU, memory and disk utilisation) on some KVM-based VMs using libvirt, but i came to some confusions. For the disk data(blkstat), I find that the results acquired by virDomainBlockStats is not consistent with the value read from /proc/[vm_pid]/io(i only care “rd_bytes" and “wr_bytes"), since libvirt doesn’t support host level monitoring, i have to calculate the host’s disk utilisation by using the /proc/diskstats. The weird thing is that individual VM’s disk data can be greater that the total disk’s during some sampling time. Can someone explain this ?

2 1