May 2009 - Devel - libvirt List Archives

[Libvir] Hang with virt-install graphic=no on FC 6 6.93/F7 RC2
by libvirtuser 23 Dec '25

23 Dec '25

I had this problem and another user confirmed the same behavior on his machine: http://pastie.caboo.se/65417 Haven't tried it with *2925.10* yet. Also, is there a way to get more verbose info about what calls are causing the "configuration file syntax error" errors? Thanks. virt-install How large would you like the disk () to be (in gigabytes)? 4 ERROR: Must provide a file, not a directory for the disk What would you like to use as the disk (path)? /xen/images/x6.img Would you like to enable graphics support? (yes or no) no What is the install location? http://mirror.anl.gov/pub/fedora-linux-core/test/6.93/Fedora/i386/os/ Starting install... libvir: Xen Daemon error : GET operation failed: libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name Retrieving Fedora... 276 kB 00:01 Retrieving vmlinuz... 100% |=========================| 2.1 MB 00:16 Retrieving initrd.img... 100% |=========================| 5.4 MB 00:28 libvir: Xen Daemon error : GET operation failed: libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name Creating domain... 0 B 00:06 Linux version 2.6.20-2925.5.fc7xen (brewbuilder(a)ls20-bc1-14.build.redhat.com) (gcc version 4.1.2 20070317 (Red Hat 4.1.2-5)) #1 SMP Thu Mar 22 13:51:38 EDT 2007 BIOS-provided physical RAM map: sanitize start sanitize bail 0 copy_e820_map() start: 0000000000000000 size: 0000000020800000 end: 0000000020800000 type: 1 Xen: 0000000000000000 - 0000000020800000 (usable) 0MB HIGHMEM available. 520MB LOWMEM available. Using x86 segment limits to approximate NX protection Zone PFN ranges: DMA 0 -> 133120 Normal 133120 -> 133120 HighMem 133120 -> 133120 early_node_map[1] active PFN ranges 0: 0 -> 133120 ACPI in unprivileged domain disabled Built 1 zonelists. Total pages: 132080 Kernel command line: method=http://mirror.anl.gov/pub/fedora-linux-core/test/6.93/Fedora/i386/os/ Enabling fast FPU save and restore... done. Enabling unmasked SIMD FPU exception support... done. Initializing CPU#0 CPU 0 irqstacks, hard=c135f000 soft=c133f000 PID hash table entries: 4096 (order: 12, 16384 bytes) Xen reported: 1694.994 MHz processor. Console: colour dummy device 80x25 Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar ... MAX_LOCKDEP_SUBCLASSES: 8 ... MAX_LOCK_DEPTH: 30 ... MAX_LOCKDEP_KEYS: 2048 ... CLASSHASH_SIZE: 1024 ... MAX_LOCKDEP_ENTRIES: 8192 ... MAX_LOCKDEP_CHAINS: 16384 ... CHAINHASH_SIZE: 8192 memory used by lock dependency info: 1064 kB per task-struct memory footprint: 1200 bytes Dentry cache hash table entries: 131072 (order: 7, 524288 bytes) Inode-cache hash table entries: 65536 (order: 6, 262144 bytes) Software IO TLB disabled vmalloc area: e1000000-f4ffe000, maxmem 2d7fe000 Memory: 503936k/532480k available (2030k kernel code, 19948k reserved, 1079k data, 180k init, 0k highmem) virtual kernel memory layout: fixmap : 0xf5315000 - 0xf57fe000 (5028 kB) pkmap : 0xf5000000 - 0xf5200000 (2048 kB) vmalloc : 0xe1000000 - 0xf4ffe000 ( 319 MB) lowmem : 0xc0000000 - 0xe0800000 ( 520 MB) .init : 0xc130e000 - 0xc133b000 ( 180 kB) .data : 0xc11fb9d9 - 0xc1309714 (1079 kB) .text : 0xc1000000 - 0xc11fb9d9 (2030 kB) Checking if this processor honours the WP bit even in supervisor mode... Ok. Calibrating delay using timer specific routine.. 4262.67 BogoMIPS (lpj=8525343) Security Framework v1.0.0 initialized SELinux: Initializing. SELinux: Starting in permissive mode selinux_register_security: Registering secondary module capability Capability LSM initialized as secondary Mount-cache hash table entries: 512 CPU: Trace cache: 12K uops, L1 D cache: 8K CPU: L2 cache: 256K Checking 'hlt' instruction... OK. SMP alternatives: switching to UP code Freeing SMP alternatives: 11k freed Brought up 1 CPUs Grant table initialized NET: Registered protocol family 16 Brought up 1 CPUs PCI: Fatal: No config space access function found PCI: setting up Xen PCI frontend stub Setting up standard PCI resources ACPI: Interpreter disabled. Linux Plug and Play Support v0.97 (c) Adam Belay pnp: PnP ACPI: disabled xen_mem: Initialising balloon driver. usbcore: registered new interface driver usbfs usbcore: registered new interface driver hub usbcore: registered new device driver usb PCI: System does not support PCI PCI: System does not support PCI NetLabel: Initializing NetLabel: domain hash size = 128 NetLabel: protocols = UNLABELED CIPSOv4 NetLabel: unlabeled traffic allowed by default NET: Registered protocol family 2 IP route cache hash table entries: 32768 (order: 5, 131072 bytes) TCP established hash table entries: 131072 (order: 10, 4194304 bytes) TCP bind hash table entries: 65536 (order: 9, 2097152 bytes) TCP: Hash tables configured (established 131072 bind 65536) TCP reno registered checking if image is initramfs... it is Freeing initrd memory: 7256k freed IA-32 Microcode Update Driver: v1.14-xen <tigran(a)veritas.com> audit: initializing netlink socket (disabled) audit(1180379657.981:1): initialized VFS: Disk quotas dquot_6.5.1 Dquot-cache hash table entries: 1024 (order 0, 4096 bytes) SELinux: Registering netfilter hooks io scheduler noop registered io scheduler anticipatory registered io scheduler deadline registered io scheduler cfq registered (default) pci_hotplug: PCI Hot Plug PCI Core version: 0.5 BUG: at kernel/fork.c:994 copy_process() [<c1005d9a>] show_trace_log_lvl+0x1a/0x2f [<c1006343>] show_trace+0x12/0x14 [<c10063be>] dump_stack+0x16/0x18 [<c101d044>] copy_process+0x195/0x1245 [<c101e144>] do_fork+0x50/0x117 [<c1003351>] kernel_thread+0x8e/0x96 [<c102c701>] __call_usermodehelper+0x2d/0x46 [<c102cd4f>] run_workqueue+0x89/0x145 [<c102d711>] worker_thread+0xd5/0x102 [<c102ff27>] kthread+0xb3/0xdc [<c10058db>] kernel_thread_helper+0x7/0x10 ======================= rtc: IRQ 8 is not free. Non-volatile memory driver v1.2 Linux agpgart interface v0.101 (c) Dave Jones RAMDISK driver initialized: 16 RAM disks of 16384K size 4096 blocksize input: Macintosh mouse button emulation as /class/input/input0 Xen virtual console successfully installed as xvc0 Event-channel device installed. usbcore: registered new interface driver libusual usbcore: registered new interface driver hiddev usbcore: registered new interface driver usbhid drivers/usb/input/hid-core.c: v2.6:USB HID core driver PNP: No PS/2 controller found. Probing ports directly. i8042.c: No controller found. mice: PS/2 mouse device common for all mice TCP bic registered Initializing XFRM netlink socket NET: Registered protocol family 1 NET: Registered protocol family 17 Using IPI No-Shortcut mode XENBUS: Device with no driver: device/vbd/51712 XENBUS: Device with no driver: device/vif/0 Freeing unused kernel memory: 180k freed Write protecting the kernel read-only data: 762k ^[Domain installation still in progress. You can reconnect

2 1

[libvirt] [PATCH] Fix python error reporting for some storage operations
by Cole Robinson 07 Mar '25

07 Mar '25

In the python bindings, all vir* classes expect to be passed a virConnect object when instantiated. Before the storage stuff, these classes were only instantiated in virConnect methods, so the generator is hardcoded to pass 'self' as the connection instance to these classes. Problem is there are some methods that return pool or vol instances which aren't called from virConnect: you can lookup a storage volume's associated pool, and can lookup volumes from a pool. In these cases passing 'self' doesn't give the vir* instance a connection, so when it comes time to raise an exception crap hits the fan. Rather than rework the generator to accomodate this edge case, I just fixed the init functions for virStorage* to pull the associated connection out of the passed value if it's not a virConnect instance. Thanks, Cole diff --git a/python/generator.py b/python/generator.py index 01a17da..c706b19 100755 --- a/python/generator.py +++ b/python/generator.py @@ -962,8 +962,12 @@ def buildWrappers(): list = reference_keepers[classname] for ref in list: classes.write(" self.%s = None\n" % ref[1]) - if classname in [ "virDomain", "virNetwork", "virStoragePool", "virStorageVol" ]: + if classname in [ "virDomain", "virNetwork" ]: classes.write(" self._conn = conn\n") + elif classname in [ "virStorageVol", "virStoragePool" ]: + classes.write(" self._conn = conn\n" + \ + " if not isinstance(conn, virConnect):\n" + \ + " self._conn = conn._conn\n") classes.write(" if _obj != None:self._o = _obj;return\n") classes.write(" self._o = None\n\n"); destruct=None

4 3

[libvirt] PATCH: 0/3: Run QEMU guests within a CGroup
by Daniel P. Berrange 07 Jul '09

07 Jul '09

Recent Linux kernels have a new concept of 'CGroups' which is a way to group tasks on the system and apply policy to them as a whole. We already use this in the LXC container driver, to control total memory usage of things runing within a container. This patch series is a proof of concept to make use of CGroups in the QEMU driver. The idea is that we have a 3 level cgroup hierarchy - Top level; contains the libvirtd daemon itself - 2nd level: one per libvirt driver, but dos not contain any processes. - 3rd level: one per guest VM. Contains the QEMU process The host admin can do control on the top level and 2nd level to set an overall system policy. libvirt will then provide APIs / capabilities to control individual VMs policy. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 10

[libvirt] [RFC][PATCH] lxc: drop CAP_SYS_BOOT capability to prevent rebooting from inside containers
by Ryota Ozaki 23 Jun '09

23 Jun '09

Hi, Current lxc driver unexpectedly allows users inside containers to reboot host physical machine. This patch prevents this by dropping CAP_SYS_BOOT capability in the bounding set of the init processes in every containers. Note that the patch intends to make it easy to add further capabilities to drop if needed, although I'm not sure which capabilities should be dropped. (We might need to drop CAP_SETFCAP as well to be strict...) Thanks, ozaki-r Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 0e7a7622bc6411bbe76c05c63c6e6e61d379d97b Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Fri, 8 May 2009 04:29:24 +0900 Subject: [PATCH] lxc: drop CAP_SYS_BOOT capability to prevent rebooting from inside containers Current lxc driver unexpectedly allows users inside containers to reboot host physical machine. This patch prevents this by dropping CAP_SYS_BOOT capability in the bounding set of the init processes in every containers. --- src/lxc_container.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/lxc_container.c b/src/lxc_container.c index 3946b84..37ab216 100644 --- a/src/lxc_container.c +++ b/src/lxc_container.c @@ -32,6 +32,8 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/wait.h> +#include <sys/prctl.h> +#include <sys/capability.h> #include <unistd.h> #include <mntent.h> @@ -639,6 +641,30 @@ static int lxcContainerSetupMounts(virDomainDefPtr vmDef, return lxcContainerSetupExtraMounts(vmDef); } + +static int lxcContainerDropCapabilities( virDomainDefPtr vmDef ) +{ + int i; + const struct { + int id; + const char *name; + } caps[] = { +#define ID_STRING(name) name, #name + { ID_STRING(CAP_SYS_BOOT) }, + }; + + for (i = 0 ; i < ARRAY_CARDINALITY(caps) ; i++) { + if (prctl(PR_CAPBSET_DROP, caps[i].id, 0, 0, 0)) { + lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("failed to drop %s"), caps[i].name); + return -1; + } + } + + return 0; +} + + /** * lxcChild: * @argv: Pointer to container arguments @@ -705,6 +731,10 @@ static int lxcContainerChild( void *data ) if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) return -1; + /* drop a set of root capabilities */ + if (lxcContainerDropCapabilities(vmDef) < 0) + return -1; + /* this function will only return if an error occured */ return lxcContainerExecInit(vmDef); } -- 1.6.0.6

6 15

[Libvirt] SSH with certificates
by Christian Weyermann 14 Jun '09

14 Jun '09

Hello everybody, We are trying to use libvirt with qemu over ssh and our goal is to have authentication done by certificates. Therefore I created a keypair on the client and send the public key to the server. Std. SSH connections work without an password prompt as expected (ssh <ip> -l user), but if I try "sudo virsh -c qemu+ssh://user@<ip>/system" it prompts for a password (Beside that password prompt it works as expected). Is there anything else I have to do beside registering the public key at the server? Thanks for your help and best regards, Christian

5 18

[libvirt] [PATCH] Fix a compilation problem with LXC drop capabilities
by Daniel Veillard 12 Jun '09

12 Jun '09

The lxcContainerDropCapabilities() function requires PR_CAPBSET_DROP to be defined in order to compile, but it may not be defined in older kernels. So I made the compilation of the core of the function conditional, raise an error but still return 0 to not make the container initialization fail. But I'm unsure, should we just fail and return -1 if we can't drop capabilities instead ? 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/

4 10

[libvirt] Release of libvirt-0.6.4
by Daniel Veillard 06 Jun '09

06 Jun '09

The monthly release is out ! There is a number of new things in that release, but as happens in time-based releases some are not fully complete, for example the OpenNebula driver was added but it still need a bit of work on the detection code and a bit of cleanup to avoid a GPL/AFS licencing issue, so please don't enable it except for test builds. We also have a new set of Interface config APIs but they are not yet implemented by a driver and the XML import/export routines are not there yet. Still there is a lot of things to use and discover in this release as you can see below: * New features: - new API virStorageVolCreateXMLFrom (Cole Robinson) - full VBox graphic capabilities (Pritesh Kothari) - Interface config APIs (Laine Stump) - APIs for domain XML conversions (Daniel Berrange) - initial version of OpenNebula driver (Abel Miguez Rodriguez) * Portability: - better compiler warning selection (Daniel Berrange) - Win32 portability fixes (Daniel Berrange) * Documentation: - documentation for <sound> device XML format (Cole Robinson) - storage format documentation fixes (Ryota Ozaki) - docs for XML conversion APIs (Daniel Berrange) - inconsistencies in storage volume docs and schemas (Ryota Ozaki) * Bug fixes: - fix hostdev managed handling (Mark McLoughlin) - lxc_controller should not cash without args (Guido Gunther) - bug fixes in I/O routines (Guido Gunther) - fix migrationsave/restore for QEmu 0.10.0 (Daniel Berrange) - avoid crash on VBox init (Guido Gunther) - fix dev and cgroup init in LXC (Ryota Ozaki) - QEmu startup fix (Cole Robinson) - block node reboots from LXCs (Ryota Ozaki) - QEmu argv detection fix for recent kvm (Daniel Berrange) - fix watch/timer event deletion (Daniel Berrange) - fix XML escaping bug - various locking bugs (Daniel Berrange) - avoid a deadlock in HAL nodedev driver (Cole Robinson) - detection of node device media insert/eject (Cole Robinson) - broken networking with new QEMU/KVM >= 86 (Daniel Berrange) - various fixes in domain and network startup error report (Cole Robinson) - double free on unexpected client disconnect (Daniel Berrange) * Improvements: - cleanups and doc on virExec (Cole Robinson) - error reporting in QEmu migrations (Cole Robinson) - better path and driver detection in VBox (Pritesh Kothari) - avoid caching QEMU driver capabilities(Cole Robinson) - multiple graphics elements definitions (Pritesh Kothari) - LSB init header init.d improvements (Frederik Himpe) - special erro code for invalid operations (Daniel Berrange) - dlopen error logging (Daniel Berrange) - fix UUID and name uniqueness (Daniel Berrange) - improvement on VBox initialization (Pritesh Kothari and Dan Berrange) - "Host only" and "Internal" network in VBox (Pritesh Kothari) - add utility virExecDaemonize (Cole Robinson) - enable bridges without IP (Ludwig Nussel) - 'make -s' silencing (Daniel Berrange) - test case for exercising the event loop (Daniel Berrange) - virsh commands vol-clone and vol-create-from (Cole Robinson) - new xend don't use [] around cpumaps (Tatsuro Enokura) - add the CIL mutex lock checker (Daniel Berrange) - fix some LXC error code (Amy Griffis) - virInterface python bindings (Daniel Berrange) - fix to the example code for event handling (Pritesh Kothari) - always add location informations to logging (Daniel Berrange) - python domain events example and binding (Daniel Berrange) - PPC Qemu Machine Type update (Thomas Baker) * Cleanups: - strings bug in virsh (Daniel Berrange) - various cleanups in storage code (Cole Robinson) - rpm spec cleanups - destructors data cleanups (Laine Stump) - some QEmu code refactoring (Daniel Berrange) - avoid dependancy on libcap (Daniel Berrange) - python import cleanup (Cole Robinson) - virAsprintf based cleanups in storage code (Cole Robinson) - fix some direct stderr logging - OpenNebula driver cleanups (Daniel Berrange) Thanks everybody for the contributions for this new release ! 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 8

[libvirt] PATCH: Fix redetection of transient QEMU VMs on daemon restarts
by Daniel P. Berrange 04 Jun '09

04 Jun '09

When the libvirtd daemon starts up, it reads all config files from /etc/libvirt/qemu. For each config file loaded, it then probes for a pidfile / live status XML config in /var/run/libvirt/qemu. In retrospect there is an obvious problem with this approach: it misses all transient VMs which don't ever have config files in /etc/libvirt/qemu. The core goal of this patch, is thus to change the way we deal with startup to apply the following logic. - Scan & load all status files in /var/run/libvirt/qemu for running VMs - Reconnect to the monitor for all VMs, and re-detect VCPU threads. - Scan & load all inactive configs in /etc/libvirt/qemu This ensures we always re-detect all inactive and running VMs, whether transient or persistent. It also fixes two other bugs, first we forgot to detect VCPU threads, so vCPU affinity functions were broken, and it also re-reserves the MCS category with selinux so it is not re-used later. Finally, if the attempt to reconnect to the QEMU monitor for a running VM fails, then we explicitly kill off that VM, rather than just ignoring it. This avoids leaving orphaned QEMU processes. The patch is larger than anticipated, because I moved all the status file code out of QEMU driver into the generic domain_conf.c file. This enables both scanning loops to be done via the single method virDomainLoadAllConfigs, just by pasing different directories. I also want to re-use this code in the LXC and UML drivers to improve bugs in their logic domain_conf.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++----- domain_conf.h | 17 ++ libvirt_private.syms | 1 lxc_driver.c | 2 qemu_conf.c | 190 ------------------------------ qemu_conf.h | 18 -- qemu_driver.c | 178 +++++++++++++--------------- security.h | 3 security_selinux.c | 39 ++++++ uml_driver.c | 4 10 files changed, 431 insertions(+), 335 deletions(-) Daniel diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -39,6 +39,7 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -511,6 +512,31 @@ void virDomainObjListFree(virDomainObjLi vms->count = 0; } + +static virDomainObjPtr virDomainObjNew(virConnectPtr conn) +{ + virDomainObjPtr domain; + + if (VIR_ALLOC(domain) < 0) { + virReportOOMError(conn); + return NULL; + } + + if (virMutexInit(&domain->lock) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialize mutex")); + VIR_FREE(domain); + return NULL; + } + + virDomainObjLock(domain); + domain->state = VIR_DOMAIN_SHUTOFF; + domain->monitorWatch = -1; + domain->monitor = -1; + + return domain; +} + virDomainObjPtr virDomainAssignDef(virConnectPtr conn, virDomainObjListPtr doms, const virDomainDefPtr def) @@ -530,29 +556,15 @@ virDomainObjPtr virDomainAssignDef(virCo return domain; } - if (VIR_ALLOC(domain) < 0) { - virReportOOMError(conn); - return NULL; - } - - if (virMutexInit(&domain->lock) < 0) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialize mutex")); - VIR_FREE(domain); - return NULL; - } - - virDomainObjLock(domain); - domain->state = VIR_DOMAIN_SHUTOFF; + if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { + virReportOOMError(conn); + return NULL; + } + + if (!(domain = virDomainObjNew(conn))) + return NULL; + domain->def = def; - domain->monitorWatch = -1; - domain->monitor = -1; - - if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { - virReportOOMError(conn); - VIR_FREE(domain); - return NULL; - } doms->objs[doms->count] = domain; doms->count++; @@ -2621,6 +2633,68 @@ no_memory: return NULL; } + +static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, + virCapsPtr caps, + xmlXPathContextPtr ctxt) +{ + char *tmp = NULL; + long val; + xmlNodePtr config; + xmlNodePtr oldctxt; + virDomainObjPtr obj; + + if (!(obj = virDomainObjNew(conn))) + return NULL; + + if (!(config = virXPathNode(conn, "./domain", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no domain config")); + goto error; + } + + oldctxt = ctxt->node; + ctxt->node = config; + obj->def = virDomainDefParseXML(conn, caps, ctxt, 0); + ctxt->node = oldctxt; + if (!obj->def) + goto error; + + if (!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing domain state")); + goto error; + } + if ((obj->state = virDomainStateTypeFromString(tmp)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("invalid domain state '%s'"), tmp); + VIR_FREE(tmp); + goto error; + } + VIR_FREE(tmp); + + if ((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid pid")); + goto error; + } + obj->pid = (pid_t)val; + + if(!(obj->monitorpath = + virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no monitor path")); + goto error; + } + + return obj; + +error: + virDomainObjFree(obj); + return NULL; +} + + /* Called from SAX on parsing errors in the XML. */ static void catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) @@ -2753,6 +2827,78 @@ cleanup: xmlXPathFreeContext(ctxt); return def; } + + +virDomainObjPtr virDomainObjParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename) +{ + xmlParserCtxtPtr pctxt; + xmlDocPtr xml = NULL; + xmlNodePtr root; + virDomainObjPtr obj = NULL; + + /* Set up a parser context so we can catch the details of XML errors. */ + pctxt = xmlNewParserCtxt (); + if (!pctxt || !pctxt->sax) + goto cleanup; + pctxt->sax->error = catchXMLError; + pctxt->_private = conn; + + if (conn) virResetError (&conn->err); + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xml) { + if (virGetLastError() == NULL) + virDomainReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("failed to parse xml document")); + goto cleanup; + } + + if ((root = xmlDocGetRootElement(xml)) == NULL) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing root element")); + goto cleanup; + } + + obj = virDomainObjParseNode(conn, caps, xml, root); + +cleanup: + xmlFreeParserCtxt (pctxt); + xmlFreeDoc (xml); + return obj; +} + + +virDomainObjPtr virDomainObjParseNode(virConnectPtr conn, + virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root) +{ + xmlXPathContextPtr ctxt = NULL; + virDomainObjPtr obj = NULL; + + if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("incorrect root element")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + obj = virDomainObjParseXML(conn, caps, ctxt); + +cleanup: + xmlXPathFreeContext(ctxt); + return obj; +} + #endif /* ! PROXY */ /************************************************************************ @@ -3704,6 +3850,33 @@ char *virDomainDefFormat(virConnectPtr c return NULL; } +char *virDomainObjFormat(virConnectPtr conn, + virDomainObjPtr obj, + int flags) +{ + char *config_xml = NULL, *xml = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", + virDomainStateTypeToString(obj->state), + obj->pid); + virBufferEscapeString(&buf, " <monitor path='%s'/>\n", obj->monitorpath); + + if (!(config_xml = virDomainDefFormat(conn, + obj->def, + flags))) + goto cleanup; + + virBufferAdd(&buf, config_xml, strlen(config_xml)); + virBufferAddLit(&buf, "</domstatus>\n"); + + xml = virBufferContentAndReset(&buf); +cleanup: + VIR_FREE(config_xml); + return xml; + +} + #ifndef PROXY @@ -3779,6 +3952,27 @@ cleanup: return ret; } +int virDomainSaveStatus(virConnectPtr conn, + const char *statusDir, + virDomainObjPtr obj) +{ + int ret = -1; + char *xml; + + if (!(xml = virDomainObjFormat(conn, + obj, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + if (virDomainSaveXML(conn, statusDir, obj->def, xml)) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(xml); + return ret; +} + virDomainObjPtr virDomainLoadConfig(virConnectPtr conn, virCapsPtr caps, @@ -3832,17 +4026,67 @@ error: return NULL; } +static virDomainObjPtr virDomainLoadStatus(virConnectPtr conn, + virCapsPtr caps, + virDomainObjListPtr doms, + const char *statusDir, + const char *name, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *statusFile = NULL; + virDomainObjPtr obj = NULL; + virDomainObjPtr tmp = NULL; + + if ((statusFile = virDomainConfigFile(conn, statusDir, name)) == NULL) + goto error; + + if (!(obj = virDomainObjParseFile(conn, caps, statusFile))) + goto error; + + tmp = virDomainFindByName(doms, obj->def->name); + if (tmp) { + virDomainObjUnlock(obj); + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected domain %s already exists"), obj->def->name); + goto error; + } + + if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { + virReportOOMError(conn); + goto error; + } + + doms->objs[doms->count] = obj; + doms->count++; + + if (notify) + (*notify)(obj, 1, opaque); + + VIR_FREE(statusFile); + return obj; + +error: + virDomainObjFree(obj); + VIR_FREE(statusFile); + return NULL; +} + int virDomainLoadAllConfigs(virConnectPtr conn, virCapsPtr caps, virDomainObjListPtr doms, const char *configDir, const char *autostartDir, + int liveStatus, virDomainLoadConfigNotify notify, void *opaque) { DIR *dir; struct dirent *entry; + VIR_INFO("Scanning for %s configs in %s", + liveStatus ? "live" : "persistent", configDir); + if (!(dir = opendir(configDir))) { if (errno == ENOENT) return 0; @@ -3863,14 +4107,24 @@ int virDomainLoadAllConfigs(virConnectPt /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ - dom = virDomainLoadConfig(conn, - caps, - doms, - configDir, - autostartDir, - entry->d_name, - notify, - opaque); + VIR_INFO("Loading config file '%s.xml'", entry->d_name); + if (liveStatus) + dom = virDomainLoadStatus(conn, + caps, + doms, + configDir, + entry->d_name, + notify, + opaque); + else + dom = virDomainLoadConfig(conn, + caps, + doms, + configDir, + autostartDir, + entry->d_name, + notify, + opaque); if (dom) { virDomainObjUnlock(dom); dom->persistent = 1; diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -515,7 +515,6 @@ struct _virDomainObj { int monitor; char *monitorpath; int monitorWatch; - int logfile; int pid; int state; @@ -589,10 +588,22 @@ virDomainDefPtr virDomainDefParseNode(vi xmlDocPtr doc, xmlNodePtr root, int flags); + +virDomainObjPtr virDomainObjParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename); +virDomainObjPtr virDomainObjParseNode(virConnectPtr conn, + virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root); + #endif char *virDomainDefFormat(virConnectPtr conn, virDomainDefPtr def, int flags); +char *virDomainObjFormat(virConnectPtr conn, + virDomainObjPtr obj, + int flags); int virDomainCpuSetParse(virConnectPtr conn, const char **str, @@ -615,6 +626,9 @@ int virDomainSaveXML(virConnectPtr conn, int virDomainSaveConfig(virConnectPtr conn, const char *configDir, virDomainDefPtr def); +int virDomainSaveStatus(virConnectPtr conn, + const char *statusDir, + virDomainObjPtr obj); typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, @@ -634,6 +648,7 @@ int virDomainLoadAllConfigs(virConnectPt virDomainObjListPtr doms, const char *configDir, const char *autostartDir, + int liveStatus, virDomainLoadConfigNotify notify, void *opaque); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -94,6 +94,7 @@ virDomainObjListFree; virDomainRemoveInactive; virDomainSaveXML; virDomainSaveConfig; +virDomainSaveStatus; virDomainSoundDefFree; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; diff --git a/src/lxc_driver.c b/src/lxc_driver.c --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1176,7 +1176,7 @@ static int lxcStartup(void) &lxc_driver->domains, lxc_driver->configDir, lxc_driver->autostartDir, - NULL, NULL) < 0) + 0, NULL, NULL) < 0) goto cleanup; for (i = 0 ; i < lxc_driver->domains.count ; i++) { diff --git a/src/qemu_conf.c b/src/qemu_conf.c --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -2765,193 +2765,3 @@ cleanup: return def; } - -/* Called from SAX on parsing errors in the XML. */ -static void -catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) -{ - xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; - - if (ctxt) { - virConnectPtr conn = ctxt->_private; - - if (ctxt->lastError.level == XML_ERR_FATAL && - ctxt->lastError.message != NULL) { - qemudReportError (conn, NULL, NULL, VIR_ERR_XML_DETAIL, - _("at line %d: %s"), - ctxt->lastError.line, - ctxt->lastError.message); - } - } -} - - -/** - * qemudDomainStatusParseFile - * - * read the last known status of a domain - * - * Returns 0 on success - */ -qemudDomainStatusPtr -qemudDomainStatusParseFile(virConnectPtr conn, - virCapsPtr caps, - const char *filename, int flags) -{ - xmlParserCtxtPtr pctxt = NULL; - xmlXPathContextPtr ctxt = NULL; - xmlDocPtr xml = NULL; - xmlNodePtr root, config_root; - virDomainDefPtr def = NULL; - char *tmp = NULL; - long val; - qemudDomainStatusPtr status = NULL; - - if (VIR_ALLOC(status) < 0) { - virReportOOMError(conn); - goto error; - } - - /* Set up a parser context so we can catch the details of XML errors. */ - pctxt = xmlNewParserCtxt (); - if (!pctxt || !pctxt->sax) - goto error; - pctxt->sax->error = catchXMLError; - pctxt->_private = conn; - - if (conn) virResetError (&conn->err); - xml = xmlCtxtReadFile (pctxt, filename, NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); - if (!xml) { - if (conn && conn->err.code == VIR_ERR_NONE) - qemudReportError(conn, NULL, NULL, VIR_ERR_XML_ERROR, - "%s", _("failed to parse xml document")); - goto error; - } - - if ((root = xmlDocGetRootElement(xml)) == NULL) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("missing root element")); - goto error; - } - - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto error; - } - - if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); - goto error; - } - - ctxt->node = root; - if(!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid domain state")); - goto error; - } else { - status->state = virDomainStateTypeFromString(tmp); - VIR_FREE(tmp); - } - - if((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid pid")); - goto error; - } else - status->pid = (pid_t)val; - - if(!(tmp = virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("no monitor path")); - goto error; - } else - status->monitorpath = tmp; - - if(!(config_root = virXPathNode(conn, "./domain", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("no domain config")); - goto error; - } - if(!(def = virDomainDefParseNode(conn, caps, xml, config_root, flags))) - goto error; - else - status->def = def; - -cleanup: - xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); - xmlFreeDoc (xml); - return status; - -error: - VIR_FREE(tmp); - VIR_FREE(status); - goto cleanup; -} - - -/** - * qemudDomainStatusFormat - * - * Get the state of a running domain as XML - * - * Returns xml on success - */ -static char* -qemudDomainStatusFormat(virConnectPtr conn, - virDomainObjPtr vm) -{ - char *config_xml = NULL, *xml = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", - virDomainStateTypeToString(vm->state), - vm->pid); - virBufferEscapeString(&buf, " <monitor path='%s'/>\n", vm->monitorpath); - - if (!(config_xml = virDomainDefFormat(conn, - vm->def, - VIR_DOMAIN_XML_SECURE))) - goto cleanup; - - virBufferAdd(&buf, config_xml, strlen(config_xml)); - virBufferAddLit(&buf, "</domstatus>\n"); - - xml = virBufferContentAndReset(&buf); -cleanup: - VIR_FREE(config_xml); - return xml; -} - - -/** - * qemudSaveDomainStatus - * - * Save the current status of a running domain - * - * Returns 0 on success - */ -int -qemudSaveDomainStatus(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm) -{ - int ret = -1; - char *xml = NULL; - - if (!(xml = qemudDomainStatusFormat(conn, vm))) - goto cleanup; - - if ((ret = virDomainSaveXML(conn, driver->stateDir, vm->def, xml))) - goto cleanup; - - ret = 0; -cleanup: - VIR_FREE(xml); - return ret; -} diff --git a/src/qemu_conf.h b/src/qemu_conf.h --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -92,15 +92,6 @@ struct qemud_driver { virSecurityDriverPtr securityDriver; }; -/* Status needed to reconenct to running VMs */ -typedef struct _qemudDomainStatus qemudDomainStatus; -typedef qemudDomainStatus *qemudDomainStatusPtr; -struct _qemudDomainStatus { - char *monitorpath; - pid_t pid; - int state; - virDomainDefPtr def; -}; /* Port numbers used for KVM migration. */ #define QEMUD_MIGRATION_FIRST_PORT 49152 @@ -141,13 +132,4 @@ virDomainDefPtr qemuParseCommandLine(vir virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, const char *args); -const char *qemudVirtTypeToString (int type); -qemudDomainStatusPtr qemudDomainStatusParseFile(virConnectPtr conn, - virCapsPtr caps, - const char *filename, - int flags); -int qemudSaveDomainStatus(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm); - #endif /* __QEMUD_CONF_H */ diff --git a/src/qemu_driver.c b/src/qemu_driver.c --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -125,6 +125,8 @@ static int qemudMonitorCommandExtra(cons static int qemudDomainSetMemoryBalloon(virConnectPtr conn, virDomainObjPtr vm, unsigned long newmem); +static int qemudDetectVcpuPIDs(virConnectPtr conn, + virDomainObjPtr vm); static struct qemud_driver *qemu_driver = NULL; @@ -287,79 +289,65 @@ static int qemudOpenMonitor(virConnectPt const char *monitor, int reconnect); + +/* + * Open an existing VM's monitor, and re-detect VCPUs + * threads + */ +static int +qemuReconnectDomain(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + int rc; + + if ((rc = qemudOpenMonitor(NULL, driver, obj, obj->monitorpath, 1)) != 0) { + VIR_ERROR(_("Failed to reconnect monitor for %s: %d\n"), + obj->def->name, rc); + goto error; + } + + if (qemudDetectVcpuPIDs(NULL, obj) < 0) { + goto error; + } + + if (obj->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && + driver->securityDriver && + driver->securityDriver->domainReserveSecurityLabel && + driver->securityDriver->domainReserveSecurityLabel(NULL, obj) < 0) + return -1; + + if (obj->def->id >= driver->nextvmid) + driver->nextvmid = obj->def->id + 1; + + return 0; + +error: + return -1; +} + /** * qemudReconnectVMs * - * Reconnect running vms to the daemon process - */ -static int -qemudReconnectVMs(struct qemud_driver *driver) + * Try to re-open the resources for live VMs that we care + * about. + */ +static void +qemuReconnectDomains(struct qemud_driver *driver) { int i; for (i = 0 ; i < driver->domains.count ; i++) { - virDomainObjPtr vm = driver->domains.objs[i]; - qemudDomainStatusPtr status = NULL; - char *config = NULL; - int rc; - - virDomainObjLock(vm); - if ((rc = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) - DEBUG("Found pid %d for '%s'", vm->pid, vm->def->name); - else - goto next; - - if ((config = virDomainConfigFile(NULL, - driver->stateDir, - vm->def->name)) == NULL) { - VIR_ERROR(_("Failed to read domain status for %s\n"), - vm->def->name); - goto next_error; - } - - status = qemudDomainStatusParseFile(NULL, driver->caps, config, 0); - if (status) { - vm->newDef = vm->def; - vm->def = status->def; - } else { - VIR_ERROR(_("Failed to parse domain status for %s\n"), - vm->def->name); - goto next_error; - } - - if ((rc = qemudOpenMonitor(NULL, driver, vm, status->monitorpath, 1)) != 0) { - VIR_ERROR(_("Failed to reconnect monitor for %s: %d\n"), - vm->def->name, rc); - goto next_error; - } - - if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0) - goto next_error; - - if (vm->def->id >= driver->nextvmid) - driver->nextvmid = vm->def->id + 1; - - vm->state = status->state; - goto next; - -next_error: - /* we failed to reconnect the vm so remove it's traces */ - vm->def->id = -1; - qemudRemoveDomainStatus(NULL, driver, vm); - /* Restore orignal def, if we'd loaded a live one */ - if (vm->newDef) { - virDomainDefFree(vm->def); - vm->def = vm->newDef; - vm->newDef = NULL; - } -next: - virDomainObjUnlock(vm); - if (status) - VIR_FREE(status->monitorpath); - VIR_FREE(status); - VIR_FREE(config); - } - return 0; + virDomainObjPtr obj = driver->domains.objs[i]; + + virDomainObjLock(obj); + if (qemuReconnectDomain(driver, obj) < 0) { + /* If we can't get the monitor back, then kill the VM + * so user has ability to start it again later without + * danger of ending up running twice */ + qemudShutdownVMDaemon(NULL, driver, obj); + } + virDomainObjUnlock(obj); + } } static int @@ -513,14 +501,25 @@ qemudStartup(void) { goto error; } + /* Get all the running persistent or transient configs first */ + if (virDomainLoadAllConfigs(NULL, + qemu_driver->caps, + &qemu_driver->domains, + qemu_driver->stateDir, + NULL, + 1, NULL, NULL) < 0) + goto error; + + qemuReconnectDomains(qemu_driver); + + /* Then inactive persistent configs */ if (virDomainLoadAllConfigs(NULL, qemu_driver->caps, &qemu_driver->domains, qemu_driver->configDir, qemu_driver->autostartDir, - NULL, NULL) < 0) - goto error; - qemudReconnectVMs(qemu_driver); + 0, NULL, NULL) < 0) + goto error; qemuDriverUnlock(qemu_driver); qemudAutostartConfigs(qemu_driver); @@ -569,7 +568,7 @@ qemudReload(void) { &qemu_driver->domains, qemu_driver->configDir, qemu_driver->autostartDir, - qemudNotifyLoadDomain, qemu_driver); + 0, qemudNotifyLoadDomain, qemu_driver); qemuDriverUnlock(qemu_driver); qemudAutostartConfigs(qemu_driver); @@ -1331,6 +1330,7 @@ static int qemudStartVMDaemon(virConnect int pos = -1; char ebuf[1024]; char *pidfile = NULL; + int logfile; struct gemudHookData hookData; hookData.conn = conn; @@ -1372,7 +1372,7 @@ static int qemudStartVMDaemon(virConnect goto cleanup; } - if((vm->logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) + if ((logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) goto cleanup; emulator = vm->def->emulator; @@ -1421,29 +1421,29 @@ static int qemudStartVMDaemon(virConnect tmp = progenv; while (*tmp) { - if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) VIR_WARN(_("Unable to write envv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if (safewrite(vm->logfile, " ", 1) < 0) + if (safewrite(logfile, " ", 1) < 0) VIR_WARN(_("Unable to write envv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { - if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if (safewrite(vm->logfile, " ", 1) < 0) + if (safewrite(logfile, " ", 1) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } - if (safewrite(vm->logfile, "\n", 1) < 0) + if (safewrite(logfile, "\n", 1) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if ((pos = lseek(vm->logfile, 0, SEEK_END)) < 0) + if ((pos = lseek(logfile, 0, SEEK_END)) < 0) VIR_WARN(_("Unable to seek to end of logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); @@ -1451,7 +1451,7 @@ static int qemudStartVMDaemon(virConnect FD_SET(tapfds[i], &keepfd); ret = virExecDaemonize(conn, argv, progenv, &keepfd, &child, - stdin_fd, &vm->logfile, &vm->logfile, + stdin_fd, &logfile, &logfile, VIR_EXEC_NONBLOCK, qemudSecurityHook, &hookData, pidfile); @@ -1501,7 +1501,7 @@ static int qemudStartVMDaemon(virConnect (qemudInitCpus(conn, vm, migrateFrom) < 0) || (qemudInitPasswords(conn, driver, vm) < 0) || (qemudDomainSetMemoryBalloon(conn, vm, vm->def->memory) < 0) || - (qemudSaveDomainStatus(conn, qemu_driver, vm) < 0)) { + (virDomainSaveStatus(conn, driver->stateDir, vm) < 0)) { qemudShutdownVMDaemon(conn, driver, vm); ret = -1; /* No need for 'goto cleanup' now since qemudShutdownVMDaemon does enough */ @@ -1519,10 +1519,8 @@ cleanup: vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->data.vnc.autoport) vm->def->graphics[0]->data.vnc.port = -1; - if (vm->logfile != -1) { - close(vm->logfile); - vm->logfile = -1; - } + if (logfile != -1) + close(logfile); vm->def->id = -1; return -1; } @@ -1549,14 +1547,8 @@ static void qemudShutdownVMDaemon(virCon vm->monitorWatch = -1; } - if (close(vm->logfile) < 0) { - char ebuf[1024]; - VIR_WARN(_("Unable to close logfile: %s\n"), - virStrerror(errno, ebuf, sizeof ebuf)); - } if (vm->monitor != -1) close(vm->monitor); - vm->logfile = -1; vm->monitor = -1; /* shut it off for sure */ @@ -2260,7 +2252,7 @@ static int qemudDomainSuspend(virDomainP VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_FREE(info); } - if (qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) goto cleanup; ret = 0; @@ -2310,7 +2302,7 @@ static int qemudDomainResume(virDomainPt VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_FREE(info); } - if (qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) goto cleanup; ret = 0; @@ -4192,7 +4184,7 @@ static int qemudDomainAttachDevice(virDo goto cleanup; } - if (!ret && qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (!ret && virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) ret = -1; cleanup: @@ -4314,7 +4306,7 @@ static int qemudDomainDetachDevice(virDo qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", _("only SCSI or virtio disk device can be detached dynamically")); - if (!ret && qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (!ret && virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) ret = -1; cleanup: diff --git a/src/security.h b/src/security.h --- a/src/security.h +++ b/src/security.h @@ -38,6 +38,8 @@ typedef int (*virSecurityDomainSetImageL virDomainDiskDefPtr disk); typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn, virDomainObjPtr sec); +typedef int (*virSecurityDomainReserveLabel) (virConnectPtr conn, + virDomainObjPtr sec); typedef int (*virSecurityDomainGetLabel) (virConnectPtr conn, virDomainObjPtr vm, virSecurityLabelPtr sec); @@ -57,6 +59,7 @@ struct _virSecurityDriver { virSecurityDomainRestoreImageLabel domainRestoreSecurityImageLabel; virSecurityDomainSetImageLabel domainSetSecurityImageLabel; virSecurityDomainGenLabel domainGenSecurityLabel; + virSecurityDomainReserveLabel domainReserveSecurityLabel; virSecurityDomainGetLabel domainGetSecurityLabel; virSecurityDomainSetLabel domainSetSecurityLabel; virSecurityDomainRestoreLabel domainRestoreSecurityLabel; diff --git a/src/security_selinux.c b/src/security_selinux.c --- a/src/security_selinux.c +++ b/src/security_selinux.c @@ -216,6 +216,44 @@ done: } static int +SELinuxReserveSecurityLabel(virConnectPtr conn, + virDomainObjPtr vm) +{ + security_context_t pctx; + context_t ctx = NULL; + const char *mcs; + + if (getpidcon(vm->pid, &pctx) == -1) { + char ebuf[1024]; + virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: error calling " + "getpidcon(): %s"), __func__, + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + ctx = context_new(pctx); + VIR_FREE(pctx); + if (!ctx) + goto err; + + mcs = context_range_get(ctx); + if (!mcs) + goto err; + + mcsAdd(mcs); + + context_free(ctx); + + return 0; + +err: + context_free(ctx); + return -1; +} + + + +static int SELinuxSecurityDriverProbe(void) { return is_selinux_enabled() ? SECURITY_DRIVER_ENABLE : SECURITY_DRIVER_DISABLE; @@ -422,6 +460,7 @@ virSecurityDriver virSELinuxSecurityDriv .domainSetSecurityImageLabel = SELinuxSetSecurityImageLabel, .domainRestoreSecurityImageLabel = SELinuxRestoreSecurityImageLabel, .domainGenSecurityLabel = SELinuxGenSecurityLabel, + .domainReserveSecurityLabel = SELinuxReserveSecurityLabel, .domainGetSecurityLabel = SELinuxGetSecurityLabel, .domainRestoreSecurityLabel = SELinuxRestoreSecurityLabel, .domainSetSecurityLabel = SELinuxSetSecurityLabel, diff --git a/src/uml_driver.c b/src/uml_driver.c --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -399,7 +399,7 @@ umlStartup(void) { &uml_driver->domains, uml_driver->configDir, uml_driver->autostartDir, - NULL, NULL) < 0) + 0, NULL, NULL) < 0) goto error; umlAutostartConfigs(uml_driver); @@ -438,7 +438,7 @@ umlReload(void) { &uml_driver->domains, uml_driver->configDir, uml_driver->autostartDir, - NULL, NULL); + 0, NULL, NULL); umlAutostartConfigs(uml_driver); umlDriverUnlock(uml_driver); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 3

[libvirt] PATCH: Include OS driver name in device information
by Daniel P. Berrange 03 Jun '09

03 Jun '09

This patch extends the node device XML from $ virsh nodedev-dumpxml pci_8086_27d6 <device> <name>pci_8086_27d6</name> <parent>computer</parent> <capability type='pci'> <domain>0</domain> <bus>0</bus> <slot>28</slot> <function>3</function> <product id='0x27d6'>82801G (ICH7 Family) PCI Express Port 4</product> <vendor id='0x8086'>Intel Corporation</vendor> </capability> </device> To, also include the operating system driver name. $ virsh nodedev-dumpxml pci_8086_27d6 <device> <name>pci_8086_27d6</name> <parent>computer</parent> <driver> <name>pcieport-driver</name> </driver> <capability type='pci'> <domain>0</domain> <bus>0</bus> <slot>28</slot> <function>3</function> <product id='0x27d6'>82801G (ICH7 Family) PCI Express Port 4</product> <vendor id='0x8086'>Intel Corporation</vendor> </capability> </device> We're not defining any particular semantics for the driver name, it is just a opaque string following rules of the OS in question. Daniel diff -r ec78a5d6c00c src/node_device.c --- a/src/node_device.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device.c Thu May 28 16:00:12 2009 +0100 @@ -46,6 +46,60 @@ static int dev_has_cap(const virNodeDevi return 0; } +#ifdef __linux__ +static int update_driver_name(virConnectPtr conn, + virNodeDeviceObjPtr dev) +{ + char *driver_link = NULL; + char devpath[PATH_MAX]; + char *p; + int ret = -1; + int n; + + VIR_FREE(dev->def->driver); + + if (virAsprintf(&driver_link, "%s/driver", dev->devicePath) < 0) { + virReportOOMError(conn); + goto cleanup; + } + + /* Some devices don't have an explicit driver, so just return + without a name */ + if (access(driver_link, R_OK) < 0) { + ret = 0; + goto cleanup; + } + + if ((n = readlink(driver_link, devpath, sizeof devpath)) < 0) { + virReportSystemError(conn, errno, + _("cannot resolve driver link %s"), driver_link); + goto cleanup; + } + devpath[n] = '\0'; + + p = strrchr(devpath, '/'); + if (p) { + dev->def->driver = strdup(p+1); + if (!dev->def->driver) { + virReportOOMError(conn); + goto cleanup; + } + } + ret = 0; + +cleanup: + VIR_FREE(driver_link); + return ret; +} +#else +/* XXX: Implement me for non-linux */ +static int update_driver_name(virConnectPtr conn ATTRIBUTE_UNUSED, + virNodeDeviceObjPtr dev ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif + void nodeDeviceLock(virDeviceMonitorStatePtr driver) { @@ -150,6 +204,7 @@ static char *nodeDeviceDumpXML(virNodeDe goto cleanup; } + update_driver_name(dev->conn, obj); ret = virNodeDeviceDefFormat(dev->conn, obj->def); cleanup: diff -r ec78a5d6c00c src/node_device_conf.c --- a/src/node_device_conf.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_conf.c Thu May 28 16:00:12 2009 +0100 @@ -78,6 +78,7 @@ void virNodeDeviceDefFree(virNodeDeviceD VIR_FREE(def->name); VIR_FREE(def->parent); + VIR_FREE(def->driver); caps = def->caps; while (caps) { @@ -94,6 +95,7 @@ void virNodeDeviceObjFree(virNodeDeviceO if (!dev) return; + VIR_FREE(dev->devicePath); virNodeDeviceDefFree(dev->def); if (dev->privateFree) (*dev->privateFree)(dev->privateData); @@ -191,6 +193,11 @@ char *virNodeDeviceDefFormat(virConnectP if (def->parent) virBufferEscapeString(&buf, " <parent>%s</parent>\n", def->parent); + if (def->driver) { + virBufferAddLit(&buf, " <driver>\n"); + virBufferEscapeString(&buf, " <name>%s</name>\n", def->driver); + virBufferAddLit(&buf, " </driver>\n"); + } for (caps = def->caps; caps; caps = caps->next) { char uuidstr[VIR_UUID_STRING_BUFLEN]; diff -r ec78a5d6c00c src/node_device_conf.h --- a/src/node_device_conf.h Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_conf.h Thu May 28 16:00:12 2009 +0100 @@ -136,6 +136,7 @@ typedef virNodeDeviceDef *virNodeDeviceD struct _virNodeDeviceDef { char *name; /* device name (unique on node) */ char *parent; /* optional parent device name */ + char *driver; /* optional driver name */ virNodeDevCapsDefPtr caps; /* optional device capabilities */ }; @@ -145,6 +146,7 @@ typedef virNodeDeviceObj *virNodeDeviceO struct _virNodeDeviceObj { virMutex lock; + char *devicePath; /* OS specific path to device metadat, eg sysfs */ virNodeDeviceDefPtr def; /* device definition */ void *privateData; /* driver-specific private data */ void (*privateFree)(void *data); /* destructor for private data */ diff -r ec78a5d6c00c src/node_device_hal.c --- a/src/node_device_hal.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_hal.c Thu May 28 16:00:12 2009 +0100 @@ -413,6 +413,7 @@ static void dev_create(const char *udi) const char *name = hal_name(udi); int rv; char *privData = strdup(udi); + char *devicePath = NULL; if (!privData) return; @@ -439,15 +440,22 @@ static void dev_create(const char *udi) if (def->caps == NULL) goto cleanup; + /* Some devices don't have a path in sysfs, so ignore failure */ + get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); - if (!dev) + if (!dev) { + VIR_FREE(devicePath); goto failure; + } dev->privateData = privData; dev->privateFree = free_udi; + dev->devicePath = devicePath; + virNodeDeviceObjUnlock(dev); nodeDeviceUnlock(driverState); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] PATCH Fix BuildRequires in spec file
by Trent Johnson 01 Jun '09

01 Jun '09

Fixes error from rpmbuild RPM build errors: File not found: /var/tmp/libvirt-0.6.3-1.el5-root/usr/libexec/libvirt_parthelper diff -u -r libvirt.spec.orig libvirt.spec --- libvirt.spec.orig 2009-04-24 08:58:29.000000000 -0500 +++ libvirt.spec 2009-05-29 09:57:56.000000000 -0500 @@ -59,7 +59,7 @@ Source: libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -BuildRequires: python python-devel +BuildRequires: python python-devel e2fsprogs-devel Requires: libxml2 Requires: readline Requires: ncurses

2 4

[libvirt] PATCH: Fix mingw32 build
by Daniel P. Berrange 29 May '09

29 May '09

On Win32/mingw32 the name 'interface' is #defined to the COM_interface struct. Needless to say, libvirt thus fails to build in spectacular ways. This patch does s/interface/iface/ on all variables. It also fixes bugs in the qemud/Makefile.am and tests/testutils.h files include/libvirt/libvirt.h | 18 +++--- include/libvirt/libvirt.h.in | 18 +++--- qemud/Makefile.am | 6 +- qemud/remote.c | 82 ++++++++++++++--------------- qemud/remote_protocol.c | 14 ++--- qemud/remote_protocol.h | 14 ++--- qemud/remote_protocol.x | 14 ++--- src/datatypes.c | 36 ++++++------ src/datatypes.h | 2 src/driver.h | 8 +- src/libvirt.c | 120 +++++++++++++++++++++---------------------- src/remote_internal.c | 56 ++++++++++---------- tests/testutils.c | 10 +++ 13 files changed, 206 insertions(+), 192 deletions(-) Daniel Index: include/libvirt/libvirt.h =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/libvirt.h,v retrieving revision 1.105 diff -u -p -r1.105 libvirt.h --- include/libvirt/libvirt.h 21 May 2009 13:46:36 -0000 1.105 +++ include/libvirt/libvirt.h 28 May 2009 16:32:53 -0000 @@ -883,7 +883,7 @@ typedef struct _virInterface virInterfac */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr interface); +virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); int virConnectNumOfInterfaces (virConnectPtr conn); int virConnectListInterfaces (virConnectPtr conn, @@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLook virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char *mac); -const char* virInterfaceGetName (virInterfacePtr interface); -const char* virInterfaceGetMACString (virInterfacePtr interface); +const char* virInterfaceGetName (virInterfacePtr iface); +const char* virInterfaceGetMACString (virInterfacePtr iface); -char * virInterfaceGetXMLDesc (virInterfacePtr interface, +char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); -int virInterfaceUndefine (virInterfacePtr interface); +int virInterfaceUndefine (virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr interface, +int virInterfaceCreate (virInterfacePtr iface, unsigned int flags); -int virInterfaceDestroy (virInterfacePtr interface, +int virInterfaceDestroy (virInterfacePtr iface, unsigned int flags); -int virInterfaceRef (virInterfacePtr interface); -int virInterfaceFree (virInterfacePtr interface); +int virInterfaceRef (virInterfacePtr iface); +int virInterfaceFree (virInterfacePtr iface); /** * virStoragePool: Index: include/libvirt/libvirt.h.in =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/libvirt.h.in,v retrieving revision 1.70 diff -u -p -r1.70 libvirt.h.in --- include/libvirt/libvirt.h.in 21 May 2009 13:46:36 -0000 1.70 +++ include/libvirt/libvirt.h.in 28 May 2009 16:32:53 -0000 @@ -883,7 +883,7 @@ typedef struct _virInterface virInterfac */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr interface); +virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); int virConnectNumOfInterfaces (virConnectPtr conn); int virConnectListInterfaces (virConnectPtr conn, @@ -895,25 +895,25 @@ virInterfacePtr virInterfaceLook virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, const char *mac); -const char* virInterfaceGetName (virInterfacePtr interface); -const char* virInterfaceGetMACString (virInterfacePtr interface); +const char* virInterfaceGetName (virInterfacePtr iface); +const char* virInterfaceGetMACString (virInterfacePtr iface); -char * virInterfaceGetXMLDesc (virInterfacePtr interface, +char * virInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags); virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); -int virInterfaceUndefine (virInterfacePtr interface); +int virInterfaceUndefine (virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr interface, +int virInterfaceCreate (virInterfacePtr iface, unsigned int flags); -int virInterfaceDestroy (virInterfacePtr interface, +int virInterfaceDestroy (virInterfacePtr iface, unsigned int flags); -int virInterfaceRef (virInterfacePtr interface); -int virInterfaceFree (virInterfacePtr interface); +int virInterfaceRef (virInterfacePtr iface); +int virInterfaceFree (virInterfacePtr iface); /** * virStoragePool: Index: qemud/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/qemud/Makefile.am,v retrieving revision 1.78 diff -u -p -r1.78 Makefile.am --- qemud/Makefile.am 25 May 2009 11:56:00 -0000 1.78 +++ qemud/Makefile.am 28 May 2009 16:32:53 -0000 @@ -31,7 +31,7 @@ EXTRA_DIST = \ $(AVAHI_SOURCES) \ $(DAEMON_SOURCES) -BUILT_SOURCES = libvirtd.init libvirtd.logrotate +BUILT_SOURCES = if HAVE_RPCGEN # @@ -218,6 +218,8 @@ remote_dispatch_args.h: $(srcdir)/remote remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@ +BUILT_SOURCES += libvirtd.logrotate + libvirtd.logrotate: libvirtd.logrotate.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ @@ -242,6 +244,8 @@ uninstall-init: rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd +BUILT_SOURCES += libvirtd.init + libvirtd.init: libvirtd.init.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ Index: qemud/remote.c =================================================================== RCS file: /data/cvs/libvirt/qemud/remote.c,v retrieving revision 1.71 diff -u -p -r1.71 remote.c --- qemud/remote.c 21 May 2009 13:50:56 -0000 1.71 +++ qemud/remote.c 28 May 2009 16:32:54 -0000 @@ -2664,16 +2664,16 @@ remoteDispatchInterfaceLookupByName (str remote_interface_lookup_by_name_args *args, remote_interface_lookup_by_name_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceLookupByName (conn, args->name); - if (interface == NULL) { + iface = virInterfaceLookupByName (conn, args->name); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2685,16 +2685,16 @@ remoteDispatchInterfaceLookupByMacString remote_interface_lookup_by_mac_string_args *args, remote_interface_lookup_by_mac_string_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceLookupByMACString (conn, args->mac); - if (interface == NULL) { + iface = virInterfaceLookupByMACString (conn, args->mac); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2706,22 +2706,22 @@ remoteDispatchInterfaceGetXmlDesc (struc remote_interface_get_xml_desc_args *args, remote_interface_get_xml_desc_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } /* remoteDispatchClientRequest will free this. */ - ret->xml = virInterfaceGetXMLDesc (interface, args->flags); + ret->xml = virInterfaceGetXMLDesc (iface, args->flags); if (!ret->xml) { - virInterfaceFree(interface); + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2733,16 +2733,16 @@ remoteDispatchInterfaceDefineXml (struct remote_interface_define_xml_args *args, remote_interface_define_xml_ret *ret) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = virInterfaceDefineXML (conn, args->xml, args->flags); - if (interface == NULL) { + iface = virInterfaceDefineXML (conn, args->xml, args->flags); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - make_nonnull_interface (&ret->interface, interface); - virInterfaceFree(interface); + make_nonnull_interface (&ret->iface, iface); + virInterfaceFree(iface); return 0; } @@ -2754,20 +2754,20 @@ remoteDispatchInterfaceUndefine (struct remote_interface_undefine_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceUndefine (interface) == -1) { - virInterfaceFree(interface); + if (virInterfaceUndefine (iface) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2779,20 +2779,20 @@ remoteDispatchInterfaceCreate (struct qe remote_interface_create_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceCreate (interface, args->flags) == -1) { - virInterfaceFree(interface); + if (virInterfaceCreate (iface, args->flags) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -2804,20 +2804,20 @@ remoteDispatchInterfaceDestroy (struct q remote_interface_destroy_args *args, void *ret ATTRIBUTE_UNUSED) { - virInterfacePtr interface; + virInterfacePtr iface; - interface = get_nonnull_interface (conn, args->interface); - if (interface == NULL) { + iface = get_nonnull_interface (conn, args->iface); + if (iface == NULL) { remoteDispatchConnError(rerr, conn); return -1; } - if (virInterfaceDestroy (interface, args->flags) == -1) { - virInterfaceFree(interface); + if (virInterfaceDestroy (iface, args->flags) == -1) { + virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); return -1; } - virInterfaceFree(interface); + virInterfaceFree(iface); return 0; } @@ -4823,9 +4823,9 @@ get_nonnull_network (virConnectPtr conn, } static virInterfacePtr -get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface) +get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface) { - return virGetInterface (conn, interface.name, interface.mac); + return virGetInterface (conn, iface.name, iface.mac); } static virStoragePoolPtr Index: qemud/remote_protocol.c =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.c,v retrieving revision 1.34 diff -u -p -r1.34 remote_protocol.c --- qemud/remote_protocol.c 21 May 2009 13:50:56 -0000 1.34 +++ qemud/remote_protocol.c 28 May 2009 16:32:54 -0000 @@ -1530,7 +1530,7 @@ bool_t xdr_remote_interface_lookup_by_name_ret (XDR *xdrs, remote_interface_lookup_by_name_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1548,7 +1548,7 @@ bool_t xdr_remote_interface_lookup_by_mac_string_ret (XDR *xdrs, remote_interface_lookup_by_mac_string_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1557,7 +1557,7 @@ bool_t xdr_remote_interface_get_xml_desc_args (XDR *xdrs, remote_interface_get_xml_desc_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; @@ -1588,7 +1588,7 @@ bool_t xdr_remote_interface_define_xml_ret (XDR *xdrs, remote_interface_define_xml_ret *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1597,7 +1597,7 @@ bool_t xdr_remote_interface_undefine_args (XDR *xdrs, remote_interface_undefine_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; return TRUE; } @@ -1606,7 +1606,7 @@ bool_t xdr_remote_interface_create_args (XDR *xdrs, remote_interface_create_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; @@ -1617,7 +1617,7 @@ bool_t xdr_remote_interface_destroy_args (XDR *xdrs, remote_interface_destroy_args *objp) { - if (!xdr_remote_nonnull_interface (xdrs, &objp->interface)) + if (!xdr_remote_nonnull_interface (xdrs, &objp->iface)) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; Index: qemud/remote_protocol.h =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.h,v retrieving revision 1.33 diff -u -p -r1.33 remote_protocol.h --- qemud/remote_protocol.h 21 May 2009 13:50:56 -0000 1.33 +++ qemud/remote_protocol.h 28 May 2009 16:32:54 -0000 @@ -853,7 +853,7 @@ struct remote_interface_lookup_by_name_a typedef struct remote_interface_lookup_by_name_args remote_interface_lookup_by_name_args; struct remote_interface_lookup_by_name_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_lookup_by_name_ret remote_interface_lookup_by_name_ret; @@ -863,12 +863,12 @@ struct remote_interface_lookup_by_mac_st typedef struct remote_interface_lookup_by_mac_string_args remote_interface_lookup_by_mac_string_args; struct remote_interface_lookup_by_mac_string_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_lookup_by_mac_string_ret remote_interface_lookup_by_mac_string_ret; struct remote_interface_get_xml_desc_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_get_xml_desc_args remote_interface_get_xml_desc_args; @@ -885,23 +885,23 @@ struct remote_interface_define_xml_args typedef struct remote_interface_define_xml_args remote_interface_define_xml_args; struct remote_interface_define_xml_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_define_xml_ret remote_interface_define_xml_ret; struct remote_interface_undefine_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; typedef struct remote_interface_undefine_args remote_interface_undefine_args; struct remote_interface_create_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_create_args remote_interface_create_args; struct remote_interface_destroy_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; u_int flags; }; typedef struct remote_interface_destroy_args remote_interface_destroy_args; Index: qemud/remote_protocol.x =================================================================== RCS file: /data/cvs/libvirt/qemud/remote_protocol.x,v retrieving revision 1.32 diff -u -p -r1.32 remote_protocol.x --- qemud/remote_protocol.x 21 May 2009 13:50:56 -0000 1.32 +++ qemud/remote_protocol.x 28 May 2009 16:32:54 -0000 @@ -798,7 +798,7 @@ struct remote_interface_lookup_by_name_a }; struct remote_interface_lookup_by_name_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_lookup_by_mac_string_args { @@ -806,11 +806,11 @@ struct remote_interface_lookup_by_mac_st }; struct remote_interface_lookup_by_mac_string_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_get_xml_desc_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; @@ -824,20 +824,20 @@ struct remote_interface_define_xml_args }; struct remote_interface_define_xml_ret { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_undefine_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; }; struct remote_interface_create_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; struct remote_interface_destroy_args { - remote_nonnull_interface interface; + remote_nonnull_interface iface; unsigned int flags; }; Index: src/datatypes.c =================================================================== RCS file: /data/cvs/libvirt/src/datatypes.c,v retrieving revision 1.12 diff -u -p -r1.12 datatypes.c --- src/datatypes.c 20 May 2009 14:26:50 -0000 1.12 +++ src/datatypes.c 28 May 2009 16:32:54 -0000 @@ -75,9 +75,9 @@ virNetworkFreeName(virNetworkPtr network * Returns 0 in case of success and -1 in case of failure. */ static int -virInterfaceFreeName(virInterfacePtr interface, const char *name ATTRIBUTE_UNUSED) +virInterfaceFreeName(virInterfacePtr iface, const char *name ATTRIBUTE_UNUSED) { - return (virUnrefInterface(interface)); + return (virUnrefInterface(iface)); } /** @@ -589,19 +589,19 @@ virGetInterface(virConnectPtr conn, cons * which may also be released if its ref count hits zero. */ static void -virReleaseInterface(virInterfacePtr interface) { - virConnectPtr conn = interface->conn; - DEBUG("release interface %p %s", interface, interface->name); +virReleaseInterface(virInterfacePtr iface) { + virConnectPtr conn = iface->conn; + DEBUG("release interface %p %s", iface, iface->name); /* TODO search by MAC first as they are better differenciators */ - if (virHashRemoveEntry(conn->interfaces, interface->name, NULL) < 0) + if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("interface missing from connection hash table")); - interface->magic = -1; - VIR_FREE(interface->name); - VIR_FREE(interface->mac); - VIR_FREE(interface); + iface->magic = -1; + VIR_FREE(iface->name); + VIR_FREE(iface->mac); + VIR_FREE(iface); DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; @@ -625,24 +625,24 @@ virReleaseInterface(virInterfacePtr inte * Returns the reference count or -1 in case of failure. */ int -virUnrefInterface(virInterfacePtr interface) { +virUnrefInterface(virInterfacePtr iface) { int refs; - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } - virMutexLock(&interface->conn->lock); - DEBUG("unref interface %p %s %d", interface, interface->name, interface->refs); - interface->refs--; - refs = interface->refs; + virMutexLock(&iface->conn->lock); + DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs); + iface->refs--; + refs = iface->refs; if (refs == 0) { - virReleaseInterface(interface); + virReleaseInterface(iface); /* Already unlocked mutex */ return (0); } - virMutexUnlock(&interface->conn->lock); + virMutexUnlock(&iface->conn->lock); return (refs); } Index: src/datatypes.h =================================================================== RCS file: /data/cvs/libvirt/src/datatypes.h,v retrieving revision 1.8 diff -u -p -r1.8 datatypes.h --- src/datatypes.h 20 May 2009 14:26:50 -0000 1.8 +++ src/datatypes.h 28 May 2009 16:32:54 -0000 @@ -254,7 +254,7 @@ int virUnrefNetwork(virNetworkPtr networ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac); -int virUnrefInterface(virInterfacePtr interface); +int virUnrefInterface(virInterfacePtr iface); virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, Index: src/driver.h =================================================================== RCS file: /data/cvs/libvirt/src/driver.h,v retrieving revision 1.75 diff -u -p -r1.75 driver.h --- src/driver.h 25 May 2009 11:56:00 -0000 1.75 +++ src/driver.h 28 May 2009 16:32:54 -0000 @@ -516,7 +516,7 @@ typedef virInterfacePtr const char *mac); typedef char * - (*virDrvInterfaceGetXMLDesc) (virInterfacePtr interface, + (*virDrvInterfaceGetXMLDesc) (virInterfacePtr iface, unsigned int flags); typedef virInterfacePtr @@ -524,12 +524,12 @@ typedef virInterfacePtr const char *xmlDesc, unsigned int flags); typedef int - (*virDrvInterfaceUndefine) (virInterfacePtr interface); + (*virDrvInterfaceUndefine) (virInterfacePtr iface); typedef int - (*virDrvInterfaceCreate) (virInterfacePtr interface, + (*virDrvInterfaceCreate) (virInterfacePtr iface, unsigned int flags); typedef int - (*virDrvInterfaceDestroy) (virInterfacePtr interface, + (*virDrvInterfaceDestroy) (virInterfacePtr iface, unsigned int flags); typedef struct _virInterfaceDriver virInterfaceDriver; Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.211 diff -u -p -r1.211 libvirt.c --- src/libvirt.c 25 May 2009 11:56:00 -0000 1.211 +++ src/libvirt.c 28 May 2009 16:32:54 -0000 @@ -472,7 +472,7 @@ virLibNetworkError(virNetworkPtr network * Handle an error at the connection level */ static void -virLibInterfaceError(virInterfacePtr interface, virErrorNumber error, +virLibInterfaceError(virInterfacePtr iface, virErrorNumber error, const char *info) { virConnectPtr conn = NULL; @@ -483,7 +483,7 @@ virLibInterfaceError(virInterfacePtr int errmsg = virErrorMsg(error, info); if (error != VIR_ERR_INVALID_INTERFACE) { - conn = interface->conn; + conn = iface->conn; } virRaiseError(conn, NULL, NULL, VIR_FROM_INTERFACE, error, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0, errmsg, info); @@ -5485,17 +5485,17 @@ error: * Returns the virConnectPtr or NULL in case of failure. */ virConnectPtr -virInterfaceGetConnect (virInterfacePtr interface) +virInterfaceGetConnect (virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE (interface)) { + if (!VIR_IS_CONNECTED_INTERFACE (iface)) { virLibInterfaceError (NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return NULL; } - return interface->conn; + return iface->conn; } /** @@ -5663,7 +5663,7 @@ error: /** * virInterfaceGetName: - * @interface: a interface object + * @iface: a interface object * * Get the public name for that interface * @@ -5671,22 +5671,22 @@ error: * its lifetime will be the same as the interface object. */ const char * -virInterfaceGetName(virInterfacePtr interface) +virInterfaceGetName(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_INTERFACE(interface)) { + if (!VIR_IS_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - return (interface->name); + return (iface->name); } /** * virInterfaceGetMACString: - * @interface: a interface object + * @iface: a interface object * * Get the MAC for a interface as string. For more information about * MAC see RFC4122. @@ -5696,22 +5696,22 @@ virInterfaceGetName(virInterfacePtr inte * will be the same as the interface object. */ const char * -virInterfaceGetMACString(virInterfacePtr interface) +virInterfaceGetMACString(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_INTERFACE(interface)) { + if (!VIR_IS_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } - return (interface->mac); + return (iface->mac); } /** * virInterfaceGetXMLDesc: - * @interface: a interface object + * @iface: a interface object * @flags: and OR'ed set of extraction flags, not used yet * * Provide an XML description of the interface. The description may be reused @@ -5721,27 +5721,27 @@ virInterfaceGetMACString(virInterfacePtr * the caller must free() the returned value. */ char * -virInterfaceGetXMLDesc(virInterfacePtr interface, unsigned int flags) +virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (NULL); } if (flags != 0) { - virLibInterfaceError(interface, VIR_ERR_INVALID_ARG, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - conn = interface->conn; + conn = iface->conn; if (conn->interfaceDriver && conn->interfaceDriver->interfaceGetXMLDesc) { char *ret; - ret = conn->interfaceDriver->interfaceGetXMLDesc (interface, flags); + ret = conn->interfaceDriver->interfaceGetXMLDesc (iface, flags); if (!ret) goto error; return ret; @@ -5751,7 +5751,7 @@ virInterfaceGetXMLDesc(virInterfacePtr i error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return NULL; } @@ -5803,7 +5803,7 @@ error: /** * virInterfaceUndefine: - * @interface: pointer to a defined interface + * @iface: pointer to a defined interface * * Undefine an interface, ie remove it from the config. * This does not free the associated virInterfacePtr object. @@ -5811,25 +5811,25 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceUndefine(virInterfacePtr interface) { +virInterfaceUndefine(virInterfacePtr iface) { virConnectPtr conn; - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceUndefine) { int ret; - ret = conn->interfaceDriver->interfaceUndefine (interface); + ret = conn->interfaceDriver->interfaceUndefine (iface); if (ret < 0) goto error; return ret; @@ -5839,13 +5839,13 @@ virInterfaceUndefine(virInterfacePtr int error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceCreate: - * @interface: pointer to a defined interface + * @iface: pointer to a defined interface * @flags: and OR'ed set of extraction flags, not used yet * * Activate an interface (ie call "ifup") @@ -5853,26 +5853,26 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceCreate(virInterfacePtr interface, unsigned int flags) +virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceCreate) { int ret; - ret = conn->interfaceDriver->interfaceCreate (interface, flags); + ret = conn->interfaceDriver->interfaceCreate (iface, flags); if (ret < 0) goto error; return ret; @@ -5882,13 +5882,13 @@ virInterfaceCreate(virInterfacePtr inter error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceDestroy: - * @interface: an interface object + * @iface: an interface object * @flags: and OR'ed set of extraction flags, not used yet * * deactivate an interface (ie call "ifdown") @@ -5898,27 +5898,27 @@ error: * Returns 0 in case of success and -1 in case of failure. */ int -virInterfaceDestroy(virInterfacePtr interface, unsigned int flags) +virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("interface=%p, flags=%d", interface, flags); + DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - conn = interface->conn; + conn = iface->conn; if (conn->flags & VIR_CONNECT_RO) { - virLibInterfaceError(interface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + virLibInterfaceError(iface, VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; } if (conn->interfaceDriver && conn->interfaceDriver->interfaceDestroy) { int ret; - ret = conn->interfaceDriver->interfaceDestroy (interface, flags); + ret = conn->interfaceDriver->interfaceDestroy (iface, flags); if (ret < 0) goto error; return ret; @@ -5928,13 +5928,13 @@ virInterfaceDestroy(virInterfacePtr inte error: /* Copy to connection error object for back compatability */ - virSetConnError(interface->conn); + virSetConnError(iface->conn); return -1; } /** * virInterfaceRef: - * @interface: the interface to hold a reference on + * @iface: the interface to hold a reference on * * Increment the reference count on the interface. For each * additional call to this method, there shall be a corresponding @@ -5950,22 +5950,22 @@ error: * Returns 0 in case of success, -1 in case of failure. */ int -virInterfaceRef(virInterfacePtr interface) +virInterfaceRef(virInterfacePtr iface) { - if ((!VIR_IS_CONNECTED_INTERFACE(interface))) { + if ((!VIR_IS_CONNECTED_INTERFACE(iface))) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } - virMutexLock(&interface->conn->lock); - DEBUG("interface=%p refs=%d", interface, interface->refs); - interface->refs++; - virMutexUnlock(&interface->conn->lock); + virMutexLock(&iface->conn->lock); + DEBUG("iface=%p refs=%d", iface, iface->refs); + iface->refs++; + virMutexUnlock(&iface->conn->lock); return 0; } /** * virInterfaceFree: - * @interface: a interface object + * @iface: a interface object * * Free the interface object. The interface itself is unaltered. * The data structure is freed and should not be used thereafter. @@ -5973,17 +5973,17 @@ virInterfaceRef(virInterfacePtr interfac * Returns 0 in case of success and -1 in case of failure. */ int -virInterfaceFree(virInterfacePtr interface) +virInterfaceFree(virInterfacePtr iface) { - DEBUG("interface=%p", interface); + DEBUG("iface=%p", iface); virResetLastError(); - if (!VIR_IS_CONNECTED_INTERFACE(interface)) { + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { virLibInterfaceError(NULL, VIR_ERR_INVALID_INTERFACE, __FUNCTION__); return (-1); } - if (virUnrefInterface(interface) < 0) + if (virUnrefInterface(iface) < 0) return (-1); return(0); } Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.153 diff -u -p -r1.153 remote_internal.c --- src/remote_internal.c 21 May 2009 13:50:56 -0000 1.153 +++ src/remote_internal.c 28 May 2009 16:32:54 -0000 @@ -212,7 +212,7 @@ static void errorf (virConnectPtr conn, static void server_error (virConnectPtr conn, remote_error *err); static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); -static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface); +static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface); static virStoragePoolPtr get_nonnull_storage_pool (virConnectPtr conn, remote_nonnull_storage_pool pool); static virStorageVolPtr get_nonnull_storage_vol (virConnectPtr conn, remote_nonnull_storage_vol vol); static virNodeDevicePtr get_nonnull_node_device (virConnectPtr conn, remote_nonnull_node_device dev); @@ -3876,7 +3876,7 @@ static virInterfacePtr remoteInterfaceLookupByName (virConnectPtr conn, const char *name) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_lookup_by_name_args args; remote_interface_lookup_by_name_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3891,19 +3891,19 @@ remoteInterfaceLookupByName (virConnectP (xdrproc_t) xdr_remote_interface_lookup_by_name_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_name_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static virInterfacePtr remoteInterfaceLookupByMACString (virConnectPtr conn, const char *mac) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_lookup_by_mac_string_args args; remote_interface_lookup_by_mac_string_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3918,30 +3918,30 @@ remoteInterfaceLookupByMACString (virCon (xdrproc_t) xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_lookup_by_mac_string_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static char * -remoteInterfaceGetXMLDesc (virInterfacePtr interface, +remoteInterfaceGetXMLDesc (virInterfacePtr iface, unsigned int flags) { char *rv = NULL; remote_interface_get_xml_desc_args args; remote_interface_get_xml_desc_ret ret; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; memset (&ret, 0, sizeof ret); - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_GET_XML_DESC, (xdrproc_t) xdr_remote_interface_get_xml_desc_args, (char *) &args, (xdrproc_t) xdr_remote_interface_get_xml_desc_ret, (char *) &ret) == -1) goto done; @@ -3959,7 +3959,7 @@ remoteInterfaceDefineXML (virConnectPtr const char *xmlDesc, unsigned int flags) { - virInterfacePtr interface = NULL; + virInterfacePtr iface = NULL; remote_interface_define_xml_args args; remote_interface_define_xml_ret ret; struct private_data *priv = conn->interfacePrivateData; @@ -3975,26 +3975,26 @@ remoteInterfaceDefineXML (virConnectPtr (xdrproc_t) xdr_remote_interface_define_xml_ret, (char *) &ret) == -1) goto done; - interface = get_nonnull_interface (conn, ret.interface); + iface = get_nonnull_interface (conn, ret.iface); xdr_free ((xdrproc_t) &xdr_remote_interface_define_xml_ret, (char *) &ret); done: remoteDriverUnlock(priv); - return interface; + return iface; } static int -remoteInterfaceUndefine (virInterfacePtr interface) +remoteInterfaceUndefine (virInterfacePtr iface) { int rv = -1; remote_interface_undefine_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_UNDEFINE, (xdrproc_t) xdr_remote_interface_undefine_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4007,19 +4007,19 @@ done: } static int -remoteInterfaceCreate (virInterfacePtr interface, +remoteInterfaceCreate (virInterfacePtr iface, unsigned int flags) { int rv = -1; remote_interface_create_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_CREATE, (xdrproc_t) xdr_remote_interface_create_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -4032,19 +4032,19 @@ done: } static int -remoteInterfaceDestroy (virInterfacePtr interface, +remoteInterfaceDestroy (virInterfacePtr iface, unsigned int flags) { int rv = -1; remote_interface_destroy_args args; - struct private_data *priv = interface->conn->interfacePrivateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); - make_nonnull_interface (&args.interface, interface); + make_nonnull_interface (&args.iface, iface); args.flags = flags; - if (call (interface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY, + if (call (iface->conn, priv, 0, REMOTE_PROC_INTERFACE_DESTROY, (xdrproc_t) xdr_remote_interface_destroy_args, (char *) &args, (xdrproc_t) xdr_void, (char *) NULL) == -1) goto done; @@ -7256,9 +7256,9 @@ get_nonnull_network (virConnectPtr conn, } static virInterfacePtr -get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface) +get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface) { - return virGetInterface (conn, interface.name, interface.mac); + return virGetInterface (conn, iface.name, iface.mac); } static virStoragePoolPtr Index: tests/testutils.c =================================================================== RCS file: /data/cvs/libvirt/tests/testutils.c,v retrieving revision 1.28 diff -u -p -r1.28 testutils.c --- tests/testutils.c 21 May 2009 14:22:51 -0000 1.28 +++ tests/testutils.c 28 May 2009 16:32:54 -0000 @@ -18,7 +18,9 @@ #ifndef WIN32 #include <sys/wait.h> #endif +#ifdef HAVE_REGEX_H #include <regex.h> +#endif #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -460,6 +462,7 @@ cleanup: } +#ifdef HAVE_REGEX_H int virtTestClearLineRegex(const char *pattern, char *str) { @@ -503,3 +506,10 @@ int virtTestClearLineRegex(const char *p return 0; } +#else +int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED, + char *str ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] [PATCH] virsh: Use consistent spacing for net-list
by Cole Robinson 29 May '09

29 May '09

There is different spacing when listing active vs. inactive networks. Ex: Name State Autostart ----------------------------------------- default active yes xxxxxx inactive no Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index fe4e8e6..e6241e6 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2798,7 +2798,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) else autostartStr = autostart ? "yes" : "no"; - vshPrint(ctl, "%-20s %s %s\n", + vshPrint(ctl, "%-20s %-10s %-10s\n", inactiveNames[i], _("inactive"), autostartStr); -- 1.6.0.6

3 12

[libvirt] libvirt needs to dynamically support kvm-img and/or qemu-img
by Doug Goldstein 29 May '09

29 May '09

Several distros out there install "kvm-img" when they install KVM and do not install "qemu-img". The following patch checks for kvm-img and qemu-img and does the right thing. I've taken it a step further and made the check a run-time check instead of a build-time check since people are able to remove and install KVM, QEMU and Xen components as they please and as such may invalidate the build-time check. The patch prefers "kvm-img" over "qemu-img" over "qcow-create" since there was a comment that libvirt wanted to support a feature of qemu-img that wasn't present in upstream qemu releases, however the feature is present in kvm-img. The patch adds a new util function called "virFindFileInPath()" which merely searches PATH for the actual location of the binary. It might be worth-while to make some of the other build-time tool checks run-time with that function since it would allow users to get more features just by installing new tools and wouldn't require distros to disable features because they don't want libvirt to be too dependency heavy. -- Doug Goldstein

3 4

[libvirt] PATCH: Fix thread safety with HAL driver restart
by Daniel P. Berrange 29 May '09

29 May '09

The restart method of the HAL implementation of node device is not currently threadsafe, because it destroys and creates the entire driver, including its mutexes. This patch changes it to simply throw away all existing devices, and re-load them from dbus. Daniel diff -r 625ffe1918a4 src/node_device_hal.c --- a/src/node_device_hal.c Thu May 21 15:56:27 2009 +0100 +++ b/src/node_device_hal.c Thu May 21 15:56:33 2009 +0100 @@ -785,10 +785,28 @@ static int halDeviceMonitorShutdown(void static int halDeviceMonitorReload(void) { - /* XXX This isn't thread safe because its free'ing the thing - * we're locking */ - (void)halDeviceMonitorShutdown(); - return halDeviceMonitorStartup(); + DBusError err; + char **udi = NULL; + int num_devs, i; + LibHalContext *hal_ctx; + + nodeDeviceLock(driverState); + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + + hal_ctx = DRV_STATE_HAL_CTX(driverState); + udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); + if (udi == NULL) { + fprintf(stderr, "%s: libhal_get_all_devices failed\n", __FUNCTION__); + return -1; + } + for (i = 0; i < num_devs; i++) { + dev_create(udi[i]); + VIR_FREE(udi[i]); + } + VIR_FREE(udi); + + return 0; } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] PATCH: Fix double-free in daemon after client connection drop
by Daniel P. Berrange 29 May '09

29 May '09

If a client drops a connection unexpectedly there is a possiblity of a double free in the daemon if using SASL or TLS. This is because there is possibility for poll() on the socket, returns POLLIN and POLLHUP/ERR at the same time. Both the POLLIN and POLLHUP handling code will attempt to use qemudDispatchClientFailure to mark the client as dieing, doing a double free. It is hard to avoid this potential double-invocation of the cleanup function, so it is preferrable to make it safe Daniel diff -rup libvirt-0.6.2.orig/qemud/qemud.c libvirt-0.6.2.new/qemud/qemud.c --- libvirt-0.6.2.orig/qemud/qemud.c 2009-03-13 17:06:16.000000000 +0000 +++ libvirt-0.6.2.new/qemud/qemud.c 2009-05-28 17:58:44.000000000 +0100 @@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qe * jobs have finished, then clean it up elsehwere */ void qemudDispatchClientFailure(struct qemud_client *client) { - virEventRemoveHandleImpl(client->watch); + if (client->watch != -1) { + virEventRemoveHandleImpl(client->watch); + client->watch = -1; + } /* Deregister event delivery callback */ if(client->conn) { @@ -1406,12 +1409,21 @@ void qemudDispatchClientFailure(struct q } #if HAVE_SASL - if (client->saslconn) sasl_dispose(&client->saslconn); + if (client->saslconn) { + sasl_dispose(&client->saslconn); + client->saslconn = NULL; + } free(client->saslUsername); + client->saslUsername = NULL; #endif - if (client->tlssession) gnutls_deinit (client->tlssession); - close(client->fd); - client->fd = -1; + if (client->tlssession) { + gnutls_deinit (client->tlssession); + client->tlssession = NULL; + } + if (client->fd != -1) { + close(client->fd); + client->fd = -1; + } } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] PPC Qemu Machine Type Patch
by Thomas J. Baker 29 May '09

29 May '09

Here's a patch I was asked to post here that attempts to fix libvirt incorrectly specifying g3bw as the machine type when it calls qemu-system-ppc. The renamed machine type is g3beige. I searched for all occurrences of g3bw and replaced it with g3beige. Thanks, tjb -- ======================================================================= | Thomas Baker email: tjb(a)unh.edu | | Systems Programmer | | Research Computing Center voice: (603) 862-4490 | | University of New Hampshire fax: (603) 862-1761 | | 332 Morse Hall | | Durham, NH 03824 USA http://wintermute.sr.unh.edu/~tjb | =======================================================================

3 2

[libvirt] [PATCH] fix storage volume inconsistencies in schema and document
by Ryota Ozaki 29 May '09

29 May '09

Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 23b096394eb15183a12c3277ac7a61e1eb73deb2 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Sat, 23 May 2009 20:52:51 +0900 Subject: [PATCH] fix storage volume inconsistencies in schema and document This patch fixes the following inconsistencies: - The volume element does not take a type attribute, but the document says it can. - The capacity element can take a unit attribute optionally, but the schema does not reflect that. This patch also modifies a testcase to check the unit attribute. --- docs/formatstorage.html | 4 ++-- docs/formatstorage.html.in | 4 ++-- docs/schemas/storagevol.rng | 11 +++++++++++ tests/storagevolschemadata/vol-qcow2.xml | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/formatstorage.html b/docs/formatstorage.html index fc47991..e96712d 100644 --- a/docs/formatstorage.html +++ b/docs/formatstorage.html @@ -294,7 +294,7 @@ <a name="StorageVolFirst" id="StorageVolFirst">General metadata</a> </h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <key>/var/lib/xen/images/sparse.img</key> <allocation>0</allocation> @@ -432,7 +432,7 @@ <a name="exampleVol" id="exampleVol">Storage volume</a> </h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <allocation>0</allocation> <capacity unit="T">1</capacity> diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 60e2ebc..4878d72 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -183,7 +183,7 @@ <h3><a name="StorageVolFirst">General metadata</a></h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <key>/var/lib/xen/images/sparse.img</key> <allocation>0</allocation> @@ -353,7 +353,7 @@ <h3><a name="exampleVol">Storage volume</a></h3> <pre> - <volume type="file"> + <volume> <name>sparse.img</name> <allocation>0</allocation> <capacity unit="T">1</capacity> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index c7bd3a7..7dc7876 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -29,6 +29,11 @@ <define name='sizing'> <optional> <element name='capacity'> + <optional> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + </optional> <ref name='uint'/> </element> </optional> @@ -183,5 +188,11 @@ </data> </define> + <define name='unit'> + <data type='string'> + <param name="pattern">[kKmMgGtTpPyYzZ]</param> + </data> + </define> + </grammar> diff --git a/tests/storagevolschemadata/vol-qcow2.xml b/tests/storagevolschemadata/vol-qcow2.xml index a3f5cca..c1cf02f 100644 --- a/tests/storagevolschemadata/vol-qcow2.xml +++ b/tests/storagevolschemadata/vol-qcow2.xml @@ -3,7 +3,7 @@ <key>/var/lib/libvirt/images/OtherDemo.img</key> <source> </source> - <capacity>5242880000</capacity> + <capacity unit="G">5</capacity> <allocation>294912</allocation> <target> <path>/var/lib/libvirt/images/OtherDemo.img</path> -- 1.6.0.6

2 1

[libvirt] [PATCH 0/1] API extension tutorial
by David Allan 28 May '09

28 May '09

Here is a document describing the process for extending the libvirt API. Note that the patch includes 8 sample patches that go with the document that should be included in and not applied to the tree. Dave

4 7

[libvirt] PATCH: Fix misc bugs in QEMU ARGV -> XML convertor
by Daniel P. Berrange 28 May '09

28 May '09

Having just tried out the QEMU ARGV -> XML convertor on a random set of args posted on the mailing list I found a few bugs. It didn't cope with a -net arg without a vlan=XX option set - this should assume vlan=0 if not set. It didn't cope with quoting of args with spaces in them. It finally did not generate a random UUID or MAC address if omitted. Regards, Daniel diff -r eb060781cfb9 src/qemu_conf.c --- a/src/qemu_conf.c Wed May 27 21:07:37 2009 +0100 +++ b/src/qemu_conf.c Wed May 27 22:56:55 2009 +0100 @@ -1565,14 +1565,27 @@ static int qemuStringToArgvEnv(const cha /* Iterate over string, splitting on sequences of ' ' */ while (curr && *curr != '\0') { char *arg; - const char *next = strchr(curr, ' '); + const char *next; + if (*curr == '\'') { + curr++; + next = strchr(curr, '\''); + } else if (*curr == '"') { + curr++; + next = strchr(curr, '"'); + } else { + next = strchr(curr, ' '); + } if (!next) next = strchr(curr, '\n'); - if (next) + if (next) { arg = strndup(curr, next-curr); - else + if (*next == '\'' || + *next == '"') + next++; + } else { arg = strdup(curr); + } if (!arg) goto no_memory; @@ -1644,7 +1657,7 @@ static const char *qemuFindEnv(const cha int i; int len = strlen(name); - for (i = 0 ; progenv[i] ; i++) { + for (i = 0 ; progenv && progenv[i] ; i++) { if (STREQLEN(progenv[i], name, len) && progenv[i][len] == '=') return progenv[i] + len + 1; @@ -1883,8 +1896,10 @@ qemuFindNICForVLAN(virConnectPtr conn, int gotvlan; const char *tmp = strstr(nics[i], "vlan="); char *end; - if (tmp) - tmp += strlen("vlan="); + if (!tmp) + continue; + + tmp += strlen("vlan="); if (virStrToLong_i(tmp, &end, 10, &gotvlan) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -1896,6 +1911,9 @@ qemuFindNICForVLAN(virConnectPtr conn, return nics[i]; } + if (wantvlan == 0 && nnics > 0) + return nics[0]; + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("cannot find NIC definition for vlan %d"), wantvlan); return NULL; @@ -1909,32 +1927,33 @@ qemuFindNICForVLAN(virConnectPtr conn, */ static virDomainNetDefPtr qemuParseCommandLineNet(virConnectPtr conn, + virCapsPtr caps, const char *val, int nnics, const char **nics) { virDomainNetDefPtr def = NULL; - char **keywords; - char **values; + char **keywords = NULL; + char **values = NULL; int nkeywords; const char *nic; int wantvlan = 0; const char *tmp; + int genmac = 1; int i; tmp = strchr(val, ','); - if (!tmp) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot extract NIC type from '%s'"), val); - return NULL; + + if (tmp) { + if ((nkeywords = qemuParseCommandLineKeywords(conn, + tmp+1, + &keywords, + &values)) < 0) + return NULL; + } else { + nkeywords = 0; } - if ((nkeywords = qemuParseCommandLineKeywords(conn, - tmp+1, - &keywords, - &values)) < 0) - return NULL; - if (VIR_ALLOC(def) < 0) { virReportOOMError(conn); goto cleanup; @@ -1983,7 +2002,9 @@ qemuParseCommandLineNet(virConnectPtr co goto cleanup; } - if (!STRPREFIX(nic, "nic,")) { + if (!STRPREFIX(nic, "nic")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse NIC definition '%s'"), nic); virDomainNetDefFree(def); def = NULL; goto cleanup; @@ -1996,17 +2017,22 @@ qemuParseCommandLineNet(virConnectPtr co VIR_FREE(keywords); VIR_FREE(values); - if ((nkeywords = qemuParseCommandLineKeywords(conn, - nic + strlen("nic,"), - &keywords, - &values)) < 0) { - virDomainNetDefFree(def); - def = NULL; - goto cleanup; + if (STRPREFIX(nic, "nic,")) { + if ((nkeywords = qemuParseCommandLineKeywords(conn, + nic + strlen("nic,"), + &keywords, + &values)) < 0) { + virDomainNetDefFree(def); + def = NULL; + goto cleanup; + } + } else { + nkeywords = 0; } for (i = 0 ; i < nkeywords ; i++) { if (STREQ(keywords[i], "macaddr")) { + genmac = 0; virParseMacAddr(values[i], def->mac); } else if (STREQ(keywords[i], "model")) { def->model = values[i]; @@ -2014,6 +2040,9 @@ qemuParseCommandLineNet(virConnectPtr co } } + if (genmac) + virCapabilitiesGenerateMac(caps, def->mac); + cleanup: for (i = 0 ; i < nkeywords ; i++) { VIR_FREE(keywords[i]); @@ -2283,6 +2312,7 @@ error: * as is practical. This is not an exact science.... */ virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, + virCapsPtr caps, const char **progenv, const char **progargv) { @@ -2303,6 +2333,8 @@ virDomainDefPtr qemuParseCommandLine(vir if (VIR_ALLOC(def) < 0) goto no_memory; + virUUIDGenerate(def->uuid); + def->id = -1; def->memory = def->maxmem = 64 * 1024; def->vcpus = 1; @@ -2604,7 +2636,7 @@ virDomainDefPtr qemuParseCommandLine(vir WANT_VALUE(); if (!STRPREFIX(val, "nic") && STRNEQ(val, "none")) { virDomainNetDefPtr net; - if (!(net = qemuParseCommandLineNet(conn, val, nnics, nics))) + if (!(net = qemuParseCommandLineNet(conn, caps, val, nnics, nics))) goto error; if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0) { virDomainNetDefFree(net); @@ -2741,6 +2773,7 @@ error: virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, + virCapsPtr caps, const char *args) { const char **progenv = NULL; @@ -2751,7 +2784,7 @@ virDomainDefPtr qemuParseCommandLineStri if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0) goto cleanup; - def = qemuParseCommandLine(conn, progenv, progargv); + def = qemuParseCommandLine(conn, caps, progenv, progargv); cleanup: for (i = 0 ; progargv && progargv[i] ; i++) diff -r eb060781cfb9 src/qemu_conf.h --- a/src/qemu_conf.h Wed May 27 21:07:37 2009 +0100 +++ b/src/qemu_conf.h Wed May 27 22:56:55 2009 +0100 @@ -127,9 +127,11 @@ int qemudBuildCommandLine const char *migrateFrom); virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, + virCapsPtr caps, const char **progenv, const char **progargv); virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, + virCapsPtr caps, const char *args); #endif /* __QEMUD_CONF_H */ diff -r eb060781cfb9 src/qemu_driver.c --- a/src/qemu_driver.c Wed May 27 21:07:37 2009 +0100 +++ b/src/qemu_driver.c Wed May 27 22:56:55 2009 +0100 @@ -3418,6 +3418,7 @@ static char *qemuDomainXMLFromNative(vir const char *format, const char *config, unsigned int flags ATTRIBUTE_UNUSED) { + struct qemud_driver *driver = conn->privateData; virDomainDefPtr def = NULL; char *xml = NULL; @@ -3427,7 +3428,7 @@ static char *qemuDomainXMLFromNative(vir goto cleanup; } - def = qemuParseCommandLineString(conn, config); + def = qemuParseCommandLineString(conn, driver->caps, config); if (!def) goto cleanup; diff -r eb060781cfb9 tests/qemuargv2xmltest.c --- a/tests/qemuargv2xmltest.c Wed May 27 21:07:37 2009 +0100 +++ b/tests/qemuargv2xmltest.c Wed May 27 22:56:55 2009 +0100 @@ -49,7 +49,7 @@ static int testCompareXMLToArgvFiles(con if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0) goto fail; - if (!(vmdef = qemuParseCommandLineString(NULL, cmd))) + if (!(vmdef = qemuParseCommandLineString(NULL, driver.caps, cmd))) goto fail; if (!(actualxml = virDomainDefFormat(NULL, vmdef, 0))) @@ -109,6 +109,8 @@ mymain(int argc, char **argv) if (!abs_srcdir) abs_srcdir = getcwd(cwd, sizeof(cwd)); + virRandomInitialize(0); + if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; if((driver.stateDir = strdup("/nowhere")) == NULL) -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] PATCH: Don't set ifname or script args for QEMU tap devices
by Daniel P. Berrange 28 May '09

28 May '09

When running QEMU with a type=bridge or type=network interface config, we pass a pre-created TAP device file descriptor, eg -net tap,fd=17,script=,vlan=0,ifname=vnet0 The ifname and script args have always been ignored by all QEMU versions we support. Latest QEMU will now error out if they are set. So this patch drops those two redundant options. NB, then are still set for type=ethernet inteface configs, because in that config we're not creating a TAP device. -net tap,fd=17,vlan=0 There is no impact on test cases, because live TAP devices is something that you can exercise in the test cases. Daniel diff -r b9dc4ea7f6aa src/qemu_conf.c --- a/src/qemu_conf.c Tue May 26 16:16:28 2009 +0100 +++ b/src/qemu_conf.c Tue May 26 22:56:09 2009 +0100 @@ -662,8 +662,8 @@ qemudNetworkIfaceConnect(virConnectPtr c } snprintf(tapfdstr, sizeof(tapfdstr), - "tap,fd=%d,script=,vlan=%d,ifname=%s", - tapfd, vlan, net->ifname); + "tap,fd=%d,vlan=%d", + tapfd, vlan); if (!(retval = strdup(tapfdstr))) goto no_memory; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] PATCH: Always log source location if available.
by Daniel P. Berrange 28 May '09

28 May '09

Currently, even though all the logging functions get given the source function and line number, it is just discarded unless priority == DEBUG. As an example, run virsh with logging enabled, and a bogus URI LIBVIRT_DEBUG=1 LIBVIRT_LOG_OUTPUTS=1:stderr virsh -c foo://bar 13:12:06.252: debug : do_open:993 : trying driver 4 (remote) ... 13:12:06.252: debug : do_open:999 : driver 4 remote returned DECLINED 13:12:06.252: error : could not connect to foo://bar 13:12:06.252: debug : virUnrefConnect:232 : unref connection 0x99617b0 1 13:12:06.252: debug : virReleaseConnect:191 : release connection 0x99617b0 Notice how it doesn't tell the user where the log message with 'error' priority came from. The same happens for info & warn levels. With the following patch applied, we always report function if it was passed into virLogMessage() 13:15:00.456: debug : do_open:993 : trying driver 4 (remote) ... 13:15:00.456: debug : do_open:999 : driver 4 remote returned DECLINED 13:15:00.456: error : virLibConnError:390 : could not connect to foo://bar 13:15:00.456: debug : virUnrefConnect:232 : unref connection 0x8dd87b0 1 13:15:00.456: debug : virReleaseConnect:191 : release connection 0x8dd87b0 So, we now see that the error came from virLibConnError at line 390 Daniel diff -r b9dc4ea7f6aa src/logging.c --- a/src/logging.c Tue May 26 16:16:28 2009 +0100 +++ b/src/logging.c Wed May 27 13:15:55 2009 +0100 @@ -516,7 +516,7 @@ void virLogMessage(const char *category, gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); - if ((funcname != NULL) && (priority == VIR_LOG_DEBUG)) { + if ((funcname != NULL)) { ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %s : %s:%lld : %s\n", time_info.tm_hour, time_info.tm_min, time_info.tm_sec, (int) cur_time.tv_usec / 1000, -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] [PATCH 1/2] (Updated & fixed) OpenNebula driver, libvirt-0.6.2
by "Abel Míguez Rodríguez" 27 May '09

27 May '09

Hi all, Here is the One driver & patches for the current git's master commit "9e9527 - Remove stale QEMU pidfiles". [PATCH 1/2] Patch to be applied to libvirt-0.6.2 sources and building files. [PATCH 2/2] Driver source code. Thanks for all the comments about the patches. We waited for the libvirt's release to update the driver's structure to 0.6.2 and apply the improvements. Here is a short list of the main changes applied: - Included driver's files in a different directory "src/opennebula" - Added Capabilities "virCapabilitiesAddGuest" for "x86_64" and "i686" guests and used "one" as hypervisor at "virCapabilitiesAddGuestDomain". - Instead creating a temporal file to send the VM definition we have updated the API we were using to being able to do everything in memory, so making use of "virBuffer" to create the VM definition Template. - Added previously unsupported features to the ONE Template, other types of disks and graphics (vnc,sdl) settings. - Fixed up warnings at compilation and make 'syntax-check' test passed. thanks, Abel Miguez. [PATCH 1/2] diff --git a/configure.in b/configure.in index dcacc7f..ab14303 100644 --- a/configure.in +++ b/configure.in @@ -186,6 +186,8 @@ AC_ARG_WITH([vbox], [ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) AC_ARG_WITH([lxc], [ --with-lxc add Linux Container support (on)],[],[with_lxc=yes]) +AC_ARG_WITH([one], +[ --with-one add ONE support (on)],[],[with_one=no]) AC_ARG_WITH([test], [ --with-test add test driver support (on)],[],[with_test=yes]) AC_ARG_WITH([remote], @@ -305,6 +307,11 @@ if test "$with_uml" = "yes" ; then fi AM_CONDITIONAL([WITH_UML], [test "$with_uml" = "yes"]) +if test "$with_one" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_ONE],1,[whether ONE driver is enabled]) +fi +AM_CONDITIONAL([WITH_ONE],[test "$with_one" = "yes"]) + if test "$with_test" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) fi @@ -406,6 +413,15 @@ dnl check for kvm headers dnl AC_CHECK_HEADERS([linux/kvm.h]) +dnl OpenNebula driver Compilation setting +dnl + +if test "$with_one" = "yes" ; then + CFLAGS="$CFLAGS -I$ONE_LOCATION/include" + ONE_LIBS="-L/usr/local/lib -lxmlrpc_client++ -lxmlrpc -lxmlrpc_util -lxmlrpc_xmlparse -lxmlrpc_xmltok -lxmlrpc++ -lxmlrpc_client -L$ONE_LOCATION/lib -loneapi" + AC_SUBST([ONE_LIBS]) +fi + dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG @@ -1372,6 +1388,7 @@ AC_MSG_NOTICE([ UML: $with_uml]) AC_MSG_NOTICE([ OpenVZ: $with_openvz]) AC_MSG_NOTICE([ VBox: $with_vbox]) AC_MSG_NOTICE([ LXC: $with_lxc]) +AC_MSG_NOTICE([ ONE: $with_one]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index faf3f61..abe54b2 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -63,6 +63,7 @@ typedef enum { VIR_FROM_XEN_INOTIFY, /* Error from xen inotify layer */ VIR_FROM_SECURITY, /* Error from security framework */ VIR_FROM_VBOX, /* Error from VirtualBox driver */ + VIR_FROM_ONE, /* Error from ONE driver */ } virErrorDomain; diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 924e8ad..9d7f61f 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -120,6 +120,10 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif +if WITH_ONE + libvirtd_LDADD += ../src/libvirt_driver_one.la +endif + if WITH_STORAGE_DIR libvirtd_LDADD += ../src/libvirt_driver_storage.la endif diff --git a/qemud/qemud.c b/qemud/qemud.c index 829a4bc..a069f38 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -75,6 +75,9 @@ #ifdef WITH_UML #include "uml_driver.h" #endif +#ifdef WITH_ONE +#include "opennebula/one_driver.h" +#endif #ifdef WITH_NETWORK #include "network_driver.h" #endif @@ -841,6 +844,7 @@ static struct qemud_server *qemudInitialize(int sigread) { virDriverLoadModule("qemu"); virDriverLoadModule("lxc"); virDriverLoadModule("uml"); + virDriverLoadModule("one"); #else #ifdef WITH_NETWORK networkRegister(); @@ -861,6 +865,9 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_UML umlRegister(); #endif +#ifdef WITH_ONE + oneRegister(); +#endif #endif virEventRegisterImpl(virEventAddHandleImpl, diff --git a/src/Makefile.am b/src/Makefile.am index fd692b4..17ae0e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -144,6 +144,12 @@ UML_DRIVER_SOURCES = \ uml_conf.c uml_conf.h \ uml_driver.c uml_driver.h +ONE_DRIVER_SOURCES = \ + ./opennebula/one_conf.c \ + ./opennebula/one_conf.h \ + ./opennebula/one_driver.c \ + ./opennebula/one_driver.h + NETWORK_DRIVER_SOURCES = \ network_driver.h network_driver.c @@ -337,6 +342,25 @@ endif libvirt_driver_uml_la_SOURCES = $(UML_DRIVER_SOURCES) endif +if WITH_ONE +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_one.la +else +noinst_LTLIBRARIES += libvirt_driver_one.la +# Stateful, so linked to daemon instead +#libvirt_la_LIBADD += libvirt_driver_one.la +endif +libvirt_driver_one_la_LDFLAGS = $(ONE_LIBS) + +if WITH_DRIVER_MODULES +libvirt_driver_one_la_LDFLAGS += -module -avoid-version +endif +libvirt_driver_one_la_SOURCES = $(ONE_DRIVER_SOURCES) +endif + + + + if WITH_NETWORK if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_network.la @@ -429,6 +453,7 @@ EXTRA_DIST += \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(UML_DRIVER_SOURCES) \ + $(ONE_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ diff --git a/src/domain_conf.c b/src/domain_conf.c index 648d9e9..06b9713 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -55,7 +55,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "test", "vmware", "hyperv", - "vbox") + "vbox", + "one") VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, "fd", diff --git a/src/domain_conf.h b/src/domain_conf.h index f4eea6b..c91a245 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -49,6 +49,7 @@ enum virDomainVirtType { VIR_DOMAIN_VIRT_VMWARE, VIR_DOMAIN_VIRT_HYPERV, VIR_DOMAIN_VIRT_VBOX, + VIR_DOMAIN_VIRT_ONE, VIR_DOMAIN_VIRT_LAST, }; diff --git a/src/driver.h b/src/driver.h index 39dc413..5685783 100644 --- a/src/driver.h +++ b/src/driver.h @@ -21,6 +21,7 @@ typedef enum { VIR_DRV_LXC = 6, VIR_DRV_UML = 7, VIR_DRV_VBOX = 8, + VIR_DRV_ONE = 9, } virDrvNo; diff --git a/src/libvirt.c b/src/libvirt.c index 95a861e..4b1610a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -845,6 +845,10 @@ virGetVersion(unsigned long *libVer, const char *type, if (STRCASEEQ(type, "UML")) *typeVer = LIBVIR_VERSION_NUMBER; #endif +#if WITH_ONE + if (STRCASEEQ(type, "ONE")) + *typeVer = LIBVIR_VERSION_NUMBER; +#endif #if WITH_REMOTE if (STRCASEEQ(type, "Remote")) *typeVer = remoteVersion(); diff --git a/src/virterror.c b/src/virterror.c index 2d34ed7..d4b429c 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -156,6 +156,8 @@ static const char *virErrorDomainName(virErrorDomain domain) { break; case VIR_FROM_VBOX: dom = "VBOX "; + case VIR_FROM_ONE: + dom = "ONE "; break; } return(dom); ---- Distributed System Architecture Group (http://dsa-research.org) GridWay, http://www.gridway.org OpenNEbula, http://www.opennebula.org

5 14

[libvirt] libvirtd 0.6.3 - Kernel Panic - 2.6.27-openvz-briullov.1
by Evan Borgstrom 27 May '09

27 May '09

Hi, I have a machine running 4 OpenVZ VE's and am looking at libvirt as a management tool. My machine is a Sun Fire X2250 with 1 CPU and 4GB of RAM running Gentoo. When I start libvirtd the output below appears in the dmesg output and the machine continues to function for about 30s longer before it starts dumping piles of continuous backtrace onto the console. Can I provide anymore info that will help diagnose this problem or should I open a bug about this? Thanks! -Evan [ 426.613841] WARNING: at fs/sysfs/dir.c:463 sysfs_add_one+0x2a/0x36() [ 426.613843] sysfs: duplicate filename 'lo' can not be created [ 426.613845] Modules linked in: ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 xt_state nf_conntrack ipt_REJECT iptable_filter ip_tables simfs vznetdev vzrst vzcpt tun vzdquota vzethdev vzmon vzdev 8021q bridge stp llc [ 426.613859] Pid: 17966, comm: libvirtd Not tainted 2.6.27-openvz- briullov.1-r1-fb3 #1 [ 426.613863] [<c022291e>] warn_slowpath+0x4b/0x6c [ 426.613869] [<c0333d00>] ? vsnprintf+0x233/0x531 [ 426.613874] [<c02294d1>] ? __sysctl_head_next+0x14/0x99 [ 426.613878] [<c032f826>] ? idr_get_empty_slot+0x13c/0x1f0 [ 426.613883] [<c032f9aa>] ? ida_get_new_above+0xd0/0x171 [ 426.613887] [<c028f9ca>] ? find_inode+0x1f/0x5b [ 426.613891] [<c02bbf5c>] ? sysfs_ilookup_test+0x0/0x11 [ 426.613894] [<c028fac5>] ? ifind+0x32/0x71 [ 426.613897] [<c02bc129>] ? sysfs_find_dirent+0x16/0x27 [ 426.613900] [<c02bc2b9>] sysfs_add_one+0x2a/0x36 [ 426.613903] [<c02bc773>] create_dir+0x43/0x72 [ 426.613906] [<c02bc7e9>] sysfs_create_dir+0x47/0x5b [ 426.613909] [<c033028b>] ? kobject_get+0x12/0x17 [ 426.613912] [<c0330390>] kobject_add_internal+0xb2/0x153 [ 426.613915] [<c03304dc>] kobject_add_varg+0x35/0x41 [ 426.613919] [<c033054d>] kobject_add+0x43/0x49 [ 426.613921] [<c03888e8>] device_add+0x7f/0x470 [ 426.613926] [<c027cd9d>] ? __percpu_alloc_mask+0xb6/0xd5 [ 426.613931] [<c023e5e7>] ? ub_slab_charge+0x4c/0x65 [ 426.613935] [<c03330fe>] ? strlcpy+0x17/0x49 [ 426.613938] [<c045a40c>] netdev_register_kobject+0x59/0x5c [ 426.613943] [<c0451afe>] register_netdevice+0x270/0x332 [ 426.613947] [<c0451bf2>] register_netdev+0x32/0x3f [ 426.613950] [<c03ad540>] loopback_net_init+0x34/0x63 [ 426.613955] [<c044d1eb>] setup_net+0x71/0xbb [ 426.613958] [<c044d534>] copy_net_ns+0x3d/0x99 [ 426.613960] [<c023712b>] create_new_namespaces+0x109/0x196 [ 426.613965] [<c0237370>] copy_namespaces+0x62/0x92 [ 426.613967] [<c0221a50>] copy_process+0x8df/0x105a [ 426.613971] [<c02222b6>] do_fork_pid+0xeb/0x25a [ 426.613973] [<c027f8a2>] ? __fput+0x138/0x140 [ 426.613977] [<c0222438>] do_fork+0x13/0x15 [ 426.613980] [<c02023cb>] sys_clone+0x1f/0x21 [ 426.613983] [<c020399e>] syscall_call+0x7/0xb [ 426.613986] [<c04f0000>] ? init_scattered_cpuid_features+0x4f/0x7d [ 426.613992] ======================= [ 426.613994] ---[ end trace 3809b0ba52b812c7 ]--- [ 426.613997] kobject_add_internal failed for lo with -EEXIST, don't try to register things with the same name in the same directory. [ 426.614001] Pid: 17966, comm: libvirtd Tainted: G W 2.6.27- openvz-briullov.1-r1-fb3 #1 [ 426.614004] [<c033041f>] kobject_add_internal+0x141/0x153 [ 426.614008] [<c03304dc>] kobject_add_varg+0x35/0x41 [ 426.614011] [<c033054d>] kobject_add+0x43/0x49 [ 426.614014] [<c03888e8>] device_add+0x7f/0x470 [ 426.614017] [<c027cd9d>] ? __percpu_alloc_mask+0xb6/0xd5 [ 426.614020] [<c023e5e7>] ? ub_slab_charge+0x4c/0x65 [ 426.614024] [<c03330fe>] ? strlcpy+0x17/0x49 [ 426.614027] [<c045a40c>] netdev_register_kobject+0x59/0x5c [ 426.614030] [<c0451afe>] register_netdevice+0x270/0x332 [ 426.614033] [<c0451bf2>] register_netdev+0x32/0x3f [ 426.614036] [<c03ad540>] loopback_net_init+0x34/0x63 [ 426.614040] [<c044d1eb>] setup_net+0x71/0xbb [ 426.614042] [<c044d534>] copy_net_ns+0x3d/0x99 [ 426.614045] [<c023712b>] create_new_namespaces+0x109/0x196 [ 426.614048] [<c0237370>] copy_namespaces+0x62/0x92 [ 426.614051] [<c0221a50>] copy_process+0x8df/0x105a [ 426.614054] [<c02222b6>] do_fork_pid+0xeb/0x25a [ 426.614057] [<c027f8a2>] ? __fput+0x138/0x140 [ 426.614060] [<c0222438>] do_fork+0x13/0x15 [ 426.614063] [<c02023cb>] sys_clone+0x1f/0x21 [ 426.614066] [<c020399e>] syscall_call+0x7/0xb [ 426.614068] [<c04f0000>] ? init_scattered_cpuid_features+0x4f/0x7d [ 426.614073] ======================= -- Evan Borgstrom <evan(a)fatbox.ca> - FatBox Inc. Find me on LinkedIn - http://www.linkedin.com/in/evanb

2 1

[libvirt] staggered guest startup / startup order
by Gerry Reno 26 May '09

26 May '09

Is there a way that you can set the guests startup order and stagger their startup at boot? Regards, Gerry

6 8

[libvirt] RFC / Braindump: public APIs needing data streams
by Daniel P. Berrange 26 May '09

26 May '09

The patches for secure migration raise an interesting question wrt the handling of data streams and their effects on the internal driver API and the public API. Although the migration helper APIs are not technically public, they do map onto the remote wire protocol and as such we have the same long term compatability issues to worry about. The way the migration APIs fit together are obscuring the picture a little, so for the sake of clarity, the remainder of this mail is going to talk about a ficticious public API 'virDomainRestoreStream' which allows a guest domain to be restored from a generic data stream, rather than a named file. If we can solve this API problem, then the design will trivially apply to secure migration. I'll now outline some possible approaches at public API level: 1. Pass a file handle to the public API Application usage: fd = open(filename); ret = virDomainRestoreStream(dom, fd); Driver internal usage: int virDomainRestoreStreamImpl(virDomainPtr dom, int fd) char buf[4096]; int ret; int qemuFD; qemuFD = runQEMUWithIncomingFD(dom); do { ret = read(fd, buf, sizeof buf); if (ret > 0) write(qemuFD, buf, ret); } while (ret > 0); } Good: Restore functionality all in one driver method Good: Public API is very simple Good: Internal driver can poll() on the FD to avoid blocking Bad: Application API is blocked Bad: Data read from FD might need transformation eg, uncompress, or decrypt TLS/SASL. 2. Provide public APIs for starting restore, feeding data, and completing. This matches proposal for secure migration patchset. Application usage: fd = open(filename); ret = virDomainRestorePrepare(dom); do { char buf[4096]; ret = read(fd, buf, sizeof buf); virDomainRestoreData(dom, buf, ret); } while (ret > 0); virDomainRestoreFinish(dom, ret == 0 ? 0 : 1); Driver internal usage: int virDomainRestorePrepareImpl(virDomainPtr dom) { qemuFD = runQEMUWithIncomingFD(dom); } int virDomainRestoreDataImpl(virDomainPtr dom, const char *buf, int buflen) { qemudFD = ...find previously opened qemuFD ... write(qemuFD, buf, buflen) } int virDomainRestoreFinishImpl(virDomainPtr dom, int error) { if (error) ...kill QEMU ... else qemuFD = ...find previously opened qemuFD ... close(qemuFD); } Good: Application can easily decrypt input data Good: Application can use an event loop to feed in data as it becomes available. eg poll in socket() Good: Application API never blocks execution for long time Bad: Driver has to maintain state across calls indefinitely Bad: Cannot guarentee that same client calls prepare/data. ie Different clients can get mixed up feeding data. Bad: Public API is fairly complex Bad: Lots of public API entry points for each method needing streams. 3. Provide a stream object for feeding data to driver from application. Similar to option 2, but provides easier state mgmt for driver. The driver will set callbacks on the data stream to receive data from client. Application usage: virDataStream stream = virDataStreamNew(); ret = virDomainRestore(dom, stream); do { char buf[4096]; ret = read(fd, buf, sizeof buf); virDataStreamWrite(stream, buf, ret); } while (ret > 0); virDataStreamFinish(dom, ret == 0 ? 0 : 1); Driver internal usage: int virDomainRestoreStreamImpl(virDomainPtr dom, virDataStream stream) { qemuFD = runQEMUWithIncomingFD(dom); virDataStreamSetCallbacks(stream, virDomainRestoreDataImpl, virDomainRestoreFinishImpl, (void *)qemudFD); } int virDomainRestoreDataImpl(virDomainPtr dom, const char *buf, int buflen, void *opaque) { int qemudFD = (int)opaque; write(qemuFD, buf, buflen) } int virDomainRestoreFinishImpl(virDomainPtr dom, int error, void *opaque) { if (error) ...kill QEMU ... else int qemudFD = (int)opaque; close(qemuFD); } Good: Application can easily decrypt input data Good: Application can use an event loop to feed in data as it becomes available. eg poll in socket() Good: Application API never blocks execution for long time Good: New APIs reusable for any public API with data stream Bad: Public API is fairly complex Bad: Driver has to maintain state across calls indefinitely 4. Provide a callback for driver to fetch data from the client app. Similar to option 1, but avoids need to expose concept of a 'fd' in public API directly. Application usage: int appreader(virDomainPtr dom, char *buf, int buflen, void *opaque) { int fd = (int)opaque; return read(fd, buf, buflen) } fd = open(filename); ret = virDomainRestoreStream(dom, appreader, (void *)fd); Driver internal usage int virDomainRestoreStreamImpl(virDomainPtr dom, int (*reader)(virDomainPtr, char *, int, voi d*), void *opaque) char buf[4096]; int ret; int qemuFD; qemuFD = runQEMUWithIncomingFD(dom); do { ret = (*reader)(dom, buf, sizeof buf, opaque); if (ret > 0) write(qemuFD, buf, ret); } while (ret > 0); } Good: Restore functionality all in one driver method Good: Public API is very simple Good: Client app callback can decrypt data Bad: Application API is blocked Bad: Internal driver code will block on executing callback if not data is available. Can't integrate with event loop. 5. Provide a generic public stream API to fetch data from the client app. Similar to option 4, but adding an stream object to manage the callback - allows more functionality to be added to public API later without changing restore API contract. Application usage: int appreader(virDomainPtr dom, char *buf, int buflen, void *opaque) { int fd = (int)opaque; return read(fd, buf, buflen) } fd = open(filename); stream = virDataStreamNewReader(appreader, (void*)fd); ret = virDomainRestoreStream(dom, stream); Driver internal usage int virDomainRestoreStreamImpl(virDomainPtr dom, virDataStream stream) { char buf[4096]; int ret; int qemuFD; qemuFD = runQEMUWithIncomingFD(dom); do { ret = virDataStreamRead(dom, buf, sizeof buf); if (ret > 0) write(qemuFD, buf, ret); } while (ret > 0); } Good: Restore functionality all in one driver method Good: Public API is fairly simple Good: Client app callback can decrypt data Bad: Application API is blocked Bad: Internal driver code will block on executing callback if not data is available. Can't integrate with event loop. All the APIs have good and bad points to them, in particular there is a difficult tradeoff between simplicity of the public API application code, vs the internal API implementation code. Some important goals though: - There must be a way to invoke the public API without blocking the application code - The driver must be able to receive data from an encrypted channel, because in libvirtd the FD might be the SASL/TLS socket - Internal driver API should not block on callbacks to app code, since it might need to be polling on another FD concurrently with reading data. - The number of new APIs to support streaming should not increase for each new method needing stream support. Ultimately I think options 3 or 5 are the most promising, because the addition of a generic 'virDataStream' public object makes it easier to manage the processing of the data stream without adding huge numbers of new APIs. Option 3 is a little more cumbersome to use from application code, but it avoids blocking either the client app, or the internal driver. The downside is the driver impl code is split across several methods. With option 5 it is harder to avoid blocking the client and internal driver, since it'd require the driver to integrate with an event loop, but there is no direct FD for the driver to poll() on. The choices made also have possible implications on the design of the remote wire protocol to support these methods. Ignoring the design of the public API, there are a handful of ways to stream data between client and server 1. Invoke primary method eg "restore domain", then feed the data in a sequence of following RPC calls. C --------------> S Restore domain call C <-------------- S Restore domain reply C --------------> S Restore data call 1 C <-------------- S Restore data reply 1 C --------------> S Restore data call 2 C <-------------- S Restore data reply 2 ............... C --------------> S Restore data call n C <-------------- S Restore data reply n C --------------> S Restore data complete C <-------------- S Restore data reply If server wants to abort a restore operation, it'll send an error on one of the replies. 2. Invoke primary method eg "restore domain", then feed the data in a sequence of following async messages. C --------------> S Restore domain call C <-------------- S Restore domain reply C --------------> S Restore data msg 1 C --------------> S Restore data msg 2 ............... C --------------> S Restore data msg n C --------------> S Restore data complete C <-------------- S Restore data reply If server wants to stop the client without closing the socket, it needs an async 'stop' message from server to client. This is prety much same as option 2, but is killing off the explicit replies for each data packet. 3. Invoke primary method eg "restore domain", but require the data to be stream to server, before the reply is sent back C --------------> S Restore domain call C --------------> S Stream data msg 1 C --------------> S Stream data msg 2 ............... C --------------> S Stream data msg n C --------------> S Stream finish msg C <-------------- S Restore domain reply If server wants to stop the client without closing the socket, it simply sends back the 'restore domain reply' message as an error before client finishes sending data, and ignore any further data messages. Options 2 or 3 have potential benefits on links with noticable latency, since they're not blocking the client on synchronous replies from the server. That said, the remote protocol does allow for interleaving of calls & replies, so with Option 1 the client could send multiple data packets without waiting for their replies, and deal with possible delayed error replies. If doing that though, the benefit of having a 1-to-1 call-to-reply ratio is minimal, miht as well go for a n-to-1, call-to-reply approach. It is hard to match public API option 3, with wire protocol option 3, because of the delayed 'restore domain reply' message. The options I'm really thinking are most viable are - Public API 3 + RPC 2 - Public API 5 + RPC 3 Both of these are a little more complex to implement in the libvirtd daemon that Chris' current secure migration patches, but then then also have functional & design benefits Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2