- Devel - libvirt List Archives

[libvirt] [PATCH] autobuild.sh: Fix minor shell-quoting bugs.
by Jim Meyering 22 Aug '08

22 Aug '08

I noticed some minor quoting problems in ovirt's autobuild.sh, and since part of that code came from here, ... Here's a patch: >From 50c37706729b7748dbf92290c6ecf6bc3982f681 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Aug 2008 17:55:19 +0200 Subject: [PATCH] autobuild.sh: Fix minor shell-quoting bugs. * autobuild.sh: Remove unnecessary quotes. Don't choke on a file name argument containing a space. Don't misbehave for $AUTOBUILD_INSTALL_ROOT containing a shell meta-character. --- autobuild.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index ce12692..7ae5d1e 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -5,7 +5,7 @@ set -v # Make things clean. -test -n "$1" && RESULTS="$1" || RESULTS="results.log" +test -n "$1" && RESULTS=$1 || RESULTS=results.log test -f Makefile && make -k distclean || : rm -rf coverage @@ -14,7 +14,7 @@ rm -rf coverage #mkdir build #cd build -./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT \ +./autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ --enable-test-coverage \ --enable-compile-warnings=error \ --with-openvz \ @@ -25,8 +25,8 @@ make make install set -o pipefail -make check 2>&1 | tee $RESULTS -make syntax-check 2>&1 | tee -a $RESULTS +make check 2>&1 | tee "$RESULTS" +make syntax-check 2>&1 | tee -a "$RESULTS" test -x /usr/bin/lcov && make cov rm -f *.tar.gz -- 1.6.0.90.g436ed

2 1

RE: [libvirt] Using Xen config files
by Matthew Donovan 22 Aug '08

22 Aug '08

I'm still having problems with this. I've dug around and found errors in the qemu-dm log. When I try to start the VM with libvirt, the error I'm getting is: "xs_read(/vm/414e73de-cf1e-487c-87e0-d4ebf7a23576/rtc/timeoffset): read error" I did a xenstore-ls on the /vm/414e73de-cf1e-487c-87e0-d4ebf7a23576 directory and sure enough, rtc/timeoffset is not there. When I start the VM with the Xen config file I used to generate the XML the rtc/timeoffset is there (timeoffset is set to "0"). Is there a way to set that in the XML? I didn't see it in the online XML description. I'm using a slightly different XML description than I had originally so I've included here (along with the Xen Config file) Thanks! -matthew const char* foo = "<domain type='xen'>" "<name>LinuxVM</name>" "<uuid>414e73de-cf1e-487c-87e0-d4ebf7a23576</uuid>" "<os>" "<type>hvm</type>" "<loader>/usr/lib/xen/boot/hvmloader</loader>" "<boot dev='hd'/>" "</os>" "<memory>512000</memory>" "<vcpu>1</vcpu>" "<on_shutdown>shutdown</on_shutdown>" "<on_reboot>restart</on_reboot>" "<on_crash>restart</on_crash>" "<features>" "<pae/>" "<acpi/>" "<apic/>" "</features>" "<clock sync='localtime'/>" "<devices>" "<emulator>/usr/lib/xen/bin/qemu-dm</emulator>" "<disk type='block'>" "<source dev='/dev/vgvms/LinuxVM'/>" "<target dev='hda'/>" "</disk>" "<interface type='ioemu'>" "<mac address='7A:AB:D0:01:82:98'/>" "</interface>" "<input type='tablet' bus='usb'/>" "<graphics type='sdl' password=''/>" "<serial type='pty'/>" "</devices>" "</domain>"; //serial = "pty" int main (int argc, char** argv) { virConnectPtr con; /* connection to the Xen hypervisor */ virDomainPtr domain; virInitialize(); con = virConnectOpen ("xen:///"); if (!con) { virErrorPtr err = virGetLastError (); printf ("virConnectOpen failed: %s\n", err->message); return -1; } domain = virDomainDefineXML (con, foo); if (!domain) { virErrorPtr err = virConnGetLastError (con); printf ("virDomainDefineXML failed: %s\n", err->message); } else { if (virDomainCreate (domain) < 0) { virErrorPtr err = virConnGetLastError (con); printf ("virDomainCreate failed: %s\n", err->message); } else { virDomainInfo info = {0}; virDomainGetInfo (domain, &info); printf ("state = %d\n", info.state); getchar (); } } virConnectClose (con); return 0; } # Automatically generated xen config file name = "LinuxVM" builder = "hvm" memory = "500" disk = [ 'phy:/dev/vgvms/LinuxVM,hda,w', ] vif = [ 'type=ioemu, mac=7A:AB:D0:01:82:98', ] uuid = "414e73de-cf1e-487c-87e0-d4ebf7a23576" device_model = "/usr/lib/xen/bin/qemu-dm" kernel = "/usr/lib/xen/boot/hvmloader" vnc=1 vnc=0 sdl=1 stdvga=0 boot="cda" usbdevice="tablet" vncunused=1 apic=1 acpi=1 pae=1 vcpus=1 serial = "pty" on_reboot = 'restart' on_crash = 'restart' > -----Original Message----- > From: Daniel P. Berrange [mailto:berrange@redhat.com] > Sent: Wednesday, August 20, 2008 1:05 PM > To: Richard W.M. Jones > Cc: Matthew Donovan; libvir-list(a)redhat.com > Subject: Re: [libvirt] Using Xen config files > > On Wed, Aug 20, 2008 at 04:44:04PM +0100, Richard W.M. Jones wrote: > > On Wed, Aug 20, 2008 at 11:35:17AM -0400, Matthew Donovan wrote: > > > > It certainly looks OK, and it seems like the domain should run after > > virDomainCreate. Have you tried adding a delay of 30 > seconds just to > > check if the domain is starting up slowly? > > Yep, that debug suggests the libvirt part of creation has > completed OK. > I think if anything is going wrong, its going to be in XenD's > arena. I'd > recommend looking in /var/log/xen for any further hints of trouble > > Daniel > -- > |: Red Hat, Engineering, London -o- > http://people.redhat.com/berrange/ :| > |: http://libvirt.org -o- http://virt-manager.org -o- > http://ovirt.org :| > |: http://autobuild.org -o- > http://search.cpan.org/~danberr/ :| > |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF > F742 7D3B 9505 :| >

2 1

Re: [libvirt] Libvirt Xen daemon interaction in Red Hat Enterprise with virtualization
by vaibhav chugh 21 Aug '08

21 Aug '08

Thanks a lot for the reply. I checked the setting in my config file and they look correct as specified by the webpage. I am able to connect to the unix socket but my login to xend is failing. What I am looking for is the exact function call that is made by libvirt to connect to xen daemon. i.e. the function that makes libvirt send out xml RPC message for xend to read. session.login_with_password() is not supported by xenAPI version being used in Red Hat. Please help me with the substitute of this method in Red Hat. Thanks Vaibhav > > > > On Wed, Aug 20, 2008 at 10:18 AM, Daniel P. Berrange <berrange(a)redhat.com>wrote: > >> On Wed, Aug 20, 2008 at 10:15:49AM -0700, vaibhav chugh wrote: >> > Hi, >> > >> > I am new to libvirt and I am trying to figure out that how libvert >> connects >> > to Xend in Red Hat Enterprise with virtualization. I read a few posts >> but >> > was not able to find this out. >> > >> > The eariler versions of Xen were using xen_session_login_with_password() >> > function call to connect to Xen daemon but I am not able to find >> anything >> > similar to this in libvirt. >> >> Libvirt talks to XenD using its UNIX socket, and SEXPR interface. This >> page gives a quick list of config settings you need in XenD to make it >> work with libvirt: >> >> http://libvirt.org/drvxen.html >> >> Daniel >> -- >> |: Red Hat, Engineering, London -o- >> http://people.redhat.com/berrange/ :| >> |: http://libvirt.org -o- http://virt-manager.org -o- >> http://ovirt.org :| >> |: http://autobuild.org -o- >> http://search.cpan.org/~danberr/ <http://search.cpan.org/%7Edanberr/> :| >> |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 >> :| >> > > > > -- > Vaibhav Chugh >

4 3

[libvirt] Bug: Libvirt java : Connect domainDefineXML shows no effect, listDefinedDomains throws exception
by Thomas Fricke 21 Aug '08

21 Aug '08

Hi everybody in the libvirt java binding the the Connect method domainDefineXML() seems to have no effect. Implementing a full lifecycle junit test for the virtual machine this method does not have any result. Perhaps related: listDefinedDomains shows empty result If at least one domain is running, listDomains show correctly the virtual machine. Anybody going to fix this? Cheers, Thomas

2 1

[libvirt] PATCH: Add libvirt_lxc to specfile
by Daniel P. Berrange 21 Aug '08

21 Aug '08

FYI, just committed this change to fix the broken build last night Daniel Index: libvirt.spec.in =================================================================== RCS file: /data/cvs/libvirt/libvirt.spec.in,v retrieving revision 1.90 diff -u -p -r1.90 libvirt.spec.in --- libvirt.spec.in 20 Aug 2008 13:16:29 -0000 1.90 +++ libvirt.spec.in 21 Aug 2008 08:50:24 -0000 @@ -3,6 +3,8 @@ %define with_xen 1 %define with_xen_proxy 1 %define with_qemu 1 +%define with_openvz 1 +%define with_lxc 1 %define with_polkit 0 # Xen is available only on i386 x86_64 ia64 @@ -152,8 +154,18 @@ of recent versions of Linux (and other O %define _without_qemu --without-qemu %endif +%if ! %{with_openvz} +%define _without_openvz --without-openvz +%endif + +%if ! %{with_lxc} +%define _without_lxc --without-lxc +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ + %{?_without_openvz} \ + %{?_without_lxc} \ --with-init-script=redhat \ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ --with-remote-file=%{_localstatedir}/run/libvirtd.pid @@ -248,6 +260,9 @@ fi %attr(4755, root, root) %{_libexecdir}/libvirt_proxy %endif %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper +%if %{with_openvz} +%attr(0755, root, root) %{_libexecdir}/libvirt_lxc +%endif %attr(0755, root, root) %{_sbindir}/libvirtd %doc docs/*.rng %doc docs/*.xml -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] virsh/virt-install for dummies
by Jun Koi 21 Aug '08

21 Aug '08

Hi, I am frustrated searching for a quick-start documentation for virsh, just to no avail. Any help is greatly appreciated! Here is what I did: - Compile and install libvirt, virt-manager, virt-install and virt-viewer from source code. This is done (on Ubuntu 8.04). - Now I want to do install a new VM with QEMU or KVM. I got the below error with virt-install: # virt-install -c qemu:///system --name jeos2 --ram 500 --file img.jeos2 --cdrom jeos-8.04.1-jeos-i386.iso Fri, 15 Aug 2008 19:19:10 ERROR virConnectOpen() failed Traceback (most recent call last): File "/usr/bin/virt-install", line 496, in <module> main() File "/usr/bin/virt-install", line 345, in main conn = cli.getConnection(options.connect) File "/usr/lib/python2.5/site-packages/virtinst/cli.py", line 92, in getConnection return libvirt.open(connect) File "/usr/lib/python2.5/site-packages/libvirt.py", line 139, in open if ret is None:raise libvirtError('virConnectOpen() failed') libvirtError: virConnectOpen() failed How to fix this? Perhaps I need to run libvirtd before using virsh??? What frustrates me is that there seems no documentation about this process at libvirt.org at all (?). Final question: I have an old QEMU image. How to "import" it to virsh script? Is there any easy way to do that? Thanks, Jun

4 16

[libvirt] Libvirt Xen daemon interaction in Red Hat Enterprise with virtualization
by vaibhav chugh 20 Aug '08

20 Aug '08

Hi, I am new to libvirt and I am trying to figure out that how libvert connects to Xend in Red Hat Enterprise with virtualization. I read a few posts but was not able to find this out. The eariler versions of Xen were using xen_session_login_with_password() function call to connect to Xen daemon but I am not able to find anything similar to this in libvirt. Please help me with the functions or the area of source code which are being used by libvirt to make the connections. Thanks Vaibhav

2 1

RE: [libvirt] Using Xen config files
by Matthew Donovan 20 Aug '08

20 Aug '08

Thanks for the quick reply! I set the LIBVIRT_DEBUG flag to 1 and ran it again. (The output is below.) One other thing I can think to mention is that I'm using version 0.4.4-2, installed with yum. Maybe I should try compiling and installing from source? Thanks again! -matthew [root@grape ~]$ gcc -g virt_test.c -lvirt && ./a.out DEBUG: libvirt.c: virInitialize (register drivers) DEBUG: xen_internal.c: xenHypervisorInit (Using new hypervisor call: 30001 ) DEBUG: xen_internal.c: xenHypervisorInit (Using hypervisor call v2, sys ver3 dom ver5 ) DEBUG: libvirt.c: virConnectOpen (name=xen:///) DEBUG: libvirt.c: do_open (name "xen:///" to URI components: scheme xen opaque (null) authority (null) server (null) user (null) port 0 path / ) DEBUG: libvirt.c: do_open (trying driver 0 (Test) ...) DEBUG: libvirt.c: do_open (driver 0 Test returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 1 (QEMU) ...) DEBUG: libvirt.c: do_open (driver 1 QEMU returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 2 (Xen) ...) DEBUG: xen_unified.c: xenUnifiedOpen (Trying hypervisor sub-driver) DEBUG: xen_unified.c: xenUnifiedOpen (Activated hypervisor sub-driver) DEBUG: xen_unified.c: xenUnifiedOpen (Trying XenD sub-driver) DEBUG: xen_unified.c: xenUnifiedOpen (Activated XenD sub-driver) DEBUG: xen_unified.c: xenUnifiedOpen (Trying XS sub-driver) DEBUG: xen_unified.c: xenUnifiedOpen (Activated XS sub-driver) DEBUG: libvirt.c: do_open (driver 2 Xen returned SUCCESS) DEBUG: libvirt.c: do_open (network driver 0 Test returned DECLINED) DEBUG: libvirt.c: do_open (network driver 1 QEMU returned DECLINED) DEBUG: remote_internal.c: doRemoteOpen (proceeding with name = xen:///) DEBUG: libvirt.c: do_open (network driver 2 remote returned SUCCESS) DEBUG: libvirt.c: do_open (storage driver 0 Test returned DECLINED) DEBUG: libvirt.c: do_open (storage driver 1 storage returned DECLINED) DEBUG: libvirt.c: do_open (storage driver 2 remote returned SUCCESS) DEBUG: libvirt.c: virDomainDefineXML (conn=0x96fe478, xml=<domain type='xen'><name>fc8.conf</name><os><type>hvm</type><loader>/usr/lib/xen/boo t/hvmloader</loader><boot dev='hd'/></os><memory>1024</memory><vcpu>1</vcpu><on_poweroff>destroy</on_p oweroff><on_reboot>restart</on_reboot><on_crash>restart</on_crash><features> <pae/><acpi/><apic/></features><clock sync="localtime"/><devices><emulator>/usr/lib/xen/bin/qemu-dm</emulator><int erface type='bridge'><source bridge='xenbr0'/><script path='vif-bridge'/></interface><disk type='block'><source dev='/dev/vgvms/fc8'/><target dev='hda'/></disk><disk type='block' device='cdrom'><source dev='/dev/cdrom'/><target dev='hdc'/><readonly/></disk><graphics type='vnc'/></devices></domain>) DEBUG: libvirt.c: virDomainLookupByName (conn=0x96fe478, name=fc8.conf) DEBUG: hash.c: __virGetDomain (New hash entry 0x9702a18) DEBUG: libvirt.c: virDomainCreate (domain=0x9702a18) DEBUG: libvirt.c: virDomainGetInfo (domain=0x9702a18, info=0xbfa2b658) state = 0 DEBUG: libvirt.c: virConnectClose (conn=0x96fe478) DEBUG: hash.c: virUnrefConnect (unref connection 0x96fe478 xen:/// 2) > -----Original Message----- > From: Richard W.M. Jones [mailto:rjones@redhat.com] > Sent: Wednesday, August 20, 2008 9:49 AM > To: Matthew Donovan > Cc: libvir-list(a)redhat.com > Subject: Re: [libvirt] Using Xen config files > > On Wed, Aug 20, 2008 at 08:35:46AM -0400, Matthew Donovan wrote: > > I am trying to programmatically start Xen guest VMs (HVM) > with libvirt (on > > Fedora Core 8) and I'm having some trouble with it. I've > included my code > > below. Essentially, the domain seems to get created > correctly but it > > doesn't seem to run. > > > > I don't receive any error messages from the libvirt > > functions but the VM does not get any CPU time (as shown > with "xm list"). > > > > [root@grape ~]$ xm list > > Name ID Mem VCPUs > State > > Time(s) > > Domain-0 0 1462 2 > r----- > > 1313.5 > > fc8.conf 7 128 1 > ------ > > 0.0 > > > > Can someone explain what I'm doing wrong here? I've tried > to get this > > working with linux and windows guests with the same results. > > That's really strange. Your program looks correct to me (but see my > comment about error handling below). One thing you can do is to run > your program after first setting the environment variable > LIBVIRT_DEBUG=1 which will cause all calls to libvirt to be printed > out. Just to make sure you are actually calling the functions that > you think you are calling. > > > I've seen references on this mailing list to libvirt's > ability to handle Xen > > configuration files but I haven't seen anything in the API > documentation or > > public header files that refer to it. Is there a public > interface to > > specifying a configuration file? > > No there isn't. This ability refers to old versions of Xen which used > /etc/xen. We have a driver that can parse files from here and present > those as inactive ("defined" but not running) domains, eg. when you > do "virsh list". > > For all other uses, use the libvirt XML configuration format. The > advantage is that it will keep working with other types of > virtualization. > > > domain = virDomainDefineXML (con, fedora); > > if (!domain) { > > virErrorPtr err = virGetLastError (); > > printf ("virDomainDefineXML failed: %s\n", > > err->message); > > By the way, this error reporting is wrong. Confusingly there are two > levels of errors stored by virterror, a global error and a > per-connection error. The global error is only used where you don't > have a virConnectPtr object (almost the only time is just after > virConnectOpen fails, when conn == NULL). The rest of the time you > should use virConnGetLastError: > > http://libvirt.org/html/libvirt-virterror.html#virConnGetLastError > > Rich. > > -- > Richard Jones, Emerging Technologies, Red Hat > http://et.redhat.com/~rjones > virt-top is 'top' for virtual machines. Tiny program with many > powerful monitoring features, net stats, disk stats, logging, etc. > http://et.redhat.com/~rjones/virt-top >

3 2

[libvirt] libvirt-java: change org.libvirt.Error implementing Serializable
by Daniel Schwager 20 Aug '08

20 Aug '08

Hi java-api-team (-: could you please let org.libvirt.Error implements the serializable interface ? Exceptions (and the content like org.libvirt.Error) should be serializable. I got an exception on my host system connected via RMI to the client-system running libvirt-java (libvirt-java, cvs-snapshot 2008-08-18) like this: ------------------------------------------------ ... cause:java.rmi.UnmarshalException: Error unmarshaling return; nested exception is: java.io.WriteAbortedException: writing aborted; java.io.NotSerializableException: org.libvirt.Error package org.libvirt; ------------------------------------------------ public class Error { VIR_FROM_NONE, /** * Error at Xen hypervisor layer */ VIR_FROM_XEN, ------------------------------------------------ thank you very much regards Danny ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

2 3

RE: [libvirt] Using Xen config files
by Matthew Donovan 20 Aug '08

20 Aug '08

Found it! I added serial and console devices to the XML and it appears to be running. It's not working completely as expcted but it's doing more than it was. Thanks for your help. -matthew > -----Original Message----- > From: Richard W.M. Jones [mailto:rjones@redhat.com] > Sent: Wednesday, August 20, 2008 11:44 AM > To: Matthew Donovan > Cc: libvir-list(a)redhat.com > Subject: Re: [libvirt] Using Xen config files > > On Wed, Aug 20, 2008 at 11:35:17AM -0400, Matthew Donovan wrote: > > Thanks for the quick reply! > > > > I set the LIBVIRT_DEBUG flag to 1 and ran it again. (The > output is below.) > [...] > > [root@grape ~]$ gcc -g virt_test.c -lvirt && ./a.out > > DEBUG: libvirt.c: virInitialize (register drivers) > > DEBUG: xen_internal.c: xenHypervisorInit (Using new > hypervisor call: 30001 > > ) > > DEBUG: xen_internal.c: xenHypervisorInit (Using hypervisor > call v2, sys ver3 > > dom ver5 > > ) > > DEBUG: libvirt.c: virConnectOpen (name=xen:///) > > DEBUG: libvirt.c: do_open (name "xen:///" to URI components: > > scheme xen > > opaque (null) > > authority (null) > > server (null) > > user (null) > > port 0 > > path / > > ) > > DEBUG: libvirt.c: do_open (trying driver 0 (Test) ...) > > DEBUG: libvirt.c: do_open (driver 0 Test returned DECLINED) > > DEBUG: libvirt.c: do_open (trying driver 1 (QEMU) ...) > > DEBUG: libvirt.c: do_open (driver 1 QEMU returned DECLINED) > > DEBUG: libvirt.c: do_open (trying driver 2 (Xen) ...) > > DEBUG: xen_unified.c: xenUnifiedOpen (Trying hypervisor sub-driver) > > DEBUG: xen_unified.c: xenUnifiedOpen (Activated hypervisor > sub-driver) > > DEBUG: xen_unified.c: xenUnifiedOpen (Trying XenD sub-driver) > > DEBUG: xen_unified.c: xenUnifiedOpen (Activated XenD sub-driver) > > DEBUG: xen_unified.c: xenUnifiedOpen (Trying XS sub-driver) > > DEBUG: xen_unified.c: xenUnifiedOpen (Activated XS sub-driver) > > DEBUG: libvirt.c: do_open (driver 2 Xen returned SUCCESS) > > DEBUG: libvirt.c: do_open (network driver 0 Test returned DECLINED) > > DEBUG: libvirt.c: do_open (network driver 1 QEMU returned DECLINED) > > DEBUG: remote_internal.c: doRemoteOpen (proceeding with > name = xen:///) > > DEBUG: libvirt.c: do_open (network driver 2 remote returned SUCCESS) > > DEBUG: libvirt.c: do_open (storage driver 0 Test returned DECLINED) > > DEBUG: libvirt.c: do_open (storage driver 1 storage > returned DECLINED) > > DEBUG: libvirt.c: do_open (storage driver 2 remote returned SUCCESS) > > DEBUG: libvirt.c: virDomainDefineXML (conn=0x96fe478, xml=<domain > > > type='xen'><name>fc8.conf</name><os><type>hvm</type><loader>/u > sr/lib/xen/boo > > t/hvmloader</loader><boot > > > dev='hd'/></os><memory>1024</memory><vcpu>1</vcpu><on_poweroff > >destroy</on_p > > > oweroff><on_reboot>restart</on_reboot><on_crash>restart</on_cr > ash><features> > > <pae/><acpi/><apic/></features><clock > > > sync="localtime"/><devices><emulator>/usr/lib/xen/bin/qemu-dm< > /emulator><int > > erface type='bridge'><source bridge='xenbr0'/><script > > path='vif-bridge'/></interface><disk type='block'><source > > dev='/dev/vgvms/fc8'/><target dev='hda'/></disk><disk type='block' > > device='cdrom'><source dev='/dev/cdrom'/><target > > dev='hdc'/><readonly/></disk><graphics > type='vnc'/></devices></domain>) > > DEBUG: libvirt.c: virDomainLookupByName (conn=0x96fe478, > name=fc8.conf) > > DEBUG: hash.c: __virGetDomain (New hash entry 0x9702a18) > > DEBUG: libvirt.c: virDomainCreate (domain=0x9702a18) > > DEBUG: libvirt.c: virDomainGetInfo (domain=0x9702a18, > info=0xbfa2b658) > > state = 0 > > DEBUG: libvirt.c: virConnectClose (conn=0x96fe478) > > DEBUG: hash.c: virUnrefConnect (unref connection 0x96fe478 > xen:/// 2) > > It certainly looks OK, and it seems like the domain should run after > virDomainCreate. Have you tried adding a delay of 30 seconds just to > check if the domain is starting up slowly? > > Dan & Dan, any ideas? > > Rich. > > -- > Richard Jones, Emerging Technologies, Red Hat > http://et.redhat.com/~rjones > virt-df lists disk usage of guests without needing to install any > software inside the virtual machine. Supports Linux and Windows. > http://et.redhat.com/~rjones/virt-df/ >

1 0

[libvirt] networking
by James Bardin 20 Aug '08

20 Aug '08

Hello, I'm having trouble digging up some documentation on libvirt's network config. I'm not sure where to set this up, but I have a bridged device br0 that I would like to have available in virt-manager/virsh. Right now, I can edit the VM's xml interface element manually to use br0. Virt-manager has an option for shared physical device, but it's empty, and I can't figure out how to see it from virsh. thanks -jim

4 8

[libvirt] Using Xen config files
by Matthew Donovan 20 Aug '08

20 Aug '08

I am trying to programmatically start Xen guest VMs (HVM) with libvirt (on Fedora Core 8) and I'm having some trouble with it. I've included my code below. Essentially, the domain seems to get created correctly but it doesn't seem to run. I don't receive any error messages from the libvirt functions but the VM does not get any CPU time (as shown with "xm list"). [root@grape ~]$ xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1462 2 r----- 1313.5 fc8.conf 7 128 1 ------ 0.0 Can someone explain what I'm doing wrong here? I've tried to get this working with linux and windows guests with the same results. I've seen references on this mailing list to libvirt's ability to handle Xen configuration files but I haven't seen anything in the API documentation or public header files that refer to it. Is there a public interface to specifying a configuration file? Thanks -matthew CODE: #include <stdio.h> #include <libvirt/libvirt.h> #include <libvirt/virterror.h> //"" //"<graphics type='vnc' port='5904'/>" const char* fedora = "<domain type='xen'>" "<name>fc8.conf</name>" "<os>" "<type>hvm</type>" "<loader>/usr/lib/xen/boot/hvmloader</loader>" "<boot dev='hd'/>" "</os>" "<memory>1024</memory>" "<vcpu>1</vcpu>" "<on_poweroff>destroy</on_poweroff>" "<on_reboot>restart</on_reboot>" "<on_crash>restart</on_crash>" "<features>" "<pae/>" "<acpi/>" "<apic/>" "</features>" "<clock sync=\"localtime\"/>" "<devices>" "<emulator>/usr/lib/xen/bin/qemu-dm</emulator>" "<interface type='bridge'>" "<source bridge='xenbr0'/>" "<script path='vif-bridge'/>" "</interface>" "<disk type='block'>" "<source dev='/dev/vgvms/fc8'/>" "<target dev='hda'/>" "</disk>" "<disk type='block' device='cdrom'>" "<source dev='/dev/cdrom'/>" "<target dev='hdc'/>" "<readonly/>" "</disk>" "<graphics type='vnc'/>" "</devices>" "</domain>"; int main (int argc, char** argv) { virConnectPtr con; /* connection to the Xen hypervisor */ virDomainPtr domain; virInitialize(); con = virConnectOpen ("xen:///"); if (!con) { virErrorPtr err = virGetLastError (); printf ("virConnectOpen failed: %s\n", err->message); return -1; } domain = virDomainDefineXML (con, fedora); if (!domain) { virErrorPtr err = virGetLastError (); printf ("virDomainDefineXML failed: %s\n", err->message); } else { if (virDomainCreate (domain) < 0) { virErrorPtr err = virGetLastError (); printf ("virDomainCreate failed: %s\n", err->message); } else { virDomainInfo info = {0}; virDomainGetInfo (domain, &info); printf ("state = %d\n", info.state); } } virConnectClose (con); return 0; }

2 1

[libvirt] [PATCH] manage number of virtual CPUs
by Evgeniy Sokolov 20 Aug '08

20 Aug '08

OpenVZ containers use all CPUs available in system by default. Limitations may be caused only by Linux kernel limitation. There is way to artificially limit number of CPUs. patch add cpu management functionality to OpenVZ driver.

3 3

[libvirt] [PATCH] Ignore specified target path when creating logical vol
by Cole Robinson 20 Aug '08

20 Aug '08

Specifying a target path when creating a storage volume has no effect, since volumes only really use the pool's target path and 'name' field to establish the volume's target. Logical volumes expect a target path to be passed, and it can only cause problems. The attached patch erases the passed target volume and fills it in with the one generated from the create operation. Thanks, Cole

3 2

[libvirt] [PATCH] Fix size reporting for disk pools without partitions
by Cole Robinson 20 Aug '08

20 Aug '08

The attached patch updates parthelper to print size information for a disk device if it doesn't have any allocated partitions. The current code starts by requesting the first partition, then iterating from there. But if there is no first partition, that whole info reporting thing never happens :) Seems to produce desired results for partitioned and unpartitioned devices. Thanks, Cole

3 2

[libvirt] Question about html file in docs
by Atsushi SAKAI 20 Aug '08

20 Aug '08

Hi, I think html files in docs directory are redundunt. It is because html file is created by html.in. May I remove these files? Or are there any reason about staying these files? Thanks Atsushi SAKAI

4 10

[libvirt] qemud/.libs/libvirtd?
by Jun Koi 20 Aug '08

20 Aug '08

Hi, I added some new code to libvirt.c, and recompile. However, when "make install". qemud/.libs/libvirtd is installed but not qemud/libvirtd. Why? Looks like a bug? The problem is that qemud/libvirtd has my new code, but not qemud/.libs/libvirtd! So "make install" installs the old binary, which I dont know where it is from. (Perhaps from the first compilation?) I am not familiar with the autoconf Makefile, and cannot figure it out why it is working this way. Many thanks, Jun

4 7

[libvirt] On shutdown Destroy/Delete
by Stefan de Konink 20 Aug '08

20 Aug '08

Hi, I would really like to know how I can make a defined domain *gone* after shutdown :) (instead of it still be defined, after shutdown) Stefan

4 5

[libvirt] Use existing QEMU image with libvirt?
by Jun Koi 19 Aug '08

19 Aug '08

Hi, I have some existing QEMU images. Now I want to use it with libvirt/virsh. Is there any easy way to do that? I suppose that we need an XML file for each image, but dont want to craft them from scratch. Thanks, Jun

2 1

[libvirt] PATCH: Improve some remote driver error messages
by Daniel P. Berrange 19 Aug '08

19 Aug '08

Bug reports from users have shown diagnosing problems with the remote driver are quite tricky, so I've been looking at improving its error messages where possible. There's a number of places where we simply pass in strerror(errno) as the only data in virRaiseError. This doesn't let us narrow down just which call failed - we just get a generic message "Permission denied" or "Connection refused" with no clue what was being tried. This patch adds descriptive error messages whereever possible, fixes a place where we'd report an error to connect to IPv4 even if IPv6 succeeded, and adds some missing translations Before $ virsh --connect qemu:///system libvir: Remote error : Permission denied $ virsh --connect qemu+tcp:///system libvir: Remote error : Connection refused $ virsh --connect qemu+tcp://wibble/system libvir: Remote error : invalid argument in Name or service not known After $ ./src/virsh --connect qemu:///system libvir: Remote error : unable to connect to '/var/run/libvirt/libvirt-sock': Permission denied $ ./src/virsh --connect qemu+tcp:///system libvir: Remote error : unable to connect to 'localhost': Connection refused $ ./src/virsh --connect qemu+tcp://wibble/system libvir: Remote error : unable to resolve hostname 'wibble': Name or service not known Daniel Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.80 diff -u -r1.80 remote_internal.c --- src/remote_internal.c 26 Jun 2008 09:37:51 -0000 1.80 +++ src/remote_internal.c 19 Aug 2008 10:36:32 -0000 @@ -371,13 +371,12 @@ priv->hostname = strdup (uri->server ? uri->server : "localhost"); - if (!priv->hostname) { - error (NULL, VIR_ERR_NO_MEMORY, _("allocating priv->hostname")); - goto failed; - } + if (!priv->hostname) + goto out_of_memory; if (uri->user) { username = strdup (uri->user); - if (!username) goto out_of_memory; + if (!username) + goto out_of_memory; } /* Get the variables from the query string. @@ -491,12 +490,15 @@ // http://people.redhat.com/drepper/userapi-ipv6.html struct addrinfo *res, *r; struct addrinfo hints; + int saved_errno = EINVAL; memset (&hints, 0, sizeof hints); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_ADDRCONFIG; int e = getaddrinfo (priv->hostname, port, &hints, &res); if (e != 0) { - error (conn, VIR_ERR_INVALID_ARG, gai_strerror (e)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to resolve hostname '%s': %s"), + priv->hostname, gai_strerror (e)); goto failed; } @@ -516,7 +518,7 @@ priv->sock = socket (r->ai_family, SOCK_STREAM, 0); if (priv->sock == -1) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (socket_errno ())); + saved_errno = socket_errno(); continue; } @@ -526,7 +528,7 @@ sizeof no_slow_start); if (connect (priv->sock, r->ai_addr, r->ai_addrlen) == -1) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (socket_errno ())); + saved_errno = socket_errno(); close (priv->sock); continue; } @@ -545,6 +547,9 @@ } freeaddrinfo (res); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to connect to '%s': %s"), + priv->hostname, strerror (saved_errno)); goto failed; tcp_connected: @@ -563,23 +568,23 @@ uid_t uid = getuid(); if (!(pw = getpwuid(uid))) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to lookup user '%d': %s"), + uid, strerror (errno)); goto failed; } if (asprintf (&sockname, "@%s" LIBVIRTD_USER_UNIX_SOCKET, pw->pw_dir) < 0) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); - goto failed; + sockname = NULL; + goto out_of_memory; } } else { if (flags & VIR_DRV_OPEN_REMOTE_RO) sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET_RO); else sockname = strdup (LIBVIRTD_PRIV_UNIX_SOCKET); - if (sockname == NULL) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); - goto failed; - } + if (sockname == NULL) + goto out_of_memory; } } @@ -598,7 +603,9 @@ autostart_retry: priv->sock = socket (AF_UNIX, SOCK_STREAM, 0); if (priv->sock == -1) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to create socket %s"), + strerror (errno)); goto failed; } if (connect (priv->sock, (struct sockaddr *) &addr, sizeof addr) == -1) { @@ -620,7 +627,9 @@ goto autostart_retry; } } - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to connect to '%s': %s"), + sockname, strerror (errno)); goto failed; } @@ -634,17 +643,13 @@ if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */ command = command ? : strdup ("ssh"); - if (command == NULL) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); - goto failed; - } + if (command == NULL) + goto out_of_memory; // Generate the final command argv[] array. // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL] - if (VIR_ALLOC_N(cmd_argv, nr_args) < 0) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); - goto failed; - } + if (VIR_ALLOC_N(cmd_argv, nr_args) < 0) + goto out_of_memory; j = 0; cmd_argv[j++] = strdup (command); @@ -667,12 +672,9 @@ cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET); cmd_argv[j++] = 0; assert (j == nr_args); - for (j = 0; j < (nr_args-1); j++) { - if (cmd_argv[j] == NULL) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); - goto failed; - } - } + for (j = 0; j < (nr_args-1); j++) + if (cmd_argv[j] == NULL) + goto out_of_memory; } /*FALLTHROUGH*/ @@ -685,28 +687,38 @@ * to faff around with two file descriptors (a la 'pipe(2)'). */ if (socketpair (PF_UNIX, SOCK_STREAM, 0, sv) == -1) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to create socket pair %s"), + strerror (errno)); goto failed; } pid = fork (); if (pid == -1) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("unable to fork external network transport: %s"), + strerror (errno)); goto failed; } else if (pid == 0) { /* Child. */ close (sv[0]); // Connect socket (sv[1]) to stdin/stdout. close (0); - if (dup (sv[1]) == -1) perror ("dup"); + if (dup (sv[1]) == -1) { + perror ("dup"); + _exit(1); + } close (1); - if (dup (sv[1]) == -1) perror ("dup"); + if (dup (sv[1]) == -1) { + perror ("dup"); + _exit(1); + } close (sv[1]); // Run the external process. if (!cmd_argv) { if (VIR_ALLOC_N(cmd_argv, 2) < 0) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); - goto failed; + perror("malloc"); + _exit(1); } cmd_argv[0] = command; cmd_argv[1] = 0; @@ -770,7 +782,7 @@ return retcode; out_of_memory: - error (NULL, VIR_ERR_NO_MEMORY, _("uri params")); + error (conn, VIR_ERR_NO_MEMORY, NULL); failed: /* Close the socket if we failed. */ @@ -882,10 +894,9 @@ { struct stat sb; if (stat(file, &sb) < 0) { - __virRaiseError (conn, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, - VIR_ERR_ERROR, LIBVIRT_CACERT, NULL, NULL, 0, 0, - _("Cannot access %s '%s': %s (%d)"), - type, file, strerror(errno), errno); + errorf(conn, VIR_ERR_RPC, + _("Cannot access %s '%s': %s (%d)"), + type, file, strerror(errno), errno); return -1; } return 0; @@ -905,7 +916,9 @@ /* X509 stuff */ err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to allocate TLS credentials: %s"), + gnutls_strerror (err)); return -1; } @@ -923,7 +936,9 @@ gnutls_certificate_set_x509_trust_file (x509_cred, LIBVIRT_CACERT, GNUTLS_X509_FMT_PEM); if (err < 0) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to load CA certificate: %s"), + gnutls_strerror (err)); return -1; } @@ -936,7 +951,9 @@ LIBVIRT_CLIENTKEY, GNUTLS_X509_FMT_PEM); if (err < 0) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to load private key/certificate: %s"), + gnutls_strerror (err)); return -1; } @@ -963,21 +980,27 @@ */ err = gnutls_init (&session, GNUTLS_CLIENT); if (err) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to initialize TLS client: %s"), + gnutls_strerror (err)); return NULL; } /* Use default priorities */ err = gnutls_set_default_priority (session); if (err) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to set TLS algorithm priority: %s"), + gnutls_strerror (err)); return NULL; } err = gnutls_certificate_type_set_priority (session, cert_type_priority); if (err) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to set certificate priority: %s"), + gnutls_strerror (err)); return NULL; } @@ -985,7 +1008,9 @@ */ err = gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred); if (err) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to set session credentials: %s"), + gnutls_strerror (err)); return NULL; } @@ -998,7 +1023,9 @@ if (err < 0) { if (err == GNUTLS_E_AGAIN || err == GNUTLS_E_INTERRUPTED) goto again; - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (err)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to complete TLS handshake: %s"), + gnutls_strerror (err)); return NULL; } @@ -1018,12 +1045,14 @@ if (len < 0 && len != GNUTLS_E_UNEXPECTED_PACKET_LENGTH) { if (len == GNUTLS_E_AGAIN || len == GNUTLS_E_INTERRUPTED) goto again_2; - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (len)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to complete TLS initialization: %s"), + gnutls_strerror (len)); return NULL; } if (len != 1 || buf[0] != '\1') { error (conn, VIR_ERR_RPC, - _("server verification (of our certificate or IP address) failed\n")); + _("server verification (of our certificate or IP address) failed\n")); return NULL; } @@ -1047,33 +1076,39 @@ time_t now; if ((ret = gnutls_certificate_verify_peers2 (session, &status)) < 0) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to verify server certificate: %s"), + gnutls_strerror (ret)); return -1; } if ((now = time(NULL)) == ((time_t)-1)) { - error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + errorf (conn, VIR_ERR_SYSTEM_ERROR, + _("cannot get current time: %s"), + strerror (errno)); return -1; } if (status != 0) { - const char *reason = "Invalid certificate"; + const char *reason = _("Invalid certificate"); if (status & GNUTLS_CERT_INVALID) - reason = "The certificate is not trusted."; + reason = _("The certificate is not trusted."); if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - reason = "The certificate hasn't got a known issuer."; + reason = _("The certificate hasn't got a known issuer."); if (status & GNUTLS_CERT_REVOKED) - reason = "The certificate has been revoked."; + reason = _("The certificate has been revoked."); #ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - reason = "The certificate uses an insecure algorithm"; + reason = _("The certificate uses an insecure algorithm"); #endif - error (conn, VIR_ERR_RPC, reason); + errorf (conn, VIR_ERR_RPC, + _("server certificate failed validation: %s"), + reason); return -1; } @@ -1092,13 +1127,17 @@ ret = gnutls_x509_crt_init (&cert); if (ret < 0) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to initialize certificate: %s"), + gnutls_strerror (ret)); return -1; } ret = gnutls_x509_crt_import (cert, &certs[i], GNUTLS_X509_FMT_DER); if (ret < 0) { - error (conn, VIR_ERR_GNUTLS_ERROR, gnutls_strerror (ret)); + errorf (conn, VIR_ERR_GNUTLS_ERROR, + _("unable to import certificate: %s"), + gnutls_strerror (ret)); gnutls_x509_crt_deinit (cert); return -1; } @@ -1117,13 +1156,9 @@ if (i == 0) { if (!gnutls_x509_crt_check_hostname (cert, priv->hostname)) { - __virRaiseError - (conn, NULL, NULL, - VIR_FROM_REMOTE, VIR_ERR_RPC, - VIR_ERR_ERROR, priv->hostname, NULL, NULL, - 0, 0, - _("Certificate's owner does not match the hostname (%s)"), - priv->hostname); + errorf(conn, VIR_ERR_RPC, + _("Certificate's owner does not match the hostname (%s)"), + priv->hostname); gnutls_x509_crt_deinit (cert); return -1; } @@ -4721,8 +4756,9 @@ errmsg = __virErrorMsg (code, errorMessage); __virRaiseError (conn, NULL, NULL, VIR_FROM_REMOTE, - code, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", errmsg); + code, VIR_ERR_ERROR, + errmsg, errorMessage, NULL, -1, -1, + errmsg, errorMessage); } /* For errors generated on the server side and sent back to us. */ -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2

[libvirt] PATCH: Ensure errors are guarenteed reported in virConnectOpen
by Daniel P. Berrange 19 Aug '08

19 Aug '08

The virConnectOpen method is unfortuantely rather special. While there is a virConnect object available, the current rule is that drivers must report errors against the global error object, because upon failure no virConnect object will be returned to the caller. Unforatunately, despite frequent cleanups of code getting this wrong, I've just audited the remote driver and found another 20 or so places where its wrong. This is clearly not a sustainable approach to error reporting. The guarenteed correct solution is actually rather simple - Always report errors against the virConnect object, even in the driver open method - In the cleanup patch of do_open() in libvirt.c, if no global error is set, copy the error from the virConnect object's virError, into the global virError. With this in place we can change all the drivers back to always report against the error object, and thus cleanup some disgusting code like __virRaiseError (in_open ? NULL : conn, ... To just __virRaiseError (conn, ... Daniel Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.151 diff -u -r1.151 libvirt.c --- src/libvirt.c 18 Aug 2008 09:24:46 -0000 1.151 +++ src/libvirt.c 19 Aug 2008 10:29:51 -0000 @@ -735,10 +735,8 @@ name = "xen:///"; ret = virGetConnect(); - if (ret == NULL) { - virLibConnError(NULL, VIR_ERR_NO_MEMORY, _("allocating connection")); + if (ret == NULL) return NULL; - } uri = xmlParseURI (name); if (!uri) { @@ -839,7 +837,21 @@ failed: if (ret->driver) ret->driver->close (ret); if (uri) xmlFreeURI(uri); - virUnrefConnect(ret); + + /* If not global error was set, copy any error set + in the connection object we're about to dispose of */ + if (__lastErr.code == VIR_ERR_OK) { + memcpy(&__lastErr, &ret->err, sizeof(ret->err)); + memset(&ret->err, 0, sizeof(ret->err)); + } + + /* Still no error set, then raise a generic error */ + if (__lastErr.code == VIR_ERR_OK) + virLibConnError (NULL, VIR_ERR_INTERNAL_ERROR, + _("unable to open connection")); + + virUnrefConnect(ret); + return NULL; } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 9

[libvirt] Libvirt XML description
by Dimitrios Kalogeras 19 Aug '08

19 Aug '08

Hi to all of you, I am trying to gather knowledge about the XML DTD of libvirt bu the http://libvirt.org/format.html does not provide any useful info. Can you point me somewhere else ? Cheers, Dimitris -- -- Dimitrios K. Kalogeras Electrical Engineer, Ph.D. Network Engineer NTUA/GR-Net Network Management Center _____________________________________ icq: 11887484 voice: +30-210-772 1863 fax: +30-210-772 1866 e-mail: D.Kalogeras(a)noc.ntua.gr pub 1024D/0E421B50 2007-01-17 [expires: 2008-01-17] Dimitrios Kalogeras (dkalo) <D.Kalogeras(a)noc.ntua.gr> Key fingerprint = F8C8 7B67 74A4 1F82 CDDF 8554 E1EF 7FAE 0E42 1B50 PGP-KEY: http://ajax.noc.ntua.gr/~dkalo/dkalo_pgp.txt

5 5

[libvirt] fail to connect via ssh
by MINAI Katsuhito 19 Aug '08

19 Aug '08

Hi all, I have built libvirt by http://libvirt.org/sources/libvirt-0.4.4.tar.gz on fedora 9 as follows. $ tar zxf libvirt-cvs-snapshot.tar.gz $ cd libvirt-0.4.4 $ ./configure --without-xen $ make However, virsh failed to connect via SSH to remote server. How can I fix the problem? $ ./src/virsh -c xen+ssh://root@server list root@server's password: libvir: Remote error : socket closed unexpectedly error: failed to connect to the hypervisor Thanks, Minai

1 1

[libvirt] [patch] remove duplicate call of virInitialize()
by Nguyen Anh Quynh 18 Aug '08

18 Aug '08

Hi, This patch removes the redundant call to virInitialize() inside __virStateInitialize(). Thanks, Quynh

2 1

[libvirt] virt-install and custom distros
by Kay Williams 15 Aug '08

15 Aug '08

We have an application that builds custom distributions based on RHEL, CentOS or Fedora. We would like to install these over the network using virt-install, but we've run into an issue with the distro check logic. Specifically, virt-install fails unless it finds a string "Red Hat Enterprise Linux", "Fedora" or "CentOS" within the family field of the .treeinfo file. Our application currently sets the family field to the user-provided distro name (see below). We have avoided using the base distro name given trademark concerns. [general] family = <user provided value> variant = <user provided value> We can get virt-install to pass the distro check by setting the family name to one of the accepted values, e.g. [general] family = Fedora variant = [user provided distro name] Is this the expected/desired use for the family and variant fields? Or is there another approach we should consider? Thanks, Kay

2 1

[libvirt] [PATCH] Fix serial console telnet protocol support
by Mark McLoughlin 15 Aug '08

15 Aug '08

With e.g.: <serial type='tcp'> <source mode='bind' host='127.0.0.1' service='4444'/> <protocol type='telnet'/> <target port='0'/> </serial> You currently get: Unknown option: listen qemu: could not open serial device 'telnet:127.0.0.1:4444,listen' With the telnet protocol, qemu expects "server" as an option rather than "listen". Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/qemu_conf.c =================================================================== --- libvirt.orig/src/qemu_conf.c 2008-08-13 18:14:34.000000000 +0100 +++ libvirt/src/qemu_conf.c 2008-08-13 18:35:20.000000000 +0100 @@ -685,12 +685,19 @@ break; case VIR_DOMAIN_CHR_TYPE_TCP: - if (snprintf(buf, buflen, "%s:%s:%s%s", - dev->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET ? "telnet" : "tcp", - dev->data.tcp.host, - dev->data.tcp.service, - dev->data.tcp.listen ? ",listen" : "") >= buflen) - return -1; + if (dev->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET) { + if (snprintf(buf, buflen, "telnet:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server" : "") >= buflen) + return -1; + } else { + if (snprintf(buf, buflen, "tcp:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",listen" : "") >= buflen) + return -1; + } break; case VIR_DOMAIN_CHR_TYPE_UNIX:

3 4

[libvirt] [ANNOUNCE][RFC] sVirt: Integrating SELinux and Linux-based virtualization
by James Morris 15 Aug '08

15 Aug '08

This is to announce the formation of the sVirt project, which aims to integrate SELinux and Linux-based virtualization (KVM et al). The idea has been discussed a few times over the last year or so, and in recent weeks, a few Fedora folk (such as Dan Walsh, Daniel Berrange and myself) have put together some requirements and had some preliminary technical discussions. The requirements document and initital technical considerations are included below inline for review and discussion. In a nutshell, we'd like to be able to apply distinct security labels to individual VM instances and their resources, so that they can be isolated from each other via MAC policy. We want this to "just work" when configuring and managing VMs via the libvirt toolchain, e.g. provide a simple option during VM creation to make the VM "isolated", and have the toolchain do all the labeling and policy configuration behind the scenes. Greater detail may be found in the requirements document. If you wish to contribute, please reply to this email with any enhancements to the requirements, technical ideas, issues etc. I'd suggest joining the libvir-list (in the to: line) if not already on it, as that is where the integration work is expected to happen. There's also a wiki page: http://selinuxproject.org/page/SVirt ------------------------------------------------------------------------ 11 Aug 2008 sVirt: Integration of SELinux and Linux-based Virtualization Requirements and Design Considerations v1.0 1. Introduction This document establishes a set of functional and technical requirements for integrating SELinux with Linux-based virtualization (i.e. Linux-as-hypervisor schemes such as KVM/Qemu amd lguest). Note that non-Linux hypervisor models such as Xen are not covered explicitly in this document, although may be afforded some MAC coverage due to shared infrastructure (e.g. libvirt). Non-Linux hypervisor models may considered further at a later stage. Also, while this document focuses on SELinux as the MAC scheme, consideration should be given to ensuring support for other label-based MAC schemes. 1.1 Rationale With increased use of virtualization, one security benefit of physically separated systems -- strong isolation -- is reduced, an issue which may be ameliorated with the application of Mandatory Access Control (MAC) security in the host system. Integration of MAC with virtualization will also help increase the overall robustness and security assurance of both host and guest systems. Many threats arising from flaws in the VM environment, or misconfiguration, may be mitigated through tighter isolation and specific MAC policy enforcement. By incorporating MAC support into the virtualization toolchain and documentation, users will also be able to make more use of the MAC security capabilities provided by the OS. 1.2 Use-cases The following use-cases have been identified: o Providing virtualized services with a level of isolation similar to that previously afforded by physical separation. o Increased protection of the host from untrusted VM guests (e.g. for VM hosting providers, grid/cloud servers etc.). o Increased protection of VM guests from each other in the event of host flaws or misconfiguration. Some protection may also be provided against a compromised host. o Consolidating access to multiple networks which require strong isolation from each other (e.g. military, government, corporate extranets, internal "Chinese wall" separation etc.) o Strongly isolating desktop applications by running them in separately labeled VMs (e.g. online banking in one VM and World of Warcraft in another; opening untrusted office documents in an isolated VM for view/print only). o Forensic analysis of disk images, binaries, browser scripts etc. in a highly isolated VM, protecting both the host system and the integrity of the components under analysis. o Isolated test environments, preventing e.g. simulated trades from entering a production system, leakage of sensitive customer data to internal networks etc. o General ability to specify a wide range of high-level security goals for virtualization through flexible MAC policy. 2. Current Situation SELinux is already able to provide general MAC protection to Linux-based virtualization, such as protecting the integrity and confidentiality of disk images and providing strong isolation of Linux hypervisor processes from the rest of the system. There is, however, no explicit support for Linux-based virtualization in SELinux, and all VMs currently run in the same security context. Thus, there is no MAC isolation applied between VMs. 3. Functional Security Requirements 3.1 Strong isolation between active VMs Running different VMs with different MAC labels allows stronger isolation between VMs, reducing risks arising from flaws in or misconfiguration of the VM environment. For example, the threat of a rogue VM exploiting a flaw in KVM could be greatly reduced if it is isolated from other VMs by MAC security policy. 3.2 Improved control over access to VM resources Distinct MAC labeling of resources belonging to VMs (disk images, disk partitions etc.) binds VM instances to those resources, ensuring that VMs can only access their own resources. This can protect the VM from invalid VM resources; and protect VM resources from flawed or misconfigured VMs. 3.3 Improved control over access to shared resources Where VMs may share resources (e.g. miscellaneous devices, virtual networking, read-only disk images etc.), fine-grained MAC policy may be specified to control information flow between VMs. 3.4 Fine-grained interaction with the host With distinct labeling of VMs and their resources, interactions with host entities on a per-VM basis may then be controlled by MAC policy. An example of this would be to safely allow different users on the host to administer different VMs. Configuration of this could be managed via the RBAC scheme integrated with SELinux. 3.5 Coarse MAC containment of VMs High-level security constraints may be applied to different VMs, to allow simplified lock-down of the overall system. For example, a VM may be restricted so that it cannot transmit TCP traffic on port 25 via virtual networking (i.e. the guest cannot be used as a spam bot even if it is compromised via a rootkit). 3.6 Leverage general MAC architecture As MAC is extended to the desktop, it will be possible to apply uniform MAC policy to the OS, desktop and Linux-based virtualization components. This will provide a basis for a variety of sophisticated security applications such as a virtualized MLS desktop with different windows running VMs at different security levels. 4. Design Considerations 4.1 Consensus in preliminary discussion appears to be that adding MAC to libvirt will be the most effective approach. Support may then be extended to virsh, virt-manager, oVirt etc. 4.2 Initially, sVirt should "just work" as a means to isolate VMs, with minimal administrative interaction. e.g. an option is added to virt-manager which allows a VM to be designated as "isolated", and from then on, it is automatically run in a separate security context, with policy etc. being generated and managed by libvirt. 4.3 We need to consider very carefully exactly how VMs will be launched and controlled e.g. overall security ultimately must be enforced by the host kernel, even though VM launch will be initially controlled by host userspace. 4.4 We need to consider overall management of labeling both locally and in distributed environments (e.g. oVirt), as well as situations where VMs may be migrated between systems, backed up etc. One possible approach may be to represent the security label as the UUID of the guest and then translate that to locally meaningful values as needed. 4.5 MAC controls/policy will need to be considered for any control planes (e.g. /dev/kvm). 4.6 We need to ensure that we have high-level management tools available from the start, avoiding past mistakes with SELinux where we dropped a bunch of complicated pieces in the user's lap. All aspects of sVirt must be managed by the via the virt tools and only present high-level abstractions to the user (and then, only if essential). 4.7 As sVirt involves creating and managing arbitrary numbers of security labels, we will need to address the effects of label space explosion and resulting complexity. Possible approaches already discussed include: - SELinux RBAC or IBAC mechanisms. - MCS labels. This has the possible advantage of not requiring any policy changes for simple isolation: just have a general policy which applies to all MCS labels, and possibly customize behavior via the type. e.g. system_u:object_r:virt_image_t:c1 ^ ^ type mcs label 'c0' = isolated inactive VM image/device. 'cN' = dynamically assigned MCS label for active VM, bound to the UUID, and translated via MCS translation file. i.e. a user running ls -Z or ps -Z will see the UUID instead of cN. 'virt_image_t' = standard VM which is also isolated if an MCS label is present. 'virt_image_nonet_t' = VM with no network access at all. etc. So, MCS is used to enforce VM isolation, Type is used to enforce general security behavior. We can then provide a high-level GUI interface for selecting this behavior without the admin knowing anything about SELinux. Note: proof of concept testing has been performed using MCS labels, which appears to be workable at this stage. - Utilize the new hierarchical types being proposed upstream by NEC. (No analysis done yet). 4.8 Accessing images via shared storage will present challenges as we do not yet have labeling for networked filesystems. 4.9 We must ensure that any MAC support integrated into libvirt is readily debuggable. e.g. hook into auditsp to actively process policy violations and handle them via the virt toolchain; also develop good setroubleshoot plugins. 4.10 {lib}semanage needs performance optimization work to reduce impact on the virt toolchain. ------------------------------------------------------------------------

7 17

[libvirt] fail to run virsh
by Jun Koi 15 Aug '08

15 Aug '08

Hi, I installed libvirt (cvs version), and can confirm that libvirtd is running. However, virsh failed to work. I got the below message when running virsh with debugging information. How to fix this problem? Many thanks, Jun # LIBVIRT_DEBUG=1 virsh DEBUG: libvirt.c: virInitialize (register drivers) DEBUG: libvirt.c: virConnectOpenAuth (name=(null), auth=0xb7f53b84, flags=0) DEBUG: libvirt.c: do_open (Probed qemu:///system) DEBUG: lxc_driver.c: lxcCheckContainerSupport (clone call returned EINVAL, container support is not enabled) DEBUG: libvirt.c: do_open (Using qemu:///system as default URI, 1 hypervisor found) DEBUG: libvirt.c: do_open (name "qemu:///system" to URI components: scheme qemu opaque (null) authority (null) server (null) user (null) port 0 path /system ) DEBUG: libvirt.c: do_open (trying driver 0 (Test) ...) DEBUG: libvirt.c: do_open (driver 0 Test returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 1 (QEMU) ...) DEBUG: libvirt.c: do_open (driver 1 QEMU returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 2 (Xen) ...) DEBUG: libvirt.c: do_open (driver 2 Xen returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 3 (OPENVZ) ...) DEBUG: libvirt.c: do_open (driver 3 OPENVZ returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 4 (LXC) ...) DEBUG: libvirt.c: do_open (driver 4 LXC returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 5 (remote) ...) DEBUG: remote_internal.c: doRemoteOpen (proceeding with name = qemu:///system) libvir: Remote error : No such file or directory DEBUG: libvirt.c: do_open (driver 5 remote returned ERROR) DEBUG: hash.c: virUnrefConnect (unref connection 0x806b588 qemu:///system 1) DEBUG: hash.c: virReleaseConnect (release connection 0x806b588 qemu:///system) error: failed to connect to the hypervisor

2 3

[libvirt] [PATCH] fix minor typo
by John Levon 15 Aug '08

15 Aug '08

Fix a typo in the message for the 'dump' command in virsh. Signed-off-by: John Levon <john.levon(a)sun.com> Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.157 diff -u -r1.157 virsh.c --- src/virsh.c 22 Jul 2008 16:12:01 -0000 1.157 +++ src/virsh.c 13 Aug 2008 15:50:09 -0000 @@ -1320,7 +1320,7 @@ return FALSE; if (virDomainCoreDump(dom, to, 0) == 0) { - vshPrint(ctl, _("Domain %s dumpd to %s\n"), name, to); + vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to); } else { vshError(ctl, FALSE, _("Failed to core dump domain %s to %s"), name, to);

3 2

[libvirt] Reusing dumpxml output
by Stefan de Konink 15 Aug '08

15 Aug '08

I would like to reuse configurations that have been edited using the libvirt api. For example by attaching interfaces. Now the output that dumpxml generates, is very 'specific' to an active configuration. I am not able to use a stored configuration from an active domain to redefine it after it has been undefined. Is there a trick to do so? Or should one really strip all 'live' attributes first? Stefan

5 14

[libvirt] breaking out of virsh console?
by Schroeder, Paul 14 Aug '08

14 Aug '08

Hello all... In my VM's inittab, I set agetty to run on ttyS0 so I could do "virsh console myvm" and log in from the host machine's command line. It works perfectly. Trouble is, I don't know how to break out of it to get back to the command line on my host. I've only been able to do so by killing the virsh process. There's gotta be a better way.. Right? Thanks...Paul...

5 4

[libvirt] VMWare support, any news?
by Yushu Yao 14 Aug '08

14 Aug '08

Hi All, I noticed there are some discussion about VMWare support of libvirt several back in April-May. Just wondering is there a prototype yet? The function I¹m interested in is to stop/start a VM by VMWare player/workstation/free server. Thanks, -Yushu

5 5

[libvirt] [PATCH] get memory in openvz driver
by Evgeniy Sokolov 14 Aug '08

14 Aug '08

OpenVZ has several parameters for memory management. All of them can be configured independetly. Patch allow to get configuration of memory from container config and then calculate total usage of memory. It is open question how to manage memory?

2 4

[libvirt] [PATCH] kvm/virtio: Set IFF_VNET_HDR when setting up tap fds
by Mark McLoughlin 13 Aug '08

13 Aug '08

Hey, Here's a patch that allows libvirt created guests to use KVM's recent GSO support in order to increase the throughput achieved with virtio_net network interfaces. We shouldn't apply this yet - we need the kernel and kvm TUNGETIFF patches to be applied first - so this is just intended as an RFC. See also: http://marc.info/?l=linux-netdev&m=121863813904363 and: http://marc.info/?l=kvm&m=121863857305255 Cheers, Mark. Subject: [PATCH] kvm/virtio: Set IFF_VNET_HDR when setting up tap fds IFF_VNET_HDR is a tun/tap flag that allows you to send and receive large (i.e. GSO) packets and packets with partial checksums. Setting the flag means that every packet is proceeded by the same header which virtio uses to communicate GSO/csum metadata. By enabling this flag on the tap fds we create, we greatly increase the achievable throughput with virtio_net. However, we need to be careful to only set the flag when a) KVM has support for this ABI and b) the value of the flag is queryable using the TUNGETIFF ioctl. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/bridge.c =================================================================== --- libvirt.orig/src/bridge.c 2008-08-13 15:40:34.000000000 +0100 +++ libvirt/src/bridge.c 2008-08-13 15:40:53.000000000 +0100 @@ -275,10 +275,52 @@ #endif /** + * brProbeVnetHdr: + * @tapfd: a tun/tap file descriptor + * + * Check whether it is safe to enable the IFF_VNET_HDR flag on the + * tap interface. + * + * Setting IFF_VNET_HDR enables KVM's virtio_net driver to allow + * guests to pass larger (GSO) packets, with partial checksums, to + * the host. This greatly increases the achievable throughput. + * + * It is only useful to enable this when we're setting up a virtio + * interface. And it is only *safe* to enable it when we know for + * sure that a) qemu has support for IFF_VNET_HDR and b) the running + * kernel implements the TUNGETIFF ioctl(), which qemu needs to query + * the supplied tapfd. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int +brProbeVnetHdr(int tapfd) +{ +#if defined(IFF_VNET_HDR) && defined(TUNGETFEATURES) && defined(TUNGETIFF) + unsigned int features; + struct ifreq dummy; + + if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) + return 0; + + if (!(features & IFF_VNET_HDR)) + return 0; + + if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) + return 0; + + return 1; +#else + return 0; +#endif +} + +/** * brAddTap: * @ctl: bridge control pointer * @bridge: the bridge name * @ifname: the interface name (or name template) + * @vnet_hdr: whether to try enabling iFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device * * This function creates a new tap device on a bridge. @ifname can be either @@ -292,6 +334,7 @@ brAddTap(brControl *ctl, const char *bridge, char **ifname, + int vnet_hdr, int *tapfd) { int id, subst, fd; @@ -307,6 +350,9 @@ if ((fd = open("/dev/net/tun", O_RDWR)) < 0) return errno; + if (vnet_hdr) + vnet_hdr = brProbeVnetHdr(fd); + do { struct ifreq try; int len; @@ -315,6 +361,11 @@ try.ifr_flags = IFF_TAP|IFF_NO_PI; +#ifdef IFF_VNET_HDR + if (vnet_hdr) + try.ifr_flags |= IFF_VNET_HDR; +#endif + if (subst) { len = snprintf(try.ifr_name, BR_IFNAME_MAXLEN, *ifname, id); if (len >= BR_IFNAME_MAXLEN) { Index: libvirt/src/bridge.h =================================================================== --- libvirt.orig/src/bridge.h 2008-08-13 15:40:34.000000000 +0100 +++ libvirt/src/bridge.h 2008-08-13 15:40:53.000000000 +0100 @@ -61,6 +61,7 @@ int brAddTap (brControl *ctl, const char *bridge, char **ifname, + int vnet_hdr, int *tapfd); int brSetInterfaceUp (brControl *ctl, Index: libvirt/src/qemu_conf.c =================================================================== --- libvirt.orig/src/qemu_conf.c 2008-08-13 15:40:34.000000000 +0100 +++ libvirt/src/qemu_conf.c 2008-08-13 15:41:15.000000000 +0100 @@ -474,6 +474,8 @@ *flags |= QEMUD_CMD_FLAG_DRIVE; if (strstr(help, "boot=on")) *flags |= QEMUD_CMD_FLAG_DRIVE_BOOT; + if (strstr(help, "IFF_VNET_HDR")) + *flags |= QEMUD_CMD_FLAG_VNET_HDR; if (ver >= 9000) *flags |= QEMUD_CMD_FLAG_VNC_COLON; } @@ -545,7 +547,8 @@ int **tapfds, int *ntapfds, virDomainNetDefPtr net, - int vlan) + int vlan, + int vnet_hdr) { virNetworkObjPtr network = NULL; char *brname; @@ -593,7 +596,7 @@ } if ((err = brAddTap(driver->brctl, brname, - &net->ifname, &tapfd))) { + &net->ifname, vnet_hdr, &tapfd))) { if (errno == ENOTSUP) { /* In this particular case, give a better diagnostic. */ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -1011,9 +1014,16 @@ case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: { - char *tap = qemudNetworkIfaceConnect(conn, driver, - tapfds, ntapfds, - net, vlan); + char *tap; + int vnet_hdr = 0; + + if (qemuCmdFlags & QEMUD_CMD_FLAG_VNET_HDR && + net->model && !strcmp(net->model, "virtio")) + vnet_hdr = 1; + + tap = qemudNetworkIfaceConnect(conn, driver, + tapfds, ntapfds, + net, vlan, vnet_hdr); if (tap == NULL) goto error; ADD_ARG(tap); Index: libvirt/src/qemu_conf.h =================================================================== --- libvirt.orig/src/qemu_conf.h 2008-08-13 15:40:34.000000000 +0100 +++ libvirt/src/qemu_conf.h 2008-08-13 15:41:15.000000000 +0100 @@ -47,6 +47,7 @@ QEMUD_CMD_FLAG_DRIVE = (1 << 3), QEMUD_CMD_FLAG_DRIVE_BOOT = (1 << 4), QEMUD_CMD_FLAG_NAME = (1 << 5), + QEMUD_CMD_FLAG_VNET_HDR = (1 << 6), }; /* Main driver state */

2 4

[libvirt] PATCH: 0/7: Re-factor LXC driver
by Daniel P. Berrange 13 Aug '08

13 Aug '08

This is a long overdue followup to my previous set of patches to make the LXC driver use the new domain XML apis. Getting this merged is a blocker for the new libvirt release, now we've turned on LXC by default. Likewise we need to get OpenVZ fully ported to new XML before release too. The previous posting was here: http://www.redhat.com/archives/libvir-list/2008-July/msg00182.html Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 24

[libvirt] virt-install?
by Jun Koi 13 Aug '08

13 Aug '08

Hi, I got the libvirt source code (cvs), and compiled. However, I cannot find the virt-install anywhere. Is it included inside libvirt? Thank you, Jun

3 4

[libvirt] [PATCH] Change disk type 'dos' to 'msdos'
by Cole Robinson 13 Aug '08

13 Aug '08

parted doesn't seem to want the label 'dos', instead wanting 'msdos'. Patch is basically s/dos/msdos/ Thanks, Cole

4 6

[libvirt] Re: virDomainMemoryPeek for Xen?
by Richard W.M. Jones 13 Aug '08

13 Aug '08

On Wed, Aug 13, 2008 at 01:19:42PM +0900, Jun Koi wrote: > According to the comment in your driver code for virDomainMemoryPeek, > libvirt is not currently supporting Xen. Why is that? As far as I see, > Xen is use the same GPL2 version as libvirt. > > I am thinking about implementing the driver for Xen, so have this question. It'd be really good to have a driver for this for libvirt. QEMU does virtual->physical translation for us, through the guest's CR3 & page tables. [This discussion will concentrate on x86 for the moment :-)] If you look at the qemu source, file target-i386/ helper2.c, function cpu_get_phys_page_debug, you will see the code they use to navigate through the 3 or 4 levels of page tables for i386 & x86-64 respectively. The QEMU memsave command made it almost trivial to write virDomainMemoryPeek (...VIR_MEMORY_VIRTUAL...); On Xen things are a bit different. You can map in physical pages from another guest using the libxc call xc_map_foreign_range. Note that you cannot just call xc_map_foreign_range because the libxc & libvirt licenses are _not_ compatible. So instead you'd need to do the underlying sequence of mmap / ioctl / munmap. (See tools/libxc/ xc_linux.c in the Xen source). But you still need to do virtual to physical page translation, either using the qemu source as an example, or using xc_translate_foreign_address as a guide (or just using the Intel Programmers Reference Manual and doing it from first principles). Another alternative is to implement virDomainMemoryPeek (...VIR_MEMORY_PHYSICAL...). It is not possible to implement this for QEMU at all, at least not without changing QEMU. Implementing this for Xen would be much easier because you don't need to do address translation, but it does push the problem of address translation up to the callers. Places to look in the QEMU source for inspiration: monitor.c:do_memory_save target-i386/helper2.c:cpu_get_phys_page_debug Other places to look in the Xen source for inspiration: tools/libxc/xc_linux.c tools/libxc/xc_pagetab.c tools/xentrace/xenctx.c (thanks Mark McLoughlin) Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

2 1

[libvirt] [PATCH]: ruby-libvirt migration fixes
by Chris Lalancette 13 Aug '08

13 Aug '08

Attached is a relatively simple patch to the ruby-libvirt bindings with some bugfixes for the migrate call. The first problem was that there was no way to pass a "nil" through to the underlying virDomainMigrate() call. This is important because generally the "dname" and "uri" parameters end up being NULL. This patch also makes all the parameters beyond the first 2 optional. I've tested this out by live migrating a KVM guest between two hosts, and this now does what I expect. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 4

[libvirt] PATCH: Block & reset signals when fork/exec'ing children
by Daniel P. Berrange 12 Aug '08

12 Aug '08

The LXC patches identified a race condition between fork/exec'ing child processes and signal handlers. The process using libvirt can have setup arbitrary signal handlers. In the libvirtd case we have one attached to SIGCHILD, and the handler writes to a pipe which is then processeed in the main loop. When you fork() signal handlers are preserved in the child process, but you may well not want the signal handlers to be run in the children - for example in LXC we closed the FD associated the pipe after fork(), and that FD is now asociated with a socket we use to talk to the container. So if the original signal handler is run bad stuff will happen in the child. Now signal handlers will eventually get reset when you exec(), but this leaves open a race condition window between the fork & exec() when we cannot assume it is safe to run the signal handlers from the parent So, this changes the virExec() function so that before fork()ing it blocks all signals. After fork() the parent process can restore its original signal mask. The child process meanwhile calls sigaction() to reset all signal handlers to SIG_DFL, and then unblocks all signals. NB, the child does not restore the parents sig-mask - libvirt can be called from any app, and we don't want to inherit whatever mask the app may have setup. On Linux there is a convenient NSIG constant defined in signal.h telling us how many signals there are. If this isn't defined I simply set it to 32 which is enough for UNIX pre-dating the addition of real-time signals to POSIX. If we find convenient or more appropriate values for other non-Linux OS we can update this as needed. NB I call pthread_sigmask() instead of sigprocmask() when doing the fork/exec, because we cannot assume that the application using libvirt is single-threaded & thus we only want to block signals in the thread doing the fork/exec. Daniel diff -r 1dbfb08d365d src/util.c --- a/src/util.c Thu Aug 07 16:55:11 2008 +0100 +++ b/src/util.c Thu Aug 07 16:55:53 2008 +0100 @@ -37,6 +37,7 @@ #include <sys/wait.h> #endif #include <string.h> +#include <signal.h> #include "c-ctype.h" #ifdef HAVE_PATHS_H @@ -49,6 +50,10 @@ #include "util.h" #include "memory.h" #include "util-lib.c" + +#ifndef NSIG +# define NSIG 32 +#endif #ifndef MIN # define MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -104,9 +109,23 @@ _virExec(virConnectPtr conn, const char *const*argv, int *retpid, int infd, int *outfd, int *errfd, int non_block) { - int pid, null; + int pid, null, i; int pipeout[2] = {-1,-1}; int pipeerr[2] = {-1,-1}; + sigset_t oldmask, newmask; + struct sigaction sig_action; + + /* + * Need to block signals now, so that child process can safely + * kill off caller's signal handlers without a race. + */ + sigfillset(&newmask); + if (pthread_sigmask(SIG_SETMASK, &newmask, &oldmask) < 0) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot block signals: %s"), + strerror(errno)); + return -1; + } if ((null = open(_PATH_DEVNULL, O_RDONLY)) < 0) { ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -122,6 +141,34 @@ goto cleanup; } + if (outfd) { + if(non_block && + virSetNonBlock(pipeout[0]) == -1) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to set non-blocking file descriptor flag")); + goto cleanup; + } + + if(virSetCloseExec(pipeout[0]) == -1) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to set close-on-exec file descriptor flag")); + goto cleanup; + } + } + if (errfd) { + if(non_block && + virSetNonBlock(pipeerr[0]) == -1) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to set non-blocking file descriptor flag")); + goto cleanup; + } + if(virSetCloseExec(pipeerr[0]) == -1) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to set close-on-exec file descriptor flag")); + goto cleanup; + } + } + if ((pid = fork()) < 0) { ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("cannot fork child process: %s"), strerror(errno)); @@ -132,33 +179,48 @@ close(null); if (outfd) { close(pipeout[1]); - if(non_block) - if(virSetNonBlock(pipeout[0]) == -1) - ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to set non-blocking file descriptor flag")); - - if(virSetCloseExec(pipeout[0]) == -1) - ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to set close-on-exec file descriptor flag")); *outfd = pipeout[0]; } if (errfd) { close(pipeerr[1]); - if(non_block) - if(virSetNonBlock(pipeerr[0]) == -1) - ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to set non-blocking file descriptor flag")); - - if(virSetCloseExec(pipeerr[0]) == -1) - ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to set close-on-exec file descriptor flag")); *errfd = pipeerr[0]; } *retpid = pid; + + /* Restore our original signal mask now child is safely + running */ + if (pthread_sigmask(SIG_SETMASK, &oldmask, NULL) < 0) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot unblock signals: %s"), + strerror(errno)); + return -1; + } + return 0; } /* child */ + + /* Clear out all signal handlers from parent so nothing + unexpected can happen in our child here */ + sig_action.sa_handler = SIG_DFL; + sig_action.sa_flags = 0; + sigemptyset(&sig_action.sa_mask); + + for (i = 0 ; i < NSIG ; i++) + /* Only possible errors are EFAULT or EINVAL + The former wont happen, the latter we + expect, so no need to check return value */ + sigaction(i, &sig_action, NULL); + + /* Unmask all signals in child, since we've no idea + what the caller's done with their signal mask */ + if (pthread_sigmask(SIG_SETMASK, &oldmask, NULL) < 0) { + ReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot unblock signals: %s"), + strerror(errno)); + return -1; + } if (pipeout[0] > 0 && close(pipeout[0]) < 0) _exit(1); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] [PATCH] rewrite virFileLinkPointsTo
by Jim Meyering 12 Aug '08

12 Aug '08

I've rewritten virFileLinkPointsTo to be a lot simpler, and more importantly, it has far fewer failure points. If anyone wants to preserve the original behavior that makes it fail when the first parameter does not specify a symlink, I can add that. The only difference in behavior would be when the two files are hard-linked. In any case, I'll remove the FIXME comment. The diff below is not very readable. Bottom line, it replaces a pair of functions (the latter is a stub for mingw) with this: #define SAME_INODE(Stat_buf_1, Stat_buf_2) \ ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \ && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev) int virFileLinkPointsTo(const char *checkLink, const char *checkDest) { struct stat src_sb; struct stat dest_sb; if (stat (checkLink, &src_sb) || stat (checkDest, &dest_sb)) return 0; /* FIXME: if required, lstat checkLink to ensure it's a symlink */ if (! SAME_INODE (src_sb, dest_sb)) { virLog("Link '%s' does not point to '%s', ignoring\n", checkLink, checkDest); return 0; } return 1; } >From 4e70c02e547b078b8f35afd0996b6887e1593afd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 12 Aug 2008 19:07:46 +0200 Subject: [PATCH] rewrite virFileLinkPointsTo * src/util.c (SAME_INODE): Define. (virFileLinkPointsTo): Rewrite to be more portable and more efficient. --- src/util.c | 97 ++++++----------------------------------------------------- 1 files changed, 10 insertions(+), 87 deletions(-) diff --git a/src/util.c b/src/util.c index 9f056e0..2905a0a 100644 --- a/src/util.c +++ b/src/util.c @@ -397,107 +397,30 @@ int virFileHasSuffix(const char *str, return STREQ(str + len - suffixlen, suffix); } -#ifndef __MINGW32__ +#define SAME_INODE(Stat_buf_1, Stat_buf_2) \ + ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \ + && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev) int virFileLinkPointsTo(const char *checkLink, const char *checkDest) { - char dest[PATH_MAX]; - char real[PATH_MAX]; - char checkReal[PATH_MAX]; - int n; - - /* read the link destination */ - if ((n = readlink(checkLink, dest, PATH_MAX)) < 0) { - switch (errno) { - case ENOENT: - case ENOTDIR: - return 0; - - case EINVAL: - virLog("File '%s' is not a symlink\n", - checkLink); - return 0; - - } - virLog("Failed to read symlink '%s': %s\n", - checkLink, strerror(errno)); - return 0; - } else if (n >= PATH_MAX) { - virLog("Symlink '%s' contents too long to fit in buffer\n", - checkLink); - return 0; - } + struct stat src_sb; + struct stat dest_sb; - dest[n] = '\0'; + if (stat (checkLink, &src_sb) || stat (checkDest, &dest_sb)) + return 0; - /* make absolute */ - if (dest[0] != '/') { - char dir[PATH_MAX]; - char tmp[PATH_MAX]; - char *p; + /* FIXME: if required, lstat checkLink to ensure it's a symlink */ - strncpy(dir, checkLink, PATH_MAX); - dir[PATH_MAX-1] = '\0'; - - if (!(p = strrchr(dir, '/'))) { - virLog("Symlink path '%s' is not absolute\n", checkLink); - return 0; - } - - if (p == dir) /* handle unlikely root dir case */ - p++; - - *p = '\0'; - - if (virFileBuildPath(dir, dest, NULL, tmp, PATH_MAX) < 0) { - virLog("Path '%s/%s' is too long\n", dir, dest); - return 0; - } - - strncpy(dest, tmp, PATH_MAX); - dest[PATH_MAX-1] = '\0'; - } - - /* canonicalize both paths */ - if (!realpath(dest, real)) { - virLog("Failed to expand path '%s' :%s\n", dest, strerror(errno)); - strncpy(real, dest, PATH_MAX); - real[PATH_MAX-1] = '\0'; - } - - if (!realpath(checkDest, checkReal)) { - virLog("Failed to expand path '%s' :%s\n", checkDest, strerror(errno)); - strncpy(checkReal, checkDest, PATH_MAX); - checkReal[PATH_MAX-1] = '\0'; - } - - /* compare */ - if (STRNEQ(checkReal, real)) { + if (! SAME_INODE (src_sb, dest_sb)) { virLog("Link '%s' does not point to '%s', ignoring\n", - checkLink, checkReal); + checkLink, checkDest); return 0; } return 1; } -#else /* !__MINGW32__ */ - -/* Gnulib has an implementation of readlink which could be used - * to implement this, but it requires LGPLv3. - */ - -int -virFileLinkPointsTo (const char *checkLink ATTRIBUTE_UNUSED, - const char *checkDest ATTRIBUTE_UNUSED) -{ - virLog (_("%s: not implemented\n"), __FUNCTION__); - return 0; -} - -#endif /*! __MINGW32__ */ - int virFileExists(const char *path) { struct stat st; -- 1.6.0.rc2.38.g413e06

2 3

[libvirt] Qemu Monitor
by Listen 12 Aug '08

12 Aug '08

Hi all, A simple question, I hope ;) Is it possible to enable the qemu monitor in libvirt's xml? It need the monitor, to dynamically add a usb device to a windows vm. Regards, Eric

4 4

[libvirt] gnome-applet-vm orphaned
by Karel Zak 12 Aug '08

12 Aug '08

Hi folks, unfortunately, I have not enough time to work on the gnome applet. I'm looking for a new upstream maintainer, or for co-maintainer. Project home page: http://fedorahosted.org/gnome-applet-vm/ Note that the applet does not require any heavy development. Any volunteers around? Karel -- Karel Zak <kzak(a)redhat.com>

1 0

[libvirt] [PATCH] Ensure parted doesn't prompt if labeling disk
by Cole Robinson 12 Aug '08

12 Aug '08

Trying to 'build' a disk pool uses 'parted mklabel' which can prompt for confirmation. Patch adds the '--script' option to remove the chance of this happening. Thanks, Cole

4 4

[libvirt] Announcement of a companion project the "UnifiedSessionsManager"
by acue 12 Aug '08

12 Aug '08

Hello, I would like to announce the unifiedSessionsManager(GPL3, including the claimed inventions), which is based for Xen on the virsh-tool, but basically uses a different approach. I guess it could be a quite usable companion of libvirt for advanced usage and enhanced customizabelity of the handling of huge amounts of virtual and physical machines in a distributed environment. It is targeting on test, development and productive environments. This requirement will particularly arise, when "bulk-core-CPUs" enter the market, providing for independently executed bulks of virtual machines, which may be logically designed as stacked and nested VMs, founding a tree like multi-layered structure of VM clusters. The design-preview as estimated by the unifiedSessionsManager is here the v-component, what could be seen as the extensin of the slogan/concept of a so called virtual appliance, where a full scale VM including it's inherent GuestOS is handeled as a virtual software component. V-Compoents are foreseen to be grouped into clusters of VMs, arranged within a nested VMSTACK and managed - e.g. suspended - as a group of services, founding a combined service by their self. In case this preview becomes reality, this may have an impact on the basic design, particularly the interface design of each of it's components to be stack-aware, thus for libvirt too. For example providing the shutdown of a stack of VMs, including the suspension of machines containing upper VMs, might require some kind of communications and propagation.. The usage of multilayered VMSTACKs is already supported by the unifiedSessionsManager. Particularly MACRO and GROUP features support for handling of the number of entities required to be handled for a VMSTACK. Whereas much of the required functionality from the VMs is simulated, particularly by utilizing a recursive Stack-Propagation based on native access to GuestOSs with SSO-accounts. The concrete supported products of current version 01_07_001b02 are: - GuestOS and HostOS on physical machines: CentOS, Fedora, debian, OpenSUSE, Ubuntu, OpenBSD, Solaris10(limited) - Hypervisors/Emulators: QEMU, Xn, VMware(workstation,server,player) Future Plans are, mostly for the next version already: -Planned-OS: FreeBSD, NetBSD, Solaris10(complete), OpenSolaris, ScientificLinux -Planned-OS: eCos(?), uCLinux(several ARCH), SkyEye, ... -Planned-VM: VirtualBOX(evaluation first), OpenVZ(evaluation first) .Introduction of a LDAP based nameservice for VMs. -Evaluation of:Cygwin The Idea was the easy to adapt utilization of a minimalistic-bash-scripts only implementation for setting up a unified wrapper interface customizable for almost any kind of user sessions by almost anyone. Even though I would prefer now at least Perl or for specific parts full scale C/C++ code and Java/JavaScript for some administrative parts. The managed user environment comprises sessions to VMs which could be allocated in a nested multilayered VMSTACK as well as within a PM, which are physical machines - layer-0 entities. Also HOSTs sessions as native access to GuestOSs are integrated. Additionally a simple implemented but with sophisticated functionally equipped cache database is introduced in order to support for hundreds and thousands of virtual machines to be managed, with an average query-response-time for single-level-filters of less than 1second. Results are measured with an average of 0.3-0.8seconds in the ref.-env., even though bash and awk is mainly used only with an Office-Compatible record format. Information could be found within the User-Manual, which has more than 600pages, and within the sources of more than 110.000LinesOfCode. The following sites provide downloads: http://www.heise.de/software/download/unified_sessions_manager_ctys/51630 http://www.unifiedsessionsmanager.org http://www.unifiedsessionsmanager.eu http://sourceforge.net/projects/ctys (sourceforge not yet complete) (berlios follows) There are basically three reasons for sending this Mail: 1. Announcing a new supplemental project focusing on usage of distributed and stacked VMs 2. Getting some feedback and ideas for the future direction of the development of libvirt and the unifiedSessionsManager. 3. Probably initiation of setting up a common overall concept for the future vision of an IT environment and it's integrated handling of VMs. And of course, I would appreciate, if the current version already is of some benefit for the OpenSource community. Yours Sincerely Arno-Can Uestuensoez -- ---------------------------------------------------------------------------- Arno-Can Uestuensoez www.i4p.de / www.i4p.com

1 0

[libvirt] [PATCH/RFC]: hostdev passthrough support
by Guido Günther 12 Aug '08

12 Aug '08

Hi, attached is some basic support for host device passthrough. It enables you to passthrough usb devices in qemu/kvm via: <devices> <hostdev type='usb' vendor='0204' product='6025'/> <hostdev type='usb' bus='001' device='007'/> </devices> I didn't implement unplug yet since this needs some modifications to qemu/kvm to be able to identify the correct device to unplug. Does this look reasonable? -- Guido

5 35

[libvirt] [PATCH] fix MinGW compilation(200808)
by Atsushi SAKAI 12 Aug '08

12 Aug '08

Hi, Currently, compilation for MinGW is broken. Here is the patch. But configure script option for MinGW is changed from previous posting. https://www.redhat.com/archives/libvir-list/2008-June/msg00145.html Currently, it should do # ./configure --without-xen --without-qemu --without-sasl --without-lxc --without-openvz --without-libvirtd --without-test currently following 3 make works, make make install make check I do not know why syntax-check is not exist on Makefile on MinGW. src/domain_conf.c | 2 ++ src/network_conf.c | 2 ++ src/virsh.c | 8 ++++++++ tests/testutilsxen.c | 2 ++ 4 files changed, 14 insertions(+) Thanks Atsushi SAKAI

5 31

[libvirt] [PATCH] make sure we call the freshly build libvirtd
by Guido Guenther 11 Aug '08

11 Aug '08

...not the one in $PATH. I was wondering why this test kept failing... -- Guido --- tests/daemon-conf | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/daemon-conf b/tests/daemon-conf index db1f0d3..4a42d1e 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -1,6 +1,8 @@ #!/bin/sh # Get coverage of libvirtd's config-parsing code. +LIBVIRTD=$abs_top_builddir/qemud/libvirtd + # Boilerplate code to set up a test directory, cd into it, # and to ensure we remove it upon completion. this_test_() { echo "./$0" | sed 's,.*/,,'; } @@ -27,7 +29,7 @@ while :; do # Change an RHS that starts with '"' or '[' to "3". # Change an RHS that starts with 0 or 1 to the string '"foo"'. sed "$i"'s/ = [["].*/ = 3/;'"$i"'s/ = [01].*/ = "foo"/' tmp.conf > $f - libvirtd --config=$f 2> err && fail=1 + $LIBVIRTD --config=$f 2> err && fail=1 case $rhs in # '"'*) msg='should be a string';; '"'*) msg='invalid type: got long; expected string';; @@ -48,7 +50,7 @@ while :; do done # Run with the unmodified config file. -libvirtd --config=tmp.conf > log 2>&1 & pid=$! +$LIBVIRTD --config=tmp.conf > log 2>&1 & pid=$! sleep 2 kill $pid -- 1.5.6.3

4 5

[libvirt] /var/run/libvirt
by Stefan de Konink 11 Aug '08

11 Aug '08

It is a trivial error, but i wonder if: Failed to change group ownership of /var/run/libvirt Failed to bind socket to '/var/run/libvirt/libvirt-sock': No such file or directory This could be corrected to: /var/run/libvirt doesn't exist or an mkdir is done on the directory... Stefan

6 9

[libvirt] virStoragePoolRefresh (costs)
by Stefan de Konink 10 Aug '08

10 Aug '08

Could anyone elaborate on the cost of running virStoragePoolRefresh on the different backends. I recall one of the Daniels here suggested it was expensive for some backends could anyone elaborate on it? Stefan

1 0

[libvirt] [ANNOUNCE] virt-mem tools version 0.2.8 released
by Richard W.M. Jones 10 Aug '08

10 Aug '08

I'm pleased to announce the latest release of the virt-mem tools, version 0.2.8. These are tools for system administrators which let you find things like kernel messages, process lists and network information of your guests. For example: virt-uname 'uname' command, shows OS version, architecture, etc. virt-dmesg 'dmesg' command, shows kernel messages virt-ps 'ps' command, shows process list Nothing needs to be installed in the guest for this to work, and the tools are specifically designed to allow easy scripting and integration with databases and monitoring systems. Source is available from the web page here: http://et.redhat.com/~rjones/virt-mem/ The latest version (0.2.8) reworks the internals substantially so that we have direct access to basically any kernel structure, and this will allow us to quickly add the remaining features that people have asked for (memory usage information, lists of network interfaces and so on). As usual, patches, feedback, suggestions etc. are very welcome! Binaries will be available in Fedora 10 (Rawhide) at some point soon. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

8 11

[libvirt] PATCH: Fix const-ness for virRun/virExec
by Daniel P. Berrange 09 Aug '08

09 Aug '08

The exec() family of UNIX functions have broken const-ness in the argv[] parameter. For inexplicable reasons, I followed this brokeness when originally doing the virRun/virExec functions. So every caller is either using wrong const-ness, or having to cast when calling them. This patch fixes the virRun/virExec API const-ness, so we only need apply a cast at the time we finally call exec() src/iptables.c | 12 ++++++------ src/lxc_driver.c | 2 +- src/openvz_driver.c | 34 +++++++++++++++++----------------- src/qemu_conf.c | 4 ++-- src/qemu_conf.h | 2 +- src/qemu_driver.c | 6 +++--- src/storage_backend.c | 4 ++-- src/storage_backend_disk.c | 4 ++-- src/storage_backend_fs.c | 8 ++++---- src/storage_backend_iscsi.c | 6 +++--- src/storage_backend_logical.c | 12 ++++++------ src/util.c | 16 ++++++++-------- src/util.h | 6 +++--- src/veth.c | 8 ++++---- tests/qemuxml2argvtest.c | 2 +- 15 files changed, 63 insertions(+), 63 deletions(-) Daniel diff -r cc63ab958867 src/iptables.c --- a/src/iptables.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/iptables.c Thu Aug 07 22:59:08 2008 +0100 @@ -57,7 +57,7 @@ typedef struct { char *rule; - char **argv; + const char **argv; int command_idx; } iptRule; @@ -91,7 +91,7 @@ const char *path) { char arg[PATH_MAX]; - char *argv[4]; + const char *argv[4]; snprintf(arg, sizeof(arg), "--custom-rules=ipv4:%s:%s", table, path); @@ -278,7 +278,7 @@ static int iptRulesAppend(iptRules *rules, char *rule, - char **argv, + const char **argv, int command_idx) { if (VIR_REALLOC_N(rules->rules, rules->nrules+1) < 0) { @@ -385,7 +385,7 @@ } static char * -argvToString(char **argv) +argvToString(const char *const *argv) { int len, i; char *ret, *p; @@ -415,7 +415,7 @@ { va_list args; int retval = ENOMEM; - char **argv; + const char **argv; char *rule = NULL; const char *s; int n, command_idx; @@ -571,7 +571,7 @@ for (i = 0; i < rules->nrules; i++) { iptRule *rule = &rules->rules[i]; - char *orig; + const char *orig; orig = rule->argv[rule->command_idx]; rule->argv[rule->command_idx] = (char *) "--delete"; diff -r cc63ab958867 src/lxc_driver.c --- a/src/lxc_driver.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/lxc_driver.c Thu Aug 07 22:59:08 2008 +0100 @@ -1288,7 +1288,7 @@ int user_netns = 0; int kern_netns = 0; - if (virRun(NULL, (char **)argv, &ip_rc) == 0) + if (virRun(NULL, argv, &ip_rc) == 0) user_netns = WIFEXITED(ip_rc) && (WEXITSTATUS(ip_rc) != 255); if (lxcCheckContainerSupport(CLONE_NEWNET) == 0) diff -r cc63ab958867 src/openvz_driver.c --- a/src/openvz_driver.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/openvz_driver.c Thu Aug 07 22:59:08 2008 +0100 @@ -91,13 +91,13 @@ unsigned int flags ATTRIBUTE_UNUSED); static int openvzDomainUndefine(virDomainPtr dom); -static void cmdExecFree(char *cmdExec[]); +static void cmdExecFree(const char *cmdExec[]); static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid); struct openvz_driver ovz_driver; -static void cmdExecFree(char *cmdExec[]) +static void cmdExecFree(const char *cmdExec[]) { int i=-1; while(cmdExec[++i]) @@ -111,7 +111,7 @@ 0 - OK */ static int openvzDomainDefineCmd(virConnectPtr conn, - char *args[], + const char *args[], int maxarg, struct openvz_vm_def *vmdef) { @@ -287,7 +287,7 @@ return -1; } - if (virRun(dom->conn, (char **)prog, NULL) < 0) { + if (virRun(dom->conn, prog, NULL) < 0) { openvzError(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); return -1; @@ -319,7 +319,7 @@ return -1; } - if (virRun(dom->conn, (char **)prog, NULL) < 0) { + if (virRun(dom->conn, prog, NULL) < 0) { openvzError(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); return -1; @@ -333,7 +333,7 @@ virDomainNetDefPtr net) { int rc = 0, narg; - char *prog[OPENVZ_MAX_ARG]; + const char *prog[OPENVZ_MAX_ARG]; char *mac = NULL; #define ADD_ARG_LIT(thisarg) \ @@ -391,7 +391,7 @@ if (prog[0] != NULL){ ADD_ARG_LIT("--save"); - if (virRun(conn, (char **)prog, NULL) < 0) { + if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); rc = -1; @@ -427,7 +427,7 @@ struct openvz_vm_def *vmdef = NULL; struct openvz_vm *vm = NULL; virDomainPtr dom = NULL; - char *prog[OPENVZ_MAX_ARG]; + const char *prog[OPENVZ_MAX_ARG]; prog[0] = NULL; if ((vmdef = openvzParseVMDef(conn, xml, NULL)) == NULL) @@ -453,7 +453,7 @@ //TODO: set number virtual CPUs //TODO: set quota - if (virRun(conn, (char **)prog, NULL) < 0) { + if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); goto exit; @@ -489,7 +489,7 @@ virDomainPtr dom = NULL; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; const char *progstart[] = {VZCTL, "--quiet", "start", NULL, NULL}; - char *progcreate[OPENVZ_MAX_ARG]; + const char *progcreate[OPENVZ_MAX_ARG]; progcreate[0] = NULL; if (!(vmdef = openvzParseVMDef(conn, xml, NULL))) @@ -514,7 +514,7 @@ goto exit; } - if (virRun(conn, (char **)progcreate, NULL) < 0) { + if (virRun(conn, progcreate, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); goto exit; @@ -534,7 +534,7 @@ progstart[3] = vmdef->name; - if (virRun(conn, (char **)progstart, NULL) < 0) { + if (virRun(conn, progstart, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); goto exit; @@ -572,7 +572,7 @@ return -1; } - if (virRun(dom->conn, (char **)prog, NULL) < 0) { + if (virRun(dom->conn, prog, NULL) < 0) { openvzError(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); return -1; @@ -604,7 +604,7 @@ return -1; } - if (virRun(conn, (char **)prog, NULL) < 0) { + if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); return -1; @@ -629,7 +629,7 @@ return -1; } - if (virRun(conn, (char **)prog, NULL) < 0) { + if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); return -1; } @@ -742,7 +742,7 @@ char *endptr; const char *cmd[] = {VZLIST, "-ovpsid", "-H" , NULL}; - ret = virExec(conn, (char **)cmd, &pid, -1, &outfd, &errfd); + ret = virExec(conn, cmd, &pid, -1, &outfd, &errfd); if(ret == -1) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZLIST); @@ -779,7 +779,7 @@ const char *cmd[] = {VZLIST, "-ovpsid", "-H", "-S", NULL}; /* the -S options lists only stopped domains */ - ret = virExec(conn, (char **)cmd, &pid, -1, &outfd, &errfd); + ret = virExec(conn, cmd, &pid, -1, &outfd, &errfd); if(ret == -1) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZLIST); diff -r cc63ab958867 src/qemu_conf.c --- a/src/qemu_conf.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/qemu_conf.c Thu Aug 07 22:59:08 2008 +0100 @@ -711,7 +711,7 @@ struct qemud_driver *driver, virDomainObjPtr vm, int qemuCmdFlags, - char ***retargv, + const char ***retargv, int **tapfds, int *ntapfds, const char *migrateFrom) { @@ -728,7 +728,7 @@ struct utsname ut; int disableKQEMU = 0; int qargc = 0, qarga = 0; - char **qargv = NULL; + const char **qargv = NULL; uname(&ut); diff -r cc63ab958867 src/qemu_conf.h --- a/src/qemu_conf.h Thu Aug 07 15:00:21 2008 +0100 +++ b/src/qemu_conf.h Thu Aug 07 22:59:08 2008 +0100 @@ -95,7 +95,7 @@ struct qemud_driver *driver, virDomainObjPtr dom, int qemuCmdFlags, - char ***argv, + const char ***argv, int **tapfds, int *ntapfds, const char *migrateFrom); diff -r cc63ab958867 src/qemu_driver.c --- a/src/qemu_driver.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/qemu_driver.c Thu Aug 07 22:59:08 2008 +0100 @@ -842,7 +842,7 @@ struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom) { - char **argv = NULL, **tmp; + const char **argv = NULL, **tmp; int i, ret; char logfile[PATH_MAX]; struct stat sb; @@ -1087,7 +1087,7 @@ static int qemudBuildDnsmasqArgv(virConnectPtr conn, virNetworkObjPtr network, - char ***argv) { + const char ***argv) { int i, len, r; char buf[PATH_MAX]; @@ -1184,7 +1184,7 @@ dhcpStartDhcpDaemon(virConnectPtr conn, virNetworkObjPtr network) { - char **argv; + const char **argv; int ret, i; if (network->def->ipAddress == NULL) { diff -r cc63ab958867 src/storage_backend.c --- a/src/storage_backend.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/storage_backend.c Thu Aug 07 22:59:08 2008 +0100 @@ -403,7 +403,7 @@ /* Run the program and capture its output */ - if (virExec(conn, (char**)prog, &child, -1, &fd, NULL) < 0) { + if (virExec(conn, prog, &child, -1, &fd, NULL) < 0) { goto cleanup; } @@ -537,7 +537,7 @@ v[i] = NULL; /* Run the program and capture its output */ - if (virExec(conn, (char**)prog, &child, -1, &fd, NULL) < 0) { + if (virExec(conn, prog, &child, -1, &fd, NULL) < 0) { goto cleanup; } diff -r cc63ab958867 src/storage_backend_disk.c --- a/src/storage_backend_disk.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/storage_backend_disk.c Thu Aug 07 22:59:08 2008 +0100 @@ -410,7 +410,7 @@ NULL, }; - if (virRun(conn, (char**)prog, NULL) < 0) + if (virRun(conn, prog, NULL) < 0) return -1; return 0; @@ -469,7 +469,7 @@ snprintf(end, sizeof(end)-1, "%lluB", endOffset); end[sizeof(end)-1] = '\0'; - if (virRun(conn, (char**)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; /* Blow away free extent info, as we're about to re-populate it */ diff -r cc63ab958867 src/storage_backend_fs.c --- a/src/storage_backend_fs.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/storage_backend_fs.c Thu Aug 07 22:59:08 2008 +0100 @@ -571,7 +571,7 @@ } mntargv[source_index] = src; - if (virRun(conn, (char**)mntargv, NULL) < 0) { + if (virRun(conn, mntargv, NULL) < 0) { VIR_FREE(src); return -1; } @@ -625,7 +625,7 @@ mntargv[1] = pool->def->target.path; mntargv[2] = NULL; - if (virRun(conn, (char**)mntargv, NULL) < 0) { + if (virRun(conn, mntargv, NULL) < 0) { return -1; } return 0; @@ -940,7 +940,7 @@ imgargv[5] = size; imgargv[6] = NULL; - if (virRun(conn, (char **)imgargv, NULL) < 0) { + if (virRun(conn, imgargv, NULL) < 0) { unlink(vol->target.path); return -1; } @@ -975,7 +975,7 @@ imgargv[2] = vol->target.path; imgargv[3] = NULL; - if (virRun(conn, (char **)imgargv, NULL) < 0) { + if (virRun(conn, imgargv, NULL) < 0) { unlink(vol->target.path); return -1; } diff -r cc63ab958867 src/storage_backend_iscsi.c --- a/src/storage_backend_iscsi.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/storage_backend_iscsi.c Thu Aug 07 22:59:08 2008 +0100 @@ -158,7 +158,7 @@ "--targetname", pool->def->source.devices[0].path, action, NULL }; - if (virRun(conn, (char **)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; return 0; @@ -507,7 +507,7 @@ ISCSIADM, "--mode", "session", "-r", session, "-R", NULL, }; - if (virRun(conn, (char **)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; return 0; @@ -524,7 +524,7 @@ "--portal", portal, NULL }; - if (virRun(conn, (char **)cmdsendtarget, NULL) < 0) + if (virRun(conn, cmdsendtarget, NULL) < 0) return -1; return virStorageBackendISCSIConnection(conn, pool, portal, "--login"); diff -r cc63ab958867 src/storage_backend_logical.c --- a/src/storage_backend_logical.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/storage_backend_logical.c Thu Aug 07 22:59:08 2008 +0100 @@ -83,7 +83,7 @@ cmdargv[2] = pool->def->name; cmdargv[3] = NULL; - if (virRun(conn, (char**)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; return 0; @@ -324,14 +324,14 @@ */ vgargv[n++] = pool->def->source.devices[i].path; pvargv[1] = pool->def->source.devices[i].path; - if (virRun(conn, (char**)pvargv, NULL) < 0) + if (virRun(conn, pvargv, NULL) < 0) goto cleanup; } vgargv[n++] = NULL; /* Now create the volume group itself */ - if (virRun(conn, (char**)vgargv, NULL) < 0) + if (virRun(conn, vgargv, NULL) < 0) goto cleanup; VIR_FREE(vgargv); @@ -422,7 +422,7 @@ VGREMOVE, "-f", pool->def->name, NULL }; - if (virRun(conn, (char**)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; /* XXX clear the PVs too ? ie pvremove ? probably ought to */ @@ -453,7 +453,7 @@ snprintf(size, sizeof(size)-1, "%lluK", vol->capacity/1024); size[sizeof(size)-1] = '\0'; - if (virRun(conn, (char**)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; if ((fd = open(vol->target.path, O_RDONLY)) < 0) { @@ -514,7 +514,7 @@ LVREMOVE, "-f", vol->target.path, NULL }; - if (virRun(conn, (char**)cmdargv, NULL) < 0) + if (virRun(conn, cmdargv, NULL) < 0) return -1; return 0; diff -r cc63ab958867 src/util.c --- a/src/util.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/util.c Thu Aug 07 22:59:08 2008 +0100 @@ -102,8 +102,8 @@ static int _virExec(virConnectPtr conn, - char **argv, - int *retpid, int infd, int *outfd, int *errfd, int non_block) { + const char *const*argv, + int *retpid, int infd, int *outfd, int *errfd, int non_block) { int pid, null; int pipeout[2] = {-1,-1}; int pipeerr[2] = {-1,-1}; @@ -185,7 +185,7 @@ if (pipeerr[1] > 0) close(pipeerr[1]); - execvp(argv[0], argv); + execvp(argv[0], (char **) argv); _exit(1); @@ -207,16 +207,16 @@ int virExec(virConnectPtr conn, - char **argv, - int *retpid, int infd, int *outfd, int *errfd) { + const char *const*argv, + int *retpid, int infd, int *outfd, int *errfd) { return(_virExec(conn, argv, retpid, infd, outfd, errfd, 0)); } int virExecNonBlock(virConnectPtr conn, - char **argv, - int *retpid, int infd, int *outfd, int *errfd) { + const char *const*argv, + int *retpid, int infd, int *outfd, int *errfd) { return(_virExec(conn, argv, retpid, infd, outfd, errfd, 1)); } @@ -238,7 +238,7 @@ */ int virRun(virConnectPtr conn, - char **argv, + const char *const*argv, int *status) { int childpid, exitstatus, ret; diff -r cc63ab958867 src/util.h --- a/src/util.h Thu Aug 07 15:00:21 2008 +0100 +++ b/src/util.h Thu Aug 07 22:59:08 2008 +0100 @@ -27,11 +27,11 @@ #include "util-lib.h" #include "verify.h" -int virExec(virConnectPtr conn, char **argv, int *retpid, +int virExec(virConnectPtr conn, const char *const*argv, int *retpid, int infd, int *outfd, int *errfd); -int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, +int virExecNonBlock(virConnectPtr conn, const char *const*argv, int *retpid, int infd, int *outfd, int *errfd); -int virRun(virConnectPtr conn, char **argv, int *status); +int virRun(virConnectPtr conn, const char *const*argv, int *status); int __virFileReadAll(const char *path, int maxlen, diff -r cc63ab958867 src/veth.c --- a/src/veth.c Thu Aug 07 15:00:21 2008 +0100 +++ b/src/veth.c Thu Aug 07 22:59:08 2008 +0100 @@ -104,7 +104,7 @@ } DEBUG("veth1: %s veth2: %s", veth1, veth2); - rc = virRun(NULL, (char**)argv, &cmdResult); + rc = virRun(NULL, argv, &cmdResult); if (0 == rc) { rc = cmdResult; @@ -137,7 +137,7 @@ DEBUG("veth: %s", veth); - rc = virRun(NULL, (char**)argv, &cmdResult); + rc = virRun(NULL, argv, &cmdResult); if (0 == rc) { rc = cmdResult; @@ -172,7 +172,7 @@ else argv[2] = "up"; - rc = virRun(NULL, (char**)argv, &cmdResult); + rc = virRun(NULL, argv, &cmdResult); if (0 == rc) { rc = cmdResult; @@ -210,7 +210,7 @@ goto error_out; argv[5] = pid; - rc = virRun(NULL, (char**)argv, &cmdResult); + rc = virRun(NULL, argv, &cmdResult); if (0 == rc) rc = cmdResult; diff -r cc63ab958867 tests/qemuxml2argvtest.c --- a/tests/qemuxml2argvtest.c Thu Aug 07 15:00:21 2008 +0100 +++ b/tests/qemuxml2argvtest.c Thu Aug 07 22:59:08 2008 +0100 @@ -26,7 +26,7 @@ char argvData[MAX_FILE]; char *expectargv = &(argvData[0]); char *actualargv = NULL; - char **argv = NULL; + const char **argv = NULL; char **tmp = NULL; int ret = -1, len, flags; virDomainDefPtr vmdef = NULL; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2

[libvirt] Release of libvirt-java-0.2.1
by Daniel Veillard 08 Aug '08

08 Aug '08

Following the refactoring patch by Tóth István, it was a good idea to make a release awoiding all the know leaks and providing the storage API. Sor libvirt-java-0.2.1 is available at the usual place: ftp://libvirt.org/libvirt/java/ thanks Tóth ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[libvirt] Question SSH support and libirt on Windows
by Atsushi SAKAI 08 Aug '08

08 Aug '08

Hi, Rich I have a question about SSH support of libvirt on Windows. Is there any reason for not supporting SSH. It is just because it lacks manpower? Thanks Atsushi SAKAI

3 2

[libvirt] [PATCH] fix xmlint in separate build dir
by Guido Günther 07 Aug '08

07 Aug '08

Hi, attached patch lets the domainschema check work when building in $build instead of $src. Otherwise it won't find the xml files to validate. -- Guido

2 1

[libvirt] ISCSI Live Migration with LUN backed VMs
by Tim Hughes 07 Aug '08

07 Aug '08

I am using iscsi backed VMs which use a separate LUN for each VM. This is all good until I try to live migrate because the LUN is not logged into on the new machine. Does anyone have a way of handling logging into and out of iscsi luns during the migration ? Tim Hughes mailto:thughes@thegoldfish.org

3 3

[libvirt] default networking issues
by Bryan Kearney 07 Aug '08

07 Aug '08

Need some help about where to look next. I am running a Fedora 9 machine, up to date on the releaed rpms. SELinux is permissive, iptables is stopped. I have followed the instructions for NAT forwarding [1]. When I launch a guest in virt manager it uses the default network, and is assigned an IP address in the 192.168.122 space. It can do dns resolution, but can not wget a known website (www.cnn.com) From my host machine, I can ssh into the guest. Where is the next place I should look. Is the fact that I am running in a corporate network causing me issues? Thanks! -- bk [1] http://wiki.libvirt.org/page/Networking#NAT_forwarding_.28aka_.22virtual_ne…

5 5

[libvirt] [PATCH] The logic in veth.c that searches for free interface names takes into account
by Dan Smith 07 Aug '08

07 Aug '08

only current devices, but not device names already planned for the other half of a container's device pair. Thus, the search can result in attempting to create a pair of devices such as veth1 and veth1, which obviously does not work. This patch augments the logic to be a little smarter in this regard, and should fix one case where attempting to start a container results in an error message of "unable to create device pair". diff -r 8c5e6387e449 -r 8545f7ac1f0f src/veth.c --- a/src/veth.c Tue Aug 05 16:45:07 2008 +0000 +++ b/src/veth.c Wed Aug 06 08:14:16 2008 -0700 @@ -92,17 +92,18 @@ DEBUG("veth1: %s veth2: %s", veth1, veth2); - if (1 > strlen(veth1)) { + while ((1 > strlen(veth1)) || STREQ(veth1, veth2)) { vethDev = getFreeVethName(veth1, veth1MaxLen, 0); ++vethDev; DEBUG("assigned veth1: %s", veth1); } - if (1 > strlen(veth2)) { + while ((1 > strlen(veth2)) || STREQ(veth1, veth2)) { vethDev = getFreeVethName(veth2, veth2MaxLen, vethDev); DEBUG("assigned veth2: %s", veth2); } + DEBUG("veth1: %s veth2: %s", veth1, veth2); rc = virRun(NULL, (char**)argv, &cmdResult); if (0 == rc) {

3 3

[libvirt] update from gnulib
by Jim Meyering 07 Aug '08

07 Aug '08

I've just checked in a big batch of changes from gnulib. Each of those changes has been reviewed by at least two people (see bug-gnulib(a)gnu.org) and most of them address problems also reported on that list, or e.g., on bug-coreutils, bug-m4, etc. However, I suspect some of them have not yet been exercised on RHEL4/5 systems, so test builds there may be interesting. >From e6440820773161436812ccad7eba6d555a8186dd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 7 Aug 2008 10:28:22 +0200 Subject: [PATCH] update from gnulib * build-aux/mktempd (rand_bytes, mktempd): * build-aux/useless-if-before-free (FILE): * build-aux/vc-list-files: * gnulib/lib/.cvsignore: * gnulib/lib/Makefile.am: * gnulib/lib/poll.c (poll): * gnulib/lib/stdbool.in.h (_GL_STDBOOL_H, true): * gnulib/lib/stdio-impl.h (fp_, fp_ub): * gnulib/lib/stdio.in.h (vasprintf, obstack_printf) (obstack_vprintf): * gnulib/lib/vasnprintf.c (_GNU_SOURCE, sprintf, IF_LINT, exp) (remainder, scale10_round_decimal_long_double) (scale10_round_decimal_double, pad_ourselves): * gnulib/m4/gnulib-cache.m4: * gnulib/m4/gnulib-common.m4 (gl_MODULE_INDICATOR): * gnulib/m4/gnulib-tool.m4 (gl_LOCAL_DIR, gl_M4_BASE, gl_PO_BASE) (gl_DOC_BASE, gl_TESTS_BASE, gl_WITH_TESTS, gl_LIB, gl_LGPL) (gl_MAKEFILE_NAME, gl_MACRO_PREFIX, gl_PO_DOMAIN, gl_VC_FILES): * gnulib/m4/lock.m4 (gl_LOCK_EARLY_BODY, gl_PREREQ_LOCK) (gl_DISABLE_THREADS): * gnulib/m4/onceonly.m4: * gnulib/m4/posix-shell.m4 (gl_POSIX_SHELL): * gnulib/m4/stdio_h.m4 (gl_STDIO_H_DEFAULTS): * gnulib/tests/test-getaddrinfo.c (ENABLE_DEBUGGING, dbgprintf) (simple): * gnulib/tests/test-stdint.c (UINTMAX_MAX, or): * gnulib/tests/test-vc-list-files-cvs.sh (compare): * gnulib/tests/test-vc-list-files-git.sh (compare): --- build-aux/mktempd | 6 +++- build-aux/useless-if-before-free | 32 +++++++++++++++--------- build-aux/vc-list-files | 5 ++- gnulib/lib/.cvsignore | 12 ++++---- gnulib/lib/Makefile.am | 15 +++++++++++- gnulib/lib/poll.c | 34 ++++++++++++++++++------- gnulib/lib/stdbool.in.h | 6 ++-- gnulib/lib/stdio-impl.h | 4 +- gnulib/lib/stdio.in.h | 20 +++++++++++++++ gnulib/lib/vasnprintf.c | 25 +++++++++++++++---- gnulib/m4/gnulib-cache.m4 | 21 ++++++++++++++- gnulib/m4/gnulib-common.m4 | 9 ++++++- gnulib/m4/gnulib-tool.m4 | 28 ++++++++++++++++++++- gnulib/m4/lock.m4 | 37 +++++++++++++++++++++------- gnulib/m4/onceonly.m4 | 15 +++++++---- gnulib/m4/posix-shell.m4 | 7 +++-- gnulib/m4/stdio_h.m4 | 6 ++++- gnulib/tests/test-getaddrinfo.c | 41 +++++++++++++++++++------------ gnulib/tests/test-stdint.c | 6 ++++- gnulib/tests/test-vc-list-files-cvs.sh | 3 +- gnulib/tests/test-vc-list-files-git.sh | 3 +- 21 files changed, 249 insertions(+), 86 deletions(-)

2 2

[libvirt] Is CVS server working?
by Atsushi SAKAI 07 Aug '08

07 Aug '08

Hi, CVS server anoncvs@libvirt.org:2401/data/cvs is working? I can see git repository but CVS repository are not. Thanks Atsushi SAKAI

2 3

[libvirt] [PATCH] Install default storage pool
by Cole Robinson 07 Aug '08

07 Aug '08

The attached patch adds a default pool definition to install with libvirt. The pool is a directory pool, hardcoded to use /var/lib/libvirt/images, though this is replaced with %{_localstatedir}/lib/libvirt/images if installing via rpm. Since /var/lib/libvirt/images may not exist if installing from tar.gz, the pool is set not to autostart by default via that method. This patch isn't ready to apply though, since there is one issue I don't know how to solve. We don't want every rpm upgrade to install the default pool, since we don't want the default to continually resurrect itself if a user explicitly deletes it. The default network handles this by checking if libvirtd has been installed. Since libvirtd and virtual network support were introduced around the same time, this makes sense. However for storage, I can't think of any simple check we can make. If we used the same as the default network, all f8 or f9 upgrades wouldn't install the default pool. I can't really think of anything to check, besides maybe doing some sort of time comparison on when /usr/share/libvirt/storage/default.xml was accessed. This code is just hardcoded to always add it. Any ideas? Thanks, Cole

2 1

[libvirt] [patch][doc] fix typos 20080807
by Atsushi SAKAI 07 Aug '08

07 Aug '08

Hi, Typo fixes on document. formatdomain.html | 22 +++++++++++----------- formatdomain.html.in | 22 +++++++++++----------- java.html | 2 +- java.html.in | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) Thanks Atsushi SAKAI

2 1

[libvirt] How does virt-manager send shutdown?
by Bryan Kearney 07 Aug '08

07 Aug '08

How does virt-manager send shutdown to guests? Does it depend on if you are running kvm or xen? I have been building images with acpid enabled and acpi=force on the command line. After upgrading to f9 and running kvm my images no longer respond to shutdown. Is there a tweak which I have missed? - bk

5 8

[libvirt] [PATCH] storage pool discovery
by David Lively 06 Aug '08

06 Aug '08

Hi - The attached patch implements virConnectDiscoverStoragePools mostly as specified by Daniel Berrange in: http://www.redhat.com/archives/libvir-list/2008-February/msg00107.html Daniel wasn't happy with the interface for this function because it wasn't sufficiently general, so it currently doesn't exist. I've attempted to generalize his proposed interface by changing the "hostname" argument to a "srcSpec" argument, which is intended to be a XML storage pool <source> element. Note that srcSpec is not necessary for some (local) pool types. For example, to discover existing LVM volume groups, there's no need to specify a source: virsh # pool-discover logical While discovering nfs shares requires a <source> document to specify the host to query: virsh # pool-discover netfs "<source><host name='share' /></source>" Currently (i.e., in this patch) I've implemented discovery support only for the "logical" and "netfs" pools. I plan on covering the other types once we've agreed upon the API. While this patch is rather large, the vast majority of it is "generic" (not specific to any particular type of storage pool) code, which I mostly took from Daniel's submission. I could easily break the storage-pool-type-specific pieces into separate patches, but those changes are already segregated into the appropriate storage_backend_ files. * Known Issues * I made the virsh interface take a XML string rather than a filename. I found it convenient, but AFAIK the rest of the commands that take XML take it from a file, so perhaps that should be changed (just let me know what you'd prefer). I realize the description of srcSpec is kind of fuzzy. For instance, for netfs discovery, the <source> must have a <host> element (to specify the host to query), but shouldn't have a <dir> element since the exported dirs are exactly what we're trying to discover in this case. So this really needs to be documented accurately for each storage pool type. (Where?) Finally, there's an underspecification issue. The XML pool descriptions returned are supposed to be usable as valid input to virStoragePoolDefineXML. But these descriptions include some data (pool name, target path) that isn't specified by the discover input or the discovered resources. For now, I'm making up a somewhat arbitrary pool name (logical: VolGroup name, netfs: last component of export path). And I don't even specify <target><path> in the "netfs" discovery output (which means it's not valid input to virStoragePoolDefineXML until a target path is added). Dave

4 14

[libvirt] [PATCH] fix failing "make syntax-check"
by Jim Meyering 06 Aug '08

06 Aug '08

"make syntax-check" just started failing. This fixes it: fix failing "make syntax-check" * src/stats_linux.c: Don't include <c-ctype.h> no longer used. --- ChangeLog | 3 +++ src/stats_linux.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c23799c..ea6f1da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Tue Aug 6 13:30:44 CEST 2008 Jim Meyering <meyering(a)redhat.com> + fix failing "make syntax-check" + * src/stats_linux.c: Don't include <c-ctype.h> no longer used. + work around MinGW build failure due to its lack of inet_aton Use inet_pton instead; pull in gnulib's module by the same name. * src/network_conf.c (virNetworkDefParseXML): Use inet_pton, diff --git a/src/stats_linux.c b/src/stats_linux.c index 897251b..3f7dd52 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -19,7 +19,6 @@ #include <string.h> #include <unistd.h> #include <regex.h> -#include "c-ctype.h" #ifdef WITH_XEN #include <xs.h> -- 1.6.0.rc1.92.g189f7

2 2

[libvirt] Memory corruption with CVS tip + python
by Chris Lalancette 06 Aug '08

06 Aug '08

All, FYI, I'm running into some memory corruption when using CVS tip and trying to use an older virt-install command. I won't have time to debug this today, so I thought I would mention it on-list in case someone else wants to take a crack at it. My system is an AMD system running RHEL-5.2 x86_64 bits, so it has python-virtinst-0.300.2-8.el5 installed. Basically, I did this: # cvs co libvirt # cd libvirt # ./autogen.sh # make dist >From here, I took the resulting .tar.gz, and dumped it into /usr/src/redhat/SOURCES, and then took the SPEC file from the Fedora 9 sources. I had to modify the very top of it (since RHEL-5 rpmbuild didn't like the macros for whatever reason), but if I read the logic right, I put these flags at the top: %define with_polkit 0 %define with_proxy yes %define with_qemu 0 Then I built and installed a libvirt and libvirt-python RPM with this. Finally, I restarted libvirtd, and then tried to run the following command: [root@amd1 libvirt]# virt-install -n test -f /var/lib/xen/images/test.img -s 10 -r 768 -v -c /var/lib/xen/images/boot.iso -d --vnc Wed, 06 Aug 2008 07:59:10 DEBUG DistroInstaller location is a local file/path: /var/lib/xen/images/boot.iso Starting install... Segmentation fault [root@amd1 libvirt]# It happens every time, so it should be fairly easy to track down. Chris Lalancette

1 0

[libvirt] incorrect data in online documentation (I think)
by matthew chan 06 Aug '08

06 Aug '08

Hi The online documentation mentions that the XML <memory> node units are in byte, but from the example code I have observed, it seems more likely to be in kilobytes. Could someone verify + change if necessary please? Thanks, Matt

2 1

[libvirt] [PATCH]: Fix sexpr generation again
by Chris Lalancette 06 Aug '08

06 Aug '08

DanB pointed out that my sexpr xend_internal patch from yesterday broke one of the regression tests. The problem is that the xenDaemonFormatSxpr{Disk,Net} functions are shared between domain creation time and attaching disk time. Unfortunately, though, Xend expects something different during these two times. During domain creation time, it wants the "(device" in front of the sexpr, while during attach time it does not. To remedy this situation, I added a flag to these two functions to differentiate between these two modes. With this patch in place, all of the regression tests pass. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 2

Re: [libvirt] PATCH: 0/7: Re-factor LXC driver
by Daniel P. Berrange 05 Aug '08

05 Aug '08

On Tue, Aug 05, 2008 at 09:04:34PM +0400, Evgeniy V. Sokolov wrote: > > >This is a long overdue followup to my previous set of patches to make the > >LXC driver use the new domain XML apis. Getting this merged is a blocker > >for the new libvirt release, now we've turned on LXC by default. Likewise > >we need to get OpenVZ fully ported to new XML before release too. > Daniel, do you plan to finish port of OpenVZ ? or I will do it. I'm happy todo the work to at least port the code, but I don't have a OpenVZ enabled machine, so would neeed someone else to actually test if its works :-) Ideally I think we should aim todo a release next week, so I'll look at whatever the state of the OpenVZ code is this coming weekend, and work from that. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] [PATCH]: Fix "virsh attach-disk" and "virsh attach-interface"
by Chris Lalancette 05 Aug '08

05 Aug '08

With the recent refactoring of the domain code, plus the changes with the Xend code, a couple of bugs were introduced into the attach-disk and attach-interface functionality. This patch fixes 3 bugs: 1) In xenDaemonAttachDevice(), there is a switch statement to determine which of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case statements are all missing the corresponding "break", so we always fall-through to the default error case. This patch just adds the appropriate break statements. 2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray "fprintf". This is now converted to a proper virXendError(). 3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2). Because of this, the attaches would fail. The patch fixes this by removing the (device from the front, which makes attach-disk and attach-interface work again. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 4

[libvirt] [PATCH]: Rework xenLinuxDomainDeviceID to support more devices
by Chris Lalancette 05 Aug '08

05 Aug '08

Recently upstream Xen added support for having xvd devices > 16. For the most part, this doesn't really concern libvirt, since for things like attach and detach we just pass it through and let xend worry about whether it is supported or not. The one place this breaks down is in the stats collecting code, where we need to figure out the device number so we can go digging in /sys for the statistics. To remedy this, I've re-written xenLinuxDomainDeviceID() to use regular expressions to figure out the device number from the name. The major advantage is that now xenLinuxDomainDeviceID() looks fairly identical to tools/python/xen/util/blkif.py (in the Xen sources), so that adding additional devices in the future should be much easier. It also reduces the size of the code, and, in my opinion, the code complexity. With this patch in place, I was able to get block statistics both on older style devices (/dev/xvda) and on the new, expanded devices (/dev/xvdaa). Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

4 10

[libvirt] [PATCH] Save uuid when define/create domain
by Evgeniy Sokolov 05 Aug '08

05 Aug '08

Hi, There was bug. UUID defined in XML or generated during define/create was not saved to config. Then it was regenerated in virDrvStateInitialize. Attached patch fix bug.

2 1

[libvirt] libvirt-java storage support and refactoring
by Tóth István 05 Aug '08

05 Aug '08

Hello! This patch contains the following: - The complete storage handling API - Fixing memory leaks in the VirConnect JNI implementation I've written the new classes using a new approach. I've found that libvirt for the most part has a very perdicitble and repetitive API (great design!), and as a result I've found myself copying the same code over and over again. I've decided to make generic JNI functions, that can handle multiple libvirt functions with function pointers. The generic functions are in generic.c and they are used extensively in the new Storage JNI implementation. I'd like to have your input on this architecture, my current plan is to refactor all trivial JNI functions to use these generics, unless there are objections. The positive aspects of the new architecture: - No code duplication, one generic function fix affects all similar functions - Less code The negative aspects: - Ugly syntax (but JNI is ugly enough already) - Easier to make errors in JNI code due to function type casts. I think that the benefits outweigh the negatives, esepecialy when we start cleaning up memory allocation, 64/32 bit cleannes stuff, threading, it will have to be done in one function, instead of 3 or 30 cut'n'pasted ones, scattered in 5 files. best regards István Index: src/org/libvirt/Connect.java =================================================================== RCS file: /data/cvs/libvirt-java/src/org/libvirt/Connect.java,v retrieving revision 1.1 diff -u -r1.1 Connect.java --- src/org/libvirt/Connect.java 18 Jul 2008 14:37:21 -0000 1.1 +++ src/org/libvirt/Connect.java 2 Aug 2008 15:21:11 -0000 @@ -1,5 +1,9 @@ package org.libvirt; +import org.libvirt.LibvirtException; +import org.libvirt.StoragePool; +import org.libvirt.StorageVol; + /** * The Connect object represents a connection to a local or remote hypervisor/driver. * @@ -541,4 +545,157 @@ private native int _setDom0Memory(long memory) throws LibvirtException; + /** + * Provides the number of inactive storage pools + * + * @return the number of pools found + * @throws LibvirtException + */ + public int numOfDefinedStoragePools() throws LibvirtException { + return _numOfDefinedStoragePools(VCP); + } + + private native int _numOfDefinedStoragePools(long VCP) throws LibvirtException; + + /** + * Provides the number of active storage pools + * + * @return the number of pools found + * @throws LibvirtException + */ + public int numOfStoragePools() throws LibvirtException { + return _numOfStoragePools(VCP); + } + + private native int _numOfStoragePools(long VCP) throws LibvirtException; + + /** + * Provides the list of names of inactive storage pools. + * + * @return an Array of Strings that contains the names of the defined storage pools + * @throws LibvirtException + */ + public String[] listDefinedStoragePools() throws LibvirtException { + return _listDefinedStoragePools(VCP); + } + + private native String[] _listDefinedStoragePools(long VCP) + throws LibvirtException; + + /** + * Provides the list of names of active storage pools. + * + * @return an Array of Strings that contains the names of the defined storage pools + * @throws LibvirtException + */ + public String[] listStoragePools() throws LibvirtException { + return _listStoragePools(VCP); + } + + private native String[] _listStoragePools(long VCP) + throws LibvirtException; + + /** + * Create a new storage based on its XML description. + * The pool is not persistent, so its definition will disappear when it is destroyed, or if the host is restarted + * + * @param xmlDesc XML description for new pool + * @param flags future flags, use 0 for now + * @return StoragePool object + * @throws LibvirtException + */ + public StoragePool storagePoolCreateXML(String xmlDesc, int flags) + throws LibvirtException { + return new StoragePool(this, _virStoragePoolCreateXML(VCP, xmlDesc, flags)); + } + + private native long _virStoragePoolCreateXML(long VCP, String xmlDesc, int flags) + throws LibvirtException; + + /** + * Define a new inactive storage pool based on its XML description. + * The pool is persistent, until explicitly undefined. + * + * @param xmlDesc XML description for new pool + * @param flags flags future flags, use 0 for now + * @return StoragePool object + * @throws LibvirtException + */ + public StoragePool storagePoolDefineXML(String xml, int flags) + throws LibvirtException { + return new StoragePool(this, _virStoragePoolDefineXML(VCP, xml, flags)); + } + + private native long _virStoragePoolDefineXML(long VCP, String xml, int flags) + throws LibvirtException; + + /** + * Fetch a storage pool based on its unique name + * + * @param name name of pool to fetch + * @return StoragePool object + * @throws LibvirtException + */ + public StoragePool storagePoolLookupByName(String name) + throws LibvirtException { + return new StoragePool(this, _virStoragePoolLookupByName(VCP, name)); + } + + private native long _virStoragePoolLookupByName(long VCP, String name) + throws LibvirtException; + + /** + * Fetch a storage pool based on its globally unique id + * + * @param UUID globally unique id of pool to fetch + * @return a new network object + * @throws LibvirtException + */ + public StoragePool storagePoolLookupByUUID(int[] UUID) + throws LibvirtException { + return new StoragePool(this, _virStoragePoolLookupByUUID(VCP, UUID)); + } + + private native long _virStoragePoolLookupByUUID(long VCP, int[] UUID); + + /** + * Fetch a storage pool based on its globally unique id + * + * @param UUID globally unique id of pool to fetch + * @return VirStoragePool object + * @throws LibvirtException + */ + public StoragePool storagePoolLookupByUUIDString(String UUID) + throws LibvirtException { + return new StoragePool(this, _virStoragePoolLookupByUUIDString(VCP, UUID)); + } + + private native long _virStoragePoolLookupByUUIDString(long VCP, String UUID) + throws LibvirtException; + + /** + * Fetch a a storage volume based on its globally unique key + * + * @param key globally unique key + * @return a storage volume + */ + public StorageVol storageVolLookupByKey(String key){ + return new StorageVol(this, _virStorageVolLookupByKey(VCP, key)); + } + + private native long _virStorageVolLookupByKey(long VCP, String key); + + /** + * Fetch a storage volume based on its locally (host) unique path + * + * @param path locally unique path + * @return a storage volume + */ + public StorageVol storageVolLookupByPath(String path){ + return new StorageVol(this, _virStorageVolLookupByPath(VCP, path)); + } + + private native long _virStorageVolLookupByPath(long VCP, String path); + + } Index: src/jni/org_libvirt_Connect.c =================================================================== RCS file: /data/cvs/libvirt-java/src/jni/org_libvirt_Connect.c,v retrieving revision 1.2 diff -u -r1.2 org_libvirt_Connect.c --- src/jni/org_libvirt_Connect.c 22 Jul 2008 08:27:42 -0000 1.2 +++ src/jni/org_libvirt_Connect.c 2 Aug 2008 15:21:11 -0000 @@ -6,7 +6,8 @@ #include <assert.h> -//TODO We are leaking UTFChars all over the place. We need to strcpy, then release every string we get from JAVA, and not use them directly! +//TODO We are leaking UTFChars all over the place. We need to release every string we get from JAVA with ReleaseStringUTFChars! (Done) +//TODO The same for *ArrayElements JNIEXPORT jint JNICALL Java_org_libvirt_Connect__1virInitialize (JNIEnv *env, jclass cls){ @@ -47,8 +48,11 @@ } JNIEXPORT jint JNICALL Java_org_libvirt_Connect__1getMaxVcpus - (JNIEnv *env, jobject obj, jlong VCP, jstring type){ - return virConnectGetMaxVcpus((virConnectPtr)VCP , (*env)->GetStringUTFChars(env, type, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_type){ + const char *type = (*env)->GetStringUTFChars(env, j_type, NULL); + int retval = (jlong)virConnectGetMaxVcpus((virConnectPtr)VCP, type); + (*env)->ReleaseStringUTFChars(env, j_type, type); + return retval; }; JNIEXPORT jstring JNICALL Java_org_libvirt_Connect__1getType @@ -76,7 +80,7 @@ JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1getVersion (JNIEnv *env, jobject obj, jlong VCP){ unsigned long hvVer=0; - int retval = virConnectGetVersion((virConnectPtr)VCP, &hvVer); + long retval = virConnectGetVersion((virConnectPtr)VCP, &hvVer); return (jlong)(hvVer); }; @@ -146,31 +150,35 @@ JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1open - (JNIEnv *env, jobject obj, jstring uri){ + (JNIEnv *env, jobject obj, jstring j_uri){ virConnectPtr vc; + const char *uri=(*env)->GetStringUTFChars(env, j_uri, NULL); //Initialize the libvirt VirtConn Object - vc=virConnectOpen((*env)->GetStringUTFChars(env, uri, NULL)); + vc=virConnectOpen(uri); + (*env)->ReleaseStringUTFChars(env, j_uri, uri); if(vc==NULL){ //We have a pending java exception, let's return assert((*env)->ExceptionOccurred(env)); return (jlong)NULL; } - //Initialized the error handler for this connection + //Initialize the error handler for this connection virConnSetErrorFunc(vc, env, virErrorHandler); return (jlong)vc; }; JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1openReadOnly - (JNIEnv *env, jobject obj, jstring uri){ + (JNIEnv *env, jobject obj, jstring j_uri){ virConnectPtr vc; - + const char *uri=(*env)->GetStringUTFChars(env, j_uri, NULL); + //Initialize the libvirt VirtConn Object - vc=virConnectOpenReadOnly((*env)->GetStringUTFChars(env, uri, NULL)); + vc=virConnectOpenReadOnly(uri); + (*env)->ReleaseStringUTFChars(env, j_uri, uri); if(vc==NULL){ //We have a pending java exception, let's return assert((*env)->ExceptionOccurred(env)); @@ -184,10 +192,10 @@ }; JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1openAuth - (JNIEnv *env, jobject obj, jstring uri, jobject j_auth, jint flags){ + (JNIEnv *env, jobject obj, jstring j_uri, jobject j_auth, jint flags){ virConnectPtr vc; - virError error; + const char *uri=(*env)->GetStringUTFChars(env, j_uri, NULL); virConnectAuth *auth = malloc(sizeof(virConnectAuth)); @@ -222,8 +230,9 @@ cb_wrapper->env = env; cb_wrapper->auth = j_auth; auth->cbdata=cb_wrapper; - - vc=virConnectOpenAuth((*env)->GetStringUTFChars(env, uri, NULL), auth, flags); + + vc=virConnectOpenAuth(uri, auth, flags); + (*env)->ReleaseStringUTFChars(env, j_uri, uri); if (vc==NULL){ //We have a pending java exception, let's return assert((*env)->ExceptionOccurred(env)); @@ -237,18 +246,27 @@ } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virNetworkCreateXML - (JNIEnv *env, jobject obj, jlong VCP, jstring xmlDesc){ - return (jlong)virNetworkCreateXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_xmlDesc){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virNetworkCreateXML((virConnectPtr)VCP, xmlDesc); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virNetworkDefineXML -(JNIEnv *env, jobject obj, jlong VCP, jstring xmlDesc){ - return (jlong)virNetworkDefineXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); +(JNIEnv *env, jobject obj, jlong VCP, jstring j_xmlDesc){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virNetworkDefineXML((virConnectPtr)VCP, xmlDesc); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virNetworkLookupByName - (JNIEnv *env, jobject obj, jlong VCP, jstring name){ - return (jlong)virNetworkLookupByName((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, name, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_name){ + const char *name=(*env)->GetStringUTFChars(env, j_name, NULL); + jlong retval = (jlong)virNetworkLookupByName((virConnectPtr)VCP, name); + (*env)->ReleaseStringUTFChars(env, j_name, name); + return retval; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virNetworkLookupByUUID @@ -264,8 +282,11 @@ JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virNetworkLookupByUUIDString - (JNIEnv *env, jobject obj, jlong VCP, jstring UUID){ - return (jlong)virNetworkLookupByUUIDString((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, UUID, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_UUID){ + const char *uuid=(*env)->GetStringUTFChars(env, j_UUID, NULL); + jlong retval = (jlong)virNetworkLookupByUUIDString((virConnectPtr)VCP, uuid); + (*env)->ReleaseStringUTFChars(env, j_UUID, uuid); + return retval; } JNIEXPORT jobject JNICALL Java_org_libvirt_Connect__1virNodeInfo @@ -342,8 +363,11 @@ } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virDomainLookupByName - (JNIEnv *env, jobject obj, jlong VCP, jstring name){ - return (jlong)virDomainLookupByName((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, name, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_name){ + const char *name=(*env)->GetStringUTFChars(env, j_name, NULL); + jlong retval = (jlong)virDomainLookupByName((virConnectPtr)VCP, name); + (*env)->ReleaseStringUTFChars(env, j_name, name); + return retval; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virDomainLookupByUUID @@ -358,8 +382,11 @@ } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virDomainLookupByUUIDString - (JNIEnv *env, jobject obj, jlong VCP, jstring UUID){ - return (jlong)virDomainLookupByUUIDString((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, UUID, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_UUID){ + const char *UUID=(*env)->GetStringUTFChars(env, j_UUID, NULL); + jlong retval = (jlong)virDomainLookupByUUIDString((virConnectPtr)VCP, UUID); + (*env)->ReleaseStringUTFChars(env, j_UUID, UUID); + return retval; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virGetLibVirVersion @@ -376,26 +403,115 @@ type = (*env)->GetStringUTFChars(env, j_type, NULL); virGetVersion(&libVer, type, &typeVer); + (*env)->ReleaseStringUTFChars(env, j_type, type); return libVer; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virDomainCreateLinux - (JNIEnv *env, jobject obj, jlong VCP, jstring xmlDesc, jint flags){ - return(jlong)virDomainCreateLinux((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL), flags); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_xmlDesc, jint flags){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virDomainCreateLinux((virConnectPtr)VCP, xmlDesc, flags); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; } JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virDomainDefineXML - (JNIEnv *env, jobject obj, jlong VCP, jstring xmlDesc){ - return(jlong)virDomainDefineXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_xmlDesc){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virDomainDefineXML((virConnectPtr)VCP, xmlDesc); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; } JNIEXPORT jint JNICALL Java_org_libvirt_Connect__1virDomainRestore - (JNIEnv *env, jobject obj, jlong VCP, jstring from){ - return virDomainRestore((virConnectPtr)VCP, (char*)(*env)->GetStringUTFChars(env, from, NULL)); + (JNIEnv *env, jobject obj, jlong VCP, jstring j_from){ + const char *from=(*env)->GetStringUTFChars(env, j_from, NULL); + jint retval = (jint)virDomainRestore((virConnectPtr)VCP, from); + (*env)->ReleaseStringUTFChars(env, j_from, from); + return retval; } JNIEXPORT jint JNICALL Java_org_libvirt_Connect__1setDom0Memory (JNIEnv *env, jobject obj, jlong memory){ return virDomainSetMemory(NULL, memory); } + +JNIEXPORT jint JNICALL Java_org_libvirt_Connect__1numOfDefinedStoragePools + (JNIEnv *env, jobject obj, jlong VCP){ + return virConnectNumOfDefinedStoragePools((virConnectPtr)VCP); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_Connect__1numOfStoragePools + (JNIEnv *env, jobject obj, jlong VCP){ + return virConnectNumOfStoragePools((virConnectPtr)VCP); +} + +JNIEXPORT jobjectArray JNICALL Java_org_libvirt_Connect__1listDefinedStoragePools +(JNIEnv *env, jobject obj, jlong VCP){ + int maxnames; + char **names; + int c; + jobjectArray j_names=NULL; + if((maxnames = virConnectNumOfDefinedStoragePools((virConnectPtr)VCP))<0) + return NULL; + names= (char**)calloc(maxnames, sizeof(char*)); + if(virConnectListDefinedStoragePools((virConnectPtr)VCP, names, maxnames)>=0){ + j_names= (jobjectArray)(*env)->NewObjectArray(env, maxnames, + (*env)->FindClass(env,"java/lang/String"), + (*env)->NewStringUTF(env,"")); + for(c=0; c<maxnames; c++){ + (*env)->SetObjectArrayElement(env, j_names, c, (*env)->NewStringUTF(env, names[c])); + } + } + free(names); + + return j_names; +} + +JNIEXPORT jobjectArray JNICALL Java_org_libvirt_Connect__1listStoragePools +(JNIEnv *env, jobject obj, jlong VCP){ + int maxnames; + char **names; + int c; + jobjectArray j_names=NULL; + if((maxnames = virConnectNumOfStoragePools((virConnectPtr)VCP))<0) + return NULL; + names= (char**)calloc(maxnames, sizeof(char*)); + if(virConnectListStoragePools((virConnectPtr)VCP, names, maxnames)>=0){ + j_names= (jobjectArray)(*env)->NewObjectArray(env, maxnames, + (*env)->FindClass(env,"java/lang/String"), + (*env)->NewStringUTF(env,"")); + for(c=0; c<maxnames; c++){ + (*env)->SetObjectArrayElement(env, j_names, c, (*env)->NewStringUTF(env, names[c])); + } + } + free(names); + + return j_names; +} + +JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virStoragePoolCreateXML +(JNIEnv *env, jobject obj, jlong VCP, jstring j_xmlDesc, jint flags){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virStoragePoolCreateXML((virConnectPtr)VCP, xmlDesc, flags); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; +} + +JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virStoragePoolDefineXML +(JNIEnv *env, jobject obj, jlong VCP, jstring j_xmlDesc, jint flags){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virStoragePoolDefineXML((virConnectPtr)VCP, xmlDesc, flags); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; +} + +JNIEXPORT jlong JNICALL Java_org_libvirt_Connect__1virStoragePoolLookupByName +(JNIEnv *env, jobject obj, jlong VCP, jstring j_name){ + const char *name=(*env)->GetStringUTFChars(env, j_name, NULL); + jlong retval = (jlong)virStoragePoolLookupByName((virConnectPtr)VCP, name); + (*env)->ReleaseStringUTFChars(env, j_name, name); + return retval; +} + Index: src/jni/Makefile.am =================================================================== RCS file: /data/cvs/libvirt-java/src/jni/Makefile.am,v retrieving revision 1.5 diff -u -r1.5 Makefile.am --- src/jni/Makefile.am 18 Jul 2008 14:37:21 -0000 1.5 +++ src/jni/Makefile.am 2 Aug 2008 15:21:11 -0000 @@ -4,7 +4,13 @@ org_libvirt_Domain.h \ org_libvirt_Domain_CreateFlags.h \ org_libvirt_Domain_MigrateFlags.h \ - org_libvirt_Domain_XMLFlags.h + org_libvirt_Domain_XMLFlags.h \ + org_libvirt_StoragePool_BuildFlags.h \ + org_libvirt_StoragePool_DeleteFlags.h \ + org_libvirt_StoragePool.h \ + org_libvirt_StorageVol_Type.h \ + org_libvirt_StorageVol_DeleteFlags.h \ + org_libvirt_StorageVol.h BUILT_SOURCES = $(GENERATED) @@ -18,12 +24,22 @@ org_libvirt_Domain.h org_libvirt_Domain_CreateFlags.h org_libvirt_Domain_MigrateFlags.h org_libvirt_Domain_XMLFlags.h : $(JAVA_CLASS_ROOT)/org/libvirt/Domain.class $(JAVAH) -classpath $(JAVA_CLASS_ROOT) org.libvirt.Domain + +org_libvirt_StoragePool.h org_libvirt_StoragePool_BuildFlags.h org_libvirt_StoragePool_DeleteFlags.h : $(JAVA_CLASS_ROOT)/org/libvirt/StoragePool.class + $(JAVAH) -classpath $(JAVA_CLASS_ROOT) org.libvirt.StoragePool + +org_libvirt_StorageVol.h org_libvirt_StorageVol_Type.h org_libvirt_StorageVol_DeleteFlags.h : $(JAVA_CLASS_ROOT)/org/libvirt/StorageVol.class + $(JAVAH) -classpath $(JAVA_CLASS_ROOT) org.libvirt.StorageVol lib_LTLIBRARIES = libvirt_jni.la libvirt_jni_la_SOURCES = \ org_libvirt_Network.c \ org_libvirt_Connect.c \ org_libvirt_Domain.c \ + org_libvirt_StoragePool.c \ + org_libvirt_StorageVol.c \ + generic.c \ + generic.h \ ErrorHandler.c \ ErrorHandler.h \ ConnectAuthCallbackBridge.c \ Index: libvirt-java.spec.in =================================================================== RCS file: /data/cvs/libvirt-java/libvirt-java.spec.in,v retrieving revision 1.9 diff -u -r1.9 libvirt-java.spec.in --- libvirt-java.spec.in 18 Jul 2008 14:37:21 -0000 1.9 +++ libvirt-java.spec.in 2 Aug 2008 15:21:10 -0000 @@ -1,7 +1,7 @@ Summary: Java bindings for the libvirt virtualization API Name: libvirt-java Version: @VERSION@ -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/java/libvirt-java-%{version}.tar.gz Index: src/jni/generic.c =================================================================== RCS file: src/jni/generic.c diff -N src/jni/generic.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/jni/generic.c 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,128 @@ +#include "generic.h" +#include <jni.h> +#include <stdlib.h> + +jint generic__virObj__int +(JNIEnv *env, jobject obj, jlong virObj1, int (*virFunc1)(void*) ){ + return (jint)virFunc1((void*)virObj1); +} + +jint generic__virObj_int__int + (JNIEnv *env, jobject obj, jlong virObj1, jint arg1, int (*virFunc1)(void*, int)){ + return (jint)virFunc1((void*)virObj1, arg1); +} + +jstring generic__virObj__conststring + (JNIEnv *env, jobject obj, jlong virObj1, const char* (*virFunc1)(void*)){ + jstring j_retstring=NULL; + const char *retstring; + if((retstring = virFunc1((void*)virObj1))){ + j_retstring = (*env)->NewStringUTF(env, retstring); + } + return j_retstring; +} + +jstring generic__virObj__string + (JNIEnv *env, jobject obj, jlong virObj1, char* (*virFunc1)(void*)){ + jstring j_retstring=NULL; + char *retstring; + if((retstring = virFunc1((void*)virObj1))){ + j_retstring = (*env)->NewStringUTF(env, retstring); + free(retstring); + } + return j_retstring; +} + +jstring generic__virObj_int__string + (JNIEnv *env, jobject obj, jlong virObj, jint arg1, char* (*virFunc1)(void*, int)){ + jstring j_retstring; + char* retstring = NULL; + if((retstring = virFunc1((void*)virObj, arg1))){ + j_retstring = (*env)->NewStringUTF(env, retstring); + free(retstring); + } + return j_retstring; +} + +jboolean generic_getAutostart + (JNIEnv *env, jobject obj, jlong virObj, int (*VirFunc1)(void*, int*)){ + int autostart=0; + VirFunc1((virStoragePoolPtr)virObj, &autostart); + return (jboolean)autostart; +} + +jintArray generic_getUUID + (JNIEnv *env, jobject obj, jlong virObj1, int (*virFunc1)(void*, unsigned char*)){ + unsigned char uuid[VIR_UUID_BUFLEN]; + jintArray j_uuid; + int c; + int uuidbyte; + + if(virFunc1((void*)virObj1, uuid)<0) + return NULL; + //unpack UUID + j_uuid=(*env)->NewIntArray(env, VIR_UUID_BUFLEN); + for(c=0; c<VIR_UUID_BUFLEN; c++){ + uuidbyte=uuid[c]; + (*env)->SetIntArrayRegion(env, j_uuid, c, 1, &uuidbyte); + } + return j_uuid; +} + +jstring generic_getUUIDString + (JNIEnv *env, jobject obj, jlong virObj, int (*virFunc1)(void*, char*)){ + char uuidString[VIR_UUID_STRING_BUFLEN]; + virFunc1((void*)virObj, uuidString); + return (*env)->NewStringUTF(env, uuidString); +} + +JNIEXPORT jobjectArray JNICALL generic_list_stringarray + (JNIEnv *env, jobject obj, jlong virObj, int (*virFunc1)(void*, char ** const, int), int (*virFunc2)(void*)){ + int maxnames; + char **names; + int c; + jobjectArray j_names=NULL; + if((maxnames = virFunc2((void*)virObj))<0) + return NULL; + names= (char**)calloc(maxnames, sizeof(char*)); + if(virFunc1((void*)virObj, names, maxnames)>=0){ + j_names= (jobjectArray)(*env)->NewObjectArray(env, maxnames, + (*env)->FindClass(env,"java/lang/String"), + (*env)->NewStringUTF(env,"")); + for(c=0; c<maxnames; c++){ + (*env)->SetObjectArrayElement(env, j_names, c, (*env)->NewStringUTF(env, names[c])); + } + } + free(names); + + return j_names; +} + +JNIEXPORT jlong JNICALL generic_lookupBy_string + (JNIEnv *env, jobject obj, jlong virObj, jstring j_stringid, void* (*virFunc1)(void*, const char *)){ + const char *stringid=(*env)->GetStringUTFChars(env, j_stringid, NULL); + jlong retval = (jlong)virFunc1((void*)virObj, stringid); + (*env)->ReleaseStringUTFChars(env, j_stringid, stringid); + return retval; +} + +JNIEXPORT jlong JNICALL generic_lookupBy_none + (JNIEnv *env, jobject obj, jlong virObj, void* (*virFunc1)(void*)){ + return (jlong)virFunc1((void*)virObj); +} + +JNIEXPORT jlong JNICALL generic_CreateDefineXML + (JNIEnv *env, jobject obj, jlong virObj, jstring j_xmlDesc, void* (*virFunc1) (void*, const char *)){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virFunc1((void*)virObj, xmlDesc); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; +} + +JNIEXPORT jlong JNICALL generic_CreateDefineXML_with_flags + (JNIEnv *env, jobject obj, jlong virObj, jstring j_xmlDesc, jint flags, void* (*virFunc1) (void*, const char *, unsigned int)){ + const char *xmlDesc=(*env)->GetStringUTFChars(env, j_xmlDesc, NULL); + jlong retval = (jlong)virFunc1((void*)virObj, xmlDesc, flags); + (*env)->ReleaseStringUTFChars(env, j_xmlDesc, xmlDesc); + return retval; +} Index: src/jni/org_libvirt_StoragePool.c =================================================================== RCS file: src/jni/org_libvirt_StoragePool.c diff -N src/jni/org_libvirt_StoragePool.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/jni/org_libvirt_StoragePool.c 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,117 @@ +#include <libvirt/libvirt.h> +#include "org_libvirt_StoragePool.h" +#include "generic.h" + + +JNIEXPORT jint JNICALL Java_org_libvirt_StoragePool__1build + (JNIEnv *env, jobject obj, jlong VSPP, jint flags){ + return generic__virObj_int__int(env, obj, VSPP, flags, (int (*)(void*, int))&virStoragePoolBuild); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StoragePool__1create + (JNIEnv *env, jobject obj, jlong VSPP, jint flags){ + return generic__virObj_int__int(env, obj, VSPP, flags, (int (*)(void*, int))&virStoragePoolCreate); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StoragePool__1delete + (JNIEnv *env, jobject obj, jlong VSPP, jint flags){ + return generic__virObj_int__int(env, obj, VSPP, flags, (int (*)(void*, int))&virStoragePoolDelete); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StoragePool__1destroy + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic__virObj__int(env, obj, VSPP, (int (*)(void*))&virStoragePoolDelete); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StoragePool__1free + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic__virObj__int(env, obj, VSPP, (int (*)(void*))&virStoragePoolFree); +} + +JNIEXPORT jboolean JNICALL Java_org_libvirt_StoragePool__1getAutostart + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic_getAutostart(env, obj, VSPP, (int (*)(void*, int*))&virStoragePoolGetAutostart); +} + +JNIEXPORT jobject JNICALL Java_org_libvirt_StoragePool__1getInfo + (JNIEnv *env, jobject obj, jlong VSPP){ + + virStoragePoolInfo storagePoolInfo; + + jobject j_info; + + //Get the data + if(virStoragePoolGetInfo((virStoragePoolPtr)VSPP, &storagePoolInfo)<0) + return NULL; + + //get the field Ids of info + jclass j_storagePoolInfo_cls = (*env)->FindClass(env,"org/libvirt/StoragePoolInfo"); + jmethodID j_storagePoolInfo_constructor = (*env)->GetMethodID(env, j_storagePoolInfo_cls, "<init>", "(IJJJ)V"); + + //Long live encapsulation + j_info=(*env)->NewObject(env, + j_storagePoolInfo_cls, + j_storagePoolInfo_constructor, + storagePoolInfo.state, + storagePoolInfo.capacity, + storagePoolInfo.allocation, + storagePoolInfo.available); + + return j_info; +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StoragePool__1getName + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic__virObj__conststring(env, obj, VSPP, (const char* (*)(void*))&virStoragePoolGetName); +} + +JNIEXPORT jintArray JNICALL Java_org_libvirt_StoragePool__1getUUID + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic_getUUID(env, obj, VSPP, (int (*)(void*, unsigned char*))&virStoragePoolGetUUID); +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StoragePool__1getUUIDString + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic_getUUIDString(env, obj, VSPP, (int (*)(void*, char*))&virStoragePoolGetUUIDString); +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StoragePool__1getXMLDesc + (JNIEnv *env, jobject obj, jlong VSPP, jint flags){ + return generic__virObj_int__string(env, obj, VSPP, flags, (char* (*)(void*, int))&virStoragePoolGetXMLDesc); +} + +JNIEXPORT jobjectArray JNICALL Java_org_libvirt_StoragePool__1listVolumes + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic_list_stringarray(env, obj, VSPP, (int (*)(void*, char ** const, int))&virStoragePoolListVolumes, (int (*)(void*))&virStoragePoolNumOfVolumes); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StoragePool__1numOfVolumes + (JNIEnv *env, jobject obj, jlong VSPP){ + return generic__virObj__int(env, obj, VSPP, (int (*)(void*))&virStoragePoolNumOfVolumes); +} + +JNIEXPORT void JNICALL Java_org_libvirt_StoragePool__1refresh + (JNIEnv *env, jobject obj, jlong VSPP, jint flags){ + generic__virObj_int__int(env, obj, VSPP, flags, (int (*)(void*, int))&virStoragePoolRefresh); +} + +JNIEXPORT void JNICALL Java_org_libvirt_StoragePool__1setAutostart + (JNIEnv *env, jobject obj, jlong VSPP, jint flags){ + generic__virObj_int__int(env, obj, VSPP, flags, (int (*)(void*, int))&virStoragePoolSetAutostart); +} + +JNIEXPORT void JNICALL Java_org_libvirt_StoragePool__1undefine +(JNIEnv *env, jobject obj, jlong VSPP){ + generic__virObj__int(env, obj, VSPP, (int (*)(void*))&virStoragePoolUndefine); +} + +JNIEXPORT jlong JNICALL Java_org_libvirt_StoragePool__1storageVolLookupByName + (JNIEnv *env, jobject obj, jlong VSPP, jstring name){ + return generic_lookupBy_string(env, obj, VSPP, name, (void* (*)(void*, const char *))&virStorageVolLookupByName); +} + +JNIEXPORT jlong JNICALL Java_org_libvirt_StoragePool__1storageVolCreateXML + (JNIEnv *env, jobject obj, jlong VSPP, jstring xmlDesc, jint flags){ + return generic_CreateDefineXML_with_flags(env, obj, VSPP, xmlDesc, flags, (void* (*)(void*, const char *, unsigned int))&virStorageVolCreateXML); +} + Index: src/org/libvirt/StorageVolInfo.java =================================================================== RCS file: src/org/libvirt/StorageVolInfo.java diff -N src/org/libvirt/StorageVolInfo.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/libvirt/StorageVolInfo.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,53 @@ +package org.libvirt; + +public class StorageVolInfo { + + /** + * The type of the Volume + */ + public VirStorageVolType type; + /** + * Logical size bytes + */ + public long capacity; + /** + * Current allocation bytes + */ + public long allocation; + + public static enum VirStorageVolType{ + /** + * Regular file based volumes + */ + VIR_STORAGE_VOL_FILE, + /** + * Block based volumes + */ + VIR_STORAGE_VOL_BLOCK, + } + + /** + * This is meant to be called from the JNI side, as a convenience constructor + * + * @param type the type, as defined by libvirt + * @param capacity + * @param allocation + */ + StorageVolInfo(int type, long capacity, long allocation){ + switch(type){ + case 0: this.type=VirStorageVolType.VIR_STORAGE_VOL_FILE; break; + case 1: this.type=VirStorageVolType.VIR_STORAGE_VOL_BLOCK; break; + default: assert(false); + } + this.capacity = capacity; + this.allocation = allocation; + } + + public String toString(){ + StringBuffer result = new StringBuffer(""); + result.append("type:" + type + "\n"); + result.append("capacity:" + capacity + "\n"); + result.append("allocation:" + allocation + "\n"); + return result.toString(); + } +} Index: src/org/libvirt/StorageVol.java =================================================================== RCS file: src/org/libvirt/StorageVol.java diff -N src/org/libvirt/StorageVol.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/libvirt/StorageVol.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,158 @@ +package org.libvirt; + +public class StorageVol { + + static final class DeleteFlags{ + /** + * Delete metadata only (fast) + */ + static final int VIR_STORAGE_POOL_DELETE_NORMAL = 0; + /** + * Clear all data to zeros (slow) + */ + static final int VIR_STORAGE_POOL_DELETE_ZEROED = 1; + } + + public static enum Type { + /** + * Regular file based volumes + */ + VIR_STORAGE_VOL_FILE, + /** + * Block based volumes + */ + VIR_STORAGE_VOL_BLOCK + } + + /** + * the native virStorageVolPtr. + */ + private long VSVP; + + /** + * The VirConnect Object that represents the Hypervisor of this Domain + */ + private Connect virConnect; + + + /** + * Constructs a VirStorageVol object from a known native virStoragePoolPtr, and a VirConnect object. + * For use when native libvirt returns a virStorageVolPtr, i.e. error handling. + * + * @param virConnect the Domain's hypervisor + * @param VSVP the native virStorageVolPtr + */ + StorageVol(Connect virConnect, long VSVP){ + this.virConnect = virConnect; + this.VSVP = VSVP; + } + + /** + * Fetch a storage pool which contains this volume + * + * @return StoragePool object, + * @throws LibvirtException + */ + public StoragePool storagePoolLookupByVolume() + throws LibvirtException { + return new StoragePool(virConnect, _storagePoolLookupByVolume(VSVP)); + } + + private native long _storagePoolLookupByVolume(long VSVP) + throws LibvirtException; + + /** + * Delete the storage volume from the pool + * + * @param flags future flags, use 0 for now + * @throws LibvirtException + */ + public void delete(int flags) throws LibvirtException{ + _delete(VSVP, flags); + } + + private native int _delete(long VSVP, int flags) throws LibvirtException; + + /** + * Release the storage volume handle. The underlying storage volume contains to exist + * + * @throws LibvirtException + */ + public void free() throws LibvirtException{ + _free(VSVP); + } + + private native int _free(long VSVP) throws LibvirtException; + + /** + * Provides the connection object associated with a storage volume. The reference counter on the connection is not increased by this call. + * + * @return the Connect object + */ + public Connect getConnect(){ + return virConnect; + } + + /** + * Fetches volatile information about the storage volume such as its current allocation + * + * @return StorageVolInfo object + * @throws LibvirtException + */ + public StorageVolInfo getInfo() throws LibvirtException{ + return _getInfo(VSVP); + } + + private native StorageVolInfo _getInfo(long VSVP) throws LibvirtException; + + /** + * Fetch the storage volume key. This is globally unique, so the same volume will have the same key no matter what host it is accessed from + * + * @return the key + * @throws LibvirtException + */ + public String getKey() throws LibvirtException{ + return _getKey(VSVP); + } + + private native String _getKey(long VSVP) throws LibvirtException; + + /** + * Fetch the storage volume name. This is unique within the scope of a pool + * + * @return the name + * @throws LibvirtException + */ + public String getName() throws LibvirtException{ + return _getName(VSVP); + } + + private native String _getName(long VSVP) throws LibvirtException; + + /** + * Fetch the storage volume path. + * Depending on the pool configuration this is either persistent across hosts, or dynamically assigned at pool startup. + * Consult pool documentation for information on getting the persistent naming + * + * @return + * @throws LibvirtException + */ + public String getPath() throws LibvirtException{ + return _getPath(VSVP); + } + + private native String _getPath(long VSVP) throws LibvirtException; + + /** + * Fetch an XML document describing all aspects of this storage volume + * + * @param flags flags for XML generation (unused, pass 0) + * @return the XML document + * @throws LibvirtException + */ + public String getXMLDesc(int flags) throws LibvirtException{ + return _getXMLDesc(VSVP, flags); + } + + private native String _getXMLDesc(long VSVP, int flags) throws LibvirtException; +} Index: src/org/libvirt/StoragePoolInfo.java =================================================================== RCS file: src/org/libvirt/StoragePoolInfo.java diff -N src/org/libvirt/StoragePoolInfo.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/libvirt/StoragePoolInfo.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,73 @@ +package org.libvirt; + +public class StoragePoolInfo { + + /** + * the running state + */ + public StoragePoolState state; + + /** + * Logical size bytes + */ + public long capacity; + + /** + * Current allocation bytes + */ + public long allocation; + + /** + * Remaining free space bytes + */ + public long available; + + public static enum StoragePoolState { + /** + * Not running + */ + VIR_STORAGE_POOL_INACTIVE, + /** + * Initializing pool, not available + */ + VIR_STORAGE_POOL_BUILDING, + /** + * Running normally + */ + VIR_STORAGE_POOL_RUNNING, + /** + * Running degraded + */ + VIR_STORAGE_POOL_DEGRADED, + } + + /** + * This is meant to be called from the JNI side, as a convenience constructor + * + * @param state the state, as defined by libvirt + * @param capacity + * @param allocation + * @param available + */ + StoragePoolInfo(int state, long capacity, long allocation, long available){ + switch(state){ + case 0: this.state=StoragePoolState.VIR_STORAGE_POOL_INACTIVE; break; + case 1: this.state=StoragePoolState.VIR_STORAGE_POOL_BUILDING; break; + case 2: this.state=StoragePoolState.VIR_STORAGE_POOL_RUNNING; break; + case 3: this.state=StoragePoolState.VIR_STORAGE_POOL_DEGRADED; break; + default: assert(false); + } + this.capacity = capacity; + this.allocation = allocation; + this.available = available; + } + + public String toString(){ + StringBuffer result = new StringBuffer(""); + result.append("state:" + state + "\n"); + result.append("capacity:" + capacity + "\n"); + result.append("allocation:" + allocation + "\n"); + result.append("available:" + available + "\n"); + return result.toString(); + } +} Index: src/org/libvirt/StoragePool.java =================================================================== RCS file: src/org/libvirt/StoragePool.java diff -N src/org/libvirt/StoragePool.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/libvirt/StoragePool.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,286 @@ +package org.libvirt; + +public class StoragePool { + + static final class BuildFlags{ + /** + * Regular build from scratch + */ + static final int VIR_STORAGE_POOL_BUILD_NEW = 0; + /** + * Repair / reinitialize + */ + static final int VIR_STORAGE_POOL_BUILD_REPAIR = 1; + /** + * Extend existing pool + */ + static final int VIR_STORAGE_POOL_BUILD_RESIZE = 2; + } + + static final class DeleteFlags{ + /** + * Delete metadata only (fast) + */ + static final int VIR_STORAGE_POOL_DELETE_NORMAL = 0; + /** + * Clear all data to zeros (slow) + */ + static final int VIR_STORAGE_POOL_DELETE_ZEROED = 1; + } + + /** + * the native virStoragePoolPtr. + */ + private long VSPP; + + /** + * The VirConnect Object that represents the Hypervisor of this Domain + */ + private Connect virConnect; + + + /** + * Constructs a VirStoragePool object from a known native virStoragePoolPtr, and a VirConnect object. + * For use when native libvirt returns a virStoragePoolPtr, i.e. error handling. + * + * @param virConnect the Domain's hypervisor + * @param VSPP the native virStoragePoolPtr + */ + StoragePool(Connect virConnect, long VSPP){ + this.virConnect = virConnect; + this.VSPP = VSPP; + } + + /** + * Build the underlying storage pool + * + * @param flags future flags, use 0 for now + */ + public void build(int flags) throws LibvirtException{ + _build(VSPP, flags); + } + + private native int _build(long VSPP, int flags) throws LibvirtException; + + /** + * Starts this inactive storage pool + * + * @param flags future flags, use 0 for now + */ + public void create(int flags) throws LibvirtException{ + _create(VSPP, flags); + } + + private native int _create(long VSPP, int flags) throws LibvirtException; + + /** + * Delete the underlying pool resources. This is a non-recoverable operation. + * The virStoragePool object itself is not free'd. + * + * @param flags flags for obliteration process + */ + public void delete(int flags) throws LibvirtException{ + _delete(VSPP, flags); + } + + private native int _delete(long VSPP, int flags) throws LibvirtException; + + /** + * Destroy an active storage pool. + * This will deactivate the pool on the host, but keep any persistent config associated with it. + * If it has a persistent config it can later be restarted with virStoragePoolCreate(). + * This does not free the associated virStoragePoolPtr object. + */ + public void destroy() throws LibvirtException{ + _destroy(VSPP); + } + + private native int _destroy(long VSPP) throws LibvirtException; + + /** + * Free a storage pool object, releasing all memory associated with it. + * Does not change the state of the pool on the host. + */ + public void free() throws LibvirtException{ + _free(VSPP); + } + + private native int _free(long VSPP) throws LibvirtException; + + + /** + * Fetches the value of the autostart flag, which determines whether the pool is automatically started at boot time + * + * @return the result + * @throws LibvirtException + */ + public boolean getAutostart() throws LibvirtException{ + return _getAutostart(VSPP); + } + + private native boolean _getAutostart(long VSPP) throws LibvirtException; + + /** + * Provides the connection pointer associated with a storage pool. + * + * @return the Connect object + */ + public Connect getConnect(){ + return virConnect; + } + /** + * Get volatile information about the storage pool such as free space / usage summary + * + * @return a StoragePoolInfo object describing this storage pool + * @throws LibvirtException + */ + public StoragePoolInfo getInfo() throws LibvirtException{ + return _getInfo(VSPP); + } + + private native StoragePoolInfo _getInfo(long VSPP) throws LibvirtException; + + /** + * Fetch the locally unique name of the storage pool + * + * @return the name + * @throws LibvirtException + */ + public String getName() throws LibvirtException{ + return _getName(VSPP); + } + + private native String _getName(long VSPP) throws LibvirtException; + + /** + * Fetch the globally unique ID of this storage pool + * + * @return the UUID as an unpacked int array + * @throws LibvirtException + */ + public int[] getUUID() throws LibvirtException{ + return _getUUID(VSPP); + } + + private native int[] _getUUID(long VSPP) throws LibvirtException; + + + /** + * Fetch the globally unique ID of the storage pool as a string + * + * @return the UUID in canonical String format + * @throws LibvirtException + */ + public String getUUIDString() throws LibvirtException{ + return _getUUIDString(VSPP); + } + + private native String _getUUIDString(long VSPP) throws LibvirtException; + + /** + * Fetch an XML document describing all aspects of the storage pool. + * This is suitable for later feeding back into the virStoragePoolCreateXML method. + * + * @param flags flags for XML format options (set of virDomainXMLFlags) + * @return a XML document + *-java @throws LibvirtException + */ + public String getXMLDesc(int flags) throws LibvirtException{ + return _getXMLDesc(VSPP, flags); + } + + private native String _getXMLDesc(long VSPP, int flags) throws LibvirtException; + + /** + * Fetch list of storage volume names + * + * @return an Array of Strings that contains the names of the storage volumes + * @throws LibvirtException + */ + public String[] listVolumes() throws LibvirtException { + return _listVolumes(VSPP); + } + + private native String[] _listVolumes(long VSPP) + throws LibvirtException; + + /** + * Fetch the number of storage volumes within a pool + * + * @return the number of storage pools + * @throws LibvirtException + */ + public int numOfVolumes() throws LibvirtException { + return _numOfVolumes(VSPP); + } + + private native int _numOfVolumes(long VSPP) throws LibvirtException; + + /** + * Request that the pool refresh its list of volumes. + * This may involve communicating with a remote server, and/or initializing new devices at the OS layer + * + * @param flags flags to control refresh behaviour (currently unused, use 0) + * @throws LibvirtException + */ + public void refresh(int flags) throws LibvirtException { + _refresh(VSPP, flags); + } + + private native void _refresh(long VSPP, int flags) throws LibvirtException; + + /** + * Sets the autostart flag + * + * @param autostart new flag setting + * @throws LibvirtException + */ + public void setAutostart(int autostart) throws LibvirtException { + _setAutostart(VSPP, autostart); + } + + private native void _setAutostart(long VSPP, int autostart) throws LibvirtException; + + /** + * Undefine an inactive storage pool + * + * @throws LibvirtException + */ + public void undefine() throws LibvirtException { + _undefine(VSPP); + } + + private native void _undefine(long VSPP) throws LibvirtException; + + /** + * Fetch an object representing to a storage volume based on its name within a pool + * + * @param name name of storage volume + * @return The StorageVol object found + * @throws LibvirtException + */ + public StorageVol storageVolLookupByName(String name) + throws LibvirtException { + return new StorageVol(virConnect, _storageVolLookupByName(VSPP, name)); + } + + private native long _storageVolLookupByName(long VSPP, String name) + throws LibvirtException; + + /** + * Create a storage volume within a pool based on an XML description. Not all pools support creation of volumes + * + * @param xmlDesc description of volume to create + * @param flags flags for creation (unused, pass 0) + * @return the storage volume + * @throws LibvirtException + */ + public StorageVol storageVolCreateXML(String xmlDesc, int flags) + throws LibvirtException { + return new StorageVol(virConnect, _storageVolCreateXML(VSPP, xmlDesc, flags)); + } + + private native long _storageVolCreateXML(long VSPP, String xmlDesc, int flags) + throws LibvirtException; + +} Index: src/jni/org_libvirt_StorageVol.c =================================================================== RCS file: src/jni/org_libvirt_StorageVol.c diff -N src/jni/org_libvirt_StorageVol.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/jni/org_libvirt_StorageVol.c 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,65 @@ +#include "org_libvirt_StorageVol.h" +#include "generic.h" +#include <libvirt/libvirt.h> + +JNIEXPORT jlong JNICALL Java_org_libvirt_StorageVol__1storagePoolLookupByVolume + (JNIEnv *env, jobject obj, jlong VSVP){ + return generic_lookupBy_none(env, obj, VSVP, (void* (*)(void*))&virStoragePoolLookupByVolume); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StorageVol__1delete + (JNIEnv *env, jobject obj, jlong VSVP, jint flags){ + return generic__virObj_int__int(env, obj, VSVP, flags, (int (*)(void*, int))&virStorageVolDelete); +} + +JNIEXPORT jint JNICALL Java_org_libvirt_StorageVol__1free + (JNIEnv *env, jobject obj, jlong VSVP){ + return generic__virObj__int(env, obj, VSVP, (int (*)(void*))&virStorageVolFree); +} + +JNIEXPORT jobject JNICALL Java_org_libvirt_StorageVol__1getInfo +(JNIEnv *env, jobject obj, jlong VSVP){ + + virStorageVolInfo storageVolInfo; + + jobject j_info; + + //Get the data + if(virStorageVolGetInfo((virStorageVolPtr)VSVP, &storageVolInfo)<0) + return NULL; + + //get the field Ids of info + jclass j_storageVolInfo_cls = (*env)->FindClass(env,"org/libvirt/StorageVolInfo"); + jmethodID j_storageVolInfo_constructor = (*env)->GetMethodID(env, j_storageVolInfo_cls, "<init>", "(IJJ)V"); + + //Long live encapsulation + j_info=(*env)->NewObject(env, + j_storageVolInfo_cls, + j_storageVolInfo_constructor, + storageVolInfo.type, + storageVolInfo.capacity, + storageVolInfo.allocation); + + return j_info; +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StorageVol__1getKey + (JNIEnv *env, jobject obj, jlong VSVP){ + return generic__virObj__conststring(env, obj, VSVP, (const char* (*)(void*))&virStorageVolGetKey); +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StorageVol__1getName + (JNIEnv *env, jobject obj, jlong VSVP){ + return generic__virObj__conststring(env, obj, VSVP, (const char* (*)(void*))&virStorageVolGetName); +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StorageVol__1getPath + (JNIEnv *env, jobject obj, jlong VSVP){ + return generic__virObj__string(env, obj, VSVP, (char* (*)(void*))&virStorageVolGetPath); +} + +JNIEXPORT jstring JNICALL Java_org_libvirt_StorageVol__1getXMLDesc + (JNIEnv *env, jobject obj, jlong VSVP, jint flags){ + return generic__virObj_int__string(env, obj, VSVP, flags, (char* (*)(void*, int))&virStorageVolGetXMLDesc); +} + Index: src/jni/generic.h =================================================================== RCS file: src/jni/generic.h diff -N src/jni/generic.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/jni/generic.h 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,88 @@ +#ifndef GENERIC_H_ +#define GENERIC_H_ +#include <jni.h> +#include <libvirt/libvirt.h> + +/* + * Generic wrapper with a virObj argument returning an int + * (for functions like virDomainFree) + */ +jint generic__virObj__int + (JNIEnv *env, jobject obj, jlong virObj1, int (*virFunc1)(void*)); + +/* + * Generic wrapper with a virObj and an int arguments returning an int + * (for functions like virStorageVolDelete) + */ +jint generic__virObj_int__int + (JNIEnv *env, jobject obj, jlong virObj1, jint arg1, int (*virFunc1)(void*, int)); + +/* + * Generic wrapper with a virObj arguments returning a constant String + * (for functions like virNetworkGetBridgeName ) + */ +jstring generic__virObj__conststring + (JNIEnv *env, jobject obj, jlong virObj1, const char* (*virFunc1)(void*)); + +/* + * Generic wrapper with a virObj arguments returning a String to be freed by the caller + * (for functions like virNetworkGetName) + */ +jstring generic__virObj__string + (JNIEnv *env, jobject obj, jlong virObj1, char* (*virFunc1)(void*)); + +/* + * Generic wrapper with a virObj and an int argument returning a String to be freed by the caller + * (for functions like virStoragePoolGetXMLDesc) + */ +jstring generic__virObj_int__string + (JNIEnv *env, jobject obj, jlong virObj, jint arg1, char* (*virFunc1)(void*, int)); + +/* + * Generic wrapper for the *getAutoStart functions + */ +jboolean generic_getAutostart + (JNIEnv *env, jobject obj, jlong virObj, int (*VirFunc1)(void*, int*)); + +/* + * Generic wrapper for the *getUUID functions + */ +jintArray generic_getUUID + (JNIEnv *env, jobject obj, jlong virObj1, int (*virFunc1)(void*, unsigned char*)); + +/* + * Generic wrapper for the *getUUIDString functions + */ +jstring generic_getUUIDString + (JNIEnv *env, jobject obj, jlong virObj, int (*virFunc1)(void*, char*)); + +/* + * Generic wrapper for the *List* functions that return an array of strings + * virFunc1 is the *List* function + * virFunc2 is the corresponding *NumOf* function + */ +JNIEXPORT jobjectArray JNICALL generic_list_stringarray + (JNIEnv *env, jobject obj, jlong virObj, int (*virFunc1)(void*, char ** const, int), int (*virFunc2)(void*)); + +/* + * Generic wrapper for the *LookupBy* functions that take a string and return a VirObject + */ +JNIEXPORT jlong JNICALL generic_lookupBy_string + (JNIEnv *env, jobject obj, jlong virObj, jstring j_stringid, void* (*virFunc1)(void*, const char *)); + +/* + * Generic wrapper for the *LookupBy* functions that take no argument and return a VirObject + */ +JNIEXPORT jlong JNICALL generic_lookupBy_none + (JNIEnv *env, jobject obj, jlong virObj, void* (*virFunc1)(void*)); + +/* + * Generic wrapper for the *CreateXML* and *DefineXML* functions that take no flags and return VirObject + */ +JNIEXPORT jlong JNICALL generic_CreateDefineXML + (JNIEnv *env, jobject obj, jlong virObj, jstring j_xmlDesc, void* (*virFunc1) (void*, const char *)); + +JNIEXPORT jlong JNICALL generic_CreateDefineXML_with_flags + (JNIEnv *env, jobject obj, jlong virObj, jstring j_xmlDesc, jint flags, void* (*virFunc1) (void*, const char *, unsigned int)); + +#endif /*GENERIC_H_*/

8 10

[libvirt] [PATCH] make distclean: remove generated source files
by Jim Meyering 05 Aug '08

05 Aug '08

"make distcheck" is failing because two generated source files are left behind. It requires that all generated files be removed. This fixes it: >From a7f4c47140ed0e585f1135e0f7917bc32f145997 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 4 Aug 2008 16:10:03 +0200 Subject: [PATCH] make distclean: remove generated source files * src/Makefile.am (DISTCLEANFILES): Define to $(BUILT_SOURCES) so "make distcheck" passes. --- src/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 556ad0a..5d238cd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,3 +189,4 @@ install-exec-local: $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/libvirt CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda +DISTCLEANFILES = $(BUILT_SOURCES) -- 1.6.0.rc1.36.g5ff70

3 3

[libvirt] fix syntax check error
by Atsushi SAKAI 04 Aug '08

04 Aug '08

Hi, This patch fixes syntax error(found TAB(s)) http://builder.virt-manager.org/module-libvirt--devel.html Thanks Atsushi SAKAI

3 2

[libvirt] Question about virbr(dnsmasq)
by Nobuhiro Itou 04 Aug '08

04 Aug '08

Hi all. I have the question about the option of dnsmasq that libvirt sets as a default virtual network. Why does dnsmasq listen to all NICs as specified "--except-interface lo"? And, at the following conditions, the message is output to /var/log/messages. Do you know why it is output? Conditions: 1) Dnsmasq is started by libvirt. And... # ps -ef | grep dnsmasq nobody 5877 5754 0 Jul30 ? 00:00:00 /usr/sbin/dnsmasq --keep-in-foreground --strict-order --bind-interfaces --pid-file --conf-file --listen-address 192.168.122.1 --except-interface lo --dhcp-leasefile=/var/lib/libvirt/dhcp-default.leases --dhcp-range 192.168.122.2,192.168.122.254 2) chenge the network address to '0.0.0.0'. And... # ifconfig eth3 0 up 3) Dnsmasq recieves DHCPINFORM message from other DHCP servers. Message: dnsmasq[5877]: no address range available for DHCP request via eth3 Thank you Nobuhiro Itou

2 2

[libvirt] When are volumes 'detected' / refreshed
by Stefan de Konink 04 Aug '08

04 Aug '08

At what time are volumes currently detected on NetFS? I see there is some sort of storage now going on, since deleting files from NFS doesn't delete them from vol-list directly. (If this is fixed in a recent version... I'm sorry to bother) Stefan

3 2

[libvirt] fully virtualized xen guest question
by Christoph Höger 01 Aug '08

01 Aug '08

Hi, I am running XEN on an debian etch. For clustering purposes I wanted to boot fedora as virtual machine. That works (except for nfs mounts) fine using the paravortualization features. But fully virtulalized guests do not even boot, I do not get any sensefull error message, my config file looks like: <domain type='xen'> <name>werewolf</name> <os> <type>hvm</type> <loader>/usr/lib/xen-3.0.3-1/boot/hvmloader</loader> <kernel>/data/virtual/kernel/kvm1/vmlinuz-2.6.18-6-amd64</kernel> <initrd>/data/virtual/kernel/kvm1/initrd.img-2.6.18-6-amd64</initrd> <cmdline>root=/dev/hda1</cmdline> </os> <memory>524M</memory> <vcpu>1</vcpu> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file'> <source file='/tmp/werewolf.img.plb13810'/> <target dev='hda1' bus='xen'/> </disk> <interface type='bridge'> <source bridge='virbr1'/> </interface> </devices> <features> <acpi/> </features> </domain> <domain type='xen'> <name>werewolf</name> <os> <type>hvm</type> <loader>/usr/lib/xen-3.0.3-1/boot/hvmloader</loader> <kernel>/data/virtual/kernel/kvm1/vmlinuz-2.6.18-6-amd64</kernel> <initrd>/data/virtual/kernel/kvm1/initrd.img-2.6.18-6-amd64</initrd> <cmdline>root=/dev/hda1</cmdline> </os> <memory>524M</memory> <vcpu>1</vcpu> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file'> <source file='/tmp/werewolf.img.plb13810'/> <target dev='hda1' bus='xen'/> </disk> <interface type='bridge'> <source bridge='virbr1'/> </interface> </devices> <features> <acpi/> </features> </domain> all I get when tryin virsh create is: xend_post: error from xen daemon: (xend.err "Error creating domain: (0, 'Error')") Whats wrong?

2 2

[libvirt] sexpr.c: reviving an old const-correct change
by Jim Meyering 01 Aug '08

01 Aug '08

I wrote this months ago and forgot about it: diff --git a/src/xend_internal.c b/src/xend_internal.c index 880a279..1e6e875 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -2171,7 +2171,7 @@ error: */ static virDomainDefPtr xenDaemonParseSxpr(virConnectPtr conn, - struct sexpr *root, + const struct sexpr *root, int xendConfigVersion, const char *cpus) { When you pull the thread (i.e., eliminate all resulting warnings that arise from the above change), you end up with the following additional const-adding changes: (I'll squash the two into a single change set before committing) >From 1d0fd10b999ab65c555d8cb5bcfc03bc5cad9e6e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 1 Aug 2008 15:36:31 +0200 Subject: [PATCH] xend_internal.c, sexpr.c: const-correctness --- src/sexpr.c | 2 +- src/sexpr.h | 2 +- src/xend_internal.c | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/sexpr.c b/src/sexpr.c index 90c549c..b607e41 100644 --- a/src/sexpr.c +++ b/src/sexpr.c @@ -519,7 +519,7 @@ sexpr_lookup(const struct sexpr *sexpr, const char *node) * Returns true if the key was found, false otherwise */ int -sexpr_has(struct sexpr *sexpr, const char *node) +sexpr_has(const struct sexpr *sexpr, const char *node) { struct sexpr *s = sexpr_lookup_key(sexpr, node); diff --git a/src/sexpr.h b/src/sexpr.h index 0559a27..c3d038e 100644 --- a/src/sexpr.h +++ b/src/sexpr.h @@ -51,5 +51,5 @@ int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst); const char *sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...) ATTRIBUTE_FORMAT(printf,2,3); struct sexpr *sexpr_lookup(const struct sexpr *sexpr, const char *node); -int sexpr_has(struct sexpr *sexpr, const char *node); +int sexpr_has(const struct sexpr *sexpr, const char *node); #endif diff --git a/src/xend_internal.c b/src/xend_internal.c index 1e6e875..e29702a 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1180,7 +1180,8 @@ xend_detect_config_version(virConnectPtr conn) { * Returns 0 in case of success and -1 in case of error */ static int -xenDaemonParseSxprOS(virConnectPtr xend, struct sexpr *node, +xenDaemonParseSxprOS(virConnectPtr xend, + const struct sexpr *node, virDomainDefPtr def, int hvm) { @@ -1640,11 +1641,11 @@ error: static int xenDaemonParseSxprDisks(virConnectPtr conn, virDomainDefPtr def, - struct sexpr *root, + const struct sexpr *root, int hvm, int xendConfigVersion) { - struct sexpr *cur, *node; + const struct sexpr *cur, *node; virDomainDiskDefPtr disk = NULL, prev = def->disks; for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) { @@ -1803,10 +1804,10 @@ error: static int xenDaemonParseSxprNets(virConnectPtr conn, virDomainDefPtr def, - struct sexpr *root) + const struct sexpr *root) { virDomainNetDefPtr net = NULL, prev = def->nets; - struct sexpr *cur, *node; + const struct sexpr *cur, *node; const char *tmp; int vif_index = 0; @@ -1964,7 +1965,7 @@ error: static int xenDaemonParseSxprUSB(virConnectPtr conn, virDomainDefPtr def, - struct sexpr *root) + const struct sexpr *root) { virDomainInputDefPtr prev = def->inputs; struct sexpr *cur, *node; @@ -2007,7 +2008,7 @@ no_memory: static int xenDaemonParseSxprGraphicsOld(virConnectPtr conn, virDomainDefPtr def, - struct sexpr *root, + const struct sexpr *root, int hvm, int xendConfigVersion) { @@ -2085,10 +2086,10 @@ no_memory: static int xenDaemonParseSxprGraphicsNew(virConnectPtr conn, virDomainDefPtr def, - struct sexpr *root) + const struct sexpr *root) { virDomainGraphicsDefPtr graphics = NULL; - struct sexpr *cur, *node; + const struct sexpr *cur, *node; const char *tmp; /* append network devices and framebuffer */ -- 1.6.0.rc1.29.gf08e3

2 2

[libvirt] [PATCH] virsh edit, virsh net-edit, virsh pool-edit
by Richard W.M. Jones 01 Aug '08

01 Aug '08

This implements 'virsh edit', 'virsh net-edit' and 'virsh pool-edit' commands. Previous discussion of this patch was in this thread: https://www.redhat.com/archives/libvir-list/2008-July/thread.html#00434 Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

2 6

[libvirt] virsh.c: more const-correctness
by Jim Meyering 01 Aug '08

01 Aug '08

One good turn deserves another ;-) This also normalizes spacing around the "*" in declarations of vshControl and vshCmd pointers. Of course, this compiles with no warnings and passes "make syntax-check". >From e0db0c0eb4a62eafe1f5790de6d7f9a9d5cb84a0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 1 Aug 2008 14:00:20 +0200 Subject: [PATCH] virsh.c: more const-correctness --- src/virsh.c | 266 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 133 insertions(+), 133 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 620f103..d636301 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -182,7 +182,7 @@ typedef struct vshCmdOpt { */ typedef struct { const char *name; - int (*handler) (vshControl *, vshCmd *); /* command handler */ + int (*handler) (vshControl *, const vshCmd *); /* command handler */ vshCmdOptDef *opts; /* definition of command options */ vshCmdInfo *info; /* details about command */ } vshCmdDef; @@ -218,35 +218,35 @@ typedef struct __vshControl { static vshCmdDef commands[]; -static void vshError(vshControl * ctl, int doexit, const char *format, ...) +static void vshError(vshControl *ctl, int doexit, const char *format, ...) ATTRIBUTE_FORMAT(printf, 3, 4); -static int vshInit(vshControl * ctl); -static int vshDeinit(vshControl * ctl); -static void vshUsage(vshControl * ctl, const char *cmdname); +static int vshInit(vshControl *ctl); +static int vshDeinit(vshControl *ctl); +static void vshUsage(vshControl *ctl, const char *cmdname); static void vshOpenLogFile(vshControl *ctl); static void vshOutputLogFile(vshControl *ctl, int log_level, const char *format, va_list ap); static void vshCloseLogFile(vshControl *ctl); -static int vshParseArgv(vshControl * ctl, int argc, char **argv); +static int vshParseArgv(vshControl *ctl, int argc, char **argv); static const char *vshCmddefGetInfo(vshCmdDef * cmd, const char *info); static vshCmdDef *vshCmddefSearch(const char *cmdname); -static int vshCmddefHelp(vshControl * ctl, const char *name, int withprog); +static int vshCmddefHelp(vshControl *ctl, const char *name, int withprog); -static vshCmdOpt *vshCommandOpt(vshCmd * cmd, const char *name); -static int vshCommandOptInt(vshCmd * cmd, const char *name, int *found); -static char *vshCommandOptString(vshCmd * cmd, const char *name, +static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); +static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); +static char *vshCommandOptString(const vshCmd *cmd, const char *name, int *found); #if 0 -static int vshCommandOptStringList(vshCmd * cmd, const char *name, char ***data); +static int vshCommandOptStringList(const vshCmd *cmd, const char *name, char ***data); #endif -static int vshCommandOptBool(vshCmd * cmd, const char *name); +static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) #define VSH_BYNAME (1 << 3) -static virDomainPtr vshCommandOptDomainBy(vshControl * ctl, vshCmd * cmd, +static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); /* default is lookup by Id, Name and UUID */ @@ -254,7 +254,7 @@ static virDomainPtr vshCommandOptDomainBy(vshControl * ctl, vshCmd * cmd, vshCommandOptDomainBy(_ctl, _cmd, _optname, _name, \ VSH_BYID|VSH_BYUUID|VSH_BYNAME) -static virNetworkPtr vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, +static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); /* default is lookup by Name and UUID */ @@ -262,7 +262,7 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, vshCommandOptNetworkBy(_ctl, _cmd, _optname, _name, \ VSH_BYUUID|VSH_BYNAME) -static virStoragePoolPtr vshCommandOptPoolBy(vshControl * ctl, vshCmd * cmd, +static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); /* default is lookup by Name and UUID */ @@ -270,7 +270,7 @@ static virStoragePoolPtr vshCommandOptPoolBy(vshControl * ctl, vshCmd * cmd, vshCommandOptPoolBy(_ctl, _cmd, _optname, _name, \ VSH_BYUUID|VSH_BYNAME) -static virStorageVolPtr vshCommandOptVolBy(vshControl * ctl, vshCmd * cmd, +static virStorageVolPtr vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, const char *pooloptname, char **name, int flag); @@ -280,9 +280,9 @@ static virStorageVolPtr vshCommandOptVolBy(vshControl * ctl, vshCmd * cmd, vshCommandOptVolBy(_ctl, _cmd, _optname, _pooloptname, _name, \ VSH_BYUUID|VSH_BYNAME) -static void vshPrintExtra(vshControl * ctl, const char *format, ...) +static void vshPrintExtra(vshControl *ctl, const char *format, ...) ATTRIBUTE_FORMAT(printf, 2, 3); -static void vshDebug(vshControl * ctl, int level, const char *format, ...) +static void vshDebug(vshControl *ctl, int level, const char *format, ...) ATTRIBUTE_FORMAT(printf, 3, 4); /* XXX: add batch support */ @@ -290,19 +290,19 @@ static void vshDebug(vshControl * ctl, int level, const char *format, ...) static const char *vshDomainStateToString(int state); static const char *vshDomainVcpuStateToString(int state); -static int vshConnectionUsability(vshControl * ctl, virConnectPtr conn, +static int vshConnectionUsability(vshControl *ctl, virConnectPtr conn, int showerror); -static void *_vshMalloc(vshControl * ctl, size_t sz, const char *filename, int line); +static void *_vshMalloc(vshControl *ctl, size_t sz, const char *filename, int line); #define vshMalloc(_ctl, _sz) _vshMalloc(_ctl, _sz, __FILE__, __LINE__) -static void *_vshCalloc(vshControl * ctl, size_t nmemb, size_t sz, const char *filename, int line); +static void *_vshCalloc(vshControl *ctl, size_t nmemb, size_t sz, const char *filename, int line); #define vshCalloc(_ctl, _nmemb, _sz) _vshCalloc(_ctl, _nmemb, _sz, __FILE__, __LINE__) -static void *_vshRealloc(vshControl * ctl, void *ptr, size_t sz, const char *filename, int line); +static void *_vshRealloc(vshControl *ctl, void *ptr, size_t sz, const char *filename, int line); #define vshRealloc(_ctl, _ptr, _sz) _vshRealloc(_ctl, _ptr, _sz, __FILE__, __LINE__) -static char *_vshStrdup(vshControl * ctl, const char *s, const char *filename, int line); +static char *_vshStrdup(vshControl *ctl, const char *s, const char *filename, int line); #define vshStrdup(_ctl, _s) _vshStrdup(_ctl, _s, __FILE__, __LINE__) @@ -346,7 +346,7 @@ static vshCmdOptDef opts_help[] = { }; static int -cmdHelp(vshControl * ctl, vshCmd * cmd) +cmdHelp(vshControl *ctl, const vshCmd *cmd) { const char *cmdname = vshCommandOptString(cmd, "command", NULL); @@ -380,7 +380,7 @@ static vshCmdOptDef opts_autostart[] = { }; static int -cmdAutostart(vshControl * ctl, vshCmd * cmd) +cmdAutostart(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *name; @@ -432,7 +432,7 @@ static vshCmdOptDef opts_connect[] = { }; static int -cmdConnect(vshControl * ctl, vshCmd * cmd) +cmdConnect(vshControl *ctl, const vshCmd *cmd) { int ro = vshCommandOptBool(cmd, "readonly"); @@ -481,7 +481,7 @@ static vshCmdOptDef opts_console[] = { #ifndef __MINGW32__ static int -cmdConsole(vshControl * ctl, vshCmd * cmd) +cmdConsole(vshControl *ctl, const vshCmd *cmd) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; @@ -531,7 +531,7 @@ cmdConsole(vshControl * ctl, vshCmd * cmd) #else /* __MINGW32__ */ static int -cmdConsole(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdConsole(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { vshError (ctl, FALSE, "%s", _("console not implemented on this platform")); return FALSE; @@ -557,7 +557,7 @@ static vshCmdOptDef opts_list[] = { static int -cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { int inactive = vshCommandOptBool(cmd, "inactive"); int all = vshCommandOptBool(cmd, "all"); @@ -673,7 +673,7 @@ static vshCmdOptDef opts_domstate[] = { }; static int -cmdDomstate(vshControl * ctl, vshCmd * cmd) +cmdDomstate(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; @@ -711,7 +711,7 @@ static vshCmdOptDef opts_domblkstat[] = { }; static int -cmdDomblkstat (vshControl *ctl, vshCmd *cmd) +cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *name, *device; @@ -768,7 +768,7 @@ static vshCmdOptDef opts_domifstat[] = { }; static int -cmdDomIfstat (vshControl *ctl, vshCmd *cmd) +cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *name, *device; @@ -834,7 +834,7 @@ static vshCmdOptDef opts_suspend[] = { }; static int -cmdSuspend(vshControl * ctl, vshCmd * cmd) +cmdSuspend(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *name; @@ -873,7 +873,7 @@ static vshCmdOptDef opts_create[] = { }; static int -cmdCreate(vshControl * ctl, vshCmd * cmd) +cmdCreate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *from; @@ -921,7 +921,7 @@ static vshCmdOptDef opts_define[] = { }; static int -cmdDefine(vshControl * ctl, vshCmd * cmd) +cmdDefine(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *from; @@ -969,7 +969,7 @@ static vshCmdOptDef opts_undefine[] = { }; static int -cmdUndefine(vshControl * ctl, vshCmd * cmd) +cmdUndefine(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -1024,7 +1024,7 @@ static vshCmdOptDef opts_start[] = { }; static int -cmdStart(vshControl * ctl, vshCmd * cmd) +cmdStart(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -1070,7 +1070,7 @@ static vshCmdOptDef opts_save[] = { }; static int -cmdSave(vshControl * ctl, vshCmd * cmd) +cmdSave(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *name; @@ -1115,7 +1115,7 @@ static vshCmdOptDef opts_schedinfo[] = { }; static int -cmdSchedinfo(vshControl * ctl, vshCmd * cmd) +cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) { char *schedulertype; virDomainPtr dom; @@ -1264,7 +1264,7 @@ static vshCmdOptDef opts_restore[] = { }; static int -cmdRestore(vshControl * ctl, vshCmd * cmd) +cmdRestore(vshControl *ctl, const vshCmd *cmd) { char *from; int found; @@ -1303,7 +1303,7 @@ static vshCmdOptDef opts_dump[] = { }; static int -cmdDump(vshControl * ctl, vshCmd * cmd) +cmdDump(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *name; @@ -1347,7 +1347,7 @@ static vshCmdOptDef opts_resume[] = { }; static int -cmdResume(vshControl * ctl, vshCmd * cmd) +cmdResume(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -1386,7 +1386,7 @@ static vshCmdOptDef opts_shutdown[] = { }; static int -cmdShutdown(vshControl * ctl, vshCmd * cmd) +cmdShutdown(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -1425,7 +1425,7 @@ static vshCmdOptDef opts_reboot[] = { }; static int -cmdReboot(vshControl * ctl, vshCmd * cmd) +cmdReboot(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -1464,7 +1464,7 @@ static vshCmdOptDef opts_destroy[] = { }; static int -cmdDestroy(vshControl * ctl, vshCmd * cmd) +cmdDestroy(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -1503,7 +1503,7 @@ static vshCmdOptDef opts_dominfo[] = { }; static int -cmdDominfo(vshControl * ctl, vshCmd * cmd) +cmdDominfo(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; @@ -1585,7 +1585,7 @@ static vshCmdOptDef opts_freecell[] = { }; static int -cmdFreecell(vshControl * ctl, vshCmd * cmd) +cmdFreecell(vshControl *ctl, const vshCmd *cmd) { int ret; int cell, cell_given; @@ -1627,7 +1627,7 @@ static vshCmdOptDef opts_vcpuinfo[] = { }; static int -cmdVcpuinfo(vshControl * ctl, vshCmd * cmd) +cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; @@ -1716,7 +1716,7 @@ static vshCmdOptDef opts_vcpupin[] = { }; static int -cmdVcpupin(vshControl * ctl, vshCmd * cmd) +cmdVcpupin(vshControl *ctl, const vshCmd *cmd) { virDomainInfo info; virDomainPtr dom; @@ -1849,7 +1849,7 @@ static vshCmdOptDef opts_setvcpus[] = { }; static int -cmdSetvcpus(vshControl * ctl, vshCmd * cmd) +cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int count; @@ -1906,7 +1906,7 @@ static vshCmdOptDef opts_setmem[] = { }; static int -cmdSetmem(vshControl * ctl, vshCmd * cmd) +cmdSetmem(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainInfo info; @@ -1963,7 +1963,7 @@ static vshCmdOptDef opts_setmaxmem[] = { }; static int -cmdSetmaxmem(vshControl * ctl, vshCmd * cmd) +cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainInfo info; @@ -2017,7 +2017,7 @@ static vshCmdInfo info_nodeinfo[] = { }; static int -cmdNodeinfo(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { virNodeInfo info; @@ -2051,7 +2051,7 @@ static vshCmdInfo info_capabilities[] = { }; static int -cmdCapabilities (vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { char *caps; @@ -2084,7 +2084,7 @@ static vshCmdOptDef opts_dumpxml[] = { }; static int -cmdDumpXML(vshControl * ctl, vshCmd * cmd) +cmdDumpXML(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; @@ -2123,7 +2123,7 @@ static vshCmdOptDef opts_domname[] = { }; static int -cmdDomname(vshControl * ctl, vshCmd * cmd) +cmdDomname(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; @@ -2153,7 +2153,7 @@ static vshCmdOptDef opts_domid[] = { }; static int -cmdDomid(vshControl * ctl, vshCmd * cmd) +cmdDomid(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; unsigned int id; @@ -2188,7 +2188,7 @@ static vshCmdOptDef opts_domuuid[] = { }; static int -cmdDomuuid(vshControl * ctl, vshCmd * cmd) +cmdDomuuid(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -2227,7 +2227,7 @@ static vshCmdOptDef opts_migrate[] = { }; static int -cmdMigrate (vshControl *ctl, vshCmd *cmd) +cmdMigrate (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; const char *desturi; @@ -2289,7 +2289,7 @@ static vshCmdOptDef opts_network_autostart[] = { }; static int -cmdNetworkAutostart(vshControl * ctl, vshCmd * cmd) +cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; char *name; @@ -2338,7 +2338,7 @@ static vshCmdOptDef opts_network_create[] = { }; static int -cmdNetworkCreate(vshControl * ctl, vshCmd * cmd) +cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; char *from; @@ -2386,7 +2386,7 @@ static vshCmdOptDef opts_network_define[] = { }; static int -cmdNetworkDefine(vshControl * ctl, vshCmd * cmd) +cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; char *from; @@ -2434,7 +2434,7 @@ static vshCmdOptDef opts_network_destroy[] = { }; static int -cmdNetworkDestroy(vshControl * ctl, vshCmd * cmd) +cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; int ret = TRUE; @@ -2474,7 +2474,7 @@ static vshCmdOptDef opts_network_dumpxml[] = { }; static int -cmdNetworkDumpXML(vshControl * ctl, vshCmd * cmd) +cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; int ret = TRUE; @@ -2516,7 +2516,7 @@ static vshCmdOptDef opts_network_list[] = { }; static int -cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { int inactive = vshCommandOptBool(cmd, "inactive"); int all = vshCommandOptBool(cmd, "all"); @@ -2638,7 +2638,7 @@ static vshCmdOptDef opts_network_name[] = { }; static int -cmdNetworkName(vshControl * ctl, vshCmd * cmd) +cmdNetworkName(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; @@ -2670,7 +2670,7 @@ static vshCmdOptDef opts_network_start[] = { }; static int -cmdNetworkStart(vshControl * ctl, vshCmd * cmd) +cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; int ret = TRUE; @@ -2709,7 +2709,7 @@ static vshCmdOptDef opts_network_undefine[] = { }; static int -cmdNetworkUndefine(vshControl * ctl, vshCmd * cmd) +cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; int ret = TRUE; @@ -2747,7 +2747,7 @@ static vshCmdOptDef opts_network_uuid[] = { }; static int -cmdNetworkUuid(vshControl * ctl, vshCmd * cmd) +cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) { virNetworkPtr network; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -2797,7 +2797,7 @@ static vshCmdOptDef opts_pool_autostart[] = { }; static int -cmdPoolAutostart(vshControl * ctl, vshCmd * cmd) +cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; char *name; @@ -2846,7 +2846,7 @@ static vshCmdOptDef opts_pool_create[] = { }; static int -cmdPoolCreate(vshControl * ctl, vshCmd * cmd) +cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; char *from; @@ -2899,7 +2899,7 @@ static vshCmdOptDef opts_pool_create_as[] = { static int -cmdPoolCreateAs(vshControl * ctl, vshCmd * cmd) +cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int found; @@ -2984,7 +2984,7 @@ static vshCmdOptDef opts_pool_define[] = { }; static int -cmdPoolDefine(vshControl * ctl, vshCmd * cmd) +cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; char *from; @@ -3038,7 +3038,7 @@ static vshCmdOptDef opts_pool_define_as[] = { static int -cmdPoolDefineAs(vshControl * ctl, vshCmd * cmd) +cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int found; @@ -3122,7 +3122,7 @@ static vshCmdOptDef opts_pool_build[] = { }; static int -cmdPoolBuild(vshControl * ctl, vshCmd * cmd) +cmdPoolBuild(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3162,7 +3162,7 @@ static vshCmdOptDef opts_pool_destroy[] = { }; static int -cmdPoolDestroy(vshControl * ctl, vshCmd * cmd) +cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3202,7 +3202,7 @@ static vshCmdOptDef opts_pool_delete[] = { }; static int -cmdPoolDelete(vshControl * ctl, vshCmd * cmd) +cmdPoolDelete(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3242,7 +3242,7 @@ static vshCmdOptDef opts_pool_refresh[] = { }; static int -cmdPoolRefresh(vshControl * ctl, vshCmd * cmd) +cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3282,7 +3282,7 @@ static vshCmdOptDef opts_pool_dumpxml[] = { }; static int -cmdPoolDumpXML(vshControl * ctl, vshCmd * cmd) +cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3324,7 +3324,7 @@ static vshCmdOptDef opts_pool_list[] = { }; static int -cmdPoolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { int inactive = vshCommandOptBool(cmd, "inactive"); int all = vshCommandOptBool(cmd, "all"); @@ -3467,7 +3467,7 @@ static vshCmdOptDef opts_pool_info[] = { }; static int -cmdPoolInfo(vshControl * ctl, vshCmd * cmd) +cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) { virStoragePoolInfo info; virStoragePoolPtr pool; @@ -3542,7 +3542,7 @@ static vshCmdOptDef opts_pool_name[] = { }; static int -cmdPoolName(vshControl * ctl, vshCmd * cmd) +cmdPoolName(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; @@ -3574,7 +3574,7 @@ static vshCmdOptDef opts_pool_start[] = { }; static int -cmdPoolStart(vshControl * ctl, vshCmd * cmd) +cmdPoolStart(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3645,7 +3645,7 @@ static int cmdVolSize(const char *data, unsigned long long *val) } static int -cmdVolCreateAs(vshControl * ctl, vshCmd * cmd) +cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; virStorageVolPtr vol; @@ -3735,7 +3735,7 @@ static vshCmdOptDef opts_pool_undefine[] = { }; static int -cmdPoolUndefine(vshControl * ctl, vshCmd * cmd) +cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; int ret = TRUE; @@ -3773,7 +3773,7 @@ static vshCmdOptDef opts_pool_uuid[] = { }; static int -cmdPoolUuid(vshControl * ctl, vshCmd * cmd) +cmdPoolUuid(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -3813,7 +3813,7 @@ static vshCmdOptDef opts_vol_create[] = { }; static int -cmdVolCreate(vshControl * ctl, vshCmd * cmd) +cmdVolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; virStorageVolPtr vol; @@ -3872,7 +3872,7 @@ static vshCmdOptDef opts_vol_delete[] = { }; static int -cmdVolDelete(vshControl * ctl, vshCmd * cmd) +cmdVolDelete(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; int ret = TRUE; @@ -3914,7 +3914,7 @@ static vshCmdOptDef opts_vol_info[] = { }; static int -cmdVolInfo(vshControl * ctl, vshCmd * cmd) +cmdVolInfo(vshControl *ctl, const vshCmd *cmd) { virStorageVolInfo info; virStorageVolPtr vol; @@ -3966,7 +3966,7 @@ static vshCmdOptDef opts_vol_dumpxml[] = { }; static int -cmdVolDumpXML(vshControl * ctl, vshCmd * cmd) +cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; int ret = TRUE; @@ -4007,7 +4007,7 @@ static vshCmdOptDef opts_vol_list[] = { }; static int -cmdVolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { virStoragePoolPtr pool; int maxactive = 0, i; @@ -4085,7 +4085,7 @@ static vshCmdOptDef opts_vol_name[] = { }; static int -cmdVolName(vshControl * ctl, vshCmd * cmd) +cmdVolName(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; @@ -4118,7 +4118,7 @@ static vshCmdOptDef opts_vol_key[] = { }; static int -cmdVolKey(vshControl * ctl, vshCmd * cmd) +cmdVolKey(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; @@ -4152,7 +4152,7 @@ static vshCmdOptDef opts_vol_path[] = { }; static int -cmdVolPath(vshControl * ctl, vshCmd * cmd) +cmdVolPath(vshControl *ctl, const vshCmd *cmd) { virStorageVolPtr vol; @@ -4185,7 +4185,7 @@ static vshCmdInfo info_version[] = { static int -cmdVersion(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { unsigned long hvVersion; const char *hvType; @@ -4263,7 +4263,7 @@ static vshCmdInfo info_hostname[] = { }; static int -cmdHostname (vshControl *ctl, vshCmd *cmd ATTRIBUTE_UNUSED) +cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { char *hostname; @@ -4292,7 +4292,7 @@ static vshCmdInfo info_uri[] = { }; static int -cmdURI (vshControl *ctl, vshCmd *cmd ATTRIBUTE_UNUSED) +cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { char *uri; @@ -4327,7 +4327,7 @@ static vshCmdOptDef opts_vncdisplay[] = { }; static int -cmdVNCDisplay(vshControl * ctl, vshCmd * cmd) +cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; @@ -4403,7 +4403,7 @@ static vshCmdOptDef opts_ttyconsole[] = { }; static int -cmdTTYConsole(vshControl * ctl, vshCmd * cmd) +cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; @@ -4465,7 +4465,7 @@ static vshCmdOptDef opts_attach_device[] = { }; static int -cmdAttachDevice(vshControl * ctl, vshCmd * cmd) +cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *from; @@ -4522,7 +4522,7 @@ static vshCmdOptDef opts_detach_device[] = { }; static int -cmdDetachDevice(vshControl * ctl, vshCmd * cmd) +cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; char *from; @@ -4583,7 +4583,7 @@ static vshCmdOptDef opts_attach_interface[] = { }; static int -cmdAttachInterface(vshControl * ctl, vshCmd * cmd) +cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; char *mac, *target, *script, *type, *source; @@ -4694,7 +4694,7 @@ static vshCmdOptDef opts_detach_interface[] = { }; static int -cmdDetachInterface(vshControl * ctl, vshCmd * cmd) +cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; xmlDocPtr xml = NULL; @@ -4817,7 +4817,7 @@ static vshCmdOptDef opts_attach_disk[] = { }; static int -cmdAttachDisk(vshControl * ctl, vshCmd * cmd) +cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; char *source, *target, *driver, *subdriver, *type, *mode; @@ -4975,7 +4975,7 @@ static vshCmdOptDef opts_detach_disk[] = { }; static int -cmdDetachDisk(vshControl * ctl, vshCmd * cmd) +cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj=NULL; @@ -5079,7 +5079,7 @@ static vshCmdInfo info_quit[] = { }; static int -cmdQuit(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +cmdQuit(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { ctl->imode = FALSE; return TRUE; @@ -5226,7 +5226,7 @@ vshCmddefGetData(vshCmdDef * cmd, int data_ct) * Checks for required options */ static int -vshCommandCheckOpts(vshControl * ctl, vshCmd * cmd) +vshCommandCheckOpts(vshControl *ctl, vshCmd *cmd) { vshCmdDef *def = cmd->def; vshCmdOptDef *d; @@ -5268,7 +5268,7 @@ vshCmddefSearch(const char *cmdname) } static int -vshCmddefHelp(vshControl * ctl, const char *cmdname, int withprog) +vshCmddefHelp(vshControl *ctl, const char *cmdname, int withprog) { vshCmdDef *def = vshCmddefSearch(cmdname); @@ -5337,7 +5337,7 @@ vshCommandOptFree(vshCmdOpt * arg) } static void -vshCommandFree(vshCmd * cmd) +vshCommandFree(vshCmd *cmd) { vshCmd *c = cmd; @@ -5356,7 +5356,7 @@ vshCommandFree(vshCmd * cmd) * Returns option by name */ static vshCmdOpt * -vshCommandOpt(vshCmd * cmd, const char *name) +vshCommandOpt(const vshCmd *cmd, const char *name) { vshCmdOpt *opt = cmd->opts; @@ -5372,7 +5372,7 @@ vshCommandOpt(vshCmd * cmd, const char *name) * Returns option as INT */ static int -vshCommandOptInt(vshCmd * cmd, const char *name, int *found) +vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) { vshCmdOpt *arg = vshCommandOpt(cmd, name); int res = 0, num_found = FALSE; @@ -5394,7 +5394,7 @@ vshCommandOptInt(vshCmd * cmd, const char *name, int *found) * Returns option as STRING */ static char * -vshCommandOptString(vshCmd * cmd, const char *name, int *found) +vshCommandOptString(const vshCmd *cmd, const char *name, int *found) { vshCmdOpt *arg = vshCommandOpt(cmd, name); @@ -5406,7 +5406,7 @@ vshCommandOptString(vshCmd * cmd, const char *name, int *found) #if 0 static int -vshCommandOptStringList(vshCmd * cmd, const char *name, char ***data) +vshCommandOptStringList(const vshCmd *cmd, const char *name, char ***data) { vshCmdOpt *arg = cmd->opts; char **val = NULL; @@ -5434,14 +5434,14 @@ vshCommandOptStringList(vshCmd * cmd, const char *name, char ***data) * Returns TRUE/FALSE if the option exists */ static int -vshCommandOptBool(vshCmd * cmd, const char *name) +vshCommandOptBool(const vshCmd *cmd, const char *name) { return vshCommandOpt(cmd, name) ? TRUE : FALSE; } static virDomainPtr -vshCommandOptDomainBy(vshControl * ctl, vshCmd * cmd, const char *optname, +vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) { virDomainPtr dom = NULL; @@ -5487,7 +5487,7 @@ vshCommandOptDomainBy(vshControl * ctl, vshCmd * cmd, const char *optname, } static virNetworkPtr -vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, const char *optname, +vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) { virNetworkPtr network = NULL; @@ -5524,7 +5524,7 @@ vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, const char *optname, } static virStoragePoolPtr -vshCommandOptPoolBy(vshControl * ctl, vshCmd * cmd, const char *optname, +vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) { virStoragePoolPtr pool = NULL; @@ -5561,7 +5561,7 @@ vshCommandOptPoolBy(vshControl * ctl, vshCmd * cmd, const char *optname, } static virStorageVolPtr -vshCommandOptVolBy(vshControl * ctl, vshCmd * cmd, +vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, const char *pooloptname, char **name, int flag) @@ -5620,7 +5620,7 @@ vshCommandOptVolBy(vshControl * ctl, vshCmd * cmd, * Executes command(s) and returns return code from last command */ static int -vshCommandRun(vshControl * ctl, vshCmd * cmd) +vshCommandRun(vshControl *ctl, const vshCmd *cmd) { int ret = TRUE; @@ -5659,7 +5659,7 @@ vshCommandRun(vshControl * ctl, vshCmd * cmd) #define VSH_TK_END 3 static int -vshCommandGetToken(vshControl * ctl, char *str, char **end, char **res) +vshCommandGetToken(vshControl *ctl, char *str, char **end, char **res) { int tk = VSH_TK_NONE; int quote = FALSE; @@ -5730,7 +5730,7 @@ vshCommandGetToken(vshControl * ctl, char *str, char **end, char **res) } static int -vshCommandParse(vshControl * ctl, char *cmdstr) +vshCommandParse(vshControl *ctl, char *cmdstr) { char *str; char *tkdata = NULL; @@ -5915,7 +5915,7 @@ vshDomainVcpuStateToString(int state) } static int -vshConnectionUsability(vshControl * ctl, virConnectPtr conn, int showerror) +vshConnectionUsability(vshControl *ctl, virConnectPtr conn, int showerror) { /* TODO: use something like virConnectionState() to * check usability of the connection @@ -5929,7 +5929,7 @@ vshConnectionUsability(vshControl * ctl, virConnectPtr conn, int showerror) } static void -vshDebug(vshControl * ctl, int level, const char *format, ...) +vshDebug(vshControl *ctl, int level, const char *format, ...) { va_list ap; @@ -5946,7 +5946,7 @@ vshDebug(vshControl * ctl, int level, const char *format, ...) } static void -vshPrintExtra(vshControl * ctl, const char *format, ...) +vshPrintExtra(vshControl *ctl, const char *format, ...) { va_list ap; @@ -5960,7 +5960,7 @@ vshPrintExtra(vshControl * ctl, const char *format, ...) static void -vshError(vshControl * ctl, int doexit, const char *format, ...) +vshError(vshControl *ctl, int doexit, const char *format, ...) { va_list ap; @@ -5987,7 +5987,7 @@ vshError(vshControl * ctl, int doexit, const char *format, ...) } static void * -_vshMalloc(vshControl * ctl, size_t size, const char *filename, int line) +_vshMalloc(vshControl *ctl, size_t size, const char *filename, int line) { void *x; @@ -5999,7 +5999,7 @@ _vshMalloc(vshControl * ctl, size_t size, const char *filename, int line) } static void * -_vshCalloc(vshControl * ctl, size_t nmemb, size_t size, const char *filename, int line) +_vshCalloc(vshControl *ctl, size_t nmemb, size_t size, const char *filename, int line) { void *x; @@ -6011,7 +6011,7 @@ _vshCalloc(vshControl * ctl, size_t nmemb, size_t size, const char *filename, in } static void * -_vshRealloc(vshControl * ctl, void *ptr, size_t size, const char *filename, int line) +_vshRealloc(vshControl *ctl, void *ptr, size_t size, const char *filename, int line) { void *x; @@ -6024,7 +6024,7 @@ _vshRealloc(vshControl * ctl, void *ptr, size_t size, const char *filename, int } static char * -_vshStrdup(vshControl * ctl, const char *s, const char *filename, int line) +_vshStrdup(vshControl *ctl, const char *s, const char *filename, int line) { char *x; @@ -6041,7 +6041,7 @@ _vshStrdup(vshControl * ctl, const char *s, const char *filename, int line) * Initialize connection. */ static int -vshInit(vshControl * ctl) +vshInit(vshControl *ctl) { if (ctl->conn) return FALSE; @@ -6357,7 +6357,7 @@ vshReadline (vshControl *ctl, const char *prompt) * Deinitialize virsh */ static int -vshDeinit(vshControl * ctl) +vshDeinit(vshControl *ctl) { vshCloseLogFile(ctl); free(ctl->name); @@ -6377,7 +6377,7 @@ vshDeinit(vshControl * ctl) * Print usage */ static void -vshUsage(vshControl * ctl, const char *cmdname) +vshUsage(vshControl *ctl, const char *cmdname) { vshCmdDef *cmd; @@ -6413,7 +6413,7 @@ vshUsage(vshControl * ctl, const char *cmdname) * */ static int -vshParseArgv(vshControl * ctl, int argc, char **argv) +vshParseArgv(vshControl *ctl, int argc, char **argv) { char *last = NULL; int i, end = 0, help = 0; -- 1.6.0.rc1.29.gf08e3

2 2

[libvirt] PATCH: Support container XML enhancements
by Daniel P. Berrange 01 Aug '08

01 Aug '08

This is something I previously submitted as part of one of the LXC patches, but I figure it makes sense on its own, since OpenVZ needs this now too. This adds two new XML elements to the domain XML format: - An <init> block within <os> allowing specification of the path for a binary to run when starting the container - aka 'init' by any other name. First we also specify that all containers will use an OS type of 'exe' - as in executable - the container equivalent of 'hvm' <os> <type>exe</type> <init>/sbin/init</init> </os> - An <filesystem> element for specifying how the container's filesystem is to be provided. This can actually be useful for full-machine virt too such as KVM which have host filesystem pass-through. There are various ways to configure it: eg to use '/some/directory' as the root filesystem for a container <filesystem type='mount'> <source dir='/some/directory'/> <target dir='/'/> </filesystem> eg to use a template called 'fedora9web' as the root filesystem for a container <filesystem type='template'> <source name='fedora9web'/> <target dir='/'/> </filesystem> eg to use a file containing a filesystem as the root filesystem <filesystem type='file'> <source file='/some/file.img'/> <target dir='/'/> </filesystem> eg to use a disk partition or other block device (eg LVM) containing a filesystem as the root filesystem <filesystem type='block'> <source dev='/dev/VolGroup00/Fedora9Web'/> <target dir='/'/> </filesystem> If setting the root filesystem, the target path will be '/', some container based virt allows the host OS root filesystem to be used in the guest, and merely specify additive mounts at specific locations, eg to override just /home within a container <filesystem type='mount'> <source dir='/some/directory'/> <target dir='/home'/> </filesystem> I believe this should satisfy all the OpenVZ, LXC and Linux-VServer drivers' requirements around filesystems Daniel diff -r 5614da5fe9ef src/domain_conf.c --- a/src/domain_conf.c Fri Jul 25 15:38:46 2008 +0100 +++ b/src/domain_conf.c Tue Jul 29 16:03:38 2008 +0100 @@ -86,6 +86,12 @@ "virtio", "xen") +VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, + "mount", + "block", + "file", + "template") + VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", "ethernet", @@ -234,6 +240,18 @@ VIR_FREE(def->driverType); virDomainDiskDefFree(def->next); + VIR_FREE(def); +} + +void virDomainFSDefFree(virDomainFSDefPtr def) +{ + if (!def) + return; + + VIR_FREE(def->src); + VIR_FREE(def->dst); + + virDomainFSDefFree(def->next); VIR_FREE(def); } @@ -345,6 +363,7 @@ virDomainGraphicsDefFree(def->graphics); virDomainInputDefFree(def->inputs); virDomainDiskDefFree(def->disks); + virDomainFSDefFree(def->fss); virDomainNetDefFree(def->nets); virDomainChrDefFree(def->serials); virDomainChrDefFree(def->parallels); @@ -355,6 +374,7 @@ VIR_FREE(def->os.type); VIR_FREE(def->os.arch); VIR_FREE(def->os.machine); + VIR_FREE(def->os.init); VIR_FREE(def->os.kernel); VIR_FREE(def->os.initrd); VIR_FREE(def->os.cmdline); @@ -620,6 +640,89 @@ error: virDomainDiskDefFree(def); + def = NULL; + goto cleanup; +} + + +/* Parse the XML definition for a disk + * @param node XML nodeset to parse for disk definition + */ +static virDomainFSDefPtr +virDomainFSDefParseXML(virConnectPtr conn, + xmlNodePtr node) { + virDomainFSDefPtr def; + xmlNodePtr cur; + char *type = NULL; + char *source = NULL; + char *target = NULL; + + if (VIR_ALLOC(def) < 0) { + virDomainReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return NULL; + } + + type = virXMLPropString(node, "type"); + if (type) { + if ((def->type = virDomainFSTypeFromString(type)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown filesystem type '%s'"), type); + goto error; + } + } else { + def->type = VIR_DOMAIN_FS_TYPE_MOUNT; + } + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if ((source == NULL) && + (xmlStrEqual(cur->name, BAD_CAST "source"))) { + + if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT) + source = virXMLPropString(cur, "dir"); + else if (def->type == VIR_DOMAIN_FS_TYPE_FILE) + source = virXMLPropString(cur, "file"); + else if (def->type == VIR_DOMAIN_FS_TYPE_BLOCK) + source = virXMLPropString(cur, "dev"); + else if (def->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) + source = virXMLPropString(cur, "name"); + } else if ((target == NULL) && + (xmlStrEqual(cur->name, BAD_CAST "target"))) { + target = virXMLPropString(cur, "dir"); + } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { + def->readonly = 1; + } + } + cur = cur->next; + } + + if (source == NULL) { + virDomainReportError(conn, VIR_ERR_NO_SOURCE, + target ? "%s" : NULL, target); + goto error; + } + + if (target == NULL) { + virDomainReportError(conn, VIR_ERR_NO_TARGET, + source ? "%s" : NULL, source); + goto error; + } + + def->src = source; + source = NULL; + def->dst = target; + target = NULL; + +cleanup: + VIR_FREE(type); + VIR_FREE(target); + VIR_FREE(source); + + return def; + + error: + virDomainFSDefFree(def); def = NULL; goto cleanup; } @@ -1351,6 +1454,10 @@ dev->type = VIR_DOMAIN_DEVICE_DISK; if (!(dev->data.disk = virDomainDiskDefParseXML(conn, node))) goto error; + } else if (xmlStrEqual(node->name, BAD_CAST "filesystem")) { + dev->type = VIR_DOMAIN_DEVICE_FS; + if (!(dev->data.fs = virDomainFSDefParseXML(conn, node))) + goto error; } else if (xmlStrEqual(node->name, BAD_CAST "interface")) { dev->type = VIR_DOMAIN_DEVICE_NET; if (!(dev->data.net = virDomainNetDefParseXML(conn, node))) @@ -1560,7 +1667,21 @@ } } - if (!def->os.bootloader) { + /* + * Booting options for different OS types.... + * + * - A bootloader (and optional kernel+initrd) (xen) + * - A kernel + initrd (xen) + * - A boot device (and optional kernel+initrd) (hvm) + * - An init script (exe) + */ + + if (STREQ(def->os.type, "exe")) { + def->os.init = virXPathString(conn, "string(./os/init[1])", ctxt); + } + + if (STREQ(def->os.type, "xen") || + STREQ(def->os.type, "hvm")) { def->os.kernel = virXPathString(conn, "string(./os/kernel[1])", ctxt); def->os.initrd = virXPathString(conn, "string(./os/initrd[1])", ctxt); def->os.cmdline = virXPathString(conn, "string(./os/cmdline[1])", ctxt); @@ -1610,12 +1731,9 @@ def->os.type, def->os.arch, type); - if (!emulator) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("unsupported guest type")); - goto error; - } - if (!(def->emulator = strdup(emulator))) { + + if (emulator && + !(def->emulator = strdup(emulator))) { virDomainReportError(conn, VIR_ERR_NO_MEMORY, NULL); goto error; } @@ -1648,6 +1766,23 @@ ptr = ptr->next; } } + } + VIR_FREE(nodes); + + /* analysis of the filesystems */ + if ((n = virXPathNodeSet(conn, "./devices/filesystem", ctxt, &nodes)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot extract filesystem devices")); + goto error; + } + for (i = n - 1 ; i >= 0 ; i--) { + virDomainFSDefPtr fs = virDomainFSDefParseXML(conn, + nodes[i]); + if (!fs) + goto error; + + fs->next = def->fss; + def->fss = fs; } VIR_FREE(nodes); @@ -2202,6 +2337,57 @@ } static int +virDomainFSDefFormat(virConnectPtr conn, + virBufferPtr buf, + virDomainFSDefPtr def) +{ + const char *type = virDomainFSTypeToString(def->type); + + if (!type) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected filesystem type %d"), def->type); + return -1; + } + + virBufferVSprintf(buf, + " <filesystem type='%s'>\n", + type); + + if (def->src) { + switch (def->type) { + case VIR_DOMAIN_FS_TYPE_MOUNT: + virBufferEscapeString(buf, " <source dir='%s'/>\n", + def->src); + break; + + case VIR_DOMAIN_FS_TYPE_BLOCK: + virBufferEscapeString(buf, " <source dev='%s'/>\n", + def->src); + break; + + case VIR_DOMAIN_FS_TYPE_FILE: + virBufferEscapeString(buf, " <source file='%s'/>\n", + def->src); + break; + + case VIR_DOMAIN_FS_TYPE_TEMPLATE: + virBufferEscapeString(buf, " <source name='%s'/>\n", + def->src); + } + } + + virBufferVSprintf(buf, " <target dir='%s'/>\n", + def->dst); + + if (def->readonly) + virBufferAddLit(buf, " <readonly/>\n"); + + virBufferAddLit(buf, " </filesystem>\n"); + + return 0; +} + +static int virDomainNetDefFormat(virConnectPtr conn, virBufferPtr buf, virDomainNetDefPtr def) @@ -2479,6 +2665,7 @@ unsigned char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainDiskDefPtr disk; + virDomainFSDefPtr fs; virDomainNetDefPtr net; virDomainSoundDefPtr sound; virDomainInputDefPtr input; @@ -2548,6 +2735,9 @@ else virBufferVSprintf(&buf, ">%s</type>\n", def->os.type); + if (def->os.init) + virBufferEscapeString(&buf, " <init>%s</init>\n", + def->os.init); if (def->os.loader) virBufferEscapeString(&buf, " <loader>%s</loader>\n", def->os.loader); @@ -2621,6 +2811,13 @@ if (virDomainDiskDefFormat(conn, &buf, disk) < 0) goto cleanup; disk = disk->next; + } + + fs = def->fss; + while (fs) { + if (virDomainFSDefFormat(conn, &buf, fs) < 0) + goto cleanup; + fs = fs->next; } net = def->nets; diff -r 5614da5fe9ef src/domain_conf.h --- a/src/domain_conf.h Fri Jul 25 15:38:46 2008 +0100 +++ b/src/domain_conf.h Tue Jul 29 16:03:38 2008 +0100 @@ -91,6 +91,28 @@ unsigned int shared : 1; virDomainDiskDefPtr next; +}; + + +/* Two types of disk backends */ +enum virDomainFSType { + VIR_DOMAIN_FS_TYPE_MOUNT, /* Better named 'bind' */ + VIR_DOMAIN_FS_TYPE_BLOCK, + VIR_DOMAIN_FS_TYPE_FILE, + VIR_DOMAIN_FS_TYPE_TEMPLATE, + + VIR_DOMAIN_FS_TYPE_LAST +}; + +typedef struct _virDomainFSDef virDomainFSDef; +typedef virDomainFSDef *virDomainFSDefPtr; +struct _virDomainFSDef { + int type; + char *src; + char *dst; + unsigned int readonly : 1; + + virDomainFSDefPtr next; }; @@ -262,6 +284,7 @@ /* Flags for the 'type' field in next struct */ enum virDomainDeviceType { VIR_DOMAIN_DEVICE_DISK, + VIR_DOMAIN_DEVICE_FS, VIR_DOMAIN_DEVICE_NET, VIR_DOMAIN_DEVICE_INPUT, VIR_DOMAIN_DEVICE_SOUND, @@ -273,6 +296,7 @@ int type; union { virDomainDiskDefPtr disk; + virDomainFSDefPtr fs; virDomainNetDefPtr net; virDomainInputDefPtr input; virDomainSoundDefPtr sound; @@ -318,6 +342,7 @@ char *machine; int nBootDevs; int bootDevs[VIR_DOMAIN_BOOT_LAST]; + char *init; char *kernel; char *initrd; char *cmdline; @@ -357,6 +382,7 @@ virDomainGraphicsDefPtr graphics; virDomainDiskDefPtr disks; + virDomainFSDefPtr fss; virDomainNetDefPtr nets; virDomainInputDefPtr inputs; virDomainSoundDefPtr sounds; @@ -411,6 +437,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def); void virDomainInputDefFree(virDomainInputDefPtr def); void virDomainDiskDefFree(virDomainDiskDefPtr def); +void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); @@ -481,6 +508,7 @@ VIR_ENUM_DECL(virDomainDisk) VIR_ENUM_DECL(virDomainDiskDevice) VIR_ENUM_DECL(virDomainDiskBus) +VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainChr) VIR_ENUM_DECL(virDomainSoundModel) -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 10

[libvirt] [PATCH] Const-correctness in virsh.c
by Richard W.M. Jones 01 Aug '08

01 Aug '08

This rather tedious patch adds const-correctness to the command & info structures in virsh. It's worth noting that it compiles without warning, and the tests still run. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

3 2

[libvirt] PATCH: Fix setting of bridge forward-delay
by Daniel P. Berrange 01 Aug '08

01 Aug '08

The libvirt virtual networking allows setting of the forward-delay parameter. This is the delay the kernel inserts before it starts forwarding traffic when a guest VIF is added to a bridge. The default network config sets this to zero, and previously we had a bug where we accidentally called brSetForwardDelay() based on the STP parameter which was zero, so we did in fact have a forward delay of 0 as desired. Rich then fixed this bug, and thus we no longer accidentally call the brSetForardDelay() method. Unfortuntely the place where we *do* delibrately call it is conditionalized on if (network->def->delay So if you set a forward delay of zero, we never explicitly set this on the bridge. Thus the kernel's default setting applies which is 15 seconds. The fix is trivial - just remove the conditional. So previously you could see traffic forwaarding delayed by the kernel for 30 seconds Aug 1 11:34:16 t60wlan kernel: device vnet0 entered promiscuous mode Aug 1 11:34:16 t60wlan kernel: virbr0: port 1(vnet0) entering listening state Aug 1 11:34:31 t60wlan kernel: virbr0: port 1(vnet0) entering learning state Aug 1 11:34:46 t60wlan kernel: virbr0: topology change detected, propagating Aug 1 11:34:46 t60wlan kernel: virbr0: port 1(vnet0) entering forwarding state Now it applies immediately Aug 1 11:40:07 t60wlan kernel: device vnet0 entered promiscuous mode Aug 1 11:40:07 t60wlan kernel: virbr0: port 1(vnet0) entering listening state Aug 1 11:40:07 t60wlan kernel: virbr0: port 1(vnet0) entering learning state Aug 1 11:40:07 t60wlan kernel: virbr0: topology change detected, propagating Aug 1 11:40:07 t60wlan kernel: virbr0: port 1(vnet0) entering forwarding state Daniel Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.98 diff -u -r1.98 qemu_driver.c --- src/qemu_driver.c 30 Jul 2008 09:20:19 -0000 1.98 +++ src/qemu_driver.c 1 Aug 2008 10:46:36 -0000 @@ -1480,8 +1480,7 @@ } - if (network->def->delay && - (err = brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay))) { + if ((err = brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("failed to set bridge forward delay to %ld"), network->def->delay); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 7

Re: [libvirt] Contribution to libvirt
by rajesh battala 01 Aug '08

01 Aug '08

hi Daniel. thanks a lot.. i will start working on it.. thanks ----- Original Message ---- From: Daniel Veillard <veillard(a)redhat.com> To: rajesh battala <rajesh.battala(a)yahoo.co.in> Cc: libvir-list(a)redhat.com Sent: Friday, 1 August, 2008 12:28:45 PM Subject: Re: [libvirt] Contribution to libvirt On Fri, Aug 01, 2008 at 12:15:38PM +0530, rajesh battala wrote: > hi all.. > i am interested to contribute to libvirt. > i want to contribute to the java bindings. > is there any procedure for that. > plz let me know i ddint find doc on the site. Discuss what you would like to provide here, send patches in unified diff format against the CVS head. See http://libvirt.org/bugs.html http://libvirt.org/java.html Basically it's like for any other project, I suggest you read what Rich Jones wrote on the topic: http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/ Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ Unlimited freedom, unlimited storage. Get it now, on http://help.yahoo.com/l/in/yahoo/mail/yahoomail/tools/tools-08.html/

2 1

[libvirt] [PATCH]: Add carriage returns to qemudLog
by Chris Lalancette 01 Aug '08

01 Aug '08

Since qemudLog just maps to fprintf(stderr), add carriage returns every where it is used, so it's easier on the eyes while debugging. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 2

[libvirt] [PATCH] Add link to how-to-contribute doc from HACKING file
by Richard W.M. Jones 01 Aug '08

01 Aug '08

Very trivial patch which adds a link to my document on how to contribute to open source projects to the HACKING file. http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/ Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 59 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

3 2

[libvirt] libvirt, XEN, bridged network and arp
by Christoph Höger 01 Aug '08

01 Aug '08

Hi, Ive got a severe networking problem over here: When I boot up my machine (debian lenny) using virsh 0.4.4 on an debian etch, a new virtual eth device (something like vif97.0) is assigned to that machine and that device is attached to my bridge virbr1. That is fine. Not so fine is the fact, that no arp packages come over to my bridge for about 5 seconds or so. During that time I can see a lot of arp-who-has on vifXX.0 but nothing on virbr1 so there are no answers and the result is my guest machine not mounting nfs directories on boot. After some time (e.g. after login) networking works fine - but thats definitely too late - I need those directories mounted on boot. Is there a way to fix that?

2 1

[libvirt] PATCH: 0/14: Generic XML parsers/formatters for all drivers
by Daniel P. Berrange 01 Aug '08

01 Aug '08

The following series of patchs provide a generic XML parser and formatter for the network and domain XML config formats. They then switch over the test, qemu, Xend and XM drivers to these APIs. The LXC driver is work in progress. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 43

[libvirt] Contribution to libvirt
by rajesh battala 01 Aug '08

01 Aug '08

hi all.. i am interested to contribute to libvirt. i want to contribute to the java bindings. is there any procedure for that. plz let me know i ddint find doc on the site. thanks rajesh Unlimited freedom, unlimited storage. Get it now, on http://help.yahoo.com/l/in/yahoo/mail/yahoomail/tools/tools-08.html/

3 2

[libvirt] [PATCH] Minor doc tweaks
by Charles Duffy 01 Aug '08

01 Aug '08

Per subject; clarifies the distinction between virDomainCreateLinux and virDomainDefineXML+virDomainCreate, and adds documentation for the autoport display attribute.

2 1

[libvirt] [Charles_Duffy@messageone.com: [PATCH] autoport overrides actual VNC port number in dump-xml]
by Daniel P. Berrange 01 Aug '08

01 Aug '08

Forwarding message that was sent to wrong list... ----- Forwarded message from Charles Duffy <Charles_Duffy(a)messageone.com> ----- > To: kvm(a)vger.kernel.org > From: Charles Duffy <Charles_Duffy(a)messageone.com> > Subject: [PATCH] autoport overrides actual VNC port number in dump-xml > Date: Wed, 30 Jul 2008 00:32:57 -0500 > > Per subject; if autoport is in use for a host, the current > virDomainGraphicsDefFormat code always emits "port=-1", even if a port > is assigned to the host; this leaves no way for a client to find the VNC > port assigned to the host in question. > > --------------090103050500010408080902 > Content-Type: text/x-diff; > name="libvirt-fix-vnc-port-output.patch" > Content-Transfer-Encoding: 7bit > Content-Disposition: inline; > filename="libvirt-fix-vnc-port-output.patch" > > diff --git a/src/domain_conf.c b/src/domain_conf.c > index d629093..ece471e 100644 > --- a/src/domain_conf.c > +++ b/src/domain_conf.c > @@ -2431,11 +2431,11 @@ virDomainGraphicsDefFormat(virConnectPtr conn, > > switch (def->type) { > case VIR_DOMAIN_GRAPHICS_TYPE_VNC: > - if (def->data.vnc.autoport) > - virBufferAddLit(buf, " port='-1'"); > - else if (def->data.vnc.port) > + if (def->data.vnc.port) > virBufferVSprintf(buf, " port='%d'", > def->data.vnc.port); > + else if (def->data.vnc.autoport) > + virBufferAddLit(buf, " port='-1'"); > > virBufferVSprintf(buf, " autoport='%s'", > def->data.vnc.autoport ? "yes" : "no"); > > --------------090103050500010408080902-- > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ----- End forwarded message ----- -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 7

[libvirt] [PATCH] qemudDomainCreate check if domain is already active
by Guido Günther 01 Aug '08

01 Aug '08

Hi, currently virsh create foo.xml overwrites running domains. In case of qemu this leaves detached qemu processes around and the domain creation fails later on being unable to start other domains afterwards - not nice. Attached patch checks if we already have a running domain by that name and in this case refuses to create a new domain from xml by that name. Probably this check needs to be pushed further upward since this might affect other hypervisors too, haven't checked that though. Cheers, -- Guido

4 13

[libvirt] [PATCH] Detailed XML errors version 4
by Richard W.M. Jones 01 Aug '08

01 Aug '08

Updated to report only the first error, as suggested by Dan. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

3 2

[libvirt] listing domains on Fedora 8 XEN kernel
by Steve Oliphant 01 Aug '08

01 Aug '08

I am having a problem being able to get domain information in an Fedora 8 XEN environment.The code does not receive an error status on the XEN kernel and does not get any information. The same code running on the non XEN kernel works fine. I am running default configuration files. Is this a known issue? Do I need to tweak the configuration files? Is there anything else I need to do get the code to work on the XEN kernel? Please point me in the right direction. If any other information is required to assist in answering my question, please let me know. Thank you in advance for your help. Steven Oliphant Software installed: rpm -qa | grep kernel kernel-headers-2.6.25.9-40.fc8 kernel-devel-2.6.23.1-42.fc8 kernel-2.6.23.1-42.fc8 kernel-xen-2.6.21-2950.fc8 kernel-2.6.25.9-40.fc8 kernel-devel-2.6.25.9-40.fc8 kernel-xen-2.6.21.7-3.fc8 rpm -qa | grep xen xen-devel-3.1.2-2.fc8 xenwatch-0.5.2-2.fc8 kernel-xen-2.6.21-2950.fc8 xen-debuginfo-3.1.2-2.fc8 kernel-xen-2.6.21.7-3.fc8 xen-libs-3.1.2-2.fc8 xen-3.1.2-2.fc8 rpm -qa | grep virt libvirt-devel-0.4.4-1.fc8 ruby-libvirt-0.0.7-1.fc8 libvirt-python-0.4.4-1.fc8 python-virtinst-0.300.2-4.fc8 virt-manager-0.5.3-2.fc8 libvirt-debuginfo-0.4.4-1.fc8 libvirt-0.4.4-1.fc8 Non XEN kernel: uname -a Linux steve-1.verizon.net 2.6.25.9-40.fc8 #1 SMP Fri Jun 27 16:25:53 EDT 2008 i686 athlon i386 GNU/Linux XEN kernel uname -a Linux steve-1.verizon.net 2.6.21.7-3.fc8xen #1 SMP Thu Mar 20 14:57:53 EDT 2008 i686 athlon i386 GNU/Linux Code sample: #include <stdio.h> #include <libvirt/libvirt.h> #define DOMAIN_COUNT 10 /** * getInfo: * * extract the virtual machine information */ static void getInfo(void) { virConnectPtr conn = NULL; /* the hypervisor connection */ virDomainPtr dom = NULL; /* the domain being checked */ int ret; int id; int i, j, k, ids[DOMAIN_COUNT]; char *names[DOMAIN_COUNT]; /* NULL means connect to local Xen hypervisor */ conn = virConnectOpen(NULL); if (conn == NULL) { fprintf(stderr, "Failed to connect to hypervisor\n"); goto error; } /* Get the active domain list */ i = virConnectListDomains(conn, &ids[0], DOMAIN_COUNT); if (i < 0) { fprintf(stderr, "Failed to list the domains\n"); goto error; } for (j = 0;j < i;j++) { if (ids[j] != 0) { id = ids[j]; fprintf(stdout, "Active Domain: %d\n", id); /* Get the information */ } } /* Get defined Domain Names */ ret = virConnectListDefinedDomains (conn, names, DOMAIN_COUNT); if (ret < 0) { fprintf(stderr, "Failed to get Domain Names\n"); goto error; } for (k = 0;k < ret;k++) { printf("Inactive Domain Name: %s\n", names[k]); } error: if (dom != NULL) virDomainFree(dom); if (conn != NULL) virConnectClose(conn); } int main() { getInfo(); return(0); }

1 1

[libvirt] what ever happened to the SCSI HBA storage backend?
by David Lively 31 Jul '08

31 Jul '08

Hi Folks - I see Daniel Berrange submitted a SCSI HBA storage backend in March. What ever happened to that? I'd be happy to pick this up if there's more work to do (is there a code base later than the posted patch?) In the longer run, I'm looking towards adding support necessary for FC environments (like multipath). Also, it seems (to my iSCSI-ignorant mind) that iSCSI should be just another flavor of the SCSI driver (kind of like netfs is a flavor of the fs driver ...). Is anyone working on such a refactoring? Thanks, Dave

2 1

[libvirt] [PATCH] fix compilation for MinGW (with LXC)
by Atsushi SAKAI 31 Jul '08

31 Jul '08

Hello, Dan Smith May I commit this patch for MinGW compilation? veth.c is not necessary for MinGW. Thanks Atsushi SAKAI

4 5

[libvirt] [PATCH] Detailed XML errors using the _private field
by Richard W.M. Jones 30 Jul '08

30 Jul '08

Here is a patch which uses the _private field to store the virConnectPtr. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 1

[libvirt] [PATCH 0/2] Detailed XML errors (with thread-local storage this time)
by Richard W.M. Jones 30 Jul '08

30 Jul '08

I've just seen Daniel Veillard's message about the '_private' field. In the meantime here is a solution using thread-local storage implemented on top of pthreads, which may be of interest. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 59 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

1 2

[libvirt] PATCH: Validate all test suite XML files against schema
by Daniel P. Berrange 30 Jul '08

30 Jul '08

After frequent prompting from John I've implemented a small test case to validate all the domain XML files we have in the test suite against the defined RNG schema. This showed one minor bug in the schema :-) Daniel diff -r c44225477420 docs/libvirt.rng --- a/docs/libvirt.rng Wed Jul 30 14:20:38 2008 +0100 +++ b/docs/libvirt.rng Wed Jul 30 16:17:19 2008 +0100 @@ -141,6 +141,7 @@ </attribute> <attribute name='machine'> <choice> + <value>xenfv</value> <value>pc</value> <value>isapc</value> </choice> diff -r c44225477420 tests/Makefile.am --- a/tests/Makefile.am Wed Jul 30 14:20:38 2008 +0100 +++ b/tests/Makefile.am Wed Jul 30 16:17:19 2008 +0100 @@ -37,13 +37,14 @@ test-lib.sh \ xmlrpcserver.py \ qemuxml2argvdata \ - nodeinfodata + nodeinfodata \ + domainschematest noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \ nodeinfotest statstest qparamtest -test_scripts = +test_scripts = domainschematest if WITH_LIBVIRTD test_scripts += \ test_conf.sh \ diff -r c44225477420 tests/domainschematest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/domainschematest Wed Jul 30 16:17:19 2008 +0100 @@ -0,0 +1,32 @@ +#!/bin/sh + +test -z "$srcdir" && srcdir=`pwd` + +DOMAINDIRS="qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata" + +n=0 +f=0 +for dir in $DOMAINDIRS +do + XML=`find $dir -name '*.xml'` + + for xml in $XML + do + n=`expr $n + 1` + printf "%4d) %-60s " $n $xml + result=`xmllint --relaxng $srcdir/../docs/libvirt.rng --noout $xml 2>&1` + ret=$? + if test $ret = 0; then + echo "OK" + else + echo "FAILED" + echo $result + f=`expr $f + 1` + fi + done +done +echo "Validated $n files, $f failed" + +ret=0 +test $f != 0 && ret=255 +exit $ret -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1