- Devel - libvirt List Archives

[libvirt] Libvirt 0.10.0-rc1 segfaults when daemon run as root
by Shawn Furrow 31 Aug '12

31 Aug '12

Hi all, For some reason when I run "libvirtd -d" as root it seems to not start. I investigate by running "libvirtd -v" as root and I get a segfault. Here is the output: 2012-08-23 19:01:23.237+0000: 27464: info : libvirt version: 0.10.0 > 2012-08-23 19:01:23.237+0000: 27464: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:01:23.238+0000: 27464: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined > symbol: virSecurityManagerGetProcessLabel > Caught Segmentation violation dumping internal log buffer: > > ====== start of log ===== > 2012-08-23 19:01:23.235+000027464: debug : main:1120 : Decided on pid file > path '/usr/local/var/run/libvirtd.pid' > 2012-08-23 19:01:23.235+000027464: debug : main:1130 : Decided on socket > paths '/usr/local/var/run/libvirt/libvirt-sock' and > '/usr/local/var/run/libvirt/libvirt-sock-ro' > 2012-08-23 19:01:23.235+000027464: debug : main:1168 : Ensuring run dir > '/usr/local/var/run/libvirt' exists > 2012-08-23 19:01:23.235+000027464: debug : virEventRegisterDefaultImpl:204 > : registering default event implementation > 2012-08-23 19:01:23.235+000027464: debug : virEventPollAddHandle:111 : > Used 0 handle slots, adding at least 10 more > 2012-08-23 19:01:23.235+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.236+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=1 fd=5 events=1 cb=0x7f323cd415a0 opaque=(nil) > ff=(nil) > 2012-08-23 19:01:23.236+000027464: debug : virEventRegisterImpl:177 : > addHandle=0x7f323cd423d0 updateHandle=0x7f323cd414a0 > removeHandle=0x7f323cd41360 addTimeout=0x7f323cd42220 > updateTimeout=0x7f323cd415e0 removeTimeout=0x7f323cd41260 > 2012-08-23 19:01:23.236+000027464: debug : virNetServerNew:407 : > srv=0xdd8890 refs=1 > 2012-08-23 19:01:23.236+000027464: debug : main:1206 : Dropping privileges > (if required) > 2012-08-23 19:01:23.236+000027464: debug : virDriverModuleInitialize:53 : > Module dir /usr/local/lib/libvirt/connection-driver > 2012-08-23 19:01:23.236+000027464: debug : virDriverLoadModule:66 : Module > load network > 2012-08-23 19:01:23.236+000027464: debug : virRegisterNetworkDriver:564 : > registering Network as network driver 4 > 2012-08-23 19:01:23.236+000027464: debug : virDriverLoadModule:66 : Module > load storage > 2012-08-23 19:01:23.236+000027464: debug : virRegisterStorageDriver:624 : > registering storage as storage driver 4 > 2012-08-23 19:01:23.236+000027464: debug : virDriverLoadModule:66 : Module > load secret > 2012-08-23 19:01:23.237+000027464: debug : virRegisterSecretDriver:684 : > registering secret as secret driver 3 > 2012-08-23 19:01:23.237+000027464: debug : virDriverLoadModule:66 : Module > load nwfilter > 2012-08-23 19:01:23.237+000027464: debug : virRegisterNWFilterDriver:714 : > registering nwfilter as network filter driver 3 > 2012-08-23 19:01:23.237+000027464: debug : virDriverLoadModule:66 : Module > load qemu > 2012-08-23 19:01:23.237+000027464: error : virDriverLoadModule:78 : failed > to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:01:23.238+000027464: debug : virDriverLoadModule:66 : Module > load lxc > 2012-08-23 19:01:23.238+000027464: error : virDriverLoadModule:78 : failed > to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:01:23.238+000027464: debug : virDriverLoadModule:66 : Module > load uml > 2012-08-23 19:01:23.238+000027464: debug : virRegisterDriver:732 : > driver=0x7f3232ec7760 name=UML > 2012-08-23 19:01:23.238+000027464: debug : virRegisterDriver:747 : > registering UML as driver 6 > 2012-08-23 19:01:23.238+000027464: debug : virDriverLoadModule:66 : Module > load xen > 2012-08-23 19:01:23.239+000027464: debug : virRegisterDriver:732 : > driver=0x7f3232caad00 name=Xen > 2012-08-23 19:01:23.239+000027464: debug : virRegisterDriver:747 : > registering Xen as driver 7 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramNew:63 : > prog=0xddca40 refs=1 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramRef:84 : > prog=0xddca40 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramNew:63 : > prog=0xddcbc0 refs=1 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramRef:84 : > prog=0xddcbc0 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=2 fd=7 events=1 cb=0x7f323ce241e0 > opaque=0xdd8890 ff=(nil) > 2012-08-23 19:01:23.239+000027464: debug : main:1257 : Attempting to > configure auditing subsystem > 2012-08-23 19:01:23.239+000027464: debug : main:1263 : Proceeding without > auditing > 2012-08-23 19:01:23.239+000027464: debug : virHookCheck:119 : No hook > script /usr/local/etc/libvirt/hooks/daemon > 2012-08-23 19:01:23.239+000027464: debug : virHookCheck:119 : No hook > script /usr/local/etc/libvirt/hooks/qemu > 2012-08-23 19:01:23.239+000027464: debug : virHookCheck:119 : No hook > script /usr/local/etc/libvirt/hooks/lxc > 2012-08-23 19:01:23.239+000027464: debug : daemonSetupNetworking:464 : > Registering unix socket /usr/local/var/run/libvirt/libvirt-sock > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:119 : > localAddr=0x7fff419bf530 remoteAddr=(nil) fd=9 errfd=-1 pid=0 > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:179 : > RPC_SOCKET_NEW: sock=0xddcbf0 refs=1 fd=9 errfd=-1 pid=0 > localAddr=127.0.0.1;0, remoteAddr=(null) > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketRef:713 : > RPC_SOCKET_REF: sock=0xddcbf0 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=3 fd=9 events=0 cb=0x7f323ce2ab10 > opaque=0xddcbf0 ff=0x7f323ce2ba60 > 2012-08-23 19:01:23.239+000027464: debug : daemonSetupNetworking:474 : > Registering unix socket /usr/local/var/run/libvirt/libvirt-sock-ro > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:119 : > localAddr=0x7fff419bf530 remoteAddr=(nil) fd=10 errfd=-1 pid=0 > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:179 : > RPC_SOCKET_NEW: sock=0xddd430 refs=1 fd=10 errfd=-1 pid=0 > localAddr=127.0.0.1;0, remoteAddr=(null) > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketRef:713 : > RPC_SOCKET_REF: sock=0xddd430 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=4 fd=10 events=0 cb=0x7f323ce2ab10 > opaque=0xddd430 ff=0x7f323ce2ba60 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerRef:420 : > srv=0xdd8890 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virNetlinkEventServiceStart:656 > : libnl was not available at build time > 2012-08-23 19:01:23.239+000027464: debug : virNetServerRun:714 : > srv=0xdd8890 quit=0 > 2012-08-23 19:01:23.239+000027464: debug : virEventRunDefaultImpl:244 : > running default event implementation > 2012-08-23 19:01:23.239+000027464: debug : virEventPollCleanupTimeouts:501 > : Cleanup 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollCleanupTimeouts:537 > : Found 0 out of 0 timeout slots used, releasing 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollCleanupHandles:549 > : Cleanup 4 > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=0 w=1, f=5 e=1 d=0 > 2012-08-23 19:01:23.240+000027475: debug : virStateInitialize:798 : > Running global init for Remote state driver > 2012-08-23 19:01:23.240+000027475: debug : virStateInitialize:798 : > Running global init for Network state driver > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=1 w=2, f=7 e=1 d=0 > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=2 w=3, f=9 e=0 d=0 > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=3 w=4, f=10 e=0 d=0 > 2012-08-23 19:01:23.240+000027464: debug : > virEventPollCalculateTimeout:320 : Calculate expiry of 0 timers > 2012-08-23 19:01:23.240+000027464: debug : > virEventPollCalculateTimeout:346 : Timeout at 0 due in -1 ms > 2012-08-23 19:01:23.240+000027464: debug : virEventPollRunOnce:614 : > EVENT_POLL_RUN: nhandles=2 timeout=-1 > > ====== end of log ===== > Segmentation fault/ However, when I run "libvirtd -d" as me, it does not segfault and continues running. However I cannot connect to the libvirt-sock because it gets created at "$HOME/.cache/libvirt/libvirt-sock" but virsh looks for it at "/usr/local/var/run/libvirt-sock". Here is what I get when I run "libvirtd -v" as me: 2012-08-23 19:02:15.145+0000: 27483: info : libvirt version: 0.10.0 > 2012-08-23 19:02:15.145+0000: 27483: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:02:15.145+0000: 27483: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined > symbol: virSecurityManagerGetProcessLabel Any ideas why this is happening? I am on Ubuntu 10.04 running libvirt 0.10.0 with qemu-kvm 1.1 Thanks, Shawn -- Virginia Tech Bradley Department of Electrical and Computer Engineering B.S. Electrical Engineering B.S. Computer Engineering

3 2

[libvirt] [perl-Sys-Virt][PATCH] Virt.xs: fix flag issue on set_scheduler_parameters
by Alex Jia 31 Aug '12

31 Aug '12

From: Alex Jia <Alex Jia ajia(a)redhat.com> The default flags are inconsistent on both qemuSetSchedulerParameters() and qemuGetSchedulerParameters() in libvirt, the qemuGetSchedulerParameters() always passes 'VIR_DOMAIN_AFFECT_CURRENT' flag to the qemuGetSchedulerParametersFlags(), it should be a expected behavior, but the qemuSetSchedulerParameters() always passes 'VIR_DOMAIN_AFFECT_LIVE' flag to the qemuSetSchedulerParametersFlags(), if users use default flag=0 or explicitly give a 'VIR_DOMAIN_AFFECT_CURRENT' flag to the set_scheduler_parameters() in perl-Sys-Virt, because the flag value is 0, the result is the virDomainSetSchedulerParameters() is called incorrectly. How to reproduce? # cat test.pl #!/usr/bin/env perl use warnings; use strict; use Sys::Virt; my $uri = "qemu:///system"; my $domname = "foo"; # change your guest name my $con = Sys::Virt->new(address => $uri, readonly => 0); my $dom = $con->get_domain_by_name($domname); my %sched_param = (Sys::Virt::Domain::SCHEDULER_CPU_SHARES=>1); $dom->set_scheduler_parameters(\%sched_param, Sys::Virt::Domain::AFFECT_CURRENT); # perl test.pl libvirt error code: 55, message: Requested operation is not valid: domain is not running Signed-off-by: Alex Jia <Alex Jia ajia(a)redhat.com> --- Virt.xs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Virt.xs b/Virt.xs index 2b8d74c..0ebf95d 100644 --- a/Virt.xs +++ b/Virt.xs @@ -2833,7 +2833,7 @@ set_scheduler_parameters(dom, newparams, flags=0) } } vir_typed_param_from_hv(newparams, params, nparams); - if (flags) { + if (flags != 1) { if (virDomainSetSchedulerParametersFlags(dom, params, nparams, flags) < 0) _croak_error(); } else { -- 1.7.1

3 4

[libvirt] [PATCH][TCK] add script to test storage and vol get commands
by Kyla Zhang 31 Aug '12

31 Aug '12

including pool->get_uuid pool->get_name pool->refresh pool->get_volume_by_name vol->get_name vol->get_key vol->get_path vol->get_info vmm->get_storage_pool_by_uuid --- scripts/storage/120-get-ops.t | 116 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) create mode 100644 scripts/storage/120-get-ops.t diff --git a/scripts/storage/120-get-ops.t b/scripts/storage/120-get-ops.t new file mode 100644 index 0000000..bf1f279 --- /dev/null +++ b/scripts/storage/120-get-ops.t @@ -0,0 +1,116 @@ +# -*- perl -*- +# +# Copyright (C) 2012 Red Hat, Inc. +# Copyright (C) 2012 Kyla Zhang <weizhan(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +storage/120-get-opts.t - Get command testing for pool and vol including +pool->get_uuid +pool->get_name +pool->refresh +pool->get_volume_by_name +vol->get_name +vol->get_key +vol->get_path +vol->get_info + +=head1 DESCRIPTION + +The test case validates the get commands for pool and vol works well + +=cut + +use strict; +use warnings; + +use Test::More tests => 15; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +my $name = "tck1"; +my $xml = $tck->generic_pool("dir", $name)->as_xml; +my $dir = $tck->create_empty_dir("storage-fs", $name); +my $vol1_name = "tck_vol1"; +my $vol2_name = "tck_vol2"; + + +diag "Creating a new transient pool"; +my $pool; +ok_pool(sub { $pool = $conn->create_storage_pool($xml) }, "created transient pool object"); + + +diag "Get pool uuid"; +my $pool_uuid=$pool->get_uuid(); +is ($conn->get_storage_pool_by_uuid($pool_uuid)->get_name(), $name, "Get pool uuid succeed"); + + +diag "Get pool name"; +is($pool->get_name(), $name, "Get pool name $name"); + + +diag "Get volume by name"; +my $vol1_xml = $tck->generic_volume($vol1_name, "raw", 1024*1024*50)->allocation(0)->as_xml; +my $vol1 = $pool->create_volume($vol1_xml); +is($pool->get_volume_by_name($vol1_name)->get_name(), $vol1_name, "Get volume $vol1_name"); + + +diag "Get volume without refresh after creating image with dd"; +system("dd if=/dev/zero of=$dir/$vol2_name count=7 bs=1048576"); +ok_error(sub { $pool->get_volume_by_name($vol2_name) }, + "Can't get volume $vol2_name without refresh", Sys::Virt::Error::ERR_NO_STORAGE_VOL); + + +diag "Refresh pool and get volume again"; +lives_ok(sub { $pool->refresh() }, "Pool refresh succeed"); +my $vol2=$pool->get_volume_by_name($vol2_name); +is($vol2->get_name(), $vol2_name, "Get volume $vol2_name"); + + +diag "get vol key"; +my $vol2_key=xpath($vol2, "string(/volume/key)"); +is($vol2->get_key(), $vol2_key, "Get vol key $vol2_key"); + + +diag "Get vol path"; +my $vol2_path=xpath($vol2, "string(/volume/target/path)"); +is($vol2->get_path(), $vol2_path, "Get vol path $vol2_path"); + + +diag "Get vol info"; +is($vol2->get_info()->{type}, Sys::Virt::StorageVol::TYPE_FILE, "Get vol type file"); +my $vol2_capacity=xpath($vol2, "string(/volume/capacity)"); +is($vol2->get_info()->{capacity}, $vol2_capacity, "Get vol capacity $vol2_capacity"); +my $vol2_allocation=xpath($vol2, "string(/volume/allocation)"); +is($vol2->get_info()->{allocation}, $vol2_allocation, "Get vol allocation $vol2_allocation"); + + +diag "Destroy volume"; +lives_ok(sub { $vol1->delete(0) }, "deleted volume 1"); +lives_ok(sub { $vol2->delete(0) }, "deleted volume 2"); + +diag "Destroying the transient pool"; +$pool->destroy; + +diag "Checking that transient pool has gone away"; +ok_error(sub { $conn->get_storage_pool_by_name("tck") }, "NO_POOL error raised from missing pool", + Sys::Virt::Error::ERR_NO_STORAGE_POOL); + +# end -- 1.7.1

3 2

[libvirt] [PATCH] command: shell-quote when logging commands
by Eric Blake 31 Aug '12

31 Aug '12

Without this patch, logged command executions can be ambiguous if the command contained any shell metacharacters. This has caused more than one person to attempt to patch clients to add unnecessary quoting, without realizing that the command itself was run with correct args, and only the logged output was ambiguous. * src/util/command.c (virCommandToString): Add shell escapes. * tests/commandtest.c (test16): Test new behavior. * tests/commanddata/test16.log: Update expected output. * tests/qemuxml2argvdata/qemuxml2argv-*.args: Likewise. * tests/networkxml2argvdata/*.argv: Likewise. --- src/util/command.c | 25 ++++++++++++++++------ tests/commanddata/test16.log | 2 +- tests/commandtest.c | 6 ++++-- .../nat-network-dns-txt-record.argv | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 7 +++--- .../qemuxml2argv-disk-drive-network-rbd.args | 7 +++--- .../qemuxml2argv-graphics-vnc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 6 +++--- 9 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 49ec178..418b198 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1614,9 +1614,10 @@ virCommandWriteArgLog(virCommandPtr cmd, int logfd) * virCommandToString: * @cmd: the command to convert * - * Call after adding all arguments and environment settings, but before - * Run/RunAsync, to return a string representation of the environment and - * arguments of cmd. If virCommandRun cannot succeed (because of an + * Call after adding all arguments and environment settings, but + * before Run/RunAsync, to return a string representation of the + * environment and arguments of cmd, suitably quoted for pasting into + * a shell. If virCommandRun cannot succeed (because of an * out-of-memory condition while building cmd), NULL will be returned. * Caller is responsible for freeing the resulting string. */ @@ -1639,13 +1640,25 @@ virCommandToString(virCommandPtr cmd) } for (i = 0; i < cmd->nenv; i++) { - virBufferAdd(&buf, cmd->env[i], strlen(cmd->env[i])); + /* In shell, a='b c' has a different meaning than 'a=b c', so + * we must determine where the '=' lives. */ + char *eq = strchr(cmd->env[i], '='); + + if (!eq) { + virBufferFreeAndReset(&buf); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid use of command API")); + return NULL; + } + eq++; + virBufferAdd(&buf, cmd->env[i], eq - cmd->env[i]); + virBufferEscapeShell(&buf, eq); virBufferAddChar(&buf, ' '); } - virBufferAdd(&buf, cmd->args[0], strlen(cmd->args[0])); + virBufferEscapeShell(&buf, cmd->args[0]); for (i = 1; i < cmd->nargs; i++) { virBufferAddChar(&buf, ' '); - virBufferAdd(&buf, cmd->args[i], strlen(cmd->args[i])); + virBufferEscapeShell(&buf, cmd->args[i]); } if (virBufferError(&buf)) { diff --git a/tests/commanddata/test16.log b/tests/commanddata/test16.log index 7088165..119dd29 100644 --- a/tests/commanddata/test16.log +++ b/tests/commanddata/test16.log @@ -1 +1 @@ -A=B true C +A=B C=D E true F G H diff --git a/tests/commandtest.c b/tests/commandtest.c index b1c7523..c005153 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -607,12 +607,14 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) { virCommandPtr cmd = virCommandNew("true"); char *outactual = NULL; - const char *outexpect = "A=B true C"; + const char *outexpect = "A=B C='D E' true F 'G H'"; int ret = -1; int fd = -1; virCommandAddEnvPair(cmd, "A", "B"); - virCommandAddArg(cmd, "C"); + virCommandAddEnvPair(cmd, "C", "D E"); + virCommandAddArg(cmd, "F"); + virCommandAddArg(cmd, "G H"); if ((outactual = virCommandToString(cmd)) == NULL) { virErrorPtr err = virGetLastError(); diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 1b31871..2a6c799 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,6 +1,6 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --filterwin2k --conf-file= \ ---except-interface lo --txt-record=example,example value \ +--except-interface lo '--txt-record=example,example value' \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args index b323e91..02a9869 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -2,9 +2,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ -file=rbd:pool/image:\ +'file=rbd:pool/image:\ id=myname:\ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ 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 +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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args index 69cf7c7..61c8f7d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args @@ -2,6 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ -file=rbd:pool/image:auth_supported=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 +'file=rbd:pool/image:auth_supported=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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index 2af1540..af99225 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -1,4 +1,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\ nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ --parallel none -usb -vnc [2001:1:2:3:4:5:1234:1234]:3 +-parallel none -usb -vnc '[2001:1:2:3:4:5:1234:1234]:3' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args index 19450a1..88bdd13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -1,4 +1,4 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test NS=ns BAR= \ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test NS=ns BAR='' \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -unknown \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index 3f6cb81..ac28bad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -1,7 +1,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -smbios type=0,vendor=LENOVO,version=6FET82WW (3.12 ) -smbios \ -type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\ +pc -m 214 -smp 1 -smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \ +-smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\ serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\ -uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat \ +uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat' \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -- 1.7.11.4

2 2

[libvirt] [PATCH] qemu: fix remote port searching
by Martin Kletzander 31 Aug '12

31 Aug '12

After fixing the last review comments on remote port searching (commit a14b4aea512d6c3a42af56207a65ef10ac4a12a1), the commit right after that wasn't modified accordingly, therefore two values weren't changed as they should and the configurable ports don't work as expected. This simple commit changes last two values missed and fixes the issue. --- This time I double checked that it does what it should! src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7f85aea..5c3b89e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3467,7 +3467,7 @@ int qemuProcessStart(virConnectPtr conn, if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && !vm->def->graphics[0]->data.vnc.socket && vm->def->graphics[0]->data.vnc.autoport) { - int port = qemuProcessNextFreePort(driver, QEMU_REMOTE_PORT_MIN); + int port = qemuProcessNextFreePort(driver, driver->remotePortMin); if (port < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to find an unused port for VNC")); @@ -3478,7 +3478,7 @@ int qemuProcessStart(virConnectPtr conn, int port = -1; if (vm->def->graphics[0]->data.spice.autoport || vm->def->graphics[0]->data.spice.port == -1) { - port = qemuProcessNextFreePort(driver, QEMU_REMOTE_PORT_MIN); + port = qemuProcessNextFreePort(driver, driver->remotePortMin); if (port < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.12

3 5

[libvirt] [PATCH 0/2] virsh: Check for connection usability before each command
by Peter Krempa 31 Aug '12

31 Aug '12

Some commands in virsh forgot to do this check before executing remote commands and printed unexpected error messages. This series moves the connection check to a central point so that these mistakes don't happen. Also it's a nice cleanup :). Peter Krempa (2): virsh: Improve checking for connection when running commands virsh: remove unneeded usage of vshConnectionUsability() tools/virsh-domain-monitor.c | 36 -------- tools/virsh-domain.c | 215 ------------------------------------------- tools/virsh-host.c | 40 -------- tools/virsh-interface.c | 40 -------- tools/virsh-network.c | 35 ------- tools/virsh-nodedev.c | 18 ---- tools/virsh-nwfilter.c | 15 --- tools/virsh-pool.c | 57 ------------ tools/virsh-secret.c | 18 ---- tools/virsh-snapshot.c | 30 ------ tools/virsh-volume.c | 50 ---------- tools/virsh.c | 46 +++++---- tools/virsh.h | 1 - 13 files changed, 28 insertions(+), 573 deletions(-) -- 1.7.12

2 4

[libvirt] [PATCH] schemas: Fix wwn pattern
by Osier Yang 31 Aug '12

31 Aug '12

It should be [] instead of (). --- docs/schemas/nodedev.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index c07a97d..88a4e9d 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -247,7 +247,7 @@ <define name='wwn'> <data type='string'> - <param name='pattern'>(0-9a-fA-F){16}</param> + <param name='pattern'>[0-9a-fA-F]{16}</param> </data> </define> -- 1.7.7.3

2 2

[libvirt] [PATCH] util: Update the inconsistent and outdated comments
by Osier Yang 31 Aug '12

31 Aug '12

The codes were updated to allow to reset the device as long as there is no devices/functions behind the same bus. However, the comments were kept without touched. --- Pushed under trivial rule. --- src/util/pci.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 137521b..0742d07 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -605,10 +605,9 @@ pciTrySecondaryBusReset(pciDevice *dev, uint16_t ctl; int ret = -1; - /* For now, we just refuse to do a secondary bus reset - * if there are other devices/functions behind the bus. - * In future, we could allow it so long as those devices - * are not in use by the host or other guests. + /* Refuse to do a secondary bus reset if there are other + * devices/functions behind the bus are used by the host + * or other guests. */ if ((conflict = pciBusContainsActiveDevices(dev, inactiveDevs))) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.7.3

1 0

[libvirt] [PATCH 0/2] conf: Fix parsing and formatting of seclabels
by Jiri Denemark 31 Aug '12

31 Aug '12

This patchset contains updated patches from Marcelo with the changes I sent previously as a WIP. Marcelo Cerri (2): conf: Fix parsing of seclabels without model conf: Avoid formatting auto-generated DAC labels src/conf/domain_conf.c | 78 ++++++++++++++++++++++++++++++++++---------------- src/conf/domain_conf.h | 1 + 2 files changed, 55 insertions(+), 24 deletions(-) -- 1.7.12

2 4

[libvirt] [PATCH] virsh: fixed incorrect timing report
by Viktor Mihajlovski 31 Aug '12

31 Aug '12

When executing virsh -t <command> the reported timing was off by 3 orders of magnitude if the command took more than one second. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 7a5b92c..04d1b52 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1509,7 +1509,7 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) return ret; if (enable_timing) { - double diff_ms = (((after.tv_sec - before.tv_sec) * 1000000.0) + + double diff_ms = (((after.tv_sec - before.tv_sec) * 1000.0) + ((after.tv_usec - before.tv_usec) / 1000.0)); vshPrint(ctl, _("\n(Time: %.3f ms)\n\n"), diff_ms); -- 1.7.0.4

3 2