- Devel - libvirt List Archives

[libvirt] [PATCH] network: Set to NULL after virNetworkDefFree()
by Michal Privoznik 18 Oct '12

18 Oct '12

which frees all allocated memory but doesn't set the passed pointer to NULL. Therefore, we must do it ourselves. This is causing actual libvirtd crash: Basically, when doing 'virsh net-edit' the newDef should be dropped. And the memory is freed, indeed. However, the pointer is not set to NULL but kept instead. And the next duo of calls 'virsh net-start' and 'virsh net-destroy' starts the disaster. The latter one does the same as 'virsh destroy'; it sees that newDef is nonNULL so it replaces def with newDef (which has been freed already as said a few lines above). Therefore any subsequent call accessing def will hit the ground. --- src/conf/network_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 891d48c..0f7470d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -260,8 +260,9 @@ virNetworkObjAssignDef(virNetworkObjPtr network, return -1; } } else if (!live) { - virNetworkDefFree(network->newDef); /* should be unnecessary */ + virNetworkDefFree(network->newDef); virNetworkDefFree(network->def); + network->newDef = NULL; network->def = def; } else { virReportError(VIR_ERR_OPERATION_INVALID, -- 1.7.8.6

3 3

[libvirt] [PATCH] selinux: relabel tapfd in qemuPhysIfaceConnect
by Guannan Ren 18 Oct '12

18 Oct '12

Relabeling tapfd right after the tap device is created. qemuPhysIfaceConnect is common function called both for static netdevs and for hotplug netdevs. --- src/qemu/qemu_command.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c0c400..b24e9b1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -170,6 +170,11 @@ qemuPhysIfaceConnect(virDomainDefPtr def, vmop, driver->stateDir, virDomainNetGetActualBandwidth(net)); if (rc >= 0) { + if (virSecurityManagerSetTapFDLabel(driver->securityManager, + def, rc) < 0) { + VIR_FORCE_CLOSE(rc); + return -1; + } virDomainAuditNetDevice(def, net, res_ifname, true); VIR_FREE(net->ifname); net->ifname = res_ifname; @@ -5425,10 +5430,6 @@ qemuBuildCommandLine(virConnectPtr conn, if (tapfd < 0) goto error; - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - def, tapfd) < 0) - goto error; - last_good_net = i; virCommandTransferFD(cmd, tapfd); -- 1.7.11.4

2 6

[libvirt] any IRC servers i can join?
by yueluck 18 Oct '12

18 Oct '12

please tell me some libvirt-IRC severs,and channel? thanks

2 1

[libvirt] [PATCH] dist: added cpu/cpu_ppc_data.h to Makefile.am
by Viktor Mihajlovski 18 Oct '12

18 Oct '12

Missing entry for cpu_ppc_data.h added to fix RPM build. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9d3194d..187663f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -660,7 +660,7 @@ CPU_SOURCES = \ cpu/cpu_s390.h cpu/cpu_s390.c \ cpu/cpu_arm.h cpu/cpu_arm.c \ cpu/cpu_map.h cpu/cpu_map.c cpu/cpu_powerpc.h \ - cpu/cpu_powerpc.c + cpu/cpu_powerpc.c cpu/cpu_ppc_data.h VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h -- 1.7.0.4

2 1

[libvirt] [PATCH] qemu: Always format CPU topology
by Jiri Denemark 18 Oct '12

18 Oct '12

When libvirt cannot find a suitable CPU model for host CPU (easily reproducible by running libvirt in a guest), it would not provide CPU topology in capabilities XML either. Even though CPU topology is known and can be queried by virNodeGetInfo. With this patch, CPU topology will always be provided in capabilities XML regardless on the presence of CPU model. --- src/qemu/qemu_capabilities.c | 6 +++--- src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 4 +++- src/qemu/qemu_driver.c | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 985d4de..7c391b3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -685,6 +685,7 @@ qemuCapsInitGuest(virCapsPtr caps, nmachines = 0; if (caps->host.cpu && + caps->host.cpu->model && qemuCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) goto error; @@ -781,12 +782,11 @@ qemuCapsInitCPU(virCapsPtr caps, cpu->sockets = nodeinfo.sockets; cpu->cores = nodeinfo.cores; cpu->threads = nodeinfo.threads; + caps->host.cpu = cpu; if (!(data = cpuNodeData(arch)) || cpuDecode(cpu, data, NULL, 0, NULL) < 0) - goto error; - - caps->host.cpu = cpu; + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9c72c10..9096b3c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4100,6 +4100,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, int hasSVM; if (!host || + !host->model || (ncpus = qemuCapsGetCPUDefinitions(caps, &cpus)) == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU specification not supported by hypervisor")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 427258d..cbc621f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1227,7 +1227,9 @@ qemuDomainDefFormatBuf(struct qemud_driver *driver, if ((flags & VIR_DOMAIN_XML_UPDATE_CPU) && def_cpu && (def_cpu->mode != VIR_CPU_MODE_CUSTOM || def_cpu->model)) { - if (!driver->caps || !driver->caps->host.cpu) { + if (!driver->caps || + !driver->caps->host.cpu || + !driver->caps->host.cpu->model) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get host CPU capabilities")); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index adfbfa6..76730c6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10180,7 +10180,8 @@ qemuCPUCompare(virConnectPtr conn, if (!driver->caps) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot get host capabilities")); - } else if (!driver->caps->host.cpu) { + } else if (!driver->caps->host.cpu || + !driver->caps->host.cpu->model) { VIR_WARN("cannot get host CPU capabilities"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; } else { -- 1.7.12.4

2 2

[libvirt] [PATCH v3 2/4] monitor: Enable adding an inherited fd to an fd set
by Corey Bryant 18 Oct '12

18 Oct '12

qmp_add_fd() gets an fd that was received over a socket with SCM_RIGHTS and adds it to an fd set. This patch adds support that will enable adding an fd that was inherited on the command line to an fd set. Note: All of the code added to monitor_fdset_add_fd(), with the exception of the error path for non-valid fdset-id, is code motion from qmp_add_fd(). Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> --- v2: -Removed Error** parameter from monitor_fdset_add_fd() v3: -Added Error** parameter back to monitor_fdset_add_fd() -Move 'if (!mon_fdset_cur)' change to patch 1 (kwolf(a)redhat.com) -Move code that prevents removal of fd from fd set during init to it's own patch (eblake(a)redhat.com, kwolf(a)redhat.com) -Mention code motion in commit message (kwolf(a)redhat.com) monitor.c | 157 +++++++++++++++++++++++++++++++++----------------------------- monitor.h | 3 ++ 2 files changed, 86 insertions(+), 74 deletions(-) diff --git a/monitor.c b/monitor.c index 2e3248f..5d5de41 100644 --- a/monitor.c +++ b/monitor.c @@ -2135,9 +2135,6 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, { int fd; Monitor *mon = cur_mon; - MonFdset *mon_fdset = NULL; - MonFdsetFd *mon_fdset_fd; - AddfdInfo *fdinfo; fd = qemu_chr_fe_get_msgfd(mon->chr); if (fd == -1) { @@ -2145,77 +2142,8 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, goto error; } - if (has_fdset_id) { - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - /* Break if match found or match impossible due to ordering by ID */ - if (fdset_id <= mon_fdset->id) { - if (fdset_id < mon_fdset->id) { - mon_fdset = NULL; - } - break; - } - } - } - - if (mon_fdset == NULL) { - int64_t fdset_id_prev = -1; - MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets); - - if (has_fdset_id) { - if (fdset_id < 0) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", - "a non-negative value"); - goto error; - } - /* Use specified fdset ID */ - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - mon_fdset_cur = mon_fdset; - if (fdset_id < mon_fdset_cur->id) { - break; - } - } - } else { - /* Use first available fdset ID */ - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - mon_fdset_cur = mon_fdset; - if (fdset_id_prev == mon_fdset_cur->id - 1) { - fdset_id_prev = mon_fdset_cur->id; - continue; - } - break; - } - } - - mon_fdset = g_malloc0(sizeof(*mon_fdset)); - if (has_fdset_id) { - mon_fdset->id = fdset_id; - } else { - mon_fdset->id = fdset_id_prev + 1; - } - - /* The fdset list is ordered by fdset ID */ - if (!mon_fdset_cur) { - QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next); - } else if (mon_fdset->id < mon_fdset_cur->id) { - QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next); - } else { - QLIST_INSERT_AFTER(mon_fdset_cur, mon_fdset, next); - } - } - - mon_fdset_fd = g_malloc0(sizeof(*mon_fdset_fd)); - mon_fdset_fd->fd = fd; - mon_fdset_fd->removed = false; - if (has_opaque) { - mon_fdset_fd->opaque = g_strdup(opaque); - } - QLIST_INSERT_HEAD(&mon_fdset->fds, mon_fdset_fd, next); - - fdinfo = g_malloc0(sizeof(*fdinfo)); - fdinfo->fdset_id = mon_fdset->id; - fdinfo->fd = mon_fdset_fd->fd; - - return fdinfo; + return monitor_fdset_add_fd(fd, has_fdset_id, fdset_id, + has_opaque, opaque, errp); error: if (fd != -1) { @@ -2301,6 +2229,87 @@ FdsetInfoList *qmp_query_fdsets(Error **errp) return fdset_list; } +AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, + bool has_opaque, const char *opaque, + Error **errp) +{ + MonFdset *mon_fdset = NULL; + MonFdsetFd *mon_fdset_fd; + AddfdInfo *fdinfo; + + if (has_fdset_id) { + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + /* Break if match found or match impossible due to ordering by ID */ + if (fdset_id <= mon_fdset->id) { + if (fdset_id < mon_fdset->id) { + mon_fdset = NULL; + } + break; + } + } + } + + if (mon_fdset == NULL) { + int64_t fdset_id_prev = -1; + MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets); + + if (has_fdset_id) { + if (fdset_id < 0) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", + "a non-negative value"); + return NULL; + } + /* Use specified fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id < mon_fdset_cur->id) { + break; + } + } + } else { + /* Use first available fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id_prev == mon_fdset_cur->id - 1) { + fdset_id_prev = mon_fdset_cur->id; + continue; + } + break; + } + } + + mon_fdset = g_malloc0(sizeof(*mon_fdset)); + if (has_fdset_id) { + mon_fdset->id = fdset_id; + } else { + mon_fdset->id = fdset_id_prev + 1; + } + + /* The fdset list is ordered by fdset ID */ + if (!mon_fdset_cur) { + QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next); + } else if (mon_fdset->id < mon_fdset_cur->id) { + QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next); + } else { + QLIST_INSERT_AFTER(mon_fdset_cur, mon_fdset, next); + } + } + + mon_fdset_fd = g_malloc0(sizeof(*mon_fdset_fd)); + mon_fdset_fd->fd = fd; + mon_fdset_fd->removed = false; + if (has_opaque) { + mon_fdset_fd->opaque = g_strdup(opaque); + } + QLIST_INSERT_HEAD(&mon_fdset->fds, mon_fdset_fd, next); + + fdinfo = g_malloc0(sizeof(*fdinfo)); + fdinfo->fdset_id = mon_fdset->id; + fdinfo->fd = mon_fdset_fd->fd; + + return fdinfo; +} + int monitor_fdset_get_fd(int64_t fdset_id, int flags) { #ifndef _WIN32 diff --git a/monitor.h b/monitor.h index b6e7d95..d4c017e 100644 --- a/monitor.h +++ b/monitor.h @@ -90,6 +90,9 @@ int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret); int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret); +AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, + bool has_opaque, const char *opaque, + Error **errp); int monitor_fdset_get_fd(int64_t fdset_id, int flags); int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); int monitor_fdset_dup_fd_remove(int dup_fd); -- 1.7.11.4

3 3

[libvirt] [PATCH v3 3/4] monitor: Prevent removing fd from set during init
by Corey Bryant 18 Oct '12

18 Oct '12

If an fd is added to an fd set via the command line, and it is not referenced by another command line option (ie. -drive), then clean it up after QEMU initialization is complete. Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> --- v3: - This patch was split into it's own patch in v3 (eblake(a)redhat.com, kwolf(a)redhat.com) monitor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 5d5de41..0dae7ac 100644 --- a/monitor.c +++ b/monitor.c @@ -2105,8 +2105,9 @@ static void monitor_fdset_cleanup(MonFdset *mon_fdset) MonFdsetFd *mon_fdset_fd_next; QLIST_FOREACH_SAFE(mon_fdset_fd, &mon_fdset->fds, next, mon_fdset_fd_next) { - if (mon_fdset_fd->removed || - (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) { + if ((mon_fdset_fd->removed || + (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) && + runstate_is_running()) { close(mon_fdset_fd->fd); g_free(mon_fdset_fd->opaque); QLIST_REMOVE(mon_fdset_fd, next); -- 1.7.11.4

2 2

[libvirt] [HELP] QEMU guest agent via ISA serial port, or shutdown hooks?
by Thorsten Glaser 18 Oct '12

18 Oct '12

Hi, http://www.redhat.com/archives/libvir-list/2012-January/msg00629.html added support only for when using the virtio channel to the guest. However, QEMU Guest Agent support is most useful to guests that do not implement ACPI shutdown support; these usually don’t have virtio (especially since I was unable to find a how-to-implement-virtio-in- a-kernel document, otherwise MirBSD might do virtio-rng at least ☺), so the serial transport would be best. The problem is of course the two lines: + if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) + continue; I’ve done a bit of hacking to allow the name attribute in the domain XML for any character device (probably half wrong, but this was just a quick test for me) and commented out these two lines, to see whether qga support on ISA ports is doable. (You probably would want to allow the attribute only on virtio and ISA serial ports, then.) Patch follows, NOT FOR APPLYING AS-IS: --- libvirt-0.9.12.orig/src/conf/domain_conf.c +++ libvirt-0.9.12/src/conf/domain_conf.c @@ -1266,6 +1266,7 @@ void virDomainChrDefFree(virDomainChrDef break; default: + VIR_FREE(def->target.name); break; } @@ -4954,6 +4955,7 @@ virDomainChrDefParseTargetXML(virCapsPtr break; default: + def->target.name = virXMLPropString(cur, "name"); portStr = virXMLPropString(cur, "port"); if (portStr == NULL) { /* Set to negative value to indicate we should set it later */ @@ -11685,11 +11687,16 @@ virDomainChrDefFormat(virBufferPtr buf, virDomainChrTargetTypeToString(def->deviceType, def->targetType), def->target.port); + //XXX def->target.name is lost break; default: - virBufferAsprintf(buf, " <target port='%d'/>\n", + virBufferAsprintf(buf, " <target port='%d'", def->target.port); + if (def->target.name) { + virBufferEscapeString(buf, " name='%s'", def->target.name); + } + virBufferAddLit(buf, "/>\n"); break; } --- libvirt-0.9.12.orig/src/qemu/qemu_process.c +++ libvirt-0.9.12/src/qemu/qemu_process.c @@ -191,8 +191,8 @@ qemuFindAgentConfig(virDomainDefPtr def) for (i = 0 ; i < def->nchannels ; i++) { virDomainChrDefPtr channel = def->channels[i]; - if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) - continue; +// if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) +// continue; if (STREQ_NULLABLE(channel->target.name, "org.qemu.guest_agent.0")) { config = &channel->source; Unfortunately, that seems to not be enough: trying to build the resulting libvirt package segfaults in the testsuite, so I must have some mistakes in the XML part. I’m really not familiar with all this, I’d “just” like to have my BSD VMs shut down cleanly when the host is shut down, so please advice. Does libvirt (the dæmon, probably) offer a shutdown hook, e.g. I could tell it to run a shellscript that ssh(1)s to the VM with a passwordless key to shut it down, instead? (Same for when the Shutdown or Restart functions in virt-manager are used, or virsh.) Thanks in advance, //mirabilos -- > Hi, does anyone sell openbsd stickers by themselves and not packaged > with other products? No, the only way I've seen them sold is for $40 with a free OpenBSD CD. -- Haroon Khalid and Steve Shockley in gmane.os.openbsd.misc

2 2

[libvirt] error of libvirt live-migrate using spice: Unable to read from monitor
by yangzhenyu 18 Oct '12

18 Oct '12

hi all: I have a problem when I live-migrate a instance to other node. I use the spice protocol in a instance. when I use the command: virsh migrate --live instance-00000001 qemu+tcp://node1/system. The 'node1' is the hostname of the dest compute. The error is: error: Unable to read from monitor: Connection reset by peer I can migrate successful When I remove the spice protocol. But I must use the spice. I think I need install something. My environmental is: Centos 6.2 libvirt 0.10.1 qemu-kvm 0.15.0 spice 0.11-11 Who can help me. 2012-10-18 yangzhenyu

1 0

[libvirt] [PATCH] spec: Fix dependency for lock-sanlock subpackage
by Jiri Denemark 18 Oct '12

18 Oct '12

This should not make a big difference in real world since libvirt-daemon, which is already required by libvirt-lock-sanlock, requires libvirt-client and thus libvirt-lock-sanlock gets this dependency transitively. However, since libvirt-lock-sanlock contains sanlock_helper binary linked to libvirt.so, we should start requiring libvirt-client directly. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2f3e829..511949e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1029,24 +1029,25 @@ Include header files & development libraries for the libvirt C library. %if %{with_sanlock} %package lock-sanlock Summary: Sanlock lock manager plugin for QEMU driver Group: Development/Libraries %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 Requires: sanlock >= 2.4 %else Requires: sanlock >= 1.8 %endif #for virt-sanlock-cleanup require augeas Requires: augeas Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} %description lock-sanlock Includes the Sanlock lock manager plugin for the QEMU driver %endif %if %{with_python} %package python Summary: Python bindings for the libvirt library Group: Development/Libraries Requires: %{name}-client = %{version}-%{release} -- 1.7.12.3

2 2