- Devel - libvirt List Archives

[libvirt] [PATCHv3] qemu: snapshot: Add support for compressing external snapshot memory
by Peter Krempa 14 Oct '13

14 Oct '13

The regular save image code has the support to compress images using a specified algorithm. This was not implemented for external checkpoints although it shares most of the backend code. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1017227 --- Notes: Version 3: - added changes for augeas (and installed augeas to avoid such problems) src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 23 +++++++++++++++++++++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 591d78d..32db983 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -58,6 +58,7 @@ module Libvirtd_qemu = let save_entry = str_entry "save_image_format" | str_entry "dump_image_format" + | str_entry "snapshot_image_format" | str_entry "auto_dump_path" | bool_entry "auto_dump_bypass_cache" | bool_entry "auto_start_bypass_cache" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 3032aa6..bf57b9c 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -278,8 +278,14 @@ # the requested compression program can't be found, this falls # back to "raw" compression. # +# snapshot_image_format specifies the compression algorithm of the memory save +# image when an external snapshot of a domain is taken. This does not apply +# on disk image format. It is an error if the specified format isn't valid, +# or the requested compression program can't be found. +# #save_image_format = "raw" #dump_image_format = "raw" +#snapshot_image_format = "raw" # When a domain is configured to be auto-dumped when libvirtd receives a # watchdog event from qemu guest, libvirtd will save dump files in directory diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 16a0b92..295f1eb 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -521,6 +521,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("save_image_format", cfg->saveImageFormat); GET_VALUE_STR("dump_image_format", cfg->dumpImageFormat); + GET_VALUE_STR("snapshot_image_format", cfg->snapshotImageFormat); + GET_VALUE_STR("auto_dump_path", cfg->autoDumpPath); GET_VALUE_BOOL("auto_dump_bypass_cache", cfg->autoDumpBypassCache); GET_VALUE_BOOL("auto_start_bypass_cache", cfg->autoStartBypassCache); diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 40adfce..ea3c691 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -144,6 +144,7 @@ struct _virQEMUDriverConfig { char *saveImageFormat; char *dumpImageFormat; + char *snapshotImageFormat; char *autoDumpPath; bool autoDumpBypassCache; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80285ff..69086c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12128,6 +12128,8 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; + virQEMUDriverConfigPtr cfg = NULL; + int compressed = QEMU_SAVE_FORMAT_RAW; if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; @@ -12189,12 +12191,28 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, JOB_MASK(QEMU_JOB_SUSPEND) | JOB_MASK(QEMU_JOB_MIGRATION_OP)); + cfg = virQEMUDriverGetConfig(driver); + if (cfg->snapshotImageFormat) { + compressed = qemuSaveCompressionTypeFromString(cfg->snapshotImageFormat); + if (compressed < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Invalid snapshot image format specified " + "in configuration file")); + goto cleanup; + } + if (!qemuCompressProgramAvailable(compressed)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Compression program for image format " + "in configuration file isn't available")); + goto cleanup; + } + } + if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true))) goto endjob; if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, - xml, QEMU_SAVE_FORMAT_RAW, - resume, 0, + xml, compressed, resume, 0, QEMU_ASYNC_JOB_SNAPSHOT)) < 0) goto endjob; @@ -12283,6 +12301,7 @@ endjob: cleanup: VIR_FREE(xml); + virObjectUnref(cfg); if (memory_unlink && ret < 0) unlink(snap->def->file); diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 4b27db1..7af3f64 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -49,6 +49,7 @@ module Test_libvirtd_qemu = } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } +{ "snapshot_image_format" = "raw" } { "auto_dump_path" = "/var/lib/libvirt/qemu/dump" } { "auto_dump_bypass_cache" = "0" } { "auto_start_bypass_cache" = "0" } -- 1.8.3.2

2 2

[libvirt] [PATCH 0/3] Misc LXC errore reporting improvements
by Daniel P. Berrange 14 Oct '13

14 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A few more LXC fixes to improve error reporting Instead of # virsh -c lxc:/// start shell error: Failed to start domain shell error: internal error: guest failed to start: PATH=/bin:/sbin TERM=linux container=lxc-libvirt container_uuid=95449419-f969-d649-d996-2566ec42af7d LIBVIRT_LXC_UUID=95449419-f969-d649-d996-2566ec42af7d LIBVIRT_LXC_NAME=shell /bin/sh error receiving signal from container: Input/output error we now get # virsh -c lxc:/// start shell error: Failed to start domain shell error: internal error: guest failed to start: Failed to access '/mnt/btr/does/not/exist': No such file or directory Daniel P. Berrange (3): Ensure lxcContainerMain reports errors on stderr Ensure lxcContainerResolveSymlinks reports errors Improve log filtering in virLXCProcessReadLogOutputData src/lxc/lxc_container.c | 18 ++++++++++++++---- src/lxc/lxc_process.c | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 5 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCHv2 0/2] Enable compression of external snapshots and managed save images
by Peter Krempa 14 Oct '13

14 Oct '13

Version 2 treats save images and managed save images as same, using the same config option. Peter Krempa (2): qemu: managedsave: Add support for compressing managed save images qemu: snapshot: Add support for compressing external snapshot memory src/qemu/qemu.conf | 12 +++++++++--- src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 54 insertions(+), 7 deletions(-) -- 1.8.3.2

2 6

[libvirt] [PATCH]virsh: support readonly in attach-disk command
by Chen Hanxiao 14 Oct '13

14 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> support readonly in attach-disk virsh command with option --readonly Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-domain.c | 7 +++++++ tools/virsh.pod | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3479a1c..d334ebe 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -315,6 +315,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_BOOL, .help = N_("shareable between domains") }, + {.name = "readonly", + .type = VSH_OT_BOOL, + .help = N_("allow guest read-only access to disk") + }, {.name = "rawio", .type = VSH_OT_BOOL, .help = N_("needs rawio capability") @@ -612,6 +616,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "shareable")) virBufferAddLit(&buf, " <shareable/>\n"); + if (vshCommandOptBool(cmd, "readonly")) + virBufferAddLit(&buf, " <readonly/>\n"); + if (straddr) { if (str2DiskAddress(straddr, &diskAddr) != 0) { vshError(ctl, _("Invalid address.")); diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..91b4429 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1908,8 +1908,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<--wwn wwn>] [I<--shareable>] [I<--rawio>] -[I<--address address>] [I<--multifunction>] [I<--print-xml>] +[I<--serial serial>] [I<--wwn wwn>] [I<--shareable>] [I<--readonly>] +[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 @@ -1931,6 +1931,7 @@ I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". 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<readonly> indicates the disk device is read-only. 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.2.1

3 5

Re: [libvirt] [Users] Migration issues with ovirt 3.3
by Dan Kenigsberg 14 Oct '13

14 Oct '13

On Wed, Oct 09, 2013 at 02:42:22PM +0200, Gianluca Cecchi wrote: > On Tue, Oct 8, 2013 at 10:40 AM, Dan Kenigsberg wrote: > > > > >> > >> But migration still fails > >> > > > > It seems like an unrelated failure. I do not know what's blocking > > migration traffic. Could you see if libvirtd.log and qemu logs at source > > and destinaiton have clues? > > > > It seems that on VM.log under qemu of desdt host I have: > ... > -incoming tcp:[::]:49153: Failed to bind socket: Address already in use Is that port really taken (`ss -ntp` should tell by whom)? > > > See all: > - In libvirtd.log of source host > 2013-10-07 23:20:54.471+0000: 1209: debug : > qemuMonitorOpenInternal:751 : QEMU_MONITOR_NEW: mon=0x7fc66412e820 > refs=2 fd=30 > 2013-10-07 23:20:54.472+0000: 1209: warning : > qemuDomainObjEnterMonitorInternal:1136 : This thread seems to be the > async job owner; entering monitor without asking for a nested job is > dangerous > 2013-10-07 23:20:54.472+0000: 1209: debug : > qemuMonitorSetCapabilities:1145 : mon=0x7fc66412e820 > 2013-10-07 23:20:54.472+0000: 1209: debug : qemuMonitorSend:887 : > QEMU_MONITOR_SEND_MSG: mon=0x7fc66412e820 > msg={"execute":"qmp_capabilities","id":"libvirt-1"} > fd=-1 > 2013-10-07 23:20:54.769+0000: 1199: error : qemuMonitorIORead:505 : > Unable to read from monitor: Connection reset by peer > 2013-10-07 23:20:54.769+0000: 1199: debug : qemuMonitorIO:638 : Error > on monitor Unable to read from monitor: Connection reset by peer > 2013-10-07 23:20:54.769+0000: 1199: debug : qemuMonitorIO:672 : > Triggering error callback > 2013-10-07 23:20:54.769+0000: 1199: debug : > qemuProcessHandleMonitorError:351 : Received error on 0x7fc664124fb0 > 'c8again32' > 2013-10-07 23:20:54.769+0000: 1209: debug : qemuMonitorSend:899 : Send > command resulted in error Unable to read from monitor: Connection > reset by peer > 2013-10-07 23:20:54.770+0000: 1199: debug : qemuMonitorIO:638 : Error > on monitor Unable to read from monitor: Connection reset by peer > 2013-10-07 23:20:54.770+0000: 1209: debug : virFileMakePathHelper:1283 > : path=/var/run/libvirt/qemu mode=0777 > 2013-10-07 23:20:54.770+0000: 1199: debug : qemuMonitorIO:661 : > Triggering EOF callback > 2013-10-07 23:20:54.770+0000: 1199: debug : > qemuProcessHandleMonitorEOF:294 : Received EOF on 0x7fc664124fb0 > 'c8again32' > 2013-10-07 23:20:54.770+0000: 1209: debug : qemuProcessStop:3992 : > Shutting down VM 'c8again32' pid=18053 flags=0 > 2013-10-07 23:20:54.771+0000: 1209: error : > virNWFilterDHCPSnoopEnd:2135 : internal error ifname "vnet0" not in > key map > 2013-10-07 23:20:54.782+0000: 1209: debug : virCommandRunAsync:2251 : > About to run /bin/sh -c 'IPT="/usr/sbin/iptables" > $IPT -D libvirt-out -m physdev --physdev-is-bridged --physdev-out > vnet0 -g FO-vnet0 > $IPT -D libvirt-out -m physdev --physdev-out vnet0 -g FO-vnet0 > $IPT -D libvirt-in -m physdev --physdev-in vnet0 -g FI-vnet0 > $IPT -D libvirt-host-in -m physdev --physdev-in vnet0 -g HI-vnet0 > $IPT -D libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT > $IPT -F FO-vnet0 > $IPT -X FO-vnet0 > $IPT -F FI-vnet0 > $IPT -X FI-vnet0 > $IPT -F HI-vnet0 > $IPT -X HI-vnet0 > IPT="/usr/sbin/ip6tables" > $IPT -D libvirt-out -m physdev --physdev-is-bridged --physdev-out > vnet0 -g FO-vnet0 > $IPT -D libvirt-out -m physdev --physdev-out vnet0 -g FO-vnet0 > $IPT -D libvirt-in -m physdev --physdev-in vnet0 -g FI-vnet0 > $IPT -D libvirt-host-in -m physdev --physdev-in vnet0 -g HI-vnet0 > $IPT -D libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT > $IPT -F FO-vnet0 > $IPT -X FO-vnet0 > $IPT -F FI-vnet0 > $IPT -X FI-vnet0 > $IPT -F HI-vnet0 > $IPT -X HI-vnet0 > EBT="/usr/sbin/ebtables" > $EBT -t nat -D PREROUTING -i vnet0 -j libvirt-I-vnet0 > $EBT -t nat -D POSTROUTING -o vnet0 -j libvirt-O-vnet0 > EBT="/usr/sbin/ebtables" > collect_chains() > { > for tmp2 in $*; do > for tmp in $($EBT -t nat -L $tmp2 | \ > sed -n "/Bridge chain/,\$ s/.*-j \$[IO]-.*\$/\\1/p"); > do > echo $tmp > collect_chains $tmp > done > done > } > rm_chains() > { > for tmp in $*; do $EBT -t nat -F $tmp; done > for tmp in $*; do $EBT -t nat -X $tmp; done > } > tmp='\'' > '\'' > IFS='\'' '\'''\'' '\''$tmp > chains="$(collect_chains libvirt-I-vnet0 libvirt-O-vnet0)" > $EBT -t nat -F libvirt-I-vnet0 > $EBT -t nat -F libvirt-O-vnet0 > rm_chains $chains > $EBT -t nat -F libvirt-I-vnet0 > $EBT -t nat -X libvirt-I-vnet0 > $EBT -t nat -F libvirt-O-vnet0 > $EBT -t nat -X libvirt-O-vnet0 > ' > 2013-10-07 23:20:54.784+0000: 1209: debug : virCommandRunAsync:2256 : > Command result 0, with PID 18076 > 2013-10-07 23:20:54.863+0000: 1209: debug : virCommandRun:2125 : > Result exit status 255, stdout: '' stderr: 'iptables v1.4.18: goto > 'FO-vnet0' is not a chain > > Try `iptables -h' or 'iptables --help' for more information. > iptables v1.4.18: goto 'FO-vnet0' is not a chain > > Try `iptables -h' or 'iptables --help' for more information. > iptables v1.4.18: goto 'FI-vnet0' is not a chain > Try `iptables -h' or 'iptables --help' for more information. > iptables v1.4.18: goto 'HI-vnet0' is not a chain > > Try `iptables -h' or 'iptables --help' for more information. > iptables: Bad rule (does a matching rule exist in that chain?). > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > ip6tables v1.4.18: goto 'FO-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables v1.4.18: goto 'FO-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables v1.4.18: goto 'FI-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables v1.4.18: goto 'HI-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables: Bad rule (does a matching rule exist in that chain?). > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > Illegal target name 'libvirt-O-vnet0'. > Chain 'libvirt-O-vnet0' doesn't exist. > Chain 'libvirt-O-vnet0' doesn't exist. > Chain 'libvirt-O-vnet0' doesn't exist. > Chain 'libvirt-O-vnet0' doesn't exist. > ' > 2013-10-07 23:20:54.863+0000: 1209: debug : qemuMonitorClose:821 : > QEMU_MONITOR_CLOSE: mon=0x7fc66412e820 refs=2 > 2013-10-07 23:20:54.863+0000: 1209: debug : qemuProcessKill:3951 : > vm=c8again32 pid=18053 flags=5 > 2013-10-07 23:20:54.863+0000: 1209: debug : > virProcessKillPainfully:269 : vpid=18053 force=1 > 2013-10-07 23:20:54.863+0000: 1209: debug : qemuDomainCleanupRun:2132 > : driver=0x7fc664024cd0, vm=c8again32 > 2013-10-07 23:20:54.863+0000: 1209: debug : > qemuProcessAutoDestroyRemove:4504 : vm=c8again32 > 2013-10-07 23:20:54.863+0000: 1209: debug : > virQEMUCloseCallbacksUnset:744 : vm=c8again32, > uuid=d54660a2-45ed-41ae-ab99-a6f93ebbdbb1, cb=0x7fc66b6fe570 > 2013-10-07 23:20:54.864+0000: 1209: error : > virPortAllocatorRelease:174 : port 0 must be in range (5900, 65535) > 2013-10-07 23:20:54.865+0000: 1209: debug : qemuDomainObjEndJob:1070 : > Stopping job: none (async=migration in) > 2013-10-07 23:20:54.865+0000: 1209: debug : > qemuDomainObjEndAsyncJob:1088 : Stopping async job: migration in > 2013-10-07 23:20:54.865+0000: 1199: debug : > qemuProcessHandleMonitorEOF:306 : Domain 0x7fc664124fb0 is not active, > ignoring EOF > Caught Segmentation violation dumping internal log buffer: This line one seems ominous. Can libvir-list help with it?

4 8

[libvirt] [PATCH]lxc: fix an improper comment in lxc_process
by Chen Hanxiao 14 Oct '13

14 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Fix an improper comment when libvirt has released all resources for lxc. Then original comment says "stopped" rather than "released". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d07ff13..7746c9b 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -217,7 +217,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virSystemdTerminateMachine(vm->def->name, "lxc", true); - /* now that we know it's stopped call the hook if present */ + /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); -- 1.8.2.1

2 3

[libvirt] Guide to view the libvirt source.
by cooldharma06 14 Oct '13

14 Oct '13

hi all, i am new to this libvirt. Any guide or reference is available to know more things libvirt (individual programs). because it will give me some idea to get about the libvirt and its corresponding programs. If there is available means please guide and share me. i want to give my contribution to this community. Lot of thanks in advance. Regards, cooldharma06.

3 2

[libvirt] [PATCH 0/3] Improve LXC startup error reporting
by Daniel P. Berrange 14 Oct '13

14 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> LXC has long suffered from pretty poor error reporting of failures at startup. This series addresses those problems. Daniel P. Berrange (3): Fix exit status of lxc controller Improve error reporting with LXC controller Don't ignore all dbus connection errors src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_process.c | 31 +++++++++++++++++++++++++------ src/nwfilter/nwfilter_driver.c | 5 +++-- src/util/virdbus.c | 22 +++++++++++++++++++--- src/util/virsystemd.c | 6 ++++-- 5 files changed, 52 insertions(+), 14 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH] rpc: Retrieve peer PID via new getsockopt() for Mac
by Doug Goldstein 13 Oct '13

13 Oct '13

While LOCAL_PEERCRED on the BSDs does not return the pid information of the peer, Mac OS X 10.8 added LOCAL_PEERPID to retrieve the pid so we should use that when its available to get that information. --- src/rpc/virnetsocket.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e8cdfa6..09a0a12 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1195,12 +1195,26 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return -1; } - /* PID and process creation time are not supported on BSDs */ + /* PID and process creation time are not supported on BSDs by + * LOCAL_PEERCRED. + */ *pid = -1; *timestamp = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; +# ifdef LOCAL_PEERPID + /* Exists on Mac OS X 10.8 for retrieving the peer's PID */ + cr_len = sizeof(*pid); + + if (getsockopt(sock->fd, VIR_SOL_PEERCRED, LOCAL_PEERPID, pid, &cr_len) < 0) { + virReportSystemError(errno, "%s", + _("Failed to get client socket PID")); + virObjectUnlock(sock); + return -1; + } +# endif + virObjectUnlock(sock); return 0; } -- 1.8.1.5

2 2

[libvirt] PATCH: better error checking for LOCAL_PEERCRED
by Brian Candler 12 Oct '13

12 Oct '13

I was debugging libvirt with OSX today, and got as far as finding the problem with LOCAL_PEERCRED, then googled this only to find that Ryota Ozaki had fixed the problems a few days ago! However you still may find the following patch useful. It tightens up the checking in the LOCAL_PEERCRED block, and in particular fixes the unlocking of the socket in the error return path for invalid groups, by using the same logic from SO_PEERCRED - have a 'goto cleanup' in all return paths. (Detail: I found that when getsockopt was being called with SOL_SOCKET, cr_ngroups was typically <0, probably because it was uninitialised. However once the check for this was tightened, it hung because the socket wasn't being unlocked on return. So better to (a) initialise it to a negative value anyway, and (b) fix the return path) However I have not checked that NGROUPS is defined on other BSD-like systems. Regards, Brian Candler. --- src/rpc/virnetsocket.c.orig 2013-10-10 22:37:49.000000000 +0100 +++ src/rpc/virnetsocket.c 2013-10-12 22:51:57.000000000 +0100 @@ -1157,8 +1157,10 @@ { struct xucred cr; socklen_t cr_len = sizeof(cr); + int ret = -1; virObjectLock(sock); + cr.cr_ngroups = -1; # if defined(__APPLE__) if (getsockopt(sock->fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &cr_len) < 0) { # else @@ -1166,20 +1168,19 @@ # endif virReportSystemError(errno, "%s", _("Failed to get client socket identity")); - virObjectUnlock(sock); - return -1; + goto cleanup; } if (cr.cr_version != XUCRED_VERSION) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Failed to get valid client socket identity")); - return -1; + goto cleanup; } - if (cr.cr_ngroups == 0) { + if (cr.cr_ngroups <= 0 || cr.cr_ngroups > NGROUPS) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Failed to get valid client socket identity groups")); - return -1; + goto cleanup; } /* PID and process creation time are not supported on BSDs */ @@ -1188,8 +1189,11 @@ *uid = cr.cr_uid; *gid = cr.cr_gid; + ret = 0; + +cleanup: virObjectUnlock(sock); - return 0; + return ret; } #else int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,

1 0

[libvirt] QEMU GSoC featured on Google Open Source Blog
by Stefan Hajnoczi 12 Oct '13

12 Oct '13

Stephanie Taylor at the Google Open Source Blog has helped us publish a post that features two projects from this year's Google Summer of Code: http://google-opensource.blogspot.de/2013/10/google-summer-of-code-veteran-… Mike and Osier contributed summaries of the "QEMU Integrated Copy/Paste" and "Libvirt API to query IP addresses for given domain" projects. Stefan

1 0

[libvirt] [BUG] libvirtd on destination crash frequently while migrating vms concurrently
by Wangyufei (A) 12 Oct '13

12 Oct '13

Hello, I found a problem that libvirtd on destination crash frequently while migrating vms concurrently. For example, if I migrate 10 vms concurrently ceaselessly, then after about 30 minutes the libvirtd on destination will crash. So I analyzed and found two bugs during migration process. First, during migration prepare phase on destination, libvirtd assigns ports to qemu to be startd on destination. But the port increase operation is not aomic, so there's a chance that multi vms get the same port, and only the first one can start successfully, others will fail to start. I've applied a patch to solve this bug, and I test it, it works well. If only this bug exists, libvirtd will not crash. The second bug is fatal. Second, I found the libvirtd crash because of segment fault which is produced by accessing vm released. Apparently it's caused by multi-thread operation, thread A access vm data which has released by thread B. At last I proved my thought right. Step 1. Because of bug one, the port is already occupied, so qemu on destination failed to start and sent a HANGUP signal to libvirtd, then libvirtd received this VIR_EVENT_HANDLE_HANGUP event, thread A dealing with events called qemuProcessHandleMonitorEOF as following: #0 qemuProcessHandleMonitorEOF (mon=0x7f4dcd9c3130, vm=0x7f4dcd9c9780) at qemu/qemu_process.c:399 #1 0x00007f4dc18d9e87 in qemuMonitorIO (watch=68, fd=27, events=8, opaque=0x7f4dcd9c3130) at qemu/qemu_monitor.c:668 #2 0x00007f4dccae6604 in virEventPollDispatchHandles (nfds=18, fds=0x7f4db4017e70) at util/vireventpoll.c:500 #3 0x00007f4dccae7ff2 in virEventPollRunOnce () at util/vireventpoll.c:646 #4 0x00007f4dccae60e4 in virEventRunDefaultImpl () at util/virevent.c:273 #5 0x00007f4dccc40b25 in virNetServerRun (srv=0x7f4dcd8d26b0) at rpc/virnetserver.c:1106 #6 0x00007f4dcd6164c9 in main (argc=3, argv=0x7fff8d8f9f88) at libvirtd.c:1518 static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { ...... /* deleted flag is still false now, so we pass through to qemuProcessHandleMonitorEOF */ if (eventLoop.handles[i].deleted) { EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } Step 2: Thread B dealing with migration on destination set deleted flag in virEventPollRemoveHandle as following: #0 virEventPollRemoveHandle (watch=74) at util/vireventpoll.c:176 #1 0x00007f4dccae5e6f in virEventRemoveHandle (watch=74) at util/virevent.c:97 #2 0x00007f4dc18d8ca8 in qemuMonitorClose (mon=0x7f4dbc030910) at qemu/qemu_monitor.c:831 #3 0x00007f4dc18bec63 in qemuProcessStop (driver=0x7f4dcd9bd400, vm=0x7f4dbc00ed20, reason=VIR_DOMAIN_SHUTOFF_FAILED, flags=0) at qemu/qemu_process.c:4302 #4 0x00007f4dc18c1a83 in qemuProcessStart (conn=0x7f4dbc031020, driver=0x7f4dcd9bd400, vm=0x7f4dbc00ed20, migrateFrom=0x7f4dbc01af90 "tcp:[::]:49152", stdin_fd=-1, stdin_path=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, flags=6) at qemu/qemu_process.c:4145 #5 0x00007f4dc18cc688 in qemuMigrationPrepareAny (driver=0x7f4dcd9bd400, Step 3: Thread B cleanup vm in qemuMigrationPrepareAny after qemuProcessStart failed. #0 virDomainObjDispose (obj=0x7f4dcd9c9780) at conf/domain_conf.c:2009 #1 0x00007f4dccb0ccd9 in virObjectUnref (anyobj=0x7f4dcd9c9780) at util/virobject.c:266 #2 0x00007f4dccb42340 in virDomainObjListRemove (doms=0x7f4dcd9bd4f0, dom=0x7f4dcd9c9780) at conf/domain_conf.c:2342 #3 0x00007f4dc189ac33 in qemuDomainRemoveInactive (driver=0x7f4dcd9bd400, vm=0x7f4dcd9c9780) at qemu/qemu_domain.c:1993 #4 0x00007f4dc18ccad5 in qemuMigrationPrepareAny (driver=0x7f4dcd9bd400, Step 4: Thread A access priv which is released by thread B before, then libvirtd crash, bomb! static void qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { virQEMUDriverPtr driver = qemu_driver; virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; int eventReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; int stopReason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; const char *auditReason = "shutdown"; VIR_DEBUG("Received EOF on %p '%s'", vm, vm->def->name); virObjectLock(vm); priv = vm->privateData; (gdb) p priv $1 = (qemuDomainObjPrivatePtr) 0x0 if (priv->beingDestroyed) { At last if anything bad happened to make qemuProcessStart failed during migration on destination, we'll be in the big trouble that accessing some memory freed. I didn't find any locks or flags exist could stop this happening. Please help me out, thanks a lot. Best Regards, -WangYufei

2 4

[libvirt] [PATCH 0/3] Fix scalability of LXC containers
by Daniel P. Berrange 11 Oct '13

11 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since we switched to use systemd for creating cgroups we have a scalability problem with LXC out of the box. Only ~230 containers can be created before we hit the default dbus-daemon connection limit. This series makes libvirt_lxc close its dbus connection once the guest has started, avoiding the problem. Daniel P. Berrange (3): Allow use of a private dbus bus connection Add a method for closing the dbus system bus connection Make LXC controller use a private dbus connection & close it src/Makefile.am | 1 + src/libvirt_private.syms | 2 ++ src/lxc/lxc_controller.c | 9 +++++++++ src/util/virdbus.c | 28 +++++++++++++++++++++++++++- src/util/virdbus.h | 3 +++ 5 files changed, 42 insertions(+), 1 deletion(-) -- 1.8.3.1

2 8

[libvirt] [PATCH] Fix flaw in detecting log format
by Daniel P. Berrange 11 Oct '13

11 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The log message regex has been [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}\+[0-9]{4}: [0-9]+: debug|info|warning|error : The precedence of '|' is high though, so this is equivalent to matching [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}\+[0-9]{4}: [0-9]+: debug Or info Or warning Or error : Which is clearly not what it should have done. This caused the code to skip over things which are not log messages. The solution is to simply add brackets. A test case is also added to validate correctness. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + src/util/virlog.c | 5 +++- tests/Makefile.am | 5 ++++ tests/virlogtest.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 tests/virlogtest.c diff --git a/.gitignore b/.gitignore index b5824dc..db5abcd 100644 --- a/.gitignore +++ b/.gitignore @@ -210,6 +210,7 @@ /tests/virkeycodetest /tests/virkeyfiletest /tests/virlockspacetest +/tests/virlogtest /tests/virnet*test /tests/virportallocatortest /tests/virshtest diff --git a/src/util/virlog.c b/src/util/virlog.c index 7ee5117..cc5032f 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -83,7 +83,7 @@ static regex_t *virLogRegex = NULL; #define VIR_LOG_DATE_REGEX "[0-9]{4}-[0-9]{2}-[0-9]{2}" #define VIR_LOG_TIME_REGEX "[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3}\\+[0-9]{4}" #define VIR_LOG_PID_REGEX "[0-9]+" -#define VIR_LOG_LEVEL_REGEX "debug|info|warning|error" +#define VIR_LOG_LEVEL_REGEX "(debug|info|warning|error)" #define VIR_LOG_REGEX \ VIR_LOG_DATE_REGEX " " VIR_LOG_TIME_REGEX ": " \ @@ -1623,6 +1623,9 @@ virLogSetFromEnv(void) { char *debugEnv; + if (virLogInitialize() < 0) + return; + debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv) virLogParseDefaultPriority(debugEnv); diff --git a/tests/Makefile.am b/tests/Makefile.am index 3eda522..250cd8c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -126,6 +126,7 @@ test_programs = virshtest sockettest \ viridentitytest \ virkeycodetest \ virlockspacetest \ + virlogtest \ virstringtest \ virportallocatortest \ sysinfotest \ @@ -716,6 +717,10 @@ virlockspacetest_SOURCES = \ virlockspacetest.c testutils.h testutils.c virlockspacetest_LDADD = $(LDADDS) +virlogtest_SOURCES = \ + virlogtest.c testutils.h testutils.c +virlogtest_LDADD = $(LDADDS) + virportallocatortest_SOURCES = \ virportallocatortest.c testutils.h testutils.c virportallocatortest_LDADD = $(LDADDS) diff --git a/tests/virlogtest.c b/tests/virlogtest.c new file mode 100644 index 0000000..dfe0f75 --- /dev/null +++ b/tests/virlogtest.c @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "testutils.h" + +#include "virlog.h" + +struct testLogMatchData { + const char *str; + bool res; +}; + +static int +testLogMatch(const void *opaque) +{ + const struct testLogMatchData *data = opaque; + + bool got = virLogProbablyLogMessage(data->str); + if (got != data->res) { + fprintf(stderr, "Expected '%d' but got '%d' for '%s'\n", + data->res, got, data->str); + return -1; + } + return 0; +} + + +static int +mymain(void) +{ + int ret = 0; + +#define TEST_LOG_MATCH(str, res) \ + do { \ + struct testLogMatchData data = { \ + str, res \ + }; \ + if (virtTestRun("testLogMatch " # str, testLogMatch, &data) < 0) \ + ret = -1; \ + } while (0) + + TEST_LOG_MATCH("2013-10-11 15:43:43.866+0000: 28302: info : libvirt version: 1.1.3", true); + + TEST_LOG_MATCH("libvirt: error : cannot execute binary /usr/libexec/libvirt_lxc: No such file or directory", false); + + return ret; +} + +VIRT_TEST_MAIN(mymain) -- 1.8.3.1

2 1

[libvirt] [PATCH] nwfilter: fix a typo in nwfilter_gentech_driver.c
by Hongwei Bi 11 Oct '13

11 Oct '13

s/occcurred/occurred --- src/nwfilter/nwfilter_gentech_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 5961165..16878a4 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -193,7 +193,7 @@ virNWFilterVarHashmapAddStdValues(virNWFilterHashTablePtr table, * Create a hashmap used for evaluating the firewall rules. Initializes * it with the standard variable 'MAC' and 'IP' if provided. * - * Returns pointer to hashmap, NULL if an error occcurred. + * Returns pointer to hashmap, NULL if an error occurred. */ virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr, -- 1.8.1.2

2 1

[libvirt] [PATCH] rpc: Fix getsockopt on Snow Leopard and lower
by Doug Goldstein 11 Oct '13

11 Oct '13

Since 5a468b38b6 we use SOL_LOCAL for the 2nd argument of getsockopt() however Lion added the define SOL_LOCAL set to 0, which is the value to the 2nd argument of getsockopt() for Unix sockets on Mac OS X. So instead of using the define just pass 0 so we restore compatibility with Snow Leopard and Leopard. Reported at https://github.com/mxcl/homebrew/pull/23141 --- v2: * Refactored ifdef outside of the function and create a define for the second argument of getsockopt(). --- src/rpc/virnetsocket.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index a2823ef..e8cdfa6 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1149,6 +1149,23 @@ cleanup: } #elif defined(LOCAL_PEERCRED) +/* VIR_SOL_PEERCRED - the value needed to let getsockopt() work with + * LOCAL_PEERCRED + */ +# ifdef __APPLE__ +# ifdef SOL_LOCAL +# define VIR_SOL_PEERCRED SOL_LOCAL +# else +/* Prior to Mac OS X 10.7, SOL_LOCAL was not defined and users were + * expected to supply 0 as the second value for getsockopt() when using + * LOCAL_PEERCRED + */ +# define VIR_SOL_PEERCRED 0 +# endif +# else +# define VIR_SOL_PEERCRED SOL_SOCKET +# endif + int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, uid_t *uid, gid_t *gid, @@ -1159,11 +1176,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, socklen_t cr_len = sizeof(cr); virObjectLock(sock); -# if defined(__APPLE__) - if (getsockopt(sock->fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &cr_len) < 0) { -# else - if (getsockopt(sock->fd, SOL_SOCKET, LOCAL_PEERCRED, &cr, &cr_len) < 0) { -# endif + if (getsockopt(sock->fd, VIR_SOL_PEERCRED, LOCAL_PEERCRED, &cr, &cr_len) < 0) { virReportSystemError(errno, "%s", _("Failed to get client socket identity")); virObjectUnlock(sock); -- 1.8.1.5

2 1

[libvirt] [PATCH] qemu: Include listenAddress in debug prints
by Michal Privoznik 11 Oct '13

11 Oct '13

After my patches, some functions gained one more argument (@listenAddress) which wasn't included in debug printing of arguments they were called with. Functions in question are: qemuMigrationPrepareDirect and qemuMigrationPerform. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 32121c6..38edadb 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2532,10 +2532,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " - "def=%p, origname=%s, flags=%lx", + "def=%p, origname=%s, listenAddress=%s, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, - *def, origname, flags); + *def, origname, NULLSTR(listenAddress), flags); *uri_out = NULL; @@ -4243,11 +4243,11 @@ qemuMigrationPerform(virQEMUDriverPtr driver, bool v3proto) { VIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, " - "uri=%s, graphicsuri=%s, " + "uri=%s, graphicsuri=%s, listenAddress=%s" "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, " "flags=%lx, dname=%s, resource=%lu, v3proto=%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), - NULLSTR(uri), NULLSTR(graphicsuri), + NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, NULLSTR(dname), resource, v3proto); -- 1.8.1.5

2 1

[libvirt] [PATCH] Fix: helper function virCompareLimitUlong should return -1 when the latter parameter is 0
by mars＠linux.vnet.ibm.com 11 Oct '13

11 Oct '13

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> The helper function virCompareLimitUlong compare limit values, where value of 0 is equal to unlimited, if the latter parameter is 0, it should return -1 instead of 1, hence the user can only set hard_limit when swap_hard_limit currently is unlimited. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/util/virutil.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index d9e0bc4..3dcf1fe 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2067,6 +2067,9 @@ virCompareLimitUlong(unsigned long long a, unsigned long b) if (a == b) return 0; + if (0 == b) + return -1; + if (a == 0 || a > b) return 1; -- 1.7.7.6

2 1

[libvirt] [PATCH 1/2] VMware: Simplify array walk for driver type
by Doug Goldstein 11 Oct '13

11 Oct '13

Rather than walking the possible driver backends by handle, use a helper function. Additionally I've done a bit of refactoring in the code over the past few commits so add myself to the copyright line. --- src/vmware/vmware_driver.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 25adb15..79954e0 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2011-2012 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) + * Copyright (C) 2013. Doug Goldstein <cardoe(a)cardoe.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -156,13 +157,8 @@ vmwareConnectOpen(virConnectPtr conn, goto cleanup; } - driver->type = -1; - for (i = 0; i < VMWARE_DRIVER_LAST; i++) { - if (STREQ(tmp, vmwareDriverTypeToString(i))) { - driver->type = i; - break; - } - } + /* Match the non-'vmware' part of the scheme as the driver backend */ + driver->type = vmwareDriverTypeFromString(tmp); if (driver->type == -1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently
by Wangyufei (A) 11 Oct '13

11 Oct '13

>From f56b290eab36bbb7a9ac53778a55638d473504d1 Mon Sep 17 00:00:00 2001 From: WangYufei <james.wangyufei(a)huawei.com> Date: Fri, 11 Oct 2013 11:27:13 +0800 Subject: [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently When we migrate vms concurrently, there's a chance that libvirtd on destination assign the same port for different migrations, which will lead to migration failed during migration prepare phase on destination. So we use virPortAllocator here to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_conf.h | 6 +++--- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 6 ++++++ src/qemu/qemu_migration.c | 28 +++++++++++++++++++++------- 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2e2acfb..3277ba4 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,9 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +# define QEMU_MIGRATION_PORT_MIN 49152 +# define QEMU_MIGRATION_PORT_MAX 49215 + typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; struct _qemuBuildCommandLineCallbacks { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index da29a2a..3176085 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -221,6 +221,9 @@ struct _virQEMUDriver { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr webSocketPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; @@ -242,9 +245,6 @@ struct _qemuDomainCmdlineDef { char **env_value; }; -/* Port numbers used for KVM migration. */ -# define QEMUD_MIGRATION_FIRST_PORT 49152 -# define QEMUD_MIGRATION_NUM_PORTS 64 void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 21f116c..16c55a6 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -160,6 +160,7 @@ struct _qemuDomainObjPrivate { unsigned long migMaxBandwidth; char *origname; int nbdPort; /* Port used for migration with NBD */ + int migrationPort; virChrdevsPtr devs; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cfdbb9a..c08a73c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -687,6 +687,11 @@ qemuStateInitialize(bool privileged, cfg->webSocketPortMax)) == NULL) goto error; + if ((qemu_driver->migrationPorts = + virPortAllocatorNew(QEMU_MIGRATION_PORT_MIN, + QEMU_MIGRATION_PORT_MAX)) == NULL) + goto error; + if (qemuSecurityInit(qemu_driver) < 0) goto error; @@ -993,6 +998,7 @@ qemuStateCleanup(void) { virObjectUnref(qemu_driver->domains); virObjectUnref(qemu_driver->remotePorts); virObjectUnref(qemu_driver->webSocketPorts); + virObjectUnref(qemu_driver->migrationPorts); virObjectUnref(qemu_driver->xmlopt); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..93ae237 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2147,6 +2147,9 @@ qemuMigrationPrepareCleanup(virQEMUDriverPtr driver, qemuDomainJobTypeToString(priv->job.active), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN)) return; qemuDomainObjDiscardAsyncJob(driver, vm); @@ -2297,6 +2300,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; + priv->migrationPort = port; if (VIR_STRDUP(priv->origname, origname) < 0) goto cleanup; @@ -2415,6 +2419,11 @@ cleanup: VIR_FREE(xmlout); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); + if (ret < 0) { + virPortAllocatorRelease(driver->migrationPorts, port); + if (priv) + priv->migrationPort = 0; + } if (vm) { if (ret >= 0 || vm->persistent) virObjectUnlock(vm); @@ -2493,7 +2502,6 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *origname, unsigned long flags) { - static int port = 0; int this_port; char *hostname = NULL; const char *p; @@ -2521,8 +2529,9 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, + (unsigned short *)&this_port) < 0) + goto cleanup; /* Get hostname */ if ((hostname = virGetHostname()) == NULL) @@ -2578,9 +2587,9 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) - port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, + (unsigned short *)&this_port) < 0) + goto cleanup; /* Caller frees */ if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) @@ -2600,8 +2609,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cleanup: virURIFree(uri); VIR_FREE(hostname); - if (ret != 0) + if (ret != 0) { VIR_FREE(*uri_out); + virPortAllocatorRelease(driver->migrationPorts, + (unsigned short)this_port); + } return ret; } @@ -4370,6 +4382,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } qemuMigrationStopNBDServer(driver, vm, mig); + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

1 0

[libvirt] [PATCH] rpc: Fix getsockopt on Snow Leopard and lower
by Doug Goldstein 10 Oct '13

10 Oct '13

Since 5a468b38b6 we use SOL_LOCAL for the 2nd argument of getsockopt() however Lion added the define SOL_LOCAL set to 0, which is the value to the 2nd argument of getsockopt() for Unix sockets on Mac OS X. So instead of using the define just pass 0 so we restore compatibility with Snow Leopard and Leopard. Reported at https://github.com/mxcl/homebrew/pull/23141 --- src/rpc/virnetsocket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index a2823ef..8651a8b 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1160,7 +1160,13 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, virObjectLock(sock); # if defined(__APPLE__) - if (getsockopt(sock->fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &cr_len) < 0) { + /* Lion (10.7) and higher define the value to be passed to getsockopt() + * as SOL_LOCAL for Unix sockets, it is defined to 0. However + * Snow Leopard and lower did not have this define so you had to + * pass 0. To support the most cases we just pass 0, this behavior + * matches PostgreSQL and CUPS source code. + */ + if (getsockopt(sock->fd, 0, LOCAL_PEERCRED, &cr, &cr_len) < 0) { # else if (getsockopt(sock->fd, SOL_SOCKET, LOCAL_PEERCRED, &cr, &cr_len) < 0) { # endif -- 1.8.1.5

2 1

[libvirt] [PATCH] esx: Fix floppy.fileName handling in the vmx file parser
by Geoff Hickey 10 Oct '13

10 Oct '13

The vmx file parsing code was reporting errors when parsing floppy.fileName entries if the filename didn't end in .flp. There is no such restriction in ESX; even using the GUI to configure floppy filenames you can specify any arbitrary file with any extension. Fix by changing the vmx parsing code so that it uses the floppy.fileType value to determine whether floppy.fileName refers to a block device or a regular file. --- src/vmx/vmx.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 38b7cc0..ffe7e7a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2250,27 +2250,18 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - if (virFileHasSuffix(fileName, ".flp")) { - if (fileType != NULL) { - if (STRCASENEQ(fileType, "file")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'file' but " - "found '%s'"), fileType_name, fileType); - goto cleanup; - } - } + if (fileType != NULL && STRCASEEQ(fileType, "device")) { + (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; + (*def)->src = fileName; + fileName = NULL; + } else if (fileType != NULL && STRCASEEQ(fileType, "file")) { (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; (*def)->src = ctx->parseFileName(fileName, ctx->opaque); if ((*def)->src == NULL) { goto cleanup; } - } else if (fileType != NULL && STRCASEEQ(fileType, "device")) { - (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; - (*def)->src = fileName; - - fileName = NULL; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -3538,13 +3529,6 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, virBufferAsprintf(buffer, "floppy%d.fileType = \"file\"\n", unit); if (def->src != NULL) { - if (! virFileHasSuffix(def->src, ".flp")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for floppy '%s' has unsupported " - "suffix, expecting '.flp'"), def->dst); - return -1; - } - fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { -- 1.8.1.2

3 4

[libvirt] [PATCH] qemu: Introduce qemuDomainDefCheckABIStability
by Michal Privoznik 10 Oct '13

10 Oct '13

https://bugzilla.redhat.com/show_bug.cgi?id=994364 Whenever we check for ABI stability, we have new xml (e.g. provided by user, or obtained from snapshot, whatever) which we compare to old xml and see if ABI won't break. However, if the new xml was produced via virDomainGetXMLDesc(..., VIR_DOMAIN_XML_MIGRATABLE) it lacks some devices, e.g. 'pci-root' controller. Hence, the ABI stability check fails even though it is stable. Moreover, we can't simply fix virDomainDefCheckABIStability because removing the correct devices is task for the driver. For instance, qemu driver wants to remove the usb controller too, while LXC driver doesn't. That's why we need special qemu wrapper over virDomainDefCheckABIStability which removes the correct devices from domain XML, produces MIGRATABLE xml and calls the check ABI stability function. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 22 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_driver.c | 10 ++-------- src/qemu/qemu_migration.c | 4 ++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 968e323..f3e2ba1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2342,3 +2342,25 @@ qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, priv->qemuDevices = aliases; return 0; } + +bool +qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, + virDomainDefPtr src, + virDomainDefPtr dst) +{ + virDomainDefPtr migratableDefSrc = NULL; + virDomainDefPtr migratableDefDst = NULL; + const int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_UPDATE_CPU | VIR_DOMAIN_XML_MIGRATABLE; + bool ret = false; + + if (!(migratableDefSrc = qemuDomainDefCopy(driver, src, flags)) || + !(migratableDefDst = qemuDomainDefCopy(driver, dst, flags))) + goto cleanup; + + ret = virDomainDefCheckABIStability(migratableDefSrc, migratableDefDst); + +cleanup: + virDomainDefFree(migratableDefSrc); + virDomainDefFree(migratableDefDst); + return ret; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 21f116c..5d9fab9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -368,4 +368,7 @@ extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig; int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, virDomainObjPtr vm); +bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, + virDomainDefPtr src, + virDomainDefPtr dst); #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c71aecc..8481591 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3077,7 +3077,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, VIR_DOMAIN_XML_INACTIVE))) { goto endjob; } - if (!virDomainDefCheckABIStability(vm->def, def)) { + if (!qemuDomainDefCheckABIStability(driver, vm->def, def)) { virDomainDefFree(def); goto endjob; } @@ -12889,7 +12889,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuDomainObjPrivatePtr priv; int rc; virDomainDefPtr config = NULL; - virDomainDefPtr migratableDef = NULL; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; @@ -13006,11 +13005,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, /* Transitions 5, 6, 8, 9 */ /* Check for ABI compatibility. We need to do this check against * the migratable XML or it will always fail otherwise */ - if (!(migratableDef = qemuDomainDefCopy(driver, vm->def, - VIR_DOMAIN_XML_MIGRATABLE))) - goto cleanup; - - if (config && !virDomainDefCheckABIStability(migratableDef, config)) { + if (config && !qemuDomainDefCheckABIStability(driver, vm->def, config)) { virErrorPtr err = virGetLastError(); if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { @@ -13215,7 +13210,6 @@ cleanup: } if (vm) virObjectUnlock(vm); - virDomainDefFree(migratableDef); virObjectUnref(caps); virObjectUnref(cfg); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..59fd263 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2039,7 +2039,7 @@ static char VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if (!virDomainDefCheckABIStability(vm->def, def)) + if (!qemuDomainDefCheckABIStability(driver, vm->def, def)) goto cleanup; rv = qemuDomainDefFormatLive(driver, def, false, true); @@ -2242,7 +2242,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (!newdef) goto cleanup; - if (!virDomainDefCheckABIStability(*def, newdef)) { + if (!qemuDomainDefCheckABIStability(driver, *def, newdef)) { virDomainDefFree(newdef); goto cleanup; } -- 1.8.1.5

2 1

[libvirt] [PATCH] Move virNetDevVPort enum impl into virnetdevvportprofile.c
by Daniel P. Berrange 10 Oct '13

10 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The enum for virNetDevVPort is declared in the header file virnetdevvportprofile.h, but for some reason the impl is in netdev_vport_profile_conf.c. This causes a dep from src/util onto src/conf which is not allowed. Move the enum impl into virnetdevvportprofile.c to break the circle. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/netdev_vport_profile_conf.c | 7 ------- src/util/virnetdevvportprofile.c | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index e8199e2..a16a04a 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -30,13 +30,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE -VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST, - "none", - "802.1Qbg", - "802.1Qbh", - "openvswitch") - - virNetDevVPortProfilePtr virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) { diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 07155b9..1cae20a 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -29,6 +29,12 @@ #define VIR_FROM_THIS VIR_FROM_NET +VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST, + "none", + "802.1Qbg", + "802.1Qbh", + "openvswitch") + VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST, "create", "save", -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] btrfs subvolume management
by Oskari Saarenmaa 10 Oct '13

10 Oct '13

Moved btrfs subvolume management to storage_backend_fs.c instead of implementing it as a separate pool as suggested by Daniel P. Berrange in https://www.redhat.com/archives/libvir-list/2013-September/msg00316.html Oskari Saarenmaa (2): virFileFsType: get filesystem type of a given path storage: btrfs subvolumes for directory pools configure.ac | 25 ++- docs/schemas/storagevol.rng | 1 + docs/storage.html.in | 30 ++- libvirt.spec.in | 4 + src/conf/storage_conf.c | 3 + src/conf/storage_conf.h | 1 + src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 15 +- src/storage/storage_backend_fs.c | 222 ++++++++++++++++++++-- src/util/virfile.c | 47 +++++ src/util/virfile.h | 1 + src/util/virstoragefile.c | 4 +- src/util/virstoragefile.h | 1 + tests/storagevolxml2xmlin/vol-btrfs-snapshot.xml | 13 ++ tests/storagevolxml2xmlin/vol-btrfs.xml | 9 + tests/storagevolxml2xmlout/vol-btrfs-snapshot.xml | 26 +++ tests/storagevolxml2xmlout/vol-btrfs.xml | 17 ++ tests/storagevolxml2xmltest.c | 2 + 18 files changed, 392 insertions(+), 30 deletions(-)

4 10