- Devel - libvirt List Archives

[libvirt] [PATCH v2] nwfilter: grab driver lock earlier during init (bz96649)
by Stefan Berger 04 Jun '13

04 Jun '13

This patch is in _relation_ to Bug 966449: https://bugzilla.redhat.com/show_bug.cgi?id=966449 Below is a possible patch addressing the coredump. Thread 1 must be calling nwfilterDriverRemoveDBusMatches(). It does so with nwfilterDriverLock held. In the patch below I am now moving the nwfilterDriverLock(driverState) further up so that the initialization, which seems to either take a long time or is entirely stuck, occurs with the lock held and the shutdown cannot occur at the same time. Remove the lock in virNWFilterDriverIsWatchingFirewallD to avoid trying to lock the same lock again. --- src/nwfilter/nwfilter_driver.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) Index: libvirt/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_driver.c +++ libvirt/src/nwfilter/nwfilter_driver.c @@ -191,6 +191,8 @@ nwfilterStateInitialize(bool privileged, if (!privileged) return 0; + nwfilterDriverLock(driverState); + if (virNWFilterIPAddrMapInit() < 0) goto err_free_driverstate; if (virNWFilterLearnInit() < 0) @@ -203,8 +205,6 @@ nwfilterStateInitialize(bool privileged, if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) goto err_techdrivers_shutdown; - nwfilterDriverLock(driverState); - /* * startup the DBus late so we don't get a reload signal while * initializing @@ -316,16 +316,10 @@ nwfilterStateReload(void) { bool virNWFilterDriverIsWatchingFirewallD(void) { - bool ret; - if (!driverState) return false; - nwfilterDriverLock(driverState); - ret = driverState->watchingFirewallD; - nwfilterDriverUnlock(driverState); - - return ret; + return driverState->watchingFirewallD; } /**

2 1

[libvirt] [PATCH] Ensure non-root can read /proc/meminfo file in LXC containers
by Daniel P. Berrange 04 Jun '13

04 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> By default files in a FUSE mount can only be accessed by the user which created them, even if the file permissions would otherwise allow it. To allow other users to access the FUSE mount the 'allow_other' mount option must be used. This bug prevented non-root users in an LXC container from reading the /proc/meminfo file. https://bugzilla.redhat.com/show_bug.cgi?id=967977 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_fuse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index b6df99c..32886cd 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -307,6 +307,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) /* process name is libvirt_lxc */ if (fuse_opt_add_arg(&args, "libvirt_lxc") == -1 || fuse_opt_add_arg(&args, "-odirect_io") == -1 || + fuse_opt_add_arg(&args, "-oallow_other") == -1 || fuse_opt_add_arg(&args, "-ofsname=libvirt") == -1) goto cleanup1; -- 1.8.1.4

1 0

[libvirt] [PATCH] docs: add spaces to formatstorage.html
by Ján Tomko 04 Jun '13

04 Jun '13

Let the pool types breathe. --- Trivial. docs/formatstorage.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 9c3be67..1a45915 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -17,9 +17,9 @@ <p> The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, - <code>fs</code>,<code>netfs</code>,<code>disk</code>,<code>iscsi</code>, - <code>logical</code>. This corresponds to the storage backend drivers - listed further along in this document. + <code>fs</code>, <code>netfs</code>, <code>disk</code>, + <code>iscsi</code>, <code>logical</code>. This corresponds to the + storage backend drivers listed further along in this document. The storage pool XML format is available <span class="since">since 0.4.1</span> </p> <h3><a name="StoragePoolFirst">General metadata</a></h3> -- 1.8.1.5

1 0

[libvirt] [PATCH] qemu: Report the offset from host UTC for RTC_CHANGE event
by Osier Yang 04 Jun '13

04 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=964177 Though both libvirt and QEMU's document say RTC_CHANGE returns the offset from the host UTC, qemu actually returns the offset from the specified date instead when specific date is privided (-rtc base=$date). It's not safe for qemu to fix it in code, it worked like that for 3 years, changing it now may break other QEMU use cases. What qemu tries to do is to fix the document: http://lists.gnu.org/archive/html/qemu-devel/2013-05/msg04782.html And in libvirt side, instead of reply on the qemu, this covert the offset returned from qemu to the offset from host UTC, by: /* * a: the offset from qemu RTC_CHANGE event * b: The specified date (-rtc base=$date) * c: the host date when libvirt gets the RTC_CHANGE event * offset: What libvirt will report */ offset = a + (b - c); The specified date (-rtc base=$date) is recorded in clock's def as an internal only member (may be useful to exposed outside?). --- src/conf/domain_conf.h | 3 +++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_process.c | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3a71d6c..3947a56 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1767,6 +1767,9 @@ struct _virDomainClockDef { struct { long long adjustment; int basis; + + /* Store the start time of guest process, internaly only */ + time_t starttime; } variable; /* Timezone name, when diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4a162a..9254525 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5518,6 +5518,9 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) now += def->data.variable.adjustment; gmtime_r(&now, &nowbits); + /* Store the starttime of qemu process */ + def->data.variable.starttime = now; + virBufferAsprintf(&buf, "base=%d-%02d-%02dT%02d:%02d:%02d", nowbits.tm_year + 1900, nowbits.tm_mon + 1, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d4fd4fb..e6f0b6d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -796,6 +796,18 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); + + /* QEMU's RTC_CHANGE event returns the offset from the specified + * date instead of the host UTC if a specific date is provided + * (-rtc base=$date). We need to convert it to be offset from + * host UTC. + */ + if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) { + time_t now = time(NULL); + + offset += vm->def->clock.data.variable.starttime - now; + } + event = virDomainEventRTCChangeNewFromObj(vm, offset); if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) -- 1.8.1.4

3 5

[libvirt] [PATCH] Remove legacy code for single-instance devpts filesystem
by Daniel P. Berrange 04 Jun '13

04 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> An earlier commit dropped support for using LXC with kernels having single-instance devpts filesystem from the LXC controller. It forgot to remove the same code from the LXC container setup. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c74e3ca..181f6c8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -869,25 +869,14 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) } } - if (access("/dev/pts/ptmx", W_OK) == 0) { - /* We have private devpts capability, so bind that */ - if (virFileTouch("/dev/ptmx", 0666) < 0) - return -1; + /* We have private devpts capability, so bind that */ + if (virFileTouch("/dev/ptmx", 0666) < 0) + return -1; - if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { - virReportSystemError(errno, "%s", - _("Failed to bind /dev/pts/ptmx on to /dev/ptmx")); - return -1; - } - } else { - /* Legacy devpts, so we need to just use shared one */ - dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX); - if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 || - chmod("/dev/ptmx", 0666)) { - virReportSystemError(errno, "%s", - _("Failed to make device /dev/ptmx")); - return -1; - } + if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Failed to bind /dev/pts/ptmx on to /dev/ptmx")); + return -1; } for (i = 0; i < nttyPaths; i++) { -- 1.8.1.4

2 1

[libvirt] ARM libvirt compiling error
by Michele Paolino 04 Jun '13

04 Jun '13

Hello, I'm trying to set up a development environment on an Arndale (ARM Samsung Exynos 5250) board to work on sVirt. I'm using Debian 7.0, I've downloaded the source code from GIT and than: ./autogen.sh --prefix=$HOME/usr make but in the middle of make execution, the program fails with this error: conf/domain_conf.c: In function 'virDomainHostdevDefParseXML': conf/domain_conf.c:3915:36: error: 'next_unit' may be used uninitialized in this function [-Werror=uninitialized] conf/domain_conf.c:3886:9: note: 'next_unit' was declared here conf/domain_conf.c: At top level: cc1: error: unrecognized command line option "-Wno-unused-command-line-argument" [-Werror] I've solved this problem simply initializing the "next_unit" variable (file src/conf/domain_conf.c, line 3886). This is the diff between the original file and the modified one: 3886c3886 < int next_unit; --- > int next_unit = -1; Another way to solve is obviously with --disable-werror, but I guess this is not the best way. My gcc version is 4.6.3 (Debian 4.6.3-14), kernel version is 3.8.0-rc4. Maybe it's only a compiler problem, but can anyone confirm this? Is it worth to submit a new bug report/patch the source? Regards, Michele -- *Michele Paolino ** *Virtual Open Systems* **Open Source KVM Virtualization Developments Multicore Systems Virtualization Porting Services *Web*:* *www.virtualopensystems.com*

3 2

[libvirt] [PATCHv2 0/2] fix segfault in virSecuritySELinuxMCSGetProcessRange
by Ján Tomko 04 Jun '13

04 Jun '13

Diff to v2: Changed char * to const char * after actually compiling it with selinux. Added a test. James Gilliland (1): selinux: fix segfault in virSecuritySELinuxMCSGetProcessRange Ján Tomko (1): tests: add test for a selinux label without a range src/security/security_selinux.c | 9 ++++++++- tests/securityselinuxtest.c | 44 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 4 deletions(-) -- 1.8.1.5

2 3

[libvirt] NBD drives with literal IPv6 addresses or hostnames starting with a digit
by Ján Tomko 04 Jun '13

04 Jun '13

Hello, since qemu's commit v1.4.0-736-gf17c90b [1]: nbd: Keep hostname and port separate * literal IPv6 addresses no longer work in nbd URIs, because getaddrinfo is called with the surrounding brackets: $ qemu-system-x86_64 -drive file=nbd://[::1]:1234/quack qemu-system-x86_64: -drive file=nbd://[::1]:1234/quack: address resolution failed for [::1]:1234: Name or service not known * hostnames starting with a digit now work in nbd URIs. Before that, or with the non-URI syntax, they fail because inet_parse assumes them to be literal IPv4 addresses: $ qemu-system-x86_64 -drive file=nbd:123flour:1234:exportname=gashunk qemu-system-x86_64: -drive file=nbd:123flour:1234:exportname=gashunk: error parsing IPv4 address '123flour:1234' In libvirt, we use the URI format on the command line only if the host contains ':', so hostnames starting with a digit still don't work. Migration with NBD and a literal IPv6 address doesn't work either, but that's purely libvirt's fault, as we don't escape it with brackets. I've just posted a patch for that. [2] Jan [1] http://git.qemu.org/?p=qemu.git;a=commitdiff;h=f17c90b [2] https://www.redhat.com/archives/libvir-list/2013-May/msg02022.html

2 2

[libvirt] Authoritative source for logging filters descriptions ?
by Kashyap Chamarthy 04 Jun '13

04 Jun '13

Heya, So I usually use these two resources, when tracing/debugging: - https://www.berrange.com/posts/2011/10/03/troubleshooting-libvirt-with-the-… - http://libvirt.org/logging.html For instance, for filters to know what QMP commands libvirt is sending to QEMU: I use: - log_filters="1:qemu_monitor" - log_outputs="1:file:/var/log/libvirt/libvirtd.log" But, from https://www.berrange.com/posts/2011/10/03/troubleshooting-libvirt-with-the-… I notice, we could also use these variations of filters QEMU/QMP filters: # QEMU JSON/QMP monitor commands - log_filters="1:qemu_monitor_json" # QEMU text monitor commands - log_filters="1:qemu_monitor_text" Is there any place where these are comprehensively documented, has anything changed from what's mentioned in the above blog & the logging wiki page ? Furthermore, from /etc/libvirt/libvirtd.conf, I see: =========================================== [...] # Logging filters: # A filter allows to select a different logging level for a given category # of logs # The format for a filter is one of: # x:name # x:+name # where name is a string which is matched against source file name, # e.g., "remote", "qemu", or "util/json", the optional "+" prefix # tells libvirt to log stack trace for each message matching name, # and x is the minimal level where matching messages should be logged: # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # # Multiple filter can be defined in a single @filters, they just need to be # separated by spaces. # # e.g. to only get warning or errors from the remote layer and only errors # from the event layer: #log_filters="3:remote 4:event" [...] =========================================== Is the above list of strings describe all possible "name" values for filters ? If I'm missing some obvious resource on the inter-webs, please point me to it. Thanks. -- /kashyap

2 2

[libvirt] [PATCH] virsh: Allow attach-disk to specify disk wwn
by Osier Yang 04 Jun '13

04 Jun '13

Commit 6e73850b01ee support to set wwn for disks, but it was not exposed to attach-disk. --- tools/virsh-domain.c | 14 +++++++++++++- tools/virsh.pod | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 9ea5ffc..767e288 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -307,6 +307,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .help = N_("serial of disk device") }, + {.name = "wwn", + .type = VSH_OT_STRING, + .help = N_("wwn of disk device") + }, {.name = "shareable", .type = VSH_OT_BOOL, .help = N_("shareable between domains") @@ -499,7 +503,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *source = NULL, *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, *mode = NULL, - *cache = NULL, *serial = NULL, *straddr = NULL; + *cache = NULL, *serial = NULL, *straddr = NULL, + *wwn = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -538,6 +543,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0 || vshCommandOptStringReq(ctl, cmd, "cache", &cache) < 0 || vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || + vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) goto cleanup; @@ -564,6 +570,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) } } + if (wwn && !virValidateWWN(wwn)) + goto cleanup; + /* Make XML of disk */ virBufferAsprintf(&buf, "<disk type='%s'", (isFile) ? "file" : "block"); @@ -597,6 +606,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (serial) virBufferAsprintf(&buf, " <serial>%s</serial>\n", serial); + if (wwn) + virBufferAsprintf(&buf, " <wwn>%s</wwn>\n", wwn); + if (vshCommandOptBool(cmd, "shareable")) virBufferAddLit(&buf, " <shareable/>\n"); diff --git a/tools/virsh.pod b/tools/virsh.pod index 047c241..69c290f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1849,8 +1849,8 @@ expected. [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] -[I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] -[I<--multifunction>] [I<--print-xml>] +[I<--serial serial>] [I<--wwn wwn>] [I<--shareable>] [I<--rawio>] +[I<--address address>] [I<--multifunction>] [I<--print-xml>] Attach a new disk device to the domain. I<source> is path for the files and devices. I<target> controls the bus or @@ -1870,8 +1870,8 @@ I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<sourcetype> can indicate the type of source (block|file) I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". -I<serial> is the serial of disk device. I<shareable> indicates the disk device -is shareable between domains. +I<serial> is the serial of disk device. I<wwn> is the wwn of disk device. +I<shareable> indicates the disk device is shareable between domains. I<rawio> indicates the disk needs rawio capability. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, scsi:controller.bus.unit or ide:controller.bus.unit. -- 1.8.1.4

2 2