- Devel - libvirt List Archives

[libvirt] [PATCH] Resolve COPY_PASTE error found by Coverity
by John Ferlan 08 Jan '13

08 Jan '13

Fix copy-paste error doing handshake. The clientShake was not set to true, thus we'd potentially never leave the handshake while loop. --- tests/virnettlscontexttest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index a1e71dc..49462df 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -662,7 +662,7 @@ static int testTLSSessionInit(const void *opaque) if (rv < 0) goto cleanup; if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE) - serverShake = true; + clientShake = true; } } while (!clientShake && !serverShake); -- 1.7.11.7

3 2

[libvirt] [PATCH] storage: fix leak in virStorageBackendLogicalMakeVol
by Ján Tomko 08 Jan '13

08 Jan '13

Use regfree instead of VIR_FREE. --- src/storage/storage_backend_logical.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 2734689..bd902fe 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -264,7 +264,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, cleanup: VIR_FREE(regex); - VIR_FREE(reg); + regfree(reg); VIR_FREE(vars); if (is_new_vol && (ret == -1)) virStorageVolDefFree(vol); -- 1.7.8.6

2 2

[libvirt] Series of patches for libvirt-java
by Wido den Hollander 08 Jan '13

08 Jan '13

Hello, This series of patches adds functionality to libvirt-java for: * block device resizing * snapshot handling * domain migration All these patches originate from the Apache CloudStack project and were written during development of new featurs for CloudStack. Thank you, Wido

4 24

[libvirt] [PATCHv4 0/2] S390: Adding support for SCLP Console
by Viktor Mihajlovski 08 Jan '13

08 Jan '13

The S390 architecture comes with a native console type (SCLP console) which is now also supported by current QEMU. This series is enabling libvirt to configure S390 domains with SCLP consoles. The domain XML has to be extended for the new console target types 'sclp' and 'sclplm' (line mode = dumb). As usual the QEMU driver must do capability probing in order to find out whether SCLP is supported and format the QEMU command line for the new console type. V2/V3 Changes: Rebased to current master, resolving conflicts. V4 Changes: Rebased, changed 'since' to 1.0.2 in formatdomain.html.in J.B. Joret (2): S390: Add SCLP console front end support S390: Enable SCLP Console in QEMU driver docs/formatdomain.html.in | 19 ++++++- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 59 ++++++++++++++++++++ .../qemuxml2argv-console-sclp.args | 8 +++ .../qemuxml2argvdata/qemuxml2argv-console-sclp.xml | 24 ++++++++ tests/qemuxml2argvtest.c | 3 + 10 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml -- 1.7.9.5

2 6

Re: [libvirt] Memory free in libvirt JNA
by Benjamin Wang (gendwang) 08 Jan '13

08 Jan '13

Hi, I wrote a code to verify the memory leak problem as following. C code in so: void checkJNAMemLeak1(int **head, int *length) { long i = 0; *head = (int *)malloc(sizeof(int) * 100000000); for(i=0; i<100000000; i++) { (*head)[i] = 1; } *length = 100000000; } Java code: public static void testJNAMemLeak1() { PointerByReference head = new PointerByReference(); IntByReference length = new IntByReference(); while(true) { libben.checkJNAMemLeak1(head, length); System.out.println(length.getValue()); sleep(1); } } When we check memory by top command, the virt and res will increase very quickly. When we check with jconsole, there is no memory in Java heap. Even I execute GC manually by jconsole. Nothing happen. If I change java code as following: public static void testJNAMemLeak1() { PointerByReference head = new PointerByReference(); IntByReference length = new IntByReference(); while(true) { libben.checkJNAMemLeak1(head, length); System.out.println(length.getValue()); sleep(1); libc.free(head.getValue()); } } public static void testJNAMemLeak1() { PointerByReference head = new PointerByReference(); IntByReference length = new IntByReference(); while(true) { libben.checkJNAMemLeak1(head, length); System.out.println(length.getValue()); sleep(1); libc.free(head.getValue()); } } Then everything works well. The virt and res will not increase. I think we must provide the free functions for all the memory allocated by libvirt. B.R. Benjamin Wang -----Original Message----- From: Benjamin Wang (gendwang) Sent: 2012年9月7日 15:22 To: libvir-list(a)redhat.com Cc: 'veillard(a)redhat.com'; Yang Zhou (yangzho) Subject: RE: Memory free in libvirt JNA Hi, Overview Part of JNA API describes as following: 1. Description1: If the native method returns char* and actually allocates memory, a return type of Pointer should be used to avoid leaking the memory. It is then up to you to take the necessary steps to free the allocated memory. 2. Description2: Declare the method as returning a Structure of the appropriate type, then invoke Structure.toArray(int) to convert to an array of initialized structures of the appropriate size. Note that your Structure class must have a no-args constructor, and you are responsible for freeing the returned memory if applicable in whatever way is appropriate for the called function. And the example code shows as following: // Original C code struct Display* get_displays(int* pcount); void free_displays(struct Display* displays); // Equivalent JNA mapping Display get_displays(IntByReference pcount); void free_displays(Display[] displays); ... IntByReference pcount = new IntByReference(); Display d = lib.get_displays(pcount); Display[] displays = (Display[])d.toArray(pcount.getValue()); ... lib.free_displays(displays); That's to say. All the memory allocated by native code must be freed explicitly in JNA part. We must add some free memory methods to support the memory-freeing. Any comments? B.R. Benjamin Wang -----Original Message----- From: Daniel Veillard [mailto:veillard@redhat.com] Sent: 2012年8月20日 14:25 To: Benjamin Wang (gendwang) Cc: stoty(a)tvnet.hu; Daniel.Schwager(a)dtnet.de Subject: Re: Memory free in libvirt JNA On Mon, Aug 20, 2012 at 05:15:45AM +0000, Benjamin Wang (gendwang) wrote: > Hi Veillard, > Thanks for your reply. I checked the current Libvirt-JNA > implementation. I find that a method named "free" defined in Domain > class which is used to free the domain object. If this is mandatory, that's to say, we should a lot of methods into the current Libvirt-jna implementation to free the memory which is allocated by libvirt API. Please correct me! As far as I understat free() is aliased as finalize() on that object so the java runtime will call free() automatically on garbage collection. I'm not a java expert, check some Java litterature for more details about how this is done and the cases where free() might be better called directly. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

4 26

[libvirt] [PATCH 00/12] Miscs of nodedev
by Osier Yang 08 Jan '13

08 Jan '13

Basicly, this set is created on the road to implement the supports for NPIV migration [1]. Some of them are preparations (such as the various new util functions), some of them are fixes, and others are improvements. Another set to support the persistent vHBA via scsi storage pool will come soon. Osier Yang (12): Introduce new public API virNodeDeviceFindByWWN remote: Wire up the remote protocol nodedev: Implement virNodeDeviceFindByWWN virsh: Use virNodeDeviceLookupByWWN nodedev: Remove the unused enum nodedev: Introduce two new flags for listAll API util: Add one helper virReadFCHost to read the value of fc_host entry nodedev: Use access instead of stat nodedev: Refactor the helpers nodedev: Dump max vports and vports in use for HBA's XML nodedev: Fix the improper logic when enumerating SRIOV VF nodedev: Abstract nodeDeviceVportCreateDelete as util function docs/formatnode.html.in | 10 +- docs/schemas/nodedev.rng | 6 + include/libvirt/libvirt.h.in | 25 ++- src/conf/node_device_conf.c | 41 ++++- src/conf/node_device_conf.h | 16 +- src/driver.h | 6 + src/libvirt.c | 47 ++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 1 + src/node_device/node_device_driver.c | 119 ++------------ src/node_device/node_device_driver.h | 23 +-- src/node_device/node_device_hal.c | 16 ++- src/node_device/node_device_linux_sysfs.c | 245 +++++++++------------------- src/node_device/node_device_udev.c | 15 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++- src/remote_protocol-structs | 9 + src/rpc/gendispatch.pl | 4 +- src/util/virpci.c | 36 +++-- src/util/virutil.c | 224 ++++++++++++++++++++++++++ src/util/virutil.h | 19 +++ tools/virsh-nodedev.c | 97 +++++++++--- tools/virsh.pod | 22 ++- 23 files changed, 626 insertions(+), 373 deletions(-) https://www.redhat.com/archives/libvir-list/2012-November/msg00826.html Regards, Osier

2 18

[libvirt] [PATCH v2 0/2] add pci-bridge support
by liguang 08 Jan '13

08 Jan '13

Now, it's impossible to arrange devices into multi-pci-bus, for example: <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x1' slot='0x02' function='0x0'/> </video> libvirt will complain about "bus != 0", fortunately, qemu supports pci-to-pci bridge, if we want to use multi-pci-bus, we can define 2 pci bridge controllers, then attach 1 to the other as a subordinate pci-bus, so, 2 pci-buses appear. for example: <controller type='pci-bridge' index='0'/> <controller type='pci-bridge' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' bridge='0'/> </controller> <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0' bridge='1'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' bridge='0'/> </video> src/conf/device_conf.c | 11 ++++++++++- src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 5 ++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 25 ++++++++++++++++++++----- 5 files changed, 36 insertions(+), 7 deletions(-)

4 14

[libvirt] [PATCH] Add missing flags to migrate documentation
by Guido Günther 08 Jan '13

08 Jan '13

--- src/libvirt.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index 6d1da12..83aeb23 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5121,10 +5121,15 @@ virDomainMigrateDirect(virDomainPtr domain, * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the * domain on the source host. * VIR_MIGRATE_PAUSED Leave the domain suspended on the remote side. + * VIR_MIGRATE_NON_SHARED_DISK Migration with non-shared storage with full + * disk copy + * VIR_MIGRATE_NON_SHARED_INC Migration with non-shared storage with + * incremental disk copy * VIR_MIGRATE_CHANGE_PROTECTION Protect against domain configuration * changes during the migration process (set * automatically when supported). * VIR_MIGRATE_UNSAFE Force migration even if it is considered unsafe. + * VIR_MIGRATE_OFFLINE Migrate offline * * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. * Applications using the VIR_MIGRATE_PEER2PEER flag will probably @@ -5330,10 +5335,15 @@ error: * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the * domain on the source host. * VIR_MIGRATE_PAUSED Leave the domain suspended on the remote side. + * VIR_MIGRATE_NON_SHARED_DISK Migration with non-shared storage with full + * disk copy + * VIR_MIGRATE_NON_SHARED_INC Migration with non-shared storage with + * incremental disk copy * VIR_MIGRATE_CHANGE_PROTECTION Protect against domain configuration * changes during the migration process (set * automatically when supported). * VIR_MIGRATE_UNSAFE Force migration even if it is considered unsafe. + * VIR_MIGRATE_OFFLINE Migrate offline * * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. * Applications using the VIR_MIGRATE_PEER2PEER flag will probably @@ -5556,10 +5566,16 @@ error: * on the destination host. * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the * domain on the source host. + * VIR_MIGRATE_PAUSED Leave the domain suspended on the remote side. + * VIR_MIGRATE_NON_SHARED_DISK Migration with non-shared storage with full + * disk copy + * VIR_MIGRATE_NON_SHARED_INC Migration with non-shared storage with + * incremental disk copy * VIR_MIGRATE_CHANGE_PROTECTION Protect against domain configuration * changes during the migration process (set * automatically when supported). * VIR_MIGRATE_UNSAFE Force migration even if it is considered unsafe. + * VIR_MIGRATE_OFFLINE Migrate offline * * The operation of this API hinges on the VIR_MIGRATE_PEER2PEER flag. * If the VIR_MIGRATE_PEER2PEER flag is NOT set, the duri parameter @@ -5689,10 +5705,16 @@ error: * on the destination host. * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the * domain on the source host. + * VIR_MIGRATE_PAUSED Leave the domain suspended on the remote side. + * VIR_MIGRATE_NON_SHARED_DISK Migration with non-shared storage with full + * disk copy + * VIR_MIGRATE_NON_SHARED_INC Migration with non-shared storage with + * incremental disk copy * VIR_MIGRATE_CHANGE_PROTECTION Protect against domain configuration * changes during the migration process (set * automatically when supported). * VIR_MIGRATE_UNSAFE Force migration even if it is considered unsafe. + * VIR_MIGRATE_OFFLINE Migrate offline * * The operation of this API hinges on the VIR_MIGRATE_PEER2PEER flag. * -- 1.7.10.4

2 2

[libvirt] [PATCH] Convert libxl driver to Xen 4.2
by Jim Fehlig 08 Jan '13

08 Jan '13

Based on a patch originally authored by Daniel De Graaf http://lists.xen.org/archives/html/xen-devel/2012-05/msg00565.html This patch converts the Xen libxl driver to support only Xen >= 4.2. Support for Xen 4.1 libxl is dropped since that version of libxl is designated 'technology preview' only and is incompatible with Xen 4.2 libxl. Additionally, the default toolstack in Xen 4.1 is still xend, for which libvirt has a stable, functional driver. --- V2: Remove 128 vcpu limit. Remove split_string_into_string_list() function copied from xen sources since libvirt now has virStringSplit(). configure.ac | 8 +- docs/drvxen.html.in | 8 + libvirt.spec.in | 4 +- src/libxl/libxl_conf.c | 321 +++++++++--------------------- src/libxl/libxl_conf.h | 16 +- src/libxl/libxl_driver.c | 488 +++++++++++++++++++++++++++------------------- 6 files changed, 404 insertions(+), 441 deletions(-) diff --git a/configure.ac b/configure.ac index c888eb8..a695e52 100644 --- a/configure.ac +++ b/configure.ac @@ -718,16 +718,14 @@ if test "$with_libxl" != "no" ; then fi CFLAGS="$CFLAGS $LIBXL_CFLAGS" LIBS="$LIBS $LIBXL_LIBS" - AC_CHECK_LIB([xenlight], [libxl_domain_create_new], [ + AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ with_libxl=yes - LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl" + LIBXL_LIBS="$LIBXL_LIBS -lxenlight" ],[ if test "$with_libxl" = "yes"; then fail=1 fi with_libxl=no - ],[ - -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl ]) fi @@ -735,7 +733,7 @@ LIBS="$old_LIBS" CFLAGS="$old_CFLAGS" if test $fail = 1; then - AC_MSG_ERROR([You must install the libxl Library to compile libxenlight driver with -lxl]) + AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.2 to compile libxenlight driver with -lxl]) fi if test "$with_libxl" = "yes"; then diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in index 0bca935..06bd911 100644 --- a/docs/drvxen.html.in +++ b/docs/drvxen.html.in @@ -53,6 +53,14 @@ the <code>/etc/xen</code> directory. It is important not to place any other non-config files in this directory. </li> + <li> + <strong>libxl</strong>: Starting with Xen 4.2, the legacy XenD/xm + toolstack is deprecated in favor of libxl, also commonly called + libxenlight. libvirt supports this new Xen toolstack via the + libxl driver. If XenD is enabled, the legacy xen driver consisting + of the above mentioned channels will be used. If XenD is disabled, + the libxl driver will be used. + </li> </ul> <h2><a name="uri">Connections to Xen driver</a></h2> diff --git a/libvirt.spec.in b/libvirt.spec.in index 5b3f4e4..47cb087 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -189,8 +189,8 @@ %endif %endif -# Fedora doesn't have new enough Xen for libxl until F16 -%if 0%{?fedora} && 0%{?fedora} < 16 +# Fedora doesn't have new enough Xen for libxl until F18 +%if 0%{?fedora} && 0%{?fedora} < 18 %define with_libxl 0 %endif diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1c3130b..b8b9ddb 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -36,11 +36,13 @@ #include "virterror_internal.h" #include "datatypes.h" #include "virfile.h" +#include "virstring.h" #include "memory.h" #include "uuid.h" #include "capabilities.h" #include "libxl_driver.h" #include "libxl_conf.h" +#include "libxl_utils.h" #include "storage_file.h" @@ -62,7 +64,6 @@ struct guest_arch { static const char *xen_cap_re = "(xen|hvm)-[[:digit:]]+\\.[[:digit:]]+-(x86_32|x86_64|ia64|powerpc64)(p|be)?"; static regex_t xen_cap_rec; - static int libxlNextFreeVncPort(libxlDriverPrivatePtr driver, int startPort) { @@ -360,18 +361,36 @@ libxlMakeCapabilitiesInternal(const char *hostmachine, } static int -libxlMakeDomCreateInfo(virDomainDefPtr def, libxl_domain_create_info *c_info) +libxlMakeDomCreateInfo(libxlDriverPrivatePtr driver, + virDomainDefPtr def, + libxl_domain_create_info *c_info) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - libxl_init_create_info(c_info); + libxl_domain_create_info_init(c_info); + + if (STREQ(def->os.type, "hvm")) + c_info->type = LIBXL_DOMAIN_TYPE_HVM; + else + c_info->type = LIBXL_DOMAIN_TYPE_PV; - c_info->hvm = STREQ(def->os.type, "hvm"); if ((c_info->name = strdup(def->name)) == NULL) { virReportOOMError(); goto error; } + if (def->nseclabels && + def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_STATIC) { + if (libxl_flask_context_to_sid(driver->ctx, + def->seclabels[0]->label, + strlen(def->seclabels[0]->label), + &c_info->ssidref)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to resolve security label '%s'"), + def->seclabels[0]->label); + } + } + virUUIDFormat(def->uuid, uuidstr); if (libxl_uuid_from_string(&c_info->uuid, uuidstr)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -382,7 +401,7 @@ libxlMakeDomCreateInfo(virDomainDefPtr def, libxl_domain_create_info *c_info) return 0; error: - libxl_domain_create_info_destroy(c_info); + libxl_domain_create_info_dispose(c_info); return -1; } @@ -393,26 +412,14 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) int hvm = STREQ(def->os.type, "hvm"); int i; - /* Currently, libxenlight only supports 32 vcpus per domain. - * cur_vcpus member of struct libxl_domain_build_info is defined - * as an int, but its semantic is a bitmap of online vcpus, so - * only 32 can be represented. - */ - if (def->maxvcpus > 32 || def->vcpus > 32) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("This version of libxenlight only supports 32 " - "vcpus per domain")); - return -1; - } + libxl_domain_build_info_init(b_info); - libxl_init_build_info(b_info, &d_config->c_info); - - b_info->hvm = hvm; - b_info->max_vcpus = def->maxvcpus; - if (def->vcpus == 32) - b_info->cur_vcpus = (uint32_t) -1; + if (hvm) + libxl_domain_build_info_init_type(b_info, LIBXL_DOMAIN_TYPE_HVM); else - b_info->cur_vcpus = (1 << def->vcpus) - 1; + libxl_domain_build_info_init_type(b_info, LIBXL_DOMAIN_TYPE_PV); + b_info->max_vcpus = def->maxvcpus; + libxl_bitmap_set((&b_info->avail_vcpus), def->vcpus); if (def->clock.ntimers > 0 && def->clock.timers[0]->name == VIR_DOMAIN_TIMER_NAME_TSC) { switch (def->clock.timers[0]->mode) { @@ -426,16 +433,20 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) b_info->tsc_mode = 1; } } + b_info->sched_params.weight = 1000; b_info->max_memkb = def->mem.max_balloon; b_info->target_memkb = def->mem.cur_balloon; if (hvm) { - b_info->u.hvm.pae = def->features & (1 << VIR_DOMAIN_FEATURE_PAE); - b_info->u.hvm.apic = def->features & (1 << VIR_DOMAIN_FEATURE_APIC); - b_info->u.hvm.acpi = def->features & (1 << VIR_DOMAIN_FEATURE_ACPI); + libxl_defbool_set(&b_info->u.hvm.pae, + def->features & (1 << VIR_DOMAIN_FEATURE_PAE)); + libxl_defbool_set(&b_info->u.hvm.apic, + def->features & (1 << VIR_DOMAIN_FEATURE_APIC)); + libxl_defbool_set(&b_info->u.hvm.acpi, + def->features & (1 << VIR_DOMAIN_FEATURE_ACPI)); for (i = 0; i < def->clock.ntimers; i++) { if (def->clock.timers[i]->name == VIR_DOMAIN_TIMER_NAME_HPET && def->clock.timers[i]->present == 1) { - b_info->u.hvm.hpet = 1; + libxl_defbool_set(&b_info->u.hvm.hpet, 1); } } @@ -446,7 +457,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) * 256 pages (1MB) per vcpu, plus 1 page per MiB of RAM for the P2M map, * plus 1 page per MiB of RAM to shadow the resident processes. */ - b_info->shadow_memkb = 4 * (256 * b_info->cur_vcpus + + b_info->shadow_memkb = 4 * (256 * libxl_bitmap_count_set(&b_info->avail_vcpus) + 2 * (b_info->max_memkb / 1024)); } else { if (def->os.bootloader) { @@ -456,10 +467,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) } } if (def->os.bootloaderArgs) { - if ((b_info->u.pv.bootloader_args = strdup(def->os.bootloaderArgs)) == NULL) { - virReportOOMError(); + if (!(b_info->u.pv.bootloader_args = + virStringSplit(def->os.bootloaderArgs, " \t\n", 0))) goto error; - } } if (def->os.cmdline) { if ((b_info->u.pv.cmdline = strdup(def->os.cmdline)) == NULL) { @@ -469,14 +479,14 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) } if (def->os.kernel) { /* libxl_init_build_info() sets kernel.path = strdup("hvmloader") */ - VIR_FREE(b_info->kernel.path); - if ((b_info->kernel.path = strdup(def->os.kernel)) == NULL) { + VIR_FREE(b_info->u.pv.kernel); + if ((b_info->u.pv.kernel = strdup(def->os.kernel)) == NULL) { virReportOOMError(); goto error; } } if (def->os.initrd) { - if ((b_info->u.pv.ramdisk.path = strdup(def->os.initrd)) == NULL) { + if ((b_info->u.pv.ramdisk = strdup(def->os.initrd)) == NULL) { virReportOOMError(); goto error; } @@ -486,13 +496,12 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) return 0; error: - libxl_domain_build_info_destroy(b_info); + libxl_domain_build_info_dispose(b_info); return -1; } int -libxlMakeDisk(virDomainDefPtr def, virDomainDiskDefPtr l_disk, - libxl_device_disk *x_disk) +libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { if (l_disk->src && (x_disk->pdev_path = strdup(l_disk->src)) == NULL) { virReportOOMError(); @@ -509,22 +518,22 @@ libxlMakeDisk(virDomainDefPtr def, virDomainDiskDefPtr l_disk, STREQ(l_disk->driverName, "tap2")) { switch (l_disk->format) { case VIR_STORAGE_FILE_QCOW: - x_disk->format = DISK_FORMAT_QCOW; - x_disk->backend = DISK_BACKEND_QDISK; + x_disk->format = LIBXL_DISK_FORMAT_QCOW; + x_disk->backend = LIBXL_DISK_BACKEND_QDISK; break; case VIR_STORAGE_FILE_QCOW2: - x_disk->format = DISK_FORMAT_QCOW2; - x_disk->backend = DISK_BACKEND_QDISK; + x_disk->format = LIBXL_DISK_FORMAT_QCOW2; + x_disk->backend = LIBXL_DISK_BACKEND_QDISK; break; case VIR_STORAGE_FILE_VHD: - x_disk->format = DISK_FORMAT_VHD; - x_disk->backend = DISK_BACKEND_TAP; + x_disk->format = LIBXL_DISK_FORMAT_VHD; + x_disk->backend = LIBXL_DISK_BACKEND_TAP; break; case VIR_STORAGE_FILE_NONE: /* No subtype specified, default to raw/tap */ case VIR_STORAGE_FILE_RAW: - x_disk->format = DISK_FORMAT_RAW; - x_disk->backend = DISK_BACKEND_TAP; + x_disk->format = LIBXL_DISK_FORMAT_RAW; + x_disk->backend = LIBXL_DISK_BACKEND_TAP; break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -533,11 +542,11 @@ libxlMakeDisk(virDomainDefPtr def, virDomainDiskDefPtr l_disk, return -1; } } else if (STREQ(l_disk->driverName, "file")) { - x_disk->format = DISK_FORMAT_RAW; - x_disk->backend = DISK_BACKEND_TAP; + x_disk->format = LIBXL_DISK_FORMAT_RAW; + x_disk->backend = LIBXL_DISK_BACKEND_TAP; } else if (STREQ(l_disk->driverName, "phy")) { - x_disk->format = DISK_FORMAT_RAW; - x_disk->backend = DISK_BACKEND_PHY; + x_disk->format = LIBXL_DISK_FORMAT_RAW; + x_disk->backend = LIBXL_DISK_BACKEND_PHY; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight does not support disk driver %s"), @@ -546,12 +555,12 @@ libxlMakeDisk(virDomainDefPtr def, virDomainDiskDefPtr l_disk, } } else { /* No driverName - default to raw/tap?? */ - x_disk->format = DISK_FORMAT_RAW; - x_disk->backend = DISK_BACKEND_TAP; + x_disk->format = LIBXL_DISK_FORMAT_RAW; + x_disk->backend = LIBXL_DISK_BACKEND_TAP; } - /* How to set unpluggable? */ - x_disk->unpluggable = 1; + /* XXX is this right? */ + x_disk->removable = 1; x_disk->readwrite = !l_disk->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (l_disk->transient) { @@ -560,8 +569,6 @@ libxlMakeDisk(virDomainDefPtr def, virDomainDiskDefPtr l_disk, return -1; } - x_disk->domid = def->id; - return 0; } @@ -579,7 +586,7 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) } for (i = 0; i < ndisks; i++) { - if (libxlMakeDisk(def, l_disks[i], &x_disks[i]) < 0) + if (libxlMakeDisk(l_disks[i], &x_disks[i]) < 0) goto error; } @@ -590,19 +597,19 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) error: for (i = 0; i < ndisks; i++) - libxl_device_disk_destroy(&x_disks[i]); + libxl_device_disk_dispose(&x_disks[i]); VIR_FREE(x_disks); return -1; } int -libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, - libxl_device_nic *x_nic) +libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic) { - // TODO: Where is mtu stored? - //x_nics[i].mtu = 1492; + /* TODO: Where is mtu stored? + * + * x_nics[i].mtu = 1492; + */ - x_nic->domid = def->id; virMacAddrGetRaw(&l_nic->mac, x_nic->mac); if (l_nic->model && !STREQ(l_nic->model, "netfront")) { @@ -610,9 +617,9 @@ libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, virReportOOMError(); return -1; } - x_nic->nictype = NICTYPE_IOEMU; + x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } else { - x_nic->nictype = NICTYPE_VIF; + x_nic->nictype = LIBXL_NIC_TYPE_VIF; } if (l_nic->ifname && (x_nic->ifname = strdup(l_nic->ifname)) == NULL) { @@ -659,48 +666,49 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) for (i = 0; i < nnics; i++) { x_nics[i].devid = i; - if (libxlMakeNic(def, l_nics[i], &x_nics[i])) + if (libxlMakeNic(l_nics[i], &x_nics[i])) goto error; } - d_config->vifs = x_nics; - d_config->num_vifs = nnics; + d_config->nics = x_nics; + d_config->num_nics = nnics; return 0; error: for (i = 0; i < nnics; i++) - libxl_device_nic_destroy(&x_nics[i]); + libxl_device_nic_dispose(&x_nics[i]); VIR_FREE(x_nics); return -1; } int -libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainDefPtr def, - virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb) +libxlMakeVfb(libxlDriverPrivatePtr driver, + virDomainGraphicsDefPtr l_vfb, + libxl_device_vfb *x_vfb) { int port; const char *listenAddr; switch (l_vfb->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - x_vfb->sdl = 1; + libxl_defbool_set(&x_vfb->sdl.enable, 1); if (l_vfb->data.sdl.display && - (x_vfb->display = strdup(l_vfb->data.sdl.display)) == NULL) { + (x_vfb->sdl.display = strdup(l_vfb->data.sdl.display)) == NULL) { virReportOOMError(); return -1; } if (l_vfb->data.sdl.xauth && - (x_vfb->xauthority = + (x_vfb->sdl.xauthority = strdup(l_vfb->data.sdl.xauth)) == NULL) { virReportOOMError(); return -1; } break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - x_vfb->vnc = 1; + libxl_defbool_set(&x_vfb->vnc.enable, 1); /* driver handles selection of free port */ - x_vfb->vncunused = 0; + libxl_defbool_set(&x_vfb->vnc.findunused, 0); if (l_vfb->data.vnc.autoport) { port = libxlNextFreeVncPort(driver, LIBXL_VNC_PORT_MIN); if (port < 0) { @@ -710,13 +718,13 @@ libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainDefPtr def, } l_vfb->data.vnc.port = port; } - x_vfb->vncdisplay = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; + x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; listenAddr = virDomainGraphicsListenGetAddress(l_vfb, 0); if (listenAddr) { /* libxl_device_vfb_init() does strdup("127.0.0.1") */ - VIR_FREE(x_vfb->vnclisten); - if ((x_vfb->vnclisten = strdup(listenAddr)) == NULL) { + VIR_FREE(x_vfb->vnc.listen); + if ((x_vfb->vnc.listen = strdup(listenAddr)) == NULL) { virReportOOMError(); return -1; } @@ -729,13 +737,14 @@ libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainDefPtr def, } break; } - x_vfb->domid = def->id; + return 0; } static int libxlMakeVfbList(libxlDriverPrivatePtr driver, - virDomainDefPtr def, libxl_domain_config *d_config) + virDomainDefPtr def, + libxl_domain_config *d_config) { virDomainGraphicsDefPtr *l_vfbs = def->graphics; int nvfbs = def->ngraphics; @@ -757,10 +766,10 @@ libxlMakeVfbList(libxlDriverPrivatePtr driver, } for (i = 0; i < nvfbs; i++) { - libxl_device_vfb_init(&x_vfbs[i], i); - libxl_device_vkb_init(&x_vkbs[i], i); + libxl_device_vfb_init(&x_vfbs[i]); + libxl_device_vkb_init(&x_vkbs[i]); - if (libxlMakeVfb(driver, def, l_vfbs[i], &x_vfbs[i]) < 0) + if (libxlMakeVfb(driver, l_vfbs[i], &x_vfbs[i]) < 0) goto error; } @@ -772,148 +781,14 @@ libxlMakeVfbList(libxlDriverPrivatePtr driver, error: for (i = 0; i < nvfbs; i++) { - libxl_device_vfb_destroy(&x_vfbs[i]); - libxl_device_vkb_destroy(&x_vkbs[i]); + libxl_device_vfb_dispose(&x_vfbs[i]); + libxl_device_vkb_dispose(&x_vkbs[i]); } VIR_FREE(x_vfbs); VIR_FREE(x_vkbs); return -1; } -static int -libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) -{ - const char *type = virDomainChrTypeToString(def->source.type); - - if (!type) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("unexpected chr device type")); - return -1; - } - - switch (def->source.type) { - case VIR_DOMAIN_CHR_TYPE_NULL: - case VIR_DOMAIN_CHR_TYPE_STDIO: - case VIR_DOMAIN_CHR_TYPE_VC: - case VIR_DOMAIN_CHR_TYPE_PTY: - if (virAsprintf(buf, "%s", type) < 0) { - virReportOOMError(); - return -1; - } - break; - - case VIR_DOMAIN_CHR_TYPE_FILE: - case VIR_DOMAIN_CHR_TYPE_PIPE: - if (virAsprintf(buf, "%s:%s", type, - def->source.data.file.path) < 0) { - virReportOOMError(); - return -1; - } - break; - - case VIR_DOMAIN_CHR_TYPE_DEV: - if (virAsprintf(buf, "%s", def->source.data.file.path) < 0) { - virReportOOMError(); - return -1; - } - break; - } - - return 0; -} - -static int -libxlMakeDeviceModelInfo(virDomainDefPtr def, libxl_domain_config *d_config) -{ - libxl_device_model_info *dm_info = &d_config->dm_info; - int i; - char b_order[VIR_DOMAIN_BOOT_LAST+1]; - - libxl_init_dm_info(dm_info, &d_config->c_info, &d_config->b_info); - - if (d_config->b_info.hvm) { - /* HVM-specific device model info */ - dm_info->type = XENFV; - if (def->os.nBootDevs > 0) { - VIR_FREE(dm_info->boot); - for (i = 0; i < def->os.nBootDevs; i++) { - switch (def->os.bootDevs[i]) { - case VIR_DOMAIN_BOOT_FLOPPY: - b_order[i] = 'a'; - break; - default: - case VIR_DOMAIN_BOOT_DISK: - b_order[i] = 'c'; - break; - case VIR_DOMAIN_BOOT_CDROM: - b_order[i] = 'd'; - break; - case VIR_DOMAIN_BOOT_NET: - b_order[i] = 'n'; - break; - } - } - b_order[def->os.nBootDevs] = '\0'; - if ((dm_info->boot = strdup(b_order)) == NULL) { - virReportOOMError(); - goto error; - } - } - if (def->serials && - (libxlMakeChrdevStr(def->serials[0], &dm_info->serial) < 0)) - goto error; - } else { - /* PV-specific device model info */ - dm_info->type = XENPV; - } - - /* Build qemu graphics options from previously parsed vfb */ - if (d_config->num_vfbs > 0) { - if (d_config->vfbs[0].vnc) { - dm_info->vnc = 1; - /* driver handles selection of free port */ - dm_info->vncunused = 0; - if (d_config->vfbs[0].vnclisten) { - VIR_FREE(dm_info->vnclisten); - if ((dm_info->vnclisten = - strdup(d_config->vfbs[0].vnclisten)) == NULL) { - virReportOOMError(); - goto error; - } - } - if (d_config->vfbs[0].keymap && - (dm_info->keymap = strdup(d_config->vfbs[0].keymap)) == NULL) { - virReportOOMError(); - goto error; - } - dm_info->vncdisplay = d_config->vfbs[0].vncdisplay; - if (d_config->vfbs[0].vncpasswd && - (dm_info->vncpasswd = - strdup(d_config->vfbs[0].vncpasswd)) == NULL) { - virReportOOMError(); - goto error; - } - } else if (d_config->vfbs[0].sdl) { - dm_info->sdl = 1; - dm_info->vnc = 0; - } - } else if (d_config->num_vfbs == 0) { - dm_info->nographic = 1; - dm_info->vnc = 0; - } - - // TODO - //dm_info->usb = ; - //dm_info->usbdevice = ; - //dm_info->soundhw = ; - - return 0; - -error: - libxl_device_model_info_destroy(dm_info); - return -1; -} - virCapsPtr libxlMakeCapabilities(libxl_ctx *ctx) { @@ -947,7 +822,7 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, virDomainDefPtr def, libxl_domain_config *d_config) { - if (libxlMakeDomCreateInfo(def, &d_config->c_info) < 0) + if (libxlMakeDomCreateInfo(driver, def, &d_config->c_info) < 0) return -1; if (libxlMakeDomBuildInfo(def, d_config) < 0) { @@ -966,10 +841,6 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, goto error; } - if (libxlMakeDeviceModelInfo(def, d_config) < 0) { - goto error; - } - d_config->on_reboot = def->onReboot; d_config->on_poweroff = def->onPoweroff; d_config->on_crash = def->onCrash; @@ -977,6 +848,6 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, return 0; error: - libxl_domain_config_destroy(d_config); + libxl_domain_config_dispose(d_config); return -1; } diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 56bf85c..8b5a9e9 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -58,7 +58,7 @@ struct _libxlDriverPrivate { FILE *logger_file; xentoollog_logger *logger; /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ - libxl_ctx ctx; + libxl_ctx *ctx; virBitmapPtr reservedVNCPorts; virDomainObjList domains; @@ -77,10 +77,8 @@ typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate; typedef libxlDomainObjPrivate *libxlDomainObjPrivatePtr; struct _libxlDomainObjPrivate { /* per domain libxl ctx */ - libxl_ctx ctx; - libxl_waiter *dWaiter; - int waiterFD; - int eventHdl; + libxl_ctx *ctx; + libxl_evgen_domain_death *deathW; }; # define LIBXL_SAVE_MAGIC "libvirt-xml\n \0 \r" @@ -100,13 +98,11 @@ virCapsPtr libxlMakeCapabilities(libxl_ctx *ctx); int -libxlMakeDisk(virDomainDefPtr def, virDomainDiskDefPtr l_dev, - libxl_device_disk *x_dev); +libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); int -libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, - libxl_device_nic *x_nic); +libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic); int -libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainDefPtr def, +libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb); int diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ae4451a..44d0781 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -40,6 +40,7 @@ #include "memory.h" #include "uuid.h" #include "command.h" +#include "libxl.h" #include "libxl_driver.h" #include "libxl_conf.h" #include "xen_xm.h" @@ -59,6 +60,19 @@ /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 +struct libxlOSEventHookFDInfo { + libxlDomainObjPrivatePtr priv; + void *xl_priv; + int watch; +}; + +struct libxlOSEventHookTimerInfo { + libxlDomainObjPrivatePtr priv; + void *xl_priv; + int id; +}; + + static void libxlDomainManagedSaveLoad(void *payload, const void *n ATTRIBUTE_UNUSED, void *opaque); @@ -84,6 +98,163 @@ libxlDriverUnlock(libxlDriverPrivatePtr driver) virMutexUnlock(&driver->lock); } + +static void libxlFDEventCallback(int watch ATTRIBUTE_UNUSED, + int fd, + int vir_events, + void *fdinfo) +{ + struct libxlOSEventHookFDInfo *info = fdinfo; + int events = 0; + + if (vir_events & VIR_EVENT_HANDLE_READABLE) + events |= POLLIN; + if (vir_events & VIR_EVENT_HANDLE_WRITABLE) + events |= POLLOUT; + if (vir_events & VIR_EVENT_HANDLE_ERROR) + events |= POLLERR; + if (vir_events & VIR_EVENT_HANDLE_HANGUP) + events |= POLLHUP; + + libxl_osevent_occurred_fd(info->priv->ctx, info->xl_priv, fd, 0, events); +} + +static void libxlFreeFDInfo(void *obj) +{ + VIR_FREE(obj); +} + +static int libxlFDRegisterEventHook(void *priv, int fd, void **hndp, + short events, void *xl_priv) +{ + int vir_events = VIR_EVENT_HANDLE_ERROR; + struct libxlOSEventHookFDInfo *fdinfo; + + if (VIR_ALLOC(fdinfo) < 0) { + virReportOOMError(); + return -1; + } + + fdinfo->priv = priv; + fdinfo->xl_priv = xl_priv; + *hndp = fdinfo; + + if (events & POLLIN) + vir_events |= VIR_EVENT_HANDLE_READABLE; + if (events & POLLOUT) + vir_events |= VIR_EVENT_HANDLE_WRITABLE; + fdinfo->watch = virEventAddHandle(fd, vir_events, libxlFDEventCallback, + fdinfo, libxlFreeFDInfo); + if (fdinfo->watch < 0) { + VIR_FREE(fdinfo); + return fdinfo->watch; + } + + return 0; +} + +static int libxlFDModifyEventHook(void *priv ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + void **hndp, + short events) +{ + struct libxlOSEventHookFDInfo *fdinfo = *hndp; + int vir_events = VIR_EVENT_HANDLE_ERROR; + + if (events & POLLIN) + vir_events |= VIR_EVENT_HANDLE_READABLE; + if (events & POLLOUT) + vir_events |= VIR_EVENT_HANDLE_WRITABLE; + + virEventUpdateHandle(fdinfo->watch, vir_events); + return 0; +} + +static void libxlFDDeregisterEventHook(void *priv ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + void *hnd) +{ + struct libxlOSEventHookFDInfo *fdinfo = hnd; + + virEventRemoveHandle(fdinfo->watch); +} + + +static void libxlTimerCallback(int timer ATTRIBUTE_UNUSED, void *timer_v) +{ + struct libxlOSEventHookTimerInfo *timer_info = timer_v; + + libxl_osevent_occurred_timeout(timer_info->priv->ctx, timer_info->xl_priv); +} + +static void libxlTimerInfoFree(void* obj) +{ + VIR_FREE(obj); +} + +static int libxlTimeoutRegisterEventHook(void *priv, + void **hndp, + struct timeval abs_t, + void *for_libxl) +{ + struct timeval now; + struct libxlOSEventHookTimerInfo *timer_info; + int timeout, timer_id; + + if (VIR_ALLOC(timer_info) < 0) { + virReportOOMError(); + return -1; + } + + gettimeofday(&now, NULL); + timeout = (abs_t.tv_usec - now.tv_usec) / 1000; + timeout += (abs_t.tv_sec - now.tv_sec) * 1000; + timer_id = virEventAddTimeout(timeout, libxlTimerCallback, + timer_info, libxlTimerInfoFree); + if (timer_id < 0) { + VIR_FREE(timer_info); + return timer_id; + } + + timer_info->priv = priv; + timer_info->xl_priv = for_libxl; + timer_info->id = timer_id; + *hndp = timer_info; + return 0; +} + +static int libxlTimeoutModifyEventHook(void *priv ATTRIBUTE_UNUSED, + void **hndp, + struct timeval abs_t) +{ + struct timeval now; + int timeout; + struct libxlOSEventHookTimerInfo *timer_info = *hndp; + + gettimeofday(&now, NULL); + timeout = (abs_t.tv_usec - now.tv_usec) / 1000; + timeout += (abs_t.tv_sec - now.tv_sec) * 1000; + virEventUpdateTimeout(timer_info->id, timeout); + return 0; +} + +static void libxlTimeoutDeregisterEventHook(void *priv ATTRIBUTE_UNUSED, + void *hnd) +{ + struct libxlOSEventHookTimerInfo *timer_info = hnd; + + virEventRemoveTimeout(timer_info->id); +} + +static const libxl_osevent_hooks libxl_event_callbacks = { + .fd_register = libxlFDRegisterEventHook, + .fd_modify = libxlFDModifyEventHook, + .fd_deregister = libxlFDDeregisterEventHook, + .timeout_register = libxlTimeoutRegisterEventHook, + .timeout_modify = libxlTimeoutModifyEventHook, + .timeout_deregister = libxlTimeoutDeregisterEventHook, +}; + static void * libxlDomainObjPrivateAlloc(void) { @@ -92,9 +263,9 @@ libxlDomainObjPrivateAlloc(void) if (VIR_ALLOC(priv) < 0) return NULL; - libxl_ctx_init(&priv->ctx, LIBXL_VERSION, libxl_driver->logger); - priv->waiterFD = -1; - priv->eventHdl = -1; + libxl_ctx_alloc(&priv->ctx, LIBXL_VERSION, 0, libxl_driver->logger); + priv->deathW = NULL; + libxl_osevent_register_hooks(priv->ctx, &libxl_event_callbacks, priv); return priv; } @@ -104,16 +275,12 @@ libxlDomainObjPrivateFree(void *data) { libxlDomainObjPrivatePtr priv = data; - if (priv->eventHdl >= 0) - virEventRemoveHandle(priv->eventHdl); - - if (priv->dWaiter) { - libxl_stop_waiting(&priv->ctx, priv->dWaiter); - libxl_free_waiter(priv->dWaiter); - VIR_FREE(priv->dWaiter); + if (priv->deathW) { + libxl_evdisable_domain_death(priv->ctx, priv->deathW); + VIR_FREE(priv->deathW); } - libxl_ctx_free(&priv->ctx); + libxl_ctx_free(priv->ctx); VIR_FREE(priv); } @@ -125,17 +292,6 @@ libxlDomainEventQueue(libxlDriverPrivatePtr driver, virDomainEventPtr event) virDomainEventStateQueue(driver->domainEventState, event); } -/* - * Remove reference to domain object. - */ -static void -libxlDomainObjUnref(void *data) -{ - virDomainObjPtr vm = data; - - virObjectUnref(vm); -} - static void libxlAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) @@ -166,13 +322,13 @@ libxlDoNodeGetInfo(libxlDriverPrivatePtr driver, virNodeInfoPtr info) const libxl_version_info* ver_info; struct utsname utsname; - if (libxl_get_physinfo(&driver->ctx, &phy_info)) { + if (libxl_get_physinfo(driver->ctx, &phy_info)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxl_get_physinfo_info failed")); return -1; } - if ((ver_info = libxl_get_version_info(&driver->ctx)) == NULL) { + if ((ver_info = libxl_get_version_info(driver->ctx)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxl_get_version_info failed")); return -1; @@ -296,15 +452,9 @@ libxlVmCleanup(libxlDriverPrivatePtr driver, char *file; int i; - if (priv->eventHdl >= 0) { - virEventRemoveHandle(priv->eventHdl); - priv->eventHdl = -1; - } - - if (priv->dWaiter) { - libxl_stop_waiting(&priv->ctx, priv->dWaiter); - libxl_free_waiter(priv->dWaiter); - VIR_FREE(priv->dWaiter); + if (priv->deathW) { + libxl_evdisable_domain_death(priv->ctx, priv->deathW); + priv->deathW = NULL; } if (vm->persistent) { @@ -355,12 +505,11 @@ libxlVmCleanup(libxlDriverPrivatePtr driver, static int libxlVmReap(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - int force, virDomainShutoffReason reason) { libxlDomainObjPrivatePtr priv = vm->privateData; - if (libxl_domain_destroy(&priv->ctx, vm->def->id, force) < 0) { + if (libxl_domain_destroy(priv->ctx, vm->def->id, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to cleanup domain %d"), vm->def->id); return -1; @@ -373,56 +522,26 @@ libxlVmReap(libxlDriverPrivatePtr driver, /* * Handle previously registered event notification from libxenlight */ -static void libxlEventHandler(int watch, - int fd, - int events, - void *data) +static void libxlEventHandler(void *data, const libxl_event *event) { libxlDriverPrivatePtr driver = libxl_driver; virDomainObjPtr vm = data; - libxlDomainObjPrivatePtr priv; virDomainEventPtr dom_event = NULL; - libxl_event event; - libxl_dominfo info; libxlDriverLock(driver); virDomainObjLock(vm); libxlDriverUnlock(driver); - priv = vm->privateData; - - memset(&event, 0, sizeof(event)); - memset(&info, 0, sizeof(info)); - - if (priv->waiterFD != fd || priv->eventHdl != watch) { - virEventRemoveHandle(watch); - priv->eventHdl = -1; - goto cleanup; - } - - if (!(events & VIR_EVENT_HANDLE_READABLE)) - goto cleanup; - - if (libxl_get_event(&priv->ctx, &event)) - goto cleanup; - - if (event.type == LIBXL_EVENT_DOMAIN_DEATH) { + if (event->type == LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN) { virDomainShutoffReason reason; - /* libxl_event_get_domain_death_info returns 1 if death - * event was for this domid */ - if (libxl_event_get_domain_death_info(&priv->ctx, - vm->def->id, - &event, - &info) != 1) + if (event->domid != vm->def->id) goto cleanup; - virEventRemoveHandle(watch); - priv->eventHdl = -1; - switch (info.shutdown_reason) { - case SHUTDOWN_poweroff: - case SHUTDOWN_crash: - if (info.shutdown_reason == SHUTDOWN_crash) { + switch (event->u.domain_shutdown.shutdown_reason) { + case LIBXL_SHUTDOWN_REASON_POWEROFF: + case LIBXL_SHUTDOWN_REASON_CRASH: + if (event->u.domain_shutdown.shutdown_reason == LIBXL_SHUTDOWN_REASON_CRASH) { dom_event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_CRASHED); @@ -430,18 +549,18 @@ static void libxlEventHandler(int watch, } else { reason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; } - libxlVmReap(driver, vm, 0, reason); + libxlVmReap(driver, vm, reason); if (!vm->persistent) { virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } break; - case SHUTDOWN_reboot: - libxlVmReap(driver, vm, 0, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + case LIBXL_SHUTDOWN_REASON_REBOOT: + libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); libxlVmStart(driver, vm, 0, -1); break; default: - VIR_INFO("Unhandled shutdown_reason %d", info.shutdown_reason); + VIR_INFO("Unhandled shutdown_reason %d", event->u.domain_shutdown.shutdown_reason); break; } } @@ -454,9 +573,14 @@ cleanup: libxlDomainEventQueue(driver, dom_event); libxlDriverUnlock(driver); } - libxl_free_event(&event); } +static const struct libxl_event_hooks ev_hooks = { + .event_occurs_mask = LIBXL_EVENTMASK_ALL, + .event_occurs = libxlEventHandler, + .disaster = NULL, +}; + /* * Register domain events with libxenlight and insert event handles * in libvirt's event loop. @@ -465,40 +589,18 @@ static int libxlCreateDomEvents(virDomainObjPtr vm) { libxlDomainObjPrivatePtr priv = vm->privateData; - int fd; - if (VIR_ALLOC(priv->dWaiter) < 0) { - virReportOOMError(); - return -1; - } - - if (libxl_wait_for_domain_death(&priv->ctx, vm->def->id, priv->dWaiter)) - goto error; - - libxl_get_wait_fd(&priv->ctx, &fd); - if (fd < 0) - goto error; + libxl_event_register_callbacks(priv->ctx, &ev_hooks, vm); - priv->waiterFD = fd; - /* Add a reference to the domain object while it is injected in - * the event loop. - */ - virObjectRef(vm); - if ((priv->eventHdl = virEventAddHandle( - fd, - VIR_EVENT_HANDLE_READABLE | VIR_EVENT_HANDLE_ERROR, - libxlEventHandler, - vm, libxlDomainObjUnref)) < 0) { - virObjectUnref(vm); + if (libxl_evenable_domain_death(priv->ctx, vm->def->id, 0, &priv->deathW)) goto error; - } return 0; error: - libxl_free_waiter(priv->dWaiter); - VIR_FREE(priv->dWaiter); - priv->eventHdl = -1; + if (priv->deathW) + libxl_evdisable_domain_death(priv->ctx, priv->deathW); + VIR_FREE(priv->deathW); return -1; } @@ -507,7 +609,7 @@ libxlDomainSetVcpuAffinites(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { libxlDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; - libxl_cpumap map; + libxl_bitmap map; uint8_t *cpumask = NULL; uint8_t *cpumap = NULL; virNodeInfo nodeinfo; @@ -539,7 +641,7 @@ libxlDomainSetVcpuAffinites(libxlDriverPrivatePtr driver, virDomainObjPtr vm) map.size = cpumaplen; map.map = cpumap; - if (libxl_set_vcpuaffinity(&priv->ctx, def->id, vcpu, &map) != 0) { + if (libxl_set_vcpuaffinity(priv->ctx, def->id, vcpu, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to pin vcpu '%d' with libxenlight"), vcpu); goto cleanup; @@ -565,11 +667,10 @@ libxlFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) int tries = 3; int wait_secs = 10; - if ((ret = libxl_domain_need_memory(&priv->ctx, &d_config->b_info, - &d_config->dm_info, + if ((ret = libxl_domain_need_memory(priv->ctx, &d_config->b_info, &needed_mem)) >= 0) { for (i = 0; i < tries; ++i) { - if ((ret = libxl_get_free_memory(&priv->ctx, &free_mem)) < 0) + if ((ret = libxl_get_free_memory(priv->ctx, &free_mem)) < 0) break; if (free_mem >= needed_mem) { @@ -577,17 +678,17 @@ libxlFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) break; } - if ((ret = libxl_set_memory_target(&priv->ctx, 0, + if ((ret = libxl_set_memory_target(priv->ctx, 0, free_mem - needed_mem, /* relative */ 1, 0)) < 0) break; - ret = libxl_wait_for_free_memory(&priv->ctx, 0, needed_mem, + ret = libxl_wait_for_free_memory(priv->ctx, 0, needed_mem, wait_secs); if (ret == 0 || ret != ERROR_NOMEM) break; - if ((ret = libxl_wait_for_memory_target(&priv->ctx, 0, 1)) < 0) + if ((ret = libxl_wait_for_memory_target(priv->ctx, 0, 1)) < 0) break; } } @@ -613,7 +714,6 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, char *dom_xml = NULL; char *managed_save_path = NULL; int managed_save_fd = -1; - pid_t child_console_pid = -1; libxlDomainObjPrivatePtr priv = vm->privateData; /* If there is a managed saved state restore it instead of starting @@ -657,7 +757,7 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, VIR_FREE(managed_save_path); } - memset(&d_config, 0, sizeof(d_config)); + libxl_domain_config_init(&d_config); if (libxlBuildDomainConfig(driver, vm->def, &d_config) < 0) return -1; @@ -669,13 +769,14 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto error; } + /* use as synchronous operations => ao_how = NULL and no intermediate reports => ao_progress = NULL */ + if (restore_fd < 0) - ret = libxl_domain_create_new(&priv->ctx, &d_config, - NULL, &child_console_pid, &domid); + ret = libxl_domain_create_new(priv->ctx, &d_config, + &domid, NULL, NULL); else - ret = libxl_domain_create_restore(&priv->ctx, &d_config, NULL, - &child_console_pid, &domid, - restore_fd); + ret = libxl_domain_create_restore(priv->ctx, &d_config, &domid, + restore_fd, NULL, NULL); if (ret) { if (restore_fd < 0) @@ -693,7 +794,7 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, if ((dom_xml = virDomainDefFormat(vm->def, 0)) == NULL) goto error; - if (libxl_userdata_store(&priv->ctx, domid, "libvirt-xml", + if (libxl_userdata_store(priv->ctx, domid, "libvirt-xml", (uint8_t *)dom_xml, strlen(dom_xml) + 1)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxenlight failed to store userdata")); @@ -707,7 +808,7 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto error; if (!start_paused) { - libxl_domain_unpause(&priv->ctx, domid); + libxl_domain_unpause(priv->ctx, domid); virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); } else { virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); @@ -723,18 +824,18 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, VIR_DOMAIN_EVENT_STARTED_RESTORED); libxlDomainEventQueue(driver, event); - libxl_domain_config_destroy(&d_config); + libxl_domain_config_dispose(&d_config); VIR_FREE(dom_xml); VIR_FORCE_CLOSE(managed_save_fd); return 0; error: if (domid > 0) { - libxl_domain_destroy(&priv->ctx, domid, 0); + libxl_domain_destroy(priv->ctx, domid, NULL); vm->def->id = -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_FAILED); } - libxl_domain_config_destroy(&d_config); + libxl_domain_config_dispose(&d_config); VIR_FREE(dom_xml); VIR_FREE(managed_save_path); virDomainDefFree(def); @@ -762,7 +863,7 @@ libxlReconnectDomain(void *payload, virDomainObjLock(vm); /* Does domain still exist? */ - rc = libxl_domain_info(&driver->ctx, &d_info, vm->def->id); + rc = libxl_domain_info(driver->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { goto out; } else if (rc != 0) { @@ -772,7 +873,7 @@ libxlReconnectDomain(void *payload, } /* Is this a domain that was under libvirt control? */ - if (libxl_userdata_retrieve(&driver->ctx, vm->def->id, + if (libxl_userdata_retrieve(driver->ctx, vm->def->id, "libvirt-xml", &data, &len)) { VIR_DEBUG("libxl_userdata_retrieve failed, ignoring domain %d", vm->def->id); goto out; @@ -810,7 +911,7 @@ libxlShutdown(void) libxlDriverLock(libxl_driver); virCapabilitiesFree(libxl_driver->caps); virDomainObjListDeinit(&libxl_driver->domains); - libxl_ctx_free(&libxl_driver->ctx); + libxl_ctx_free(libxl_driver->ctx); xtl_logger_destroy(libxl_driver->logger); if (libxl_driver->logger_file) VIR_FORCE_FCLOSE(libxl_driver->logger_file); @@ -943,14 +1044,14 @@ libxlStartup(bool privileged) { goto fail; } - if (libxl_ctx_init(&libxl_driver->ctx, - LIBXL_VERSION, + if (libxl_ctx_alloc(&libxl_driver->ctx, + LIBXL_VERSION, 0, libxl_driver->logger)) { VIR_INFO("cannot initialize libxenlight context, probably not running in a Xen Dom0, disabling driver"); goto fail; } - if ((ver_info = libxl_get_version_info(&libxl_driver->ctx)) == NULL) { + if ((ver_info = libxl_get_version_info(libxl_driver->ctx)) == NULL) { VIR_INFO("cannot version information from libxenlight, disabling driver"); goto fail; } @@ -958,7 +1059,7 @@ libxlStartup(bool privileged) { (ver_info->xen_version_minor * 1000); if ((libxl_driver->caps = - libxlMakeCapabilities(&libxl_driver->ctx)) == NULL) { + libxlMakeCapabilities(libxl_driver->ctx)) == NULL) { VIR_ERROR(_("cannot create capabilities for libxenlight")); goto error; } @@ -1115,7 +1216,7 @@ libxlGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) int ret; libxlDriverPrivatePtr driver = conn->privateData; - ret = libxl_get_max_cpus(&driver->ctx); + ret = libxl_get_max_cpus(driver->ctx); /* libxl_get_max_cpus() will return 0 if there were any failures, e.g. xc_physinfo() failing */ if (ret == 0) @@ -1320,7 +1421,7 @@ libxlDomainSuspend(virDomainPtr dom) priv = vm->privateData; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { - if (libxl_domain_pause(&priv->ctx, dom->id) != 0) { + if (libxl_domain_pause(priv->ctx, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to suspend domain '%d' with libxenlight"), dom->id); @@ -1379,7 +1480,7 @@ libxlDomainResume(virDomainPtr dom) priv = vm->privateData; if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { - if (libxl_domain_unpause(&priv->ctx, dom->id) != 0) { + if (libxl_domain_unpause(priv->ctx, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to resume domain '%d' with libxenlight"), dom->id); @@ -1436,7 +1537,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags) } priv = vm->privateData; - if (libxl_domain_shutdown(&priv->ctx, dom->id, LIBXL_DOM_REQ_POWEROFF) != 0) { + if (libxl_domain_shutdown(priv->ctx, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to shutdown domain '%d' with libxenlight"), dom->id); @@ -1489,7 +1590,7 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) } priv = vm->privateData; - if (libxl_domain_shutdown(&priv->ctx, dom->id, LIBXL_DOM_REQ_REBOOT) != 0) { + if (libxl_domain_reboot(priv->ctx, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to reboot domain '%d' with libxenlight"), dom->id); @@ -1534,7 +1635,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, event = virDomainEventNewFromObj(vm,VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); - if (libxlVmReap(driver, vm, 1, VIR_DOMAIN_SHUTOFF_DESTROYED) != 0) { + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to destroy domain '%d'"), dom->id); goto cleanup; @@ -1672,7 +1773,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, if (flags & VIR_DOMAIN_MEM_LIVE) { priv = vm->privateData; - if (libxl_domain_setmaxmem(&priv->ctx, dom->id, newmem) < 0) { + if (libxl_domain_setmaxmem(priv->ctx, dom->id, newmem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set maximum memory for domain '%d'" " with libxenlight"), dom->id); @@ -1701,7 +1802,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, if (flags & VIR_DOMAIN_MEM_LIVE) { priv = vm->privateData; - if (libxl_set_memory_target(&priv->ctx, dom->id, newmem, 0, + if (libxl_set_memory_target(priv->ctx, dom->id, newmem, 0, /* force */ 1) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set memory for domain '%d'" @@ -1761,7 +1862,7 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->memory = vm->def->mem.cur_balloon; info->maxMem = vm->def->mem.max_balloon; } else { - if (libxl_domain_info(&driver->ctx, &d_info, dom->id) != 0) { + if (libxl_domain_info(driver->ctx, &d_info, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxl_domain_info failed for domain '%d'"), dom->id); goto cleanup; @@ -1861,7 +1962,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; } - if (libxl_domain_suspend(&priv->ctx, NULL, vm->def->id, fd) != 0) { + if (libxl_domain_suspend(priv->ctx, vm->def->id, fd, 0, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to save domain '%d' with libxenlight"), vm->def->id); @@ -1871,7 +1972,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SAVED); - if (libxlVmReap(driver, vm, 1, VIR_DOMAIN_SHUTOFF_SAVED) != 0) { + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to destroy domain '%d'"), vm->def->id); goto cleanup; @@ -2028,7 +2129,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) if (!(flags & VIR_DUMP_LIVE) && virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { - if (libxl_domain_pause(&priv->ctx, dom->id) != 0) { + if (libxl_domain_pause(priv->ctx, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Before dumping core, failed to suspend domain '%d'" " with libxenlight"), @@ -2039,7 +2140,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) paused = true; } - if (libxl_domain_core_dump(&priv->ctx, dom->id, to) != 0) { + if (libxl_domain_core_dump(priv->ctx, dom->id, to, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to dump core of domain '%d' with libxenlight"), dom->id); @@ -2048,7 +2149,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) libxlDriverLock(driver); if (flags & VIR_DUMP_CRASH) { - if (libxlVmReap(driver, vm, 1, VIR_DOMAIN_SHUTOFF_CRASHED) != 0) { + if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to destroy domain '%d'"), dom->id); goto cleanup_unlock; @@ -2069,7 +2170,7 @@ cleanup_unlock: libxlDriverUnlock(driver); cleanup_unpause: if (virDomainObjIsActive(vm) && paused) { - if (libxl_domain_unpause(&priv->ctx, dom->id) != 0) { + if (libxl_domain_unpause(priv->ctx, dom->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("After dumping core, failed to resume domain '%d' with" " libxenlight"), dom->id); @@ -2227,7 +2328,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, libxlDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainObjPtr vm; - libxl_cpumap map; + libxl_bitmap map; uint8_t *bitmask = NULL; unsigned int maplen; unsigned int i, pos; @@ -2322,7 +2423,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, break; case VIR_DOMAIN_VCPU_LIVE: - if (libxl_set_vcpuonline(&priv->ctx, dom->id, &map) != 0) { + if (libxl_set_vcpuonline(priv->ctx, dom->id, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set vcpus for domain '%d'" " with libxenlight"), dom->id); @@ -2331,7 +2432,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, break; case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG: - if (libxl_set_vcpuonline(&priv->ctx, dom->id, &map) != 0) { + if (libxl_set_vcpuonline(priv->ctx, dom->id, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set vcpus for domain '%d'" " with libxenlight"), dom->id); @@ -2427,7 +2528,7 @@ libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap, libxlDomainObjPrivatePtr priv; virDomainObjPtr vm; int ret = -1; - libxl_cpumap map; + libxl_bitmap map; libxlDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -2448,7 +2549,7 @@ libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap, map.size = maplen; map.map = cpumap; - if (libxl_set_vcpuaffinity(&priv->ctx, dom->id, vcpu, &map) != 0) { + if (libxl_set_vcpuaffinity(priv->ctx, dom->id, vcpu, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to pin vcpu '%d' with libxenlight"), vcpu); goto cleanup; @@ -2511,7 +2612,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, } priv = vm->privateData; - if ((vcpuinfo = libxl_list_vcpu(&priv->ctx, dom->id, &maxcpu, + if ((vcpuinfo = libxl_list_vcpu(priv->ctx, dom->id, &maxcpu, &hostcpus)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to list vcpus for domain '%d' with libxenlight"), @@ -2538,7 +2639,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, MIN(maplen, vcpuinfo[i].cpumap.size)); } - libxl_vcpuinfo_destroy(&vcpuinfo[i]); + libxl_vcpuinfo_dispose(&vcpuinfo[i]); } VIR_FREE(vcpuinfo); @@ -2596,7 +2697,7 @@ libxlDomainXMLFromNative(virConnectPtr conn, const char * nativeFormat, goto cleanup; } - if ((ver_info = libxl_get_version_info(&driver->ctx)) == NULL) { + if ((ver_info = libxl_get_version_info(driver->ctx)) == NULL) { VIR_ERROR(_("cannot get version information from libxenlight")); goto cleanup; } @@ -2639,7 +2740,7 @@ libxlDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, goto cleanup; } - if ((ver_info = libxl_get_version_info(&driver->ctx)) == NULL) { + if ((ver_info = libxl_get_version_info(driver->ctx)) == NULL) { VIR_ERROR(_("cannot get version information from libxenlight")); goto cleanup; } @@ -2899,10 +3000,10 @@ libxlDomainChangeEjectableMedia(libxlDomainObjPrivatePtr priv, return -1; } - if (libxlMakeDisk(vm->def, disk, &x_disk) < 0) + if (libxlMakeDisk(disk, &x_disk) < 0) goto cleanup; - if ((ret = libxl_cdrom_insert(&priv->ctx, vm->def->id, &x_disk)) < 0) { + if ((ret = libxl_cdrom_insert(priv->ctx, vm->def->id, &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to change media for disk '%s'"), disk->dst); @@ -2954,11 +3055,11 @@ libxlDomainAttachDeviceDiskLive(libxlDomainObjPrivatePtr priv, goto cleanup; } - if (libxlMakeDisk(vm->def, l_disk, &x_disk) < 0) + if (libxlMakeDisk(l_disk, &x_disk) < 0) goto cleanup; - if ((ret = libxl_device_disk_add(&priv->ctx, vm->def->id, - &x_disk)) < 0) { + if ((ret = libxl_device_disk_add(priv->ctx, vm->def->id, + &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to attach disk '%s'"), l_disk->dst); @@ -2991,7 +3092,6 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, virDomainDiskDefPtr l_disk = NULL; libxl_device_disk x_disk; int i; - int wait_secs = 2; int ret = -1; switch (dev->data.disk->device) { @@ -3008,11 +3108,11 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, l_disk = vm->def->disks[i]; - if (libxlMakeDisk(vm->def, l_disk, &x_disk) < 0) + if (libxlMakeDisk(l_disk, &x_disk) < 0) goto cleanup; - if ((ret = libxl_device_disk_del(&priv->ctx, &x_disk, - wait_secs)) < 0) { + if ((ret = libxl_device_disk_remove(priv->ctx, vm->def->id, + &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to detach disk '%s'"), l_disk->dst); @@ -3383,13 +3483,13 @@ libxlNodeGetFreeMemory(virConnectPtr conn) const libxl_version_info* ver_info; libxlDriverPrivatePtr driver = conn->privateData; - if (libxl_get_physinfo(&driver->ctx, &phy_info)) { + if (libxl_get_physinfo(driver->ctx, &phy_info)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxl_get_physinfo_info failed")); return 0; } - if ((ver_info = libxl_get_version_info(&driver->ctx)) == NULL) { + if ((ver_info = libxl_get_version_info(driver->ctx)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxl_get_version_info failed")); return 0; @@ -3536,7 +3636,7 @@ libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams) libxlDomainObjPrivatePtr priv; virDomainObjPtr vm; char * ret = NULL; - int sched_id; + libxl_scheduler sched_id; libxlDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -3553,31 +3653,29 @@ libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams) } priv = vm->privateData; - if ((sched_id = libxl_get_sched_id(&priv->ctx)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get scheduler id for domain '%d'" - " with libxenlight"), dom->id); - goto cleanup; - } + sched_id = libxl_get_scheduler(priv->ctx); if (nparams) *nparams = 0; switch (sched_id) { - case XEN_SCHEDULER_SEDF: + case LIBXL_SCHEDULER_SEDF: ret = strdup("sedf"); break; - case XEN_SCHEDULER_CREDIT: + case LIBXL_SCHEDULER_CREDIT: ret = strdup("credit"); if (nparams) *nparams = XEN_SCHED_CREDIT_NPARAM; break; - case XEN_SCHEDULER_CREDIT2: + case LIBXL_SCHEDULER_CREDIT2: ret = strdup("credit2"); break; - case XEN_SCHEDULER_ARINC653: + case LIBXL_SCHEDULER_ARINC653: ret = strdup("arinc653"); break; default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get scheduler id for domain '%d'" + " with libxenlight"), dom->id); goto cleanup; } @@ -3599,8 +3697,8 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, libxlDriverPrivatePtr driver = dom->conn->privateData; libxlDomainObjPrivatePtr priv; virDomainObjPtr vm; - libxl_sched_credit sc_info; - int sched_id; + libxl_domain_sched_params sc_info; + libxl_scheduler sched_id; int ret = -1; virCheckFlags(0, -1); @@ -3610,31 +3708,28 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, libxlDriverUnlock(driver); if (!vm) { - virReportError(VIR_ERR_NO_DOMAIN, "%s", _("no domain with matching uuid")); + virReportError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); goto cleanup; } if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running")); + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not running")); goto cleanup; } priv = vm->privateData; - if ((sched_id = libxl_get_sched_id(&priv->ctx)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get scheduler id for domain '%d'" - " with libxenlight"), dom->id); - goto cleanup; - } + sched_id = libxl_get_scheduler(priv->ctx); - if (sched_id != XEN_SCHEDULER_CREDIT) { + if (sched_id != LIBXL_SCHEDULER_CREDIT) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Only 'credit' scheduler is supported")); goto cleanup; } - if (libxl_sched_credit_domain_get(&priv->ctx, dom->id, &sc_info) != 0) { + if (libxl_domain_sched_params_get(priv->ctx, dom->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get scheduler parameters for domain '%d'" " with libxenlight"), dom->id); @@ -3677,7 +3772,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, libxlDriverPrivatePtr driver = dom->conn->privateData; libxlDomainObjPrivatePtr priv; virDomainObjPtr vm; - libxl_sched_credit sc_info; + libxl_domain_sched_params sc_info; int sched_id; int i; int ret = -1; @@ -3707,20 +3802,15 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, priv = vm->privateData; - if ((sched_id = libxl_get_sched_id(&priv->ctx)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get scheduler id for domain '%d'" - " with libxenlight"), dom->id); - goto cleanup; - } + sched_id = libxl_get_scheduler(priv->ctx); - if (sched_id != XEN_SCHEDULER_CREDIT) { + if (sched_id != LIBXL_SCHEDULER_CREDIT) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Only 'credit' scheduler is supported")); goto cleanup; } - if (libxl_sched_credit_domain_get(&priv->ctx, dom->id, &sc_info) != 0) { + if (libxl_domain_sched_params_get(priv->ctx, dom->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get scheduler parameters for domain '%d'" " with libxenlight"), dom->id); @@ -3737,7 +3827,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, } } - if (libxl_sched_credit_domain_set(&priv->ctx, dom->id, &sc_info) != 0) { + if (libxl_domain_sched_params_set(priv->ctx, dom->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set scheduler parameters for domain '%d'" " with libxenlight"), dom->id); -- 1.7.10.4

4 8

[libvirt] [PATCH 0/3] add pci-bridge device and address type
by liguang 08 Jan '13

08 Jan '13

Now, it's unnecessary to arrange devices into multi-pci-bus, for example: <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x1' slot='0x02' function='0x0'/> </video> libvirt will complain about "bus != 0", fortunately, qemu supports pci-to-pci bridge, if we want to use multi-pci-bus, we can define 2 pci bridge devices then attach 1 to the other as a subordinate pci-bus, so, 2 pci-buses appear. for example: <pci-bridge type='root'/> <pci-bridge type='subordinate'> <address type='pci-bridge' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </pci-bridge> <sound model='ac97'> <address type='pci-bridge' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci-bridge' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> src/conf/domain_conf.c | 88 +++++++++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 22 ++++++++++++ src/qemu/qemu_command.c | 52 +++++++++++++++++++++++++++++++++++++++++++--- docs/formatdomain.html.in | 23 +++++++++++++++++++++++ 4 files changed, 176 insertions(+), 9 deletions(-)

6 21

[libvirt] [PATCH 0/6] Resolve FORWARD_NULL errors found by Coverity
by John Ferlan 08 Jan '13

08 Jan '13

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=880388 This set of patches resolves "Error: FORWARD_NULL (CWE-476)" errors found by Coverity. John Ferlan (6): xen: Avoid possible NULL dereference vmware: Avoid NULL dereference for 'caps' remote: Avoid calling virAuthConfigLookup() if 'credname' is NULL. lxc: Check for non NULL usb prior to calling usbFreeDevice() lxc: Avoid possible NULL dereference on *root prior to opendir(). cpu: Avoid NULL dereference src/cpu/cpu_powerpc.c | 3 ++- src/lxc/lxc_container.c | 6 ++++++ src/lxc/lxc_driver.c | 6 ++++-- src/remote/remote_driver.c | 3 ++- src/vmware/vmware_conf.c | 3 ++- src/xen/xen_driver.c | 6 +++--- 6 files changed, 19 insertions(+), 8 deletions(-) -- 1.7.11.7

3 13

[libvirt] It's said 'when the guest has PCI passthrough devices in use, operations like migration/save/restore are not possible.' where are the corresponding codes in xen? '
by bobooscar 08 Jan '13

08 Jan '13

It's said 'when the guest has PCI passthrough devices in use, operations like migration/save/restore are not possible.' where are the corresponding codes in xen? I'm wondering how xend/xenlight tells whether a guest has a pci passthu device in use or not. thank you in advance! 已从三星手机发送

2 1

[libvirt] libvirt-1.0.1 make check failure
by Marc Evans 08 Jan '13

08 Jan '13

Hello, I just attempted compilation and testing of libvirt-1.0.1 on an RHEL-6.3 x86_64 system and received one failure noted here: ... TEST: qemumonitorjsontest !!!!! 5 FAIL FAIL: qemumonitorjsontest ... ======================================= 1 of 68 tests failed (1 test was not run) Please report to libvir-list(a)redhat.com ======================================= The whole reason that I am even attempting this is because I have not be able to successfully craft a chroot LXC container using the older 0.9.10-21.el6_3.6 versions that I can get through yum. When attempting to start that container I get: # virsh start base error: Failed to start domain base error: internal error guest failed to start: 2013-01-07 18:48:31.382+0000: 2397: info : libvirt version: 0.9.10, package: 21.el6_3.6 (Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>, 2012-11-12-11:08:41, x86-008.build.bos.redhat.com) 2013-01-07 18:48:31.382+0000: 2397: error : lxcControllerRun:1484 : Failed to query file context on /lxc/base_rhel-6.3-i686: No data available The /lxc/base_rhel-6.3-i686 directory contains a basic installation of an i686 choot environment which I can interact fine with using chroot. I have not been able to figure out what "error : lxcControllerRun:1484 : Failed to query file context on /lxc/base_rhel-6.3-i686: No data available" is trying to tell me and was hoping that maybe a newer version of libvirt may be more friendly (though this is more likely coming from lxc code). Does anyone have suggestions? Thanks in advance. - Marc

1 0

[libvirt] [PATCH] build: Add libxenctrl to LIBXL_LIBS
by Jim Fehlig 08 Jan '13

08 Jan '13

Commit dfa1e1dd removed libxenctrl from LIBXL_LIBS, but the libxl driver uses a symbol from this library. Explicitly link with libxenctrl instead of relying on the build system to support implicit DSO linking. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab08f17..20108c2 100644 --- a/configure.ac +++ b/configure.ac @@ -733,7 +733,7 @@ if test "$with_libxl" != "no" ; then LIBS="$LIBS $LIBXL_LIBS" AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ with_libxl=yes - LIBXL_LIBS="$LIBXL_LIBS -lxenlight" + LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl" ],[ if test "$with_libxl" = "yes"; then fail=1 -- 1.8.0.1

2 3

[libvirt] [PATCH] Fix virLXCPrepareHostDevices method
by Daniel P. Berrange 08 Jan '13

08 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virLXCPrepareHostDevices method was returning success even when it reported an error, and failed to handle several host device types --- src/lxc/lxc_hostdev.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c index 21f3096..4fa0508 100644 --- a/src/lxc/lxc_hostdev.c +++ b/src/lxc/lxc_hostdev.c @@ -299,15 +299,29 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported hostdev type %s"), virDomainHostdevSubsysTypeToString(dev->source.subsys.type)); + return -1; + } + break; + + case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: + switch (dev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported hostdev type %s"), + virDomainHostdevSubsysTypeToString(dev->source.subsys.type)); + return -1; } break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported hostdev mode %s"), virDomainHostdevModeTypeToString(dev->mode)); - break; + return -1; } } -- 1.8.0.1

2 1

[libvirt] [PATCH] Ensure we always setup a private mount namespace for LXC controller
by Daniel P. Berrange 08 Jan '13

08 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The code for setting up a private /dev/pts for the containers is also responsible for making the LXC controller have a private mount namespace. Unfortunately the /dev/pts code is not run if launching a container without a custom root. This causes the LXC FUSE mount to leak into the host FS. --- src/lxc/lxc_controller.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c9d96b3..a1c264c 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1143,6 +1143,29 @@ cleanup: static int +virLXCControllerSetupPrivateNS(void) +{ + int ret = -1; + + if (unshare(CLONE_NEWNS) < 0) { + virReportSystemError(errno, "%s", + _("Cannot unshare mount namespace")); + goto cleanup; + } + + if (mount("", "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Failed to switch root mount into slave mode")); + goto cleanup; + } + + ret = 0; +cleanup: + return ret; +} + + +static int virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) { virDomainFSDefPtr root = virDomainGetRootFilesystem(ctrl->def); @@ -1193,18 +1216,6 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) goto cleanup; } - if (unshare(CLONE_NEWNS) < 0) { - virReportSystemError(errno, "%s", - _("Cannot unshare mount namespace")); - goto cleanup; - } - - if (mount("", "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) { - virReportSystemError(errno, "%s", - _("Failed to switch root mount into slave mode")); - goto cleanup; - } - if (virAsprintf(&devpts, "%s/dev/pts", root->src) < 0 || virAsprintf(&ctrl->devptmx, "%s/dev/pts/ptmx", root->src) < 0) { virReportOOMError(); @@ -1408,6 +1419,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) goto cleanup; } + if (virLXCControllerSetupPrivateNS() < 0) + goto cleanup; + if (virLXCControllerSetupLoopDevices(ctrl) < 0) goto cleanup; -- 1.8.0.1

2 1

[libvirt] [PATCH qom-cpu 00/11] disable-kvm_mmu + -cpu check/enforce fixes (v2)
by Eduardo Habkost 08 Jan '13

08 Jan '13

Changes on v2: - Now both the kvm_mmu-disable and -cpu "enforce" changes are on the same series - Coding style fixes Git tree for reference: git://github.com/ehabkost/qemu-hacks.git cpu-enforce-all.v2 https://github.com/ehabkost/qemu-hacks/tree/cpu-enforce-all.v2 Patches 1-2 disable the "kvm_mmu" feature by default on pc-1.4. Host-side support for the kvm_mmu feature was removed from the kernel since v3.3 (released in March 2012), it was marked for removal since January 2011 and it's slower than shadow or hardware assisted paging (see kernel commit fb92045843). It doesn't make sense to keep it enabled by default. Also, keeping it enabled by default would cause unnecessary hassle when libvirt start using the "enforce" option. Patches 3-11 change the -cpu check/enforce code to work as it should: it will check every single CPUID bit to make sure it is supported by the host. The changes are a bit intrusive, but: - The longer we take to make "enforce" strict as it should (and make libvirt finally use it), more users will have VMs with migration-unsafe unpredictable guest ABIs. For this reason, I would like to get this into QEMU 1.4. - The changes in this series should affect only users that are already using the "enforce" flag, and I believe whoever is using the "enforce" flag really want the strict behavior introduced by this series. Eduardo Habkost (11): target-i386: Don't set any KVM flag by default if KVM is disabled target-i386: Disable kvm_mmu_op by default on pc-1.4 target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM features target-i386: kvm: Enable all supported KVM features for -cpu host target-i386: check/enforce: Fix CPUID leaf numbers on error messages target-i386: check/enforce: Do not ignore "hypervisor" flag target-i386: check/enforce: Check all CPUID.80000001H.EDX bits target-i386: check/enforce: Check SVM flag support as well target-i386: check/enforce: Eliminate check_feat field target-i386: Call kvm_check_features_against_host() only if CONFIG_KVM is set target-i386: check/enforce: Check all feature words hw/pc_piix.c | 9 +++++- target-i386/cpu.c | 93 +++++++++++++++++++++++++++++++++++++++++-------------- target-i386/cpu.h | 4 +++ 3 files changed, 81 insertions(+), 25 deletions(-) -- 1.7.11.7

4 42

[libvirt] [PATCH] Only initialize capabilities after setting dir permissions
by Daniel P. Berrange 08 Jan '13

08 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The current code is initializing capabilities before setting directory permissions. Thus the QEMU binaries being run may not have the ability to create the UNIX monitor socket on the first run of libvirtd. --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ac4c094..cea76af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -831,9 +831,6 @@ qemuStartup(bool privileged, if (!qemu_driver->capsCache) goto error; - if ((qemu_driver->caps = qemuCreateCapabilities(qemu_driver)) == NULL) - goto error; - if ((qemu_driver->activePciHostdevs = pciDeviceListNew()) == NULL) goto error; @@ -870,6 +867,9 @@ qemuStartup(bool privileged, } } + if ((qemu_driver->caps = qemuCreateCapabilities(qemu_driver)) == NULL) + goto error; + /* If hugetlbfs is present, then we need to create a sub-directory within * it, since we can't assume the root mount point has permissions that * will let our spawned QEMU instances use it. -- 1.8.0.1

2 1

[libvirt] [PATCH] Speed up fallback to legacy non-QMP probing
by Daniel P. Berrange 08 Jan '13

08 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since we daemonized QEMU for capabilities probing there is a long time if QEMU fals to launch. This is because we're not passing in any virDomainObjPtr instance and thus the monitor code can not check to see if the PID is still alive. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e16bc70..bcecc6d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2307,6 +2307,8 @@ qemuCapsInitQMP(qemuCapsPtr caps, char *pidfile = NULL; qemuCapsHookData hookData; char *archstr; + pid_t pid = 0; + virDomainObj vm; /* the ".sock" sufix is important to avoid a possible clash with a qemu * domain called "capabilities" @@ -2360,7 +2362,16 @@ qemuCapsInitQMP(qemuCapsPtr caps, goto cleanup; } - if (!(mon = qemuMonitorOpen(NULL, &config, true, &callbacks))) { + if (virPidFileReadPath(pidfile, &pid) < 0) { + VIR_DEBUG("Failed to read pidfile %s", pidfile); + ret = 0; + goto cleanup; + } + + memset(&vm, 0, sizeof(vm)); + vm.pid = pid; + + if (!(mon = qemuMonitorOpen(&vm, &config, true, &callbacks))) { ret = 0; goto cleanup; } @@ -2446,21 +2457,16 @@ cleanup: VIR_FREE(monpath); VIR_FREE(package); - if (pidfile) { + if (pid != 0) { char ebuf[1024]; - pid_t pid; - int rc; - if ((rc = virPidFileReadPath(pidfile, &pid)) < 0) { - VIR_DEBUG("Failed to read pidfile %s: %s", - pidfile, virStrerror(-rc, ebuf, sizeof(ebuf))); - } else { - VIR_DEBUG("Killing QMP caps process %lld", (long long) pid); - if (virProcessKill(pid, SIGKILL) < 0 && errno != ESRCH) - VIR_ERROR(_("Failed to kill process %lld: %s"), - (long long) pid, - virStrerror(errno, ebuf, sizeof(ebuf))); - } + VIR_DEBUG("Killing QMP caps process %lld", (long long) pid); + if (virProcessKill(pid, SIGKILL) < 0 && errno != ESRCH) + VIR_ERROR(_("Failed to kill process %lld: %s"), + (long long) pid, + virStrerror(errno, ebuf, sizeof(ebuf))); + } + if (pidfile) { unlink(pidfile); VIR_FREE(pidfile); } -- 1.8.0.1

2 1

[libvirt] [PATCH 0/4] installed service file cleanups
by Eric Blake 08 Jan '13

08 Jan '13

This started based on a bug report from Jim Fehlig[1], but turned into a fix for another issue[2] in a patch by Guido Günther as well as an open bugzilla[3] fix. [1]https://www.redhat.com/archives/libvir-list/2013-January/msg00198.html [2]https://www.redhat.com/archives/libvir-list/2013-January/msg00130.html [3]https://bugzilla.redhat.com/show_bug.cgi?id=887017 I've run the series through './autobuild.sh', which includes 'make dist' and 'make rpm', so I'm reasonably confident that I didn't botch things. But as always, a careful review is appreciated :) Eric Blake (4): build: use common .in replacement mechanism build: properly substitute virtlockd.socket build: .service files don't need to be executable build: install libvirt sysctl file correctly daemon/Makefile.am | 49 +++++++++++++++++++++-------------------- libvirt.spec.in | 4 ++-- src/Makefile.am | 32 +++++++++++---------------- src/locking/virtlockd.init.in | 14 ++++++------ src/locking/virtlockd.socket.in | 2 +- tools/Makefile.am | 49 ++++++++++++++++++++--------------------- tools/virt-pki-validate.in | 2 +- tools/virt-sanlock-cleanup.in | 6 ++--- tools/virt-xml-validate.in | 2 +- 9 files changed, 77 insertions(+), 83 deletions(-) -- 1.8.0.2

3 12

[libvirt] [PATCH 0/6 v9] Unprivileged SG_IO support
by Osier Yang 07 Jan '13

07 Jan '13

As a result of RFC [1], this implements the unprivleged SG_IO support. 1/6 and 2/6 are already acked. v8 - v9: * Just rebasing. v7 - v8: * Change the XML tag name from "cdbfilter" to "sgio", and to leave enough room for future values, the values of "sgio" are "filtered" and "unfiltered" now. v6 - v7: * No restoring of unpriv_sgio per Daniel's thought. * Use "major:minor" as the hash key per Jirka's suggestion. Osier Yang (6): util: Prepare helpers for unpriv_sgio setting qemu: Add a hash table for the shared disks docs: Add docs and rng schema for new XML tag sgio conf: Parse and format the new XML qemu: set unpriv_sgio when starting domain and attaching disk qemu: Check if the shared disk's cdbfilter conflicts with others docs/formatdomain.html.in | 14 ++- docs/schemas/domaincommon.rng | 54 +++++--- src/conf/domain_conf.c | 55 ++++++-- src/conf/domain_conf.h | 10 ++ src/libvirt_private.syms | 4 + src/qemu/qemu_conf.c | 86 ++++++++++++ src/qemu/qemu_conf.h | 12 ++ src/qemu/qemu_driver.c | 30 ++++ src/qemu/qemu_process.c | 99 ++++++++++++++ src/qemu/qemu_process.h | 4 + src/util/virutil.c | 140 ++++++++++++++++++++ src/util/virutil.h | 13 ++ ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 32 +++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 522 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00988.html Regards, Osier

2 19

[libvirt] Setup libvirt deveplopment environment
by Thomas Lin 07 Jan '13

07 Jan '13

Hi, How to setup libvirt development environment on Ubuntu 12.04? I use virt-manager right now. It already installed virsh with it. I configured libvirt and it all went well. So how to test my modification in source code? When I open ./virsh from libvirt/tools/, it give errors like cannot open socket. Please help, I am a newbie. Thank you, Tom

2 1

[libvirt] [test-API][PATCH] Add dir volume wipe cases
by Wayne Sun 07 Jan '13

07 Jan '13

* add dir volume wipe and wipe pattern cases * wipe case compare wiped volume with zero volume file with same capacity * wipe pattern cases support algorithms in: zero|nnsa|dod|bsi|gutmann|schneier|pfitzner7|pfitzner33|random, Besides zero, other algorithms are patterns supported by scrub, some algorithm might fail due to scrub version. * the check method in wipe pattern case for each algorithm is the same, only to make sure digest before and after wipe is different. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir_vol_wipe.conf | 132 ++++++++++++++++++++++++++++++++ repos/storage/dir_vol_wipe.py | 136 +++++++++++++++++++++++++++++++++ repos/storage/dir_vol_wipe_pattern.py | 123 +++++++++++++++++++++++++++++ 3 files changed, 391 insertions(+), 0 deletions(-) create mode 100644 cases/storage_dir_vol_wipe.conf create mode 100644 repos/storage/dir_vol_wipe.py create mode 100644 repos/storage/dir_vol_wipe_pattern.py diff --git a/cases/storage_dir_vol_wipe.conf b/cases/storage_dir_vol_wipe.conf new file mode 100644 index 0000000..aa39415 --- /dev/null +++ b/cases/storage_dir_vol_wipe.conf @@ -0,0 +1,132 @@ +storage:create_dir_pool + poolname + $defaultpoolname + +storage:dir_vol_wipe + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 2M + volformat + raw +clean + +storage:dir_vol_wipe + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qcow2 +clean + +storage:dir_vol_wipe + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 30M + volformat + qed +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 2M + volformat + raw + algorithm + zero +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qcow2 + algorithm + nnsa +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 30M + volformat + qed + algorithm + pfitzner7 +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 1K + volformat + raw + algorithm + random +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 1K + volformat + raw + algorithm + dod +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 1K + volformat + raw + algorithm + bsi +clean + +storage:dir_vol_wipe_pattern + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 1K + volformat + raw + algorithm + gutmann +clean + + +storage:destroy_pool + poolname + $defaultpoolname diff --git a/repos/storage/dir_vol_wipe.py b/repos/storage/dir_vol_wipe.py new file mode 100644 index 0000000..c020b43 --- /dev/null +++ b/repos/storage/dir_vol_wipe.py @@ -0,0 +1,136 @@ +#!/usr/bin/env python +# volume wipe testing + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'volformat', 'capacity',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path, capacity): + """write test data to file + """ + logger.info("write %s data into file %s" % (capacity, path)) + out = utils.get_capacity_suffix_size(capacity) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = out['capacity_byte'] / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def dir_vol_wipe(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s %s volume" % (volname, volformat)) + vol = poolobj.createXML(xmlstr, 0) + + write_file(volume_path, capacity) + + poolobj.refresh(0) + + origdigest = utils.digest(volume_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + test_path = path_value + "/" + "vol_test" + out = utils.get_capacity_suffix_size(capacity) + count = out['capacity_byte'] / 1024 + logger.info("write %s zero to test volume %s" % (capacity, test_path)) + cmd = "dd if=/dev/zero of=%s bs=1024 count=%s" % (test_path, count) + utils.exec_cmd(cmd, shell=True) + cmpdigest = utils.digest(test_path, 0, 0) + logger.debug("the compare volume digest is: %s" % cmpdigest) + + logger.info("wipe volume %s" % volume_path) + vol.wipe(0) + + newdigest = utils.digest(volume_path, 0, 0) + logger.debug("the volum digest of data read from %s after wipe is: %s" + % (volume_path, newdigest)) + + logger.info("check the digest before and after wipe") + if newdigest == origdigest: + logger.error("wipe failed, digest did not change") + return 1 + else: + logger.info("digest is different before and after wipe") + + logger.info("compare the digest after wipe with digest of volume %s" % + test_path) + if not newdigest == cmpdigest: + logger.error("wipe failed, digest is different") + return 1 + else: + logger.info("digest is same with zero volume %s" % test_path) + + logger.info("wipe succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def dir_vol_wipe_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/repos/storage/dir_vol_wipe_pattern.py b/repos/storage/dir_vol_wipe_pattern.py new file mode 100644 index 0000000..86e3ea2 --- /dev/null +++ b/repos/storage/dir_vol_wipe_pattern.py @@ -0,0 +1,123 @@ +#!/usr/bin/env python +# volume wipe with pattern testing, the supported algorithm are +# zero and algorithm patterns supported by 'scrub' command which +# are nnsa|dod|bsi|gutmann|schneier|pfitzner7|pfitzner33|random + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'volformat', 'capacity', 'algorithm',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path, capacity): + """write test data to file + """ + logger.info("write %s data into file %s" % (capacity, path)) + out = utils.get_capacity_suffix_size(capacity) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = out['capacity_byte'] / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def dir_vol_wipe_pattern(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + capacity = params['capacity'] + algorithm = params['algorithm'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + + logger.info("the wipe algorithm given is %s" % algorithm) + alg_str = 'libvirt.VIR_STORAGE_VOL_WIPE_ALG_%s' % algorithm.upper() + alg_val = eval(alg_str) + logger.info("the correspond algorithm value is %s" % alg_val) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s %s volume" % (volname, volformat)) + vol = poolobj.createXML(xmlstr, 0) + + write_file(volume_path, capacity) + + poolobj.refresh(0) + + origdigest = utils.digest(volume_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + logger.info("wipe volume %s with algorithm value %s" % + (volume_path, alg_val)) + vol.wipePattern(alg_val, 0) + + newdigest = utils.digest(volume_path, 0, 0) + logger.debug("the volum digest of data read from %s after wipe is: %s" + % (volume_path, newdigest)) + + logger.info("check the digest before and after wipe") + if newdigest == origdigest: + logger.error("wipe with algorithm %s failed, digest is the same" + % algorithm) + return 1 + else: + logger.info("digest is different before and after wipe") + + logger.info("wipe with algorithm %s succeed" % algorithm) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def dir_vol_wipe_pattern_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + return 0 -- 1.7.1

2 1

[libvirt] [test-API][PATCH v2] Add volume upload and download cases
by Wayne Sun 07 Jan '13

07 Jan '13

The cases only cover dir volume testing. v1: * test download storage volumes using storage download API. * test upload storage volumes using storage upload API. For upload case, only raw volume format is supported, other format will fail. The offset and length value should be chosen from 0 and 1048576, because upload size is set as 1M. * both case use blocking stream. * sample conf is added. v2: * move digest function to utils * rename cases with prefix 'dir_' to emphasise that they are only for dir vol testing Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir_vol_upload_download.conf | 127 ++++++++++++++++++++++ repos/storage/dir_vol_download.py | 131 +++++++++++++++++++++++ repos/storage/dir_vol_upload.py | 158 ++++++++++++++++++++++++++++ utils/utils.py | 24 ++++ 4 files changed, 440 insertions(+), 0 deletions(-) create mode 100644 cases/storage_dir_vol_upload_download.conf create mode 100644 repos/storage/dir_vol_download.py create mode 100644 repos/storage/dir_vol_upload.py diff --git a/cases/storage_dir_vol_upload_download.conf b/cases/storage_dir_vol_upload_download.conf new file mode 100644 index 0000000..fd22720 --- /dev/null +++ b/cases/storage_dir_vol_upload_download.conf @@ -0,0 +1,127 @@ +storage:create_dir_pool + poolname + $defaultpoolname + +storage:dir_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 0 + length + 0 +clean + +storage:dir_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 1048576 + length + 0 +clean + +storage:dir_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 0 + length + 1048576 +clean + +storage:dir_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 1048576 + length + 1048576 +clean + +storage:dir_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + raw + offset + 0 + length + 0 +clean + +storage:dir_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qcow2 + offset + 1048576 + length + 0 +clean + +storage:dir_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qed + offset + 0 + length + 1048576 +clean + +storage:dir_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + raw + offset + 1048576 + length + 1048576 +clean + +storage:destroy_pool + poolname + $defaultpoolname diff --git a/repos/storage/dir_vol_download.py b/repos/storage/dir_vol_download.py new file mode 100644 index 0000000..ddf293b --- /dev/null +++ b/repos/storage/dir_vol_download.py @@ -0,0 +1,131 @@ +#!/usr/bin/env python +# dir storage volume download testing + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'volformat', 'capacity', 'offset', + 'length',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path, capacity): + """write test data to file + """ + logger.info("write %s data into file %s" % (capacity, path)) + out = utils.get_capacity_suffix_size(capacity) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = out['capacity_byte'] / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def handler(stream, data, file_): + return file_.write(data) + +def dir_vol_download(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + offset = int(params['offset']) + length = int(params['length']) + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s %s volume" % (volname, volformat)) + vol = poolobj.createXML(xmlstr, 0) + + write_file(volume_path, capacity) + origdigest = utils.digest(volume_path, offset, length) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + st = conn.newStream(0) + + test_path = path_value + "/" + "vol_test" + + f = open(test_path, 'w') + logger.info("start download") + vol.download(st, offset, length, 0) + logger.info("downloaded all data") + st.recvAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = utils.digest(test_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (test_path, newdigest)) + + if origdigest == newdigest: + logger.info("file digests match, download succeed") + else: + logger.error("file digests not match, download failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def dir_vol_download_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/repos/storage/dir_vol_upload.py b/repos/storage/dir_vol_upload.py new file mode 100644 index 0000000..78188e9 --- /dev/null +++ b/repos/storage/dir_vol_upload.py @@ -0,0 +1,158 @@ +#!/usr/bin/env python +# dir storage volume upload testing, only raw format volume is +# supported, other format might fail. offset and length can +# only be chosen in 0 and 1048576. + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'volformat', 'capacity', + 'offset', 'length',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path): + """write 1M test data to file + """ + logger.info("write data into file %s" % path) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + data = ''.join(16384 * datastr) + f.write(data) + f.close() + +def handler(stream, data, file_): + return file_.read(data) + +def dir_vol_upload(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + offset = int(params['offset']) + length = int(params['length']) + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + logger.info("upload offset is: %s" % offset) + logger.info("the data length to upload is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s %s volume" % (volname, volformat)) + vol = poolobj.createXML(xmlstr, 0) + + test_path = path_value + "/" + "vol_test" + write_file(test_path) + olddigest = utils.digest(test_path, 0, 0) + logger.debug("the old file digest is: %s" % olddigest) + + if offset: + origdigestpre = utils.digest(volume_path, 0, offset) + else: + origdigestpre = '' + logger.debug("the original pre region digest is: %s" % origdigestpre) + + origdigestpost = utils.digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the original post region digest is: %s" % origdigestpost) + + st = conn.newStream(0) + + f = open(test_path, 'r') + logger.info("start upload") + vol.upload(st, offset, length, 0) + logger.info("sent all data") + st.sendAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = utils.digest(volume_path, offset, 1024 * 1024) + logger.debug("the new file digest is: %s" % olddigest) + + if offset: + newdigestpre = utils.digest(volume_path, 0, offset) + else: + newdigestpre = '' + logger.debug("the new pre region digest is: %s" % origdigestpre) + + newdigestpost = utils.digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the new post region digest is: %s" % origdigestpost) + + if newdigestpre == origdigestpre: + logger.info("file pre region digests match") + else: + logger.error("file pre region digests not match") + return 1 + + if olddigest == newdigest: + logger.info("file digests match") + else: + logger.error("file digests not match") + return 1 + + if newdigestpost == origdigestpost: + logger.info("file post region digests match") + else: + logger.error("file post region digests not match") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def dir_vol_upload_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/utils/utils.py b/utils/utils.py index 1ed673a..d3b0dc1 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -29,6 +29,7 @@ import struct import pexpect import string import subprocess +import hashlib import libvirt from xml.dom import minidom from urlparse import urlparse @@ -725,6 +726,29 @@ def param_to_tuple(paramlist, length): else: return False +def digest(path, offset, length): + """read data from file with length bytes, begin at offset + and return md5 hexdigest + """ + f = open(path, 'r') + f.seek(offset) + m = hashlib.md5() + done = 0 + + while True: + want = 1024 + if length and length - done < want: + want = length - done + outstr = f.read(want) + got = len(outstr) + if got == 0: + break + done += got + m.update(outstr) + + f.close() + return m.hexdigest() + def run_wget_app(hostname, username, password, file_url, logger): """Simple test for wget app on specified host""" cmd_line = "wget -P /tmp %s -o /tmp/wget.log" % (file_url) -- 1.7.1

2 1

[libvirt] [PATCH 0/2] Add virsh commands to modify cpu node and model node of a domain XML
by Ken ICHIKAWA 07 Jan '13

07 Jan '13

From: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> This patchset adds two virsh commands, "confcpu" and "confcpu-model". "confcpu" allows to modify 'mode' attirbute and 'match' attribute of a cpu node of a domain XML. "confcpu-model" allows to modify cpu model, 'fallback' attribute and 'vendor_id' attribute of a model node of a domain XML. By using these commands, we can easily change cpu mode, model and etc. by hand or shellscript without editing XML. Ken ICHIKAWA (2): virsh: Add a new command "confcpu" virsh: Add a new command "confcpu-model" tools/virsh-domain.c | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 51 +++++++ 2 files changed, 462 insertions(+) -- 1.7.11.7

1 3

[libvirt] [PATCH 5/5] virsh: Command to define new domain using OVA package.
by Ata E Husain Bohra 06 Jan '13

06 Jan '13

This patch provides virsh commands to support defining new domain using an OVA package. --- tools/virsh-domain.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f3da1d5..5218d12 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5594,11 +5594,25 @@ static const vshCmdInfo info_define[] = { {NULL, NULL} }; +static const vshCmdInfo info_define_ova[] = { + {"help", N_("define (but don't start) a domain from an OVA package")}, + {"desc", N_("Define a domain.")}, + {NULL, NULL} +}; + static const vshCmdOptDef opts_define[] = { {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")}, {NULL, 0, 0, NULL} }; +static const vshCmdOptDef opts_define_ova[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, + N_("ova package file")}, + {"pool", VSH_OT_STRING, VSH_OFLAG_REQ_OPT, + N_("storage pool to define new domain")}, + {NULL, 0, 0, NULL} +}; + static bool cmdDefine(vshControl *ctl, const vshCmd *cmd) { @@ -5627,6 +5641,35 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) return ret; } +static bool +cmdDefineOVA(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + const char *file = NULL; + const char *pool = NULL; + bool ret = true; + + if (vshCommandOptString(cmd, "file", &file) <= 0) + return false; + + if (vshCommandOptString(cmd, "pool", &pool) <= 0) + return false; + + dom = virDomainDefineOVA(ctl->conn, file, pool); + VIR_FREE(file); + VIR_FREE(pool); + + if (dom != NULL) { + vshPrint(ctl, _("Domain %s defined from %s\n"), + virDomainGetName(dom), file); + virDomainFree(dom); + } else { + vshError(ctl, _("Failed to define domain from %s"), file); + ret = false; + } + return ret; +} + /* * "destroy" command */ @@ -8515,6 +8558,7 @@ const vshCmdDef domManagementCmds[] = { {"cpu-stats", cmdCPUStats, opts_cpu_stats, info_cpu_stats, 0}, {"create", cmdCreate, opts_create, info_create, 0}, {"define", cmdDefine, opts_define, info_define, 0}, + {"define-ova", cmdDefineOVA, opts_define_ova, info_define_ova, 0}, {"desc", cmdDesc, opts_desc, info_desc, 0}, {"destroy", cmdDestroy, opts_destroy, info_destroy, 0}, {"detach-device", cmdDetachDevice, opts_detach_device, -- 1.7.9.5

1 0

[libvirt] [PATCH 4/5] ESX: Driver support to define new domain using an OVA pacakge
by Ata E Husain Bohra 06 Jan '13

06 Jan '13

This patch provides implementation support to define new domain using given OVA package for an ESXi server. As per vSphere API documentation, the OVA installation consists of following steps: 1. Run OVF descriptor against hypervisor to check if it can be deployed. 2. Obtain ImportSpec object from hypervisor defining new domain's specifications such as: virtual hrdware detials, networks etc. 3. Create virtual machine entity on the hypervisor. 4. Upload virtual disk contained inside OVA package using lease obtained from step 3. --- src/esx/esx_driver.c | 573 ++++++++++++++++++++++++++- src/esx/esx_vi_generator.input | 856 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi_generator.py | 13 +- src/esx/esx_vi_types.c | 13 +- 4 files changed, 1430 insertions(+), 25 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 1366c81..d4f4ce4 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5,6 +5,7 @@ * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2009-2012 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> + * Copyright (C) 2013 Ata E Husain Bohra <ata.husain(a)hotmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ #include "viralloc.h" #include "virlog.h" #include "viruuid.h" +#include "virfile.h" #include "vmx.h" #include "virtypedparam.h" #include "esx_driver.h" @@ -46,10 +48,16 @@ #include "esx_vi_methods.h" #include "esx_util.h" #include "viruri.h" +#include "virova.h" #define VIR_FROM_THIS VIR_FROM_ESX + static int esxDomainGetMaxVcpus(virDomainPtr domain); +static int esxDomainUploadDisks(virConnectPtr conn, + esxVI_ManagedObjectReference *nfcLease, + esxVI_OvfCreateImportSpecResult *importResult, + virOVAPtr ova); typedef struct _esxVMX_Data esxVMX_Data; @@ -59,7 +67,6 @@ struct _esxVMX_Data { }; - static void esxFreePrivate(esxPrivate **priv) { @@ -3304,6 +3311,569 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) static int +esxDomainUploadDisks(virConnectPtr conn, + esxVI_ManagedObjectReference *nfcLease, + esxVI_OvfCreateImportSpecResult *importResult, + virOVAPtr ova) +{ + int result = -1; + esxPrivate* priv = conn->privateData; + esxVI_Context *ctx = priv->primary; + esxVI_String *propertyNameInfo = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *infoObject = NULL; + esxVI_HttpNfcLeaseInfo *httpNfcInfo = NULL; + esxVI_HttpNfcLeaseDeviceUrl *deviceUrl = NULL; + esxVI_FileData *fileData = NULL; + esxVI_CURL *curl = NULL; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + virOVADiskListPtr listDisk = NULL; + bool ready = false; + char *uploadUrl = NULL; + char *fileExtension = NULL; + off_t bytesToSend = 0; + int numAttempts = 0; + char cl_string[64] = {'\0'}; + int fd = -1; + + if (!ova || !ova->fHandle) { + goto cleanup; + } + + /** + * obtain file handle for OVA file, it is better to re-open + * file while uploading given disk. Cleanup for esxVI_FileData and + * virFreeOVA remains simple and clean this way + */ + fd = fileno(ova->fHandle); + if (fd <= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid fielno for OVA file")); + goto cleanup; + } + + if (esxVI_String_AppendValueListToList(&propertyNameInfo, + "info\0state\0error\0") < 0) { + return -1; + } + + if (esxVI_CURL_Alloc(&curl) < 0) { + virReportOOMError(); + goto cleanup; + } + + /** + * CURL headers for streaming vmdk are different from normal + * execution headers, open a dedicated curl->handle to upload + * VMDKs + */ + curl->handle = curl_easy_init(); + if (!curl->handle) { + fprintf(stderr, "curl init failed"); + goto cleanup; + } + + /** + * vSphere API recommends wait till ESX sets the status to + * "ready" before initiating disk transfer. Wait for max + * 10 seconds before giving up! + * + * TODO May be convert it to WaitForUpdate call */ + for (ready = false, numAttempts = 0; + ready != true && numAttempts < 10; ++numAttempts) { + esxVI_ObjectContent_Free(&infoObject); + + if (esxVI_LookupObjectContentByType(ctx, nfcLease, + "HttpNfcLease", propertyNameInfo, + &infoObject, esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + for (dynamicProperty = infoObject->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "state")) { + if (STREQ(dynamicProperty->val->value, "initializing")) { + /* check after sometime */ + sleep(1); + } else { + ready = true; + } + } else if (STREQ(dynamicProperty->name, "error")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + dynamicProperty->val->value); + goto cleanup; + } + } + } + + if (!ready) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ESX server not ready for disk upload")); + goto cleanup; + } + + /** + * Better to retrieve "info" object again once the ESX server + * is "ready" + */ + esxVI_String_Free(&propertyNameInfo); + esxVI_ObjectContent_Free(&infoObject); + if (esxVI_String_AppendValueListToList( + &propertyNameInfo, "info\0") < 0 || + esxVI_LookupObjectContentByType( + ctx, nfcLease, "HttpNfcLease", propertyNameInfo, + &infoObject, esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + for (dynamicProperty = infoObject->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_HttpNfcLeaseInfo_CastFromAnyType( + dynamicProperty->val, &httpNfcInfo) < 0) { + goto cleanup; + } + } + } + + bytesToSend = ova->totalSize; + for (listDisk = ova->head; listDisk != NULL; listDisk = listDisk->next) { + fileExtension = strrchr(listDisk->data->name, '.'); + if (!fileExtension || STRNEQ(fileExtension, ".vmdk")) { + /* not a VMDK */ + continue ; + } + + /* iterate over deviceUri and upload VMDK files from OVA */ + for (deviceUrl = httpNfcInfo->deviceUrl; + deviceUrl != NULL; deviceUrl = deviceUrl->_next) { + virOVADiskListPtr candidate = NULL; + esxVI_OvfFileItem *fileItem = NULL; + int position = -1; + char *ptr_char = NULL; + + /* ESXi HttpLeaseInfo object when returned have "url"(s) to be + * used to upload VMDK files. The format of the url is + * https://\\*\\/<session-id>/<vmdk-file-name> + * Replaces the "\\*" with approriate server IP address. + */ + + VIR_FREE(uploadUrl); + virBufferFreeAndReset(&buffer); + + if (!deviceUrl->url) { + goto cleanup; + } + + position = strcspn(deviceUrl->url, "*"); + if (position <= 0) { + goto cleanup; + } + + virBufferAdd(&buffer, deviceUrl->url, position); + + ptr_char = strchr(deviceUrl->url, '*'); + if (ptr_char == NULL) { + goto cleanup; + } + + virBufferStrcat(&buffer, ctx->ipAddress, NULL); + virBufferStrcat(&buffer, ptr_char + 1, NULL); + uploadUrl = virBufferContentAndReset(&buffer); + + /* iterate virOVA struct to find relevant file details */ + for (fileItem = importResult->fileItem; + fileItem != NULL; fileItem = fileItem->_next) { + if (STREQ(deviceUrl->importKey, fileItem->deviceId)) { + break; + } + } + + if (!fileItem || !fileItem->path) { + goto cleanup; + } + + candidate = ova->head; + for (; candidate != NULL; candidate = candidate->next) { + if (STREQ(candidate->data->name, fileItem->path)) { + + esxVI_FileData_Free(&fileData); + if (esxVI_FileData_Alloc(&fileData) < 0) { + virReportOOMError(); + goto cleanup; + } + + fileData->fHandle = VIR_FDOPEN(fd, "r"); + if (!fileData->fHandle) { + goto cleanup; + } + + /* Seek the file to the proper offset */ + if (fseeko(fileData->fHandle, candidate->data->offset, + SEEK_SET) < 0) { + goto cleanup; + } + + fileData->ctx = ctx; + fileData->lease = nfcLease; + fileData->cur_size = candidate->data->size; + fileData->time_elapsed = time(NULL); + fileData->total_size = bytesToSend; + fileData->type = OVA_DISK; + + if (curl->headers) { + curl_slist_free_all(curl->headers); + } + + /** + * Prepare the header to reflect the vmware-vdisk + * stream with proper size sever should expect + */ + curl->headers = curl_slist_append(curl->headers, + "Connection: Keep-Alive"); + curl->headers = curl_slist_append(curl->headers, + "Content-Type: application/x-vnd.vmware-streamVmdk"); + + memset(cl_string, '\0', sizeof(cl_string)); + snprintf(cl_string, sizeof(cl_string), + "Content-Length: %ld", fileData->cur_size); + curl->headers = curl_slist_append(curl->headers, cl_string); + + if (curl->headers == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not build CURL header list")); + goto cleanup; + } + + curl_easy_setopt( + curl->handle, CURLOPT_HTTPHEADER , curl->headers); + curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, false); + curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYHOST, false); + + + if (esxVI_CURL_FileUpload(curl, uploadUrl, + fileData) < 0) { + goto cleanup; + } + + bytesToSend -= candidate->data->size; + } + } + } + } + + result = 0; + +cleanup: + + esxVI_String_Free(&propertyNameInfo); + esxVI_ObjectContent_Free(&infoObject); + esxVI_HttpNfcLeaseInfo_Free(&httpNfcInfo); + esxVI_FileData_Free(&fileData); + esxVI_CURL_Free(&curl); + virBufferFreeAndReset(&buffer); + VIR_FREE(uploadUrl); + + return result; + +} + + + +static virDomainPtr +esxDomainDefineOVA(virConnectPtr conn, const char *ovaPath, + const char *datastoreName) +{ + virDomainPtr domain = NULL; + virOVAPtr ova = NULL; + esxPrivate* priv = conn->interfacePrivateData; + esxVI_Context *ctx = priv->primary; + esxVI_OvfParseDescriptorParams *pdp = NULL; + esxVI_OvfParseDescriptorResult *pdResult = NULL; + esxVI_OvfCreateImportSpecParams *cisp = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_OvfCreateImportSpecResult *importResult = NULL; + esxVI_ManagedObjectReference *nfcLease = NULL; + esxVI_ManagedObjectReference *ovfManager = NULL; + char *ovfDescriptor = NULL; + char *escapedOvfDescriptor = NULL; + char *domainName = NULL; + struct curl_slist *headers = NULL; + const struct curl_slist *old_headers = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + virParseOVA(ovaPath, &ova) < 0) { + goto cleanup; + } + + /** + * FIXME: vSphere API v2.5 does expose all relevant information + * needed by ESXi servers suporting vSphere API version 4.0 + * or above. As per API version 4.0, the connection header + * or execution CURL header should include: + * "SOAPACTION: urn:vim25" + * header field, otherwise, ServiceContent object is not + * fully populated and miss references to MoBs such as: + * ovfManager. Also, this namespace is necessary to expose + * API methods such as: ParseDescriptor, CreateImportSpec + * and ImportVApp. + * + * But, adding this header item in esxVI_XXX initial functions has + * various bad affects: + * 1. Ordering of other MoB deserialization is affected that breaks + * existing code (this one is big risk) + * 2. Namespace add extra fields that may cause warning messages + * (this one is benign though) + * + * To avoid breaking existing API calls, modify CURL headers in this + * routine to include "SOAPACTION" field. + */ + if (ctx->service->ovfManager == NULL) { + + headers = curl_slist_append(headers, + "Content-Type: text/xml; charset=UTF-8"); + headers = curl_slist_append(headers, "Expect:"); + headers = curl_slist_append(headers, + "SOAPAction: \"urn:vim25\""); + if (headers == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not build CURL header list")); + goto cleanup; + } + + old_headers = ctx->curl->headers; + curl_easy_setopt(ctx->curl->handle, CURLOPT_HTTPHEADER , headers); + + if (esxVI_ManagedObjectReference_Alloc(&ovfManager) < 0) { + virReportOOMError(); + goto cleanup; + } + + ovfManager->_next = NULL; + ovfManager->_type = esxVI_Type_ManagedObjectReference; + ovfManager->type = strdup("OvfManager"); + ovfManager->value = strdup("ha-ovf-manager"); + } + + /** + * OVA installation is a multi step process: + * + * Step 1: ParseDescriptor: + * run OVF descriptor by hypervisor to see if it is deployable. + */ + if (esxVI_OvfParseDescriptorParams_Alloc(&pdp) < 0) { + virReportOOMError(); + goto cleanup; + } + + pdp->locale = strdup("en-US"); + pdp->deploymentOption = strdup(""); + + if (virGetOVFDescriptor(ova, &ovfDescriptor) < 0 || + ovfDescriptor == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing OVF descriptor")); + goto cleanup; + }; + + escapedOvfDescriptor = esxUtil_EscapeForXml(ovfDescriptor); + if (escapedOvfDescriptor == NULL) { + goto cleanup; + } + + if (ctx->service->ovfManager) { + if (esxVI_ParseDescriptor(ctx, ctx->service->ovfManager, + escapedOvfDescriptor, pdp, &pdResult) < 0) { + goto cleanup; + } + } else { + if (esxVI_ParseDescriptor(ctx, ovfManager, escapedOvfDescriptor, + pdp, &pdResult) < 0) { + goto cleanup; + } + } + + if (pdResult == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ParseDescriptor: NULL return value")); + goto cleanup; + } else if (pdResult->error) { + esxVI_LocalizedMethodFault *pFault = NULL; + + for (pFault = pdResult->error; + pFault != NULL; + pFault = pFault->_next) { + if (pFault->localizedMessage) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + pFault->localizedMessage); + } + } + + goto cleanup; + } + + /* + * Step 2: InstallvAPP: + * create virtual machine entity on the hypervisor. + */ + if (esxVI_OvfCreateImportSpecParams_Alloc(&cisp) < 0) { + virReportOOMError(); + goto cleanup; + } + + domainName = virGetOVFDomainName(ovfDescriptor); + if (domainName == NULL) { + goto cleanup; + } + + cisp->locale = strdup("en-US"); + cisp->deploymentOption = strdup(""); + cisp->entityName = strdup(domainName); + + if (esxVI_ManagedObjectReference_DeepCopy( + &cisp->hostSystem, priv->host->hostSystem->_reference) < 0 || + esxVI_LookupDatastoreByName(ctx, datastoreName, NULL, &datastore, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + + cisp->ipAllocationPolicy = strdup("fixedPolicy"); + cisp->ipProtocol = strdup("IPv4"); + cisp->diskProvisioning = strdup("thick"); + + if (ctx->service->ovfManager) { + if (esxVI_CreateImportSpec( + ctx, ctx->service->ovfManager, escapedOvfDescriptor, + priv->primary->computeResource->resourcePool, + datastore->obj, cisp, &importResult) < 0) { + goto cleanup; + } + } else { + if (esxVI_CreateImportSpec( + ctx, ovfManager, escapedOvfDescriptor, + priv->primary->computeResource->resourcePool, + datastore->obj, cisp, &importResult) < 0) { + goto cleanup; + } + } + + if (importResult == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("CreateImportSpec returned NULL.")); + goto cleanup; + } else { + if (!importResult->error) { + if (importResult->warning) { + esxVI_LocalizedMethodFault *pWarn= NULL; + for (pWarn = importResult->warning; + pWarn != NULL; + pWarn = pWarn->_next) { + if (pWarn->localizedMessage) { + VIR_WARN("%s", pWarn->localizedMessage); + } + } + } + } else { + esxVI_LocalizedMethodFault *pFault = NULL; + + for (pFault = importResult->error; + pFault != NULL; + pFault = pFault->_next) { + if (pFault->localizedMessage) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + pFault->localizedMessage); + } + } + + goto cleanup; + } + } + + if (!importResult->importSpec) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("InstallVApp : ImportSpec is NULL")); + goto cleanup; + } + + /* Step 3: ImportVApp: this will create the VApp entity on the + * ESXi box. + */ + if (esxVI_ImportVApp(ctx, + priv->primary->computeResource->resourcePool, + importResult->importSpec, + priv->primary->datacenter->vmFolder, + priv->host->hostSystem->_reference, + &nfcLease) < 0) { + goto cleanup; + } + + if (nfcLease == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ImportVApp: lease NULL.")); + goto cleanup; + } + + /* + * Step 3: Transfer VMDKs: + * if VM creation is a success, ESX provides the lease object + * with URL to upload vmdks to the ESX server. + */ + + if (esxDomainUploadDisks(conn, nfcLease, importResult, ova) < 0) { + goto abort; + } + + /* Done: installation */ + if (esxVI_HttpNfcLeaseComplete(ctx, nfcLease) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ImportVApp: VMDK upload complete error")); + goto abort; + } + + domain = esxDomainLookupByName(conn, domainName); + + cleanup: + + esxVI_OvfParseDescriptorParams_Free(&pdp); + esxVI_OvfParseDescriptorResult_Free(&pdResult); + esxVI_OvfCreateImportSpecParams_Free(&cisp); + esxVI_OvfCreateImportSpecResult_Free(&importResult); + esxVI_ObjectContent_Free(&datastore); + esxVI_ManagedObjectReference_Free(&nfcLease); + esxVI_ManagedObjectReference_Free(&ovfManager); + VIR_FREE(ovfDescriptor); + VIR_FREE(escapedOvfDescriptor); + VIR_FREE(domainName); + virFreeOVA(ova); + + if (old_headers) { + curl_easy_setopt(ctx->curl->handle, CURLOPT_HTTPHEADER , old_headers); + } + + if (headers) { + curl_slist_free_all(headers); + } + + return domain; + + abort: + + /* Abort the Lease */ + if (nfcLease != NULL) { + /** + * ESXi will clean up the lease objects when the timeout expires + * ignore if this calls fails. + */ + esxVI_HttpNfcLeaseAbort(ctx, nfcLease); + } + + goto cleanup; + +} + + +static int esxDomainUndefineFlags(virDomainPtr domain, unsigned int flags) { @@ -5284,6 +5854,7 @@ static virDriver esxDriver = { .domainCreate = esxDomainCreate, /* 0.7.0 */ .domainCreateWithFlags = esxDomainCreateWithFlags, /* 0.8.2 */ .domainDefineXML = esxDomainDefineXML, /* 0.7.2 */ + .domainDefineOVA = esxDomainDefineOVA, /* 1.0.2 */ .domainUndefine = esxDomainUndefine, /* 0.7.1 */ .domainUndefineFlags = esxDomainUndefineFlags, /* 0.9.4 */ .domainGetAutostart = esxDomainGetAutostart, /* 0.9.0 */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index eec135e..5f0df45 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -51,10 +51,17 @@ # Enumerations # +enum ArrayUpdateOperation + add + edit + remove +end + + enum AutoStartWaitHeartbeatSetting - yes - no - systemDefault + yes + no + systemDefault end @@ -66,6 +73,14 @@ enum FibreChannelPortType end +enum HttpNfcLeaseState + initializing + ready + done + error +end + + enum ManagedEntityStatus gray green @@ -122,6 +137,27 @@ enum TaskInfoState end +enum VirtualDeviceConfigSpecFileOperation + create + destroy + replace +end + + +enum VirtualDeviceConfigSpecOperation + add + edit + remove +end + + +enum VirtualSCSISharing + noSharing + physicalSharing + virtualSharing +end + + enum VirtualMachineMovePriority lowPriority highPriority @@ -136,6 +172,17 @@ enum VirtualMachinePowerState end +enum VirtualMachineToolsStatus + toolsNotInstalled + toolsNotRunning + toolsOk + toolsOld +end + +enum vStorageSupport + vStorageUnknown +end + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Objects # @@ -158,6 +205,12 @@ object AboutInfo end +object ArrayUpdateSpec + ArrayUpdateOperation operation r + AnyType removeKey o +end + + object AutoStartDefaults Boolean enabled o Int startDelay o @@ -184,6 +237,26 @@ object ChoiceOption extends OptionType end +object ClusterDasVmConfigSpec extends ArrayUpdateSpec + ClusterDasVmConfigInfo info i +end + + +object ClusterDpmHostConfigSpec extends ArrayUpdateSpec + ClusterDpmHostConfigInfo info i +end + + +object ClusterRuleSpec extends ArrayUpdateSpec + ClusterRuleInfo info i +end + + +object ClusterDrsVmConfigSpec extends ArrayUpdateSpec + ClusterDrsVmConfigInfo info i +end + + object DatastoreHostMount ManagedObjectReference key r HostMountInfo mountInfo r @@ -740,6 +813,64 @@ object HostVmfsVolume extends HostFileSystemVolume end +object HttpNfcLease + LocalizedMethodFault error o + HttpNfcLeaseInfo info o + Int initializeProgress r + HttpNfcLeaseState state r +end + + +object HttpNfcLeaseDatastoreLeaseInfo + String datastoreKey r + HttpNfcLeaseHostInfo hosts rl +end + + +object HttpNfcLeaseDeviceUrl + String datastoreKey o + Boolean disk o + Long fileSize o + String importKey r + String key r + String sslThumbprint r + String targetId o + String url r +end + + +object HttpNfcLeaseHostInfo + String sslThumbprint r + String url r +end + + +object HttpNfcLeaseInfo + HttpNfcLeaseDeviceUrl deviceUrl ol + ManagedObjectReference entity r + HttpNfcLeaseDatastoreLeaseInfo hostMap ol + ManagedObjectReference lease r + Int leaseTimeout r + Long totalDiskCapacityInKB r +end + + + +object HttpNfcLeaseManifestEntry + Long capacity o + Boolean disk r + String key r + Long populatedSize o + String sha1 r + Long size r +end + + +object ImportSpec + VAppEntityConfigInfo entityConfig o +end + + object IsoImageFileInfo extends FileInfo end @@ -754,6 +885,12 @@ object KeyAnyValue end +object KeyValue + String key r + String value r +end + + object LocalDatastoreInfo extends DatastoreInfo String path o end @@ -792,6 +929,11 @@ object ObjectUpdate end +object OptionDef extends ElementDescription + OptionType optionType r +end + + object OptionType Boolean valueIsReadonly o end @@ -803,6 +945,97 @@ object OptionValue end +object OvfCreateImportSpecParams extends OvfManagerCommonParams + String entityName r + ManagedObjectReference hostSystem o + OvfNetworkMapping networkMapping ol + String ipAllocationPolicy o + String ipProtocol o + String diskProvisioning o + KeyValue propertyMapping ol + OvfResourceMap resourceMapping ol + +end + + +object OvfCreateImportSpecResult + LocalizedMethodFault error ol + OvfFileItem fileItem ol + VirtualMachineImportSpec importSpec o + LocalizedMethodFault warning ol +end + + +object OvfDeploymentOption + String description r + String key r + String label r +end + + +object OvfFileItem + Long chunkSize o + Int cimType r + String compressionMethod o + Boolean create r + String deviceId r + String path r + Long size o +end + + +object OvfManagerCommonParams + String locale r + String deploymentOption r + KeyValue msgBundle ol +end + + +object OvfNetworkInfo + String description r + String name r +end + + +object OvfNetworkMapping + String name r + ManagedObjectReference network r +end + + +object OvfParseDescriptorParams extends OvfManagerCommonParams +end + + +object OvfParseDescriptorResult + String annotation o + Long approximateDownloadSize o + Long approximateFlatDeploymentSize o + Long approximateSparseDeploymentSize o + String defaultDeploymentOption r + String defaultEntityName r + OvfDeploymentOption deploymentOption ol + KeyValue entityName ol + LocalizedMethodFault error ol + String eula ol + String ipAllocationScheme ol + String ipProtocols ol + OvfNetworkInfo network ol + VAppProductInfo productInfo o + VAppPropertyInfo property ol + Boolean virtualApp r + LocalizedMethodFault warning ol +end + + +object OvfResourceMap + ManagedObjectReference datastore o + ManagedObjectReference parent o + ResourceConfigSpec resourceSpec o + String source r +end + + object PerfCounterInfo Int key r ElementDescription nameInfo r @@ -911,6 +1144,15 @@ object PropertySpec end +object ResourceConfigSpec + String changeVersion o + ResourceAllocationInfo cpuAllocation r + ManagedObjectReference entity o + DateTime lastModified o + ResourceAllocationInfo memoryAllocation r +end + + object ResourceAllocationInfo Long reservation o Boolean expandableReservation o @@ -1017,6 +1259,18 @@ object SharesInfo end +object StorageIOAllocationInfo + Long limit o + SharesInfo shares o +end + + +object StringOption extends OptionType + String defaultValue r + String validCharacters o +end + + object TaskInfo String key r ManagedObjectReference task r @@ -1051,6 +1305,19 @@ object TemplateConfigFileQuery extends VmConfigFileQuery end +object ToolsConfigInfo + Boolean afterPowerOn o + Boolean afterResume o + Boolean beforeGuestStandby o + Boolean beforeGuestShutdown o + Boolean beforeGuestReboot o + String pendingCustomization o + Boolean syncTimeWithHost o + String toolsUpgradePolicy o + Int toolsVersion o +end + + object TraversalSpec extends SelectionSpec String type r String path r @@ -1073,6 +1340,175 @@ object UserSession DateTime lastActiveTime r String locale r String messageLocale r + Boolean extensionSession o +end + + +object VAppConfigSpec extends VmConfigSpec + String annotation o + VAppEntityConfigInfo entityConfig ol +end + +object VAppEntityConfigInfo + Boolean destroyWithParent o + ManagedObjectReference key o + String startAction o + Int startDelay o + Int startOrder o + String stopAction o + Int stopDelay o + String tag o + Boolean waitingForGuest o +end + + +object VAppIPAssignmentInfo + String ipAllocationPolicy o + String ipProtocol o + String supportedAllocationScheme ol + String supportedIpProtocol ol +end + + +object VAppOvfSectionInfo + Boolean atEnvelopeLevel o + String contents o + Int key o + String namespace o + String type o +end + + +object VAppOvfSectionSpec extends ArrayUpdateSpec + VAppOvfSectionInfo info o +end + + +object VAppProductInfo + String appUrl o + String classId o + String fullVersion o + String instanceId o + Int key r + String name o + String productUrl o + String vendor o + String vendorUrl o + String version o +end + + +object VAppProductSpec extends ArrayUpdateSpec + VAppProductInfo info o +end + + +object VAppPropertyInfo + String category o + String classId o + String defaultValue o + String description o + String id o + Int key r + String label o + String type o + Boolean userConfigurable o + String value o +end + + +object VAppPropertySpec extends ArrayUpdateSpec + VAppPropertyInfo info o +end + + +object VirtualDevice + Int key r + Description deviceInfo o + VirtualDeviceBackingInfo backing o + VirtualDeviceConnectInfo connectable o + Int controllerKey o + Int unitNumber o +end + + +object VirtualDeviceBackingInfo +end + + +object VirtualDeviceConnectInfo + Boolean startConnected r + Boolean allowGuestControl r + Boolean connected r + String status o +end + + +object VirtualCdrom extends VirtualDevice +end + + +object VirtualController extends VirtualDevice + Int busNumber r + Int device ol +end + + +object VirtualIDEController extends VirtualController +end + + +object VirtualPCIController extends VirtualController +end + + +object VirtualPS2Controller extends VirtualController +end + + +object VirtualSCSIController extends VirtualController + Boolean hotAddRemove o + Int scsiCtlrUnitNumber o + VirtualSCSISharing sharedBus r +end + + +object ParaVirtualSCSIController extends VirtualSCSIController +end + + +object VirtualBusLogicController extends VirtualSCSIController +end + + +object VirtualLsiLogicController extends VirtualSCSIController +end + + +object VirtualLsiLogicSASController extends VirtualSCSIController +end + + +object VirtualSIOController extends VirtualController +end + + +object VirtualUSBController extends VirtualController + Boolean autoConnectDevices o + Boolean ehciEnabled o +end + + +object VirtualDeviceConfigSpec + VirtualDeviceConfigSpecOperation operation o + VirtualDeviceConfigSpecFileOperation fileOperation o + VirtualDevice device r +end + + +object VirtualDisk extends VirtualDevice + Long capacityInKB r + SharesInfo shares o end @@ -1082,6 +1518,283 @@ object VirtualDiskSpec end +object VirtualEthernetCard extends VirtualDevice + String addressType o + String macAddress o + Boolean wakeOnLanEnabled o +end + + +object VirtualE1000 extends VirtualEthernetCard +end + + +object VirtualPCNet32 extends VirtualEthernetCard +end + + +object VirtualVmxnet extends VirtualEthernetCard +end + + +object VirtualVmxnet2 extends VirtualVmxnet +end + + +object VirtualVmxnet3 extends VirtualVmxnet +end + + +object VirtualFloppy extends VirtualDevice +end + + +object VirtualKeyboard extends VirtualDevice +end + + +object VirtualMachineCpuIdInfoSpec + HostCpuIdInfo info o +end + + +object VirtualMachineVideoCard extends VirtualDevice + Boolean enable3DSupport o + Int numDisplays o + Boolean useAutoDetect o + Long videoRamSizeInKB o +end + + +object VirtualMachineVMCIDevice extends VirtualDevice + Boolean allowUnrestrictedCommunication o + Long id o +end + + +object VirtualMachineVMIROM extends VirtualDevice +end + + +object VirtualParallelPort extends VirtualDevice +end + + +object VirtualPCIPassthrough extends VirtualDevice +end + + +object VirtualPointingDevice extends VirtualDevice +end + + +object VirtualSCSIPassthrough extends VirtualDevice +end + + +object VirtualSerialPort extends VirtualDevice + Boolean yieldOnPoll r +end + +object VirtualSoundCard extends VirtualDevice +end + +object VirtualUSB extends VirtualDevice + Boolean connected r +end + + +object VirtualDeviceBackingInfo +end + + +object VirtualDeviceDeviceBackingInfo extends VirtualDeviceBackingInfo + String deviceName r + Boolean useAutoDetect o +end + + +object VirtualCdromAtapiBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualCdromPassthroughBackingInfo extends VirtualDeviceDeviceBackingInfo + Boolean exclusive r +end + + +object VirtualDiskRawDiskVer2BackingInfo extends VirtualDeviceDeviceBackingInfo + String changeId o + String descriptorFileName r + String uuid o +end + + +object VirtualDiskPartitionedRawDiskVer2BackingInfo extends VirtualDiskRawDiskVer2BackingInfo + Int partition rl +end + + +object VirtualEthernetCardLegacyNetworkBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualEthernetCardNetworkBackingInfo extends VirtualDeviceDeviceBackingInfo + Boolean inPassthroughMode o + ManagedObjectReference network o +end + + +object VirtualFloppyDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualParallelPortDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualPCIPassthroughDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo + String deviceId r + String id r + String systemId r + Int vendorId r +end + + +object VirtualPointingDeviceDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo + String hostPointingDevice r +end + + +object VirtualSCSIPassthroughDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualSerialPortDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualSoundCardDeviceBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualUSBUSBBackingInfo extends VirtualDeviceDeviceBackingInfo +end + + +object VirtualDeviceFileBackingInfo extends VirtualDeviceBackingInfo + String fileName r + ManagedObjectReference datastore o +end + + +object VirtualCdromIsoBackingInfo extends VirtualDeviceFileBackingInfo +end + + +object VirtualDiskFlatVer1BackingInfo extends VirtualDeviceFileBackingInfo + String contentId o + String diskMode r + VirtualDiskFlatVer1BackingInfo parent o + Boolean split o + Boolean writeThrough o +end + + +object VirtualDiskFlatVer2BackingInfo extends VirtualDeviceFileBackingInfo + String changeId o + String contentId o + String diskMode r + VirtualDiskFlatVer2BackingInfo parent o + Boolean split o + Boolean thinProvisioned o + Boolean eagerlyScrub o + String uuid o + Boolean writeThrough o +end + + +object VirtualDiskRawDiskMappingVer1BackingInfo extends VirtualDeviceFileBackingInfo + String changeId o + String compatibilityMode o + String contentId o + String deviceName o + String diskMode o + String lunUuid o + VirtualDiskRawDiskMappingVer1BackingInfo parent o + String uuid o +end + + +object VirtualDiskSparseVer1BackingInfo extends VirtualDeviceFileBackingInfo + String contentId o + String diskMode r + VirtualDiskSparseVer1BackingInfo parent o + Long spaceUsedInKB o + Boolean split o + Boolean writeThrough o +end + + +object VirtualDiskSparseVer2BackingInfo extends VirtualDeviceFileBackingInfo + String changeId o + String contentId o + String diskMode r + VirtualDiskSparseVer2BackingInfo parent o + Long spaceUsedInKB o + Boolean split o + String uuid o + Boolean writeThrough o +end + + +object VirtualFloppyImageBackingInfo extends VirtualDeviceFileBackingInfo +end + + +object VirtualParallelPortFileBackingInfo extends VirtualDeviceFileBackingInfo +end + + +object VirtualSerialPortFileBackingInfo extends VirtualDeviceFileBackingInfo +end + + +object VirtualDevicePipeBackingInfo extends VirtualDeviceBackingInfo + String pipeName r +end + + +object VirtualSerialPortPipeBackingInfo extends VirtualDevicePipeBackingInfo + String endpoint r + Boolean noRxLoss o +end + + +object VirtualDeviceRemoteDeviceBackingInfo extends VirtualDeviceBackingInfo + String deviceName r + Boolean useAutoDetect o +end + + +object VirtualCdromRemoteAtapiBackingInfo extends VirtualDeviceRemoteDeviceBackingInfo +end + + +object VirtualCdromRemotePassthroughBackingInfo extends VirtualDeviceRemoteDeviceBackingInfo + Boolean exclusive r +end + + +object VirtualFloppyRemoteDeviceBackingInfo extends VirtualDeviceRemoteDeviceBackingInfo +end + + +object VirtualMachineAffinityInfo + Int affinitySet ol +end + + object VirtualMachineConfigSpec String changeVersion o String name o @@ -1100,33 +1813,93 @@ object VirtualMachineConfigSpec String guestId o String alternateGuestName o String annotation o - VirtualMachineFileInfo files i - ToolsConfigInfo tools i - VirtualMachineFlagInfo flags i - VirtualMachineConsolePreferences consolePreferences i - VirtualMachineDefaultPowerOpInfo powerOpInfo i + VirtualMachineFileInfo files o + ToolsConfigInfo tools o + VirtualMachineFlagInfo flags o + VirtualMachineConsolePreferences consolePreferences o + VirtualMachineDefaultPowerOpInfo powerOpInfo o Int numCPUs o + Int numCoresPerSocket o Long memoryMB o Boolean memoryHotAddEnabled o Boolean cpuHotAddEnabled o Boolean cpuHotRemoveEnabled o - VirtualDeviceConfigSpec deviceChange i + VirtualDeviceConfigSpec deviceChange ol ResourceAllocationInfo cpuAllocation o ResourceAllocationInfo memoryAllocation o - VirtualMachineAffinityInfo cpuAffinity i - VirtualMachineAffinityInfo memoryAffinity i - VirtualMachineNetworkShaperInfo networkShaper i - VirtualMachineCpuIdInfoSpec cpuFeatureMask i - OptionValue extraConfig i + VirtualMachineAffinityInfo cpuAffinity o + VirtualMachineAffinityInfo memoryAffinity o + VirtualMachineNetworkShaperInfo networkShaper o + VirtualMachineCpuIdInfoSpec cpuFeatureMask o + OptionValue extraConfig ol String swapPlacement o - VirtualMachineBootOptions bootOptions i - VmConfigSpec vAppConfig i + VirtualMachineBootOptions bootOptions o + VmConfigSpec vAppConfig o FaultToleranceConfigInfo ftInfo i Boolean vAppConfigRemoved o Boolean vAssertsEnabled o Boolean changeTrackingEnabled o end +object VirtualMachineDefaultPowerOpInfo + String defaultPowerOffType o + String defaultResetType o + String defaultSuspendType o + String powerOffType o + String resetType o + String standbyAction o + String suspendType o +end + +object VirtualMachineConsolePreferences + Boolean closeOnPowerOffOrSuspend o + Boolean enterFullScreenOnPowerOn o + Boolean powerOnWhenOpened o +end + +object VirtualMachineFileInfo + String logDrirectory o + String snapshotDirectory o + String suspendDirectory o + String vmPathName o +end + + +object VirtualMachineNetworkShaperInfo + Long averageBps o + Long burstSize o + Boolean enabled o + Long peakBps o +end + +object VirtualMachineFlagInfo + Boolean disableAcceleration o + Boolean diskUuidEnabled o + Boolean enableLogging o + String htSharing o + String monitorType o + Boolean recordReplayEnabled o + Boolean runWithDebugInfo o + Boolean snapshotDisabled o + Boolean snapshotLocked o + String snapshotPowerOffBehavior o + Boolean useToe o + String virtualExecUsage o + String virtualMmuUsage o +end + +object VirtualMachineBootOptions + Long bootDelay o + Long bootRetryDelay o + Boolean bootRetryEnabled o + Boolean enterBIOSSetup o +end + +object VirtualMachineImportSpec extends ImportSpec + VirtualMachineConfigSpec configSpec r + ManagedObjectReference resPoolEntity o +end + object VirtualMachineQuestionInfo String id r @@ -1172,6 +1945,18 @@ object VmConfigFileQueryFlags end +object VmConfigSpec + Boolean installBootRequired o + Int installBootStopDelay o + String eula ol + VAppIPAssignmentInfo ipAssignment o + String ovfEnviornmentTransport ol + VAppOvfSectionSpec ovfSection ol + VAppProductSpec product ol + VAppPropertySpec property ol +end + + object VmDiskFileInfo extends FileInfo String diskType o Long capacityKb o @@ -1310,6 +2095,15 @@ method CopyVirtualDisk_Task returns ManagedObjectReference r end +method CreateImportSpec returns OvfCreateImportSpecResult r + ManagedObjectReference _this r + String ovfDescriptor r + ManagedObjectReference resourcePool r + ManagedObjectReference datastore r + OvfCreateImportSpecParams cisp r +end + + method CreateFilter returns ManagedObjectReference r ManagedObjectReference _this:propertyCollector r PropertyFilterSpec spec r @@ -1363,12 +2157,35 @@ method FindByUuid returns ManagedObjectReference o end +method HttpNfcLeaseAbort + ManagedObjectReference _this r +end + + +method HttpNfcLeaseComplete + ManagedObjectReference _this r +end + + +method HttpNfcLeaseGetManifest returns HttpNfcLeaseManifestEntry rl + ManagedObjectReference _this r +end + + method HttpNfcLeaseProgress ManagedObjectReference _this r Int percent r end +method ImportVApp returns ManagedObjectReference r + ManagedObjectReference _this r + VirtualMachineImportSpec spec r + ManagedObjectReference folder o + ManagedObjectReference host o +end + + method Login returns UserSession r ManagedObjectReference _this:sessionManager r String userName r @@ -1404,6 +2221,13 @@ method PowerOffVM_Task returns ManagedObjectReference r end +method ParseDescriptor returns OvfParseDescriptorResult r + ManagedObjectReference _this r + String ovfDescriptor r + OvfParseDescriptorParams pdp r +end + + method PowerOnVM_Task returns ManagedObjectReference r ManagedObjectReference _this r ManagedObjectReference host o diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index af4e7e8..19f4ffe 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1284,7 +1284,6 @@ class ManagedObject(Type): return source - class Enum(Type): FEATURE__ANY_TYPE = (1 << 1) FEATURE__SERIALIZE = (1 << 2) @@ -1518,7 +1517,8 @@ predefined_objects = ["AnyType", additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE, "TaskInfoState" : Enum.FEATURE__ANY_TYPE, - "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } + "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE, + "VirtualMachineToolsStatus" : Enum.FEATURE__ANY_TYPE } additional_object_features = { "AutoStartDefaults" : Object.FEATURE__ANY_TYPE, "AutoStartPowerInfo" : Object.FEATURE__ANY_TYPE, @@ -1527,6 +1527,7 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, + "DynamicProperty" : Object.FEATURE__LIST, "HostConfigManager" : Object.FEATURE__ANY_TYPE, "HostCpuIdInfo" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, @@ -1552,8 +1553,12 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN "HostVirtualSwitch" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HttpNfcLeaseInfo" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "OptionDef" : Object.FEATURE__LIST, + "OptionValue" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, "PhysicalNic" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, @@ -1567,9 +1572,13 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN "TaskInfo" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, "UserSession" : Object.FEATURE__ANY_TYPE, + "VirtualDeviceConfigSpec" : Object.FEATURE__LIST, + "VirtualMachineImportSpec" : Object.FEATURE__DYNAMIC_CAST, "VirtualMachineQuestionInfo" : Object.FEATURE__ANY_TYPE, "VirtualMachineSnapshotTree" : Object.FEATURE__DEEP_COPY | Object.FEATURE__ANY_TYPE, + "VirtualDevice" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, "VmEventArgument" : Object.FEATURE__DESERIALIZE } removed_object_features = {} diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index d1f91ff..c1c314c 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -720,14 +720,15 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); if (type == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is missing 'type' property"), - esxVI_Type_ToString(baseType)); - return -1; + /** + * Few ESX objects are nasty and doesn't contain any 'type' value, + * for instance: VmConfigSpec; set the value to baseType and proceed + */ + *actualType = baseType; + } else { + *actualType = esxVI_Type_FromString(type); } - *actualType = esxVI_Type_FromString(type); - if (*actualType == esxVI_Type_Undefined || *actualType == esxVI_Type_Other) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown value '%s' for %s 'type' property"), -- 1.7.9.5

1 0

[libvirt] [PATCH 3/5] ESX: CURL routine to allow file upload to the server
by Ata E Husain Bohra 06 Jan '13

06 Jan '13

Currently esx_vi.c supports file upload/download to the server but only for string based contents. This patch extends the support to upload file contents by opening file and sending data in chunks using CURL POST operation. This patch also servers as fundemental block for OVA installations to create new domain. This patch introduces a structure to maintain metadata information about the file being uploaded, it defines an enum to allow user to set the "file type". For instance: OVA disk(s) while uploading needs to refresh "lease timeout" by reporting upload progress, the file type allow us to perform specific operations to be performed per file upload if needed. --- src/esx/esx_vi.c | 147 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.h | 35 +++++++++- src/esx/esx_vi_generator.input | 6 ++ 3 files changed, 186 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 99c1eb1..a49ab7e 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4,6 +4,7 @@ * * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2009-2012 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2013 Ata E Husain Bohra <ata.husain(a)hotmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +34,7 @@ #include "viruuid.h" #include "vmx.h" #include "virxml.h" +#include "virfile.h" #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" @@ -115,6 +117,22 @@ ESX_VI__TEMPLATE__FREE(CURL, virMutexDestroy(&item->lock); }) + +/* esxVI_FileData_Alloc */ +ESX_VI__TEMPLATE__ALLOC(FileData) + + +/* esxVI_FileData_Free */ +ESX_VI__TEMPLATE__FREE(FileData, +{ + if (item->fHandle) { + if (VIR_FCLOSE(item->fHandle) < 0) { + VIR_FORCE_FCLOSE(item->fHandle); + } + } +}) + + static size_t esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *userdata) { @@ -167,6 +185,85 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *userdata) return 0; } +/* 1 minute timeout to report upload status */ +#define UPLOAD_STATUS_TIMEOUT 30 + +static size_t +esxVI_CURL_ReadFile(void *data, size_t size, size_t nmemb, void *userdata) +{ + int result = -1; + size_t readsize = -1; + esxVI_FileData *fileData = (esxVI_FileData *) userdata; + esxVI_Int *percentage = NULL; + time_t cur_time = 0; + int elapsed = 0; + + if ((fileData == NULL) || + (fileData->fHandle == NULL)) { + return readsize; + } + + if (fileData->cur_size == 0) { + readsize = 0; + } else { + if ((size*nmemb) > fileData->cur_size) { + readsize = fread(data, 1, fileData->cur_size, + (FILE*) fileData->fHandle); + } else { + readsize = fread(data, size, nmemb, (FILE*)fileData->fHandle); + } + + fileData->cur_size -= readsize; + } + + if (fileData->type == OVA_DISK) { + cur_time = time(NULL); + elapsed = cur_time - fileData->time_elapsed; + + if (elapsed < UPLOAD_STATUS_TIMEOUT) { + /* no need to update upload progress */ + result = 0; + goto cleanup; + } + + if (fileData->ctx == NULL || + fileData->lease == NULL) { + /* inability to extend lease may timeout the connection. + * Abort the transfer! + */ + goto cleanup; + } + + /** + * to extend the timeout we have to report upload progress + * to the server. + */ + if (esxVI_Int_Alloc(&percentage) < 0) { + virReportOOMError(); + goto cleanup; + } + + percentage->value = + ((fileData->total_size - fileData->cur_size) * 100)/fileData->total_size; + + esxVI_HttpNfcLeaseProgress( + fileData->ctx, fileData->lease, percentage); + + + fileData->time_elapsed = time(NULL); + } + + result = 0; + +cleanup: + + esxVI_Int_Free(&percentage); + + return result < 0 ? -1 : readsize; + +} + + #define ESX_VI__CURL__ENABLE_DEBUG_OUTPUT 0 #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT @@ -480,6 +577,55 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) return 0; } +int esxVI_CURL_FileUpload(esxVI_CURL *curl, const char *url, + esxVI_FileData *fileData) +{ + /* + * FIXME: VMDK upload does not work well as it stops the transfer + * after sending metadata. However, this method is used to upload + * OVA disk, given parsing OVA we extract the exact file offset + * to initiate the transfer. + */ + + int result = -1; + int responseCode = 0; + + if (fileData == NULL || fileData->fHandle == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + goto cleanup; + } + + virMutexLock(&curl->lock); + + curl_easy_setopt(curl->handle, CURLOPT_POST, 1L); + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_READDATA, fileData); + curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, + (curl_off_t) fileData->cur_size); + curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, + esxVI_CURL_ReadFile); + + responseCode = esxVI_CURL_Perform(curl, url); + + virMutexUnlock(&curl->lock); + + if (responseCode < 0) { + goto cleanup; + } else if (responseCode != 200 && responseCode != 201) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("HTTP response code %d for upload to '%s'"), + responseCode, url); + goto cleanup; + } + + result = 0; + +cleanup: + + return result; + +} + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -5213,5 +5359,4 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, } - #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 3eaeb38..324f931 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -1,9 +1,9 @@ - /* * esx_vi.h: client for the VMware VI API 2.5 to manage ESX hosts * * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2009-2012 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2013 Ata E Husain Bohra <ata.husain(a)hotmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -75,6 +75,7 @@ typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; +typedef enum _esxVI_UploadFileType esxVI_UploadFileType; typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; typedef struct _esxVI_CURL esxVI_CURL; typedef struct _esxVI_SharedCURL esxVI_SharedCURL; @@ -84,6 +85,7 @@ typedef struct _esxVI_Response esxVI_Response; typedef struct _esxVI_Enumeration esxVI_Enumeration; typedef struct _esxVI_EnumerationValue esxVI_EnumerationValue; typedef struct _esxVI_List esxVI_List; +typedef struct _esxVI_FileData esxVI_FileData; @@ -167,6 +169,37 @@ int esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, unsigned long long offset, unsigned long long *length); int esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content); +/* Upload Files to ESX server */ + +/** + * Based on file, upload may be requied to do extra work. + * For instance: OVA file upload need to report upload transfer + * progress to extend Upload Lease + */ +enum _esxVI_UploadFileType { + VMDK, + OVA_DISK, + OTHERS +}; + +struct _esxVI_FileData +{ + FILE *fHandle; + off_t cur_size; /* file size of the current file */ + off_t total_size; /* total size of all files */ + esxVI_UploadFileType type; /* type of file to upload */ + /** + * below parameteres are mandatory only for OVA disk upload + */ + esxVI_Context *ctx; + esxVI_ManagedObjectReference *lease; + time_t time_elapsed; /* time since upload started */ +}; + +int esxVI_FileData_Alloc(esxVI_FileData **fileData); +void esxVI_FileData_Free(esxVI_FileData **fileData); +int esxVI_CURL_FileUpload(esxVI_CURL *curl, const char *url, + esxVI_FileData *fileData); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 22c114e..eec135e 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -1363,6 +1363,12 @@ method FindByUuid returns ManagedObjectReference o end +method HttpNfcLeaseProgress + ManagedObjectReference _this r + Int percent r +end + + method Login returns UserSession r ManagedObjectReference _this:sessionManager r String userName r -- 1.7.9.5

1 0

[libvirt] [PATCH 2/5] Parsing and file handling operations for an OVA file
by Ata E Husain Bohra 06 Jan '13

06 Jan '13

The set of routines provides parsing and file handling operation for a given OVA package, the extracted information contains: 1. OVF descriptor (xml descriptor contained in the package) 2. List of virtual disk and related details (file name, size and offset) Parsing results are stored in a structure virOVA, one of the members of this structure is head of linked list (single pointed) which stores file details for all OVA contained files (such as: OVF descriptor(s), virtual disk, metaconf files etc.). --- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/util/virova.c | 463 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virova.h | 68 ++++++++ 4 files changed, 533 insertions(+) create mode 100644 src/util/virova.c create mode 100644 src/util/virova.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 95619f9..580a035 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -182,6 +182,7 @@ src/util/viruri.c src/util/virusb.c src/util/virutil.c src/util/virxml.c +src/util/virova.c src/vbox/vbox_MSCOMGlue.c src/vbox/vbox_XPCOMCGlue.c src/vbox/vbox_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index 955973e..2c20433 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -116,6 +116,7 @@ UTIL_SOURCES = \ util/virutil.c util/virutil.h \ util/viruuid.c util/viruuid.h \ util/virxml.c util/virxml.h \ + util/virova.c util/virova.h \ $(NULL) diff --git a/src/util/virova.c b/src/util/virova.c new file mode 100644 index 0000000..23709e0 --- /dev/null +++ b/src/util/virova.c @@ -0,0 +1,463 @@ +/* + * virova.c: OVA file handling/parsing + * + * Copyright (C) 2013 Ata E Husain Bohra <ata.husain(a)hotmail.com> + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> +#include "internal.h" + +#include <string.h> +#include <sys/stat.h> +#include <libxml/parser.h> +#include <libxml/xpathInternals.h> + +#include "virova.h" +#include "virfile.h" +#include "virerror.h" +#include "viralloc.h" +#include "virbuffer.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +#define XMLCHAR_CAST(VALUE) (const char *)(VALUE) + +/** + * OVA file is a tar file, the details of header/metadata are: + * + * ---------------- OVA/TAR Header-------------------------------------- + *___________________________________________________________________ + *| Field | Field | Field | + *| Offset| Size | | + *|_______|_______|__________________________________________________| + *| 0 | 100 |File name | + *| 100 | 8 |File mode | + *| 108 | 8 |Owner's numeric user ID | + *| 116 | 8 |Group's numeric user ID | + *| 124 | 12 |File size in bytes | + *| 136 | 12 |Last modification time in numeric Unix time format| + *| 148 | 8 |Checksum for header block | + *| 156 | 1 |Link indicator (file type) | + *| 157 | 100 |Name of linked file | + *| 257 | 6 |TAR magic | + *| 263 | 2 |Version | + *|_______|_______|__________________________________________________| + */ + +#define FILE_NAME_LENGTH 100 +#define FILE_SIZE_LENGTH 12 +#define HEADER_SIZE 512 +#define VERSION_LENGTH 2 +#define MAGIC_LENGTH 6 + +static const char *MAGIC_STRING = "ustar"; +static const char *GNU_VERSION = " "; + +static const int START_OFFSET = 0L; +static const int FILE_SIZE_OFFSET = 24L; +static const int MAGIC_OFFSET = 257; +static const int VERSION_OFFSET = 263L; +static const int HEADER_END_OFFSET = 377L; +static const char LARGE_FILE_OCTET = '\200'; + +static int validateOVAMagic(FILE *fHandle); + + +/** + * validateOVAMagic: verify OVA magix string + * + * @fHandle: FILE* + * + * validate if given OVA package contains a valid TAR magic string. + */ +int +validateOVAMagic(FILE *fHandle) +{ + int result = -1; + char magic[MAGIC_LENGTH+1] = {'\0'}; + char version[VERSION_LENGTH+1] = {'\0'}; + size_t bytesRead = 0; + + if (fseeko(fHandle, MAGIC_OFFSET, SEEK_SET) < 0) { + virReportSystemError(errno, "%s", _("Seek error: OVA magic string")); + goto cleanup; + } + + bytesRead = fread(magic, 1, MAGIC_LENGTH, fHandle); + if (bytesRead != MAGIC_LENGTH) { + virReportSystemError(errno, "%s", _("Unable to read magic string")); + goto cleanup; + } + + if (STRNEQLEN(magic, MAGIC_STRING, MAGIC_LENGTH-1)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid magic string")); + goto cleanup; + } + + /* FIXME: Version string can be found at offset 263 in the header. + * Two supported tar version packages are: + * 1. POSIX_VERSION: version string is "00" + * 2. GNU_VERSION: version string is " " + * + * Current parsing support is valid ONLY for GNU VERSION format + */ + if (fseeko(fHandle, VERSION_OFFSET, SEEK_SET) < 0) { + virReportSystemError(errno, "%s", _("Seek error: version string")); + goto cleanup; + } + + bytesRead = fread(version, 1, VERSION_LENGTH, fHandle); + if (bytesRead != VERSION_LENGTH) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error reading version string")); + goto cleanup; + } + + if (STRNEQLEN(version, GNU_VERSION, VERSION_LENGTH-1)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Only GNU VERSION OVA packages are supported")); + goto cleanup; + } + + result = 0; + +cleanup: + + /* ignore seek error */ + fseeko(fHandle, START_OFFSET, SEEK_SET); + + return result; + +} + + + +/** + * virParseOva + * + * @ovaPath: string containing full path of OVA file. + * + * Function open OVA package and populates virOVA struct + */ +int +virParseOVA(const char *ovaPath, virOVAPtr *ret) +{ + int result = -1; + virOVAPtr ova = NULL; + virOVADiskListPtr listItr = NULL; + char fileSizeBuff[FILE_SIZE_LENGTH+1] = {'\0'}; + size_t bytesRead = 0; + off_t adjust = 0; + struct stat buff; + + if (VIR_ALLOC(ova) < 0) { + virReportOOMError(); + goto cleanup; + } + + ova->fHandle = fopen(ovaPath, "r"); + if (ova->fHandle == NULL) { + virReportSystemError(errno, "%s", _("Unable to open file")); + goto cleanup; + } + + if (fstat(fileno(ova->fHandle), &buff) < 0) { + virReportSystemError(errno, "%s", _("File stat error")); + goto cleanup; + } + + ova->totalSize = buff.st_size; + + /* seek to the stating of the package */ + if (fseeko(ova->fHandle, START_OFFSET, SEEK_SET) < 0) { + virReportSystemError(errno, "%s", _("File seek error")); + goto cleanup; + } + + /* verify OVA magic string is valid. */ + if (validateOVAMagic(ova->fHandle) < 0) { + goto cleanup; + } + + /* extract details */ + while (1) { + virOVADiskList *diskList = NULL; + + if (VIR_ALLOC(diskList) < 0 || + VIR_ALLOC(diskList->data)) { + virReportOOMError(); + goto cleanup; + } + + memset(diskList->data->name, '\0', FILE_NAME_LENGTH+1); + diskList->data->offset = 0; + diskList->data->size = 0; + diskList->next = NULL; + + memset(fileSizeBuff, '\0', FILE_SIZE_LENGTH+1); + + /* extract file name */ + bytesRead = fread(diskList->data->name, 1, FILE_NAME_LENGTH, + ova->fHandle); + if (bytesRead <= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid file name")); + goto cleanup; + } + + if (diskList->data->name[0] == '\0') { + /* package parsing is done */ + VIR_FREE(diskList->data); + VIR_FREE(diskList); + break; + } + + /* extract file size */ + if (fseeko(ova->fHandle, FILE_SIZE_OFFSET, SEEK_CUR) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, "%s", + _("File seek error")); + goto cleanup; + } + + bytesRead = fread(fileSizeBuff, 1, FILE_SIZE_LENGTH, ova->fHandle); + if (bytesRead <= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid file length")); + goto cleanup; + } + + /** + * if file size exceeds 8 G, then file size has to be obtained + * by reading 11 bytes of which first byte will be '\200' + */ + if (fileSizeBuff[0] == LARGE_FILE_OCTET) { + const int byteSize = 4; + int i = 0; + + for (i = 0; i < 8; ++i) { + uint8_t c = 0; + c = fileSizeBuff[byteSize + i]; + diskList->data->size = (diskList->data->size << 8) | c; + } + } else { + sscanf(fileSizeBuff, "%lo", &diskList->data->size); + } + + /* set the file content offset */ + if (fseeko(ova->fHandle, HEADER_END_OFFSET, SEEK_CUR) < 0) { + virReportSystemError(errno, "%s", _("Seek error")); + VIR_FREE(diskList->data); + VIR_FREE(diskList); + goto cleanup; + } + + diskList->data->offset = ftello(ova->fHandle) - 1; + if (diskList->data->offset < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid file offset")); + VIR_FREE(diskList->data); + VIR_FREE(diskList); + goto cleanup; + } + + /* adjust seek head to header size boundary */ + adjust = diskList->data->size; + if (diskList->data->size % HEADER_SIZE) { + adjust = (adjust/HEADER_SIZE + 1) * HEADER_SIZE; + } + + if (fseeko(ova->fHandle, adjust - 1, SEEK_CUR) < 0) { + virReportSystemError(errno, "%s", _("Seek error")); + goto cleanup; + } + + if (!ova->head) { + ova->head = diskList; + listItr = ova->head; + } else { + listItr->next = diskList; + listItr = listItr->next; + } + } + + *ret = ova; + result = 0; + +cleanup: + + if (result < 0) { + virFreeOVA(ova); + } + + return result; + +} + + +/** + * virGetOVFDescriptor + * + * @ova: virOVAPtr + * + * Returns OVF descriptor string. + */ + +int +virGetOVFDescriptor(virOVAPtr ova, char **ret) +{ + int result = -1; + virOVADiskListPtr candidate = NULL; + char *fileExtension = NULL; + size_t bytesRead = 0; + + if (ova == NULL || ret == NULL) { + goto cleanup; + } + + /** + * TODO: OVA may have multiple OVF descriptors, + * for now consider deploying only one OVF at once + */ + for (candidate = ova->head; candidate != NULL; + candidate = candidate->next) { + if (!candidate->data) { + goto cleanup; + } + fileExtension = strrchr(candidate->data->name, '.'); + if (fileExtension && STREQ(fileExtension, ".ovf")) { + break; + } + } + + if (!candidate) { + /** + * OVA may have multiple OVF descriptor, leave error handling + * to the caller + */ + goto cleanup; + } + + if (fseeko(ova->fHandle, candidate->data->offset, SEEK_SET) < 0) { + virReportSystemError(errno, "%s", _("File seek error")); + goto cleanup; + } + + if (VIR_ALLOC_N(*ret, candidate->data->size+1) < 0) { + virReportOOMError(); + goto cleanup; + } + + bytesRead = fread(*ret, 1, candidate->data->size, ova->fHandle); + if (bytesRead != candidate->data->size) { + virReportSystemError(errno, "%s", _("File read error")); + goto cleanup; + } + + result = 0; + +cleanup: + + return result; + +} + + + +/** + * virGetOVFDomainName + * + * Extract domain name from a OVF file + */ +char * +virGetOVFDomainName(const char *ovf) +{ + char *domainName = NULL; + xmlNode *root_element = NULL; + xmlNode *curNode = NULL; + xmlNode *section = NULL; + xmlNode *element = NULL; + xmlDoc *doc = xmlReadMemory(ovf, strlen(ovf), NULL, NULL, 0); + + if (!doc) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error reading OVF xml")); + goto cleanup; + } + + root_element = xmlDocGetRootElement(doc); + for (curNode = root_element; curNode != NULL; curNode = curNode->next) { + if (STRCASENEQ(XMLCHAR_CAST(curNode->name), "envelope")) { + /* not the OVF root element */ + continue; + } + + for (section = curNode->children; section; section = section->next) { + if (STRCASENEQ(XMLCHAR_CAST(section->name), "virtualsystem")) { + /* wait for VirtualSystem section */ + continue; + } + + for (element = section->children; element ; element = element->next) { + if (STRCASENEQ(XMLCHAR_CAST(element->name), "name")) { + continue; + } + + domainName = strdup(XMLCHAR_CAST(xmlNodeGetContent(element))); + } + } + } + +cleanup: + + xmlFreeDoc(doc); + + return domainName; + +} + + + +/** + * virFreeOVA: free OVA structure members + */ +void virFreeOVA(virOVAPtr ova) +{ + struct _virOVADiskList *list = NULL; + + if (ova == NULL) { + /* nothing to free */ + return ; + } + + if (VIR_FCLOSE(ova->fHandle) < 0) { + VIR_FORCE_FCLOSE(ova->fHandle); + } + + /* iterate over linked list and free */ + while (ova->head != NULL) { + list = ova->head; + ova->head = ova->head->next; + + VIR_FREE(list->data); + VIR_FREE(list); + } + + VIR_FREE(ova); + +} diff --git a/src/util/virova.h b/src/util/virova.h new file mode 100644 index 0000000..df74e0f --- /dev/null +++ b/src/util/virova.h @@ -0,0 +1,68 @@ +/* + * virova.h: OVA file handling/parsing + * + * Copyright (C) 2013 Ata E Husain Bohra <ata.husain(a)hotmail.com> + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + */ + +#ifndef __VIR_OVA_H_ +# define __VIR_OVA_H_ + +# include <fcntl.h> +# include <stdio.h> + +typedef struct _virOVADiskList virOVADiskList; +typedef struct _virOVADiskFile virOVADiskFile; +typedef struct _virOVA virOVA; + +/* opaque management of OVA file details */ +struct _virOVADiskFile { + char name[101]; /* TAR header file name limit */ + off_t size; /* virtual disk file size */ + off_t offset; /* virtual disk file offset */ +}; + +typedef virOVADiskFile *virOVADiskFilePtr; + +/* opaque type to maintain OVA files as single pointer linked list */ +struct _virOVADiskList { + struct _virOVADiskList *next; + virOVADiskFilePtr data; +}; + +typedef virOVADiskList *virOVADiskListPtr; + +/** + * parse OVA and populate the containing file details (OVA desc, vDisk etc.) + */ +struct _virOVA { + FILE* fHandle; /* file handle for OVA file */ + virOVADiskListPtr head; /* virtual disk single linked list */ + off_t totalSize; /* total size of OVA package */ +}; + +typedef virOVA *virOVAPtr; + +int virParseOVA(const char *ovaPath, virOVAPtr *ret); + +int virGetOVFDescriptor(virOVAPtr ova, char **ret); + +char *virGetOVFDomainName(const char *ovf); + +void virFreeOVA(virOVAPtr ova); + +#endif /* __VIR_OVA_H_ */ -- 1.7.9.5

1 0

[libvirt] [PATCH 0/5] Add support to define new domain using an OVA package.
by Ata E Husain Bohra 06 Jan '13

06 Jan '13

This patch aims to extend libvirt functionality to define new domain using a given OVA package. The patch consist of multiple commits divided mainly into two categories: Infrastructure support: ----------------------- Patch 1,2 and 5 lays the foundation work including: 1. Libvirt Public API support. 2. OVA file handling and parsing operations. 3. virsh command. ESX specific implementation: --------------------------- Patch 3 and 4 adds implementation support to define new domain for a ESX hypervisor. NOTE: ----- During development of this patch, I have fixed two issues with exisiting ESX hypervisor driver, they are posted as seperate reviews: 1. https://www.redhat.com/archives/libvir-list/2012-December/msg01377.html 2. https://www.redhat.com/archives/libvir-list/2013-January/msg00007.html Above patches are necessary for proper functioning of the proposed feature. Ata E Husain Bohra (5): Public API to allow defining new domain using OVA file Parsing and file handling operations for an OVA file ESX: CURL routine to allow file upload to the server ESX: Driver support to define new domain using an OVA pacakge virsh: Command to define new domain using OVA package. include/libvirt/libvirt.h.in | 3 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/driver.h | 5 + src/esx/esx_driver.c | 573 +++++++++++++++++++++++++- src/esx/esx_vi.c | 147 ++++++- src/esx/esx_vi.h | 35 +- src/esx/esx_vi_generator.input | 862 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi_generator.py | 13 +- src/esx/esx_vi_types.c | 13 +- src/libvirt.c | 58 +++ src/libvirt_public.syms | 5 + src/util/virova.c | 463 +++++++++++++++++++++ src/util/virova.h | 68 ++++ tools/virsh-domain.c | 44 ++ 15 files changed, 2264 insertions(+), 27 deletions(-) create mode 100644 src/util/virova.c create mode 100644 src/util/virova.h -- 1.7.9.5

1 0

[libvirt] [PATCH] Install virtlockd.{socket, service} non executable
by Guido Günther 06 Jan '13

06 Jan '13

since they're not scripts but systemd service files. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f7a9b91..0cfc1ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1687,9 +1687,9 @@ DISTCLEANFILES += virtlockd.service virtlockd.socket install-systemd: virtlockd.service virtlockd.socket install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_SCRIPT) virtlockd.service \ + $(INSTALL_DATA) virtlockd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ - $(INSTALL_SCRIPT) virtlockd.socket \ + $(INSTALL_DATA) virtlockd.socket \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ uninstall-systemd: uninstall-sysconfig -- 1.7.10.4

3 5

[libvirt] [PATCH 0/4] Fix segfault while redefining snapshots and allow redefinition of external snapshots
by Peter Krempa 05 Jan '13

05 Jan '13

This series fixes two issues while redefining snapshots: 1) Segfault when disk alignment of the new snapshot failed (patch 3) 2) Failure to redefine external snapshots. A check was missing to align disks for external snapshots. (patch 4) Peter Krempa (4): snapshot: conf: Make virDomainSnapshotIsExternal more reusable snapshot: qemu: Separate logic blocks with newlines snapshot: qemu: Fix segfault and vanishing snapshots when redefining snapshot: qemu: Allow redefinition of external snapshots src/conf/snapshot_conf.c | 14 ++++++++---- src/conf/snapshot_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 57 +++++++++++++++++++++++++++++++++++------------- 4 files changed, 54 insertions(+), 19 deletions(-) -- 1.8.0.2

2 10

[libvirt] [PATCH 0/4 v2] ivshmem support
by Osier Yang 05 Jan '13

05 Jan '13

v1 - v2: * Change attribute "model" to be a sub-element instead. NOTE: Since the invshmem server socket path is not created by QEMU, but by an external app called "ivshmem_server", It's not good to construct the socket path in libvirt with a solid rule, and force the user to figure out what the path is libvirt uses first and use that for "ivshmem_server". Thus it's the user's business to set the selinux context on the socket path so that the qemu process could be started successfully when selinux is enabled. Shawn Furrow proposed a patch more than a month ago: https://www.redhat.com/archives/libvir-list/2012-September/msg01612.html But this is a complete different implementation. Considering there could be other memory related devices in futuer, this introduces a new device model, called "memory device", instead of a specific device like "ivshmem", though only "ivshmem" is supported currently. Please refer to PATCH 1/4 for more details. CC'ed to Cam and Shawn, to see if there is advise on the documents. Osier Yang (4): docs: Add documents for memory device conf: Parse and format memory device XML qemu: Add cap flag QEMU_CAPS_IVSHMEM qemu: Build command line for ivshmem device docs/formatdomain.html.in | 40 +++++ docs/schemas/domaincommon.rng | 40 +++++ src/conf/domain_conf.c | 195 +++++++++++++++++++++- src/conf/domain_conf.h | 27 +++ src/libvirt_private.syms | 3 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 85 ++++++++++ src/util/util.c | 5 + src/util/util.h | 2 + tests/qemuhelptest.c | 12 +- tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args | 7 + tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml | 34 ++++ tests/qemuxml2argvtest.c | 2 + 14 files changed, 450 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml -- 1.7.7.6

5 12

[libvirt] [PATCH 0/5] Add API to tunnel channels
by John Eckersberg 05 Jan '13

05 Jan '13

This series enables the qemu driver to tunnel a virtio channel. This is useful for a remote session to communicate with a guest channel via the streaming API. This was originally fleshed out a while back in this thread: https://www.redhat.com/archives/libvir-list/2011-September/msg01049.html This implements only item (3) in that list. The new API is nearly identical to the existing virDomainOpenConsole API, except it works on channels, and supports UNIX sockets in addition to PTYs for channel source type. This is my first libvirt patch, please be gentle :) John Eckersberg (5): api: Add API to tunnel a guest channel via stream conf: Rename virconsole.* to virchrdev.* conf: Rename console-specific identifiers to be more generic conf: Add unix socket support to virChrdevOpen qemu: Implement virDomainOpenChannel API configure.ac | 48 ++--- include/libvirt/libvirt.h.in | 16 ++ po/POTFILES.in | 2 +- src/Makefile.am | 8 +- src/conf/virchrdev.c | 442 +++++++++++++++++++++++++++++++++++++++++++ src/conf/virchrdev.h | 37 ++++ src/conf/virconsole.c | 414 ---------------------------------------- src/conf/virconsole.h | 36 ---- src/driver.h | 7 + src/libvirt.c | 61 ++++++ src/libvirt_private.syms | 8 +- src/libvirt_public.syms | 5 + src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_driver.c | 81 +++++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +- src/remote_protocol-structs | 6 + 18 files changed, 697 insertions(+), 492 deletions(-) create mode 100644 src/conf/virchrdev.c create mode 100644 src/conf/virchrdev.h delete mode 100644 src/conf/virconsole.c delete mode 100644 src/conf/virconsole.h -- 1.7.11.7

4 21

[libvirt] [PATCH] build: fix mingw rpm build
by Eric Blake 05 Jan '13

05 Jan '13

Commit d13155c changed which files get installed for the libvirt-guests service, but did not touch up the mingw spec file. As a result, rpmbuild complained: RPM build errors: Installed (but unpackaged) file(s) found: /usr/i686-w64-mingw32/sys-root/mingw/libexec/libvirt-guests.sh /usr/x86_64-w64-mingw32/sys-root/mingw/libexec/libvirt-guests.sh which in turn breaks ./autobuild.sh when cross-compilers are present. * mingw-libvirt.spec.in: Remove files not relevant to mingw. --- Pushing under the build-breaker rule. mingw-libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 4695895..f1540b3 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -177,6 +177,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/* rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe +rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh +rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh # Mingw32 -- 1.8.0.2

1 0

[libvirt] [PATCH] network: fix check for ambiguous lookup
by Eric Blake 05 Jan '13

05 Jan '13

gcc -O2 complained: ../../src/conf/network_conf.c: In function 'virNetworkDefUpdateDNSSrv': ../../src/conf/network_conf.c:3232: error: 'foundIdx' may be used uninitialized in this function [-Wuninitialized] It turned out to be a spurious warning (we didn't use foundIdx unless foundCt was non-zero). But in investigating that, I noticed a worse problem: we were using 'if (foundCt > 1)', but since foundCt was bool, it could never be > 1. * src/conf/network_conf.c (virNetworkDefUpdateDNSHost): Use correct type. (virNetworkDefUpdateDNSSrv): Likewise, and silence compiler warning. --- Pushing under the build-breaker rule in order to shut up the gcc warning, and under the trivial rule to fix the wrong type. src/conf/network_conf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f949f79..d185b46 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1,7 +1,7 @@ /* * network_conf.c: network XML handling * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3138,7 +3138,7 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, virNetworkDNSHostDef host; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST); - bool foundCt = 0; + int foundCt = 0; memset(&host, 0, sizeof(host)); @@ -3229,12 +3229,12 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, foundIdx, ret = -1; + int ii, foundIdx = -1, ret = -1; virNetworkDNSDefPtr dns = &def->dns; virNetworkDNSSrvDef srv; bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST); - bool foundCt = 0; + int foundCt = 0; memset(&srv, 0, sizeof(srv)); -- 1.7.1

1 0

[libvirt] [PATCH 2/2] target-i386: Disable kvm_mmu_op by default on pc-1.4
by Eduardo Habkost 05 Jan '13

05 Jan '13

The kvm_mmu_op feature was removed from the kernel since v3.3 (released in March 2012), it was marked for removal since January 2011 and it's slower than shadow or hardware assisted paging (see kernel commit fb92045843). It doesn't make sense to keep it enabled by default. Also, keeping it enabled by default would cause unnecessary hassle when libvirt start using the "enforce" option. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- Cc: kvm(a)vger.kernel.org Cc: Michael S. Tsirkin <mst(a)redhat.com> Cc: Gleb Natapov <gleb(a)redhat.com> Cc: Marcelo Tosatti <mtosatti(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> I was planning to reverse the logic of the compat init functions and make pc_init_pci_1_3() enable kvm_mmu_op and then call pc_init_pci_1_4(). But that would require changing pc_init_pci_no_kvmclock() and pc_init_isa() as well. So to keep the changes simple, I am keeping the pattern used when pc_init_pci_1_3() was introduced, making pc_init_pci_1_4() disable kvm_mmu_op and then call pc_init_pci_1_3(). --- hw/pc_piix.c | 11 ++++++++++- target-i386/cpu.c | 8 ++++++++ target-i386/cpu.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 99747a7..a6bf645 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -217,6 +217,7 @@ static void pc_init1(MemoryRegion *system_memory, } } +/* machine init function for pc-0.14 - pc-1.2 */ static void pc_init_pci(QEMUMachineInitArgs *args) { ram_addr_t ram_size = args->ram_size; @@ -232,12 +233,20 @@ static void pc_init_pci(QEMUMachineInitArgs *args) initrd_filename, cpu_model, 1, 1); } +/* machine init function for pc-1.3 */ static void pc_init_pci_1_3(QEMUMachineInitArgs *args) { enable_kvm_pv_eoi(); pc_init_pci(args); } +/* machine init function for pc-1.4 */ +static void pc_init_pci_1_4(QEMUMachineInitArgs *args) +{ + disable_kvm_mmu_op(); + pc_init_pci_1_3(args); +} + static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) { ram_addr_t ram_size = args->ram_size; @@ -285,7 +294,7 @@ static QEMUMachine pc_machine_v1_4 = { .name = "pc-1.4", .alias = "pc", .desc = "Standard PC", - .init = pc_init_pci_1_3, + .init = pc_init_pci_1_4, .max_cpus = 255, .is_default = 1, }; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 808001a..ec877c7 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -157,6 +157,14 @@ void enable_kvm_pv_eoi(void) #endif } +void disable_kvm_mmu_op(void) +{ +#ifdef CONFIG_KVM + if (kvm_enabled()) + kvm_default_features &= ~(1UL << KVM_FEATURE_MMU_OP); +#endif +} + void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 1283537..27c8d0c 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1219,5 +1219,6 @@ void do_smm_enter(CPUX86State *env1); void cpu_report_tpr_access(CPUX86State *env, TPRAccess access); void enable_kvm_pv_eoi(void); +void disable_kvm_mmu_op(void); #endif /* CPU_I386_H */ -- 1.7.11.7

2 2

[libvirt] [PATCH 0/9] target-i386: make "enforce" flag work as it should
by Eduardo Habkost 05 Jan '13

05 Jan '13

This changes the -cpu check/enforce code to work as it should: it will check every single CPUID bit to make sure it is supported by the host. The changes are a bit intrusive, but: - The longer we take to make "enforce" strict as it should (and make libvirt finally use it), more users will have VMs with migration-unsafe unpredictable guest ABIs. For this reason, I would like to get this into QEMU 1.4. - The changes in this series should affect only users that are already using the "enforce" flag, and I believe whoever is using the "enforce" flag really want the strict behavior introduced by this series. This series is based on Andreas' qom-cpu branch, and depends on the series: Subject: [PATCH 0/2] Disable kvm_mmu_op by default on pc-1.4 Message-Id: <1357311145-16410-1-git-send-email-ehabkost(a)redhat.com> Git tree for reference: git://github.com/ehabkost/qemu-hacks.git cpu-enforce-all.v1 https://github.com/ehabkost/qemu-hacks/tree/cpu-enforce-all.v1 Eduardo Habkost (9): target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM features target-i386: kvm: Enable all supported KVM features for -cpu host target-i386: check/enforce: Fix CPUID leaf numbers on error messages target-i386: check/enforce: Do not ignore "hypervisor" flag target-i386: check/enforce: Check all CPUID.80000001H.EDX bits target-i386: check/enforce: Check SVM flag support as well target-i386: check/enforce: Eliminate check_feat field target-i386: Call kvm_check_features_against_host() only if CONFIG_KVM is set target-i386: check/enforce: Check all feature words target-i386/cpu.c | 73 +++++++++++++++++++++++++++++++++++++++---------------- target-i386/cpu.h | 3 +++ 2 files changed, 55 insertions(+), 21 deletions(-) -- 1.7.11.7

3 12

[libvirt] [PATCH] Fix substitution of sbindir in virtlockd.service
by Jim Fehlig 05 Jan '13

05 Jan '13

The makefile rule substitutes variables delimited by '::', but the virtlockd service files uses '@'. Change the service file to match the makefile rule. --- src/locking/virtlockd.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index a9f9f93..dad7c19 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -5,7 +5,7 @@ After=syslog.target [Service] EnvironmentFile=-/etc/sysconfig/virtlockd -ExecStart=@sbindir@/virtlockd +ExecStart=::sbindir::/virtlockd ExecReload=/bin/kill -HUP $MAINPID # Loosing the locks is a really bad thing that will # cause the machine to be fenced (rebooted), so make -- 1.8.0.1

2 3

[libvirt] [PATCH] qemu: Detect VGA_QXL capability correctly
by Michal Privoznik 04 Jan '13

04 Jan '13

Since 4c993d8a we failed to set this important capability, which allows starting a domain with QXL video card. We set DEVICE_QXL capability bit instead, which is not necessary wrong. Anyway, if qemu supports the new '-device qxl' it supports older '-vga qxl' as well. The latter is used for the primary (the first) qxl video card, the former for other video cards. --- Other approach is to set QEMU_CAPS_VGA_QXL unconditionally as supported by all qemu-1.2+ in qemuCapsInitQMPBasic(). But I think this one is slightly nicer. src/qemu/qemu_capabilities.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f49a31c..e16bc70 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2018,6 +2018,9 @@ qemuCapsProbeQMPObjects(qemuCapsPtr caps, /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ if (qemuCapsGet(caps, QEMU_CAPS_CHARDEV_SPICEVMC)) qemuCapsClear(caps, QEMU_CAPS_DEVICE_SPICEVMC); + /* If qemu supports newer -device qxl it supports -vga qxl as well */ + if (qemuCapsGet(caps, QEMU_CAPS_DEVICE_QXL)) + qemuCapsSet(caps, QEMU_CAPS_VGA_QXL); return 0; } -- 1.8.0.2

5 6

[libvirt] libvirt unable to start domains
by Zeeshan Ali (Khattak) 04 Jan '13

04 Jan '13

Hi, I updated my libvirt git clone and install yesterday (after about a month or so) and now I can't start domains: $ virsh start fedora18 error: Failed to start domain fedora18 error: unsupported configuration: This QEMU does not support QXL graphics adapters While libvirt is self-built, I'm using qemu 1.2.2-1.fc18 from vanila Fedora 18 repo. Just to be clear, qemu was not updated before the problem appeared, only libvirt. Here is the libvirtd log: http://static.fi/~zeenix/tmp/libvirtd-session-zeenix.log (13 MB). Also attaching the domain config. -- Regards, Zeeshan Ali (Khattak) FSF member#5124

5 10

[libvirt] [PATCH v2 0/8] Dump domain's IP addresses
by Michal Privoznik 04 Jan '13

04 Jan '13

It's been a while since I tried get this in. I've reworked the patches, the exposed API, and start new round of reviews. Moreover, during work I've come to point, where extending qemu guest agent seemed wise: http://lists.nongnu.org/archive/html/qemu-devel/2012-12/msg03264.html Therefore I am introducing 'flags' field, which can contain some boolean values we don't have yet, e.g. IFF_UP, IFF_PROMISC, etc. Re: 'dstaddr' field in struct _virDomainInterfaceIPAddress; It's basically a join of: union { char *dstaddr; /* for IFF_POINTOPOINT interface */ char *broadaddr; /* for IFF_BROADCAST interface */ } Since an interface cannot has both flags set (see man 3 getifaddrs) I've joined both into one 'char *dstaddr'. I know it is not mnemonic as the union, so I left it for discussion. I can change it if you want to. diff to v1: -don't return array of objects, but array of pointer to objects instead Michal Privoznik (8): Introduce virDomainInterfacesAddresses API Introduce virDomainInterfaceFree API qemu_agent: Implement 'guest-network-get-interfaces' command handling qemu: Implement qemuDomainInterfacesAddresses virsh: Expose virDomainInterfacesAddresses remote: Implement virDomainInterfacesAddresses python: Expose virDomainInterfacesAddresses python: create example for dumping domain IP addresses daemon/remote.c | 140 ++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 ++++++++++++ include/libvirt/libvirt.h.in | 51 ++++++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 7 ++ python/libvirt-override.c | 120 ++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 107 +++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/qemu/qemu_agent.c | 171 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 68 ++++++++++++++++ src/remote/remote_driver.c | 94 ++++++++++++++++++++++ src/remote/remote_protocol.x | 27 ++++++- src/remote_protocol-structs | 27 +++++++ tools/virsh-domain.c | 104 ++++++++++++++++++++++++ 18 files changed, 985 insertions(+), 2 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.8.0.2

3 10

[libvirt] problem in pciFindStubDriver
by Chunyan Liu 04 Jan '13

04 Jan '13

For Xen PV guests, pciback is the only working driver, pci-stub doesn't work. Current function finds pci-stub driver first, if pci-stub doesn't exist, find pciback. It won't work for Xen PV guests since it will find pci-stub driver and return, but in fact it needs pciback. One way is to prefer pciback rather than pci-stub like in following patch. But that will change the behaviour of other drivers too. Is there any preferred aprroach to handle this? diff --git a/src/util/virpci.c b/src/util/virpci.c index 5971764..c0a1c05 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -861,22 +861,22 @@ pciFindStubDriver(void) int probed = 0; recheck: - if (pciDriverDir(&drvpath, "pci-stub") < 0) { + if (pciDriverDir(&drvpath, "pciback") < 0) { return NULL; } if (virFileExists(drvpath)) { VIR_FREE(drvpath); - return "pci-stub"; + return "pciback"; } - if (pciDriverDir(&drvpath, "pciback") < 0) { + if (pciDriverDir(&drvpath, "pci-stub") < 0) { return NULL; } if (virFileExists(drvpath)) { VIR_FREE(drvpath); - return "pciback"; + return "pci-stub"; } VIR_FREE(drvpath);

2 1

[libvirt] [PATCH] qemu: Don't parse log output when starting up a domain
by Michal Privoznik 04 Jan '13

04 Jan '13

Despite our great effort we still parsed qemu log output. We wouldn't notice unless qemu changed the format of the logs slightly. Anyway, now we should gather all interesting knobs like pty paths from monitor. Moreover, since for historical reasons the first console can be just an alias to the first serial port, we need to check this and copy the pty path if that's the case to the first console. --- src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_process.c | 20 ++++++++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 17e6679..f49a31c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1695,6 +1695,7 @@ qemuCapsPtr qemuCapsNewCopy(qemuCapsPtr caps) virBitmapCopy(ret->flags, caps->flags); + ret->usedQMP = caps->usedQMP; ret->version = caps->version; ret->kvmVersion = caps->kvmVersion; ret->arch = caps->arch; @@ -2633,3 +2634,9 @@ qemuCapsCacheFree(qemuCapsCachePtr cache) virMutexDestroy(&cache->lock); VIR_FREE(cache); } + +bool +qemuCapsUsedQMP(qemuCapsPtr caps) +{ + return caps->usedQMP; +} diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3457852..1417d7f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -241,4 +241,5 @@ int qemuCapsParseDeviceStr(qemuCapsPtr caps, const char *str); VIR_ENUM_DECL(qemuCaps); +bool qemuCapsUsedQMP(qemuCapsPtr caps); #endif /* __QEMU_CAPABILITIES_H__*/ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eac6553..ff88192 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1532,6 +1532,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, virHashTablePtr paths) { bool chardevfmt = qemuCapsGet(caps, QEMU_CAPS_CHARDEV); + int i = 0; if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, paths, chardevfmt) < 0) @@ -1544,8 +1545,23 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, paths, chardevfmt) < 0) return -1; + /* For historical reasons, console[0] can be just an alias + * for serial[0]; That's why we need to update it as well */ + if (vm->def->nconsoles) { + virDomainChrDefPtr chr = vm->def->consoles[0]; + + if (vm->def->nserials && + chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) { + /* yes, the first console is just an alias for serials[0] */ + i = 1; + if (virDomainChrSourceDefCopy(&chr->source, + &((vm->def->serials[0])->source)) < 0) + return -1; + } + } - if (qemuProcessLookupPTYs(vm->def->consoles, vm->def->nconsoles, + if (qemuProcessLookupPTYs(vm->def->consoles + i, vm->def->nconsoles - i, paths, chardevfmt) < 0) return -1; @@ -1650,7 +1666,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, virHashTablePtr paths = NULL; qemuDomainObjPrivatePtr priv; - if (pos != -1) { + if (!qemuCapsUsedQMP(caps) && pos != -1) { if ((logfd = qemuDomainOpenLog(driver, vm, pos)) < 0) return -1; -- 1.8.0.2

3 5

[libvirt] [ESX:Error] HTTP 403 error for CURL upload operation
by Ata Bohra 04 Jan '13

04 Jan '13

Hi Everyone, Merry Christmas and Happy New Year! I'm trying to upload disk to ESX 5.0 server using the URL obtained by the server (during VM installation process); I'm using libcurl support in libvirt to upload the disk, but I get this error on file upload:----------------------* About to connect() to <ip> port 443 (#1) * Trying <ip>... * connected * found 153 certificates in /etc/ssl/certs/ca-certificates.crt * server certificate verification SKIPPED * compression: NULL * cipher: AES-128-CBC * MAC: SHA1 > PUT /ha-nfc/52c6d592-7636-67c5-29f3-d5b373be4f42/disk-0.vmdk HTTP/1.1 User-Agent: libvirt-esx Host: <ip> Accept: */* Cookie: vmware_soap_session="521af33d-2bbe-38aa-21e8-13d474ccb023" Content-Type: text/xml; charset=UTF-8 SOAPAction: "urn:vim25" Content-Length: 7021568< HTTP/1.1 403 Forbidden < Date: Sun, 30 Dec 2012 01:28:19 GMT < Connection: close < Content-Type: text; charset=plain < Content-Length: 44 ----------------------To achieve this operation I've added a routine to support file Upload (for ESX driver as currently it only support buffer upload), I verified its functioning my uploading a file using datastore based URL:(http(s)//<ip>/file??dcPath=ha-datacenter?dsName=xxx). CURL options provided by me are; ----------- curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L); curl_easy_setopt(curl->handle, CURLOPT_URL, url); curl_easy_setopt(curl->handle, CURLOPT_READDATA, <data pointer>); curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t) fileData->size); curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, <read function>); curl_easy_setopt(curl->handle, CURLOPT_VERBOSE, 1);------------------------ My understanding is there needs to be some tuning done to ESX server to accept this upload operation, please suggest if anyone has faced this issue before. Thanks!Ata

2 3

[libvirt] RFC: An "embedded" mode for QEMU/LXC drivers
by Daniel P. Berrange 04 Jan '13

04 Jan '13

This is something I was thinking about a little over the christmas break. I've no intention of implementing this in the immediate future, but wanted to post it while it was fresh in my mind. Historically we have had 2 ways of using the stateful drivers like QEMU/LXC/UML/etc. - "system mode" - privileged libvirtd, one per host, started at boot - "session mode" - unprivileged libvirtd, one per non-root user, autostarted Within context of each daemon, VM name uniqueness is enforced. Operating via the daemon means that all applications connected to libvirtd get the same world view. This single world view is exactly what you want when dealing with server / cloud / desktop virtualization, because it means tools like 'virt-top', 'virt-viewer', 'virsh' can see the same VMs as virt-manager / oVirt / OpenStack / Boxes / etc. Recently we've seen increasing importance of a new use case which I will refer to as "embedded" virtualization. The best example of this use case is libguestfs which has long run a dedicated QEMU instance, but just now switched to using libvirtd. The other use case is virt-sandbox which is doing application confinement using LXC/KVM. In both these cases, operating via libvirtd is sub-optimal. Users of so called "embedded" virtualization, explicitly don't want to have interaction with other libvirt applications. They likely don't even want to expose the concept of virtualization to their users. For them virtualization is intended to be just a hidden impl detail of their application. Some issues which arise when using embedded virtualization - Need to invent sensible unique names for each VM launched. This leads to pollution of logfiles for QEMU instances run. - User sees libguestfs / virt-sandbox VMs in virt-manager / oVirt which they may then try to "manage", breaking libguestfs / etc - Disassociated process context, so if 'virt-sandbox' is placed in a cgroup, the VMs it launches are in a different cgroup. Likewise if custom env variables are set, work is needed to propagate those to VMs. This leads me to wonder whether it is worth exploring the idea of a new type of libvirt connection. - "embed mode" - no libvirtd, driver runs in application context The idea here is to take libvirtd out of the equation and directly use the QEMU driver code in the libvirt.so client / application. Since libvirtd (mostly) uses the same APIs as the public libvirt.so clients, there isn't much required to make this work. - A way for the application to invoke virStateInit for the driver - Application must provide an event loop impl - A way to specify alternative dirs for logs/state/config/etc An application would access this mode using a different path for the driver, and specifying the path to use for logs/state/config etc. eg libguestfs might use qemu:///embed?statedir=/tmp/libguestfsXXXXX/ to get an instance of the QEMU driver that is completely private to itself. One question is whether there should be a single embed instance per process, or whether an application should be allowed to open multiple completely isolated embed instances. The latter might require is to eliminate more static variables in our code. This kind of embedded mode is not without its downsides though - How to access virtual network / storage / node device APIs ? - Extra SELinux policy work to allow each app to have the same kind of privileges that libvirtd has to let it start VMs - How to troubleshoot - can't use things like 'virsh qemu-monitor-command' since the embedded instance is private to the application in question. One answer to the latter question, might be to actually allow the application to expose the same RPC service as libvirtd does. So virsh could connect to libguestfs using qemu:///embed?socketdir=/tmp/libguestfsXXXXX/libvirt-sock For the question of network/storage/node device access, the long term answer is probably to split up the system libvirtd instance into separate pieces. eg a virtnodedeviced, virtnetworkd, virstoraged, virtqemud, virtlxcd, etc. Now a client app would connect to their embedded QEMU instances, but to the shared nodedevice/network/storage daemons. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 2

[libvirt] Build failed in Jenkins: libvirt-build #472
by Jenkins CI 04 Jan '13

04 Jan '13

See <http://honk.sigxcpu.org:8001/job/libvirt-build/472/changes> Changes: [eblake] maint: update to latest gnulib ------------------------------------------ [...truncated 5806 lines...] GEN wchar.h GEN wctype.h make all-am make[3]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/gnulib/lib'> CC allocator.lo CC areadlink.lo CC base64.lo CC binary-io.lo CC bitrotate.lo CC c-ctype.lo CC c-strcasecmp.lo CC c-strncasecmp.lo CC c-strcasestr.lo CC careadlinkat.lo CC cloexec.lo CC count-one-bits.lo CC md5.lo CC sha256.lo CC dirname-lgpl.lo CC basename-lgpl.lo CC stripslash.lo CC fd-hook.lo CC freading.lo CC localcharset.lo CC lock.lo CC malloca.lo CC nonblocking.lo CC passfd.lo CC physmem.lo CC pipe2.lo CC sig-handler.lo CC sockets.lo CC stat-time.lo CC stdio.lo CC strnlen1.lo CC sys_socket.lo CC tempname.lo CC threadlib.lo CC unistd.lo CC wctype-h.lo CC xsize.lo CC asnprintf.lo CC fclose.lo CC fcntl.lo CC fflush.lo CC fpurge.lo CC fseek.lo CC fseeko.lo CC ioctl.lo CC mktime.lo CC perror.lo CC printf-args.lo CC printf-parse.lo CC strerror.lo CC strerror_r.lo CC vasnprintf.lo CCLD libgnu.la GEN charset.alias GEN ref-add.sed GEN ref-del.sed make[3]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/gnulib/lib'> make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/gnulib/lib'> Making all in include make[2]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/include'> Making all in libvirt make[3]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/include/libvirt'> make[3]: Nothing to be done for `all'. make[3]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/include/libvirt'> make[3]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/include'> make[3]: Nothing to be done for `all-am'. make[3]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/include'> make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/include'> Making all in src make[2]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src'> GEN libvirt.syms GEN libvirt.def make all-am make[3]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src'> CC libvirt_util_la-viralloc.lo CC libvirt_util_la-virarch.lo CC libvirt_util_la-viratomic.lo CC libvirt_util_la-viraudit.lo CC libvirt_util_la-virauth.lo CC libvirt_util_la-virauthconfig.lo CC libvirt_util_la-virbitmap.lo CC libvirt_util_la-virbuffer.lo CC libvirt_util_la-vircgroup.lo CC libvirt_util_la-vircommand.lo CC libvirt_util_la-virconf.lo CC libvirt_util_la-virdbus.lo CC libvirt_util_la-virdnsmasq.lo CC libvirt_util_la-virebtables.lo CC libvirt_util_la-virerror.lo CC libvirt_util_la-virevent.lo CC libvirt_util_la-vireventpoll.lo CC libvirt_util_la-virfile.lo CC libvirt_util_la-virhash.lo CC libvirt_util_la-virhashcode.lo CC libvirt_util_la-virhook.lo CC libvirt_util_la-virinitctl.lo CC libvirt_util_la-viriptables.lo CC libvirt_util_la-virjson.lo CC libvirt_util_la-virkeycode.lo CC libvirt_util_la-virkeyfile.lo CC libvirt_util_la-virlockspace.lo CC libvirt_util_la-virlog.lo CC libvirt_util_la-virmacaddr.lo CC libvirt_util_la-virnetdev.lo CC libvirt_util_la-virnetdevbandwidth.lo CC libvirt_util_la-virnetdevbridge.lo CC libvirt_util_la-virnetdevmacvlan.lo CC libvirt_util_la-virnetdevopenvswitch.lo CC libvirt_util_la-virnetdevtap.lo CC libvirt_util_la-virnetdevveth.lo CC libvirt_util_la-virnetdevvlan.lo CC libvirt_util_la-virnetdevvportprofile.lo CC libvirt_util_la-virnetlink.lo CC libvirt_util_la-virnodesuspend.lo CC libvirt_util_la-virobject.lo CC libvirt_util_la-virpci.lo CC libvirt_util_la-virpidfile.lo CC libvirt_util_la-virprocess.lo CC libvirt_util_la-virrandom.lo CC libvirt_util_la-virsexpr.lo CC libvirt_util_la-virsocketaddr.lo CC libvirt_util_la-virstatslinux.lo CC libvirt_util_la-virstoragefile.lo CC libvirt_util_la-virstring.lo CC libvirt_util_la-virsysinfo.lo CC libvirt_util_la-virthread.lo CC libvirt_util_la-virthreadpool.lo CC libvirt_util_la-virtime.lo CC libvirt_util_la-virtypedparam.lo CC libvirt_util_la-virusb.lo CC libvirt_util_la-viruri.lo CC libvirt_util_la-virutil.lo CC libvirt_util_la-viruuid.lo CC libvirt_util_la-virxml.lo CCLD libvirt_util.la CC libvirt_conf_la-netdev_bandwidth_conf.lo CC libvirt_conf_la-netdev_vport_profile_conf.lo CC libvirt_conf_la-netdev_vlan_conf.lo CC libvirt_conf_la-capabilities.lo CC libvirt_conf_la-domain_conf.lo CC libvirt_conf_la-domain_audit.lo CC libvirt_conf_la-domain_nwfilter.lo CC libvirt_conf_la-snapshot_conf.lo CC libvirt_conf_la-domain_event.lo CC libvirt_conf_la-network_conf.lo CC libvirt_conf_la-nwfilter_params.lo CC libvirt_conf_la-nwfilter_ipaddrmap.lo CC libvirt_conf_la-nwfilter_conf.lo CC libvirt_conf_la-node_device_conf.lo CC libvirt_conf_la-storage_conf.lo CC libvirt_conf_la-storage_encryption_conf.lo CC libvirt_conf_la-interface_conf.lo CC libvirt_conf_la-secret_conf.lo CC libvirt_conf_la-cpu_conf.lo CC libvirt_conf_la-virconsole.lo CC libvirt_conf_la-device_conf.lo CCLD libvirt_conf.la CC libvirt_cpu_la-cpu.lo CC libvirt_cpu_la-cpu_generic.lo CC libvirt_cpu_la-cpu_x86.lo CC libvirt_cpu_la-cpu_s390.lo CC libvirt_cpu_la-cpu_arm.lo CC libvirt_cpu_la-cpu_map.lo CC libvirt_cpu_la-cpu_powerpc.lo CCLD libvirt_cpu.la CC libvirt_vmx_la-vmx.lo CCLD libvirt_vmx.la CC libvirt_xenxs_la-xen_sxpr.lo CC libvirt_xenxs_la-xen_xm.lo CCLD libvirt_xenxs.la CC libvirt_driver_la-driver.lo CC libvirt_driver_la-datatypes.lo CC libvirt_driver_la-fdstream.lo CC libvirt_driver_la-nodeinfo.lo CC libvirt_driver_la-libvirt.lo CC libvirt_driver_la-lock_manager.lo CC libvirt_driver_la-lock_driver_nop.lo CC libvirt_driver_la-domain_lock.lo CCLD libvirt_driver.la CC libvirt_driver_test_la-test_driver.lo CCLD libvirt_driver_test.la CC libvirt_driver_remote_la-remote_driver.lo CC libvirt_driver_remote_la-remote_protocol.lo CC libvirt_driver_remote_la-qemu_protocol.lo CC libvirt_net_rpc_client_la-virnetclientprogram.lo CC libvirt_net_rpc_client_la-virnetclientstream.lo CC libvirt_net_rpc_client_la-virnetclient.lo CCLD libvirt-net-rpc-client.la CC libvirt_net_rpc_server_la-virnetserverprogram.lo CC libvirt_net_rpc_server_la-virnetserverservice.lo CC libvirt_net_rpc_server_la-virnetserverclient.lo CC libvirt_net_rpc_server_la-virnetservermdns.lo CC libvirt_net_rpc_server_la-virnetserver.lo CCLD libvirt-net-rpc-server.la CC libvirt_net_rpc_la-virnetmessage.lo CC libvirt_net_rpc_la-virnetprotocol.lo CC libvirt_net_rpc_la-virnetsocket.lo CC libvirt_net_rpc_la-virnettlscontext.lo CC libvirt_net_rpc_la-virkeepaliveprotocol.lo CC libvirt_net_rpc_la-virkeepalive.lo CC libvirt_net_rpc_la-virnetsaslcontext.lo CCLD libvirt-net-rpc.la CCLD libvirt_driver_remote.la CC libvirt_driver_openvz_la-openvz_conf.lo CC libvirt_driver_openvz_la-openvz_driver.lo CC libvirt_driver_openvz_la-openvz_util.lo CCLD libvirt_driver_openvz.la CC libvirt_driver_vmware_la-vmware_driver.lo CC libvirt_driver_vmware_la-vmware_conf.lo CCLD libvirt_driver_vmware.la CC libvirt_driver_vbox_la-vbox_glue.lo CC libvirt_driver_vbox_la-vbox_driver.lo CC libvirt_driver_vbox_la-vbox_V2_2.lo CC libvirt_driver_vbox_la-vbox_V3_0.lo CC libvirt_driver_vbox_la-vbox_V3_1.lo CC libvirt_driver_vbox_la-vbox_V3_2.lo CC libvirt_driver_vbox_la-vbox_V4_0.lo CC libvirt_driver_vbox_la-vbox_V4_1.lo CCLD libvirt_driver_vbox.la CC libvirt_security_manager_la-security_driver.lo CC libvirt_security_manager_la-security_nop.lo CC libvirt_security_manager_la-security_stack.lo CC libvirt_security_manager_la-security_dac.lo CC libvirt_security_manager_la-security_manager.lo CC libvirt_security_manager_la-security_selinux.lo CCLD libvirt_security_manager.la CCLD libvirt.la ./.libs/libvirt_util.a(libvirt_util_la-virnetdevtap.o): In function `rpl_fwrite': <http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src/../gnulib/lib/stdio.h>:903: multiple definition of `rpl_fwrite' ./.libs/libvirt_util.a(libvirt_util_la-virnetdev.o):<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src/../gnulib/lib/stdio.h>:903: first defined here ./.libs/libvirt_util.a(libvirt_util_la-virnetlink.o): In function `rpl_fwrite': <http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src/../gnulib/lib/stdio.h>:903: multiple definition of `rpl_fwrite' ./.libs/libvirt_util.a(libvirt_util_la-virnetdev.o):<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src/../gnulib/lib/stdio.h>:903: first defined here ../gnulib/lib/.libs/libgnu.a(stdio.o): In function `rpl_fwrite': <http://honk.sigxcpu.org:8001/job/libvirt-build/ws/gnulib/lib/stdio.h>:903: multiple definition of `rpl_fwrite' ./.libs/libvirt_util.a(libvirt_util_la-virnetdev.o):<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src/../gnulib/lib/stdio.h>:903: first defined here collect2: error: ld returned 1 exit status make[3]: *** [libvirt.la] Error 1 make[3]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src'> make[2]: *** [all] Error 2 make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/src'> make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-build/ws/'> make: *** [all] Error 2 Build step 'Execute shell' marked build as failure

4 12

[libvirt] Jenkins build is back to normal : libvirt-syntax-check #437
by Jenkins CI 04 Jan '13

04 Jan '13

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/437/>

1 0

[libvirt] Build failed in Jenkins: libvirt-check #441
by Jenkins CI 04 Jan '13

04 Jan '13

See <http://honk.sigxcpu.org:8001/job/libvirt-check/441/> ------------------------------------------ Started by upstream project "libvirt-build" build number 482 [workspace] $ /bin/sh -xe /tmp/hudson1110434311877203261.sh + make check Making check in gnulib/lib make[1]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/gnulib/lib'> make check-am make[2]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/gnulib/lib'> make[2]: Nothing to be done for `check-am'. make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/gnulib/lib'> make[1]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/gnulib/lib'> Making check in include make[1]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/include'> Making check in libvirt make[2]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/include/libvirt'> make[2]: Nothing to be done for `check'. make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/include/libvirt'> make[2]: Entering directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/include'> make[2]: Nothing to be done for `check-am'. make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/include'> make[1]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/include'> Making check in src /bin/bash: line 9: 28650 Segmentation fault make $local_target make: *** [check-recursive] Error 1 Build step 'Execute shell' marked build as failure

1 0

[libvirt] [PATCH 0/2] Split out parts of qemu_driver.c into separate files
by Peter Krempa 04 Jan '13

04 Jan '13

qemu_driver.c is starting to grow out of proportions. This series creates two(actualy four) files to split out some code from the main file. 1) qemu_util.c - various qemu-related tools and common code (~0.5k lines) 2) qemu_snapshot.c - snapshot related code (~1.7k lines) Apart from reformating function headers, no changes were made to the code. Peter Krempa (2): qemu: Split out various utility functions to qemu_util.c qemu: Split out snapshot related functions to qemu_snapshot.c po/POTFILES.in | 2 + src/Makefile.am | 2 + src/qemu/qemu_driver.c | 2191 +--------------------------------------------- src/qemu/qemu_snapshot.c | 1752 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_snapshot.h | 38 + src/qemu/qemu_util.c | 486 ++++++++++ src/qemu/qemu_util.h | 111 +++ 7 files changed, 2404 insertions(+), 2178 deletions(-) create mode 100644 src/qemu/qemu_snapshot.c create mode 100644 src/qemu/qemu_snapshot.h create mode 100644 src/qemu/qemu_util.c create mode 100644 src/qemu/qemu_util.h -- 1.8.0.2 e

3 7