- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/8] test: Mock snapshot APIs and misc improvements
by Cole Robinson 04 Oct '13

04 Oct '13

This series implements snapshot and managed save APIs for the test driver, and adds some misc improvements, like specifying domain transient state in the driver XML. v3: Rebase Validate that managedsave, transient, and runstate combo make sense Use STREQ_NULLABLE to simplify a check Cole Robinson (8): test: Allow specifying object transient state in driver XML test: Wire up managed save APIs test: Implement readonly snapshot APIs test: Implement snapshot create/delete/revert APIs qemu: snapshots: Simplify REDEFINE flag check qemu: snapshot: Break out redefine preparation to shared function test: snapshot: Add REDEFINE support test: Allow specifying domainsnapshot XML src/conf/domain_conf.c | 2 +- src/conf/snapshot_conf.c | 150 ++++++ src/conf/snapshot_conf.h | 7 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 145 +----- src/test/test_driver.c | 1162 +++++++++++++++++++++++++++++++++++++++++++++- tests/virshtest.c | 2 +- 7 files changed, 1328 insertions(+), 141 deletions(-) -- 1.8.3.1

3 29

[libvirt] [PATCH] nodedev: Resolve Relax-NG validity error
by John Ferlan 04 Oct '13

04 Oct '13

Commit id 'c4a4603de' added an output <path> to the nodedev xml, but did not update the schema. This resulted in the failure of the 'virt-xml-validate' on a file generated by 'virsh nodedev-dumpxml pci_0000_00_00_0' (for example). This was found/seen by running autotest on my host. --- I'm not sure if something like this needs to be backported or not, but I'm sure someone will let me know... docs/schemas/nodedev.rng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index d2bebff..81ab4d4 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -13,6 +13,9 @@ and in virsh --> <element name="name"><text/></element> <optional> + <element name="path"><text/></element> + </optional> + <optional> <element name="parent"><text/></element> </optional> -- 1.8.3.1

2 2

[libvirt] [PATCH 0/5] Fixes for lxc veth handling
by Daniel P. Berrange 04 Oct '13

04 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The primary goal of this series was to address the race condition in creation of veth device names. A few other bugs were identified along the way though & fixed. Daniel P. Berrange (5): Don't set netdev offline in container cleanup Avoid reporting an error if veth device is already deleted Avoid deleting NULL veth device name Retry veth device creation on failure Use 'vnet' as prefix for veth devices src/lxc/lxc_process.c | 3 +- src/util/virnetdevveth.c | 168 ++++++++++++++++++++++++++++++----------------- 2 files changed, 107 insertions(+), 64 deletions(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] test: snapshots: Fix some unused variables
by Cole Robinson 04 Oct '13

04 Oct '13

Spotted by coverity as John mentioned here: http://www.redhat.com/archives/libvir-list/2013-October/msg00078.html --- src/test/test_driver.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 255cc2b..a09facb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6547,16 +6547,12 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, { virDomainObjPtr vm = NULL; int ret = -1; - virDomainSnapshotObjPtr snap = NULL; virCheckFlags(0, -1); if (!(vm = testDomObjFromSnapshot(snapshot))) goto cleanup; - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); @@ -6568,27 +6564,11 @@ cleanup: static int -testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, +testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot ATTRIBUTE_UNUSED, unsigned int flags) { - virDomainObjPtr vm = NULL; - int ret = -1; - virDomainSnapshotObjPtr snap = NULL; - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - goto cleanup; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - ret = 1; - -cleanup: - if (vm) - virObjectUnlock(vm); - return ret; + return 1; } static int -- 1.8.3.1

2 1

[libvirt] [PATCH] build: fix 'make -C src check' under subset builds
by Eric Blake 03 Oct '13

03 Oct '13

Another build failure detected on cygwin, where lxc is not built. The lxc_monitor_protocol.c file requires the use of $(XDR_CFLAGS), but should only be built on platforms where WITH_LXC is true; however, 'make -C src check' was unconditionally trying to build the .o file (and with the wrong CFLAGS) in order to validate the matching -structs file. Rework the checks to only test files that are built for the current configuration. * src/Makefile.am (PROTOCOL_STRUCTS): Split list by which files are currently being compiled. (EXTRA_DIST): Ensure that -structs files are shipped even when not built. (check-protocol): Declare unconditionally, now that the condition has been moved into PROTOCOL_STRUCTS. (libvirt_driver_lxc_impl_la_CFLAGS): Add $(XDR_CFLAGS). (libvirt_net_rpc_la_SOURCES): List generated files more compactly. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This is a build-breaker, but I'm still in the middle of running a (lengthy) 'make distcheck' on several platforms before pushing, so a review wouldn't hurt. src/Makefile.am | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 09311b7..20ba1c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -428,18 +428,35 @@ check-symsorting: EXTRA_DIST += check-symfile.pl check-symsorting.pl # Keep this list synced with RPC_PROBE_FILES -PROTOCOL_STRUCTS = \ +PROTOCOL_STRUCTS = +if WITH_REMOTE +PROTOCOL_STRUCTS += \ $(srcdir)/remote_protocol-structs \ $(srcdir)/lxc_protocol-structs \ $(srcdir)/qemu_protocol-structs \ + $(NULL) +endif WITH_REMOTE +PROTOCOL_STRUCTS += \ $(srcdir)/virnetprotocol-structs \ $(srcdir)/virkeepaliveprotocol-structs \ + $(NULL) +if WITH_LXC +PROTOCOL_STRUCTS += \ $(srcdir)/lxc_monitor_protocol-structs \ + $(NULL) +endif WITH_LXC +if WITH_LIBVIRTD +PROTOCOL_STRUCTS += \ $(srcdir)/lock_protocol-structs \ $(NULL) +endif WITH_LIBVIRTD + +# The various -structs files live in git, because they are only +# conditionally generated; ship one -structs file for each .x file. +EXTRA_DIST += $(notdir $(RPC_PROBE_FILES:.x=-structs))) -if WITH_REMOTE check-protocol: $(PROTOCOL_STRUCTS) $(PROTOCOL_STRUCTS:structs=struct) +.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # The .o file that pdwtags parses is created as a side effect of running # libtool; but from make's perspective we depend on the .lo file. @@ -458,13 +475,6 @@ $(srcdir)/lock_protocol-struct: \ $(srcdir)/%-struct: locking/lockd_la-%.lo $(PDWTAGS) -else !WITH_REMOTE -# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be -# re-generated when configured --without-remote. -check-protocol: -endif !WITH_REMOTE -EXTRA_DIST += $(PROTOCOL_STRUCTS) - check-drivername: $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ $(srcdir)/driver.h \ @@ -538,7 +548,6 @@ EXTRA_DIST += check-driverimpls.pl check-aclrules.pl check-aclperms.pl check-local: check-protocol check-symfile check-symsorting \ check-drivername check-driverimpls check-aclrules \ check-aclperms -.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc TEST_DRIVER_SOURCES = \ @@ -1183,6 +1192,7 @@ endif ! WITH_DRIVER_MODULES libvirt_driver_lxc_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ + $(XDR_CFLAGS) \ $(FUSE_CFLAGS) \ -I$(top_srcdir)/src/access \ -I$(top_srcdir)/src/conf \ @@ -2203,10 +2213,9 @@ BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) libvirt_net_rpc_la_SOURCES = \ rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetprotocol.h rpc/virnetprotocol.c \ rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c \ - rpc/virkeepalive.h rpc/virkeepalive.c + rpc/virkeepalive.h rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) if WITH_SSH2 libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -- 1.8.3.1

1 1

[libvirt] [PATCH] Fix crash in libvirtd when events are registered & ACLs active
by Daniel P. Berrange 03 Oct '13

03 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When a client disconnects from libvirtd, all event callbacks must be removed. This involves running the public API virConnectDomainEventDeregisterAny This code does not run in normal API dispatch context, so no identity was set. The result was that the access control drivers denied the attempt to deregister callbacks. The callbacks thus continued to trigger after the client was free'd causing fairly predictable use of free memory & a crash. This can be triggered by any client with readonly access when the ACL drivers are active. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/remote.c | 6 ++++++ 1 file changed, 6 insertions(+) NB, this bug is a publically reported security flaw and I'll be backporting it to other stable branches. A CVE will be assigned soon and will notify when that info is available. diff --git a/daemon/remote.c b/daemon/remote.c index 9497cc1..f3de6a0 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -666,8 +666,11 @@ void remoteClientFreeFunc(void *data) /* Deregister event delivery callback */ if (priv->conn) { + virIdentityPtr sysident = virIdentityGetSystem(); size_t i; + virIdentitySetCurrent(sysident); + for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { if (priv->domainEventCallbackID[i] != -1) { VIR_DEBUG("Deregistering to relay remote events %zu", i); @@ -678,6 +681,9 @@ void remoteClientFreeFunc(void *data) } virConnectClose(priv->conn); + + virIdentitySetCurrent(NULL); + virObjectUnref(sysident); } VIR_FREE(priv); -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: check actual netdev type rather than config netdev type during init
by Laine Stump 03 Oct '13

03 Oct '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1012834 Note that a similar problem was reported in: https://bugzilla.redhat.com/show_bug.cgi?id=827519 but the fix only worked for <interface type='hostdev'>, *not* for <interface type='network'> where the network itself was a pool of hostdevs. The symptom in both cases was this error message: internal error: Unable to determine device index for network device In both cases the cause was lack of proper handling for netdevs (<interface>) of type='hostdev' when scanning the netdev list looking for alias names in qemuAssignDeviceNetAlias() - those that aren't type='hostdev' have an alias of the form "net%d", while those that are hostdev use "hostdev%d". This special handling was completely lacking prior to the fix for Bug 827519 which was: When searching for the highest alias index, libvirt looks at the alias for each netdev and if it is type='hostdev' it ignores the entry. If the type is not hostdev, then it expects the "net%d" form; if it doesn't find that, it fails and logs the above error message. That fix works except in the case of <interface type='network'> where the network uses hostdev (i.e. the network is a pool of VFs to be assigned to the guests via PCI passthrough). In this case, the check for type='hostdev' would fail because it was done as: def->net[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV (which compares what was written in the config) when it actually should have been: virDomainNetGetActualType(def->net[i]) == VIR_DOMAIN_NET_TYPE_HOSTDEV (which compares the type of netdev that was actually allocated from the network at runtime). Of course the latter wouldn't be of any use if the netdevs of type='network' hadn't already acquired their actual network connection yet, but manual examination of the code showed that this is never the case. While looking through qemu_command.c, two other places were found to directly compare the net[i]->type field rather than getting actualType: * qemuAssignDeviceAliases() - in this case, the incorrect comparison would cause us to create a "net%d" alias for a netdev with type='network' but actualType='hostdev'. This alias would be subsequently overwritten by the proper "hostdev%d" form, so everything would operate properly, but a string would be leaked. This patch also fixes this problem. * qemuAssignDevicePCISlots() - would defer assigning a PCI address to a netdev if it was type='hostdev', but not for type='network + actualType='hostdev'. In this case, the actual device usually hasn't been acquired yet anyway, and even in the case that it has, there is no practical difference between assigning a PCI address while traversing the netdev list or while traversing the hostdev list. Because changing it would be an effective NOP (but potentially cause some unexpected regression), this usage was left unchanged. --- src/qemu/qemu_command.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ba102f4..e976466 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -817,7 +817,8 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) for (i = 0; i < def->nnets; i++) { int thisidx; - if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + if (virDomainNetGetActualType(def->nets[i]) + == VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* type='hostdev' interfaces have a hostdev%d alias */ continue; } @@ -987,8 +988,9 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) /* type='hostdev' interfaces are also on the hostdevs list, * and will have their alias assigned with other hostdevs. */ - if ((def->nets[i]->type != VIR_DOMAIN_NET_TYPE_HOSTDEV) && - (qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0)) { + if (virDomainNetGetActualType(def->nets[i]) + != VIR_DOMAIN_NET_TYPE_HOSTDEV && + qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0) { return -1; } } -- 1.7.11.7

2 1

[libvirt] [PATCH 0/3] Avoid crash due to race in nwfilter reload/libvirtd startup
by Daniel P. Berrange 03 Oct '13

03 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The past 24 hours have seen a flurry of libvirtd crash reports from Fedora users. https://bugzilla.redhat.com/show_bug.cgi?id=1014933 In one thread we have the libvirtd daemon startup code running, and it is in the middle of QEMU state initialization. #9 0xb00882e4 in qemuStateInitialize (privileged=true, callback=0xb77a0420 <daemonInhibitCallback>, opaque=0xb8b1fc98) at qemu/qemu_driver.c:595 driverConf = 0xaf5afcd8 "/etc/libvirt/qemu.conf" conn = 0x0 ebuf = "\000\260\025\267\024\071P\257\214\000\000\000\360\316\341\257\335\242\023\267\214\000\000\000\210\177X\257\001\000\000\000l\000\000\000\360\316\341\257\000\260\025\267\264\316\341\257\210\177X\257$\316\341\257$\316\341\257l\000\000\000\304\316\341\257\201\321LRl\000\000\000\235R\022\267\000)\233\351\260\316\341\257\000\000\000\000\253G\022\267\000\260\025\267\340\316\341\257\a\000\000\000\v\260\023\267\000\260\025\267\001\000\000\000\254\325\334\266\000\260\025\267\214\261\023\267 :P\257\037:P\257\000\000\000\000/\261\023\267\000\260\025\267uc\334\266\000\260\025\267A\262\023\267\037:P\257\000\000\000\000\001\000\000\000\000\000\000\000\340\316\341\257\334\316\341\257\001\000\000\000\001\000\000\000\033c\024\267"... membase = 0x0 mempath = 0x0 cfg = 0xaf509050 run_uid = 4294967295 run_gid = 4294967295 __func__ = "qemuStateInitialize" __FUNCTION__ = "qemuStateInitialize" #10 0xb74c5325 in virStateInitialize (privileged=true, callback=callback@entry=0xb77a0420 <daemonInhibitCallback>, opaque=opaque@entry=0xb8b1fc98) at libvirt.c:833 i = 6 __func__ = "virStateInitialize" #11 0xb77a049e in daemonRunStateInit (opaque=opaque@entry=0xb8b1fc98) at libvirtd.c:876 srv = 0xb8b1fc98 __func__ = "daemonRunStateInit" In another thread, we have a dbus event being handled by the nwfilter driver, and the nwfilter driver calls into the QEMU driver....which has not finished initializing itself yet! Thread 1 (Thread 0xb6366ac0 (LWP 7041)): #0 0xb0052861 in virQEMUCloseCallbacksGetForConn (closeCallbacks=0x0, conn=0xb8b2cc20) at qemu/qemu_conf.c:861 list = 0xb8ac57e8 data = {conn = 0xb8b2cc20, list = 0xb8ac57e8, oom = false} #1 virQEMUCloseCallbacksRun (closeCallbacks=0x0, conn=conn@entry=0xb8b2cc20, driver=0xaf50b350) at qemu/qemu_conf.c:890 list = 0xb8b2cc20 i = <optimized out> __func__ = "virQEMUCloseCallbacksRun" #2 0xb009df3b in qemuConnectClose (conn=0xb8b2cc20) at qemu/qemu_driver.c:1057 driver = <optimized out> #3 0xb74babc1 in virConnectDispose (obj=0xb8b2cc20) at datatypes.c:159 conn = 0xb8b2cc20 #4 0xb742f22c in virObjectUnref (anyobj=anyobj@entry=0xb8b2cc20) at util/virobject.c:264 klass = 0xb8b2cba0 obj = 0xb8b2cc20 lastRef = true __func__ = "virObjectUnref" #5 0xb74c5811 in virConnectClose (conn=conn@entry=0xb8b2cc20) at libvirt.c:1503 __func__ = "virConnectClose" __FUNCTION__ = "virConnectClose" #6 0xb023424e in nwfilterStateReload () at nwfilter/nwfilter_driver.c:301 conn = 0xb8b2cc20 #7 0xb02342fc in nwfilterFirewalldDBusFilter (connection=0xaf501038, message=0xaf503910, user_data=0x0) at nwfilter/nwfilter_driver.c:90 __func__ = "nwfilterFirewalldDBusFilter" #8 0xb711efb9 in dbus_connection_dispatch (connection=0xaf501038) at dbus-connection.c:4631 filter = <optimized out> next = 0x0 message = 0xaf503910 link = <optimized out> filter_list_copy = 0xaf5009dc message_link = 0xaf500a18 result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED pending = <optimized out> reply_serial = <optimized out> status = <optimized out> found_object = 3071507249 __FUNCTION__ = "dbus_connection_dispatch" #9 0xb740caeb in virDBusWatchCallback (fdatch=fdatch@entry=8, fd=15, events=1, opaque=0xaf500ca8) at util/virdbus.c:144 watch = 0xaf500ca8 info = 0xaf500de0 dbus_flags = 1 This DBus event is triggered when the firewalld driver is reloaded, or restarted. I confirmed this analysis by adding a sleep(10) to the QEMU driver startup code, and then triggering a firewalld restart. Sure enough it crashed & burned with the same trace. The reason why it has suddenly hit us is that we are unlucky enough to have a firewalld update in Fedora repos at the same time as a libvirt update, and lots of people are pulling both updates down in one yum transaction! After wasting time figuring out how to avoid the race condition with mutexes and other synchronization ideas, I realized that the nwfilter code was in fact bogus. The only reason it gets a virConnectPtr is so that the code for reloading filters can access its nwfilterPrivateData field to get the virNWFilterDriverStatePtr object instance. This is insanely convoluted, since the nwfilter driver can trivially pass the driver state instance into the virNWFilterConfLayerInit method at startup. Thus these patches just rip out all use of virConnectPtr from the nwfilter driver code, thus avoiding the race with the QEMU driver initialization code. This also fixes the nwfilter driver in cases where the QEMU driver is disabled, but LXC driver still wants to use nwfilter. Daniel P. Berrange (3): Remove virConnectPtr arg from virNWFilterDefParse* Don't pass virConnectPtr in nwfilter 'struct domUpdateCBStruct' Remove use of virConnectPtr from all remaining nwfilter code src/conf/nwfilter_conf.c | 78 ++++++++++++++++------------------ src/conf/nwfilter_conf.h | 24 ++++------- src/lxc/lxc_driver.c | 3 +- src/nwfilter/nwfilter_dhcpsnoop.c | 12 +++--- src/nwfilter/nwfilter_driver.c | 49 +++++++++------------ src/nwfilter/nwfilter_gentech_driver.c | 32 +++++++------- src/nwfilter/nwfilter_gentech_driver.h | 10 ++--- src/nwfilter/nwfilter_learnipaddr.c | 6 +-- src/qemu/qemu_driver.c | 6 ++- src/uml/uml_driver.c | 3 +- tests/nwfilterxml2xmltest.c | 2 +- 11 files changed, 102 insertions(+), 123 deletions(-) -- 1.8.3.1

3 8

[libvirt] ANNOUNCE: Perl binding Sys-Virt releases 1.1.2 & 1.1.3
by Daniel P. Berrange 03 Oct '13

03 Oct '13

I am pleased to announce that releases 1.1.2 & 1.1.3 of Sys-Virt, the libvirt Perl API binding are now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.1.2.tar.gz http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.1.3.tar.gz Changed in the 1.1.2 release: - Add all new constants in libvirt 1.1.2 Changed in the 1.1.3 release: - Add all new APIs in libvirt 1.1.3 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 00/18] qemumonitorjsontest: Introduce some tests
by Michal Privoznik 03 Oct '13

03 Oct '13

and fix some bugs I've ran into while writing the tests. Michal Privoznik (18): qemuMonitorJSONGetVirtType: Fix error message qemumonitorjsontest: Test qemuMonitorJSONSystemPowerdown qemuMonitorJSONSendKey: Avoid double free qemuMonitorTestFree: Join worker thread unconditionally qemumonitorjsontest: Extend the test for yet another monitor commands qemumonitorjsontest: Test qemuMonitorJSONGetCPUInfo qemumonitorjsontest: Test qemuMonitorJSONGetVirtType qemumonitorjsontest: Test qemuMonitorJSONGetBalloonInfo qemumonitorjsontest: Test qemuMonitorJSONGetBlockInfo qemumonitorjsontest: Test qemuMonitorJSONGetBlockStatsInfo qemumonitorjsontest: Test qemuMonitorJSONGetMigrationCacheSize qemumonitorjsontest: Test qemuMonitorJSONGetMigrationStatus qemumonitorjsontest: Test qemuMonitorJSONGetSpiceMigrationStatus qemumonitorjsontest: Test qemuMonitorJSONGetPtyPaths qemumonitorjsontest: Test qemuMonitorJSONSendKey qemumonitorjsontest: Test qemuMonitorJSONSetBlockIoThrottle qemumonitorjsontest: Test qemuMonitorJSONGetTargetArch qemumonitorjsontest: Test qemuMonitorJSONGetMigrationCapability src/qemu/qemu_monitor_json.c | 5 +- tests/qemumonitorjsontest.c | 955 ++++++++++++++++++++++++++++++++++++++++++- tests/qemumonitortestutils.c | 3 +- 3 files changed, 959 insertions(+), 4 deletions(-) -- 1.8.1.5

3 40

[libvirt] ANNOUNCE: libvirt 1.0.5.6 maintenance release
by Cole Robinson 03 Oct '13

03 Oct '13

libvirt 1.0.5.6 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.6.tar.gz Changes in this version: * virsh: fix change-media bug on disk block type * Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) * Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) * Include process start time when doing polkit checks * qemuDomainChangeGraphics: Check listen address change by listen type * security: provide supplemental groups even when parsing label (CVE-2013-4291) * python: return dictionary without value in case of no blockjob * virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

5 11

[libvirt] [PATCHv3] lxc veth interfaces: fix interface name collisions
by Oskari Saarenmaa 02 Oct '13

02 Oct '13

The previous veth interface naming scheme tried to find the lowest unused index for both the parent and container veth interfaces. That's susceptible to race conditions when multiple containers are started at the same time. Try to pick a random unused interface id for the parent if one wasn't given by the caller and use that as a template for the container interface name. This should prevent races to create two uniquely named interfaces for each container. The caller can still assign the parent interface name manually and that name is used for in container (before the interface is moved to the container namespace and renamed.) Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- My previous two patches for this issue were rejected because of concerns with the naming scheme (in v1) or leaving fixing the race condition to the caller (v2) and I mostly forgot about this issue after implementing a workaround in my application, but yesterday someone else on #virt ran into the same issue and I took another look at my patches. The third iteration of this patch uses random identifiers and makes sure they're not already in use, but still does not retry interface creation on failure. I believe this is good enough as the likelihood of two containers starting up at the same time and coming up with the same random 32-bit identifier should be rather low. This does change the interface names from nice low integers to random larger integers, but I don't see that an issue. And the caller can select any other name they like if that's not acceptable. src/util/virnetdevveth.c | 95 ++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 68 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 039767f..9a5bc63 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -23,6 +23,7 @@ #include <config.h> +#include <net/if.h> #include <sys/wait.h> #include "virnetdevveth.h" @@ -33,119 +34,77 @@ #include "virfile.h" #include "virstring.h" #include "virutil.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_NONE /* Functions */ /** - * virNetDevVethGetFreeName: - * @veth: pointer to store returned name for veth device - * @startDev: device number to start at (x in vethx) - * - * Looks in /sys/class/net/ to find the first available veth device - * name. - * - * Returns non-negative device number on success or -1 in case of error - */ -static int virNetDevVethGetFreeName(char **veth, int startDev) -{ - int devNum = startDev-1; - char *path = NULL; - - VIR_DEBUG("Find free from veth%d", startDev); - do { - VIR_FREE(path); - ++devNum; - if (virAsprintf(&path, "/sys/class/net/veth%d/", devNum) < 0) - return -1; - VIR_DEBUG("Probe %s", path); - } while (virFileExists(path)); - VIR_FREE(path); - - if (virAsprintf(veth, "veth%d", devNum) < 0) - return -1; - - return devNum; -} - -/** * virNetDevVethCreate: * @veth1: pointer to name for parent end of veth pair - * @veth2: pointer to return name for container end of veth pair + * @veth2: pointer to name for container end of veth pair * * Creates a veth device pair using the ip command: * ip link add veth1 type veth peer name veth2 - * If veth1 points to NULL on entry, it will be a valid interface on - * return. veth2 should point to NULL on entry. * - * NOTE: If veth1 and veth2 names are not specified, ip will auto assign - * names. There seems to be two problems here - - * 1) There doesn't seem to be a way to determine the names of the - * devices that it creates. They show up in ip link show and - * under /sys/class/net/ however there is no guarantee that they - * are the devices that this process just created. - * 2) Once one of the veth devices is moved to another namespace, it - * is no longer visible in the parent namespace. This seems to - * confuse the name assignment causing it to fail with File exists. - * Because of these issues, this function currently allocates names - * prior to using the ip command, and returns any allocated names - * to the caller. + * If veth1 or veth2 points to NULL on entry, they will be + * a valid interface on return. * * Returns 0 on success or -1 in case of error */ int virNetDevVethCreate(char** veth1, char** veth2) { - int rc = -1; const char *argv[] = { "ip", "link", "add", NULL, "type", "veth", "peer", "name", NULL, NULL }; - int vethDev = 0; bool veth1_alloc = false; bool veth2_alloc = false; VIR_DEBUG("Host: %s guest: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth1, vethDev)) < 0) - goto cleanup; + size_t veth_path_max = sizeof("/sys/class/net//") + IF_NAMESIZE; + char *veth1_path; + + if (VIR_ALLOC_N(*veth1, IF_NAMESIZE) < 0 || + VIR_ALLOC_N(veth1_path, veth_path_max) < 0) { + VIR_FREE(*veth1); + return -1; + } + while (1) { + snprintf(*veth1, IF_NAMESIZE, "veth%u", (unsigned int) virRandomBits(32)); + snprintf(veth1_path, veth_path_max, "/sys/class/net/%s/", *veth1); + if (! virFileExists(veth1_path)) + break; + } + VIR_FREE(veth1_path); VIR_DEBUG("Assigned host: %s", *veth1); veth1_alloc = true; - vethDev++; } argv[3] = *veth1; - while (*veth2 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth2, vethDev)) < 0) { + if (*veth2 == NULL) { + /* Append a 'c' to veth1 if name */ + if (virAsprintf(veth2, "%sc", *veth1) < 0) { if (veth1_alloc) VIR_FREE(*veth1); - goto cleanup; - } - - /* Just make sure they didn't accidentally get same name */ - if (STREQ(*veth1, *veth2)) { - vethDev++; - VIR_FREE(*veth2); - continue; + return -1; } - VIR_DEBUG("Assigned guest: %s", *veth2); veth2_alloc = true; } argv[8] = *veth2; - VIR_DEBUG("Create Host: %s guest: %s", *veth1, *veth2); + VIR_DEBUG("Create veth host: %s guest: %s", *veth1, *veth2); if (virRun(argv, NULL) < 0) { if (veth1_alloc) VIR_FREE(*veth1); if (veth2_alloc) VIR_FREE(*veth2); - goto cleanup; + return -1; } - rc = 0; - -cleanup: - return rc; + return 0; } /** -- 1.8.3.1

2 2

Re: [libvirt] [Qemu-devel] Attaching PCI devices to the PCIe root complex
by Michael S. Tsirkin 02 Oct '13

02 Oct '13

On Wed, Sep 25, 2013 at 11:48:28AM +0300, Marcel Apfelbaum wrote: > On Wed, 2013-09-25 at 10:01 +0300, Michael S. Tsirkin wrote: > > On Tue, Sep 24, 2013 at 06:01:02AM -0400, Laine Stump wrote: > > > When I added support for the Q35-based machinetypes to libvirt, I > > > specifically prohibited attaching any PCI devices (with the exception of > > > graphics controllers) to the PCIe root complex, > > > > That's wrong I think. Anything attached to RC is an integrated > > endpoint, and these can be PCI devices. > I couldn't find on PCIe spec any mention that "Root Complex Integrated EndPoint" > must be PCIe. But, from spec 1.3.2.3: > - A Root Complex Integrated Endpoint must not require I/O resources claimed through BAR(s). > - A Root Complex Integrated Endpoint must not generate I/O Requests. > - A Root Complex Integrated Endpoint is required to support MSI or MSI-X or both if an > interrupt resource is requested. Heh PCI-SIG keeps fighting against legacy interrupts and IO. But lots of hardware happily ignores these rules. And the reason is simple: software does not enforce them. Here's integrated stuff on my laptop: 00:02.0 VGA compatible controller: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller (rev 09) (prog-if 00 [VGA controller]) Subsystem: Lenovo Device 21cf Flags: bus master, fast devsel, latency 0, IRQ 43 Memory at f0000000 (64-bit, non-prefetchable) [size=4M] Memory at e0000000 (64-bit, prefetchable) [size=256M] I/O ports at 5000 [size=64] Expansion ROM at <unassigned> [disabled] Capabilities: [90] MSI: Enable+ Count=1/1 Maskable- 64bit- Capabilities: [d0] Power Management version 2 Capabilities: [a4] PCI Advanced Features Kernel driver in use: i915 So it has an IO BAR. 00:1a.0 USB controller: Intel Corporation 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2 (rev 04) (prog-if 20 [EHCI]) Subsystem: Lenovo Device 21cf Flags: bus master, medium devsel, latency 0, IRQ 16 Memory at f252a000 (32-bit, non-prefetchable) [size=1K] Capabilities: [50] Power Management version 2 Capabilities: [58] Debug port: BAR=1 offset=00a0 Capabilities: [98] PCI Advanced Features Kernel driver in use: ehci-pci So IRQ but no MSI. > I suppose that this restriction can be removed for PCI devices that > 1. Actually work when plugged in into RC Integrated EndPoint > 2. Respond to the above limitations These limitations are just guidance for future devices. They can't change the past, such devices were made. > > > > > and had planned to > > > prevent attaching them to PCIe root ports (ioh3420 device) and PCIe > > > downstream switch ports (xio-3130 device) as well. I did this because, > > > even though qemu currently allows attaching a normal PCI device in any > > > of these three places, the restriction exists for real hardware and I > > > didn't see any guarantee that qemu wouldn't add the restriction in the > > > future in order to more closely emulate real hardware. > > > > > > However, since I did that, I've learned that many of the qemu "pci" > > > devices really should be considered as "pci or pcie". Gerd Hoffman lists > > > some of these cases in a bug he filed against libvirt: > > > > > > https://bugzilla.redhat.com/show_bug.cgi?id=1003983 > > > > > > I would like to loosen up the restrictions in libvirt, but want to make > > > sure that I don't allow something that could later be forbidden by qemu > > > (thus creating a compatibility problem during upgrades). Beyond Gerd's > > > specific requests to allow ehci, uhci, and hda controllers to attach to > > > PCIe ports, are there any other devices that I specifically should or > > > shouldn't allow? (I would rather be conservative in what I allow - it's > > > easy to allow more things later, but nearly impossible to revoke > > > permission once it's been allowed). > For the moment I would not remove any restrictions, but only the ones > requested and verified by somebody. > > > > > IMO, we really need to grow an interface to query this kind of thing. > Basically libvirt needs to know: > 1. for (libvirt) controllers: what kind of devices can be plugged in > 2. for devices (controller is also a device) > - to which controllers can it be plugged in > - does it support hot-plug? > 3. implicit controllers of the machine types (q35 - "pcie-root", i440fx - "pci-root") > All the above must be exported to libvirt > > Implementation options: > 1. Add a compliance field on PCI/PCIe devices and controllers stating if it supports > PCI/PCIe or both (and maybe hot-plug) > - consider plug type + compliance to figure out whether a plug can go into a socket > > 2. Use Markus Armbruster idea of introducing a concept of "plug and sockets": > - dividing the devices into adapters and plugs > - adding sockets to bridges(buses?). > In this way it would be clear which devices can connect to bridges > > Any thoughts? > Thanks, > Marcel It's all not too hard to implement, we just need to know what kind of interface makes sense for management. So Cc libvir-list(a)redhat.com . > > > > >

2 2

[libvirt] [PATCHv2 0/2] Allow updating QoS via virDomainUpdateDeviceFlags
by Michal Privoznik 02 Oct '13

02 Oct '13

*** BLURB HERE *** Michal Privoznik (2): qemu_hotplug: Allow QoS update in qemuDomainChangeNet virNetDevBandwidthEqual: Make it more robust src/qemu/qemu_hotplug.c | 20 ++++++++++++++++++-- src/util/virnetdevbandwidth.c | 26 ++++++++++++++++++++------ 2 files changed, 38 insertions(+), 8 deletions(-) -- 1.8.1.5

2 5

[libvirt] libvirt-glib fails to compile with CLANG compiler
by Jason Helfman 02 Oct '13

02 Oct '13

When compiling libvirt-glib with CLANG, I get the following error. 16 warnings generated. CCLD libvirt-glib-1.0.la GEN LibvirtGLib-1.0.gir /usr/local/lib/libvirt.so: undefined reference to `__stack_chk_fail_local' clang: error: linker command failed with exit code 1 (use -v to see invocation) linking of temporary binary failed: Command '['/usr/local/bin/libtool', '--mode=link', '--tag=CC', '--silent', 'clang', '-o', '/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7/libvirt-glib/tmp-introspectOO6vqG/LibvirtGLib-1.0', '-export-dynamic', '-O2', '-pipe', '-fno-strict-aliasing', '-L/usr/local/lib', '-fstack-protector', '/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7/libvirt-glib/tmp-introspectOO6vqG/LibvirtGLib-1.0.o', '-L.', './libvirt-glib-1.0.la', '-lgio-2.0', '-lgobject-2.0', '-Wl,--export-dynamic', '-lgmodule-2.0', '-lgthread-2.0', '-pthread', '-L/usr/local/lib', '-lglib-2.0', '-lintl']' returned non-zero exit status 1 gmake[2]: *** [LibvirtGLib-1.0.gir] Error 1 gmake[2]: Leaving directory `/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7/libvirt-glib' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7' gmake: *** [all] Error 2 *** [do-build] Error code 1 -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

3 7

[libvirt] ANNOUNCE: libvirt 0.9.12.2 maintenance release
by Guido Günther 01 Oct '13

01 Oct '13

libvirt 0.9.12.2 maintenance release is now available. This is libvirt 0.9.12 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.12.2.tar.gz md5sum: 8d5fdc4517a83ba9d99fd47fa70f7ed1 libvirt-0.9.12.2.tar.gz sha1: 8c49123c673231f1f0ed665156c88dd7c109be30 libvirt-0.9.12.2.tar.gz sha256: 32b48c7e56048f670ffe980abc9d60710e7811e361a162b0ac31ec57719ac577 libvirt-0.9.12.2.tar.gz Changes in this release: Prepare for 0.9.12.2 (Guido Günther) Distribute viratomic.h (Guido Günther) Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) (Daniel P. Berrange) Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) (Daniel P. Berrange) Include process start time when doing polkit checks (Daniel P. Berrange) Move virProcess{Kill, Abort, TranslateStatus} into virprocess.{c, h} (Daniel P. Berrange) Move virProcessKill into virprocess.{h, c} (Daniel P. Berrange) Rename virCommandTranslateStatus to virProcessTranslateStatus (Daniel P. Berrange) Rename virPid{Abort, Wait} to virProcess{Abort, Wait} (Daniel P. Berrange) Rename virKillProcess to virProcessKill (Daniel P. Berrange) Introduce APIs for splitting/joining strings (Daniel P. Berrange) For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Cheers, -- Guido

1 0

[libvirt] [v0.9.12-maint] Distribute viratomic.h
by Guido Günther 01 Oct '13

01 Oct '13

Sicne cbcb1983afbd76f0503185e4183afa10af88af47 we need viratmic.h in the distributed tarball as well. This fixes "make distcheck". --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index 6656fa0..88b6160 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ augeastest_DATA = # These files are not related to driver APIs. Simply generic # helper APIs for various purposes UTIL_SOURCES = \ + util/viratomic.h \ util/bitmap.c util/bitmap.h \ util/buf.c util/buf.h \ util/command.c util/command.h \ -- 1.8.4.rc3

3 4

[libvirt] [PATCH] qemu: cgroup: Fix crash if starting nographics guest
by Cole Robinson 01 Oct '13

01 Oct '13

We can dereference graphics[0] even if guest has no graphics device configured. I screwed this up in a216e6487255d3b65d97c7ec1fa5da63dbced902 --- src/qemu/qemu_cgroup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f95c7f2..ace7e35 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -490,9 +490,10 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, if (vm->def->nsounds && ((!vm->def->ngraphics && cfg->nogfxAllowHostAudio) || - ((vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + (vm->def->graphics && + ((vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && cfg->vncAllowHostAudio) || - (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL)))) { + (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL))))) { rv = virCgroupAllowDeviceMajor(priv->cgroup, 'c', DEVICE_SND_MAJOR, VIR_CGROUP_DEVICE_RW); virDomainAuditCgroupMajor(vm, priv->cgroup, "allow", DEVICE_SND_MAJOR, -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu_hotplug: Allow QoS update in qemuDomainChangeNet
by Michal Privoznik 01 Oct '13

01 Oct '13

The qemuDomainChangeNet() is called when 'virsh update-device' is invoked on a NIC. Currently, we fail to update the QoS even though we have routines for that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f06930e..41b942f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2062,8 +2062,6 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, virDomainNetGetActualDirectMode(olddev) != virDomainNetGetActualDirectMode(olddev) || !virNetDevVPortProfileEqual(virDomainNetGetActualVirtPortProfile(olddev), virDomainNetGetActualVirtPortProfile(newdev)) || - !virNetDevBandwidthEqual(virDomainNetGetActualBandwidth(olddev), - virDomainNetGetActualBandwidth(newdev)) || !virNetDevVlanEqual(virDomainNetGetActualVlan(olddev), virDomainNetGetActualVlan(newdev))) { needReconnect = true; @@ -2081,6 +2079,18 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } + if (!virNetDevBandwidthEqual(virDomainNetGetActualBandwidth(olddev), + virDomainNetGetActualBandwidth(newdev))) { + if (virNetDevBandwidthSet(newdev->ifname, + virDomainNetGetActualBandwidth(newdev), + false) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot set bandwidth limits on %s"), + newdev->ifname); + goto cleanup; + } + needReplaceDevDef = true; + } if (needBridgeChange) { if (qemuDomainChangeNetBridge(dom->conn, vm, olddev, newdev) < 0) goto cleanup; -- 1.8.1.5

2 1

[libvirt] ANNOUNCE: libvirt 0.9.12.1 maintenance release
by Guido Günther 01 Oct '13

01 Oct '13

libvirt 0.9.12.1 maintenance release is now available. This is libvirt 0.9.12 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.12.1.tar.gz Checksums: md5sum: 65fb37b247281bcdd027f51e6d7d3847 sha1: 2710e415bed06043a75ebbf0a7de773ce0748250 sha256: e5d0055c8bde84620f65bfe6968acc39a1015ab17b735b951e982d67909f5484 Changes in this version: Prepare 0.9.12.1 (Guido Günther) Fix TLS tests with gnutls 3 (Daniel P. Berrange) build: avoid confusing make with raw name 'undefine' (Eric Blake) virsh: Fix POD syntax (Jiri Denemark) build: more workarounds for if_bridge.h (Eric Blake) build: allow building with newer glibc-headers and -O0 (Eric Blake) Fix race condition when destroying guests (Daniel P. Berrange) Don't ignore return value of qemuProcessKill (Daniel P. Berrange) conf: Remove console stream callback only when freeing console helper (Peter Krempa) conf: Remove callback from stream when freeing entries in console hash (Peter Krempa) storage: Need to also VIR_FREE(reg) (Luca Tettamanti) qemu: Add support for -no-user-config (Jiri Denemark) rpc: Fix crash on error paths of message dispatching (Peter Krempa) qemu: Fix off-by-one error while unescaping monitor strings (Peter Krempa) Revert "rpc: Discard non-blocking calls only when necessary" (Jiri Denemark) build: fix virnetlink on glibc 2.11 (Eric Blake) security: Fix libvirtd crash possibility (Martin Kletzander) daemon: Fix crash in virTypedParameterArrayClear (Jiri Denemark) For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Cheers, -- Guido

1 0

[libvirt] [PATCH] selinux: Only close the selabel_handle once
by Ján Tomko 01 Oct '13

01 Oct '13

On selinux driver initialization failure (missing/incorrectly formated contexts file), selabel_handle was closed twice. Introduced by 6159710. --- src/security/security_selinux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 38de060..c408fa8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -460,6 +460,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) error: # if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); + data->label_handle = NULL; # endif virConfFree(selinux_conf); VIR_FREE(data->domain_context); @@ -547,6 +548,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) error: #if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); + data->label_handle = NULL; #endif VIR_FREE(data->domain_context); VIR_FREE(data->alt_domain_context); @@ -808,7 +810,8 @@ virSecuritySELinuxSecurityDriverClose(virSecurityManagerPtr mgr) return 0; #if HAVE_SELINUX_LABEL_H - selabel_close(data->label_handle); + if (data->label_handle) + selabel_close(data->label_handle); #endif virHashFree(data->mcs); -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix handling of IPv6 listen addresses in cmdDomDisplay
by Ján Tomko 01 Oct '13

01 Oct '13

Use virSocketAddrIsWildcard instead of STREQ to check for the ANY address and put brackets around the address if it contains ':'. --- tools/virsh-domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fa012d1..42c9920 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9043,6 +9043,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) int flags = 0; bool params = false; const char *xpath_fmt = "string(/domain/devices/graphics[@type='%s']/@%s)"; + virSocketAddr addr; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -9126,8 +9127,12 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, ":%s@", passwd); /* Then host name or IP */ - if (!listen_addr || STREQ((const char *)listen_addr, "0.0.0.0")) + if (!listen_addr || + (virSocketAddrParse(&addr, listen_addr, AF_UNSPEC) > 0 && + virSocketAddrIsWildcard(&addr))) virBufferAddLit(&buf, "localhost"); + else if (strchr(listen_addr, ':')) + virBufferAsprintf(&buf, "[%s]", listen_addr); else virBufferAsprintf(&buf, "%s", listen_addr); -- 1.8.1.5

2 2

[libvirt] [PATCH] LXC: Detect fs support. Mount only supported fs in containers
by Bogdan Purcareata 01 Oct '13

01 Oct '13

Some filesystems - specifically securityfs - are not supported in all systems running libvirt containers. When starting a container, mount only the filesystems that are supported on the host. Detection of filesystem support is done at runtime. Signed-off-by: Bogdan Purcareata <bogdan.purcareata(a)freescale.com> --- src/lxc/lxc_container.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c60f5d8..eff9a24 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -509,6 +509,61 @@ static int lxcContainerChildMountSort(const void *a, const void *b) # define MS_SLAVE (1<<19) #endif +/* + * This function attempts to detect kernel support + * for a specific filesystem type. This is done by + * inspecting /proc/filesystems. + */ +static int lxcCheckFSSupport(const char *fs_type) +{ + FILE *fp = NULL; + int ret = -1; + const char *fslist = "/proc/filesystems"; + char *line = NULL; + const char *type; + + if (!fs_type) + return 1; + + VIR_DEBUG("Checking kernel support for %s", fs_type); + + VIR_DEBUG("Open %s", fslist); + if (!(fp = fopen(fslist, "r"))) { + if (errno == ENOENT) + + virReportSystemError(errno, + _("Unable to read %s"), + fslist); + goto cleanup; + } + + while (!feof(fp)) { + size_t n; + VIR_FREE(line); + if (getline(&line, &n, fp) <= 0) { + if (feof(fp)) + break; + + goto cleanup; + } + + type = strstr(line, fs_type); + if (type) { + ret = 1; + goto cleanup; + } + } + + VIR_DEBUG("No kernel support for %s", fs_type); + + ret = 0; + +cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fp); + return ret; +} + static int lxcContainerGetSubtree(const char *prefix, char ***mountsret, size_t *nmountsret) @@ -855,17 +910,23 @@ static int lxcContainerMountBasicFS(bool userns_enabled) for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) { virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; const char *srcpath = NULL; + const char *dstpath = NULL; VIR_DEBUG("Processing %s -> %s", mnt->src, mnt->dst); srcpath = mnt->src; + dstpath = mnt->dst; /* Skip if mount doesn't exist in source */ if ((srcpath[0] == '/') && (access(srcpath, R_OK) < 0)) continue; + if ((access(dstpath, R_OK) < 0) || /* mount is not present on host */ + (!lxcCheckFSSupport(mnt->type))) /* no fs support in kernel */ + continue; + #if WITH_SELINUX if (STREQ(mnt->src, SELINUX_MOUNT) && (!is_selinux_enabled() || userns_enabled)) -- 1.7.11.7

3 2

[libvirt] networking restart after redefinition
by Mihamina Rakotomandimby 01 Oct '13

01 Oct '13

Hi all, Running Fedora 18 and the bundled libvirt and virt-tools. Desktop use. As I like to access my guests with a hostname and not a numerical IP address, I fix the IP addressing in the network configuration: http://pastebin.com/rfMKn40j Unfortunately, I cant find a way to add a host without loosing the whole networking, as when I add a ahost, I destroy and redefine the network. Restarting libvirtd is not the solution. How would you recommend to have networking UP after network redefinition? -- RMA.

2 2

[libvirt] [PATCH 0/2] Support IPv6 in port allocator
by Ján Tomko 01 Oct '13

01 Oct '13

Ján Tomko (2): Split out virHostHasIPv6 from qemuMigrationPrepareAny Bind to both IPv4 and v6 when checking port availability src/libvirt_private.syms | 1 + src/qemu/qemu_migration.c | 8 +------- src/util/virportallocator.c | 34 +++++++++++++++++++++++++++------- src/util/virutil.c | 14 ++++++++++++++ src/util/virutil.h | 1 + 5 files changed, 44 insertions(+), 14 deletions(-) -- 1.8.1.5

2 4

[libvirt] [PATCH] libvirt: hostdev SCSI AdapterId retrieval fix
by Boris Fiuczynski 01 Oct '13

01 Oct '13

Fixed the retrieval of the AdapterId from the AdapterName of the hostdev source so it does return an error instead of leaving the adapter_id uninitialized. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/virscsi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 43658c0..7aca9e6 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -88,16 +88,13 @@ static int virSCSIDeviceGetAdapterId(const char *adapter, unsigned int *adapter_id) { - if (STRPREFIX(adapter, "scsi_host")) { - if (virStrToLong_ui(adapter + strlen("scsi_host"), - NULL, 0, adapter_id) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse adapter '%s'"), adapter); - return -1; - } - } - - return 0; + if (STRPREFIX(adapter, "scsi_host") && + virStrToLong_ui(adapter + strlen("scsi_host"), + NULL, 0, adapter_id) == 0) + return 0; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse adapter '%s'"), adapter); + return -1; } char * -- 1.8.3.1

2 3

[libvirt] Release of libvirt-1.1.3
by Daniel Veillard 01 Oct '13

01 Oct '13

As scheduled I made the 1.1.3 release today, the git tree is tagged and tarball and rpms are available at the usual place: ftp://libvirt.org/libvirt/ Overall a rather big release, with more than 300 patches included, with a lot of fixes many of them being leaks or report from Coverity, but also 3 security fixes. There is also a few features but listed but they are more about focused improvement than anything revolutionary, this should be considered a stabilization release, it should be good (Famous Last Words !) Features: - VMware: Initial VMware Fusion support and various improvements (Doug Goldstein) - libvirt: add new public API virConnectGetCPUModelNames (Giuseppe Scrivano) - various libxl driver improvements (Jim Fehlig) - LXC many container driver improvement (Chen Hanxiao, Gao Feng, Daniel P. Berrange) - ARM cpu improvements (Cole Robinson) Security: - Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) (Daniel P. Berrange) - Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) (Daniel P. Berrange) - virFileNBDDeviceAssociate: Avoid use of uninitialized variable (Michal Privoznik) Documentation: - python: Document virNodeGetInfo bug (Michal Privoznik) - maint: fix comment typos (Eric Blake) - conf: Fix virNetworkAssignDef's comment. (lawrancejing) - fix virEventAddHandle return details (Jonathan Lebon) - fix XML for the RNG device example (Giuseppe Scrivano) - mention hostname subtlety (Eric Blake) - Add some notes about security considerations when using LXC (Daniel P. Berrange) - Repair the search on libvirt.org (Daniel Veillard) - api-docs: Fix description of virConnectGetType() API function (Michal Novotny) - Update docs about user namespace for LXC (Daniel P. Berrange) - docs, comments: minor typo fixes (Oskari Saarenmaa) - LXC: fix typos in lxc_container.c (Chen Hanxiao) - fix a typo in virt-login-shell.pod (Alex Jia) - Fix a typo in network XML docs (Ján Tomko) - Add OpenStack into references (Martin Kletzander) - examples: Add script to parse topology from capabilities output (Peter Krempa) Portability: - build: fix build --without-lxc (Eric Blake) - build: tweak vpath builds of net_rpc (Eric Blake) - fchosttest: Run the test only under linux (Michal Privoznik) - genprotocol.pl: Fix code on FreeBSD too (Michal Privoznik) - BSD: Ensure process creation timestamp is init'd (Doug Goldstein) - BSD: Ensure UNIX socket credentials are valid (Doug Goldstein) - build: fix testsuite building under cygwin (Eric Blake) - build: Fix VPATH build error for locking daemon (Viktor Mihajlovski) - build: fix use of rpc.h on cygwin (Eric Blake) - build: skip ld_preload tests on non-Linux systems (Eric Blake) - build: hoist system-specific checks before library checks (Eric Blake) - virsh: Don't shadow global variable "remove" in cmdMetadata (Peter Krempa) - conf: Avoid false positive of uninitialized variable use (Peter Krempa) - build: fix VPATH build of remote driver (Eric Blake) - build: make autobuild require rpm build deps (Eric Blake) - build: fix build with latest rawhide kernel headers (Eric Blake) - Explicitly link libvirt_net_rpc against SELINUX_LIBS (Guido Günther) - build: require libnl-3 if netcf uses it (Eric Blake) - build: fix regression in requiring yajl for new enough qemu (Eric Blake) - build: avoid obsolete AC_HELP_STRING (Eric Blake) - virsh: fix build on mingw, which lacks termios stuff (Eric Blake) - build: avoid stranded polkit file in client-only build (Eric Blake) - spec: fix rpm build when lxc disabled (Eric Blake) Bug Fixes: - lxc: do cleanup when failed to bind fs as read-only (Chen Hanxiao) - Fix max stream packet size for old clients (Daniel P. Berrange) - LXC: workaround machined uncleaned data with containers running systemd. (Cédric Bosdonnat) - virfile: safezero: align mmap offset to page size (Oskari Saarenmaa) - virscsi: hostdev SCSI AdapterId retrieval fix (Boris Fiuczynski) - virsh-volume: Add missing check when calling virStreamNew (Hongwei Bi) - virsh-domain: Free dom before return false in cmdDump (Hongwei Bi) - qemu: process: Silence coverity warning when rewinding log file (Peter Krempa) - Fix crash in libvirtd when events are registered & ACLs active (Daniel P. Berrange) - virsh: Fix domdisplay when domain only uses TLS (Christophe Fergeau) - qemu: Free all driver data in qemuStateCleanup (Jiri Denemark) - qemu: Don't leak reference to virQEMUDriverConfigPtr (Jiri Denemark) - rpc: Increase bound limit for virDomainGetJobStats (Jiri Denemark) - LXC: free dst before lxcDomainAttachDeviceDiskLive returns (Chen Hanxiao) - qemu: virDomainControllerFind may return 0 if controller found (Chen Hanxiao) - conf: Don't crash on invalid chardev source definition of RNGs and other (Peter Krempa) - Avoid use of uninitialized data in virnetmessagetest (Daniel P. Berrange) - Avoid crash on OOM in virnetmessagetest (Daniel P. Berrange) - Avoid crash on OOM in virportallocatortest (Daniel P. Berrange) - Avoid crash on OOM in virlockspacetest (Daniel P. Berrange) - Avoid crash on OOM in virbuftest (Daniel P. Berrange) - Avoid uninitialized data in qemuMonitorTestNew (Daniel P. Berrange) - Avoid double free in qemuMonitorCommonTestInit on OOM (Daniel P. Berrange) - Fix leak on OOM in qemuMonitorCommonTestNew (Daniel P. Berrange) - Don't ignore errors parsing nwfilter rules (Daniel P. Berrange) - Fix leak in virLockSpaceResourceFree (Daniel P. Berrange) - Fix leak of parser state in virJSONValueFromString (Daniel P. Berrange) - Fix double-free in virJSONParserHandleStartMap on OOM (Daniel P. Berrange) - Fix leak of iterators in virDBusMessageIterEncode (Daniel P. Berrange) - Fix leak of comment string if virConfAddEntry fails on OOM (Daniel P. Berrange) - Add missing check for OOM with virVMXEscapeHexPipe (Daniel P. Berrange) - Fix crash on OOM parsing storage pool XML (Daniel P. Berrange) - Fix double free of hostdev on OOM in xenParseSxprPCI (Daniel P. Berrange) - Don't clobber 'ret' in LXC XML test case (Daniel P. Berrange) - Fix crash on OOM in virDomainSnapshotDefParse (Daniel P. Berrange) - Don't clobber return value in virInterfaceDefParseProtoIPv6 (Daniel P. Berrange) - Fix handling of OOM when getting Xen dom ID (Daniel P. Berrange) - Fix crash on OOM in xenParseSxpr (Daniel P. Berrange) - virsh-domain: Add a missing check and fix leak in cmdScreenshot (Hongwei Bi) - Fix leak of serial value in xenFormatXM on OOM (Daniel P. Berrange) - Fix broken formatting on OOM in xenFormatXM (Daniel P. Berrange) - Fix crash on OOM in xenParseXM handling consoles (Daniel P. Berrange) - Fix leak of char device in xenParseXM (Daniel P. Berrange) - Fix leak of command line args in qemuParseCommandLine (Daniel P. Berrange) - Fix leak in qemuParseCommandLine on OOM (Daniel P. Berrange) - Fix leak in qemuStringToArgvEnv upon OOM (Daniel P. Berrange) - Fix missing jump to error cleanup in qemuParseCommandLineDisk (Daniel P. Berrange) - Fix leak in qemuParseCommandLineDisk on OOM (Daniel P. Berrange) - Fix leak on OOM in qemuBuildCommandLine dealing with sound card (Daniel P. Berrange) - Fix failure to honour OOM status in qemuParseNBDString (Daniel P. Berrange) - Avoid leak in qemuParseRBDString on failure of qemuAddRBDHost (Daniel P. Berrange) - Fix leak of address string in qemuDomainPCIAddressGetNextSlot (Daniel P. Berrange) - Fix leak in virDomainDefParseXML parsing vcpupin (Daniel P. Berrange) - Fix leak in virDomainVcpuPinDefParseXML parsing cpumask (Daniel P. Berrange) - Avoid leak if virDomainSoundCodecDefParseXML return error (Daniel P. Berrange) - Fix leak in virDomainVcpuPinDefArrayFree (Daniel P. Berrange) - Check return value of virDomainControllerInsert when parsing QEMU args (Daniel P. Berrange) - Honour error returned by virBitmapFormat (Daniel P. Berrange) - Add missing check for OOM when building boot menu args (Daniel P. Berrange) - Fix format specifier for OOM test fprintfs (Daniel P. Berrange) - Always open files in binary mode in virFDStreamOpenFileInternal (Claudio Bley) - Don't ignore allocation failure in virCommandAddEnvPassCommon (Daniel P. Berrange) - Fix reporting of errors in OOM injection code (Daniel P. Berrange) - Fix missing OOM check in qemuParseCommandLine when splitting strings (Daniel P. Berrange) - Fix error checking of qemuParseKeywords return status (Daniel P. Berrange) - Fix allocation of arglist in qemuStringToArgvEnv (Daniel P. Berrange) - Fix crash on OOM in qemuAddRBDHost (Daniel P. Berrange) - Fix crash on OOM in qemuDomainCCWAddressSetCreate() (Daniel P. Berrange) - Fix crash if OOM occurs when creating virConnectPtr (Daniel P. Berrange) - Fix crash on OOM in parsing CPU mask in domain XML (Daniel P. Berrange) - Fix crash on OOM when parsing disk security label (Daniel P. Berrange) - Fix typo in identity code which is pre-requisite for CVE-2013-4311 (Daniel P. Berrange) - Fix potential use of uninitialized value in virDomainGetVcpuPinInfo (Daniel P. Berrange) - qemu: Fix seamless SPICE migration (Martin Kletzander) - Don't dereference NULL in qemumonitorjsontest (Ján Tomko) - Add checking of dbus_message_iter_append_basic return value (Daniel P. Berrange) - qemu: use "ide" as device name for implicit SATA controller on Q35 (Laine Stump) - qemu: Avoid dangling job in qemuDomainSetBlockIoTune (Jiri Denemark) - conf: Don't corrupt metadata on OOM (Peter Krempa) - qemu: Fix memleak after commit 59898a88ce8431bd3ea249b8789edc2ef9985827 (Peter Krempa) - qemu: Use "migratable" XML definition when doing external checkpoints (Peter Krempa) - qemu: Fix checking of ABI stability when restoring external checkpoints (Peter Krempa) - virsh: Fix a wrong check in cmdEcho() (Hongwei Bi) - Always free network and graphics cookies (Ján Tomko) - Free slicename in virSystemdCreateMachine (Ján Tomko) - Fix naming of permission for detecting storage pools (Daniel P. Berrange) - qemu: Fix checking of guest ABI compatibility when reverting snapshots (Peter Krempa) - netcf driver: use a single netcf handle for all connections (Laine Stump) - Fix launching of VMs on when only logind part of systemd is present (Daniel P. Berrange) - Fix polkit permission names for storage pools, vols & node devices (Daniel P. Berrange) - virsh domjobinfo: Do not return 1 if job is NONE (Jiri Denemark) - virDomainDefParseXML: set the argument of virBitmapFree to NULL after calling virBitmapFree (Liuji (Jeremy)) - cpu: Cleanup ppcCompute to avoid memory leak (Li Zhang) - qemu: don't leak vm on failure (Eric Blake) - LXC: Free variable vroot in lxcDomainDetachDeviceHostdevUSBLive() (Hongwei Bi) - qemu: don't leave shutdown inhibited on attach failure (Eric Blake) - libxl: Compile regular expression where it is used (Jim Fehlig) - Don't call regfree() if regcomp() fails (Jim Fehlig) - Use loop-control to allocate loop device. (Ian Main) - LXC: Don't mount securityfs when user namespace enabled (Gao feng) - Stop free'ing 'const char *' strings (Daniel P. Berrange) - conf: Don't deref NULL actual network in virDomainNetGetActualHostdev() (Peter Krempa) - libxl: Check for regcomp failure (Jim Fehlig) - libxl: Fix Coverity warning (Jim Fehlig) - Don't call VIR_ALLOC on def->uuid in parallels storage driver (Daniel P. Berrange) - qemu: Make domain renaming work during migration (Jiri Denemark) - AppArmorSetSecurityImageLabel: Avoid use of uninitialized variable (Michal Privoznik) - build: fix typo that broke 'make dist' (Eric Blake) - esx_driver: Resolve Coverity RESOURCE_LEAK on error paths (John Ferlan) - esx_vi: Resolve Coverity RESOURCE_LEAK in error path (John Ferlan) - test_virtlockd.aug.in: Use the correct file (Michal Privoznik) - virsh-console: Avoid using signal() in multithreaded application (Peter Krempa) - qemu: Handle huge number of queues correctly (Michal Privoznik) - Fix leaks in python bindings (Ján Tomko) - virsh-domain: Avoid killing ssh transport tunnels when cancelling job (Peter Krempa) - qemu: Fix networking for ARM guests (Cole Robinson) - qemu: Don't try to allocate PCI addresses for ARM (Cole Robinson) - Fix AM_LDFLAGS typo (Guido Günther) Improvements: - VMware: Add Fusion version test (Doug Goldstein) - VMware: Support more than 2 driver backends (Doug Goldstein) - Makefile.am: Always include rule to make org.libvirt.api.policy (Michal Privoznik) - event: Make debug message match function comments (Doug Goldstein) - lxc: fix a warning typo in virLXCControllerEventSend (Chen Hanxiao) - Distribute check-aclperms.pl (Guido Günther) - conf: clean up virDomainChrSourceDefParseXML (Peter Krempa) - spec: Clean up distribution of ChangeLog (and others) (Cole Robinson) - test: Allow specifying object runstate in driver XML (Cole Robinson) - Don't print all test suite errors to stderr in vmx2xmltest (Daniel P. Berrange) - qemu: prefer to put a Q35 machine's dmi-to-pci-bridge at 00:1E.0 (Laine Stump) - qemu: turn if into switch in qemuDomainValidateDevicePCISlotsQ35 (Laine Stump) - qemu: support ich9-intel-hda audio device (Laine Stump) - qemu: replace multiple strcmps with a switch on an enum (Laine Stump) - qemu: allow some PCI devices to be attached to PCIe slots (Laine Stump) - qemu: eliminate redundant if clauses in qemuCollectPCIAddress (Laine Stump) - bridge driver: don't masquerade local subnet broadcast/multicast packets (Laszlo Ersek) - util/viriptables: add/remove rules that short-circuit masquerading (Laszlo Ersek) - qemu: Wire up better early error reporting (Peter Krempa) - qemu: monitor: Produce better errors on monitor hangup (Peter Krempa) - qemu: monitor: Add infrastructure to access VM logs for better err msgs (Peter Krempa) - qemu_process: Make qemuProcessReadLog() more versatile and reusable (Peter Krempa) - maint: update to latest gnulib (Eric Blake) - test: fix call to virFDStreamOpenFile in testDomainScreenshot (Claudio Bley) - Add test case for virNetServerClient object identity code (Daniel P. Berrange) - Add a virNetSocketNewConnectSockFD method (Daniel P. Berrange) - python: add bindings for virConnectGetCPUModelNames (Giuseppe Scrivano) - virsh: add function to get the CPU models for an arch (Giuseppe Scrivano) - virConnectGetCPUModelNames: add the support for the test protocol (Giuseppe Scrivano) - virConnectGetCPUModelNames: add the support for qemu (Giuseppe Scrivano) - virConnectGetCPUModelNames: implement the remote protocol (Giuseppe Scrivano) - cpu: add function to get the models for an arch (Giuseppe Scrivano) - build: ensure 'make check' sees up-to-date config.h (Eric Blake) - docs: Load libvirt_access*.xml from build dir (Jiri Denemark) - LXC: Check the existence of dir before resolving symlinks (Chen Hanxiao) - LXC: follow the unit style of /proc/meminfo (Chen Hanxiao) - conf: Do better job when comparing features ABI compatibility (Peter Krempa) - VMware: Make version parsing testable and add tests (Doug Goldstein) - VMware: Store vmrun binary's path in the driver (Doug Goldstein) - VMware: Convert driver type defines to enum (Doug Goldstein) - virsh: add missing "async" option in opts_block_commit (Simone Gotti) - qemumonitorjsontest: Introduce DO_TEST_SIMPLE (Michal Privoznik) - qemumonitorjsontest: Test CPU state handling code (Michal Privoznik) - daemon: Remove more hardcoded paths from help output (Christophe Fergeau) - Fix LIBVIRTD_CONFIGURATION_FILE constant (Christophe Fergeau) - Ensure system identity includes process start time (Daniel P. Berrange) - Also store user & group ID values in virIdentity (Daniel P. Berrange) - daemon: Don't hardcode pki paths in help output (Christophe Fergeau) - daemon: Fix 'caert.pem' typo in privileged help output (Christophe Fergeau) - virsh: Add vshCompleter to each option (Tomas Meszaros) - Add forwarder attribute to <dns/> element (Diego Woitasen) - VMX: Add a VMWare Fusion 5 configuration for tests (Doug Goldstein) - VMX: Add support for 'auto detect' fileNames (Doug Goldstein) - Allow <source> for type=block to have no dev (Doug Goldstein) - maint: ignore recently-added test (Eric Blake) - tests: metadatatest: Quiesce errors on expected paths (Peter Krempa) - test: Refactor setting of dummy error handlers (Peter Krempa) - Add tftp protocol support for cdrom disk (Aline Manera) - Add ftps protocol support for cdrom disk (Aline Manera) - Add https protocol support for cdrom disk (Aline Manera) - tests: Add metadata tests (Peter Krempa) - test: Add <metadata> support into the test driver (Peter Krempa) - lxc: Add metadata modification APIs (Peter Krempa) - lib: Don't force the key argument when deleting metadata (Peter Krempa) - conf: allow to add XML metadata using the virDomainSetMetadata api (Peter Krempa) - conf: Add support for requesting of XML metadata via the API (Peter Krempa) - virsh-domain: Add command to allow modifications of XML metadata (Peter Krempa) - virsh-domain: use virXMLNodeToString instead of xmlNodeDump (Peter Krempa) - util: Add helper to convert libxml2 nodes to a string (Peter Krempa) - conf: Factor out setting of metadata to simplify code (Peter Krempa) - qemu: Factor out body of qemuDomainSetMetadata for universal use (Peter Krempa) - qemu: Factor out body of qemuDomainGetMetadata for universal use (Peter Krempa) - virsh-domain: Line up signal names array (Peter Krempa) - virsh-domain: Remove spurious ATTRIBUTE_UNUSED from cmdDesc (Peter Krempa) - Allow LUN type disks to have no source (Doug Goldstein) - cgroup: Move [qemu|lxc]GetCpuBWStatus to vicgroup.c and refactor it (Peter Krempa) - cleanup: Kill usage of access(PATH, F_OK) in favor of virFileExists() (Peter Krempa) - util: Declare that virFileExists shall honor errno (Peter Krempa) - virsh: move command maxvcpus from domain group to host group. (yangdongsheng) - tools: add missing 'interface' type and update man page (Alex Jia) - tests: Don't test user config file if ran as root (Martin Kletzander) - test-lib: Make case skipping possible (Martin Kletzander) - LXC: don't try to mount selinux filesystem when user namespace enabled (Gao feng) - rename "struct interface_driver" to virNetcfDriverState (Laine Stump) - Ensure root filesystem is recursively mounted readonly (Daniel P. Berrange) - Move array of mounts out of lxcContainerMountBasicFS (Daniel P. Berrange) - Fix virsystemdtest for previous commit (Daniel P. Berrange) - DBus: introduce virDBusIsServiceEnabled (Gao feng) - LXC: introduce lxcContainerUnmountForSharedRoot (Gao feng) - LXC: umount the temporary filesystem created by libvirt (Gao feng) - Add test for the nodemask double free crash (Ján Tomko) - Fix cgroups when all are mounted on /sys/fs/cgroup (Daniel P. Berrange) - qemu: endjob returns a bool (Eric Blake) - build: use automake subdir-objects (Eric Blake) - tests: check remaining .x files (Eric Blake) - build: use library rather than cross-directory compilation (Eric Blake) - build: avoid $(srcdir) in *_SOURCES (Eric Blake) - Add ARM v7 big-endian architecture (armv7b) (Yogesh Tillu) - qemu: avoid users specifying CPU features for non-x86 plaftorm. (Li Zhang) - qemu: recognize -machine accel=kvm when parsing native (Eric Blake) - qemu: only parse basename when determining emulator properties (Eric Blake) - spec: make client-only testing easier (Eric Blake) - build: shut up automake warnings (Eric Blake) - Change 'shortforward' to bool. (Ján Tomko) - Add '<nat>' element to '<forward>' network schemas (Ján Tomko) - cpu: Add cpu test cases for PPC CPU driver. (Li Zhang) - cpu: Implement guestData and update for PPC (Li Zhang) - qemu: Remove CPU features functions calling for non-x86 platform. (Li Zhang) - Stop calling virAllocN directly from ESX code (Daniel P. Berrange) - virDomainDeviceIsUSB: Drop check for USB controller (Liuji (Jeremy)) - Ensure 'arch' is always set in cpuArchNodeData (Daniel P. Berrange) - qemu: simplify list cleanup (Eric Blake) - libxl: Unconditionally call virSysinfoRead() on driver init (Jim Fehlig) - spec: default vbox according to libvirtd build (Eric Blake) - build: only install nwfilter examples when building nwfilter (Eric Blake) - build: only run fdstreamtest when libvirtd is built (Eric Blake) - virGet{User,Group}Ent() don't say success on fail (Doug Goldstein) - build: enforce makefile conditional style (Eric Blake) - Add missing 'libvirt_lxc_api' variable in pkg-config file (Daniel P. Berrange) - Fix coding style issues in daemon/remote.c (Nehal J Wani) - conf: Remove the actual hostdev when removing a network (Peter Krempa) - libxl: Use standard format for source file copyright notice (Jim Fehlig) - libxl: Add libxlDomObjFromDomain (Jim Fehlig) - libxl: Remove unnecessary driver locking (Jim Fehlig) - libxl: Move driver lock/unlock to libxl_conf (Jim Fehlig) - libxl: Add comments to libxlDriverPrivate fields (Jim Fehlig) - libxl: Use atomic ops for driver->nactive (Jim Fehlig) - libxl: Introduce libxlDriverConfig object (Jim Fehlig) - libxl: User per-domain ctx in libxlDomainGetInfo (Jim Fehlig) - libxl: libxl: Use per-domain ctx in libxlMakeDomCreateInfo (Jim Fehlig) - libxl: Add libxl_version_info to libxlDriverPrivate (Jim Fehlig) - libxl: Earlier detection of not running on Xen (Jim Fehlig) - libxl: Introduce libxl_domain.[ch] (Jim Fehlig) - libxl: Move detection of autoballoon to libxl_conf (Jim Fehlig) - virsh: Rename vshMakeStdinRaw to vshTTYMakeRaw and move it to virsh.c (Peter Krempa) - tools: rename console.[ch] to virsh-console.[ch] and fix coding style (Peter Krempa) - virsh: Remember terminal state when starting and add helpers (Peter Krempa) - VMX: Add cdrom-raw dev type from VMWare Fusion (Doug Goldstein) - VMX: Some serial ports are not actually connected (Doug Goldstein) - qemu: Support virtio-mmio transport for virtio on ARM (Cole Robinson) - domain_conf: Add disk bus=sd, wire it up for qemu (Cole Robinson) - qemu: Fix specifying char devs for ARM (Cole Robinson) - qemu: Don't add default memballoon device on ARM (Cole Robinson) - domain_conf: Add default memballoon in PostParse callbacks (Cole Robinson) - qemu: Set QEMU_AUDIO_DRV=none with -nographic (Cole Robinson) - Pass AM_LDFLAGS to driver modules too (Guido Günther) - qemu: Support setting the 'removable' flag for USB disks (Fred A. Kemp) - qemu: Add capability flag for usb-storage (Fred A. Kemp) - VMX: Create virVMXFormatDisk() from HD and CD-ROM (Doug Goldstein) Cleanup: - daemon: Avoid dead code in polkit auth (Jiri Denemark) So thanks everybody for your contributions, with code, comments, reports, documentation or fixes, and of course our localizations from Fedora Transifex team ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] FreeBSD-8.3 build failure for amd64/i386, build archive included
by Jason Helfman 01 Oct '13

01 Oct '13

Libvirt no longer builds on FreeBSD 8.3. I had brought this up awhile ago, but didn't have the resources to get the requested information. A fellow committer was able to build, and send me an archive of the complete build failure for analysis. Here is a link to build archive for investigation. http://people.freebsd.org/~jgh/files/libvirt_83amd64.tar.xz Please let me know if there is any information you need. Thanks! -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

5 12

[libvirt] [PATCH] VMware: Add Fusion version test
by Doug Goldstein 01 Oct '13

01 Oct '13

This adds a test for the version string of VMware Fusion. --- Not sure how but this was dropped from my series adding VMware Fusion that was added prior to 1.1.3-rc2. This should be safe for 1.1.3 and probably encouraged --- tests/vmwareverdata/fusion-5.0.3.txt | 3 +++ tests/vmwarevertest.c | 1 + 2 files changed, 4 insertions(+) create mode 100644 tests/vmwareverdata/fusion-5.0.3.txt diff --git a/tests/vmwareverdata/fusion-5.0.3.txt b/tests/vmwareverdata/fusion-5.0.3.txt new file mode 100644 index 0000000..9fae811 --- /dev/null +++ b/tests/vmwareverdata/fusion-5.0.3.txt @@ -0,0 +1,3 @@ + +VMware Fusion Information: +VMware Fusion 5.0.3 build-1040386 Release diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index f5ccb06..47c250c 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -88,6 +88,7 @@ mymain(void) } while (0) DO_TEST("ws", "workstation-7.0.0", 7000000); + DO_TEST("fusion", "fusion-5.0.3", 5000003); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] Entering freeze for libvirt-1.1.3
by Daniel Veillard 01 Oct '13

01 Oct '13

I'm a day late from suggested schedule, but I have now tagged rc1 in git and pushed the tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ My initial testing didn't revealed anything bad, but wider testing is obviously needed, i have heard of problem on FreeBSD by Jason, hopefully we can collect and fix those in time. I will probably make rc2 during the w.e. and depending on news push on Tuesday next week or a bit later the final 1.1.3 thanks for testing and reports ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

9 21

[libvirt] [PATCH 0/4] Introduction of qemucapabilitiestest
by Michal Privoznik 30 Sep '13

30 Sep '13

So far, we are testing our capabilities code only from the --help output. Which is sufficient for ancient qemus, but not sufficient for 99% of qemus, where the QMP is used. So far, only one (example) test case is being added. If the patch set is accepted, we can add much more test cases. Michal Privoznik (4): qemu_capabilities: Introduce virQEMUCapsInitQMPMonitor tests: Learn qemuMonitorTestNew optional greeting qemuMonitorTest: Make check for monitor command match optional tests: Introduce qemucapabilitiestest .gitignore | 1 + src/qemu/qemu_capabilities.c | 144 +- src/qemu/qemu_capabilities.h | 3 + tests/Makefile.am | 12 +- tests/qemucapabilitiesdata/caps_default.caps | 132 ++ tests/qemucapabilitiesdata/caps_default.replies | 2519 +++++++++++++++++++++++ tests/qemucapabilitiestest.c | 231 +++ tests/qemuhotplugtest.c | 2 +- tests/qemumonitortestutils.c | 23 +- tests/qemumonitortestutils.h | 5 +- 10 files changed, 2994 insertions(+), 78 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_default.caps create mode 100644 tests/qemucapabilitiesdata/caps_default.replies create mode 100644 tests/qemucapabilitiestest.c -- 1.8.1.5

2 11

[libvirt] [PATCH] Fix max stream packet size for old clients
by Daniel P. Berrange 30 Sep '13

30 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The libvirtd server pushes data out to clients. It does not know what protocol version the client might have, so must be conservative and use the old payload limits. ie send no more than 256kb of data per packet. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/stream.c | 2 +- src/rpc/virnetprotocol.x | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/daemon/stream.c b/daemon/stream.c index 87dfaf5..9e36e8a 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -708,7 +708,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, daemonClientStream *stream) { char *buffer; - size_t bufferLen = VIR_NET_MESSAGE_PAYLOAD_MAX; + size_t bufferLen = VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX; int ret; VIR_DEBUG("client=%p, stream=%p tx=%d closed=%d", diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index 131e40b..1eae7cb 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -50,6 +50,13 @@ */ const VIR_NET_MESSAGE_INITIAL = 65536; +/* + * Until we enlarged the message buffers, this was the max + * payload size. We need to remember this for compat with + * old clients. + */ +const VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX = 262144; + /* Maximum total message size (serialised). */ const VIR_NET_MESSAGE_MAX = 16777216; -- 1.8.3.1

2 1

Re: [libvirt] [PATCH 1/6] kvm: Add KVM_GET_EMULATED_CPUID
by Eduardo Habkost 30 Sep '13

30 Sep '13

On Tue, Sep 24, 2013 at 01:04:14PM +0300, Gleb Natapov wrote: > On Tue, Sep 24, 2013 at 11:57:00AM +0200, Borislav Petkov wrote: > > On Mon, September 23, 2013 6:28 pm, Eduardo Habkost wrote: > > > On Sun, Sep 22, 2013 at 04:44:50PM +0200, Borislav Petkov wrote: > > >> From: Borislav Petkov <bp(a)suse.de> > > >> > > >> Add a kvm ioctl which states which system functionality kvm emulates. > > >> The format used is that of CPUID and we return the corresponding CPUID > > >> bits set for which we do emulate functionality. > > > > > > Let me check if I understood the purpose of the new ioctl correctly: the > > > only reason for GET_EMULATED_CPUID to exist is to allow userspace to > > > differentiate features that are native or that are emulated efficiently > > > (GET_SUPPORTED_CPUID) and features that are emulated not very > > > efficiently (GET_EMULATED_CPUID)? > > > > Not only that - emulated features are not reported in CPUID so they > > can be enabled only when specifically and explicitly requested, i.e. > > "+movbe". Basically, you want to emulate that feature for the guest but > > only for this specific guest - the others shouldn't see it. Then we may have a problem: some CPU models already have "movbe" included (e.g. Haswell), and patch 6/6 will make "-cpu Haswell" get movbe enabled even if it is being emulated. So if we really want to avoid enabling emulated features by mistake, we may need a new CPU flag in addition to "enforce" to tell QEMU that it is OK to enable emulated features (maybe "-cpu ...,emulate"?). > > > > > If that's the case, how do we decide how efficient emulation should be, > > > to deserve inclusion in GET_SUPPORTED_CPUID? I am guessing that the > > > criterion will be: if enabling it doesn't risk making performance worse, > > > it can get in GET_SUPPORTED_CPUID. > > > > Well, in the MOVBE case, supported means, the host can execute this > > instruction natively. Now, you guys say you can emulate x2apic very > > efficiently and I'm guessing emulating x2apic doesn't bring any > > emulation overhead, thus SUPPORTED_CPUID. > x2apic emulation has nothing to do with x2apic in a host. It is emulated > same way no matter if host has it or not. x2apic is not really cpu > feature, but apic one and apic is fully emulated by KVM anyway. But my question still stands: suppose we had x2apic emulation implemented but for some reason it was painfully slow, we wouldn't want to enable it by mistake. In this case, it would end up on EMULATED_CPUID and not on SUPPORTED_CPUID, right? > > > > > But for single instructions or group of instructions, the distinction > > should be very clear. > > > > At least this is how I see it but Gleb probably can comment too. > > > That's how I see it two. Basically you want to use movbe emulation (as > opposite of virtualization) only if you have binary kernel that compiled > for CPU with movbe (Borislav's use case), or you want to migrate > temporarily from movbe enabled host to non movbe host because downtime > is not an option. We should avoid enabling it "by mistake". "we should avoid enabling it 'by mistake'" sounds like a good criterion for including something on GET_EMULATED_CPUID instead of GET_SUPPORTED_CPUID. In that case, I believe QEMU should use GET_EMULATED_CPUID only if explicitly requested in the configuration/command-line (that's not what patch 6/6 does). -- Eduardo

2 7

[libvirt] [PATCH] LXC: workaround machined uncleaned data with containers running systemd.
by Cédric Bosdonnat 30 Sep '13

30 Sep '13

The problem is described by [0] but its effect on libvirt is that starting a container with a full distro running systemd after having stopped it simply fails. The container cleanup now calls the machined Terminate function to make sure that everything is in order for the next run. [0]: https://bugs.freedesktop.org/show_bug.cgi?id=68370 --- src/libvirt_private.syms | 2 ++ src/lxc/lxc_process.c | 8 +++++ src/util/virsystemd.c | 80 +++++++++++++++++++++++++++++++++++++++++------- src/util/virsystemd.h | 8 +++++ tests/virsystemdtest.c | 28 +++++++++++++++++ 6 files changed, 117 insertions(+), 12 deletions(-) 2nd version: * Removed the Makefile hack and added symbols to libvirt_private.syms instead * Added virSystemdMakeMachineName to factorize some code in Make and Terminate machine systemd functions. * Added tests for TerminateMachine and TerminateContainer cases. diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 48e4b04..4bc4d69 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1947,8 +1947,10 @@ virSysinfoSetup; # util/virsystemd.h virSystemdCreateMachine; +virSystemdMakeMachineName; virSystemdMakeScopeName; virSystemdMakeSliceName; +virSystemdTerminateMachine; # util/virthread.h diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..f92c613 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "viratomic.h" #include "virprocess.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -210,6 +211,13 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virCgroupFree(&priv->cgroup); } + /* Get machined to terminate the machine as it may not have cleaned it + * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for + * the bug we are working around here. + */ + virSystemdTerminateMachine(vm->def->name, "lxc", true); + + /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e72b7f0..1ba37cc 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -116,6 +116,27 @@ char *virSystemdMakeSliceName(const char *partition) return virBufferContentAndReset(&buf); } +char *virSystemdMakeMachineName(const char *name, + const char *drivername, + bool privileged) +{ + char *machinename = NULL; + char *username = NULL; + if (privileged) { + if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) + goto cleanup; + } else { + if (!(username = virGetUserName(geteuid()))) + goto cleanup; + if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) + goto cleanup; + } + +cleanup: + VIR_FREE(username); + + return machinename; +} /** * virSystemdCreateMachine: @@ -142,7 +163,6 @@ int virSystemdCreateMachine(const char *name, DBusConnection *conn; char *machinename = NULL; char *creatorname = NULL; - char *username = NULL; char *slicename = NULL; ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); @@ -152,15 +172,8 @@ int virSystemdCreateMachine(const char *name, conn = virDBusGetSystemBus(); ret = -1; - if (privileged) { - if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) - goto cleanup; - } else { - if (!(username = virGetUserName(geteuid()))) - goto cleanup; - if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) - goto cleanup; - } + if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) + goto cleanup; if (virAsprintf(&creatorname, "libvirt-%s", drivername) < 0) goto cleanup; @@ -236,9 +249,54 @@ int virSystemdCreateMachine(const char *name, ret = 0; cleanup: - VIR_FREE(username); VIR_FREE(creatorname); VIR_FREE(machinename); VIR_FREE(slicename); return ret; } + +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged) +{ + int ret; + DBusConnection *conn; + char *machinename = NULL; + + ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); + if (ret < 0) + return ret; + + conn = virDBusGetSystemBus(); + + ret = -1; + if (!(machinename = virSystemdMakeMachineName(name, drivername, privileged))) + goto cleanup; + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * TerminateMachine(in s name); + * + * @name a host unique name for the machine. shows up + * in 'ps' listing & similar + */ + + VIR_DEBUG("Attempting to terminate machine via systemd"); + if (virDBusCallMethod(conn, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "TerminateMachine", + "s", + machinename) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(machinename); + return ret; +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 414ae5a..d9845e1 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -29,6 +29,10 @@ char *virSystemdMakeScopeName(const char *name, const char *slicename); char *virSystemdMakeSliceName(const char *partition); +char *virSystemdMakeMachineName(const char *name, + const char *drivername, + bool privileged); + int virSystemdCreateMachine(const char *name, const char *drivername, bool privileged, @@ -38,4 +42,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, const char *partition); +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged); + #endif /* __VIR_SYSTEMD_H__ */ diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index e68b3ac..e6efebf 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -54,6 +54,18 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) return 0; } +static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) +{ + if (virSystemdTerminateMachine("demo", + "lxc", + true) < 0) { + fprintf(stderr, "%s", "Failed to terminate LXC machine\n"); + return -1; + } + + return 0; +} + static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { @@ -77,6 +89,18 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) return 0; } +static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) +{ + if (virSystemdTerminateMachine("demo", + "qemu", + false) < 0) { + fprintf(stderr, "%s", "Failed to terminate KVM machine\n"); + return -1; + } + + return 0; +} + static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { @@ -184,8 +208,12 @@ mymain(void) if (virtTestRun("Test create container ", 1, testCreateContainer, NULL) < 0) ret = -1; + if (virtTestRun("Test terminate container ", 1, testTerminateContainer, NULL) < 0) + ret = -1; if (virtTestRun("Test create machine ", 1, testCreateMachine, NULL) < 0) ret = -1; + if (virtTestRun("Test terminate machine ", 1, testTerminateMachine, NULL) < 0) + ret = -1; if (virtTestRun("Test create no systemd ", 1, testCreateNoSystemd, NULL) < 0) ret = -1; if (virtTestRun("Test create bad systemd ", 1, testCreateBadSystemd, NULL) < 0) -- 1.8.4

2 1

[libvirt] [PATCH v2] virsh-domain: Free dom before return false in cmdDump
by Hongwei Bi 30 Sep '13

30 Sep '13

--- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8538125..fa012d1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4488,7 +4488,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) - return false; + goto cleanup; if (vshCommandOptBool(cmd, "verbose")) verbose = true; -- 1.7.1

2 2

[libvirt] [PATCH v2] virsh-volume: Add missing check when calling virStreamNew
by Hongwei Bi 30 Sep '13

30 Sep '13

Check return value of virStreamNew when called by cmdVolUpload and cmdVolDownload. --- tools/virsh-volume.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 7dab532..0a66a6c 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -665,7 +665,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) { + vshError(ctl, _("cannot create a new stream")); + goto cleanup; + } + if (virStorageVolUpload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot upload to volume %s"), name); goto cleanup; @@ -775,7 +779,11 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) created = true; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) { + vshError(ctl, _("cannot create a new stream")); + goto cleanup; + } + if (virStorageVolDownload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot download from volume %s"), name); goto cleanup; -- 1.7.1

2 2

[libvirt] [PATCH v3 0/2] Libvirt Wireshark dissector
by Yuto KAWAMURA(kawamuray) 30 Sep '13

30 Sep '13

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Changes from version2: * Remove moduleinfo.h * Stop accessing internal XDR struct and just use free() Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector Makefile.am | 3 +- cfg.mk | 8 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 29 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/.gitignore | 4 + tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/packet-libvirt.c | 512 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1009 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 198 ++++++ 12 files changed, 2236 insertions(+), 6 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/.gitignore create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.1.5

2 3

[libvirt] [PATCH] virfile: safezero: align mmap offset to page size
by Oskari Saarenmaa 30 Sep '13

30 Sep '13

mmap's offset must be aligned to page size or mapping will fail. mmap-based safezero is only used if posix_fallocate isn't available. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- src/util/virfile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 20ca89f..16f8101 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1038,9 +1038,16 @@ safezero(int fd, off_t offset, off_t len) int safezero(int fd, off_t offset, off_t len) { + static long pagemask = 0; + off_t map_skip; int r; char *buf; + /* align offset and length, rounding offset down and length up */ + if (pagemask == 0) + pagemask = ~(sysconf(_SC_PAGESIZE) - 1); + map_skip = offset - (offset & pagemask); + /* memset wants the mmap'ed file to be present on disk so create a * sparse file */ @@ -1048,12 +1055,13 @@ safezero(int fd, off_t offset, off_t len) if (r < 0) return -1; - buf = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset); + buf = mmap(NULL, len + map_skip, PROT_READ | PROT_WRITE, MAP_SHARED, + fd, offset - map_skip); if (buf == MAP_FAILED) return -1; - memset(buf, 0, len); - munmap(buf, len); + memset(buf + map_skip, 0, len); + munmap(buf, len + map_skip); return 0; } -- 1.8.3.1

2 1

[libvirt] Patch to launch virt-sandbox-containers with correct label.
by Dan Walsh 30 Sep '13

30 Sep '13

[sandbox PATCH] virt-sandbox patch to launch containers with proper

3 4

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

30 Sep '13

>From 6c2de34432db674072231ad66c9e8a0a600ede8a Mon Sep 17 00:00:00 2001 From: WangYufei <james.wangyufei(a)huawei.com> Date: Mon, 30 Sep 2013 11:48:43 +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_driver.c | 6 ++++++ src/qemu/qemu_migration.c | 17 ++++++++++------- 4 files changed, 22 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_driver.c b/src/qemu/qemu_driver.c index e8bc04d..9437b5a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -688,6 +688,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; @@ -994,6 +999,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..82d90bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2493,7 +2493,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 +2520,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 +2578,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 +2600,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; } -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH v2 0/2] Libvirt Wireshark dissector
by Yuto KAWAMURA(kawamuray) 30 Sep '13

30 Sep '13

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector Makefile.am | 3 +- cfg.mk | 6 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 29 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/.gitignore | 4 + tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/moduleinfo.h | 37 + tools/wireshark/src/packet-libvirt.c | 513 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1010 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 199 ++++++ 13 files changed, 2275 insertions(+), 5 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/.gitignore create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/moduleinfo.h create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.1.5

3 5

[libvirt] qemu, numa: non-contiguous cpusets
by Borislav Petkov 30 Sep '13

30 Sep '13

Btw, while I got your attention, on a not-really related topic: how do we feel about adding support for specifying a non-contiguous set of cpus for a numa node in qemu with the -numa option? I.e., like this, for example: x86_64-softmmu/qemu-system-x86_64 -smp 8 -numa node,nodeid=0,cpus=0\;2\;4-5 -numa node,nodeid=1,cpus=1\;3\;6-7 The ';' needs to be escaped from the shell but I'm open for better suggestions. Here's a diff: --- diff --git a/vl.c b/vl.c index 4e709d5c1c20..82a6c8451fb0 100644 --- a/vl.c +++ b/vl.c @@ -1261,9 +1261,27 @@ char *get_boot_devices_list(size_t *size) return list; } +static int __numa_set_cpus(unsigned long *map, int start, int end) +{ + if (end >= MAX_CPUMASK_BITS) { + end = MAX_CPUMASK_BITS - 1; + fprintf(stderr, + "qemu: NUMA: A max of %d VCPUs are supported\n", + MAX_CPUMASK_BITS); + return -EINVAL; + } + + if (end < start) { + return -EINVAL; + } + + bitmap_set(map, start, end-start+1); + return 0; +} + static void numa_node_parse_cpus(int nodenr, const char *cpus) { - char *endptr; + char *endptr, *ptr = (char *)cpus; unsigned long long value, endvalue; /* Empty CPU range strings will be considered valid, they will simply @@ -1273,7 +1291,8 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) return; } - if (parse_uint(cpus, &value, &endptr, 10) < 0) { +fromthetop: + if (parse_uint(ptr, &value, &endptr, 10) < 0) { goto error; } if (*endptr == '-') { @@ -1282,22 +1301,22 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) } } else if (*endptr == '\0') { endvalue = value; - } else { - goto error; - } + } else if (*endptr == ';') { + if (__numa_set_cpus(node_cpumask[nodenr], value, value) < 0) { + goto error; + } + endptr++; + if (*endptr == '\0') + return; - if (endvalue >= MAX_CPUMASK_BITS) { - endvalue = MAX_CPUMASK_BITS - 1; - fprintf(stderr, - "qemu: NUMA: A max of %d VCPUs are supported\n", - MAX_CPUMASK_BITS); - } + ptr = endptr; - if (endvalue < value) { + goto fromthetop; + } else { goto error; } - bitmap_set(node_cpumask[nodenr], value, endvalue-value+1); + __numa_set_cpus(node_cpumask[nodenr], value, endvalue); return; error: -- Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. --

3 4

[libvirt] [PATCH] qemu: process: Silence coverity warning when rewinding log file
by Peter Krempa 30 Sep '13

30 Sep '13

The change in ef29de14c37d14abc546e90555a0093797facfdd that introduced better error logging from qemu introduced a warning from coverity about unused return value from lseek. Silence this warning and fix typo in the corresponding error message. Reported by: John Ferlan --- 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 d7be731..7a30a5e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1845,10 +1845,10 @@ cleanup: } len = strlen(buf); - /* best effor seek - we need to reset to the original position, so that + /* best effort seek - we need to reset to the original position, so that * a possible read of the fd in the monitor code doesn't influence this * error delivery option */ - lseek(logfd, pos, SEEK_SET); + ignore_value(lseek(logfd, pos, SEEK_SET)); qemuProcessReadLog(logfd, buf + len, buf_size - len - 1, 0, true); virReportError(VIR_ERR_INTERNAL_ERROR, _("process exited while connecting to monitor: %s"), -- 1.8.3.2

2 2

[libvirt] [PATCH 0/2] Python virNodeGetInfo mess
by Michal Privoznik 30 Sep '13

30 Sep '13

I'm proposing two contradictionary patches to fix the issue. Long story short, libvirt is mangling the memory size in pythong API binding where the size is reported in MiB instead of KiB: https://www.redhat.com/archives/libvirt-users/2013-September/msg00187.html Which approach do you like better? Michal Privoznik (2): python: Report nodeinfo's memory in KiB python: Document virNodeGetInfo bug python/libvirt-override-api.xml | 2 +- python/libvirt-override.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH v2] genprotocol.pl: Fix code on FreeBSD too
by Michal Privoznik 30 Sep '13

30 Sep '13

On some systems (linux, cygwin and gnukfreebsd) rpcgen generates files which when compiling produces this warning: remote/remote_protocol.c: In function 'xdr_remote_node_get_cpu_stats_ret': remote/remote_protocol.c:530: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Hence, on those systems we need to post-process the files by the rpc/genprotocol.pl perl script. At the beginning of the script the OS is detected via $^O perl variable. From my latest build on FreeBSD I see we need to fix the code there too. On FreeBSD the variable contains 'freebsd' string: http://perldoc.perl.org/perlport.html#PLATFORMS Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/genprotocol.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 4f8b6c4..6e6d6d4 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -43,7 +43,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd"; +my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd" || $^O eq "freebsd"; if ($mode eq "-c") { print TARGET "#include <config.h>\n"; -- 1.8.1.5

3 2

[libvirt] [PATCH] genprotocol.pl: Fix code on FreeBSD too
by Michal Privoznik 30 Sep '13

30 Sep '13

On some systems (linux, cygwin and freebsd) rpcgen generates files which when compiling produces this warning: remote/remote_protocol.c: In function 'xdr_remote_node_get_cpu_stats_ret': remote/remote_protocol.c:530: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Hence, on those systems we need to post-process the files by the rpc/genprotocol.pl perl script. At the beginning of the script the OS is detected via $^O perl variable. On FreeBSD it contains 'freebsd' string and not 'gnukfreebsd' as is currently there: http://perldoc.perl.org/perlport.html#PLATFORMS Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/genprotocol.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 4f8b6c4..abd40fd 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -43,7 +43,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd"; +my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "freebsd"; if ($mode eq "-c") { print TARGET "#include <config.h>\n"; -- 1.8.1.5

3 2

[libvirt] [PATCH]lxc: goto cleanup if lxcContainerBuildInitCmd returns NULL
by Chen Hanxiao 30 Sep '13

30 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We should goto cleanup directly if lxcContainerBuildInitCmd returns NULL, which would avoid lots of unnecessary works. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 3fdf397..f03f236 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1820,7 +1820,10 @@ static int lxcContainerChild(void *data) if ((hasReboot = lxcContainerHasReboot()) < 0) goto cleanup; - cmd = lxcContainerBuildInitCmd(vmDef); + if (!(cmd = lxcContainerBuildInitCmd(vmDef))) { + VIR_DEBUG("Failed to build init cmd for container"); + goto cleanup; + } virCommandWriteArgLog(cmd, 1); if (lxcContainerSetID(vmDef) < 0) -- 1.8.2.1

2 2

[libvirt] Openvswitch support question
by Vasiliy Tolstov 30 Sep '13

30 Sep '13

Hi all. I'm using vs witch and libvirt 1.2. I'm write vswitch controller and want to react on up/down port in virtual switch. All fork fine, but message sent to controller does not contain Mac address of added interface. Does this libvirt problem or this is only vswitch error?

2 2

[libvirt] [PATCH]lxc: do cleanup when failed to bind fs as read-only
by Chen Hanxiao 30 Sep '13

30 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We forgot to 'goto cleanup' when lxcContainerMountFSTmpfs failed to bind fs as read-only. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c60f5d8..3fdf397 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1451,6 +1451,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, virReportSystemError(errno, _("Failed to make directory %s readonly"), fs->dst); + goto cleanup; } } -- 1.8.2.1

2 2

[libvirt] [PATCH] storage: use btrfs file clone ioctl when possible
by Oskari Saarenmaa 30 Sep '13

30 Sep '13

Btrfs provides a copy-on-write clone ioctl so let's try to use it instead of copying files block by block. The ioctl is executed unconditionally if it's available and we fall back to block copying if it fails, similarly to cp --reflink=auto. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- configure.ac | 5 +++++ src/storage/storage_backend.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index 553015a..acae92e 100644 --- a/configure.ac +++ b/configure.ac @@ -1984,6 +1984,11 @@ fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"]) dnl +dnl check for headers for filesystem specific operations +dnl +AC_CHECK_HEADERS([linux/btrfs.h]) + +dnl dnl check for (ESX) dnl diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b7edf85..40bfb73 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -38,6 +38,9 @@ # include <sys/ioctl.h> # include <linux/fs.h> #endif +#ifdef HAVE_LINUX_BTRFS_H +# include <linux/btrfs.h> +#endif #if WITH_SELINUX # include <selinux/selinux.h> @@ -149,6 +152,13 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, goto cleanup; } +#ifdef HAVE_LINUX_BTRFS_H + /* try to perform a btrfs CoW clone */ + if (ioctl(fd, BTRFS_IOC_CLONE, inputfd) == 0) { + goto done; + } +#endif + #ifdef __linux__ if (ioctl(fd, BLKBSZGET, &wbytes) < 0) { wbytes = 0; @@ -210,6 +220,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } while ((amtleft -= interval) > 0); } +done: if (fdatasync(fd) < 0) { ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), -- 1.8.3.1

2 3

[libvirt] [PATCH] fix a ambiguous output of the command:'virsh vol-create-as'
by Hongwei Bi 30 Sep '13

30 Sep '13

I created a storage volume(eg: test) from a storage pool(eg:vg10) using the following command:"virsh vol-create-as --pool vg10 --name test --capacity 300M." When I re-executed the above command, the output was as the following: "error: Failed to create vol test error: Storage volume not found: storage vol 'test' already exists" I think the output "Storage volume not found" is not appropriate. Because in fact storage vol test has been found at this time. And then I think virErrorNumber should includes VIR_ERR_STORAGE_EXIST which can also be used elsewhere. So I make this patch. The result is as following: "error: Failed to create vol test error: storage volume 'test' exists already" --- include/libvirt/virterror.h | 1 + src/storage/storage_driver.c | 4 ++-- src/util/virerror.c | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index c1960c8..28ef30a 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -296,6 +296,7 @@ typedef enum { VIR_ERR_ACCESS_DENIED = 88, /* operation on the object/resource was denied */ VIR_ERR_DBUS_SERVICE = 89, /* error from a dbus service */ + VIR_ERR_STORAGE_EXIST = 90, /* the storage vol already exist */ } virErrorNumber; /** diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6c39284..aa5a144 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1538,8 +1538,8 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; if (virStorageVolDefFindByName(pool, voldef->name)) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("storage vol '%s' already exists"), voldef->name); + virReportError(VIR_ERR_STORAGE_EXIST, + _("'%s'"), voldef->name); goto cleanup; } diff --git a/src/util/virerror.c b/src/util/virerror.c index ca25678..35bb017 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1004,6 +1004,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("Storage volume not found: %s"); break; + case VIR_ERR_STORAGE_EXIST: + if (info == NULL) + errmsg = _("this storage volume exists already"); + else + errmsg = _("storage volume %s exists already"); + break; case VIR_ERR_STORAGE_PROBE_FAILED: if (info == NULL) errmsg = _("Storage pool probe failed"); -- 1.7.1

1 0

Re: [libvirt] [PATCH] add migration APIs to libxl driver
by Bamvor Jian Zhang 30 Sep '13

30 Sep '13

> --- > src/libxl/libxl_conf.h | 4 + > src/libxl/libxl_driver.c | 641 > ++++++++++++++++++++++++++++++++++++++++++++++ > src/libxl/libxl_driver.h | 5 + > 3 files changed, 650 insertions(+), 0 deletions(-) > > diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h > index 8ba0ee4..2041cc2 100644 > --- a/src/libxl/libxl_conf.h > +++ b/src/libxl/libxl_conf.h > @@ -41,6 +41,9 @@ > # define LIBXL_VNC_PORT_MIN 5900 > # define LIBXL_VNC_PORT_MAX 65535 > > +# define LIBXL_MIGRATION_PORT_MIN 49152 > +# define LIBXL_MIGRATION_PORT_MAX 49216 > + there is a overlap between vnc and migration port. althrought, it will try next port in virPortAllocatorAcquire after bind fail. > # define LIBXL_CONFIG_DIR SYSCONFDIR "/libvirt/libxl" > # define LIBXL_AUTOSTART_DIR LIBXL_CONFIG_DIR "/autostart" > # define LIBXL_STATE_DIR LOCALSTATEDIR "/run/libvirt/libxl" > @@ -109,6 +112,7 @@ struct _libxlDriverPrivate { > > /* Immutable pointer, self-locking APIs */ > virPortAllocatorPtr reservedVNCPorts; > + virPortAllocatorPtr reservedMigPorts; > > /* Immutable pointer, lockless APIs*/ > virSysinfoDefPtr hostsysinfo; > diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c > index e2a6d44..93b7153 100644 > --- a/src/libxl/libxl_driver.c > +++ b/src/libxl/libxl_driver.c > @@ -32,6 +32,12 @@ > #include <libxl_utils.h> > #include <fcntl.h> > #include <regex.h> > +#include <stdlib.h> > +#include <string.h> > +#include <sys/types.h> > +#include <sys/socket.h> > +#include <arpa/inet.h> > +#include <netdb.h> > > #include "internal.h" > #include "virlog.h" > @@ -52,6 +58,7 @@ > #include "virsysinfo.h" > #include "viraccessapicheck.h" > #include "viratomic.h" > +#include "rpc/virnetsocket.h" > > #define VIR_FROM_THIS VIR_FROM_LIBXL > > @@ -69,6 +76,20 @@ > > static libxlDriverPrivatePtr libxl_driver = NULL; > > +typedef struct _libxlMigrateReceiveArgs { > + virConnectPtr conn; > + virDomainObjPtr vm; > + > + /* for freeing listen sockets */ > + virNetSocketPtr *socks; > + size_t nsocks; > +} libxlMigrateReceiveArgs; > + > +static const char libxlMigrateReceiverReady[]= > + "libvirt libxl migration receiver ready, send binary domain data"; > +static const char libxlMigrateReceiverFinish[]= > + "domain received, ready to unpause"; > + > /* Function declarations */ > static int > libxlDomainManagedSaveLoad(virDomainObjPtr vm, > @@ -836,6 +857,12 @@ libxlStateInitialize(bool privileged, > LIBXL_VNC_PORT_MAX))) > goto error; > > + /* Allocate bitmap for migration port reservation */ > + if (!(libxl_driver->reservedMigPorts = > + virPortAllocatorNew(LIBXL_MIGRATION_PORT_MIN, > + LIBXL_MIGRATION_PORT_MAX))) > + goto error; > + > if (!(libxl_driver->domains = virDomainObjListNew())) > goto error; > > @@ -4175,11 +4202,620 @@ libxlConnectSupportsFeature(virConnectPtr conn, > int feature) > switch (feature) { > case VIR_DRV_FEATURE_TYPED_PARAM_STRING: > return 1; > + case VIR_DRV_FEATURE_MIGRATION_V3: > + return 1; > default: > return 0; > } > } > > +static int > +libxlCheckMessageBanner(int fd, const char *banner, int banner_sz) > +{ > + char buf[banner_sz]; > + int ret = 0; > + > + do { > + ret = saferead(fd, buf, banner_sz); > + } while (ret == -1 && errno == EAGAIN); > + > + if (ret != banner_sz || memcmp(buf, banner, banner_sz)) { > + return -1; > + } > + > + return 0; > +} > + > +static char * > +libxlDomainMigrateBegin3(virDomainPtr domain, > + const char *xmlin, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + unsigned long flags, > + const char *dname ATTRIBUTE_UNUSED, > + unsigned long resource ATTRIBUTE_UNUSED) > +{ > + libxlDriverPrivatePtr driver = domain->conn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainObjPtr vm; > + virDomainDefPtr def = NULL; > + char *xml = NULL; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); > + > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + if (!vm) { > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > + virUUIDFormat(domain->uuid, uuidstr); > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("no domain with matching uuid '%s'"), uuidstr); > + goto cleanup; > + } libxlDomObjFromDomain is introduced in commit 0d87fd0aa by Jim. > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, "%s", > + _("domain is not running")); > + goto cleanup; > + } > + > + if (virDomainMigrateBegin3EnsureACL(domain->conn, vm->def) < 0) > + goto cleanup; > + > + if (xmlin) { > + if (!(def = virDomainDefParseString(xmlin, cfg->caps, > + driver->xmlopt, > + 1 << VIR_DOMAIN_VIRT_XEN, > + VIR_DOMAIN_XML_INACTIVE))) > + goto cleanup; > + > + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); > + } else { > + xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); > + } > + > +cleanup: > + virDomainDefFree(def); > + if (vm) > + virObjectUnlock(vm); > + virObjectUnref(cfg); > + return xml; > +} > + > +static void > +doMigrateReceive(virNetSocketPtr sock, > + int events ATTRIBUTE_UNUSED, > + void *opaque) > +{ > + libxlMigrateReceiveArgs *data = opaque; > + virConnectPtr conn = data->conn; > + virDomainObjPtr vm = data->vm; > + virNetSocketPtr *socks = data->socks; > + size_t nsocks = data->nsocks; > + libxlDriverPrivatePtr driver = conn->privateData; > + virNetSocketPtr client_sock; > + int recv_fd; > + int len; > + size_t i; > + int ret; > + > + virNetSocketAccept(sock, &client_sock); > + if (client_sock == NULL) { > + virReportError(VIR_ERR_OPERATION_INVALID, "%s", > + _("Fail to accept migration connection")); > + goto cleanup; > + } > + VIR_DEBUG("Accepted migration\n"); > + recv_fd = virNetSocketDupFD(client_sock, true); > + virObjectUnref(client_sock); > + > + len = sizeof(libxlMigrateReceiverReady); > + if (safewrite(recv_fd, libxlMigrateReceiverReady, len) != len) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Failed to write libxlMigrateReceiverReady")); > + goto cleanup; > + } > + > + virObjectLock(vm); > + ret = libxlVmStart(driver, vm, false, recv_fd); > + virObjectUnlock(vm); > + > + if (ret < 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("Failed to restore domain with libxenlight")); > + if (!vm->persistent) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + goto cleanup; > + } > + > + len = sizeof(libxlMigrateReceiverFinish); > + if (safewrite(recv_fd, libxlMigrateReceiverFinish, len) != len) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Failed to write libxlMigrateReceiverFinish")); > + } > + > + /* Remove all listen socks from event handler, and close them. */ > + if (nsocks) { > + for (i = 0; i < nsocks; i++) { > + virNetSocketUpdateIOCallback(socks[i], 0); > + virNetSocketRemoveIOCallback(socks[i]); > + virNetSocketClose(socks[i]); > + virObjectUnref(socks[i]); > + } > + VIR_FREE(socks); > + } > + > +cleanup: > + VIR_FORCE_CLOSE(recv_fd); > + VIR_FREE(opaque); > + return; > +} > + > +static int > +doMigrateSend(libxlDriverPrivatePtr driver, > + virDomainObjPtr vm, > + unsigned long flags, > + int sockfd) > +{ > + libxlDomainObjPrivatePtr priv; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainEventPtr event = NULL; > + int live = 0; > + int ret = -1; > + > + if (flags & VIR_MIGRATE_LIVE) > + live = LIBXL_SUSPEND_LIVE; > + > + priv = vm->privateData; > + > + /* read fixed message from dest (ready to receive) */ > + if (libxlCheckMessageBanner(sockfd, libxlMigrateReceiverReady, > + sizeof(libxlMigrateReceiverReady))) > + goto cleanup; > + > + if (libxl_domain_suspend(priv->ctx, vm->def->id, sockfd, live, NULL) > != 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Failed to save domain '%d' with libxenlight"), > + vm->def->id); > + goto cleanup; > + } > + > + /* read fixed message from dest (receive completed) */ > + if (libxlCheckMessageBanner(sockfd, libxlMigrateReceiverFinish, > + sizeof(libxlMigrateReceiverFinish))) { > + if (libxl_domain_resume(priv->ctx, vm->def->id, 0, 0) != 0) { > + VIR_DEBUG("Failed to resume domain '%d' with libxenlight", > + vm->def->id); > + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, > + VIR_DOMAIN_PAUSED_MIGRATION); > + event = virDomainEventNewFromObj(vm, > VIR_DOMAIN_EVENT_SUSPENDED, > + > VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); > + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) > + goto cleanup; > + } > + goto cleanup; > + } > + > + ret = 0; > + > +cleanup: > + if (event) > + libxlDomainEventQueue(driver, event); > + virObjectUnref(cfg); > + return ret; > +} > + > +static int > +libxlDomainMigratePrepare3(virConnectPtr dconn, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + const char *uri_in, > + char **uri_out, > + unsigned long flags, > + const char *dname, > + unsigned long resource ATTRIBUTE_UNUSED, > + const char *dom_xml) > +{ > + libxlDriverPrivatePtr driver = dconn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainDefPtr def = NULL; > + virDomainObjPtr vm = NULL; > + char *hostname = NULL; > + unsigned short port; > + char portstr[100]; > + virURIPtr uri = NULL; > + virNetSocketPtr *socks = NULL; > + size_t nsocks = 0; > + int nsocks_listen = 0; > + libxlMigrateReceiveArgs *args; > + size_t i; > + int ret = -1; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); > + > + libxlDriverLock(driver); > + if (!dom_xml) { > + virReportError(VIR_ERR_OPERATION_INVALID, "%s", > + _("no domain XML passed")); > + goto cleanup; > + } > + def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt, > + 1 << VIR_DOMAIN_VIRT_XEN, > + VIR_DOMAIN_XML_INACTIVE); > + > + /* Target domain name, maybe renamed. */ > + if (dname) { > + if (VIR_STRDUP(def->name, dname) < 0) > + goto cleanup; > + } > + > + if (!(vm = virDomainObjListAdd(driver->domains, def, > + driver->xmlopt, > + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | > + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, > + NULL))) > + goto cleanup; > + > + def = NULL; > + > + if (virDomainMigratePrepare3EnsureACL(dconn, vm->def) < 0) > + goto cleanup; > + > + /* Create socket connection to receive migration data */ > + if (!uri_in) { > + hostname = virGetHostname(); > + if (hostname == NULL) > + goto cleanup; > + > + if (virPortAllocatorAcquire(driver->reservedMigPorts, &port) < 0) > + goto cleanup; > + > + if (port == 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + "%s", _("Unable to find an unused migrate > port")); > + goto cleanup; > + } > + > + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) > + goto cleanup; > + } else { > + if (!strstr(uri_in, "//")) { > + /* not full URI, add prefix tcp:// */ > + char *tmp; > + if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) > + goto cleanup; > + uri = virURIParse(tmp); > + VIR_FREE(tmp); > + } else { > + uri = virURIParse(uri_in); > + } > + > + if (uri == NULL) { > + virReportError(VIR_ERR_INVALID_ARG, > + _("unable to parse URI: %s"), > + uri_in); > + goto cleanup; > + } > + > + if (uri->server == NULL) { > + virReportError(VIR_ERR_INVALID_ARG, > + _("missing host in migration URI: %s"), > + uri_in); > + goto cleanup; > + } else { > + hostname = uri->server; > + } > + > + if (uri->port == 0) { > + if (virPortAllocatorAcquire(driver->reservedMigPorts, &port) < > 0) > + goto cleanup; > + > + if (port == 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("Unable to find an unused migrate port")); > + goto cleanup; > + } > + } else { > + port = uri->port; > + } > + > + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) > + goto cleanup; > + } > + > + snprintf(portstr, sizeof(portstr), "%d", port); > + > + if (virNetSocketNewListenTCP(hostname, portstr, &socks, &nsocks) < 0) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Fail to create socket for incoming migration")); > + goto cleanup; > + } > + > + if (VIR_ALLOC(args) < 0) > + goto cleanup; > + > + args->conn = dconn; > + args->vm = vm; > + args->socks = socks; > + args->nsocks = nsocks; > + > + for (i = 0 ; i < nsocks ; i++) { > + if (virNetSocketSetBlocking(socks[i], true) < 0) > + continue; > + if (virNetSocketListen(socks[i], 1) < 0) > + continue; > + > + if (virNetSocketAddIOCallback(socks[i], > + 0, > + doMigrateReceive, > + args, > + NULL) < 0) { > + continue; > + } > + > + virNetSocketUpdateIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE); > + nsocks_listen ++; > + } > + > + if (!nsocks_listen) > + goto cleanup; > + > + ret = 0; > + goto end; > + > +cleanup: > + if (nsocks) { > + for (i = 0 ; i < nsocks ; i++) { > + virNetSocketClose(socks[i]); > + virObjectUnref(socks[i]); > + } > + VIR_FREE(socks); > + } > + > +end: > + virURIFree(uri); > + if (vm) > + virObjectUnlock(vm); > + virObjectUnref(cfg); > + libxlDriverUnlock(driver); > + return ret; > +} > + > +static int > +libxlDomainMigratePerform3(virDomainPtr dom, > + const char *xmlin ATTRIBUTE_UNUSED, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + const char *dconnuri ATTRIBUTE_UNUSED, > + const char *uri, > + unsigned long flags, > + const char *dname ATTRIBUTE_UNUSED, > + unsigned long resource ATTRIBUTE_UNUSED) > +{ > + libxlDriverPrivatePtr driver = dom->conn->privateData; > + virDomainObjPtr vm; > + char *hostname = NULL; > + unsigned short port = 0; > + char portstr[100]; > + virURIPtr uri_p = NULL; > + virNetSocketPtr sock; > + int sockfd = -1; > + int saved_errno = EINVAL; > + int ret = -1; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); > + > + vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); > + if (!vm) { > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > + virUUIDFormat(dom->uuid, uuidstr); > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("no domain with matching uuid '%s'"), uuidstr); > + goto cleanup; > + } same here. > + > + if (virDomainMigratePerform3EnsureACL(dom->conn, vm->def) < 0) > + goto cleanup; > + > + /* parse dst host:port from uri */ > + uri_p = virURIParse(uri); > + if (uri_p == NULL || uri_p->server == NULL || uri_p->port == 0) > + goto cleanup; > + > + hostname = uri_p->server; > + port = uri_p->port; > + snprintf(portstr, sizeof(portstr), "%d", port); > + > + /* socket connect to dst host:port */ > + if (virNetSocketNewConnectTCP(hostname, portstr, &sock) < 0) { > + virReportSystemError(saved_errno, > + _("unable to connect to '%s:%s'"), > + hostname, portstr); > + goto cleanup; > + } > + > + if (virNetSocketSetBlocking(sock, true) < 0) { > + virObjectUnref(sock); > + goto cleanup; > + } > + > + sockfd = virNetSocketDupFD(sock, true); > + virObjectUnref(sock); > + > + /* suspend vm and send saved data to dst through socket fd */ > + ret = doMigrateSend(driver, vm, flags, sockfd); > + > +cleanup: > + VIR_FORCE_CLOSE(sockfd); > + virURIFree(uri_p); > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static virDomainPtr > +libxlDomainMigrateFinish3(virConnectPtr dconn, > + const char *dname, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + const char *dconnuri ATTRIBUTE_UNUSED, > + const char *uri, > + unsigned long flags, > + int cancelled) > +{ > + libxlDriverPrivatePtr driver = dconn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + unsigned short port = 0; > + virURIPtr uri_p = NULL; > + virDomainObjPtr vm = NULL; > + virDomainPtr dom = NULL; > + libxlDomainObjPrivatePtr priv; > + virDomainEventPtr event = NULL; > + int rc; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); > + > + uri_p = virURIParse(uri); > + if (uri_p == NULL || uri_p->port == 0) > + VIR_DEBUG("Fail to parse port from URI"); > + port = uri_p->port; > + if (LIBXL_MIGRATION_PORT_MIN <= port && port < > LIBXL_MIGRATION_PORT_MAX) { > + if (virPortAllocatorRelease(driver->reservedMigPorts, port) < 0) > + VIR_DEBUG("Could not mark port %d as unused", port); > + } > + > + vm = virDomainObjListFindByName(driver->domains, dname); > + if (!vm) > + goto cleanup; > + > + if (virDomainMigrateFinish3EnsureACL(dconn, vm->def) < 0) > + goto cleanup; > + > + if (!cancelled) { > + if (!(flags & VIR_MIGRATE_PAUSED)) { > + priv = vm->privateData; > + rc = libxl_domain_unpause(priv->ctx, vm->def->id); > + if (rc) { > + virReportError(VIR_ERR_OPERATION_FAILED, "%s", > + _("Failed to unpause domain")); > + goto error; > + } > + > + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, > VIR_DOMAIN_RUNNING_BOOTED); > + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) > + goto error; > + } > + > + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); > + goto cleanup; > + } > + > +error: > + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED)) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Failed to destroy domain '%d'"), vm->def->id); > + goto cleanup; > + } > + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, > + VIR_DOMAIN_EVENT_STOPPED_SAVED); > + if (!vm->persistent) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + > +cleanup: > + virURIFree(uri_p); > + if (vm) > + virObjectUnlock(vm); > + if (event) > + libxlDomainEventQueue(driver, event); > + virObjectUnref(cfg); > + return dom; > +} > + > +static int > +libxlDomainMigrateConfirm3(virDomainPtr domain, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + unsigned long flags, > + int cancelled) > +{ > + libxlDriverPrivatePtr driver = domain->conn->privateData; > + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); > + virDomainObjPtr vm; > + libxlDomainObjPrivatePtr priv; > + virDomainEventPtr event = NULL; > + int ret = -1; > + > + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); > + > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + if (!vm) { > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > + virUUIDFormat(domain->uuid, uuidstr); > + virReportError(VIR_ERR_NO_DOMAIN, > + _("no domain with matching uuid '%s'"), uuidstr); > + goto cleanup; > + } here. > + > + if (virDomainMigrateConfirm3EnsureACL(domain->conn, vm->def) < 0) > + goto cleanup; > + > + if (cancelled) { > + priv = vm->privateData; > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("migration failed, try to resume on our end")); > + if (!libxl_domain_resume(priv->ctx, vm->def->id, 0, 0)) { > + ret = 0; > + } else { > + VIR_DEBUG("Failed to resume domain '%d' with libxenlight", > + vm->def->id); > + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, > VIR_DOMAIN_PAUSED_MIGRATION); > + event = virDomainEventNewFromObj(vm, > VIR_DOMAIN_EVENT_SUSPENDED, > + > VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); > + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) > + goto cleanup; > + } > + > + goto cleanup; > + } > + > + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED)) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Failed to destroy domain '%d'"), vm->def->id); > + goto cleanup; > + } > + > + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, > + VIR_DOMAIN_EVENT_STOPPED_SAVED); > + > + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) > + virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); > + > + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + > + VIR_DEBUG("Migration successful.\n"); > + ret = 0; > + > +cleanup: > + if (vm) > + virObjectUnlock(vm); > + if (event) > + libxlDomainEventQueue(driver, event); > + virObjectUnref(cfg); > + return ret; > +} > + > > static virDriver libxlDriver = { > .no = VIR_DRV_LIBXL, > @@ -4249,6 +4885,11 @@ static virDriver libxlDriver = { > #ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY > .domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */ > #endif > + .domainMigrateBegin3 = libxlDomainMigrateBegin3, /* 1.1.3 */ > + .domainMigratePrepare3 = libxlDomainMigratePrepare3, /* 1.1.3 */ > + .domainMigratePerform3 = libxlDomainMigratePerform3, /* 1.1.3 */ > + .domainMigrateFinish3 = libxlDomainMigrateFinish3, /* 1.1.3 */ > + .domainMigrateConfirm3 = libxlDomainMigrateConfirm3, /* 1.1.3 */ > .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ > .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ > .connectDomainEventRegister = libxlConnectDomainEventRegister, /* > 0.9.0 */ > diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h > index a33d60c..25ac2b8 100644 > --- a/src/libxl/libxl_driver.h > +++ b/src/libxl/libxl_driver.h > @@ -24,6 +24,11 @@ > #ifndef LIBXL_DRIVER_H > # define LIBXL_DRIVER_H > > +# define LIBXL_MIGRATION_FLAGS \ > + (VIR_MIGRATE_LIVE | \ > + VIR_MIGRATE_UNDEFINE_SOURCE | \ > + VIR_MIGRATE_PAUSED) > + > int libxlRegister(void); > > #endif /* LIBXL_DRIVER_H */ > -- > 1.6.0.2 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] [PATCH] virsh-volume: Add missing check when calling virStreamNew
by Hongwei Bi 30 Sep '13

30 Sep '13

Check return value of virStreamNew when called by cmdVolUpload and cmdVolDownload. --- tools/virsh-volume.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 7dab532..e8b0d9a 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -665,7 +665,9 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; + if (virStorageVolUpload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot upload to volume %s"), name); goto cleanup; @@ -775,7 +777,9 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) created = true; } - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; + if (virStorageVolDownload(vol, st, offset, length, 0) < 0) { vshError(ctl, _("cannot download from volume %s"), name); goto cleanup; -- 1.7.1

2 2

[libvirt] libvirt: How to boot VM in esx?
by varun bhatnagar 29 Sep '13

29 Sep '13

Hi, Im not able to boot my VM on esx hypervisor using libvirt. It says NO Operating System found. Can anyone help? Regards, Varun

1 1

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1531
by Jenkins CI 29 Sep '13

29 Sep '13

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1531/> ------------------------------------------ Started by upstream project "libvirt-build" build number 1700 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson4053703831105800586.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.48 GFDL_version TAB_in_indentation src/vmware/vmware_driver.c:163: break; src/vmware/vmware_driver.c:164: } maint.mk: indent with space, not TAB, in C, sh, html, py, syms and RNG schemas make: *** [sc_TAB_in_indentation] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCHv3 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 29 Sep '13

29 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- change from v2: * No change change from v1: * Added default case so we don't potentially pass NULL to virCommand --- src/vmware/vmware_conf.c | 28 +++++++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..c11c92d 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,30 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid driver type for version detection")); + goto cleanup; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +296,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

4 7

[libvirt] [PATCH] build: fix build --without-lxc
by Eric Blake 28 Sep '13

28 Sep '13

'make distcheck' fails from a directory configured --without-lxc: GEN virt-login-shell.1 Can't write-open ../../tools/virt-login-shell.1: Permission denied at /usr/bin/pod2man line 69. * tools/Makefile.am (EXTRA_DIST): Ship pre-built man page. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0193140..1d9892c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -84,7 +84,9 @@ dist_man1_MANS = \ virsh.1 if WITH_LXC dist_man1_MANS += virt-login-shell.1 -endif WITH_LXC +else ! WITH_LXC +EXTRA_DIST += virt-login-shell.1 +endif ! WITH_LXC if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif WITH_SANLOCK -- 1.8.3.1

1 1

[libvirt] [PATCH] build: tweak vpath builds of net_rpc
by Eric Blake 28 Sep '13

28 Sep '13

Another case missed by commits 716c7bb and 6973e02. * src/Makefile.am (VIR_NET_RPC_GENERATED): Drop $(srcdir). (libvirt_net_rpc_la_SOURCES): List generated files more compactly. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2b4549e..8632b18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2194,19 +2194,18 @@ EXTRA_DIST += \ rpc/virkeepaliveprotocol.x VIR_NET_RPC_GENERATED = \ - $(srcdir)/rpc/virnetprotocol.h \ - $(srcdir)/rpc/virnetprotocol.c \ - $(srcdir)/rpc/virkeepaliveprotocol.h \ - $(srcdir)/rpc/virkeepaliveprotocol.c + rpc/virnetprotocol.h \ + rpc/virnetprotocol.c \ + rpc/virkeepaliveprotocol.h \ + rpc/virkeepaliveprotocol.c BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) libvirt_net_rpc_la_SOURCES = \ rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetprotocol.h rpc/virnetprotocol.c \ rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c \ - rpc/virkeepalive.h rpc/virkeepalive.c + rpc/virkeepalive.h rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) if WITH_SSH2 libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -- 1.8.3.1

1 0

[libvirt] [PATCHv2 0/4] Improve passthrough of early errors from qemu log
by Peter Krempa 27 Sep '13

27 Sep '13

Version 2 fixed according to review feedback of Jan. Peter Krempa (4): qemu_process: Make qemuProcessReadLog() more versatile and reusable qemu: monitor: Add infrastructure to access VM logs for better err msgs qemu: monitor: Produce better errors on monitor hangup qemu: Wire up better early error reporting src/qemu/qemu_monitor.c | 93 +++++++++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_process.c | 54 +++++++++++++++++++--------- src/qemu/qemu_process.h | 2 ++ 4 files changed, 129 insertions(+), 22 deletions(-) -- 1.8.3.2

3 7

Re: [libvirt] [PATCH] virsh: Fix domdisplay when domain only uses TLS
by Martin Kletzander 27 Sep '13

27 Sep '13

On Fri, Sep 27, 2013 at 05:43:50PM +0200, Christophe Fergeau wrote: > Hey Martin, > > Your reply wasn't sent to the mailing list, I'm assuming this was > unintentional. > Yes, sorry, that happened to me with 2 ACKs today :-( > On Fri, Sep 27, 2013 at 12:08:27PM +0200, Martin Kletzander wrote: > > On Wed, Sep 25, 2013 at 05:59:54PM +0200, Christophe Fergeau wrote: > > > It's possible to create a domain which will only use a TLS port > > > and will not have a non-TLS port set by using: > > > <graphics type='spice' autoport='yes' defaultMode='secure'/> > > > In such a setup, the 'graphics' node for the running domain will be: > > > <graphics type='spice' tlsPort='5900' > > > autoport='yes' listen='127.0.0.1' > > > defaultMode='secure'> > > > > > > However, cmdDomDisplay loops over all the 'graphics' node, and it > > > ignores nodes which don't have a 'port' attribute. This means > > > 'virsh domdisplay' will only return an empty string for domains > > > as the one above. > > > > > > This commit looks for both 'port' and 'tlsPort' before deciding > > > to ignore a graphics node. It also makes sure 'port' is not printed > > > when it's not set. > > > This makes 'virsh domdisplay' return > > > 'spice://127.0.0.1?tls-port=5900' for domains using only a TLS > > > port. > > > > > > Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> > > > --- > > > tools/virsh-domain.c | 28 ++++++++++++++++------------ > > > 1 file changed, 16 insertions(+), 12 deletions(-) > > > > > > > ACK and OK for this release. > > Thanks, I've pushed this to master. > > This patch would also be a good candidate for the stable branch, is there > some process to follow to get it in there? > IIRC, either let Cole know or, if you have the rights, feel free to just back-port it when it is a bug (which this is). Martin

1 0

[libvirt] [PATCH v2] fchosttest: Run the test only under linux
by Michal Privoznik 27 Sep '13

27 Sep '13

Currently, we have functions to handle fc_host implemented just for linux. On all other platforms an error is thrown. It makes no sense to run the test on those platforms then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1a7ff4b..17a2a72 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -129,9 +129,12 @@ test_programs = virshtest sockettest \ virportallocatortest \ sysinfotest \ virstoragetest \ - fchosttest \ $(NULL) +if WITH_LINUX +test_programs += fchosttest +endif WITH_LINUX + if WITH_LIBVIRTD test_programs += fdstreamtest endif WITH_LIBVIRTD @@ -845,10 +848,15 @@ fdstreamtest_SOURCES = \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD = $(LDADDS) +if WITH_LINUX fchosttest_SOURCES = \ fchosttest.c testutils.h testutils.c fchosttest_LDADD = $(LDADDS) +else ! WITH_LINUX +EXTRA_DIST += fchosttest.c +endif ! WITH_LINUX + if WITH_CIL CILOPTFLAGS = CILOPTINCS = -- 1.8.1.5

2 1

[libvirt] [PATCH] Makefile.am: Always include rule to make org.libvirt.api.policy
by Michal Privoznik 27 Sep '13

27 Sep '13

When running 'make dist' on a system without policykit, we currently fail. This is because $(srcdir)/access/org.libvirt.api.policy is in EXTRA_DIST, however, the rule to generate the file is conditional whether we build with polkit or not. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 09311b7..2b4549e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1519,6 +1519,10 @@ libvirt_driver_access_la_LIBADD = EXTRA_DIST += access/genpolkit.pl +$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ + $(srcdir)/access/genpolkit.pl Makefile.am + $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ + if WITH_POLKIT1 libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) @@ -1527,10 +1531,6 @@ if WITH_LIBVIRTD polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) endif WITH_LIBVIRTD -$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ - $(srcdir)/access/genpolkit.pl Makefile.am - $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ - CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) else ! WITH_POLKIT1 -- 1.8.1.5

2 1

[libvirt] [PATCH 1/3] BSD: Ensure UNIX socket credentials are valid
by Doug Goldstein 27 Sep '13

27 Sep '13

Ensure that the socket credentials we got back on BSD are valid before using them. --- src/rpc/virnetsocket.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b311aae..49c6ddc 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1166,6 +1166,18 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return -1; } + if (cr.cr_version != XUCRED_VERSION) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Failed to get valid client socket identity")); + return -1; + } + + if (cr.cr_ngroups == 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Failed to get valid client socket identity groups")); + return -1; + } + *pid = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; -- 1.8.1.5

2 7

[libvirt] [PATCH 00/17] Many OOM fixes
by Daniel P. Berrange 27 Sep '13

27 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series fixes a large number of problems in OOM codepaths. These are primarily memory leaks, but there's one crash in Xen parsing code and a few places which silently ignore failure leading to corrupt or malformed output. Daniel P. Berrange (17): Fix leak in virDomainVcpuPinDefArrayFree Avoid leak if virDomainSoundCodecDefParseXML return error Fix leak in virDomainVcpuPinDefParseXML parsing cpumask Fix leak in virDomainDefParseXML parsing vcpupin Fix leak of address string in qemuDomainPCIAddressGetNextSlot Avoid leak in qemuParseRBDString on failure of qemuAddRBDHost Fix failure to honour OOM status in qemuParseNBDString Fix leak on OOM in qemuBuildCommandLine dealing with sound card Fix leak in qemuParseCommandLineDisk on OOM Fix missing jump to error cleanup in qemuParseCommandLineDisk Fix leak in qemuStringToArgvEnv upon OOM Fix leak in qemuParseCommandLine on OOM Fix leak of command line args in qemuParseCommandLine Fix leak of char device in xenParseXM Fix crash on OOM in xenParseXM handling consoles Fix broken formatting on OOM in xenFormatXM Fix leak of serial value in xenFormatXM on OOM src/conf/domain_conf.c | 16 +++++++++----- src/qemu/qemu_command.c | 56 ++++++++++++++++++++++++++++--------------------- src/qemu/qemu_conf.c | 18 ++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 15 +------------ src/xenxs/xen_xm.c | 12 +++++++---- 6 files changed, 72 insertions(+), 47 deletions(-) -- 1.8.3.1

3 36

[libvirt] [PATCH] LXC: workaround machined uncleaned data with containers running systemd.
by Cédric Bosdonnat 27 Sep '13

27 Sep '13

The problem is described by [0] but its effect on libvirt is that starting a container with a full distro running systemd after having stopped it simply fails. The container cleanup now calls the machined Terminate function to make sure that everything is in order for the next run. [0]: https://bugs.freedesktop.org/show_bug.cgi?id=68370 --- src/Makefile.am | 4 +++- src/lxc/lxc_process.c | 8 ++++++++ src/util/virsystemd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 4 ++++ 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4375ef7..211b42e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1170,7 +1170,9 @@ EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ if WITH_LXC noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la libvirt_driver_lxc_la_SOURCES = -libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la +libvirt_driver_lxc_la_LIBADD = \ + libvirt_driver_lxc_impl.la \ + libvirt_util.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_lxc.la libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..f92c613 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "viratomic.h" #include "virprocess.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -210,6 +211,13 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virCgroupFree(&priv->cgroup); } + /* Get machined to terminate the machine as it may not have cleaned it + * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for + * the bug we are working around here. + */ + virSystemdTerminateMachine(vm->def->name, "lxc", true); + + /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e72b7f0..3320e53 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -242,3 +242,58 @@ cleanup: VIR_FREE(slicename); return ret; } + +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged) +{ + int ret; + DBusConnection *conn; + char *machinename = NULL; + char *username = NULL; + + ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); + if (ret < 0) + return ret; + + conn = virDBusGetSystemBus(); + + ret = -1; + if (privileged) { + if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) + goto cleanup; + } else { + if (!(username = virGetUserName(geteuid()))) + goto cleanup; + if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) + goto cleanup; + } + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * TerminateMachine(in s name); + * + * @name a host unique name for the machine. shows up + * in 'ps' listing & similar + */ + + VIR_DEBUG("Attempting to terminate machine via systemd"); + if (virDBusCallMethod(conn, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "TerminateMachine", + "s", + machinename) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(username); + VIR_FREE(machinename); + return ret; +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 414ae5a..6c9c6df 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -38,4 +38,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, const char *partition); +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4

2 1

[libvirt] [PATCH] fchosttest: Run the test only under linux
by Michal Privoznik 27 Sep '13

27 Sep '13

Currently, we have functions to handle fc_host implemented just for linux. On all other platforms an error is thrown. It makes no sense to run the test on those platforms then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/fchosttest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 05ff20b..46bd784 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -163,6 +163,11 @@ mymain(void) { int ret = 0; +#ifndef __linux__ + fputs("Not compiled under linux, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + if (virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/") < 0) { ret = -1; -- 1.8.1.5

3 2

[libvirt] [PATCH 0/2] Fix a few memory leaks in libvirtd
by Jiri Denemark 27 Sep '13

27 Sep '13

Jiri Denemark (2): qemu: Don't leak reference to virQEMUDriverConfigPtr qemu: Free all driver data in qemuStateCleanup src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_process.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 1.8.3.2

2 4

[libvirt] [PATCH] build: Fix VPATH build error for locking daemon
by Viktor Mihajlovski 27 Sep '13

27 Sep '13

Removed superfluous/wrong srcdir prefix. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4057eda..09311b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -196,7 +196,7 @@ BUILT_SOURCES += $(LOCK_PROTOCOL_GENERATED) MAINTAINERCLEANFILES += $(LOCK_PROTOCOL_GENERATED) LOCK_DAEMON_GENERATED = \ - $(srcdir)/locking/lock_daemon_dispatch_stubs.h + locking/lock_daemon_dispatch_stubs.h $(NULL) BUILT_SOURCES += $(LOCK_DAEMON_GENERATED) -- 1.7.9.5

2 1

[libvirt] [PATCH]lxc: don't start container when no root fs found
by Chen Hanxiao 27 Sep '13

27 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Currently, if we don't explicitly add root fs for container, libvirt will add one for us implicitly with "/" as src. It would be not safe. Unless user asked for it, we should not assume this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..4f4a906 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -911,29 +911,14 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) { virDomainFSDefPtr root = virDomainGetRootFilesystem(vm->def); - if (root) + if (root) { return 0; - - if (VIR_ALLOC(root) < 0) - goto error; - - root->type = VIR_DOMAIN_FS_TYPE_MOUNT; - - if (VIR_STRDUP(root->src, "/") < 0 || - VIR_STRDUP(root->dst, "/") < 0) - goto error; - - if (VIR_INSERT_ELEMENT(vm->def->fss, - 0, - vm->def->nfss, - root) < 0) - goto error; - - return 0; - -error: - virDomainFSDefFree(root); - return -1; + } else { + errno = EINVAL; + virReportSystemError(errno, "%s", + _("No root fs found for container")); + return -1; + } } /** -- 1.8.2.1

2 2

[libvirt] [PATCHv2] util: recognize SMB/CIFS filesystems as shared
by Laine Stump 27 Sep '13

27 Sep '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=1012085 libvirt previously recognized NFS, GFS2, OCFS2, and AFS filesystems as "shared", and thus eligible for exceptions to certain rules/actions about chowning image files before handing them off to a guest. This patch widens the definition of "shared filesystem" to include SMB and CIFS filesystems (aka "Windows file sharing"); both of these use the same protocol, but different drivers so there are different magic numbers for each. --- Change from V1 - also check for CIFS_SUPER_MAGIC, not just SMB_SUPER_MAGIC. src/util/virstoragefile.c | 16 +++++++++++++++- src/util/virstoragefile.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 0b9cec3..48d5fbb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1241,6 +1241,12 @@ cleanup: # ifndef AFS_FS_MAGIC # define AFS_FS_MAGIC 0x6B414653 # endif +# ifndef SMB_SUPER_MAGIC +# define SMB_SUPER_MAGIC 0x517B +# endif +# ifndef CIFS_SUPER_MAGIC +# define CIFS_SUPER_MAGIC 0xFF534D42 +# endif int virStorageFileIsSharedFSType(const char *path, @@ -1304,6 +1310,12 @@ int virStorageFileIsSharedFSType(const char *path, if ((fstypes & VIR_STORAGE_FILE_SHFS_AFS) && (sb.f_type == AFS_FS_MAGIC)) return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_SMB) && + (sb.f_type == SMB_SUPER_MAGIC)) + return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_CIFS) && + (sb.f_type == CIFS_SUPER_MAGIC)) + return 1; return 0; } @@ -1322,7 +1334,9 @@ int virStorageFileIsSharedFS(const char *path) VIR_STORAGE_FILE_SHFS_NFS | VIR_STORAGE_FILE_SHFS_GFS2 | VIR_STORAGE_FILE_SHFS_OCFS | - VIR_STORAGE_FILE_SHFS_AFS); + VIR_STORAGE_FILE_SHFS_AFS | + VIR_STORAGE_FILE_SHFS_SMB | + VIR_STORAGE_FILE_SHFS_CIFS); } int virStorageFileIsClusterFS(const char *path) diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f89839..d5effa4 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -112,6 +112,8 @@ enum { VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), VIR_STORAGE_FILE_SHFS_OCFS = (1 << 2), VIR_STORAGE_FILE_SHFS_AFS = (1 << 3), + VIR_STORAGE_FILE_SHFS_SMB = (1 << 4), + VIR_STORAGE_FILE_SHFS_CIFS = (1 << 5), }; int virStorageFileIsSharedFS(const char *path); -- 1.7.11.7

2 1

[libvirt] [PATCH] build: fix testsuite building under cygwin
by Eric Blake 27 Sep '13

27 Sep '13

Similar to commit 8f34f19. * tests/Makefile.am (virnetserverclienttest_CFLAGS): Add XDR_CFLAGS. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 777758f..1a7ff4b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -639,6 +639,7 @@ virnetsockettest_LDADD = $(LDADDS) virnetserverclienttest_SOURCES = \ virnetserverclienttest.c \ testutils.h testutils.c +virnetserverclienttest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) virnetserverclienttest_LDADD = $(LDADDS) virnetserverclientmock_la_SOURCES = \ -- 1.8.3.1

1 0

[libvirt] [PATCH] rpc: Increase bound limit for virDomainGetJobStats
by Jiri Denemark 27 Sep '13

27 Sep '13

https://bugzilla.redhat.com/show_bug.cgi?id=1012818 Commit 6d7d0b1869ed293e3208d11f375cecea0129dfc5 (in 1.1.2) added bounds checking to virDomainGetJobStats. But even at that time the API was able to return 20 parameters while the limit was set to 16. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 8d17bad..810eeca 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -230,7 +230,7 @@ const REMOTE_NODE_MEMORY_PARAMETERS_MAX = 64; const REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX = 64; /* Upper limit on number of job stats */ -const REMOTE_DOMAIN_JOB_STATS_MAX = 16; +const REMOTE_DOMAIN_JOB_STATS_MAX = 64; /* Upper limit on number of CPU models */ const REMOTE_CONNECT_CPU_MODELS_MAX = 8192; -- 1.8.3.2

2 2

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

27 Sep '13

From: WangYufei <james.wangyufei(a)huawei.com> Date: Fri, 27 Sep 2013 11:53:57 +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 change the port increase to atomic operation to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_migration.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..0f496f4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -57,6 +57,7 @@ #include "virhook.h" #include "virstring.h" #include "virtypedparam.h" +#include "viratomic.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -2521,7 +2522,7 @@ 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++; + this_port = QEMUD_MIGRATION_FIRST_PORT + virAtomicIntInc(&port); if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ @@ -2578,7 +2579,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + this_port = QEMUD_MIGRATION_FIRST_PORT + virAtomicIntInc(&port); if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

3 3

[libvirt] [libvirt-designer 1/2] Fix typo in error message
by Christophe Fergeau 27 Sep '13

27 Sep '13

--- Pushed under the trivial rule libvirt-designer/libvirt-designer-main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 5e82f8a..9341754 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -21,7 +21,7 @@ */ #if !defined(__LIBVIRT_DESIGNER_H__) && !defined(LIBVIRT_DESIGNER_BUILD) -#error "Only <libvirt-gdesigner/libvirt-gdesigner.h> can be included directly." +#error "Only <libvirt-designer/libvirt-designer.h> can be included directly." #endif #include <osinfo/osinfo.h> -- 1.8.3.1

2 2

[libvirt] [PATCH]LXC: fix a comment typo in lxc_controller.c
by Chen Hanxiao 27 Sep '13

27 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> LXC: fix a comment typo in lxc_controller.c Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ed73ab0..636cf6e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2011,7 +2011,7 @@ virLXCControllerEventSend(virLXCControllerPtr ctrl, virNetMessagePtr msg; if (!ctrl->client) { - VIR_WARN("Dropping event %d becuase libvirtd is not connected", procnr); + VIR_WARN("Dropping event %d because libvirtd is not connected", procnr); return; } -- 1.8.2.1

2 1

[libvirt] [PATCH] build: fix use of rpc.h on cygwin
by Eric Blake 27 Sep '13

27 Sep '13

Caused by commit 012c25e8 splitting out a convenience library. CC libvirtd_conf_la-libvirtd-config.lo In file included from ../src/rpc/virnetmessage.h:24:0, from ../src/rpc/virnetserverprogram.h:27, from ../src/rpc/virnetserver.h:32, from libvirtd-config.c:31: ../src/rpc/virnetprotocol.h:9:21: fatal error: rpc/rpc.h: No such file or directory * daemon/Makefile.am (libvirtd_conf_la_CFLAGS): Add XDR_CFLAGS. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule (well, I will once libvirt.org is responsive again - it's been having problems with the git server today) daemon/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index eb58de9..46c766c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -100,6 +100,7 @@ noinst_LTLIBRARIES = libvirtd_conf.la libvirtd_conf_la_SOURCES = $(LIBVIRTD_CONF_SOURCES) libvirtd_conf_la_CFLAGS = \ $(LIBXML_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) -- 1.8.3.1

1 0

[libvirt] [PATCH]LXC: free dst before lxcDomainAttachDeviceDiskLive return
by Chen Hanxiao 26 Sep '13

26 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> free dst before lxcDomainAttachDeviceDiskLive return Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9c58f67..7906ad1 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3053,6 +3053,7 @@ cleanup: virDomainAuditDisk(vm, NULL, def->src, "attach", ret == 0); if (dst && created && ret < 0) unlink(dst); + VIR_FREE(dst); return ret; } -- 1.8.2.1

5 5

[libvirt] Is it possible to attach a harddisk to an ESX node
by varun bhatnagar 26 Sep '13

26 Sep '13

Hi, Is it possible to attach a harddisk to an ESX node later after creating/defining it? If yes, can anyone tell me how to do it? Regards, Varun

2 2

[libvirt] [PATCH 0/3] qemu: Hotplug SCSI controllers/hostdevs
by Eric Farman 26 Sep '13

26 Sep '13

Today, hotplug of a SCSI hostdev relies on the presence of an existing SCSI controller, which can be defined in the initial domain XML. Hotplug of a SCSI controller relies on the presence of a PCI bus, which does not work in all environments. These patches correct this behavior, in order to allow hotplug (and unplug) work without incident. Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Eric Farman (3): qemu: Rename controller hotplug functions to not be PCI-specific qemu: Separate calls based on controller bus type qemu: Auto-generate controller for hotplugged hostdev src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_hotplug.c | 62 ++++++++++++++++++++++++++++++++--------------- src/qemu/qemu_hotplug.h | 12 ++++----- 3 files changed, 50 insertions(+), 28 deletions(-) -- 1.7.9.5

1 3

[libvirt] [PATCH] util: recognize SMB filesystems as shared
by Laine Stump 26 Sep '13

26 Sep '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=1012085 libvirt previously recognized NFS, GFS2, OCFS2, and AFS filesystems as "shared", and thus eligible for exceptions to certain rules/actions about chowning image files before handing them off to a guest. This patch widens the definition of "shared filesystem" to include the SMB filesystem (sometimes called CIFS, or "Windows file sharing"). --- src/util/virstoragefile.c | 9 ++++++++- src/util/virstoragefile.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 0b9cec3..ed43b2b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1241,6 +1241,9 @@ cleanup: # ifndef AFS_FS_MAGIC # define AFS_FS_MAGIC 0x6B414653 # endif +# ifndef SMB_SUPER_MAGIC +# define SMB_SUPER_MAGIC 0x517B +# endif int virStorageFileIsSharedFSType(const char *path, @@ -1304,6 +1307,9 @@ int virStorageFileIsSharedFSType(const char *path, if ((fstypes & VIR_STORAGE_FILE_SHFS_AFS) && (sb.f_type == AFS_FS_MAGIC)) return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_SMB) && + (sb.f_type == SMB_SUPER_MAGIC)) + return 1; return 0; } @@ -1322,7 +1328,8 @@ int virStorageFileIsSharedFS(const char *path) VIR_STORAGE_FILE_SHFS_NFS | VIR_STORAGE_FILE_SHFS_GFS2 | VIR_STORAGE_FILE_SHFS_OCFS | - VIR_STORAGE_FILE_SHFS_AFS); + VIR_STORAGE_FILE_SHFS_AFS | + VIR_STORAGE_FILE_SHFS_SMB); } int virStorageFileIsClusterFS(const char *path) diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f89839..9c07212 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -112,6 +112,7 @@ enum { VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), VIR_STORAGE_FILE_SHFS_OCFS = (1 << 2), VIR_STORAGE_FILE_SHFS_AFS = (1 << 3), + VIR_STORAGE_FILE_SHFS_SMB = (1 << 4), }; int virStorageFileIsSharedFS(const char *path); -- 1.7.11.7

4 4

[libvirt] [libvirt-glib] Use latest warnings.m4 from gnulib
by Christophe Fergeau 26 Sep '13

26 Sep '13

The one we were using does not work properly with clang, causing the build process to try to use -f/-W options that are not supported by clang. --- m4/warnings.m4 | 82 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 69d05a6..e3d239b 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ -# warnings.m4 serial 5 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# warnings.m4 serial 11 +dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,24 +14,66 @@ m4_ifdef([AS_VAR_APPEND], [m4_define([gl_AS_VAR_APPEND], [AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])]) -# gl_WARN_ADD(PARAMETER, [VARIABLE = WARN_CFLAGS]) -# ------------------------------------------------ -# Adds parameter to WARN_CFLAGS if the compiler supports it. For example, -# gl_WARN_ADD([-Wparentheses]). -AC_DEFUN([gl_WARN_ADD], -dnl FIXME: gl_Warn must be used unquoted until we can assume -dnl autoconf 2.64 or newer. -[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_$1])dnl -AC_CACHE_CHECK([whether compiler handles $1], m4_defn([gl_Warn]), [ - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="${CPPFLAGS} $1" - AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])], - [AS_VAR_SET(gl_Warn, [yes])], - [AS_VAR_SET(gl_Warn, [no])]) - CPPFLAGS="$gl_save_CPPFLAGS" + +# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED], +# [PROGRAM = AC_LANG_PROGRAM()]) +# ----------------------------------------------------------------- +# Check if the compiler supports OPTION when compiling PROGRAM. +# +# FIXME: gl_Warn must be used unquoted until we can assume Autoconf +# 2.64 or newer. +AC_DEFUN([gl_COMPILER_OPTION_IF], +[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl +AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl +AS_LITERAL_IF([$1], + [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], + [gl_positive="$1" +case $gl_positive in + -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-$.*$'` ;; +esac +m4_pushdef([gl_Positive], [$gl_positive])])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ + gl_save_compiler_FLAGS="$gl_Flags" + gl_AS_VAR_APPEND(m4_defn([gl_Flags]), + [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) + AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], + [AS_VAR_SET(gl_Warn, [yes])], + [AS_VAR_SET(gl_Warn, [no])]) + gl_Flags="$gl_save_compiler_FLAGS" ]) -AS_VAR_IF(gl_Warn, [yes], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])]) +AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) +m4_popdef([gl_Positive])dnl +AS_VAR_POPDEF([gl_Flags])dnl AS_VAR_POPDEF([gl_Warn])dnl -m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl ]) + +# gl_UNKNOWN_WARNINGS_ARE_ERRORS +# ------------------------------ +# Clang doesn't complain about unknown warning options unless one also +# specifies -Wunknown-warning-option -Werror. Detect this. +AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], +[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], + [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], + [gl_unknown_warnings_are_errors=])]) + +# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS], +# [PROGRAM = AC_LANG_PROGRAM()]) +# --------------------------------------------- +# Adds parameter to WARN_CFLAGS if the compiler supports it when +# compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). +# +# If VARIABLE is a variable name, AC_SUBST it. +AC_DEFUN([gl_WARN_ADD], +[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS]) +gl_COMPILER_OPTION_IF([$1], + [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])], + [], + [$3]) +m4_ifval([$2], + [AS_LITERAL_IF([$2], [AC_SUBST([$2])])], + [AC_SUBST([WARN_CFLAGS])])dnl +]) + +# Local Variables: +# mode: autoconf +# End: -- 1.8.3.1

2 2

[libvirt] [PATCH]qemu: virDomainControllerFind may return 0 if controller found
by Chen Hanxiao 26 Sep '13

26 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> The return value of virDomainControllerFind >=0 means that the specific controller was found. But some functions invoke it and treat 0 as not found. This patch fix these incorrect invocation. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 346a8f9..ccd9cc6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6626,7 +6626,7 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, case VIR_DOMAIN_DEVICE_CONTROLLER: controller = dev->data.controller; if (virDomainControllerFind(vmdef, controller->type, - controller->idx) > 0) { + controller->idx) >= 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Target already exists")); return -1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6cdee44..f06930e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -358,7 +358,7 @@ int qemuDomainAttachPciControllerDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; bool releaseaddr = false; - if (virDomainControllerFind(vm->def, controller->type, controller->idx) > 0) { + if (virDomainControllerFind(vm->def, controller->type, controller->idx) >= 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("target %s:%d already exists"), type, controller->idx); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/2] Fix crash in chardev source parsing
by Peter Krempa 26 Sep '13

26 Sep '13

Peter Krempa (2): conf: Don't crash on invalid chardev source definition of RNGs and other conf: clean up virDomainChrSourceDefParseXML src/conf/domain_conf.c | 68 +++++++++++----------- .../qemuxml2argv-virtio-rng-egd-crash.xml | 27 +++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd-crash.xml -- 1.8.3.2

2 4

[libvirt] [PATCH] LXC start after shutdown didn't work
by Cédric Bosdonnat 26 Sep '13

26 Sep '13

The bug is that after shutting down an lxc full-distro container, start always fails. It turns out that shutdown doesn't clean the machine on the machined side. A workaround is to machinectl terminate the container. A proper fix would be that machinectl tracks the state of the init process and cleans the machine if that one disappears. This fix is the reasonable fix we can have on the libvirt side: really try to start the container manually if starting it with systemd failed. It currently never calls the virCgroupNewMachineManual function. --- src/util/vircgroup.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..466c170 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1656,9 +1656,6 @@ virCgroupNewMachine(const char *name, group)) == 0) return 0; - if (rv == -1) - return -1; - return virCgroupNewMachineManual(name, drivername, pidleader, -- 1.8.4

2 1

[libvirt] virDomainGetInfo() returns wrong domain state
by Panday Ritesh Sharma (rpanday) 26 Sep '13

26 Sep '13

Hi Team, I have written below code to get the VM state at run time. I found, though the VM is in shut-off state, when I use the function virDomainGetInfo(); I get state as running. Could you please let me know what wrong I am doing. To know the actual VM state I used 'virsh list' and it clearly shows the VM is in shut-off state. Please find the log and code snippet below. Log from virsh: ================= [host:~]$ virsh list --all Id Name State ---------------------------------------------------- 1 calvados running 2 LCXR running 3 default-sdr--1 running - test--2 shut off Out put: ========= 04.03.06.698923264:INFO: vm_libvirt_state_to_vmm_state: state returned is 1 Note : Here 1 is actually running. Code snippet: =============== enum cidl_vmm_vm_state vm_libvirt_state_to_vmm_state(unsigned char libvirt_state) { enum cidl_vmm_vm_state state; INFO("%s: state returned is %u\n",__FUNCTION__, libvirt_state); <<<<<<<<<<<<<<<<<< if (libvirt_state == VIR_DOMAIN_RUNNING) { state = cidl_vm_state_running; } else if ((libvirt_state == VIR_DOMAIN_PAUSED) || (libvirt_state == VIR_DOMAIN_BLOCKED)) { state = cidl_vm_state_paused; } else if (libvirt_state == VIR_DOMAIN_SHUTOFF) { state = cidl_vm_state_defined; } else { state = cidl_vm_state_not_defined; } return state; } virDomainInfo res_util; virDomainPtr dom = virDomainLookupByName(virt, private_names[vm_idx]); res = virDomainGetInfo(dom, &res_util); vminfo[vm_idx].vm_state = vm_libvirt_state_to_vmm_state(res_util.state); Regards Ritesh Sharma

2 3

[libvirt] [PATCH 1/2] qemu: Add SPAPR_VFIO_BRIDGE capability for PPC platform
by Li Zhang 26 Sep '13

26 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> To support VFIO for PPC, it is needed spapr-vfio-pci-host-bridge in QEMU. This patch is to add one capability for it. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d94188a..7cc02db 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -241,6 +241,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "usb-storage", /* 155 */ "usb-storage.removable", "virtio-mmio", + "spapr-pci-vfio-host-bridge", ); struct _virQEMUCaps { @@ -1391,6 +1392,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "i82801b11-bridge", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE }, { "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE }, { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, + { "spapr-pci-vfio-host-bridge", QEMU_CAPS_SPAPR_VFIO_BRIDGE }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f3c8fa8..33d303e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -196,6 +196,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ + QEMU_CAPS_SPAPR_VFIO_BRIDGE = 158, /* -device spapr-pci-vfio-host-bridge */ QEMU_CAPS_LAST, /* this must always be the last item */ }; -- 1.8.1.4

2 5

[libvirt] [PATCH 00/23] Fix yet more OOM errors
by Daniel P. Berrange 26 Sep '13

26 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A nice mix of leaks and crashes and ignoring errors. Daniel P. Berrange (23): Fix crash on OOM in xenParseSxpr Fix handling of OOM when getting Xen dom ID Don't clobber return value in virInterfaceDefParseProtoIPv6 Fix crash on OOM in virDomainSnapshotDefParse Don't clobber 'ret' in LXC XML test case Fix double free of hostdev on OOM in xenParseSxprPCI Fix crash on OOM parsing storage pool XML Add missing check for OOM with virVMXEscapeHexPipe Fix leak of comment string if virConfAddEntry fails on OOM Don't print all test suite errors to stderr in vmx2xmltest Fix leak of iterators in virDBusMessageIterEncode Fix double-free in virJSONParserHandleStartMap on OOM Fix leak of parser state in virJSONValueFromString Fix leak in virLockSpaceResourceFree Don't ignore errors parsing nwfilter rules Fix leak on OOM in qemuMonitorCommonTestNew Avoid double free in qemuMonitorCommonTestInit on OOM Avoid uninitialized data in qemuMonitorTestNew Avoid crash on OOM in virbuftest Avoid crash on OOM in virlockspacetest Avoid crash on OOM in virportallocatortest Avoid crash on OOM in virnetmessagetest Avoid use of uninitialized data in virnetmessagetest src/conf/interface_conf.c | 16 ++++++-------- src/conf/nwfilter_conf.c | 16 +++++++------- src/conf/snapshot_conf.c | 4 ++-- src/conf/storage_conf.c | 6 +++--- src/util/virconf.c | 5 ++++- src/util/virdbus.c | 24 ++++++++++++++++++--- src/util/virjson.c | 2 +- src/util/virlockspace.c | 1 + src/vmx/vmx.c | 3 ++- src/xen/xen_driver.c | 3 ++- src/xen/xend_internal.c | 10 +++++---- src/xenxs/xen_sxpr.c | 23 ++++++++++---------- src/xenxs/xen_sxpr.h | 4 ++-- tests/lxcxml2xmltest.c | 13 +++++++---- tests/nwfilterxml2xmltest.c | 14 ++++++------ tests/qemumonitortestutils.c | 7 +++++- tests/sexpr2xmltest.c | 3 ++- tests/virbuftest.c | 14 ++++++++++++ tests/virlockspacetest.c | 21 ++++++++++++------ tests/virnetmessagetest.c | 9 +++++++- tests/virportallocatortest.c | 6 ++++++ tests/vmx2xmltest.c | 51 +++++++++++++++++--------------------------- 22 files changed, 154 insertions(+), 101 deletions(-) -- 1.8.3.1

3 32

[libvirt] networking restart after redefinition
by Mihamina Rakotomandimby 26 Sep '13

26 Sep '13

Hi all, Running Fedora 18 and the bundled libvirt and virt-tools. Desktop use. As I like to access my guests with a hostname and not a numerical IP address, I fix the IP addressing in the network configuration: http://pastebin.com/rfMKn40j Unfortunately, I cant find a way to add a host without loosing the whole networking, as when I add a ahost, I destroy and redefine the network. Restarting libvirtd is not the solution. How would you recommend to have networking UP after network redefinition? -- RMA.

2 1

[libvirt] [PATCH 0/4] Rewrite the test OOM checking code
by Daniel P. Berrange 25 Sep '13

25 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This rewrites the OOM checking code to be much much much more scalable. Instead of looping running 'main' multiple times, we loop running 'virtTestRun' multiple times. Although the overall number of mallocs to be checked is basically the same, checking them in small blocks is a massive efficiency win, because the complexity is 'n * (n + 1) / 1'. Although I've fixed many issues, there are still some big problems remaining - The APIs in virxml.h don't let the caller distinguish between "attribute not found" and other errors. So anywhere we have an attribute that is optional, we are failing to diagnose & report OOM correctly (or indeed other errors we might get from libxml) - It is desirable to validate that we get VIR_ERR_NO_MEMORY for each failure, but there are times where we won't get this. In particular with any of the APIs which have delayed error reporting such as virCommand and virBuffer. You can see an OOM from those APIs, but there's a window between that occurring & being reported, where another error may be reported. - We should not count allocs in virerror.c or virlog.c APIs when doing OOM testing, since they're intentionally non-fatal Daniel P. Berrange (4): Don't clobber 'ret' variable in testCompareXMLToXMLHelper Remove existing OOM test impl Remove test case average timing Introduce new OOM testing support tests/commandtest.c | 2 +- tests/cputest.c | 5 +- tests/domainsnapshotxml2xmltest.c | 2 +- tests/esxutilstest.c | 2 +- tests/fchosttest.c | 10 +- tests/fdstreamtest.c | 8 +- tests/interfacexml2xmltest.c | 6 +- tests/jsontest.c | 2 +- tests/libvirtdconftest.c | 2 +- tests/lxcxml2xmltest.c | 4 +- tests/metadatatest.c | 6 +- tests/networkxml2conftest.c | 2 +- tests/networkxml2xmltest.c | 2 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nodedevxml2xmltest.c | 6 +- tests/nodeinfotest.c | 2 +- tests/nwfilterxml2xmltest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 4 +- tests/qemuargv2xmltest.c | 18 +- tests/qemuhelptest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 8 +- tests/qemumonitortest.c | 2 +- tests/qemuxml2argvtest.c | 14 +- tests/qemuxml2xmltest.c | 25 +-- tests/qemuxmlnstest.c | 20 +- tests/securityselinuxlabeltest.c | 6 +- tests/securityselinuxtest.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/sockettest.c | 16 +- tests/statstest.c | 2 +- tests/storagepoolxml2xmltest.c | 6 +- tests/storagevolxml2argvtest.c | 2 +- tests/storagevolxml2xmltest.c | 14 +- tests/sysinfotest.c | 2 +- tests/testutils.c | 386 ++++++++++++++++++++------------------ tests/testutils.h | 3 +- tests/utiltest.c | 4 +- tests/viratomictest.c | 4 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 18 +- tests/virbuftest.c | 2 +- tests/vircgrouptest.c | 22 +-- tests/virdbustest.c | 10 +- tests/virdrivermoduletest.c | 2 +- tests/virendiantest.c | 4 +- tests/virhashtest.c | 2 +- tests/viridentitytest.c | 4 +- tests/virkeycodetest.c | 4 +- tests/virkeyfiletest.c | 2 +- tests/virlockspacetest.c | 14 +- tests/virnetmessagetest.c | 10 +- tests/virnetserverclienttest.c | 2 +- tests/virnetsockettest.c | 30 +-- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 4 +- tests/virportallocatortest.c | 4 +- tests/virshtest.c | 36 ++-- tests/virstoragetest.c | 2 +- tests/virstringtest.c | 8 +- tests/virsystemdtest.c | 10 +- tests/virtimetest.c | 2 +- tests/viruritest.c | 2 +- tests/vmwarevertest.c | 2 +- tests/vmx2xmltest.c | 2 +- tests/xencapstest.c | 22 +-- tests/xmconfigtest.c | 4 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 70 files changed, 436 insertions(+), 407 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH] spec: Clean up distribution of ChangeLog (and others)
by Cole Robinson 25 Sep '13

25 Sep '13

- Move COPYING* to libvirt-client, so every package pulls them in - Move AUTHORS ChangeLog.gz NEWS README TODO from -daemon to -docs - Drop duplicate distribution of docs in -python --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f899149..d294aad 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1723,6 +1723,8 @@ fi %files docs %defattr(-, root, root) +%doc AUTHORS ChangeLog.gz NEWS README TODO + # Website %dir %{_datadir}/doc/libvirt-docs-%{version} %dir %{_datadir}/doc/libvirt-docs-%{version}/html @@ -1739,7 +1741,6 @@ fi %files daemon %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} @@ -2011,7 +2012,7 @@ fi %files client -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO +%doc COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %if %{with_lxc} @@ -2101,7 +2102,6 @@ fi %files python %defattr(-, root, root) -%doc AUTHORS NEWS README COPYING COPYING.LESSER %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirt_qemu.py* %{_libdir}/python*/site-packages/libvirt_lxc.py* -- 1.8.3.1

2 2

[libvirt] [PATCH v2 0/9] test: Mock snapshot APIs and misc improvements
by Cole Robinson 25 Sep '13

25 Sep '13

This series implements snapshot and managed save APIs for the test driver, and adds some misc improvements, like specifying domain state in the passed in driver XML. v2: Use a separate XML namespace for the custom XML additions Add snapshot REDEFINE support, sharing the generic logic with qemu Cole Robinson (9): test: Allow specifying object runstate in driver XML test: Allow specifying object transient state in driver XML test: Wire up managed save APIs test: Implement readonly snapshot APIs test: Implement snapshot create/delete/revert APIs qemu: snapshots: Simplify REDEFINE flag check qemu: snapshot: Break out redefine preparation to shared function test: snapshot: Add REDEFINE support test: Allow specifying domainsnapshot XML src/conf/domain_conf.c | 3 +- src/conf/snapshot_conf.c | 150 ++++++ src/conf/snapshot_conf.h | 7 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 145 +----- src/test/test_driver.c | 1236 +++++++++++++++++++++++++++++++++++++++++++++- tests/virshtest.c | 2 +- 7 files changed, 1399 insertions(+), 145 deletions(-) -- 1.8.3.1

2 15

[libvirt] [PATCH] spec: Only distribute ChangeLog in -devel package
by Cole Robinson 25 Sep '13

25 Sep '13

Helps save space on the Fedora livecd, as requested here: https://bugzilla.redhat.com/show_bug.cgi?id=977099 --- libvirt.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e94901a..a327eab 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1739,7 +1739,6 @@ fi %files daemon %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} @@ -2011,7 +2010,6 @@ fi %files client -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf @@ -2081,6 +2079,7 @@ fi %{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-lxc-api.xml +%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %doc docs/*.html docs/html docs/*.gif %doc docs/libvirt-api.xml %doc examples/hellolibvirt -- 1.8.3.1

3 6

[libvirt] [PATCH 0/3] Refactor feature handling and add support for pvticketlocks
by Peter Krempa 25 Sep '13

25 Sep '13

The kernel recently added support for paravirtual spinlocks and qemu will be following up soon. This series adds the support to libvirt. Peter Krempa (3): schema: Rename option to make it reusable conf: Refactor storing and usage of feature flags qemu: Add support for paravirtual spinlocks in the guest docs/formatdomain.html.in | 7 + docs/schemas/domaincommon.rng | 18 +- src/conf/domain_conf.c | 186 ++++++++++++++------- src/conf/domain_conf.h | 3 +- src/libxl/libxl_conf.c | 9 +- src/lxc/lxc_container.c | 6 +- src/qemu/qemu_command.c | 30 +++- src/vbox/vbox_tmpl.c | 45 +++-- src/xenapi/xenapi_driver.c | 10 +- src/xenapi/xenapi_utils.c | 22 ++- src/xenxs/xen_sxpr.c | 20 +-- src/xenxs/xen_xm.c | 30 ++-- .../qemuxml2argv-pv-spinlock-disabled.args | 5 + .../qemuxml2argv-pv-spinlock-disabled.xml | 26 +++ .../qemuxml2argv-pv-spinlock-enabled.args | 5 + .../qemuxml2argv-pv-spinlock-enabled.xml | 26 +++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + 18 files changed, 311 insertions(+), 141 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.xml -- 1.8.3.2

3 7

[libvirt] [PATCH] virsh: Fix domdisplay when domain only uses TLS
by Christophe Fergeau 25 Sep '13

25 Sep '13

It's possible to create a domain which will only use a TLS port and will not have a non-TLS port set by using: <graphics type='spice' autoport='yes' defaultMode='secure'/> In such a setup, the 'graphics' node for the running domain will be: <graphics type='spice' tlsPort='5900' autoport='yes' listen='127.0.0.1' defaultMode='secure'> However, cmdDomDisplay loops over all the 'graphics' node, and it ignores nodes which don't have a 'port' attribute. This means 'virsh domdisplay' will only return an empty string for domains as the one above. This commit looks for both 'port' and 'tlsPort' before deciding to ignore a graphics node. It also makes sure 'port' is not printed when it's not set. This makes 'virsh domdisplay' return 'spice://127.0.0.1?tls-port=5900' for domains using only a TLS port. Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- tools/virsh-domain.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..5e9d784 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9073,6 +9073,20 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* If there is no port number for this type, then jump to the next * scheme */ if (tmp) + port = 0; + + /* Create our XPATH lookup for TLS Port (automatically skipped + * for unsupported schemes */ + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "tlsPort") < 0) + goto cleanup; + + /* Attempt to get the TLS port number */ + tmp = virXPathInt(xpath, ctxt, &tls_port); + VIR_FREE(xpath); + if (tmp) + tls_port = 0; + + if (!port && !tls_port) continue; /* Create our XPATH lookup for the current display's address */ @@ -9103,17 +9117,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) port -= 5900; } - /* Create our XPATH lookup for TLS Port (automatically skipped - * for unsupported schemes */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "tlsPort") < 0) - goto cleanup; - - /* Attempt to get the TLS port number */ - tmp = virXPathInt(xpath, ctxt, &tls_port); - VIR_FREE(xpath); - if (tmp) - tls_port = 0; - /* Build up the full URI, starting with the scheme */ virBufferAsprintf(&buf, "%s://", scheme[iter]); @@ -9128,7 +9131,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, "%s", listen_addr); /* Add the port */ - virBufferAsprintf(&buf, ":%d", port); + if (port) + virBufferAsprintf(&buf, ":%d", port); /* TLS Port */ if (tls_port) { -- 1.8.3.1

1 0

[libvirt] [PATCH] virsh-domain: Add a missing check and fix leak in cmdScreenshot
by Hongwei Bi 25 Sep '13

25 Sep '13

--- tools/virsh-domain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..7fe42df 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4610,7 +4610,8 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; mime = virDomainScreenshot(dom, st, screen, flags); if (!mime) { @@ -4620,7 +4621,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (!file) { if (!(file=vshGenFileName(ctl, dom, mime))) - return false; + goto cleanup; generated = true; } -- 1.7.1

2 1

[libvirt] [PATCH 0/6] Several Q35 related tweaks
by Laine Stump 25 Sep '13

25 Sep '13

These patches are all in response to the issues that Gerd Hoffman raised in https://bugzilla.redhat.com/show_bug.cgi?id=1003983 Three of the six are simple refactoring of existing code, done separately so that the patches that change functionality would be simpler to review. None of them is very long. Laine Stump (6): qemu: eliminate redundant if clauses in qemuCollectPCIAddress qemu: allow some PCI devices to be attached to PCIe slots qemu: replace multiple strcmps with a switch on an enum qemu: support ich9-intel-hda audio device qemu: turn if into switch in qemuDomainValidateDevicePCISlotsQ35 qemu: prefer to put a Q35 machine's dmi-to-pci-bridge at 00:1E.0 docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 6 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 197 +++++++++++++++------ src/qemu/qemu_command.h | 4 + tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-sound-device.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 5 + tests/qemuxml2argvtest.c | 3 +- 13 files changed, 175 insertions(+), 58 deletions(-) -- 1.8.3.1

2 13

[libvirt] regarding libvirt development.
by cooldharma06 25 Sep '13

25 Sep '13

hi, i wish to give my contribution for the libvirt development. Any guide or documentation available for libvirt development. Or Any suggestions you have about the development means, please guide me. Regards cooldharma06

2 1

[libvirt] [PATCH] virsh-domain: Free dom before return false in cmdDump
by Hongwei Bi 25 Sep '13

25 Sep '13

--- tools/virsh-domain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..f6d4edd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { + virDomainFree(dom); return false; + } if (vshCommandOptBool(cmd, "verbose")) verbose = true; -- 1.7.1

3 2

Re: [libvirt] [PATCH] virsh-domain: Free dom before return false in cmdDump
by Hongwei Bi 25 Sep '13

25 Sep '13

Yes, 'goto cleanup' would be better. 2013/9/25 Hongwei Bi <hwbi2008(a)gmail.com> > Yes, 'goto cleanup' would be better. > > > 2013/9/25 Ján Tomko <jtomko(a)redhat.com> > >> On 09/25/2013 07:49 AM, Hongwei Bi wrote: >> > >> > >> > --- >> > tools/virsh-domain.c | 4 +++- >> > 1 files changed, 3 insertions(+), 1 deletions(-) >> > >> > diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c >> > index 856e888..f6d4edd 100644 >> > --- a/tools/virsh-domain.c >> > +++ b/tools/virsh-domain.c >> > @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) >> > if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) >> > return false; >> > >> > - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) >> > + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { >> > + virDomainFree(dom); >> > return false; >> > + } >> >> 'goto cleanup' would do the same and it's easier to read. >> >> Alternatively, if we moved vshCommandOptStringReq before >> vshCommandOptDomain, >> 'return false' would be enough. >> >> Jan >> > >

1 0

[libvirt] [PATCH v4 0/2] don't masquerade local broadcast/multicast packets
by Laszlo Ersek 25 Sep '13

25 Sep '13

v2->v4 changes (v3 went in a different direction): - Rename iptables(Add|Remove)ForwardDontMasquerade to iptables(Add|Remove)DontMasquerade [Laine]. Masquerading local broadcast breaks DHCP replies for some clients. There has been a report about broken local multicast too. (See references in the patches.) Testing: Chain POSTROUTING (policy ACCEPT 2 packets, 134 bytes) pkts bytes target prot opt in out source destination 0 0 RETURN all -- * * 192.168.122.0/24 224.0.0.0/24 0 0 RETURN all -- * * 192.168.122.0/24 255.255.255.255 0 0 MASQUERADE tcp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE udp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24 + make check, make syntax-check, virsh net-start / net-destroy. Laszlo Ersek (2): util/viriptables: add/remove rules that short-circuit masquerading bridge driver: don't masquerade local subnet broadcast/multicast packets src/util/viriptables.h | 8 ++++ src/network/bridge_driver_linux.c | 70 +++++++++++++++++++++++++++++-- src/util/viriptables.c | 88 +++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + 4 files changed, 164 insertions(+), 4 deletions(-) -- 1.8.3.1

2 5