- Devel - libvirt List Archives

[libvirt] [PATCH] numad: Set memory policy according to the advisory nodeset from numad
by Osier Yang 08 May '12

08 May '12

Though numad will manage the memory allocation of task dynamically, but it wants management application (libvirt) to pre-set the memory policy according to the advisory nodeset returned from querying numad, (just like pre-bind CPU nodeset for domain process), and thus the performance could benifit much more from it. This patch introduces new XML tag 'placement', value 'auto' indicates whether to set the memory policy with the advisory nodeset from numad, and its value defaults to 'static'. e.g. <numatune> <memory placement='auto' mode='interleave'/> </numatune> Just like what current "numatune" does, the 'auto' numa memory policy setting uses libnuma's API too. So, to full drive numad, one needs to specify placement='auto' for both "<vcpu>" and "<numatune><memory .../></numatune>". It's a bit inconvenient, but makes sense from semantics' point of view. --- An alternative way is to not introduce the new XML tag, and pre-set the memory policy implicitly with "<vcpu placement='auto'>4</vcpu>", but IMHO it implies too much, and I'd not like go this way unless the new XML tag is not accepted. --- docs/formatdomain.html.in | 11 ++- docs/schemas/domaincommon.rng | 39 +++++++--- libvirt.spec.in | 1 + src/conf/domain_conf.c | 96 ++++++++++++++++-------- src/conf/domain_conf.h | 9 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_process.c | 79 +++++++++++-------- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 4 + tests/qemuxml2argvdata/qemuxml2argv-numad.xml | 31 ++++++++ tests/qemuxml2argvtest.c | 1 + 10 files changed, 194 insertions(+), 79 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numad.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numad.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e1fe0c4..01b3124 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -580,9 +580,14 @@ The optional <code>memory</code> element specifies how to allocate memory for the domain process on a NUMA host. It contains two attributes, attribute <code>mode</code> is either 'interleave', 'strict', - or 'preferred', - attribute <code>nodeset</code> specifies the NUMA nodes, it leads same - syntax with attribute <code>cpuset</code> of element <code>vcpu</code>. + or 'preferred', attribute <code>nodeset</code> specifies the NUMA nodes, + it leads same syntax with attribute <code>cpuset</code> of element + <code>vcpu</code>, the optional attribute <code>placement</code> can be + used to indicate the memory placement mode for domain process, its value + can be either "static" or "auto", defaults to "static". "auto" indicates + the domain process will only allocate memory from the advisory nodeset + returned from querying numad, and the value of attribute <code>nodeset</code> + will be ignored if it's specified. Since 0.9.3 </dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8419ccc..9b509f1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -562,16 +562,35 @@ <element name="numatune"> <optional> <element name="memory"> - <attribute name="mode"> - <choice> - <value>strict</value> - <value>preferred</value> - <value>interleave</value> - </choice> - </attribute> - <attribute name="nodeset"> - <ref name="cpuset"/> - </attribute> + <choice> + <group> + <attribute name="mode"> + <choice> + <value>strict</value> + <value>preferred</value> + <value>interleave</value> + </choice> + </attribute> + <attribute name='placement'> + <choice> + <value>static</value> + <value>auto</value> + </choice> + </attribute> + </group> + <group> + <attribute name="mode"> + <choice> + <value>strict</value> + <value>preferred</value> + <value>interleave</value> + </choice> + </attribute> + <attribute name="nodeset"> + <ref name="cpuset"/> + </attribute> + </group> + </choice> </element> </optional> </element> diff --git a/libvirt.spec.in b/libvirt.spec.in index e7e0a55..0b119c2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -454,6 +454,7 @@ BuildRequires: scrub %if %{with_numad} BuildRequires: numad +BuildRequires: numactl-devel %endif %description diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3fce7e5..b728cb6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -640,6 +640,11 @@ VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_LAST, "closed", "open"); +VIR_ENUM_IMPL(virDomainNumatuneMemPlacementMode, + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_LAST, + "static", + "auto"); + #define virDomainReportError(code, ...) \ virReportErrorHelper(VIR_FROM_DOMAIN, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) @@ -8023,30 +8028,22 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "memory")) { - tmp = virXMLPropString(cur, "nodeset"); - + tmp = virXMLPropString(cur, "placement"); + int placement_mode; if (tmp) { - char *set = tmp; - int nodemasklen = VIR_DOMAIN_CPUMASK_LEN; - - if (VIR_ALLOC_N(def->numatune.memory.nodemask, - nodemasklen) < 0) { - virReportOOMError(); + if ((placement_mode = + virDomainNumatuneMemPlacementModeTypeFromString(tmp)) < 0) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("Unsupported memory placement " + "mode '%s'"), tmp); + VIR_FREE(tmp); goto error; } - - /* "nodeset" leads same syntax with "cpuset". */ - if (virDomainCpuSetParse(set, 0, - def->numatune.memory.nodemask, - nodemasklen) < 0) - goto error; VIR_FREE(tmp); } else { - virDomainReportError(VIR_ERR_XML_ERROR, "%s", - _("nodeset for NUMA memory " - "tuning must be set")); - goto error; + placement_mode = VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC; } + def->numatune.memory.placement_mode = placement_mode; tmp = virXMLPropString(cur, "mode"); if (tmp) { @@ -8055,13 +8052,40 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, virDomainReportError(VIR_ERR_XML_ERROR, _("Unsupported NUMA memory " "tuning mode '%s'"), - tmp); + tmp); goto error; } VIR_FREE(tmp); } else { def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; } + + if (placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC) { + tmp = virXMLPropString(cur, "nodeset"); + if (tmp) { + char *set = tmp; + int nodemasklen = VIR_DOMAIN_CPUMASK_LEN; + + if (VIR_ALLOC_N(def->numatune.memory.nodemask, + nodemasklen) < 0) { + virReportOOMError(); + goto error; + } + + /* "nodeset" leads same syntax with "cpuset". */ + if (virDomainCpuSetParse(set, 0, + def->numatune.memory.nodemask, + nodemasklen) < 0) + goto error; + VIR_FREE(tmp); + } else { + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("nodeset for NUMA memory " + "tuning must be set")); + goto error; + } + } } else { virDomainReportError(VIR_ERR_XML_ERROR, _("unsupported XML element %s"), @@ -12491,25 +12515,33 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->cputune.period || def->cputune.quota) virBufferAddLit(buf, " </cputune>\n"); - if (def->numatune.memory.nodemask) { + if (def->numatune.memory.nodemask || + (def->numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_AUTO)) { virBufferAddLit(buf, " <numatune>\n"); const char *mode; char *nodemask = NULL; - - nodemask = virDomainCpuSetFormat(def->numatune.memory.nodemask, - VIR_DOMAIN_CPUMASK_LEN); - if (nodemask == NULL) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to format nodeset for " - "NUMA memory tuning")); - goto cleanup; - } + const char *placement; mode = virDomainNumatuneMemModeTypeToString(def->numatune.memory.mode); - virBufferAsprintf(buf, " <memory mode='%s' nodeset='%s'/>\n", - mode, nodemask); - VIR_FREE(nodemask); + virBufferAsprintf(buf, " <memory mode='%s' ", mode); + if (def->numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC) { + nodemask = virDomainCpuSetFormat(def->numatune.memory.nodemask, + VIR_DOMAIN_CPUMASK_LEN); + if (nodemask == NULL) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to format nodeset for " + "NUMA memory tuning")); + goto cleanup; + } + virBufferAsprintf(buf, "nodeset='%s'/>\n", nodemask); + VIR_FREE(nodemask); + } else { + placement = virDomainNumatuneMemPlacementModeTypeToString(def->numatune.memory.placement_mode); + virBufferAsprintf(buf, "placement='%s'/>\n", placement); + } virBufferAddLit(buf, " </numatune>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5aa8fc1..9aade99 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1416,6 +1416,13 @@ enum virDomainCpuPlacementMode { VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST, }; +enum virDomainNumatuneMemPlacementMode { + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC = 0, + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_AUTO, + + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_LAST, +}; + typedef struct _virDomainTimerCatchupDef virDomainTimerCatchupDef; typedef virDomainTimerCatchupDef *virDomainTimerCatchupDefPtr; struct _virDomainTimerCatchupDef { @@ -1504,6 +1511,7 @@ struct _virDomainNumatuneDef { struct { char *nodemask; int mode; + int placement_mode; } memory; /* Future NUMA tuning related stuff should go here. */ @@ -2176,6 +2184,7 @@ VIR_ENUM_DECL(virDomainGraphicsSpiceStreamingMode) VIR_ENUM_DECL(virDomainGraphicsSpiceClipboardCopypaste) VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode) VIR_ENUM_DECL(virDomainNumatuneMemMode) +VIR_ENUM_DECL(virDomainNumatuneMemPlacementMode) VIR_ENUM_DECL(virDomainSnapshotState) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 88f8a21..c9c1486 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -400,6 +400,8 @@ virDomainNostateReasonTypeFromString; virDomainNostateReasonTypeToString; virDomainNumatuneMemModeTypeFromString; virDomainNumatuneMemModeTypeToString; +virDomainNumatuneMemPlacementModeTypeFromString; +virDomainNumatuneMemPlacementModeTypeToString; virDomainObjAssignDef; virDomainObjCopyPersistentDef; virDomainObjGetPersistentDef; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f1401e1..72beb83 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1657,7 +1657,8 @@ qemuProcessDetectVcpuPIDs(struct qemud_driver *driver, */ #if HAVE_NUMACTL static int -qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) +qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm, + const char *nodemask) { nodemask_t mask; int mode = -1; @@ -1666,9 +1667,18 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) int i = 0; int maxnode = 0; bool warned = false; + virDomainNumatuneDef numatune = vm->def->numatune; + const char *tmp_nodemask = NULL; - if (!vm->def->numatune.memory.nodemask) - return 0; + if (numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC) { + if (!numatune.memory.nodemask) + return 0; + tmp_nodemask = numatune.memory.nodemask; + } else if (numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_AUTO) { + tmp_nodemask = nodemask; + } VIR_DEBUG("Setting NUMA memory policy"); @@ -1679,11 +1689,10 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) } maxnode = numa_max_node() + 1; - /* Convert nodemask to NUMA bitmask. */ nodemask_zero(&mask); for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; i++) { - if (vm->def->numatune.memory.nodemask[i]) { + if (tmp_nodemask[i]) { if (i > NUMA_NUM_NODES) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Host cannot support NUMA node %d"), i); @@ -1693,12 +1702,12 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) VIR_WARN("nodeset is out of range, there is only %d NUMA " "nodes on host", maxnode); warned = true; - } + } nodemask_set(&mask, i); } } - mode = vm->def->numatune.memory.mode; + mode = numatune.memory.mode; if (mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { numa_set_bind_policy(1); @@ -1789,7 +1798,8 @@ qemuGetNumadAdvice(virDomainDefPtr def ATTRIBUTE_UNUSED) */ static int qemuProcessInitCpuAffinity(struct qemud_driver *driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + const char *nodemask) { int ret = -1; int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; @@ -1815,27 +1825,6 @@ qemuProcessInitCpuAffinity(struct qemud_driver *driver, } if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - char *nodeset = NULL; - char *nodemask = NULL; - - nodeset = qemuGetNumadAdvice(vm->def); - if (!nodeset) - goto cleanup; - - if (VIR_ALLOC_N(nodemask, VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportOOMError(); - VIR_FREE(nodeset); - goto cleanup; - } - - if (virDomainCpuSetParse(nodeset, 0, nodemask, - VIR_DOMAIN_CPUMASK_LEN) < 0) { - VIR_FREE(nodemask); - VIR_FREE(nodeset); - goto cleanup; - } - VIR_FREE(nodeset); - /* numad returns the NUMA node list, convert it to cpumap */ int prev_total_ncpus = 0; for (i = 0; i < driver->caps->host.nnumaCell; i++) { @@ -1852,8 +1841,6 @@ qemuProcessInitCpuAffinity(struct qemud_driver *driver, } prev_total_ncpus += cur_ncpus; } - - VIR_FREE(nodemask); } else { if (vm->def->cpumask) { /* XXX why don't we keep 'cpumask' in the libvirt cpumap @@ -2564,6 +2551,8 @@ static int qemuProcessHook(void *data) struct qemuProcessHookData *h = data; int ret = -1; int fd; + char *nodeset = NULL; + char *nodemask = NULL; /* Some later calls want pid present */ h->vm->pid = getpid(); @@ -2597,14 +2586,34 @@ static int qemuProcessHook(void *data) if (qemuAddToCgroup(h->driver, h->vm->def) < 0) goto cleanup; + if ((h->vm->def->placement_mode == + VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) || + (h->vm->def->numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_AUTO)) { + nodeset = qemuGetNumadAdvice(h->vm->def); + if (!nodeset) + goto cleanup; + + VIR_DEBUG("Nodeset returned from numad: %s", nodeset); + + if (VIR_ALLOC_N(nodemask, VIR_DOMAIN_CPUMASK_LEN) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virDomainCpuSetParse(nodeset, 0, nodemask, + VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + } + /* This must be done after cgroup placement to avoid resetting CPU * affinity */ VIR_DEBUG("Setup CPU affinity"); - if (qemuProcessInitCpuAffinity(h->driver, h->vm) < 0) + if (qemuProcessInitCpuAffinity(h->driver, h->vm, nodemask) < 0) goto cleanup; - if (qemuProcessInitNumaMemoryPolicy(h->vm) < 0) - return -1; + if (qemuProcessInitNumaMemoryPolicy(h->vm, nodemask) < 0) + goto cleanup; VIR_DEBUG("Setting up security labelling"); if (virSecurityManagerSetProcessLabel(h->driver->securityManager, h->vm->def) < 0) @@ -2614,6 +2623,8 @@ static int qemuProcessHook(void *data) cleanup: VIR_DEBUG("Hook complete ret=%d", ret); + VIR_FREE(nodeset); + VIR_FREE(nodemask); return ret; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args new file mode 100644 index 0000000..23bcb70 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 2 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ +/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.xml b/tests/qemuxml2argvdata/qemuxml2argv-numad.xml new file mode 100644 index 0000000..c87ec49 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='auto'>2</vcpu> + <numatune> + <memory mode="interleave" placement='auto'/> + </numatune> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e47a385..3e529e2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -732,6 +732,7 @@ mymain(void) DO_TEST("blkiotune-device", false, QEMU_CAPS_NAME); DO_TEST("cputune", false, QEMU_CAPS_NAME); DO_TEST("numatune-memory", false, NONE); + DO_TEST("numad", false, NONE); DO_TEST("blkdeviotune", false, QEMU_CAPS_NAME, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_IOTUNE); -- 1.7.7.3

2 2

[libvirt] internal error hostname of destination resolved to localhost, but migration requires an FQDN
by William Herry 08 May '12

08 May '12

HI I use virsh to migrate kvm virtual machine, it show me this error I already use ip address in my command: virsh migrate --live kvm-test qemu+ssh://root@my_ip:port/system after a few tries I make it work by change the hostname of dest to something else rather than localhost, this looks like a bug cause a already this virsh the ip address, or any thing I misunderstand? regards -- =========================== William Herry WilliamHerryChina(a)Gmail.com

2 2

[libvirt] [PATCHv6 0/8] live block migration
by Eric Blake 07 May '12

07 May '12

v5: https://www.redhat.com/archives/libvir-list/2012-April/msg00753.html Differences in v6: - rebased on top of accepted patches v5:1-4/23 and latest tree - corresponds to patches v5:7-14/23 - patch 5/8 is new - patch v5:12/23 is dropped; qemu is giving us something better, but I still need to finish writing that patch - patch v5:11/23 comments were incorporated, with better cleanup on error - tweak series to deal with potential for qemu 1.1 to support copy but not pivot - limit series to just the bare minimum for now; patches from v5:15/23 are still on my tree, but not worth submitting until we know more about what qemu will provide I'm posting this more for reference for my efforts to backport this to RHEL 6 where I have tested against a candidate qemu build, and don't this is ready for upstream until we have confirmation that actual patches have gone into at least the qemu block queue for 1.1. Eric Blake (8): blockjob: react to active block copy blockjob: add qemu capabilities related to block jobs blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: make drive-reopen safer blockjob: implement block copy for qemu blockjob: allow for existing files blockjob: allow mirroring under SELinux src/conf/domain_conf.c | 12 ++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 396 +++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 37 ++++ src/qemu/qemu_monitor.h | 11 ++ src/qemu/qemu_monitor_json.c | 67 +++++++ src/qemu/qemu_monitor_json.h | 18 ++- 11 files changed, 549 insertions(+), 6 deletions(-) -- 1.7.7.6

3 15

[libvirt] [PATCH] virsh: avoid heap corruption leading to virsh abort
by Jim Meyering 07 May '12

07 May '12

Investigating a build problem reported by Laine, I was surprised to see "make check" fail on F17 due to a glibc invalid free abort. Ok to push to master? >From 61a559e0b2f4bded3059c5be7c958e2276f7fd16 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 7 May 2012 21:22:09 +0200 Subject: [PATCH] virsh: avoid heap corruption leading to virsh abort * tools/virsh.c (vshParseSnapshotDiskspec): Fix off-by-3 memmove that would corrupt heap when parsing escaped --diskspec comma. Bug introduced via commit v0.9.4-260-g35d52b5. --- tools/virsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1207ac9..dd9292a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -16107,7 +16107,7 @@ vshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) while ((tmp = strchr(tmp, ','))) { if (tmp[1] == ',') { /* Recognize ,, as an escape for a literal comma */ - memmove(&tmp[1], &tmp[2], len - (tmp - spec) + 2); + memmove(&tmp[1], &tmp[2], len - (tmp - spec) - 2 + 1); len--; tmp++; continue; -- 1.7.10.1.457.g8275905

2 2

[libvirt] [PATCHv3 0/4] util: fix libvirtd startup failure due to netlink error
by Laine Stump 07 May '12

07 May '12

The initial patch in this series is the same as the single patch I provided before, but in addition there are 3 new patches that take care of the fallout from 1/4 by: 2/4) removing hard-coding of the src nl_pid when virNetLinkCommand is sending a message 3/4) adding a helper function to retrieve the local nl_pid from a libnl socket and 4/4) using that value when appropriate (I think). As before, I'm unable to fully test this myself, so I won't push unless/until I get verification it works.

3 10

[libvirt] [PATCH] openvz: simplify openvzDomainDefineCmd by using virCommandPtr
by Guido Günther 07 May '12

07 May '12

--- While working on setting filesystem quotas I came accross this and I figured I'll send this in advance because of the diffstat. Cheers, -- Guido src/openvz/openvz_driver.c | 79 +++++++++++--------------------------------- 1 file changed, 19 insertions(+), 60 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 91f5d49..8cceed6 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -100,68 +100,31 @@ static void cmdExecFree(const char *cmdExec[]) /* generate arguments to create OpenVZ container return -1 - error 0 - OK + Caller has to free the cmd */ -static int -openvzDomainDefineCmd(const char *args[], - int maxarg, virDomainDefPtr vmdef) +static virCommandPtr +openvzDomainDefineCmd(virDomainDefPtr vmdef) { - int narg; - - for (narg = 0; narg < maxarg; narg++) - args[narg] = NULL; + virCommandPtr cmd = virCommandNewArgList(VZCTL, + "--quiet", + "create", + NULL); if (vmdef == NULL) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("Container is not defined")); - return -1; + virCommandFree(cmd); + return NULL; } -#define ADD_ARG(thisarg) \ - do { \ - if (narg >= maxarg) \ - goto no_memory; \ - args[narg++] = thisarg; \ - } while (0) - -#define ADD_ARG_LIT(thisarg) \ - do { \ - if (narg >= maxarg) \ - goto no_memory; \ - if ((args[narg++] = strdup(thisarg)) == NULL) \ - goto no_memory; \ - } while (0) - - narg = 0; - ADD_ARG_LIT(VZCTL); - ADD_ARG_LIT("--quiet"); - ADD_ARG_LIT("create"); - - ADD_ARG_LIT(vmdef->name); - ADD_ARG_LIT("--name"); - ADD_ARG_LIT(vmdef->name); + virCommandAddArgList(cmd, vmdef->name, "--name", vmdef->name, NULL); if (vmdef->nfss == 1 && vmdef->fss[0]->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) { - ADD_ARG_LIT("--ostemplate"); - ADD_ARG_LIT(vmdef->fss[0]->src); - } -#if 0 - if ((vmdef->profile && *(vmdef->profile))) { - ADD_ARG_LIT("--config"); - ADD_ARG_LIT(vmdef->profile); + virCommandAddArgList(cmd, "--ostemplate", vmdef->fss[0]->src, NULL); } -#endif - ADD_ARG(NULL); - return 0; - -no_memory: - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not put argument to %s"), VZCTL); - return -1; - -#undef ADD_ARG -#undef ADD_ARG_LIT + return cmd; } @@ -170,8 +133,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) int ret = -1; int vpsid; char * confdir = NULL; - const char *prog[OPENVZ_MAX_ARG]; - prog[0] = NULL; + virCommandPtr cmd = NULL; if (vmdef->nfss > 1) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -210,24 +172,21 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) _("Could not set the source dir for the filesystem")); goto cleanup; } - } - else - { - if (openvzDomainDefineCmd(prog, OPENVZ_MAX_ARG, vmdef) < 0) { - VIR_ERROR(_("Error creating command for container")); + } else { + cmd = openvzDomainDefineCmd(vmdef); + if (cmd == NULL) goto cleanup; - } - if (virRun(prog, NULL) < 0) { + if (virCommandRun(cmd, NULL) < 0) goto cleanup; - } } ret = 0; cleanup: VIR_FREE(confdir); - cmdExecFree(prog); + virCommandFree(cmd); + return ret; } -- 1.7.10

2 2

[libvirt] [PATCH] docs: Add 'maintenance releases' link in 'News' sidebar
by Cole Robinson 07 May '12

07 May '12

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/sitemap.html.in | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 8f58d46..206040c 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -13,8 +13,14 @@ Details of new features and bugs fixed in each release <ul> <li> + <a href="http://wiki.libvirt.org/page/Maintenance_Releases">Maintenance Releases</a> + Details about libvirt maintenance releases + </li> + </ul> + <ul> + <li> <a href="http://libvirt.org/git/?p=libvirt.git;a=log">Git log</a> - Latest commit messages from the source repository + Latest commit messages from the source repository </li> </ul> </li> -- 1.7.7.6

2 2

[libvirt] [PATCH] rpm: Handle different source URLs for maint releases
by Cole Robinson 07 May '12

07 May '12

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e7e0a55..95d8af4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -276,10 +276,14 @@ Version: @VERSION@ Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries -Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ +%if %(echo %{version} | grep -o \\. | wc -l) == 3 +%define mainturl stable_updates/ +%endif +Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz + %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} %if %{with_network} -- 1.7.7.6

2 2

[libvirt] [PATCH 0/2] Fix migration to older versions of libvirt
by Jiri Denemark 07 May '12

07 May '12

This series deals with migrating to older versions of libvirt broken by unconditionally added USB controller into domain XML. Jiri Denemark (2): qemu: Don't use virDomainDefFormat* directly qemu: Emit compatible XML when migrating a domain src/qemu/qemu_domain.c | 88 ++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_domain.h | 15 ++++++-- src/qemu/qemu_driver.c | 26 ++++++++------ src/qemu/qemu_migration.c | 30 +++++++++------ src/qemu/qemu_process.c | 8 ++-- 5 files changed, 128 insertions(+), 39 deletions(-) -- 1.7.8.6

2 5

[libvirt] Submission Deadline Extension
by VHPC 12 06 May '12

06 May '12

we apologize if you receive multiple copies of this CFP =================================================================== CALL FOR PAPERS 7th Workshop on Virtualization in High-Performance Cloud Computing VHPC '12 as part of Euro-Par 2012, Rhodes Island, Greece =================================================================== Date: August 28, 2012 Workshop URL: http://vhpc.org SUBMISSION DEADLINE: June 11, 2012 - Full paper submission (extended) SCOPE: Virtualization has become a common abstraction layer in modern data centers, enabling resource owners to manage complex infrastructure independently of their applications. Conjointly, virtualization is becoming a driving technology for a manifold of industry grade IT services. The cloud concept includes the notion of a separation between resource owners and users, adding services such as hosted application frameworks and queueing. Utilizing the same infrastructure, clouds carry significant potential for use in high-performance scientific computing. The ability of clouds to provide for requests and releases of vast computing resources dynamically and close to the marginal cost of providing the services is unprecedented in the history of scientific and commercial computing. Distributed computing concepts that leverage federated resource access are popular within the grid community, but have not seen previously desired deployed levels so far. Also, many of the scientific data centers have not adopted virtualization or cloud concepts yet. This workshop aims to bring together industrial providers with the scientific community in order to foster discussion, collaboration and mutual exchange of knowledge and experience. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections. Presentations may be accompanied by interactive demonstrations. TOPICS Topics of interest include, but are not limited to: Higher-level cloud architectures, focusing on issues such as: - Languages for describing highly-distributed compute jobs - Workload characterization for VM-based environments - Optimized communication libraries/protocols in the cloud - Cross-layer optimization of numeric algorithms on VM infrastructure - System and process/bytecode VM convergence - Cloud frameworks and API sets - Checkpointing/migration of large compute jobs - Instrumentation interfaces and languages - VMM performance (auto-)tuning on various load types - Cloud reliability, fault-tolerance, and security - Software as a Service (SaaS) architectures - Research and education use cases - Virtualization in cloud, cluster and grid environments - Cross-layer VM optimizations - Cloud use cases including optimizations - VM-based cloud performance modelling - Performance and cost modelling Lower-level design challenges for Hypervisors, VM-aware I/O devices, hardware accelerators or filesystems in VM environments, especially: - Cloud, grid and distributed filesystems - Hardware for I/O virtualization (storage/network/accelerators) - Storage and network I/O subsystems in virtualized environments - Novel software approaches to I/O virtualization - Paravirtualized I/O subsystems for modified/unmodified guests - Virtualization-aware cluster interconnects - Direct device assignment - NUMA-aware subsystems in virtualized environments - Hardware Accelerators in virtualization (GPUs/FPGAs) - Hardware extensions for virtualization - VMMs/Hypervisors for embedded systems Data Center management methods, including: - QoS and and service levels - VM cloud and cluster distribution algorithms - VM load-balancing in Clouds - Hypervisor extensions and tools for cluster and grid computing - Fault tolerant VM environments - Virtual machine monitor platforms - Management, deployment and monitoring of VM-based environments - Cluster provisioning in the Cloud PAPER SUBMISSION Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. Accepted papers will be published in the Springer LNCS series - the format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: http://www.springer.de/comp/lncs/authors.html Style template: ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip Abstract Submission Link: http://edas.info/newPaper.php?c=11943 IMPORTANT DATES Rolling abstract submission June 11, 2012 - Full paper submission (extended) June 29, 2012 - Acceptance notification July 20, 2012 - Camera-ready version due August 28, 2012 - Workshop Date CHAIR Michael Alexander (chair), TU Wien, Austria Gianluigi Zanetti (co-chair), CRS4, Italy Anastassios Nanos (co-chair), NTUA, Greece PROGRAM COMMITTEE Paolo Anedda, CRS4, Italy Giovanni Busonera, CRS4, Italy Brad Calder, Microsoft, USA Roberto Canonico, University of Napoli Federico II, Italy Tommaso Cucinotta, Alcatel-Lucent Bell Labs, Ireland Werner Fischer, Thomas-Krenn AG, Germany William Gardner, University of Guelph, USA Marcus Hardt, Forschungszentrum Karlsruhe, Germany Sverre Jarp, CERN, Switzerland Shantenu Jha, Louisiana State University, USA Xuxian Jiang, NC State, USA Nectarios Koziris, National Technical University of Athens, Greece Simone Leo, CRS4, Italy Ignacio Llorente, Universidad Complutense de Madrid, Spain Naoya Maruyama, Tokyo Institute of Technology, Japan Jean-Marc Menaud, Ecole des Mines de Nantes, France Dimitrios Nikolopoulos, Foundation for Research&Technology Hellas, Greece Jose Renato Santos, HP Labs, USA Walter Schwaiger, TU Wien, Austria Yoshio Turner, HP Labs, USA Kurt Tutschku, University of Vienna, Austria Lizhe Wang, Indiana University, USA Chao-Tung Yang, Tunghai University, Taiwan DURATION: Workshop Duration is one day. GENERAL INFORMATION The workshop will be held as part of Euro-Par 2012. Euro-Par 2012: http://europar2012.cti.gr/

1 0

[libvirt] [PATCH] qemu: don't modify domain on failed blockiotune
by Eric Blake 04 May '12

04 May '12

If you have a qemu build that lacks the blockio tune monitor command, then this command: $ virsh blkdeviotune rhel6u2 hda --total_bytes_sec 1000 error: Unable to change block I/O throttle error: internal error Unexpected error fails as expected (well, the error message is lousy), but the next dumpxml shows that the domain was modified anyway. Worse, that means if you save the domain then restore it, the restore will likely fail due to throttling being unsupported, even though no throttling should even be active because the monitor command failed in the first place. * src/qemu/qemu_driver.c (qemuDomainSetBlockIoTune): Check for error before making modification permanent. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a36c348..2fde15b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12011,9 +12011,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetBlockIoThrottle(priv->mon, device, &info); qemuDomainObjExitMonitorWithDriver(driver, vm); - vm->def->disks[idx]->blkdeviotune = info; if (ret < 0) goto endjob; + vm->def->disks[idx]->blkdeviotune = info; } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { -- 1.7.7.6

2 4

[libvirt] [PATCHv2] util: fix libvirtd startup failure due to netlink error
by Laine Stump 04 May '12

04 May '12

This solves the problem detailed in: https://bugzilla.redhat.com/show_bug.cgi?id=816465 and further detailed in https://www.redhat.com/archives/libvir-list/2012-May/msg00202.htm A short explanation is included in the comments of the patch itself. Even with ACK, I will wait to push this until I have verification that it does not break lldpad<-->libvirtd communication (if it does, I may need to use the nl_handle allocated during virNetlinkStartup() for virNetlinkEventServiceStart()). --- daemon/libvirtd.c | 6 +++++ src/libvirt_private.syms | 2 ++ src/util/virnetlink.c | 67 +++++++++++++++++++++++++++++++++++++++++++++- src/util/virnetlink.h | 5 +++- 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b098f6a..5d57b50 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1007,6 +1007,11 @@ int main(int argc, char **argv) { goto cleanup; } + if (virNetlinkStartup() < 0) { + ret = VIR_DAEMON_ERR_INIT; + goto cleanup; + } + if (!(srv = virNetServerNew(config->min_workers, config->max_workers, config->prio_workers, @@ -1143,6 +1148,7 @@ cleanup: virNetServerProgramFree(qemuProgram); virNetServerClose(srv); virNetServerFree(srv); + virNetlinkShutdown(); if (statuswrite != -1) { if (ret != 0) { /* Tell parent of daemon what failed */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d4038b2..e911774 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1330,6 +1330,8 @@ virNetlinkEventRemoveClient; virNetlinkEventServiceIsRunning; virNetlinkEventServiceStop; virNetlinkEventServiceStart; +virNetlinkShutdown; +virNetlinkStartup; # virnetmessage.h diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index b2e9d51..a249e94 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010-2012 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -88,10 +88,63 @@ static int nextWatch = 1; # define NETLINK_EVENT_ALLOC_EXTENT 10 static virNetlinkEventSrvPrivatePtr server = NULL; +static struct nl_handle *placeholder_nlhandle = NULL; /* Function definitions */ /** + * virNetlinkStartup: + * + * Perform any initialization that needs to take place before the + * program starts up worker threads. This is currently used to assure + * that an nl_handle is allocated prior to any attempts to bind a + * netlink socket. For a discussion of why this is necessary, please + * see the following email message: + * + * https://www.redhat.com/archives/libvir-list/2012-May/msg00202.html + * + * The short version is that, without this placeholder allocation of + * an nl_handle that is never used, it is possible for nl_connect() in + * one thread to collide with a direct bind() of a netlink socket in + * another thread, leading to failure of the operation (which could + * lead to failure of libvirtd to start). Since getaddrinfo() (used by + * libvirtd in virSocketAddrParse, which is called quite frequently + * during startup) directly calls bind() on a netlink socket, this is + * actually a very common occurence (15-20% failure rate on some + * hardware). + * + * Returns 0 on success, -1 on failure. + */ +int +virNetlinkStartup(void) +{ + if (placeholder_nlhandle) + return 0; + placeholder_nlhandle = nl_handle_alloc(); + if (!placeholder_nlhandle) { + virReportSystemError(errno, "%s", + _("cannot allocate placeholder nlhandle for netlink")); + return -1; + } + return 0; +} + +/** + * virNetlinkShutdown: + * + * Undo any initialization done by virNetlinkStartup. This currently + * destroys the placeholder nl_handle. + */ +void +virNetlinkShutdown(void) +{ + if (placeholder_nlhandle) { + nl_handle_destroy(placeholder_nlhandle); + placeholder_nlhandle = NULL; + } +} + +/** * virNetlinkCommand: * @nlmsg: pointer to netlink message * @respbuf: pointer to pointer where response buffer will be allocated @@ -535,6 +588,18 @@ static const char *unsupported = N_("libnl was not available at build time"); static const char *unsupported = N_("not supported on non-linux platforms"); # endif +int +virNetlinkStartup(void) +{ + return 0; +} + +void +virNetlinkShutdown(void) +{ + return; +} + int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, unsigned char **respbuf ATTRIBUTE_UNUSED, unsigned int *respbuflen ATTRIBUTE_UNUSED, diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index a72612e..93df59a 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010-2012 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -35,6 +35,9 @@ struct nlattr; # endif /* __linux__ */ +int virNetlinkStartup(void); +void virNetlinkShutdown(void); + int virNetlinkCommand(struct nl_msg *nl_msg, unsigned char **respbuf, unsigned int *respbuflen, int nl_pid); -- 1.7.10

4 5

[libvirt] [PATCH V2 0/2] Various coverity fixes
by Stefan Berger 04 May '12

04 May '12

Coverity fixes from a previous post split into individual patches. Regards, Stefan

2 4

Re: [libvirt] Virsh Command Reference -- Feedback
by Eric Blake 04 May '12

04 May '12

[adding the mailing list] On 04/24/2012 09:02 PM, Justin Clift wrote: > On 20/04/2012, at 11:58 PM, Robert Urban wrote: >> Hello, >> >> at the bottom of >> >> http://libvirt.org/sources/virshcmdref/html-single/ >> >> someone has written "we need feedback!", so I thought I'd give you a little feedback. >> >> I suggest deleting everything and replacing it with the string "Needs to be written". It would save people a lot of time that might be under the mistaken impression that there is anything of use to be found here. > > Ouch, guess that means you didn't find the few pages that actually have been done? > > The Virsh Command Reference was an effort that started some time ago when I was > working on the Libvirt team. But, it's not received much attention since I > moved teams. A few external contributors have updated or expanded things here > and there. > > Don't suppose you'd be interested in helping get it in shape? As you kinda point > out, the present version of it kinda sucks. :( All help appreciated. :) Reiterating this point to a wider audience. Is there anyone willing to help with improving our documentation? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH V1 0/5] Various coverity fixes
by Stefan Berger 04 May '12

04 May '12

Coverity fixes from a previous post split into individual files. Regards, Stefan

3 12

[libvirt] This patch mounts tmpfs on /run iff /run directory exists in libvirt-lxc containers.
by Daniel J Walsh 04 May '12

04 May '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 We do not want to share /run with containers in order to prevent information leakage and applications within the containers attempting to communicate with applications outside of the container. It uses the same mount options used for /dev. We also want to bind mount over /var/run directory since this will either be a symbolic link to /run but on some installations /run is bind mounted over /var/run. If we just mount /run we are not guaranteed the /var/run will have the same content. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk+j7skACgkQrlYvE4MpobNSKQCfY2yGP/S+piUJ9VNtSjrliFTp ucAAoLJOazpcZvBRFnQUa7uqhh+tRagb =TjAb -----END PGP SIGNATURE-----

1 0

[libvirt] disable usb?
by Gerd Hoffmann 04 May '12

04 May '12

Hi, Is there some way to disable usb altogether? libvirt used to just pass in '-usb'. With the arrival of usb2 support that changed into '-device uhci,...'. Problem is that this breaks with several machine types such as isapc. '-usb' is silently ignored in case the machine type can't handle usb. '-device uhci,...' leads to an error message though and the guest doesn't start. /me tried "<controller type='usb' model='none'/>" which didn't work. Just removing the controller from the xml doesn't work too, it gets automagically readded. Suggestions? thanks, Gerd

2 1

Re: [libvirt] [Users] Host missing cpuFlags
by Itamar Heim 04 May '12

04 May '12

On 05/04/2012 09:23 AM, ovirt(a)qip.ru wrote: > Engine is incorrectly show cpu name (cluster compatibility is set to 3.1) > > all hosts in my cluster engine are shown as Conroe, but I have 2 hosts > from Nehalem family and 2 from SandyBridge > > this host must be SandyBridge but shown as Conroe vdsm reports the model at the end of the cpuFlags based on libvirt reporting models. cc'ing libvirt list for their thoughts. > > # vdsClient -s 0 getVdsCaps > HBAInventory = {'iSCSI': [{'InitiatorName': > 'iqn.1994-05.com.redhat:7e8ac59efbe0'}], 'FC': []} > ISCSIInitiatorName = iqn.1994-05.com.redhat:7e8ac59efbe0 > bondings = {'bond4': {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': > '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond0': {'addr': '', > 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], 'hwaddr': > '00:00:00:00:00:00'}, 'bond1': {'addr': '', 'cfg': {}, 'mtu': '1500', > 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond2': > {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], > 'hwaddr': '00:00:00:00:00:00'}, 'bond3': {'addr': '', 'cfg': {}, 'mtu': > '1500', 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}} > clusterLevels = ['3.0', '3.1'] > cpuCores = 4 > cpuFlags = > fpu,vme,de,pse,tsc,msr,pae,mce,cx8,apic,sep,mtrr,pge,mca,cmov,pat,pse36,clflush,dts,acpi,mmx,fxsr,sse,sse2,ss,ht,tm,pbe,syscall,nx,rdtscp,lm,constant_tsc,arch_perfmon,pebs,bts,rep_good,nopl,xtopology,nonstop_tsc,aperfmperf,pni,pclmulqdq,dtes64,monitor,ds_cpl,vmx,smx,est,tm2,ssse3,cx16,xtpr,pdcm,pcid,sse4_1,sse4_2,x2apic,popcnt,tsc_deadline_timer,aes,xsave,avx,lahf_lm,ida,arat,epb,xsaveopt,pln,pts,dts,tpr_shadow,vnmi,flexpriority,ept,vpid,model_coreduo,model_Conroe > cpuModel = Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz > cpuSockets = 1 > cpuSpeed = 1600.000 > emulatedMachines = ['pc-0.14', 'pc', 'fedora-13', 'pc-0.13', 'pc-0.12', > 'pc-0.11', 'pc-0.10', 'isapc', 'pc-0.14', 'pc', 'fedora-13', 'pc-0.13', > 'pc-0.12', 'pc-0.11', 'pc-0.10', 'isapc'] > guestOverhead = 65 > hooks = {} > kvmEnabled = true > lastClient = 192.168.131.42 > lastClientIface = ovirtmgmt > management_ip = > memSize = 16032 > networks = {'ovirtmgmt': {'addr': '192.168.130.73', 'cfg': {'DELAY': > '0', 'NM_CONTROLLED': 'no', 'BOOTPROTO': 'dhcp', 'DEVICE': 'ovirtmgmt', > 'TYPE': 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': > '255.255.0.0', 'stp': 'off', 'bridged': 'True', 'gateway': > '192.168.131.17', 'ports': ['p6p1']}, 'Storage': {'addr': > '172.16.0.100', 'cfg': {'IPADDR': '172.16.0.100', 'DELAY': '0', > 'NETMASK': '255.255.255.0', 'STP': 'no', 'DEVICE': 'Storage', 'TYPE': > 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': '255.255.255.0', > 'stp': 'off', 'bridged': 'True', 'gateway': '0.0.0.0', 'ports': ['p4p1']}} > nics = {'p4p1': {'hwaddr': '00:1B:21:1D:B6:E2', 'netmask': '', 'speed': > 1000, 'addr': '', 'mtu': '1500'}, 'p6p1': {'hwaddr': > '54:04:A6:A1:BA:39', 'netmask': '', 'speed': 1000, 'addr': '', 'mtu': > '1500'}} > operatingSystem = {'release': '1', 'version': '16', 'name': 'oVirt Node'} > packages2 = {'kernel': {'release': '6.fc16.x86_64', 'buildtime': > 1334997800.0, 'version': '3.3.2'}, 'spice-server': {'release': '1.fc16', > 'buildtime': '1327339129', 'version': '0.10.1'}, 'vdsm': {'release': > '0.161.git094ec00.fc16', 'buildtime': '1336045451', 'version': '4.9.6'}, > 'qemu-kvm': {'release': '4.fc16', 'buildtime': '1327954752', 'version': > '0.15.1'}, 'libvirt': {'release': '1.fc16', 'buildtime': '1336048215', > 'version': '0.9.11.3'}, 'qemu-img': {'release': '4.fc16', 'buildtime': > '1327954752', 'version': '0.15.1'}} > reservedMem = 321 > software_revision = 0 > software_version = 4.9 > supportedProtocols = ['2.2', '2.3'] > supportedRHEVMs = ['3.0'] > uuid = 1C8F4D00-5BCB-11D9-8A55-5404A6A1BA39_00:1B:21:1D:B6:E2 > version_name = Snow Man > vlans = {} > vmTypes = ['kvm'] > > > > this host must be Nehalem but shown as Conroe > > # vdsClient -s 0 getVdsCaps > HBAInventory = {'iSCSI': [{'InitiatorName': > 'iqn.1994-05.com.redhat:972b88629c1'}], 'FC': []} > ISCSIInitiatorName = iqn.1994-05.com.redhat:972b88629c1 > bondings = {'bond4': {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': > '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond0': {'addr': '', > 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], 'hwaddr': > '00:00:00:00:00:00'}, 'bond1': {'addr': '', 'cfg': {}, 'mtu': '1500', > 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}, 'bond2': > {'addr': '', 'cfg': {}, 'mtu': '1500', 'netmask': '', 'slaves': [], > 'hwaddr': '00:00:00:00:00:00'}, 'bond3': {'addr': '', 'cfg': {}, 'mtu': > '1500', 'netmask': '', 'slaves': [], 'hwaddr': '00:00:00:00:00:00'}} > clusterLevels = ['3.0', '3.1'] > cpuCores = 8 > cpuFlags = > fpu,vme,de,pse,tsc,msr,pae,mce,cx8,apic,sep,mtrr,pge,mca,cmov,pat,pse36,clflush,dts,acpi,mmx,fxsr,sse,sse2,ss,ht,tm,pbe,syscall,nx,pdpe1gb,rdtscp,lm,constant_tsc,arch_perfmon,pebs,bts,rep_good,nopl,xtopology,nonstop_tsc,aperfmperf,pni,dtes64,monitor,ds_cpl,vmx,smx,est,tm2,ssse3,cx16,xtpr,pdcm,pcid,dca,sse4_1,sse4_2,popcnt,lahf_lm,ida,arat,epb,dts,tpr_shadow,vnmi,flexpriority,ept,vpid,model_coreduo,model_Conroe > cpuModel = Intel(R) Xeon(R) CPU E5620 @ 2.40GHz > cpuSockets = 2 > cpuSpeed = 1600.000 > emulatedMachines = ['pc-0.14', 'pc', 'fedora-13', 'pc-0.13', 'pc-0.12', > 'pc-0.11', 'pc-0.10', 'isapc', 'pc-0.14', 'pc', 'fedora-13', 'pc-0.13', > 'pc-0.12', 'pc-0.11', 'pc-0.10', 'isapc'] > guestOverhead = 65 > hooks = {} > kvmEnabled = true > lastClient = 192.168.131.42 > lastClientIface = ovirtmgmt > management_ip = > memSize = 36200 > networks = {'ovirtmgmt': {'addr': '192.168.131.46', 'cfg': {'DELAY': > '0', 'NM_CONTROLLED': 'no', 'BOOTPROTO': 'dhcp', 'DEVICE': 'ovirtmgmt', > 'TYPE': 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': > '255.255.0.0', 'stp': 'off', 'bridged': 'True', 'gateway': > '192.168.131.17', 'ports': ['em1']}, 'Storage': {'addr': '172.16.0.104', > 'cfg': {'IPADDR': '172.16.0.104', 'DELAY': '0', 'NM_CONTROLLED': 'no', > 'NETMASK': '255.255.255.0', 'STP': 'no', 'DEVICE': 'Storage', 'TYPE': > 'Bridge', 'ONBOOT': 'yes'}, 'mtu': '1500', 'netmask': '255.255.255.0', > 'stp': 'off', 'bridged': 'True', 'gateway': '0.0.0.0', 'ports': ['em2']}} > nics = {'em1': {'hwaddr': '00:25:90:66:53:E8', 'netmask': '', 'speed': > 1000, 'addr': '', 'mtu': '1500'}, 'em2': {'hwaddr': '00:25:90:66:53:E9', > 'netmask': '', 'speed': 100, 'addr': '', 'mtu': '1500'}} > operatingSystem = {'release': '1', 'version': '16', 'name': 'oVirt Node'} > packages2 = {'kernel': {'release': '6.fc16.x86_64', 'buildtime': > 1334997800.0, 'version': '3.3.2'}, 'spice-server': {'release': '1.fc16', > 'buildtime': '1327339129', 'version': '0.10.1'}, 'vdsm': {'release': > '0.155.git457d1a0.fc16', 'buildtime': '1335883691', 'version': '4.9.6'}, > 'qemu-kvm': {'release': '4.fc16', 'buildtime': '1327954752', 'version': > '0.15.1'}, 'libvirt': {'release': '1.fc16', 'buildtime': '1335356374', > 'version': '0.9.11'}, 'qemu-img': {'release': '4.fc16', 'buildtime': > '1327954752', 'version': '0.15.1'}} > reservedMem = 321 > software_revision = 0 > software_version = 4.9 > supportedProtocols = ['2.2', '2.3'] > supportedRHEVMs = ['3.0'] > uuid = 49434D53-0200-9066-2500-66902500E853_00:25:90:66:53:E8 > version_name = Snow Man > vlans = {} > vmTypes = ['kvm'] > > > > Птн 04 Май 2012 09:14:22 +0400, Itamar Heim <iheim(a)redhat.com> написал: > > On 05/04/2012 06:49 AM, Nicholas Kesick wrote: > > I managed to get a host successfully added into oVirt Manager > (Fedora16 > > minimum install, then used the wiki RPM install method), but the > last > > event reports "Host <hostname> moved to Non-operational state as > host > > does not meet the cluster's minimum CPU level. Missing CPU features: > > CpuFlags" > > > > Can anyone shine some light on the problem? The CPU does support > > virtualization... and as far as I can tell from cat /proc/cpuinfo > does > > does have cpu flags. > > flags : fpu vme de pse tsc msr *pae* mce cx8 apic sep mtrr pge > mca cmov > > pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall > nx lm > > constant_tsc pebs bts nopl pni dtes64 monitor ds_cpl *vmx* est > cid cx16 > > xtpr pdcm lahf_lm tpr_shadow > > what is the cpu level of the cluster? > what cluster compatibility level? > what does vdsClient -s 0 getVdsCaps shows for cpu flags? > > > > > Many thanks > > - Nick > > > > > > _______________________________________________ > > Users mailing list > > Users(a)ovirt.org > > nicspellword"="">ovirt.org/mailman/listinfo/users" title="Открыть > внешнюю ссылку">http://lists.ovirt.org/mailman/listinfo/users > <http://lists.%3Cspan%20class=> > > _______________________________________________ > Users mailing list > Users(a)ovirt.org > nicspellword"="">ovirt.org/mailman/listinfo/users" title="Открыть > внешнюю ссылку">http://lists.ovirt.org/mailman/listinfo/users > <http://lists.%3Cspan%20class=> > > > > -- >

2 1

[libvirt] [PATCH v3 0/3] usb devices with same vendorID, productID hotplug support
by Guannan Ren 04 May '12

04 May '12

https://bugzilla.redhat.com/show_bug.cgi?id=815755 The set of patch tries to fix the issue when multiple usb devices with same idVendor, idProduct are availible on host, the usb device with lowest bus:device will be attached to guest if usb xml file is given like this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x15e1'/> <product id='0x2007'/> </source> </hostdev> The reason is that the usb hotplug function searchs usb device in system files to match vendor and product id, the file with lowest number is always found first. After fix, in this case, libvirt will report an error like: # virsh attach-device rhel6u1 /tmp/usb.xml error: Failed to attach device from /tmp/usb.xml error: operation failed: multiple USB devices for 15e1:2007, use <address> to specify one At the same time, the usb part of domain initilization is also updated in patch 2/3 These patches also fix the problem when using the following xml, the usb device could be hotplugged in two domains without raising errors <hostdev mode='subsystem' type='usb' managed='yes'> <source> <address bus='6' device='7'/> </source> </hostdev> # virsh attach-device rhel6u12nd /tmp/usb_by_bus.xml error: Failed to attach device from /tmp/usb_by_bus.xml error: Requested operation is not valid: USB device 006:007 is in use by domain rhel6u1

3 8

[libvirt] [PATCH 1/2] coverity: fix memory leak in error path in virnetlink.c
by Guannan Ren 04 May '12

04 May '12

--- src/util/virnetlink.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index b2e9d51..e199d62 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -340,8 +340,10 @@ virNetlinkEventServiceStart(void) goto error; } - if (virMutexInit(&srv->lock) < 0) + if (virMutexInit(&srv->lock) < 0) { + VIR_FREE(srv); goto error; + } virNetlinkEventServerLock(srv); -- 1.7.7.5

3 4

[libvirt] [PATCH 0/7] Fix resource leaks detected by coverity
by Osier Yang 04 May '12

04 May '12

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=771021 For more details, please refer to the coverity logs attached in the BZ. There is still one error which I don't understand: Error: RESOURCE_LEAK: /builddir/build/BUILD/libvirt-0.9.10/src/uml/uml_driver.c:325: alloc_fn: Calling allocation function "virDomainEventNewFromObj". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:723: alloc_fn: Storage is returned from allocation function "virDomainEventNewFromDef". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:728: alloc_fn: Storage is returned from allocation function "virDomainEventNew". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:705: alloc_fn: Storage is returned from allocation function "virDomainEventNewInternal". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:684: alloc_arg: "virAlloc" allocates memory that is stored into "event". /builddir/build/BUILD/libvirt-0.9.10/src/util/memory.c:101: alloc_fn: Storage is returned from allocation function "calloc". /builddir/build/BUILD/libvirt-0.9.10/src/util/memory.c:101: var_assign: Assigning: "*((void **)ptrptr)" = "calloc(1UL, size)". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:698: return_alloc: Returning allocated memory "event". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:705: var_assign: Assigning: "event" = "virDomainEventNewInternal(0, id, name, uuid)". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:713: return_alloc: Returning allocated memory "event". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:728: return_alloc_fn: Directly returning storage allocated by "virDomainEventNew". /builddir/build/BUILD/libvirt-0.9.10/src/conf/domain_event.c:723: return_alloc_fn: Directly returning storage allocated by "virDomainEventNewFromDef". /builddir/build/BUILD/libvirt-0.9.10/src/uml/uml_driver.c:325: var_assign: Assigning: "event" = storage returned from "virDomainEventNewFromObj(dom, 5, 0)". /builddir/build/BUILD/libvirt-0.9.10/src/uml/uml_driver.c:325: overwrite_var: Overwriting "event" in call "event = virDomainEventNewFromObj(dom, 5, 0)" leaks the storage that "event" points to. I can't see how it's overwrote. And I'd persuade myself it's mistake of coverage. But appreciated if anybody could kill it if I blindly bypass the porblem. Osier Yang (7): Coverity: Fix the forward_null error in Python binding codes Coverity: Fix resource leaks in phyp driver Coverity: Fix resource leak in esx driver Coverity: Fix resource leak in xen driver Coverity: Fix resource leak in test driver Coverity: Fix resource leak in nodeinfo.c Coverity: Fix resource leak in virnetlink.c python/libvirt-override.c | 10 +++++----- src/esx/esx_vi.c | 4 ++++ src/nodeinfo.c | 1 + src/phyp/phyp_driver.c | 34 ++++++++++++++++++++-------------- src/test/test_driver.c | 1 + src/util/virnetlink.c | 9 +++++---- src/xen/xen_hypervisor.c | 5 +++-- src/xen/xen_inotify.c | 1 + 8 files changed, 40 insertions(+), 25 deletions(-) Regards, Osier -- 1.7.7.3

4 19

[libvirt] [PATCH 2/2] Modify interface qemuDefaultScsiControllerModel().
by Li Zhang 04 May '12

04 May '12

Now, the libvirt sets the default module as 'ibmvscsi' for pseries, and 'lsi' for other platforms.The controller model should be set according to controller type, not only just the platform, otherwise, it will have to set controller's model externally to select right model for specific controller type. This patch is to modify the qemuDefaultScsiControllerModel() interface to set right controller model according to the controller's type. For pseries guest, PCI scsi controller is also supported. So the default scsi controller model is set according to the contrller type. If it is PCI scsi controller, the default model is set as lsi, and if it is VSCSI controller, the default model is set as ibmvscsi. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_command.c | 51 +++++++++++++++++++++++++++++++---------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_hotplug.c | 2 +- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 99005b7..44130c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4097,7 +4097,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Controllers must use the 'pci' address type")); + _("Controllers must use the 'pci' or 'spapr-vio' address type")); goto error; } @@ -4549,7 +4549,7 @@ virDomainNetDefParseXML(virCapsPtr caps, def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Network interfaces must use 'pci' address type")); + _("Network interfaces must use 'pci' or 'spapr-vio' address type")); goto error; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb3be17..d31dae2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -463,9 +463,8 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) } static int -qemuDefaultScsiControllerModel(virDomainDefPtr def) { - if (STREQ(def->os.arch, "ppc64") && - STREQ(def->os.machine, "pseries")) { +qemuDefaultScsiControllerModel(int ctlType) { + if (ctlType == VIR_DOMAIN_CONTROLLER_TYPE_VSCSI) { return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; } else { return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; @@ -479,19 +478,30 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def, { const char *prefix = virDomainDiskBusTypeToString(disk->bus); int controllerModel = -1; + int controllerType = -1; if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { - controllerModel = - virDomainDiskFindControllerModel(def, disk, - VIR_DOMAIN_CONTROLLER_TYPE_SCSI); + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_SCSI; + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_VSCSI) { + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_VSCSI; + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported disk bus type '%s'"), + virDomainDiskBusTypeToString(disk->bus)); + return -1; } + controllerModel = + virDomainDiskFindControllerModel(def, disk, + controllerType); + if (controllerModel == -1 || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) - controllerModel = qemuDefaultScsiControllerModel(def); + controllerModel = qemuDefaultScsiControllerModel(controllerType); - if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || + if ((disk->bus != VIR_DOMAIN_DISK_BUS_SCSI && + disk->bus != VIR_DOMAIN_DISK_BUS_VSCSI) || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, disk->info.addr.drive.controller, @@ -2173,6 +2183,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def, const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); int idx = virDiskNameToIndex(disk->dst); int controllerModel; + int controllerType; if (idx < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -2236,12 +2247,18 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } - controllerModel = - virDomainDiskFindControllerModel(def, disk, - VIR_DOMAIN_CONTROLLER_TYPE_SCSI); + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_SCSI; + else + controllerType = VIR_DOMAIN_CONTROLLER_TYPE_VSCSI; + + controllerModel = + virDomainDiskFindControllerModel(def, disk, + controllerType); + if (controllerModel == -1 || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) - controllerModel = qemuDefaultScsiControllerModel(def); + controllerModel = qemuDefaultScsiControllerModel(controllerType); if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { if (disk->info.addr.drive.target != 0) { @@ -2547,8 +2564,7 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, } char * -qemuBuildControllerDevStr(virDomainDefPtr domainDef, - virDomainControllerDefPtr def, +qemuBuildControllerDevStr(virDomainControllerDefPtr def, virBitmapPtr qemuCaps, int *nusbcontroller) { @@ -2557,10 +2573,11 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + case VIR_DOMAIN_CONTROLLER_TYPE_VSCSI: model = def->model; if (model == -1 || model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) { - model = qemuDefaultScsiControllerModel(domainDef); + model = qemuDefaultScsiControllerModel(def->type); } switch (model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: @@ -4551,7 +4568,7 @@ qemuBuildCommandLine(virConnectPtr conn, char *devstr; virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildControllerDevStr(def, cont, qemuCaps, NULL))) + if (!(devstr = qemuBuildControllerDevStr(cont, qemuCaps, NULL))) goto error; virCommandAddArg(cmd, devstr); @@ -4570,7 +4587,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-device"); char *devstr; - if (!(devstr = qemuBuildControllerDevStr(def, def->controllers[i], qemuCaps, + if (!(devstr = qemuBuildControllerDevStr(def->controllers[i], qemuCaps, &usbcontroller))) goto error; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 1eafeb3..13d9cb8 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -97,8 +97,7 @@ char * qemuBuildDriveDevStr(virDomainDefPtr def, char * qemuBuildFSDevStr(virDomainFSDefPtr fs, virBitmapPtr qemuCaps); /* Current, best practice */ -char * qemuBuildControllerDevStr(virDomainDefPtr domainDef, - virDomainControllerDefPtr def, +char * qemuBuildControllerDevStr(virDomainControllerDefPtr def, virBitmapPtr qemuCaps, int *nusbcontroller); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7cf7b90..5b1dee2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -340,7 +340,7 @@ int qemuDomainAttachPciControllerDevice(struct qemud_driver *driver, goto cleanup; } - if (!(devstr = qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, NULL))) { + if (!(devstr = qemuBuildControllerDevStr(controller, priv->qemuCaps, NULL))) { goto cleanup; } } -- 1.7.9.5

1 0

[libvirt] [PATCH 1/1] Correct indent errors in the function qemuDomainNetsRestart
by Li Zhang 04 May '12

04 May '12

There are three spapces for a indent every line in the function qemuDomainNetsRestart. This patch is to correct it. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86e82d6..bed8edb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -420,28 +420,28 @@ static void qemuDomainNetsRestart(void *payload, const void *name ATTRIBUTE_UNUSED, void *data ATTRIBUTE_UNUSED) { - int i; - virDomainObjPtr vm = (virDomainObjPtr)payload; - virDomainDefPtr def = vm->def; - - virDomainObjLock(vm); - - for (i = 0; i < def->nnets; i++) { - virDomainNetDefPtr net = def->nets[i]; - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && - virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { - VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", - net->ifname, def->name); - ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, - net->mac, - virDomainNetGetActualDirectDev(net), - def->uuid, - virDomainNetGetActualVirtPortProfile(net), - VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); - } - } + int i; + virDomainObjPtr vm = (virDomainObjPtr)payload; + virDomainDefPtr def = vm->def; + + virDomainObjLock(vm); - virDomainObjUnlock(vm); + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && + virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { + VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", + net->ifname, def->name); + ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, + net->mac, + virDomainNetGetActualDirectDev(net), + def->uuid, + virDomainNetGetActualVirtPortProfile(net), + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); + } + } + + virDomainObjUnlock(vm); } /** -- 1.7.9.5

3 3

[libvirt] [PATCH] qemu: avoid 32-bit compiler warning
by Eric Blake 03 May '12

03 May '12

On 32-bit platforms, gcc warns that the comparison between a long and (ULLONG_MAX/1024/1024) is always false; throwing in a type conversion shuts up the warning. * src/qemu/qemu_monitor.c (qemuMonitorBlockJob): Shut gcc up. --- Pushing under the build-breaker rule. src/qemu/qemu_monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ca1c7aa..0d4319d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2785,7 +2785,7 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, modern); /* Convert bandwidth MiB to bytes */ - if (bandwidth > ULLONG_MAX / 1024 / 1024) { + if (bandwidth * 1ULL > ULLONG_MAX / 1024 / 1024) { qemuReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), ULLONG_MAX / 1024 / 1024); -- 1.7.7.6

1 0

[libvirt] [PATCH 1/1] Support libnl-3 as well as libnl-1
by Serge Hallyn 03 May '12

03 May '12

configure.ac: Check for libnl-3. If found, find libnl-route-3. If not found, do the original check to look for libnl-1. src/util/virnetlink.c: support libnl3 api. I could play games to make the patch smaller, but this would just hide what is actually needing to be done at the expense of clarity. src/Makefile.am and daemon/Makefile.am: Add LIBNL_ROUTE3_{LIBS,CFLAGS} Unfortunately libnl3 moves netlink/msg.h to /usr/include/libnl3/netlink/msg.h, which is the reason why the LIBNL_CFLAGS need to be added to a bunch of places where they weren't needed with libnl1. Those spots probaby don't actually need to also have LIBNL*LIBS added, but while I may be looking at it wrong, it seemed right to do so. I haven't gotten as far as to compile this into a package on ubuntu, but the source does build with libnl-3 as well as with libnl-1. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- configure.ac | 24 ++++++++++++----- daemon/Makefile.am | 5 +++- src/Makefile.am | 25 ++++++++++++------ src/util/virnetlink.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index a819898..ab40e1d 100644 --- a/configure.ac +++ b/configure.ac @@ -2626,19 +2626,29 @@ AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) dnl netlink library +LIBNL_ROUTE3_CFLAGS="" +LIBNL_ROUTE3_LIBS="" LIBNL_CFLAGS="" LIBNL_LIBS="" have_libnl=no if test "$with_linux" = "yes"; then - PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ + PKG_CHECK_MODULES([LIBNL],[libnl-3.0],[ have_libnl=yes - AC_DEFINE_UNQUOTED([HAVE_LIBNL], 1, [whether the netlink library is available]) - ], [ - if test "$with_macvtap" = "yes"; then - AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) - fi - ]) + AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) + AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) + PKG_CHECK_MODULES([LIBNL_ROUTE3],[libnl-route-3.0]) + ], + PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ + have_libnl=yes + AC_DEFINE_UNQUOTED([HAVE_LIBNL], 1, [whether the netlink library is available]) + AC_DEFINE_UNQUOTED([HAVE_LIBNL1], 1, [whether the netlink v1 library is available]) + ], [ + if test "$with_macvtap" = "yes"; then + AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) + fi + ]) + ) fi AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 24cce8f..8074803 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -95,6 +95,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES) libvirtd_CFLAGS = \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ + $(LIBNL_CFLAGS) $(LIBNL_ROUTE3_CFLAGS) \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ @@ -109,7 +110,9 @@ libvirtd_LDADD = \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ $(DBUS_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBNL_ROUTE3_LIBS) if WITH_DTRACE_PROBES libvirtd_LDADD += ../src/probes.o diff --git a/src/Makefile.am b/src/Makefile.am index e48dfa5..c159c1e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -576,10 +576,10 @@ libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) $(LIBNL_ROUTE3_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) $(DBUS_LIBS) + $(RT_LIBS) $(DBUS_LIBS) $(LIBNL_ROUTE3_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -809,12 +809,16 @@ endif libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(LIBXML_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(LIBNL_ROUTE3_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_qemu_la_LIBADD = $(NUMACTL_LIBS) \ $(CAPNG_LIBS) \ $(GNUTLS_LIBS) \ - $(LIBXML_LIBS) + $(LIBXML_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBNL_ROUTE3_LIBS) if WITH_DRIVER_MODULES libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_qemu_la_LDFLAGS += -module -avoid-version @@ -840,8 +844,9 @@ noinst_LTLIBRARIES += libvirt_driver_lxc.la #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la endif libvirt_driver_lxc_la_CFLAGS = \ + $(LIBNL_CFLAGS) $(LIBNL_ROUTE3_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) +libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) $(LIBNL_ROUTE3_LIBS) if WITH_SECDRIVER_SELINUX libvirt_driver_lxc_la_LIBADD += $(SELINUX_LIBS) endif @@ -941,9 +946,10 @@ noinst_LTLIBRARIES += libvirt_driver_network.la #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la endif libvirt_driver_network_la_CFLAGS = \ + $(LIBNL_CFLAGS) $(LIBNL_ROUTE3_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) if WITH_DRIVER_MODULES -libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la +libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la $(LIBNL_LIBS) $(LIBNL_ROUTE3_LIBS) libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) endif libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) @@ -1086,9 +1092,10 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la noinst_LTLIBRARIES += libvirt_driver_nwfilter.la endif libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) + -I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) \ + $(LIBNL_ROUTE3_CFLAGS) $(AM_CFLAGS) libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) -libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) +libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(LIBNL_ROUTE3_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version @@ -1522,7 +1529,7 @@ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) $(DBUS_LIBS) \ + $(RT_LIBS) $(DBUS_LIBS) $(LIBNL_ROUTE3_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o @@ -1540,6 +1547,8 @@ libvirt_lxc_CFLAGS = \ $(YAJL_CFLAGS) \ $(AUDIT_CFLAGS) \ $(DBUS_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(LIBNL_ROUTE3_CFLAGS) \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) if HAVE_LIBBLKID diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index b2e9d51..1d3cd2e 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -67,7 +67,11 @@ struct _virNetlinkEventSrvPrivate { virMutex lock; int eventwatch; int netlinkfd; +#ifdef HAVE_LIBNL1 struct nl_handle *netlinknh; +#else + struct nl_sock *netlinksock; +#endif /*Events*/ int handled; size_t handlesCount; @@ -121,15 +125,31 @@ int virNetlinkCommand(struct nl_msg *nl_msg, int fd; int n; struct nlmsghdr *nlmsg = nlmsg_hdr(nl_msg); +#ifdef HAVE_LIBNL1 struct nl_handle *nlhandle = nl_handle_alloc(); +#else + struct nl_sock *nlsock = nl_socket_alloc(); +#endif +#ifdef HAVE_LIBNL1 if (!nlhandle) { +#else + if (!nlsock) { +#endif virReportSystemError(errno, +#ifdef HAVE_LIBNL1 "%s", _("cannot allocate nlhandle for netlink")); +#else + "%s", _("cannot allocate nlsock for netlink")); +#endif return -1; } +#ifdef HAVE_LIBNL1 if (nl_connect(nlhandle, NETLINK_ROUTE) < 0) { +#else + if (nl_connect(nlsock, NETLINK_ROUTE) < 0) { +#endif virReportSystemError(errno, "%s", _("cannot connect to netlink socket")); rc = -1; @@ -140,7 +160,11 @@ int virNetlinkCommand(struct nl_msg *nl_msg, nlmsg->nlmsg_pid = getpid(); +#ifdef HAVE_LIBNL1 nbytes = nl_send_auto_complete(nlhandle, nl_msg); +#else + nbytes = nl_send_auto_complete(nlsock, nl_msg); +#endif if (nbytes < 0) { virReportSystemError(errno, "%s", _("cannot send to netlink socket")); @@ -148,7 +172,11 @@ int virNetlinkCommand(struct nl_msg *nl_msg, goto error; } +#ifdef HAVE_LIBNL1 fd = nl_socket_get_fd(nlhandle); +#else + fd = nl_socket_get_fd(nlsock); +#endif FD_ZERO(&readfds); FD_SET(fd, &readfds); @@ -165,7 +193,11 @@ int virNetlinkCommand(struct nl_msg *nl_msg, goto error; } +#ifdef HAVE_LIBNL1 *respbuflen = nl_recv(nlhandle, &nladdr, respbuf, NULL); +#else + *respbuflen = nl_recv(nlsock, &nladdr, respbuf, NULL); +#endif if (*respbuflen <= 0) { virReportSystemError(errno, "%s", _("nl_recv failed")); @@ -178,7 +210,11 @@ error: *respbuflen = 0; } +#ifdef HAVE_LIBNL1 nl_handle_destroy(nlhandle); +#else + nl_socket_free(nlsock); +#endif return rc; } @@ -233,7 +269,11 @@ virNetlinkEventCallback(int watch, int i, length; bool handled = false; +#ifdef HAVE_LIBNL1 length = nl_recv(srv->netlinknh, &peer, &msg, &creds); +#else + length = nl_recv(srv->netlinksock, &peer, &msg, &creds); +#endif if (length == 0) return; @@ -284,8 +324,13 @@ virNetlinkEventServiceStop(void) return 0; virNetlinkEventServerLock(srv); +#ifdef HAVE_LIBNL1 nl_close(srv->netlinknh); nl_handle_destroy(srv->netlinknh); +#else + nl_close(srv->netlinksock); + nl_socket_free(srv->netlinksock); +#endif virEventRemoveHandle(srv->eventwatch); /* free any remaining clients on the list */ @@ -346,21 +391,37 @@ virNetlinkEventServiceStart(void) virNetlinkEventServerLock(srv); /* Allocate a new socket and get fd */ +#ifdef HAVE_LIBNL1 srv->netlinknh = nl_handle_alloc(); +#else + srv->netlinksock = nl_socket_alloc(); +#endif +#ifdef HAVE_LIBNL1 if (!srv->netlinknh) { +#else + if (!srv->netlinksock) { +#endif virReportSystemError(errno, "%s", _("cannot allocate nlhandle for virNetlinkEvent server")); goto error_locked; } +#ifdef HAVE_LIBNL1 if (nl_connect(srv->netlinknh, NETLINK_ROUTE) < 0) { +#else + if (nl_connect(srv->netlinksock, NETLINK_ROUTE) < 0) { +#endif virReportSystemError(errno, "%s", _("cannot connect to netlink socket")); goto error_server; } +#ifdef HAVE_LIBNL1 fd = nl_socket_get_fd(srv->netlinknh); +#else + fd = nl_socket_get_fd(srv->netlinksock); +#endif if (fd < 0) { virReportSystemError(errno, @@ -368,7 +429,11 @@ virNetlinkEventServiceStart(void) goto error_server; } +#ifdef HAVE_LIBNL1 if (nl_socket_set_nonblocking(srv->netlinknh)) { +#else + if (nl_socket_set_nonblocking(srv->netlinksock)) { +#endif virReportSystemError(errno, "%s", _("cannot set netlink socket nonblocking")); goto error_server; @@ -391,8 +456,13 @@ virNetlinkEventServiceStart(void) error_server: if (ret < 0) { +#ifdef HAVE_LIBNL1 nl_close(srv->netlinknh); nl_handle_destroy(srv->netlinknh); +#else + nl_close(srv->netlinksock); + nl_socket_free(srv->netlinksock); +#endif } error_locked: virNetlinkEventServerUnlock(srv); -- 1.7.9.5

3 11

[libvirt] [PATCH] build: fix build on cygwin
by Eric Blake 03 May '12

03 May '12

Now that tests are built unconditionally, this cases 'make' to fail on cygwin (previously, only 'make check' failed), since on cygwin, <rpc/rpc.h> lives in a different directory than /usr/include. * tests/Makefile.am (virnetmessagetest_CFLAGS): Find rpc headers. --- Pushing under the build-breaker rule. tests/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c4d550f..fbb756a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -458,7 +458,8 @@ endif virnetmessagetest_SOURCES = \ virnetmessagetest.c testutils.h testutils.c -virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS) +virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" \ + $(XDR_CFLAGS) $(AM_CFLAGS) virnetmessagetest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS) virnetsockettest_SOURCES = \ -- 1.7.7.6

1 0

[libvirt] [PATCH v6 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 03 May '12

03 May '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation AUTHORS | 1 + cfg.mk | 1 + configure.ac | 23 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 4 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1309 ++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 75 +++ src/pvs/pvs_storage.c | 1458 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 131 ++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 20 files changed, 3120 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

4 13

[libvirt] [PATCH] util: remove error log from stub versions of virNetlinkEventServiceStart|Stop
by Laine Stump 03 May '12

03 May '12

These two functions are called from main() on all platforms, and always return success on platforms that don't support libnl. They still log an error message, though, which doesn't make sense - they should just be NOPs on those platforms. --- src/util/virnetlink.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index a249e94..34d56ef 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -615,7 +615,6 @@ int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, */ int virNetlinkEventServiceStop(void) { - netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return 0; } @@ -625,7 +624,6 @@ int virNetlinkEventServiceStop(void) */ int virNetlinkEventServiceStart(void) { - netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return 0; } -- 1.7.10

3 2

[libvirt] [PATCH - 2 alternatives] util: fix libvirtd startup failure due to netlink error
by Laine Stump 03 May '12

03 May '12

The two following patches fix the same problem (described in https://bugzilla.redhat.com/show_bug.cgi?id=816465) in two alternate ways - one by retrying the failing operation after a delay, the other by using knowledge of how libnl works internally to artificially "reserve" a particular address so libnl doesn't attempt to bind to it. You might think that libnl is the right place to fix this bug. Unfortunately, that isn't possible, because it would involve changing libnl's API - currently libnl decides what address to use for future binds of a netlink socket at the time nl_handle_alloc() is called, but doesn't actually attempt to bind it. Later, during nl_connect(), it calls bind() with the address it had earlier decided. It would be nice if we could just retry the bind with a different address when the first attempt failed, but libnl allows client applications to retrieve the bind address *before nl_connect() is called*, so an application may have already gotten the address prior to calling nl_connect(), and changing it would render the applications information incorrect. So the best we can do (for now at least) is work around the problem, and these are two possible workarounds.

3 12

[libvirt] [PATCH] [libvirt-test-API] Use YABOOT instead of ISOLINUX to create bootable ISO.
by Lin Qing 03 May '12

03 May '12

Yaboot is the bootloader of PowerPC (ISOLINUX on AMD64/x86 systems, yaboot on PowerPC), so should change the yaboot.conf firstly,then use mkiso command to create bootable ISO. Signed-off-by: Qing Lin<qinglbj(a)linux.vnet.ibm.com> --- utils/ksiso.sh | 57 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 22 deletions(-) diff --git a/utils/ksiso.sh b/utils/ksiso.sh index 7cf30fc..8b3186c 100755 --- a/utils/ksiso.sh +++ b/utils/ksiso.sh @@ -23,28 +23,41 @@ cp -rf ${boot_iso_dir}/* $custom_iso_dir chmod -R 777 ${custom_iso_dir}/* umount $boot_iso_dir -echo "- copy kickstart to custom work directory" -cp $kscfg $custom_iso_dir - -echo "- edit isolinux.cfg and add kickstart entry" -WORKING_ISO="${custom_iso_dir}/isolinux/isolinux.cfg" - -echo "label custom_ks - kernel vmlinuz $kernel_args - append initrd=initrd.img ks=cdrom:/$kscfg ramdisk_size=20000">> $WORKING_ISO - -# change default boot target and timeout -DEFAULT_LINE=`cat $WORKING_ISO | grep default | head -1` -TIMEOUT_LINE=`cat $WORKING_ISO | grep timeout | head -1` - -cat $WORKING_ISO | sed "s/${DEFAULT_LINE}/default custom_ks/" | sed "s/${TIMEOUT_LINE}/timeout 5/"> isocfgtmp - -mv -f isocfgtmp $WORKING_ISO - -# cd to custom_iso_dir, otherwise mkisofs seems to bomb... -cd $custom_iso_dir -mkisofs -R -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -o $cwd/$custom_iso . - +vlmid=`isoinfo -d -i $boot_iso |grep 'Volume id:'` +vlmid=${vlmid#"Volume id: "} +if [ -n "`echo $vlmid|grep ppc`" ];then + echo "- edit yaboot.conf and add kickstart entry" + WORKING_ISO="${custom_iso_dir}/etc/yaboot.conf" + # change timeout and add kickstart entry + TIMEOUT_LINE=`cat $WORKING_ISO | grep timeout | head -1` + APPEND_LINE=`cat $WORKING_ISO | grep append | head -1` + cat $WORKING_ISO | sed "s#${TIMEOUT_LINE}#timeout=5#" | sed "s#${APPEND_LINE}#append= \"root=live:CDLABEL=$vlmid ks=cdrom:/$kscfg \"#"> isocfgtmp + mv -f isocfgtmp $WORKING_ISO + cd $custom_iso_dir + mkisofs -R -V "$vlmid" -sysid PPC -chrp-boot -U -prep-boot ppc/chrp/yaboot -hfs-bless ppc/mac -no-desktop -allow-multidot -volset 4 -volset-size 1 -volset-seqno 1 -hfs-volid 4 -o $cwd/$custom_iso . +else + echo "- copy kickstart to custom work directory" + cp $kscfg $custom_iso_dir + + echo "- edit isolinux.cfg and add kickstart entry" + WORKING_ISO="${custom_iso_dir}/isolinux/isolinux.cfg" + + echo "label custom_ks + kernel vmlinuz $kernel_args + append initrd=initrd.img ks=cdrom:/$kscfg ramdisk_size=20000">> $WORKING_ISO + + # change default boot target and timeout + DEFAULT_LINE=`cat $WORKING_ISO | grep default | head -1` + TIMEOUT_LINE=`cat $WORKING_ISO | grep timeout | head -1` + + cat $WORKING_ISO | sed "s/${DEFAULT_LINE}/default custom_ks/" | sed "s/${TIMEOUT_LINE}/timeout 5/"> isocfgtmp + + mv -f isocfgtmp $WORKING_ISO + + # cd to custom_iso_dir, otherwise mkisofs seems to bomb... + cd $custom_iso_dir + mkisofs -R -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -o $cwd/$custom_iso . +fi EXITVAL=$? if [ $EXITVAL -ne '0' ] ; then echo -e "\n mkisofs exited with $EXITVAL!" --

3 3

[libvirt] [PATCH] Use XDG Base Directories instead of storing in home directory
by William Jon McCann 03 May '12

03 May '12

As defined in: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html This offers a number of advantages: * Allows sharing a home directory between different machines, or sessions (eg. using NFS) * Cleanly separates cache, runtime (eg. sockets), or app data from user settings * Supports performing smart or selective migration of settings between different OS versions * Supports reseting settings without breaking things * Makes it possible to clear cache data to make room when the disk is filling up * Allows us to write a robust and efficient backup solution * Allows an admin flexibility to change where data and settings are stored * Dramatically reduces the complexity and incoherence of the system for administrators --- AUTHORS | 1 + daemon/libvirtd-config.c | 10 +-- daemon/libvirtd.c | 143 +++++++++++++++++++++++++++++++++------- daemon/libvirtd.pod.in | 2 +- docs/auth.html.in | 2 +- docs/uri.html.in | 2 +- src/libvirt.c | 4 +- src/libvirt_private.syms | 4 ++ src/network/bridge_driver.c | 8 ++- src/nwfilter/nwfilter_driver.c | 11 +--- src/qemu/qemu_driver.c | 32 +++++---- src/remote/remote_driver.c | 4 +- src/remote/remote_driver.h | 2 +- src/secret/secret_driver.c | 11 +--- src/storage/storage_driver.c | 13 +--- src/uml/uml_driver.c | 10 +-- src/util/util.c | 67 +++++++++++++++++++ src/util/util.h | 4 ++ src/util/virauth.c | 4 +- tools/virsh.c | 6 +- 20 files changed, 251 insertions(+), 89 deletions(-) diff --git a/AUTHORS b/AUTHORS index 06b830a..668eca1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -234,6 +234,7 @@ Patches have also been contributed by: Jan Kiszka <jan.kiszka(a)siemens.com> Ryan Woodsmall <rwoodsmall(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> + William Jon McCann <jmccann(a)redhat.com> [....send patches to get your name here....] diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 471236c..8b95969 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -205,16 +205,16 @@ daemonConfigFilePath(bool privileged, char **configfile) if (!(*configfile = strdup(SYSCONFDIR "/libvirt/libvirtd.conf"))) goto no_memory; } else { - char *userdir = NULL; + char *configdir = NULL; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(configdir = virGetUserConfigDirectory(geteuid()))) goto error; - if (virAsprintf(configfile, "%s/.libvirt/libvirtd.conf", userdir) < 0) { - VIR_FREE(userdir); + if (virAsprintf(configfile, "%s/libvirtd.conf", configdir) < 0) { + VIR_FREE(configdir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(configdir); } return 0; diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b098f6a..bb25678 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -239,17 +239,25 @@ daemonPidFilePath(bool privileged, if (!(*pidfile = strdup(LOCALSTATEDIR "/run/libvirtd.pid"))) goto no_memory; } else { - char *userdir = NULL; + char *rundir = NULL; + mode_t old_umask; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(rundir = virGetUserRuntimeDirectory(geteuid()))) goto error; - if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) { - VIR_FREE(userdir); + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(pidfile, "%s/libvirtd.pid", rundir) < 0) { + VIR_FREE(rundir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(rundir); } return 0; @@ -279,17 +287,25 @@ daemonUnixSocketPaths(struct daemonConfig *config, if (!(*rosockfile = strdup(LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro"))) goto no_memory; } else { - char *userdir = NULL; + char *rundir = NULL; + mode_t old_umask; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(rundir = virGetUserRuntimeDirectory(geteuid()))) goto error; - if (virAsprintf(sockfile, "@%s/.libvirt/libvirt-sock", userdir) < 0) { - VIR_FREE(userdir); + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(sockfile, "@%s/libvirt-sock", rundir) < 0) { + VIR_FREE(rundir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(rundir); } } return 0; @@ -593,16 +609,25 @@ daemonSetupLogging(struct daemonConfig *config, LOCALSTATEDIR) == -1) goto no_memory; } else { - char *userdir = virGetUserDirectory(geteuid()); - if (!userdir) + char *logdir = virGetUserCacheDirectory(geteuid()); + mode_t old_umask; + + if (!logdir) + goto error; + + old_umask = umask(077); + if (virFileMakePath(logdir) < 0) { + umask(old_umask); goto error; + } + umask(old_umask); - if (virAsprintf(&tmp, "%d:file:%s/.libvirt/libvirtd.log", - virLogGetDefaultPriority(), userdir) == -1) { - VIR_FREE(userdir); + if (virAsprintf(&tmp, "%d:file:%s/libvirtd.log", + virLogGetDefaultPriority(), logdir) == -1) { + VIR_FREE(logdir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(logdir); } } else { if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) @@ -722,6 +747,75 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +static int migrateProfile(void) +{ + char *old_base = NULL; + char *updated = NULL; + char *home = NULL; + char *xdg_dir = NULL; + char *config_dir = NULL; + const char *config_home; + int ret = -1; + mode_t old_umask; + + if (!(home = virGetUserDirectory(geteuid()))) + goto cleanup; + + if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) { + goto cleanup; + } + + /* if the new directory is there or the old one is not: do nothing */ + if (!(config_dir = virGetUserConfigDirectory(geteuid()))) + goto cleanup; + + if (!virFileIsDir(old_base) || virFileExists(config_dir)) { + goto cleanup; + } + + /* test if we already attempted to migrate first */ + if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) { + goto cleanup; + } + if (virFileExists(updated)) { + goto cleanup; + } + + config_home = getenv("XDG_CONFIG_HOME"); + if (config_home && config_home[0] != '\0') { + xdg_dir = strdup(config_home); + } else { + if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) { + goto cleanup; + } + } + + old_umask = umask(077); + if (virFileMakePath(xdg_dir) < 0) { + umask(old_umask); + goto cleanup; + } + umask(old_umask); + + if (rename(old_base, config_dir) < 0) { + int fd = creat(updated, 0600); + VIR_FORCE_CLOSE(fd); + VIR_ERROR(_("Unable to migrate %s to %s"), old_base, config_dir); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(home); + VIR_FREE(old_base); + VIR_FREE(xdg_dir); + VIR_FREE(config_dir); + VIR_FREE(updated); + + return ret; +} + /* Print command-line usage. */ static void daemonUsage(const char *argv0, bool privileged) @@ -775,10 +869,10 @@ libvirt management daemon:\n"), argv0); Default paths:\n\ \n\ Configuration file (unless overridden by -f):\n\ - $HOME/.libvirt/libvirtd.conf\n\ + $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ \n\ Sockets:\n\ - $HOME/.libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + $XDG_RUNTIME_HOME/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ @@ -786,7 +880,7 @@ libvirt management daemon:\n"), argv0); Server private key: $HOME/.pki/libvirt/serverkey.pem\n\ \n\ PID file:\n\ - $HOME/.libvirt/libvirtd.pid\n\ + $XDG_RUNTIME_HOME/libvirt/libvirtd.pid\n\ \n")); } } @@ -931,6 +1025,9 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (migrateProfile() < 0) + exit(EXIT_FAILURE); + if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { VIR_ERROR(_("invalid host UUID: %s"), config->host_uuid); @@ -977,21 +1074,19 @@ int main(int argc, char **argv) { if (privileged) { run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); } else { - char *user_dir = virGetUserDirectory(geteuid()); + run_dir = virGetUserRuntimeDirectory(geteuid()); - if (!user_dir) { + if (!run_dir) { VIR_ERROR(_("Can't determine user directory")); goto cleanup; } - ignore_value(virAsprintf(&run_dir, "%s/.libvirt/", user_dir)); - VIR_FREE(user_dir); } if (!run_dir) { virReportOOMError(); goto cleanup; } - old_umask = umask(022); + old_umask = umask(077); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 6e699b8..ea6c37d 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -85,7 +85,7 @@ command line using the B<-f>|B<--config> option. The sockets libvirtd will use when B<run as root>. -=item F<$HOME/.libvirt/libvirt-sock> +=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock> The socket libvirtd will use when run as a B<non-root> user. diff --git a/docs/auth.html.in b/docs/auth.html.in index ecff0fc..60e4f11 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -25,7 +25,7 @@ for the authentication file using the following sequence: variable.</li> <li>The file path specified by the "authfile=/some/file" URI query parameter</li> - <li>The file $HOME/.libvirt/auth.conf</li> + <li>The file $XDG_CONFIG_DIR/libvirt/auth.conf</li> <li>The file /etc/libvirt/auth.conf</li> </ol> diff --git a/docs/uri.html.in b/docs/uri.html.in index 2f76e8f..5812ca9 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -30,7 +30,7 @@ virConnectPtr conn = virConnectOpenReadOnly ("test:///default"); To simplify life for administrators, it is possible to setup URI aliases in a libvirt client configuration file. The configuration file is <code>/etc/libvirt/libvirt.conf</code> -for the root user, or <code>$HOME/.libvirt/libvirt.conf</code> for any unprivileged user. +for the root user, or <code>$XDG_CONFIG_DIR/libvirt/libvirt.conf</code> for any unprivileged user. In this file, the following syntax can be used to setup aliases diff --git a/src/libvirt.c b/src/libvirt.c index cfd7711..22fc863 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -969,11 +969,11 @@ virConnectGetConfigFilePath(void) SYSCONFDIR) < 0) goto no_memory; } else { - char *userdir = virGetUserDirectory(geteuid()); + char *userdir = virGetUserConfigDirectory(geteuid()); if (!userdir) goto error; - if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", + if (virAsprintf(&path, "%s/libvirt.conf", userdir) < 0) { VIR_FREE(userdir); goto no_memory; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d4038b2..06d5823 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1109,6 +1109,7 @@ virFileFindMountPoint; virFileHasSuffix; virFileIsExecutable; virFileIsLink; +virFileIsDir; virFileLinkPointsTo; virFileLock; virFileMakePath; @@ -1129,6 +1130,9 @@ virGetGroupID; virGetGroupName; virGetHostname; virGetUserDirectory; +virGetUserConfigDirectory; +virGetUserCacheDirectory; +virGetUserRuntimeDirectory; virGetUserID; virGetUserName; virHexToBin; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d82212f..cea87c2 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -280,18 +280,20 @@ networkStartup(int privileged) { if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { - char *userdir = virGetUserDirectory(uid); + char *userdir = virGetUserCacheDirectory(uid); if (!userdir) goto error; if (virAsprintf(&driverState->logDir, - "%s/.libvirt/qemu/log", userdir) == -1) { + "%s/qemu/log", userdir) == -1) { VIR_FREE(userdir); goto out_of_memory; } + VIR_FREE(userdir); - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + userdir = virGetUserConfigDirectory(uid); + if (virAsprintf(&base, "%s", userdir) == -1) { VIR_FREE(userdir); goto out_of_memory; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..3d732ab 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -87,16 +87,9 @@ nwfilterDriverStartup(int privileged) { goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } if (virAsprintf(&driverState->configDir, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86e82d6..6d98abd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -520,28 +520,38 @@ qemudStartup(int privileged) { goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - if (!userdir) + char *rundir; + char *cachedir; + + cachedir = virGetUserCacheDirectory(uid); + if (!cachedir) goto error; if (virAsprintf(&qemu_driver->logDir, - "%s/.libvirt/qemu/log", userdir) == -1) { - VIR_FREE(userdir); + "%s/qemu/log", cachedir) == -1) { + VIR_FREE(cachedir); goto out_of_memory; } - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", cachedir) == -1) { + VIR_FREE(cachedir); goto out_of_memory; } - VIR_FREE(userdir); + VIR_FREE(cachedir); - if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", base) == -1) + rundir = virGetUserRuntimeDirectory(uid); + if (!rundir) + goto error; + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", rundir) == -1) { + VIR_FREE(rundir); goto out_of_memory; + } + VIR_FREE(rundir); + + base = virGetUserConfigDirectory(uid); + if (!base) + goto error; if (virAsprintf(&qemu_driver->libDir, "%s/qemu/lib", base) == -1) goto out_of_memory; - if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", base) == -1) - goto out_of_memory; if (virAsprintf(&qemu_driver->saveDir, "%s/qemu/save", base) == -1) goto out_of_memory; if (virAsprintf(&qemu_driver->snapshotDir, "%s/qemu/snapshot", base) == -1) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7863b73..4a9299a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -578,12 +578,12 @@ doRemoteOpen (virConnectPtr conn, case trans_unix: if (!sockname) { if (flags & VIR_DRV_OPEN_REMOTE_USER) { - char *userdir = virGetUserDirectory(getuid()); + char *userdir = virGetUserRuntimeDirectory(getuid()); if (!userdir) goto failed; - if (virAsprintf(&sockname, "@%s" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { + if (virAsprintf(&sockname, "@%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { VIR_FREE(userdir); goto out_of_memory; } diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 1504eec..aca9412 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -37,7 +37,7 @@ unsigned long remoteVersion(void); # define LIBVIRTD_TCP_PORT "16509" # define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock" # define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro" -# define LIBVIRTD_USER_UNIX_SOCKET "/.libvirt/libvirt-sock" +# define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock" # define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirtd.conf" /* Defaults for PKI directory. */ diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 088a243..f3fcce2 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1013,16 +1013,9 @@ secretDriverStartup(int privileged) goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } if (virAsprintf(&driverState->directory, "%s/secrets", base) == -1) goto out_of_memory; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f23ec7e..fd762c0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -146,19 +146,12 @@ storageDriverStartup(int privileged) goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } - /* Configuration paths are either ~/.libvirt/storage/... (session) or + /* Configuration paths are either $USER_CONFIG_HOME/libvirt/storage/... (session) or * /etc/libvirt/storage/... (system). */ if (virAsprintf(&driverState->configDir, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 4e640ff..8a39d73 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -434,12 +434,12 @@ umlStartup(int privileged) "%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1) goto out_of_memory; } else { + base = virGetUserConfigDirectory(uid); + if (!base) + goto error; if (virAsprintf(&uml_driver->logDir, - "%s/.libvirt/uml/log", userdir) == -1) - goto out_of_memory; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) + "%s/uml/log", base) == -1) goto out_of_memory; if (virAsprintf(&uml_driver->monitorDir, @@ -447,7 +447,7 @@ umlStartup(int privileged) goto out_of_memory; } - /* Configuration paths are either ~/.libvirt/uml/... (session) or + /* Configuration paths are either $XDG_CONFIG_HOME/libvirt/uml/... (session) or * /etc/libvirt/uml/... (system). */ if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1) diff --git a/src/util/util.c b/src/util/util.c index 48358b2..447b7b7 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -665,6 +665,12 @@ char *virFindFileInPath(const char *file) return fullpath; } +bool virFileIsDir(const char *path) +{ + struct stat s; + return (stat (path, &s) == 0) && S_ISDIR (s.st_mode); +} + bool virFileExists(const char *path) { return access(path, F_OK) == 0; @@ -2304,6 +2310,67 @@ char *virGetUserDirectory(uid_t uid) return virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY); } +static char *virGetXDGDirectory(uid_t uid, const char *xdgenvname, const char *xdgdefdir) +{ + char *path = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (uid == getuid ()) + path = getenv(xdgenvname); + + if (path && path[0]) { + virBufferAsprintf(&buf, "%s/libvirt/", path); + } else { + char *home; + home = virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY); + virBufferAsprintf(&buf, "%s/%s/libvirt/", home, xdgdefdir); + VIR_FREE(home); + } + VIR_FREE(path); + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return NULL; + } + + return virBufferContentAndReset(&buf); +} + +char *virGetUserConfigDirectory(uid_t uid) +{ + return virGetXDGDirectory(uid, "XDG_CONFIG_HOME", ".config"); +} + +char *virGetUserCacheDirectory(uid_t uid) +{ + return virGetXDGDirectory(uid, "XDG_CACHE_HOME", ".cache"); +} + +char *virGetUserRuntimeDirectory(uid_t uid) +{ + char *path = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (uid == getuid ()) + path = getenv("XDG_RUNTIME_DIR"); + + if (!path || !path[0]) { + return virGetUserCacheDirectory(uid); + } else { + virBufferAsprintf(&buf, "%s/libvirt/", path); + VIR_FREE(path); + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return NULL; + } + + return virBufferContentAndReset(&buf); + } +} + char *virGetUserName(uid_t uid) { return virGetUserEnt(uid, VIR_USER_ENT_NAME); diff --git a/src/util/util.h b/src/util/util.h index 85e8bd6..f5fa876 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -85,6 +85,7 @@ int virFileIsLink(const char *linkpath) char *virFindFileInPath(const char *file); +bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1); bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1); @@ -228,6 +229,9 @@ char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); char *virGetUserDirectory(uid_t uid); +char *virGetUserConfigDirectory(uid_t uid); +char *virGetUserCacheDirectory(uid_t uid); +char *virGetUserRuntimeDirectory(uid_t uid); char *virGetUserName(uid_t uid); char *virGetGroupName(gid_t gid); int virGetUserID(const char *name, diff --git a/src/util/virauth.c b/src/util/virauth.c index c59c55a..92ecb7c 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -65,10 +65,10 @@ int virAuthGetConfigFilePath(virConnectPtr conn, } } - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(userdir = virGetUserConfigDirectory(geteuid()))) goto cleanup; - if (virAsprintf(path, "%s/.libvirt/auth.conf", userdir) < 0) + if (virAsprintf(path, "%s/auth.conf", userdir) < 0) goto no_memory; VIR_DEBUG("Checking for readability of '%s'", *path); diff --git a/tools/virsh.c b/tools/virsh.c index 1207ac9..2ae9b71 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -19864,15 +19864,15 @@ vshReadlineInit(vshControl *ctl) /* Limit the total size of the history buffer */ stifle_history(500); - /* Prepare to read/write history from/to the ~/.virsh/history file */ - userdir = virGetUserDirectory(getuid()); + /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ + userdir = virGetUserCacheDirectory(getuid()); if (userdir == NULL) { vshError(ctl, "%s", _("Could not determine home directory")); return -1; } - if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + if (virAsprintf(&ctl->historydir, "%s/virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); VIR_FREE(userdir); return -1; -- 1.7.10

4 4

[libvirt] [PATCH v2 0/3]usb devices with same vendorID, productID hotplug support
by Guannan Ren 03 May '12

03 May '12

https://bugzilla.redhat.com/show_bug.cgi?id=815755 The set of patch tries to fix the issue when multiple usb devices with same idVendor, idProduct are availible on host, the usb device with lowest bus:device will be attached to guest if usb xml file is given like this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x15e1'/> <product id='0x2007'/> </source> </hostdev> The reason is that the usb hotplug function searchs usb device in system files to match vendor and product id, the file with lowest number is always found first. After fix, in this case, libvirt will report an error as follows: At the same time, the usb part of domain initilization is also update in patch 2/3 # virsh attach-device rhel6u1 /tmp/usb.xml error: Failed to attach device from /tmp/usb.xml error: XML error: multiple USB deivces 15e1:2007, use <address> to specify one. The patch also fix the problem when using the following xml, the usb device could be hotplugged in two domains without raising errors. <hostdev mode='subsystem' type='usb' managed='yes'> <source> <address bus='6' device='4'/> </source> </hostdev>

4 21

[libvirt] [PATCH 1/1] Correct indent errors in the function qemuDomainNetsRestart
by Li Zhang 03 May '12

03 May '12

There are three spapces for a indent every line in the function qemuDomainNetsRestart. This patch is to correct it. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86e82d6..bed8edb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -420,28 +420,28 @@ static void qemuDomainNetsRestart(void *payload, const void *name ATTRIBUTE_UNUSED, void *data ATTRIBUTE_UNUSED) { - int i; - virDomainObjPtr vm = (virDomainObjPtr)payload; - virDomainDefPtr def = vm->def; - - virDomainObjLock(vm); - - for (i = 0; i < def->nnets; i++) { - virDomainNetDefPtr net = def->nets[i]; - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && - virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { - VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", - net->ifname, def->name); - ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, - net->mac, - virDomainNetGetActualDirectDev(net), - def->uuid, - virDomainNetGetActualVirtPortProfile(net), - VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); - } - } + int i; + virDomainObjPtr vm = (virDomainObjPtr)payload; + virDomainDefPtr def = vm->def; + + virDomainObjLock(vm); - virDomainObjUnlock(vm); + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && + virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { + VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", + net->ifname, def->name); + ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, + net->mac, + virDomainNetGetActualDirectDev(net), + def->uuid, + virDomainNetGetActualVirtPortProfile(net), + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); + } + } + + virDomainObjUnlock(vm); } /** -- 1.7.9.5

2 1

[libvirt] [PATCH] Use XDG Base Directories instead of storing in home
by William Jon McCann 03 May '12

03 May '12

Hi, New to the list so hopefully I'm following the correct protocol. Attached is a patch (mostly untested at the moment) to change the default storage location from .libvirt to the locations defined in the XDG Base Directory Specification (http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html) This has a number of advantages for us: It allows sharing a home directory between different machines, or sessions (eg. using NFS) Cleanly separates cache, runtime (eg. sockets), or app data from user settings Supports performing smart or selective migration of settings between different OS versions Supports reseting settings without breaking things Makes it possible to clear cache data to make room when the disk is filling up Allows us to write a robust and efficient backup solution Allows an admin flexibility to change where data and settings are stored It dramatically reduces the complexity and incoherence of the system for administrators This is a pretty important set of features for both enterprise and individual use cases. I hope you will please consider the change. Thanks, Jon PS. This is also related to a goal for upstream GNOME https://live.gnome.org/GnomeGoals/XDGConfigFolders

3 7

[libvirt] [libvirt-docs PATCH] Added Snooze cloud manager to the IaaS section
by Eugen Feller 02 May '12

02 May '12

--- docs/apps.html.in | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 29bebbd..10ea6bf 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -219,6 +219,14 @@ community. It uses libvirt for communication with all KVM and Xen virtual machines. </dd> + + <dt><a href="http://snooze.inria.fr">Snooze</a></dt> + <dd> + Snooze is an open-source scalable, autonomic, and energy-efficient + virtual machine (VM) management framework for private clouds. It + integrates libvirt for VM monitoring, live migration, and life-cycle + management. + </dd> </dl> <h2><a name="libraries">Libraries</a></h2> -- 1.7.2.5

3 3

[libvirt] [PATCH v5 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 02 May '12

02 May '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. changes in v5: * rebased to current version changes in v4: * fix errors, found by 'make syntax-check' Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation AUTHORS | 1 + cfg.mk | 1 + configure.ac | 23 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 3 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1280 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 75 +++ src/pvs/pvs_storage.c | 1458 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 143 +++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 20 files changed, 3102 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

2 22

[libvirt] ANNOUNCE: Stable release libvirt-0.9.11.2
by Cole Robinson 02 May '12

02 May '12

Okay, I screwed up the tarball for the first stable release, due to not building it from a fresh checkout :/ No changes for this one except a version bump and dist rebuild. This release can be downloaded at: http://libvirt.org/sources/libvirt-0.9.11.2.tar.gz Thanks, Cole

9 12

[libvirt] [PATCH] Use XDG Base Directories instead of storing in home directory
by William Jon McCann 02 May '12

02 May '12

As defined in: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html This offers a number of advantages: * Allows sharing a home directory between different machines, or sessions (eg. using NFS) * Cleanly separates cache, runtime (eg. sockets), or app data from user settings * Supports performing smart or selective migration of settings between different OS versions * Supports reseting settings without breaking things * Makes it possible to clear cache data to make room when the disk is filling up * Allows us to write a robust and efficient backup solution * Allows an admin flexibility to change where data and settings are stored * Dramatically reduces the complexity and incoherence of the system for administrators --- AUTHORS | 1 + daemon/libvirtd-config.c | 10 +-- daemon/libvirtd.c | 140 +++++++++++++++++++++++++++++++++------- daemon/libvirtd.pod.in | 2 +- docs/auth.html.in | 2 +- docs/uri.html.in | 2 +- src/libvirt.c | 4 +- src/libvirt_private.syms | 4 ++ src/network/bridge_driver.c | 8 ++- src/nwfilter/nwfilter_driver.c | 11 +--- src/qemu/qemu_driver.c | 32 +++++---- src/remote/remote_driver.c | 4 +- src/remote/remote_driver.h | 2 +- src/secret/secret_driver.c | 11 +--- src/storage/storage_driver.c | 13 +--- src/uml/uml_driver.c | 10 +-- src/util/util.c | 67 +++++++++++++++++++ src/util/util.h | 4 ++ src/util/virauth.c | 4 +- tools/virsh.c | 6 +- 20 files changed, 248 insertions(+), 89 deletions(-) diff --git a/AUTHORS b/AUTHORS index 06b830a..668eca1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -234,6 +234,7 @@ Patches have also been contributed by: Jan Kiszka <jan.kiszka(a)siemens.com> Ryan Woodsmall <rwoodsmall(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> + William Jon McCann <jmccann(a)redhat.com> [....send patches to get your name here....] diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 471236c..8b95969 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -205,16 +205,16 @@ daemonConfigFilePath(bool privileged, char **configfile) if (!(*configfile = strdup(SYSCONFDIR "/libvirt/libvirtd.conf"))) goto no_memory; } else { - char *userdir = NULL; + char *configdir = NULL; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(configdir = virGetUserConfigDirectory(geteuid()))) goto error; - if (virAsprintf(configfile, "%s/.libvirt/libvirtd.conf", userdir) < 0) { - VIR_FREE(userdir); + if (virAsprintf(configfile, "%s/libvirtd.conf", configdir) < 0) { + VIR_FREE(configdir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(configdir); } return 0; diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b098f6a..0272fe7 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -239,17 +239,25 @@ daemonPidFilePath(bool privileged, if (!(*pidfile = strdup(LOCALSTATEDIR "/run/libvirtd.pid"))) goto no_memory; } else { - char *userdir = NULL; + char *rundir = NULL; + mode_t old_umask; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(rundir = virGetUserRuntimeDirectory(geteuid()))) goto error; - if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) { - VIR_FREE(userdir); + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(pidfile, "%s/libvirtd.pid", rundir) < 0) { + VIR_FREE(rundir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(rundir); } return 0; @@ -279,17 +287,25 @@ daemonUnixSocketPaths(struct daemonConfig *config, if (!(*rosockfile = strdup(LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro"))) goto no_memory; } else { - char *userdir = NULL; + char *rundir = NULL; + mode_t old_umask; - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(rundir = virGetUserRuntimeDirectory(geteuid()))) goto error; - if (virAsprintf(sockfile, "@%s/.libvirt/libvirt-sock", userdir) < 0) { - VIR_FREE(userdir); + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(sockfile, "@%s/libvirt-sock", rundir) < 0) { + VIR_FREE(rundir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(rundir); } } return 0; @@ -593,16 +609,25 @@ daemonSetupLogging(struct daemonConfig *config, LOCALSTATEDIR) == -1) goto no_memory; } else { - char *userdir = virGetUserDirectory(geteuid()); - if (!userdir) + char *logdir = virGetUserCacheDirectory(geteuid()); + mode_t old_umask; + + if (!logdir) + goto error; + + old_umask = umask(077); + if (virFileMakePath(logdir) < 0) { + umask(old_umask); goto error; + } + umask(old_umask); - if (virAsprintf(&tmp, "%d:file:%s/.libvirt/libvirtd.log", - virLogGetDefaultPriority(), userdir) == -1) { - VIR_FREE(userdir); + if (virAsprintf(&tmp, "%d:file:%s/libvirtd.log", + virLogGetDefaultPriority(), logdir) == -1) { + VIR_FREE(logdir); goto no_memory; } - VIR_FREE(userdir); + VIR_FREE(logdir); } } else { if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) @@ -722,6 +747,72 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +static int migrateProfile(void) +{ + char *old_base = NULL; + char *updated = NULL; + char *home = NULL; + char *xdg_dir = NULL; + char *config_dir = NULL; + int ret = -1; + mode_t old_umask; + + if (!(home = virGetUserDirectory(geteuid()))) + goto cleanup; + + if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) { + goto cleanup; + } + + /* if the new directory is there or the old one is not: do nothing */ + if (!(config_dir = virGetUserConfigDirectory(geteuid()))) + goto cleanup; + + if (!virFileIsDir(old_base) || virFileExists(config_dir)) { + goto cleanup; + } + + /* test if we already attempted to migrate first */ + if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) { + goto cleanup; + } + if (virFileExists(updated)) { + goto cleanup; + } + + xdg_dir = strdup(getenv("XDG_CONFIG_HOME")); + if (!xdg_dir || xdg_dir[0] == '\0') { + if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) { + goto cleanup; + } + } + + old_umask = umask(077); + if (virFileMakePath(xdg_dir) < 0) { + umask(old_umask); + goto cleanup; + } + umask(old_umask); + + if (rename(old_base, config_dir) < 0) { + int fd = creat(updated, 0600); + VIR_FORCE_CLOSE(fd); + VIR_ERROR(_("Unable to migrate %s to %s"), old_base, config_dir); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(home); + VIR_FREE(old_base); + VIR_FREE(xdg_dir); + VIR_FREE(config_dir); + VIR_FREE(updated); + + return ret; +} + /* Print command-line usage. */ static void daemonUsage(const char *argv0, bool privileged) @@ -775,10 +866,10 @@ libvirt management daemon:\n"), argv0); Default paths:\n\ \n\ Configuration file (unless overridden by -f):\n\ - $HOME/.libvirt/libvirtd.conf\n\ + $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ \n\ Sockets:\n\ - $HOME/.libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + $XDG_RUNTIME_HOME/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ @@ -786,7 +877,7 @@ libvirt management daemon:\n"), argv0); Server private key: $HOME/.pki/libvirt/serverkey.pem\n\ \n\ PID file:\n\ - $HOME/.libvirt/libvirtd.pid\n\ + $XDG_RUNTIME_HOME/libvirt/libvirtd.pid\n\ \n")); } } @@ -931,6 +1022,9 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (migrateProfile() < 0) + exit(EXIT_FAILURE); + if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { VIR_ERROR(_("invalid host UUID: %s"), config->host_uuid); @@ -977,21 +1071,19 @@ int main(int argc, char **argv) { if (privileged) { run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); } else { - char *user_dir = virGetUserDirectory(geteuid()); + run_dir = virGetUserRuntimeDirectory(geteuid()); - if (!user_dir) { + if (!run_dir) { VIR_ERROR(_("Can't determine user directory")); goto cleanup; } - ignore_value(virAsprintf(&run_dir, "%s/.libvirt/", user_dir)); - VIR_FREE(user_dir); } if (!run_dir) { virReportOOMError(); goto cleanup; } - old_umask = umask(022); + old_umask = umask(077); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 6e699b8..ea6c37d 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -85,7 +85,7 @@ command line using the B<-f>|B<--config> option. The sockets libvirtd will use when B<run as root>. -=item F<$HOME/.libvirt/libvirt-sock> +=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock> The socket libvirtd will use when run as a B<non-root> user. diff --git a/docs/auth.html.in b/docs/auth.html.in index ecff0fc..60e4f11 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -25,7 +25,7 @@ for the authentication file using the following sequence: variable.</li> <li>The file path specified by the "authfile=/some/file" URI query parameter</li> - <li>The file $HOME/.libvirt/auth.conf</li> + <li>The file $XDG_CONFIG_DIR/libvirt/auth.conf</li> <li>The file /etc/libvirt/auth.conf</li> </ol> diff --git a/docs/uri.html.in b/docs/uri.html.in index 2f76e8f..5812ca9 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -30,7 +30,7 @@ virConnectPtr conn = virConnectOpenReadOnly ("test:///default"); To simplify life for administrators, it is possible to setup URI aliases in a libvirt client configuration file. The configuration file is <code>/etc/libvirt/libvirt.conf</code> -for the root user, or <code>$HOME/.libvirt/libvirt.conf</code> for any unprivileged user. +for the root user, or <code>$XDG_CONFIG_DIR/libvirt/libvirt.conf</code> for any unprivileged user. In this file, the following syntax can be used to setup aliases diff --git a/src/libvirt.c b/src/libvirt.c index cfd7711..22fc863 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -969,11 +969,11 @@ virConnectGetConfigFilePath(void) SYSCONFDIR) < 0) goto no_memory; } else { - char *userdir = virGetUserDirectory(geteuid()); + char *userdir = virGetUserConfigDirectory(geteuid()); if (!userdir) goto error; - if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", + if (virAsprintf(&path, "%s/libvirt.conf", userdir) < 0) { VIR_FREE(userdir); goto no_memory; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d4038b2..06d5823 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1109,6 +1109,7 @@ virFileFindMountPoint; virFileHasSuffix; virFileIsExecutable; virFileIsLink; +virFileIsDir; virFileLinkPointsTo; virFileLock; virFileMakePath; @@ -1129,6 +1130,9 @@ virGetGroupID; virGetGroupName; virGetHostname; virGetUserDirectory; +virGetUserConfigDirectory; +virGetUserCacheDirectory; +virGetUserRuntimeDirectory; virGetUserID; virGetUserName; virHexToBin; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d82212f..cea87c2 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -280,18 +280,20 @@ networkStartup(int privileged) { if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { - char *userdir = virGetUserDirectory(uid); + char *userdir = virGetUserCacheDirectory(uid); if (!userdir) goto error; if (virAsprintf(&driverState->logDir, - "%s/.libvirt/qemu/log", userdir) == -1) { + "%s/qemu/log", userdir) == -1) { VIR_FREE(userdir); goto out_of_memory; } + VIR_FREE(userdir); - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + userdir = virGetUserConfigDirectory(uid); + if (virAsprintf(&base, "%s", userdir) == -1) { VIR_FREE(userdir); goto out_of_memory; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..3d732ab 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -87,16 +87,9 @@ nwfilterDriverStartup(int privileged) { goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } if (virAsprintf(&driverState->configDir, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 78899a4..e3c0594 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -520,28 +520,38 @@ qemudStartup(int privileged) { goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - if (!userdir) + char *rundir; + char *cachedir; + + cachedir = virGetUserCacheDirectory(uid); + if (!cachedir) goto error; if (virAsprintf(&qemu_driver->logDir, - "%s/.libvirt/qemu/log", userdir) == -1) { - VIR_FREE(userdir); + "%s/qemu/log", cachedir) == -1) { + VIR_FREE(cachedir); goto out_of_memory; } - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", cachedir) == -1) { + VIR_FREE(cachedir); goto out_of_memory; } - VIR_FREE(userdir); + VIR_FREE(cachedir); - if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", base) == -1) + rundir = virGetUserRuntimeDirectory(uid); + if (!rundir) + goto error; + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", rundir) == -1) { + VIR_FREE(rundir); goto out_of_memory; + } + VIR_FREE(rundir); + + base = virGetUserConfigDirectory(uid); + if (!base) + goto error; if (virAsprintf(&qemu_driver->libDir, "%s/qemu/lib", base) == -1) goto out_of_memory; - if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", base) == -1) - goto out_of_memory; if (virAsprintf(&qemu_driver->saveDir, "%s/qemu/save", base) == -1) goto out_of_memory; if (virAsprintf(&qemu_driver->snapshotDir, "%s/qemu/snapshot", base) == -1) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7863b73..4a9299a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -578,12 +578,12 @@ doRemoteOpen (virConnectPtr conn, case trans_unix: if (!sockname) { if (flags & VIR_DRV_OPEN_REMOTE_USER) { - char *userdir = virGetUserDirectory(getuid()); + char *userdir = virGetUserRuntimeDirectory(getuid()); if (!userdir) goto failed; - if (virAsprintf(&sockname, "@%s" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { + if (virAsprintf(&sockname, "@%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { VIR_FREE(userdir); goto out_of_memory; } diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 1504eec..aca9412 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -37,7 +37,7 @@ unsigned long remoteVersion(void); # define LIBVIRTD_TCP_PORT "16509" # define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock" # define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro" -# define LIBVIRTD_USER_UNIX_SOCKET "/.libvirt/libvirt-sock" +# define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock" # define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirtd.conf" /* Defaults for PKI directory. */ diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 088a243..f3fcce2 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1013,16 +1013,9 @@ secretDriverStartup(int privileged) goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } if (virAsprintf(&driverState->directory, "%s/secrets", base) == -1) goto out_of_memory; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f23ec7e..fd762c0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -146,19 +146,12 @@ storageDriverStartup(int privileged) goto out_of_memory; } else { uid_t uid = geteuid(); - char *userdir = virGetUserDirectory(uid); - - if (!userdir) + base = virGetUserConfigDirectory(uid); + if (!base) goto error; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); } - /* Configuration paths are either ~/.libvirt/storage/... (session) or + /* Configuration paths are either $USER_CONFIG_HOME/libvirt/storage/... (session) or * /etc/libvirt/storage/... (system). */ if (virAsprintf(&driverState->configDir, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 4e640ff..8a39d73 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -434,12 +434,12 @@ umlStartup(int privileged) "%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1) goto out_of_memory; } else { + base = virGetUserConfigDirectory(uid); + if (!base) + goto error; if (virAsprintf(&uml_driver->logDir, - "%s/.libvirt/uml/log", userdir) == -1) - goto out_of_memory; - - if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) + "%s/uml/log", base) == -1) goto out_of_memory; if (virAsprintf(&uml_driver->monitorDir, @@ -447,7 +447,7 @@ umlStartup(int privileged) goto out_of_memory; } - /* Configuration paths are either ~/.libvirt/uml/... (session) or + /* Configuration paths are either $XDG_CONFIG_HOME/libvirt/uml/... (session) or * /etc/libvirt/uml/... (system). */ if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1) diff --git a/src/util/util.c b/src/util/util.c index 48358b2..447b7b7 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -665,6 +665,12 @@ char *virFindFileInPath(const char *file) return fullpath; } +bool virFileIsDir(const char *path) +{ + struct stat s; + return (stat (path, &s) == 0) && S_ISDIR (s.st_mode); +} + bool virFileExists(const char *path) { return access(path, F_OK) == 0; @@ -2304,6 +2310,67 @@ char *virGetUserDirectory(uid_t uid) return virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY); } +static char *virGetXDGDirectory(uid_t uid, const char *xdgenvname, const char *xdgdefdir) +{ + char *path = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (uid == getuid ()) + path = getenv(xdgenvname); + + if (path && path[0]) { + virBufferAsprintf(&buf, "%s/libvirt/", path); + } else { + char *home; + home = virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY); + virBufferAsprintf(&buf, "%s/%s/libvirt/", home, xdgdefdir); + VIR_FREE(home); + } + VIR_FREE(path); + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return NULL; + } + + return virBufferContentAndReset(&buf); +} + +char *virGetUserConfigDirectory(uid_t uid) +{ + return virGetXDGDirectory(uid, "XDG_CONFIG_HOME", ".config"); +} + +char *virGetUserCacheDirectory(uid_t uid) +{ + return virGetXDGDirectory(uid, "XDG_CACHE_HOME", ".cache"); +} + +char *virGetUserRuntimeDirectory(uid_t uid) +{ + char *path = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (uid == getuid ()) + path = getenv("XDG_RUNTIME_DIR"); + + if (!path || !path[0]) { + return virGetUserCacheDirectory(uid); + } else { + virBufferAsprintf(&buf, "%s/libvirt/", path); + VIR_FREE(path); + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return NULL; + } + + return virBufferContentAndReset(&buf); + } +} + char *virGetUserName(uid_t uid) { return virGetUserEnt(uid, VIR_USER_ENT_NAME); diff --git a/src/util/util.h b/src/util/util.h index 85e8bd6..f5fa876 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -85,6 +85,7 @@ int virFileIsLink(const char *linkpath) char *virFindFileInPath(const char *file); +bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1); bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1); @@ -228,6 +229,9 @@ char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); char *virGetUserDirectory(uid_t uid); +char *virGetUserConfigDirectory(uid_t uid); +char *virGetUserCacheDirectory(uid_t uid); +char *virGetUserRuntimeDirectory(uid_t uid); char *virGetUserName(uid_t uid); char *virGetGroupName(gid_t gid); int virGetUserID(const char *name, diff --git a/src/util/virauth.c b/src/util/virauth.c index c59c55a..92ecb7c 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -65,10 +65,10 @@ int virAuthGetConfigFilePath(virConnectPtr conn, } } - if (!(userdir = virGetUserDirectory(geteuid()))) + if (!(userdir = virGetUserConfigDirectory(geteuid()))) goto cleanup; - if (virAsprintf(path, "%s/.libvirt/auth.conf", userdir) < 0) + if (virAsprintf(path, "%s/auth.conf", userdir) < 0) goto no_memory; VIR_DEBUG("Checking for readability of '%s'", *path); diff --git a/tools/virsh.c b/tools/virsh.c index e177684..ee14c02 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -19863,15 +19863,15 @@ vshReadlineInit(vshControl *ctl) /* Limit the total size of the history buffer */ stifle_history(500); - /* Prepare to read/write history from/to the ~/.virsh/history file */ - userdir = virGetUserDirectory(getuid()); + /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ + userdir = virGetUserCacheDirectory(getuid()); if (userdir == NULL) { vshError(ctl, "%s", _("Could not determine home directory")); return -1; } - if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + if (virAsprintf(&ctl->historydir, "%s/virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); VIR_FREE(userdir); return -1; -- 1.7.10

2 2

[libvirt] [libvirt-glib] Corrections to satisfy latest GIR
by Zeeshan Ali (Khattak) 02 May '12

02 May '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 1 + libvirt-gobject/libvirt-gobject-domain-snapshot.c | 1 + libvirt-gobject/libvirt-gobject-domain.c | 3 +++ libvirt-gobject/libvirt-gobject-interface.c | 2 ++ libvirt-gobject/libvirt-gobject-manager.c | 2 ++ libvirt-gobject/libvirt-gobject-network-filter.c | 2 ++ libvirt-gobject/libvirt-gobject-network.c | 2 ++ libvirt-gobject/libvirt-gobject-node-device.c | 2 ++ libvirt-gobject/libvirt-gobject-secret.c | 2 ++ libvirt-gobject/libvirt-gobject-storage-pool.c | 6 ++++++ libvirt-gobject/libvirt-gobject-storage-vol.c | 4 ++++ libvirt-gobject/libvirt-gobject-stream.c | 18 +++++++++++------- libvirt-gobject/libvirt-gobject-stream.h | 2 ++ 13 files changed, 40 insertions(+), 7 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 33a69e3..c8cd1c5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -277,6 +277,7 @@ static gboolean add_feature(xmlNodePtr node, gpointer opaque) /** * gvir_config_domain_get_features: + * * Returns: (transfer full): */ GStrv gvir_config_domain_get_features(GVirConfigDomain *domain) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 6097952..dbf0c51 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -184,6 +184,7 @@ const gchar *gvir_domain_snapshot_get_name(GVirDomainSnapshot *snapshot) * gvir_domain_snapshot_get_config: * @snapshot: the domain_snapshot * @flags: the flags + * * Returns: (transfer full): the config */ GVirConfigDomainSnapshot *gvir_domain_snapshot_get_config diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 67ca257..e5113d4 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -337,6 +337,7 @@ gboolean gvir_domain_start(GVirDomain *dom, /** * gvir_domain_resume: * @dom: the domain + * @err: Place-holder for possible errors * * Returns: TRUE on success */ @@ -453,6 +454,7 @@ gboolean gvir_domain_reboot(GVirDomain *dom, * gvir_domain_get_config: * @dom: the domain * @flags: the flags + * * Returns: (transfer full): the config */ GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, @@ -546,6 +548,7 @@ gboolean gvir_domain_set_config(GVirDomain *domain, /** * gvir_domain_get_info: * @dom: the domain + * * Returns: (transfer full): the info */ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 892db8b..a8e299c 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -175,6 +175,8 @@ const gchar *gvir_interface_get_name(GVirInterface *iface) * gvir_interface_get_config: * @iface: the interface * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigInterface *gvir_interface_get_config(GVirInterface *iface, diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index da5d31d..010e8da 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -160,6 +160,7 @@ void gvir_manager_remove_connection(GVirManager *man, /** * gvir_manager_get_connections: + * * Returns: (transfer full)(element-type GVirConnection): the connections */ GList *gvir_manager_get_connections(GVirManager *man) @@ -179,6 +180,7 @@ GList *gvir_manager_get_connections(GVirManager *man) /** * gvir_manager_find_connection_by_uri: + * * Returns: (transfer full)(allow-none): the connection,or NULL */ GVirConnection *gvir_manager_find_connection_by_uri(GVirManager *man, diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 5956a3d..103174b 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -206,6 +206,8 @@ const gchar *gvir_network_filter_get_uuid(GVirNetworkFilter *filter) * gvir_network_filter_get_config: * @filter: the network_filter * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigNetworkFilter *gvir_network_filter_get_config diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 16cd2f1..2d195d9 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -203,6 +203,8 @@ const gchar *gvir_network_get_uuid(GVirNetwork *network) * gvir_network_get_config: * @network: the network * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigNetwork *gvir_network_get_config(GVirNetwork *network, diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index b565052..6f81f1a 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -175,6 +175,8 @@ const gchar *gvir_node_device_get_name(GVirNodeDevice *device) * gvir_node_device_get_config: * @device: the node_device * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigNodeDevice *gvir_node_device_get_config(GVirNodeDevice *device, diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 3c9da86..299fdca 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -191,6 +191,8 @@ const gchar *gvir_secret_get_uuid(GVirSecret *secret) * gvir_secret_get_config: * @secret: the secret * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigSecret *gvir_secret_get_config(GVirSecret *secret, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 1d89496..f09f122 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -235,6 +235,8 @@ const gchar *gvir_storage_pool_get_uuid(GVirStoragePool *pool) * gvir_storage_pool_get_config: * @pool: the storage_pool * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, @@ -260,6 +262,8 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, /** * gvir_storage_pool_get_info: * @pool: the storage_pool + * @err: Place-holder for possible errors + * * Returns: (transfer full): the info */ GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, @@ -526,6 +530,8 @@ GVirStorageVol *gvir_storage_pool_get_volume(GVirStoragePool *pool, * gvir_storage_pool_create_volume: * @pool: the storage pool in which to create the volume * @conf: the configuration for the new volume + * @err: Place-holder for possible errors + * * Returns: (transfer full): the newly created volume */ GVirStorageVol *gvir_storage_pool_create_volume diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 78ce76e..cd02b38 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -225,6 +225,8 @@ const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) * gvir_storage_vol_get_config: * @vol: the storage_vol * @flags: the flags + * @err: Place-holder for possible errors + * * Returns: (transfer full): the config */ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, @@ -250,6 +252,8 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, /** * gvir_storage_vol_get_info: * @vol: the storage_vol + * @err: Place-holder for possible errors + * * Returns: (transfer full): the info */ GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 5486b95..60da4bc 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -355,18 +355,20 @@ stream_sink(virStreamPtr st G_GNUC_UNUSED, * @cancellable: cancellation notifier * @func: (scope notified): the callback for writing data to application * @user_data: (closure): data to be passed to @callback - * Returns: the number of bytes consumed or -1 upon error + * @error: #GError for error reporting, or %NULL to ignore. * * Receive the entire data stream, sending the data to the * requested data sink. This is simply a convenient alternative * to virStreamRecv, for apps that do blocking-I/o. + * + * Returns: the number of bytes consumed or -1 upon error */ gssize gvir_stream_receive_all(GVirStream *self, GCancellable *cancellable, GVirStreamSinkFunc func, gpointer user_data, - GError **err) + GError **error) { struct stream_sink_helper helper = { .self = self, @@ -381,7 +383,7 @@ gvir_stream_receive_all(GVirStream *self, r = virStreamRecvAll(self->priv->handle, stream_sink, &helper); if (r < 0) { - gvir_set_error_literal(err, GVIR_STREAM_ERROR, + gvir_set_error_literal(error, GVIR_STREAM_ERROR, 0, "Unable to perform RecvAll"); } @@ -465,18 +467,20 @@ stream_source(virStreamPtr st G_GNUC_UNUSED, * @cancellable: cancellation notifier * @func: (scope notified): the callback for writing data to application * @user_data: (closure): data to be passed to @callback - * Returns: the number of bytes consumed or -1 upon error + * @error: #GError for error reporting, or %NULL to ignore. * * Send the entire data stream, sending the data to the * requested data source. This is simply a convenient alternative * to virStreamRecv, for apps that do blocking-I/o. + * + * Returns: the number of bytes consumed or -1 upon error */ gssize gvir_stream_send_all(GVirStream *self, GCancellable *cancellable, GVirStreamSourceFunc func, gpointer user_data, - GError **err) + GError **error) { struct stream_source_helper helper = { .self = self, @@ -491,7 +495,7 @@ gvir_stream_send_all(GVirStream *self, r = virStreamSendAll(self->priv->handle, stream_source, &helper); if (r < 0) { - gvir_set_error_literal(err, GVIR_STREAM_ERROR, + gvir_set_error_literal(error, GVIR_STREAM_ERROR, 0, "Unable to perform SendAll"); } @@ -618,7 +622,7 @@ GSourceFuncs gvir_stream_source_funcs = { /** - * gvir_stream_add_watch: (skip): + * gvir_stream_add_watch: (skip) * @stream: the stream * @cond: the conditions to watch for (bitfield of #GVirStreamIOCondition) * @func: (closure opaque): the function to call when the condition is satisfied diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index c84f2a2..4da83ac 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -68,6 +68,7 @@ struct _GVirStreamClass * @buf: (out) (array length=nbytes) (transfer none): data pointer * @nbytes: data size * @user_data: user data passed to the function + * * Returns: the number of bytes filled, 0 upon end * of file, or -1 upon error */ @@ -82,6 +83,7 @@ typedef gint (* GVirStreamSinkFunc)(GVirStream *stream, * @buf: (out) (array length=nbytes) (transfer none): data pointer * @nbytes: data size * @user_data: user data passed to the function + * * Returns: the number of bytes filled, 0 upon end * of file, or -1 upon error */ -- 1.7.7.6

3 4

[libvirt] [PATCH qemu v2 0/6] -no-user-config option, move CPU models to /usr/share
by Eduardo Habkost 02 May '12

02 May '12

Changes v1 -> v2: - Move qemu_read_default_config_files() prototype to qemu-config.h - Make defconfig and userconfig variable bool - Coding style change Patches 1 to 4 just move some code around, patch 5 just adds the new option without adding any new config file. Patch 6 finally creates a /usr/share/qemu /cpus-x86_64.conf file, with the CPU models we currently have on Qemu. Reference to previous discussion: - http://marc.info/?l=qemu-devel&m=133278877315665 Eduardo Habkost (6): move code to read default config files to a separate function (v2) eliminate arch_config_name variable move list of default config files to an array vl.c: change 'defconfig' variable to bool implement -no-user-config command-line option (v2) move CPU definitions to /usr/share/qemu/cpus-x86_64.conf (v2) Makefile | 12 +++- arch_init.c | 32 ++++++++- arch_init.h | 2 - qemu-config.h | 4 + qemu-options.hx | 16 ++++- sysconfigs/target/cpus-x86_64.conf | 128 ++++++++++++++++++++++++++++++++++ sysconfigs/target/target-x86_64.conf | 128 ---------------------------------- vl.c | 18 ++--- 8 files changed, 193 insertions(+), 147 deletions(-) create mode 100644 sysconfigs/target/cpus-x86_64.conf -- 1.7.3.2

3 12

[libvirt] [PATCH 1/2] virsh: make -h always give help
by Eric Blake 01 May '12

01 May '12

https://bugzilla.redhat.com/show_bug.cgi?id=817244 mentions that unlike most other tools, where --help or --version prevent all further parsing of all later options, virsh was strange in that --version stopped parsing but --help tried to plow on to the end. There was no rationale for this original implementation (since 2005!), so I think we can safely conform to common usage patterns. * tools/virsh.c (main): Drop useless 'help' variable. --- I think the intent might have been to someday allow: virsh -h foo to be short for virsh help foo but since that hasn't been implemented in 7 years, I think it is smarter to be consistent with other tools instead. tools/virsh.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e177684..7159744 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20179,7 +20179,6 @@ vshAllowedEscapeChar(char c) static bool vshParseArgv(vshControl *ctl, int argc, char **argv) { - bool help = false; int arg, len; struct option opt[] = { {"debug", required_argument, NULL, 'd'}, @@ -20206,7 +20205,8 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) } break; case 'h': - help = true; + vshUsage(); + exit(EXIT_SUCCESS); break; case 'q': ctl->quiet = true; @@ -20251,17 +20251,6 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) } } - if (help) { - if (optind < argc) { - vshError(ctl, _("extra argument '%s'. See --help."), argv[optind]); - exit(EXIT_FAILURE); - } - - /* list all command */ - vshUsage(); - exit(EXIT_SUCCESS); - } - if (argc > optind) { /* parse command */ ctl->imode = false; -- 1.7.7.6

2 6

[libvirt] [libvirt-glib] Add some tests for new capabilities APIs
by Zeeshan Ali (Khattak) 01 May '12

01 May '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/tests/Makefile.am | 4 +- libvirt-gconfig/tests/test-capabilities-parse.c | 159 +++++++++++ libvirt-gconfig/tests/test-capabilities-parse.xml | 294 +++++++++++++++++++++ 3 files changed, 456 insertions(+), 1 deletions(-) create mode 100644 libvirt-gconfig/tests/test-capabilities-parse.c create mode 100644 libvirt-gconfig/tests/test-capabilities-parse.xml diff --git a/libvirt-gconfig/tests/Makefile.am b/libvirt-gconfig/tests/Makefile.am index 5061fd9..4d1a564 100644 --- a/libvirt-gconfig/tests/Makefile.am +++ b/libvirt-gconfig/tests/Makefile.am @@ -1,4 +1,4 @@ -noinst_PROGRAMS = test-domain-create test-domain-parse +noinst_PROGRAMS = test-domain-create test-domain-parse test-capabilities-parse AM_CFLAGS = \ $(GOBJECT2_CFLAGS) \ @@ -14,3 +14,5 @@ LDADD = \ test_domain_create_SOURCES = test-domain-create.c test_domain_parse_SOURCES = test-domain-parse.c + +test_capabilities_parse_SOURCES = test-capabilities-parse.c diff --git a/libvirt-gconfig/tests/test-capabilities-parse.c b/libvirt-gconfig/tests/test-capabilities-parse.c new file mode 100644 index 0000000..87d2790 --- /dev/null +++ b/libvirt-gconfig/tests/test-capabilities-parse.c @@ -0,0 +1,159 @@ +/* + * test-capabilities-parse.c: test libvirt-gconfig capabilities parsing + * + * Copyright (C) 2011-2012 Red Hat, Inc. + * + * 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. + * + * Authors: Zeeshan Ali <zeenix(a)redhat.com> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#include <config.h> + +#include <string.h> +#include <libvirt-gconfig/libvirt-gconfig.h> + +static void verify_host_caps(GVirConfigCapabilitiesHost *host_caps) +{ + GVirConfigCapabilitiesCPU *cpu_caps; + GList *features, *iter; + const char *str; + + g_assert(host_caps != NULL); + str = gvir_config_capabilities_host_get_uuid(host_caps); + g_assert(g_strcmp0(str, "cd6a24b3-46f8-01aa-bb39-c39aa2123730") == 0); + cpu_caps = gvir_config_capabilities_host_get_cpu(host_caps); + g_assert(cpu_caps != NULL); + str = gvir_config_capabilities_cpu_get_arch(cpu_caps); + g_assert(g_strcmp0(str, "x86_64") == 0); + + features = gvir_config_capabilities_cpu_get_features(cpu_caps); + for (iter = features; iter != NULL; iter = iter->next) { + g_assert(iter->data != NULL); + g_object_unref(G_OBJECT(iter->data)); + } + g_list_free(features); +} + +static void verify_guest_caps(GVirConfigCapabilitiesGuest *guest_caps) +{ + GVirConfigCapabilitiesCPUArch *arch_caps; + GList *features, *domains, *iter; + const char *str; + + g_assert(guest_caps != NULL); + g_assert(gvir_config_capabilities_guest_get_os_type(guest_caps) == + GVIR_CONFIG_DOMAIN_OS_TYPE_HVM); + + features = gvir_config_capabilities_guest_get_cpu_features(guest_caps); + for (iter = features; iter != NULL; iter = iter->next) { + GVirConfigCapabilitiesCPUFeature *feature_caps; + + feature_caps = GVIR_CONFIG_CAPABILITIES_CPU_FEATURE(iter->data); + g_assert(feature_caps != NULL); + str = gvir_config_capabilities_cpu_feature_get_name(feature_caps); + g_assert(str != NULL); + g_object_unref(G_OBJECT(feature_caps)); + } + g_list_free(features); + + arch_caps = gvir_config_capabilities_guest_get_cpu_arch(guest_caps); + g_assert(arch_caps != NULL); + str = gvir_config_capabilities_cpu_arch_get_name(arch_caps); + g_assert(str != NULL); + str = gvir_config_capabilities_cpu_arch_get_emulator(arch_caps); + g_assert(str != NULL); + + domains = gvir_config_capabilities_cpu_arch_get_domains(arch_caps); + for (iter = domains; iter != NULL; iter = iter->next) { + GVirConfigCapabilitiesDomain *domain_caps; + GVirConfigDomainVirtType virt_type; + + domain_caps = GVIR_CONFIG_CAPABILITIES_DOMAIN(iter->data); + g_assert(domain_caps != NULL); + virt_type = gvir_config_capabilities_domain_get_virt_type(domain_caps); + str = gvir_config_capabilities_domain_get_emulator(domain_caps); + g_assert((virt_type == GVIR_CONFIG_DOMAIN_VIRT_QEMU && str == NULL) || + (virt_type == GVIR_CONFIG_DOMAIN_VIRT_KVM && + g_strcmp0(str, "/usr/bin/qemu-kvm") == 0)); + g_object_unref(G_OBJECT(domain_caps)); + } + g_list_free(features); +} + +int main(int argc, char **argv) +{ + GVirConfigCapabilities *caps; + GVirConfigCapabilitiesHost *host_caps; + GList *guests_caps, *iter; + char *xml; + GError *error = NULL; + + gvir_config_init(&argc, &argv); + if (argc != 2) { + g_print("Usage: %s filename\n", argv[0]); + g_print("Attempt to parse the libvirt XML definition from filename\n"); + return 1; + } + + g_file_get_contents(argv[1], &xml, NULL, &error); + if (error != NULL) { + g_print("Couldn't read %s: %s\n", argv[1], error->message); + return 2; + } + + g_type_init(); + + caps = gvir_config_capabilities_new_from_xml(xml, &error); + if (error != NULL) { + g_print("Couldn't parse %s: %s\n", argv[1], error->message); + return 3; + } + g_assert(caps != NULL); + gvir_config_object_validate(GVIR_CONFIG_OBJECT(caps), &error); + if (error != NULL) { + g_print("%s format is invalid: %s\n", argv[1], error->message); + g_clear_error(&error); + } + + host_caps = gvir_config_capabilities_get_host(caps); + verify_host_caps(host_caps); + g_object_unref(G_OBJECT(host_caps)); + + guests_caps = gvir_config_capabilities_get_guests(caps); + for (iter = guests_caps; iter != NULL; iter = iter->next) { + GVirConfigCapabilitiesGuest *guest_caps; + + guest_caps = GVIR_CONFIG_CAPABILITIES_GUEST(iter->data); + verify_guest_caps(guest_caps); + g_object_unref(G_OBJECT(guest_caps)); + } + g_list_free(guests_caps); + + g_free(xml); + + xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(caps)); + g_print("%s\n", xml); + g_free(xml); + g_object_unref(G_OBJECT(caps)); + + return 0; +} diff --git a/libvirt-gconfig/tests/test-capabilities-parse.xml b/libvirt-gconfig/tests/test-capabilities-parse.xml new file mode 100644 index 0000000..796c81d --- /dev/null +++ b/libvirt-gconfig/tests/test-capabilities-parse.xml @@ -0,0 +1,294 @@ +<capabilities> + + <host> + <uuid>cd6a24b3-46f8-01aa-bb39-c39aa2123730</uuid> + <cpu> + <arch>x86_64</arch> + <model>Westmere</model> + <vendor>Intel</vendor> + <topology sockets="1" cores="2" threads="2"/> + <feature name="rdtscp"/> + <feature name="pdcm"/> + <feature name="xtpr"/> + <feature name="tm2"/> + <feature name="est"/> + <feature name="smx"/> + <feature name="vmx"/> + <feature name="ds_cpl"/> + <feature name="monitor"/> + <feature name="dtes64"/> + <feature name="pclmuldq"/> + <feature name="pbe"/> + <feature name="tm"/> + <feature name="ht"/> + <feature name="ss"/> + <feature name="acpi"/> + <feature name="ds"/> + <feature name="vme"/> + </cpu> + <power_management> + <suspend_mem/> + <suspend_disk/> + </power_management> + <migration_features> + <live/> + <uri_transports> + <uri_transport>tcp</uri_transport> + </uri_transports> + </migration_features> + <secmodel> + <model>selinux</model> + <doi>0</doi> + </secmodel> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name="i686"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <machine>pc-1.1</machine> + <machine canonical="pc-1.1">pc</machine> + <machine>pc-1.0</machine> + <machine>pc-0.15</machine> + <machine>pc-0.14</machine> + <machine>pc-0.13</machine> + <machine>pc-0.12</machine> + <machine>pc-0.11</machine> + <machine>pc-0.10</machine> + <machine>isapc</machine> + <domain type="qemu"> + </domain> + <domain type="kvm"> + <emulator>/usr/bin/qemu-kvm</emulator> + <machine>pc-1.1</machine> + <machine canonical="pc-1.1">pc</machine> + <machine>pc-1.0</machine> + <machine>pc-0.15</machine> + <machine>pc-0.14</machine> + <machine>pc-0.13</machine> + <machine>pc-0.12</machine> + <machine>pc-0.11</machine> + <machine>pc-0.10</machine> + <machine>isapc</machine> + </domain> + </arch> + <features> + <cpuselection/> + <pae/> + <nonpae/> + <acpi default="on" toggle="yes"/> + <apic default="on" toggle="no"/> + </features> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="x86_64"> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <machine>pc-1.1</machine> + <machine canonical="pc-1.1">pc</machine> + <machine>pc-1.0</machine> + <machine>pc-0.15</machine> + <machine>pc-0.14</machine> + <machine>pc-0.13</machine> + <machine>pc-0.12</machine> + <machine>pc-0.11</machine> + <machine>pc-0.10</machine> + <machine>isapc</machine> + <domain type="qemu"> + </domain> + <domain type="kvm"> + <emulator>/usr/bin/qemu-kvm</emulator> + <machine>pc-1.1</machine> + <machine canonical="pc-1.1">pc</machine> + <machine>pc-1.0</machine> + <machine>pc-0.15</machine> + <machine>pc-0.14</machine> + <machine>pc-0.13</machine> + <machine>pc-0.12</machine> + <machine>pc-0.11</machine> + <machine>pc-0.10</machine> + <machine>isapc</machine> + </domain> + </arch> + <features> + <cpuselection/> + <acpi default="on" toggle="yes"/> + <apic default="on" toggle="no"/> + </features> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="arm"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-arm</emulator> + <machine>integratorcp</machine> + <machine>collie</machine> + <machine>nuri</machine> + <machine>smdkc210</machine> + <machine>connex</machine> + <machine>verdex</machine> + <machine>highbank</machine> + <machine>mainstone</machine> + <machine>musicpal</machine> + <machine>n800</machine> + <machine>n810</machine> + <machine>sx1</machine> + <machine>sx1-v1</machine> + <machine>cheetah</machine> + <machine>realview-eb</machine> + <machine>realview-eb-mpcore</machine> + <machine>realview-pb-a8</machine> + <machine>realview-pbx-a9</machine> + <machine>akita</machine> + <machine>spitz</machine> + <machine>borzoi</machine> + <machine>terrier</machine> + <machine>lm3s811evb</machine> + <machine>lm3s6965evb</machine> + <machine>tosa</machine> + <machine>versatilepb</machine> + <machine>versatileab</machine> + <machine>vexpress-a9</machine> + <machine>vexpress-a15</machine> + <machine>xilinx-zynq-a9</machine> + <machine>z2</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="microblaze"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-microblaze</emulator> + <machine>petalogix-s3adsp1800</machine> + <machine>petalogix-ml605</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="microblazeel"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-microblazeel</emulator> + <machine>petalogix-s3adsp1800</machine> + <machine>petalogix-ml605</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="mips"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-mips</emulator> + <machine>malta</machine> + <machine>magnum</machine> + <machine>pica61</machine> + <machine>mipssim</machine> + <machine>mips</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="mipsel"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-mipsel</emulator> + <machine>malta</machine> + <machine>magnum</machine> + <machine>pica61</machine> + <machine>mipssim</machine> + <machine>mips</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="sparc"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-sparc</emulator> + <machine>SS-5</machine> + <machine>leon3_generic</machine> + <machine>SS-10</machine> + <machine>SS-600MP</machine> + <machine>SS-20</machine> + <machine>Voyager</machine> + <machine>LX</machine> + <machine>SS-4</machine> + <machine>SPARCClassic</machine> + <machine>SPARCbook</machine> + <machine>SS-1000</machine> + <machine>SS-2000</machine> + <machine>SS-2</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="ppc"> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-ppc</emulator> + <machine>g3beige</machine> + <machine>ref405ep</machine> + <machine>taihu</machine> + <machine>bamboo</machine> + <machine>mac99</machine> + <machine>prep</machine> + <machine>mpc8544ds</machine> + <machine>virtex-ml507</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="ppc64"> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <machine>mac99</machine> + <machine>ref405ep</machine> + <machine>taihu</machine> + <machine>bamboo</machine> + <machine>g3beige</machine> + <machine>prep</machine> + <machine>mpc8544ds</machine> + <machine>virtex-ml507</machine> + <domain type="qemu"> + </domain> + </arch> + <features> + <cpuselection/> + </features> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name="s390x"> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <machine>s390-virtio</machine> + <machine canonical="s390-virtio">s390</machine> + <domain type="qemu"> + </domain> + </arch> + </guest> + +</capabilities> + + -- 1.7.7.6

1 0

[libvirt] [PATCH] util: fix crash when starting macvtap interfaces
by Laine Stump 01 May '12

01 May '12

This patch resolves https://bugzilla.redhat.com/show_bug.cgi?id=815270 The function virNetDevMacVLanVPortProfileRegisterCallback() takes an arg "virtPortProfile", and was checking it for non-NULL before using it. However, the prototype for virNetDevMacVLanPortProfileRegisterCallback had marked that arg with ATTRIBUTE_NONNULL(). Contrary to what one may think, ATTRIBUTE_NONNULL() does not provide any guarantee that an arg marked as such really is always non-null; the only effect to the code generated by gcc, is that gcc *assumes* it is non-NULL; this results in, for example, the check for a non-NULL value being optimized out. (Unfortunately, this code removal only occurs when optimization is enabled, and I am in the habit of doing local builds with optimization off to ease debugging, so the bug didn't show up in my earlier local testing). In general, virPortProfile might always be NULL, so it shouldn't be marked as ATTRIBUTE_NONNULL. One other function prototype made this same error, so this patch fixes it as well. --- src/util/virnetdevmacvlan.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 2299f1d..07d54e2 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -82,7 +82,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, virNetDevVPortProfilePtr virtPortProfile, enum virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const unsigned char *macaddress , @@ -91,5 +91,5 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, virNetDevVPortProfilePtr virtPortProfile, enum virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) -ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; +ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; #endif /* __UTIL_MACVTAP_H__ */ -- 1.7.10

3 10

[libvirt] [PATCH v2 RESEND] qemu: change rbd auth_supported separation character to ;
by Josh Durgin 01 May '12

01 May '12

This works with newer qemu that doesn't allow escaping spaces. It's backwards compatible as well. Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> --- src/qemu/qemu_command.c | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 45cd417..070d13e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1674,7 +1674,7 @@ qemuBuildRBDString(virConnectPtr conn, goto error; } virBufferEscape(opt, '\\', ":", - ":key=%s:auth_supported=cephx none", + ":key=%s:auth_supported=cephx\\;none", base64); VIR_FREE(base64); } else { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args index 1500672..b323e91 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -5,6 +5,6 @@ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ file=rbd:pool/image:\ id=myname:\ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ -auth_supported=cephx none:\ +auth_supported=cephx\;none:\ mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,\ if=virtio,format=raw -net none -serial none -parallel none -usb -- 1.7.5.4

3 2

[libvirt] [PATCH RESEND] qemu: allow snapshotting of sheepdog and rbd disks
by Josh Durgin 01 May '12

01 May '12

Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> --- src/qemu/qemu_driver.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 78899a4..86e82d6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9605,12 +9605,18 @@ qemuDomainSnapshotIsAllowed(virDomainObjPtr vm) * that succeed as well */ for (i = 0; i < vm->def->ndisks; i++) { - if ((vm->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_LUN) || - (vm->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && - STRNEQ_NULLABLE(vm->def->disks[i]->driverType, "qcow2"))) { + virDomainDiskDefPtr disk = vm->def->disks[i]; + if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + (disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG || + disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD)) + continue; + + if ((disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) || + (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK && + STRNEQ_NULLABLE(disk->driverType, "qcow2"))) { qemuReportError(VIR_ERR_OPERATION_INVALID, _("Disk '%s' does not support snapshotting"), - vm->def->disks[i]->src); + disk->src); return false; } } -- 1.7.5.4

3 2

[libvirt] [PATCH] maint: avoid false positives on unmarked diagnostics
by Eric Blake 01 May '12

01 May '12

Otherwise, a string such as _("Don't use \"" VAR "\".") would complain about unmarked diagnostics. * cfg.mk (sc_libvirt_unmarked_diagnostics): Handle \" in message. --- I needed this patch to let me verify Stefan's DHCP Snooping series. cfg.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index fb4df2f..9935820 100644 --- a/cfg.mk +++ b/cfg.mk @@ -603,7 +603,7 @@ sc_libvirt_unmarked_diagnostics: $(_sc_search_regexp) @{ grep -nE '\<$(func_re) *$.*;$$' $$($(VC_LIST_EXCEPT)); \ grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ - | sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \ + | sed 's/_("\([^"]\|\\"\+$*"//;s/[ ]"%s"//' \ | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : -- 1.7.7.6

2 5

[libvirt] [PATCH 0/3] Misc improvements & fixes to LXC startup
by Daniel P. Berrange 01 May '12

01 May '12

This fixes a startup problem with LXC and security drivers, and adds / improves debugging.

3 7

[libvirt] [PATCH V13 0/5] Add DHCP snooping support to nwfilter
by Stefan Berger 01 May '12

01 May '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> </filterref> </interface> Once an IP address has been detected on an interface, 'virsh dumpxml <vm>' would show the IP address lease in the format <IP address>,<lease timeout in seconds>: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan

3 11

[libvirt] [PATCH 0/3] Fix misc LXC startup problems with security drivers
by Daniel P. Berrange 01 May '12

01 May '12

This series fixes a startup problem with LXC and improves debugging capabilities

1 0

[libvirt] [PATCH 0/3] usb devices with same vendor, productID hotplug support
by Guannan Ren 01 May '12

01 May '12

https://bugzilla.redhat.com/show_bug.cgi?id=815755 The set of patch tries to fix the issue when multiple usb devices with same idVendor, idProduct are availible on host, the usb device with lowest bus:device will be attached to guest if usb xml file is given like this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x15e1'/> <product id='0x2007'/> </source> </hostdev> The reason is that the usb hotplug function searchs usb device in system files to match vendor and product id, the file with lowest number is always found first. After fix, in this case, libvirt will report an error like: At the same time, the usb part of domain initilization is also update in patch 2/3 # virsh attach-device rhel6u1 /tmp/usb.xml error: Failed to attach device from /tmp/usb.xml error: XML error: multiple USB deivces 15e1:2007, use <address> to specify one.

3 7