- Devel - libvirt List Archives

[libvirt] [PATCH] [REPOST] web docs -- macvtap mode explanation
by Stefan Berger 05 Mar '10

05 Mar '10

This adds more information about the different macvtap device modes, spells out VEPA and adds a link to a pdf at the ieee site. Regards, Stefan

2 1

[libvirt] [PATCH] qemuMonitorTextGetMemoryStats: decrease risk of false positive in parsing
by Jim Meyering 05 Mar '10

05 Mar '10

Not urgent. This was highlighted by clang as a dead store, since the first result stored in "offset" was never used. But if "info balloon" were ever to print some introductory text (containing a comma) before the balloon: actual... line, the bug would have made a difference. >From c81c6af87f20740a6b75652937ec8346f8bf59e3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 5 Mar 2010 15:25:48 +0100 Subject: [PATCH] qemuMonitorTextGetMemoryStats: decrease risk of false positive in parsing The code erroneously searched the entire "reply" for a comma, when its intent was to search only that portion after "balloon: actual=" * src/qemu/qemu_monitor_text.c (qemuMonitorTextGetMemoryStats): Search for "," only starting *after* the BALLOON_PREFIX string. Otherwise, we'd be more prone to false positives. --- src/qemu/qemu_monitor_text.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7f0e7f6..e629c6b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -593,7 +593,8 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, } if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { - if ((offset = strchr(reply, ',')) != NULL) { + offset += strlen(BALLOON_PREFIX); + if ((offset = strchr(offset, ',')) != NULL) { ret = qemuMonitorParseExtraBalloonInfo(offset, stats, nr_stats); } } -- 1.7.0.1.300.gd855a

2 1

[libvirt] [PATCH] Fix USB passthrough based on product/vendor
by Daniel P. Berrange 05 Mar '10

05 Mar '10

Changeset commit 5073aa994af460e775cb3e548528e28d7660fcc8 Author: Cole Robinson <crobinso(a)redhat.com> Date: Mon Jan 11 11:40:46 2010 -0500 Added support for product/vendor based passthrough, but it only worked at the security driver layer. The main guest XML config was not updated with the resolved bus/device ID. When the QEMU argv refactoring removed use of product/vendor, this then broke launching guests. THe solution is to move the product/vendor resolution up a layer into the QEMU driver. So the first thing QEMU does is resolve the product/vendor to a bus/device and updates the XML config with this info. The rest of the code, including security drivers and QEMU argv generated can now rely on bus/device always being set. * src/util/hostusb.c, src/util/hostusb.h: Split vendor/product resolution code out of usbGetDevice and into usbFindDevice. Add accessors for bus/device ID * src/security/virt-aa-helper.c, src/security/security_selinux.c, src/qemu/qemu_security_dac.c: Remove vendor/product from the usbGetDevice() calls * src/qemu/qemu_driver.c: Use usbFindDevice to resolve vendor/product into a bus/device ID --- src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 102 +++++++++++++++++++++++++++++++++++---- src/qemu/qemu_security_dac.c | 8 +-- src/security/security_selinux.c | 8 +-- src/security/virt-aa-helper.c | 4 +- src/util/hostusb.c | 39 +++++++++++---- src/util/hostusb.h | 13 +++-- 7 files changed, 136 insertions(+), 41 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ce9f013..c5ee23d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -599,7 +599,10 @@ virArgvToString; # usb.h usbGetDevice; +usbFindDevice; usbFreeDevice; +usbDeviceGetBus; +usbDeviceGetDevno; usbDeviceFileIterate; # uuid.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ef3cd6c..50bd55b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2283,17 +2283,15 @@ cleanup: return ret; } + static int -qemuPrepareHostDevices(struct qemud_driver *driver, - virDomainDefPtr def) +qemuPrepareHostPCIDevices(struct qemud_driver *driver, + virDomainDefPtr def) { pciDeviceList *pcidevs; int i; int ret = -1; - if (!def->nhostdevs) - return 0; - if (!(pcidevs = qemuGetPciHostDeviceList(def))) return -1; @@ -2344,6 +2342,62 @@ cleanup: return ret; } + +static int +qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + int i; + for (i = 0 ; i < def->nhostdevs ; i++) { + virDomainHostdevDefPtr hostdev = def->hostdevs[i]; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + continue; + + /* Resolve a vendor/product to bus/device */ + if (hostdev->source.subsys.u.usb.vendor) { + usbDevice *usb + = usbFindDevice(hostdev->source.subsys.u.usb.vendor, + hostdev->source.subsys.u.usb.product); + + if (!usb) + return -1; + + hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb); + hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb); + + fprintf(stderr, "Resolve %u %u -> %u %u\n", + hostdev->source.subsys.u.usb.vendor, + hostdev->source.subsys.u.usb.product, + hostdev->source.subsys.u.usb.bus, + hostdev->source.subsys.u.usb.device ); + + usbFreeDevice(usb); + } + } + + return 0; +} + +static int +qemuPrepareHostDevices(struct qemud_driver *driver, + virDomainDefPtr def) +{ + if (!def->nhostdevs) + return 0; + + if (qemuPrepareHostPCIDevices(driver, def) < 0) + return -1; + + if (qemuPrepareHostUSBDevices(driver, def) < 0) + return -1; + + return 0; +} + + static void qemudReattachManagedDevice(pciDevice *dev) { @@ -6114,6 +6168,23 @@ static int qemudDomainAttachHostDevice(struct qemud_driver *driver, return -1; } + /* Resolve USB product/vendor to bus/device */ + if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && + hostdev->source.subsys.u.usb.vendor) { + usbDevice *usb + = usbFindDevice(hostdev->source.subsys.u.usb.vendor, + hostdev->source.subsys.u.usb.product); + + if (!usb) + return -1; + + hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb); + hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb); + + usbFreeDevice(usb); + } + + if (driver->securityDriver && driver->securityDriver->domainSetSecurityHostdevLabel && driver->securityDriver->domainSetSecurityHostdevLabel(vm, hostdev) < 0) @@ -6677,11 +6748,22 @@ static int qemudDomainDetachHostUsbDevice(struct qemud_driver *driver, unsigned bus = vm->def->hostdevs[i]->source.subsys.u.usb.bus; unsigned device = vm->def->hostdevs[i]->source.subsys.u.usb.device; - - if (dev->data.hostdev->source.subsys.u.usb.bus == bus && - dev->data.hostdev->source.subsys.u.usb.device == device) { - detach = vm->def->hostdevs[i]; - break; + unsigned product = vm->def->hostdevs[i]->source.subsys.u.usb.product; + unsigned vendor = vm->def->hostdevs[i]->source.subsys.u.usb.vendor; + + if (dev->data.hostdev->source.subsys.u.usb.bus && + dev->data.hostdev->source.subsys.u.usb.device) { + if (dev->data.hostdev->source.subsys.u.usb.bus == bus && + dev->data.hostdev->source.subsys.u.usb.device == device) { + detach = vm->def->hostdevs[i]; + break; + } + } else { + if (dev->data.hostdev->source.subsys.u.usb.product == product && + dev->data.hostdev->source.subsys.u.usb.vendor == vendor) { + detach = vm->def->hostdevs[i]; + break; + } } } diff --git a/src/qemu/qemu_security_dac.c b/src/qemu/qemu_security_dac.c index f281b96..6911f48 100644 --- a/src/qemu/qemu_security_dac.c +++ b/src/qemu/qemu_security_dac.c @@ -206,9 +206,7 @@ qemuSecurityDACSetSecurityHostdevLabel(virDomainObjPtr vm, switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device, - dev->source.subsys.u.usb.vendor, - dev->source.subsys.u.usb.product); + dev->source.subsys.u.usb.device); if (!usb) goto done; @@ -277,9 +275,7 @@ qemuSecurityDACRestoreSecurityHostdevLabel(virDomainObjPtr vm ATTRIBUTE_UNUSED, switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device, - dev->source.subsys.u.usb.vendor, - dev->source.subsys.u.usb.product); + dev->source.subsys.u.usb.device); if (!usb) goto done; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 06a2479..b2c8581 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -491,9 +491,7 @@ SELinuxSetSecurityHostdevLabel(virDomainObjPtr vm, switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device, - dev->source.subsys.u.usb.vendor, - dev->source.subsys.u.usb.product); + dev->source.subsys.u.usb.device); if (!usb) goto done; @@ -561,9 +559,7 @@ SELinuxRestoreSecurityHostdevLabel(virDomainObjPtr vm, switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device, - dev->source.subsys.u.usb.vendor, - dev->source.subsys.u.usb.product); + dev->source.subsys.u.usb.device); if (!usb) goto done; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 066e18b..78bef41 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -836,9 +836,7 @@ get_files(vahControl * ctl) switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device, - dev->source.subsys.u.usb.vendor, - dev->source.subsys.u.usb.product); + dev->source.subsys.u.usb.device); if (usb == NULL) continue; diff --git a/src/util/hostusb.c b/src/util/hostusb.c index bf96539..afba325 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -159,9 +159,7 @@ cleanup: usbDevice * usbGetDevice(unsigned bus, - unsigned devno, - unsigned vendor, - unsigned product) + unsigned devno) { usbDevice *dev; @@ -170,14 +168,6 @@ usbGetDevice(unsigned bus, return NULL; } - if (vendor) { - /* Look up bus.dev by vendor:product */ - if (usbFindBusByVendor(vendor, product, &bus, &devno) < 0) { - VIR_FREE(dev); - return NULL; - } - } - dev->bus = bus; dev->dev = devno; @@ -194,6 +184,21 @@ usbGetDevice(unsigned bus, return dev; } + +usbDevice * +usbFindDevice(unsigned vendor, + unsigned product) +{ + unsigned bus = 0, devno = 0; + + if (usbFindBusByVendor(vendor, product, &bus, &devno) < 0) { + return NULL; + } + + return usbGetDevice(bus, devno); +} + + void usbFreeDevice(usbDevice *dev) { @@ -202,6 +207,18 @@ usbFreeDevice(usbDevice *dev) } +unsigned usbDeviceGetBus(usbDevice *dev) +{ + return dev->bus; +} + + +unsigned usbDeviceGetDevno(usbDevice *dev) +{ + return dev->dev; +} + + int usbDeviceFileIterate(usbDevice *dev, usbDeviceFileActor actor, void *opaque) diff --git a/src/util/hostusb.h b/src/util/hostusb.h index bc22671..9a1b1b7 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -26,11 +26,14 @@ typedef struct _usbDevice usbDevice; -usbDevice *usbGetDevice (unsigned bus, - unsigned devno, - unsigned vendor, - unsigned product); -void usbFreeDevice (usbDevice *dev); +usbDevice *usbGetDevice(unsigned bus, + unsigned devno); +usbDevice *usbFindDevice(unsigned vendor, + unsigned product); +void usbFreeDevice (usbDevice *dev); + +unsigned usbDeviceGetBus(usbDevice *dev); +unsigned usbDeviceGetDevno(usbDevice *dev); /* * Callback that will be invoked once for each file -- 1.6.5.2

2 1

[libvirt] RFC: Modelling timers/ clocks / tick policies in libvirt
by Daniel P. Berrange 05 Mar '10

05 Mar '10

One of the things we've not dealt with in libvirt yet is how to model the various evil hacks most virt products have for dealing with timers in guests. This email tries to outlines the problems & way each virt system has dealt with them. Finally it suggests how to manage this in libvirt domain XML. Comments please :-) Virtual machine timer management in libvirt =========================================== On PC hardware there are a number of terrible timers / clock sources available to operating systems * PIT Timer with periodic interrupts * RTC Time of Day clock, continuous running Timer with periodic interrupts * Local APIC Timer Timer with periodic interrupts * ACPI Timer Timer with periodic interrupts * TSC Read via rdtsc instruction. No interrupts Unreliable on some hardware. eg changes frequency. Not synced between cores Different HZ across hosts * HPET Multiple timers with periodic interrupts Can replace PIT/RTC timers They all generally suck in real hardware, and this gets worse in virtual machines. Many different approaches to making them suck less in VMWare, Xen & KVM, but there are some reasonably common concepts.... Virtual timekeeping problems ---------------------------- Three primary problems / areas to deal with: * Time of day clock (RTC) - Initialized to UTC/Localtime/Timezone/UTC+offset - Two modes of operation: 1. Guest wallclock: only runs when guest is executing. ie stopped across save/restore, etc 2. Host wallclock: runs continuously with host wall time. * Interrupt timers - Ticks can not always be delivered on time Policies to deal with "missed" ticks: 1. Deliver at normal rate without catchup 2. Deliver at higher rate to catch up 3. Merge into 1 tick & deliver asap 4. Discard all missed ticks * TSC - rdtsc instruction can be exposed to guests in two ways 1. Trap + emulate (slow, but more reliable) 2. Native (fast, but possibly unreliable) Optionally also expose a 'rdtscp' instruction Possiblly set a fixed HZ independant of host. VMWare timekeeping ------------------ * All timers run in "apparant time" ie track guest wallclock * Missed tick policy is to deliver at higher rate to catchup * TSC can be switched between native/emulate (virtual_rdtsc=TRUE|FALSE) * TSC can have hardcoded HZ in emulate mode (apparantHZ=VALUE) * RTC time of day is synced to host at startup (rtc.diffFromUTC or rtc.startTime) * VMWare tools reset guest TOD if it gets out of sync Xen timekeeping --------------- * Virtual platform timer (VPT) used as source for other timers * VPT has 4 modes 0: delay_for_missed_ticks Missed ticks are delivered when next scheduled, at the normal rate. RTC runs in guest wallclock, so is delayed. No catchup is attempted 1: no_delay_for_missed_ticks Missed ticks are delivered when next scheduled, at the normal rate. RTC runs in host wallclock, so is not delayed. 2: no_missed_ticks_pending Missed ticks are discarded & next tick is delivered normally. RTC runs in host wallclock. 3: one_missed_tick_pending Missed interrupts are collapsed into a single late tick. RTC run in host wallclock. * HPET Optionally enabled * TSC. Can run in 4 modes - auto: emulate if host TSC is unstable. native with invariant TSC - native: always native regardless of host TSC stability - emulate: trap + emulate regardless of host TSC invariant - pvrdtsc: native, requiring invariant TSC. Also exposes rdtscp instruction KVM timekeeping --------------- * PIT: can be in kernel, or userspace (userspace deprecated for KVM) Default tick policies differ for both impls - Userspace: Default: missed ticks are delivered when next scheduled at normal rate -tdf flag enable tick reinjection to catchup - Kernel: Default: Missed ticks are delivered at higher rate to catch up -no-kvm-pit-reinjection to disable tick reinjection catchup * RTC TOD clock can run in host or guest wallclock (clock=host|guest) Default: missed ticks are delivered when next scheduled at normal rate -rtc-td-hack or -clock driftfix=slew: missed ticks are delivered at a higher rate to catchup * TSC - Always runs native. * HPET - Optionally enabled/disabled Mapping in libvirt XML ---------------------- Currently supports setting Time of Day clock via <clock offset="utc"/> Always sync to UTC <clock offset="localtime"/> Always sync to host timezone <clock offset="timezone" timezone='Europe/Paris'/> Sync to arbitrary timezone <clock offset="variable" adjustment='123456'/> Sync to UTC + arbitrary offset Proposal to model all timers policies as sub-elements of this <clock/> In general we wil allow zero or more <timer/> elements following the syntax: <timer name='platform|pit|rtc|hpet|tsc' wallclock='host|guest' tickpolicy='none|catchup|merge|discard' frequency='123' mode='auto|native|emulate|paravirt' present='yes|no' /> Meaning of 'name': Names map to regular PC timers / clocks. 'Platform' refers to the (optional) master virtual clock source that may be used to drive policy of "other" clocks (eg used in Xen, which clocks are controlled by the platform clock is to be undefined because it has varied in Xen over time). Meaning of 'tickpolicy': none: continue to deliver at normal rate (ie ticks are delayed) catchup: deliver at higher rate to catchup merge: ticks merged into 1 single tick discard: all missed ticks are discarded Meaning of 'wallclock': Only valid for name='rtc' or 'platform' host: RTC wallclock always tracks host time guest: RTC wallclock always tracks host time Meaning of 'frequency': Set a fixed frequency in HZ. NB: Only relevant for TSC. All other timers are fixed (PIT, RTC), or fully guest controlled frequency (HPET) Meaning of 'mode': Control how the clock is exposed to guest. auto: native if safe, otherwise emulate native: always native emulate: always emulate paravirt: native + paravirtualize NB: Only relevant for TSC. All other timers are always emulated. Meaing of 'present': Used to override default set of timers visible to the guest. eg to enable or disable the HPET Mapping to VMWare ----------------- eg with guest config showing diffFromUTC='123456' apparentHZ='123456' virtual_rdtsc=False libvirt XML gets: <clock mode='variable' adjustment='123456'> <timer name='tsc' frequency='123456' mode='native'/> </clock> Mapping to Xen -------------- eg with guest config showing timer_mode=3 hpet=1 tsc_mode=2 localtime=1 <clock mode='localtime'> <timer name='platform' tickpolicy='merge' wallclock='host'/> <timer name='hpet'/> <timer name='tsc' mode='native'/> </clock> Mapping to KVM -------------- eg with guest ARGV showing -no-kvm-pit-reinjection -clock base=localtime,clock=guest,driftfix=slew -no-hpet <clock mode='localtime'> <timer name='rtc' tickpolicy='catchup' wallclock='guest'/> <timer name='pit' tickpolicy='none'/> <timer name='hpet' present='no'/> </clock> Further reading --------------- VMWare has the best doc: http://www.vmware.com/pdf/vmware_timekeeping.pdf Xen: Docs on 'tsc_mode' at $SOURCETREE/docs/misc/tscmode.txt Docs for 'timer_mode' in the source code only: xen/include/public/hvm/params.h KVM: No docs at all. Guess from -help descriptions, reading source code & asking clever people about it :-) -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] [PATCH 0/3] Misc fixes for LXC driver
by Daniel P. Berrange 05 Mar '10

05 Mar '10

This series provides some small fixes to the LXC driver which bring it closer to being able to run a full Fedora OS with regular init (upstart) startup process

2 6

[libvirt] Get IP of ghost from remote with libvirt
by angelo alfano 05 Mar '10

05 Mar '10

Hello everyone, sorry for my English, I need to create a script (preferably in Python) that runs on a host machine, I return the IP address of a Ghost running, providing its hostname. In this VM is assigned the IP in DHCP with a network with this configuration: $ virsh net-dumpxml network1 Connecting to uri: qemu:///system <network> <name>network1</name> <uuid>6050d8d4-4030-fdd5-ddfa-041c89bbdfa7</uuid> <forward mode='nat'/> <bridge name='virbr0' stp='on' forwardDelay='0' /> <ip address='192.168.100.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.100.2' end='192.168.100.254' /> </dhcp> </ip> </network> While the configuration of one of the VM is: $ virsh dumpxml test1 Connecting to uri: qemu:///system <domain type='kvm' id='1'> <name>test1</name> <uuid>cf71c7d3-0d05-d51c-492e-f5ad2be3ec0e</uuid> <memory>524288</memory> <currentMemory>524288</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='/var/lib/libvirt/images/test1.img'/> <target dev='vda' bus='virtio'/> </disk> <interface type='network'> <mac address='54:52:00:4e:59:0d'/> <source network='network1'/> <target dev='vnet0'/> <model type='virtio'/> </interface> <serial type='pty'> <source path='/dev/pts/1'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/1'> <source path='/dev/pts/1'/> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes' keymap='it'/> <sound model='es1370'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> </devices> <seclabel type='dynamic' model='apparmor'> <label>libvirt-cf71c7d3-0d05-d51c-492e-f5ad2be3ec0e</label> <imagelabel>libvirt-cf71c7d3-0d05-d51c-492e-f5ad2be3ec0e</imagelabel> </seclabel> </domain> Give me a hand? Thanks -- Angelo

1 0

[libvirt] Assigning a static IP to the Linux Container through libvirt.
by Kumar L Srikanth-B22348 05 Mar '10

05 Mar '10

Hi, I want to assign a static IP 172.16.1.20 to one of the containers created using libvirt. For that, I defined a network 'mynetwork' using net-define. The XML format for that network is shown below: <network> <name>mynetwork</name> <uuid>f76c44dd-bcef-6b45-4a50-00d575a369ad</uuid> <bridge name='virbr1' stp='on' delay='0' /> <ip address='172.16.1.20' netmask='255.255.255.0'> </ip> </network> I started the network 'mynetwork' using net-start. virsh # net-list --all Name State Autostart ----------------------------------------- default active yes mynetwork active no I created a domain 'vm1_fedora' with libvirt XML: <domain type='lxc' id='1'> <name>vm1_fedora</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/bash</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='/root/lxc/fedora12'/> <target dir='/'/> </filesystem> <filesystem type='mount'> <source dir='/root/lxc/fedora12/dev'/> <target dir='/dev'/> </filesystem> <interface type='network'> <source network='mynetwork'/> </interface> <console type='pty' /> </devices> </domain> But, when I start that domain and see for 'ifconfig', I am not able to see the IP address 172.16.1.20 there. [root@localhost /]# ifconfig eth0 Link encap:Ethernet HWaddr 52:54:00:53:4D:BF inet6 addr: fe80::5054:ff:fe53:4dbf/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:18 errors:0 dropped:0 overruns:0 frame:0 TX packets:6 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:840 (840.0 b) TX bytes:384 (384.0 b) lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) can you please let me know, how can I assign a static IP to the Linux Container? Regards, Srikanth.

2 2

[libvirt] Assigning a Static IP to the Domain.
by Kumar L Srikanth-B22348 05 Mar '10

05 Mar '10

Hi, I am using libvirt version 0.7.6, to create a Linux Container. With the domain XML format, I am able to create a Domain and able to access. But, I am struck at assigning an IP address to the Domain. I want to assign a static IP to eth0 of the Domain and ale to ping that from the host machine. For that, I created a bridge br0 [which can be linked to the interface eth0 of the Domain created by libvirt] with the IP 172.16.1.10. I want to assign an IP 172.16.1.16 to the Domain. Can any one please guide me? Regards, Srikanth.

1 0

[libvirt] [PATCH] Change default for storage uid/gid from getuid()/getgid() to -1/-1
by Laine Stump 05 Mar '10

05 Mar '10

This allows the config to have a setting that means "leave it alone", eg when building a pool where the directory already exists the user may want the current uid/gid of the directory left intact. This actually gets us back to older behavior - before recent changes to the pool building code, we weren't as insistent about honoring the uid/gid settings in the XML, and virt-manager was taking advantage of this behavior. As a side benefit, removing calls to getuid/getgid from the XML parsing functions also seems like a good idea. And having a default that is different from a common/useful value (0 == root) is a good thing in general, as it removes ambiguity from decisions (at least one place in the code was checking for (perms.uid == 0) to see if a special uid was requested). Note that this will only affect newly created pools and volumes. Due to the way that the XML is parsed, then formatted for newly created volumes, all existing pools/volumes already have an explicit uid and gid set. src/conf/storage_conf.c: Remove calls to setuid/setgid for default values of uid/gid, and set them to -1 instead src/storage/storage_backend.c: src/storage/storage_backend_fs.c: Make account for the new default values of perms.uid and perms.gid. --- src/conf/storage_conf.c | 8 +++--- src/storage/storage_backend.c | 25 +++++++++++++---------- src/storage/storage_backend_fs.c | 39 +++++++++++++++++++++++++++---------- 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 19a1db9..f59f109 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -539,8 +539,8 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, if (node == NULL) { /* Set default values if there is not <permissions> element */ perms->mode = defaultmode; - perms->uid = getuid(); - perms->gid = getgid(); + perms->uid = -1; + perms->gid = -1; perms->label = NULL; return 0; } @@ -564,7 +564,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, } if (virXPathNode("./owner", ctxt) == NULL) { - perms->uid = getuid(); + perms->uid = -1; } else { if (virXPathLong("number(./owner)", ctxt, &v) < 0) { virStorageReportError(VIR_ERR_XML_ERROR, @@ -575,7 +575,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, } if (virXPathNode("./group", ctxt) == NULL) { - perms->gid = getgid(); + perms->gid = -1; } else { if (virXPathLong("number(./group)", ctxt, &v) < 0) { virStorageReportError(VIR_ERR_XML_ERROR, diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 3742493..ee6a32e 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -241,11 +241,10 @@ virStorageBackendCreateBlockFrom(virConnectPtr conn ATTRIBUTE_UNUSED, uid = (vol->target.perms.uid != st.st_uid) ? vol->target.perms.uid : -1; gid = (vol->target.perms.gid != st.st_gid) ? vol->target.perms.gid : -1; if (((uid != -1) || (gid != -1)) - && (fchown(fd, vol->target.perms.uid, vol->target.perms.gid) < 0)) { + && (fchown(fd, uid, gid) < 0)) { virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - vol->target.path, vol->target.perms.uid, - vol->target.perms.gid); + vol->target.path, uid, gid); goto cleanup; } if (fchmod(fd, vol->target.perms.mode) < 0) { @@ -356,10 +355,12 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; } + uid_t uid = (vol->target.perms.uid == -1) ? getuid() : vol->target.perms.uid; + gid_t gid = (vol->target.perms.gid == -1) ? getgid() : vol->target.perms.gid; + if ((createstat = virFileOperation(vol->target.path, O_RDWR | O_CREAT | O_EXCL | O_DSYNC, - vol->target.perms.mode, - vol->target.perms.uid, vol->target.perms.gid, + vol->target.perms.mode, uid, gid, createRawFileOpHook, &hdata, VIR_FILE_OP_FORCE_PERMS | (pool->def->type == VIR_STORAGE_POOL_NETFS @@ -491,14 +492,14 @@ cleanup: static int virStorageBuildSetUIDHook(void *data) { virStorageVolDefPtr vol = data; - if ((vol->target.perms.gid != 0) + if ((vol->target.perms.gid != -1) && (setgid(vol->target.perms.gid) != 0)) { virReportSystemError(errno, _("Cannot set gid to %u before creating %s"), vol->target.perms.gid, vol->target.path); return -1; } - if ((vol->target.perms.uid != 0) + if ((vol->target.perms.uid != -1) && (setuid(vol->target.perms.uid) != 0)) { virReportSystemError(errno, _("Cannot set uid to %u before creating %s"), @@ -517,8 +518,11 @@ static int virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, int filecreated = 0; if ((pool->def->type == VIR_STORAGE_POOL_NETFS) - && (getuid() == 0) - && ((vol->target.perms.uid != 0) || (vol->target.perms.gid != 0))) { + && (((getuid() == 0) + && (vol->target.perms.uid != -1) + && (vol->target.perms.uid != 0)) + || ((vol->target.perms.gid != -1) + && (vol->target.perms.gid != getgid())))) { if (virRunWithHook(cmdargv, virStorageBuildSetUIDHook, vol, NULL) == 0) { /* command was successfully run, check if the file was created */ @@ -547,8 +551,7 @@ static int virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, && (chown(vol->target.path, uid, gid) < 0)) { virReportSystemError(errno, _("cannot chown %s to (%u, %u)"), - vol->target.path, vol->target.perms.uid, - vol->target.perms.gid); + vol->target.path, uid, gid); return -1; } if (chmod(vol->target.path, vol->target.perms.mode) < 0) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 8279d78..dfd417f 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -529,16 +529,28 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, /* Now create the final dir in the path with the uid/gid/mode * requested in the config. If the dir already exists, just set * the perms. */ - if ((err = virDirCreate(pool->def->target.path, - pool->def->target.perms.mode, - pool->def->target.perms.uid, - pool->def->target.perms.gid, - VIR_DIR_CREATE_FORCE_PERMS | VIR_DIR_CREATE_ALLOW_EXIST | - (pool->def->type == VIR_STORAGE_POOL_NETFS - ? VIR_DIR_CREATE_AS_UID : 0)) != 0)) { - virReportSystemError(err, _("cannot create path '%s'"), - pool->def->target.path); - goto error; + + struct stat st; + + if ((stat(pool->def->target.path, &st) < 0) + || (pool->def->target.perms.uid != -1)) { + + uid_t uid = (pool->def->target.perms.uid == -1) + ? getuid() : pool->def->target.perms.uid; + gid_t gid = (pool->def->target.perms.gid == -1) + ? getgid() : pool->def->target.perms.gid; + + if ((err = virDirCreate(pool->def->target.path, + pool->def->target.perms.mode, + uid, gid, + VIR_DIR_CREATE_FORCE_PERMS | + VIR_DIR_CREATE_ALLOW_EXIST | + (pool->def->type == VIR_STORAGE_POOL_NETFS + ? VIR_DIR_CREATE_AS_UID : 0)) != 0)) { + virReportSystemError(err, _("cannot create path '%s'"), + pool->def->target.path); + goto error; + } } ret = 0; error: @@ -777,8 +789,13 @@ static int createFileDir(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } + uid_t uid = (vol->target.perms.uid == -1) + ? getuid() : vol->target.perms.uid; + gid_t gid = (vol->target.perms.gid == -1) + ? getgid() : vol->target.perms.gid; + if ((err = virDirCreate(vol->target.path, vol->target.perms.mode, - vol->target.perms.uid, vol->target.perms.gid, + uid, gid, VIR_DIR_CREATE_FORCE_PERMS | (pool->def->type == VIR_STORAGE_POOL_NETFS ? VIR_DIR_CREATE_AS_UID : 0))) != 0) { -- 1.6.6.1

3 4

[libvirt] [PATCH 0/9] Storage volume wiping API
by David Allan 04 Mar '10

04 Mar '10

Here's the revised volume wiping API patchset (thanks to Dan for the improved name). I'm sending a replacement patchset since the name change made for a very large and messy incremental. This set contains everybody's feedback, which was all very helpful. Many thanks. Dave David Allan (9): Add public API for volume wiping Define the internal driver API for vol wiping Add vol wiping to ESX storage driver struct Implement the public API for vol wiping Define wire protocol format for vol wiping Implement RPC client for vol wiping Implement the remote dispatch bits of vol wiping Simplified version of volume wiping based on feedback from the list. Virsh support for vol wiping daemon/remote.c | 32 +++++ daemon/remote_dispatch_args.h | 1 + daemon/remote_dispatch_prototypes.h | 8 ++ daemon/remote_dispatch_table.h | 5 + include/libvirt/libvirt.h.in | 2 + src/driver.h | 5 + src/esx/esx_storage_driver.c | 1 + src/libvirt.c | 47 ++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 27 ++++ src/remote/remote_protocol.c | 11 ++ src/remote/remote_protocol.h | 9 ++ src/remote/remote_protocol.x | 8 +- src/storage/storage_driver.c | 224 +++++++++++++++++++++++++++++++++++ tools/virsh.c | 42 +++++++ 15 files changed, 422 insertions(+), 1 deletions(-)

1 9

[libvirt] Libvirt Auth
by Marco Mornati 04 Mar '10

04 Mar '10

Hello guys, I've created a plugin for Hudson (CI) to manage virtmachines using libvirt java (start vm for a build and stop just after). I've just a problem in authentication, in fact I cannot send uname and password using code, libvirt ask me for the credentials on CLI. someone could explain me How I can use authentican or where I can find an usage guide or example? Thanks a lot Bye Marco

3 8

[libvirt] FW: Libvirt and openvz?
by Thomas Graves 04 Mar '10

04 Mar '10

I just recently started using openvz and I'm trying to use libvirt/virsh with it. I followed the directions on page: http://libvirt.org/drvopenvz.html But I get an error trying to run define with the example config file: virsh define virt.conf error: Failed to define domain from virt.conf error: unknown OS type exe sudo virsh -c openvz:/// list error: could not connect to openvz:/// error: failed to connect to the hypervisor I'm using libvirt 0.7.2 with latest rhel5.4 openvz. Does anyone have more example configuration files or other setup instructions? Does Libvirt allow you to specify other resource limits and controls that openvz has - like vzctl set --devnodes device:rw or vzctl set kmemsize? Thanks, Tom

1 1

[libvirt] [PATCH] fix rawhide/F13 --no-add-needed/dlopen-related build failures
by Jim Meyering 04 Mar '10

04 Mar '10

Diego, I saw no follow-up here, http://thread.gmane.org/gmane.comp.emulators.libvirt/21398/focus=21671 so I've fixed your two patches to address Eric's review feedback, and confirmed that they solve the problem on Rawhide. >From 55c182d89cd6e5417eafe9f4bdf2e0ef7f8721f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes(a)gmail.com> Date: Thu, 4 Mar 2010 16:45:02 +0100 Subject: [PATCH 1/2] build: avoid dlopen-related link failure on rawhide/F13 Instead of using AC_CHECK_LIB and hardcoding -ldl, search for the library needed to get dlopen() and then use the cached value. --- configure.ac | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 682b8b5..d5d62ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1700,7 +1700,7 @@ if test "x$with_driver_modules" = "xyes" ; then old_libs="$LIBS" fail=0 AC_CHECK_HEADER([dlfcn.h],[],[fail=1]) - AC_CHECK_LIB([dl], [dlopen],[],[fail=1]) + AC_SEARCH_LIBS([dlopen], [dl], [], [fail=1]) test $fail = 1 && AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules]) @@ -1709,7 +1709,10 @@ if test "x$with_driver_modules" = "xyes" ; then fi if test "$with_driver_modules" = "yes"; then DRIVER_MODULE_CFLAGS="-export-dynamic" - DRIVER_MODULE_LIBS="-ldl" + case $ac_cv_search_dlopen in + no*) DRIVER_MODULE_LIBS= ;; + *) DRIVER_MODULE_LIBS=$ac_cv_search_dlopen ;; + esac AC_DEFINE_UNQUOTED([WITH_DRIVER_MODULES], 1, [whether to build drivers as modules]) fi AM_CONDITIONAL([WITH_DRIVER_MODULES], [test "$with_driver_modules" != "no"]) -- 1.7.0.1.475.gaf89b >From ca7a9f299b0bd415f8434b3c9e6c70528d2f85cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes(a)gmail.com> Date: Thu, 4 Mar 2010 16:48:10 +0100 Subject: [PATCH 2/2] build: vbox: avoid build failure when linking with --no-add-needed With the recent changes to the linking defaults in Fedora 13 (namely enabling --no-add-needed behaviour by default), we have to pass the dlopen()-providing libraries directly at the link of the module; use the same AC_SEARCH_LIBS function as used before to look for it and add it to the Makefile. --- configure.ac | 6 ++++++ src/Makefile.am | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index d5d62ea..923d7b8 100644 --- a/configure.ac +++ b/configure.ac @@ -303,6 +303,12 @@ fi AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"]) if test "x$with_vbox" = "xyes"; then + AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([Unable to find dlopen()])]) + case $ac_cv_search_dlopen in + no*) DLOPEN_LIBS= ;; + *) DLOPEN_LIBS=$ac_cv_search_dlopen ;; + esac + AC_SUBST([DLOPEN_LIBS]) AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabled]) fi AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"]) diff --git a/src/Makefile.am b/src/Makefile.am index 2051e5d..67f8b6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -463,6 +463,7 @@ libvirt_driver_vbox_la_CFLAGS = \ if WITH_DRIVER_MODULES libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version endif +libvirt_driver_vbox_la_LIBADD = $(DLOPEN_LIBS) libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES) endif -- 1.7.0.1.475.gaf89b

2 1

[libvirt] FW: Bringing up LXC container from virsh command prompt.
by Kumar L Srikanth-B22348 04 Mar '10

04 Mar '10

Hi Daniel, One more thing is that in my host machine vibr0 inteface is missing. Because of the the 'default' network is in 'inactive' state and if I tried to activate, it's giving the following error: error: Failed to start network default error: internal error '/usr/sbin/dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/default.pid --conf-file= --listen-address 192.168.122.1 --except-interface lo --dhcp-range 192.168.122.2,192.168.122.254' exited with non-zero status 2 and signal 0: dnsmasq: failed to bind listening socket for 192.168.122.1: Address already in use Can you please guide me in this regard? Regards, Srikanth. -----Original Message----- From: Kumar L Srikanth-B22348 Sent: Thursday, March 04, 2010 4:43 PM To: 'Daniel P. Berrange' Cc: libvir-list(a)redhat.com; Reddy B Veera-B22347 Subject: RE: Bringing up LXC container from virsh command prompt. Hi, I want to create eth0 network interface in the container, which is linked to br0 bridge in the host machine. For that, I have created a bridge 'br0' with the IP '172.16.1.10'. Now, I want to create a network interface eth0 in the container with the IP '172.16.1.17'. I created the following network XML for the above requirement. <network> <name>mynetwork</name> <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> <bridge name="br0" stp="on" delay="5"/> <forward mode="nat" dev="eth0"/> <ip address="172.16.1.17" netmask="255.255.255.0"/> </network> I am able to define the network, but unable to start the network. The following error is coming when I start the network with the following command: #virsh -c lxc:/// net-start mynetwork error: Failed to start network mynetwork error: cannot create bridge 'br0': File exists Can you please guide me to create a network? My network interfaces in the host machine is shown below: br0 Link encap:Ethernet HWaddr 00:50:BF:27:AA:60 inet addr:172.16.1.10 Bcast:172.16.255.255 Mask:255.255.0.0 inet6 addr: fe80::250:bfff:fe27:aa60/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:80728 errors:0 dropped:0 overruns:0 frame:0 TX packets:170078 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:54037401 (51.5 MiB) TX bytes:123567268 (117.8 MiB) eth0 Link encap:Ethernet HWaddr 00:50:BF:27:AA:60 inet6 addr: fe80::250:bfff:fe27:aa60/64 Scope:Link UP BROADCAST RUNNING PROMISC MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:288 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:0 (0.0 b) TX bytes:30108 (29.4 KiB) Interrupt:21 Base address:0x1140 eth1 Link encap:Ethernet HWaddr 00:16:76:4B:91:DC inet addr:192.168.1.10 Bcast:192.168.1.255 Mask:255.255.255.0 UP BROADCAST MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) eth2 Link encap:Ethernet HWaddr 00:11:95:FC:8D:62 inet addr:10.232.113.80 Bcast:10.232.113.255 Mask:255.255.254.0 inet6 addr: fe80::211:95ff:fefc:8d62/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:563988 errors:0 dropped:0 overruns:0 frame:0 TX packets:391293 errors:1100 dropped:0 overruns:0 carrier:1100 collisions:188525 txqueuelen:1000 RX bytes:565906426 (539.6 MiB) TX bytes:234291753 (223.4 MiB) Interrupt:22 Base address:0xa000 lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:23001 errors:0 dropped:0 overruns:0 frame:0 TX packets:23001 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:3478027 (3.3 MiB) TX bytes:3478027 (3.3 MiB) Regards, Srikanth. -----Original Message----- From: Daniel P. Berrange [mailto:berrange@redhat.com] Sent: Thursday, March 04, 2010 3:41 PM To: Kumar L Srikanth-B22348 Cc: libvir-list(a)redhat.com; Reddy B Veera-B22347 Subject: Re: Bringing up LXC container from virsh command prompt. On Thu, Mar 04, 2010 at 03:38:43PM +0530, Kumar L Srikanth-B22348 wrote: > So, again I need to add one network interface in the libvirt XML?. It > will not take the interface which was created earlier while creating > container using lxc-tools?. > But, in the container which was created with lxc-tools(lxc-create, > lxc-start ..etc), I am not getting any such issues. The lxc-XXX tools are completely unrelated. They have a configuration file where you specify what network interfaces are created. Likewise if you use libvirt you need to specify what network interfaces are to be created. > Why I am getting these issues in virsh command prompt, when I am > mounting the same rootfs that was used while creating container using > lxc-tools. You need to setup $PATH in your container. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] Bringing up LXC container from virsh command prompt.
by Kumar L Srikanth-B22348 04 Mar '10

04 Mar '10

Hi, I am new to libvirt virsh console. Currently I am working on Linux Containers(LXC). After lot of exploration, I am able to create a Linux Container(fedora12) with the help of lxc-tools(lxc-create, lxc-start, ...etc). I am able to start that container and use it's console. I am able to assign an IP address to the container, by creating a bridge in the host machine and assigning it to the container. Here, my goal is to bring up this container(fedora12) through libvirt virsh command prompt. For that I created a domain with the following XML file: [vm1_fedora_container.xml] <domain type='lxc' id='1'> <name>vm1_fedora</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/bash</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='/root/lxc/fedora12'/> /*This is the rootfs directory for my linux container(fedora12)*/ <target dir='/'/> /* I mounted it to '/' directory in the Domain. */ </filesystem> <console type='pty' /> </devices> </domain> I executed the following virsh commands: # virsh --connect lxc:/// define vm1_fedora_container.xml Domain vm1_fedora defined from /root/lxc_devel/fedora.xml # virsh --connect lxc:/// list --all Id Name State ---------------------------------- - vm1_fedora shut off # virsh --connect lxc:/// start vm1_fedora Domain vm1_fedora started # virsh --connect lxc:/// list --all Id Name State ---------------------------------- 7805 vm1_fedora running # virsh --connect lxc:/// console vm1_fedora Connected to domain vm1_fedora Escape character is ^] [root@localhost /]# I am able to view the console of my container(fedora12), but when I execute 'ifconfig' in that console, I am getting the following error: bash: ifconfig: command not found When I execute the same 'ifconfig' command through lxc-tools (like lxc_start -n fedora12 /bin/bash), I am able to get the assigned IP address. Can you please suggest me where did I go wrong? Regards, Srikanth.

2 6

[libvirt] [PATCH 0/9] Vol Zeroing API
by David Allan 04 Mar '10

04 Mar '10

This patch set contains a new API for zeroing out volumes. I called it zero out rather than overwrite because it doesn't overwrite anything in the case of sparse files. It does guarantee that any subsequent reads from the volume will return zeroes. The ESX driver change is part of the patch. Without it, the struct is missing its initializer and fails to build. I'm not sure what our position on the style of struct initializers is; there are both forms in the code. If this style is heresy, we should add a statement to that effect in HACKING. Dave David Allan (9): Fix ESX storage driver struct initializer Add public API for volume zeroing Define the internal driver API for vol zeroing Implement the public API for vol zeroing Define wire protocol format for vol zeroing Implement RPC client for vol zeroing Implement the remote dispatch bits of vol zeroing Simplified version of volume zeroing based on feedback from the list. Virsh support for vol zeroing daemon/remote.c | 32 +++++ daemon/remote_dispatch_args.h | 1 + daemon/remote_dispatch_prototypes.h | 8 ++ daemon/remote_dispatch_table.h | 5 + include/libvirt/libvirt.h.in | 2 + src/driver.h | 5 + src/esx/esx_storage_driver.c | 39 +------ src/libvirt.c | 47 ++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 27 +++++ src/remote/remote_protocol.c | 11 ++ src/remote/remote_protocol.h | 9 ++ src/remote/remote_protocol.x | 8 +- src/storage/storage_driver.c | 218 +++++++++++++++++++++++++++++++++++ tools/virsh.c | 42 +++++++ 15 files changed, 418 insertions(+), 37 deletions(-)

7 27

[libvirt] [PATCH] Add TCK script for verifying disk based storage pools
by Daniel P. Berrange 04 Mar '10

04 Mar '10

This adds a reasonably comprehensive test script for working with disk based storage pools. It checks - Prevent re-formating an existing partition table (currently missing this check in libvirt) - Formating of a partiton table - Wiping a partition table (currently missing in libvirt) - Creating multiple storage volumes - Deleteing storage volumes * conf/default.cfg: add config entry for specifying host block devices that a test script can use * lib/Sys/Virt/TCK.pm: Add API to get a host block device * lib/Sys/Virt/TCK/StoragePoolBuilder.pm: Fix typo in device XML formatting. Allow pool source format to be specified * scripts/storage/110-disk-pool.t: Test which creates a storage pool, creates some volumes, then deletes it all again. --- conf/default.cfg | 9 ++ lib/Sys/Virt/TCK.pm | 7 ++ lib/Sys/Virt/TCK/StoragePoolBuilder.pm | 13 +++- scripts/storage/110-disk-pool.t | 127 ++++++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+), 1 deletions(-) create mode 100644 scripts/storage/110-disk-pool.t diff --git a/conf/default.cfg b/conf/default.cfg index 5b85cbc..288540f 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -127,3 +127,12 @@ host_pci_devices = ( # } # Can list more than one PCI device if many are available ) + +# List of host block devices that the test suite can trash all +# data on, for purposes of testing. You have been warned ! +# Only full block devices allowed, no single partitions, since +# the test suite itself needs to create partitions. +# The disks should be at *least* 512 MB in size +host_block_devices = ( +# /dev/vdb +) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index f101937..d32b03d 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -805,4 +805,11 @@ sub get_host_pci_device { return ($domain, $bus, $slot, $function); } +sub get_host_block_device { + my $self = shift; + my $devindex = @_ ? shift : 0; + + return $self->config("host_block_devices/[$devindex]", undef); +} + 1; diff --git a/lib/Sys/Virt/TCK/StoragePoolBuilder.pm b/lib/Sys/Virt/TCK/StoragePoolBuilder.pm index f92b21a..c9ef2dd 100644 --- a/lib/Sys/Virt/TCK/StoragePoolBuilder.pm +++ b/lib/Sys/Virt/TCK/StoragePoolBuilder.pm @@ -77,6 +77,14 @@ sub target { return $self; } +sub format { + my $self = shift; + + $self->{format} = shift; + + return $self; +} + sub as_xml { my $self = shift; @@ -98,7 +106,7 @@ sub as_xml { } if ($self->{source}->{device}) { foreach my $dev (@{$self->{source}->{device}}) { - $w->emptyTag("dev", path => $dev); + $w->emptyTag("device", path => $dev); } } if ($self->{source}->{adapter}) { @@ -107,6 +115,9 @@ sub as_xml { if ($self->{source}->{name}) { $w->dataElement("name", $self->{source}->{name}); } + if ($self->{format}) { + $w->emptyTag("format", type => $self->{format}); + } $w->endTag("source"); $w->startTag("target"); diff --git a/scripts/storage/110-disk-pool.t b/scripts/storage/110-disk-pool.t new file mode 100644 index 0000000..faa13c5 --- /dev/null +++ b/scripts/storage/110-disk-pool.t @@ -0,0 +1,127 @@ +# -*- perl -*- +# +# Copyright (C) 2009-2010 Red Hat +# Copyright (C) 2009-2010 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +storage/110-disk-pool.t - test disk storage pools + +=head1 DESCRIPTION + +The test case validates that it is possible to use all core +functions of the disk pool type. + +=cut + +use strict; +use warnings; + +use Test::More tests => 20; + +use Sys::Virt::TCK; +use Test::Exception; +use File::stat; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + + +SKIP: { + my $dev = $tck->get_host_block_device(); + + skip "no host block device available", 20 unless defined $dev; + + # Blow away partition table (if any) + open DEV, ">$dev" or die "cannot write to $dev: $!"; + my $data = " "x 512; + + print DEV $data; + close DEV or die "cannot save $dev: $!"; + + my $poolxml = $tck->generic_pool("disk", "tck") + ->source_device($dev) + ->format("dos") + ->target("/dev/") + ->as_xml; + + diag "Defining persistent storage pool $poolxml"; + my $pool; + ok_pool(sub { $pool = $conn->define_storage_pool($poolxml) }, "define persistent storage pool"); + + # Since we blew away the partition table we should not be able to + # start the pool yet + ok_error(sub { $pool->create }, "unable to start un-built storage pool"); + + lives_ok(sub { $pool->build(0) }, "built storage pool"); + + # We should get an error if trying to build a pool which already + # has a partition table written. + ok_error(sub { $pool->build(0) }, "prevent rebuilding existing storage pool"); + + lives_ok(sub { $pool->create }, "started storage pool"); + + my @vols = $pool->list_volumes(); + + is($#vols, -1, "no storage volumes in new pool"); + + my $poolinfo = $pool->get_info(); + + ok($poolinfo->{available} > 1000, "there is some space available in the pool"); + + my $volbase = $dev; + $volbase =~ s,/dev/,,; + + my $vol1xml = $tck->generic_volume($volbase . "1", undef, 1024*1024*256)->as_xml; + my $vol2xml = $tck->generic_volume($volbase . "2", undef, 1024*1024*64)->as_xml; + + diag "Vol $vol1xml $vol2xml"; + my $vol1; + my $vol2; + ok_volume(sub { $vol1 = $pool->create_volume($vol1xml) }, "create disk partition"); + ok_volume(sub { $vol2 = $pool->create_volume($vol2xml) }, "create disk partition"); + + for my $vol (($vol1, $vol2)) { + my $path = xpath($vol, "string(/volume/target/path)"); + my $st = stat($path); + + ok($st, "path $path exists"); + } + + @vols = $pool->list_volumes(); + is($#vols, 1, "two storage volumes in pool"); + + lives_ok(sub { $vol1->delete(0) }, "deleted volume"); + + @vols = $pool->list_volumes(); + is($#vols, 0, "one storage volume in pool"); + + lives_ok(sub { $vol2->delete(0) }, "deleted volume"); + + @vols = $pool->list_volumes(); + is($#vols, -1, "zero storage volume in pool"); + + lives_ok(sub { $pool->destroy() }, "destroyed pool"); + lives_ok(sub { $pool->delete(0) }, "deleted pool"); + + # Since we blew away the partition table we should not be able to + # start the pool anymore + ok_error(sub { $pool->create }, "unable to start un-built storage pool"); + + lives_ok(sub { $pool->undefine() }, "undefined pool"); +} -- 1.6.5.2

3 3

[libvirt] Problem building on Fedora Rawhide
by Laine Stump 04 Mar '10

04 Mar '10

I just checked out a clean tree on a Fedora Rawhide system (up to date as of today), and ran "./autogen.sh && make", and ended up with the following error. Am I missing something, or is configure missing something? make[3]: Entering directory `/home/laine/devel/libvirt/daemon' CC libvirtd-event.o CC libvirtd-libvirtd.o CC libvirtd-remote.o CC libvirtd-dispatch.o CC libvirtd-stream.o CC libvirtd-remote_protocol.o CCLD libvirtd ../src/.libs/libvirt.so: undefined reference to `g_pfnGetFunctions' ../src/.libs/libvirt.so: undefined reference to `g_pVBoxFuncs' ../src/.libs/libvirt.so: undefined reference to `VBoxCGlueInit'

1 0

[libvirt] [PATCH] Fix parser checking of storage pool device
by Daniel P. Berrange 03 Mar '10

03 Mar '10

The storage backend implementations all presume that the XML parser is validating correctness of the source specification. The check for a source device was lost at some point. This allowed for a potential crash in the disk backend. Re-introduce the sanity check * src/conf/storage_conf.c: Re-add check for source device --- src/conf/storage_conf.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 19a1db9..b0f326f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -689,6 +689,15 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) { } } + /* If DEVICE is the only source type, then its required */ + if (options->flags == VIR_STORAGE_POOL_SOURCE_DEVICE) { + if (!ret->source.ndevice) { + virStorageReportError(VIR_ERR_XML_ERROR, + "%s", _("missing storage pool source device name")); + goto cleanup; + } + } + if ((ret->target.path = virXPathString("string(./target/path)", ctxt)) == NULL) { virStorageReportError(VIR_ERR_XML_ERROR, "%s", _("missing storage pool target path")); -- 1.6.5.2

3 2

[libvirt] [PATCH] Fix mis-leading error message in pool delete API
by Daniel P. Berrange 03 Mar '10

03 Mar '10

When trying to delete a pool the error message claimed the volume could not be deleted. * src/storage/storage_driver.c: Error message referred to volumes instead of pools --- src/storage/storage_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6b1045a..f3be6de 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -822,7 +822,7 @@ storagePoolDelete(virStoragePoolPtr obj, if (!backend->deletePool) { virStorageReportError(VIR_ERR_NO_SUPPORT, - "%s", _("pool does not support volume delete")); + "%s", _("pool does not support pool deletion")); goto cleanup; } if (backend->deletePool(obj->conn, pool, flags) < 0) -- 1.6.5.2

3 2

[libvirt] [PATCH 0/2] virsh: consistent N_() usage
by Eric Blake 03 Mar '10

03 Mar '10

As discussed here[1], we aren't being very smart about the use of gettext_noop(). In particular, most packages use N_() to mean gettext_noop rather than a synonym to _(); furthermore, our current definition of N_() meant that we were effectively calling gettext(gettext("string")), which has undefined results. Patch 1/2 also fixes a potential crash due to a translation bug, by telling xgettext to enforce that the translation of a string later handed to printf does not violate printf constraints. [1] https://www.redhat.com/archives/libvir-list/2010-March/msg00197.html [PATCH 1/2] virsh: fix existing N_ uses [PATCH 2/2] virsh: use N_ rather than gettext_noop .../0008-Step-8-of-8-Add-virsh-support.patch | 21 +- src/internal.h | 2 +- tools/virsh.c | 895 ++++++++++---------- 3 files changed, 459 insertions(+), 459 deletions(-)

1 2

[libvirt] [PATCH] Add a define for NFS_SUPER_MAGIC
by Chris Lalancette 03 Mar '10

03 Mar '10

Commit 3c12a67b766cce51b47861ccde2be41de369f832 added a dependency on the NFS_SUPER_MAGIC macro, which is defined in linux/magic.h. Unfortunately linux/magic.h is not available in RHEL-5, and causes a compile error. Just define it locally, since this is something that can't change. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ccb9ef9..efc3be1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -49,8 +49,10 @@ #ifdef __linux__ #include <sys/vfs.h> -#include <linux/magic.h> -#endif +#ifndef NFS_SUPER_MAGIC +#define NFS_SUPER_MAGIC 0x6969 +#endif /* NFS_SUPER_MAGIC */ +#endif /* __linux__ */ #include "virterror_internal.h" #include "logging.h" -- 1.6.6.1

4 5

[libvirt] [PATCH] util: ensure safe{read, write, zero} return is checked
by Eric Blake 03 Mar '10

03 Mar '10

Based on a warning from coverity. The safe* functions guarantee complete transactions on success, but don't guarantee freedom from failure. * src/util/util.h (saferead, safewrite, safezero): Add ATTRIBUTE_RETURN_CHECK. * src/remote/remote_driver.c (remoteIO, remoteIOEventLoop): Ignore some failures. (remoteIOReadBuffer): Adjust error messages on read failure. * daemon/event.c (virEventHandleWakeup): Ignore read failure. --- Coverity claimed that safewrite was checked 37 out of 46 times, but only flagged one instance of a CHECKED_RETURN report, against remote_driver.c. I didn't spot the 9 unchecked calls that coverity's numbers would imply. Meanwhile, adding the attribute ensures that we don't forget this in the future. Please double-check if my use of ignore_value on some of the previously unchecked calls makes sense, or if we need a more invasive patch to deal with real failure. daemon/event.c | 5 +++-- src/remote/remote_driver.c | 13 +++++++++---- src/util/util.h | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/daemon/event.c b/daemon/event.c index 2218a3e..36e9dd3 100644 --- a/daemon/event.c +++ b/daemon/event.c @@ -1,8 +1,8 @@ /* * event.c: event loop for monitoring file handles * + * Copyright (C) 2007, 2010 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange - * Copyright (C) 2007 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +35,7 @@ #include "event.h" #include "memory.h" #include "util.h" +#include "ignore-value.h" #define EVENT_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__) @@ -630,7 +631,7 @@ static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED, { char c; virEventLock(); - saferead(fd, &c, sizeof(c)); + ignore_value (saferead(fd, &c, sizeof(c))); virEventUnlock(); } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index def4617..47d8c56 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7809,7 +7809,9 @@ remoteIOReadBuffer(virConnectPtr conn, char errout[1024] = "\0"; if (priv->errfd != -1) { - saferead(priv->errfd, errout, sizeof(errout)); + if (saferead(priv->errfd, errout, sizeof(errout)) < 0) { + strncpy (errout, _("unknown reason"), sizeof errout); + } } virReportSystemError(errno, @@ -7818,7 +7820,9 @@ remoteIOReadBuffer(virConnectPtr conn, } else { char errout[1024] = "\0"; if (priv->errfd != -1) { - saferead(priv->errfd, errout, sizeof(errout)); + if (saferead(priv->errfd, errout, sizeof(errout)) < 0) { + strncpy (errout, _("unknown reason"), sizeof errout); + } } errorf (in_open ? NULL : conn, @@ -8431,7 +8435,8 @@ remoteIOEventLoop(virConnectPtr conn, if (fds[1].revents) { DEBUG0("Woken up from poll by other thread"); - saferead(priv->wakeupReadFD, &ignore, sizeof(ignore)); + ignore_value (saferead(priv->wakeupReadFD, &ignore, + sizeof(ignore))); } if (ret < 0) { @@ -8575,7 +8580,7 @@ remoteIO(virConnectPtr conn, priv->waitDispatch = thiscall; /* Force other thread to wakup from poll */ - safewrite(priv->wakeupSendFD, &ignore, sizeof(ignore)); + ignore_value (safewrite(priv->wakeupSendFD, &ignore, sizeof(ignore))); DEBUG("Going to sleep %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); /* Go to sleep while other thread is working... */ diff --git a/src/util/util.h b/src/util/util.h index cc05abe..34b77fa 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -2,6 +2,7 @@ /* * utils.h: common, generic utility functions * + * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain * @@ -31,9 +32,11 @@ #include <sys/select.h> #include <sys/types.h> -int saferead(int fd, void *buf, size_t count); -ssize_t safewrite(int fd, const void *buf, size_t count); -int safezero(int fd, int flags, off_t offset, off_t len); +int saferead(int fd, void *buf, size_t count) ATTRIBUTE_RETURN_CHECK; +ssize_t safewrite(int fd, const void *buf, size_t count) + ATTRIBUTE_RETURN_CHECK; +int safezero(int fd, int flags, off_t offset, off_t len) + ATTRIBUTE_RETURN_CHECK; enum { VIR_EXEC_NONE = 0, -- 1.6.6.1

1 1

[libvirt] [PATCH] Fix typo in QEMU migration command name
by Daniel P. Berrange 03 Mar '10

03 Mar '10

The QMP code was running query-migration instead of query-migrate. This doesn't work so well * src/qemu/qemu_monitor_json.c: s/query-migration/query-migrate/ --- src/qemu/qemu_monitor_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3a94dd0..9c0245c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1108,7 +1108,7 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *total) { int ret; - virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-migration", + virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL); virJSONValuePtr reply = NULL; -- 1.6.5.2

2 1

[libvirt] [PATCH] Add TCK script for host PCI device hotplug/unplug
by Daniel P. Berrange 03 Mar '10

03 Mar '10

This adds support for testing host PCI device hotplug/unplug in libvirt drivers. This requires that the host have a usable IOMMU & hardware virt, and that the device in question can be reset safely. Since the TCK can't assume there are any host PCI devices that can be safely messed around with, the person running the test suite must first list one or more devices in the config file. If no devices are listed, the test will automatically skip all parts, rather than failing. * conf/default.cfg: Config entry to specify PCI devices that the TCK can mess around with * lib/Sys/Virt/TCK.pm: API for getting a host PCI device from the config * scripts/domain/250-pci-host-hotplug.t: Test case for PCI device hotplug/unplug. --- conf/default.cfg | 15 ++++ lib/Sys/Virt/TCK.pm | 18 +++++ scripts/domain/250-pci-host-hotplug.t | 117 +++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/250-pci-host-hotplug.t diff --git a/conf/default.cfg b/conf/default.cfg index f9c2b5c..5b85cbc 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -112,3 +112,18 @@ host_usb_devices = ( # } # Can list more than one USB device if many are available ) + + +# Host PCI devices that the test suite can safely mess around with +# without risk of breaking the host OS. Using a NIC device is the +# most reliable option. Definitely don't try listing a VGA device. +host_pci_devices = ( +# Slot is only required entry, all others default to 0 +# { +# domain = 0000 +# bus = 00 +# slot = 07 +# function = 0 +# } +# Can list more than one PCI device if many are available +) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index ce03935..f101937 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -787,4 +787,22 @@ sub get_host_usb_device { return ($bus, $device, $vendor, $product); } +sub get_host_pci_device { + my $self = shift; + my $devindex = @_ ? shift : 0; + + my $devs = $self->config("host_pci_devices", []); + + if ($devindex > $#{$devs}) { + return (); + } + + my $domain = $self->config("host_pci_devices/[$devindex]/domain", 0); + my $bus = $self->config("host_pci_devices/[$devindex]/bus", 0); + my $slot = $self->config("host_pci_devices/[$devindex]/slot"); + my $function = $self->config("host_pci_devices/[$devindex]/function", 0); + + return ($domain, $bus, $slot, $function); +} + 1; diff --git a/scripts/domain/250-pci-host-hotplug.t b/scripts/domain/250-pci-host-hotplug.t new file mode 100644 index 0000000..9ccd036 --- /dev/null +++ b/scripts/domain/250-pci-host-hotplug.t @@ -0,0 +1,117 @@ +# -*- perl -*- +# +# Copyright (C) 2009 Red Hat +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/250-pci-host-hotplug.t - verify hot plug & unplug of a host PCI device + +=head1 DESCRIPTION + +The test case validates that it is possible to hotplug a pci +host device to a running domain, and then unplug it again. +This requires that the TCK configuration file have at least +one host PCI device listed. + +This first searches for the node device, then detachs it from +the host OS. Next it performs a reset. Then does the hotplug +and unplug, before finally reattaching to the host. + +=cut + +use strict; +use warnings; + +use Test::More tests => 10; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + + +my $xml = $tck->generic_domain("tck")->as_xml; + +diag "Creating a new transient domain"; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + + +my ($domain, $bus, $slot, $function) = $tck->get_host_pci_device(); + +SKIP: { + # Must have one item be non-zero + unless ($domain || $bus || $slot || $function) { + skip "No host pci device available in configuration file", 9; + } + + my $nodedev; + my @devs = $conn->list_node_devices("pci"); + foreach my $dev (@devs) { + my $thisxml = $dev->get_xml_description(); + + my $xp = XML::XPath->new(xml => $thisxml); + + #warn $thisxml; + my $ndomain = $xp->find("string(/device/capability[\@type='pci']/domain[text()])")->value(); + my $nbus = $xp->find("string(/device/capability[\@type='pci']/bus[text()])")->value(); + my $nslot = $xp->find("string(/device/capability[\@type='pci']/slot[text()])")->value(); + my $nfunction = $xp->find("string(/device/capability[\@type='pci']/function[text()])")->value(); + + if ($ndomain == $domain && + $nbus == $bus && + $nslot == $slot && + $nfunction == $function) { + $nodedev = $dev; + last; + } + } + + ok(defined $nodedev, "found PCI device $domain:$bus:$slot.$function on host"); + + lives_ok(sub { $nodedev->dettach() }, "detached device from host OS"); + lives_ok(sub { $nodedev->reset() }, "reset the host PCI device"); + + my $devxml = + "<hostdev mode='subsystem' type='pci' managed='no'>\n" . + " <source>\n" . + " <address domain='$domain' bus='$bus' slot='$slot' function='$function'/>\n" . + " </source>\n" . + "</hostdev>\n"; + + my $initialxml = $dom->get_xml_description; + + diag "Attaching the new dev $devxml"; + lives_ok(sub { $dom->attach_device($devxml); }, "PCI dev has been attached"); + + my $newxml = $dom->get_xml_description; + ok($newxml =~ m|<hostdev|, "new XML has extra PCI dev present"); + + diag "Detaching the new dev $devxml"; + lives_ok(sub { $dom->detach_device($devxml); }, "PCI dev has been detached"); + + lives_ok(sub { $nodedev->reset() }, "reset the host PCI device"); + lives_ok(sub { $nodedev->reattach() }, "reattached device to host OS"); + + my $finalxml = $dom->get_xml_description; + + is($initialxml, $finalxml, "final XML has removed the disk") +} + -- 1.6.5.2

2 1