- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] command line fd passing using fd sets
by Corey Bryant 06 Oct '12

06 Oct '12

This series adds command line file descriptor passing support to the -drive option. This is a follow-on to the existing QMP fd passing support provided in the following patch series: comments.gmane.org/gmane.comp.emulators.qemu/165463 An example of using the new -drive fd and opaque options: qemu-kvm -drive fd=24,opaque="rdwr:/path/file",index=0,media=disk When an fd, and optionally opaque, are passed with -drive, they are added to an automatically generated fd set. The file name is also generated in the form of "/dev/fdset/nnn", where nnn is the fd set ID. qemu_open() already knows how to handle a filename of this format. qemu_open() searches the corresponding fd set for an fd and when it finds a match, QEMU goes on to use a dup of that fd just like it would have used an fd that it opened itself. Corey Bryant (4): monitor: Less restrictive fd matching for fd sets monitor: Enable adding an inherited fd to an fd set qemu-config: Add -drive fd and opaque options blockdev: Process -drive fd and opaque options blockdev.c | 40 +++++++++++++++++- monitor.c | 128 ++++++++++++++++++++++++++++++++------------------------ monitor.h | 3 ++ qemu-config.c | 8 ++++ qemu-options.hx | 15 ++++++- 5 files changed, 135 insertions(+), 59 deletions(-) -- 1.7.11.4

3 14

[libvirt] with latest libvirt(from git) on F18, time to take internal snapshot increases as snapshot count rises
by Kashyap Chamarthy 06 Oct '12

06 Oct '12

Hi, the below three internal snapshots were taken when the guest is running 'live'. Any hints on why the time to take snapshots keep increasing ? If you notice, the 2nd and 3rd internal snaphtots took more than 4 minutes each (note: there is no noticeable content change from snap1 ) #==================================================# [root@localhost vmimages]# time virsh snapshot-create-as f17vm3-with-b snap1 snap1-f17vm3-desc Domain snapshot snap1 created real 0m57.734s user 0m0.009s sys 0m0.024s [root@localhost vmimages]# [root@localhost vmimages]# virsh snapshot-list f17vm3-with-b Name Creation Time State ------------------------------------------------------------ snap1 2012-10-04 06:55:38 -0400 running [root@localhost vmimages]# #==================================================# [root@localhost vmimages]# time virsh snapshot-create-as f17vm3-with-b snap2 snap2-f17vm3-desc Domain snapshot snap2 created real 4m19.126s user 0m0.020s sys 0m0.030s [root@localhost vmimages]# #==================================================# [root@localhost vmimages]# time virsh snapshot-create-as f17vm3-with-b snap3 snap3-f17vm3-desc Domain snapshot snap3 created real 4m45.053s user 0m0.013s sys 0m0.032s [root@localhost vmimages]# #==================================================# [root@localhost qemu]# qemu-img info /home/kashyap/vmimages/f17vm3-with-b.qcow2 image: /home/kashyap/vmimages/f17vm3-with-b.qcow2 file format: qcow2 virtual size: 5.0G (5368709120 bytes) disk size: 755M cluster_size: 65536 backing file: /home/kashyap/vmimages/base-f17.qcow2 Snapshot list: ID TAG VM SIZE DATE VM CLOCK 1 snap1 232M 2012-10-04 06:55:38 19:58:19.804 2 snap2 247M 2012-10-04 07:03:09 20:04:53.360 3 snap3 244M 2012-10-04 07:08:23 20:05:48.889 4 snap4 0 2012-10-04 08:51:16 00:00:00.000 5 snap5 0 2012-10-04 08:53:04 00:00:00.000 [root@localhost qemu]# #==================================================# [root@localhost qemu]# virsh snapshot-list f17vm3-with-b Name Creation Time State ------------------------------------------------------------ snap1 2012-10-04 06:55:38 -0400 running snap2 2012-10-04 07:03:08 -0400 running snap3 2012-10-04 07:08:23 -0400 running snap4 2012-10-04 08:51:16 -0400 shutoff snap5 2012-10-04 08:53:04 -0400 shutoff [root@localhost qemu]# #==================================================# -- /kashyap

2 4

[libvirt] [PATCH] S390: Buffer too small for large CPU numbers.
by Viktor Mihajlovski 06 Oct '12

06 Oct '12

The output buffer for virFileReadAll was too small for systems with more than 30 CPUs which leads to a log entry and incorrect behavior. The new size will be sufficient for the current architectural limits. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/sysinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index d38b4ff..8add936 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -361,7 +361,7 @@ virSysinfoRead(void) { goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -376,7 +376,7 @@ virSysinfoRead(void) { VIR_FREE(outbuf); /* Gather info from /proc/sysinfo */ - if (virFileReadAll(SYSINFO, 4096, &outbuf) < 0) { + if (virFileReadAll(SYSINFO, 8192, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), SYSINFO); return NULL; -- 1.7.0.4

2 2

[libvirt] [PATCH] Check for private symbols presence as well
by Michal Privoznik 05 Oct '12

05 Oct '12

Currently, we are checking if libvirt.so contains public symbols. However, sometimes we rename an internal symbol and forget to change libvirt_private.syms accordingly. Hence, it's safer to check for internal symbols as well. --- src/Makefile.am | 7 ++++++- src/check-symfile.pl | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ae3d491..c5840c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -318,8 +318,13 @@ if WITH_LINUX check-symfile: libvirt.syms libvirt.la $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ .libs/libvirt.so + +check-private-symfile: libvirt_private.syms libvirt.la + $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt_private.syms \ + .libs/libvirt.so else check-symfile: +check-private-symfile: endif PROTOCOL_STRUCTS = \ @@ -344,7 +349,7 @@ else !WITH_REMOTE check-protocol: endif EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl -check-local: check-protocol check-symfile +check-local: check-protocol check-symfile check-private-symfile .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc diff --git a/src/check-symfile.pl b/src/check-symfile.pl index ac37b46..435e045 100755 --- a/src/check-symfile.pl +++ b/src/check-symfile.pl @@ -44,7 +44,7 @@ foreach my $elflib (@elflibs) { close NM; } -foreach my $sym (@wantsyms) { +foreach my $sym (keys(%wantsyms)) { next if exists $gotsyms{$sym}; print STDERR "Expected symbol $sym is not in ELF library\n"; -- 1.7.8.6

2 5

[libvirt] [libvirt-php] Function calls blocking on Ubuntu 12.04
by Rory Slegtenhorst 05 Oct '12

05 Oct '12

Dear List, Please note I am not subscribed to this list. I just wanted to state my problem, and will wait for a fix when it comes. I have sucessfully compiled libvirt-php-0.4.5 on Ubuntu 12.04. I ran into some problems when using the library in simple php code, specifically trying to retrieve a screenshot. 1. libvirt_domain_get_screenshot_api returns a PHP fatal about it not being defined ?!? I have not looked into this at all. It was the first of the two I tried, and went on for the other :) 2. libvirt_domain_get_screenshot blocks forever I investigated this one, as from my debug logging, I could see things were going right. My browser just never finishes loading. I traced it down vnc.c on line x where a loop is started. The loop never seems to finish (unsure why though), and commenting out the loop fixes my problem. With kind regards, Rory Slegtenhorst rory dot slegtenhorst at gmail dot com

1 1

[libvirt] [PATCH] private.syms: Drop virKillProcess
by Michal Privoznik 05 Oct '12

05 Oct '12

After it got renamed to virProcessKill (cf470068a11) it is no longer needed in the private syms file. --- It is trivial, but maybe worth inventing cfg.mk macro that does check if all symbols fro private syms are defined somewhere. However, I am not that familiar with cfg.mk, so if anybody has any idea ... src/libvirt_private.syms | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index eebc52a..a8c81e7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1246,7 +1246,6 @@ virGetUserName; virHexToBin; virIndexToDiskName; virIsDevMapperDevice; -virKillProcess; virParseNumber; virParseVersionString; virPipeReadUntilEOF; -- 1.7.8.6

2 2

[libvirt] [PATCH v3 0/2] security: support for names on DAC labels
by Marcelo Cerri 05 Oct '12

05 Oct '12

This patch series extends label parsing for DAC security driver and updates the related documentation. This version basically uses virReportError instead of VIR_DEBUG for error messages. Marcelo Cerri (2): security: also parse user/group names instead of just IDs for DAC labels doc: update description about security labels on formatdomain.html docs/formatdomain.html.in | 14 ++++++- src/security/security_dac.c | 92 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 82 insertions(+), 24 deletions(-) -- 1.7.12

3 8

[libvirt] [PATCH] spec: prefer canonical name of util-linux
by Eric Blake 05 Oct '12

05 Oct '12

I noticed that in two places, we require util-linux, and in a third, we require util-linux-ng. On Fedora (I tested F15 through rawhide), util-linux-ng is obsoleted by util-linux; on RHEL 6, util-linux is obsoleted by util-linux-ng. That is, on either platform, either name will get you the correct package installed (where the preferred name on fedora is util-linux, and on RHEL 6 is util-linux-ng). But on RHEL 5, there is no util-linux-ng * libvirt.spec.in (Requires): Use util-linux, not util-linux-ng. --- I debated about pushing this under the trivial rule, but decided not to. Also, if you look at Fedora's git repository for libvirt, you'll notice that Peter Robinson attempted this same patch for F17 in commit f9de2f6, but with no explanation why. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 11e3199..e3d0a2d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -614,7 +614,7 @@ Requires: PolicyKit >= 0.6 %if %{with_storage_fs} Requires: nfs-utils # For mkfs -Requires: util-linux-ng +Requires: util-linux # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 # For glusterfs -- 1.7.11.4

2 2

[libvirt] migration.html page issues
by Eric Blake 05 Oct '12

05 Oct '12

Compare the table of contents on http://libvirt.org/migration.html to most other pages on libvirt.org. For some reason, the build process of converting migration.html.in into live html is rendering all links to internal anchors as '#' instead of full '#name' links. I'm throwing this out there in case someone else knows more quickly how to fix the problem (I'm not very fluent with all the xsltproc conversion stuff in the docs directory). -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] feature or bug
by Gene Czarcinski 05 Oct '12

05 Oct '12

I notice that radvd is started for any ISOLATED (non-forwarding) network with an IPv6 definition. Why? In fact, I believe that there should be a way of defining a virtual network where neither dnsmasq nor radvd are started. My assumption is that virtual servers will be defined on the network as needed. I assume that the network addresses, etc. are needed by software somewhere deep in the bowels of the kernel and related software. Thus, it should not be possible to have guests use IPv4 or IPv6 addresses on a network other than those defined. Comments? Gene

1 0

[libvirt] [libvirt-java] Upload 0.4.8 to central Maven repository
by Wido den Hollander 04 Oct '12

04 Oct '12

Hi, At the CloudStack project we are switching to Maven for building and resolving external dependencies. In the central Maven repository [0] the latest version of libvirt-java is however 0.4.7 Could 0.4.8 be uploaded to this repository? Thank you, Wido [0]: http://search.maven.org/#search|ga|1|org.libvirt

3 25

[libvirt] Problems live migrating a Windows VM - Inconsistent?
by Shawn Starr 04 Oct '12

04 Oct '12

Hello, I noticed some issues migrating a VM 1) I had to have ssh key authentication exchanged or it would refuse to connect tunneled to the remote libvirtd server 2) When it attempts to finish live migrating the VM it fails saying it can't find the domain on the remote libvirtd server host However, if I run the command again to migrate, it DOES migrate the VM over, however the Windows guest is not usable, cant type/use mouse, but i can see the VM display fine. I can gracefully shut the VM down from virt-manager and I see the VM shut down gracefully from display attached via spice. This seems like two bugs? Versions: host kernel: 3.6.0-0.rc7.git0.1.fc18.x86_64 libvirt-XXXXXXX-0.10.2-3.fc18.x86_64 qemu-kvm-1.2.0-8.fc18.x86_64 (will upgrade to latest on koji but unrelated I believe) Command: LIBVIRT_DEBUG=1 virsh --debug=4 migrate --verbose --live --tunnelled --p2p Windows_7 qemu+ssh://root@172.18.2.3/system Output: ... <snip> 2012-09-30 17:59:14.814+0000: 24710: debug : virKeepAliveCheckMessage:384 : ka=0x266a470, client=0x2669ee0, msg=0x2669f48 2012-09-30 17:59:14.814+0000: 24710: debug : virNetClientIOEventLoopRemoveDone:1380 : Waking up sleep 0x2669cb0 2012-09-30 17:59:14.814+0000: 24708: debug : virNetClientIO:1754 : Woken up from sleep head=0x7f4830400e60 call=0x2669cb0 2012-09-30 17:59:14.814+0000: 24708: debug : virNetClientIO:1807 : All done with our call head=0x7f4830400e60 call=0x2669cb0 rv=0 2012-09-30 17:59:14.814+0000: 24708: debug : virNetMessageFree:73 : msg=0x2669640 nfds=0 cb=(nil) Migration: [ 95 %]2012-09-30 17:59:15.315+0000: 24708: debug : virDomainGetJobInfo:17129 : dom=0x2669e70, (VM: name=Windows, uuid=41562d70-d0a8-25bc-10ec-a3dc46b3d258), info=0x7fffb64d72d0 2012-09-30 17:59:15.315+0000: 24708: debug : virNetMessageNew:45 : msg=0x2669640 tracked=0 2012-09-30 17:59:15.315+0000: 24708: debug : virNetMessageEncodePayload:358 : Encode length as 64 2012-09-30 17:59:15.315+0000: 24708: debug : virNetClientSendInternal:1955 : RPC_CLIENT_MSG_TX_QUEUE: client=0x2669ee0 len=64 prog=536903814 vers=1 proc=163 type=0 status=0 serial=50 2012-09-30 17:59:15.315+0000: 24708: debug : virNetClientCallNew:1908 : New call 0x2669150: msg=0x2669640, expectReply=1, nonBlock=0 2012-09-30 17:59:15.315+0000: 24708: debug : virNetClientIO:1718 : Outgoing message prog=536903814 version=1 serial=50 proc=163 type=0 length=64 dispatch=0x7f4830400e60 2012-09-30 17:59:15.315+0000: 24708: debug : virNetClientIO:1744 : Going to sleep head=0x7f4830400e60 call=0x2669150 2012-09-30 17:59:15.315+0000: 24710: debug : virNetClientIOEventLoop:1558 : Woken up from poll by other thread 2012-09-30 17:59:15.317+0000: 24710: debug : virNetMessageDecodeLength:152 : Got length, now need 120 total (116 more) 2012-09-30 17:59:15.317+0000: 24710: debug : virNetClientCallDispatch:1127 : RPC_CLIENT_MSG_RX: client=0x2669ee0 len=120 prog=536903814 vers=1 proc=163 type=1 status=0 serial=50 2012-09-30 17:59:15.317+0000: 24710: debug : virKeepAliveCheckMessage:384 : ka=0x266a470, client=0x2669ee0, msg=0x2669f48 2012-09-30 17:59:15.317+0000: 24710: debug : virNetClientIOEventLoopRemoveDone:1380 : Waking up sleep 0x2669150 2012-09-30 17:59:15.317+0000: 24708: debug : virNetClientIO:1754 : Woken up from sleep head=0x7f4830400e60 call=0x2669150 2012-09-30 17:59:15.317+0000: 24708: debug : virNetClientIO:1807 : All done with our call head=0x7f4830400e60 call=0x2669150 rv=0 2012-09-30 17:59:15.317+0000: 24708: debug : virNetMessageFree:73 : msg=0x2669640 nfds=0 cb=(nil) Migration: [ 95 %]2012-09-30 17:59:15.751+0000: 24710: debug : virNetMessageDecodeLength:152 : Got length, now need 204 total (200 more) 2012-09-30 17:59:15.751+0000: 24710: debug : virNetClientCallDispatch:1127 : RPC_CLIENT_MSG_RX: client=0x2669ee0 len=204 prog=536903814 vers=1 proc=216 type=1 status=1 serial=8 2012-09-30 17:59:15.751+0000: 24710: debug : virKeepAliveCheckMessage:384 : ka=0x266a470, client=0x2669ee0, msg=0x2669f48 2012-09-30 17:59:15.751+0000: 24710: debug : virNetClientIOEventLoopPassTheBuck:1424 : Giving up the buck 0x7f4830400e60 2012-09-30 17:59:15.751+0000: 24710: debug : virNetClientIOEventLoopPassTheBuck:1438 : No thread to pass the buck to 2012-09-30 17:59:15.751+0000: 24710: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=2 events=1 2012-09-30 17:59:15.751+0000: 24710: debug : virEventPollInterruptLocked:701 : Interrupting 2012-09-30 17:59:15.751+0000: 24710: debug : virNetClientIO:1807 : All done with our call head=(nil) call=0x7f4830400e60 rv=0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollDispatchTimeouts:410 : Dispatch 0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollDispatchHandles:455 : Dispatch 1 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCleanupTimeouts:501 : Cleanup 0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCleanupTimeouts:537 : Found 0 out of 0 timeout slots used, releasing 0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCleanupHandles:549 : Cleanup 2 2012-09-30 17:59:15.751+0000: 24709: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCleanupTimeouts:501 : Cleanup 0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCleanupTimeouts:537 : Found 0 out of 0 timeout slots used, releasing 0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCleanupHandles:549 : Cleanup 2 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=4 e=1 d=0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=6 e=1 d=0 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 0 timers 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollCalculateTimeout:346 : Timeout at 0 due in -1 ms 2012-09-30 17:59:15.751+0000: 24709: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-09-30 17:59:15.751+0000: 24710: debug : virNetMessageFree:73 : msg=0x7f4830000de0 nfds=0 cb=(nil) 2012-09-30 17:59:15.751+0000: 24710: debug : virDomainFree:2281 : dom=0x7f4830000af0, (VM: name=Windows, uuid=41562d70-d0a8-25bc-10ec-a3dc46b3d258) 2012-09-30 17:59:15.751+0000: 24710: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f4830000af0 2012-09-30 17:59:15.751+0000: 24710: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7f4830000af0 2012-09-30 17:59:15.751+0000: 24710: debug : virDomainDispose:225 : release domain 0x7f4830000af0 Windows 41562d70-d0a8-25bc-10ec-a3dc46b3d258 2012-09-30 17:59:15.751+0000: 24710: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x26693b0 2012-09-30 17:59:15.751+0000: 24708: debug : virDomainFree:2281 : dom=0x2669e70, (VM: name=Windows, uuid=41562d70-d0a8-25bc-10ec-a3dc46b3d258) 2012-09-30 17:59:15.751+0000: 24708: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x2669e70 2012-09-30 17:59:15.751+0000: 24708: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x2669e70 2012-09-30 17:59:15.751+0000: 24708: debug : virDomainDispose:225 : release domain 0x2669e70 Windows 41562d70-d0a8-25bc-10ec-a3dc46b3d258 2012-09-30 17:59:15.752+0000: 24708: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x26693b0 2012-09-30 17:59:15.752+0000: 24708: debug : virFileClose:72 : Closed fd 9 2012-09-30 17:59:15.752+0000: 24708: debug : virFileClose:72 : Closed fd 10 error: Domain not found: no domain with matching name 'Windows'

2 2

[libvirt] [libvirt-glib PATCH] Add wrappers for virDomainPMWakeup
by Alexander Larsson 04 Oct '12

04 Oct '12

--- libvirt-gobject/libvirt-gobject-domain.c | 87 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 11 ++++ libvirt-gobject/libvirt-gobject.sym | 4 ++ 3 files changed, 102 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index f8ad493..8ade3ea 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -514,6 +514,93 @@ gboolean gvir_domain_resume_finish(GVirDomain *dom, } /** + * gvir_domain_wakeup: + * @dom: the domain + * @flags: placeholder for flags, pass 0 + * @err: Place-holder for possible errors + * + * Returns: TRUE on success + */ +gboolean gvir_domain_wakeup(GVirDomain *dom, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + priv = dom->priv; + if (virDomainPMWakeup(priv->handle, flags) < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to wakeup domain"); + return FALSE; + } + + return TRUE; +} + +static void +gvir_domain_wakeup_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GError *err = NULL; + + if (!gvir_domain_wakeup(dom, (guint)g_simple_async_result_get_op_res_gssize(res), &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_domain_wakeup_async: + * @dom: the domain to wakeup + * @flags: placeholder for flags, pass 0 + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_wakeup. + */ +void gvir_domain_wakeup_async(GVirDomain *dom, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_wakeup_async); + g_simple_async_result_set_op_res_gssize (res, (gssize)flags); + g_simple_async_result_run_in_thread(res, + gvir_domain_wakeup_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +gboolean gvir_domain_wakeup_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_wakeup_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) + return FALSE; + + return TRUE; +} + +/** * gvir_domain_stop: * @dom: the domain * @flags: the flags diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index fc2db7c..6e7b10d 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -198,6 +198,17 @@ void gvir_domain_resume_async(GVirDomain *dom, gboolean gvir_domain_resume_finish(GVirDomain *dom, GAsyncResult *result, GError **err); +gboolean gvir_domain_wakeup(GVirDomain *dom, + guint flags, + GError **err); +void gvir_domain_wakeup_async(GVirDomain *dom, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_wakeup_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); gboolean gvir_domain_stop(GVirDomain *dom, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index c496540..3a40a8a 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -198,6 +198,10 @@ LIBVIRT_GOBJECT_0.1.3 { global: gvir_connection_get_hypervisor_name; gvir_connection_get_version; + + gvir_domain_wakeup; + gvir_domain_wakeup_async; + gvir_domain_wakeup_finish; } LIBVIRT_GOBJECT_0.1.2; # .... define new API here using predicted next version number .... -- 1.7.12.1

3 3

[libvirt] [PATCH] Correct checking of virStrcpyStatic() return value
by Kyle Mestery 04 Oct '12

04 Oct '12

Correct the check for the return value of virStrcpyStatic() when copying port-profile names. Fixes Open vSwitch ports which utilize port-profiles from network definitions. Signed-off-by: Kyle Mestery <kmestery(a)cisco.com> --- src/util/virnetdevvportprofile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index d774fb1..ac7aa5f 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -374,7 +374,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfilePtr orig, orig->profileID, mods->profileID); return -1; } - if (virStrcpyStatic(orig->profileID, mods->profileID)) { + if (virStrcpyStatic(orig->profileID, mods->profileID) == NULL) { /* this should never happen - it indicates mods->profileID * isn't properly null terminated. */ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.11.4

2 1

[libvirt] Libvirt arpdstipaddr doesn't work with a subnet
by Brian Haley 04 Oct '12

04 Oct '12

Hi, This is mostly a cut/paste from a bugzilla I just filed, https://bugzilla.redhat.com/show_bug.cgi?id=862887 - Dave Allan mentioned I should post it on the mailing list for comments. I was trying to program up a libvirt nwfilter rule to restrict the ARP destination IP address (in the request) to be a subnet. I can specify one using ebtables directly, but not via a filter. Looking on libvirt.org seems to show it must be an IP address, don't know if anyone's thought about changing that to support a subnet? $ libvirtd --version libvirtd (libvirt) 0.9.8 I created a file that looks something like this: <filter name='only-arp-dstip-net' chain='arp'> <rule action='drop' direction='out' priority='550'> <arp match='no' arpdstipaddr='10.1.2.0/24' /> </rule> </filter> But when it's defined, it loses the arpdstipaddr part: <filter name='only-arp-dstip-net' chain='arp' priority='-500'> <uuid>a4f2f8a4-a590-b406-e4cd-97580a153545</uuid> <rule action='drop' direction='out' priority='550'> <arp/> </rule> </filter> And the corresponding ebtables rule is: Bridge chain: I-vnet0-arp, entries: 7, policy: ACCEPT <snip> -p ARP -j DROP , pcnt = 0 -- bcnt = 0 Using ebtables works: $ sudo ebtables -t nat -A I-vnet0-arp -p ARP --arp-ip-dst 10.1.2.0/24 -j DROP Bridge chain: I-vnet0-arp, entries: 7, policy: ACCEPT <snip> -p ARP --arp-ip-dst 10.1.2.0/24 -j DROP , pcnt = 0 -- bcnt = 0 The use case I have is that I have a bridge with proxy_arp=1, but I don't want to respond for all IP addresses, just a certain range. Right now a VM can use 'ping -r -I eth0 $any_ip' and the stack will respond. Thanks, -Brian

1 0

[libvirt] [PATCH 0/6] track disk formats by storage enum
by Eric Blake 04 Oct '12

04 Oct '12

My ongoing work with disk snapshots is having to deal with the fact that determining the backing chain uses API from src/util/storage_file.c that expects an enum for storage format, but the domain XML is tracking the storage type as a string. Universally tracking things as an enum will make for easier handling as I make more use of storage_file.c. Eric Blake (6): storage: list more file types storage: treat 'aio' like 'raw' at parse time storage: match RNG to supported driver types storage: use enum for default driver type storage: use enum for disk driver type storage: use enum for snapshot driver type docs/schemas/domaincommon.rng | 27 +++++- docs/schemas/domainsnapshot.rng | 2 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 62 +++++++------ src/conf/domain_conf.h | 4 +- src/conf/snapshot_conf.c | 23 +++-- src/conf/snapshot_conf.h | 2 +- src/conf/storage_conf.c | 15 ++- src/libxl/libxl_conf.c | 42 +++++---- src/libxl/libxl_driver.c | 6 +- src/qemu/qemu_command.c | 18 ++-- src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_driver.c | 103 +++++++-------------- src/qemu/qemu_hotplug.c | 9 +- src/util/storage_file.c | 69 ++++++++++---- src/util/storage_file.h | 8 +- src/vbox/vbox_tmpl.c | 6 +- src/xenxs/xen_sxpr.c | 26 ++++-- src/xenxs/xen_xm.c | 28 ++++-- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- 23 files changed, 269 insertions(+), 200 deletions(-) -- 1.7.11.4

1 6

[libvirt] [PATCH] docs: rudimentary phyp documentation
by Eric Blake 04 Oct '12

04 Oct '12

Based on a report that phyp is undocumented: https://www.redhat.com/archives/libvirt-users/2012-July/msg00013.html * docs/drvphyp.html.in (phyp): New file. * docs/drivers.html.in: List it. --- Following up on an old thread. This is probably incomplete or possibly even inaccurate, but I'd rather have something than nothing. If I don't get any feedback within a week, I'm pushing this as-is. docs/drivers.html.in | 1 + docs/drvphyp.html.in | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 docs/drvphyp.html.in diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 24387d0..307d286 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -29,6 +29,7 @@ <li><strong><a href="drvvmware.html">VMware Workstation/Player</a></strong></li> <li><strong><a href="drvxen.html">Xen</a></strong></li> <li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li> + <li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li> </ul> <h2><a name="storage">Storage drivers</a></h2> diff --git a/docs/drvphyp.html.in b/docs/drvphyp.html.in new file mode 100644 index 0000000..7d97fa4 --- /dev/null +++ b/docs/drvphyp.html.in @@ -0,0 +1,46 @@ +<html><body> + <h1>IBM PowerVM hypervisor driver (phyp)</h1> + <ul id="toc"></ul> + <p> + The IBM PowerVM driver can manage both HMC and IVM PowerVM + guests. VIOS connections are tunneled through HMC. + </p> + + + <h2><a name="project">Project Links</a></h2> + <ul> + <li> + The <a href="http://www-03.ibm.com/systems/power/software/virtualization/index.html">IBM + PowerVM</a> hypervisor + </li> + </ul> + + + <h2><a name="uri">Connections to the PowerVM driver</a></h2> + <p> + Some example remote connection URIs for the driver are: + </p> +<pre> +phyp://user@hmc/system (HMC connection) +phyp://user@ivm/system (IVM connection) +</pre> + <p> + <strong>Note</strong>: In contrast to other drivers, the + PowerVM (or phyp) driver is a client-side-only driver. Therefore, the + <a href="remote.html">remote transport mechanism</a> provided by the + remote driver and libvirtd will not work, and you cannot use URIs like + <code>phyp+ssh://example.com</code>. + </p> + + + <h3><a name="uriformat">URI Format</a></h3> + <p> + URIs have this general form (<code>[...]</code> marks an + optional part, <code>{...|...}</code> marks a mandatory choice). + </p> +<pre> +phyp://[username@]{hmc|ivm}/managed_system +</pre> + </p> + +</body></html> -- 1.7.11.4

3 3

[libvirt] [libvirt-glib 1/2] spec: Get min libvirt version from configure.ac
by Christophe Fergeau 03 Oct '12

03 Oct '12

The minimum libvirt version we need is duplicated in configure.ac and libvirt.spec.in. Since libvirt.spec.in already gets some variables substituted, we can also substitute LIBVIRT_REQUIRED to avoid the duplication. --- configure.ac | 1 + libvirt-glib.spec.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7262322..369b368 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AC_CANONICAL_HOST AM_SILENT_RULES([yes]) LIBVIRT_REQUIRED=0.9.10 +AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file GLIB2_REQUIRED=2.22.0 GOBJECT2_REQUIRED=2.10.0 GIO_REQUIRED=2.10.0 diff --git a/libvirt-glib.spec.in b/libvirt-glib.spec.in index e312926..f10c38a 100644 --- a/libvirt-glib.spec.in +++ b/libvirt-glib.spec.in @@ -18,7 +18,7 @@ %endif %define with_vala %{with_introspection} -%define libvirt_version 0.9.10 +%define libvirt_version @LIBVIRT_REQUIRED@ Name: @PACKAGE@ Version: @VERSION@ -- 1.7.12.1

2 2

[libvirt] [libvirt-glib 1/2] gobject: Handle PMSUSPENDED state from libvirt
by Christophe Fergeau 03 Oct '12

03 Oct '12

Emit a signal when switching to the PMSUSPENDED state, and add an enum entry to describe this state. This avoids runtime warnings with newer libvirt. --- libvirt-gobject/libvirt-gobject-connection.c | 7 +++++++ libvirt-gobject/libvirt-gobject-domain.c | 11 +++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 19 +++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 428ae38..ad7aa07 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -389,6 +389,13 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_SHUTDOWN: break; + case VIR_DOMAIN_EVENT_PMSUSPENDED: + if (detail == VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY) + g_signal_emit_by_name(gdom, "pmsuspended::memory"); + else + g_warn_if_reached(); + break; + default: g_warn_if_reached(); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index bcfad2a..f8ad493 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -55,6 +55,7 @@ enum { VIR_RESUMED, VIR_STOPPED, VIR_UPDATED, + VIR_PMSUSPENDED, LAST_SIGNAL }; @@ -225,6 +226,16 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 0); + signals[VIR_PMSUSPENDED] = g_signal_new("pmsuspended", + G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | + G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET(GVirDomainClass, pmsuspended), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + g_type_class_add_private(klass, sizeof(GVirDomainPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 7810d1b..fc2db7c 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -66,19 +66,22 @@ struct _GVirDomainClass void (*resumed)(GVirDomain *dom); void (*updated)(GVirDomain *dom); void (*suspended)(GVirDomain *dom); + void (*pmsuspended)(GVirDomain *dom); - gpointer padding[20]; + gpointer padding[19]; }; typedef enum { - GVIR_DOMAIN_STATE_NONE = 0, /* no state */ - GVIR_DOMAIN_STATE_RUNNING = 1, /* the domain is running */ - GVIR_DOMAIN_STATE_BLOCKED = 2, /* the domain is blocked on resource */ - GVIR_DOMAIN_STATE_PAUSED = 3, /* the domain is paused by user */ - GVIR_DOMAIN_STATE_SHUTDOWN= 4, /* the domain is being shut down */ - GVIR_DOMAIN_STATE_SHUTOFF = 5, /* the domain is shut off */ - GVIR_DOMAIN_STATE_CRASHED = 6 /* the domain is crashed */ + GVIR_DOMAIN_STATE_NONE = 0, /* no state */ + GVIR_DOMAIN_STATE_RUNNING = 1, /* the domain is running */ + GVIR_DOMAIN_STATE_BLOCKED = 2, /* the domain is blocked on resource */ + GVIR_DOMAIN_STATE_PAUSED = 3, /* the domain is paused by user */ + GVIR_DOMAIN_STATE_SHUTDOWN= 4, /* the domain is being shut down */ + GVIR_DOMAIN_STATE_SHUTOFF = 5, /* the domain is shut off */ + GVIR_DOMAIN_STATE_CRASHED = 6, /* the domain is crashed */ + GVIR_DOMAIN_STATE_PMSUSPENDED = 7 /* the domain is suspended by guest + power management */ } GVirDomainState; -- 1.7.11.4

2 4

[libvirt] [PATCH] build: update gnulib for FreeBSD build
by Eric Blake 03 Oct '12

03 Oct '12

* .gnulib: Update to latest, for gcc 4.2 support and fixed FreeBSD tests. --- Pushing under the build-breaker rule; this fixes the problems I found on FreeBSD 8.2 during 'make check' with CFLAGS=-g. * .gnulib b493832...bc8b4e9 (6): > pselect: reject invalid file descriptors > select: reject invalid file descriptors > ptsname: reject invalid file descriptors > hash-pjw-bare: new module > manywarnings: cater to more gcc infelicities > select, poll tests: Make setsockopt invocation effective. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index b493832..bc8b4e9 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit b4938324b7113c9d73f8390d21f3ecbd842e74b9 +Subproject commit bc8b4e9f9d325e01d83e3ddff360a8b7d1f36cb3 -- 1.7.11.4

1 0

[libvirt] ipv6 related filtering through libvirt interfaces
by R P Herrold 03 Oct '12

03 Oct '12

Looking mid page at: http://libvirt.org/formatnwfilter.html#nwfelemsReservedVars I see that there are some un-implemented filtering variables for IPv6. Conspicuously absent is a variable set for the content handed out by radvd. The changes back at 0.8.0 [Apr 12 2010] seem to be the last time this area was touched [ The interaction of the dhcpd, a dhcp6d, and the radvd as to DNS server assignment is also on the horizon with the roll in of the systemd ] I used the search tool to look for a current 'ROADMAP' without getting meaningful results; The 'TODO' page is empty [1]; the patch queue page seems unmaintained [2]. I cannot find a 'roadmap' posting in my archive this year ;( With the exhaustion of 'easy' ipv4 space allocations, we are turning to deploying ipv6 only VM's, but finding that we are manually maintaining filtering rule sets, rather than handing them out in the XML configs Is there movement in this space 'behind the scenes'? Thank you -- Russ herrold [1] http://libvirt.org/todo.html [2] http://libvirt.org/pending.html

1 0

[libvirt] [PATCH] build: avoid -Wno-format on new-enough gcc
by Eric Blake 02 Oct '12

02 Oct '12

Commit c579d6b added a sledgehammer to silence spurious warnings from gcc 4.2, but in the process, it also silenced useful warnings from newer gcc (such as 4.4). As a result, a bug slipped in to commit 0caccb58. Tested with FreeBSD (gcc 4.2.1), RHEL 6.3 (gcc 4.4), and F17 (gcc 4.7.2). * m4/virt-compile-warnings.m4 (-Wno-format): Probe for the actual spurious message, to once again allow gcc 4.4 to use -Wformat. --- m4/virt-compile-warnings.m4 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index d1173eb..f1b8f39 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -60,6 +60,23 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall dontwarn="$dontwarn -Wenum-compare" + # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), + # which triggers spurious warnings for our usage + AC_CACHE_CHECK([whether gcc -Wformat allows NULL strings], + [lv_cv_gcc_wformat_null_works], [ + save_CFLAGS=$CFLAGS + CFLAGS='-Wunknown-pragmas -Werror -Wformat' + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <stddef.h> + static __attribute__ ((__format__ (__printf__, 1, 2))) int + foo (const char *fmt, ...) { return !fmt; } + ]], [[ + return foo(NULL); + ]])], + [lv_cv_gcc_wformat_null_works=yes], + [lv_cv_gcc_wformat_null_works=no]) + CFLAGS=$save_CFLAGS]) + # Gnulib uses '#pragma GCC diagnostic push' to silence some # warnings, but older gcc doesn't support this. AC_CACHE_CHECK([whether pragma GCC diagnostic push works], @@ -117,7 +134,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # ATTRIBUTE_FMT_PRINT, which causes -Wformat failure on our # intentional use of virReportError(code, NULL). gl_WARN_ADD([-Wno-format-nonliteral]) - if test $lv_cv_gcc_pragma_push_works = no; then + if test $lv_cv_gcc_wformat_null_works = no; then gl_WARN_ADD([-Wno-format]) fi -- 1.7.11.4

2 2

[libvirt] [PATCH] build: fix typo in debug message
by Eric Blake 02 Oct '12

02 Oct '12

Introduced in commit 0caccb58. CC libvirt_driver_qemu_impl_la-qemu_capabilities.lo ../../src/qemu/qemu_capabilities.c: In function 'qemuCapsInitQMP': ../../src/qemu/qemu_capabilities.c:2327:13: error: format '%d' expects argument of type 'int', but argument 8 has type 'const char *' [-Werror=format] * src/qemu/qemu_capabilities.c (qemuCapsInitQMP): Use correct format. --- Pushing under the build-breaker rule. src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 759f5bb..a5eb995 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2324,7 +2324,7 @@ cleanup: int rc; if ((rc = virPidFileReadPath(pidfile, &pid)) < 0) { - VIR_DEBUG("Failed to read pidfile %s: %d", + VIR_DEBUG("Failed to read pidfile %s: %s", pidfile, virStrerror(-rc, ebuf, sizeof(ebuf))); } else { VIR_DEBUG("Killing QMP caps process %lld", (long long) pid); -- 1.7.11.4

1 1

[libvirt] [PATCH] qemu: Kill processes used for QMP caps probing
by Jiri Denemark 02 Oct '12

02 Oct '12

Since libvirt switched to QMP capabilities probing recently, it starts QEMU process used for this probing with -daemonize, which means virCommandAbort can no longer reach these processes. As a result of that, restarting libvirtd will leave several new QEMU processes behind. Let's use QEMU's -pidfile and use it to kill the process when QMP caps probing is done. --- src/qemu/qemu_capabilities.c | 51 ++++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_capabilities.h | 5 +++-- src/qemu/qemu_driver.c | 4 +++- 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 20b350a..bfefa92 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -29,6 +29,8 @@ #include "virterror_internal.h" #include "util.h" #include "virfile.h" +#include "virpidfile.h" +#include "virprocess.h" #include "nodeinfo.h" #include "cpu/cpu.h" #include "domain_conf.h" @@ -214,6 +216,7 @@ struct _qemuCapsCache { virMutex lock; virHashTablePtr binaries; char *libDir; + char *runDir; }; @@ -2180,7 +2183,8 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) static int qemuCapsInitQMP(qemuCapsPtr caps, - const char *libDir) + const char *libDir, + const char *runDir) { int ret = -1; virCommandPtr cmd = NULL; @@ -2191,7 +2195,11 @@ qemuCapsInitQMP(qemuCapsPtr caps, virDomainChrSourceDef config; char *monarg = NULL; char *monpath = NULL; + char *pidfile = NULL; + /* the ".sock" sufix is important to avoid a possible clash with a qemu + * domain called "capabilities" + */ if (virAsprintf(&monpath, "%s/%s", libDir, "capabilities.monitor.sock") < 0) { virReportOOMError(); goto cleanup; @@ -2201,6 +2209,14 @@ qemuCapsInitQMP(qemuCapsPtr caps, goto cleanup; } + /* ".pidfile" suffix is used rather than ".pid" to avoid a possible clash + * with a qemu domain called "capabilities" + */ + if (virAsprintf(&pidfile, "%s/%s", runDir, "capabilities.pidfile") < 0) { + virReportOOMError(); + goto cleanup; + } + memset(&config, 0, sizeof(config)); config.type = VIR_DOMAIN_CHR_TYPE_UNIX; config.data.nix.path = monpath; @@ -2215,6 +2231,7 @@ qemuCapsInitQMP(qemuCapsPtr caps, "-nographic", "-M", "none", "-qmp", monarg, + "-pidfile", pidfile, "-daemonize", NULL); virCommandAddEnvPassCommon(cmd); @@ -2300,12 +2317,32 @@ cleanup: virCommandFree(cmd); VIR_FREE(monarg); VIR_FREE(monpath); + + if (pidfile) { + char ebuf[1024]; + pid_t pid; + int rc; + + if ((rc = virPidFileReadPath(pidfile, &pid)) < 0) { + VIR_DEBUG("Failed to read pidfile %s: %d", + pidfile, virStrerror(-rc, ebuf, sizeof(ebuf))); + } else { + VIR_DEBUG("Killing QMP caps process %lld", (long long) pid); + if (virProcessKill(pid, SIGKILL) < 0) + VIR_DEBUG("Failed to kill process %lld: %s", + (long long) pid, + virStrerror(errno, ebuf, sizeof(ebuf))); + } + unlink(pidfile); + VIR_FREE(pidfile); + } return ret; } qemuCapsPtr qemuCapsNewForBinary(const char *binary, - const char *libDir) + const char *libDir, + const char *runDir) { qemuCapsPtr caps = qemuCapsNew(); struct stat sb; @@ -2333,7 +2370,7 @@ qemuCapsPtr qemuCapsNewForBinary(const char *binary, goto error; } - if ((rv = qemuCapsInitQMP(caps, libDir)) < 0) + if ((rv = qemuCapsInitQMP(caps, libDir, runDir)) < 0) goto error; if (!caps->usedQMP && @@ -2373,7 +2410,7 @@ qemuCapsHashDataFree(void *payload, const void *key ATTRIBUTE_UNUSED) qemuCapsCachePtr -qemuCapsCacheNew(const char *libDir) +qemuCapsCacheNew(const char *libDir, const char *runDir) { qemuCapsCachePtr cache; @@ -2391,7 +2428,8 @@ qemuCapsCacheNew(const char *libDir) if (!(cache->binaries = virHashCreate(10, qemuCapsHashDataFree))) goto error; - if (!(cache->libDir = strdup(libDir))) { + if (!(cache->libDir = strdup(libDir)) || + !(cache->runDir = strdup(runDir))) { virReportOOMError(); goto error; } @@ -2420,7 +2458,7 @@ qemuCapsCacheLookup(qemuCapsCachePtr cache, const char *binary) if (!ret) { VIR_DEBUG("Creating capabilities for %s", binary); - ret = qemuCapsNewForBinary(binary, cache->libDir); + ret = qemuCapsNewForBinary(binary, cache->libDir, cache->runDir); if (ret) { VIR_DEBUG("Caching capabilities %p for %s", ret, binary); @@ -2459,6 +2497,7 @@ qemuCapsCacheFree(qemuCapsCachePtr cache) return; VIR_FREE(cache->libDir); + VIR_FREE(cache->runDir); virHashFree(cache->binaries); virMutexDestroy(&cache->lock); VIR_FREE(cache); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 89f351c..5d343c1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -163,7 +163,8 @@ typedef qemuCapsCache *qemuCapsCachePtr; qemuCapsPtr qemuCapsNew(void); qemuCapsPtr qemuCapsNewCopy(qemuCapsPtr caps); qemuCapsPtr qemuCapsNewForBinary(const char *binary, - const char *libDir); + const char *libDir, + const char *runDir); int qemuCapsProbeQMP(qemuCapsPtr caps, qemuMonitorPtr mon); @@ -201,7 +202,7 @@ int qemuCapsGetMachineTypesCaps(qemuCapsPtr caps, bool qemuCapsIsValid(qemuCapsPtr caps); -qemuCapsCachePtr qemuCapsCacheNew(const char *libDir); +qemuCapsCachePtr qemuCapsCacheNew(const char *libDir, const char *runDir); qemuCapsPtr qemuCapsCacheLookup(qemuCapsCachePtr cache, const char *binary); qemuCapsPtr qemuCapsCacheLookupCopy(qemuCapsCachePtr cache, const char *binary); void qemuCapsCacheFree(qemuCapsCachePtr cache); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b0a0bb5..55d8027 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -767,7 +767,9 @@ qemudStartup(int privileged) { if (qemuSecurityInit(qemu_driver) < 0) goto error; - if ((qemu_driver->capsCache = qemuCapsCacheNew(qemu_driver->libDir)) == NULL) + qemu_driver->capsCache = qemuCapsCacheNew(qemu_driver->libDir, + qemu_driver->stateDir); + if (!qemu_driver->capsCache) goto error; if ((qemu_driver->caps = qemuCreateCapabilities(qemu_driver)) == NULL) -- 1.7.12

2 2

[libvirt] installing libvirt
by Felipe Oliveira Gutierrez 02 Oct '12

02 Oct '12

Hi everyone, I am new using libvirt, Do I have to install libvirt-0.10.2.tar.gz alone, or I need to install libvirt-java-0.4.9.tar.gz after to developing codes using java? I runned "# ant build" from libvirt-java-0.4.9, and got this: Buildfile: /libvirt-java-0.4.9/build.xml init: [copy] Copying 1 file to /libvirt-java-0.4.9 build: [javac] /libvirt-java-0.4.9/build.xml:42: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds [javac] /libvirt-java-0.4.9/build.xml:43: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds BUILD SUCCESSFUL On the README file he asks: 2. You must have the libvirt.jar file in your classpath. By default the installs it to /usr/share/java/0.4.9.jar But I don't find the libvirt.jar file to copy. Does anyone can help me please? Bets Regards, Felipe -- *-- Felipe Oliveira Gutierrez* *-- **lipe.82(a)gmail.com* <lipe.82(a)gmail.com> *-- https://sites.google.com/site/lipe82/Home/diaadia*

2 2