- Devel - libvirt List Archives

[libvirt] [PATCH] Detailed XML errors when XML is not well-formed
by Richard W.M. Jones 30 Jul '08

30 Jul '08

This patch changes the implementations lots of functions which parse XML documents, so that if the XML document is not well-formed then we get detailed error messages. The general form of the change is: static void catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) { // a callback which calls virDomainReportError } virDomainDefPtr virDomainDefParseString(virConnectPtr conn, virCapsPtr caps, const char *xmlStr) { xmlParserCtxtPtr pctxt; pctxt = xmlNewParserCtxt (); pctxt->sax->error = catchXMLError; xml = xmlCtxtReadDoc (pctxt, //...) etc. There are some unavoidable shortcomings: (1) There is no place to stash user pointers during the callback (the suggestively named pctxt->userData field is already used for something else), so we cannot pass the virConnectPtr to the error function. As a result, virterror will store the error in a global variable, and callers will probably not be able to access it. (2) The XML parser routinely produces multiple error messages, and virterror throws away all but the last one. The errors do, however, get printed to stderr. You can test this by using 'virsh define', 'virsh net-define', 'virsh pool-define', etc. on not-well-formed XML files. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

3 2

[libvirt] libvirt log
by Steve Oliphant 30 Jul '08

30 Jul '08

I have a quick question. I am trying to debug a remote access problem and have set the following parameters: # Override the default config file #LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf # Listen for TCP/IP connections # NB. must setup TLS/SSL keys prior to using this LIBVIRTD_ARGS="--listen --verbose" # Override Kerberos service keytab for SASL/GSSAPI #KRB5_KTNAME=/etc/libvirt/krb5.tab I have not been able to find the libvirtd log. Where is it located? Thanks for your help Steve

2 3

[libvirt] [PATCH] virsh edit command
by Richard W.M. Jones 30 Jul '08

30 Jul '08

One thing which is very apparent is that sys admins using libvirt / virsh have a great deal of difficulty understanding "where the configuration files have gone" and how to edit them. This patch adds a "virsh edit <domain>" command which is basically the equivalent of: virsh dumpxml dom > /tmp/dom.xml $EDITOR /tmp/dom.xml && virsh define /tmp/dom.xml but with much more sanity checking. The editor is $EDITOR or vi, and it does the right thing if the user doesn't modify the file, or if another user edits the configuration at the same time. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

4 19

[libvirt] [PATCH] don't dump core on NULL ifname
by Guido Günther 30 Jul '08

30 Jul '08

Hi, actually I thought I sent this out already, but it seems I didn't: Don't dump core on NULL ifname when getting interface statistic. Not all networking types have a target ifname set (user,client,server,mcast). Cheers, -- Guido

2 1

[libvirt] Small regression with domain refactoring
by Chris Lalancette 30 Jul '08

30 Jul '08

Hey, I've run into another regression when using a KVM guest with libvirt tip. If I have a guest with some XML: <graphics type='vnc' port='-1' listen='127.0.0.1'/> Then when I "virsh define" that guest, it ends up looking like: <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'/> So far, so good. Now, when I actually "virsh start" the guest, it ends up like: <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'/> That is, there is no change to the XML when the domain is running. What is supposed to happen is that the "port" field should be filled in with the port that libvirt ended up choosing for this guest. This is important for tools like virt-viewer, which parse this part of the XML to find out where to connect to. Looking at the code, I believe the problem is in src/domain_conf.c:virDomainGraphicsDefFormat(). It looks like: case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (def->data.vnc.autoport) virBufferAddLit(buf, " port='-1'"); else if (def->data.vnc.port) virBufferVSprintf(buf, " port='%d'", def->data.vnc.port); The problem is that we are missing some sort of "isActive" check in there, so that it fills in the actual port it is using if the domain is running. Unfortunately, from a quick perusal, I couldn't easily figure out how to do this; does someone have a suggestion on how to fix this? Thanks, Chris Lalancette

2 1

[libvirt] [PATCH] Fix logical storage pool operation on SLES10-SP2
by David Lively 30 Jul '08

30 Jul '08

The attached patch adjusts for a difference in behavior in the LVM utilities 'lvs' and 'vgs'. The SLES10-SP2 versions of these (and presumably others) append a trailing separator. This patch simply adjusts the regexps to allow (but not require) this. I thought just adding the ":?" to the regexps would do this, but this was leaving the trailing separator in the last group match, so I ended up tweaking the preceding group pattern as well. Dave

3 3

[libvirt] [PATCH] qemud: move check for polkit before config file check
by Guido Günther 30 Jul '08

30 Jul '08

Hi, Without this patch and without a /etc/libvirt/libvirt.conf config file the default policy for running the daemon as non root user is still polkit which is bad. Please apply. Cheers, -- Guido

3 2

[Libvir] [PATCH] Add bus attribute to disk target definition
by Soren Hansen 29 Jul '08

29 Jul '08

Hi! I'd like to propose that the following patch gets applied against libvirt. It adds the option of putting a bus attribute on a disk target. To acommodate this, it also changes the way drives are defined for kvm from the old "-hda /path/to/file -boot c" style to the new "-drive file=/path/to/file,if=ide,boot=on". This makes it possible to specify virtio, scsi, and ide disks. === modified file 'src/qemu_conf.c' --- src/qemu_conf.c 2008-04-28 15:14:59 +0000 +++ src/qemu_conf.c 2008-04-29 07:43:11 +0000 @@ -568,6 +568,7 @@ xmlChar *source = NULL; xmlChar *target = NULL; xmlChar *type = NULL; + xmlChar *bus = NULL; int typ = 0; type = xmlGetProp(node, BAD_CAST "type"); @@ -598,6 +599,7 @@ } else if ((target == NULL) && (xmlStrEqual(cur->name, BAD_CAST "target"))) { target = xmlGetProp(cur, BAD_CAST "dev"); + bus = xmlGetProp(cur, BAD_CAST "bus"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { disk->readonly = 1; } @@ -646,7 +648,9 @@ strcmp((const char *)target, "hda") && strcmp((const char *)target, "hdb") && strcmp((const char *)target, "hdc") && - strcmp((const char *)target, "hdd")) { + strcmp((const char *)target, "hdd") && + strcmp((const char *)target, "hdd") && + strncmp((const char *)target, "vd", 2)) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Invalid harddisk device name: %s"), target); goto error; @@ -673,6 +677,20 @@ goto error; } + if (!bus) + disk->bus = QEMUD_DISK_BUS_IDE; + else if (!strcmp((const char *)bus, "ide")) + disk->bus = QEMUD_DISK_BUS_IDE; + else if (!strcmp((const char *)bus, "scsi")) + disk->bus = QEMUD_DISK_BUS_SCSI; + else if (!strcmp((const char *)bus, "virtio")) + disk->bus = QEMUD_DISK_BUS_VIRTIO; + else { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "Invalid bus type: %s", bus); + goto error; + } + + xmlFree(bus); xmlFree(device); xmlFree(target); xmlFree(source); @@ -688,6 +706,8 @@ xmlFree(source); if (device) xmlFree(device); + if (bus) + xmlFree(bus); return -1; } @@ -1350,6 +1370,68 @@ return -1; } +static int qemudDiskCompare(const void *aptr, const void *bptr) { + struct qemud_vm_disk_def *a = (struct qemud_vm_disk_def *) aptr; + struct qemud_vm_disk_def *b = (struct qemud_vm_disk_def *) bptr; + if (a->device == b->device) + return virDiskNameToIndex(a->dst) - virDiskNameToIndex(b->dst); + else + return a->device - b->device; +} + +static const char *qemudBusIdToName(int busId) { + const char *busnames[] = { "ide", + "scsi", + "virtio" }; + + if (busId >= 0 && busId < 3) + return busnames[busId]; + else + return 0; +} + +static char *qemudDriveOpt(struct qemud_vm_disk_def *disk, int boot) +{ + char opt[PATH_MAX]; + + switch (disk->device) { + case QEMUD_DISK_CDROM: + snprintf(opt, PATH_MAX, "file=%s,if=ide,media=cdrom%s", + disk->src, boot ? ",boot=on" : ""); + break; + case QEMUD_DISK_FLOPPY: + snprintf(opt, PATH_MAX, "file=%s,if=floppy%s", + disk->src, boot ? ",boot=on" : ""); + break; + case QEMUD_DISK_DISK: + snprintf(opt, PATH_MAX, "file=%s,if=%s%s", + disk->src, qemudBusIdToName(disk->bus), boot ? ",boot=on" : ""); + break; + default: + return 0; + } + return strdup(opt); +} + +static char *qemudAddBootDrive(virConnectPtr conn, + struct qemud_vm_def *def, + char *handledDisks, + int type) { + int j = 0; + struct qemud_vm_disk_def *disk = def->disks; + + while (disk) { + if (!handledDisks[j] && disk->device == type) { + handledDisks[j] = 1; + return qemudDriveOpt(disk, 1); + } + j++; + disk = disk->next; + } + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "Requested boot device type %d, but no such device defined.", type); + return 0; +} /* * Parses a libvirt XML definition of a guest, and populates the @@ -1739,7 +1821,6 @@ obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { - struct qemud_vm_disk_def *prev = NULL; for (i = 0; i < obj->nodesetval->nodeNr; i++) { struct qemud_vm_disk_def *disk = calloc(1, sizeof(*disk)); if (!disk) { @@ -1752,13 +1833,20 @@ goto error; } def->ndisks++; - disk->next = NULL; if (i == 0) { + disk->next = NULL; def->disks = disk; } else { - prev->next = disk; + struct qemud_vm_disk_def *ptr = def->disks; + while (ptr) { + if (!ptr->next || qemudDiskCompare(ptr->next, disk) < 0) { + disk->next = ptr->next; + ptr->next = disk; + break; + } + ptr = ptr->next; + } } - prev = disk; } } xmlXPathFreeObject(obj); @@ -2207,30 +2295,32 @@ goto no_memory; } - for (i = 0 ; i < vm->def->os.nBootDevs ; i++) { - switch (vm->def->os.bootDevs[i]) { - case QEMUD_BOOT_CDROM: - boot[i] = 'd'; - break; - case QEMUD_BOOT_FLOPPY: - boot[i] = 'a'; - break; - case QEMUD_BOOT_DISK: - boot[i] = 'c'; - break; - case QEMUD_BOOT_NET: - boot[i] = 'n'; - break; - default: - boot[i] = 'c'; - break; + if (vm->def->virtType != QEMUD_VIRT_KVM) { + for (i = 0 ; i < vm->def->os.nBootDevs ; i++) { + switch (vm->def->os.bootDevs[i]) { + case QEMUD_BOOT_CDROM: + boot[i] = 'd'; + break; + case QEMUD_BOOT_FLOPPY: + boot[i] = 'a'; + break; + case QEMUD_BOOT_DISK: + boot[i] = 'c'; + break; + case QEMUD_BOOT_NET: + boot[i] = 'n'; + break; + default: + boot[i] = 'c'; + break; + } } + boot[vm->def->os.nBootDevs] = '\0'; + if (!((*argv)[++n] = strdup("-boot"))) + goto no_memory; + if (!((*argv)[++n] = strdup(boot))) + goto no_memory; } - boot[vm->def->os.nBootDevs] = '\0'; - if (!((*argv)[++n] = strdup("-boot"))) - goto no_memory; - if (!((*argv)[++n] = strdup(boot))) - goto no_memory; if (vm->def->os.kernel[0]) { if (!((*argv)[++n] = strdup("-kernel"))) @@ -2251,28 +2341,74 @@ goto no_memory; } - while (disk) { - char dev[NAME_MAX]; - char file[PATH_MAX]; - if (!strcmp(disk->dst, "hdc") && - disk->device == QEMUD_DISK_CDROM) { - if (disk->src[0]) - snprintf(dev, NAME_MAX, "-%s", "cdrom"); - else { - /* Don't put anything on the cmdline for an empty cdrom*/ - disk = disk->next; - continue; - } - } else - snprintf(dev, NAME_MAX, "-%s", disk->dst); - snprintf(file, PATH_MAX, "%s", disk->src); - - if (!((*argv)[++n] = strdup(dev))) - goto no_memory; - if (!((*argv)[++n] = strdup(file))) - goto no_memory; - - disk = disk->next; + if (vm->def->virtType == QEMUD_VIRT_KVM) { + char *handledDisks = NULL; + int j; + + handledDisks = calloc(sizeof(*handledDisks), vm->def->ndisks); + + if (!handledDisks) + goto no_memory; + + /* When using -drive notation, we need to provide the devices in boot + * preference order. */ + for (i = 0 ; i < vm->def->os.nBootDevs ; i++) { + if (!((*argv)[++n] = strdup("-drive"))) + goto no_memory; + + switch (vm->def->os.bootDevs[i]) { + case QEMUD_BOOT_CDROM: + if (!((*argv)[++n] = qemudAddBootDrive(conn, vm->def, handledDisks, QEMUD_DISK_CDROM))) + goto error; + break; + case QEMUD_BOOT_FLOPPY: + if (!((*argv)[++n] = qemudAddBootDrive(conn, vm->def, handledDisks, QEMUD_DISK_FLOPPY))) + goto error; + break; + case QEMUD_BOOT_DISK: + if (!((*argv)[++n] = qemudAddBootDrive(conn, vm->def, handledDisks, QEMUD_DISK_DISK))) + goto error; + break; + } + } + + /* Pick up the rest of the devices */ + j=0; + while (disk) { + if (!handledDisks[j]) { + handledDisks[j] = 1; + if (!((*argv)[++n] = strdup("-drive"))) + goto no_memory; + if (!((*argv)[++n] = qemudDriveOpt(disk, 0))) + goto no_memory; + } + disk = disk->next; + j++; + } + } else { + while (disk) { + char dev[NAME_MAX]; + char file[PATH_MAX]; + + if (!strcmp(disk->dst, "hdc") && + disk->device == QEMUD_DISK_CDROM) + if (disk->src[0]) + snprintf(dev, NAME_MAX, "-%s", "cdrom"); + else { + disk = disk->next; + continue; + } + else + snprintf(dev, NAME_MAX, "-%s", disk->dst); + snprintf(file, PATH_MAX, "%s", disk->src); + + if (!((*argv)[++n] = strdup(dev))) + goto no_memory; + if (!((*argv)[++n] = strdup(file))) + goto no_memory; + + disk = disk->next; + } } if (!net) { @@ -3565,6 +3701,7 @@ virBufferVSprintf(&buf, " <source %s='%s'/>\n", typeAttrs[disk->type], disk->src); + virBufferVSprintf(&buf, " <target dev='%s' bus='%s'/>\n", disk->dst, qemudBusIdToName(disk->bus)); virBufferVSprintf(&buf, " <target dev='%s'/>\n", disk->dst); if (disk->readonly) === modified file 'src/qemu_conf.h' --- src/qemu_conf.h 2008-04-25 20:46:13 +0000 +++ src/qemu_conf.h 2008-04-29 07:13:16 +0000 @@ -56,10 +56,17 @@ QEMUD_DISK_FLOPPY, }; +enum qemud_vm_disk_bus { + QEMUD_DISK_BUS_IDE, + QEMUD_DISK_BUS_SCSI, + QEMUD_DISK_BUS_VIRTIO +}; + /* Stores the virtual disk configuration */ struct qemud_vm_disk_def { int type; int device; + int bus; char src[PATH_MAX]; char dst[NAME_MAX]; int readonly; === modified file 'src/util.c' --- src/util.c 2008-04-25 14:53:05 +0000 +++ src/util.c 2008-04-29 06:59:49 +0000 @@ -771,3 +771,43 @@ return -1; } + +/* Translates a device name of the form (regex) "[fhv]d[a-z]+" into + * the corresponding index (e.g. sda => 1, hdz => 26, vdaa => 27) + * @param name The name of the device + * @return name's index, or 0 on failure + */ +int virDiskNameToIndex(const char *name) { + const char *ptr = NULL; + int idx = 0; + + if (strlen(name) < 3) + return 0; + + switch (*name) { + case 'f': + case 'h': + case 'v': + break; + default: + return 0; + } + + if (*(name + 1) != 'd') + return 0; + + ptr = name+2; + + while (*ptr) { + idx = idx * 26; + + if ('a' > *ptr || 'z' < *ptr) + return 0; + + idx += *ptr - 'a' + 1; + ptr++; + } + + return idx; +} + === modified file 'src/util.h' --- src/util.h 2008-04-25 14:53:05 +0000 +++ src/util.h 2008-04-29 06:59:57 +0000 @@ -92,4 +92,6 @@ int virParseMacAddr(const char* str, unsigned char *addr); +int virDiskNameToIndex(const char* str); + #endif /* __VIR_UTIL_H__ */ -- Soren Hansen | Virtualisation specialist | Ubuntu Server Team Canonical Ltd. | http://www.ubuntu.com/

6 17

[libvirt] KVM migration patch (2008-07-29)
by Richard W.M. Jones 29 Jul '08

29 Jul '08

This is just a rebase of the KVM migration patch to the latest libvirt CVS: http://www.annexia.org/tmp/libvirt-kvm-migrate-20080729.patch Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 59 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

1 0

[libvirt] [PATCH]: Fix Qemu CD-ROM with no source
by Chris Lalancette 29 Jul '08

29 Jul '08

The new generic domain re-factor introduced a small regression into the drive handling code. In particular, if you had a section of XML like: <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> This used to work with older libvirt, but now fails. This is because we are actually passing the literal string (null) to the qemu command-line, which qemu barfs on. This patch fixes it up by making it blank, which allows qemu to continue on it's merry way. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 3

[libvirt] Now ESXi is 'free'
by Stefan de Konink 29 Jul '08

29 Jul '08

Now ESXi is 'free as in beer' would it be appropriate to hack a libvirtd in it? Stefan

2 1

[libvirt] [PATCH] OpenVZ xml refactoring
by Evgeniy Sokolov 29 Jul '08

29 Jul '08

Patch switch OpenVZ XML format to generic. main changes: - I used generic virDomainNetDef to define network in container. And wrote function to apply virDomainNetDef for container. Method virDomainNetDefParseXML is public now. - tag "container" is changed to "devices" - changed format of tag "filesystem" - added processing "vcpu" tag.

3 7

[libvirt] [PATCH]: qemu_driver: convert uuid to string in error messages
by Guido Günther 28 Jul '08

28 Jul '08

Hi, qemu_driver misses some conversions to a char* before printing the uuid. Possible fix attached. Cheers, -- Guido

3 6

[libvirt] Re: kexec/kdump of a kvm guest?
by Mike Snitzer 27 Jul '08

27 Jul '08

On Thu, Jul 24, 2008 at 9:15 AM, Vivek Goyal <vgoyal(a)redhat.com> wrote: > On Thu, Jul 24, 2008 at 07:49:59AM -0400, Mike Snitzer wrote: >> On Thu, Jul 24, 2008 at 4:39 AM, Alexander Graf <agraf(a)suse.de> wrote: >> > As you're stating that the host kernel breaks with kvm modules loaded, maybe >> > someone there could give a hint. >> >> OK, I can try using a newer kernel on the host too (e.g. 2.6.25.x) to >> see how kexec/kdump of the host fairs when kvm modules are loaded. >> >> On the guest side of things, as I mentioned in my original post, >> kexec/kdump wouldn't work within a 2.6.22.19 guest with the host >> running 2.6.25.4 (with kvm-70). >> > > Hi Mike, > > I have never tried kexec/kdump inside a kvm guest. So I don't know if > historically they have been working or not. Avi indicated he seems to remember that at least kexec worked last he tried (didn't provide when/what he tried though). > Having said that, Why do we need kdump to work inside the guest? In this > case qemu should be knowing about the memory of guest kernel and should > be able to capture a kernel crash dump? I am not sure if qemu already does > that. If not, then probably we should think about it? > > To me, kdump is a good solution for baremetal but not for virtualized > environment where we already have another piece of software running which > can do the job for us. We will end up wasting memory in every instance > of guest (memory reserved for kdump kernel in every guest). I haven't looked into what mechanics qemu provides for collecting the entire guest memory image; I'll dig deeper at some point. It seems the libvirt mid-layer ("virsh dump" - dump the core of a domain to a file for analysis) doesn't support saving a kvm guest core: # virsh dump guest10 guest10.dump libvir: error : this function is not supported by the hypervisor: virDomainCoreDump error: Failed to core dump domain guest10 to guest10.dump Seems that libvirt functionality isn't available yet with kvm (I'm using libvirt 0.4.2, I'll give libvirt 0.4.4 a try). cc'ing the libvirt-list to get their insight. That aside, having the crash dump collection be multi-phased really isn't workable (that is if it requires a crashed guest to be manually saved after the fact). The host system _could_ be rebooted; whereby losing the guest's core image. So automating qemu and/or libvirtd to trigger a dump would seem worthwhile (maybe its already done?). So while I agree with you its ideal to not have to waste memory in each guest for the purposes of kdump; if users want to model a guest image as closely as possible to what will be deployed on bare metal it really would be ideal to support a 1:1 functional equivalent with kvm. I work with people who refuse to use kvm because of the lack of kexec/kdump support. I can do further research but welcome others' insight: do others have advice on how best to collect a crashed kvm guest's core? > It will be interesting to look at your results with 2.6.25.x kernels with > kvm module inserted. Currently I can't think what can possibly be wrong. If the host's 2.6.25.4 kernel has both the kvm and kvm-intel modules loaded kexec/kdump does _not_ work (simply hangs the system). If I only have the kvm module loaded kexec/kdump works as expected (likewise if no kvm modules are loaded at all). So it would appear that kvm-intel and kexec are definitely mutually exclusive at the moment (at least on both 2.6.22.x and 2.6.25.x). Mike

4 4

[libvirt] virsh
by drew einhorn 25 Jul '08

25 Jul '08

Hi, I have virsh running in a remote ssh session in a dom0 xen VM, it is presenting a virtual console for a domU vm running a RHEL5 installer The RHEL5 is going astray setting up the network using DHCP, I want to do Ctrl-Alt-Fn to view the installer log files, and access a shell prompt. But the Ctrl-Alt-Fn is being consumed by the laptop running the remote ssh ssh session. How do I get the virsh to send Ctrl-Alt-Fn to the domU console? -- Drew Einhorn

1 0

[libvirt] [PATCH]: Utterly trivial comment cleanups in src/domain_conf.c
by Chris Lalancette 25 Jul '08

25 Jul '08

The subject pretty much says it all, except for the minor fact of using "domain.xml" in the xmlReadDoc(). This cleanup really just makes the code easier to read. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 2

[libvirt] Problems when using libvirt-cim provider
by SHAN, CHUN -HCHBJ 25 Jul '08

25 Jul '08

Hi,all: I am trying to use libvirt API and libvirt-cim now. After installed them successfully, I can see the "Virt_*****" providers using "cimprovider -l -s"commond. My cimom is pegasus. Then I used wbemcli as cim client. But when I used "wbemcli ei" to enumerate instances of a specified class,for example,Xen_DiskPool, error code was: wbemcli:Cim(1) CIM_ERR_FAILED: A general error occurred that is not covered by a more specific error code:"For provider Virt_DevicePool the library name was empty. Check provider registered location". Could you please help me to solve this problem? Did it mean that the providers were not registered correctly? But I "make postinstall" the provider and no errors occourred. Thank you! Regards, Chun Shan Disclaimer: The contents of this e-mail, and its attachments, if any, are confidential and may be protected by law against any unauthorized use. If you have received this e-mail by mistake or have reason to believe that you are not the intended recipient, please notify the sender by reply e-mail as soon as possible and delete it from your computer system immediately thereafter. If you are not the intended recipient, you must not copy this e-mail or attachment or disclose the contents to any other person. While we have made every effort to keep our network virus free, we take no responsibility for any computer virus which might be transferred by way of this e-mail.

3 2

[libvirt] PATCH Remove unused openvz code
by Daniel P. Berrange 25 Jul '08

25 Jul '08

The openvz driver currrently generates a compile warning due to this unused function. If no one objects I'll shortly remove it. I intend to turn on openvz and LXC driver compilation for the nightly builds to get more testing coverage Daniel diff -r 59140de4e7a9 src/openvz_driver.c --- a/src/openvz_driver.c Mon Jul 21 18:27:29 2008 +0100 +++ b/src/openvz_driver.c Tue Jul 22 22:12:22 2008 +0100 @@ -91,32 +91,11 @@ unsigned int flags ATTRIBUTE_UNUSED); static int openvzDomainUndefine(virDomainPtr dom); -static int convCmdbufExec(char cmdbuf[], char *cmdExec[]); static void cmdExecFree(char *cmdExec[]); static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid); struct openvz_driver ovz_driver; - -static int convCmdbufExec(char cmdbuf[], char *cmdExec[]) -{ - int i=0, limit = OPENVZ_MAX_ARG - 1; - char cmdWord[CMDOP_LEN]; - while(*cmdbuf) - { - if(i >= limit) - { - cmdExec[i] = NULL; - return -1; - } - sscanf(cmdbuf, "%s", cmdWord); - cmdbuf += strlen(cmdWord); - while(*cmdbuf == ' ') cmdbuf++; - cmdExec[i++] = strdup(cmdWord); - } - cmdExec[i] = NULL; - return i; -} static void cmdExecFree(char *cmdExec[]) { -- |: 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] Couple qemu driver bugs after xml refactoring
by Cole Robinson 25 Jul '08

25 Jul '08

Hi all, I've hit a couple bugs in the qemu driver with the recent domain xml refactoring. I've debugged them but in both cases I'm not sure what the optimal solutions are, so I'm just laying them out here: 1) Previously defining a qemu guest without a 'listen' address specified in the graphics tag would default to 127.0.0.1 (hardcoded in qemu_driver->vncListen). Current xml doesn't set this default, and will build a qemu command line with an entry like '-vnc (null):1'. Not sure if the default should be set at the parsing level or the driver level. 2) If a cpuset isn't specified, def->cpumask is null. However qemudInitCpus from qemu_driver.c doesn't know how to handle this, causing libvirtd to crash. This function is also using QEMUD_CPUMASK_LEN which I think should be replaced with VIR_DOMAIN_CPUMASK_LEN. I tried the obvious fix of just skipping the dependent code if cpumask is null, but there still seemed to be problems and I didn't dig much deeper. Thanks, Cole

4 6

[libvirt] Double free in test driver error handling (0.4.4)
by Tóth István 25 Jul '08

25 Jul '08

While debugging the libvirt-java error handling problem, Ive found that if I call the test driver with a bad uri, the application instantly bombs with a double free error. Try to run the attached test program to trigger the bug. regards István #include <libvirt/libvirt.h> #include <stdio.h> int main(){ int ret=virInitialize(); virConnectOpen("test:///defaultt"); }

3 2

[libvirt] [PATCH]: libvirt.h: very xen centric
by Guido Günther 25 Jul '08

25 Jul '08

Hi, while reading through that I noticed libvirt.h is quiet xen centric. Purely cosmetic patch attached, -- Guido

3 2

[libvirt] [PATCH] qemudOpenMonitor: fix open(2) error check
by Guido Günther 25 Jul '08

25 Jul '08

Hi, open returns -1 on failure. Pointed out by Guido Trotter on: http://bugs.debian.org/492250 Patch against current CVS attached. -- Guido

3 2

[libvirt] [PATCH] fix Relax-NG pattern matching
by John Levon 25 Jul '08

25 Jul '08

Don't use unescaped meta-characters. Signed-off-by: John Levon <john.levon(a)sun.com> Index: docs/libvirt.rng =================================================================== RCS file: /data/cvs/libvirt/docs/libvirt.rng,v retrieving revision 1.9 diff -u -r1.9 libvirt.rng --- docs/libvirt.rng 10 Jul 2008 08:05:39 -0000 1.9 +++ docs/libvirt.rng 24 Jul 2008 16:40:16 -0000 @@ -840,7 +840,7 @@ </define> <define name='domainName'> <data type='string'> - <param name="pattern">[A-Za-z0-9_.:/\+\-&-]+</param> + <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param> </data> </define> <define name='genericName'> @@ -860,22 +860,22 @@ </define> <define name='filePath'> <data type='string'> - <param name="pattern">[a-zA-Z0-9_\+\-%./&]+</param> + <param name="pattern">[a-zA-Z0-9_\.\+\-&/%]+</param> </data> </define> <define name='absFilePath'> <data type='string'> - <param name="pattern">/[a-zA-Z0-9_\+\-%./&]+</param> + <param name="pattern">/[a-zA-Z0-9_\.\+\-&/%]+</param> </data> </define> <define name='devicePath'> <data type='string'> - <param name="pattern">/[a-zA-Z0-9_\+\-%/]+</param> + <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> </data> </define> <define name='deviceName'> <data type='string'> - <param name="pattern">[a-zA-Z0-9_\-:./]+</param> + <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> </data> </define> <define name='addrMAC'>

2 1

[libvirt] Virt-Manager, libvirt & TLS
by Geoff Wiener 24 Jul '08

24 Jul '08

Hi! This is my first post to either of these list, I have been lurking, (sorry to cross post but I don't know if this is a virt-manager or libvirt question). So first off thank you to everyone for all your efforts. I think libvirt and virt-manager are excellent! I've built a pair of server s in the lab with a Xen stack and have been attempting to get virt-manager 0.5.4 to communicate with, first libvirt 0.4.2 and then libvirt 0.4.4 using TLS across the network in a "client / server" configuration unsuccessfully. All the machines are on the same subnet (192.168.4.x/24). I can make Virt-Manager communicate with Libvirt over TCP without authentication so now that I know the installation works I want to further secure it using TLS. I've read everything I can get my hands on, subscribe to the lists and feel that I must be making a simple error ;I could really use a fresh perspective. I would really appreciate any feedback you can offer. Here's my configuration and testing method. Workstation Ubuntu Hardy Heron 64 bit Virt-manager 0.5.4 Server Distribution = CentOS 5.1 (64 bit) Kernel = 2.6.18.8-xen (compiled from source) Xen = 3.2.1.gz virsh # version Compiled against library: libvir 0.4.4 Using library: libvir 0.4.4 Using API: Xen 3.0.1 Running hypervisor: Xen 3.2.0 /usr/local/etc/libvirt/libvirtd.conf Listen_tcp = 1 auth_unix_ro = "none" auth_unix_rw="none" auth_tcp="none" In this configuration I can use "Remove Password or Kerberos" to connect. I just enter the hostname of the Xen machine and Virt-Manager lets me see all the Domains that are running (or shutdown if I virsh define them) as well as look at their consoles (if the vfb is configured correctly). I followed the configuration notes at: http://libvirt.org/remote.html with a couple of exceptions: 1. I already have a linux based CA that I use with OpenVPN so I used that CA root certificate and just generated client and server cert / key pairs for my client and server (I tested with just one server) 2. I reverted back to the default libvirtd.conf to setup for TLS and noticed that the default paths for the certificate locations were not in line with the documentation on the web page but there were commented sections as follows that matched the documentation, so I uncommented them: key_file = "/etc/pki/libvirt/private/serverkey.pem" cert_file = "/etc/pki/libvirt/servercert.pem" ca_file = "/etc/pki/CA/cacert.pem" #crl_file = "/etc/pki/CA/crl.pem" Note: I did not uncomment the CRL_FILE path as I do not want to use a CRL at this time 3. On the server I execute "libvirtd -listen -verbose" (libvirtd output) attached 4. virt-manager 0.5.4 (as root) , File, Open Connection Hypervisor: Xen Connection: Remote SSL/TLS with x509 certificate Hostname: vxen-01.aenigmacorp.com (I have a host entry for this machine) The virt-manager console reports "unable to open a connection to the libvirt management daemon". Verify that the "libvirtd" daemon has been started. Then, in details there is a lot of info (see virt-manager output) 5. If I tail /root/.virt-manager/virt-manager.log I get the following output (see virt-manager.log) That about sums it up. I have not read any instructions that ask me to copy the CA root certificate to the client, is that required? And if so where would I put it. Also, whenever I attempt to connect there are no errors appearing in the libvirtd output, which is a bit surprising. I would have expected that by using -verbose on the libvirtd command line that i would see more info. Lin 94 in the libvirt.py script is definitely trying to do some kind of authentication but I don't really know what to do to troubleshot this next? I still don't know if my issue is related to the client or the server? Any advice would be greatly appreciated. Many thanks Geoff Wiener

2 2

[libvirt] [PATCH] qemuDriver: check for migrate command
by Guido Günther 24 Jul '08

24 Jul '08

Hi, qemu doesn't know about "migrate" used to save a qemu/kvm domain. Current CVS fails silently - this patch checks if the command if available. Cheers, -- Guido

3 2

[libvirt] xml format for openvz driver
by Evgeniy Sokolov 24 Jul '08

24 Jul '08

Hello! I made review of domain XML format for driver in libvirt. And I have several questions and additions. For tag domain: need to add "vmid" or "id" - currenly tag "name" is used for ID. OpenVZ has mandatory parameter ID, but it also support optional parameter "name", which is not implemented for openvz driver now. I plan to support of "name" in future. For tag domain/os: need to add "ostemplate" desirable "config" For tag domain/devices/disk: need to add "diskspace" desirable "diskinodes" - it is optional because of "disknodes" are over very rarely. For tag domain/devices/interface: How to describe, if want to add ip addresses for routing network? Also, OpenVZ may move network adapter to VM (for example, eth1), adapter becomes inaccessible on harware node. How to describe it? Is it ethernet type? Thanks! Evgeniy

3 10

[libvirt] [FeatureRequest/RFC] non-volitile domain defines
by Stefan de Konink 23 Jul '08

23 Jul '08

I think I have already sent an email about this to the list, but no reply on this specific point. Libvirt is currently capable of storing storage, networks, the only thing that is really missing is the direct storage of domains. I wonder if a patch would be accepted that stores defined domains (live) to disk upon change. Some sort of dumpxml per define/attach/etc. when a domain is undefined the file is removed. Stefan

3 9

[libvirt] [PATCH] repeat lookup by name in LookupByID
by Evgeniy Sokolov 22 Jul '08

22 Jul '08

There was error every time when I undefine stoped container "no domain with matching id". Bug arrise due to stoped container has ID = -1. In such case container will be searched by name. other: use VIR_ERR_NO_DOMAIN when domain is not found

4 13

[libvirt] virbr0 bridge delay
by Richard W.M. Jones 22 Jul '08

22 Jul '08

https://www.redhat.com/archives/fedora-devel-list/2008-July/msg01254.html https://www.redhat.com/archives/fedora-devel-list/2008-July/msg01258.html Since we know [or do we?] that virbr0 is only connected to end systems, not to other bridges, should we do the brctl set command suggested above inside libvirt? Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 59 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

1 0

[libvirt] Release of libvirt-java-0.2.0
by Daniel Veillard 22 Jul '08

22 Jul '08

Okay I made a new release with the API renaming changes we discussed previously. It is available at the usual place: ftp://libvirt.org/libvirt/java/ I also built it for Fedora-9, it should be available for testing there soon too. There is still a few issues, for example I get an out of bound exception error when running the test.java, looks like a pointer/integer conversion error when using the authentification callbacks (I realize i may have left a couple of debug statement in the JNI C file there). In general I'm not sure the jlong VDP cast trick will always work, it looks a bit unsafe but that's an implementation detail it should not affect the API. I tried to incorporate some solaris fixes from John Levon, but i can't garantee it's all fixed (well not the warnings due to the VDP cast) So this is a good version for testing, feedback, patches and expertise much welcome, as I'm sort of a Java newbie ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 5

[libvirt] Re: ruby-libvirt on debian based systems
by Tom Verhaeghe 22 Jul '08

22 Jul '08

Yes it does, it works like a train on rails 2.0.2 & ruby 1.8.6 I'll keep you in touch if anything goes wrong On Tue, Jul 22, 2008 at 1:19 AM, David Lutterkort <dlutter(a)redhat.com> wrote: > On Mon, 2008-07-21 at 16:48 +0200, Tom Verhaeghe wrote: > > Solved, i had to install libxen3-dev in order to make it work. > > I assume that that contains the pkgconfig for libvirt; the extconf.rb in > ruby-libvirt needs that. > > With that ruby-libvirt works fine on Ubuntu ? I am glad to hear that. > > David > > > >

1 0

[libvirt] ruby-libvirt on debian based systems
by Tom Verhaeghe 22 Jul '08

22 Jul '08

Hello I don't know if ruby-libvirt can work in a debian-based environment. I installed kvm, libvirt, RoR, etc on Ubuntu and it all works fine. I pasted the output when installing the gem below. I think the problem could be that libvirt is called differently in Ubuntu or stored on a different location. Is there a way to get around? Thanks in advance Tom Building native extensions. This could take a while... ERROR: While executing gem ... (RuntimeError) Error instaling ruby-libvirt-0.0.7.gem: ERROR: Failed to build gem native extension. ruby extconf.rb install ruby-libvirt-0.0.7.gem *** extconf.rb failed *** Could not create Makefile due to some reason, probably lack of necessary libraries and/or headers. Check the mkmf.log file for more details. You may need configuration options. Provided configuration options: --with-opt-dir --without-opt-dir --with-opt-include --without-opt-include=${opt-dir}/include --with-opt-lib --without-opt-lib=${opt-dir}/lib --with-make-prog --without-make-prog --srcdir=. --curdir --ruby=/usr/bin/ruby1.8 --with-_libvirt-dir --without-_libvirt-dir --with-_libvirt-include --without-_libvirt-include=${_libvirt-dir}/include --with-_libvirt-lib --without-_libvirt-lib=${_libvirt-dir}/lib --with-libvirt-config --without-libvirt-config --with-pkg-config --without-pkg-config extconf.rb:16: libvirt not found (RuntimeError) Gem files will remain installed in /var/lib/gems/1.8/gems/ruby-libvirt-0.0.7 for inspection. Results logged to /var/lib/gems/1.8/gems/ruby-libvirt-0.0.7/ext/libvirt/gem_make.out

2 2

[libvirt] Problem building RPM on x86_64
by Darryl L. Pierce 21 Jul '08

21 Jul '08

I'm hitting the following problem while building an RPM for x86_64: (mcpierce@dpierce-dev:libvirt)$ make rpm Making clean in po make[1]: Entering directory `/home/mcpierce/Programming/libvirt/po' rm -f *.insert-header rm -f remove-potcdate.sed rm -f stamp-poT rm -f core core.* libvirt.po libvirt.1po libvirt.2po *.new.po rm -fr *.o ... make[2]: Leaving directory `/home/mcpierce/Programming/libvirt/gnulib/tests' make[2]: Entering directory `/home/mcpierce/Programming/libvirt/python' make[2]: *** No rule to make target `libvirt-py.c', needed by `distdir'. Stop. make[2]: Leaving directory `/home/mcpierce/Programming/libvirt/python' make[1]: *** [distdir] Error 1 make[1]: Leaving directory `/home/mcpierce/Programming/libvirt' make: *** [rpm] Error 2 However, on i386 the build works just fine. -- Darryl L. Pierce, Sr. Software Engineer Red Hat, Inc. - http://www.redhat.com/ oVirt - Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?"

3 7

[libvirt] [PATCH] parse container id in separate function
by Evgeniy Sokolov 21 Jul '08

21 Jul '08

There were several places with parsing container id from code. Separate function is used now.

3 8

[libvirt] Re: make fails (Kenneth Nagin)
by Kenneth Nagin 21 Jul '08

21 Jul '08

>I downloaded the latest libvirt and tried to make it but received this >error message: >make: *** No rule to make target `gnulib/m4/onceonly_2_57.m4', needed by >`Makefile.in'. Stop. The problem was related to running ./autogen.sh --prefix=$HOME/usr. I didn't notice that it did not run correctly. It requires the install gettext-devel which does not come automatically with fedora. But now the make fails due to an i386 / i386:x86-64 incompatibility. These are the error messages: /usr/bin/ld: i386 architecture of input file `.libs/libvirt_la-openvz_conf.o' is incompatible with i386:x86-64 output /usr/bin/ld: i386 architecture of input file `.libs/libvirt_la-openvz_driver.o' is incompatible with i386:x86-64 output collect2: ld returned 1 exit status make[2]: *** [libvirt.la] Error 1 make[2]: Leaving directory `/home/nagin/workspace/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/nagin/workspace/libvirt' make: *** [all] Error 2 -- Kenneth Nagin

3 4

[libvirt] leak? xenUnifiedOpen
by Stefan de Konink 21 Jul '08

21 Jul '08

==5486== 184 bytes in 1 blocks are definitely lost in loss record 5 of 18 ==5486== at 0x4C20111: calloc (vg_replace_malloc.c:397) ==5486== by 0x4E3ADFD: __virAlloc (memory.c:100) ==5486== by 0x4E4AF21: xenUnifiedOpen (xen_unified.c:264) ==5486== by 0x4E3A005: do_open (libvirt.c:777) ==5486== by 0x4009D7: main (in /home/skinkie/development/htdocs/cherokee/experiment) Maybe valgrind is over active, because I see the free code at the close connection, and my own code is closing it... Stefan

3 5

[libvirt] [PATCH] cpu usage in OpenVZ
by Evgeniy Sokolov 21 Jul '08

21 Jul '08

OpenVZ calculate statistics and allow to get them . Added function for getting cpu usage of container.

3 3

[libvirt] [PATCH] configure.in: make --with-xen-distdir work for 64bit xen too
by David Lively 21 Jul '08

21 Jul '08

Currently running autogen.sh with --with-xen-distdir=something fails to find libxenstore if there's only a 64-bit version, and subsequently fails to enable xen support (i.e., ends up with WITH_XEN=0). This one-line patch fixes that by telling it to search both lib and lib64. I guess it would be better to search only the appropriate directory (lib OR lib64) rather than both, but I'm not sure (being an autoconf-dummy) how to ask about the target architecture. Dave configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[libvirt] [PATCH] fix lookup
by Evgeniy Sokolov 21 Jul '08

21 Jul '08

I am often catching error related with that stoped VM has ID = -1. 1. If I create/define VM with existing ID of stoped VM. Creation failed, but error message is wrong. Detection is fixed. 2. Dominfo command may show info about some another VM. And report error that can't get autostart state. Current patch shoud fix problems.

3 2

[libvirt] make fails
by Kenneth Nagin 20 Jul '08

20 Jul '08

I downloaded the latest libvirt and tried to make it but received this error message: make: *** No rule to make target `gnulib/m4/onceonly_2_57.m4', needed by `Makefile.in'. Stop. Kenneth Nagin

1 0

[libvirt] Inconsistency with documentation virDomainGetMaxMemory(NULL)
by Stefan de Konink 19 Jul '08

19 Jul '08

I was making a some test code to checkout some code before I start on my brand new Invite/Tender cluster distribution engine(tm ;) From docs: Retrieve the maximum amount of physical memory allocated to a domain. If domain is NULL, then this get the amount of memory reserved to Domain0 i.e. the domain where the application runs. skinkie@xenapi ~/development/htdocs/cherokee $ ./experiment libvir: Domain error : invalid domain pointer in virDomainGetMaxMemory 0 262144 Code: printf("%ld\n", virDomainGetMaxMemory(NULL)); virDomainPtr domu = virDomainLookupByName(conn, "klant1_gentoo"); printf("%ld\n", virDomainGetMaxMemory(domu)); virDomainFree(domu); Stefan

1 3

[libvirt] [PATCH] remove unnecessary "V = NULL; " stmts after VIR_FREE(V)
by Jim Meyering 19 Jul '08

19 Jul '08

Doing a review (in progress), I spotted one of these, so went in search of others. They're harmless, so this is more a heads up than anything else. I am happy to defer application until the patch queue has been reduced. >From d97af7667699529c216835d806d1f0c6f698a70d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 17 Jul 2008 12:05:44 +0200 Subject: [PATCH] remove unnecessary "V = NULL;" stmts after VIR_FREE(V) * src/domain_conf.c (virDomainChrDefParseXML) (virDomainNetDefParseXML): Likewise. * src/iptables.c (iptRuleFree): Likewise. * src/storage_backend.c (virStorageBackendRunProgRegex): Likewise. * src/test.c (testOpenFromFile): Likewise. * src/xm_internal.c (xenXMAttachInterface): Likewise. * src/xml.c (virDomainParseXMLOSDescHVM): Likewise. * src/xmlrpc.c (xmlRpcCallRaw): Likewise. --- src/domain_conf.c | 5 +---- src/iptables.c | 2 -- src/storage_backend.c | 4 +--- src/test.c | 8 ++------ src/xm_internal.c | 1 - src/xml.c | 1 - src/xmlrpc.c | 1 - 7 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 82c0ee6..6340c2a 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -696,7 +696,6 @@ virDomainNetDefParseXML(virConnectPtr conn, if (STRPREFIX((const char*)ifname, "vnet")) { /* An auto-generated target name, blank it out */ VIR_FREE(ifname); - ifname = NULL; } } else if ((script == NULL) && (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET) && @@ -954,10 +953,8 @@ virDomainChrDefParseXML(virConnectPtr conn, bindService = virXMLPropString(cur, "service"); } - if (def->type == VIR_DOMAIN_CHR_TYPE_UDP) { + if (def->type == VIR_DOMAIN_CHR_TYPE_UDP) VIR_FREE(mode); - mode = NULL; - } } } else if (xmlStrEqual(cur->name, BAD_CAST "protocol")) { if (protocol == NULL) diff --git a/src/iptables.c b/src/iptables.c index e7613e2..3e3a1a2 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -266,14 +266,12 @@ static void iptRuleFree(iptRule *rule) { VIR_FREE(rule->rule); - rule->rule = NULL; if (rule->argv) { int i = 0; while (rule->argv[i]) VIR_FREE(rule->argv[i++]); VIR_FREE(rule->argv); - rule->argv = NULL; } } diff --git a/src/storage_backend.c b/src/storage_backend.c index 3e4e39c..a164a08 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -444,10 +444,8 @@ virStorageBackendRunProgRegex(virConnectPtr conn, goto cleanup; /* Release matches & restart to matching the first regex */ - for (j = 0 ; j < totgroups ; j++) { + for (j = 0 ; j < totgroups ; j++) VIR_FREE(groups[j]); - groups[j] = NULL; - } maxReg = 0; ngroup = 0; } diff --git a/src/test.c b/src/test.c index d0bb003..b7b9df0 100644 --- a/src/test.c +++ b/src/test.c @@ -461,10 +461,8 @@ static int testOpenFromFile(virConnectPtr conn, dom->def->id = privconn->nextDomID++; dom->persistent = 1; } - if (domains != NULL) { + if (domains != NULL) VIR_FREE(domains); - domains = NULL; - } ret = virXPathNodeSet("/node/network", ctxt, &networks); if (ret < 0) { @@ -498,10 +496,8 @@ static int testOpenFromFile(virConnectPtr conn, net->persistent = 1; } - if (networks != NULL) { + if (networks != NULL) VIR_FREE(networks); - networks = NULL; - } xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); diff --git a/src/xm_internal.c b/src/xm_internal.c index 3b264a8..60f32fe 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2925,7 +2925,6 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, if (virMacAddrCompare (dommac, (const char *) mac) == 0) { if (autoassign) { VIR_FREE(mac); - mac = NULL; if (!(mac = (xmlChar *)xenXMAutoAssignMac())) goto cleanup; /* initialize the list */ diff --git a/src/xml.c b/src/xml.c index d5730ed..477d466 100644 --- a/src/xml.c +++ b/src/xml.c @@ -1200,7 +1200,6 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, xmlFree(bus); } VIR_FREE(nodes); - nodes = NULL; } cur = virXPathNode("/domain/devices/parallel[1]", ctxt); diff --git a/src/xmlrpc.c b/src/xmlrpc.c index d627607..cbca389 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -443,7 +443,6 @@ static char *xmlRpcCallRaw(const char *url, const char *request) if (ret != len) { errno = EINVAL; VIR_FREE(response); - response = NULL; xmlRpcError(VIR_ERR_POST_FAILED, _("read response"), 0); } -- 1.5.6.3.385.g9f9af

2 2

[libvirt] Libvirtd default.xml (in qemu/networks/autostart) breaks XEN
by Stefan de Konink 18 Jul '08

18 Jul '08

The desire to automatically install the autostarted network configuration of libvirt broke my (and some other users on xen-users) setup. I suggest to *remove* this network configuration as default and *not* put it into xenstore as a stateful config. *It does not work by default* Worse is that it is almost impossible to debug if you don't know where to find it. Stefan

2 5

[libvirt] virStorageVolCreateXML vs virStorageVolCloneXML
by Stefan de Konink 18 Jul '08

18 Jul '08

Hi, There is currently no implementation in the api to clone snapshots or images. I wonder if we could add an XML node to specify a backed device. Or add a new function that allows to clone. Like the create is not supported by all pools, cloning should also be based on best effort, falling back to cp for non sparse images. (Probably a good configuration option) Now the new XML parser is in place I have still the desire to create this type of configuration: <disk type='pool'> <source pool='netapp' volume='lun-3' /> <target dev='xvda'/> </disk> And it might be a useful source tag for cloning too. Stefan

2 2

[libvirt] [PATCH]: Add floppy support to xm_internal
by Chris Lalancette 18 Jul '08

18 Jul '08

Yes, you read the subject right; add floppy support to xm internal. Let's just say I didn't do this by choice. In any case, there was a cryptic comment in xenXMParseXMLDisks() that said: /* Xend (all versions) put the floppy device config * under the hvm (image (os)) block */ What this actually means is that we shouldn't parse the floppy stuff to put it in the "disks =" section of the /etc/xen configuration file, since it doesn't have meaning there. Instead, floppy disks go at the top-level of a Xen config file, like: fda = '/var/lib/xen/images/floppy.img' fdb = '/var/lib/xen/images/floppy2.img' That's exactly what this patch does. In combination with a couple of other small patches to virt-install (which I will post to the appropriate list), I was able to use a floppy disk to hold the kickstart for a fully virtualized Xen guest install. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 4

[libvirt] RFC? finding potential storage pool resources
by David Lively 18 Jul '08

18 Jul '08

Hi - I'm looking into using (which I think means extending) libvirt to enumerate "potential" storage pool resources, in particular: * existing physical disk device names (for creating "disk" pools) * existing logical volume group names (for creating "logical" pools) Note that List{Defined,Active}StorageGroups don't do the trick. Suppose this is a new host and I'm trying to start defining the storage pools (and I want to be able to use existing volume groups, for example). I don't see how to do that within the current libvirt framework. If I'm missing something, please let me know (and ignore the rest of this message ...). This could be done by adding some new calls like: int virConnectListPhysDisks(virConnectPtr conn, char ** const name, int maxnames) int virConnectListLogicalVolGroups(virConnectPtr conn, char ** const name, int maxnames) ... plus a pair of NumOf functions ... But these are each storage-driver specific. For example, if I'm not using the "logical" storage driver, I have no need (or means) of listing volume groups. So maybe it's cleaner to fold these two functions into one, now parameterized by storage driver type: int virConnectListStorageSources(virConnectPtr conn, const char *type, char ** const name, int maxnames) ... plus a NumOf function ... where <type> is one of the supported storage pool types. So, if <type> is "disk", ListStorageSources acts like ListPhysDisks, and if <type> is "logical", ListStorageSources acts like ListLogicalVolumeGroups, (and we return empty lists or some sort of "unsupported" error for any other types ... can't list all possible network servers, for instance). What do you all think? Thanks, Dave

2 2

[libvirt] attach device on a defined (non-active) vm
by Stefan de Konink 18 Jul '08

18 Jul '08

It seems that the attach device function really 'attaches' a (live) device to a non-active domain. Is this by design? Otherwise I would not have a clue how to interpreted this message: libvir: Xen Daemon error : POST operation failed: (xend.err 'Device /dev/xvdp (51952, tap) is already connected.') (when I try to start the domain) So what I did; I have created an empty domain without any devices. Loaded that and added a disk. Stefan

2 1

[libvirt] [PATCH] enable format-safety checks for virDomainReportError
by Jim Meyering 18 Jul '08

18 Jul '08

This enables format-safety checks for virDomainReportError, so that if you try to print e.g., an int via "%s", gcc will detect it. The Makefile.maint check ensures that all string arguments to virDomainReportError are marked for translation with _(...). >From 65c7fc8bdbf491a02d1d14fcdef429ba1c9e0dea Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 18 Jul 2008 12:46:38 +0200 Subject: [PATCH] enable format-safety checks for virDomainReportError * src/domain_conf.c (virDomainReportError): Declare using ATTRIBUTE_FORMAT(printf, 3, 4). * Makefile.maint (msg_gen_function): Add virDomainReportError. --- Makefile.maint | 1 + src/domain_conf.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 5da2984..03800f8 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -352,6 +352,7 @@ msg_gen_function += ReportError msg_gen_function += qemudReportError msg_gen_function += openvzLog msg_gen_function += openvzError +msg_gen_function += virDomainReportError # Uncomment the following and run "make syntax-check" to see diagnostics # that are not yet marked for translation, but that need to be rewritten diff --git a/src/domain_conf.c b/src/domain_conf.c index 82c0ee6..2ff5d1a 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -128,6 +128,10 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, static void virDomainReportError(virConnectPtr conn, int code, const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 3, 4); + +static void virDomainReportError(virConnectPtr conn, + int code, const char *fmt, ...) { va_list args; char errorMessage[1024]; -- 1.5.6.3.440.ge3a8d

2 2

[libvirt] [PATCH]: Add MIGRATE_LIVE definition to ruby-libvirt bindings
by Chris Lalancette 18 Jul '08

18 Jul '08

Attached is a trivial patch to add the MIGRATE_LIVE flag into the ruby-libvirt bindings. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 2

[libvirt] [PATCH] Fix pool-create for netfs format 'auto'
by Cole Robinson 17 Jul '08

17 Jul '08

Trying to pool-create a netfs pool with the format type 'auto' (as in, to autodetect the format) runs the command mount -t auto munged-source-path '-t auto' seems to do its job for regular file systems, but actually fails with nfs or cifs (I assume anything that required an external mount program). Strangely though, the command mount munged-source-path will do the right thing. The attached patch fixes the generated command to work in the above case, fully removing the '-t type' piece if auto is specified for a netfs pool. I tested the intended case, as well as regular fs pools format=auto, and netfs format=nfs, and all seemed to work fine. Thanks, Cole diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 9926493..f195034 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -487,7 +487,23 @@ static int virStorageBackendFileSystemMount(virConnectPtr conn, virStoragePoolObjPtr pool) { char *src; - const char *mntargv[] = { + const char **mntargv; + + /* 'mount -t auto' doesn't seem to auto determine nfs (or cifs), + * while plain 'mount' does. We have to craft separate argvs to + * accommodate this */ + int netauto = (pool->def->type == VIR_STORAGE_POOL_NETFS && + pool->def->source.format == VIR_STORAGE_POOL_NETFS_AUTO); + int source_index; + + const char *netfs_auto_argv[] = { + MOUNT, + NULL, /* source path */ + pool->def->target.path, + NULL, + }; + + const char *fs_argv[] = { MOUNT, "-t", pool->def->type == VIR_STORAGE_POOL_FS ? @@ -495,10 +511,20 @@ virStorageBackendFileSystemMount(virConnectPtr conn, pool->def->source.format) : virStorageBackendFileSystemNetPoolFormatToString(conn, pool->def->source.format), - NULL, /* Fill in shortly - careful not to add extra fields before this */ + NULL, /* Fill in shortly - careful not to add extra fields + before this */ pool->def->target.path, NULL, }; + + if (netauto) { + mntargv = netfs_auto_argv; + source_index = 1; + } else { + mntargv = fs_argv; + source_index = 3; + } + int ret; if (pool->def->type == VIR_STORAGE_POOL_NETFS) { @@ -543,7 +569,7 @@ virStorageBackendFileSystemMount(virConnectPtr conn, return -1; } } - mntargv[3] = src; + mntargv[source_index] = src; if (virRun(conn, (char**)mntargv, NULL) < 0) { VIR_FREE(src);

4 3

[libvirt] some unsorted questions
by Stefan de Konink 17 Jul '08

17 Jul '08

Hi, Currently I'm working on my webserver thingie. And I notice some annoying error messages. Generally I use a predefined host to do the basic setup of defining a domain. So a client can shoot its XML directly into a post request, or we set it up by parsing some parameters from the URI. Now personally I think it is smart to check if a domain is already defined, or in use. If this is not the case libvirtd and the client get this message: libvir: Xen Daemon error : GET operation failed: That doesn't seem to fit the scenario at all :) Why does lookupbyname behave so bad? Secondly; I am a bit distracted by the domids concept. These ids are not available before a domain is launched. I think it would be interesting to allow signed values. In this way the 'defined' not active domains would get a negative value and a running domain a positive value. (Dom0 gets 0) This would have far less implications than using an uuid through the codebase consistently (not speaking the about the extra overhead). If this gets implemented I would suggest a call that fetches all domains from a running system and not only the defined or only the active ones. Stefan

4 6

[libvirt] PATCH: 0/5: Refactoring LXC & switching to generic domain APIs
by Daniel P. Berrange 16 Jul '08

16 Jul '08

The following series of 5 patches perform some general re-factoring of the LXC driver, the relationship between libvirtd & the processes it spawns, and finally switches LXC over to the generic domain XML APIs. This is just basically 1 day's work, so its a little rough around the edges in places, but I can confim that the core functionality is still all operational - by which I mean, start, stop, list, console, & re-start of daemon. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 8

[libvirt] Updating xml (cmdline)
by Stefan de Konink 16 Jul '08

16 Jul '08

Hi, Is it possible to 'update' a defined domain before it is started. I have run into a chicken and egg problem related to the <cmdline> and the first ethernet interface, I cannot create the interface before I have a domain and visa versa. Stefan

2 1

[libvirt] PATCH: Bash auto-completion for virsh
by Daniel P. Berrange 16 Jul '08

16 Jul '08

Everyone[1] seems to be doing funky bash auto-completion for commands these days, so I thought I'd make a stab at doing something for virsh. First of all I needed the command line help in an easier format to deal with, so I've added virsh _complete-command commands|arguments|options eg, $ virsh _complete-command commands help attach-device attach-disk attach-interface autostart capabilities connect console ...snip rest... $ virsh _complete-command arguments vcpupin domain vcpu cpulist $ virsh _complete-command options -c --connect -r --readonly -d --debug -h --help -q --quiet -t --timing -l --log -v --version $ virsh _complete-command options net-list --inactive --all That's enough to get all the basic commands & options auto-completing. For the arguments though I wanted to be able to auto-complete domain names, ids and UUIDs. likewise for storage pools and networks. I also wanted to auto-complete connect URIs ,eg test://default, qemu:///system $ virsh _complete-domain ISCSIServer 35e5efcc-f6a3-b489-fc33-99f2e4792e6d untangle dc502cb8-4bdd-7a15-f35a-cf76287ea2bd VirtTest 82038f2a-1344-aaf7-1a85-2a7250be2076 xenner 18c23d31-4d74-0bff-986d-e4251d2a2ff0 And $ virsh _complete-uri test:///default qemu:///system lxc:/// For this latter command, I needed to add a new API /** * virConnectURIs: * uris: pointer to a list to be filled with URI strings * * This functions returns the list of available connection * URIs. The caller is responsible for freeing the returned * strings, and the array they're stored in. * * Returns the number of URIs in case of success or -1 in * case of error. */ int virConnectURIs(char ***uris); This simply calls the existing probe() method for each driver and stores the list of URIs returned. Finally to tie this all together simply needs a little helper script which by convention is added to the /etc/bash_completion.d/. On Fedora this isn't enable by default, so you have to turn it on with source /etc/bash_completion.d/virsh To your $HOME/.bashrc Daniel [1] For a definition of 'everyone' which includes git & mercurial b/src/virsh.bash | 79 +++++++ include/libvirt/libvirt.h | 1 include/libvirt/libvirt.h.in | 1 libvirt.spec.in | 1 src/Makefile.am | 10 src/libvirt.c | 54 +++++ src/libvirt_sym.version | 2 src/test.c | 6 src/virsh.c | 442 ++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 581 insertions(+), 15 deletions(-) diff -r f3413463b3ff include/libvirt/libvirt.h --- a/include/libvirt/libvirt.h Sun Jul 13 13:14:50 2008 +0100 +++ b/include/libvirt/libvirt.h Mon Jul 14 11:54:10 2008 +0100 @@ -397,6 +397,7 @@ virConnectAuthPtr auth, int flags); int virConnectClose (virConnectPtr conn); +int virConnectURIs (char ***uris); const char * virConnectGetType (virConnectPtr conn); int virConnectGetVersion (virConnectPtr conn, unsigned long *hvVer); diff -r f3413463b3ff include/libvirt/libvirt.h.in --- a/include/libvirt/libvirt.h.in Sun Jul 13 13:14:50 2008 +0100 +++ b/include/libvirt/libvirt.h.in Mon Jul 14 11:54:10 2008 +0100 @@ -397,6 +397,7 @@ virConnectAuthPtr auth, int flags); int virConnectClose (virConnectPtr conn); +int virConnectURIs (char ***uris); const char * virConnectGetType (virConnectPtr conn); int virConnectGetVersion (virConnectPtr conn, unsigned long *hvVer); diff -r f3413463b3ff libvirt.spec.in --- a/libvirt.spec.in Sun Jul 13 13:14:50 2008 +0100 +++ b/libvirt.spec.in Mon Jul 14 11:54:10 2008 +0100 @@ -227,6 +227,7 @@ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart +%{_sysconfdir}/bash_completion.d/virsh %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf diff -r f3413463b3ff src/Makefile.am --- a/src/Makefile.am Sun Jul 13 13:14:50 2008 +0100 +++ b/src/Makefile.am Mon Jul 14 11:54:10 2008 +0100 @@ -25,8 +25,9 @@ confdir = $(sysconfdir)/libvirt/ conf_DATA = qemu.conf +bashdir = $(sysconfdir)/bash_completion.d -EXTRA_DIST = libvirt_sym.version $(conf_DATA) +EXTRA_DIST = libvirt_sym.version $(conf_DATA) virsh.bash lib_LTLIBRARIES = libvirt.la @@ -153,7 +154,12 @@ endif # Create the /var/cache/libvirt directory when installing. -install-exec-local: +install-exec-local:: $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/libvirt + $(MKDIR_P) $(DESTDIR)$(bashdir) + $(INSTALL_SCRIPT) virsh.bash $(bashdir)/virsh + +uninstall-local:: + $(RM) -f $(bashdir)/virsh CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff -r f3413463b3ff src/libvirt.c --- a/src/libvirt.c Sun Jul 13 13:14:50 2008 +0100 +++ b/src/libvirt.c Mon Jul 14 11:54:10 2008 +0100 @@ -37,6 +37,7 @@ #include "uuid.h" #include "util.h" #include "test.h" +#include "memory.h" #include "xen_unified.h" #include "remote_internal.h" #include "qemu_driver.h" @@ -701,7 +702,8 @@ int probes = 0; for (i = 0; i < virDriverTabCount; i++) { if ((virDriverTab[i]->probe != NULL) && - ((latest = virDriverTab[i]->probe()) != NULL)) { + ((latest = virDriverTab[i]->probe()) != NULL) && + STRNEQ(latest, "test:///default")) { probes++; DEBUG("Probed %s", latest); @@ -946,6 +948,56 @@ if (virUnrefConnect(conn) < 0) return (-1); return (0); +} + + +/** + * virConnectURIs: + * uris: pointer to a list to be filled with URI strings + * + * This functions returns the list of available connection + * URIs. The caller is responsible for freeing the returned + * strings, and the array they're stored in. + * + * Returns the number of URIs in case of success or -1 in + * case of error. + */ +int +virConnectURIs(char ***uris) +{ + const char *uri; + char **ret = NULL; + int nuris = 0, i; + DEBUG("uris=%p", uris); + + if (!initialized) + if (virInitialize() < 0) + return -1; + + if (!uris) + return -1; + + for (i = 0; i < virDriverTabCount; i++) { + if ((virDriverTab[i]->probe != NULL) && + ((uri = virDriverTab[i]->probe()) != NULL)) { + if (VIR_REALLOC_N(ret, nuris + 1) < 0) + goto no_memory; + if ((ret[nuris++] = strdup(uri)) == NULL) + goto no_memory; + + DEBUG("Probed %s", uri); + } + } + + *uris = ret; + return (nuris); + +no_memory: + for (i = 0 ; i < nuris ; i++) + VIR_FREE(ret[i]); + VIR_FREE(ret); + virLibConnError(NULL, VIR_ERR_NO_MEMORY, NULL); + return -1; } /* Not for public use. This function is part of the internal diff -r f3413463b3ff src/libvirt_sym.version --- a/src/libvirt_sym.version Sun Jul 13 13:14:50 2008 +0100 +++ b/src/libvirt_sym.version Mon Jul 14 11:54:10 2008 +0100 @@ -5,7 +5,7 @@ virConnectOpenReadOnly; virConnectOpenAuth; virConnectAuthPtrDefault; - + virConnectURIs; virConnectClose; virConnectGetType; virConnectGetVersion; diff -r f3413463b3ff src/test.c --- a/src/test.c Sun Jul 13 13:14:50 2008 +0100 +++ b/src/test.c Mon Jul 14 11:54:10 2008 +0100 @@ -215,6 +215,10 @@ " </ip>" "</network>"; + +static const char *testProbe(void) { + return "test:///default"; +} static int testOpenDefault(virConnectPtr conn) { int u; @@ -1545,7 +1549,7 @@ VIR_DRV_TEST, "Test", LIBVIR_VERSION_NUMBER, - NULL, /* probe */ + testProbe, /* probe */ testOpen, /* open */ testClose, /* close */ NULL, /* supports_feature */ diff -r f3413463b3ff src/virsh.bash --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/virsh.bash Mon Jul 14 11:54:10 2008 +0100 @@ -0,0 +1,79 @@ + +_virsh() +{ + local cur prev cmd cmd_index arg arg_index i results + local virsh="$1" + local canonical=0 + + COMPREPLY=() + cur="$2" + prev="$3" + + if [[ $COMP_CWORD > 1 && ${COMP_WORDS[COMP_CWORD-1]} = '--connect' ]]; then + results="$("$virsh" _complete-uri)" || nets="" + fi + + if [ -z "$results" ]; then + # searching for the command name + for ((i=1; $i<=$COMP_CWORD; i++)); do + if [[ ${COMP_WORDS[i]} != -* ]]; then + if [[ ${COMP_WORDS[i-1]} != '--connect' ]]; then + if [[ $i < $COMP_CWORD ]]; then + cmd="${COMP_WORDS[i]}" + cmd_index=$i + arg_index=`expr $COMP_CWORD - $cmd_index` + break + fi + fi + fi + done + + if [[ "$cur" == -* ]]; then + # Generate args - global or command specific + results="$("$virsh" _complete-command options "$cmd")" + else + if [ -z "$cmd" ]; then + # No command set, so generate list of all commands + results="$("$virsh" _complete-command commands)" || commands="" + else + # Command set, to generate command specific args + n=0 + for i in "$("$virsh" _complete-command arguments "$cmd")" + do + n=`expr $n + 1` + if [ $n = $arg_index ]; then + arg=$i + break + fi + done + + case $arg in + file) + COMPREPLY=(${COMPREPLY[@]:-} $(compgen -o "default" -- "$cur")) + ;; + + domain) + results="$("$virsh" _complete-domain)" || doms="" + ;; + + network) + results="$("$virsh" _complete-network)" || nets="" + ;; + + pool) + results="$("$virsh" _complete-pool)" || nets="" + ;; + + uri) + results="$("$virsh" _complete-uri)" || nets="" + ;; + esac + fi + fi + fi + if [ ! -z "$results" ]; then + COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$results' -- "$cur")) + fi +} + +complete -F _virsh virsh diff -r f3413463b3ff src/virsh.c --- a/src/virsh.c Sun Jul 13 13:14:50 2008 +0100 +++ b/src/virsh.c Mon Jul 14 11:54:10 2008 +0100 @@ -329,6 +329,409 @@ * --------------- */ + + +/* + * "_compcmds" command + */ +static vshCmdInfo info_compcommand[] = { + {"syntax", "_complete-command [commands|arguments|options] [<command>]"}, + {"help", gettext_noop("print shell completion data")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of commands.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compcommand[] = { + {"type", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("type of data")}, + {"cmd", VSH_OT_DATA, 0, gettext_noop("command name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdCompCommand(vshControl * ctl, vshCmd * cmd) +{ + const char *type = vshCommandOptString(cmd, "type", NULL); + const char *name = vshCommandOptString(cmd, "cmd", NULL); + + if (STREQ(type, "commands")) { + vshCmdDef *def; + for (def = commands; def->name; def++) + if (def->name[0] != '_') + vshPrint(ctl, "%s\n", def->name); + } else if (STREQ(type, "options")) { + if (name) { + vshCmdDef *def = vshCmddefSearch(name); + if (!def) { + vshError(ctl, FALSE, _("command '%s' doesn't exist"), name); + return FALSE; + } else if (def->opts) { + vshCmdOptDef *opt; + for (opt = def->opts; opt->name; opt++) + if (opt->type == VSH_OT_BOOL || + opt->type == VSH_OT_INT || + opt->type == VSH_OT_STRING) + vshPrint(ctl, "--%s\n", opt->name); + } + } else { + vshPrint(ctl, + "-c\n--connect\n" + "-r\n--readonly\n" + "-d\n--debug\n" + "-h\n--help\n" + "-q\n--quiet\n" + "-t\n--timing\n" + "-l\n--log\n" + "-v\n--version\n"); + } + } else if (STREQ(type, "arguments")) { + if (!name) { + vshError(ctl, FALSE, "%s", _("no command specified")); + return FALSE; + } else { + vshCmdDef *def = vshCmddefSearch(name); + if (!def) { + vshError(ctl, FALSE, _("command '%s' doesn't exist"), name); + return FALSE; + } else if (def->opts) { + vshCmdOptDef *opt; + for (opt = def->opts; opt->name; opt++) + if (opt->type == VSH_OT_DATA) + vshPrint(ctl, "%s\n", opt->name); + } + } + } + return TRUE; +} + +/* + * "_compuris" command + */ +static vshCmdInfo info_compuri[] = { + {"syntax", "_complete-uri"}, + {"help", gettext_noop("print shell completion data for URIs")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of URIs.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compuri[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompUri(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + char **uris = NULL; + int nuris, i; + + nuris = virConnectURIs(&uris); + if (nuris < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list connection URIs")); + return FALSE; + } + for (i = 0 ; i < nuris ; i++) { + vshPrint(ctl, "%s\n", uris[i]); + free(uris[i]); + } + + free(uris); + return TRUE; +} +/* + * "_compdomains" command + */ +static vshCmdInfo info_compdomain[] = { + {"syntax", "_complete-domain"}, + {"help", gettext_noop("print shell completion data for domains")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of domains.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compdomain[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompDomain(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + int *ids = NULL; + char **names = NULL; + int maxname = 0, maxid = 0, i; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + maxid = virConnectNumOfDomains(ctl->conn); + if (maxid < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active domains")); + return FALSE; + } + if (maxid) { + ids = vshMalloc(ctl, sizeof(int) * maxid); + + if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active domains")); + free(ids); + return FALSE; + } + + qsort(&ids[0], maxid, sizeof(int), idsorter); + } + maxname = virConnectNumOfDefinedDomains(ctl->conn); + if (maxname < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); + free(ids); + return FALSE; + } + if (maxname) { + names = vshMalloc(ctl, sizeof(char *) * maxname); + + if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); + free(ids); + free(names); + return FALSE; + } + + qsort(&names[0], maxname, sizeof(char*), namesorter); + } + + for (i = 0; i < maxid; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); + /* this kind of work with domains is not atomic operation */ + if (!dom) + continue; + virDomainGetUUIDString(dom, uuid); + vshPrint(ctl, "%d\n%s\n%s\n", + virDomainGetID(dom), + virDomainGetName(dom), + uuid); + virDomainFree(dom); + } + for (i = 0; i < maxname; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virDomainPtr dom = virDomainLookupByName(ctl->conn, names[i]); + + /* this kind of work with domains is not atomic operation */ + if (!dom) { + free(names[i]); + continue; + } + virDomainGetUUIDString(dom, uuid); + vshPrint(ctl, "%s\n%s\n", + virDomainGetName(dom), + uuid); + virDomainFree(dom); + free(names[i]); + } + free(ids); + free(names); + return TRUE; +} + +/* + * "_compnetworks" command + */ +static vshCmdInfo info_compnetwork[] = { + {"syntax", "_complete-network"}, + {"help", gettext_noop("print shell completion data for networks")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of networks.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compnetwork[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompNetwork(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + char **activeNames = NULL, **inactiveNames = NULL; + int maxactive = 0, maxinactive = 0, i; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + maxactive = virConnectNumOfNetworks(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active networks")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListNetworks(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active networks")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + + for (i = 0; i < maxactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virNetworkPtr network = virNetworkLookupByName(ctl->conn, activeNames[i]); + + /* this kind of work with networks is not atomic operation */ + if (!network) { + free(activeNames[i]); + continue; + } + virNetworkGetUUIDString(network, uuid); + vshPrint(ctl, "%s\n%s\n", + virNetworkGetName(network), + uuid); + virNetworkFree(network); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); + + /* this kind of work with networks is not atomic operation */ + if (!network) { + free(inactiveNames[i]); + continue; + } + virNetworkGetUUIDString(network, uuid); + vshPrint(ctl, "%s\n%s\n", + virNetworkGetName(network), + uuid); + + virNetworkFree(network); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + + return TRUE; +} + + +/* + * "_comppools" command + */ +static vshCmdInfo info_comppool[] = { + {"syntax", "_complete-pool"}, + {"help", gettext_noop("print shell completion data for pools")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of pools.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_comppool[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompPool(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + char **activeNames = NULL, **inactiveNames = NULL; + int maxactive = 0, maxinactive = 0, i; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + maxactive = virConnectNumOfStoragePools(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active pools")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListStoragePools(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active pools")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + maxinactive = virConnectNumOfDefinedStoragePools(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive pools")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedStoragePools(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive pools")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + + for (i = 0; i < maxactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, activeNames[i]); + + /* this kind of work with pools is not atomic operation */ + if (!pool) { + free(activeNames[i]); + continue; + } + virStoragePoolGetUUIDString(pool, uuid); + vshPrint(ctl, "%s\n%s\n", + virStoragePoolGetName(pool), + uuid); + virStoragePoolFree(pool); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, inactiveNames[i]); + + /* this kind of work with pools is not atomic operation */ + if (!pool) { + free(inactiveNames[i]); + continue; + } + virStoragePoolGetUUIDString(pool, uuid); + vshPrint(ctl, "%s\n%s\n", + virStoragePoolGetName(pool), + uuid); + + virStoragePoolFree(pool); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + + return TRUE; +} + + /* * "help" command */ @@ -355,8 +758,9 @@ vshPrint(ctl, "%s", _("Commands:\n\n")); for (def = commands; def->name; def++) - vshPrint(ctl, " %-15s %s\n", def->name, - N_(vshCmddefGetInfo(def, "help"))); + if (def->name[0] != '_') + vshPrint(ctl, " %-15s %s\n", def->name, + N_(vshCmddefGetInfo(def, "help"))); return TRUE; } return vshCmddefHelp(ctl, cmdname, FALSE); @@ -426,7 +830,7 @@ }; static vshCmdOptDef opts_connect[] = { - {"name", VSH_OT_DATA, 0, gettext_noop("hypervisor connection URI")}, + {"uri", VSH_OT_DATA, 0, gettext_noop("hypervisor connection URI")}, {"readonly", VSH_OT_BOOL, 0, gettext_noop("read-only connection")}, {NULL, 0, 0, NULL} }; @@ -446,7 +850,7 @@ } free(ctl->name); - ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "name", NULL)); + ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "uri", NULL)); if (!ro) { ctl->conn = virConnectOpen(ctl->name); @@ -1004,7 +1408,7 @@ }; static vshCmdOptDef opts_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, {NULL, 0, 0, NULL} }; @@ -1017,7 +1421,7 @@ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, VSH_BYNAME))) return FALSE; if (virDomainGetID(dom) != (unsigned int)-1) { @@ -2650,7 +3054,7 @@ }; static vshCmdOptDef opts_network_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, {NULL, 0, 0, NULL} }; @@ -2663,7 +3067,7 @@ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetworkBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(network = vshCommandOptNetworkBy(ctl, cmd, "network", NULL, VSH_BYNAME))) return FALSE; if (virNetworkCreate(network) == 0) { @@ -3554,7 +3958,7 @@ }; static vshCmdOptDef opts_pool_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")}, + {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")}, {NULL, 0, 0, NULL} }; @@ -3567,7 +3971,7 @@ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(pool = vshCommandOptPoolBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME))) return FALSE; if (virStoragePoolCreate(pool, 0) == 0) { @@ -5074,6 +5478,12 @@ * Commands */ static vshCmdDef commands[] = { + {"_complete-command", cmdCompCommand, opts_compcommand, info_compcommand}, + {"_complete-uri", cmdCompUri, opts_compuri, info_compuri}, + {"_complete-domain", cmdCompDomain, opts_compdomain, info_compdomain}, + {"_complete-network", cmdCompNetwork, opts_compnetwork, info_compnetwork}, + {"_complete-pool", cmdCompPool, opts_comppool, info_comppool}, + {"help", cmdHelp, opts_help, info_help}, {"attach-device", cmdAttachDevice, opts_attach_device, info_attach_device}, {"attach-disk", cmdAttachDisk, opts_attach_disk, info_attach_disk}, @@ -6514,6 +6924,18 @@ ret = vshCommandParse(ctl, cmdstr); free(cmdstr); + + /* Special case 'help' to avoid virConnectOpen */ + if (ctl->cmd && + ctl->cmd->def && + ctl->cmd->def->name && + (STREQ(ctl->cmd->def->name, "help") || + STREQ(ctl->cmd->def->name, "_complete-command") || + STREQ(ctl->cmd->def->name, "_complete-uri"))) { + ret = vshCommandRun(ctl, ctl->cmd); + exit(ret ? EXIT_SUCCESS : EXIT_FAILURE); + } + return ret; } return TRUE; -- |: 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 4

[libvirt] [PATCH] cleanup functions which exec OpenVZ tools
by Evgeniy Sokolov 16 Jul '08

16 Jul '08

Patch improve code which execute external OpenVZ tools.

3 3

[libvirt] auto shutdown for qemu / kvm
by Matthias Pfafferodt 16 Jul '08

16 Jul '08

Hello, there is the possibility to autostart a (qemu/kvm) domain. If libvirtd is stopped this domain is killed and the filesystem is in a unclean state. I miss the possible of an 'autostop' option that will shutdown a (qemu/kvm) domain if libvirtd is stopped. I changed the init script of my system (opensuse 11.0) to implement the 'autostop' option. Is there a simpler solution? Do you have tips how to improve the script? Matthias ## Path: System/Virtualization ## Description: libvirtd stop configuration ## Type: yesno ## Default: yes # # On 'libvirtd stop' all running (kvm) domains are killed. If # LIBVIRTD_KVM_SHUTDOWN is set to 'yes' all running vm's are given time # for a gracefully shutdown. # LIBVIRTD_KVM_SHUTDOWN="yes" ## Path: System/Virtualization ## Description: libvirtd timeout ## Type: integer ## Default: 300 # # On 'libvirtd stop' the vm's are ask to shutdown. This optine gives the # maximum number of seconds the script will wait until libvirt is stopped. # LIBVIRTD_KVM_SHUTDOWN_MAXWAIT=300

2 2

[libvirt] static address assignment via dnsmasq
by Kurt Sussman 15 Jul '08

15 Jul '08

I want my VMs to be assigned static addresses by hostname. I would prefer to set up a generic way to configure dnsmasq, since I don't think this is the last thing I'll want to change about address assignment. I saw this patch from "Mads Chr. Olesen" https://www.redhat.com/archives/libvir-list/2008-April/msg00327.html But it seems like a lot of work to give access to only one dnsmasq option. I'm working on a patch that enables a dnsmasq.d directory where you can (optionally) put individual configuration files. I have not fully tested it yet, so please don't consider this an official submission. I also don't feel that I have spent enough time with the code to understand the 'philosphy' if you will, the guiding attitudes. Is the all-XML approach better according the libvirt developer community standards? If so, why? Thanks. Untested patch follows. Please let me know if I'm on the right path and if not, why. --Kurt diff -u /root/libvirt-0.4.4-virgin/src/qemu_driver.c ./qemu_driver.c --- /root/libvirt-0.4.4-virgin/src/qemu_driver.c 2008-06-12 07:52:53.000000000 -0700 +++ ./qemu_driver.c 2008-07-13 11:31:26.000000000 -0700 @@ -1048,6 +1048,7 @@ 1 + /* --bind-interfaces */ 2 + /* --pid-file "" */ 2 + /* --conf-file "" */ + 2 + /* --conf-dir DNSMASQCONF_DIR */ /*2 + *//* --interface virbr0 */ 2 + /* --except-interface lo */ 2 + /* --listen-address 10.0.0.1 */ @@ -1081,6 +1082,9 @@ APPEND_ARG(*argv, i++, "--conf-file"); APPEND_ARG(*argv, i++, ""); + APPEND_ARG(*argv, i++, "--conf-dir"); + APPEND_ARG(*argv, i++, DNSMASQCONF_DIR); + /* * XXX does not actually work, due to some kind of * race condition setting up ipv6 addresses on the diff -u /root/libvirt-0.4.4-virgin/src/qemu_driver.h ./qemu_driver.h --- /root/libvirt-0.4.4-virgin/src/qemu_driver.h 2008-04-23 07:19:02.000000000 -0700 +++ ./qemu_driver.h 2008-07-13 11:26:47.000000000 -0700 @@ -33,6 +33,8 @@ int qemudRegister(void); +#define DNSMASQCONF_DIR SYSCONF_DIR "/dnsmasq.d" + #endif /* WITH_QEMU */ #endif /* QEMUD_DRIVER_H */ -- ---------------------------------------------------------------------- Merlot Research Group, Inc kls[at]merlot.com "Quality is free, but only to those who are willing to pay heavily for it." (Lister, DeMarco: "Peopleware")

2 1

[libvirt] PATCH: Refactor LXC to remove some state from lxc_vm_t
by Daniel P. Berrange 14 Jul '08

14 Jul '08

I've been working on getting LXC ready to use the common XML routines. One of the first tasks is finding a way to remove some of the state stored in the lxc_vm_t struct, so it can be switched over to virDomainObj struct instead. This patch does some simple re-factoring of the way the TTYs and control socket are handled to prepare for the switchover. lxc_conf.c | 1 lxc_conf.h | 10 -- lxc_container.c | 61 +++++++--------- lxc_container.h | 14 +++ lxc_driver.c | 211 ++++++++++++++++---------------------------------------- 5 files changed, 103 insertions(+), 194 deletions(-) Daniel diff -r 6273f6456bd2 src/lxc_conf.c --- a/src/lxc_conf.c Sun Jul 13 10:33:25 2008 +0100 +++ b/src/lxc_conf.c Sun Jul 13 11:45:04 2008 +0100 @@ -1041,7 +1041,6 @@ void lxcFreeVM(lxc_vm_t *vm) { lxcFreeVMDef(vm->def); - VIR_FREE(vm->containerTty); VIR_FREE(vm); } diff -r 6273f6456bd2 src/lxc_conf.h --- a/src/lxc_conf.h Sun Jul 13 10:33:25 2008 +0100 +++ b/src/lxc_conf.h Sun Jul 13 11:45:04 2008 +0100 @@ -35,12 +35,6 @@ #define LXC_MAX_XML_LENGTH 16384 #define LXC_MAX_ERROR_LEN 1024 #define LXC_DOMAIN_TYPE "lxc" -#define LXC_PARENT_SOCKET 0 -#define LXC_CONTAINER_SOCKET 1 - -/* messages between parent and container */ -typedef char lxc_message_t; -#define LXC_CONTINUE_MSG 'c' /* types of networks for containers */ enum lxc_net_type { @@ -100,10 +94,6 @@ char ttyPidFile[PATH_MAX]; int parentTty; - int containerTtyFd; - char *containerTty; - - int sockpair[2]; lxc_vm_def_t *def; diff -r 6273f6456bd2 src/lxc_container.c --- a/src/lxc_container.c Sun Jul 13 10:33:25 2008 +0100 +++ b/src/lxc_container.c Sun Jul 13 11:45:04 2008 +0100 @@ -33,7 +33,6 @@ #include <unistd.h> #include "lxc_container.h" -#include "lxc_conf.h" #include "util.h" #include "memory.h" #include "veth.h" @@ -83,7 +82,7 @@ * * Returns 0 on success or -1 in case of error */ -static int lxcSetContainerStdio(const char *ttyName) +static int lxcSetContainerStdio(const char *ttyPath) { int rc = -1; int ttyfd; @@ -94,10 +93,10 @@ goto error_out; } - ttyfd = open(ttyName, O_RDWR|O_NOCTTY); + ttyfd = open(ttyPath, O_RDWR|O_NOCTTY); if (ttyfd < 0) { lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("open(%s) failed: %s"), ttyName, strerror(errno)); + _("open(%s) failed: %s"), ttyPath, strerror(errno)); goto error_out; } @@ -106,8 +105,6 @@ _("ioctl(TIOCSTTY) failed: %s"), strerror(errno)); goto cleanup; } - - close(0); close(1); close(2); if (dup2(ttyfd, 0) < 0) { lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -144,12 +141,18 @@ * * Returns 0 on success or -1 in case of error */ -static int lxcExecWithTty(lxc_vm_t *vm) +static int lxcExecWithTty(lxc_vm_def_t *vmDef, char *ttyPath) { int rc = -1; - lxc_vm_def_t *vmDef = vm->def; + int open_max, i; - if(lxcSetContainerStdio(vm->containerTty) < 0) { + /* Just in case someone forget to set FD_CLOEXEC, explicitly + * close all FDs before executing the container */ + open_max = sysconf (_SC_OPEN_MAX); + for (i = 0; i < open_max; i++) + close(i); + + if(lxcSetContainerStdio(ttyPath) < 0) { goto exit_with_error; } @@ -161,7 +164,7 @@ /** * lxcWaitForContinue: - * @vm: Pointer to vm structure + * @monitor: monitor FD from parent * * This function will wait for the container continue message from the * parent process. It will send this message on the socket pair stored in @@ -169,31 +172,23 @@ * * Returns 0 on success or -1 in case of error */ -static int lxcWaitForContinue(lxc_vm_t *vm) +static int lxcWaitForContinue(int monitor) { - int rc = -1; lxc_message_t msg; int readLen; - readLen = saferead(vm->sockpair[LXC_CONTAINER_SOCKET], &msg, sizeof(msg)); - if (readLen != sizeof(msg)) { + readLen = saferead(monitor, &msg, sizeof(msg)); + if (readLen != sizeof(msg) || + msg != LXC_CONTINUE_MSG) { lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Failed to read the container continue message: %s"), strerror(errno)); - goto error_out; + return -1; } DEBUG0("Received container continue message"); - close(vm->sockpair[LXC_PARENT_SOCKET]); - vm->sockpair[LXC_PARENT_SOCKET] = -1; - close(vm->sockpair[LXC_CONTAINER_SOCKET]); - vm->sockpair[LXC_CONTAINER_SOCKET] = -1; - - rc = 0; - -error_out: - return rc; + return 0; } /** @@ -204,12 +199,12 @@ * * Returns 0 on success or nonzero in case of error */ -static int lxcEnableInterfaces(const lxc_vm_t *vm) +static int lxcEnableInterfaces(const lxc_vm_def_t *def) { int rc = 0; const lxc_net_def_t *net; - for (net = vm->def->nets; net; net = net->next) { + for (net = def->nets; net; net = net->next) { DEBUG("Enabling %s", net->containerVeth); rc = vethInterfaceUpOrDown(net->containerVeth, 1); if (0 != rc) { @@ -218,7 +213,7 @@ } /* enable lo device only if there were other net devices */ - if (vm->def->nets) + if (def->nets) rc = vethInterfaceUpOrDown("lo", 1); error_out: @@ -237,11 +232,11 @@ * * Returns 0 on success or -1 in case of error */ -int lxcChild( void *argv ) +int lxcChild( void *data ) { int rc = -1; - lxc_vm_t *vm = (lxc_vm_t *)argv; - lxc_vm_def_t *vmDef = vm->def; + lxc_child_argv_t *argv = data; + lxc_vm_def_t *vmDef = argv->config; lxc_mount_t *curMount; int i; @@ -278,16 +273,16 @@ } /* Wait for interface devices to show up */ - if (0 != (rc = lxcWaitForContinue(vm))) { + if (0 != (rc = lxcWaitForContinue(argv->monitor))) { goto cleanup; } /* enable interfaces */ - if (0 != (rc = lxcEnableInterfaces(vm))) { + if (0 != (rc = lxcEnableInterfaces(vmDef))) { goto cleanup; } - rc = lxcExecWithTty(vm); + rc = lxcExecWithTty(vmDef, argv->ttyPath); /* this function will only return if an error occured */ cleanup: diff -r 6273f6456bd2 src/lxc_container.h --- a/src/lxc_container.h Sun Jul 13 10:33:25 2008 +0100 +++ b/src/lxc_container.h Sun Jul 13 11:45:04 2008 +0100 @@ -24,7 +24,21 @@ #ifndef LXC_CONTAINER_H #define LXC_CONTAINER_H +#include "lxc_conf.h" + #ifdef WITH_LXC + +typedef struct __lxc_child_argv lxc_child_argv_t; +struct __lxc_child_argv { + lxc_vm_def_t *config; + int monitor; + char *ttyPath; +}; + +/* messages between parent and container */ +typedef char lxc_message_t; +#define LXC_CONTINUE_MSG 'c' + /* Function declarations */ int lxcChild( void *argv ); diff -r 6273f6456bd2 src/lxc_driver.c --- a/src/lxc_driver.c Sun Jul 13 10:33:25 2008 +0100 +++ b/src/lxc_driver.c Sun Jul 13 11:45:04 2008 +0100 @@ -561,27 +561,23 @@ /** * lxcSendContainerContinue: - * @vm: pointer to virtual machine structure + * @monitor: FD for communicating with child * * Sends the continue message via the socket pair stored in the vm * structure. * * Returns 0 on success or -1 in case of error */ -static int lxcSendContainerContinue(const lxc_vm_t *vm) +static int lxcSendContainerContinue(virConnectPtr conn, + int monitor) { int rc = -1; lxc_message_t msg = LXC_CONTINUE_MSG; int writeCount = 0; - if (NULL == vm) { - goto error_out; - } - - writeCount = safewrite(vm->sockpair[LXC_PARENT_SOCKET], &msg, - sizeof(msg)); + writeCount = safewrite(monitor, &msg, sizeof(msg)); if (writeCount != sizeof(msg)) { - lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, _("unable to send container continue message: %s"), strerror(errno)); goto error_out; @@ -605,12 +601,15 @@ */ static int lxcStartContainer(virConnectPtr conn, lxc_driver_t* driver, - lxc_vm_t *vm) + lxc_vm_t *vm, + int monitor, + char *ttyPath) { int rc = -1; int flags; int stacksize = getpagesize() * 4; char *stack, *stacktop; + lxc_child_argv_t args = { vm->def, monitor, ttyPath }; /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) { @@ -625,7 +624,7 @@ if (vm->def->nets != NULL) flags |= CLONE_NEWNET; - vm->def->id = clone(lxcChild, stacktop, flags, (void *)vm); + vm->def->id = clone(lxcChild, stacktop, flags, &args); DEBUG("clone() returned, %d", vm->def->id); @@ -643,117 +642,9 @@ return rc; } -/** - * lxcPutTtyInRawMode: - * @conn: pointer to connection - * @ttyDev: file descriptor for tty - * - * Sets tty attributes via cfmakeraw() - * - * Returns 0 on success or -1 in case of error - */ -static int lxcPutTtyInRawMode(virConnectPtr conn, int ttyDev) -{ - int rc = -1; - - struct termios ttyAttr; - - if (tcgetattr(ttyDev, &ttyAttr) < 0) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - "tcgetattr() failed: %s", strerror(errno)); - goto cleanup; - } - - cfmakeraw(&ttyAttr); - - if (tcsetattr(ttyDev, TCSADRAIN, &ttyAttr) < 0) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - "tcsetattr failed: %s", strerror(errno)); - goto cleanup; - } - - rc = 0; - -cleanup: - return rc; -} /** - * lxcSetupTtyTunnel: - * @conn: pointer to connection - * @vmDef: pointer to virtual machine definition structure - * @ttyDev: pointer to int. On success will be set to fd for master - * end of tty - * - * Opens and configures the parent side tty - * - * Returns 0 on success or -1 in case of error - */ -static int lxcSetupTtyTunnel(virConnectPtr conn, - lxc_vm_def_t *vmDef, - int* ttyDev) -{ - int rc = -1; - char *ptsStr; - - if (0 < strlen(vmDef->tty)) { - *ttyDev = posix_openpt(O_RDWR|O_NOCTTY|O_NONBLOCK); - if (*ttyDev < 0) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - "open() tty failed: %s", strerror(errno)); - goto setup_complete; - } - - rc = grantpt(*ttyDev); - if (rc < 0) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - "grantpt() failed: %s", strerror(errno)); - goto setup_complete; - } - - rc = unlockpt(*ttyDev); - if (rc < 0) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - "unlockpt() failed: %s", strerror(errno)); - goto setup_complete; - } - - /* get the name and print it to stdout */ - ptsStr = ptsname(*ttyDev); - if (ptsStr == NULL) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - "ptsname() failed"); - goto setup_complete; - } - /* This value needs to be stored in the container configuration file */ - VIR_FREE(vmDef->tty); - if (!(vmDef->tty = strdup(ptsStr))) { - lxcError(conn, NULL, VIR_ERR_NO_MEMORY, - _("unable to get storage for vm tty name")); - goto setup_complete; - } - - /* Enter raw mode, so all characters are passed directly to child */ - if (lxcPutTtyInRawMode(conn, *ttyDev) < 0) { - goto setup_complete; - } - - } else { - *ttyDev = -1; - } - - rc = 0; - -setup_complete: - if((0 != rc) && (*ttyDev > 0)) { - close(*ttyDev); - } - - return rc; -} - -/** - * lxcSetupContainerTty: + * lxcOpenTty: * @conn: pointer to connection * @ttymaster: pointer to int. On success, set to fd for master end * @ttyName: On success, will point to string slave end of tty. Caller @@ -763,12 +654,12 @@ * * Returns 0 on success or -1 in case of error */ -static int lxcSetupContainerTty(virConnectPtr conn, - int *ttymaster, - char **ttyName) +static int lxcOpenTty(virConnectPtr conn, + int *ttymaster, + char **ttyName, + int rawmode) { int rc = -1; - char tempTtyName[PATH_MAX]; *ttymaster = posix_openpt(O_RDWR|O_NOCTTY|O_NONBLOCK); if (*ttymaster < 0) { @@ -783,27 +674,43 @@ goto cleanup; } - if (0 != ptsname_r(*ttymaster, tempTtyName, sizeof(tempTtyName))) { - lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - _("ptsname_r failed: %s"), strerror(errno)); - goto cleanup; + if (rawmode) { + struct termios ttyAttr; + if (tcgetattr(*ttymaster, &ttyAttr) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "tcgetattr() failed: %s", strerror(errno)); + goto cleanup; + } + + cfmakeraw(&ttyAttr); + + if (tcsetattr(*ttymaster, TCSADRAIN, &ttyAttr) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "tcsetattr failed: %s", strerror(errno)); + goto cleanup; + } } - if (VIR_ALLOC_N(*ttyName, strlen(tempTtyName) + 1) < 0) { - lxcError(conn, NULL, VIR_ERR_NO_MEMORY, - _("unable to allocate container name string")); - goto cleanup; + if (ttyName) { + char tempTtyName[PATH_MAX]; + if (0 != ptsname_r(*ttymaster, tempTtyName, sizeof(tempTtyName))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("ptsname_r failed: %s"), strerror(errno)); + goto cleanup; + } + + if ((*ttyName = strdup(tempTtyName)) == NULL) { + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, NULL); + goto cleanup; + } } - - strcpy(*ttyName, tempTtyName); rc = 0; cleanup: - if (0 != rc) { - if (-1 != *ttymaster) { - close(*ttymaster); - } + if (rc != 0 && + *ttymaster != -1) { + close(*ttymaster); } return rc; @@ -989,15 +896,18 @@ lxc_vm_t * vm) { int rc = -1; - lxc_vm_def_t *vmDef = vm->def; + int sockpair[2]; + int containerTty; + char *containerTtyPath = NULL; /* open parent tty */ - if (lxcSetupTtyTunnel(conn, vmDef, &vm->parentTty) < 0) { + VIR_FREE(vm->def->tty); + if (lxcOpenTty(conn, &vm->parentTty, &vm->def->tty, 1) < 0) { goto cleanup; } /* open container tty */ - if (lxcSetupContainerTty(conn, &(vm->containerTtyFd), &(vm->containerTty)) < 0) { + if (lxcOpenTty(conn, &containerTty, &containerTtyPath, 0) < 0) { goto cleanup; } @@ -1011,7 +921,7 @@ if (vm->pid == 0) { /* child process calls forward routine */ - lxcTtyForward(vm->parentTty, vm->containerTtyFd); + lxcTtyForward(vm->parentTty, containerTty); } if (lxcStoreTtyPid(driver, vm)) { @@ -1019,7 +929,7 @@ } close(vm->parentTty); - close(vm->containerTtyFd); + close(containerTty); if (0 != (rc = lxcSetupInterfaces(conn, vm))) { goto cleanup; @@ -1027,7 +937,7 @@ /* create a socket pair to send continue message to the container once */ /* we've completed the post clone configuration */ - if (0 != socketpair(PF_UNIX, SOCK_STREAM, 0, vm->sockpair)) { + if (0 != socketpair(PF_UNIX, SOCK_STREAM, 0, sockpair)) { lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, _("sockpair failed: %s"), strerror(errno)); goto cleanup; @@ -1035,7 +945,9 @@ /* check this rc */ - rc = lxcStartContainer(conn, driver, vm); + rc = lxcStartContainer(conn, driver, vm, + sockpair[1], + containerTtyPath); if (rc != 0) goto cleanup; @@ -1043,7 +955,7 @@ if (rc != 0) goto cleanup; - rc = lxcSendContainerContinue(vm); + rc = lxcSendContainerContinue(conn, sockpair[0]); if (rc != 0) goto cleanup; @@ -1052,10 +964,9 @@ driver->nactivevms++; cleanup: - close(vm->sockpair[LXC_PARENT_SOCKET]); - vm->sockpair[LXC_PARENT_SOCKET] = -1; - close(vm->sockpair[LXC_CONTAINER_SOCKET]); - vm->sockpair[LXC_CONTAINER_SOCKET] = -1; + close(sockpair[0]); + close(sockpair[1]); + VIR_FREE(containerTtyPath); return rc; } -- |: 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] save / restore for KVM
by Matthias Pfafferodt 12 Jul '08

12 Jul '08

Hello, I try to save a KVM domain which has its hard disk on a LVM volume. I can execute the command to save the domain but restore fails # virsh list Id Name State ---------------------------------- 3 kvm-linux03 running 4 kvm-linux01 running # virsh save kvm-linux01 ./kvm-linux01.ram Domain kvm-linux01 saved to ./kvm-linux01.ram # virsh list Id Name State ---------------------------------- 3 kvm-linux03 running # virsh restore ./kvm-linux01.ram libvir: QEMU error : operation failed: failed to start VM error: Failed to restore domain from ./kvm-linux01.ram I tried to save and restore this domain using kvm directly # /usr/bin/qemu-kvm -m 1024 -boot c -drive file=/dev/virtual/kvm_linux01,if=ide,index=0,boot=on -net nic,macaddr=00:16:3e:00:01:02,vlan=0 -net tap,fd=24,script=,vlan=0,ifname=vnet3 (qemu) savevm kvm-linux01.ram Device id0-hd0 does not support VM state snapshots (qemu) Here I get an error message which I also found on the qemu homepage: to save a qemu vm the hard disk must be a file using the qcow format. But in the libvirt documentation there is no hint to this limitation. Is it possible to save the state of a kvm vm using physical hard disks with libvirt? Kind regards Matthias Pfafferodt -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt <at> mapfa.de

3 4

[libvirt] [PATCH] default URI in probe
by Evgeniy Sokolov 11 Jul '08

11 Jul '08

I specified default URI in probe(). To use libvirt with OpenVZ: # ./configure --with-openvz # make # ./src/virsh list Id Name State ---------------------------------- 33 33 running 105 105 running 108 108 running

2 1

[libvirt] [PATCH] using one function to locate OpenVZ config files
by Evgeniy Sokolov 11 Jul '08

11 Jul '08

There were 3 places with the same code. I moved it to separate function. other: use O_RDONLY to read config file

2 1

[libvirt] bug in libvirt.c?
by Evgeniy Sokolov 10 Jul '08

10 Jul '08

for (i = 0; i < virNetworkDriverTabCount; i++) { if ((virDriverTab[i]->probe != NULL) && ((latest = virDriverTab[i]->probe()) != NULL)) { probes++; ..... } } We use array virDriverTab, but cicle is to virNetworkDriverTabCount which count number of virNetworkDriverTab drivers. I think virDriverTabCount should be used. Index: libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.147 diff -u -p -r1.147 libvirt.c --- libvirt.c 26 Jun 2008 09:37:51 -0000 1.147 +++ libvirt.c 10 Jul 2008 14:48:44 -0000 @@ -699,7 +699,7 @@ do_open (const char *name, const char *use = NULL; const char *latest; int probes = 0; - for (i = 0; i < virNetworkDriverTabCount; i++) { + for (i = 0; i < virDriverTabCount; i++) { if ((virDriverTab[i]->probe != NULL) && ((latest = virDriverTab[i]->probe()) != NULL)) { probes++;

3 2

[libvirt] [Patch] Libvirt & Autobuild
by Mohammed Morsi 10 Jul '08

10 Jul '08

Attached is a small fix to get libvirt working w/ autobuild. Autobuild attempts to create and test the RPM, which lists the PolicyKit as one of the files to be installed, and thus if it is not installed, autobuild reports an error and fails. The was to get this file installed is to specify --with-polkit to ./autogen which I added to the autobuild.sh build script. (also the syntax check errors broke autobuild, but these have been fixed according to the latest email on the list). Knock on wood, after this libvirt should work w/ autobuild and will be built nightly, and I can finish getting oVirt working with it. -Mo

2 3

[libvirt] PV loader in capabilities?
by John Levon 10 Jul '08

10 Jul '08

Why is it NULL instead of the path to pygrub? On Solaris, the path is different. regards john

3 4

[libvirt] [PATCH] fix diagnostic when execute openvz commands
by Evgeniy Sokolov 10 Jul '08

10 Jul '08

-- Evgeniy Sokolov

4 7

[libvirt] [PATCH] renaming error -> openvzError
by Evgeniy Sokolov 10 Jul '08

10 Jul '08

function error() was renamed to openvzError() to don't conflict with other functions with the same name. other - openvzError() is added to msg_gen_function - fixed to pass "make syntax-check" Thanks to Jim Meyering for review.

2 1

[libvirt] [PATCH] fix up dom-name validation
by John Levon 10 Jul '08

10 Jul '08

libvirt schema: improve domain name regex This regexp is based upon what xend actually allows, plus the existing &, which I presume is there for a reason. Signed-off-by: John Levon <john.levon> Index: docs/libvirt.rng =================================================================== RCS file: /data/cvs/libvirt/docs/libvirt.rng,v retrieving revision 1.8 diff -u -r1.8 libvirt.rng --- docs/libvirt.rng 8 Jul 2008 12:05:13 -0000 1.8 +++ docs/libvirt.rng 10 Jul 2008 04:04:58 -0000 @@ -840,7 +840,7 @@ </define> <define name='domainName'> <data type='string'> - <param name="pattern">[a-zA-Z0-9_\+\-&]+</param> + <param name="pattern">[A-Za-z0-9_.:/\+\-&-]+</param> </data> </define> <define name='genericName'>

2 1

[libvirt] [PATCH] SetAutostart and GetAutostart in openvz driver
by Evgeniy Sokolov 10 Jul '08

10 Jul '08

Implemented functions domainSetAutostart and domainGetAutostart. other: fixed closing file descriptor during reading uuid from config.

3 3

[libvirt] virDomainMemoryPeek & maximum remote message buffer size
by Richard W.M. Jones 09 Jul '08

09 Jul '08

The kernel images that I want to snoop in virt-mem are around 16 MB in size. In the qemu / KVM case, these images have to travel over the remote connection. Because of limits on the maximum message size, they have to travel currently in 64 KB chunks, and it turns out that this is slow. Apparently the dominating factors are how long it takes to issue the 'memsave' command in the qemu monitor (there is some big constant overhead), and extra network round trips. The current remote message size is intentionally limited to 256KB (fully serialized, including all XDR headers and overhead), so the most we could practically send in a single message at the moment is 128KB if we stick to powers of two, or ~255KB if we don't. The reason we limit it is to avoid denial of service attacks, where a rogue client or server sends excessively large messages and causes the peer to allocate lots of memory [eg. if we didn't have any limit, then you could send a message which was several GB in size and cause problems at the other end, because the message is slurped in before it is fully parsed]. There is a second problem with reading the kernel in small chunks, namely that this allows the virtual machine to make a lot of progress, so we don't get anything near an 'instantaneous' snapshot (getting the kernel in a single chunk doesn't necessarily guarantee this either, but it's better). As an experiment, I tried increasing the maximum message to 32 MB, so that I could send the whole kernel in one go. Unfortunately just increasing the limit doesn't work for two reasons, one prosaic and one very weird: (1) The current code likes to keep message buffers on the stack, and because Linux limits the stack to something artificially small, this fails. Increasing the stack ulimit is a short-term fix for this, while testing. In the long term we could rewrite any code which does this to use heap buffers instead. (2) There is some really odd problem with our use of recv(2) which causes messages > 64 KB to fail. I have no idea what is really happening, but the sequence of events seems to be this: server client write(sock,buf,len) = len-k recv(sock,buf,len) = len-k write(sock,buf+len-k,len-k) = k recv(sock,buf,k) = 0 [NOT k] At this point the client assumes that the server has unexpectedly closed the connection and fails. I have stared at this for a while, but I've got no idea at all what's going on. A test program is attached. You'll need a 32 bit KVM guest. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

3 2

[libvirt] Web Interface -> LibVirt Communication?
by Henri Cook 09 Jul '08

09 Jul '08

Hi, I want to write a web tool that lets me administer my cluster from one location (including operations that things like virt-manager don't provide) - what's the proper way of achieving this? Can i communicate over TCP with libvirt on each server (is this documented?) or should I be trying to get my web app to auth and run virsh commands over SSH? Thanks. Henri

4 11

Re: [libvirt] libvirt-java
by Daniel Veillard 09 Jul '08

09 Jul '08

On Mon, Jul 07, 2008 at 01:14:40PM +0200, Tóth István wrote: > Daniel Veillard wrote: > > Ah, okay.... Well my perspective is that libvirt-java should include > > only parts which are directly releated to using libvirt on Java. I would > > really not try to reinvent or push any XML related APIs there, at least > > as part of libvirt bindings (I still have the scars from libxml2, believe > > me you don't want to push new XML APIs to programmers even specialized ones). > > > My thoughts exactly. Okay seems we agree on the fundamentals :-) > > But things like the XSD descriptiond might be useful generally, and > > IMHO are very tied to libvirt, so i think they are a good fit. > > > Absolutely. I've had major problems when I tried to use some Java XML > mapping libraries, because they can only process xsd, > and not the language you use. So having high-quality xsd definitions is > high on my personal wish-list. Okay > > Also fitting into this model are build makefiles for other environment, > > I understand that for most Java developpers, configure and make are really > > foreign tools, so adding ant/Eclipse/... build recipes for the package also > > makes a lot of sense. > > > Well, they certainly wouldn't hurt, but I don't see that as a priority. > Java-only programmers (end users) won't touch the JNI core parts. > They will just install the package, and get on with using it, by adding > the jar > to their devel enviroment, and perhaps the JNI lib file to the command line. > > These kind of users don't really care about the java-libvirt build > environment. okay, so just the Jar availability is sufficient for them, okidoc. > If you want to do something more interesting than renaming the java > classes and methods, > the you have to hit the JNI bindings, and that code is so ugly, that > no-one without some C experience will want to touch it. > > Having said that, I think that an ant build file would be the most > useful, as it can be used directly in all major > development enviroments. There is also this maven thing, that seems to > be widely used, but I still haven't figured out > exactly what that is :-) me either, though there are examples in the Fedora-java packaging pages. [...] > My current plans for java-libvirt are: > > 1. Add the storage API: It's really mostly just copy-paste-search > replace but it still takes some work okay > 2. There are some consistency problems with the naming of classes and > methods. I'd like to revisit the java api, and make some changes in > names, and maybe class structure Hum, better done early than late. Basically i would prefer to avoid pushing incompatible changes. what kind of inconsistencies problems ? > 3. There are many places where the C part leaks memory, this should also > be audited/ fixed. Ah, okay I will have to reread the bindings code then. Not sure how to track leaks, I doubt valgrind can work with java ... > Number 2 is what worries me, I don't know if it's a good idea to push > toFedora, when I know I want to make incompatible API changes soon. yes, which is why I would like to know a bit better :-) > (Or you can just say that you won't accept them, but I'm a big fan of > clean and consistent APIs, and the current one can be improved) > I believe that I will get around to doing 1. and 2. at least in late > july/early august, It's about a three day job, I just don't have that > three days right now :-( Maybe if you can expose what you think is wrong i can try to clean things up. Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 3

[libvirt] PATCH: Fix ue of VIR_TEST_DEBUG var
by Daniel P. Berrange 09 Jul '08

09 Jul '08

The previous patch I did to add OOM testing accidentally disabled use of the VIR_TEST_DEBUG env variable when OOM testing is #ifdef'd out. This patch I just comitted makes sure its always used. Daniel diff -r d37150dc5895 tests/testutils.c --- a/tests/testutils.c Tue Jul 08 16:17:52 2008 +0100 +++ b/tests/testutils.c Wed Jul 09 11:23:27 2008 +0100 @@ -321,20 +321,24 @@ char **argv, int (*func)(int, char **)) { + char *debugStr; #if TEST_OOM int ret; int approxAlloc = 0; int n; - char *oomStr = NULL, *debugStr; + char *oomStr = NULL; int oomCount; int mp = 0; pid_t *workers; int worker = 0; +#endif + if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) { if (virStrToLong_ui(debugStr, NULL, 10, &testDebug) < 0) testDebug = 0; } +#if TEST_OOM if ((oomStr = getenv("VIR_TEST_OOM")) != NULL) { if (virStrToLong_i(oomStr, NULL, 10, &oomCount) < 0) oomCount = 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 :|

1 0

[libvirt] PATCH: Misc changes to policykit policy file
by Daniel P. Berrange 09 Jul '08

09 Jul '08

After discussions with policykit maintainers I've come to the conclusion that it is better for security if we default to 'auth_admin_keep_sesion' instead of 'auth_self_keep_session'. ie prompt for the root password (ala 'su') instead of the user's password (ala 'sudo'). This is because having access to libvirtd gives you very significant power over the host machine. Secondly, newer versions of policykit have imposed a naming constraint on policy files, so when we install our policy it needs to be in a file called org.libvirt.unix.policy, instead of just libvirt.policy. So there's a change to the Makefile to support this. Daniel diff -r e17c1bd119fc libvirt.spec.in --- a/libvirt.spec.in Wed Jul 09 09:26:26 2008 +0100 +++ b/libvirt.spec.in Wed Jul 09 10:32:24 2008 +0100 @@ -240,7 +240,7 @@ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ %if %{with_polkit} -%{_datadir}/PolicyKit/policy/libvirtd.policy +%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %if %{with_xen_proxy} diff -r e17c1bd119fc qemud/Makefile.am --- a/qemud/Makefile.am Wed Jul 09 09:26:26 2008 +0100 +++ b/qemud/Makefile.am Wed Jul 09 10:32:24 2008 +0100 @@ -13,7 +13,8 @@ remote_dispatch_proc_switch.h \ mdns.c mdns.h \ libvirtd.sasl \ - libvirtd.conf + libvirtd.conf \ + libvirtd.policy if RPCGEN SUFFIXES = .x @@ -75,9 +76,7 @@ if HAVE_POLKIT policydir = $(datadir)/PolicyKit/policy -policy_DATA = libvirtd.policy endif -EXTRA_DIST += libvirtd.policy if HAVE_AVAHI libvirtd_SOURCES += mdns.c mdns.h @@ -86,7 +85,7 @@ endif default_xml_dest = libvirt/qemu/networks/default.xml -install-data-local: install-init install-data-sasl +install-data-local: install-init install-data-sasl install-data-polkit mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart $(INSTALL_DATA) $(srcdir)/default-network.xml \ $(DESTDIR)$(sysconfdir)/$(default_xml_dest) @@ -99,7 +98,7 @@ mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt -uninstall-local:: uninstall-init uninstall-data-sasl +uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest) rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || : @@ -119,6 +118,18 @@ install-data-sasl: uninstall-data-sasl: endif + +if HAVE_POLKIT +install-data-polkit:: install-init + mkdir -p $(DESTDIR)$(policydir) + $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy +uninstall-data-polkit:: install-init + rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy +else +install-data-polkit:: +uninstall-data-polkit:: +endif + remote.c: remote_dispatch_prototypes.h \ remote_dispatch_localvars.h \ diff -r e17c1bd119fc qemud/libvirtd.policy --- a/qemud/libvirtd.policy Wed Jul 09 09:26:26 2008 +0100 +++ b/qemud/libvirtd.policy Wed Jul 09 10:32:24 2008 +0100 @@ -36,7 +36,7 @@ read-write mode for management, and we require user password --> <allow_any>no</allow_any> <allow_inactive>no</allow_inactive> - <allow_active>auth_self_keep_session</allow_active> + <allow_active>auth_admin_keep_session</allow_active> </defaults> </action> -</policyconfig> \ No newline at end of file +</policyconfig> -- |: 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] monitor cpu & network load
by Zu 09 Jul '08

09 Jul '08

Hi, I want to write a program to monitor the CPU and network usage of the Xen domUs. But I don't know how to implement. Can the libvirt APIs help me to do that? Does libvirt have the APIs to get the CPU and network usages? If yes I'll study libvirt APIs. Thanks Zu

3 2

[libvirt] PATCH: DOn't use policykit if running non-root
by Daniel P. Berrange 09 Jul '08

09 Jul '08

If the libvirtd daemon is running as non-root (ie a regular user) then there is no point in defaulting policykit, since only clients of same user account are able to connect to the UNIX socket anyway. This removes the pointless login prompt when using qemu:///session. Daniel diff -r 9a457b847ffc qemud/qemud.c --- a/qemud/qemud.c Tue Jul 08 16:17:52 2008 +0100 +++ b/qemud/qemud.c Wed Jul 09 09:24:53 2008 +0100 @@ -1926,6 +1926,14 @@ GET_CONF_STR (conf, filename, tcp_port); GET_CONF_STR (conf, filename, listen_addr); +#if HAVE_POLKIT + /* Change the default back to no auth for non-root */ + if (getuid() != 0 && auth_unix_rw == REMOTE_AUTH_POLKIT) + auth_unix_rw = REMOTE_AUTH_NONE; + if (getuid() != 0 && auth_unix_ro == REMOTE_AUTH_POLKIT) + auth_unix_ro = REMOTE_AUTH_NONE; +#endif + if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0) goto free_and_fail; #if HAVE_POLKIT -- |: 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] give a more useful diagnostic for tap-add failure w/ENOTSUP
by Jim Meyering 09 Jul '08

09 Jul '08

I invoked virt-isntall with --network=bridge:eth1 rather than --network=bridge:br1 and got the latter (current) diagnostic below. This change makes it so in this relatively common case people get a slightly more understandable diagnostic. >From 3d6dc8442fd9f1b0915c232040200154832fdf51 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Jul 2008 13:58:10 +0200 Subject: [PATCH] give a more useful diagnostic for tap-add failure w/ENOTSUP * src/qemu_conf.c (qemudNetworkIfaceConnect): Suggestion from Daniel P. Berrange. --- src/qemu_conf.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 17f0162..4b8c01e 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -2304,9 +2304,17 @@ qemudNetworkIfaceConnect(virConnectPtr conn, if ((err = brAddTap(driver->brctl, brname, ifname, BR_IFNAME_MAXLEN, &tapfd))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to add tap interface '%s' to bridge '%s' : %s"), - ifname, brname, strerror(err)); + if (errno == ENOTSUP) { + /* In this particular case, give a better diagnostic. */ + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to add tap interface to bridge. " + "%s is not a bridge device"), brname); + } else { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to add tap interface '%s' " + "to bridge '%s' : %s"), + ifname, brname, strerror(err)); + } goto error; } -- 1.5.6.2.221.gb589

3 3

[libvirt] [PATCH] Missing htonl (etc) on MinGW
by Richard W.M. Jones 08 Jul '08

08 Jul '08

With the attached patch you can get all the way through a compile of libvirt using the MinGW cross-compiler. Basically MinGW lacks the htonl/ntohl/htons/ntohs functions. This simply adds the same functions from glibc (which has a compatible license) in a single file called "byteswap.h". The reason it worked previously was that PortableXDR used to provide these functions by linking to winsock2. However I have now removed that dependency from PortableXDR because it prevented a DLL being built of PortableXDR. This doesn't fully resolve dynamic linking of libvirt yet, but it is one step (or rather, one library) closer to happening. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 59 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 2

[libvirt] incorrect VIR_DOMAIN_NONE usage
by Tóth István 08 Jul '08

08 Jul '08

As I was trying to understand exact semantics of the libvirt flags api, I found an error in the xs_internal.c file. When it wants to indicate that it cannot report the state of the domain, it user VIR_DOMAIN_NONE as a return value, which does not, in fact, refer to a domain state at all, but is a dummy flag for creating domains, instead of VIR_DOMAIN_NOSTATE. This patch does not affect the compiled code, only the readability. On a related note, the defined enum flags seem inconstent to me, half of them have explicitly named 0 default values, and half of them don't, it's a bit confusing. If enum virStorageVolDeleteFlags { VIR_STORAGE_VOL_DELETE_NORMAL = 0 : Delete metadata only (fast) VIR_STORAGE_VOL_DELETE_ZEROED = 1 : Clear all data to zeros (slow) } then why not enum virConnectFlags { VIR_CONNECT_RW = 0 : A read-write connection VIR_CONNECT_RO = 1 : A readonly connection } ? It would not affect existing code, and would make the library more consistent. regards István ? .project ? xs_internal_constant_semantics.patch Index: src/xs_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xs_internal.c,v retrieving revision 1.65 diff -u -p -r1.65 xs_internal.c --- src/xs_internal.c 10 Apr 2008 16:54:54 -0000 1.65 +++ src/xs_internal.c 1 Jul 2008 19:46:41 -0000 @@ -399,7 +399,7 @@ xenStoreGetDomainInfo(virDomainPtr domai info->state = VIR_DOMAIN_RUNNING; free(tmp); } else { - info->state = VIR_DOMAIN_NONE; + info->state = VIR_DOMAIN_NOSTATE; } tmp = virDomainDoStoreQuery(domain->conn, domain->id, "memory/target"); if (tmp != NULL) {

2 1

[Libvirt] [PATCH] 1+2=3 errors in docs
by Anton Protopopov 08 Jul '08

08 Jul '08

Hi. This patch fixes three examples given in docs/drvqemu.html.in and docs/ formatnetwork.html.in A.

2 1

[libvirt] libvirt and linux vserver
by ADNET Ghislain 08 Jul '08

08 Jul '08

Hi, i am new here , i looked on the web but cannot find anything about linux vserver support in libvirt. I found that one of the main dev of linux vserver submitted patches for the support but nothing seems to have been integrated from his work into libvirt. Do you have reviewed them ? Is libvirt a possibility to manage linux vservers ? * /From/: "Daniel Hokka Zakrisson" <daniel hozac com> * /To/: libvir-list redhat com * /Subject/: [Libvir] [PATCH] Linux-VServer support * /Date/: Wed, 9 Jan 2008 22:51:20 +0100 (CET) http://www.redhat.com/archives/libvir-list/2008-January/msg00097.html -- Cordialement, Ghislain

2 1

[libvirt] routed networking
by Ben Guthro 08 Jul '08

08 Jul '08

Hello Perhaps this is my limited understanding of bridging, and I would appreciate someone to educate me in the way this is supposed to work, and/or point me to the documentation on where this is covered. If I create a routed network using the following xml: <network> <name>mybr0</name> <bridge name="mybr0" /> <ip address="10.1.220.1" netmask="255.255.255.0" /> <forward type="route" dev="eth1"/> </network> I would expect to see the eth1 interface enslaved to this bridge. However, "brctl show" does not show any devices enslaved. My goal is to have the guest get its IP address from a DHCP server not on dom0, but out on the network attached to by eth1, but as my guest comes up, I see its virtual NIC added to the bridge, but without the connection to eth1, it never has the proper connectivity. Any help understanding this would be appreciated. Ben

2 1

[libvirt] PATCH: Fix booting QEMU off CDROM
by Daniel P. Berrange 08 Jul '08

08 Jul '08

KVM supports an alternate syntax for indicating a boot device when the -drive parameter is available. Instead of -boot c, it allow 'boot=on' to be set for the -drive parameter. Unfortauntely it turns that this doesn't work with certain CDROM images, in particular Fedora 9 https://bugzilla.redhat.com/show_bug.cgi?id=452355 Discussion with upstream indicates we're lucky it ever worked at all for CDROM media. So this patch removes use of the boot=on flag for CDROM devices. NB, even when we added boot=on, we always still added -boot d param too, so merely removing the boot=on flag is sufficient to make it work again. src/qemu_conf.c | 3 - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args | 1 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml | 26 ++++++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args | 1 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml | 26 ++++++++++ tests/qemuxml2argvtest.c | 4 + 6 files changed, 60 insertions(+), 1 deletion(-) Daniel diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c --- libvirt-0.4.4.orig/src/qemu_conf.c 2008-06-19 14:15:02.000000000 +0100 +++ libvirt-0.4.4.new/src/qemu_conf.c 2008-07-08 12:24:07.000000000 +0100 @@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr disk->src, qemudBusIdToName(disk->bus, 1), media ? media : "", idx, - bootable ? ",boot=on" : ""); + bootable && disk->device == QEMUD_DISK_DISK + ? ",boot=on" : ""); ADD_ARG_LIT("-drive"); ADD_ARG_LIT(opt); diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args 2008-07-08 12:25:59.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml 2008-07-08 12:20:42.000000000 +0100 @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdc' bus='ide'/> + </disk> + </devices> +</domain> diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args 2008-07-08 12:13:15.000000000 +0100 @@ -0,0 +1 @@ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb \ No newline at end of file diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml --- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 1970-01-01 01:00:00.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml 2008-07-08 12:12:41.000000000 +0100 @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdc' bus='ide'/> + </disk> + </devices> +</domain> diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c --- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c 2008-06-02 10:16:46.000000000 +0100 +++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c 2008-07-08 12:21:53.000000000 +0100 @@ -158,6 +158,10 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); DO_TEST("input-usbmouse", 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] MinGW Windows cross-compiler in Fedora, compiling libvirt
by Richard W.M. Jones 08 Jul '08

08 Jul '08

We've set up a SIG (Special Interest Group) for people interested in adding a Windows cross-compiler to Fedora: https://fedoraproject.org/wiki/SIGs/MinGW The primary target at the moment is to allow libvirt to be cross- compiled on a Fedora machine, targetting Windows. This will allow us to do more regular testing on the Windows build and ensure it doesn't break so often. At the moment you can already build all dependencies of libvirt, and libvirt itself, but only statically (see detailed reasons below). I also got virsh.exe working, and there seems to be no reason why other C programs linked to libvirt wouldn't work too. For the dependencies, start with the README file here: http://hg.et.redhat.com/misc/fedora-mingw--devel Building libvirt ---------------- After building and installing the dependencies, you will be able to build libvirt from CVS (*not* libvirt 0.4.4 since that had a MinGW bug which was subsequently patched): CC="i686-pc-mingw32-gcc -I/usr/i686-pc-mingw32/sys-root/mingw/include/libxml2" \ ./configure \ --host=i686-pc-mingw32 \ --prefix=/usr/i686-pc-mingw32/sys-root/mingw \ --without-xen \ --without-qemu \ --without-libvirtd \ --without-sasl \ --disable-shared make Running programs under Wine --------------------------- If Wine is installed, you can just run programs like virsh.exe directly. Make sure any required DLLs are on your path. It's possible we could get the test suite running using Wine, but I haven't tried this. Current problems for libvirt on Windows/MinGW --------------------------------------------- No python. Either it was my imagination, or we've lost the '--disable-python' configure option. In any case we should be able to detect that Python isn't going to work or disable it completely, so the build doesn't fail at this point. Libxml2 detection is broken (again?). The configure script insists on finding the system library, not the MinGW sys-root library. Hence the strange $CC variable above. Static linking only: The problem here is that PortableXDR uses a Windows library called Winsock (ws2_32.dll). MinGW doesn't provide a dynamic version of this library, only a static version -- I'm not sure why this is, obviously though if you were running on Windows then you'd have the MSFT binary DLL. Hence PortableXDR can only be linked statically. This implies that libvirt can also only be linked statically. I think this is easy to solve: PortableXDR only uses a handful of simple functions from Winsock, which we can just get from Gnulib or some other source instead. ----------- Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

1 0

[libvirt] trying to 'destroy' a domain with Python bindings...
by Michael March 07 Jul '08

07 Jul '08

When I do this: conn.lookupByName('myDomU').destroy() ... I get this: Traceback (most recent call last): File "test.py", line 30, in ? print conn.lookupByName('myDomU').destroy() File "/usr/lib64/python2.4/site-packages/libvirt.py", line 238, in destroy if ret == -1: raise libvirtError ('virDomainDestroy() failed', dom=self) libvirt.libvirtError: virDomainDestroy() failed What am I missing here? Destroy should do the equivalent of 'Delete' on virt-manager, correct? thanks! (BTW... I'm running stock RH5.2.)

2 2

[libvirt] [PATCH] update libvirt.rng
by John Levon 07 Jul '08

07 Jul '08

The below patch makes a significant update to libvirt.rng to bring it into line with reality. This is an incremental improvement rather than a full fix. In particular, various parts are still under-specified (e.g. qemu char devices). This version lets almost all of the XML files in tests/ validate. I'd appreciate help getting the last few to validate - any volunteers? One possible idea might be virsh validate: split out both the schema validation and the additional checks in libvirt into one consolidated place. This would help people check their definitions. The question also arises on how to help avoid the schema getting so badly out of date again. Some suggestions: - add a validation phase to the test suite, and mark failures - require any changes to the implicit schema to add a test suite entry - and require such changes to update the schema too Comments? thanks, john Index: docs/libvirt.rng =================================================================== RCS file: /data/cvs/libvirt/docs/libvirt.rng,v retrieving revision 1.7 diff -u -r1.7 libvirt.rng --- docs/libvirt.rng 14 Mar 2008 11:08:03 -0000 1.7 +++ docs/libvirt.rng 4 Jul 2008 22:22:52 -0000 @@ -50,6 +50,7 @@ </optional> </group> </choice> + <ref name='clock'/> <ref name='resources'/> <ref name='features'/> <ref name='termination'/> @@ -82,8 +83,13 @@ </choice> <value>hvm</value> </element> + <optional> + <ref name='bootdev'/> + </optional> </element> + <ref name='clock'/> <ref name='resources'/> + <ref name='termination'/> <ref name='devices'/> </interleave> </group> @@ -157,8 +163,14 @@ <interleave> <element name='os'> <element name='type'> - <value>hvm</value> + <choice> + <value>hvm</value> + <value>xen</value> + </choice> </element> + <optional> + <ref name='bootdev' /> + </optional> </element> <ref name='resources'/> <ref name='devices-with-emulator'/> @@ -208,12 +220,29 @@ </optional> <optional> <element name='vcpu'> + <optional> + <attribute name='cpuset' /> + </optional> <ref name='countCPU'/> </element> </optional> </interleave> </define> + <define name='clock'> + <optional> + <element name='clock'> + <attribute name='offset'> + <choice> + <value>localtime</value> + <value>utc</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + </define> +  - <define name='linux'> - <element name='type'> - <value>linux</value> - </element> + <define name='kernboot'> <interleave> <element name='kernel'> <ref name='absFilePath'/> @@ -269,8 +291,39 @@ </define>  + <define name='linux'> + <element name='type'> + <value>linux</value> + </element> + <ref name='kernboot'/> + </define> + + <define name='bootdev'> + <element name='boot'> + <attribute name='dev'> + <choice> + <value>hd</value> + <value>fd</value> + <value>cdrom</value> + <value>network</value> + </choice> + </attribute> + <empty/> + </element> + </define> + + <define name='hvmboot'> + <choice> + <ref name='bootdev'/> + <ref name='kernboot'/> + </choice> + </define> + +  <define name='hvm'> <element name='type'> @@ -281,20 +334,28 @@ <ref name='absFilePath'/> </element> <optional> - <element name='boot'> - <attribute name='dev'> - <choice> - <value>hd</value> - <value>fd</value> - <value>cdrom</value> - </choice> - </attribute> - <empty/> - </element> + <ref name='hvmboot' /> </optional> </interleave> </define> + <define name='diskspec'> + <optional> + <ref name='driver'/> + </optional> + <ref name='target'/> + <optional> + <element name='readonly'> + <empty/> + </element> + </optional> + <optional> + <element name='shareable'> + <empty/> + </element> + </optional> + </define> +  <define name='interface'> <element name='interface'> @@ -402,12 +456,14 @@ <value>bridge</value> </attribute> <interleave> - <element name='source'> - <attribute name='bridge'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> + <optional> + <element name='source'> + <attribute name='bridge'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + </optional> <ref name='interface-options'/> </interleave> </group> @@ -416,8 +472,24 @@ <value>ethernet</value> </attribute> <interleave> + <optional> + <element name='source'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + </optional> + <ref name='interface-options'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>network</value> + </attribute> + <interleave> <element name='source'> - <attribute name='dev'> + <attribute name='network'> <ref name='deviceName'/> </attribute> <empty/> @@ -478,11 +550,17 @@ <empty/> </element> </optional> + <optional> + <element name='model'> + <attribute name='type' /> + <empty/> + </element> + </optional> </interleave> </define>  <define name='emulator'> <element name='emulator'> @@ -493,7 +571,8 @@  <define name='graphic'> <element name='graphics'> @@ -518,6 +597,11 @@ <text/> </attribute> </optional> + <optional> + <attribute name='keymap'> + <text/> + </attribute> + </optional> </group> </choice> </element> @@ -565,24 +649,134 @@ </define>  + <define name='qemucdev'> + <attribute name='type'> + <choice> + <value>dev</value> + <value>file</value> + <value>pipe</value> + <value>unix</value> + <value>tcp</value> + <value>udp</value> + <value>null</value> + <value>stdio</value> + <value>vc</value> + <value>pty</value> + </choice> + </attribute> + + <interleave> + <optional> + <oneOrMore> + <element name='source'> + <optional> + <attribute name='mode' /> + </optional> + <optional> + <attribute name='path' /> + </optional> + <optional> + <attribute name='host' /> + </optional> + <optional> + <attribute name='service' /> + </optional> + <optional> + <attribute name='wiremode' /> + </optional> + </element> + </oneOrMore> + </optional> + <optional> + <element name='protocol'> + <optional> + <attribute name='type' /> + </optional> + </element> + </optional> + <optional> + <element name='target'> + <optional> + <attribute name='port' /> + </optional> + </element> + </optional> + </interleave> + </define> + +  <define name='console'> <element name='console'> - <attribute name='tty'> - <ref name='devicePath'/> - </attribute> - <empty/> + <choice> + <group> + <optional> + <attribute name='tty'> + <ref name='devicePath'/> + </attribute> + </optional> + <empty/> + </group> + <ref name='qemucdev' /> + </choice> + </element> + </define> + + <define name='sound'> + <oneOrMore> + <element name='sound'> + <attribute name='model'> + <choice> + <value>sb16</value> + <value>es1370</value> + <value>pcspk</value> + </choice> + </attribute> + </element> + </oneOrMore> + </define> + + <define name='parallel'> + <element name='parallel'> + <ref name='qemucdev' /> + </element> + </define> + + <define name='serial'> + <element name='serial'> + <ref name='qemucdev' /> </element> </define> + <define name='input'> + <oneOrMore> + <element name='input'> + <attribute name='type'> + <choice> + <value>tablet</value> + <value>mouse</value> + </choice> + </attribute> + <optional> + <attribute name='bus'> + <choice> + <value>ps2</value> + <value>usb</value> + <value>xen</value> + </choice> + </attribute> + </optional> + </element> + </oneOrMore> + </define> +  <define name='devices'> <element name='devices'> @@ -602,6 +796,18 @@ <optional> <ref name='console'/> </optional> + <optional> + <ref name='sound'/> + </optional> + <optional> + <ref name='parallel'/> + </optional> + <optional> + <ref name='serial'/> + </optional> + <optional> + <ref name='input'/> + </optional> </interleave> </element> </define> @@ -625,6 +831,18 @@ <optional> <ref name='console'/> </optional> + <optional> + <ref name='sound'/> + </optional> + <optional> + <ref name='parallel'/> + </optional> + <optional> + <ref name='serial'/> + </optional> + <optional> + <ref name='input'/> + </optional> </interleave> </element> </define>

3 8

[libvirt] Re: Libvir-list Digest, Vol 32, Issue 7
by Tóth István 07 Jul '08

07 Jul '08

I took at a look at that code. The JNI code is basically unchanged from the 0.1 version. The interesting part is the code is for handling the XML structures used by libvirt. You can see how Daniel Schweger's added functionality is meant to be used in the srtc/testclient/org/libvirt/TestXen.java file. The way I imagined the java-libvirt architecture is that there is a lower 'core' level, which is basically a function-for function equivalent of the C libvirt functionality, with the bare minimum of object-orientedness thrown in to pass for a proper java library (the current libvirt in CVS) Plus, there should/can be anotherl API, that exposes the XML files as java objects with get/set functions, etc. (It's in the org.libvirt.schema package in Daniel Schweger's code) Optionally, there could be higher level API that uses the core and XML api, and provides a really clean java-style object model, but IO haven't given it much thought yet. I think these two or three layers should be clearly demarcated, maybe even shipped as separate packages, becuse anything that layers on more functionaity that what the current cvs provides represents design decisions that are not inherent to libvirt. One may not want to use the XML technology/object model/whatever that libvirt-java ships, but rather add their own XML handling stuff/ higher level abstractions on top of the core libvirt bindings. (for example, Daniel Schweger's code uses XMLBeans, my original idea was to use JAXB for the same purpose). BTW I am working on adding the core bindings for the storage stuff, but don't expect anything soon, as my day job is currently eating all my time. regards István libvir-list-request(a)redhat.com wrote: > Send Libvir-list mailing list submissions to > libvir-list(a)redhat.com > > To subscribe or unsubscribe via the World Wide Web, visit > https://www.redhat.com/mailman/listinfo/libvir-list > or, via email, send a message with subject or body 'help' to > libvir-list-request(a)redhat.com > > You can reach the person managing the list at > libvir-list-owner(a)redhat.com > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Libvir-list digest..." > > > Today's Topics: > > 1. Re: AW: beta libvirt-java port uploaded (Daniel Veillard) > 2. AW: [libvirt] AW: beta libvirt-java port uploaded > (Daniel Schwager) > 3. storage_conf.c: In function 'virStorageSize' (Jaime Traver) > 4. Re: storage_conf.c: In function 'virStorageSize' (Atsushi SAKAI) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Thu, 3 Jul 2008 12:29:04 -0400 > From: Daniel Veillard <veillard(a)redhat.com> > Subject: Re: [libvirt] AW: beta libvirt-java port uploaded > To: Daniel Schwager <Daniel.Schwager(a)dtnet.de> > Cc: libvir-list(a)redhat.com > Message-ID: <20080703162903.GI1362(a)redhat.com> > Content-Type: text/plain; charset=us-ascii > > On Thu, Jul 03, 2008 at 12:10:40PM +0200, Daniel Schwager wrote: > >> Cool - there's an "official" port... >> http://comments.gmane.org/gmane.comp.emulators.libvirt/7118 >> >> sorry for my last port, i didn't watch this list in the last time .. >> > > BTW there is a new one 0.1.2 with better portability and JPackage > compatibility. > I must admit i'm a bit lost by all the code in your tarball, > there are changes to libvirt-java, even in code already included in > 0.1.0 , and a lot of subtrees which seems only loosely coupled to > libvirt. > What are the diffs which should be applied to the cirrent 0.1.2 > code base ? and what specifically should be added in libvirt-java > CVS. The Beans support seems one of them (but i have no idea how > it's supposed to be used). > A bit of explanations would go a long way ;-) > > Daniel > >

3 3

Re: [libvirt] storage_conf.c: In function 'virStorageSize'
by Jaime Traver 07 Jul '08

07 Jul '08

hi, thank Atsushi SAKAI i has fixed the problem with your recomendations, but now it is happened the following *libvirt_proxy.c: En la función `main': libvirt_proxy.c:844: aviso: implicit declaration of function `fprintf' libvirt_proxy.c:844: error: `stderr' undeclared (first use in this function) libvirt_proxy.c:844: error: (Each undeclared identifier is reported only once libvirt_proxy.c:844: error: for each function it appears in.) libvirt_proxy.c:845: aviso: implicit declaration of function `exit'* About this i don't see nothing in the mail list. I hope that you can help me. thank by advance revartj 2008/7/4 Jaime Traver <revartj(a)gmail.com>: > I has done the folllowing changes: > > i has modified the file * > /usr/src/linux-headers-2.6.18-6-xen-686/include/linux/limits.h,* add > > #define ULLONG_MAX 18446744073709551615ULL > > and also i has saw that file * > /home/revartj/libvirt/libvirt-0.4.4/src/internal.h* have the include of > limits.h. > > And the result is that it continue playing the same errors. > > thank you by the help and excuse me my bad english > > if you don't understand somethings, then ask me. > > > 2008/7/4 Jaime Traver <revartj(a)gmail.com>: > > I am using i686 >> >> 2.6.18-6-xen-686 #1 SMP Sat May 24 14:16:03 UTC 2008 *i686* GNU/Linux >> >> I will try now modify de limits.h and comment you. >> >> thanks >> >> 2008/7/4 Atsushi SAKAI <sakaia(a)jp.fujitsu.com>: >> >> Hi, >>> >>> ULLONG_MAX should be defined on limits.h. >>> and its limits.h is includes on src/internal.h. >>> Please check these files. >>> >>> By the way, you are using i486?. >>> >>> >>> Thanks >>> Atsushi SAKAI >>> >>> >>> "Jaime Traver" <revartj(a)gmail.com> wrote: >>> >>> > Hi, I am having problem with compilation of libvirt, i has saw one post >>> > about this in the maillist, but it don't resolved the problem. The >>> detail of >>> > erros is: >>> > >>> > storage_conf.c: In function 'virStorageSize': >>> > storage_conf.c:627: error: 'ULLONG_MAX' undeclared (first use in this >>> > function) >>> > storage_conf.c:627: error: (Each undeclared identifier is reported only >>> once >>> > storage_conf.c:627: error: for each function it appears in.) >>> > make[2]: *** [libvirt_la-storage_conf.lo] Error 1 >>> > make[2]: se sale del directorio >>> `/home/revartj/libvirt/libvirt-0.4.4/src' >>> > make[1]: *** [all-recursive] Error 1 >>> > make[1]: se sale del directorio `/home/revartj/libvirt/libvirt-0.4.4' >>> > make: *** [all] Error 2 >>> > >>> > >>> > Any information about SO: >>> > >>> > EREBO:/home/revartj/libvirt/libvirt-0.4.4# *uname -a* >>> > Linux EREBO 2.6.18-6-xen-686 #1 SMP Sat May 24 14:16:03 UTC 2008 i686 >>> > GNU/Linux >>> > >>> > EREBO:/home/revartj/libvirt/libvirt-0.4.4# *gcc -v* >>> > Using built-in specs. >>> > Target: i486-linux-gnu >>> > Configured with: ../src/configure -v >>> > --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr >>> > --enable-shared --with-system-zlib --libexecdir=/usr/lib >>> > --without-included-gettext --enable-threads=posix --enable-nls >>> > --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu >>> > --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 >>> > --enable-checking=release i486-linux-gnu >>> > Thread model: posix >>> > gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) >>> > >>> > Someboy know how i can resolved this error. >>> > >>> > Thank everybody by advance. >>> > >>> > revartj >>> >>> >>> >> >

2 1

[libvirt] Xen config files again
by Thomas Moyer 06 Jul '08

06 Jul '08

I've seen in the src tree that there are functions to read and use Xen configuration files. Are these functions available in the Python bindings or do I need to use C to get access to them? What I am mostly interested in doing is parsing the Xen config file and getting back the XML version that I can store and use later on. -- Thomas Moyer Graduate Student CSE Department Penn State University tmmoyer(a)cse.psu.edu http://www.cse.psu.edu/~tmmoyer

2 3

[libvirt] 'starting' a domain using Python libvirt..
by Michael March 06 Jul '08

06 Jul '08

I'm trying to figure out how to start a domain .. and I can't figure out what method to use.. When I do this: >>> dir(conn.lookupByName('my-vm-1')) I get these options: ['ID', 'OSType', 'UUID', 'UUIDString', 'XMLDesc', '__del__', '__doc__', '__init__', '__module__', '_conn', '_o', 'attachDevice', 'autostart', 'blockStats', 'connect', 'coreDump', 'create', 'destroy', 'detachDevice', 'info', 'interfaceStats', 'maxMemory', 'maxVcpus', 'migrate', 'name', 'pinVcpu', 'reboot', 'resume', 'save', 'setAutostart', 'setMaxMemory', 'setMemory', 'setVcpus', 'shutdown', 'suspend', 'undefine'] I don't see a method to start a domain up.. What am I missing here? thanks!

2 2

[libvirt] PATCH: 0/2: port Test driver to new XML apis
by Daniel P. Berrange 04 Jul '08

04 Jul '08

The next two patches port the test driver over to use the new XML APIs for dealing with domain and network XML. More details with each one... Daniel. -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 13

[libvirt] storage_conf.c: In function 'virStorageSize'
by Jaime Traver 04 Jul '08

04 Jul '08

Hi, I am having problem with compilation of libvirt, i has saw one post about this in the maillist, but it don't resolved the problem. The detail of erros is: storage_conf.c: In function 'virStorageSize': storage_conf.c:627: error: 'ULLONG_MAX' undeclared (first use in this function) storage_conf.c:627: error: (Each undeclared identifier is reported only once storage_conf.c:627: error: for each function it appears in.) make[2]: *** [libvirt_la-storage_conf.lo] Error 1 make[2]: se sale del directorio `/home/revartj/libvirt/libvirt-0.4.4/src' make[1]: *** [all-recursive] Error 1 make[1]: se sale del directorio `/home/revartj/libvirt/libvirt-0.4.4' make: *** [all] Error 2 Any information about SO: EREBO:/home/revartj/libvirt/libvirt-0.4.4# *uname -a* Linux EREBO 2.6.18-6-xen-686 #1 SMP Sat May 24 14:16:03 UTC 2008 i686 GNU/Linux EREBO:/home/revartj/libvirt/libvirt-0.4.4# *gcc -v* Using built-in specs. Target: i486-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 --enable-checking=release i486-linux-gnu Thread model: posix gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) Someboy know how i can resolved this error. Thank everybody by advance. revartj

2 1

[libvirt] beta libvirt-java port uploaded
by Daniel Schwager 03 Jul '08

03 Jul '08

Hi, we are using libvirt in our softwaredemo.de plattform (launching in 2 or 3 weeks).. Because I saw some thread relating to the java-port, I uploaded our modified version (SNAPSHOT of my eclipse-workspace, based on the Tóth István libvir-java port - e.g. http://www.mail-archive.com/libvir-list@redhat.com/msg03131.html) to http://www.softwaredemo.de/index.php?id=154 for free access. At the moment, it's does not support all the XML-elements, because if haven't enough time to update it out XSD-file - but I works with the current libvirt 0.4.4-1 (-: - and work for us .... The uploaded java-project depends on some other (internal) staff of our company (devtools, ivy-repository), so it will not compile out-of-the-box for you - sorry for this at the moment. The TGZ includes all Dependant libs in lib/compiler Dependant infos in output/ivy-report Output artifacts in output/artifact (jar-files for using to access libvirt ...) If there are people wanting to work-on/update/extend these sources, I will think about adapting our individual-company-dependant project-build-framework to run everywhere (replace our ivy-repos with public maven-repos, insert the missing ant-scripts, ...) Maybe it could be also a good input for other people's to restart the libvirt-java project for their own (look into the project and uses some fragemets/ideas - staf, testing, buildprocess, ..) Thx to libvirt-community Danny (from softwaredemo.de ;-) If you have question, please ask (-:

2 3

[libvirt] PATCH: Fix memory leak in OOM cleanup for capabilities
by Daniel P. Berrange 03 Jul '08

03 Jul '08

The combo of the OOM testing and valgrind identified a place where we fail to correctly free memory when cleaning up from an OOM failure in the NUMA code for capabilities. This patch addresses that problem Daniel diff -r 0f3ebb9e7958 src/capabilities.c --- a/src/capabilities.c Thu Jul 03 11:42:29 2008 +0100 +++ b/src/capabilities.c Thu Jul 03 14:24:20 2008 +0100 @@ -224,17 +224,19 @@ if (VIR_ALLOC(cell) < 0) return -1; - caps->host.numaCell[caps->host.nnumaCell] = cell; - if (VIR_ALLOC_N(caps->host.numaCell[caps->host.nnumaCell]->cpus, - ncpus) < 0) + if (VIR_ALLOC_N(cell->cpus, ncpus) < 0) { + VIR_FREE(cell); return -1; - memcpy(caps->host.numaCell[caps->host.nnumaCell]->cpus, + } + memcpy(cell->cpus, cpus, ncpus * sizeof(*cpus)); - caps->host.numaCell[caps->host.nnumaCell]->ncpus = ncpus; - caps->host.numaCell[caps->host.nnumaCell]->num = num; + cell->ncpus = ncpus; + cell->num = num; + + caps->host.numaCell[caps->host.nnumaCell] = cell; caps->host.nnumaCell++; 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: Parallelize OOM testing
by Daniel P. Berrange 03 Jul '08

03 Jul '08

The OOM testing takes a long time to run. Add in valgrind, and it takes a very very very long time to run. My dev box has 8 cpus though and it'd be nice to use all 8 rather than just 1 to cut the time by a factor of 8. So this patch tweaks the control harness for the OOM testrig so that it can fork off multiple worker processes. Each worker is assigned a number from 1 -> n, and will be responsible for test all allocations failures divisible by their number. By default it still runs single process, but if you set VIR_TEST_MP=1 then we use sysconf() to get the actual number of online CPUs and fork off one worker per CPU. eg, so to run the OOM testing with valgrind, parallelized $ VIR_TEST_MP=1 VIR_TEST_OOM=1 make valgrind Or to run a test directly $ VIR_TEST_MP=1 VIR_TEST_OOM=1 valgrind --leak-check=full ./xmconfigtest Daniel diff -r 3548706d639f tests/testutils.c --- a/tests/testutils.c Thu Jul 03 14:24:20 2008 +0100 +++ b/tests/testutils.c Thu Jul 03 14:24:40 2008 +0100 @@ -330,7 +330,9 @@ int n; char *oomStr = NULL, *debugStr; int oomCount; - + int mp = 0; + pid_t *workers; + int worker = 0; if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) { if (virStrToLong_ui(debugStr, NULL, 10, &testDebug) < 0) testDebug = 0; @@ -344,6 +346,13 @@ oomCount = 0; if (oomCount) testOOM = 1; + } + + if (getenv("VIR_TEST_MP") != NULL) { + mp = sysconf(_SC_NPROCESSORS_ONLN); + fprintf(stderr, "Using %d worker processes\n", mp); + if (VIR_ALLOC_N(workers, mp) < 0) + return EXIT_FAILURE; } if (testOOM) @@ -371,11 +380,27 @@ else fprintf(stderr, "%d) OOM of %d allocs ", testCounter, approxAlloc); + if (mp) { + int i; + for (i = 0 ; i < mp ; i++) { + workers[i] = fork(); + if (workers[i] == 0) { + worker = i + 1; + break; + } + } + } + /* Run once for each alloc, failing a different one and validating that the test case failed */ - for (n = 0; n < approxAlloc ; n++) { + for (n = 0; n < approxAlloc && (!mp || worker) ; n++) { + if ((n % mp) != (worker - 1)) + continue; if (!testDebug) { - fprintf(stderr, "."); + if (mp) + fprintf(stderr, "%d", worker); + else + fprintf(stderr, "."); fflush(stderr); } virAllocTestOOM(n+1, oomCount); @@ -383,6 +408,20 @@ if (((func)(argc, argv)) != EXIT_FAILURE) { ret = EXIT_FAILURE; break; + } + } + + if (mp) { + if (worker) { + _exit(ret); + } else { + int i, status; + for (i = 0 ; i < mp ; i++) { + waitpid(workers[i], &status, 0); + if (WEXITSTATUS(status) != EXIT_SUCCESS) + ret = EXIT_FAILURE; + } + VIR_FREE(workers); } } -- |: 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] <script path='...'/> ignored for interface types 'bridge' and 'network'
by Emele, Joshua M 03 Jul '08

03 Jul '08

Hello, I'm new to libvirt, but I've looked around the internet for answers to my question with little success. I'd like to have a configuration script do host network integration when starting a virtual machine using virsh. The documentation (http://libvirt.org/formatdomain.html#elementsNICSBridge) suggests that the interface configuration can include a script tag that describes the path to the configuration script. My domain configuration (/etc/libvirt/qemu/test1.xml) includes: <interface type='bridge'> <source bridge='br0'/> <script path='/etc/libvirt/qemu/test1-networking'/> </interface> Unfortunately this value is never used. I'm using: [root@thoroughbred qemu]# rpm -qi libvirt Name : libvirt Relocations: (not relocatable) Version : 0.4.3 Vendor: Fedora Project Release : 1.fc8 Build Date: Fri 13 Jun 2008 03:15:16 AM PDT Looking at the source, the script value is used when 'ethernet' is specified (libvirt-0.4.3/src/qemu_conf.c:2690): case QEMUD_NET_ETHERNET: { char arg[PATH_MAX]; if (snprintf(arg, PATH_MAX-1, "tap,ifname=%s,script=%s,vlan=%d", net->dst.ethernet.ifname, net->dst.ethernet.script, vlan) >= (PATH_MAX-1)) goto error; ADD_ARG_LIT(arg); } However, the script value is not used when 'bridge' or 'network' is specified (libvirt-0.4.3/src/qemu_conf.c:2313): snprintf(tapfdstr, sizeof(tapfdstr), "tap,fd=%d,script=,vlan=%d,ifname=%s", tapfd, vlan, ifname); Is there a way to force libvirt to use the specified script with interface type 'network' or 'bridge'? If not, are there plans in the future to do so? Cheers, Joshua Emele

2 1

[libvirt] [PATCH] Return VIR_ERR_NO_SUPPORT in qemu SetMemory()/SetVcpus() if domain is active.
by Kaitlin Rupert 02 Jul '08

02 Jul '08

qemu doesn't support setting the memory or vcpus of an active guest. In this case, use the VIR_ERR_NO_SUPPORT return code to indicate that the action failed because its not supported. Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.85 diff -u -p -r1.85 qemu_driver.c --- src/qemu_driver.c 10 Jun 2008 10:43:28 -0000 1.85 +++ src/qemu_driver.c 11 Jun 2008 20:35:09 -0000 @@ -2148,7 +2148,7 @@ static int qemudDomainSetMemory(virDomai } if (qemudIsActiveVM(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", _("cannot set memory of an active domain")); return -1; } @@ -2404,7 +2404,7 @@ static int qemudDomainSetVcpus(virDomain } if (qemudIsActiveVM(vm)) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", _("cannot change vcpu count of an active domain")); return -1; } -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

3 5

[Libvir] Re: libvirt on mingw
by Richard W.M. Jones 02 Jul '08

02 Jul '08

Brecht Sanders wrote: > Hi, > I saw on the following link: > http://www.mail-archive.com/libvir-list@redhat.com/msg04103.html > that you are also trying to compile libvirt on win32. > I'm also attempting to do this, and I guess I got stuck at the same > point your post was about. > Have you in the mean time found an XDR implementation that compiles on > MinGW and that implements xdr_u_quad_t? > If you did, can you please tell me where to find it? You'll find the answer to this question and more if you look through the libvir-list archives for the current month: https://www.redhat.com/archives/libvir-list/2008-January/thread.html Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 12

[libvirt] RFC: virt-console
by John Levon 01 Jul '08

01 Jul '08

See implementation here: http://cr.opensolaris.org/~johnlev/virt-console/ (inside libvirt.hg/patches/libvirt/virt-console) This splits virsh console into a separate binary to allow it to be setuid-root on Solaris (where we check permissions then drop privilege). It also fixes a number of RFEs This is against 0.4.0, so it's not ready for merging yet (I hope to get it forward ported at some point). regards john

3 12

[libvirt] PATCH: Generic internal API for network XML parser/formatter
by Daniel P. Berrange 01 Jul '08

01 Jul '08

We currently have two drivers which handle the networking XML containing duplicated parsers and formatters for the XML, and very similar structs. This patch introduces a new general purpose internal API for parsing and formatting network XML, and representing it as a series of structs. This code is derived from the current equivalent code in the QEMU driver for networks. The naming conventions I'm adopting in this patch follow those in the storage driver: - virNetworkPtr - the public opaque object in libvirt.h - virNetworkObjPtr - the primary internal object for network state - virNetworkDefPtr - the configuration data for a network A virNetworkObjPtr contains a reference to one or two virNetworkDefPtr objects - the current live config, and potentially a secondary inactive config which will become live at the next restart. The structs are defined in network_conf.h, along with a bunch of APIs for dealing with them. These APIs are the same as similarly named ones from the current qemu driver, but I'll go over them again for a reminder: virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets, const unsigned char *uuid); virNetworkObjPtr virNetworkFindByName(const virNetworkObjPtr nets, const char *name); Allow lookup of a virNetworkObjPtr object based on its name or UUID, as typically obtained from the public virNetworkPtr object. The 'nets' parameter to both of thse is a linked list of networks which are currently known to the driver using this API. void virNetworkDefFree(virNetworkDefPtr def); void virNetworkObjFree(virNetworkObjPtr net); Convenience APIs to totally free the memory associated with these objects. virNetworkObjPtr virNetworkAssignDef(virConnectPtr conn, virNetworkObjPtr *nets, const virNetworkDefPtr def); Given a virNetworkDefPtr object, it'll search for a pre-existing virNetworkObjPtr object with matching config. If one is found, its config will be updated, otherwise a new object will be allocated. void virNetworkRemoveInactive(virNetworkObjPtr *nets, const virNetworkObjPtr net); Convenience for removing and free'ing a virNetworkObjPtr object in the current list of active networks. virNetworkDefPtr virNetworkDefParse(virConnectPtr conn, const char *xmlStr, const char *displayName); Given an XML document describing a network, parses the doc and generates a virNetworkDefPtr to represent it in memory. char *virNetworkDefFormat(virConnectPtr conn, const virNetworkDefPtr def); Given a virNetworkDefPtr object, generate a XML document describing the network. As a mentioned earlier, the impl of these APIs is just copied from the QEMU driver, but instead of using pre-declared char[PATH_MAX] fields, we allocate memory for strings as required. Regards, Daniel diff -r a6e5acdd23df src/Makefile.am --- a/src/Makefile.am Tue Jun 24 15:07:21 2008 +0100 +++ b/src/Makefile.am Tue Jun 24 15:07:23 2008 +0100 @@ -52,6 +52,7 @@ driver.h \ proxy_internal.c proxy_internal.h \ conf.c conf.h \ + network_conf.c network_conf.h \ xm_internal.c xm_internal.h \ remote_internal.c remote_internal.h \ bridge.c bridge.h \ diff -r a6e5acdd23df src/network_conf.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/network_conf.c Tue Jun 24 15:07:23 2008 +0100 @@ -0,0 +1,467 @@ +/* + * network_conf.h: network XML handling + * + * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + + + +#include <config.h> + +#include <arpa/inet.h> + +#include "internal.h" + +#include "network_conf.h" +#include "memory.h" +#include "xml.h" +#include "uuid.h" +#include "util.h" +#include "buf.h" + +VIR_ENUM_DECL(virNetworkForward) + +VIR_ENUM_IMPL(virNetworkForward, + VIR_NETWORK_FORWARD_LAST, + "none", "nat", "route" ) + +static void virNetworkReportError(virConnectPtr conn, + int code, const char *fmt, ...) +{ + va_list args; + char errorMessage[1024]; + const char *virerr; + + if (fmt) { + va_start(args, fmt); + vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args); + va_end(args); + } else { + errorMessage[0] = '\0'; + } + + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL)); + __virRaiseError(conn, NULL, NULL, VIR_FROM_QEMU, code, VIR_ERR_ERROR, + virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); +} + + +virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets, + const unsigned char *uuid) +{ + virNetworkObjPtr net = nets; + while (net) { + if (!memcmp(net->def->uuid, uuid, VIR_UUID_BUFLEN)) + return net; + net = net->next; + } + + return NULL; +} + +virNetworkObjPtr virNetworkFindByName(const virNetworkObjPtr nets, + const char *name) +{ + virNetworkObjPtr net = nets; + while (net) { + if (STREQ(net->def->name, name)) + return net; + net = net->next; + } + + return NULL; +} + + +void virNetworkDefFree(virNetworkDefPtr def) +{ + int i; + + if (!def) + return; + + VIR_FREE(def->name); + VIR_FREE(def->bridge); + VIR_FREE(def->forwardDev); + VIR_FREE(def->ipAddress); + VIR_FREE(def->network); + VIR_FREE(def->netmask); + + for (i = 0 ; i < def->nranges && def->ranges ; i++) { + VIR_FREE(def->ranges[i].start); + VIR_FREE(def->ranges[i].end); + } + VIR_FREE(def->ranges); + + VIR_FREE(def); +} + +void virNetworkObjFree(virNetworkObjPtr net) +{ + if (!net) + return; + + virNetworkDefFree(net->def); + virNetworkDefFree(net->newDef); + + VIR_FREE(net->configFile); + VIR_FREE(net->autostartLink); + + VIR_FREE(net); +} + +virNetworkObjPtr virNetworkAssignDef(virConnectPtr conn, + virNetworkObjPtr *nets, + const virNetworkDefPtr def) +{ + virNetworkObjPtr network; + + if ((network = virNetworkFindByName(*nets, def->name))) { + if (!virNetworkIsActive(network)) { + virNetworkDefFree(network->def); + network->def = def; + } else { + if (network->newDef) + virNetworkDefFree(network->newDef); + network->newDef = def; + } + + return network; + } + + if (VIR_ALLOC(network) < 0) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return NULL; + } + + network->def = def; + network->next = *nets; + + *nets = network; + + return network; + +} + +void virNetworkRemoveInactive(virNetworkObjPtr *nets, + const virNetworkObjPtr net) +{ + virNetworkObjPtr prev = NULL; + virNetworkObjPtr curr = *nets; + + while (curr && + curr != net) { + prev = curr; + curr = curr->next; + } + + if (curr) { + if (prev) + prev->next = curr->next; + else + *nets = curr->next; + } + + virNetworkObjFree(net); +} + + +static int +virNetworkDHCPRangeDefParseXML(virConnectPtr conn, + virNetworkDefPtr def, + xmlNodePtr node) { + + xmlNodePtr cur; + + cur = node->children; + while (cur != NULL) { + xmlChar *start, *end; + + if (cur->type != XML_ELEMENT_NODE || + !xmlStrEqual(cur->name, BAD_CAST "range")) { + cur = cur->next; + continue; + } + + if (!(start = xmlGetProp(cur, BAD_CAST "start"))) { + cur = cur->next; + continue; + } + if (!(end = xmlGetProp(cur, BAD_CAST "end"))) { + cur = cur->next; + xmlFree(start); + continue; + } + + if (VIR_REALLOC_N(def->ranges, def->nranges + 1) < 0) { + xmlFree(start); + xmlFree(end); + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return -1; + } + def->ranges[def->nranges].start = (char *)start; + def->ranges[def->nranges].end = (char *)end; + def->nranges++; + + cur = cur->next; + } + + return 0; +} + +static virNetworkDefPtr +virNetworkDefParseXML(virConnectPtr conn, + xmlDocPtr xml) +{ + xmlNodePtr root = NULL; + xmlXPathContextPtr ctxt = NULL; + virNetworkDefPtr def; + char *tmp; + + if (VIR_ALLOC(def) < 0) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return NULL; + } + + /* Prepare parser / xpath context */ + root = xmlDocGetRootElement(xml); + if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "network"))) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("incorrect root element")); + goto error; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for xmlXPathContext string")); + goto error; + } + + + /* Extract network name */ + def->name = virXPathString("string(/network/name[1])", ctxt); + if (!def->name) { + virNetworkReportError(conn, VIR_ERR_NO_NAME, NULL); + goto error; + } + + /* Extract network uuid */ + tmp = virXPathString("string(/network/uuid[1])", ctxt); + if (!tmp) { + int err; + if ((err = virUUIDGenerate(def->uuid))) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Failed to generate UUID: %s"), strerror(err)); + goto error; + } + } else { + if (virUUIDParse(tmp, def->uuid) < 0) { + VIR_FREE(tmp); + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed uuid element")); + goto error; + } + VIR_FREE(tmp); + } + + /* Parse bridge information */ + def->bridge = virXPathString("string(/network/bridge[1]/@name)", ctxt); + tmp = virXPathString("string(/network/bridge[1]/@stp)", ctxt); + if (tmp && STREQ(tmp, "off")) + def->stp = 0; + else + def->stp = 1; + VIR_FREE(tmp); + + if (virXPathLong("string(/network/bridge[1]/@delay)", ctxt, &def->delay) < 0) + def->delay = 0; + + def->ipAddress = virXPathString("string(/network/ip[1]/@address)", ctxt); + def->netmask = virXPathString("string(/network/ip[1]/@netmask)", ctxt); + if (def->ipAddress && + def->netmask) { + /* XXX someday we want IPv6 too, so inet_aton won't work there */ + struct in_addr inaddress, innetmask; + char *netaddr; + int netlen; + xmlNodePtr dhcp; + + if (!inet_aton(def->ipAddress, &inaddress)) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse IP address '%s'"), + def->ipAddress); + goto error; + } + if (!inet_aton(def->netmask, &innetmask)) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse netmask '%s'"), + def->netmask); + goto error; + } + + inaddress.s_addr &= innetmask.s_addr; + netaddr = inet_ntoa(inaddress); + + netlen = strlen(netaddr) + 1 + strlen(def->netmask) + 1; + if (VIR_ALLOC_N(def->network, netlen) < 0) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + goto error; + } + strcpy(def->network, netaddr); + strcat(def->network, "/"); + strcat(def->network, def->netmask); + + + if ((dhcp = virXPathNode("/network/ip[1]/dhcp[1]", ctxt)) && + virNetworkDHCPRangeDefParseXML(conn, def, dhcp) < 0) + goto error; + } + + + /* IPv4 forwarding setup */ + if (virXPathBoolean("count(/network/forward) > 0", ctxt)) { + if (!def->ipAddress || + !def->netmask) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Forwarding requested, but no IPv4 address/netmask provided")); + goto error; + } + + tmp = virXPathString("string(/network/forward[1]/@mode)", ctxt); + if (tmp) { + if ((def->forwardType = virNetworkForwardTypeFromString(tmp)) < 0) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown forwarding type '%s'"), tmp); + VIR_FREE(tmp); + } + VIR_FREE(tmp); + } else { + def->forwardType = VIR_NETWORK_FORWARD_NAT; + } + + + def->forwardDev = virXPathString("string(/network/forward[1]/@dev)", ctxt); + } else { + def->forwardType = VIR_NETWORK_FORWARD_NONE; + } + + xmlXPathFreeContext(ctxt); + + return def; + + error: + xmlXPathFreeContext(ctxt); + virNetworkDefFree(def); + return NULL; +} + +virNetworkDefPtr virNetworkDefParse(virConnectPtr conn, + const char *xmlStr, + const char *displayName) +{ + xmlDocPtr xml; + virNetworkDefPtr def; + + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "network.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + virNetworkReportError(conn, VIR_ERR_XML_ERROR, NULL); + return NULL; + } + + def = virNetworkDefParseXML(conn, xml); + + xmlFreeDoc(xml); + + return def; +} + +char *virNetworkDefFormat(virConnectPtr conn, + const virNetworkDefPtr def) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + unsigned char *uuid; + char *tmp; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virBufferAddLit(&buf, "<network>\n"); + virBufferVSprintf(&buf, " <name>%s</name>\n", def->name); + + uuid = def->uuid; + virUUIDFormat(uuid, uuidstr); + virBufferVSprintf(&buf, " <uuid>%s</uuid>\n", uuidstr); + + if (def->forwardType != VIR_NETWORK_FORWARD_NONE) { + const char *mode = virNetworkForwardTypeToString(def->forwardType); + if (mode) { + if (def->forwardDev) { + virBufferVSprintf(&buf, " <forward dev='%s' mode='%s'/>\n", + def->forwardDev, mode); + } else { + virBufferVSprintf(&buf, " <forward mode='%s'/>\n", mode); + } + } + } + + virBufferAddLit(&buf, " <bridge"); + if (def->bridge) + virBufferVSprintf(&buf, " name='%s'", def->bridge); + virBufferVSprintf(&buf, " stp='%s' forwardDelay='%ld' />\n", + def->stp ? "on" : "off", + def->delay); + + if (def->ipAddress || def->netmask) { + virBufferAddLit(&buf, " <ip"); + + if (def->ipAddress) + virBufferVSprintf(&buf, " address='%s'", def->ipAddress); + + if (def->netmask) + virBufferVSprintf(&buf, " netmask='%s'", def->netmask); + + virBufferAddLit(&buf, ">\n"); + + if (def->nranges) { + int i; + virBufferAddLit(&buf, " <dhcp>\n"); + for (i = 0 ; i < def->nranges ; i++) + virBufferVSprintf(&buf, " <range start='%s' end='%s' />\n", + def->ranges[i].start, def->ranges[i].end); + virBufferAddLit(&buf, " </dhcp>\n"); + } + + virBufferAddLit(&buf, " </ip>\n"); + } + + virBufferAddLit(&buf, "</network>\n"); + + if (virBufferError(&buf)) + goto no_memory; + + return virBufferContentAndReset(&buf); + + no_memory: + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + tmp = virBufferContentAndReset(&buf); + VIR_FREE(tmp); + return NULL; +} + diff -r a6e5acdd23df src/network_conf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/network_conf.h Tue Jun 24 15:07:23 2008 +0100 @@ -0,0 +1,114 @@ +/* + * network_conf.h: network XML handling + * + * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#ifndef __NETWORK_CONF_H__ +#define __NETWORK_CONF_H__ + +#include "internal.h" + +/* 2 possible types of forwarding */ +enum virNetworkForwardType { + VIR_NETWORK_FORWARD_NONE = 0, + VIR_NETWORK_FORWARD_NAT, + VIR_NETWORK_FORWARD_ROUTE, + + VIR_NETWORK_FORWARD_LAST, +}; + +typedef struct _virNetworkDHCPRangeDef virNetworkDHCPRangeDef; +typedef virNetworkDHCPRangeDef *virNetworkDHCPRangeDefPtr; +struct _virNetworkDHCPRangeDef { + char *start; + char *end; +}; + +typedef struct _virNetworkDef virNetworkDef; +typedef virNetworkDef *virNetworkDefPtr; +struct _virNetworkDef { + unsigned char uuid[VIR_UUID_BUFLEN]; + char *name; + + char *bridge; /* Name of bridge device */ + int stp : 1; /* Spanning tree protocol */ + long delay; /* Bridge forward delay (ms) */ + + int forwardType; /* One of virNetworkForwardType constants */ + char *forwardDev; /* Destination device for forwarding */ + + char *ipAddress; /* Bridge IP address */ + char *netmask; + char *network; + + int nranges; /* Zero or more dhcp ranges */ + virNetworkDHCPRangeDefPtr ranges; +}; + +typedef struct _virNetworkObj virNetworkObj; +typedef virNetworkObj *virNetworkObjPtr; +struct _virNetworkObj { + int dnsmasqPid; + unsigned int active : 1; + unsigned int autostart : 1; + unsigned int persistent : 1; + + char *configFile; /* Persistent config file path */ + char *autostartLink; /* Symlink path for autostart */ + + virNetworkDefPtr def; /* The current definition */ + virNetworkDefPtr newDef; /* New definition to activate at shutdown */ + + virNetworkObjPtr next; +}; + +static inline int +virNetworkIsActive(const virNetworkObjPtr net) +{ + return net->active; +} + + +virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets, + const unsigned char *uuid); +virNetworkObjPtr virNetworkFindByName(const virNetworkObjPtr nets, + const char *name); + + +void virNetworkDefFree(virNetworkDefPtr def); +void virNetworkObjFree(virNetworkObjPtr net); + +virNetworkObjPtr virNetworkAssignDef(virConnectPtr conn, + virNetworkObjPtr *nets, + const virNetworkDefPtr def); +void virNetworkRemoveInactive(virNetworkObjPtr *nets, + const virNetworkObjPtr net); + +virNetworkDefPtr virNetworkDefParse(virConnectPtr conn, + const char *xmlStr, + const char *displayName); + +char *virNetworkDefFormat(virConnectPtr conn, + const virNetworkDefPtr def); + + +#endif /* __NETWORK_CONF_H__ */ + -- |: 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 5

[libvirt] Release of libvirt-java-0.1.1
by Daniel Veillard 01 Jul '08

01 Jul '08

A new release which should fix the main portability problems (crossing fingers) and add the authentication support patch from Tóth István. Available at ftp://libvirt.org/libvirt/java/ Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0