- Devel - libvirt List Archives

[libvirt] [PATCH] Whitespace cleanup for pre-tags on the website
by Matthias Bolte 16 Nov '09

16 Nov '09

--- docs/drvlxc.html.in | 80 +++++++++--------- docs/drvone.html.in | 89 +++++++++++---------- docs/drvopenvz.html.in | 22 +++--- docs/drvqemu.html.in | 48 ++++++------ docs/drvtest.html.in | 16 ++-- docs/drvuml.html.in | 22 +++--- docs/drvvbox.html.in | 194 ++++++++++++++++++++++----------------------- docs/drvxen.html.in | 22 +++--- docs/formatdomain.html.in | 3 +- docs/storage.html.in | 18 ++--- 10 files changed, 253 insertions(+), 261 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index f67b7d0..cfcfdab 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -13,24 +13,24 @@ start it using <p></p> <pre> <domain type='lxc'> - <name>vm1</name> - <memory>500000</memory> - <os> - <type>exe</type> - <init>/bin/sh</init> - </os> - <vcpu>1</vcpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/libexec/libvirt_lxc</emulator> - <interface type='network'> - <source network='default'/> - </interface> - <console type='pty' /> - </devices> + <name>vm1</name> + <memory>500000</memory> + <os> + <type>exe</type> + <init>/bin/sh</init> + </os> + <vcpu>1</vcpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <interface type='network'> + <source network='default'/> + </interface> + <console type='pty' /> + </devices> </domain> </pre> @@ -42,28 +42,28 @@ debootstrap, whatever) under /opt/vm-1-root: <p></p> <pre> <domain type='lxc'> - <name>vm1</name> - <memory>32768</memory> - <os> - <type>exe</type> - <init>/init</init> - </os> - <vcpu>1</vcpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/libexec/libvirt_lxc</emulator> - <filesystem type='mount'> - <source dir='/opt/vm-1-root'/> - <target dir='/'/> - </filesystem> - <interface type='network'> - <source network='default'/> - </interface> - <console type='pty' /> - </devices> + <name>vm1</name> + <memory>32768</memory> + <os> + <type>exe</type> + <init>/init</init> + </os> + <vcpu>1</vcpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount'> + <source dir='/opt/vm-1-root'/> + <target dir='/'/> + </filesystem> + <interface type='network'> + <source network='default'/> + </interface> + <console type='pty' /> + </devices> </domain> </pre> diff --git a/docs/drvone.html.in b/docs/drvone.html.in index 1745be1..036c0c7 100644 --- a/docs/drvone.html.in +++ b/docs/drvone.html.in @@ -27,12 +27,13 @@ tools and VM description files.</p> <p>The Uri of the driver protocol is "one". Some example connection Uris for the driver are: </p> -<pre> one:/// (local access) - one+unix:/// (local access) - one://example.com/ (remote access) - one+tcp://example.com/ (remote access, SASl/Kerberos) - one+ssh://user@example.com/ (remote access, SSH tunnelled) - </pre> +<pre> +one:/// (local access) +one+unix:/// (local access) +one://example.com/ (remote access) +one+tcp://example.com/ (remote access, SASl/Kerberos) +one+ssh://user@example.com/ (remote access, SSH tunnelled) +</pre> <h2> <a name="xmlconfig"></a>Example domain XML config</h2> <p>There are some limitations on the XML attributes that may be @@ -42,51 +43,51 @@ driver:</p> <h3>Paravirtualized guest direct kernel boot </h3> -<pre> <domain type='one'> - <name>vm01</name> - <memory>32768</memory> - <vcpu>1</vcpu> +<pre> +<domain type='one'> + <name>vm01</name> + <memory>32768</memory> + <vcpu>1</vcpu> - <os> - <type>linux</type> - <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> - <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> - <cmdline></cmdline> - <root>sda1</root> - </os> + <os> + <type>linux</type> + <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> + <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> + <cmdline></cmdline> + <root>sda1</root> + </os> - <devices> + <devices> + <disk type='file' device='disk'> + <source file='/images/sgehosts/01/disk.img'/> + <target dev='sda1'/> + </disk> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/disk.img'/> - <target dev='sda1'/> - </disk> + <disk type='file' device='disk'> + <source file='/images/sgehosts/01/swap.img'/> + <target dev='sda2'/> + </disk> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/swap.img'/> - <target dev='sda2'/> - </disk> + <disk type='file' device='cdrom'> + <source file='/images/iso/cdrom.iso'/> + <target dev='hdc'/> + <readonly/> + </disk> - <disk type='file' device='cdrom'> - <source file='/images/iso/cdrom.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> +  + <interface type='bridge'> + <source bridge='eth0'/> + <mac address='00:16:3e:5d:c7:9e'/> + </interface> -  - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - </interface> - -  - <interface type='network'> - <source network='onenetwork'/> - </interface> - </devices> - </domain> - </pre> +  + <interface type='network'> + <source network='onenetwork'/> + </interface> + </devices> +</domain> +</pre> <p> <b>Note:</b> The "<interface type='network'>" will attach the interface to a previously configured network (named diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index b2beadb..e446b1a 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -19,13 +19,13 @@ the libvirt driver are: </p> - <pre> - openvz:///system (local access) - openvz+unix:///system (local access) - openvz://example.com/system (remote access, TLS/x509) - openvz+tcp://example.com/system (remote access, SASl/Kerberos) - openvz+ssh://root@example.com/system (remote access, SSH tunnelled) - </pre> +<pre> +openvz:///system (local access) +openvz+unix:///system (local access) +openvz://example.com/system (remote access, TLS/x509) +openvz+tcp://example.com/system (remote access, SASl/Kerberos) +openvz+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> <h2>Notes on bridged networking</h2> @@ -60,10 +60,10 @@ must be created containing </p> - <pre> +<pre> #!/bin/bash EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" - </pre> +</pre> <p> The host OS is now ready to allow bridging of guest containers, which @@ -83,7 +83,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" matches the templates known to OpenVZ tools. </p> - <pre> +<pre> <domain type='openvz' id='104'> <name>104</name> <uuid>86c12009-e591-a159-6e9f-91d18b85ef78</uuid> @@ -104,7 +104,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" </interface> </devices> </domain> - </pre> +</pre> </body> </html> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 996ed3e..c5c826c 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -43,16 +43,16 @@ is "qemu". Some example conection URIs for the libvirt driver are: </p> - <pre> - qemu:///session (local access to per-user instance) - qemu+unix:///session (local access to per-user instance) - - qemu:///system (local access to system instance) - qemu+unix:///system (local access to system instance) - qemu://example.com/system (remote access, TLS/x509) - qemu+tcp://example.com/system (remote access, SASl/Kerberos) - qemu+ssh://root@example.com/system (remote access, SSH tunnelled) - </pre> +<pre> +qemu:///session (local access to per-user instance) +qemu+unix:///session (local access to per-user instance) + +qemu:///system (local access to system instance) +qemu+unix:///system (local access to system instance) +qemu://example.com/system (remote access, TLS/x509) +qemu+tcp://example.com/system (remote access, SASl/Kerberos) +qemu+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> <h2><a name="security">Driver security architecture</a></h2> @@ -167,7 +167,7 @@ parent directories </p> <pre> - chmod o+x /path/to/directory +chmod o+x /path/to/directory </pre> <p> In particular note that if using the "system" instance @@ -383,12 +383,12 @@ The list of shared devices a guest is allowed access to is </p> - <pre> - /dev/null, /dev/full, /dev/zero, - /dev/random, /dev/urandom, - /dev/ptmx, /dev/kvm, /dev/kqemu, - /dev/rtc, /dev/hpet, /dev/net/tun - </pre> +<pre> +/dev/null, /dev/full, /dev/zero, +/dev/random, /dev/urandom, +/dev/ptmx, /dev/kvm, /dev/kqemu, +/dev/rtc, /dev/hpet, /dev/net/tun +</pre> <p> In the event of unanticipated needs arising, this can be customized @@ -397,10 +397,10 @@ should be run as root, prior to starting libvirtd </p> - <pre> - mkdir /dev/cgroup - mount -t cgroup none /dev/cgroup -o devices - </pre> +<pre> +mkdir /dev/cgroup +mount -t cgroup none /dev/cgroup -o devices +</pre> <p> libvirt will then place each virtual machine in a cgroup at @@ -430,6 +430,7 @@ LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 \ /dev/HostVG/QEMUGuest1 -net none -serial none \ -parallel none -usb EOF + $ virsh domxml-from-native qemu-argv demo.args <domain type='qemu'> <uuid>00000000-0000-0000-0000-000000000000</uuid> @@ -452,7 +453,7 @@ $ virsh domxml-from-native qemu-argv demo.args </disk> </devices> </domain> - </pre> +</pre> <p>NB, don't include the literral \ in the args, put everything on one line</p> @@ -488,6 +489,7 @@ $ virsh domxml-from-native qemu-argv demo.args </devices> </domain> EOF + $ virsh domxml-to-native qemu-argv demo.xml LC_ALL=C PATH=/usr/bin:/bin HOME=/home/test \ USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ @@ -495,7 +497,7 @@ $ virsh domxml-to-native qemu-argv demo.xml -monitor pty -no-acpi -boot c -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -net none \ -serial none -parallel none -usb - </pre> +</pre> <h2><a name="xmlconfig">Example domain XML config</a></h2> diff --git a/docs/drvtest.html.in b/docs/drvtest.html.in index 0547fbb..b5814c3 100644 --- a/docs/drvtest.html.in +++ b/docs/drvtest.html.in @@ -12,14 +12,14 @@ for the libvirt driver are: </p> - <pre> - test:///default (local access, default config) - test:///path/to/driver/config.xml (local access, custom config) - test+unix:///default (local access, default config, via daemon) - test://example.com/default (remote access, TLS/x509) - test+tcp://example.com/default (remote access, SASl/Kerberos) - test+ssh://root@example.com/default (remote access, SSH tunnelled) - </pre> +<pre> +test:///default (local access, default config) +test:///path/to/driver/config.xml (local access, custom config) +test+unix:///default (local access, default config, via daemon) +test://example.com/default (remote access, TLS/x509) +test+tcp://example.com/default (remote access, SASl/Kerberos) +test+ssh://root@example.com/default (remote access, SSH tunnelled) +</pre> </body> </html> diff --git a/docs/drvuml.html.in b/docs/drvuml.html.in index 25a417f..9e5db95 100644 --- a/docs/drvuml.html.in +++ b/docs/drvuml.html.in @@ -24,16 +24,16 @@ URIs are </p> - <pre> - uml:///session (local access to per-user instance) - uml+unix:///session (local access to per-user instance) +<pre> +uml:///session (local access to per-user instance) +uml+unix:///session (local access to per-user instance) - uml:///system (local access to system instance) - uml+unix:///system (local access to system instance) - uml://example.com/system (remote access, TLS/x509) - uml+tcp://example.com/system (remote access, SASl/Kerberos) - uml+ssh://root@example.com/system (remote access, SSH tunnelled) - </pre> +uml:///system (local access to system instance) +uml+unix:///system (local access to system instance) +uml://example.com/system (remote access, TLS/x509) +uml+tcp://example.com/system (remote access, SASl/Kerberos) +uml+ssh://root@example.com/system (remote access, SSH tunnelled) +</pre> <h2>Example XML configuration</h2> @@ -58,7 +58,7 @@ thus accessible with "virsh console" or equivalent tools </p> - <pre> +<pre> <domain type='uml'> <name>demo</name> <uuid>b4433fc2-a22e-ffb3-0a3d-9c173b395800</uuid> @@ -77,6 +77,6 @@ <console type='pty'/> </devices> </domain> - </pre> +</pre> </body> </html> diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in index 73372f1..ef55757 100644 --- a/docs/drvvbox.html.in +++ b/docs/drvvbox.html.in @@ -13,107 +13,105 @@ The uri of the driver protocol is "vbox". Some example connection URIs for the driver are: </p> - <pre> - vbox:///session (local access to per-user instance) - vbox+unix:///session (local access to per-user instance) - vbox+tcp://user@example.com/session (remote access, SASl/Kerberos) - vbox+ssh://user@example.com/session (remote access, SSH tunnelled) - </pre> +<pre> +vbox:///session (local access to per-user instance) +vbox+unix:///session (local access to per-user instance) +vbox+tcp://user@example.com/session (remote access, SASl/Kerberos) +vbox+ssh://user@example.com/session (remote access, SSH tunnelled) +</pre> <h2><a name="xmlconfig">Example domain XML config</a></h2> - <pre> - <domain type='vbox'> - <name>vbox</name> - <uuid>4dab22b31d52d8f32516782e98ab3fa0</uuid> - - <os> - <type>hvm</type> - <boot dev='cdrom'/> - <boot dev='hd'/> - <boot dev='fd'/> - <boot dev='network'/> - </os> - - <memory>654321</memory> - <vcpu>1</vcpu> - - <features> - <pae/> - <acpi/> - <apic/> - </features> - - <devices> - <disk type='file' device='cdrom'> - <source file='/home/user/Downloads/slax-6.0.9.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> - - <disk type='file' device='disk'> - <source file='/home/user/tmp/vbox.vdi'/> - <target dev='hdd'/> - </disk> - - <disk type='file' device='floppy'> - <source file='/home/user/tmp/WIN98C.IMG'/> - <target dev='fda'/> - </disk> - -  - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - <model type='am79c973'/> - </interface> - -  - <interface type='user'> - <mac address='56:16:3e:5d:c7:9e'/> - <model type='82540eM'/> - </interface> - - <sound model='sb16'/> - - <parallel type='dev'> - <source path='/dev/pts/1'/> - <target port='0'/> - </parallel> - - <parallel type='dev'> - <source path='/dev/pts/2'/> - <target port='1'/> - </parallel> - - <serial type="dev"> - <source path="/dev/ttyS0"/> - <target port="0"/> - </serial> - - <serial type="pipe"> - <source path="/tmp/serial.txt"/> - <target port="1"/> - </serial> - - <hostdev mode='subsystem' type='usb'> - <source> - <vendor id='0x1234'/> - <product id='0xbeef'/> - </source> - </hostdev> - - <hostdev mode='subsystem' type='usb'> - <source> - <vendor id='0x4321'/> - <product id='0xfeeb'/> - </source> - </hostdev> - - </devices> - - </domain> - </pre> +<pre> +<domain type='vbox'> + <name>vbox</name> + <uuid>4dab22b31d52d8f32516782e98ab3fa0</uuid> + + <os> + <type>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <boot dev='fd'/> + <boot dev='network'/> + </os> + + <memory>654321</memory> + <vcpu>1</vcpu> + + <features> + <pae/> + <acpi/> + <apic/> + </features> + + <devices> + <disk type='file' device='cdrom'> + <source file='/home/user/Downloads/slax-6.0.9.iso'/> + <target dev='hdc'/> + <readonly/> + </disk> + + <disk type='file' device='disk'> + <source file='/home/user/tmp/vbox.vdi'/> + <target dev='hdd'/> + </disk> + + <disk type='file' device='floppy'> + <source file='/home/user/tmp/WIN98C.IMG'/> + <target dev='fda'/> + </disk> + +  + <interface type='bridge'> + <source bridge='eth0'/> + <mac address='00:16:3e:5d:c7:9e'/> + <model type='am79c973'/> + </interface> + +  + <interface type='user'> + <mac address='56:16:3e:5d:c7:9e'/> + <model type='82540eM'/> + </interface> + + <sound model='sb16'/> + + <parallel type='dev'> + <source path='/dev/pts/1'/> + <target port='0'/> + </parallel> + + <parallel type='dev'> + <source path='/dev/pts/2'/> + <target port='1'/> + </parallel> + + <serial type="dev"> + <source path="/dev/ttyS0"/> + <target port="0"/> + </serial> + + <serial type="pipe"> + <source path="/tmp/serial.txt"/> + <target port="1"/> + </serial> + + <hostdev mode='subsystem' type='usb'> + <source> + <vendor id='0x1234'/> + <product id='0xbeef'/> + </source> + </hostdev> + + <hostdev mode='subsystem' type='usb'> + <source> + <vendor id='0x4321'/> + <product id='0xfeeb'/> + </source> + </hostdev> + </devices> +</domain> +</pre> </body> </html> diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in index fbad477..a6f0e57 100644 --- a/docs/drvxen.html.in +++ b/docs/drvxen.html.in @@ -54,13 +54,13 @@ the libvirt driver are: </p> - <pre> - xen:/// (local access, direct) - xen+unix:/// (local access, via daemon) - xen://example.com/ (remote access, TLS/x509) - xen+tcp://example.com/ (remote access, SASl/Kerberos) - xen+ssh://root@example.com/ (remote access, SSH tunnelled) - </pre> +<pre> +xen:/// (local access, direct) +xen+unix:/// (local access, via daemon) +xen://example.com/ (remote access, TLS/x509) +xen+tcp://example.com/ (remote access, SASl/Kerberos) +xen+ssh://root@example.com/ (remote access, SSH tunnelled) +</pre> <h2><a name="imex">Import and export of libvirt domain XML configs</a></h2> @@ -114,8 +114,7 @@ <input type='mouse' bus='xen'/> <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> </devices> -</domain> - </pre> +</domain></pre> <h3><a name="xmlexport">Converting from domain XML to XM config files</a></h3> @@ -125,7 +124,7 @@ format. </p> - <pre># virsh -c xen:/// domxml-to-native xen-xm rhel5pv.xml + <pre>$ virsh -c xen:/// domxml-to-native xen-xm rhel5pv.xml name = "rhel5pv" uuid = "8f07fe28-753f-2729-d76d-bdbd892f949a" maxmem = 2500 @@ -143,8 +142,7 @@ vnc = 1 vncunused = 1 vnclisten = "0.0.0.0" disk = [ "tap:aio:/var/lib/xen/images/rhel5pv.img,xvda,w", "tap:qcow:/root/qcow1-xen.img,xvdd,w" ] -vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ] - </pre> +vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]</pre> <h2><a name="xmlconfig">Example domain XML config</a></h2> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 52889af..05047d3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -750,8 +750,7 @@ qemu-kvm -net nic,model=? /dev/null <video type='vga' nvram='8192' heads='1'> <acceleration accel3d='yes' accel3d='yes' /> </video> - ... - </pre> + ...</pre> <dl> <dt><code>video</code></dt> diff --git a/docs/storage.html.in b/docs/storage.html.in index 2d48a59..904fc7c 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -45,8 +45,7 @@ libvirt. <target> <path>/var/lib/virt/images</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -101,8 +100,7 @@ libvirt. <target> <path>/var/lib/virt/images</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -172,8 +170,7 @@ libvirt. <target> <path>/var/lib/virt/images</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -215,8 +212,7 @@ libvirt. <target> <path>/dev/HostVG</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -248,8 +244,7 @@ libvirt. <target> <path>/dev</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> @@ -338,8 +333,7 @@ libvirt. <target> <path>/dev/disk/by-path</path> </target> - </pool> - </pre> + </pool></pre> <h3>Valid pool format types</h3> <p> -- 1.6.0.4

2 1

[libvirt] Re: device type 'interface' cannot be attached
by Ian Woodstock 16 Nov '09

16 Nov '09

----- "Gerry Reno" <greno(a)verizon.net> wrote: > Gerry Reno wrote: > > Gerry Reno wrote: > >> I'm using libvirt 0.6.2 on F11 x86_64 and CPU supports hw > >> virtualization. When I try to do 'virsh attach-interface ...' I get > >> an error that the function is not supported by the hypervisor device > >> type 'interface' cannot be attached. Is this command not supported? > >> Or is there something special I need to do? I found it in the man page. > >> > > > > > > I have a private network declared now, thank you Mark. > > > > And here is how I am trying to attach an interface: > > # cat PRIVBR0.xml > > <network> > > <name>PRIVBR0</name> > > <bridge name='privbr0'/> > > <ip address='172.19.0.1' netmask='255.255.0.0'> > > </ip> > > </network> > > > > # virsh net-list --all > > Name State Autostart > > ----------------------------------------- > > PRIVBR0 active yes > > default active no > > > > # virsh attach-interface CC bridge privbr0 > > error: this function is not supported by the hypervisor: device type > > 'interface' cannot be attached > > > > # grep emulator CC.xml > > <emulator>/usr/bin/qemu-kvm</emulator> > > > > > > I tried the 'attach-interface' both while the domain is running and > > while shutdown. Neither works. > > > > Can anyone see something wrong in what I'm doing here or the reason > > that 'attach-interface' is failing? > > > > -Gerry > > > I have also tried this as 'attach-device' with the same result: > > # cat INTERFACE_PRIVBR0.xml > <interface type='bridge'> > <mac address='00:0c:01:41:50:01'/> > <source bridge='privbr0'/> > </interface> > > # virsh attach-device CC INTERFACE_PRIVBR0.xml > error: Failed to attach device from INTERFACE_PRIVBR0.xml > error: this function is not supported by the hypervisor: device type > 'interface' cannot be attached > > I opened the following bug on this issue: > https://bugzilla.redhat.com/show_bug.cgi?id=537688 > Hot adding nics to qemu was added in libvirt 0.7 > > -Gerry > > -- > Libvir-list mailing list > Libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

2 1

[libvirt] device type 'interface' cannot be attached
by Gerry Reno 16 Nov '09

16 Nov '09

I'm using libvirt 0.6.2 on F11 x86_64 and CPU supports hw virtualization. When I try to do 'virsh attach-interface ...' I get an error that the function is not supported by the hypervisor device type 'interface' cannot be attached. Is this command not supported? Or is there something special I need to do? I found it in the man page. -Gerry

1 2

[libvirt] How to keep VM definitions in sync across hosts?
by Thomas Treutner 16 Nov '09

16 Nov '09

Hi, is there any best-practice how to keep VM definitions in sync across a couple of hosts? Is it reasonable to put /etc/libvirt/qemu/ on a NFS share? Or are there better ways? How does oVirt solve that? I'm asking because I'm currently setting up a four node "cluster" with KVM and libvirt. Previously, with Xen, I used libvirt only for changing currently running VMs (setmem, migrate etc.), but with KVM, I'd like to use libvirt the way it is intented to ;-) So I assume that VM definitions are required to be available and in sync among all nodes for doing live migration. I don't want to rsync them or wrap the virsh URI edit inside a for-loop, as I assume there are better ways? I'd like to do virsh URI edit once and have the changes propagated automagically. kr,tom

2 2

[libvirt] [PATCH] fix detach-disk for inactive xen domains
by Jim Fehlig 16 Nov '09

16 Nov '09

detach-disk was not working for inactive xen domains due to lookup of device ID from xenstore. When detaching disks there is no need to use device id as device name can be used directly. Unfortunately that same is not true for network devices. In fact, AFAICT, there is no way to "hot unplug" a network device from inactive domain using xen tools. I have tested attaching/detaching disks to/from both active and inactive domains. I've also ensured no regressions in attaching/detaching network devices on active domains and attaching network devices on inactive domains. As noted above, detaching network devices from inactive domains does not work, but I'm not sure what we can do about that since xen tools themselves don't support this. Any suggestions are kindly welcomed. Oh, and I also ensured all of these scenarios work with both PV and HVM domains. Regards, Jim

2 1

[libvirt] [PATCH] esx: Add documentation to the website
by Matthias Bolte 16 Nov '09

16 Nov '09

* docs/drivers.html.in: list the ESX driver * docs/drvesx.html.in: the new ESX driver documentation * docs/hvsupport.html.in: add the ESX driver to the matrix * docs/index.html.in, docs/sitemap.html.in: list the ESX driver * src/esx/esx_driver.c: fix and cleanup some comments --- docs/drivers.html.in | 1 + docs/drvesx.html.in | 497 ++++++++++++++++++++++++++++++++++++++++++++++++ docs/hvsupport.html.in | 69 +++++++- docs/index.html.in | 3 + docs/sitemap.html.in | 4 + src/esx/esx_driver.c | 8 +- 6 files changed, 574 insertions(+), 8 deletions(-) create mode 100644 docs/drvesx.html.in diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 983115a..7e31434 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -24,6 +24,7 @@ <li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li> <li><strong><a href="drvvbox.html">VirtualBox</a></strong></li> <li><strong><a href="drvone.html">OpenNebula</a></strong></li> + <li><strong><a href="drvesx.html">VMware ESX</a></strong></li> </ul> </body> </html> diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in new file mode 100644 index 0000000..893c1e2 --- /dev/null +++ b/docs/drvesx.html.in @@ -0,0 +1,497 @@ +<html><body> + <h1>VMware ESX hypervisor driver</h1> + <ul id="toc"></ul> + <p> + The libvirt VMware ESX driver can manage VMware ESX/ESXi 3.5/4.0 and + VMware GSX 2.0, also called VMware Server 2.0, and possibly later + versions. + </p> + + + <h2><a name="prereq">Deployment pre-requisites</a></h2> + <p> + None. Any out-of-the-box installation of ESX/GSX should work. No + preparations are required on the server side, no libvirtd must be + installed on the ESX server. The driver uses version 2.5 of the remote, + SOAP based + <a href="http://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/"> + VMware Virtual Infrastructure API</a> to communicate with the + ESX server, like the VMware Virtual Infrastructure Client does. Since + version 4.0 this API is called + <a href="http://www.vmware.com/support/developer/vc-sdk/visdk400pubs/ReferenceGuide/"> + VMware vSphere API</a>. + </p> + + <h2><a name="uri">Connections to the VMware ESX driver</a></h2> + <p> + Some example remote connection URIs for the driver are: + </p> +<pre> +esx://example.com (ESX over HTTPS) +gsx://example.com (GSX over HTTPS) +esx://example.com/?transport=http (ESX over HTTP) +esx://example.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the server's SSL certificate) +</pre> + + + <h3><a name="uriformat">URI Format</a></h3> + <p> + URIs have this general form ('[...]' marks an optional part). + </p> +<pre> +type://[username@]hostname[:port]/[?extraparameters] +</pre> + <p> + The <code>type://</code> is either <code>esx://</code> or + <code>gsx://</code> and the driver selects the default port depending + on it. For ESX the default HTTPS port is 443, for GSX it is 8333. If + the port parameter is given, it overrides the default port. + </p> + + + <h4>Extra parameters</h4> + <p> + Extra parameters can be added to a URI as part of the query string + (the part following '?'). The driver understands the extra parameters + shown below. + </p> + <table class="top_table"> + <tr> + <th>Name</th> + <th>Values</th> + <th>Meaning</th> + </tr> + <tr> + <td> + <code>transport</code> + </td> + <td> + <code>http</code> or <code>https</code> + </td> + <td> + Overrides the default HTTPS transport. For ESX the default + HTTP port is 80, for GSX it is 8222. + </td> + </tr> + <tr> + <td> + <code>vcenter</code> + </td> + <td> + Hostname of a VMware vCenter + </td> + <td> + In order to perform a migration the driver needs to know the + VMware vCenter for the ESX server. + </td> + </tr> + <tr> + <td> + <code>no_verify</code> + </td> + <td> + <code>0</code> or <code>1</code> + </td> + <td> + If set to 1, this disables libcurl client checks of the server's + SSL certificate. The default value it 0. + </td> + </tr> + </table> + + + <h3><a name="auth">Authentication</a></h3> + <p> + In order to perform any useful operation the driver needs to log into + the ESX server. Therefore, only <code>virConnectOpenAuth</code> can be + used to connect to an ESX server, <code>virConnectOpen</code> and + <code>virConnectOpenReadOnly</code> don't work. + To log into an ESX server or vCenter the driver will request + credentials using the callback passed to the + <code>virConnectOpenAuth</code> function. The driver passes the + hostname as challenge parameter to the callback. This enables the + callback to distinguish between requests for ESX server and vCenter. + </p> + <p> + <strong>Note</strong>: During the ongoing driver development, testing + is done using an unrestricted <code>root</code> account. Problems may + occur if you use a restricted account. Detailed testing with restricted + accounts has not been done yet. + </p> + + + <h2><a name="xmlspecial">Specialties in the domain XML config</a></h2> + <p> + There are several specialties in the domain XML config for ESX domains. + </p> + + <h3>Restrictions</h3> + <p> + There are some restrictions for some values of the domain XML config. + The driver will complain if this restrictions are violated. + </p> + <ul> + <li> + Memory size has to be a multiple of 4096 + </li> + <li> + Number of virtual CPU has to be 1 or a multiple of 2 + </li> + <li> + Valid MAC address prefixes are <code>00:0c:29</code> and + <code>00:50:56</code> + </li> + </ul> + + + <h3>Datastore references</h3> + <p> + Storage is managed in datastores. VMware uses a special path format to + reference files in a datastore. Basically, the datastore name is put + into squared braces in front of the path. + </p> +<pre> +[datastore] directory/filename +</pre> + <p> + To define a new domain the driver converts the domain XML into a + VMware VMX file and uploads it to a datastore known to the ESX server. + Because multiple datastores may be known to an ESX server the driver + needs to decide to which datastores the VMX file should be uploaded. + The driver deduces this information from the path of the source of the + first file-based harddisk listed in the domain XML. + </p> + + + <h3>Available hardware</h3> + <p> + VMware ESX supports different models of SCSI controllers and network + cards. + </p> + + <h4>SCSI controller models</h4> + <dl> + <dt><code>buslogic</code></dt> + <dd> + BusLogic SCSI controller for older guests. + </dd> + <dt><code>lsilogic</code></dt> + <dd> + LSI Logic SCSI controller for recent guests. + </dd> + </dl> + <p> + Here a domain XML snippet: + </p> +<pre> + ... + <disk type='file' device='disk'> + <driver name='<strong>lsilogic</strong>'/> + <source file='[local-storage] Fedora11/Fedora11.vmdk'/> + <target dev='sda' bus='scsi'/> + </disk> + ... +</pre> + + + <h4>Network card models</h4> + <dl> + <dt><code>vlance</code></dt> + <dd> + AMD PCnet32 network card for older guests. + </dd> + <dt><code>vmxnet</code>, <code>vmxnet3</code></dt> + <dd> + Special VMware VMXnet network card, requires VMware tools inside + the guest. + </dd> + <dt><code>e1000</code></dt> + <dd> + Intel E1000 network card for recent guests. + </dd> + </dl> + <p> + Here a domain XML snippet: + </p> +<pre> + ... + <interface type='bridge'> + <mac address='00:50:56:25:48:c7'/> + <source bridge='VM Network'/> + <model type='<strong>e1000</strong>'/> + </interface> + ... +</pre> + + + <h2><a name="importexport">Import and export of domain XML configs</a></h2> + <p> + The ESX driver currently supports a native config format known as + <code>vmware-vmx</code> to handle VMware VMX configs. + </p> + + + <h3><a name="xmlimport">Converting from VMware VMX config to domain XML config</a></h3> + <p> + The <code>virsh domxml-from-native</code> provides a way to convert an + existing VMware VMX config into a domain XML config that can then be + used by libvirt. + </p> +<pre> +$ cat > demo.vmx << EOF +#!/usr/bin/vmware +config.version = "8" +virtualHW.version = "4" +floppy0.present = "false" +nvram = "Fedora11.nvram" +deploymentPlatform = "windows" +virtualHW.productCompatibility = "hosted" +tools.upgrade.policy = "useGlobal" +powerType.powerOff = "default" +powerType.powerOn = "default" +powerType.suspend = "default" +powerType.reset = "default" +displayName = "Fedora11" +extendedConfigFile = "Fedora11.vmxf" +scsi0.present = "true" +scsi0.sharedBus = "none" +scsi0.virtualDev = "lsilogic" +memsize = "1024" +scsi0:0.present = "true" +scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Fedora11/Fedora11.vmdk" +scsi0:0.deviceType = "scsi-hardDisk" +ide0:0.present = "true" +ide0:0.clientDevice = "true" +ide0:0.deviceType = "cdrom-raw" +ide0:0.startConnected = "false" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.addressType = "vpx" +ethernet0.address = "00:50:56:91:48:c7" +chipset.onlineStandby = "false" +guestOSAltName = "Red Hat Enterprise Linux 5 (32-Bit)" +guestOS = "rhel5" +uuid.bios = "50 11 5e 16 9b dc 49 d7-f1 71 53 c4 d7 f9 17 10" +snapshot.action = "keep" +sched.cpu.min = "0" +sched.cpu.units = "mhz" +sched.cpu.shares = "normal" +sched.mem.minsize = "0" +sched.mem.shares = "normal" +toolScripts.afterPowerOn = "true" +toolScripts.afterResume = "true" +toolScripts.beforeSuspend = "true" +toolScripts.beforePowerOff = "true" +scsi0:0.redo = "" +tools.syncTime = "false" +uuid.location = "56 4d b5 06 a2 bd fb eb-ae 86 f7 d8 49 27 d0 c4" +sched.cpu.max = "unlimited" +sched.swap.derivedName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Fedora11/Fedora11-7de040d8.vswp" +tools.remindInstall = "TRUE" +EOF + +$ virsh -c esx://example.com domxml-from-native vmware-vmx demo.vmx +Enter username for example.com [root]: +Enter root password for example.com: +<domain type='vmware'> + <name>Fedora11</name> + <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='lsilogic'/> + <source file='[local-storage] Fedora11/Fedora11.vmdk'/> + <target dev='sda' bus='scsi'/> + </disk> + <interface type='bridge'> + <mac address='00:50:56:91:48:c7'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> +</pre> + + + <h3><a name="xmlexport">Converting from domain XML config to VMware VMX config</a></h3> + <p> + The <code>virsh domxml-to-native</code> provides a way to convert a + domain XML config into a VMware VMX config. + </p> +<pre> +$ cat > demo.xml << EOF +<domain type='vmware'> + <name>Fedora11</name> + <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='lsilogic'/> + <source file='[local-storage] Fedora11/Fedora11.vmdk'/> + <target dev='sda' bus='scsi'/> + </disk> + <interface type='bridge'> + <mac address='00:50:56:25:48:c7'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> +EOF + +$ virsh -c esx://example.com domxml-to-native vmware-vmx demo.xml +Enter username for example.com [root]: +Enter root password for example.com: +config.version = "8" +virtualHW.version = "4" +guestOS = "other-64" +uuid.bios = "50 11 5e 16 9b dc 49 d7-f1 71 53 c4 d7 f9 17 10" +displayName = "Fedora11" +memsize = "1024" +numvcpus = "1" +scsi0.present = "true" +scsi0.virtualDev = "lsilogic" +scsi0:0.present = "true" +scsi0:0.deviceType = "scsi-hardDisk" +scsi0:0.fileName = "/vmfs/volumes/local-storage/Fedora11/Fedora11.vmdk" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:25:48:C7" +</pre> + + + <h2><a name="xmlconfig">Example domain XML configs</a></h2> + + <h3>Fedora11 on x86_64</h3> +<pre> +<domain type='vmware'> + <name>Fedora11</name> + <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + </os> + <devices> + <disk type='file' device='disk'> + <source file='[local-storage] Fedora11/Fedora11.vmdk'/> + <target dev='sda' bus='scsi'/> + </disk> + <interface type='bridge'> + <mac address='00:50:56:25:48:c7'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> +</pre> + + + <h2><a name="migration">Migration</a></h2> + <p> + A migration cannot be initiated on an ESX server directly, a VMware + vCenter is necessary for this. The vCenter hostname has to be passed + to the driver via the <code>vcenter</code> query parameter. + </p> +<pre> +esx://example.com/?vcenter=example-vcenter.com +</pre> + <p> + Here an example how to migrate the domain <code>Fedora11</code> from + ESX server <code>example-src.com</code> to ESX server + <code>example-dst.com</code> involving vCenter + <code>example-vcenter.com</code> using <code>virsh</code>. + </p> +<pre> +$ virsh -c esx://example-src.com/?vcenter=example-vcenter.com migrate Fedora11 esx://example-dst.com/?vcenter=example-vcenter.com +Enter username for example-src.com [root]: +Enter root password for example-src.com: +Enter username for example-vcenter.com [administrator]: +Enter administrator password for example-vcenter.com: +Enter username for example-dst.com [root]: +Enter root password for example-dst.com: +Enter username for example-vcenter.com [administrator]: +Enter administrator password for example-vcenter.com: +</pre> + + + <h2><a name="scheduler">Scheduler configuration</a></h2> + <p> + The driver exposes the ESX CPU scheduler. The parameters listed below + are available to control the scheduler. + </p> + <dl> + <dt><code>reservation</code></dt> + <dd> + The amount of CPU resource in MHz that is guaranteed to be + available to the domain. Valid values are 0 and greater. + </dd> + <dt><code>limit</code></dt> + <dd> + The CPU utilization of the domain will be + limited to this value in MHz, even if more CPU resources are + available. If the limit is set to -1, the CPU utilization of the + domain is unlimited. If the limit is not set to -1, it must be + greater than or equal to the reservation. + </dd> + <dt><code>shares</code></dt> + <dd> + Shares are used to determine relative CPU + allocation between domains. In general, a domain with more shares + gets proportionally more of the CPU resource. Valid values are 0 + and greater. The special values -1, -2 and -3 represent the + predefined shares level <code>low</code>, <code>normal</code> and + <code>high</code>. + </dd> + </dl> + + + <h2><a name="tools">VMware tools</a></h2> + <p> + Some actions require installed VMware tools. If the VMware tools are + not installed in the guest and one of the actions below is to be + performed the ESX server raises an error and the driver reports it. + </p> + <ul> + <li> + <code>virDomainReboot</code> + </li> + <li> + <code>virDomainShutdown</code> + </li> + </ul> + + + <h2><a name="links">Links</a></h2> + <ul> + <li> + <a href="http://www.vmware.com/support/developer/vc-sdk/"> + VMware vSphere Web Services SDK Documentation + </a> + </li> + <li> + <a href="http://www.vmware.com/pdf/esx3_memory.pdf"> + The Role of Memory in VMware ESX Server 3 + </a> + </li> + <li> + <a href="http://www.sanbarrow.com/vmx.html"> + VMware VMX config parameters + </a> + </li> + </ul> +</body></html> diff --git a/docs/hvsupport.html.in b/docs/hvsupport.html.in index 4775561..4cc2634 100644 --- a/docs/hvsupport.html.in +++ b/docs/hvsupport.html.in @@ -23,6 +23,7 @@ updated on <i>2008-06-05</i>. <th><a href="remote.html">Remote</a></th> <th><a href="drvvbox.html">VirtualBox</a></th> <th><a href="drvone.html">ONE</a></th> + <th><a href="drvesx.html">ESX</a></th> </tr> <tr> <td> virConnectClose </td> @@ -33,6 +34,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectGetCapabilities </td> @@ -43,6 +45,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.1 </td> </tr> <tr> <td> virConnectGetHostname </td> @@ -53,6 +56,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectGetMaxVcpus </td> @@ -63,6 +67,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virConnectGetType </td> @@ -73,6 +78,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectGetURI </td> @@ -83,6 +89,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectGetVersion </td> @@ -93,6 +100,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectListDefinedDomains </td> @@ -103,6 +111,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectListDomains </td> @@ -113,6 +122,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectNumOfDefinedDomains </td> @@ -123,6 +133,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectNumOfDomains </td> @@ -133,6 +144,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectOpen </td> @@ -143,6 +155,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> x </td> </tr> <tr> <td> virConnectOpenAuth </td> @@ -153,6 +166,7 @@ updated on <i>2008-06-05</i>. <td> </td> <td> </td> <td> </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virConnectOpenReadOnly </td> @@ -163,6 +177,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainAttachDevice </td> @@ -173,6 +188,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainBlockPeek </td> @@ -183,6 +199,7 @@ updated on <i>2008-06-05</i>. <td> x </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainBlockStats </td> @@ -193,6 +210,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.2 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainCoreDump </td> @@ -203,6 +221,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainCreate </td> @@ -213,6 +232,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainCreateLinux </td> @@ -223,6 +243,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> x </td> </tr> <tr> <td> virDomainDefineXML </td> @@ -233,6 +254,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.2 </td> </tr> <tr> <td> virDomainDestroy </td> @@ -243,6 +265,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainDetachDevice </td> @@ -253,6 +276,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainFree </td> @@ -263,6 +287,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetAutostart </td> @@ -273,11 +298,12 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainGetConnect </td> <td> 0.3.0 </td> - <td colspan="6"> not a HV function </td> + <td colspan="7"> not a HV function </td> </tr> <tr> <td> virDomainGetID </td> @@ -288,6 +314,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetInfo </td> @@ -298,6 +325,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetMaxMemory </td> @@ -308,6 +336,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetMaxVcpus </td> @@ -318,6 +347,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetName </td> @@ -328,6 +358,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetOSType </td> @@ -338,6 +369,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetSchedulerParameters </td> @@ -348,6 +380,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetSchedulerType </td> @@ -358,6 +391,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetUUID </td> @@ -368,6 +402,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetUUIDString </td> @@ -378,6 +413,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainGetVcpus </td> @@ -388,6 +424,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainInterfaceStats </td> @@ -398,6 +435,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.2 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainGetXMLDesc </td> @@ -408,6 +446,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainLookupByID </td> @@ -418,6 +457,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainLookupByName </td> @@ -428,6 +468,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainLookupByUUID </td> @@ -438,6 +479,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainLookupByUUIDString </td> @@ -448,6 +490,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainMigrate </td> @@ -458,6 +501,7 @@ updated on <i>2008-06-05</i>. <td> 0.3.2 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainPinVcpu </td> @@ -468,6 +512,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainReboot </td> @@ -478,6 +523,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainRestore </td> @@ -488,7 +534,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> - + <td> x </td> </tr> <tr> <td> virDomainResume </td> @@ -499,6 +545,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainSave </td> @@ -509,6 +556,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainSetAutostart </td> @@ -519,6 +567,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virDomainSetMaxMemory </td> @@ -528,6 +577,8 @@ updated on <i>2008-06-05</i>. <td> x </td> <td> ≥ 0.3.0 </td> <td> x </td> + <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainSetMemory </td> @@ -538,6 +589,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainSetSchedulerParameters </td> @@ -548,6 +600,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainSetVcpus </td> @@ -558,6 +611,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainShutdown </td> @@ -568,6 +622,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainSuspend </td> @@ -578,6 +633,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virDomainUndefine </td> @@ -588,17 +644,18 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> ≥ 0.6.4 </td> + <td> ≥ 0.7.1 </td> </tr> <tr> <td> virGetVersion </td> <td> All </td> <td> All </td> - <td colspan="5"> Returns -1 if HV unsupported. </td> + <td colspan="6"> Returns -1 if HV unsupported. </td> </tr> <tr> <td> virInitialize </td> <td> 0.1.0 </td> - <td colspan="6"> not a HV function </td> + <td colspan="7"> not a HV function </td> </tr> <tr> <td> virDomainMemoryPeek </td> @@ -609,6 +666,7 @@ updated on <i>2008-06-05</i>. <td> x </td> <td> x </td> <td> x </td> + <td> x </td> </tr> <tr> <td> virNodeGetInfo </td> @@ -619,6 +677,7 @@ updated on <i>2008-06-05</i>. <td> ≥ 0.3.0 </td> <td> ≥ 0.6.3 </td> <td> x </td> + <td> ≥ 0.7.0 </td> </tr> <tr> <td> virNodeGetFreeMemory </td> @@ -629,6 +688,7 @@ updated on <i>2008-06-05</i>. <td> x </td> <td> x </td> <td> x </td> + <td> ≥ 0.7.2 </td> </tr> <tr> <td> virNodeGetCellsFreeMemory </td> @@ -639,6 +699,7 @@ updated on <i>2008-06-05</i>. <td> x </td> <td> x </td> <td> x </td> + <td> x </td> </tr> </table> <h3>Network functions</h3> diff --git a/docs/index.html.in b/docs/index.html.in index efb7e8a..57ea84e 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -56,6 +56,9 @@ The <a href="http://www.virtualbox.org/">VirtualBox</a> hypervisor </li> <li> + The <a href="http://www.vmware.com/">VMware ESX and GSX</a> hypervisors + </li> + <li> Storage on IDE/SCSI/USB disks, FibreChannel, LVM, iSCSI, NFS and filesystems </li> </ul> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index a999da4..424897f 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -160,6 +160,10 @@ <a href="drvone.html">OpenNebula</a> <span>Driver for OpenNebula</span> </li> + <li> + <a href="drvesx.html">VMware ESX</a> + <span>Driver for VMware ESX</span> + </li> </ul> </li> <li> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fe75aa3..b84250c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -247,7 +247,7 @@ esxCapsInit(virConnectPtr conn) * If no port is specified the default port is set dependent on the scheme and * transport parameter: * - esx+http 80 - * - esx+https 433 + * - esx+https 443 * - gsx+http 8222 * - gsx+https 8333 * @@ -2791,13 +2791,13 @@ esxDomainUndefine(virDomainPtr domain) * * - reservation (VIR_DOMAIN_SCHED_FIELD_LLONG >= 0, in megaherz) * - * Amount of CPU resource that is guaranteed available to the domain. + * The amount of CPU resource that is guaranteed to be available to the domain. * * * - limit (VIR_DOMAIN_SCHED_FIELD_LLONG >= 0, or -1, in megaherz) * - * The CPU utilization of the domain will not exceed this limit, even if - * there are available CPU resources. If the limit is set to -1, the CPU + * The CPU utilization of the domain will be limited to this value, even if + * more CPU resources are available. If the limit is set to -1, the CPU * utilization of the domain is unlimited. If the limit is not set to -1, it * must be greater than or equal to the reservation. * -- 1.6.0.4

2 2

[libvirt] [PATCH] esx: Fix CPU clock Hz to MHz conversion
by Matthias Bolte 16 Nov '09

16 Nov '09

--- src/esx/esx_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b84250c..5737fe9 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -878,7 +878,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) nodeinfo->memory = memorySize / 1024; /* Scale from bytes to kilobytes */ nodeinfo->cpus = cpuInfo_numCpuCores; - nodeinfo->mhz = cpuInfo_hz / (1024 * 1024); /* Scale from hz to mhz */ + nodeinfo->mhz = cpuInfo_hz / (1000 * 1000); /* Scale from hz to mhz */ nodeinfo->nodes = numaInfo_numNodes; nodeinfo->sockets = cpuInfo_numCpuPackages; nodeinfo->cores = cpuInfo_numCpuPackages > 0 -- 1.6.0.4

2 2

[libvirt] [PATCH] esx: Fix memory leak in esxVI_HostCpuIdInfo_Free()
by Matthias Bolte 15 Nov '09

15 Nov '09

--- src/esx/esx_vi_types.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 73d3069..9af9f73 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1496,6 +1496,7 @@ ESX_VI__TEMPLATE__FREE(HostCpuIdInfo, { esxVI_HostCpuIdInfo_Free(&item->_next); + esxVI_Int_Free(&item->level); VIR_FREE(item->vendor); VIR_FREE(item->eax); VIR_FREE(item->ebx); -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Fix MAC address formatting
by Matthias Bolte 15 Nov '09

15 Nov '09

VMware uses two MAC address prefixes: 00:0c:29 and 00:50:56. The 00:0c:29 prefix is used for ESX server generated addresses. The 00:50:56 prefix is split into two parts. MAC addresses above 00:50:56:3f:ff:ff are generated by a vCenter. The rest of the 00:50:56 prefix can be assigned manually. Any MAC address within the 00:0c:29 and 00:50:56 prefix can be specified in a domain XML config and the driver will handle the details internally. * src/esx/esx_vmx.c: fix MAC address formatting * tests/xml2vmxdata/*: update test files accordingly --- src/esx/esx_vmx.c | 21 ++++++++++++++++++--- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx | 4 ++-- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx | 2 ++ tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx | 1 + 12 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 97ad43e..9a9fe0a 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -277,8 +277,10 @@ def->nets[0]... ethernet0.addressType = "vpx" # default to "generated" ->mac = <value> <=> ethernet0.generatedAddress = "<value>" - # 00:0c:29 prefix for autogenerated mac's + # 00:0c:29 prefix for autogenerated mac's -> ethernet0.addressType = "generated" # 00:50:56 prefix for manual configured mac's + # 00:50:56:00:00:00 - 00:50:56:3f:ff:ff -> ethernet0.addressType = "static" + # 00:50:56:40:00:00 - 00:50:56:ff:ff:ff -> ethernet0.addressType = "vpx" # 00:05:69 old prefix from esx 1.5 @@ -2687,12 +2689,25 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, virFormatMacAddr(def->mac, mac_string); - if ((def->mac[0] == 0x00 && def->mac[1] == 0x0c && def->mac[2] == 0x29) || - (def->mac[0] == 0x00 && def->mac[1] == 0x50 && def->mac[2] == 0x56)) { + if (def->mac[0] == 0x00 && def->mac[1] == 0x0c && def->mac[2] == 0x29) { virBufferVSprintf(buffer, "ethernet%d.addressType = \"generated\"\n", controller); virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", controller, mac_string); + virBufferVSprintf(buffer, "ethernet%d.generatedAddressOffset = \"0\"\n", + controller); + } else if (def->mac[0] == 0x00 && def->mac[1] == 0x50 && def->mac[2] == 0x56) { + if (def->mac[3] <= 0x3f) { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + } else { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", + controller, mac_string); + } } else { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Unsupported MAC address prefix '%02X:%02X:%02X', expecting " diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx index ea14588..077d907 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx @@ -13,5 +13,5 @@ scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/Fedora11/F ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" +ethernet0.addressType = "vpx" ethernet0.generatedAddress = "00:50:56:91:48:C7" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx index 05e3d46..f507548 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx @@ -36,3 +36,4 @@ ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:3C:98:3E" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx index d418475..10559fb 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx @@ -22,3 +22,4 @@ ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:F5:C3:0C" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx index 68f6d6d..068f0f8 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx @@ -13,12 +13,12 @@ scsi0:0.fileName = "/vmfs/volumes/498076b2-02796c1a-ef5b-000ae484a6a3/virtMonSer ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" +ethernet0.addressType = "vpx" ethernet0.generatedAddress = "00:50:56:91:66:D4" ethernet1.present = "true" ethernet1.networkName = "VM Switch 2" ethernet1.connectionType = "bridged" -ethernet1.addressType = "generated" +ethernet1.addressType = "vpx" ethernet1.generatedAddress = "00:50:56:91:0C:51" serial0.present = "true" serial0.fileType = "file" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx index 73ca8a8..7d9c6f7 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx @@ -8,5 +8,5 @@ numvcpus = "1" ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" -ethernet0.generatedAddress = "00:50:56:11:22:33" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx index cc42140..fb4b116 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx @@ -9,5 +9,5 @@ ethernet0.present = "true" ethernet0.networkName = "VM Network" ethernet0.connectionType = "custom" ethernet0.vnet = "vmnet7" -ethernet0.addressType = "generated" -ethernet0.generatedAddress = "00:50:56:11:22:33" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx index dd2c86d..3aed46c 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx @@ -9,5 +9,5 @@ ethernet0.present = "true" ethernet0.virtualDev = "e1000" ethernet0.networkName = "VM Network" ethernet0.connectionType = "bridged" -ethernet0.addressType = "generated" -ethernet0.generatedAddress = "00:50:56:11:22:33" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx index 8b2d6a4..526fe3c 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx @@ -14,3 +14,4 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet1" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:D6:2B:D3" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx index d811b7f..34f006d 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx @@ -14,3 +14,4 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet1" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:D6:CB:A4" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx index 7109fb9..a2a3575 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx @@ -14,9 +14,11 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet1" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:C4:BE:5A" +ethernet0.generatedAddressOffset = "0" ethernet1.present = "true" ethernet1.networkName = "net2" ethernet1.connectionType = "custom" ethernet1.vnet = "/dev/vmnet2" ethernet1.addressType = "generated" ethernet1.generatedAddress = "00:0C:29:C4:BE:64" +ethernet1.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx index ee9b8c9..765d35c 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx @@ -14,3 +14,4 @@ ethernet0.connectionType = "custom" ethernet0.vnet = "/dev/vmnet2" ethernet0.addressType = "generated" ethernet0.generatedAddress = "00:0C:29:C5:E3:5D" +ethernet0.generatedAddressOffset = "0" -- 1.6.0.4

2 1

[libvirt] [PATCH] Change DTD references to use public instead of system identifier
by Matthias Bolte 15 Nov '09

15 Nov '09

Debian's /etc/xml/catalog doesn't contain system identifiers, so use public identifiers instead. * docs/Makefile.am: use public instead of system identifier * docs/site.xsl: use matching public identifier --- docs/Makefile.am | 6 +++--- docs/site.xsl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index d819869..d53f305 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -106,7 +106,7 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl %.html: %.html.tmp @(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ - if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \ + if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating $@" ; \ $(XMLLINT) --nonet --format --valid $< > $@ || : ; \ else echo "missing XHTML1 DTD" ; fi ; fi ); @@ -117,7 +117,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in echo "Rebuilding the HTML pages from the XML API" ; \ $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi ) -@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ - if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \ + if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ $(XMLLINT) --nonet --valid --noout html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi ); @@ -159,4 +159,4 @@ uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done \ No newline at end of file + rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done diff --git a/docs/site.xsl b/docs/site.xsl index b2983bd..86cfd41 100644 --- a/docs/site.xsl +++ b/docs/site.xsl @@ -11,7 +11,7 @@ method="xml" encoding="ISO-8859-1" indent="yes" - doctype-public="-//W3C//DTD XHTML 1.0//EN" + doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/> <xsl:variable name="href_base" select="''"/> -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Handle 'vmxnet3' in esxVMX_FormatEthernet()
by Matthias Bolte 15 Nov '09

15 Nov '09

In commit 3c80fac2588cbc9e5ee7e7069e1ca4468f2359d3 'vmxnet3' handling was added to esxVMX_ParseEthernet(), but not to the inverse function esxVMX_FormatEthernet(). --- src/esx/esx_vmx.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 536bf2d..97ad43e 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -1758,7 +1758,8 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller, STRCASENEQ(virtualDev, "e1000")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, virtualDev); + "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, + virtualDev); goto failure; } @@ -2646,11 +2647,12 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, if (def->model != NULL) { if (STRCASENEQ(def->model, "vlance") && STRCASENEQ(def->model, "vmxnet") && + STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Expecting domain XML entry 'devices/interfase/model' " - "to be 'vlance' or 'vmxnet' or 'e1000' but found '%s'", - def->model); + "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' but " + "found '%s'", def->model); return -1; } -- 1.6.0.4

2 1

[libvirt] [PATCH] Fix compilation of libvirt against xen-unstable
by Jim Fehlig 15 Nov '09

15 Nov '09

libvirt fails to compile against current xen-unstable. This patch fixes it. Regards, Jim

2 1

[libvirt] make install fails, missing HTML files
by Thomas Treutner 14 Nov '09

14 Nov '09

Hi, I'm not sure if this is a bug or if I'm missing some tools: When doing a fresh git clone && ./autogen.sh, make install fails because it complains about some missing HTML doc files. # ./autogen.sh ...... configure: Libraries configure: configure: libxml: -I/usr/include/libxml2 -lxml2 configure: libcurl: no configure: libssh2: no configure: gnutls: -lgnutls -lpthread configure: sasl: -lsasl2 configure: avahi: no configure: polkit: no configure: selinux: no configure: apparmor: no configure: numactl: no configure: capng: no configure: xen: -lxenstore configure: hal: no configure: devkit: no configure: netcf: no configure: xmlrpc: no ....... # make ......... make[3]: Leaving directory `/root/tmp/libvirt/docs' (./apibuild.py) missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD missing XHTML1 DTD ..... (lots more) # ll docs/*html | wc -l 8 # ll docs/*html.in | wc -l 51 Could someone please cross-check? thx,kr tom

4 13

[libvirt] Entering freeze for 0.7.3
by Daniel Veillard 14 Nov '09

14 Nov '09

I think that all expected feature patches have been pushed to git head so it's time to enter feature freeze, and just do cleanup and bug fixing patches until next friday. So the plan is to get 0.7.3 out on the 20th and we then have one month before the end of year holliday season to push the following release (probably 0.7.4 as I don't see a major feature landing in next month, but we never know). so let's focuse on debug for the coming week ! happy hacking :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 1/2] Fix cleanup when state driver init fails
by Daniel P. Berrange 14 Nov '09

14 Nov '09

* daemon/libvirtd.c: Fix incorrect goto label causing cleanup to be missed when state driver init fails --- daemon/libvirtd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ef07460..1caa4ce 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -3153,7 +3153,7 @@ int main(int argc, char **argv) { * seriously delay OS bootup process */ if (virStateInitialize(server->privileged) < 0) { VIR_ERROR0("Driver state initialization failed"); - goto error; + goto shutdown; } /* Start accepting new clients from network */ -- 1.6.2.5

3 6

[libvirt] [PATCH 1/2] Fix guestfwdTarget indentation in domain.rng
by Matthew Booth 14 Nov '09

14 Nov '09

* docs/schemas/domain.rng: Fix up some 4 space indentation --- docs/schemas/domain.rng | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index b75f17e..1bf44fd 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1052,11 +1052,11 @@ </define> <define name="guestfwdTarget"> <element name="target"> - <attribute name="type"> - <value>guestfwd</value> - </attribute> - <attribute name="address"/> - <attribute name="port"/> + <attribute name="type"> + <value>guestfwd</value> + </attribute> + <attribute name="address"/> + <attribute name="port"/> </element> </define> <define name="channel"> -- 1.6.2.5

2 2

[libvirt] [PATCH 1/2] Remove obsolte devicekit checks
by Daniel P. Berrange 14 Nov '09

14 Nov '09

Device kit support was removed, but the configure.ac checks were left in place. A number of the XXX_REQUIRED=X.Y.Z variables were not declared in the correct location (ie top of the file) * configure.in: Remove device kit checks & move mis-placed variables to correct location --- configure.in | 66 +++++---------------------------------------------------- 1 files changed, 6 insertions(+), 60 deletions(-) diff --git a/configure.in b/configure.in index df8eba2..1c705b2 100644 --- a/configure.in +++ b/configure.in @@ -34,6 +34,12 @@ AVAHI_REQUIRED="0.6.0" POLKIT_REQUIRED="0.6" PARTED_REQUIRED="1.8.0" NETCF_REQUIRED="0.1.3" +UDEV_REQUIRED=145 +PCIACCESS_REQUIRED=0.10.0 +XMLRPC_REQUIRED=1.14.0 +HAL_REQUIRED=0.5.0 +DEVMAPPER_REQUIRED=1.0.0 +LIBCURL_REQUIRED="7.18.0" dnl Checks for C compiler. AC_PROG_CC @@ -472,8 +478,6 @@ PKG_PROG_PKG_CONFIG dnl OpenNebula driver Compilation setting dnl -XMLRPC_REQUIRED=1.14.0 - XMLRPC_CFLAGS= XMLRPC_LIBS= if test "x$with_one" = "xyes" -o "x$with_one" = "xcheck"; then @@ -1304,7 +1308,6 @@ fi AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"]) if test "$with_storage_mpath" = "yes"; then - DEVMAPPER_REQUIRED=0.0 DEVMAPPER_CFLAGS= DEVMAPPER_LIBS= PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= $DEVMAPPER_REQUIRED], [], [DEVMAPPER_FOUND=no]) @@ -1379,7 +1382,6 @@ dnl LIBCURL_CFLAGS="" LIBCURL_LIBS="" -LIBCURL_REQUIRED="7.18.0" LIBCURL_FOUND="no" if test "$with_esx" = "yes" -o "$with_esx" = "check"; then @@ -1655,7 +1657,6 @@ LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) dnl HAL, DeviceKit, or libudev library for host device enumeration -HAL_REQUIRED=0.0 HAL_CFLAGS= HAL_LIBS= AC_ARG_WITH([hal], @@ -1694,61 +1695,7 @@ AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AC_SUBST([HAL_CFLAGS]) AC_SUBST([HAL_LIBS]) -DEVKIT_REQUIRED=0.0 -DEVKIT_CFLAGS= -DEVKIT_LIBS= -AC_ARG_WITH([devkit], - [ --with-devkit use DeviceKit for host device enumeration], - [], - [with_devkit=no]) -if test "$with_libvirtd" = "no" ; then - with_devkit=no -fi - -dnl Extra check needed while devkit pkg-config info missing glib2 dependency -PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 0.0,,[ - if test "x$with_devkit" = "xcheck"; then - with_devkit=no - elif test "x$with_devkit" = "xyes"; then - AC_MSG_ERROR([required package DeviceKit requires package glib-2.0]) - fi]) - -if test "x$with_devkit" = "xyes" -o "x$with_devkit" = "xcheck"; then - PKG_CHECK_MODULES(DEVKIT, devkit-gobject >= $DEVKIT_REQUIRED, - [with_devkit=yes], [ - if test "x$with_devkit" = "xcheck" ; then - with_devkit=no - else - AC_MSG_ERROR( - [You must install DeviceKit-devel >= $DEVKIT_REQUIRED to compile libvirt]) - fi - ]) - if test "x$with_devkit" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_DEVKIT], 1, - [use DeviceKit for host device enumeration]) - - dnl Add glib2 flags explicitly while devkit pkg-config info missing glib2 dependency - DEVKIT_CFLAGS="$GLIB2_CFLAGS $DEVKIT_CFLAGS" - DEVKIT_LIBS="$GLIB2_LIBS $DEVKIT_LIBS" - - dnl Add more flags apparently required for devkit to work properly - DEVKIT_CFLAGS="$DEVKIT_CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" - - old_CFLAGS=$CFLAGS - old_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $DEVKIT_CFLAGS" - LDFLAGS="$LDFLAGS $DEVKIT_LIBS" - AC_CHECK_FUNCS([devkit_client_connect],,[with_devkit=no]) - CFLAGS="$old_CFLAGS" - LDFLAGS="$old_LDFLAGS" - fi -fi -AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) -AC_SUBST([DEVKIT_CFLAGS]) -AC_SUBST([DEVKIT_LIBS]) - -UDEV_REQUIRED=145 UDEV_CFLAGS= UDEV_LIBS= AC_ARG_WITH([udev], @@ -1781,7 +1728,6 @@ if test "x$with_udev" = "xyes" -o "x$with_udev" = "xcheck"; then CFLAGS="$old_CFLAGS" LDFLAGS="$old_LDFLAGS" fi - PCIACCESS_REQUIRED=0.10.0 PCIACCESS_CFLAGS= PCIACCESS_LIBS= PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= $PCIACCESS_REQUIRED], [], [PCIACCESS_FOUND=no]) -- 1.6.2.5

2 3

[libvirt] [PATCH 0/4] AppArmor updates
by Jamie Strandboge 14 Nov '09

14 Nov '09

Hi, The following patchset contains various cleanups for the AppArmor driver. It assumes that the patch contained in the email with the following subject is already applied: [libvirt] [PATCH] fix virt-aa-helper failure when host arch and os.type arch are different This patch was ACKed but never applied. When committing that patch, please also chmod 755 ./tests/virt-aa-helper-test. 1_aa_profile_updates.patch: Adds pulseaudio, alsa and preliminary save/restore to the example apparmor abstraction. Also allows libvirtd access to inet dgram, inet6 dgram, inet6 stream and /usr/lib/libvirt/*. 2_aa_require_absolute_path.patch: Require absolute path for dynamic added files. This is required by AppArmor and conveniently prevents adding tcp consoles to the profile. This fixes https://launchpad.net/bugs/460271. 3_aa_deny_write_to_readonly.patch: Suppress confusing and misleading apparmor denied message when kvm/qemu tries to open a libvirt specified readonly file (such as a cdrom) with write permissions. libvirt uses the readonly attribute for the security driver only, and has no way of telling kvm/qemu that the device should be opened readonly. This fixes https://launchpad.net/bugs/453335. 4_aa_driver_cleanups.patch: Implements all changes requested by DV except for getting rid of readlink(). I can't use virFileResolveLink() because it lstat()s the file and uses st.st_size to create a buffer. Unfortunately, running lstat() on /proc/self/exe results in st.st_size to be 0. The changes pass 'syntax-check'. secaatest and virt-aa-helper-test both pass (there are several problems in the test suite causing 'make check' to fail. These are all unrelated to these patches). Jamie -- Jamie Strandboge | http://www.canonical.com

2 5

[libvirt] [PATCH] Fix incorrect reference counting logic in qemu monitor open
by Daniel P. Berrange 13 Nov '09

13 Nov '09

The QEMU monitor open method would not take a reference on the virDomainObjPtr until it had successfully opened the monitor. The cleanup code upon failure to open though would call qemuMonitorClose() which would in turn decrement the reference count. This caused the virDoaminObjPtr to be mistakenly freed and then the whole driver crashes * src/qemu/qemu_monitor.c: Fix reference counting in qemuMonitorOpen --- src/qemu/qemu_monitor.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2357734..f0ef81b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -456,6 +456,7 @@ qemuMonitorOpen(virDomainObjPtr vm, mon->vm = vm; mon->eofCB = eofCB; qemuMonitorLock(mon); + virDomainObjRef(vm); switch (vm->monitor_chr->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -499,8 +500,6 @@ qemuMonitorOpen(virDomainObjPtr vm, goto cleanup; } - virDomainObjRef(vm); - VIR_DEBUG("New mon %p fd =%d watch=%d", mon, mon->fd, mon->watch); qemuMonitorUnlock(mon); -- 1.6.2.5

2 1

[libvirt] [PATCH 1/5] Fix formatting of XML for an inactive guest
by Daniel P. Berrange 13 Nov '09

13 Nov '09

If the virDomainDefPtr object has an 'id' of -1, then forcably set the VIR_DOMAIN_XML_INACTIVE flag to ensure generated XML does not include any cruft from the previously running guest such as console PTY path, or VNC port. * src/conf/domain_conf.c: Set VIR_DOMAIN_XML_INACTIVE if def->id is -1. Replace checks for def->id == -1 with check against flags & VIR_DOMAIN_XML_INACTIVE. --- src/conf/domain_conf.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9e37452..c2c07ca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4407,7 +4407,6 @@ virDomainInputDefFormat(virConnectPtr conn, static int virDomainGraphicsDefFormat(virConnectPtr conn, virBufferPtr buf, - virDomainDefPtr vm, virDomainGraphicsDefPtr def, int flags) { @@ -4424,7 +4423,7 @@ virDomainGraphicsDefFormat(virConnectPtr conn, switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (def->data.vnc.port && - (!def->data.vnc.autoport || vm->id != -1)) + (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_XML_INACTIVE))) virBufferVSprintf(buf, " port='%d'", def->data.vnc.port); else if (def->data.vnc.autoport) @@ -4579,7 +4578,10 @@ char *virDomainDefFormat(virConnectPtr conn, goto cleanup; } - if (def->id >= 0) + if (def->id == -1) + flags |= VIR_DOMAIN_XML_INACTIVE; + + if (!(flags & VIR_DOMAIN_XML_INACTIVE)) virBufferVSprintf(&buf, "<domain type='%s' id='%d'>\n", type, def->id); else virBufferVSprintf(&buf, "<domain type='%s'>\n", type); @@ -4770,7 +4772,7 @@ char *virDomainDefFormat(virConnectPtr conn, goto cleanup; for (n = 0 ; n < def->ngraphics ; n++) - if (virDomainGraphicsDefFormat(conn, &buf, def, def->graphics[n], flags) < 0) + if (virDomainGraphicsDefFormat(conn, &buf, def->graphics[n], flags) < 0) goto cleanup; } -- 1.6.2.5

3 11

[libvirt] [PATCH] Fix initscript to check daemon pidfile
by Daniel P. Berrange 13 Nov '09

13 Nov '09

The libvirtd initscript could get confused between the system and session instances of the daemon. To avoid this it is neccessary to check the pidfile explicitly. * daemon/libvirtd.init.in: Always check the pidfile of the system daemon to avoid confusion with the session daemons --- daemon/libvirtd.init.in | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 43c2d68..071fe2c 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -40,6 +40,7 @@ SERVICE=libvirtd PROCESS=libvirtd +PIDFILE=@localstatedir@/run/$SERVICE.pid LIBVIRTD_CONFIG= LIBVIRTD_ARGS= @@ -59,7 +60,7 @@ start() { echo -n $"Starting $SERVICE daemon: " mkdir -p @localstatedir@/cache/libvirt rm -rf @localstatedir@/cache/libvirt/* - KRB5_KTNAME=$KRB5_KTNAME daemon --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS + KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE @@ -68,12 +69,12 @@ start() { stop() { echo -n $"Stopping $SERVICE daemon: " - killproc $PROCESS + killproc -p $PIDFILE $PROCESS RETVAL=$? echo if [ $RETVAL -eq 0 ]; then rm -f @localstatedir@/lock/subsys/$SERVICE - rm -f @localstatedir@/run/$SERVICE.pid + rm -f $PIDFILE rm -rf @localstatedir@/cache/libvirt/* fi } @@ -86,7 +87,7 @@ restart() { reload() { echo -n $"Reloading $SERVICE configuration: " - killproc $PROCESS -HUP + killproc -p $PIDFILE $PROCESS -HUP RETVAL=$? echo return $RETVAL @@ -98,7 +99,7 @@ case "$1" in $1 ;; status) - status $PROCESS + status -p $PIDFILE $PROCESS RETVAL=$? ;; force-reload) -- 1.6.2.5

2 1

[libvirt] [PATCH] fix virt-aa-helper failure when host arch and os.type arch are different
by Jamie Strandboge 13 Nov '09

13 Nov '09

This is a fix for Ubuntu bug #448671[1]. virt-aa-helper's get_definition() now calls the new caps_mockup() function which will parse the XML for os.type, os.type.arch and then sets the wordsize. These attributes are needed only to get a valid virCapsPtr for virDomainDefParseString(). The -H and -b options are now removed from virt-aa-helper (they weren't used yet anyway). The patch also adds several tests and fixes another. Please also 'chmod 755 tests/virt-aa-helper-test' so it can be run with 'make check'. Thanks! Jamie [1] https://launchpad.net/bugs/448671 -- Jamie Strandboge | http://www.canonical.com

3 2

[libvirt] udev node device backend
by Dave Allan 13 Nov '09

13 Nov '09

Attached is a fully functional version of the node device udev based backend, incorporating all the feedback from earlier revisions. I broke the new capability fields out into a separate patch per Dan's suggestion, and I have also included a patch removing the DevKit backend. Dave >From e95f0c84ff50c4d8736750e93b70b901c7a246ad Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 16 Oct 2009 16:52:40 -0400 Subject: [PATCH 1/3] Add several fields to node device capabilities --- src/conf/node_device_conf.c | 22 ++++++++++++++++++++++ src/conf/node_device_conf.h | 7 +++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index c2c5a44..87f441d 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -248,6 +248,12 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, if (data->system.product_name) virBufferEscapeString(&buf, " <product>%s</product>\n", data->system.product_name); + if (data->system.dmi_devpath) + virBufferEscapeString(&buf, " <dmi_devpath>%s</dmi_devpath>\n", + data->system.dmi_devpath); + if (data->system.description) + virBufferEscapeString(&buf, " <description>%s</description>\n", + data->system.description); virBufferAddLit(&buf, " <hardware>\n"); if (data->system.hardware.vendor_name) virBufferEscapeString(&buf, " <vendor>%s</vendor>\n", @@ -325,6 +331,9 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, data->usb_if.subclass); virBufferVSprintf(&buf, " <protocol>%d</protocol>\n", data->usb_if.protocol); + if (data->usb_if.interface_name) + virBufferVSprintf(&buf, " <interface_name>%s</interface_name>\n", + data->usb_if.interface_name); if (data->usb_if.description) virBufferVSprintf(&buf, " <description>%s</description>\n", data->usb_if.description); @@ -394,10 +403,20 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, "</media_available>\n", avl ? 1 : 0); virBufferVSprintf(&buf, " <media_size>%llu</media_size>\n", data->storage.removable_media_size); + virBufferVSprintf(&buf, " <logical_block_size>%llu" + "</logical_block_size>\n", + data->storage.logical_block_size); + virBufferVSprintf(&buf, " <num_blocks>%llu</num_blocks>\n", + data->storage.num_blocks); virBufferAddLit(&buf, " </capability>\n"); } else { virBufferVSprintf(&buf, " <size>%llu</size>\n", data->storage.size); + virBufferVSprintf(&buf, " <logical_block_size>%llu" + "</logical_block_size>\n", + data->storage.logical_block_size); + virBufferVSprintf(&buf, " <num_blocks>%llu</num_blocks>\n", + data->storage.num_blocks); } if (data->storage.flags & VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE) virBufferAddLit(&buf, @@ -1310,6 +1329,8 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) switch (caps->type) { case VIR_NODE_DEV_CAP_SYSTEM: VIR_FREE(data->system.product_name); + VIR_FREE(data->system.dmi_devpath); + VIR_FREE(data->system.description); VIR_FREE(data->system.hardware.vendor_name); VIR_FREE(data->system.hardware.version); VIR_FREE(data->system.hardware.serial); @@ -1326,6 +1347,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(data->usb_dev.vendor_name); break; case VIR_NODE_DEV_CAP_USB_INTERFACE: + VIR_FREE(data->usb_if.interface_name); VIR_FREE(data->usb_if.description); break; case VIR_NODE_DEV_CAP_NET: diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index a7bb6c6..f70184d 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -82,6 +82,8 @@ struct _virNodeDevCapsDef { union _virNodeDevCapData { struct { char *product_name; + char *description; + char *dmi_devpath; struct { char *vendor_name; char *version; @@ -101,6 +103,7 @@ struct _virNodeDevCapsDef { unsigned function; unsigned product; unsigned vendor; + unsigned class; char *product_name; char *vendor_name; } pci_dev; @@ -117,10 +120,12 @@ struct _virNodeDevCapsDef { unsigned _class; /* "class" is reserved in C */ unsigned subclass; unsigned protocol; + char *interface_name; char *description; } usb_if; struct { char *address; + unsigned address_len; char *ifname; enum virNodeDevNetCapType subtype; /* LAST -> no subtype */ } net; @@ -139,6 +144,8 @@ struct _virNodeDevCapsDef { } scsi; struct { unsigned long long size; + unsigned long long num_blocks; + unsigned long long logical_block_size; unsigned long long removable_media_size; char *block; char *bus; -- 1.6.4.4 >From d8f4ac6806a8f55e4f9fa9c4af3e0c89aa4d0074 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 16 Oct 2009 10:09:01 -0400 Subject: [PATCH 2/3] Implement a node device backend using libudev. Monitoring for addition and removal of devices is implemented. There is a lot of detail work in this code, so we should try to get people running it on a wide variety of hardware so we can shake out the differences in implementation between the HAL and libudev backends. I have moved the new fields in the node device capabilities to a separate patch. This version contains changes per all the feedback I've received on earlier versions. --- configure.in | 47 +- daemon/libvirtd.c | 3 +- po/POTFILES.in | 3 +- src/Makefile.am | 16 +- src/node_device/node_device_driver.c | 12 +- src/node_device/node_device_driver.h | 22 + src/node_device/node_device_hal.h | 19 - ...evice_hal_linux.c => node_device_linux_sysfs.c} | 0 src/node_device/node_device_udev.c | 1142 ++++++++++++++++++++ src/node_device/node_device_udev.h | 32 + src/util/util.c | 28 + src/util/util.h | 3 + tools/virsh.c | 10 +- 13 files changed, 1306 insertions(+), 31 deletions(-) rename src/node_device/{node_device_hal_linux.c => node_device_linux_sysfs.c} (100%) create mode 100644 src/node_device/node_device_udev.c create mode 100644 src/node_device/node_device_udev.h diff --git a/configure.in b/configure.in index 2f9db72..25ed55f 100644 --- a/configure.in +++ b/configure.in @@ -1640,7 +1640,7 @@ test "$enable_shared" = no && lt_cv_objdir=. LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) -dnl HAL or DeviceKit library for host device enumeration +dnl HAL, DeviceKit, or libudev library for host device enumeration HAL_REQUIRED=0.0 HAL_CFLAGS= HAL_LIBS= @@ -1734,8 +1734,46 @@ AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) AC_SUBST([DEVKIT_CFLAGS]) AC_SUBST([DEVKIT_LIBS]) +UDEV_REQUIRED=143 +UDEV_CFLAGS= +UDEV_LIBS= +AC_ARG_WITH([udev], + [ --with-udev use libudev for host device enumeration], + [], + [with_udev=check]) + +if test "$with_libvirtd" = "no" ; then + with_udev=no +fi +if test "x$with_udev" = "xyes" -o "x$with_udev" = "xcheck"; then + PKG_CHECK_MODULES(UDEV, libudev >= $UDEV_REQUIRED, + [with_udev=yes], [ + if test "x$with_udev" = "xcheck" ; then + with_udev=no + else + AC_MSG_ERROR( + [You must install udev-devel >= $UDEV_REQUIRED to compile libvirt]) + fi + ]) + if test "x$with_udev" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_UDEV], 1, + [use UDEV for host device enumeration]) + + old_CFLAGS=$CFLAGS + old_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $UDEV_CFLAGS" + LDFLAGS="$LDFLAGS $UDEV_LIBS" + AC_CHECK_FUNCS([udev_new],,[with_udev=no]) + CFLAGS="$old_CFLAGS" + LDFLAGS="$old_LDFLAGS" + fi +fi +AM_CONDITIONAL([HAVE_UDEV], [test "x$with_udev" = "xyes"]) +AC_SUBST([UDEV_CFLAGS]) +AC_SUBST([UDEV_LIBS]) + with_nodedev=no; -if test "$with_devkit" = "yes" -o "$with_hal" = "yes"; +if test "$with_devkit" = "yes" -o "$with_hal" = "yes" -o "$with_udev" = "yes"; then with_nodedev=yes AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) @@ -1900,6 +1938,11 @@ AC_MSG_NOTICE([ devkit: $DEVKIT_CFLAGS $DEVKIT_LIBS]) else AC_MSG_NOTICE([ devkit: no]) fi +if test "$with_udev" = "yes" ; then +AC_MSG_NOTICE([ udev: $UDEV_CFLAGS $UDEV_LIBS]) +else +AC_MSG_NOTICE([ udev: no]) +fi if test "$with_netcf" = "yes" ; then AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 02bd287..d8d6c00 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -833,8 +833,7 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_STORAGE_DIR storageRegister(); #endif -#if defined(WITH_NODE_DEVICES) && \ - (defined(HAVE_HAL) || defined(HAVE_DEVKIT)) +#if defined(WITH_NODE_DEVICES) nodedevRegister(); #endif secretRegister(); diff --git a/po/POTFILES.in b/po/POTFILES.in index 1a12a39..4561e55 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,7 +17,8 @@ src/lxc/lxc_controller.c src/lxc/lxc_driver.c src/network/bridge_driver.c src/node_device/node_device_driver.c -src/node_device/node_device_hal_linux.c +src/node_device/node_device_linux_sysfs.c +src/node_device/node_device_udev.c src/nodeinfo.c src/opennebula/one_conf.c src/opennebula/one_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index 8e27ea7..11da07b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -254,16 +254,20 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ NODE_DEVICE_DRIVER_SOURCES = \ - node_device/node_device_driver.c node_device/node_device_driver.h + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + node_device/node_device_linux_sysfs.c NODE_DEVICE_DRIVER_HAL_SOURCES = \ node_device/node_device_hal.c \ - node_device/node_device_hal.h \ - node_device/node_device_hal_linux.c + node_device/node_device_hal.h NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \ node_device/node_device_devkit.c +NODE_DEVICE_DRIVER_UDEV_SOURCES = \ + node_device/node_device_udev.c + ######################### # @@ -642,6 +646,11 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(DEVKIT_CFLAGS) libvirt_driver_nodedev_la_LDFLAGS += $(DEVKIT_LIBS) endif +if HAVE_UDEV +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_nodedev_la_LDFLAGS += $(UDEV_LIBS) +endif if WITH_DRIVER_MODULES libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version @@ -691,6 +700,7 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index f33ff48..c139907 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -70,7 +70,10 @@ static int update_caps(virNodeDeviceObjPtr dev) } -#ifdef __linux__ +#if defined (__linux__) && defined (HAVE_HAL) +/* Under libudev changes to the driver name should be picked up as + * "change" events, so we don't call update driver name unless we're + * using the HAL backend. */ static int update_driver_name(virConnectPtr conn, virNodeDeviceObjPtr dev) { @@ -658,10 +661,10 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr driver) int nodedevRegister(void) { -#if defined(HAVE_HAL) && defined(HAVE_DEVKIT) +#if defined(HAVE_HAL) && defined(HAVE_UDEV) /* Register only one of these two - they conflict */ if (halNodeRegister() == -1) - return devkitNodeRegister(); + return udevNodeRegister(); return 0; #else #ifdef HAVE_HAL @@ -670,5 +673,8 @@ int nodedevRegister(void) { #ifdef HAVE_DEVKIT return devkitNodeRegister(); #endif +#ifdef HAVE_UDEV + return udevNodeRegister(); +#endif #endif } diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index db01624..5be0781 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -45,6 +45,9 @@ int halNodeRegister(void); #ifdef HAVE_DEVKIT int devkitNodeRegister(void); #endif +#ifdef HAVE_UDEV +int udevNodeRegister(void); +#endif void nodeDeviceLock(virDeviceMonitorStatePtr driver); void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); @@ -53,4 +56,23 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr mon); int nodedevRegister(void); +#ifdef __linux__ + +#define check_fc_host(d) check_fc_host_linux(d) +int check_fc_host_linux(union _virNodeDevCapData *d); + +#define check_vport_capable(d) check_vport_capable_linux(d) +int check_vport_capable_linux(union _virNodeDevCapData *d); + +#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) +int read_wwn_linux(int host, const char *file, char **wwn); + +#else /* __linux__ */ + +#define check_fc_host(d) +#define check_vport_capable(d) +#define read_wwn(host, file, wwn) + +#endif /* __linux__ */ + #endif /* __VIR_NODE_DEVICE_H__ */ diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index c859fe3..8ac8a35 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -22,23 +22,4 @@ #ifndef __VIR_NODE_DEVICE_HAL_H__ #define __VIR_NODE_DEVICE_HAL_H__ -#ifdef __linux__ - -#define check_fc_host(d) check_fc_host_linux(d) -int check_fc_host_linux(union _virNodeDevCapData *d); - -#define check_vport_capable(d) check_vport_capable_linux(d) -int check_vport_capable_linux(union _virNodeDevCapData *d); - -#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) -int read_wwn_linux(int host, const char *file, char **wwn); - -#else /* __linux__ */ - -#define check_fc_host(d) -#define check_vport_capable(d) -#define read_wwn(host, file, wwn) - -#endif /* __linux__ */ - #endif /* __VIR_NODE_DEVICE_HAL_H__ */ diff --git a/src/node_device/node_device_hal_linux.c b/src/node_device/node_device_linux_sysfs.c similarity index 100% rename from src/node_device/node_device_hal_linux.c rename to src/node_device/node_device_linux_sysfs.c diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c new file mode 100644 index 0000000..10f45aa --- /dev/null +++ b/src/node_device/node_device_udev.c @@ -0,0 +1,1142 @@ +/* + * node_device_udev.c: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <config.h> +#include <libudev.h> + +#include "node_device_udev.h" +#include "virterror_internal.h" +#include "node_device_conf.h" +#include "node_device_driver.h" +#include "driver.h" +#include "datatypes.h" +#include "logging.h" +#include "memory.h" +#include "uuid.h" +#include "util.h" +#include "buf.h" +#include "daemon/event.h" + +#define VIR_FROM_THIS VIR_FROM_NODEDEV + +static virDeviceMonitorStatePtr driverState = NULL; + +/* This function allocates memory from the heap for the property + * value. That memory must be later freed by some other code. */ +static int udevGetDeviceProperty(struct udev_device *udev_device, + const char *property_key, + char **property_value) +{ + const char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + udev_value = udev_device_get_property_value(udev_device, property_key); + if (udev_value == NULL) { + VIR_INFO(_("udev reports device '%s' does not have property '%s'"), + udev_device_get_sysname(udev_device), property_key); + ret = PROPERTY_MISSING; + goto out; + } + + /* If this allocation is changed, the comment at the beginning + * of the function must also be changed. */ + *property_value = strdup(udev_value); + if (*property_value == NULL) { + VIR_ERROR(_("Failed to allocate memory for " + "property '%s' on device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + virReportOOMError(NULL); + ret = PROPERTY_ERROR; + } + +out: + return ret; +} + + +static int udevGetStringProperty(struct udev_device *udev_device, + const char *property_key, + char **value) +{ + return udevGetDeviceProperty(udev_device, property_key, value); +} + + +static int udevGetIntProperty(struct udev_device *udev_device, + const char *property_key, + int *value, + int base) +{ + char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == PROPERTY_FOUND) { + if (virStrToLong_i(udev_value, NULL, base, value) != 0) { + ret = PROPERTY_ERROR; + } + } + + VIR_FREE(udev_value); + return ret; +} + + +static int udevGetUintProperty(struct udev_device *udev_device, + const char *property_key, + unsigned int *value, + int base) +{ + char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == PROPERTY_FOUND) { + if (virStrToLong_ui(udev_value, NULL, base, value) != 0) { + ret = PROPERTY_ERROR; + } + } + + VIR_FREE(udev_value); + return ret; +} + + +/* This function allocates memory from the heap for the attr value. + * That memory must be later freed by some other code. */ +static int udevGetStringSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + char **value) +{ + const char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + *value = strdup(udev_value); + if (*value == NULL) { + VIR_ERROR(_("Failed to allocate memory for " + "attribute '%s' on device '%s'"), + attr_name, udev_device_get_sysname(udev_device)); + virReportOOMError(NULL); + ret = PROPERTY_ERROR; + } + } else { + ret = PROPERTY_MISSING; + } + + return ret; +} + + +static int udevGetIntSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + int *value, + int base) +{ + const char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + if (virStrToLong_i(udev_value, NULL, base, value) != 0) { + ret = PROPERTY_ERROR; + } + } else { + ret = PROPERTY_MISSING; + } + + return ret; +} + + +static int udevGetUintSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + unsigned int *value, + int base) +{ + const char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + if (virStrToLong_ui(udev_value, NULL, base, value) != 0) { + ret = PROPERTY_ERROR; + } + } else { + ret = PROPERTY_MISSING; + } + + return ret; +} + + +static int udevGetUint64SysfsAttr(struct udev_device *udev_device, + const char *attr_name, + uint64_t *value) +{ + const char *udev_value = NULL; + int ret = PROPERTY_FOUND; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + if (virStrToLong_ull(udev_value, NULL, 0, value) != 0) { + ret = PROPERTY_ERROR; + } + } else { + ret = PROPERTY_MISSING; + } + + return ret; +} + + +static void udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, + int priority ATTRIBUTE_UNUSED, + const char *file, + int line, + const char *fn, + const char *fmt, + va_list args) +{ + VIR_ERROR_INT(file, fn, line, fmt, args); +} + + +static int udevProcessPCI(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devpath = NULL; + union _virNodeDevCapData *data = &def->caps->data; + int ret = -1; + + devpath = udev_device_get_devpath(device); + + char *p = strrchr(devpath, '/'); + + if ((p == NULL) || (virStrToLong_ui(p+1, + &p, + 16, + &data->pci_dev.domain) == -1)) { + goto out; + } + + if ((p == NULL) || (virStrToLong_ui(p+1, + &p, + 16, + &data->pci_dev.bus) == -1)) { + goto out; + } + + if ((p == NULL) || (virStrToLong_ui(p+1, + &p, + 16, + &data->pci_dev.slot) == -1)) { + goto out; + } + + if ((p == NULL) || (virStrToLong_ui(p+1, + &p, + 16, + &data->pci_dev.function) == -1)) { + goto out; + } + + if (udevGetUintSysfsAttr(device, + "vendor", + &data->pci_dev.vendor, + 0) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintSysfsAttr(device, "product", &data->pci_dev.product, 0) + == PROPERTY_ERROR) { + goto out; + } + + /* FIXME: to do the vendor name and product name, we have to + * parse /usr/share/hwdata/pci.ids. Look in hal/hald/ids.c + */ + + ret = 0; + +out: + return ret; +} + + +static int udevProcessUSBDevice(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = &def->caps->data; + int ret = 0; + + if (udevGetUintProperty(device, + "BUSNUM", + &data->usb_dev.bus, + 0) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintProperty(device, + "DEVNUM", + &data->usb_dev.device, + 0) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintProperty(device, + "ID_VENDOR_ID", + &data->usb_dev.vendor, + 16) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetStringProperty(device, + "ID_VENDOR", + &data->usb_dev.vendor_name) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintProperty(device, + "ID_MODEL_ID", + &data->usb_dev.product, + 0) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetStringProperty(device, + "ID_MODEL", + &data->usb_dev.product_name) == PROPERTY_ERROR) { + goto out; + } + +out: + return ret; +} + + +/* XXX Is 10 the correct base for the Number/Class/SubClass/Protocol + * conversions? */ +static int udevProcessUSBInterface(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + union _virNodeDevCapData *data = &def->caps->data; + + if (udevGetStringProperty(device, + "INTERFACE", + &data->usb_if.interface_name) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintSysfsAttr(device, + "bInterfaceNumber", + &data->usb_if.number, + 10) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintSysfsAttr(device, + "bInterfaceClass", + &data->usb_if._class, + 10) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintSysfsAttr(device, + "bInterfaceSubClass", + &data->usb_if.subclass, + 10) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUintSysfsAttr(device, + "bInterfaceProtocol", + &data->usb_if.protocol, + 10) == PROPERTY_ERROR) { + goto out; + } + + ret = 0; + +out: + return ret; +} + + +static int udevProcessNetworkInterface(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = &def->caps->data; + int ret = 0; + + if (udevGetStringSysfsAttr(device, + "address", + &data->net.address) == PROPERTY_ERROR) { + goto out; + } + if (udevGetUintSysfsAttr(device, + "addr_len", + &data->net.address_len, + 0) == PROPERTY_ERROR) { + goto out; + } + +out: + return ret; +} + + +static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, + virNodeDeviceDefPtr def) +{ + int ret = 0; + union _virNodeDevCapData *data = &def->caps->data; + char *filename = NULL; + + filename = basename(def->name); + + if (STRPREFIX(filename, "host")) { + /* XXX There's really no better way to get the host #? */ + ret = virStrToLong_ui(filename + strlen("host"), + NULL, + 0, + &data->scsi_host.host); + check_fc_host(&def->caps->data); + check_vport_capable(&def->caps->data); + } + + return ret; +} + + +static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, + virNodeDeviceDefPtr def) +{ + int ret = 0; + union _virNodeDevCapData *data = &def->caps->data; + char *filename = NULL, *p = NULL; + + filename = basename(def->name); + + virStrToLong_ui(filename, &p, 10, &data->scsi.host); + virStrToLong_ui(p+1, &p, 10, &data->scsi.bus); + virStrToLong_ui(p+1, &p, 10, &data->scsi.target); + virStrToLong_ui(p+1, &p, 10, &data->scsi.lun); + + return ret; +} + + +static int udevProcessDisk(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = &def->caps->data; + int ret = 0; + + data->storage.drive_type = strdup("disk"); + if (data->storage.drive_type == NULL) { + ret = -1; + goto out; + } + + if (udevGetUint64SysfsAttr(device, + "size", + &data->storage.num_blocks) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUint64SysfsAttr(device, + "queue/logical_block_size", + &data->storage.logical_block_size) + == PROPERTY_ERROR) { + goto out; + } + + + data->storage.size = data->storage.num_blocks * + data->storage.logical_block_size; + +out: + return ret; +} + + +static int udevProcessCDROM(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = &def->caps->data; + int tmp_int = 0, ret = 0; + + if ((udevGetIntSysfsAttr(device, "removable", &tmp_int, 0) == PROPERTY_FOUND) && + (tmp_int == 1)) { + def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE; + } + + if ((udevGetIntProperty(device, "ID_CDROM_MEDIA", &tmp_int, 0) + == PROPERTY_FOUND) && (tmp_int == 1)) { + + def->caps->data.storage.flags |= + VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; + + if (udevGetUint64SysfsAttr(device, + "size", + &data->storage.num_blocks) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUint64SysfsAttr(device, + "queue/logical_block_size", + &data->storage.logical_block_size) == PROPERTY_ERROR) { + goto out; + } + + /* XXX This calculation is wrong for the qemu virtual cdrom + * which reports the size in 512 byte blocks, but the logical + * block size as 2048. I don't have a physical cdrom on a + * devel system to see how they behave. */ + def->caps->data.storage.removable_media_size = + def->caps->data.storage.num_blocks * + def->caps->data.storage.logical_block_size; + } + +out: + return ret; +} + + +/* This function exists to deal with the case in which a driver does + * not provide a device type in the usual place, but udev told us it's + * a storage device, and we can make a good guess at what kind of + * storage device it is from other information that is provided. */ +static int udevKludgeStorageType(virNodeDeviceDefPtr def) +{ + int ret = -1; + + if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { + /* virtio disk */ + def->caps->data.storage.drive_type = strdup("disk"); + if (def->caps->data.storage.drive_type != NULL) { + ret = 0; + } + } + + return ret; +} + + +static void udevStripSpaces(char *s) +{ + if (s == NULL) { + return; + } + + while (virFileStripSuffix(s, " ")) { + /* do nothing */ + ; + } + + return; +} + + +static int udevProcessStorage(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = &def->caps->data; + int ret = -1; + + data->storage.block = strdup(udev_device_get_devnode(device)); + if (udevGetStringProperty(device, + "DEVNAME", + &data->storage.block) == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringProperty(device, + "ID_BUS", + &data->storage.bus) == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringProperty(device, + "ID_SERIAL", + &data->storage.serial) == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringSysfsAttr(device, + "device/vendor", + &data->storage.vendor) == PROPERTY_ERROR) { + goto out; + } + udevStripSpaces(def->caps->data.storage.vendor); + if (udevGetStringSysfsAttr(device, + "device/model", + &data->storage.model) == PROPERTY_ERROR) { + goto out; + } + udevStripSpaces(def->caps->data.storage.model); + /* There is no equivalent of the hotpluggable property in libudev, + * but storage is going toward a world in which hotpluggable is + * expected, so I don't see a problem with not having a property + * for it. */ + + if (udevGetStringProperty(device, + "ID_TYPE", + &data->storage.drive_type) != 0) { + /* If udev doesn't have it, perhaps we can guess it. */ + if (udevKludgeStorageType(def) != 0) { + goto out; + } + } + + /* NB: drive_type has changed from HAL; now it's "cd" instead of "cdrom" */ + if (STREQ(def->caps->data.storage.drive_type, "cd")) { + ret = udevProcessCDROM(device, def); + } else if (STREQ(def->caps->data.storage.drive_type, "disk")) { + ret = udevProcessDisk(device, def); + } else { + goto out; + } + +out: + return ret; +} + + +static int udevSetDeviceType(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = NULL; + const char *devtype = NULL; + int ret = 0; + + if (VIR_ALLOC(def->caps) != 0) { + ret = -1; + goto out; + } + + data = &def->caps->data; + + devtype = udev_device_get_devtype(device); + + if (udevGetUintProperty(device, + "PCI_CLASS", + &data->pci_dev.class, + 0) == PROPERTY_FOUND) { + def->caps->type = VIR_NODE_DEV_CAP_PCI_DEV; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "usb_device")) { + def->caps->type = VIR_NODE_DEV_CAP_USB_DEV; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "usb_interface")) { + def->caps->type = VIR_NODE_DEV_CAP_USB_INTERFACE; + goto out; + } + + /* XXX Do some network interfaces set the device type property? */ + if (udevGetStringProperty(device, + "INTERFACE", + &data->net.ifname) == PROPERTY_FOUND) { + def->caps->type = VIR_NODE_DEV_CAP_NET; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "scsi_host")) { + def->caps->type = VIR_NODE_DEV_CAP_SCSI_HOST; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "scsi_device")) { + def->caps->type = VIR_NODE_DEV_CAP_SCSI; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "disk")) { + def->caps->type = VIR_NODE_DEV_CAP_STORAGE; + goto out; + } + + ret = -1; + +out: + return ret; +} + + +static int udevGetDeviceDetails(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + + switch (def->caps->type) { + case VIR_NODE_DEV_CAP_SYSTEM: + /* There's no libudev equivalent of system, so ignore it. */ + break; + case VIR_NODE_DEV_CAP_PCI_DEV: + ret = udevProcessPCI(device, def); + break; + case VIR_NODE_DEV_CAP_USB_DEV: + ret = udevProcessUSBDevice(device, def); + break; + case VIR_NODE_DEV_CAP_USB_INTERFACE: + ret = udevProcessUSBInterface(device, def); + break; + case VIR_NODE_DEV_CAP_NET: + ret = udevProcessNetworkInterface(device, def); + break; + case VIR_NODE_DEV_CAP_SCSI_HOST: + ret = udevProcessSCSIHost(device, def); + break; + case VIR_NODE_DEV_CAP_SCSI: + ret = udevProcessSCSIDevice(device, def); + break; + case VIR_NODE_DEV_CAP_STORAGE: + ret = udevProcessStorage(device, def); + break; + default: + ret = -1; + break; + } + + return ret; +} + + +static int udevRemoveOneDevice(struct udev_device *device) +{ + virNodeDeviceObjPtr dev = NULL; + const char *name = NULL; + int ret = 0; + + name = udev_device_get_syspath(device); + + dev = virNodeDeviceFindByName(&driverState->devs, name); + if (dev != NULL) { + virNodeDeviceObjRemove(&driverState->devs, dev); + } else { + ret = -1; + } + + return ret; +} + + +static int udevAddOneDevice(struct udev_device *device) +{ + virNodeDeviceDefPtr def = NULL; + struct udev_device *parent = NULL; + virNodeDeviceObjPtr dev = NULL; + const char *parent_name = NULL; + int ret = -1; + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + def->name = strdup(udev_device_get_syspath(device)); + if (udevGetStringProperty(device, + "DRIVER", + &def->driver) == PROPERTY_ERROR) { + goto out; + } + + parent = udev_device_get_parent(device); + if (parent != NULL) { + parent_name = udev_device_get_syspath(parent); + if (parent_name != NULL) { + def->parent = strdup(parent_name); + } + } + + if (udevSetDeviceType(device, def) == 0) { + ret = udevGetDeviceDetails(device, def); + } + + if (ret == 0) { + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + dev->devicePath = strdup(udev_device_get_devpath(device)); + virNodeDeviceObjUnlock(dev); + } else { + virNodeDeviceDefFree(def); + } + +out: + return ret; +} + + +static int udevProcessDeviceListEntry(struct udev *udev, + struct udev_list_entry *list_entry) +{ + struct udev_device *device; + const char *name = NULL; + int ret = -1; + + name = udev_list_entry_get_name(list_entry); + + device = udev_device_new_from_syspath(udev, name); + if (device != NULL) { + udevAddOneDevice(device); + udev_device_unref(device); + ret = 0; + } + + return ret; +} + + +static int udevEnumerateDevices(struct udev *udev) +{ + struct udev_enumerate *udev_enumerate = NULL; + struct udev_list_entry *list_entry = NULL; + const char *name = NULL; + int ret = 0; + + udev_enumerate = udev_enumerate_new(udev); + + ret = udev_enumerate_scan_devices(udev_enumerate); + if (0 != ret) { + VIR_ERROR("udev scan devices returned %d\n", ret); + goto out; + } + + udev_list_entry_foreach(list_entry, + udev_enumerate_get_list_entry(udev_enumerate)) { + + udevProcessDeviceListEntry(udev, list_entry); + name = udev_list_entry_get_name(list_entry); + } + +out: + udev_enumerate_unref(udev_enumerate); + return ret; +} + + +static int udevDeviceMonitorShutdown(void) +{ + int ret = 0; + + struct udev_monitor *udev_monitor = NULL; + struct udev *udev = NULL; + + if (driverState) { + + nodeDeviceLock(driverState); + udev_monitor = DRV_STATE_UDEV_MONITOR(driverState); + + if (udev_monitor != NULL) { + udev = udev_monitor_get_udev(udev_monitor); + udev_monitor_unref(udev_monitor); + } + + if (udev != NULL) { + udev_unref(udev); + } + + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + virMutexDestroy(&driverState->lock); + VIR_FREE(driverState); + + } else { + ret = -1; + } + + return ret; +} + + +static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, + int fd, + int events ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) +{ + struct udev_device *device = NULL; + struct udev_monitor *udev_monitor = DRV_STATE_UDEV_MONITOR(driverState); + const char *action = NULL; + + if (fd != udev_monitor_get_fd(udev_monitor)) { + goto out; + } + + device = udev_monitor_receive_device(udev_monitor); + if (device == NULL) { + goto out; + } + + action = udev_device_get_action(device); + + if (STREQ(action, "add") || STREQ(action, "change")) { + udevAddOneDevice(device); + goto out; + } + + if (STREQ(action, "remove")) { + udevRemoveOneDevice(device); + goto out; + } + +out: + return; +} + + +static int udevSetupSystemDev(void) +{ + virNodeDeviceDefPtr def = NULL; + virNodeDeviceObjPtr dev = NULL; + struct udev *udev = NULL; + struct udev_device *device = NULL; + union _virNodeDevCapData *data = NULL; + char *tmp = NULL; + int ret = -1; + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + def->name = strdup("computer"); + if (def->name == NULL) { + goto out; + } + + if (VIR_ALLOC(def->caps) != 0) { + goto out; + } + + udev = udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driverState)); + device = udev_device_new_from_syspath(udev, DMI_DEVPATH); + if (device == NULL) { + goto out; + } + + data = &def->caps->data; + + data->system.dmi_devpath = strdup(DMI_DEVPATH); + data->system.description = strdup(SYSTEM_DESCRIPTION); + + if (udevGetStringSysfsAttr(device, + "product_name", + &data->system.product_name) == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringSysfsAttr(device, + "sys_vendor", + &data->system.hardware.vendor_name) + == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringSysfsAttr(device, + "product_version", + &data->system.hardware.version) + == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringSysfsAttr(device, + "product_serial", + &data->system.hardware.serial) + == PROPERTY_ERROR) { + goto out; + } + + if (udevGetStringSysfsAttr(device, + "product_uuid", + &tmp) == PROPERTY_ERROR) { + goto out; + } + virUUIDParse(tmp, def->caps->data.system.hardware.uuid); + VIR_FREE(tmp); + + if (udevGetStringSysfsAttr(device, + "bios_vendor", + &data->system.firmware.vendor_name) + == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringSysfsAttr(device, + "bios_version", + &data->system.firmware.version) + == PROPERTY_ERROR) { + goto out; + } + if (udevGetStringSysfsAttr(device, + "bios_date", + &data->system.firmware.release_date) + == PROPERTY_ERROR) { + goto out; + } + + udev_device_unref(device); + + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + virNodeDeviceObjUnlock(dev); + + ret = 0; + +out: + return ret; +} + +static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) +{ + struct udev *udev = NULL; + struct udev_monitor *udev_monitor = NULL; + int ret = 0; + + if (VIR_ALLOC(driverState) < 0) { + ret = -1; + goto out; + } + + if (virMutexInit(&driverState->lock) < 0) { + VIR_FREE(driverState); + ret = -1; + goto out; + } + + nodeDeviceLock(driverState); + + /* + * http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev.h… + * + * indicates no return value other than success, so we don't check + * its return value. + */ + udev = udev_new(); + udev_set_log_fn(udev, udevLogFunction); + + udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); + if (udev_monitor == NULL) { + ret = -1; + goto out; + } + + udev_monitor_enable_receiving(udev_monitor); + + /* udev can be retrieved from udev_monitor */ + driverState->privateData = udev_monitor; + nodeDeviceUnlock(driverState); + + /* We register the monitor with the event callback so we are + * notified by udev of device changes before we enumerate existing + * devices because libvirt will simply recreate the device if we + * try to register it twice, i.e., if the device appears between + * the time we register the callback and the time we begin + * enumeration. The alternative is to register the callback after + * we enumerate, in which case we will fail to create any devices + * that appear while the enumeration is taking place. */ + if (virEventAddHandleImpl(udev_monitor_get_fd(udev_monitor), + VIR_EVENT_HANDLE_READABLE, + udevEventHandleCallback, + NULL, NULL) == -1) { + ret = -1; + goto out; + } + + /* Create a fictional 'computer' device to root the device tree. */ + if (udevSetupSystemDev() != 0) { + ret = -1; + goto out; + } + + /* Populate with known devices */ + + if (udevEnumerateDevices(udev) != 0) { + ret = -1; + goto out; + } + +out: + if (ret == -1) { + udevDeviceMonitorShutdown(); + } + return ret; +} + + +static int udevDeviceMonitorReload(void) +{ + return 0; +} + + +static int udevDeviceMonitorActive(void) +{ + /* Always ready to deal with a shutdown */ + return 0; +} + + +static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (driverState == NULL) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->devMonPrivateData = driverState; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int udevNodeDrvClose(virConnectPtr conn) +{ + conn->devMonPrivateData = NULL; + return 0; +} + +static virDeviceMonitor udevDeviceMonitor = { + .name = "udevDeviceMonitor", + .open = udevNodeDrvOpen, + .close = udevNodeDrvClose, +}; + +static virStateDriver udevStateDriver = { + .initialize = udevDeviceMonitorStartup, + .cleanup = udevDeviceMonitorShutdown, + .reload = udevDeviceMonitorReload, + .active = udevDeviceMonitorActive, +}; + +int udevNodeRegister(void) +{ + VIR_ERROR0("Registering udev node device backend\n"); + + registerCommonNodeFuncs(&udevDeviceMonitor); + if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { + return -1; + } + + return virRegisterStateDriver(&udevStateDriver); +} diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h new file mode 100644 index 0000000..d950106 --- /dev/null +++ b/src/node_device/node_device_udev.h @@ -0,0 +1,32 @@ +/* + * node_device_udev.h: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <libudev.h> +#include <stdint.h> + +#define SYSFS_DATA_SIZE 4096 +#define DRV_STATE_UDEV_MONITOR(ds) ((struct udev_monitor *)((ds)->privateData)) +#define DMI_DEVPATH "/sys/devices/virtual/dmi/id" +#define SYSTEM_DESCRIPTION "fictional device to root the node device tree" +#define PROPERTY_FOUND 0 +#define PROPERTY_MISSING 1 +#define PROPERTY_ERROR -1 diff --git a/src/util/util.c b/src/util/util.c index 98f8a14..f63bd39 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2114,3 +2114,31 @@ void virFileWaitForDevices(virConnectPtr conn) void virFileWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} #endif #endif + +int virBuildPathInternal(char **path, ...) +{ + char *path_component = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + va_list ap; + int ret = 0; + + va_start(ap, *path); + + path_component = va_arg(ap, char *); + virBufferAdd(&buf, path_component, -1); + + while ((path_component = va_arg(ap, char *)) != NULL) + { + virBufferAddChar(&buf, '/'); + virBufferAdd(&buf, path_component, -1); + } + + va_end(ap); + + *path = virBufferContentAndReset(&buf); + if (*path == NULL) { + ret = -1; + } + + return ret; +} diff --git a/src/util/util.h b/src/util/util.h index 8679636..da410e1 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -248,4 +248,7 @@ char *virFileFindMountPoint(const char *type); void virFileWaitForDevices(virConnectPtr conn); +#define virBuildPath(path, ...) virBuildPathInternal(path, __VA_ARGS__, NULL) +int virBuildPathInternal(char **path, ...) __attribute__ ((sentinel)); + #endif /* __VIR_UTIL_H__ */ diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..19a2eb1 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5790,9 +5790,17 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) char **parents = vshMalloc(ctl, sizeof(char *) * num_devices); for (i = 0; i < num_devices; i++) { virNodeDevicePtr dev = virNodeDeviceLookupByName(ctl->conn, devices[i]); + virNodeDevicePtr parent_dev = NULL; + if (dev && STRNEQ(devices[i], "computer")) { const char *parent = virNodeDeviceGetParent(dev); - parents[i] = parent ? strdup(parent) : NULL; + parent_dev = virNodeDeviceLookupByName(ctl->conn, parent); + if (parent_dev) { + parents[i] = strdup(parent); + } else { + parents[i] = strdup("computer"); + } + virNodeDeviceFree(parent_dev); } else { parents[i] = NULL; } -- 1.6.4.4 >From cc3644b71d042ff394c9540a9f364752484f63a8 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 16 Oct 2009 14:36:07 -0400 Subject: [PATCH 3/3] Remove DevKit node device backend --- configure.in | 61 +----- src/Makefile.am | 9 - src/node_device/node_device_devkit.c | 446 ---------------------------------- src/node_device/node_device_driver.c | 3 - src/node_device/node_device_driver.h | 3 - 5 files changed, 1 insertions(+), 521 deletions(-) delete mode 100644 src/node_device/node_device_devkit.c diff --git a/configure.in b/configure.in index 25ed55f..3d05d9b 100644 --- a/configure.in +++ b/configure.in @@ -1680,60 +1680,6 @@ AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AC_SUBST([HAL_CFLAGS]) AC_SUBST([HAL_LIBS]) -DEVKIT_REQUIRED=0.0 -DEVKIT_CFLAGS= -DEVKIT_LIBS= -AC_ARG_WITH([devkit], - [ --with-devkit use DeviceKit for host device enumeration], - [], - [with_devkit=no]) - -if test "$with_libvirtd" = "no" ; then - with_devkit=no -fi - -dnl Extra check needed while devkit pkg-config info missing glib2 dependency -PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 0.0,,[ - if test "x$with_devkit" = "xcheck"; then - with_devkit=no - elif test "x$with_devkit" = "xyes"; then - AC_MSG_ERROR([required package DeviceKit requires package glib-2.0]) - fi]) - -if test "x$with_devkit" = "xyes" -o "x$with_devkit" = "xcheck"; then - PKG_CHECK_MODULES(DEVKIT, devkit-gobject >= $DEVKIT_REQUIRED, - [with_devkit=yes], [ - if test "x$with_devkit" = "xcheck" ; then - with_devkit=no - else - AC_MSG_ERROR( - [You must install DeviceKit-devel >= $DEVKIT_REQUIRED to compile libvirt]) - fi - ]) - if test "x$with_devkit" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_DEVKIT], 1, - [use DeviceKit for host device enumeration]) - - dnl Add glib2 flags explicitly while devkit pkg-config info missing glib2 dependency - DEVKIT_CFLAGS="$GLIB2_CFLAGS $DEVKIT_CFLAGS" - DEVKIT_LIBS="$GLIB2_LIBS $DEVKIT_LIBS" - - dnl Add more flags apparently required for devkit to work properly - DEVKIT_CFLAGS="$DEVKIT_CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" - - old_CFLAGS=$CFLAGS - old_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $DEVKIT_CFLAGS" - LDFLAGS="$LDFLAGS $DEVKIT_LIBS" - AC_CHECK_FUNCS([devkit_client_connect],,[with_devkit=no]) - CFLAGS="$old_CFLAGS" - LDFLAGS="$old_LDFLAGS" - fi -fi -AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) -AC_SUBST([DEVKIT_CFLAGS]) -AC_SUBST([DEVKIT_LIBS]) - UDEV_REQUIRED=143 UDEV_CFLAGS= UDEV_LIBS= @@ -1773,7 +1719,7 @@ AC_SUBST([UDEV_CFLAGS]) AC_SUBST([UDEV_LIBS]) with_nodedev=no; -if test "$with_devkit" = "yes" -o "$with_hal" = "yes" -o "$with_udev" = "yes"; +if test "$with_hal" = "yes" -o "$with_udev" = "yes"; then with_nodedev=yes AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) @@ -1933,11 +1879,6 @@ AC_MSG_NOTICE([ hal: $HAL_CFLAGS $HAL_LIBS]) else AC_MSG_NOTICE([ hal: no]) fi -if test "$with_devkit" = "yes" ; then -AC_MSG_NOTICE([ devkit: $DEVKIT_CFLAGS $DEVKIT_LIBS]) -else -AC_MSG_NOTICE([ devkit: no]) -fi if test "$with_udev" = "yes" ; then AC_MSG_NOTICE([ udev: $UDEV_CFLAGS $UDEV_LIBS]) else diff --git a/src/Makefile.am b/src/Makefile.am index 11da07b..cd05c28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -262,9 +262,6 @@ NODE_DEVICE_DRIVER_HAL_SOURCES = \ node_device/node_device_hal.c \ node_device/node_device_hal.h -NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \ - node_device/node_device_devkit.c - NODE_DEVICE_DRIVER_UDEV_SOURCES = \ node_device/node_device_udev.c @@ -641,11 +638,6 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) libvirt_driver_nodedev_la_LDFLAGS += $(HAL_LIBS) endif -if HAVE_DEVKIT -libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) -libvirt_driver_nodedev_la_CFLAGS += $(DEVKIT_CFLAGS) -libvirt_driver_nodedev_la_LDFLAGS += $(DEVKIT_LIBS) -endif if HAVE_UDEV libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) @@ -699,7 +691,6 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ diff --git a/src/node_device/node_device_devkit.c b/src/node_device/node_device_devkit.c deleted file mode 100644 index a6c7941..0000000 --- a/src/node_device/node_device_devkit.c +++ /dev/null @@ -1,446 +0,0 @@ -/* - * node_device_devkit.c: node device enumeration - DeviceKit-based implementation - * - * Copyright (C) 2008 Virtual Iron Software, Inc. - * Copyright (C) 2008 David F. Lively - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Author: David F. Lively <dlively(a)virtualiron.com> - */ - -#include <config.h> -#include <devkit-gobject.h> - -#include "node_device_conf.h" -#include "virterror_internal.h" -#include "driver.h" -#include "datatypes.h" -#include "event.h" -#include "memory.h" -#include "uuid.h" -#include "logging.h" - -#include "node_device.h" - -/* - * Host device enumeration (DeviceKit implementation) - */ - -static virDeviceMonitorStatePtr driverState; - -#define CONN_DRV_STATE(conn) \ - ((virDeviceMonitorStatePtr)((conn)->devMonPrivateData)) -#define DRV_STATE_DKCLIENT(ds) ((DevkitClient *)((ds)->privateData)) -#define CONN_DKCLIENT(conn) DRV_STATE_DKCLIENT(CONN_DRV_STATE(conn)) - -#define NODE_DEV_DKDEV(obj) ((DevkitDevice *)((obj)->privateData) - -static int get_str_prop(DevkitDevice *dkdev, const char *prop, char **val_p) -{ - char *val = devkit_device_dup_property_as_str(dkdev, prop); - - if (val) { - if (*val) { - *val_p = val; - return 0; - } else { - /* Treat empty strings as NULL values */ - VIR_FREE(val); - } - } - - return -1; -} - -#if 0 -static int get_int_prop(DevkitDevice *dkdev, const char *prop, int *val_p) -{ - if (! devkit_device_has_property(dkdev, prop)) - return -1; - *val_p = devkit_device_get_property_as_int(dkdev, prop); - return 0; -} - -static int get_uint64_prop(DevkitDevice *dkdev, const char *prop, - unsigned long long *val_p) -{ - if (! devkit_device_has_property(dkdev, prop)) - return -1; - *val_p = devkit_device_get_property_as_uint64(dkdev, prop); - return 0; -} -#endif - -static int gather_pci_cap(DevkitDevice *dkdev, - union _virNodeDevCapData *d) -{ - const char *sysfs_path = devkit_device_get_native_path(dkdev); - - if (sysfs_path != NULL) { - char *p = strrchr(sysfs_path, '/'); - if (p) { - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.domain); - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.bus); - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.slot); - (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function); - } - } - return 0; -} - - -static int gather_usb_cap(DevkitDevice *dkdev, - union _virNodeDevCapData *d) -{ - (void)get_str_prop(dkdev, "ID_VENDOR", &d->usb_dev.vendor_name); - (void)get_str_prop(dkdev, "ID_MODEL", &d->usb_dev.product_name); - return 0; -} - - -static int gather_net_cap(DevkitDevice *dkdev, - union _virNodeDevCapData *d) -{ - const char *sysfs_path = devkit_device_get_native_path(dkdev); - const char *ifname; - - if (sysfs_path == NULL) - return -1; - ifname = strrchr(sysfs_path, '/'); - if (!ifname || !*ifname || !*(++ifname)) - return -1; - if ((d->net.ifname = strdup(ifname)) == NULL) - return -1; - - d->net.subtype = VIR_NODE_DEV_CAP_NET_LAST; - - return 0; -} - - -static int gather_storage_cap(DevkitDevice *dkdev, - union _virNodeDevCapData *d) -{ - const char *device = devkit_device_get_device_file(dkdev); - - if (device && ((d->storage.block = strdup(device)) == NULL)) - return -1; - - return 0; -} - - -struct _caps_tbl_entry { - const char *cap_name; - enum virNodeDevCapType type; - int (*gather_fn)(DevkitDevice *dkdev, - union _virNodeDevCapData *data); -}; - -typedef struct _caps_tbl_entry caps_tbl_entry; - -static caps_tbl_entry caps_tbl[] = { - { "pci", VIR_NODE_DEV_CAP_PCI_DEV, gather_pci_cap }, - { "usb", VIR_NODE_DEV_CAP_USB_DEV, gather_usb_cap }, - { "net", VIR_NODE_DEV_CAP_NET, gather_net_cap }, - { "block", VIR_NODE_DEV_CAP_STORAGE, gather_storage_cap }, - // TODO: more caps! -}; - - -/* qsort/bsearch string comparator */ -static int cmpstringp(const void *p1, const void *p2) -{ - /* from man 3 qsort */ - return strcmp(* (char * const *) p1, * (char * const *) p2); -} - - -static int gather_capability(DevkitDevice *dkdev, - const char *cap_name, - virNodeDevCapsDefPtr *caps_p) -{ - size_t caps_tbl_len = sizeof(caps_tbl) / sizeof(caps_tbl[0]); - caps_tbl_entry *entry; - - entry = bsearch(&cap_name, caps_tbl, caps_tbl_len, - sizeof(caps_tbl[0]), cmpstringp); - - if (entry) { - virNodeDevCapsDefPtr caps; - if (VIR_ALLOC(caps) < 0) - return ENOMEM; - caps->type = entry->type; - if (entry->gather_fn) { - int rv = (*entry->gather_fn)(dkdev, &caps->data); - if (rv != 0) { - virNodeDevCapsDefFree(caps); - return rv; - } - } - caps->next = *caps_p; - *caps_p = caps; - } - - return 0; -} - - -static int gather_capabilities(DevkitDevice *dkdev, - virNodeDevCapsDefPtr *caps_p) -{ - const char *subsys = devkit_device_get_subsystem(dkdev); - const char *bus_name = devkit_device_get_property(dkdev, "ID_BUS"); - virNodeDevCapsDefPtr caps = NULL; - int rv; - - if (subsys) { - rv = gather_capability(dkdev, subsys, &caps); - if (rv != 0) goto failure; - } - - if (bus_name && (subsys == NULL || !STREQ(bus_name, subsys))) { - rv = gather_capability(dkdev, bus_name, &caps); - if (rv != 0) goto failure; - } - - *caps_p = caps; - return 0; - - failure: - while (caps) { - virNodeDevCapsDefPtr next = caps->next; - virNodeDevCapsDefFree(caps); - caps = next; - } - return rv; -} - -static void dev_create(void *_dkdev, void *_dkclient ATTRIBUTE_UNUSED) -{ - DevkitDevice *dkdev = _dkdev; - const char *sysfs_path = devkit_device_get_native_path(dkdev); - virNodeDeviceObjPtr dev = NULL; - virNodeDeviceDefPtr def = NULL; - const char *name; - int rv; - - if (sysfs_path == NULL) - /* Currently using basename(sysfs_path) as device name (key) */ - return; - - name = strrchr(sysfs_path, '/'); - if (name == NULL) - name = sysfs_path; - else - ++name; - - if (VIR_ALLOC(def) < 0) - goto failure; - - if ((def->name = strdup(name)) == NULL) - goto failure; - - // TODO: Find device parent, if any - - rv = gather_capabilities(dkdev, &def->caps); - if (rv != 0) goto failure; - - nodeDeviceLock(driverState); - dev = virNodeDeviceAssignDef(NULL, - &driverState->devs, - def); - - if (!dev) { - nodeDeviceUnlock(driverState); - goto failure; - } - - dev->privateData = dkdev; - dev->privateFree = NULL; /* XXX some free func needed ? */ - virNodeDeviceObjUnlock(dev); - - nodeDeviceUnlock(driverState); - - return; - - failure: - DEBUG("FAILED TO ADD dev %s", name); - if (def) - virNodeDeviceDefFree(def); -} - - -static int devkitDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) -{ - size_t caps_tbl_len = sizeof(caps_tbl) / sizeof(caps_tbl[0]); - DevkitClient *devkit_client = NULL; - GError *err = NULL; - GList *devs; - int i; - - /* Ensure caps_tbl is sorted by capability name */ - qsort(caps_tbl, caps_tbl_len, sizeof(caps_tbl[0]), cmpstringp); - - if (VIR_ALLOC(driverState) < 0) - return -1; - - if (virMutexInit(&driverState->lock) < 0) { - VIR_FREE(driverState); - return -1; - } - - g_type_init(); - - /* Get new devkit_client and connect to daemon */ - devkit_client = devkit_client_new(NULL); - if (devkit_client == NULL) { - DEBUG0("devkit_client_new returned NULL"); - goto failure; - } - if (!devkit_client_connect(devkit_client, &err)) { - DEBUG0("devkit_client_connect failed"); - goto failure; - } - - /* Populate with known devices. - * - * This really should be: - devs = devkit_client_enumerate_by_subsystem(devkit_client, NULL, &err); - if (err) { - DEBUG0("devkit_client_enumerate_by_subsystem failed"); - devs = NULL; - goto failure; - } - g_list_foreach(devs, dev_create, devkit_client); - * but devkit_client_enumerate_by_subsystem currently fails when the second - * arg is null (contrary to the API documentation). So the following code - * (from Dan B) works around this by listing devices per handled subsystem. - */ - - for (i = 0 ; i < ARRAY_CARDINALITY(caps_tbl) ; i++) { - const char *caps[] = { caps_tbl[i].cap_name, NULL }; - devs = devkit_client_enumerate_by_subsystem(devkit_client, - caps, - &err); - if (err) { - DEBUG0("devkit_client_enumerate_by_subsystem failed"); - devs = NULL; - goto failure; - } - g_list_foreach(devs, dev_create, devkit_client); - } - - driverState->privateData = devkit_client; - - // TODO: Register to get DeviceKit events on device changes and - // coordinate updates with queries and other operations. - - return 0; - - failure: - if (err) { - DEBUG("\terror[%d]: %s", err->code, err->message); - g_error_free(err); - } - if (devs) { - g_list_foreach(devs, (GFunc)g_object_unref, NULL); - g_list_free(devs); - } - if (devkit_client) - g_object_unref(devkit_client); - VIR_FREE(driverState); - - return -1; -} - - -static int devkitDeviceMonitorShutdown(void) -{ - if (driverState) { - DevkitClient *devkit_client; - - nodeDeviceLock(driverState); - devkit_client = DRV_STATE_DKCLIENT(driverState); - virNodeDeviceObjListFree(&driverState->devs); - if (devkit_client) - g_object_unref(devkit_client); - nodeDeviceUnlock(driverState); - virMutexDestroy(&driveState->lock); - VIR_FREE(driverState); - return 0; - } - return -1; -} - - -static int devkitDeviceMonitorReload(void) -{ - /* XXX This isn't thread safe because its free'ing the thing - * we're locking */ - (void)devkitDeviceMonitorShutdown(); - return devkitDeviceMonitorStartup(); -} - - -static int devkitDeviceMonitorActive(void) -{ - /* Always ready to deal with a shutdown */ - return 0; -} - - -static virDrvOpenStatus -devkitNodeDrvOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED) -{ - if (driverState == NULL) - return VIR_DRV_OPEN_DECLINED; - - conn->devMonPrivateData = driverState; - - return VIR_DRV_OPEN_SUCCESS; -} - -static int devkitNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - conn->devMonPrivateData = NULL; - return 0; -} - - -static virDeviceMonitor devkitDeviceMonitor = { - .name = "devkitDeviceMonitor", - .open = devkitNodeDrvOpen, - .close = devkitNodeDrvClose, -}; - - -static virStateDriver devkitStateDriver = { - .initialize = devkitDeviceMonitorStartup, - .cleanup = devkitDeviceMonitorShutdown, - .reload = devkitDeviceMonitorReload, - .active = devkitDeviceMonitorActive, -}; - -int devkitNodeRegister(void) -{ - registerCommonNodeFuncs(&devkitDeviceMonitor); - if (virRegisterDeviceMonitor(&devkitDeviceMonitor) < 0) - return -1; - return virRegisterStateDriver(&devkitStateDriver); -} diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index c139907..cddd994 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -670,9 +670,6 @@ int nodedevRegister(void) { #ifdef HAVE_HAL return halNodeRegister(); #endif -#ifdef HAVE_DEVKIT - return devkitNodeRegister(); -#endif #ifdef HAVE_UDEV return udevNodeRegister(); #endif diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 5be0781..4f0822c 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -42,9 +42,6 @@ #ifdef HAVE_HAL int halNodeRegister(void); #endif -#ifdef HAVE_DEVKIT -int devkitNodeRegister(void); -#endif #ifdef HAVE_UDEV int udevNodeRegister(void); #endif -- 1.6.4.4

5 12

[libvirt] [PATCH] Remove capng_lock() call when spawning LXC container init process
by Daniel P. Berrange 13 Nov '09

13 Nov '09

The capng_lock() call sets the SECURE_NO_SETUID_FIXUP and SECURE_NOROOT bits on the process. This prevents the kernel granting capabilities to processes with an effective UID of 0, or with setuid programs. This is not actually what we want in the container init process. It should be allowed to run setuid processes & keep capabilities when root. All that is required is masking a handful of dangerous capabilities from the bounding set. * src/lxc/lxc_container.c: Remove bogus capng_lock() call. --- src/lxc/lxc_container.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c77d099..023d553 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -694,12 +694,11 @@ static int lxcContainerDropCapabilities(void) return -1; } - /* Need to prevent them regaining any caps on exec */ - if ((ret = capng_lock()) < 0) { - lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to lock capabilities: %d"), ret); - return -1; - } + /* We do not need to call capng_lock() in this case. The bounding + * set restriction will prevent them reacquiring sys_boot/module/time, + * etc which is all that matters for the container. Once inside the + * container it is fine for SECURE_NOROOT / SECURE_NO_SETUID_FIXUP to + * be unmasked - they can never escape the bounding set. */ #else VIR_WARN0(_("libcap-ng support not compiled in, unable to clear capabilities")); -- 1.6.2.5

2 1

[libvirt] Interface script for qemu/kvm determinately fails?
by Ryota Ozaki 13 Nov '09

13 Nov '09

Hi, I have a question about interface script (e.g., qemu-ifup) for qemu/kvm. qemu/kvm is dropped its all capabilities by libcap-ng before executed. So the script that is executed by qemu/kvm will fail if it executes privileged operations which are usual jobs of it. It means we cannot use <script> anymore? or I'm missing something? I think executing the script in libvirtd after creating a tap and before dropping capabilities would be a solution for that issue. Am I wrong? Thanks, ozaki-r

2 2

[libvirt] [PATCH] Add virConnectGetLibvirtVersion API
by Cole Robinson 13 Nov '09

13 Nov '09

Hi all, The attached patch adds a new API call for retrieving the libvirt version used by a connection: virConnectGetLibvirtVersion. Without this, there is currently no way to determine the libvirt version of a remote qemu connection for example. This info can be useful for feature detection/enabling/disabling. As an example, virt-install may want to use the AC97 sound device as the default sound model for new VMs. However, this was only added to libvirt's white list in 0.6.0, while the other models have been available since 0.4.3. If installing a remote guest, virt-install will want to ensure that the remote libvirtd is >= 0.6.0. Granted, the remote version could have backported the AC97 patch and virt-install would be incorrect, but better to be overly restrictive than to blindly specify AC97 and have guest creation bomb out. The 'correct' way to handle the above issue would be some combination of dropping internal whitelists from libvirt and generating them from info reported by the hypervisor, and advertising the available values in the capabilities XML. However I think this API addition makes things more manageable with little downside until a proper solution is implemented. Thanks, Cole

3 4

[libvirt] libvirt strange behavior possibly bug with version 0.7.2
by Ricardo Mendes 13 Nov '09

13 Nov '09

>>>import libvirt >>>con=libvirt.open('xen:///') >> libvirt.getVersion() 7002 >>>dom=con.defineXML('<domain type="xen"><name>rtiago_test2</name><clock offset="utc"/><vcpu>8</vcpu><on_poweroff>restart</on_poweroff><devices><disk device="disk" type="file"><source file="/images/SLC-4-x86.img"/><driver name="file"/><target bus="xen" dev="xvda1"/></disk><console tty="/dev/pts/2" type="pty"><source path="/dev/pts/2"/><target port="0"/></console></devices><on_crash>restart</on_crash><currentMemory>300000</currentMemory><memory>300000</memory><on_reboot>restart</on_reboot><os><kernel>/root/vmlinuz</kernel><initrd>/root/initrd.img</initrd><type>linux</type><root>/dev/xvda1 ro</root><cmdline>rtiago</cmdline></os></domain>') >>> dom.create() >>>0 >>> dom.destroy() >>> 0 >>> dom.create() Traceback (most recent call last): File "<stdin>", line 1, in ? File "/usr/lib64/python2.4/site-packages/libvirt.py", line 287, in create if ret == -1: raise libvirtError ('virDomainCreate() failed', dom=self) libvirt.libvirtError: Unknown failure Every call to create will raise the same exception, It only works if I do a new connection to the hypervisor. Is there an workaround??

2 1

[libvirt] [PATCH] Finer grained migration control
by Chris Lalancette 13 Nov '09

13 Nov '09

Normally, when you migrate a domain from host A to host B, the domain on host A remains defined but shutoff and the domain on host B remains running but is a "transient". Add a new flag to virDomainMigrate() to allow the original domain to be undefined on source host A, and a new flag to virDomainMigrate() to allow the new domain to be persisted on the destination host B. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- include/libvirt/libvirt.h.in | 2 ++ src/libvirt.c | 4 ++++ src/qemu/qemu_driver.c | 34 ++++++++++++++++++++++++++++++++-- tools/virsh.c | 8 ++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index f51a565..6186d4e 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -339,6 +339,8 @@ typedef enum { VIR_MIGRATE_LIVE = (1 << 0), /* live migration */ VIR_MIGRATE_PEER2PEER = (1 << 1), /* direct source -> dest host control channel */ VIR_MIGRATE_TUNNELLED = (1 << 2), /* tunnel migration data over libvirtd connection */ + VIR_MIGRATE_PERSIST_DEST = (1 << 3), /* persist the VM on the destination */ + VIR_MIGRATE_UNDEFINE_SOURCE = (1 << 4), /* undefine the VM on the source */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/libvirt.c b/src/libvirt.c index b14942d..92a1eaa 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3128,6 +3128,10 @@ virDomainMigrateDirect (virDomainPtr domain, * VIR_MIGRATE_LIVE Do not pause the VM during migration * VIR_MIGRATE_PEER2PEER Direct connection between source & destination hosts * VIR_MIGRATE_TUNNELLED Tunnel migration data over the libvirt RPC channel + * VIR_MIGRATE_PERSIST_DEST If the migration is successful, persist the domain + * on the destination host. + * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the + * domain on the source host. * * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. * Applications using the VIR_MIGRATE_PEER2PEER flag will probably diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3812f91..ba5694e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6848,7 +6848,8 @@ qemudDomainMigratePerform (virDomainPtr dom, event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_MIGRATED); - if (!vm->persistent) { + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) { + virDomainDeleteConfig(dom->conn, driver->configDir, driver->autostartDir, vm); virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } @@ -6886,13 +6887,14 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, const char *cookie ATTRIBUTE_UNUSED, int cookielen ATTRIBUTE_UNUSED, const char *uri ATTRIBUTE_UNUSED, - unsigned long flags ATTRIBUTE_UNUSED, + unsigned long flags, int retcode) { struct qemud_driver *driver = dconn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; virDomainEventPtr event = NULL; + int newVM = 1; qemuDriverLock(driver); vm = virDomainFindByName(&driver->domains, dname); @@ -6906,6 +6908,34 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, * object, but if no, clean up the empty qemu process. */ if (retcode == 0) { + if (flags & VIR_MIGRATE_PERSIST_DEST) { + if (vm->persistent) + newVM = 0; + vm->persistent = 1; + + if (virDomainSaveConfig(dconn, driver->configDir, vm->def) < 0) { + /* Hmpf. Migration was successful, but making it persistent + * was not. If we report successful, then when this domain + * shuts down, management tools are in for a surprise. On the + * other hand, if we report failure, then the management tools + * might try to restart the domain on the source side, even + * though the domain is actually running on the destination. + * Return a NULL dom pointer, and hope that this is a rare + * situation and management tools are smart. + */ + vm = NULL; + goto cleanup; + } + + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + newVM ? + VIR_DOMAIN_EVENT_DEFINED_ADDED : + VIR_DOMAIN_EVENT_DEFINED_UPDATED); + if (event) + qemuDomainEventQueue(driver, event); + + } dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); /* run 'cont' on the destination, which allows migration on qemu diff --git a/tools/virsh.c b/tools/virsh.c index 46c5454..47122d5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2465,6 +2465,8 @@ static const vshCmdOptDef opts_migrate[] = { {"p2p", VSH_OT_BOOL, 0, gettext_noop("peer-2-peer migration")}, {"direct", VSH_OT_BOOL, 0, gettext_noop("direct migration")}, {"tunnelled", VSH_OT_BOOL, 0, gettext_noop("tunnelled migration")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist VM on destination")}, + {"undefinesource", VSH_OT_BOOL, 0, gettext_noop("undefine VM on source")}, {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("connection URI of the destination host")}, {"migrateuri", VSH_OT_DATA, 0, gettext_noop("migration URI, usually can be omitted")}, @@ -2504,6 +2506,12 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool (cmd, "tunnelled")) flags |= VIR_MIGRATE_TUNNELLED; + if (vshCommandOptBool (cmd, "persistent")) + flags |= VIR_MIGRATE_PERSIST_DEST; + + if (vshCommandOptBool (cmd, "undefinesource")) + flags |= VIR_MIGRATE_UNDEFINE_SOURCE; + if ((flags & VIR_MIGRATE_PEER2PEER) || vshCommandOptBool (cmd, "direct")) { /* For peer2peer migration or direct migration we only expect one URI -- 1.6.0.6

3 10

[libvirt] [PATCH] Support for SATA Disks in virDomainDiskBus
by pritesh 13 Nov '09

13 Nov '09

Hi All, I have just added support for SATA Disks in virDomainDiskBus and the patch for same is as below. Regards, Pritesh

2 3

[libvirt] [PATCH] LXC implement missing lxcDomainInterfaceStats (domifstat)
by Ryota Ozaki 12 Nov '09

12 Nov '09

Most part of code is just copied from qemu_driver.c. * src/lxc/lxc_driver.c: add lxcDomainInterfaceStats --- src/lxc/lxc_driver.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a917a46..542b382 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -48,6 +48,7 @@ #include "event.h" #include "nodeinfo.h" #include "uuid.h" +#include "stats_linux.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -1939,6 +1940,65 @@ cleanup: return ret; } +#ifdef __linux__ +static int +lxcDomainInterfaceStats(virDomainPtr dom, + const char *path, + struct _virDomainInterfaceStats *stats) +{ + lxc_driver_t *driver = dom->conn->privateData; + virDomainObjPtr vm; + int i; + int ret = -1; + + lxcDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + lxcDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + lxcError(dom->conn, dom, VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + lxcError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + + /* Check the path is one of the domain's network interfaces. */ + for (i = 0 ; i < vm->def->nnets ; i++) { + if (vm->def->nets[i]->ifname && + STREQ(vm->def->nets[i]->ifname, path)) { + ret = 0; + break; + } + } + + if (ret == 0) + ret = linuxDomainInterfaceStats(dom->conn, path, stats); + else + lxcError(dom->conn, dom, VIR_ERR_INVALID_ARG, + _("Invalid path, '%s' is not a known interface"), path); + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} +#else +static int +lxcDomainInterfaceStats(virDomainPtr dom, + const char *path ATTRIBUTE_UNUSED, + struct _virDomainInterfaceStats *stats ATTRIBUTE_UNUSED) + lxcError(dom->conn, dom, VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); + return -1; +} +#endif + static int lxcDomainGetAutostart(virDomainPtr dom, int *autostart) { lxc_driver_t *driver = dom->conn->privateData; @@ -2308,7 +2368,7 @@ static virDriver lxcDriver = { NULL, /* domainMigratePerform */ NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ + lxcDomainInterfaceStats, /* domainInterfaceStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ -- 1.6.2.5

3 2

[libvirt] Windows VM doesn't start as Linux one does
by Daniel Huhardeaux 12 Nov '09

12 Nov '09

Hi, everything is in the subject. I'm running Debian SID with libvirt-bin 0.7.2-3 and virt-manager 0.8.0-2. I had 4 VMs created manually some times ago (Lenny, Ubuntu 9.04, W2k and XPHome) which I migrate to libvirt. Both Linux are booting well, both Windows not: they start but suddenly reboot. On W2K I see the white starting bannier increasing on the bottom off the screen, and when done, reboot. On XPh at the time where the booting Windows screen should appear, VM restart. The I get the famous "Windows hasn't shutdown clearly, do you want to start in safe mode ... aso) On both systems, after first fail reboot, I can try and try again, always the same. If I stared VMs manually, no problem! My start script -which started without any problem my XPHome VM- is: #!/bin/bash AUDIO="es1370" VGA="std" sudo /usr/bin/kvm -localtime -cdrom /dev/scd0 -boot c -hda /media/XP/vdisk.img -hdb /media/XP/vdisk1.img -m 512 -soundhw $AUDIO -vga $VGA\ -net nic,vlan=0 -net vde,vlan=0,sock=/var/run/vde.ctl -usb -smb public -monitor tcp:127.0.0.1:32011,server,nowait & The XML file for the same VM which fail on boot is: <domain type='kvm'> <name>XPHome</name> <uuid>26e5de74-0841-c4b3-4cc1-e0df0f93cb31</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <pae/> </features> <clock offset='localtime'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> <source file='/media/XP/vdisk.img'/> <target dev='hda' bus='ide'/> </disk> <disk type='file' device='disk'> <source file='/media/XP/vdisk1.img'/> <target dev='hdb' bus='ide'/> </disk> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> <interface type='bridge'> <mac address='54:52:00:7a:ee:01'/> <source bridge='virbr2'/> </interface> <serial type='pty'> <source path='/dev/pts/6'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/6'> <source path='/dev/pts/6'/> <target port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> <sound model='es1370'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> </devices> </domain> ~>qemu-img info /media/XP/vdisk.img image: /media/XP/vdisk.img file format: raw virtual size: 6.0G (6442450944 bytes) disk size: 5.8G ~>qemu-img info /media/XP/vdisk1.img image: /media/XP/vdisk1.img file format: raw virtual size: 2.0G (2147483648 bytes) disk size: 268M The disk image from all Linux VMs are also raw. On another server I installed from scratch on LVM partition an XPPro Windows VM without any problem. Thanks for any hint. Regards -- Daniel

2 4

[libvirt] [PATCH] Fix save and restore with non-privileged guests and SELinux
by Daniel P. Berrange 12 Nov '09

12 Nov '09

When running qemu:///system instance, libvirtd runs as root, but QEMU may optionally be configured to run non-root. When then saving a guest to a state file, the file is initially created as root, and thus QEMU cannot write to it. It is also missing labelling required to allow access via SELinux. * src/qemu/qemu_driver.c: Set ownership on save image before running migrate command in virDomainSave impl. Call out to security driver to set save image labelling * src/security/security_driver.h: Add driver APIs for setting and restoring saved state file labelling * src/security/security_selinux.c: Implement saved state file labelling for SELinux --- src/qemu/qemu_driver.c | 35 ++++++++++++++++++++++++++++++++--- src/security/security_driver.h | 7 +++++++ src/security/security_selinux.c | 23 +++++++++++++++++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 30003e6..b023902 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3347,6 +3347,7 @@ static int qemudDomainSave(virDomainPtr dom, char *xml = NULL; struct qemud_save_header header; int ret = -1; + int rc; virDomainEventPtr event = NULL; memset(&header, 0, sizeof(header)); @@ -3435,11 +3436,24 @@ static int qemudDomainSave(virDomainPtr dom, } fd = -1; + if (driver->privileged && + chown(path, driver->user, driver->group) < 0) { + virReportSystemError(NULL, errno, + _("unable to set ownership of '%s' to user %d:%d"), + path, driver->user, driver->group); + goto endjob; + } + + if (driver->securityDriver && + driver->securityDriver->domainSetSavedStateLabel && + driver->securityDriver->domainSetSavedStateLabel(dom->conn, vm, path) == -1) + goto endjob; + if (header.compressed == QEMUD_SAVE_FORMAT_RAW) { const char *args[] = { "cat", NULL }; qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjEnterMonitor(vm); - ret = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); + rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); qemuDomainObjExitMonitor(vm); } else { const char *prog = qemudSaveCompressionTypeToString(header.compressed); @@ -3450,13 +3464,28 @@ static int qemudDomainSave(virDomainPtr dom, NULL }; qemuDomainObjEnterMonitor(vm); - ret = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); + rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); qemuDomainObjExitMonitor(vm); } - if (ret < 0) + if (rc < 0) goto endjob; + if (driver->privileged && + chown(path, 0, 0) < 0) { + virReportSystemError(NULL, errno, + _("unable to set ownership of '%s' to user %d:%d"), + path, 0, 0); + goto endjob; + } + + if (driver->securityDriver && + driver->securityDriver->domainRestoreSavedStateLabel && + driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, path) == -1) + goto endjob; + + ret = 0; + /* Shut it down */ qemudShutdownVMDaemon(dom->conn, driver, vm); event = virDomainEventNewFromObj(vm, diff --git a/src/security/security_driver.h b/src/security/security_driver.h index fde2978..5514962 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -42,6 +42,11 @@ typedef int (*virSecurityDomainRestoreHostdevLabel) (virConnectPtr conn, typedef int (*virSecurityDomainSetHostdevLabel) (virConnectPtr conn, virDomainObjPtr vm, virDomainHostdevDefPtr dev); +typedef int (*virSecurityDomainSetSavedStateLabel) (virConnectPtr conn, + virDomainObjPtr vm, + const char *savefile); +typedef int (*virSecurityDomainRestoreSavedStateLabel) (virConnectPtr conn, + const char *savefile); typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn, virDomainObjPtr sec); typedef int (*virSecurityDomainReserveLabel) (virConnectPtr conn, @@ -71,6 +76,8 @@ struct _virSecurityDriver { virSecurityDomainRestoreLabel domainRestoreSecurityLabel; virSecurityDomainRestoreHostdevLabel domainRestoreSecurityHostdevLabel; virSecurityDomainSetHostdevLabel domainSetSecurityHostdevLabel; + virSecurityDomainSetSavedStateLabel domainSetSavedStateLabel; + virSecurityDomainRestoreSavedStateLabel domainRestoreSavedStateLabel; /* * This is internally managed driver state and should only be accessed diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 0e31077..bd838e6 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -523,6 +523,7 @@ done: return ret; } + static int SELinuxRestoreSecurityPCILabel(virConnectPtr conn, pciDevice *dev ATTRIBUTE_UNUSED, @@ -623,6 +624,26 @@ SELinuxRestoreSecurityLabel(virConnectPtr conn, return rc; } + +static int +SELinuxSetSavedStateLabel(virConnectPtr conn, + virDomainObjPtr vm, + const char *savefile) +{ + const virSecurityLabelDefPtr secdef = &vm->def->seclabel; + + return SELinuxSetFilecon(conn, savefile, secdef->imagelabel); +} + + +static int +SELinuxRestoreSavedStateLabel(virConnectPtr conn, + const char *savefile) +{ + return SELinuxRestoreSecurityFileLabel(conn, savefile); +} + + static int SELinuxSecurityVerify(virConnectPtr conn, virDomainDefPtr def) { @@ -692,4 +713,6 @@ virSecurityDriver virSELinuxSecurityDriver = { .domainSetSecurityLabel = SELinuxSetSecurityLabel, .domainSetSecurityHostdevLabel = SELinuxSetSecurityHostdevLabel, .domainRestoreSecurityHostdevLabel = SELinuxRestoreSecurityHostdevLabel, + .domainSetSavedStateLabel = SELinuxSetSavedStateLabel, + .domainRestoreSavedStateLabel = SELinuxRestoreSavedStateLabel, }; -- 1.6.2.5

3 3

[libvirt] [PATCH 0/2] Fix xen domain listing
by Daniel P. Berrange 12 Nov '09

12 Nov '09

These patches are a re-post of Jonas Eriksson's work from a couple of months ago, that we mistakenly forgot to commit. The first patch is unchanged, apart from being adjusted for new source code layout. The second patch is changed so that it checks against the hypervisor, not Xend, since using Xend has a very serious performance impact (as much as 1 second per domain queried has been seen) Daniel

3 6

[libvirt] kvm network modes
by Rakotomandimby Mihamina 12 Nov '09

12 Nov '09

Hi all, On an ubuntu host, I have the network: virsh # net-dumpxml default <network> <name>default</name> <uuid>9af73579-2dea-d0a9-020d-a45b0526b07f</uuid> <forward mode='nat'/> <bridge name='virbr0' stp='on' forwardDelay='0' /> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254' /> </dhcp> </ip> </network> Would you now some doecumentation on non NATing configuration? I would like to give my guests public IP adresses. I create my guests using: virt-install --connect qemu:///system \ [...] \ --network=network:default where 'default' is the configuration above. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 33 11 207 36

2 2

[libvirt] [PATCH 1/2] Add a new <nesting/> option in the domain config features list.
by Evan Broder 12 Nov '09

12 Nov '09

--- docs/formatdomain.html.in | 4 ++++ docs/schemas/domain.rng | 5 +++++ src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 72bd7b9..c4eed79 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -263,6 +263,7 @@ <pae/> <acpi/> <apic/> + <nesting/> </features> ...</pre> @@ -282,6 +283,9 @@ <dd>ACPI is useful for power management, for example, with KVM guests it is required for graceful shutdown to work. </dd> + <dt><code>nesting</code></dt> + <dd>Some hypervisors support nested hardware-supported + virtualization, allowing you to run VMs inside of VMs.</dd> </dl> <h3><a name="elementsTime">Time keeping</a></h3> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index b75f17e..78a4504 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1213,6 +1213,11 @@ <empty/> </element> </optional> + <optional> + <element name="nesting"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 918a5d7..653cba0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -70,7 +70,8 @@ VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "acpi", "apic", - "pae") + "pae", + "nesting") VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fadf43f..7306b0b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -517,6 +517,7 @@ enum virDomainFeature { VIR_DOMAIN_FEATURE_ACPI, VIR_DOMAIN_FEATURE_APIC, VIR_DOMAIN_FEATURE_PAE, + VIR_DOMAIN_FEATURE_NESTING, VIR_DOMAIN_FEATURE_LAST }; -- 1.6.2.1

2 2

[libvirt] VirtualBox and windows.
by Varghese Mathew 12 Nov '09

12 Nov '09

Does libvirt support running a virtualbox vm on windows.. ? Is there any limitations with this, vs. a linux environment? /v

2 1

[libvirt] [PATCH] Fix error handling in qemuMonitorOpen
by Ryota Ozaki 12 Nov '09

12 Nov '09

* src/qemu/qemu_monitor.c: add error check for qemuMonitorOpenXXX --- src/qemu/qemu_monitor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index dcd2dd7..2357734 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -474,6 +474,8 @@ qemuMonitorOpen(virDomainObjPtr vm, goto cleanup; } + if (mon->fd == -1) goto cleanup; + if (virSetCloseExec(mon->fd) < 0) { qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to set monitor close-on-exec flag")); -- 1.6.2.5

2 1

[libvirt] [PATCH] Exclude numactl on s390[x]
by Daniel P. Berrange 12 Nov '09

12 Nov '09

The numactl package is not applicable for s390[x] arches, so do not enable it as a build dep. * libvirt.spec.in: Exclude numactl on s390[x] --- libvirt.spec.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9238bdd..770a064 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -72,6 +72,10 @@ %define with_xen 0 %endif +# Numactl is not available on s390[x] +%ifarch s390 s390x +%define with_numactl 0 +%endif # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX %if 0%{?rhel} -- 1.6.2.5

3 2

[libvirt] [PATCH] Disable IPv6 socket auto-binding to IPv4 socket
by Daniel P. Berrange 12 Nov '09

12 Nov '09

Sometimes getaddrinfo returns IPv4 addresses before IPv4 addresses. IPv6 sockets default to attempting to bind to IPv4 addresses too. So if the IPv4 address is activated first, then binding to IPv6 will fail. * daemon/libvirtd.c: Bind to IPv6 and IPv4 addresses separately --- daemon/libvirtd.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 2fcd9a9..01c9bbc 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -615,6 +615,21 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c int opt = 1; setsockopt (fds[*nfds_r], SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt); +#ifdef IPV6_V6ONLY + if (runp->ai_family == PF_INET6) { + int on = 1; + /* + * Normally on Linux an INET6 socket will bind to the INET4 + * address too. If getaddrinfo returns results with INET4 + * first though, this will result in INET6 binding failing. + * We can trivially cope with multiple server sockets, so + * we force it to only listen on IPv6 + */ + setsockopt(fds[*nfds_r], IPPROTO_IPV6,IPV6_V6ONLY, + (void*)&on, sizeof on); + } +#endif + if (bind (fds[*nfds_r], runp->ai_addr, runp->ai_addrlen) == -1) { if (errno != EADDRINUSE) { VIR_ERROR(_("bind: %s"), virStrerror (errno, ebuf, sizeof ebuf)); -- 1.6.2.5

2 1

[libvirt] Mounting a bare-metal folder as a drive
by Adam Mooz 12 Nov '09

12 Nov '09

Hello List, Still working on getting the DVD drive to go, but I got another question. I'm attempting to ad a folder located on the bare-metal machine to the VM and have it appear as a drive (such as HDD), is this possible? I've looked over the documentation and it suggests this is only possible for USB devices or virtual disks, but not a folder. How would I go about adding a folder located on the bare-metal to the VM to appear as a hard drive but still be accessable to the bare metal machine? ----------------------------------------------------------------- Adam Mooz Adam.Mooz(a)gmail.com AdamMooz(a)me.com http://www.AdamMooz.com

2 3

[libvirt] [PATCH] python bindings: override virDomainGetVcpus doc
by Dan Kenigsberg 12 Nov '09

12 Nov '09

--- python/libvirt-override-api.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 148b89b..e7b5cbe 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -118,7 +118,7 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> </function> <function name='virDomainGetVcpus' file='python'> - <info>Extract information about virtual CPUs of domain, store it in info array and also in cpumaps if this pointer is'nt NULL.</info> + <info>Extract information about virtual CPUs of domain. Return two lists: one with cpuinfo per vcpu, and the other with cpu affinity map per vcpu.</info> <return type='int' info='the number of info filled in case of success, -1 in case of failure.'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object, or NULL for Domain0'/> </function> -- 1.6.5.2

2 1

[libvirt] Possibly deadlock with tunnelled migration
by Cole Robinson 12 Nov '09

12 Nov '09

Hi Chris (and list), Playing with TUNNELLED migration, I'm hitting an issue. Take this example: VM URI = qemu+ssh://phys1/system destconn = qemu:///system invoking virDomainMigrate with a VM from the former URI, and destconn as the latter, we will deadlock. The qemu driver would be reopening it's local qemu:///system, and eventually lock up. We should probably add some sanity checking for the URI we plan to open. Aside from that, anyone have recommendations on the best way to handle the above situation? I'm currently improving the migration support in virt-manager, and if the TUNNELLED API requires opening a URI, it makes the remote-to-local migration case a bit annoying, because we would have to require the user to provide a remote accessible URI for the local system. Thanks, Cole

2 2

[libvirt] [PATCH] phyp: too much timeout when polling socket
by Eduardo Otubo 11 Nov '09

11 Nov '09

Hello all, Since I moved to libssh2 I had noticed a weird behaviour, virsh was taking too much time to complete the operations when using phyp driver. Just found the problem, 10 seconds of timeout passed to select(). Changed to zero, since I'm just polling the socket. Actually this patch is more important than it seems, now I can write a script (using virsh) to test all the phyp features. Thanks! []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

3 3

[libvirt] [PATCH] Set owner and group for file used for saving domain
by Anoop Vijayan 11 Nov '09

11 Nov '09

virsh save a domain created by libvirt and it hangs with the log message "sh: /home/newguest: Permission denied". --- src/qemu/qemu_driver.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 30003e6..a2d9534 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3415,6 +3415,11 @@ static int qemudDomainSave(virDomainPtr dom, goto endjob; } + if (qemuDomainSetFileOwnership(dom->conn, path, driver->user, + driver->group) < 0 ) { + goto endjob; + } + if (safewrite(fd, &header, sizeof(header)) != sizeof(header)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "%s", _("failed to write save header")); -- 1.5.4.5 -- Cheers! Anoop Linux Technology Center, IBM

2 1

[libvirt] [PATCH] Fix warning on make due to missing cast (int)
by Ryota Ozaki 11 Nov '09

11 Nov '09

qemu/qemu_monitor_text.c: In function 'qemuMonitorTextIOProcess': qemu/qemu_monitor_text.c:175: error: format '%d' expects type 'int', but argument 7 has type 'size_t' * src/qemu/qemu_monitor.c src/qemu/qemu_monitor_text.c: cast size_t to int when passing to '%d' --- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor_text.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3e6a490..dcd2dd7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -179,7 +179,7 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) if (mon->msg && mon->msg->txOffset == mon->msg->txLength) msg = mon->msg; - VIR_DEBUG("Process %d", mon->bufferOffset); + VIR_DEBUG("Process %d", (int)mon->bufferOffset); len = qemuMonitorTextIOProcess(mon, mon->buffer, mon->bufferOffset, msg); @@ -196,7 +196,7 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) VIR_FREE(mon->buffer); mon->bufferOffset = mon->bufferLength = 0; } - VIR_DEBUG("Process done %d used %d", mon->bufferOffset, len); + VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len); if (msg && msg->finished) virCondBroadcast(&mon->notify); return len; @@ -319,7 +319,7 @@ qemuMonitorIORead(qemuMonitorPtr mon) mon->buffer[mon->bufferOffset] = '\0'; } - VIR_DEBUG("Now read %d bytes of data", mon->bufferOffset); + VIR_DEBUG("Now read %d bytes of data", (int)mon->bufferOffset); return ret; } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index db7ff57..ee234a1 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -172,7 +172,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED, /* Don't print raw data in debug because its full of control chars */ /*VIR_DEBUG("Process data %d byts of data [%s]", len - used, data + used);*/ - VIR_DEBUG("Process data %d byts of data", len - used); + VIR_DEBUG("Process data %d byts of data", (int)(len - used)); /* Look for a non-zero reply followed by prompt */ if (msg && !msg->finished) { -- 1.6.2.5

3 2

[libvirt] [PATCH] Prevent initializing ebtables if disabled in qemu.conf
by Ryota Ozaki 11 Nov '09

11 Nov '09

* src/qemu/qemu_conf.c: don't initialize ebtables if disabled --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 28567b2..5f492dd 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -322,7 +322,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, p = virConfGetValue (conf, "mac_filter"); CHECK_TYPE ("mac_filter", VIR_CONF_LONG); - if (p) { + if (p && p->l) { driver->macFilter = p->l; if (!(driver->ebtables = ebtablesContextNew("qemu"))) { driver->macFilter = 0; -- 1.6.2.5

5 5

[libvirt] RFC move logging initialization earlier in libvirtd
by Dave Allan 11 Nov '09

11 Nov '09

I noticed yesterday that logging gets initialized fairly far into the libvirtd startup process, so messages generated during server startup don't get logged to the same sinks that will be used for the rest of the life of the daemon. I'd like to explore moving the logging startup to an earlier point. Has this idea been explored previously? Dave

2 3

[libvirt] [PATCH] phyp: ssh authentication with pub keys fixed
by Eduardo Otubo 11 Nov '09

11 Nov '09

-- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

2 9

[libvirt] ANNOUNCE: libguestfs 1.0.78 released
by Richard W.M. Jones 11 Nov '09

11 Nov '09

I'm pleased to announce the release of libguestfs 1.0.78. Libguestfs is a library for accessing and modifying virtual machine disk images. Home page: http://libguestfs.org/ Source: http://libguestfs.org/download/ Binaries: http://libguestfs.org/FAQ.html#binaries A Fedora build is available in Koji here: http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 (These release notes cover all the significant changes since the last announcement which was for 1.0.67, 2 months ago). New features: - FUSE support so you can mount guest filesystems in the host: http://rwmj.wordpress.com/2009/11/03/browsing-guests-using-fuse/ - Support for btrfs, gfs, gfs2, hfs, hfs+, nilfs2, jfs, reiserfs, xfs: http://rwmj.wordpress.com/2009/11/08/filesystem-metadata-overhead/ - Support for huge (multi-exabyte) sparse virtual disks: http://rwmj.wordpress.com/2009/11/04/petabytes-exabytes-why-not/ http://git.et.redhat.com/?p=libguestfs.git;a=commit;h=5ce72e039ca332ba19bb9… - New partitioning API, supports GPT and more: http://libguestfs.org/guestfs.3.html#guestfs_part_add http://git.et.redhat.com/?p=libguestfs.git;a=commit;h=b1e1ca2f74a921b3f7845… - New tool: virt-ls http://rwmj.wordpress.com/2009/10/19/new-tool-virt-ls/ - New tool: virt-tar http://rwmj.wordpress.com/2009/10/19/new-tool-virt-tar/ - New tool: virt-edit http://rwmj.wordpress.com/2009/09/23/virt-edit/ - New tool: virt-rescue http://rwmj.wordpress.com/2009/09/22/virt-rescue/ - Windows Registry support, tools and library: http://rwmj.wordpress.com/2009/10/29/virt-win-reg-get-at-the-windows-regist… http://rwmj.wordpress.com/2009/10/28/libhivex-windows-registry-hive-extract… - OCaml bindings for virt-inspector - RELAX NG schema for virt-inspector - New APIs: utimens, vfs_type, truncate, truncate_size, lchown, lstatlist, lxattrlist, readlinklist, case_sensitive_path, find0, mkfs_b, mke2journal, and more ... - New program: OCaml viewer http://rwmj.wordpress.com/2009/09/29/graphical-virt-df/ - Allow stdout to be redirected when running guestfish remotely (Matt Booth). - Remove requirement for vmchannel support in qemu (horray!) and the tricky main loop code. Bug fixes: (Too many to list here, see: http://git.et.redhat.com/?p=libguestfs.git;a=log) Thanks to: Jim Meyering, Matt Booth and Charles Duffy for lots of bugfixes, patches and testing. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html

1 0

[libvirt] Re: libvirt code review
by Daniel Veillard 11 Nov '09

11 Nov '09

On Thu, Nov 05, 2009 at 03:27:16PM -0500, Steve Grubb wrote: > Hello, > > I missed code in a couple other directories. This is much shorter. > > -Steve > > > In daemon/libvirtd.c at line 371 the "if" statement will never be true. ret is > set to 0 at line 350 and never changed. probably a leftover from previous refactoring, server->shutdown = 1 is directly set in the cases that matters, removed ret altogether. In the current code head, server->shutdown has been renamed server->quitEventThread, so patch changed accordingly. > At line 1535 seems to want to loop on reads that return -1 and either EINTR or > EAGAIN. The implementation does not. Rather than calling return at line 1538, > it should likely have a "goto again" with the again label placed just before > the read call. Actually in that case I think the current code is fine, the function should exit 0 on EAGAIN, it's documented, I assume the read will be retried by the caller, otherwise we would have used saferead() there an internal routine taking directly care of interrupted calls. > At line 1783 is a call to write that likely wants a treatment similar to the > read above. Same thing, I guess it's intended behaviour :-) > In tools/virsh.c at line 4616 is a test that format is true. It was checked at > line 4614 and nothing changed it. Ah right, harmless but fixed :-) > At line 6810 memory is allocated. At the error exit at line 6824 it has not > been freed. okay > At line 7664 is a test for network==NULL. This will always be true. > At line 7704 is a test for iface == NULL. This will always be true. > At line 7741 is a test for pool==NULL. This will always be true. Okay, fixed, allows the test to fit in 80 columns too, Patch for git head attached. thanks a lot ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Bump required netcf version to 0.1.4
by Laine Stump 11 Nov '09

11 Nov '09

0.1.3 will build everything, but causes a segfault. --- configure.in | 2 +- libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 7ad1a90..cd8bb95 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,7 @@ GNUTLS_REQUIRED="1.0.25" AVAHI_REQUIRED="0.6.0" POLKIT_REQUIRED="0.6" PARTED_REQUIRED="1.8.0" -NETCF_REQUIRED="0.1.3" +NETCF_REQUIRED="0.1.4" dnl Checks for C compiler. AC_PROG_CC diff --git a/libvirt.spec.in b/libvirt.spec.in index 9238bdd..7c43180 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -308,7 +308,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0 BuildRequires: libssh2-devel %endif %if %{with_netcf} -BuildRequires: netcf-devel >= 0.1.3 +BuildRequires: netcf-devel >= 0.1.4 %endif # Fedora build root suckage -- 1.6.5.15.gc274d

2 1

[libvirt] Re: libvirt code review
by Daniel Veillard 11 Nov '09

11 Nov '09

On Thu, Nov 05, 2009 at 01:12:41PM -0500, Steve Grubb wrote: > Hello, > > The following is against 0.7.2-3 from F-13 cvs. I mention each source file at > the beginning of a block and have a blank line indicating that we are moving > along to the next file. Hope you find this helpful. > > -Steve Okay I fixed the issues on a 0.7.2 branch and then backported the patch back onto git head, except for a few exceptions, everything was still applying ! > In src/util/storage_file.c at line 192, there is a test that I presume is for > -1. The problem is that its a variable that is an unsigned long is 64 bits on unsigned long size; size = ((buf[4+4+8] << 24) | (buf[4+4+8+1] << 16) | (buf[4+4+8+2] << 8) | buf[4+4+8+3]); /* QCowHeader.backing_file_size */ [...] if (size + 1 == 0) return BACKING_STORE_INVALID; if (VIR_ALLOC_N(*res, size + 1) < 0) { I think it's just to make 100% sure the size + 1 computation on the following line won't overflow. So current code looks fine to me > some arches. It would probably be better to use a unit32_t for size or change > the test. The bottom line is the test will evaluate false on some arches. unit32_t is nowhere used in libvirt code I would rather not use it, we could use size_t there since the goal is to allocate memory but I'm not 100% sure it's right, basically the test make sure we won't try to allocate more than 4G of memory in one chunk. > In src/datatypes.c at lines 335, 476, and 790, there is a test to see if uuid > is NULL. There was a test in the beginning of the function and it returned if > this was true, so this "if" statement can be deleted in all 3 cases. Hum, this is the virGetxxx() functions, they lookup objects given the name or uuid, and hold big TODOs comments at the start: /* TODO search by UUID first as they are better differenciators */ /* TODO check the UUID */ And somehow I think the intend was to allow lookup only by name, with the uuid being unknown, I would think the proper fix is actually to drop the || (uuid == NULL) at the start of the function. > In src/libvirt.c at line 1122, there is an "if" statement that "ands" 0 with > the return from STREQ. Should that have been a == ? The test evaluates false > as is. Comparing with others similar message being emitted in other places, I think '0 && ' is just a bogus remain, I'm removing it. > At line 3214, there is a test if uri == NULL. Then within that "if" > statement at line 3216 is a test for if uri is still NULL. Should that have > been a test for dstURI being NULL? yup ! That had been fixed in head since though. > In src/remote/remote_driver.c at line 939 is a do loop. By design, it seems > the intention was to reloop if waitpid returns -1 and EINTR is set. The > implementation doesn't match it. If -1 is returned, it will do the continue, > which is to jump to the end of the do loop and it evaluates reap which would > be a -1 and it will exit. I suspect instead of continue, it should "goto > again" and again would be placed before the call to waitpid. > This problem is found again at line 1406 okay, nasty, somehow it's easy to think continue will retry from top of the loop not including the test > In src/xen/sexpr.c at line 443 is a test for token == NULL. Token is > guaranteed to not be NULL because of the loop entry test at line 440. okay > In src/xen/xend_internal.c at line 1367 is a test for connectPort being true. > Prior to this, connectPort is guranteed to be valid or it would have jumped to > no_memory. okay as the affectation is done in both if and else parts of the preceeding test. > In src/xen/xm_internal.c at line 579 is a test for dh being valid. It is > guaranteed to be valid since a -1 was returned from the function on a failed > call to opendir. okay > At line 2219 is an unusual if statement. Normally you do not see something > constructed as (!cpu)<0). That would seem to have meant cpu>=0 which is more > straightforward. if (def->cpumask && !(cpus = virDomainCpuSetFormat(conn, def->cpumask, def->cpumasklen)) < 0) goto cleanup; But the function returns a string or NULL in case of error, I try to fight again not fully parenthetized test expressions but I'm loosing that fight unfortunately :-( in any case the < 0 test is bogus since it's a string if ((def->cpumask) && ((cpus = virDomainCpuSetFormat(conn, def->cpumask, def->cpumasklen)) == NULL)) goto cleanup seems the right construct to me, as it tests if the call failed. > In src/phyp/phyp_driver.c at line 1008, there is a strdup inside an if > statement with nothing catching its returned memory. Two lines later it does > the same thing again but puts it in an array. Not sure what the if statement > should have been checking, but its definitely a memory leak as is. > At line 1040 is an allocation. If that fails, it passes dom->comm to an error > reporting function. However, at line 1034, dom was set to NULL and is not > changed. > The same problem appears again at line 1085. > At line 1105 is a test for exit_status < 0. Nothing has changed it since it > was initialized. That code was completely revamped since, none of this applies now, it was pretty bad ! C.f. https://bugzilla.redhat.com/show_bug.cgi?id=529977 > In src/openvz/openvz_conf at line 336 is a test for from being NULL. However, > it was previously used at line 333 before checking if it was NULL. yeah, there was another passed pointer which should have got the same check too, cleaning this up. > In src/qemu/qemu_monitor_text.c at line 178, a variable, control, is assigned > to a member of the msg structure. However, control goes out of scope before > its used. It should be in the function level declarations. Ah right, nasty ! > In src/qemu/qemu_driver.c at line 894 is a test for retries being 0. This will > always be true since the loop has no break statements. > At line 4484, we leave the function without freeing devname. okay, > In src/lxc/lxc_conf.c at line 111, 114, and 125, we leave the function without > freeing filename. okay > In src/lxc/lxc_container.c at line 743, we leave the function without freeing > ttyPath. okay > In src/storage/storage_driver.c at lines 83 and 93 we call storageLog/fprintf > with the second parameter to %s being NULL. Wasn't an empty string intended? I used "no error message found" as we failed to gather an error message > In src/storage/storage_backend_disk.c at line 88, we leave the function > without freeing devpath. okay > At line 649 is a test for part_num being NULL. Can it ever be NULL? No, but we should check for an empty string, done > In src/node_device/node_device_hal.c at line 405 is a test for hal_cap_names > being true, its conceivable to get there without it being initialized. For > example, line 373 could jump to it. It should probably be initialized to 0. okay > At line 781 is a test for udi being true. It will alwys be false since once > its defined it will never jump to failure. > At line 782 is a use of num_devs without it being initialized. If the problem > mentioned for udi is fixed by deleting all this code, then the problem goes > away. okay removing that block, I just hope we won't add a failure jump from within the loop > In src/lxc/lxc_controller.c at line 633 is a test for containerPty not being > -1. Its conceivable to get here with it notr being initialized perhaps at line > 512 for example. It should probably be initialized to a -1. yup, okay > At line 735 is an if statement "anding" 0 with getuid(). this should probably > be a != rather than a &&. right since the error message clearly indicate we expect this to run as root. Thanks a lot for the review ! Patch for git head attached Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 5

[libvirt] Mounting a raw DVD
by Adam Mooz 11 Nov '09

11 Nov '09

Hello List, I'm attempting to pass a DVD drive of a headless server into a virtual machine. So far I've managed to mount *something* into the VM, but it's being registered as a blank DVD within the VM. When I mount /dev/ dvd into the bare-metal machine it registers normally as the DVD. How do I pass physical drives into a VM and back out using libvirt? Command used: #virsh attach-disk Montreal /dev/dvd hdc --mode readonly --driver phy --type cdrom Connecting to uri: qemu:///system Disk attached successfully VM XML file: <domain type='kvm'> <name>Montreal</name> <uuid>0f79ba7f-27bf-16a0-5887-6cfa2b5569f1</uuid> <memory>2097152</memory> <currentMemory>2097152</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.11'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> <disk type='file' device='disk'> <source file='(Mangled Purposely)'/> <target dev='vda' bus='virtio'/> </disk> <interface type='bridge'> <mac address='(mangled purposly)/> <source bridge='br0'/> <model type='virtio'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> </devices> </domain> Thanks in advance, ----------------------------------------------------------------- Adam Mooz Adam.Mooz(a)gmail.com AdamMooz(a)me.com http://www.AdamMooz.com

2 5

[libvirt] [RFD] API for reporting virtual machine memory statistics
by Adam Litke 11 Nov '09

11 Nov '09

I am working on a feature that enables virtual machines to report memory statistics to the host. Examples include: free memory, number of pages swapped out/in, number of page faults, etc. This information is useful to a virtual machine manager which can use it to make memory ballooning or VM migration decisions. My implementation uses the virtio-balloon driver as a conduit for the memory info. What is the best way to expose these memory stats in libvirt? I see two possibilities. The dominfo command already queries the balloon driver so I could easily extend this command to report the additional fields. The second, and better IMO, option is to introduce a new command (dommemstat) with output similar to domblkstat. What do you think? -- Thanks, Adam

2 1

[libvirt] Libvirt & VMware using bindings?
by H Alexandre 11 Nov '09

11 Nov '09

Hi, I can see on the home page that Libvirt supports Linux virtualization platform (Xen, KVM…) but in the bindings page mentions about other languages integration (perl & java for instance). I would like to know if there is a way (using those bindings) to use standard Libvirt based code to manage VMware virtualization platform ? Thanks a lot, Regards, Alex

3 2

[libvirt] Need second private network between guests's
by Gerry Reno 10 Nov '09

10 Nov '09

I've got a shared device 'br0' between my host and all my guests. The guests are now on the host network. What do I need to do in order to setup a second 'private' network between the guests? My host network is on 192.168 and I'd like the second private network on 172.19. thx, -Gerry

3 3

Re: [libvirt] Get Virtual Machine Information
by Gandhiraj Natarajan 10 Nov '09

10 Nov '09

Hi Jun Koi Thanks for your reply. I am writing a tool to document the novell xen server and its vm configuration. for this i need to know how to get operating system of vm and its ipaddress. Help me Regards, Gandhiraj Natarajan --- On Fri, 23/10/09, Jun Koi <junkoi2004(a)gmail.com> wrote: From: Jun Koi <junkoi2004(a)gmail.com> Subject: Re: [libvirt] Get Virtual Machine Information To: "Gandhiraj Natarajan" <gandhiraj_gk(a)yahoo.co.in> Date: Friday, 23 October, 2009, 7:51 PM On Thu, Oct 22, 2009 at 5:39 PM, Gandhiraj Natarajan <gandhiraj_gk(a)yahoo.co.in> wrote: > > Hi > > 1. We need to know how to get the IP addresses of virtual machines running in Novel Xen Server? Is that HVM, or PV? in the case of HVM, it is not realistic to get the IP, as the IP is managed from inside the HVM, and that is out-of-control from Dom0. > 2. We need to know how to get the proper operating system like Windows XP or 2000 or 2003? Could you explain why you need this kind of information?? Thanks, J The INTERNET now has a personality. YOURS! See your Yahoo! Homepage. http://in.yahoo.com/

1 0

[libvirt] timing issues of calling virsh on the command line
by David Wilcox 10 Nov '09

10 Nov '09

Hi, I've encountered some concurrency issues when calling virsh in a script. If I try to restore a VM too soon after it's been saved, libvirtd will stop responding. As well, if I try to save a VM too soon after it's been restored, libvirtd will stop responding. At the moment, I am not using any type of wait in my program for virsh to come back. I merely let the system call run its course and I assume that virsh will return when it's done waiting. Is there any type of wait that needs to occur in order to avoid these concurrency issues? Thanks, David

2 2

[libvirt] Add support for qemu's guestfwd
by Matthew Booth 10 Nov '09

10 Nov '09

This is an update of the patchset I posted yesterday. There have been a few changes in the 4th patch, which actually adds guestfwd support: Firstly, after discussion on IRC, it was agreed that 'vmchannel' is a poor name for the collection of implementations of private host<->guest channels, because it is the name of a specific implementation. Consequently the name has been changed to just 'channel'. Secondly, I've fixed a bunch of things I noticed while adding actual vmchannel support (patches to follow separately). Lastly, I've changed the relax-ng a bit to check the precise set of attributes for guestfwd. This change is also followed up in the vmchannel support. The patch now supports the following domain XML: <channel type='pipe'> <source path='/tmp/guestfwd'/> <target type='guestfwd' address='10.0.2.1' port='4600'/> </channel> It will output the following on the qemu command line for this: -chardev pipe,id=channel0,path=/tmp/guestfwd \ -net user,guestfwd=tcp:10.0.2.1:4600-chardev:channel0 Support for -chardev is as complete as the current character device support. Because of the legacy vmchannel, there was also some confusion about whether these patches are intended for merging. These patches aren't directly related to vmchannel, and are targeted at merging. Matt

3 16

[libvirt] [PATCH 1/2] Separate character device documentation into guest and host sections
by Matthew Booth 10 Nov '09

10 Nov '09

This change refactors the existing character device documentation to make it explicit which directives configure the guest interface, and which configure the host interface. * docs/formatdomain.html.in: Do it. --- docs/formatdomain.html.in | 117 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 88 insertions(+), 29 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 72bd7b9..be35ad0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -789,28 +789,87 @@ qemu-kvm -net nic,model=? /dev/null </devices> </domain></pre> + <p> + In each of these directives, the top-level element name (parallel, serial, + console, channel) describes how the device is presented to the guest. The + guest interface is configured by the <code>target</code> element. + </p> - <dl> - <dt><code>parallel</code></dt> - <dd>Represents a parallel port</dd> - <dt><code>serial</code></dt> - <dd>Represents a serial port</dd> - <dt><code>console</code></dt> - <dd>Represents the primary console. This can be the paravirtualized - console with Xen guests, or duplicates the primary serial port - for fully virtualized guests without a paravirtualized console.</dd> - <dt><code>source</code></dt> - <dd>The attributes available for the <code>source</code> element - vary according to the <code>type</code> attribute on the parent - tag. Allowed variations will be described below</dd> - <dt><code>target</code></dt> - <dd>The port number of the character device is specified via the - <code>port</code> attribute, numbered starting from 1. There is - usually only one console device, and 0, 1 or 2 serial devices - or parallel devices. - </dl> + <p> + The interface presented to the host is given in the <code>type</code> + attribute of the top-level element. The host interface is + configured by the <code>source</code> element. + </p> + + <h5><a name="elementsCharGuestInterface">Guest interface</a></h5> + + <p> + A character device presents itself to the guest as one of the following + types. + </p> + + <h6><a name="elementCharParallel">Parallel port</a></h6> + + <pre> + ... + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + ...</pre> + + <p> + <code>target</code> can have a <code>port</code> attribute, which + specifies the port number. Ports are numbered starting from 1. There are + usually 0, 1 or 2 parallel ports. + </p> + + <h6><a name="elementCharSerial">Serial port</a></h6> + + <pre> + ... + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + ...</pre> + + <p> + <code>target</code> can have a <code>port</code> attribute, which + specifies the port number. Ports are numbered starting from 1. There are + usually 0, 1 or 2 serial ports. + </p> + + <h6><a name="elementCharConsole">Console</a></h6> + + <p> + This represents the primary console. This can be the paravirtualized + console with Xen guests, or duplicates the primary serial port for fully + virtualized guests without a paravirtualized console. + </p> + + <pre> + ... + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + ...</pre> + + <p> + If the console is presented as a serial port, the <code>target</code> + element has the same attributes as for a serial port. There is usually + only 1 console. + </p> + + <h5><a name="elementsCharHostInterface">Host interface</a></h5> + + <p> + A character device presents itself to the host as one of the following + types. + </p> - <h5><a name="elementsCharSTDIO">Domain logfile</a></h5> + <h6><a name="elementsCharSTDIO">Domain logfile</a></h6> <p> This disables all input on the character device, and sends output @@ -825,7 +884,7 @@ qemu-kvm -net nic,model=? /dev/null ...</pre> - <h5><a name="elementsCharFle">Device logfile</a></h5> + <h6><a name="elementsCharFle">Device logfile</a></h6> <p> A file is opened and all data sent to the character @@ -840,7 +899,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharVC">Virtual console</a></h5> + <h6><a name="elementsCharVC">Virtual console</a></h6> <p> Connects the character device to the graphical framebuffer in @@ -855,7 +914,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharNull">Null device</a></h5> + <h6><a name="elementsCharNull">Null device</a></h6> <p> Connects the character device to the void. No data is ever @@ -869,7 +928,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharPTY">Pseudo TTY</a></h5> + <h6><a name="elementsCharPTY">Pseudo TTY</a></h6> <p> A Pseudo TTY is allocated using /dev/ptmx. A suitable client @@ -892,7 +951,7 @@ qemu-kvm -net nic,model=? /dev/null with existing syntax for <console> tags. </p> - <h5><a name="elementsCharHost">Host device proxy</a></h5> + <h6><a name="elementsCharHost">Host device proxy</a></h6> <p> The character device is passed through to the underlying @@ -910,7 +969,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharPipe">Named pipe</a></h5> + <h6><a name="elementsCharPipe">Named pipe</a></h6> <p> The character device writes output to a named pipe. See pipe(7) for @@ -925,7 +984,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharTCP">TCP client/server</a></h5> + <h6><a name="elementsCharTCP">TCP client/server</a></h6> <p> The character device acts as a TCP client connecting to a @@ -973,7 +1032,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharUDP">UDP network console</a></h5> + <h6><a name="elementsCharUDP">UDP network console</a></h6> <p> The character device acts as a UDP netconsole service, @@ -989,7 +1048,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharUNIX">UNIX domain socket client/server</a></h5> + <h6><a name="elementsCharUNIX">UNIX domain socket client/server</a></h6> <p> The character device acts as a UNIX domain socket server, -- 1.6.2.5

2 2

[libvirt] [PATCH 0/6] Add internal APIs for disabling error reporting
by Cole Robinson 09 Nov '09

09 Nov '09

In testing migration, I was hitting an error in the Perform step, but this was being returned as 'Unknown Error' via virsh. The reason is that even a failed Perform will call MigrateFinish to do cleanup, but Finish will always return an NULL == error in that case, overwriting the original message. I've added internal APIs which allow temporarily disabling error reporting: any ReportError calls will log the error message, but will not overwrite the previous error and will not trigger the error callback. These APIs are then used in a few places where they are needed. Thanks, Cole Cole Robinson (6): virterror: Make a thread local error state structure virterror: Add methods to temporarily disable error reporting. qemu: migrate: Disable errors in MigrateFinish if MigratePerform failed. Disable errors if Perform failed at the libvirt.c level. qemu: Disable errors in qemudShutdownVMDaemon virterror: Log reported errors when only logging output is stderr src/libvirt.c | 5 ++ src/qemu/qemu_driver.c | 13 ++++ src/util/logging.c | 3 +- src/util/virterror.c | 143 ++++++++++++++++++++++++++++++++--------- src/util/virterror_internal.h | 2 + 5 files changed, 135 insertions(+), 31 deletions(-)

2 9

[libvirt] [PATCH] Add missing OOM error checks, reports and cleanups
by Matthias Bolte 09 Nov '09

09 Nov '09

--- daemon/remote.c | 10 +-- src/conf/domain_conf.c | 4 +- src/conf/node_device_conf.c | 13 +++- src/esx/esx_driver.c | 5 ++ src/lxc/lxc_driver.c | 27 +++++-- src/openvz/openvz_conf.c | 12 ++- src/openvz/openvz_driver.c | 17 +++-- src/phyp/phyp_driver.c | 7 ++- src/qemu/qemu_conf.c | 64 +++++++++++++---- src/qemu/qemu_driver.c | 12 ++-- src/qemu/qemu_monitor_text.c | 4 +- src/remote/remote_driver.c | 135 +++++++++++++++++++++++++++++++---- src/secret/secret_driver.c | 8 ++- src/security/security_apparmor.c | 5 +- src/storage/storage_backend_scsi.c | 15 ++++ src/util/conf.c | 14 ++++ src/vbox/vbox_tmpl.c | 25 +++++-- src/xen/xen_driver.c | 12 +++- src/xen/xen_hypervisor.c | 15 ++++- src/xen/xen_inotify.c | 13 ++-- src/xen/xend_internal.c | 45 ++++++++++--- src/xen/xm_internal.c | 47 ++++++++++--- src/xen/xs_internal.c | 64 ++++++++++++----- 23 files changed, 444 insertions(+), 129 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 4296fc3..31d9841 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -565,7 +565,7 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT remoteDispatchFormatError (rerr, "%s", _("nparams too large")); return -1; } - if (VIR_ALLOC_N(params, nparams)) { + if (VIR_ALLOC_N(params, nparams) < 0) { remoteDispatchOOMError(rerr); return -1; } @@ -721,10 +721,8 @@ remoteDispatchDomainBlockPeek (struct qemud_server *server ATTRIBUTE_UNUSED, ret->buffer.buffer_len = size; if (VIR_ALLOC_N (ret->buffer.buffer_val, size) < 0) { - char ebuf[1024]; virDomainFree (dom); - remoteDispatchFormatError (rerr, "%s", - virStrerror(errno, ebuf, sizeof ebuf)); + remoteDispatchOOMError(rerr); return -1; } @@ -772,10 +770,8 @@ remoteDispatchDomainMemoryPeek (struct qemud_server *server ATTRIBUTE_UNUSED, ret->buffer.buffer_len = size; if (VIR_ALLOC_N (ret->buffer.buffer_val, size) < 0) { - char ebuf[1024]; virDomainFree (dom); - remoteDispatchFormatError (rerr, "%s", - virStrerror(errno, ebuf, sizeof ebuf)); + remoteDispatchOOMError(rerr); return -1; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 918a5d7..28bee54 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3431,8 +3431,10 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, goto error; if (n) { obj->nvcpupids = n; - if (VIR_REALLOC_N(obj->vcpupids, obj->nvcpupids) < 0) + if (VIR_REALLOC_N(obj->vcpupids, obj->nvcpupids) < 0) { + virReportOOMError(conn); goto error; + } for (i = 0 ; i < n ; i++) { char *pidstr = virXMLPropString(nodes[i], "pid"); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index c2c5a44..c5083cc 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1057,13 +1057,18 @@ virNodeDeviceDefParseXML(virConnectPtr conn, xmlXPathContextPtr ctxt, int create /* Extract device name */ if (create == EXISTING_DEVICE) { def->name = virXPathString(conn, "string(./name[1])", ctxt); + + if (!def->name) { + virNodeDeviceReportError(conn, VIR_ERR_NO_NAME, NULL); + goto error; + } } else { def->name = strdup("new device"); - } - if (!def->name) { - virNodeDeviceReportError(conn, VIR_ERR_NO_NAME, NULL); - goto error; + if (!def->name) { + virReportOOMError(conn); + goto error; + } } /* Extract device parent, if any */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 93fb5a9..f81f744 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2262,6 +2262,7 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_VirtualMachinePowerState powerState; int count = 0; + int i; if (names == NULL || maxnames < 0) { goto failure; @@ -2329,6 +2330,10 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) return count; failure: + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + count = -1; goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0fd7a17..f44901c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -445,6 +445,9 @@ static char *lxcGetOSType(virDomainPtr dom) ret = strdup(vm->def->os.type); + if (ret == NULL) + virReportOOMError(dom->conn); + cleanup: if (vm) virDomainObjUnlock(vm); @@ -724,14 +727,18 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (NULL == def->nets[i]->ifname) { def->nets[i]->ifname = strdup(parentVeth); } - if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) + if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) { + virReportOOMError(conn); goto error_exit; - if (((*veths)[(*nveths)++] = strdup(containerVeth)) == NULL) + } + if (((*veths)[(*nveths)] = strdup(containerVeth)) == NULL) { + virReportOOMError(conn); goto error_exit; + } + (*nveths)++; if (NULL == def->nets[i]->ifname) { - lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to allocate veth names")); + virReportOOMError(conn); goto error_exit; } @@ -1771,13 +1778,19 @@ static int lxcVersion(virConnectPtr conn, unsigned long *version) return 0; } -static char *lxcGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, - int *nparams) +static char *lxcGetSchedulerType(virDomainPtr domain, int *nparams) { + char *schedulerType = NULL; + if (nparams) *nparams = 1; - return strdup("posix"); + schedulerType = strdup("posix"); + + if (schedulerType == NULL) + virReportOOMError(domain->conn); + + return schedulerType; } static int lxcSetSchedulerParameters(virDomainPtr domain, diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c928afb..6eeece8 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -386,8 +386,8 @@ openvzReadFSConf(virConnectPtr conn, if (VIR_ALLOC(fs) < 0) goto no_memory; - if(virAsprintf(&veid_str, "%d", veid) < 0) - goto error; + if (virAsprintf(&veid_str, "%d", veid) < 0) + goto no_memory; fs->type = VIR_DOMAIN_FS_TYPE_MOUNT; fs->src = openvz_replace(temp, "$VEID", veid_str); @@ -547,8 +547,10 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va int fd = -1, temp_fd = -1; char line[PATH_MAX] ; - if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0) + if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0) { + virReportOOMError(NULL); return -1; + } fd = open(conf_file, O_RDONLY); if (fd == -1) @@ -733,8 +735,10 @@ openvzCopyDefaultConfig(int vpsid) if (confdir == NULL) goto cleanup; - if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, configfile_value) < 0) + if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, configfile_value) < 0) { + virReportOOMError(NULL); goto cleanup; + } if (openvzLocateConfFile(vpsid, conf_file, PATH_MAX, "conf")<0) goto cleanup; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 53fcaee..467c03b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -767,9 +767,11 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if (vmdef->os.init == NULL && - !(vmdef->os.init = strdup("/sbin/init"))) { - goto cleanup; + if (vmdef->os.init == NULL) { + if (!(vmdef->os.init = strdup("/sbin/init"))) { + virReportOOMError(conn); + goto cleanup; + } } vm = virDomainFindByName(&driver->domains, vmdef->name); @@ -844,9 +846,12 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if (vmdef->os.init == NULL && - !(vmdef->os.init = strdup("/sbin/init"))) - goto cleanup; + if (vmdef->os.init == NULL) { + if (!(vmdef->os.init = strdup("/sbin/init"))) { + virReportOOMError(conn); + goto cleanup; + } + } vm = virDomainFindByName(&driver->domains, vmdef->name); if (vm) { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index a92046a..6aee504 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1732,7 +1732,8 @@ phypUUIDTable_ReadFile(virConnectPtr conn) goto err; } } - } + } else + virReportOOMError(conn); close(fd); return 0; @@ -1833,8 +1834,10 @@ phypUUIDTable_Init(virConnectPtr conn) VIR_WARN("%s %d", "Unable to generate UUID for domain", ids[i]); } - } else + } else { + virReportOOMError(conn); goto err; + } if (phypUUIDTable_WriteFile(conn) == -1) goto err; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e1e24c3..28567b2 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -417,17 +417,17 @@ qemudParseMachineTypesStr(const char *output, continue; if (VIR_ALLOC(machine) < 0) - goto error; + goto no_memory; if (!(machine->name = strndup(p, t - p))) { VIR_FREE(machine); - goto error; + goto no_memory; } if (VIR_REALLOC_N(list, nitems + 1) < 0) { VIR_FREE(machine->name); VIR_FREE(machine); - goto error; + goto no_memory; } p = t; @@ -446,7 +446,7 @@ qemudParseMachineTypesStr(const char *output, continue; if (!(machine->canonical = strndup(p, t - p))) - goto error; + goto no_memory; } } while ((p = next)); @@ -455,7 +455,8 @@ qemudParseMachineTypesStr(const char *output, return 0; -error: + no_memory: + virReportOOMError(NULL); virCapabilitiesFreeMachines(list, nitems); return -1; } @@ -537,23 +538,22 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info, return 0; } - if (VIR_ALLOC_N(list, info->nmachines) < 0) + if (VIR_ALLOC_N(list, info->nmachines) < 0) { + virReportOOMError(NULL); return 0; + } for (i = 0; i < info->nmachines; i++) { if (VIR_ALLOC(list[i]) < 0) { - virCapabilitiesFreeMachines(list, info->nmachines); - return 0; + goto no_memory; } if (info->machines[i]->name && !(list[i]->name = strdup(info->machines[i]->name))) { - virCapabilitiesFreeMachines(list, info->nmachines); - return 0; + goto no_memory; } if (info->machines[i]->canonical && !(list[i]->canonical = strdup(info->machines[i]->canonical))) { - virCapabilitiesFreeMachines(list, info->nmachines); - return 0; + goto no_memory; } } @@ -561,6 +561,11 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info, *nmachines = info->nmachines; return 1; + + no_memory: + virReportOOMError(NULL); + virCapabilitiesFreeMachines(list, info->nmachines); + return 0; } static int @@ -668,15 +673,19 @@ qemudCapsInitGuest(virCapsPtr caps, if (info->machine) { virCapsGuestMachinePtr machine; - if (VIR_ALLOC(machine) < 0) + if (VIR_ALLOC(machine) < 0) { + virReportOOMError(NULL); return -1; + } if (!(machine->name = strdup(info->machine))) { + virReportOOMError(NULL); VIR_FREE(machine); return -1; } if (VIR_ALLOC_N(machines, nmachines) < 0) { + virReportOOMError(NULL); VIR_FREE(machine->name); VIR_FREE(machine); return -1; @@ -1166,7 +1175,10 @@ qemudNetworkIfaceConnect(virConnectPtr conn, if (brname == NULL) return -1; } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - brname = strdup(net->data.bridge.brname); + if (!(brname = strdup(net->data.bridge.brname))) { + virReportOOMError(conn); + return -1; + } } else { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Network type %d is not supported"), net->type); @@ -1276,12 +1288,15 @@ qemuAssignNetNames(virDomainDefPtr def, if (virAsprintf(&nic_name, "%s.%d", net->model ? net->model : "nic", - nic_index) < 0) + nic_index) < 0) { + virReportOOMError(NULL); return -1; + } if (virAsprintf(&hostnet_name, "%s.%d", qemuNetTypeToHostNet(net->type), hostnet_index) < 0) { + virReportOOMError(NULL); VIR_FREE(nic_name); return -1; } @@ -2434,7 +2449,7 @@ int qemudBuildCommandLine(virConnectPtr conn, hostdev->source.subsys.u.pci.function); if (ret < 0) { pcidev = NULL; - goto error; + goto no_memory; } ADD_ARG_LIT("-pcidevice"); ADD_ARG_LIT(pcidev); @@ -2589,6 +2604,7 @@ no_memory: for (i = 0 ; i < argcount ; i++) VIR_FREE(arglist[i]); VIR_FREE(arglist); + virReportOOMError(NULL); return -1; } @@ -3177,12 +3193,19 @@ qemuParseCommandLineChr(virConnectPtr conn, def->data.udp.connectHost = strndup(val, svc1-val); else def->data.udp.connectHost = strdup(val); + + if (!def->data.udp.connectHost) + goto no_memory; + if (svc1) { svc1++; if (host2) def->data.udp.connectService = strndup(svc1, host2-svc1); else def->data.udp.connectService = strdup(svc1); + + if (!def->data.udp.connectService) + goto no_memory; } if (host2) { @@ -3191,10 +3214,15 @@ qemuParseCommandLineChr(virConnectPtr conn, def->data.udp.bindHost = strndup(host2, svc2-host2); else def->data.udp.bindHost = strdup(host2); + + if (!def->data.udp.bindHost) + goto no_memory; } if (svc2) { svc2++; def->data.udp.bindService = strdup(svc2); + if (!def->data.udp.bindService) + goto no_memory; } } else if (STRPREFIX(val, "tcp:") || STRPREFIX(val, "telnet:")) { @@ -3217,12 +3245,16 @@ qemuParseCommandLineChr(virConnectPtr conn, def->data.tcp.listen = 1; def->data.tcp.host = strndup(val, svc-val); + if (!def->data.tcp.host) + goto no_memory; svc++; if (opt) { def->data.tcp.service = strndup(svc, opt-svc); } else { def->data.tcp.service = strdup(svc); } + if (!def->data.tcp.service) + goto no_memory; } else if (STRPREFIX(val, "unix:")) { const char *opt; val += strlen("unix:"); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5463951..f022f89 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -364,17 +364,13 @@ qemudSecurityCapsInit(virSecurityDriverPtr secdrv, caps->host.secModel.model = strdup(model); if (!caps->host.secModel.model) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel model: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); + virReportOOMError(NULL); return -1; } caps->host.secModel.doi = strdup(doi); if (!caps->host.secModel.doi) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel DOI: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); + virReportOOMError(NULL); return -1; } @@ -5851,8 +5847,10 @@ static struct qemuStreamMigFile *qemuStreamMigOpen(virStreamPtr st, int timeout = 3; int ret; - if (VIR_ALLOC(qemust) < 0) + if (VIR_ALLOC(qemust) < 0) { + virReportOOMError(st->conn); return NULL; + } qemust->fd = socket(AF_UNIX, SOCK_STREAM, 0); if (qemust->fd < 0) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 66526dc..35cd330 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -201,8 +201,10 @@ qemuMonitorSend(const virDomainObjPtr vm, size_t len; int ret = -1; - if (virAsprintf(&full, "%s\r", cmd) < 0) + if (virAsprintf(&full, "%s\r", cmd) < 0) { + virReportOOMError(NULL); return -1; + } len = strlen(full); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ee7a046..c866111 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -870,12 +870,12 @@ doRemoteOpen (virConnectPtr conn, } if(VIR_ALLOC(priv->callbackList)<0) { - error(conn, VIR_ERR_INVALID_ARG, _("Error allocating callbacks list")); + virReportOOMError(conn); goto failed; } if(VIR_ALLOC(priv->domainEvents)<0) { - error(conn, VIR_ERR_INVALID_ARG, _("Error allocating domainEvents")); + virReportOOMError(conn); goto failed; } @@ -2751,9 +2751,18 @@ remoteListDefinedDomains (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3086,7 +3095,7 @@ remoteDomainSetSchedulerParameters (virDomainPtr domain, /* Serialise the scheduler parameters. */ args.params.params_len = nparams; if (VIR_ALLOC_N(args.params.params_val, nparams) < 0) { - error (domain->conn, VIR_ERR_RPC, _("out of memory allocating array")); + virReportOOMError(domain->conn); goto done; } @@ -3432,9 +3441,18 @@ remoteListNetworks (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3505,9 +3523,18 @@ remoteListDefinedNetworks (virConnectPtr conn, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3921,9 +3948,18 @@ remoteListInterfaces (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3993,9 +4029,18 @@ remoteListDefinedInterfaces (virConnectPtr conn, char **const names, int maxname * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -4314,9 +4359,18 @@ remoteListStoragePools (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -4383,9 +4437,18 @@ remoteListDefinedStoragePools (virConnectPtr conn, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -4890,9 +4953,18 @@ remoteStoragePoolListVolumes (virStoragePoolPtr pool, char **const names, int ma * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(pool->conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -5290,9 +5362,18 @@ static int remoteNodeListDevices(virConnectPtr conn, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -5443,9 +5524,18 @@ static int remoteNodeDeviceListCaps(virNodeDevicePtr dev, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(dev->conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -6496,9 +6586,18 @@ remoteSecretListSecrets (virConnectPtr conn, char **uuids, int maxuuids) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.uuids.uuids_len; ++i) + for (i = 0; i < ret.uuids.uuids_len; ++i) { uuids[i] = strdup (ret.uuids.uuids_val[i]); + if (uuids[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(uuids[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.uuids.uuids_len; cleanup: @@ -6707,8 +6806,10 @@ remoteStreamOpen(virStreamPtr st, struct private_data *priv = st->conn->privateData; struct private_stream_data *stpriv; - if (VIR_ALLOC(stpriv) < 0) + if (VIR_ALLOC(stpriv) < 0) { + virReportOOMError(st->conn); return NULL; + } /* Initialize call object used to receive replies */ stpriv->proc_nr = proc_nr; @@ -7106,8 +7207,10 @@ prepareCall(virConnectPtr conn, struct remote_message_header hdr; struct remote_thread_call *rv; - if (VIR_ALLOC(rv) < 0) + if (VIR_ALLOC(rv) < 0) { + virReportOOMError(conn); return NULL; + } if (virCondInit(&rv->cond) < 0) { VIR_FREE(rv); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 1d5b4f7..1eef468 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -449,8 +449,10 @@ secretLoad(virConnectPtr conn, virSecretDriverStatePtr driver, if (secretLoadValidateUUID(conn, def, xml_basename) < 0) goto cleanup; - if (VIR_ALLOC(secret) < 0) + if (VIR_ALLOC(secret) < 0) { + virReportOOMError(conn); goto cleanup; + } secret->def = def; def = NULL; @@ -578,8 +580,10 @@ secretListSecrets(virConnectPtr conn, char **uuids, int maxuuids) char *uuidstr; if (i == maxuuids) break; - if (VIR_ALLOC_N(uuidstr, VIR_UUID_STRING_BUFLEN) < 0) + if (VIR_ALLOC_N(uuidstr, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(conn); goto cleanup; + } virUUIDFormat(secret->def->uuid, uuidstr); uuids[i] = uuidstr; i++; diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 6db51cd..6c2dce5 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -56,13 +56,16 @@ profile_status(const char *str, const int check_enforcing) int rc = -1; /* create string that is '<str> \0' for accurate matching */ - if (virAsprintf(&tmp, "%s ", str) == -1) + if (virAsprintf(&tmp, "%s ", str) == -1) { + virReportOOMError(NULL); return rc; + } if (check_enforcing != 0) { /* create string that is '<str> (enforce)\0' for accurate matching */ if (virAsprintf(&etmp, "%s (enforce)", str) == -1) { VIR_FREE(tmp); + virReportOOMError(NULL); return rc; } } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index c70b1ed..4b181d7 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -326,6 +326,14 @@ getNewStyleBlockDevice(virConnectPtr conn, } *block_device = strdup(block_dirent->d_name); + + if (*block_device == NULL) { + virReportOOMError(conn); + closedir(block_dir); + retval = -1; + goto out; + } + VIR_DEBUG(_("Block device is '%s'"), *block_device); break; @@ -360,9 +368,16 @@ getOldStyleBlockDevice(virConnectPtr conn, blockp++; *block_device = strdup(blockp); + if (*block_device == NULL) { + virReportOOMError(conn); + retval = -1; + goto out; + } + VIR_DEBUG(_("Block device is '%s'"), *block_device); } +out: return retval; } diff --git a/src/util/conf.c b/src/util/conf.c index 2aa4a55..8126f69 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -388,6 +388,10 @@ virConfParseString(virConfParserCtxtPtr ctxt) return(NULL); } ret = strndup(base, ctxt->cur - base); + if (ret == NULL) { + virReportOOMError(NULL); + return NULL; + } NEXT; } else if ((ctxt->cur + 6 < ctxt->end) && (ctxt->cur[0] == '"') && (ctxt->cur[1] == '"') && (ctxt->cur[2] == '"')) { @@ -404,6 +408,10 @@ virConfParseString(virConfParserCtxtPtr ctxt) return(NULL); } ret = strndup(base, ctxt->cur - base); + if (ret == NULL) { + virReportOOMError(NULL); + return NULL; + } ctxt->cur += 3; } else if (CUR == '"') { NEXT; @@ -415,6 +423,10 @@ virConfParseString(virConfParserCtxtPtr ctxt) return(NULL); } ret = strndup(base, ctxt->cur - base); + if (ret == NULL) { + virReportOOMError(NULL); + return NULL; + } NEXT; } return(ret); @@ -857,11 +869,13 @@ virConfSetValue (virConfPtr conf, if (!cur) { if (VIR_ALLOC(cur) < 0) { + virReportOOMError(NULL); virConfFreeValue(value); return (-1); } cur->comment = NULL; if (!(cur->name = strdup(setting))) { + virReportOOMError(NULL); virConfFreeValue(value); VIR_FREE(cur); return (-1); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d29e424..0957809 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1333,13 +1333,18 @@ cleanup: return ret; } -static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { +static char *vboxDomainGetOSType(virDomainPtr dom) { /* Returning "hvm" always as suggested on list, cause * this functions seems to be badly named and it * is supposed to pass the ABI name and not the domain * operating system driver as I had imagined ;) */ - return strdup("hvm"); + char *osType = strdup("hvm"); + + if (osType == NULL) + virReportOOMError(dom->conn); + + return osType; } static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { @@ -1881,7 +1886,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { if (valueDisplayUtf8) sdlDisplay = strdup(valueDisplayUtf8); if (sdlDisplay == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(dom->conn); /* just don't go to cleanup yet as it is ok to have * sdlDisplay as NULL and we check it below if it * exist and then only use it there @@ -1895,7 +1900,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { if (valueDisplayUtf8) guiDisplay = strdup(valueDisplayUtf8); if (guiDisplay == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(dom->conn); /* just don't go to cleanup yet as it is ok to have * guiDisplay as NULL and we check it below if it * exist and then only use it there @@ -1932,7 +1937,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { def->graphics[def->ngraphics]->type = VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP; def->graphics[def->ngraphics]->data.desktop.display = strdup(getenv("DISPLAY")); if (def->graphics[def->ngraphics]->data.desktop.display == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(dom->conn); /* just don't go to cleanup yet as it is ok to have * display as NULL */ @@ -3983,6 +3988,11 @@ static int vboxDomainAttachDevice(virDomainPtr dom, const char *xml) { def->os.type = strdup("hvm"); + if (def->os.type == NULL) { + virReportOOMError(dom->conn); + goto cleanup; + } + dev = virDomainDeviceDefParse(dom->conn, data->caps, def, xml, VIR_DOMAIN_XML_INACTIVE); if (dev == NULL) { @@ -4176,6 +4186,11 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { def->os.type = strdup("hvm"); + if (def->os.type == NULL) { + virReportOOMError(dom->conn); + goto cleanup; + } + dev = virDomainDeviceDefParse(dom->conn, data->caps, def, xml, VIR_DOMAIN_XML_INACTIVE); if (dev == NULL) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 479db10..a83b764 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -138,14 +138,20 @@ xenDomainUsedCpus(virDomainPtr dom) if (xenUnifiedNodeGetInfo(dom->conn, &nodeinfo) < 0) return(NULL); - if (VIR_ALLOC_N(cpulist, priv->nbNodeCpus) < 0) + if (VIR_ALLOC_N(cpulist, priv->nbNodeCpus) < 0) { + virReportOOMError(dom->conn); goto done; - if (VIR_ALLOC_N(cpuinfo, nb_vcpu) < 0) + } + if (VIR_ALLOC_N(cpuinfo, nb_vcpu) < 0) { + virReportOOMError(dom->conn); goto done; + } cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (xalloc_oversized(nb_vcpu, cpumaplen) || - VIR_ALLOC_N(cpumap, nb_vcpu * cpumaplen) < 0) + VIR_ALLOC_N(cpumap, nb_vcpu * cpumaplen) < 0) { + virReportOOMError(dom->conn); goto done; + } if ((ncpus = xenUnifiedDomainGetVcpus(dom, cpuinfo, nb_vcpu, cpumap, cpumaplen)) >= 0) { diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index e107d1e..f25629a 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1114,11 +1114,15 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) switch (op.u.getschedulerid.sched_id){ case XEN_SCHEDULER_SEDF: schedulertype = strdup("sedf"); + if (schedulertype == NULL) + virReportOOMError(domain->conn); if (nparams) *nparams = 6; break; case XEN_SCHEDULER_CREDIT: schedulertype = strdup("credit"); + if (schedulertype == NULL) + virReportOOMError(domain->conn); if (nparams) *nparams = 2; break; @@ -2755,6 +2759,7 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) { xenUnifiedPrivatePtr priv; xen_getdomaininfo dominfo; + char *ostype = NULL; priv = (xenUnifiedPrivatePtr) dom->conn->privateData; if (priv->handle < 0) @@ -2774,8 +2779,14 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) return (NULL); if (XEN_GETDOMAININFO_FLAGS(dominfo) & DOMFLAGS_HVM) - return strdup("hvm"); - return strdup("linux"); + ostype = strdup("hvm"); + else + ostype = strdup("linux"); + + if (ostype == NULL) + virReportOOMError(dom->conn); + + return ostype; } virDomainPtr diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index aa3893a..a41711d 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -107,6 +107,7 @@ xenInotifyXenCacheLookup(virConnectPtr conn, if (!*name) { DEBUG0("Error getting dom from def"); + virReportOOMError(conn); return -1; } return 0; @@ -145,8 +146,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { *name = strdup(priv->configInfoList->doms[i]->name); if (!*name) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - _("finding dom for %s"), uuid_str); + virReportOOMError(conn); return -1; } memcpy(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN); @@ -159,8 +159,10 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, return -1; } - if (!(*name = strdup(dom->name))) + if (!(*name = strdup(dom->name))) { + virReportOOMError(conn); return -1; + } memcpy(uuid, dom->uuid, VIR_UUID_BUFLEN); virDomainFree(dom); /* succeeded too find domain by uuid */ @@ -380,7 +382,7 @@ cleanup: * Returns 0 or -1 in case of error. */ virDrvOpenStatus -xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED, +xenInotifyOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { @@ -397,8 +399,7 @@ xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED, priv->useXenConfigCache = 0; if (VIR_ALLOC(priv->configInfoList) < 0) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to allocate configInfoList")); + virReportOOMError(conn); return -1; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index f86e022..3c660be 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -1055,8 +1055,13 @@ xenDaemonDomainLookupByID(virConnectPtr xend, "%s", _("domain information incomplete, missing name")); goto error; } - if (domname) + if (domname) { *domname = strdup(name); + if (*domname == NULL) { + virReportOOMError(xend); + goto error; + } + } if (sexpr_uuid(uuid, root, "domain/uuid") < 0) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, @@ -2946,8 +2951,10 @@ xenDaemonOpen(virConnectPtr conn, goto failed; } else if (STRCASEEQ (conn->uri->scheme, "http")) { if (conn->uri->port && - virAsprintf(&port, "%d", conn->uri->port) == -1) + virAsprintf(&port, "%d", conn->uri->port) == -1) { + virReportOOMError(conn); goto failed; + } if (xenDaemonOpen_tcp(conn, conn->uri->server ? conn->uri->server : "localhost", @@ -3164,6 +3171,9 @@ xenDaemonDomainGetOSType(virDomainPtr domain) type = strdup("linux"); } + if (type == NULL) + virReportOOMError(domain->conn); + sexpr_free(root); return(type); @@ -3959,6 +3969,10 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (id >= 0) { if (!memcmp(uuid, ident, VIR_UUID_BUFLEN)) { name = strdup(*tmp); + + if (name == NULL) + virReportOOMError(conn); + break; } } @@ -3979,7 +3993,14 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) id = sexpr_int(root, "domain/domid"); else id = -1; - name = domname ? strdup(domname) : NULL; + + if (domname) { + name = strdup(domname); + + if (name == NULL) + virReportOOMError(conn); + } + sexpr_free(root); } @@ -4308,8 +4329,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, autonode->u.s.car->u.value = (autostart ? strdup("start") : strdup("ignore")); if (!(autonode->u.s.car->u.value)) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("no memory")); + virReportOOMError(domain->conn); goto error; } @@ -4628,7 +4648,7 @@ error: static int xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { struct sexpr *root = NULL; - int ret = -1; + int i, ret = -1; struct sexpr *_for_i, *node; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; @@ -4651,12 +4671,19 @@ xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames if (node->kind != SEXPR_VALUE) continue; - names[ret++] = strdup(node->u.value); + if ((names[ret++] = strdup(node->u.value)) == NULL) { + virReportOOMError(conn); + goto error; + } + if (ret >= maxnames) break; } error: + for (i = 0; i < ret; ++i) + VIR_FREE(names[i]); + sexpr_free(root); return(ret); } @@ -4708,14 +4735,14 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) if (STREQ (ret, "credit")) { schedulertype = strdup("credit"); if (schedulertype == NULL){ - virXendError(domain->conn, VIR_ERR_SYSTEM_ERROR, "%s", _("strdup failed")); + virReportOOMError(domain->conn); goto error; } *nparams = XEN_SCHED_CRED_NPARAM; } else if (STREQ (ret, "sedf")) { schedulertype = strdup("sedf"); if (schedulertype == NULL){ - virXendError(domain->conn, VIR_ERR_SYSTEM_ERROR, "%s", _("strdup failed")); + virReportOOMError(domain->conn); goto error; } *nparams = XEN_SCHED_SEDF_NPARAM; diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 5e8931e..5878ba1 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -689,8 +689,10 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { int i; const char *defaultArch, *defaultMachine; - if (VIR_ALLOC(def) < 0) + if (VIR_ALLOC(def) < 0) { + virReportOOMError(conn); return NULL; + } def->virtType = VIR_DOMAIN_VIRT_XEN; def->id = -1; @@ -1100,7 +1102,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { } if (VIR_ALLOC(net) < 0) - goto cleanup; + goto no_memory; if (mac[0]) { unsigned int rawmac[6]; @@ -1234,7 +1236,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { goto skippci; if (VIR_ALLOC(hostdev) < 0) - goto cleanup; + goto no_memory; hostdev->managed = 0; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; @@ -1922,8 +1924,10 @@ static int xenXMConfigSetInt(virConfPtr conf, const char *setting, long l) { virConfValuePtr value = NULL; - if (VIR_ALLOC(value) < 0) + if (VIR_ALLOC(value) < 0) { + virReportOOMError(NULL); return -1; + } value->type = VIR_CONF_LONG; value->next = NULL; @@ -1937,13 +1941,16 @@ static int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) { virConfValuePtr value = NULL; - if (VIR_ALLOC(value) < 0) + if (VIR_ALLOC(value) < 0) { + virReportOOMError(NULL); return -1; + } value->type = VIR_CONF_STRING; value->next = NULL; if (!(value->str = strdup(str))) { VIR_FREE(value); + virReportOOMError(NULL); return -1; } @@ -2133,8 +2140,10 @@ xenXMDomainConfigFormatPCI(virConnectPtr conn, if (!hasPCI) return 0; - if (VIR_ALLOC(pciVal) < 0) + if (VIR_ALLOC(pciVal) < 0) { + virReportOOMError(conn); return -1; + } pciVal->type = VIR_CONF_LIST; pciVal->list = NULL; @@ -2149,8 +2158,10 @@ xenXMDomainConfigFormatPCI(virConnectPtr conn, def->hostdevs[i]->source.subsys.u.pci.domain, def->hostdevs[i]->source.subsys.u.pci.bus, def->hostdevs[i]->source.subsys.u.pci.slot, - def->hostdevs[i]->source.subsys.u.pci.function) < 0) + def->hostdevs[i]->source.subsys.u.pci.function) < 0) { + virReportOOMError(conn); goto error; + } if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); @@ -2748,6 +2759,7 @@ cleanup: struct xenXMListIteratorContext { virConnectPtr conn; + int oom; int max; int count; char ** names; @@ -2757,13 +2769,18 @@ static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const char *name, struct xenXMListIteratorContext *ctx = data; virDomainPtr dom = NULL; + if (ctx->oom) + return; + if (ctx->count == ctx->max) return; dom = xenDaemonLookupByName(ctx->conn, name); if (!dom) { - ctx->names[ctx->count] = strdup(name); - ctx->count++; + if (!(ctx->names[ctx->count] = strdup(name))) + ctx->oom = 1; + else + ctx->count++; } else { virDomainFree(dom); } @@ -2777,7 +2794,7 @@ static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const char *name, int xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { xenUnifiedPrivatePtr priv; struct xenXMListIteratorContext ctx; - int ret = -1; + int i, ret = -1; if (!VIR_IS_CONNECT(conn)) { xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); @@ -2794,11 +2811,21 @@ int xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames maxnames = virHashSize(priv->configCache); ctx.conn = conn; + ctx.oom = 0; ctx.count = 0; ctx.max = maxnames; ctx.names = names; virHashForEach(priv->nameConfigMap, xenXMListIterator, &ctx); + + if (ctx.oom) { + for (i = 0; i < ctx.count; i++) + VIR_FREE(ctx.names[i]); + + virReportOOMError(conn); + goto cleanup; + } + ret = ctx.count; cleanup: diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 0fabcf8..f8ef00b 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -305,17 +305,15 @@ xenStoreOpen(virConnectPtr conn, #ifndef PROXY /* Init activeDomainList */ if (VIR_ALLOC(priv->activeDomainList) < 0) { - virXenStoreError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to allocate activeDomainList")); + virReportOOMError(conn); return -1; } /* Init watch list before filling in domInfoList, so we can know if it is the first time through when the callback fires */ - if ( VIR_ALLOC(priv->xsWatchList) < 0 ) { - virXenStoreError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to allocate xsWatchList")); + if (VIR_ALLOC(priv->xsWatchList) < 0) { + virReportOOMError(conn); return -1; } @@ -892,7 +890,8 @@ xenStoreDomainGetOSTypeID(virConnectPtr conn, int id) { } if (str == NULL) str = strdup("linux"); - + if (str == NULL) + virReportOOMError(conn); return (str); } @@ -944,6 +943,10 @@ xenStoreDomainGetNetworkID(virConnectPtr conn, int id, const char *mac) { if (match) { ret = strdup(list[i]); + + if (ret == NULL) + virReportOOMError(conn); + break; } } @@ -995,15 +998,19 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) { if (val == NULL) break; if ((devlen != len) || memcmp(val, dev, len)) { - free (val); + VIR_FREE (val); } else { ret = strdup(list[i]); - free (val); - free (list); + + if (ret == NULL) + virReportOOMError(conn); + + VIR_FREE (val); + VIR_FREE (list); return (ret); } } - free (list); + VIR_FREE (list); } snprintf(dir, sizeof(dir), "/local/domain/0/backend/tap/%d", id); list = xs_directory(priv->xshandle, 0, dir, &num); @@ -1014,15 +1021,19 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) { if (val == NULL) break; if ((devlen != len) || memcmp(val, dev, len)) { - free (val); + VIR_FREE (val); } else { ret = strdup(list[i]); - free (val); - free (list); + + if (ret == NULL) + virReportOOMError(conn); + + VIR_FREE (val); + VIR_FREE (list); return (ret); } } - free (list); + VIR_FREE (list); } return (NULL); } @@ -1100,7 +1111,7 @@ int xenStoreAddWatch(virConnectPtr conn, xenStoreWatchCallback cb, void *opaque) { - xenStoreWatchPtr watch; + xenStoreWatchPtr watch = NULL; int n; xenStoreWatchListPtr list; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; @@ -1123,25 +1134,38 @@ int xenStoreAddWatch(virConnectPtr conn, } if (VIR_ALLOC(watch) < 0) - return -1; + goto no_memory; + watch->path = strdup(path); watch->token = strdup(token); watch->cb = cb; watch->opaque = opaque; + if (watch->path == NULL || watch->token == NULL) { + goto no_memory; + } + /* Make space on list */ n = list->count; if (VIR_REALLOC_N(list->watches, n + 1) < 0) { - virXenStoreError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("reallocating list")); - VIR_FREE(watch); - return -1; + goto no_memory; } list->watches[n] = watch; list->count++; return xs_watch(priv->xshandle, watch->path, watch->token); + + no_memory: + if (watch) { + VIR_FREE(watch->path); + VIR_FREE(watch->token); + VIR_FREE(watch); + } + + virReportOOMError(conn); + + return -1; } /* -- 1.6.0.4

2 3

[libvirt] [PATCH 0/2] Break out virDomainObjIsDuplicate function
by Cole Robinson 09 Nov '09

09 Nov '09

Code to check for a VM duplicate in create/define/restore is present in various forms throughout several drivers. Break this code out into its own function (virDomainObjIsDuplicate) and use where applicable. Cole Robinson (2): qemu: Break out function to check if we can create/define/restore qemu: Use same create/define overwrite logic for migration prepare. src/conf/domain_conf.c | 64 ++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++ src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 68 ++--------------------- src/qemu/qemu_driver.c | 132 ++++----------------------------------------- src/test/test_driver.c | 14 +++++- src/uml/uml_driver.c | 20 ++------ 7 files changed, 104 insertions(+), 199 deletions(-)

3 6

[libvirt] Status and freeze for 0.7.3
by Daniel Veillard 09 Nov '09

09 Nov '09

I think we still have some pending feature patches needed for commit before entering the 0.7.3 freeze, for example the 15 patches from Dan Berrange, I was also wondering about the udev, patch though Cole last review might indicate it's better postponing a bit. Jiri CPU flags patches may actually wait a bit, since without the associated qemu driver code they don't introduce any functional change and that will provide more time to make sure the description fits everybody's needs. I still need to review Cole patches to disable temporarily error propagation, and if I missed some features patches for review or commit please tell me because we should try to enter the freeze sometime this week. Of course the various cleanup patches like Matthias ones, or the one needed from Eduardo can and should be commited during the freeze, I have myself a number of fixes pending due to an external code review that I will have to look at this week. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] opennebula: Fix potential memory/mutex leak in state driver startup
by Matthias Bolte 09 Nov '09

09 Nov '09

In case of an error the domains hash and the driver mutex may leak. * src/opennebula/one_driver.c: free/destroy domains hash and driver mutex in error cases --- src/opennebula/one_driver.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 19a335c..f461ff6 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -617,23 +617,26 @@ static int oneStartup(int privileged ATTRIBUTE_UNUSED){ return -1; } + c_oneStart(); + oneDriverLock(one_driver); + if (virDomainObjListInit(&one_driver->domains) < 0) { - virMutexDestroy(&one_driver->lock); - VIR_FREE(one_driver); - return -1; + goto error; } - c_oneStart(); - oneDriverLock(one_driver); one_driver->nextid=1; if ((one_driver->caps = oneCapsInit()) == NULL) { - oneDriverUnlock(one_driver); - VIR_FREE(one_driver); - return -1; + virReportOOMError(NULL); + goto error; } oneDriverUnlock(one_driver); return 0; + +error: + oneDriverUnlock(one_driver); + oneShutdown(); + return -1; } static int oneShutdown(void){ -- 1.6.0.4

2 1

[libvirt] [PATCH] Add a Python example that lists active ESX domains
by Matthias Bolte 08 Nov '09

08 Nov '09

It also demonstrates how to use the libvirt.openAuth() method. * examples/python/Makefile.am: add esxlist.py to EXTRA_DIST * examples/python/README: add some notes about esxlist.py * examples/python/esxlist.py: the new example --- examples/python/Makefile.am | 2 +- examples/python/README | 19 +++++ examples/python/esxlist.py | 155 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 175 insertions(+), 1 deletions(-) create mode 100755 examples/python/esxlist.py diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am index 0742226..dcd2c24 100644 --- a/examples/python/Makefile.am +++ b/examples/python/Makefile.am @@ -1,3 +1,3 @@ EXTRA_DIST= \ README \ - dominfo.py domrestore.py domsave.py domstart.py + dominfo.py domrestore.py domsave.py domstart.py esxlist.py diff --git a/examples/python/README b/examples/python/README index 02c5bfb..f4db76c 100644 --- a/examples/python/README +++ b/examples/python/README @@ -8,7 +8,26 @@ domstart.py - create a domU from an XML description if the domU isn't running yet domsave.py - save all running domU's into a directory domrestore.py - restore domU's from their saved files in a directory +esxlist.py - list active domains of an VMware ESX host and print some info. + also demonstrates how to use the libvirt.openAuth() method The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed for domstart.py + + +Some additional notes for the esxlist.py example: + +You may see remote errors complaining about missing certificates: + + Cannot access CA certificate '/usr/local/etc/pki/CA/cacert.pem': No such file + or directory + +This is expected, libvirt tries to find network and storage drivers for ESX, +but those are not implemented yet (November 2009). While searching for this +drivers, libvirt may try to start a local libvirtd instance, but fails because +of the missing certificates. It'll warn about that: + + Failed to find the network: Is the daemon running? + +This is also expected and can be ignored. diff --git a/examples/python/esxlist.py b/examples/python/esxlist.py new file mode 100755 index 0000000..a0602e8 --- /dev/null +++ b/examples/python/esxlist.py @@ -0,0 +1,155 @@ +#! /usr/bin/python +# esxlist - list active domains of an ESX host and print some info. +# also demonstrates how to use the libvirt.openAuth() method + +import libvirt +import sys +import os +import libxml2 +import getpass + + +def usage(): + print "Usage: %s HOSTNAME" % sys.argv[0] + print " List active domains of HOSTNAME and print some info" + + +# This is the callback method passed to libvirt.openAuth() (see below). +# +# The credentials argument is a list of credentials that libvirt (actually +# the ESX driver) would like to request. An element of this list is itself a +# list containing 5 items (4 inputs, 1 output): +# - the credential type, e.g. libvirt.VIR_CRED_AUTHNAME +# - a prompt to be displayed to the user +# - a challenge, the ESX driver sets this to the hostname to allow automatic +# distinction between requests for ESX and vCenter credentials +# - a default result for the request +# - a place to store the actual result for the request +# +# The user_data argument is the user data item of the auth argument (see below) +# passed to libvirt.openAuth(). +def request_credentials(credentials, user_data): + for credential in credentials: + if credential[0] == libvirt.VIR_CRED_AUTHNAME: + # prompt the user to input a authname. display the provided message + credential[4] = raw_input(credential[1] + ": ") + + # if the user just hits enter raw_input() returns an empty string. + # in this case return the default result through the last item of + # the list + if len(credential[4]) == 0: + credential[4] = credential[3] + elif credential[0] == libvirt.VIR_CRED_NOECHOPROMPT: + # use the getpass module to prompt the user to input a password. + # display the provided message and return the result through the + # last item of the list + credential[4] = getpass.getpass(credential[1] + ": ") + else: + return -1 + + return 0 + + +def print_section(title): + print "\n%s" % title + print "=" * 60 + + +def print_entry(key, value): + print "%-10s %-10s" % (key, value) + + +def print_xml(key, ctx, path): + res = ctx.xpathEval(path) + + if res is None or len(res) == 0: + value = "Unknown" + else: + value = res[0].content + + print_entry(key, value) + + return value + + +if len(sys.argv) != 2: + usage() + sys.exit(2) + + +hostname = sys.argv[1] + +# Connect to libvirt +uri = "esx://%s/?no_verify=1" % hostname + +# The auth argument is a list that contains 3 items: +# - a list of supported credential types +# - a callable that takes 2 arguments +# - user data that will be passed to the callable as second argument +# +# In this example the supported credential types are VIR_CRED_AUTHNAME and +# VIR_CRED_NOECHOPROMPT, the callable is the unbound method request_credentials +# (see above) and the user data is None. +# +# libvirt (actually the ESX driver) will call the callable to request +# credentials in order to log into the ESX host. The callable would also be +# called if the connection URI would reference a vCenter to request credentials +# in order to log into the vCenter +auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_NOECHOPROMPT], + request_credentials, None] +conn = libvirt.openAuth(uri, auth, 0) + +if conn is None: + print "Failed to open connection to %s" % hostname + sys.exit(1) + +state_names = { libvirt.VIR_DOMAIN_RUNNING : "running", + libvirt.VIR_DOMAIN_BLOCKED : "idle", + libvirt.VIR_DOMAIN_PAUSED : "paused", + libvirt.VIR_DOMAIN_SHUTDOWN : "in shutdown", + libvirt.VIR_DOMAIN_SHUTOFF : "shut off", + libvirt.VIR_DOMAIN_CRASHED : "crashed", + libvirt.VIR_DOMAIN_NOSTATE : "no state" } + +for id in conn.listDomainsID(): + domain = conn.lookupByID(id) + info = domain.info() + + print_section("Domain " + domain.name()) + print_entry("ID:", id) + print_entry("UUID:", domain.UUIDString()) + print_entry("State:", state_names[info[0]]) + print_entry("MaxMem:", info[1]) + print_entry("UsedMem:", info[2]) + print_entry("VCPUs:", info[3]) + + # Read some info from the XML desc + print_section("Devices of " + domain.name()) + + xmldesc = domain.XMLDesc(0) + doc = libxml2.parseDoc(xmldesc) + ctx = doc.xpathNewContext() + devs = ctx.xpathEval("/domain/devices/*") + first = True + + for d in devs: + ctx.setContextNode(d) + + if not first: + print "------------------------------------------------------------" + else: + first = False + + print_entry("Device", d.name) + + type = print_xml("Type:", ctx, "@type") + + if type == "file": + print_xml("Source:", ctx, "source/@file") + print_xml("Target:", ctx, "target/@dev") + elif type == "block": + print_xml("Source:", ctx, "source/@dev") + print_xml("Target:", ctx, "target/@dev") + elif type == "bridge": + print_xml("Source:", ctx, "source/@bridge") + print_xml("MAC Addr:", ctx, "mac/@address") -- 1.6.0.4

2 1

[libvirt] [PATCH v2 0/2] CPU flags capabilities and domain configuration
by Jiri Denemark 08 Nov '09

08 Nov '09

Hi, These are two initial patches for CPU flags/masks support for libvirt. The first patch contains changes to schemas and describes semantics of new elements and attributes. The second patch introduces internal API functions for XML parsing and formating. Version 2 changes: - feature names moved to a 'name' attribute of 'feature' element - 'cpu' element in guest capabilities renamed as 'cpuselection' - topology attributes restricted to positiveInteger - move 'cpu' element above 'os' element in domain configuration schema - feature names restricted to [a-zA-Z0-9\-_]+ - feature names are not internally converted to lower case Jiri Denemark (2): XML schema for CPU flags XML parsing/formating code for CPU flags docs/schemas/capability.rng | 46 ++++++- docs/schemas/domain.rng | 62 ++++++++ include/libvirt/virterror.h | 1 + src/Makefile.am | 9 +- src/conf/capabilities.c | 31 ++++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 331 +++++++++++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 110 ++++++++++++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 8 + src/util/virterror.c | 3 + 12 files changed, 620 insertions(+), 4 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h

2 3

[libvirt] [PATCH 0/9] Several bug fixes for the Power Hypervisor driver
by Matthias Bolte 07 Nov '09

07 Nov '09

After the last large patch has been applied I reviewed the whole driver code and found several bugs and issues. Most important memory leaks and two potential infinite loops. I've no Power Hypervisor at hand, so I can't test this changes with an actual system. Eduardo could you test this patches to make sure they don't break existing functionality? Matthias

3 20

[libvirt] 3 patches to solve bug 524280
by Daniel Veillard 07 Nov '09

07 Nov '09

Basically dnsmasq limits itself by default to 150 leases maximum. Which means we may inflict an arbitrary limit in the number of domains running on a given host https://bugzilla.redhat.com/show_bug.cgi?id=524280 The patches do 3 things: - first introduce IPv4 and IPv6 parsing routines, generally useful this could be used to double check input in other places too - then when a DHCP range is defined use those routines to parse the start and end, do some cheking and keep the range size in the structure - last when exec'ing dnsmasq compute the sum of all dhcp ranges and pass the max lease option Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 16

[libvirt] [PATCH] qemu: Allow cpu pinning for all logical CPUs, not just physical
by Cole Robinson 07 Nov '09

07 Nov '09

This is what virsh already expects when printing output, and what 'man cpuset' claims to support. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1f3a0e4..5463951 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1222,7 +1222,7 @@ qemudInitCpus(virConnectPtr conn, const char *migrateFrom) { #if HAVE_SCHED_GETAFFINITY cpu_set_t mask; - int i, maxcpu = QEMUD_CPUMASK_LEN; + int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; virNodeInfo nodeinfo; if (nodeGetInfo(conn, &nodeinfo) < 0) @@ -1230,8 +1230,9 @@ qemudInitCpus(virConnectPtr conn, /* setaffinity fails if you set bits for CPUs which * aren't present, so we have to limit ourselves */ - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + if (maxcpu > hostcpus) + maxcpu = hostcpus; CPU_ZERO(&mask); if (vm->def->cpumask) { @@ -3339,7 +3340,7 @@ qemudDomainPinVcpu(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; cpu_set_t mask; - int i, maxcpu; + int i, maxcpu, hostcpus; virNodeInfo nodeinfo; int ret = -1; @@ -3371,13 +3372,14 @@ qemudDomainPinVcpu(virDomainPtr dom, if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); maxcpu = maplen * 8; - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + if (maxcpu > hostcpus) + maxcpu = hostcpus; CPU_ZERO(&mask); for (i = 0 ; i < maxcpu ; i++) { - if ((cpumap[i/8] >> (i % 8)) & 1) + if (VIR_CPU_USABLE(cpumap, maplen, 0, i)) CPU_SET(i, &mask); } @@ -3409,7 +3411,7 @@ qemudDomainGetVcpus(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virNodeInfo nodeinfo; - int i, v, maxcpu; + int i, v, maxcpu, hostcpus; int ret = -1; qemuDriverLock(driver); @@ -3434,9 +3436,10 @@ qemudDomainGetVcpus(virDomainPtr dom, if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); maxcpu = maplen * 8; - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + if (maxcpu > hostcpus) + maxcpu = hostcpus; /* Clamp to actual number of vcpus */ if (maxinfo > vm->nvcpupids) -- 1.6.5.1

2 2

[libvirt] [PATCH] Cleanup whitespace in docs
by Matthew Booth 07 Nov '09

07 Nov '09

This patch is the result of running the following command in the docs direct sed -i 's/\t/ /g; s/\s*$//' *.html.in * docs/api.html.in docs/api_extension.html.in docs/apps.html.in docs/archnetwork.html.in docs/archstorage.html.in docs/bugs.html.in docs/drvlxc.html.in docs/drvone.html.in docs/drvqemu.html.in docs/drvxen.html.in docs/formatdomain.html.in docs/formatnetwork.html.in docs/formatsecret.html.in docs/formatstorage.html.in docs/hacking.html.in docs/hvsupport.html.in docs/index.html.in docs/news.html.in docs/relatedlinks.html.in docs/sitemap.html.in: convert tabs into 8 spaces and remove trailing whitespace docs/api.html.in | 6 +- docs/api_extension.html.in | 14 +- docs/apps.html.in | 92 ++++++------ docs/archnetwork.html.in | 26 ++-- docs/archstorage.html.in | 16 +- docs/bugs.html.in | 34 ++-- docs/drvlxc.html.in | 80 +++++----- docs/drvone.html.in | 14 +- docs/drvqemu.html.in | 28 ++-- docs/drvxen.html.in | 38 +++--- docs/formatdomain.html.in | 376 ++++++++++++++++++++++---------------------- docs/formatnetwork.html.in | 158 +++++++++--------- docs/formatsecret.html.in | 8 +- docs/formatstorage.html.in | 208 ++++++++++++------------ docs/hacking.html.in | 108 +++++++------- docs/hvsupport.html.in | 2 +- docs/index.html.in | 36 ++-- docs/news.html.in | 94 ++++++------ docs/relatedlinks.html.in | 22 ++-- docs/sitemap.html.in | 16 +- 20 files changed, 688 insertions(+), 688 deletions(-) Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

2 1

[libvirt] [PATCH] Use virBuffer when constructing QEMU character device command line
by Matthew Booth 06 Nov '09

06 Nov '09

This patch updates qemudBuildCommandLineChrDevStr to use a virBuffer instead of a char[]. This is slightly tidier, and it makes it cleaner to (ap|pre)pend the output in other command lines. * src/qemu/qemu_conf.c: Update qemudBuildCommandLineChrDevStr to use a virBuffer --- src/qemu/qemu_conf.c | 97 +++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 40613dd..052ae98 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1409,83 +1409,66 @@ qemuBuildHostNetStr(virConnectPtr conn, return 0; } -static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, - char *buf, - int buflen) +static void qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, + virBufferPtr buf) { switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: - if (virStrcpy(buf, "null", buflen) == NULL) - return -1; + virBufferAddLit(buf, "null"); break; case VIR_DOMAIN_CHR_TYPE_VC: - if (virStrcpy(buf, "vc", buflen) == NULL) - return -1; + virBufferAddLit(buf, "vc"); break; case VIR_DOMAIN_CHR_TYPE_PTY: - if (virStrcpy(buf, "pty", buflen) == NULL) - return -1; + virBufferAddLit(buf, "pty"); break; case VIR_DOMAIN_CHR_TYPE_DEV: - if (snprintf(buf, buflen, "%s", - dev->data.file.path) >= buflen) - return -1; + virBufferStrcat(buf, dev->data.file.path, NULL); break; case VIR_DOMAIN_CHR_TYPE_FILE: - if (snprintf(buf, buflen, "file:%s", - dev->data.file.path) >= buflen) - return -1; + virBufferVSprintf(buf, "file:%s", dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if (snprintf(buf, buflen, "pipe:%s", - dev->data.file.path) >= buflen) - return -1; + virBufferVSprintf(buf, "pipe:%s", dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_STDIO: - if (virStrcpy(buf, "stdio", buflen) == NULL) - return -1; + virBufferAddLit(buf, "stdio"); break; case VIR_DOMAIN_CHR_TYPE_UDP: - if (snprintf(buf, buflen, "udp:%s:%s@%s:%s", - dev->data.udp.connectHost, - dev->data.udp.connectService, - dev->data.udp.bindHost, - dev->data.udp.bindService) >= buflen) - return -1; + virBufferVSprintf(buf, "udp:%s:%s@%s:%s", + dev->data.udp.connectHost, + dev->data.udp.connectService, + dev->data.udp.bindHost, + dev->data.udp.bindService); break; case VIR_DOMAIN_CHR_TYPE_TCP: 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,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "telnet:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server,nowait" : ""); } else { - if (snprintf(buf, buflen, "tcp:%s:%s%s", - dev->data.tcp.host, - dev->data.tcp.service, - dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "tcp:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server,nowait" : ""); } break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (snprintf(buf, buflen, "unix:%s%s", - dev->data.nix.path, - dev->data.nix.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "unix:%s%s", + dev->data.nix.path, + dev->data.nix.listen ? ",server,nowait" : ""); break; } - - return 0; } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ @@ -1773,13 +1756,17 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-nographic"); if (monitor_chr) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; - if (qemudBuildCommandLineChrDevStr(monitor_chr, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(monitor_chr, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-monitor"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } if (def->localtime) @@ -2059,14 +2046,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("none"); } else { for (i = 0 ; i < def->nserials ; i++) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr serial = def->serials[i]; - if (qemudBuildCommandLineChrDevStr(serial, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(serial, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-serial"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } } @@ -2075,14 +2066,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("none"); } else { for (i = 0 ; i < def->nparallels ; i++) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr parallel = def->parallels[i]; - if (qemudBuildCommandLineChrDevStr(parallel, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(parallel, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-parallel"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } } -- 1.6.2.5

3 3

[libvirt] [PATCH] Cleanup virBuffer usage in qemdBuildCommandLine
by Matthew Booth 06 Nov '09

06 Nov '09

Dan Berrangé pointed out that using virBufferError() is preferred to checking virBufferContentAndReset() for NULL return. Also, this allows ADD_ARG_LIT to be replaced with ADD_ARG, skipping an intermediate variable. * src/qemu_qemu_conf.c: Cleanup usage of virBuffer in qemudBuildCommandLine --- src/qemu/qemu_conf.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f010f4a..4a278e3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2182,7 +2182,6 @@ int qemudBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nchannels ; i++) { virBuffer buf = VIR_BUFFER_INITIALIZER; - const char *argStr; char id[16]; virDomainChrDefPtr channel = def->channels[i]; @@ -2199,24 +2198,18 @@ int qemudBuildCommandLine(virConnectPtr conn, } qemudBuildCommandLineChrDevChardevStr(channel, id, &buf); - argStr = virBufferContentAndReset(&buf); - if (argStr == NULL) + if (virBufferError(&buf)) goto error; ADD_ARG_LIT("-chardev"); - ADD_ARG_LIT(argStr); - - VIR_FREE(argStr); + ADD_ARG(virBufferContentAndReset(&buf)); qemudBuildCommandLineChrDevTargetStr(channel, id, &buf); - argStr = virBufferContentAndReset(&buf); - if (argStr == NULL) + if (virBufferError(&buf)) goto error; ADD_ARG_LIT("-net"); - ADD_ARG_LIT(argStr); - - VIR_FREE(argStr); + ADD_ARG(virBufferContentAndReset(&buf)); } } -- 1.6.2.5

2 1

[libvirt] [PATCH] add sentinel attribute
by Paolo Bonzini 06 Nov '09

06 Nov '09

This patch adds a (macro-wrapped) sentinel attribute to functions that take a NULL-terminated variable argument list. This is a nice debugging aid. * src/internal.h (ATTRIBUTE_SENTINEL): New. * src/util/buf.c (virBufferStrcat): Use it. * src/util/ebtables.c (ebtablesAddRemoveRule): Use it. * src/util/iptables.c (iptableAddRemoveRule: Use it. * src/util/qparams.h (new_qparam_set, append_qparams): Use it. --- src/internal.h | 11 +++++++++++ src/util/buf.h | 3 ++- src/util/ebtables.c | 2 +- src/util/iptables.c | 2 +- src/util/qparams.h | 6 ++++-- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/internal.h b/src/internal.h index bd1cfe6..09c19ea 100644 --- a/src/internal.h +++ b/src/internal.h @@ -93,6 +93,17 @@ #endif /** + * ATTRIBUTE_SENTINEL: + * + * Macro to check for NULL-terminated varargs lists + */ +#ifndef ATTRIBUTE_SENTINEL +#if __GNUC_PREREQ (4, 0) +#define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) +#endif +#endif + +/** * ATTRIBUTE_FMT_PRINTF * * Macro used to check printf like functions, if compiling diff --git a/src/util/buf.h b/src/util/buf.h index 7d31cb2..94ee8a3 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -41,7 +41,8 @@ void virBufferAdd(const virBufferPtr buf, const char *str, int len); void virBufferAddChar(const virBufferPtr buf, char c); void virBufferVSprintf(const virBufferPtr buf, const char *format, ...) ATTRIBUTE_FMT_PRINTF(2, 3); -void virBufferStrcat(const virBufferPtr buf, ...); +void virBufferStrcat(const virBufferPtr buf, ...) + ATTRIBUTE_SENTINEL; void virBufferEscapeString(const virBufferPtr buf, const char *format, const char *str); void virBufferURIEncodeString (const virBufferPtr buf, const char *str); diff --git a/src/util/ebtables.c b/src/util/ebtables.c index 60427d7..20f3342 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -175,7 +175,7 @@ ebtRulesNew(const char *table, return NULL; } -static int +static int ATTRIBUTE_SENTINEL ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) { va_list args; diff --git a/src/util/iptables.c b/src/util/iptables.c index 4562800..284f3c0 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -382,7 +382,7 @@ iptRulesNew(const char *table, return NULL; } -static int +static int ATTRIBUTE_SENTINEL iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) { va_list args; diff --git a/src/util/qparams.h b/src/util/qparams.h index 1a92048..a2f5aa2 100644 --- a/src/util/qparams.h +++ b/src/util/qparams.h @@ -38,10 +38,12 @@ struct qparam_set { }; /* New parameter set. */ -extern struct qparam_set *new_qparam_set (int init_alloc, ...); +extern struct qparam_set *new_qparam_set (int init_alloc, ...) + ATTRIBUTE_SENTINEL; /* Appending parameters. */ -extern int append_qparams (struct qparam_set *ps, ...); +extern int append_qparams (struct qparam_set *ps, ...) + ATTRIBUTE_SENTINEL; extern int append_qparam (struct qparam_set *ps, const char *name, const char *value); -- 1.6.2.5

3 5

Re: [libvirt] Remote access and libvirtd
by Maximilian Wilhelm 06 Nov '09

06 Nov '09

Anno domini 2009 Dave Bryson scripsit: Hi Dave! (Moved the thread back to the list, hope thats OK) > Thank you for the response. I'm working with ESX and am looking at > libvirt to see if it would be beneficial to use over the ESX SOAP API > (i'm not a SOAP fan). But in the case of remote access it doesn't appear > that libvirt will be able to help me. Well, the ESX driver is working completely remote and should therefore be helpful. The driver only uses the VI API, which practically is SOAP, to communicate with the server. If you could describe the problem you are facing a bit more precisly, one could give you some hints about how to solve this. Ciao Max -- Träume nicht von Dein Leben: Lebe Deinen Traum!

4 3

[libvirt] [PATCH 0/2] test: Update inactive guest config on shutdown
by Cole Robinson 06 Nov '09

06 Nov '09

This small series teaches the test driver to abide changes to the inactive domain definition (caused by 'defining' over an already running domain). Cole Robinson (2): test: Add testDomainShutdownState helper test: Update inactive guest config on shutdown src/test/test_driver.c | 48 +++++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 19 deletions(-)

2 5

[libvirt] [PATCH] fix cut-and-paste error
by Paolo Bonzini 06 Nov '09

06 Nov '09

Seems like a bad merge conflict. * src/qemu/qemu_driver.c (qemudDomainMigratePerform): Do call doPeer2PeerMigrate for VIR_MIGRATE_PEER2PEER. --- Note: untested beyond compiling. src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ed2136..635d787 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6792,9 +6792,9 @@ qemudDomainMigratePerform (virDomainPtr dom, event = NULL; } - if ((flags & VIR_MIGRATE_TUNNELLED)) { + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (doPeer2PeerMigrate(dom, vm, uri, flags, dname, resource) < 0) - /* doTunnelMigrate already set the error, so just get out */ + /* doPeer2PeerMigrate already set the error, so just get out */ goto cleanup; } else { if (doNativeMigrate(dom, vm, uri, flags, dname, resource) < 0) -- 1.6.2.5

3 2

[libvirt] [PATCH 00/15] Rewrite the QEMU monitor handling v2
by Daniel P. Berrange 06 Nov '09

06 Nov '09

This is an update of this series: http://www.redhat.com/archives/libvir-list/2009-October/msg00644.html minus the patches DV already ACKd which I've merged. The main change in this series is that I've removed the change which added a RW-lock primitive in the QEMU driver. Instead I've implemented the job condition variable idea I described here http://www.redhat.com/archives/libvir-list/2009-October/msg00815.html The nice thing about this is that its actually possible to start doing timeouts of commands. This series only partially supports timeouts. A long running monitor command itself will not timeout, but if a second API call is made while someone else is using the monitor, this waiting call will timeout after 30 seconds if the monitor was not relased. Daniel

3 37

[libvirt] [PATCH] network utilities: Add functions for address->text and get/set port number
by Matthew Booth 06 Nov '09

06 Nov '09

--- src/libvirt_private.syms | 3 ++ src/util/network.c | 88 +++++++++++++++++++++++++++++++++++++++++++++- src/util/network.h | 6 +++ 3 files changed, 96 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8525dbd..15d75fd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -289,10 +289,13 @@ virFree; virSocketAddrInNetwork; virSocketAddrIsNetmask; virSocketCheckNetmask; +virSocketFormatAddr; +virSocketGetPort; virSocketGetRange; virSocketParseAddr; virSocketParseIpv4Addr; virSocketParseIpv6Addr; +virSocketSetPort; # network_conf.h diff --git a/src/util/network.c b/src/util/network.c index abd866c..094130f 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -9,6 +9,7 @@ */ #include <config.h> +#include <arpa/inet.h> #include "memory.h" #include "network.h" @@ -64,7 +65,7 @@ static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { * Mostly a wrapper for getaddrinfo() extracting the address storage * from the numeric string like 1.2.3.4 or 2001:db8:85a3:0:0:8a2e:370:7334 * - * Returns the lenght of the network address or -1 in case of error. + * Returns the length of the network address or -1 in case of error. */ int virSocketParseAddr(const char *val, virSocketAddrPtr addr, int hint) { @@ -116,6 +117,91 @@ virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr) { return(virSocketParseAddr(val, addr, AF_INET6)); } +/* + * virSocketFormatAddr: + * @addr: an initialised virSocketAddrPtr + * + * Returns a string representation of the given address + * Returns NULL on any error + * Caller must free the returned string + */ +char * +virSocketFormatAddr(virSocketAddrPtr addr) { + char *out; + size_t outlen; + void *inaddr; + + if (addr->stor.ss_family == AF_INET) { + outlen = INET_ADDRSTRLEN; + inaddr = &addr->inet4.sin_addr; + } + + else if (addr->stor.ss_family == AF_INET6) { + outlen = INET6_ADDRSTRLEN; + inaddr = &addr->inet6.sin6_addr; + } + + else { + return NULL; + } + + if (VIR_ALLOC_N(out, outlen) < 0) + return NULL; + + if (inet_ntop(addr->stor.ss_family, inaddr, out, outlen) == NULL) { + VIR_FREE(out); + return NULL; + } + + return out; +} + +/* + * virSocketSetPort: + * @addr: an initialised virSocketAddrPtr + * @port: the port number to set + * + * Set the transport layer port of the given virtSocketAddr + * + * Returns 0 on success, -1 on failure + */ +int +virSocketSetPort(virSocketAddrPtr addr, in_port_t port) { + if(addr->stor.ss_family == AF_INET) { + addr->inet4.sin_port = port; + } + + else if(addr->stor.ss_family == AF_INET6) { + addr->inet6.sin6_port = port; + } + + else { + return -1; + } + + return 0; +} + +/* + * virSocketGetPort: + * @addr: an initialised virSocketAddrPtr + * + * Returns the transport layer port of the given virtSocketAddr + * Returns 0 if @addr is invalid + */ +in_port_t +virSocketGetPort(virSocketAddrPtr addr) { + if(addr->stor.ss_family == AF_INET) { + return addr->inet4.sin_port; + } + + else if(addr->stor.ss_family == AF_INET6) { + return addr->inet6.sin6_port; + } + + return 0; +} + /** * virSocketAddrIsNetmask: * @netmask: the netmask address diff --git a/src/util/network.h b/src/util/network.h index e590747..7618547 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -34,6 +34,12 @@ int virSocketParseIpv4Addr(const char *val, int virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr); +char * virSocketFormatAddr(virSocketAddrPtr addr); + +int virSocketSetPort(virSocketAddrPtr addr, in_port_t port); + +in_port_t virSocketGetPort(virSocketAddrPtr addr); + int virSocketAddrInNetwork(virSocketAddrPtr addr1, virSocketAddrPtr addr2, virSocketAddrPtr netmask); -- 1.6.2.5

3 7

[libvirt] [PATCH] create() and destroy() support for Power Hypervisor
by Eduardo Otubo 06 Nov '09

06 Nov '09

Hello all, This patch includes a lot of changes: * I changed all references of uuid_db to uuid_table. Bigger name, but this semantic has a better understanding. * Now we have a little control of UUID generated for each partition. It's based on a table that matches UUID with LPAR's IDs, I keep it in a file that is stored in the managed system (HMC or IVM). Even having isolated functions to manipulate this file I still need to implement a way to lock it and make the operation atomic to avoid corruptions. * The XML file used in the create() function still must be improved. I used the <disk> tag to make a work around to handle storage pools. Now I ask for some help, how do I use the <pool> tag if there is no reference to it at the virDomainDef structure? I've been told that libvirt possibly would make a mini-release this week to push some major fixes on Fedora 12. Is there a little possibility to push these new phyp features too? This would be very important for the phyp project, since this functions are not just to manage partitions but manipulate them. Any comments are always welcome. []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

5 13

[libvirt] Remote access and libvirtd
by Dave Bryson 06 Nov '09

06 Nov '09

I need to be able to access libvirt remotely. Reading through the documention is says "libvirtd should be running on the remote machine" for clarification does this mean that libvirtd needs to run *on* the remote hypervisor? Thanks, Dave

2 1

[libvirt] Add support for legacy -vmchannel option
by Matthew Booth 06 Nov '09

06 Nov '09

These patches add support for the legacy qemu -vmchannel option. The following domain xml: <channel type='unix'> <source mode='bind' path='/tmp/vmchannel'/> <target type='vmchannel' deviceid='0200'/> </channel> becomes: -vmchannel di:0200,unix:/tmp/vmchannel,server,nowait I don't expect these to be merged, but I would appreciate a review. Thanks, Matt

4 6

[libvirt] Guestfwd support (round 3)
by Matthew Booth 06 Nov '09

06 Nov '09

This is substantially the same as the last set. I don't think I changed patches 1 and 2 at all. Patch 3 is updated to use a virBuffer as Rich Jones recommended. Patch 4 is updated slightly for the above change, and there are a couple of other trivial tidy ups in there. Patch 5 is new. QEMU's guestfwd only supports IPv4 addresses, so we check for that. Rich Jones also noted that guestfwd is specific to QEMU. If there's a good chance this same syntax might do something simililar in a different driver, I agree that changing the name would be a good idea. However, I'm not familiar enough with other hypervisors to be able to make a call on this. If nothing else does anything similar, I'd keep the QEMU name for clarity. Matt

3 17

[libvirt] [PATCH] LXC allow container to have ethN interfaces
by Ryota Ozaki 05 Nov '09

05 Nov '09

Current implementation of lxc driver creates vethN named interface(s) in the host and passes as it is to a container. The reason why it doesn't use ethN is due to the limitation that one namespace cannot have multiple iterfaces that have an identical name so that we give up creating ethN named interface in the host for the container. However, we should be able to allow the container to have ethN by changing the name after clone(CLONE_NEWNET). The patch simply does that and numberes to ethN with ascending order from zero with no concern for what vethN is named. So say if there is one interface, its name will be eth0. Note that this patch is based on top of the prior cleanup patches. --- src/lxc/lxc_container.c | 34 ++++++++++++++++++++++++---------- src/lxc/veth.c | 31 +++++++++++++++++++++++++++++++ src/lxc/veth.h | 1 + 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2419345..97b7903 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -225,26 +225,38 @@ static int lxcContainerWaitForContinue(int control) /** - * lxcContainerEnableInterfaces: + * lxcContainerRenameAndEnableInterfaces: * @nveths: number of interfaces * @veths: interface names * - * This function will enable the interfaces for this container. + * This function will rename the interfaces to ethN + * with id ascending order from zero and enable the + * renamed interfaces for this container. * * Returns 0 on success or nonzero in case of error */ -static int lxcContainerEnableInterfaces(unsigned int nveths, - char **veths) +static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, + char **veths) { int rc = 0; unsigned int i; + char *newname = NULL; for (i = 0 ; i < nveths ; i++) { - DEBUG("Enabling %s", veths[i]); - rc = vethInterfaceUpOrDown(veths[i], 1); - if (0 != rc) { + rc = virAsprintf(&newname, "eth%d", i); + if (rc < 0) goto error_out; - } + + DEBUG("Renaming %s to %s", veths[i], newname); + rc = setInterfaceName(veths[i], newname); + if (0 != rc) + goto error_out; + + DEBUG("Enabling %s", newname); + rc = vethInterfaceUpOrDown(newname, 1); + if (0 != rc) + goto error_out; + VIR_FREE(newname); } /* enable lo device only if there were other net devices */ @@ -252,6 +264,7 @@ static int lxcContainerEnableInterfaces(unsigned int nveths, rc = vethInterfaceUpOrDown("lo", 1); error_out: + VIR_FREE(newname); return rc; } @@ -757,8 +770,9 @@ static int lxcContainerChild( void *data ) if (lxcContainerWaitForContinue(argv->monitor) < 0) return -1; - /* enable interfaces */ - if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) + /* rename and enable interfaces */ + if (lxcContainerRenameAndEnableInterfaces(argv->nveths, + argv->veths) < 0) return -1; /* drop a set of root capabilities */ diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 8617cf7..ede85ce 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -247,3 +247,34 @@ int setMacAddr(const char* iface, const char* macaddr) error_out: return rc; } + +/** + * setInterfaceName + * @iface: name of device + * @new: new name of @iface + * + * Changes the name of the given device with the + * given new name using this command: + * ip link set @iface name @new + * + * Returns 0 on success or -1 in case of error + */ +int setInterfaceName(const char* iface, const char* new) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "name", new, NULL + }; + int cmdResult; + + if (NULL == iface || NULL == new) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 8f2f514..8075a5e 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -21,5 +21,6 @@ int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); int setMacAddr(const char* iface, const char* macaddr); +int setInterfaceName(const char* iface, const char* new); #endif /* VETH_H */ -- 1.6.2.5

2 1

[libvirt] [PATCH 0/3] LXC misc fixes and cleanups
by Ryota Ozaki 05 Nov '09

05 Nov '09

This patch series fix and cleanup over whole lxc codes. I want to clean up before adding more in them. Thanks, ozaki-r Ryota Ozaki (3): LXC fix wrong or out-of-date function descriptions LXC cleanup and fix lxcError LXC cleanup deep indentation in lxcDomainSetAutostart src/lxc/lxc_container.c | 85 +++++++++++----------- src/lxc/lxc_controller.c | 40 ++++++----- src/lxc/lxc_driver.c | 177 +++++++++++++++++++++++++--------------------- src/lxc/veth.c | 8 +- 4 files changed, 164 insertions(+), 146 deletions(-)

3 7

[libvirt] flush guest page cache and suspend?
by Marco Colombo 05 Nov '09

05 Nov '09

Hi, I'm new to this list. I've searched the archives (and google) but I haven't found an answer. Recently I moved to CentOS 5.4, with libvirt-0.6.3 and kvm-83. They are rather new compared to 5.3 ones, so I'm still investigating on the new capabilities. My guests disk images are LV single devices, /dev/vg_virt/<guestname>, usually with two partitions, the root fs and swap space. I'd like to run backups on the node only, taking snapshots of the LVs. I'm already doing that, actually. Everything works fine, using bacula (with one minor glitch, but that's for another list). Now I wonder if it makes sense to suspend the guest before creating the snapshot: virsh suspend <guestname> lvcreate --snapshot ... virsh resume <guestname> ... perform backup ... lvremove -f <the snapshot> but thinking about it a second time it seems it doesn't add anything to the equation, the filesystem is still potentially unclean, with data to be written still in the guest page cache. The filesystem is ext3, so it's not that bad (recovers a consistent state from the journal, with standard options even data-consistent, not just metadata-consistent). Yet it's like doing a backup of a (potentially badly) crashed filesystem. While I trust the recovery step of ext3, my feeling is that it can't be 100% reliable. I have (rarely) seen ext3 crash and ask for fsck at boot, journal or not (for truth's sake, I can't rule out an hard disk problem in those cases). So, first question: does the suspend command cause a flush in the guest OS (details: both guest and node are CentOS 5.4, hypervisor is qemu-kvm)? I guess not (otherwise I won't be here). So if not, what are the options to force the sync? Ideally, there should be a single atomic 'sync & suspend'. In practice, I can think of some workarounds: ssh <guest> -c sync, or the very old-fashioned way of enabling the 'sync' user and logging in from the serial console, or issuing a sysrq-s, again on the console. I'm interested in the latter, but I wasn't able to trigger the sysrq from either 'virsh console <guestname>' or 'screen `virsh ttyconsole <guestname>` (tried minicom, too). The serial console is on pty, I'm not even sure you can generate a break on a pty. (and yes, I remembered to sysctl -w kernel.sysrq=1 on the guest). I know XEN has 'xm sysrq', but this is kvm. Is there anything similar? I think it can be done if you invoke qemu-kvm from the command line with -nographics (it multiplexes the console and the monitor lines on stdin/out, and you can send a 'break' with C-a b I think, I've never tried). So question 2): is there a way to send a sysrq-s to the guest? My fallback plan is to try and map the serial line over telnet instead of pty, and the figure out a way to send the break (which I think is part of the telnet protocol) from the command line. I'd rather not mess with telnet and local port assignment to the guests, if not necessary. My really fallback plan is to revert to shutdown/snapshot/create, which is overkill for a daily backup. Question 3): does it _really_ make sense to try and sync the guest OS page cache before taking the snapshot? Or is it just me being paranoid? For reference, here's the qemu cmdline of one of the guests: /usr/libexec/qemu-kvm -S -M pc -m 512 -smp 1 -name wtitv -uuid 445d0fe5-c1b6-4baf-a186-da1fe021158c -monitor pty -pidfile /var/run/libvirt/qemu//wtitv.pid -boot c -drive file=/dev/vg_virt/wtitv,if=ide,index=0,boot=on -net nic,macaddr=00:16:3e:57:45:4f,vlan=0,model=e1000 -net tap,fd=14,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 and here's the xml config file for libvirt, same guest: <domain type='kvm'> <name>wtitv</name> <uuid>445d0fe5-c1b6-4baf-a186-da1fe021158c</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> <acpi/> </features> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='block' device='disk'> <source dev='/dev/vg_virt/wtitv'/> <target dev='hda' bus='ide'/> </disk> <interface type='bridge'> <mac address='00:16:3e:57:45:4f'/> <source bridge='br1'/> <model type='e1000'/> </interface> <console type='pty'> <target port='0'/> </console> <input type='tablet' bus='usb'/> <graphics type='vnc' autoport='yes'/> </devices> </domain> TIA, .TM.

2 2

[libvirt] [PATCH 0/2] CPU flags capabilities and domain configuration
by Jiri Denemark 05 Nov '09

05 Nov '09

Hi, These are two initial patches for CPU flags/masks support for libvirt. The first patch contains changes to schemas and describes semantics of new elements and attributes. The second patch introduces internal API functions for XML parsing and formating. Jiri Denemark (2): XML schema for CPU flags XML parsing/formating code for CPU flags docs/schemas/capability.rng | 30 ++++ docs/schemas/domain.rng | 49 ++++++ include/libvirt/virterror.h | 1 + src/Makefile.am | 9 +- src/conf/capabilities.c | 31 ++++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 345 +++++++++++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 110 ++++++++++++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 8 + src/util/virterror.c | 3 + 12 files changed, 606 insertions(+), 3 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h

2 4

[libvirt] F12beta guest will not connect to LAN via bridge
by Gerry Reno 05 Nov '09

05 Nov '09

Setup: HOST: F11 x86_64 GUEST: F12beta x86_64 I have a number of guests setup on this host and all connect without a problem with the 'br0' bridge on the host. I created a new guest and loaded F12beta on it. I defined it to also use 'br0' networking but this guest cannot ping anything on the LAN. All the other guests have no problems communicating to addresses on the LAN. Details: ### on HOST: # brctl showmacs br0 port no mac addr is local? ageing timer 1 00:0b:82:11:bc:cb no 15.88 3 00:0c:01:30:50:00 no 16.37 2 00:0c:01:40:50:00 no 2.51 1 00:0c:29:e3:bc:ee no 0.49 1 00:18:f8:48:27:15 no 2.51 1 00:18:f8:9b:ba:b4 no 116.39 1 00:18:f8:9b:ba:b5 no 20.60 1 00:1a:4d:5e:f6:36 no 156.43 1 00:24:1d:19:05:cf yes 0.00 3 06:1d:1d:7a:31:9b yes 0.00 2 06:ba:11:dd:7b:08 yes 0.00 1 54:52:00:24:5e:cf no 28.93 # EXISTING GUEST: network interface in xml file: <interface type='bridge'> <mac address='00:0c:01:30:50:00'/> <source bridge='br0'/> <target dev='vnet0'/> <model type='virtio'/> </interface> # NEW GUEST: network interface in xml file: <interface type='bridge'> <mac address='00:0c:01:40:50:00'/> <source bridge='br0'/> <target dev='vnet0'/> <model type='virtio'/> </interface> ### on EXISTING GUEST: DEVICE=eth0 ONBOOT=yes BOOTPROTO=static HWADDR=00:0c:01:30:50:00 IPADDR=192.168.1.200 NETMASK=255.255.255.0 NETWORK=192.168.1.0 ### on NEW GUEST: DEVICE=eth0 ONBOOT=yes BOOTPROTO=static HWADDR=00:0c:01:40:50:00 IPADDR=192.168.1.210 NETMASK=255.255.255.0 GATEWAY=192.168.1.1 NETWORK=192.168.1.0 TYPE=Ethernet IPV6INIT=no USERCTL=no ### on EXISTING GUEST: # ping 192.168.1.1 succeeds ### on NEW GUEST: # ping 192.168.1.1 fails with Destination Host Unreachable Is there something else I need to configure in F12beta to get this working? -Gerry

1 2

[libvirt] Minor doc fix for <clock>
by Cole Robinson 05 Nov '09

05 Nov '09

FYI, I just pushed this minor docs fix: commit 45bd290b64c9f911ebb6e0990f8fcef249576436 Author: Cole Robinson <crobinso(a)redhat.com> Date: Wed Nov 4 13:26:28 2009 -0500 docs: <clock> property is 'offset', not 'sync' diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 53cd960..d26ce75 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -300,7 +300,7 @@ <dl> <dt><code>clock</code></dt> - <dd>The <code>sync</code> attribute takes either "utc" or + <dd>The <code>offset</code> attribute takes either "utc" or "localtime" to specify how the guest clock is initialized in relation to the host OS. </dd> Thanks, Cole

1 0

[libvirt] ESX with Python binding
by Dave Bryson 04 Nov '09

04 Nov '09

I'm new to libvirt. Is it possible to use the python binding with the latest ESX support? If so, does anyone have a simple example I can try? Thanks in advance! Dave

3 2

[libvirt] [RFC][PATCH] LXC allow a container to have ethN named interfaces
by Ryota Ozaki 04 Nov '09

04 Nov '09

Note that this patch is not mature yet and still proof- of-concept prototype, although it actually works. Current implementation of lxc driver creates vethN named interface(s) in the host and passes as it is to a container. The reason why it doesn't use ethN is due to the limitation that one namespace cannot have multiple iterfaces that have an identical name so that we give up creating ethN named interface in the host for the container. However, we should be able to allow the container to have ethN by changing the name after clone(CLONE_NEWNET) in controller. To this end, this patch extends --veth argument of controller to be able to have two names; one is the name of a created veth, and the other is a new name. The format is: --veth veth1,eth0 --veth veth3,eth1 ... where veth1 is old name and eth0 is new one. The implementation also allows a single name, in that case, controller does not do nothing for the interface, which is the original behavior. The numbering of the new names is simply ascending order from zero. So if there is one interface, its name will be eth0. --- src/lxc/lxc_container.c | 23 ++++++++++++++++++----- src/lxc/lxc_container.h | 1 + src/lxc/lxc_controller.c | 30 ++++++++++++++++++++++++++++-- src/lxc/lxc_driver.c | 30 +++++++++++++++++++++++++----- src/lxc/veth.c | 20 ++++++++++++++++++++ src/lxc/veth.h | 1 + 6 files changed, 93 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f4381e7..f065788 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -84,6 +84,7 @@ struct __lxc_child_argv { virDomainDefPtr config; unsigned int nveths; char **veths; + char **newveths; int monitor; char *ttyPath; }; @@ -233,14 +234,23 @@ static int lxcContainerWaitForContinue(int control) * Returns 0 on success or nonzero in case of error */ static int lxcContainerEnableInterfaces(unsigned int nveths, - char **veths) + char **veths, char **newveths) { int rc = 0; unsigned int i; for (i = 0 ; i < nveths ; i++) { - DEBUG("Enabling %s", veths[i]); - rc = vethInterfaceUpOrDown(veths[i], 1); + char *veth = veths[i]; + if (newveths[i] && !STREQ(veths[i], newveths[i])) { + DEBUG("changing %s", veths[i]); + rc = setInterfaceName(veths[i], newveths[i]); + if (0 != rc) { + goto error_out; + } + veth = newveths[i]; + } + DEBUG("Enabling %s", veth); + rc = vethInterfaceUpOrDown(veth, 1); if (0 != rc) { goto error_out; } @@ -758,7 +768,9 @@ static int lxcContainerChild( void *data ) return -1; /* enable interfaces */ - if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) + if (lxcContainerEnableInterfaces(argv->nveths, + argv->veths, + argv->newveths) < 0) return -1; /* drop a set of root capabilities */ @@ -786,6 +798,7 @@ static int userns_supported(void) int lxcContainerStart(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int control, char *ttyPath) { @@ -793,7 +806,7 @@ int lxcContainerStart(virDomainDefPtr def, int flags; int stacksize = getpagesize() * 4; char *stack, *stacktop; - lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; + lxc_child_argv_t args = { def, nveths, veths, newveths, control, ttyPath }; /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) { diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index a1dd5a1..d796380 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -49,6 +49,7 @@ int lxcContainerSendContinue(int control); int lxcContainerStart(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int control, char *ttyPath); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 545f718..75dd73a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -493,6 +493,7 @@ static int lxcControllerRun(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int monitor, int client, int appPty) @@ -603,6 +604,7 @@ lxcControllerRun(virDomainDefPtr def, if ((container = lxcContainerStart(def, nveths, veths, + newveths, control[1], containerPtyPath)) < 0) goto cleanup; @@ -649,6 +651,7 @@ int main(int argc, char *argv[]) char *name = NULL; int nveths = 0; char **veths = NULL; + char **newveths = NULL; int monitor = -1; int appPty = -1; int bg = 0; @@ -691,10 +694,33 @@ int main(int argc, char *argv[]) virReportOOMError(NULL); goto cleanup; } - if ((veths[nveths++] = strdup(optarg)) == NULL) { + if (VIR_REALLOC_N(newveths, nveths+1) < 0) { virReportOOMError(NULL); goto cleanup; } + { + char *sep = strchr(optarg, ','); + if (sep) { + *sep = '\0'; + sep++; + if ((veths[nveths] = strdup(optarg)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + if ((newveths[nveths] = strdup(sep)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + nveths++; + } else { + if ((veths[nveths] = strdup(optarg)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + newveths[nveths] = NULL; + nveths++; + } + } break; case 'c': @@ -803,7 +829,7 @@ int main(int argc, char *argv[]) goto cleanup; } - rc = lxcControllerRun(def, nveths, veths, monitor, client, appPty); + rc = lxcControllerRun(def, nveths, veths, newveths, monitor, client, appPty); cleanup: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f0787b..1323cff 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -693,13 +693,15 @@ static int lxcVMCleanup(virConnectPtr conn, static int lxcSetupInterfaces(virConnectPtr conn, virDomainDefPtr def, unsigned int *nveths, - char ***veths) + char ***veths, + char ***newveths) { int rc = -1, i; char *bridge = NULL; char parentVeth[PATH_MAX] = ""; char containerVeth[PATH_MAX] = ""; brControl *brctl = NULL; + char *newveth; if (brInit(&brctl) != 0) return -1; @@ -744,10 +746,20 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (NULL == def->nets[i]->ifname) { def->nets[i]->ifname = strdup(parentVeth); } + if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) goto error_exit; - if (((*veths)[(*nveths)++] = strdup(containerVeth)) == NULL) + if (VIR_REALLOC_N(*newveths, (*nveths)+1) < 0) + goto error_exit; + + if (((*veths)[*nveths] = strdup(containerVeth)) == NULL) + goto error_exit; + if (virAsprintf(&newveth, "eth%d", i) < 0) goto error_exit; + if (((*newveths)[*nveths] = strdup(newveth)) == NULL) + goto error_exit; + (*nveths)++; + VIR_FREE(newveth); if (NULL == def->nets[i]->ifname) { lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -906,6 +918,7 @@ static int lxcControllerStart(virConnectPtr conn, virDomainObjPtr vm, int nveths, char **veths, + char **newveths, int appPty, int logfd) { @@ -1029,7 +1042,13 @@ static int lxcControllerStart(virConnectPtr conn, for (i = 0 ; i < nveths ; i++) { ADD_ARG_LIT("--veth"); - ADD_ARG_LIT(veths[i]); + if (newveths[i]) { + if (virAsprintf(&tmp, "%s,%s", veths[i], newveths[i]) < 0) + goto no_memory; + ADD_ARG_LIT(tmp); + } else { + ADD_ARG_LIT(veths[i]); + } } ADD_ARG(NULL); @@ -1107,6 +1126,7 @@ static int lxcVmStart(virConnectPtr conn, int logfd = -1; unsigned int nveths = 0; char **veths = NULL; + char **newveths = NULL; if ((r = virFileMakePath(driver->logDir)) < 0) { virReportSystemError(conn, r, @@ -1135,7 +1155,7 @@ static int lxcVmStart(virConnectPtr conn, VIR_FREE(parentTtyPath); } - if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths) != 0) + if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths, &newveths) != 0) goto cleanup; /* Persist the live configuration now we have veth & tty info */ @@ -1152,7 +1172,7 @@ static int lxcVmStart(virConnectPtr conn, if (lxcControllerStart(conn, vm, - nveths, veths, + nveths, veths, newveths, parentTty, logfd) < 0) goto cleanup; diff --git a/src/lxc/veth.c b/src/lxc/veth.c index b15df8d..fbd1195 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -247,3 +247,23 @@ int setMacAddr(const char* iface, const char* macaddr) error_out: return rc; } + +int setInterfaceName(const char* iface, const char* new) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "name", new, NULL + }; + int cmdResult; + + if (NULL == iface || NULL == new) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 8f2f514..8075a5e 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -21,5 +21,6 @@ int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); int setMacAddr(const char* iface, const char* macaddr); +int setInterfaceName(const char* iface, const char* new); #endif /* VETH_H */ -- 1.6.2.5

2 4

[libvirt] starting vm using virsh somewhat fails
by Ricardo Tiago 04 Nov '09

04 Nov '09

Hi all, I have started a vm using virsh create domain.xml and it starts for a second and then its destroyed automatically. When I do xm create -f <xm cfg> it works fine. I don't know if this is relevant but virsh net-list --all Name State Autostart ----------------------------------------- default inactive yes virsh net-start default error: Failed to start network default error: Failed to open file '/etc/sysconfig/system-config-firewall': No such file or directory Can this be the problem? Why do I need /etc/sysconfig/system-config-firewall? Domain XML Description: (converted from a xm cfg file) <domain type='xen'> <name>rtiago_test</name> <uuid>8f07fe28-753f-2729-d76d-bdbd892f949a</uuid> <memory>2560000</memory> <currentMemory>200000</currentMemory> <vcpu>8</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> <type arch='x86_64' machine='xenpv'>linux</type> <cmdline>rtiago</cmdline> </os> <clock offset='utc'/> <on_poweroff>restart</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <disk type='file' device='disk'> <driver name='file'/> <source file='/images/fc-6.img'/> <target dev='xvda1' bus='xen'/> </disk> </domain>

1 1

[libvirt] [PATCH] network utilities: Allocate space for terminating NUL in virSocketFormatAddr
by Matthew Booth 04 Nov '09

04 Nov '09

* src/util/network.c: Allocate an additional byte for virSocketFormatAddr's return buffer --- src/util/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/network.c b/src/util/network.c index 56426e7..f6588c7 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -135,12 +135,12 @@ virSocketFormatAddr(virSocketAddrPtr addr) { return NULL; if (addr->stor.ss_family == AF_INET) { - outlen = INET_ADDRSTRLEN; + outlen = INET_ADDRSTRLEN + 1; inaddr = &addr->inet4.sin_addr; } else if (addr->stor.ss_family == AF_INET6) { - outlen = INET6_ADDRSTRLEN; + outlen = INET6_ADDRSTRLEN + 1; inaddr = &addr->inet6.sin6_addr; } -- 1.6.2.5

2 2

[libvirt] [PATCH] Fix up NLS warnings.
by Chris Lalancette 04 Nov '09

04 Nov '09

When building with --disable-nls, I got a few messages like this: storage/storage_backend.c: In function 'virStorageBackendCreateQemuImg': storage/storage_backend.c:571: warning: format not a string literal and no format arguments Fix these up. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/storage/storage_backend.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ba6b28d..a9c8573 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1813,7 +1813,7 @@ virDomainWatchdogDefParseXML(virConnectPtr conn, model = virXMLPropString (node, "model"); if (model == NULL) { - virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, + virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, "%s", _("watchdog must contain model name")); goto error; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9a5c43a..1e984c5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1858,7 +1858,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, for (i = 0; i < nparams; i++) { virSchedParameterPtr param = &params[i]; if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { - lxcError(NULL, domain, VIR_ERR_INVALID_ARG, + lxcError(NULL, domain, VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38fe19e..7295641 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5299,7 +5299,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, if (STREQ(param->field, "cpu_shares")) { int rc; if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); goto cleanup; } @@ -6479,7 +6479,7 @@ static int doTunnelSendAll(virDomainPtr dom, break; if (virStreamSend(st, buffer, nbytes) < 0) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "%s", _("Failed to write migration data to remote libvirtd")); return -1; } @@ -6701,7 +6701,7 @@ static int doNonTunnelMigrate(virDomainPtr dom, goto cleanup; if (uri_out == NULL) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); } diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 18a69be..bb926cd 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -568,7 +568,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, return -1; } if (enc->nsecrets > 1) { - virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, + virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, "%s", _("too many secrets for qcow encryption")); return -1; } -- 1.6.0.6

3 3

[libvirt] libvirt generates bad kvm command line
by Harald Dunkel 04 Nov '09

04 Nov '09

Hi folks, using this command sequence <code> export VIRSH_DEFAULT_CONNECT_URI=qemu:///system name=Testing kvmdir=/export/hdunkel/kvm hda=$kvmdir/$name/hda.qcow2 iso=/export/isos/debian-testing-amd64-netinst.iso mkdir -p $kvmdir/$name qemu-img create -f qcow2 $hda 32G virt-install --connect ${VIRSH_DEFAULT_CONNECT_URI} \ -n $name -r 1024 -vcpus=1 -f $hda -c $iso \ --network=bridge:br0 --vnc --accelerate -v \ --os-type=linux --os-variant=debianSqueeze </code> I get the famous "cdrom boot failure code 0003" error. The log file shows that libvirt generated this kvm command line: <code> LC_ALL=C \ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none \ /usr/bin/kvm -S -M pc -m 1024 -smp 1 -name Testing \ -uuid 3a6b6b3f-84e6-6a21-a51a-2c61cf3914e2 \ -monitor unix:/var/lib/libvirt/qemu/Testing.monitor,server,nowait \ -no-reboot -boot d \ -drive file=/export/hdunkel/kvm/Testing/hda.qcow2,if=virtio,index=0 -drive file=/export/isos/debian-testing-amd64-netinst.iso,if=virtio,media=cdrom,index=1 \ -net nic,macaddr=52:54:00:3e:0b:26,vlan=0,model=virtio,name=virtio.0 \ -net tap,fd=18,vlan=0,name=tap.0 -serial pty -parallel none \ -usb -usbdevice tablet -vnc 127.0.0.1:0 -k en-us -vga cirrus </code> If I try this on the command line, then there is the same 0003 error. If I omit the if=virtio for the cdrom drive, then it boots the cd without 0003. Can you reproduce this? Is this a problem with libvirt or with the kvm module? Kernel is 2.6.31.5, i.e. kvm 0.88. libvirt is 0.7.2 Any helpful comments would be highly appreciated. Harri

4 7

[libvirt] [PATCH 0/6] test: Implement GetVcpus and PinVcpu
by Cole Robinson 04 Nov '09

04 Nov '09

Using the recently committed support for driver specific domain data blobs[1], carry around VCPU pinning info for running test domains, which enables supporting GetVcpus and PinVcpu, which makes my life easier when adding support in virt-manager. [1] http://libvirt.org/git/?p=libvirt.git;a=commit;h=3505790b85da55c16191a9dca4… Cole Robinson (6): test: Fixes for SetVcpus test: Break out wrapper for setting up started domain state. test: Use privateData to track running VM vcpu state test: Update vcpu runtime info in SetVcpus test: Implement virDomainGetVcpus test: Implement virDomainPinVcpu src/test/test_driver.c | 354 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 337 insertions(+), 17 deletions(-)

2 13

[libvirt] [PATCH 0/3] qemu: Use same create/define overwrite logic for migration
by Cole Robinson 04 Nov '09

04 Nov '09

As pointed out by Dan here: https://www.redhat.com/archives/libvir-list/2009-October/msg00784.html We should be using the same logic for collision prevention and domain redefinition in the migrate routines as we use in create/define/restore. Cole Robinson (3): qemu: Remove compiled out localhost migration support qemu: Break out function to check if we can create/define/restore qemu: Use same create/define overwrite logic for migration prepare. src/qemu/qemu_driver.c | 191 ++++++++++++++++-------------------------------- 1 files changed, 62 insertions(+), 129 deletions(-)

3 8

[libvirt] [PATCH] storage: conf: Fix memory leak in encryption parsing
by Cole Robinson 04 Nov '09

04 Nov '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/storage_encryption_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index b97b989..a329622 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -112,6 +112,7 @@ virStorageEncryptionSecretParse(virConnectPtr conn, xmlXPathContextPtr ctxt, uuidstr); goto cleanup; } + VIR_FREE(uuidstr); } else { virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("missing volume encryption uuid")); -- 1.6.5.1

2 2

[libvirt] [PATCH] Various error reporting fixes
by Cole Robinson 04 Nov '09

04 Nov '09

- Don't duplicate SystemError - Use proper error code in domain_conf - Fix a broken error call in qemu_conf - Don't use VIR_ERR_ERROR in security driver (isn't a valid code in this case) Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/storage_conf.c | 6 +++--- src/qemu/qemu_conf.c | 6 ++---- src/qemu/qemu_driver.c | 2 +- src/security/security_apparmor.c | 30 +++++++++++++++--------------- src/security/security_driver.c | 2 +- src/security/security_selinux.c | 10 +++++----- src/xen/xen_hypervisor.c | 4 +--- tests/cpuset | 2 +- 9 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ba6b28d..ca141e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3705,7 +3705,7 @@ virDomainCpuSetParse(virConnectPtr conn, const char **str, char sep, return (ret); parse_error: - virDomainReportError(conn, VIR_ERR_XEN_CALL, + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("topology cpuset syntax error")); return (-1); } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2924a0d..065cd04 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1593,9 +1593,9 @@ virStoragePoolObjSaveDef(virConnectPtr conn, char path[PATH_MAX]; if ((err = virFileMakePath(driver->configDir))) { - virStorageReportError(conn, err, - _("cannot create config directory %s"), - driver->configDir); + virReportSystemError(conn, err, + _("cannot create config directory %s"), + driver->configDir); return -1; } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 59873d7..71b3550 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1106,10 +1106,8 @@ int qemudExtractVersion(virConnectPtr conn, return -1; if (stat(binary, &sb) < 0) { - char ebuf[1024]; - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Cannot find QEMU binary %s: %s"), binary, - virStrerror(errno, ebuf, sizeof ebuf)); + virReportSystemError(conn, errno, + _("Cannot find QEMU binary %s"), binary); return -1; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0470315..e8606c8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1773,7 +1773,7 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn, } return 0; #else - qemudReportError(conn, NULL, NULL, "%s", + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, "%s", _("unable to set host device ownership on this platform")); return -1; #endif diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 16de0f2..6db51cd 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -112,7 +112,7 @@ profile_status_file(const char *str) if (snprintf(profile, PATH_MAX, "%s/%s", APPARMOR_DIR "/libvirt", str) > PATH_MAX - 1) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("profile name exceeds maximum length")); } @@ -204,7 +204,7 @@ load_profile(virConnectPtr conn, const char *profile, virDomainObjPtr vm, if (errno == EINTR) goto rewait; - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("Unexpected exit status from virt-aa-helper " "%d pid %lu"), WEXITSTATUS(status), (unsigned long)child); @@ -265,7 +265,7 @@ use_apparmor(void) if ((len = readlink("/proc/self/exe", libvirt_daemon, PATH_MAX - 1)) < 0) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("could not find libvirtd")); return rc; } @@ -289,13 +289,13 @@ AppArmorSecurityDriverProbe(void) /* see if template file exists */ if (snprintf(template, PATH_MAX, "%s/TEMPLATE", APPARMOR_DIR "/libvirt") > PATH_MAX - 1) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("template too large")); return SECURITY_DRIVER_DISABLE; } if (!virFileExists(template)) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, _("template \'%s\' does not exist"), template); return SECURITY_DRIVER_DISABLE; } @@ -326,7 +326,7 @@ AppArmorGenSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) if ((vm->def->seclabel.label) || (vm->def->seclabel.model) || (vm->def->seclabel.imagelabel)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("security label already defined for VM")); return rc; @@ -338,7 +338,7 @@ AppArmorGenSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) /* if the profile is not already loaded, then load one */ if (profile_loaded(profile_name) < 0) { if (load_profile(conn, profile_name, vm, NULL) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate AppArmor profile " "\'%s\'"), profile_name); goto clean; @@ -395,13 +395,13 @@ AppArmorGetSecurityLabel(virConnectPtr conn, if (virStrcpy(sec->label, profile_name, VIR_SECURITY_LABEL_BUFLEN) == NULL) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("error copying profile name")); goto clean; } if ((sec->enforcing = profile_status(profile_name, 1)) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("error calling profile_status()")); goto clean; } @@ -424,7 +424,7 @@ AppArmorRestoreSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) if (secdef->imagelabel) { if ((rc = remove_profile(secdef->label)) != 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("could not remove profile for \'%s\'"), secdef->label); } @@ -450,7 +450,7 @@ AppArmorSetSecurityLabel(virConnectPtr conn, return rc; if (STRNEQ(drv->name, secdef->model)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "\'%s\' model configured for domain, but " "hypervisor driver is \'%s\'."), @@ -460,7 +460,7 @@ AppArmorSetSecurityLabel(virConnectPtr conn, } if (aa_change_profile(profile_name) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("error calling aa_change_profile()")); goto clean; } @@ -490,7 +490,7 @@ AppArmorRestoreSecurityImageLabel(virConnectPtr conn, /* Update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { if (load_profile(conn, secdef->imagelabel, vm, NULL) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), secdef->imagelabel); @@ -520,7 +520,7 @@ AppArmorSetSecurityImageLabel(virConnectPtr conn, if (secdef->imagelabel) { /* if the device doesn't exist, error out */ if (!virFileExists(disk->src)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("\'%s\' does not exist"), disk->src); return rc; } @@ -531,7 +531,7 @@ AppArmorSetSecurityImageLabel(virConnectPtr conn, /* update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { if (load_profile(conn, secdef->imagelabel, vm, disk) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), secdef->imagelabel); diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 43d52b1..4e6172d 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -123,7 +123,7 @@ virSecurityDriverSetDOI(virConnectPtr conn, const char *doi) { if (strlen(doi) >= VIR_SECURITY_DOI_BUFLEN) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("%s: DOI \'%s\' is " "longer than the maximum allowed length of %d"), __func__, doi, VIR_SECURITY_DOI_BUFLEN - 1); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 6a03af7..0e31077 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -189,13 +189,13 @@ SELinuxGenSecurityLabel(virConnectPtr conn, vm->def->seclabel.label = SELinuxGenNewContext(default_domain_context, mcs); if (! vm->def->seclabel.label) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto err; } vm->def->seclabel.imagelabel = SELinuxGenNewContext(default_image_context, mcs); if (! vm->def->seclabel.imagelabel) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto err; } @@ -285,9 +285,9 @@ SELinuxGetSecurityLabel(virConnectPtr conn, } if (strlen((char *) ctx) >= VIR_SECURITY_LABEL_BUFLEN) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label exceeds " - "maximum lenth: %d"), + "maximum length: %d"), VIR_SECURITY_LABEL_BUFLEN - 1); return -1; } @@ -647,7 +647,7 @@ SELinuxSetSecurityLabel(virConnectPtr conn, int i; if (!STREQ(drv->name, secdef->model)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " "hypervisor driver is '%s'."), diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 3aa3c30..e107d1e 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2298,9 +2298,7 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) if ((fd = open("/dev/cpu/self/cpuid", O_RDONLY)) == -1 || pread(fd, &regs, sizeof(regs), 0) != sizeof(regs)) { - char ebuf[1024]; - virXenError(conn, VIR_ERR_SYSTEM_ERROR, - "couldn't read CPU flags: %s", virStrerror(errno, ebuf, sizeof ebuf)); + virReportSystemError(conn, errno, "%s", _("could not read CPU flags")); goto out; } diff --git a/tests/cpuset b/tests/cpuset index 9f43269..89c19e0 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -41,7 +41,7 @@ sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 error: Failed to define domain from xml-invalid -error: failed Xen syscall topology cpuset syntax error +error: internal error topology cpuset syntax error EOF compare exp out || fail=1 -- 1.6.5.1

2 2

[libvirt] [PATCH v2] Improve error reporting for virConnectGetHostname calls
by Cole Robinson 04 Nov '09

04 Nov '09

All drivers have copy + pasted inadequate error reporting which wraps util.c:virGetHostname. Move all error reporting to this function, and improve what we report. Changes from v1: Drop the driver wrappers around virGetHostname. This means we still need to keep the new conn argument to virGetHostname, but I think it's worth it. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 7 +++---- src/lxc/lxc_driver.c | 16 +--------------- src/qemu/qemu_driver.c | 22 ++-------------------- src/test/test_driver.c | 16 +--------------- src/uml/uml_driver.c | 17 +---------------- src/util/util.c | 18 +++++++++++++++--- src/util/util.h | 2 +- src/vbox/vbox_tmpl.c | 16 +--------------- src/xen/xen_driver.c | 20 +------------------- src/xen/xend_internal.c | 6 ++---- tools/virsh.c | 2 +- 11 files changed, 29 insertions(+), 113 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 0615cd2..322a320 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -993,11 +993,10 @@ static int qemudNetworkInit(struct qemud_server *server) { if (!mdns_name) { char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - localhost = virGetHostname(); - if (localhost == NULL) { - virReportOOMError(NULL); + localhost = virGetHostname(NULL); + if (localhost == NULL) goto cleanup; - } + if ((tmp = strchr(localhost, '.'))) *tmp = '\0'; snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 47e59f6..05fc48d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2027,20 +2027,6 @@ cleanup: return ret; } -static char *lxcGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) { int timeout = 1000; /* In milliseconds */ @@ -2258,7 +2244,7 @@ static virDriver lxcDriver = { NULL, /* supports_feature */ NULL, /* type */ lxcVersion, /* version */ - lxcGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ lxcGetCapabilities, /* getCapabilities */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 437a1b4..0470315 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2610,21 +2610,6 @@ cleanup: return ret; } -static char * -qemudGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { struct qemud_driver *driver = conn->privateData; int n; @@ -6248,11 +6233,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if ((hostname = virGetHostname()) == NULL) { - virReportSystemError (dconn, errno, - "%s", _("failed to determine host name")); + if ((hostname = virGetHostname(dconn)) == NULL) goto cleanup; - } /* XXX this really should have been a properly well-formed * URI, but we can't add in tcp:// now without breaking @@ -7084,7 +7066,7 @@ static virDriver qemuDriver = { qemudSupportsFeature, /* supports_feature */ qemudGetType, /* type */ qemudGetVersion, /* version */ - qemudGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ qemudGetMaxVCPUs, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ qemudGetCapabilities, /* getCapabilities */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7e19072..31b5ad3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1023,20 +1023,6 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, return (0); } -static char *testGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED) { @@ -4674,7 +4660,7 @@ static virDriver testDriver = { NULL, /* supports_feature */ NULL, /* type */ testGetVersion, /* version */ - testGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ testGetMaxVCPUs, /* getMaxVcpus */ testNodeGetInfo, /* nodeGetInfo */ testGetCapabilities, /* getCapabilities */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index fac3c4c..2455b92 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1146,21 +1146,6 @@ cleanup: return ret; } -static char * -umlGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int umlListDomains(virConnectPtr conn, int *ids, int nids) { struct uml_driver *driver = conn->privateData; int n; @@ -1790,7 +1775,7 @@ static virDriver umlDriver = { NULL, /* supports_feature */ umlGetType, /* type */ umlGetVersion, /* version */ - umlGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ umlGetCapabilities, /* getCapabilities */ diff --git a/src/util/util.c b/src/util/util.c index 08070da..853d3a0 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1805,30 +1805,42 @@ int virDiskNameToIndex(const char *name) { #define AI_CANONIDN 0 #endif -char *virGetHostname(void) +char *virGetHostname(virConnectPtr conn) { int r; char hostname[HOST_NAME_MAX+1], *result; struct addrinfo hints, *info; r = gethostname (hostname, sizeof(hostname)); - if (r == -1) + if (r == -1) { + virReportSystemError (conn, errno, + "%s", _("failed to determine host name")); return NULL; + } NUL_TERMINATE(hostname); memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); - if (r != 0) + if (r != 0) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("getaddrinfo failed for '%s': %s"), + hostname, gai_strerror(r)); return NULL; + } if (info->ai_canonname == NULL) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("could not determine canonical host name")); freeaddrinfo(info); return NULL; } /* Caller frees this string. */ result = strdup (info->ai_canonname); + if (!result) + virReportOOMError(conn); + freeaddrinfo(info); return result; } diff --git a/src/util/util.h b/src/util/util.h index 3ef26e6..f4e395e 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -222,7 +222,7 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif -char *virGetHostname(void); +char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index aecda23..c6305ac 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -591,20 +591,6 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { return 0; } -static char *vboxGetHostname(virConnectPtr conn) { - char *hostname; - - /* the return string should be freed by caller */ - hostname = virGetHostname(); - if (hostname == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", - "failed to determine host name"); - return NULL; - } - - return hostname; -} - static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { vboxGlobalData *data = conn->privateData; PRUint32 maxCPUCount = 0; @@ -6402,7 +6388,7 @@ virDriver NAME(Driver) = { NULL, /* supports_feature */ NULL, /* type */ vboxGetVersion, /* version */ - vboxGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ vboxGetMaxVcpus, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ vboxGetCapabilities, /* getCapabilities */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f2744b0..6dc4ac0 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -478,24 +478,6 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) return -1; } -/* NB: Even if connected to the proxy, we're still on the - * same machine. - */ -static char * -xenUnifiedGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int xenUnifiedGetMaxVcpus (virConnectPtr conn, const char *type) { @@ -1659,7 +1641,7 @@ static virDriver xenUnifiedDriver = { xenUnifiedSupportsFeature, /* supports_feature */ xenUnifiedType, /* type */ xenUnifiedGetVersion, /* version */ - xenUnifiedGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ xenUnifiedGetMaxVcpus, /* getMaxVcpus */ xenUnifiedNodeGetInfo, /* nodeGetInfo */ xenUnifiedGetCapabilities, /* getCapabilities */ diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d3ab019..9080754 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4347,11 +4347,9 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, * deallocates this string. */ if (uri_in == NULL) { - *uri_out = virGetHostname(); - if (*uri_out == NULL) { - virReportOOMError(dconn); + *uri_out = virGetHostname(dconn); + if (*uri_out == NULL) return -1; - } } return 0; diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..3c668da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -524,7 +524,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) char *thatHost = NULL; char *thisHost = NULL; - if (!(thisHost = virGetHostname())) { + if (!(thisHost = virGetHostname(ctl->conn))) { vshError(ctl, "%s", _("Failed to get local hostname")); goto cleanup; } -- 1.6.5.1

2 2