- Devel - libvirt List Archives

[libvirt] [PATCH] qemu_agent|monitor: use different log on hangup event
by Chen Hanxiao 19 Sep '16

19 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Both qemu monitor and agent print the same log on HUANGUP event, which woud be confused when reading libvirtd log. This patch will give a different log for them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index eeede6b..babd8f2 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -633,7 +633,7 @@ qemuAgentIO(int watch, int fd, int events, void *opaque) if (!error && events & VIR_EVENT_HANDLE_HANGUP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from monitor")); + _("End of file from agent monitor")); eof = true; events &= ~VIR_EVENT_HANDLE_HANGUP; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4171914..d92a359 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -692,7 +692,7 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) hangup = true; if (!error) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from monitor")); + _("End of file from qemu monitor")); eof = true; events &= ~VIR_EVENT_HANDLE_HANGUP; } -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: expand docs on user x509 cert locations
by Daniel P. Berrange 19 Sep '16

19 Sep '16

The layout in $HOME/.pki is different from that in /etc/pki but we never tell anyone about this trap. Add docs showing the required $HOME/.pki layout. --- docs/remote.html.in | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index 9b132f1..4c3012f 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -419,13 +419,21 @@ next section. <td> <code>/etc/pki/CA/cacert.pem</code> </td> - <td> Installed on all clients and servers </td> + <td> Installed on the client and server </td> <td> CA's certificate (<a href="#Remote_TLS_CA">more info</a>)</td> <td> n/a </td> </tr> <tr> <td> - <code>/etc/pki/libvirt/ private/serverkey.pem</code> + <code>$HOME/.pki/cacert.pem</code> + </td> + <td> Installed on the client </td> + <td> CA's certificate (<a href="#Remote_TLS_CA">more info</a>)</td> + <td> n/a </td> + </tr> + <tr> + <td> + <code>/etc/pki/libvirt/private/serverkey.pem</code> </td> <td> Installed on the server </td> <td> Server's private key (<a href="#Remote_TLS_server_certificates">more info</a>)</td> @@ -433,7 +441,7 @@ next section. </tr> <tr> <td> - <code>/etc/pki/libvirt/ servercert.pem</code> + <code>/etc/pki/libvirt/servercert.pem</code> </td> <td> Installed on the server </td> <td> Server's certificate signed by the CA. @@ -443,7 +451,26 @@ next section. </tr> <tr> <td> - <code>/etc/pki/libvirt/ private/clientkey.pem</code> + <code>/etc/pki/libvirt/private/clientkey.pem</code> + </td> + <td> Installed on the client </td> + <td> Client's private key. (<a href="#Remote_TLS_client_certificates">more info</a>) </td> + <td> n/a </td> + </tr> + <tr> + <td> + <code>/etc/pki/libvirt/clientcert.pem</code> + </td> + <td> Installed on the client </td> + <td> Client's certificate signed by the CA + (<a href="#Remote_TLS_client_certificates">more info</a>) </td> + <td> Distinguished Name (DN) can be checked against an access + control list (<code>tls_allowed_dn_list</code>). + </td> + </tr> + <tr> + <td> + <code>$HOME/.pki/libvirt/clientkey.pem</code> </td> <td> Installed on the client </td> <td> Client's private key. (<a href="#Remote_TLS_client_certificates">more info</a>) </td> @@ -451,7 +478,7 @@ next section. </tr> <tr> <td> - <code>/etc/pki/libvirt/ clientcert.pem</code> + <code>$HOME/.pki/libvirt/clientcert.pem</code> </td> <td> Installed on the client </td> <td> Client's certificate signed by the CA @@ -469,7 +496,7 @@ next section. </p> <ul> <li> For a non-root user, libvirt tries to find the certificates - in $HOME/.pki/libvirt. If the required CA certificate cannot + in $HOME/.pki/libvirt first. If the required CA certificate cannot be found, then the global default location (/etc/pki/CA/cacert.pem) will be used. Likewise, if either the client certificate @@ -477,7 +504,7 @@ next section. locations (/etc/pki/libvirt/clientcert.pem, /etc/pki/libvirt/private/clientkey.pem) will be used. </li> - <li> For the root user, the global default locations will be used.</li> + <li> For the root user, the global default locations will always be used.</li> </ul> <h4> <a name="Remote_TLS_background">Background to TLS certificates</a> -- 2.7.4

2 1

[libvirt] [PATCH 00/20] 20 crazy IVSHMEM patches you won't believe compile
by Martin Kletzander 19 Sep '16

19 Sep '16

Let's see if the subject works if one is in need of reviews =) Yet another qemu device, right? We even have an existing device for that, right? That should be pretty straight-forward and easy, right? Well, let's see... I, at least, tried splitting the patches for you to be as easy to review as possible. Just in case you're trying out the hot-(un)plug on an upstream QEMU, make sure you do it on i440fx machine, not on q35 one, otherwise it will not work nicely (or rather at all). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1347049 Martin Kletzander (20): qemuhotplugtest: Only read result_filename if used schema: Allow shmem to have alias conf: Allow copying of shmem defs conf: Add support for shmem model conf: Add support for shmem role qemu: Add support for shmem role qemu: Add newer shmem models qemu: Add capabilities for ivshmem-{plain,doorbell} qemu: Save various defaults for shmem qemu: Disable migration for shmem with peer role qemu: Make qemuBuildShmemDevStr static qemu: Rename qemuBuildShmemDevStr to qemuBuildShmemDevLegacyStr qemu: Move common checks outside qemuBuildShmemDevLegacyStr qemu: Reorder shmem params nicely qemu: Abstract shmem socket path preparation qemu: Rename qemuBuildShmemBackendStr to qemuBuildShmemBackendChrStr qemu: Support newer ivshmem device variants qemu: Add qemuAssignDeviceShmemAlias and use it conf: Add some shmem helpers for future use qemu: Add support for hot/cold-(un)plug of shmem devices docs/formatdomain.html.in | 10 +- docs/schemas/domaincommon.rng | 22 ++ src/conf/domain_conf.c | 154 ++++++++++++- src/conf/domain_conf.h | 30 +++ src/libvirt_private.syms | 9 + src/qemu/qemu_alias.c | 32 ++- src/qemu/qemu_alias.h | 4 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 245 ++++++++++++++++---- src/qemu/qemu_command.h | 14 +- src/qemu/qemu_domain.c | 46 ++++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 39 +++- src/qemu/qemu_hotplug.c | 247 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 13 ++ .../caps_2.6.0-gicv2.aarch64.xml | 2 + .../caps_2.6.0-gicv3.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemuhotplugtest.c | 23 +- .../qemuhotplug-ivshmem-doorbell-detach.xml | 7 + .../qemuhotplug-ivshmem-doorbell.xml | 4 + .../qemuhotplug-ivshmem-plain-detach.xml | 6 + .../qemuhotplug-ivshmem-plain.xml | 3 + ...muhotplug-base-live+ivshmem-doorbell-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-doorbell.xml | 65 ++++++ .../qemuhotplug-base-live+ivshmem-plain-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-plain.xml | 58 +++++ .../qemuxml2argv-shmem-plain-doorbell.args | 46 ++++ ...m.xml => qemuxml2argv-shmem-plain-doorbell.xml} | 15 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 6 +- tests/qemuxml2argvtest.c | 3 + ...xml => qemuxml2xmlout-shmem-plain-doorbell.xml} | 24 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 15 +- tests/qemuxml2xmltest.c | 2 + 39 files changed, 1092 insertions(+), 93 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args copy tests/qemuxml2argvdata/{qemuxml2argv-shmem.xml => qemuxml2argv-shmem-plain-doorbell.xml} (78%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem.xml => qemuxml2xmlout-shmem-plain-doorbell.xml} (78%) -- 2.10.0

2 52

[libvirt] [PATCH] qemu-migration: Disallow migration of read only disk
by Corey S. McQuay 19 Sep '16

19 Sep '16

Currently Libvirt allows attempts to migrate read only disks. Qemu cannot handle this as read only disks cannot be written to on the destination system. The end result is a cryptic error message and a failed migration. This patch causes migration to fail earlier and provides a meaningful error message stating that migrating read only disks is not supported. Signed-off-by: Corey S. McQuay <csmcquay(a)linux.vnet.ibm.com> Reviewed-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e451ef6..3311711 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2392,6 +2392,28 @@ qemuMigrationIsSafe(virDomainDefPtr def, return true; } +static bool +qemuMigrationAreAllDisksRW(virDomainDefPtr def, + size_t nmigrate_disks, + const char **migrate_disks) +{ + size_t i; + + for (i = 0; i < def->ndisks; i++) { + virDomainDiskDefPtr disk = def->disks[i]; + + if (qemuMigrateDisk(disk, nmigrate_disks, migrate_disks) && + disk->src->readonly) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Cannot migrate read-only disk %s"), + disk->dst); + return false; + } + } + + return true; +} + /** qemuMigrationSetOffline * Pause domain for non-live migration. */ @@ -3137,6 +3159,9 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, !qemuMigrationIsSafe(vm->def, nmigrate_disks, migrate_disks)) goto cleanup; + if (!qemuMigrationAreAllDisksRW(vm->def, nmigrate_disks, migrate_disks)) + goto cleanup; + if (flags & VIR_MIGRATE_POSTCOPY && (!(flags & VIR_MIGRATE_LIVE) || flags & VIR_MIGRATE_PAUSED)) { -- 2.7.4

3 3

[libvirt] libvirt.org domain certificate expired yesterday
by Yaniv Kaul 19 Sep '16

19 Sep '16

I'm getting warnings about it - I assume it needs renewal. TIA, Y.

2 1

[libvirt] [PATCH 1/2] libxl: add support for PVH
by Marek Marczykowski-Górecki 17 Sep '16

17 Sep '16

Since this is something between PV and HVM, it makes sense to put the setting in place where domain type is specified. To enable it, use <os><type machine="xenpvh">...</type></os>. It is also included in capabilities.xml, for every supported HVM guest type - it doesn't seems to be any other requirement (besides new enough Xen). Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_capabilities.c | 40 +++++++++++++++++++++++++++++++--------- src/libxl/libxl_conf.c | 2 ++ src/libxl/libxl_driver.c | 6 ++++-- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 0145116..c443353 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -45,11 +45,16 @@ VIR_LOG_INIT("libxl.libxl_capabilities"); /* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */ #define LIBXL_X86_FEATURE_PAE_MASK 0x40 +enum machine_type { + machine_hvm, + machine_pvh, + machine_pv, +}; struct guest_arch { virArch arch; int bits; - int hvm; + enum machine_type machine; int pae; int nonpae; int ia64_be; @@ -296,7 +301,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) /* Search for existing matching (model,hvm) tuple */ for (i = 0; i < nr_guest_archs; i++) { if ((guest_archs[i].arch == arch) && - guest_archs[i].hvm == hvm) + guest_archs[i].machine == (hvm ? machine_hvm : machine_pv)) break; } @@ -308,7 +313,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) nr_guest_archs++; guest_archs[i].arch = arch; - guest_archs[i].hvm = hvm; + guest_archs[i].machine = hvm ? machine_hvm : machine_pv; /* Careful not to overwrite a previous positive setting with a negative one here - some archs @@ -320,23 +325,40 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) guest_archs[i].nonpae = nonpae; if (ia64_be) guest_archs[i].ia64_be = ia64_be; + + /* On Xen >= 4.4 add PVH for each HVM guest, and do it only once */ + if ((ver_info->xen_version_major > 4 || + (ver_info->xen_version_major == 4 && + ver_info->xen_version_minor >= 4)) && + hvm && i == nr_guest_archs-1) { + i = nr_guest_archs; + /* Too many arch flavours - highly unlikely ! */ + if (i >= ARRAY_CARDINALITY(guest_archs)) + continue; + nr_guest_archs++; + guest_archs[i].arch = arch; + guest_archs[i].machine = machine_pvh; + } } } regfree(&regex); for (i = 0; i < nr_guest_archs; ++i) { virCapsGuestPtr guest; - char const *const xen_machines[] = {guest_archs[i].hvm ? "xenfv" : "xenpv"}; + char const *const xen_machines[] = { + guest_archs[i].machine == machine_hvm ? "xenfv" : + (guest_archs[i].machine == machine_pvh ? "xenpvh" : "xenpv")}; virCapsGuestMachinePtr *machines; if ((machines = virCapabilitiesAllocMachines(xen_machines, 1)) == NULL) return -1; if ((guest = virCapabilitiesAddGuest(caps, - guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, + guest_archs[i].machine == machine_hvm ? + VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, guest_archs[i].arch, LIBXL_EXECBIN_DIR "/qemu-system-i386", - (guest_archs[i].hvm ? + (guest_archs[i].machine == machine_hvm ? LIBXL_FIRMWARE_DIR "/hvmloader" : NULL), 1, @@ -375,7 +397,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) 0) == NULL) return -1; - if (guest_archs[i].hvm) { + if (guest_archs[i].machine != machine_pv) { if (virCapabilitiesAddGuestFeature(guest, "acpi", 1, @@ -390,7 +412,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) if (virCapabilitiesAddGuestFeature(guest, "hap", 1, - 1) == NULL) + guest_archs[i].machine == machine_hvm) == NULL) return -1; } } @@ -409,7 +431,7 @@ libxlMakeDomainOSCaps(const char *machine, os->supported = true; - if (STREQ(machine, "xenpv")) + if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh")) return 0; capsLoader->supported = true; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 5202ca1..aa06586 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -173,6 +173,8 @@ libxlMakeDomCreateInfo(libxl_ctx *ctx, } } else { c_info->type = LIBXL_DOMAIN_TYPE_PV; + if (STREQ(def->os.machine, "xenpvh")) + libxl_defbool_set(&c_info->pvh, true); } if (VIR_STRDUP(c_info->name, def->name) < 0) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 4957072..fa58346 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6321,9 +6321,11 @@ libxlConnectGetDomainCapabilities(virConnectPtr conn, emulatorbin = "/usr/bin/qemu-system-x86_64"; if (machine) { - if (STRNEQ(machine, "xenpv") && STRNEQ(machine, "xenfv")) { + if (STRNEQ(machine, "xenpv") && + STRNEQ(machine, "xenpvh") && + STRNEQ(machine, "xenfv")) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Xen only supports 'xenpv' and 'xenfv' machines")); + _("Xen only supports 'xenpv', 'xenpvh' and 'xenfv' machines")); goto cleanup; } } else { -- 2.5.5 >From marmarek(a)invisiblethingslab.com Fri Aug 5 20:06:26 2016 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> To: libvir-list(a)redhat.com Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek(a)invisiblethingslab.com> Subject: [PATCH 2/2] libxl: set shadow memory for any guest type, not only HVM Date: Fri, 5 Aug 2016 20:05:44 +0200 Message-Id: <1470420344-7693-2-git-send-email-marmarek(a)invisiblethingslab.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1470420344-7693-1-git-send-email-marmarek(a)invisiblethingslab.com> References: <1470420344-7693-1-git-send-email-marmarek(a)invisiblethingslab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Invisible Things Lab Content-Transfer-Encoding: 8bit Otherwise starting PVH guest will result in "arch_setup_bootlate: mapping shared_info failed (pfn=..., rc=-1, errno: 12): Internal error". After this change the behaviour is the same as in `xl`. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_conf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index aa06586..155934c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -494,11 +494,6 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } } } - - /* Allow libxl to calculate shadow memory requirements */ - b_info->shadow_memkb = - libxl_get_required_shadow_memory(b_info->max_memkb, - b_info->max_vcpus); } else { /* * For compatibility with the legacy xen toolstack, default to pygrub @@ -528,6 +523,11 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, return -1; } + /* Allow libxl to calculate shadow memory requirements */ + b_info->shadow_memkb = + libxl_get_required_shadow_memory(b_info->max_memkb, + b_info->max_vcpus); + return 0; } -- 2.5.5

2 5

[libvirt] [PATCH 00/41] Enhance guest CPU configuration code
by Jiri Denemark 17 Sep '16

17 Sep '16

This patch series does several things: - fixes tests to avoid relying on bugs in our code - adds support for advertising supported CPU modes and models in domain capabilities - starts adding better and higher level APIs to our cpu driver (the old low level APIs will be removed once this process is over) - prepares qemu driver for asking QEMU what a host CPU looks like and what CPU models can be run on it - makes QEMU CPU command line builder build command line and nothing else The added part of domain capabilities XML looks like this: <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> <model fallback='allow'>Broadwell</model> <vendor>Intel</vendor> <feature policy='disable' name='aes'/> <feature policy='require' name='vmx'/> </mode> <mode name='custom' supported='yes'> <model>Broadwell</model> <model>Broadwell-noTSX</model> ... </mode> </cpu> and host-passthrough is only advertised as supported for KVM domains, host-model is only supported when guest architecture is compatible with host and overall it should just work the way one would expect (in contrast to the current state of the code). Big thanks for any comments and review in advance and... Enjoy my PTO :-) Jiri Denemark (41): cpuGetModels: Switch to virArch domcaps: Add support for listing supported CPU models qemu: Use virDomainCapsCPUModels for cpuDefinitions qemuxml2argvtest: Rename extraFlags as qemuCaps qemuxml2argvtest: Rename "out" labels as "cleanup" qemuxml2argvtest: Get rid of testCompareXMLToArgvHelper qemuxml2argvtest: Reorder functions qemuxml2argvtest: Update qemuCaps after parsing domain XML qemuxml2argvtest: Properly initialize qemuCaps->arch testutilsqemu: Helpers for changing host CPU and arch qemu: Separate guest CPU validation from command line creation qemuxml2argvtest: Properly setup CPU models in qemuCaps qemuxml2argvtest: Set correct architecture for KVM guests qemuxml2argvtest: Reorder CPU features qemu: Introduce virQEMUCapsGuestIsNative qemu: Fill in CPU domain capabilities cpu: Special case models == NULL in cpuGetModels cpu: Don't overwrite errors in cpuGetModels domcaps: Show only CPU models supported by libvirt domcaps: Add CPU usable flag schema: Separate CPU related definitions into cputypes.rng qemu: Propagate virCapsPtr to virQEMUCapsNewForBinaryInternal conf: Introduce virCPUDefCopyWithoutModel conf: Introduce virCPUDefMoveModel conf: Introduce virCPUDefCopyModelFilter qemu: Store host-model CPU in qemu capabilities cpu: Drop false support for ARM cpu-model Show host model in domain capabilities qemu: Introduce virQEMUCapsGetHostModel qemu: Introduce virQEMUCapsIsCPUModeSupported cpu: Make x86ModelFromCPU easier to read cpu: Make x86ModelFromCPU a bit smarter cpu: Report error for unknown features in x86HasFeature cpu: Add x86FeatureInData cpu: Rework cpuUpdate cpu: Set nfeatures_max correctly in x86Decode cpu: Introduce virCPUTranslate cpu: Rework cpuHasFeature cpu: Rework cpuCompare* APIs qemu: Update guest CPU def in live XML Move CMT feature filtering to QEMU driver docs/formatdomaincaps.html.in | 65 +++ docs/schemas/cputypes.rng | 135 ++++++ docs/schemas/domaincaps.rng | 60 +++ docs/schemas/domaincommon.rng | 129 +----- po/POTFILES.in | 1 + src/conf/cpu_conf.c | 64 ++- src/conf/cpu_conf.h | 19 + src/conf/domain_capabilities.c | 209 ++++++++++ src/conf/domain_capabilities.h | 47 +++ src/cpu/cpu.c | 247 ++++++++--- src/cpu/cpu.h | 72 +++- src/cpu/cpu_arm.c | 79 ++-- src/cpu/cpu_ppc64.c | 48 ++- src/cpu/cpu_s390.c | 1 - src/cpu/cpu_x86.c | 463 +++++++++++++-------- src/driver-hypervisor.h | 2 +- src/libvirt-host.c | 3 +- src/libvirt_private.syms | 20 +- src/qemu/qemu_capabilities.c | 387 ++++++++++++----- src/qemu/qemu_capabilities.h | 24 +- src/qemu/qemu_capspriv.h | 13 +- src/qemu/qemu_command.c | 216 +++------- src/qemu/qemu_domain.c | 32 +- src/qemu/qemu_driver.c | 41 +- src/qemu/qemu_monitor.c | 12 +- src/qemu/qemu_monitor.h | 10 +- src/qemu/qemu_monitor_json.c | 24 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 95 ++++- src/test/test_driver.c | 12 +- src/vmware/vmware_conf.c | 6 +- tests/cputest.c | 24 +- .../cputestdata/x86-host+host-model-nofallback.xml | 2 +- tests/cputestdata/x86-host+host-model.xml | 2 +- .../x86-host+host-passthrough-features.xml | 4 + tests/cputestdata/x86-host+host-passthrough.xml | 19 +- tests/cputestdata/x86-host+min.xml | 27 +- tests/cputestdata/x86-host+pentium3.xml | 39 +- tests/cputestdata/x86-host-invtsc+host-model.xml | 2 +- .../cputestdata/x86-host-passthrough-features.xml | 4 + tests/domaincapsschemadata/basic.xml | 5 + tests/domaincapsschemadata/full.xml | 12 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 5 + tests/domaincapsschemadata/libxl-xenfv.xml | 5 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 5 + tests/domaincapsschemadata/libxl-xenpv.xml | 5 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 32 ++ .../qemu_2.6.0-gicv2-virt.aarch64.xml | 36 ++ .../qemu_2.6.0-gicv3-virt.aarch64.xml | 36 ++ tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 36 ++ tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 10 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 36 ++ tests/domaincapstest.c | 78 +++- tests/qemucapabilitiestest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemumonitorjsontest.c | 8 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml | 2 +- .../qemuxml2argv-cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 12 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 3 +- .../qemuxml2argv-cpu-exact2-nofallback.xml | 14 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 14 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model-cmt.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-minimum2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 6 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 20 +- .../qemuxml2argv-graphics-spice-timeout.xml | 24 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.xml | 2 +- tests/qemuxml2argvtest.c | 312 +++++++------- .../qemuxml2xmlout-graphics-spice-timeout.xml | 24 +- tests/testutilsqemu.c | 126 ++++-- tests/testutilsqemu.h | 11 +- tools/virsh-host.c | 10 +- 79 files changed, 2455 insertions(+), 1119 deletions(-) create mode 100644 docs/schemas/cputypes.rng create mode 100644 tests/cputestdata/x86-host+host-passthrough-features.xml create mode 100644 tests/cputestdata/x86-host-passthrough-features.xml -- 2.9.2

2 90

[libvirt] [PATCH v1 0/4] libxl: host cpu element in capabilities
by Joao Martins 16 Sep '16

16 Sep '16

Hey, This small series implements host cpu description in caps, by getting topology and xen hwcaps parsing done, followed by having cpu-{compare,baseline} APIs implemented. Last thing missing I think it would be to libxl_cpuid_set the features to enable/disable whichever format we choose plus the appropriate XML convertion to/from XM and XL config formats. Note that since RFC[0] I removed the Get CPU model names API since it would make more sense having it exported once we do support guest cpu model/features setting. Changelog included in individual patches (only second patch got changed) Cheers, Joao [0] http://www.redhat.com/archives/libvir-list/2016-July/msg00245.html Joao Martins (4): libxl: describe host topology in capabilities libxl: describe host cpu features based on hwcaps libxl: implement virConnectCompareCPU libxl: implement virConnectBaselineCPU src/libxl/libxl_capabilities.c | 168 ++++++++++++++++++++++++++++++++++++++--- src/libxl/libxl_driver.c | 60 +++++++++++++++ 2 files changed, 218 insertions(+), 10 deletions(-) -- 2.1.4

4 11

[libvirt] [PATCH][RFC] enable modification of xml in case of a restore forthe combination of xen/libvirt
by Guido.Rossmueller＠gdata.de 16 Sep '16

16 Sep '16

Hello everybody, the modification of the xml-decription of an vm is disabled in libvirt for the combination of xen/libvirt. The following patches will enabled it. a possible use case is the restore of a vm , whose virtuell disk is on an LVM, and it should use for the restore a snapshot of this LVM all the best guido --- src/libxl/libxl_domain.c | 14 +++++++++++--- src/libxl/libxl_domain.h | 3 ++- src/libxl/libxl_driver.c | 9 +-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 0e26b91..98992a5 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -630,7 +630,8 @@ libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, libxlDriverConfigPtr cfg, const char *from, virDomainDefPtr *ret_def, - libxlSavefileHeaderPtr ret_hdr) + libxlSavefileHeaderPtr ret_hdr, + const char *xmlin ) { int fd; virDomainDefPtr def = NULL; @@ -675,10 +676,17 @@ libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, goto error; } - if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt, + if (xmlin != NULL) { + if (!(def = virDomainDefParseString(xmlin, cfg->caps, driver->xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) + goto error; + } else { + if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) goto error; + } VIR_FREE(xml); @@ -1072,7 +1080,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, managed_save_fd = libxlDomainSaveImageOpen(driver, cfg, managed_save_path, - &def, &hdr); + &def, &hdr, NULL); if (managed_save_fd < 0) goto cleanup; diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index af11a2c..863473d 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -106,7 +106,8 @@ libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, libxlDriverConfigPtr cfg, const char *from, virDomainDefPtr *ret_def, - libxlSavefileHeaderPtr ret_hdr) + libxlSavefileHeaderPtr ret_hdr, + const char *xmlin) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5); int diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index cb501cf..4683fe7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1828,14 +1828,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, return -1; #endif - virCheckFlags(VIR_DOMAIN_SAVE_PAUSED, -1); - if (dxml) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); - return -1; - } - - fd = libxlDomainSaveImageOpen(driver, cfg, from, &def, &hdr); + fd = libxlDomainSaveImageOpen(driver, cfg, from, &def, &hdr, dxml); if (fd < 0) goto cleanup; -- 2.6.6 ____________ Virus checked by G Data MailSecurity Version: AVA 25.8250 dated 12.09.2016 Virus news: www.antiviruslab.com

2 1

[libvirt] [PATCH v2a] HyperV: Improve 2008, introduce 2012
by Jason Miesionczek 16 Sep '16

16 Sep '16

Second round of patches based on recently complete code review. Going to submit patches in much smaller chunks, starting with this one. Future patches will be submitted as each previous patch is reviewed and merged. Jason Miesionczek (1): hyperv: add new WMI classes and improve generator src/hyperv/hyperv_wmi_generator.input | 485 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi_generator.py | 57 +++- 2 files changed, 539 insertions(+), 3 deletions(-) -- 2.7.4

2 6

[libvirt] [PATCH 00/16] Hyper-V: Improve 2008, Introduce 2012
by Jason Miesionczek 16 Sep '16

16 Sep '16

The following patches include work originally done by Yves Vinter back in 2014. The last patch introduces support for Hyper-V 2012, while still supporting 2008. I am not sure that the method I used to include the 2012 support is the best approach, mainly due to code duplication, but I am open to suggestions on how to do this better. Jason Miesionczek (16): hyperv: additional server 2008 wmi classes hyperv: add cim types support to code generator hyperv: add get capabilities hyperv: implement connectGetVersion hyperv: implement vcpu functions hyperv: implement nodeGetFreeMemory hyperv: implement ability to send xml soap requests hyperv: introduce basic network driver hyperv: add domain shutdown function hyperv: add get scheduler functions hyperv: add set memory functions hyperv: set vpcu functions hyperv: domain undefine functions hyperv: domain define and associated functions hyperv: network list functions hyperv: introduce 2012 support src/Makefile.am | 2 + src/hyperv/hyperv_driver.c | 1989 ++++++++++++++++++++++++++++++++- src/hyperv/hyperv_driver_2012.c | 299 +++++ src/hyperv/hyperv_driver_2012.h | 55 + src/hyperv/hyperv_network_driver.c | 280 +++++ src/hyperv/hyperv_network_driver.h | 30 + src/hyperv/hyperv_private.h | 8 + src/hyperv/hyperv_wmi.c | 709 +++++++++++- src/hyperv/hyperv_wmi.h | 78 ++ src/hyperv/hyperv_wmi_generator.input | 518 ++++++++- src/hyperv/hyperv_wmi_generator.py | 68 +- src/hyperv/openwsman.h | 4 + 12 files changed, 3989 insertions(+), 51 deletions(-) create mode 100644 src/hyperv/hyperv_driver_2012.c create mode 100644 src/hyperv/hyperv_driver_2012.h create mode 100644 src/hyperv/hyperv_network_driver.c create mode 100644 src/hyperv/hyperv_network_driver.h -- 2.7.4

6 47

[libvirt] [PATCH v2] qemu: map "virtio" video model to "virt" machtype correctly (arm/aarch64)
by Laszlo Ersek 16 Sep '16

16 Sep '16

Most of QEMU's PCI display device models, such as: libvirt video/model/@type QEMU -device ------------------------- ------------ cirrus cirrus-vga vga VGA qxl qxl-vga virtio virtio-vga come with a linear framebuffer (sometimes called "VGA compatibility framebuffer"). This linear framebuffer lives in one of the PCI device's MMIO BARs, and allows guest code (primarily: firmware drivers, and non-accelerated OS drivers) to display graphics with direct memory access. Due to architectural reasons on aarch64/KVM hosts, this kind of framebuffer doesn't / can't work in qemu-system-(arm|aarch64) -M virt machines. Cache coherency issues guarantee a corrupted / unusable display. The problem has been researched by several people, including kvm-arm maintainers, and it's been decided that the best way (practically the only way) to have boot time graphics for such guests is to consolidate on QEMU's "virtio-gpu-pci" device. >From <https://bugzilla.redhat.com/show_bug.cgi?id=1195176>, libvirt supports <devices> <video> <model type='virtio'/> </video> </devices> but libvirt unconditionally maps @type='virtio' to QEMU's "virtio-vga" device model. (See the qemuBuildDeviceVideoStr() function and the "qemuDeviceVideo" enum impl.) According to the above, this is not right for the "virt" machine type; the qemu-system-(arm|aarch64) binaries don't even recognize the "virtio-vga" device model (justifiedly). Whereas "virtio-gpu-pci", which is a pure virtio device without a compatibility framebuffer, is available, and works fine. (The ArmVirtQemu ("AAVMF") platform of edk2 -- that is, the UEFI firmware for "virt" -- supports "virtio-gpu-pci", as of upstream commit 3ef3209d3028. See <https://tianocore.acgmultimedia.com/show_bug.cgi?id=66>.) Override the default mapping of "virtio", from "virtio-vga" to "virtio-gpu-pci", if qemuDomainMachineIsVirt() evaluates to true. Cc: Andrea Bolognani <abologna(a)redhat.com> Cc: Drew Jones <drjones(a)redhat.com> Cc: Marc-André Lureau <marcandre.lureau(a)redhat.com> Cc: Martin Kletzander <mkletzan(a)redhat.com> Suggested-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1372901 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> Acked-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v2: - rewrap "qemuxml2argv-aarch64-video-virtio-gpu-pci.args" with "test-wrap-argv.pl" [Martin] - pick up Martin's ACK src/qemu/qemu_command.c | 4 ++ tests/qemuxml2argvtest.c | 5 +++ tests/qemuxml2xmltest.c | 5 +++ tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args | 26 +++++++++++ tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml | 36 ++++++++++++++++ tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml | 45 ++++++++++++++++++++ 6 files changed, 121 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a61863b9abb..038c38f2217c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4325,6 +4325,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virDomainVideoTypeToString(video->type)); goto error; } + if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO && + qemuDomainMachineIsVirt(def)) { + model = "virtio-gpu-pci"; + } } else { if (video->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dbb0e4d56142..e8540779a4b5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1872,6 +1872,11 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("aarch64-video-virtio-gpu-pci", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 14c2b0ccf2ce..fb05c8571411 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -831,6 +831,11 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("aarch64-video-virtio-gpu-pci", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH, GIC_NONE, NONE); DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, NONE); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args new file mode 100644 index 000000000000..76ee977a3ca2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args @@ -0,0 +1,26 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/opt/qemu-installed/bin/qemu-system-aarch64 \ +-name aarch64-vgpu \ +-S \ +-M virt \ +-cpu cortex-a57 \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid f3197c89-6457-44fe-b26d-897090ba6541 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \ +-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ +addr=0x1 \ +-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,multifunction=on,\ +addr=0x1.0x1 \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:73:34:53,bus=pci.1,addr=0x0,\ +bootindex=1 \ +-net user,vlan=0,name=hostnet0 \ +-device virtio-gpu-pci,id=video0,bus=pci.2,addr=0x0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml new file mode 100644 index 000000000000..4b52a731b043 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>aarch64-vgpu</name> + <uuid>f3197c89-6457-44fe-b26d-897090ba6541</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <features> + <acpi/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a57</model> + </cpu> + <devices> + <emulator>/opt/qemu-installed/bin/qemu-system-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1' multifunction='on'/> + </controller> + <interface type='user'> + <mac address='52:54:00:73:34:53'/> + <model type='virtio'/> + <boot order='1'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <video> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml new file mode 100644 index 000000000000..26f6a51622ef --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>aarch64-vgpu</name> + <uuid>f3197c89-6457-44fe-b26d-897090ba6541</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <features> + <acpi/> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a57</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/opt/qemu-installed/bin/qemu-system-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='ioh3420'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='ioh3420'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1' multifunction='on'/> + </controller> + <interface type='user'> + <mac address='52:54:00:73:34:53'/> + <model type='virtio'/> + <boot order='1'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <video> + <model type='virtio' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + </video> + </devices> +</domain> -- 2.9.2

4 12

[libvirt] [PATCH] test driver: File test_driver.c was splitted into smaller files.
by Tomáš Ryšavý 16 Sep '16

16 Sep '16

Because the file had over 7000 lines. Now its splitted into 5 smaller files. It looks clearer and it's better for reading the code. Signed-off-by: Tomáš Ryšavý <tom.rysavy.0(a)gmail.com> --- po/POTFILES.in | 6 +- src/Makefile.am | 8 +- src/test/test_device_driver.c | 462 +++ src/test/test_device_driver.h | 1 + src/test/test_driver.c | 6924 +------------------------------------ src/test/test_hypervisor_driver.c | 4152 ++++++++++++++++++++++ src/test/test_hypervisor_driver.h | 1 + src/test/test_interface_driver.c | 487 +++ src/test/test_interface_driver.h | 1 + src/test/test_network_driver.c | 540 +++ src/test/test_network_driver.h | 1 + src/test/test_private_driver.h | 70 + src/test/test_storage_driver.c | 1517 ++++++++ src/test/test_storage_driver.h | 1 + 14 files changed, 7259 insertions(+), 6912 deletions(-) create mode 100644 src/test/test_device_driver.c create mode 100644 src/test/test_device_driver.h create mode 100644 src/test/test_hypervisor_driver.c create mode 100644 src/test/test_hypervisor_driver.h create mode 100644 src/test/test_interface_driver.c create mode 100644 src/test/test_interface_driver.h create mode 100644 src/test/test_network_driver.c create mode 100644 src/test/test_network_driver.h create mode 100644 src/test/test_private_driver.h create mode 100644 src/test/test_storage_driver.c create mode 100644 src/test/test_storage_driver.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 25dbc84..5738c4e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -173,7 +173,11 @@ src/storage/storage_backend_scsi.c src/storage/storage_backend_sheepdog.c src/storage/storage_backend_zfs.c src/storage/storage_driver.c -src/test/test_driver.c +src/test/test_device_driver.c +src/test/test_hypervisor_driver.c +src/test/test_interface_driver.c +src/test/test_network_driver.c +src/test/test_storage_driver.c src/uml/uml_conf.c src/uml/uml_driver.c src/util/iohelper.c diff --git a/src/Makefile.am b/src/Makefile.am index 8ee5567..4cf01fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -689,7 +689,13 @@ check-local: check-protocol check-symfile check-symsorting \ # Mock driver, covering domains, storage, networks, etc TEST_DRIVER_SOURCES = \ - test/test_driver.c test/test_driver.h + test/test_driver.c test/test_driver.h \ + test/test_device_driver.c test/test_device_driver.h \ + test/test_hypervisor_driver.c test/test_hypervisor_driver.h \ + test/test_interface_driver.c test/test_interface_driver.h \ + test/test_network_driver.c test/test_network_driver.h \ + test/test_storage_driver.c test/test_storage_driver.h + # Now the Hypervisor specific drivers XEN_DRIVER_SOURCES = \ diff --git a/src/test/test_device_driver.c b/src/test/test_device_driver.c new file mode 100644 index 0000000..1172bc5 --- /dev/null +++ b/src/test/test_device_driver.c @@ -0,0 +1,462 @@ +/* + * test_device_driver.c: A "mock" hypervisor for use by application unit tests + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Daniel Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <string.h> +#include <sys/time.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <libxml/xmlsave.h> +#include <libxml/xpathInternals.h> + + +#include "virerror.h" +#include "datatypes.h" +#include "test_driver.h" +#include "virbuffer.h" +#include "viruuid.h" +#include "capabilities.h" +#include "configmake.h" +#include "viralloc.h" +#include "network_conf.h" +#include "interface_conf.h" +#include "domain_conf.h" +#include "domain_event.h" +#include "network_event.h" +#include "snapshot_conf.h" +#include "fdstream.h" +#include "storage_conf.h" +#include "storage_event.h" +#include "node_device_conf.h" +#include "node_device_event.h" +#include "virxml.h" +#include "virthread.h" +#include "virlog.h" +#include "virfile.h" +#include "virtypedparam.h" +#include "virrandom.h" +#include "virstring.h" +#include "cpu/cpu.h" +#include "virauth.h" +#include "viratomic.h" +#include "virdomainobjlist.h" +#include "virhostcpu.h" + +#include "test_device_driver.h" + +#include "test_private_driver.h" + +/* Node device implementations */ + +static int +testConnectNodeDeviceEventRegisterAny(virConnectPtr conn, + virNodeDevicePtr dev, + int eventID, + virConnectNodeDeviceEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + testDriverPtr driver = conn->privateData; + int ret; + + if (virNodeDeviceEventStateRegisterID(conn, driver->eventState, + dev, eventID, callback, + opaque, freecb, &ret) < 0) + ret = -1; + + return ret; +} + +static int +testConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, + int callbackID) +{ + testDriverPtr driver = conn->privateData; + int ret = 0; + + if (virObjectEventStateDeregisterID(conn, driver->eventState, + callbackID) < 0) + ret = -1; + + return ret; +} + +static int +testNodeNumOfDevices(virConnectPtr conn, + const char *cap, + unsigned int flags) +{ + testDriverPtr driver = conn->privateData; + int ndevs = 0; + size_t i; + + virCheckFlags(0, -1); + + testDriverLock(driver); + for (i = 0; i < driver->devs.count; i++) + if ((cap == NULL) || + virNodeDeviceHasCap(driver->devs.objs[i], cap)) + ++ndevs; + testDriverUnlock(driver); + + return ndevs; +} + +static int +testNodeListDevices(virConnectPtr conn, + const char *cap, + char **const names, + int maxnames, + unsigned int flags) +{ + testDriverPtr driver = conn->privateData; + int ndevs = 0; + size_t i; + + virCheckFlags(0, -1); + + testDriverLock(driver); + for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) { + virNodeDeviceObjLock(driver->devs.objs[i]); + if (cap == NULL || + virNodeDeviceHasCap(driver->devs.objs[i], cap)) { + if (VIR_STRDUP(names[ndevs++], driver->devs.objs[i]->def->name) < 0) { + virNodeDeviceObjUnlock(driver->devs.objs[i]); + goto failure; + } + } + virNodeDeviceObjUnlock(driver->devs.objs[i]); + } + testDriverUnlock(driver); + + return ndevs; + + failure: + testDriverUnlock(driver); + --ndevs; + while (--ndevs >= 0) + VIR_FREE(names[ndevs]); + return -1; +} + +static virNodeDevicePtr +testNodeDeviceLookupByName(virConnectPtr conn, const char *name) +{ + testDriverPtr driver = conn->privateData; + virNodeDeviceObjPtr obj; + virNodeDevicePtr ret = NULL; + + testDriverLock(driver); + obj = virNodeDeviceFindByName(&driver->devs, name); + testDriverUnlock(driver); + + if (!obj) { + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + name); + goto cleanup; + } + + ret = virGetNodeDevice(conn, name); + + cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); + return ret; +} + +static char * +testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, + unsigned int flags) +{ + testDriverPtr driver = dev->conn->privateData; + virNodeDeviceObjPtr obj; + char *ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(driver); + obj = virNodeDeviceFindByName(&driver->devs, dev->name); + testDriverUnlock(driver); + + if (!obj) { + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); + goto cleanup; + } + + ret = virNodeDeviceDefFormat(obj->def); + + cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); + return ret; +} + +static char * +testNodeDeviceGetParent(virNodeDevicePtr dev) +{ + testDriverPtr driver = dev->conn->privateData; + virNodeDeviceObjPtr obj; + char *ret = NULL; + + testDriverLock(driver); + obj = virNodeDeviceFindByName(&driver->devs, dev->name); + testDriverUnlock(driver); + + if (!obj) { + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); + goto cleanup; + } + + if (obj->def->parent) { + ignore_value(VIR_STRDUP(ret, obj->def->parent)); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("no parent for this device")); + } + + cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); + return ret; +} + + +static int +testNodeDeviceNumOfCaps(virNodeDevicePtr dev) +{ + testDriverPtr driver = dev->conn->privateData; + virNodeDeviceObjPtr obj; + virNodeDevCapsDefPtr caps; + int ncaps = 0; + int ret = -1; + + testDriverLock(driver); + obj = virNodeDeviceFindByName(&driver->devs, dev->name); + testDriverUnlock(driver); + + if (!obj) { + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); + goto cleanup; + } + + for (caps = obj->def->caps; caps; caps = caps->next) + ++ncaps; + ret = ncaps; + + cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); + return ret; +} + + +static int +testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) +{ + testDriverPtr driver = dev->conn->privateData; + virNodeDeviceObjPtr obj; + virNodeDevCapsDefPtr caps; + int ncaps = 0; + int ret = -1; + + testDriverLock(driver); + obj = virNodeDeviceFindByName(&driver->devs, dev->name); + testDriverUnlock(driver); + + if (!obj) { + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); + goto cleanup; + } + + for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { + if (VIR_STRDUP(names[ncaps++], virNodeDevCapTypeToString(caps->data.type)) < 0) + goto cleanup; + } + ret = ncaps; + + cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); + if (ret == -1) { + --ncaps; + while (--ncaps >= 0) + VIR_FREE(names[ncaps]); + } + return ret; +} + +static virNodeDevicePtr +testNodeDeviceCreateXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags) +{ + testDriverPtr driver = conn->privateData; + virNodeDeviceDefPtr def = NULL; + virNodeDeviceObjPtr obj = NULL; + char *wwnn = NULL, *wwpn = NULL; + int parent_host = -1; + virNodeDevicePtr dev = NULL; + virNodeDevCapsDefPtr caps; + virObjectEventPtr event = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(driver); + + def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, NULL); + if (def == NULL) + goto cleanup; + + /* We run these next two simply for validation */ + if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) + goto cleanup; + + if (virNodeDeviceGetParentHost(&driver->devs, + def->name, + def->parent, + &parent_host) == -1) { + goto cleanup; + } + + /* 'name' is supposed to be filled in by the node device backend, which + * we don't have. Use WWPN instead. */ + VIR_FREE(def->name); + if (VIR_STRDUP(def->name, wwpn) < 0) + goto cleanup; + + /* Fill in a random 'host' and 'unique_id' value, + * since this would also come from the backend */ + caps = def->caps; + while (caps) { + if (caps->data.type != VIR_NODE_DEV_CAP_SCSI_HOST) + continue; + + caps->data.scsi_host.host = virRandomBits(10); + caps->data.scsi_host.unique_id = 2; + caps = caps->next; + } + + + if (!(obj = virNodeDeviceAssignDef(&driver->devs, def))) + goto cleanup; + virNodeDeviceObjUnlock(obj); + + event = virNodeDeviceEventLifecycleNew(def->name, + VIR_NODE_DEVICE_EVENT_CREATED, + 0); + + dev = virGetNodeDevice(conn, def->name); + def = NULL; + cleanup: + testDriverUnlock(driver); + virNodeDeviceDefFree(def); + testObjectEventQueue(driver, event); + VIR_FREE(wwnn); + VIR_FREE(wwpn); + return dev; +} + +static int +testNodeDeviceDestroy(virNodeDevicePtr dev) +{ + int ret = 0; + testDriverPtr driver = dev->conn->privateData; + virNodeDeviceObjPtr obj = NULL; + char *parent_name = NULL, *wwnn = NULL, *wwpn = NULL; + int parent_host = -1; + virObjectEventPtr event = NULL; + + testDriverLock(driver); + obj = virNodeDeviceFindByName(&driver->devs, dev->name); + testDriverUnlock(driver); + + if (!obj) { + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); + goto out; + } + + if (virNodeDeviceGetWWNs(obj->def, &wwnn, &wwpn) == -1) + goto out; + + if (VIR_STRDUP(parent_name, obj->def->parent) < 0) + goto out; + + /* virNodeDeviceGetParentHost will cause the device object's lock to be + * taken, so we have to dup the parent's name and drop the lock + * before calling it. We don't need the reference to the object + * any more once we have the parent's name. */ + virNodeDeviceObjUnlock(obj); + + /* We do this just for basic validation */ + if (virNodeDeviceGetParentHost(&driver->devs, + dev->name, + parent_name, + &parent_host) == -1) { + obj = NULL; + goto out; + } + + event = virNodeDeviceEventLifecycleNew(dev->name, + VIR_NODE_DEVICE_EVENT_DELETED, + 0); + + virNodeDeviceObjLock(obj); + virNodeDeviceObjRemove(&driver->devs, &obj); + + out: + if (obj) + virNodeDeviceObjUnlock(obj); + testObjectEventQueue(driver, event); + VIR_FREE(parent_name); + VIR_FREE(wwnn); + VIR_FREE(wwpn); + return ret; +} + +virNodeDeviceDriver testNodeDeviceDriver = { + .connectNodeDeviceEventRegisterAny = testConnectNodeDeviceEventRegisterAny, /* 2.2.0 */ + .connectNodeDeviceEventDeregisterAny = testConnectNodeDeviceEventDeregisterAny, /* 2.2.0 */ + .nodeNumOfDevices = testNodeNumOfDevices, /* 0.7.2 */ + .nodeListDevices = testNodeListDevices, /* 0.7.2 */ + .nodeDeviceLookupByName = testNodeDeviceLookupByName, /* 0.7.2 */ + .nodeDeviceGetXMLDesc = testNodeDeviceGetXMLDesc, /* 0.7.2 */ + .nodeDeviceGetParent = testNodeDeviceGetParent, /* 0.7.2 */ + .nodeDeviceNumOfCaps = testNodeDeviceNumOfCaps, /* 0.7.2 */ + .nodeDeviceListCaps = testNodeDeviceListCaps, /* 0.7.2 */ + .nodeDeviceCreateXML = testNodeDeviceCreateXML, /* 0.7.3 */ + .nodeDeviceDestroy = testNodeDeviceDestroy, /* 0.7.3 */ +}; diff --git a/src/test/test_device_driver.h b/src/test/test_device_driver.h new file mode 100644 index 0000000..b5bd2bd --- /dev/null +++ b/src/test/test_device_driver.h @@ -0,0 +1 @@ +extern virNodeDeviceDriver testNodeDeviceDriver; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 87799e1..c30ae29 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -65,113 +65,28 @@ #include "virdomainobjlist.h" #include "virhostcpu.h" -#define VIR_FROM_THIS VIR_FROM_TEST +#include "test_hypervisor_driver.h" +#include "test_storage_driver.h" +#include "test_network_driver.h" +#include "test_interface_driver.h" +#include "test_device_driver.h" -VIR_LOG_INIT("test.test_driver"); - - -#define MAX_CPUS 128 - -struct _testCell { - unsigned long mem; - unsigned long freeMem; - int numCpus; - virCapsHostNUMACellCPU cpus[MAX_CPUS]; -}; -typedef struct _testCell testCell; -typedef struct _testCell *testCellPtr; - -#define MAX_CELLS 128 - -struct _testAuth { - char *username; - char *password; -}; -typedef struct _testAuth testAuth; -typedef struct _testAuth *testAuthPtr; - -struct _testDriver { - virMutex lock; - - virNodeInfo nodeInfo; - virInterfaceObjList ifaces; - bool transaction_running; - virInterfaceObjList backupIfaces; - virStoragePoolObjList pools; - virNodeDeviceObjList devs; - int numCells; - testCell cells[MAX_CELLS]; - size_t numAuths; - testAuthPtr auths; - - /* virAtomic access only */ - volatile int nextDomID; - - /* immutable pointer, immutable object after being initialized with - * testBuildCapabilities */ - virCapsPtr caps; - - /* immutable pointer, immutable object */ - virDomainXMLOptionPtr xmlopt; - - /* immutable pointer, self-locking APIs */ - virDomainObjListPtr domains; - virNetworkObjListPtr networks; - virObjectEventStatePtr eventState; -}; -typedef struct _testDriver testDriver; -typedef testDriver *testDriverPtr; - -static testDriverPtr defaultConn; -static int defaultConnections; -static virMutex defaultLock = VIR_MUTEX_INITIALIZER; +#include "test_private_driver.h" -#define TEST_MODEL "i686" -#define TEST_EMULATOR "/usr/bin/test-hv" - -static const virNodeInfo defaultNodeInfo = { - TEST_MODEL, - 1024*1024*3, /* 3 GB */ - 16, - 1400, - 2, - 2, - 2, - 2, -}; - -static void -testDriverFree(testDriverPtr driver) -{ - if (!driver) - return; - - virObjectUnref(driver->caps); - virObjectUnref(driver->xmlopt); - virObjectUnref(driver->domains); - virNodeDeviceObjListFree(&driver->devs); - virObjectUnref(driver->networks); - virInterfaceObjListFree(&driver->ifaces); - virStoragePoolObjListFree(&driver->pools); - virObjectEventStateFree(driver->eventState); - virMutexUnlock(&driver->lock); - virMutexDestroy(&driver->lock); - - VIR_FREE(driver); -} +VIR_LOG_INIT("test.test_driver"); -static void testDriverLock(testDriverPtr driver) +void testDriverLock(testDriverPtr driver) { virMutexLock(&driver->lock); } -static void testDriverUnlock(testDriverPtr driver) +void testDriverUnlock(testDriverPtr driver) { virMutexUnlock(&driver->lock); } -static void testObjectEventQueue(testDriverPtr driver, +void testObjectEventQueue(testDriverPtr driver, virObjectEventPtr event) { if (!event) @@ -180,6825 +95,14 @@ static void testObjectEventQueue(testDriverPtr driver, virObjectEventStateQueue(driver->eventState, event); } -#define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" - -typedef struct _testDomainNamespaceDef testDomainNamespaceDef; -typedef testDomainNamespaceDef *testDomainNamespaceDefPtr; -struct _testDomainNamespaceDef { - int runstate; - bool transient; - bool hasManagedSave; - - unsigned int num_snap_nodes; - xmlNodePtr *snap_nodes; -}; - -static void -testDomainDefNamespaceFree(void *data) -{ - testDomainNamespaceDefPtr nsdata = data; - size_t i; - - if (!nsdata) - return; - - for (i = 0; i < nsdata->num_snap_nodes; i++) - xmlFreeNode(nsdata->snap_nodes[i]); - - VIR_FREE(nsdata->snap_nodes); - VIR_FREE(nsdata); -} - -static int -testDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED, - xmlNodePtr root ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt, - void **data) -{ - testDomainNamespaceDefPtr nsdata = NULL; - xmlNodePtr *nodes = NULL; - int tmp, n; - size_t i; - unsigned int tmpuint; - - if (xmlXPathRegisterNs(ctxt, BAD_CAST "test", - BAD_CAST TEST_NAMESPACE_HREF) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to register xml namespace '%s'"), - TEST_NAMESPACE_HREF); - return -1; - } - - if (VIR_ALLOC(nsdata) < 0) - return -1; - - n = virXPathNodeSet("./test:domainsnapshot", ctxt, &nodes); - if (n < 0) - goto error; - - if (n && VIR_ALLOC_N(nsdata->snap_nodes, n) < 0) - goto error; - - for (i = 0; i < n; i++) { - xmlNodePtr newnode = xmlCopyNode(nodes[i], 1); - if (!newnode) { - virReportOOMError(); - goto error; - } - - nsdata->snap_nodes[nsdata->num_snap_nodes] = newnode; - nsdata->num_snap_nodes++; - } - VIR_FREE(nodes); - - tmp = virXPathBoolean("boolean(./test:transient)", ctxt); - if (tmp == -1) { - virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid transient")); - goto error; - } - nsdata->transient = tmp; - - tmp = virXPathBoolean("boolean(./test:hasmanagedsave)", ctxt); - if (tmp == -1) { - virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid hasmanagedsave")); - goto error; - } - nsdata->hasManagedSave = tmp; - - tmp = virXPathUInt("string(./test:runstate)", ctxt, &tmpuint); - if (tmp == 0) { - if (tmpuint >= VIR_DOMAIN_LAST) { - virReportError(VIR_ERR_XML_ERROR, - _("runstate '%d' out of range'"), tmpuint); - goto error; - } - nsdata->runstate = tmpuint; - } else if (tmp == -1) { - nsdata->runstate = VIR_DOMAIN_RUNNING; - } else if (tmp == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid runstate")); - goto error; - } - - if (nsdata->transient && nsdata->runstate == VIR_DOMAIN_SHUTOFF) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("transient domain cannot have runstate 'shutoff'")); - goto error; - } - if (nsdata->hasManagedSave && nsdata->runstate != VIR_DOMAIN_SHUTOFF) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("domain with managedsave data can only have runstate 'shutoff'")); - goto error; - } - - *data = nsdata; - return 0; - - error: - VIR_FREE(nodes); - testDomainDefNamespaceFree(nsdata); - return -1; -} - -static virCapsPtr -testBuildCapabilities(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - virCapsPtr caps; - virCapsGuestPtr guest; - int guest_types[] = { VIR_DOMAIN_OSTYPE_HVM, - VIR_DOMAIN_OSTYPE_XEN }; - size_t i, j; - - if ((caps = virCapabilitiesNew(VIR_ARCH_I686, false, false)) == NULL) - goto error; - - if (virCapabilitiesAddHostFeature(caps, "pae") < 0) - goto error; - if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) - goto error; - - if (VIR_ALLOC_N(caps->host.pagesSize, 2) < 0) - goto error; - - caps->host.pagesSize[caps->host.nPagesSize++] = 4; - caps->host.pagesSize[caps->host.nPagesSize++] = 2048; - - for (i = 0; i < privconn->numCells; i++) { - virCapsHostNUMACellCPUPtr cpu_cells; - virCapsHostNUMACellPageInfoPtr pages; - size_t nPages; - - if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 || - VIR_ALLOC_N(pages, caps->host.nPagesSize) < 0) { - VIR_FREE(cpu_cells); - goto error; - } - - nPages = caps->host.nPagesSize; - - memcpy(cpu_cells, privconn->cells[i].cpus, - sizeof(*cpu_cells) * privconn->cells[i].numCpus); - - for (j = 0; j < nPages; j++) - pages[j].size = caps->host.pagesSize[j]; - - pages[0].avail = privconn->cells[i].mem / pages[0].size; - - if (virCapabilitiesAddHostNUMACell(caps, i, privconn->cells[i].mem, - privconn->cells[i].numCpus, - cpu_cells, 0, NULL, nPages, pages) < 0) - goto error; - } - - for (i = 0; i < ARRAY_CARDINALITY(guest_types); i++) { - if ((guest = virCapabilitiesAddGuest(caps, - guest_types[i], - VIR_ARCH_I686, - TEST_EMULATOR, - NULL, - 0, - NULL)) == NULL) - goto error; - - if (virCapabilitiesAddGuestDomain(guest, - VIR_DOMAIN_VIRT_TEST, - NULL, - NULL, - 0, - NULL) == NULL) - goto error; - - if (virCapabilitiesAddGuestFeature(guest, "pae", true, true) == NULL) - goto error; - if (virCapabilitiesAddGuestFeature(guest, "nonpae", true, true) == NULL) - goto error; - } - - caps->host.nsecModels = 1; - if (VIR_ALLOC_N(caps->host.secModels, caps->host.nsecModels) < 0) - goto error; - if (VIR_STRDUP(caps->host.secModels[0].model, "testSecurity") < 0) - goto error; - - if (VIR_STRDUP(caps->host.secModels[0].doi, "") < 0) - goto error; - - return caps; - - error: - virObjectUnref(caps); - return NULL; -} - - -static testDriverPtr -testDriverNew(void) -{ - virDomainXMLNamespace ns = { - .parse = testDomainDefNamespaceParse, - .free = testDomainDefNamespaceFree, - }; - testDriverPtr ret; - - if (VIR_ALLOC(ret) < 0) - return NULL; - - if (virMutexInit(&ret->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialize mutex")); - goto error; - } - - if (!(ret->xmlopt = virDomainXMLOptionNew(NULL, NULL, &ns)) || - !(ret->eventState = virObjectEventStateNew()) || - !(ret->domains = virDomainObjListNew()) || - !(ret->networks = virNetworkObjListNew())) - goto error; - - virAtomicIntSet(&ret->nextDomID, 1); - - return ret; - - error: - testDriverFree(ret); - return NULL; -} - - -static const char *defaultConnXML = -"<node>" -"<domain type='test'>" -" <name>test</name>" -" <uuid>6695eb01-f6a4-8304-79aa-97f2502e193f</uuid>" -" <memory>8388608</memory>" -" <currentMemory>2097152</currentMemory>" -" <vcpu>2</vcpu>" -" <os>" -" <type>hvm</type>" -" </os>" -"</domain>" -"" -"<network>" -" <name>default</name>" -" <uuid>dd8fe884-6c02-601e-7551-cca97df1c5df</uuid>" -" <bridge name='virbr0'/>" -" <forward/>" -" <ip address='192.168.122.1' netmask='255.255.255.0'>" -" <dhcp>" -" <range start='192.168.122.2' end='192.168.122.254'/>" -" </dhcp>" -" </ip>" -"</network>" -"" -"<interface type=\"ethernet\" name=\"eth1\">" -" <start mode=\"onboot\"/>" -" <mac address=\"aa:bb:cc:dd:ee:ff\"/>" -" <mtu size=\"1492\"/>" -" <protocol family=\"ipv4\">" -" <ip address=\"192.168.0.5\" prefix=\"24\"/>" -" <route gateway=\"192.168.0.1\"/>" -" </protocol>" -"</interface>" -"" -"<pool type='dir'>" -" <name>default-pool</name>" -" <uuid>dfe224cb-28fb-8dd0-c4b2-64eb3f0f4566</uuid>" -" <target>" -" <path>/default-pool</path>" -" </target>" -"</pool>" -"" -"<device>" -" <name>computer</name>" -" <capability type='system'>" -" <hardware>" -" <vendor>Libvirt</vendor>" -" <version>Test driver</version>" -" <serial>123456</serial>" -" <uuid>11111111-2222-3333-4444-555555555555</uuid>" -" </hardware>" -" <firmware>" -" <vendor>Libvirt</vendor>" -" <version>Test Driver</version>" -" <release_date>01/22/2007</release_date>" -" </firmware>" -" </capability>" -"</device>" -"<device>" -" <name>test-scsi-host-vport</name>" -" <parent>computer</parent>" -" <capability type='scsi_host'>" -" <host>1</host>" -" <capability type='fc_host'>" -" <wwnn>2000000012341234</wwnn>" -" <wwpn>1000000012341234</wwpn>" -" </capability>" -" <capability type='vport_ops'/>" -" </capability>" -"</device>" -"</node>"; - - -static const char *defaultPoolSourcesLogicalXML = -"<sources>\n" -" <source>\n" -" <device path='/dev/sda20'/>\n" -" <name>testvg1</name>\n" -" <format type='lvm2'/>\n" -" </source>\n" -" <source>\n" -" <device path='/dev/sda21'/>\n" -" <name>testvg2</name>\n" -" <format type='lvm2'/>\n" -" </source>\n" -"</sources>\n"; - -static const char *defaultPoolSourcesNetFSXML = -"<sources>\n" -" <source>\n" -" <host name='%s'/>\n" -" <dir path='/testshare'/>\n" -" <format type='nfs'/>\n" -" </source>\n" -"</sources>\n"; - -static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ull); -static const unsigned long long defaultPoolAlloc; - -static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool); -static int testNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info); - -static virDomainObjPtr -testDomObjFromDomain(virDomainPtr domain) -{ - virDomainObjPtr vm; - testDriverPtr driver = domain->conn->privateData; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - vm = virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); - if (!vm) { - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), - uuidstr, domain->name); - } - - return vm; -} - -static char * -testDomainGenerateIfname(virDomainDefPtr domdef) -{ - int maxif = 1024; - int ifctr; - size_t i; - - for (ifctr = 0; ifctr < maxif; ++ifctr) { - char *ifname; - int found = 0; - - if (virAsprintf(&ifname, "testnet%d", ifctr) < 0) - return NULL; - - /* Generate network interface names */ - for (i = 0; i < domdef->nnets; i++) { - if (domdef->nets[i]->ifname && - STREQ(domdef->nets[i]->ifname, ifname)) { - found = 1; - break; - } - } - - if (!found) - return ifname; - VIR_FREE(ifname); - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Exceeded max iface limit %d"), maxif); - return NULL; -} - -static int -testDomainGenerateIfnames(virDomainDefPtr domdef) -{ - size_t i = 0; - - for (i = 0; i < domdef->nnets; i++) { - char *ifname; - if (domdef->nets[i]->ifname) - continue; - - ifname = testDomainGenerateIfname(domdef); - if (!ifname) - return -1; - - domdef->nets[i]->ifname = ifname; - } - - return 0; -} - - -static void -testDomainShutdownState(virDomainPtr domain, - virDomainObjPtr privdom, - virDomainShutoffReason reason) -{ - virDomainObjRemoveTransientDef(privdom); - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, reason); - - if (domain) - domain->id = -1; -} - -/* Set up domain runtime state */ -static int -testDomainStartState(testDriverPtr privconn, - virDomainObjPtr dom, - virDomainRunningReason reason) -{ - int ret = -1; - - virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, reason); - dom->def->id = virAtomicIntAdd(&privconn->nextDomID, 1); - - if (virDomainObjSetDefTransient(privconn->caps, - privconn->xmlopt, - dom) < 0) { - goto cleanup; - } - - dom->hasManagedSave = false; - ret = 0; - cleanup: - if (ret < 0) - testDomainShutdownState(NULL, dom, VIR_DOMAIN_SHUTOFF_FAILED); - return ret; -} - - -static char *testBuildFilename(const char *relativeTo, - const char *filename) -{ - char *offset; - int baseLen; - char *ret; - - if (!filename || filename[0] == '\0') - return NULL; - if (filename[0] == '/') { - ignore_value(VIR_STRDUP(ret, filename)); - return ret; - } - - offset = strrchr(relativeTo, '/'); - if ((baseLen = (offset-relativeTo+1))) { - char *absFile; - int totalLen = baseLen + strlen(filename) + 1; - if (VIR_ALLOC_N(absFile, totalLen) < 0) - return NULL; - if (virStrncpy(absFile, relativeTo, baseLen, totalLen) == NULL) { - VIR_FREE(absFile); - return NULL; - } - strcat(absFile, filename); - return absFile; - } else { - ignore_value(VIR_STRDUP(ret, filename)); - return ret; - } -} - -static xmlNodePtr -testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type) -{ - xmlNodePtr ret = NULL; - xmlDocPtr doc = NULL; - char *absFile = NULL; - char *relFile = virXMLPropString(node, "file"); - - if (relFile != NULL) { - absFile = testBuildFilename(file, relFile); - VIR_FREE(relFile); - if (!absFile) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("resolving %s filename"), type); - return NULL; - } - - if (!(doc = virXMLParse(absFile, NULL, type))) - goto error; - - ret = xmlCopyNode(xmlDocGetRootElement(doc), 1); - if (!ret) { - virReportOOMError(); - goto error; - } - xmlReplaceNode(node, ret); - xmlFreeNode(node); - } else { - ret = node; - } - - error: - xmlFreeDoc(doc); - VIR_FREE(absFile); - return ret; -} - -static int -testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) -{ - char *str; - long l; - int ret; - - ret = virXPathLong("string(/node/cpu/nodes[1])", ctxt, &l); - if (ret == 0) { - nodeInfo->nodes = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu nodes value")); - goto error; - } - - ret = virXPathLong("string(/node/cpu/sockets[1])", ctxt, &l); - if (ret == 0) { - nodeInfo->sockets = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu sockets value")); - goto error; - } - - ret = virXPathLong("string(/node/cpu/cores[1])", ctxt, &l); - if (ret == 0) { - nodeInfo->cores = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu cores value")); - goto error; - } - - ret = virXPathLong("string(/node/cpu/threads[1])", ctxt, &l); - if (ret == 0) { - nodeInfo->threads = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu threads value")); - goto error; - } - - nodeInfo->cpus = (nodeInfo->cores * nodeInfo->threads * - nodeInfo->sockets * nodeInfo->nodes); - ret = virXPathLong("string(/node/cpu/active[1])", ctxt, &l); - if (ret == 0) { - if (l < nodeInfo->cpus) - nodeInfo->cpus = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu active value")); - goto error; - } - ret = virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l); - if (ret == 0) { - nodeInfo->mhz = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu mhz value")); - goto error; - } - - str = virXPathString("string(/node/cpu/model[1])", ctxt); - if (str != NULL) { - if (virStrcpyStatic(nodeInfo->model, str) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Model %s too big for destination"), str); - VIR_FREE(str); - goto error; - } - VIR_FREE(str); - } - - ret = virXPathLong("string(/node/memory[1])", ctxt, &l); - if (ret == 0) { - nodeInfo->memory = l; - } else if (ret == -2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid node memory value")); - goto error; - } - - return 0; - error: - return -1; -} - -static int -testParseDomainSnapshots(testDriverPtr privconn, - virDomainObjPtr domobj, - const char *file, - xmlXPathContextPtr ctxt) -{ - size_t i; - int ret = -1; - testDomainNamespaceDefPtr nsdata = domobj->def->namespaceData; - xmlNodePtr *nodes = nsdata->snap_nodes; - - for (i = 0; i < nsdata->num_snap_nodes; i++) { - virDomainSnapshotObjPtr snap; - virDomainSnapshotDefPtr def; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, - "domainsnapshot"); - if (!node) - goto error; - - def = virDomainSnapshotDefParseNode(ctxt->doc, node, - privconn->caps, - privconn->xmlopt, - VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | - VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL | - VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); - if (!def) - goto error; - - if (!(snap = virDomainSnapshotAssignDef(domobj->snapshots, def))) { - virDomainSnapshotDefFree(def); - goto error; - } - - if (def->current) { - if (domobj->current_snapshot) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("more than one snapshot claims to be active")); - goto error; - } - - domobj->current_snapshot = snap; - } - } - - if (virDomainSnapshotUpdateRelations(domobj->snapshots) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Snapshots have inconsistent relations for " - "domain %s"), domobj->def->name); - goto error; - } - - ret = 0; - error: - return ret; -} - -static int -testParseDomains(testDriverPtr privconn, - const char *file, - xmlXPathContextPtr ctxt) -{ - int num, ret = -1; - size_t i; - xmlNodePtr *nodes = NULL; - virDomainObjPtr obj; - - num = virXPathNodeSet("/node/domain", ctxt, &nodes); - if (num < 0) - goto error; - - for (i = 0; i < num; i++) { - virDomainDefPtr def; - testDomainNamespaceDefPtr nsdata; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "domain"); - if (!node) - goto error; - - def = virDomainDefParseNode(ctxt->doc, node, - privconn->caps, privconn->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); - if (!def) - goto error; - - if (testDomainGenerateIfnames(def) < 0 || - !(obj = virDomainObjListAdd(privconn->domains, - def, - privconn->xmlopt, - 0, NULL))) { - virDomainDefFree(def); - goto error; - } - - if (testParseDomainSnapshots(privconn, obj, file, ctxt) < 0) { - virObjectUnlock(obj); - goto error; - } - - nsdata = def->namespaceData; - obj->persistent = !nsdata->transient; - obj->hasManagedSave = nsdata->hasManagedSave; - - if (nsdata->runstate != VIR_DOMAIN_SHUTOFF) { - if (testDomainStartState(privconn, obj, - VIR_DOMAIN_RUNNING_BOOTED) < 0) { - virObjectUnlock(obj); - goto error; - } - } else { - testDomainShutdownState(NULL, obj, 0); - } - virDomainObjSetState(obj, nsdata->runstate, 0); - - virObjectUnlock(obj); - } - - ret = 0; - error: - VIR_FREE(nodes); - return ret; -} - -static int -testParseNetworks(testDriverPtr privconn, - const char *file, - xmlXPathContextPtr ctxt) -{ - int num, ret = -1; - size_t i; - xmlNodePtr *nodes = NULL; - virNetworkObjPtr obj; - - num = virXPathNodeSet("/node/network", ctxt, &nodes); - if (num < 0) - goto error; - - for (i = 0; i < num; i++) { - virNetworkDefPtr def; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "network"); - if (!node) - goto error; - - def = virNetworkDefParseNode(ctxt->doc, node); - if (!def) - goto error; - - if (!(obj = virNetworkAssignDef(privconn->networks, def, 0))) { - virNetworkDefFree(def); - goto error; - } - - obj->active = 1; - virNetworkObjEndAPI(&obj); - } - - ret = 0; - error: - VIR_FREE(nodes); - return ret; -} - -static int -testParseInterfaces(testDriverPtr privconn, - const char *file, - xmlXPathContextPtr ctxt) -{ - int num, ret = -1; - size_t i; - xmlNodePtr *nodes = NULL; - virInterfaceObjPtr obj; - - num = virXPathNodeSet("/node/interface", ctxt, &nodes); - if (num < 0) - goto error; - - for (i = 0; i < num; i++) { - virInterfaceDefPtr def; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, - "interface"); - if (!node) - goto error; - - def = virInterfaceDefParseNode(ctxt->doc, node); - if (!def) - goto error; - - if (!(obj = virInterfaceAssignDef(&privconn->ifaces, def))) { - virInterfaceDefFree(def); - goto error; - } - - obj->active = 1; - virInterfaceObjUnlock(obj); - } - - ret = 0; - error: - VIR_FREE(nodes); - return ret; -} - -static int -testOpenVolumesForPool(const char *file, - xmlXPathContextPtr ctxt, - virStoragePoolObjPtr pool, - int poolidx) -{ - char *vol_xpath; - size_t i; - int num, ret = -1; - xmlNodePtr *nodes = NULL; - virStorageVolDefPtr def = NULL; - - /* Find storage volumes */ - if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0) - goto error; - - num = virXPathNodeSet(vol_xpath, ctxt, &nodes); - VIR_FREE(vol_xpath); - if (num < 0) - goto error; - - for (i = 0; i < num; i++) { - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, - "volume"); - if (!node) - goto error; - - def = virStorageVolDefParseNode(pool->def, ctxt->doc, node, 0); - if (!def) - goto error; - - if (def->target.path == NULL) { - if (virAsprintf(&def->target.path, "%s/%s", - pool->def->target.path, - def->name) == -1) - goto error; - } - - if (!def->key && VIR_STRDUP(def->key, def->target.path) < 0) - goto error; - if (VIR_APPEND_ELEMENT_COPY(pool->volumes.objs, pool->volumes.count, def) < 0) - goto error; - - pool->def->allocation += def->target.allocation; - pool->def->available = (pool->def->capacity - - pool->def->allocation); - def = NULL; - } - - ret = 0; - error: - virStorageVolDefFree(def); - VIR_FREE(nodes); - return ret; -} - -static int -testParseStorage(testDriverPtr privconn, - const char *file, - xmlXPathContextPtr ctxt) -{ - int num, ret = -1; - size_t i; - xmlNodePtr *nodes = NULL; - virStoragePoolObjPtr obj; - - num = virXPathNodeSet("/node/pool", ctxt, &nodes); - if (num < 0) - goto error; - - for (i = 0; i < num; i++) { - virStoragePoolDefPtr def; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, - "pool"); - if (!node) - goto error; - - def = virStoragePoolDefParseNode(ctxt->doc, node); - if (!def) - goto error; - - if (!(obj = virStoragePoolObjAssignDef(&privconn->pools, - def))) { - virStoragePoolDefFree(def); - goto error; - } - - if (testStoragePoolObjSetDefaults(obj) == -1) { - virStoragePoolObjUnlock(obj); - goto error; - } - obj->active = 1; - - /* Find storage volumes */ - if (testOpenVolumesForPool(file, ctxt, obj, i+1) < 0) { - virStoragePoolObjUnlock(obj); - goto error; - } - - virStoragePoolObjUnlock(obj); - } - - ret = 0; - error: - VIR_FREE(nodes); - return ret; -} - -static int -testParseNodedevs(testDriverPtr privconn, - const char *file, - xmlXPathContextPtr ctxt) -{ - int num, ret = -1; - size_t i; - xmlNodePtr *nodes = NULL; - virNodeDeviceObjPtr obj; - - num = virXPathNodeSet("/node/device", ctxt, &nodes); - if (num < 0) - goto error; - - for (i = 0; i < num; i++) { - virNodeDeviceDefPtr def; - xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, - "nodedev"); - if (!node) - goto error; - - def = virNodeDeviceDefParseNode(ctxt->doc, node, 0, NULL); - if (!def) - goto error; - - if (!(obj = virNodeDeviceAssignDef(&privconn->devs, def))) { - virNodeDeviceDefFree(def); - goto error; - } - - virNodeDeviceObjUnlock(obj); - } - - ret = 0; - error: - VIR_FREE(nodes); - return ret; -} - -static int -testParseAuthUsers(testDriverPtr privconn, - xmlXPathContextPtr ctxt) -{ - int num, ret = -1; - size_t i; - xmlNodePtr *nodes = NULL; - - num = virXPathNodeSet("/node/auth/user", ctxt, &nodes); - if (num < 0) - goto error; - - privconn->numAuths = num; - if (num && VIR_ALLOC_N(privconn->auths, num) < 0) - goto error; - - for (i = 0; i < num; i++) { - char *username, *password; - - ctxt->node = nodes[i]; - username = virXPathString("string(.)", ctxt); - if (!username || STREQ(username, "")) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing username in /node/auth/user field")); - VIR_FREE(username); - goto error; - } - /* This field is optional. */ - password = virXMLPropString(nodes[i], "password"); - - privconn->auths[i].username = username; - privconn->auths[i].password = password; - } - - ret = 0; - error: - VIR_FREE(nodes); - return ret; -} - -static int -testOpenParse(testDriverPtr privconn, - const char *file, - xmlXPathContextPtr ctxt) -{ - if (!xmlStrEqual(ctxt->node->name, BAD_CAST "node")) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Root element is not 'node'")); - goto error; - } - - if (testParseNodeInfo(&privconn->nodeInfo, ctxt) < 0) - goto error; - if (testParseDomains(privconn, file, ctxt) < 0) - goto error; - if (testParseNetworks(privconn, file, ctxt) < 0) - goto error; - if (testParseInterfaces(privconn, file, ctxt) < 0) - goto error; - if (testParseStorage(privconn, file, ctxt) < 0) - goto error; - if (testParseNodedevs(privconn, file, ctxt) < 0) - goto error; - if (testParseAuthUsers(privconn, ctxt) < 0) - goto error; +unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ull); +unsigned long long defaultPoolAlloc; - return 0; - error: - return -1; -} +int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool); +int testNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info); /* No shared state between simultaneous test connections initialized * from a file. */ -static int -testOpenFromFile(virConnectPtr conn, const char *file) -{ - xmlDocPtr doc = NULL; - xmlXPathContextPtr ctxt = NULL; - testDriverPtr privconn; - - if (!(privconn = testDriverNew())) - return VIR_DRV_OPEN_ERROR; - - testDriverLock(privconn); - conn->privateData = privconn; - - if (!(privconn->caps = testBuildCapabilities(conn))) - goto error; - - if (!(doc = virXMLParseFileCtxt(file, &ctxt))) - goto error; - - privconn->numCells = 0; - memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo)); - - if (testOpenParse(privconn, file, ctxt) < 0) - goto error; - - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); - testDriverUnlock(privconn); - - return 0; - - error: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); - testDriverFree(privconn); - conn->privateData = NULL; - return VIR_DRV_OPEN_ERROR; -} - -/* Simultaneous test:///default connections should share the same - * common state (among other things, this allows testing event - * detection in one connection for an action caused in another). */ -static int -testOpenDefault(virConnectPtr conn) -{ - int u; - testDriverPtr privconn = NULL; - xmlDocPtr doc = NULL; - xmlXPathContextPtr ctxt = NULL; - - virMutexLock(&defaultLock); - if (defaultConnections++) { - conn->privateData = defaultConn; - virMutexUnlock(&defaultLock); - return VIR_DRV_OPEN_SUCCESS; - } - - if (!(privconn = testDriverNew())) - goto error; - - conn->privateData = privconn; - - memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo)); - - /* Numa setup */ - privconn->numCells = 2; - for (u = 0; u < privconn->numCells; ++u) { - privconn->cells[u].numCpus = 8; - privconn->cells[u].mem = (u + 1) * 2048 * 1024; - privconn->cells[u].freeMem = (u + 1) * 1024 * 1024; - } - for (u = 0; u < 16; u++) { - virBitmapPtr siblings = virBitmapNew(16); - if (!siblings) - goto error; - ignore_value(virBitmapSetBit(siblings, u)); - privconn->cells[u / 8].cpus[(u % 8)].id = u; - privconn->cells[u / 8].cpus[(u % 8)].socket_id = u / 8; - privconn->cells[u / 8].cpus[(u % 8)].core_id = u % 8; - privconn->cells[u / 8].cpus[(u % 8)].siblings = siblings; - } - - if (!(privconn->caps = testBuildCapabilities(conn))) - goto error; - - if (!(doc = virXMLParseStringCtxt(defaultConnXML, - _("(test driver)"), &ctxt))) - goto error; - - if (testOpenParse(privconn, NULL, ctxt) < 0) - goto error; - - defaultConn = privconn; - - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); - virMutexUnlock(&defaultLock); - - return VIR_DRV_OPEN_SUCCESS; - - error: - testDriverFree(privconn); - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); - conn->privateData = NULL; - defaultConnections--; - virMutexUnlock(&defaultLock); - return VIR_DRV_OPEN_ERROR; -} - -static int -testConnectAuthenticate(virConnectPtr conn, - virConnectAuthPtr auth) -{ - testDriverPtr privconn = conn->privateData; - int ret = -1; - ssize_t i; - char *username = NULL, *password = NULL; - - if (privconn->numAuths == 0) - return 0; - - /* Authentication is required because the test XML contains a - * non-empty <auth/> section. First we must ask for a username. - */ - username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/); - if (!username) { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed when asking for username")); - goto cleanup; - } - - /* Does the username exist? */ - for (i = 0; i < privconn->numAuths; ++i) { - if (STREQ(privconn->auths[i].username, username)) - goto found_user; - } - i = -1; - - found_user: - /* Even if we didn't find the user, we still ask for a password. */ - if (i == -1 || privconn->auths[i].password != NULL) { - password = virAuthGetPassword(conn, auth, "test", - username, "localhost"); - if (password == NULL) { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed when asking for password")); - goto cleanup; - } - } - - if (i == -1 || - (password && STRNEQ(privconn->auths[i].password, password))) { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed, see test XML for the correct username/password")); - goto cleanup; - } - - ret = 0; - cleanup: - VIR_FREE(username); - VIR_FREE(password); - return ret; -} - -static virDrvOpenStatus testConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth, - virConfPtr conf ATTRIBUTE_UNUSED, - unsigned int flags) -{ - int ret; - - virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - - if (!conn->uri) - return VIR_DRV_OPEN_DECLINED; - - if (!conn->uri->scheme || STRNEQ(conn->uri->scheme, "test")) - return VIR_DRV_OPEN_DECLINED; - - /* Remote driver should handle these. */ - if (conn->uri->server) - return VIR_DRV_OPEN_DECLINED; - - /* From this point on, the connection is for us. */ - if (!conn->uri->path - || conn->uri->path[0] == '\0' - || (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("testOpen: supply a path or use test:///default")); - return VIR_DRV_OPEN_ERROR; - } - - if (STREQ(conn->uri->path, "/default")) - ret = testOpenDefault(conn); - else - ret = testOpenFromFile(conn, - conn->uri->path); - - if (ret != VIR_DRV_OPEN_SUCCESS) - return ret; - - /* Fake authentication. */ - if (testConnectAuthenticate(conn, auth) < 0) - return VIR_DRV_OPEN_ERROR; - - return VIR_DRV_OPEN_SUCCESS; -} - -static int testConnectClose(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - bool dflt = false; - - if (privconn == defaultConn) { - dflt = true; - virMutexLock(&defaultLock); - if (--defaultConnections) { - virMutexUnlock(&defaultLock); - return 0; - } - } - - testDriverLock(privconn); - testDriverFree(privconn); - - if (dflt) { - defaultConn = NULL; - virMutexUnlock(&defaultLock); - } - - conn->privateData = NULL; - return 0; -} - -static int testConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, - unsigned long *hvVer) -{ - *hvVer = 2; - return 0; -} - -static char *testConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - return virGetHostname(); -} - - -static int testConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - return 1; -} - -static int testConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - return 0; -} - -static int testConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - return 1; -} - -static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *type ATTRIBUTE_UNUSED) -{ - return 32; -} - -static char * -testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, - const char **xmlCPUs, - unsigned int ncpus, - unsigned int flags) -{ - char *cpu; - - virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL); - - cpu = cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); - - return cpu; -} - -static int testNodeGetInfo(virConnectPtr conn, - virNodeInfoPtr info) -{ - testDriverPtr privconn = conn->privateData; - testDriverLock(privconn); - memcpy(info, &privconn->nodeInfo, sizeof(virNodeInfo)); - testDriverUnlock(privconn); - return 0; -} - -static char *testConnectGetCapabilities(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - char *xml; - testDriverLock(privconn); - xml = virCapabilitiesFormatXML(privconn->caps); - testDriverUnlock(privconn); - return xml; -} - -static char * -testConnectGetSysinfo(virConnectPtr conn ATTRIBUTE_UNUSED, - unsigned int flags) -{ - char *ret; - const char *sysinfo = "<sysinfo type='smbios'>\n" - " <bios>\n" - " <entry name='vendor'>LENOVO</entry>\n" - " <entry name='version'>G4ETA1WW (2.61 )</entry>\n" - " <entry name='date'>05/07/2014</entry>\n" - " <entry name='release'>2.61</entry>\n" - " </bios>\n" - "</sysinfo>\n"; - - virCheckFlags(0, NULL); - - ignore_value(VIR_STRDUP(ret, sysinfo)); - return ret; -} - -static const char * -testConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - return "TEST"; -} - -static int testConnectNumOfDomains(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - int count; - - testDriverLock(privconn); - count = virDomainObjListNumOfDomains(privconn->domains, true, NULL, NULL); - testDriverUnlock(privconn); - - return count; -} - -static int testDomainIsActive(virDomainPtr dom) -{ - virDomainObjPtr obj; - int ret; - - if (!(obj = testDomObjFromDomain(dom))) - return -1; - - ret = virDomainObjIsActive(obj); - virDomainObjEndAPI(&obj); - return ret; -} - -static int testDomainIsPersistent(virDomainPtr dom) -{ - virDomainObjPtr obj; - int ret; - - if (!(obj = testDomObjFromDomain(dom))) - return -1; - - ret = obj->persistent; - - virDomainObjEndAPI(&obj); - return ret; -} - -static int testDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) -{ - return 0; -} - -static virDomainPtr -testDomainCreateXML(virConnectPtr conn, const char *xml, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - virDomainPtr ret = NULL; - virDomainDefPtr def; - virDomainObjPtr dom = NULL; - virObjectEventPtr event = NULL; - unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; - - virCheckFlags(VIR_DOMAIN_START_VALIDATE, NULL); - - if (flags & VIR_DOMAIN_START_VALIDATE) - parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; - - testDriverLock(privconn); - if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, - parse_flags)) == NULL) - goto cleanup; - - if (testDomainGenerateIfnames(def) < 0) - goto cleanup; - if (!(dom = virDomainObjListAdd(privconn->domains, - def, - privconn->xmlopt, - VIR_DOMAIN_OBJ_LIST_ADD_LIVE | - VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, - NULL))) - goto cleanup; - def = NULL; - - if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_BOOTED) < 0) { - if (!dom->persistent) { - virDomainObjListRemove(privconn->domains, dom); - dom = NULL; - } - goto cleanup; - } - - event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); - - ret = virGetDomain(conn, dom->def->name, dom->def->uuid); - if (ret) - ret->id = dom->def->id; - - cleanup: - if (dom) - virObjectUnlock(dom); - testObjectEventQueue(privconn, event); - virDomainDefFree(def); - testDriverUnlock(privconn); - return ret; -} - - -static virDomainPtr testDomainLookupByID(virConnectPtr conn, - int id) -{ - testDriverPtr privconn = conn->privateData; - virDomainPtr ret = NULL; - virDomainObjPtr dom; - - if (!(dom = virDomainObjListFindByID(privconn->domains, id))) { - virReportError(VIR_ERR_NO_DOMAIN, NULL); - goto cleanup; - } - - ret = virGetDomain(conn, dom->def->name, dom->def->uuid); - if (ret) - ret->id = dom->def->id; - - cleanup: - if (dom) - virObjectUnlock(dom); - return ret; -} - -static virDomainPtr testDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) -{ - testDriverPtr privconn = conn->privateData; - virDomainPtr ret = NULL; - virDomainObjPtr dom; - - if (!(dom = virDomainObjListFindByUUID(privconn->domains, uuid))) { - virReportError(VIR_ERR_NO_DOMAIN, NULL); - goto cleanup; - } - - ret = virGetDomain(conn, dom->def->name, dom->def->uuid); - if (ret) - ret->id = dom->def->id; - - cleanup: - if (dom) - virObjectUnlock(dom); - return ret; -} - -static virDomainPtr testDomainLookupByName(virConnectPtr conn, - const char *name) -{ - testDriverPtr privconn = conn->privateData; - virDomainPtr ret = NULL; - virDomainObjPtr dom; - - if (!(dom = virDomainObjListFindByName(privconn->domains, name))) { - virReportError(VIR_ERR_NO_DOMAIN, NULL); - goto cleanup; - } - - ret = virGetDomain(conn, dom->def->name, dom->def->uuid); - if (ret) - ret->id = dom->def->id; - - cleanup: - virDomainObjEndAPI(&dom); - return ret; -} - -static int testConnectListDomains(virConnectPtr conn, - int *ids, - int maxids) -{ - testDriverPtr privconn = conn->privateData; - - return virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, - NULL, NULL); -} - -static int testDomainDestroy(virDomainPtr domain) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_DESTROYED); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_DESTROYED); - - if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); - - ret = 0; - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int testDomainResume(virDomainPtr domain) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - if (virDomainObjGetState(privdom, NULL) != VIR_DOMAIN_PAUSED) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not paused"), - domain->name); - goto cleanup; - } - - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_UNPAUSED); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_RESUMED, - VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int testDomainSuspend(virDomainPtr domain) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - int state; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - state = virDomainObjGetState(privdom, NULL); - if (state == VIR_DOMAIN_SHUTOFF || state == VIR_DOMAIN_PAUSED) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not running"), - domain->name); - goto cleanup; - } - - virDomainObjSetState(privdom, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int testDomainShutdownFlags(virDomainPtr domain, - unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - virCheckFlags(0, -1); - - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("domain '%s' not running"), domain->name); - goto cleanup; - } - - testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); - - if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); - - ret = 0; - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int testDomainShutdown(virDomainPtr domain) -{ - return testDomainShutdownFlags(domain, 0); -} - -/* Similar behaviour as shutdown */ -static int testDomainReboot(virDomainPtr domain, - unsigned int action ATTRIBUTE_UNUSED) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, - VIR_DOMAIN_SHUTDOWN_USER); - - switch (privdom->def->onReboot) { - case VIR_DOMAIN_LIFECYCLE_DESTROY: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_RESTART: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - case VIR_DOMAIN_LIFECYCLE_PRESERVE: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - - case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME: - virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, - VIR_DOMAIN_RUNNING_BOOTED); - break; - - default: - virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, - VIR_DOMAIN_SHUTOFF_SHUTDOWN); - break; - } - - if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { - testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); - - if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); - } - - ret = 0; - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int testDomainGetInfo(virDomainPtr domain, - virDomainInfoPtr info) -{ - struct timeval tv; - virDomainObjPtr privdom; - int ret = -1; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - if (gettimeofday(&tv, NULL) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("getting time of day")); - goto cleanup; - } - - info->state = virDomainObjGetState(privdom, NULL); - info->memory = privdom->def->mem.cur_balloon; - info->maxMem = virDomainDefGetMemoryTotal(privdom->def); - info->nrVirtCpu = virDomainDefGetVcpus(privdom->def); - info->cpuTime = ((tv.tv_sec * 1000ll * 1000ll * 1000ll) + (tv.tv_usec * 1000ll)); - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - return ret; -} - -static int -testDomainGetState(virDomainPtr domain, - int *state, - int *reason, - unsigned int flags) -{ - virDomainObjPtr privdom; - - virCheckFlags(0, -1); - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - *state = virDomainObjGetState(privdom, reason); - - virDomainObjEndAPI(&privdom); - - return 0; -} - -#define TEST_SAVE_MAGIC "TestGuestMagic" - -static int -testDomainSaveFlags(virDomainPtr domain, const char *path, - const char *dxml, unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - char *xml = NULL; - int fd = -1; - int len; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - virCheckFlags(0, -1); - if (dxml) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); - return -1; - } - - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - xml = virDomainDefFormat(privdom->def, privconn->caps, - VIR_DOMAIN_DEF_FORMAT_SECURE); - - if (xml == NULL) { - virReportSystemError(errno, - _("saving domain '%s' failed to allocate space for metadata"), - domain->name); - goto cleanup; - } - - if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { - virReportSystemError(errno, - _("saving domain '%s' to '%s': open failed"), - domain->name, path); - goto cleanup; - } - len = strlen(xml); - if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { - virReportSystemError(errno, - _("saving domain '%s' to '%s': write failed"), - domain->name, path); - goto cleanup; - } - if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { - virReportSystemError(errno, - _("saving domain '%s' to '%s': write failed"), - domain->name, path); - goto cleanup; - } - if (safewrite(fd, xml, len) < 0) { - virReportSystemError(errno, - _("saving domain '%s' to '%s': write failed"), - domain->name, path); - goto cleanup; - } - - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, - _("saving domain '%s' to '%s': write failed"), - domain->name, path); - goto cleanup; - } - fd = -1; - - testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SAVED); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SAVED); - - if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); - - ret = 0; - cleanup: - VIR_FREE(xml); - - /* Don't report failure in close or unlink, because - * in either case we're already in a failure scenario - * and have reported a earlier error */ - if (ret != 0) { - VIR_FORCE_CLOSE(fd); - unlink(path); - } - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int -testDomainSave(virDomainPtr domain, - const char *path) -{ - return testDomainSaveFlags(domain, path, NULL, 0); -} - -static int -testDomainRestoreFlags(virConnectPtr conn, - const char *path, - const char *dxml, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - char *xml = NULL; - char magic[15]; - int fd = -1; - int len; - virDomainDefPtr def = NULL; - virDomainObjPtr dom = NULL; - virObjectEventPtr event = NULL; - int ret = -1; - - virCheckFlags(0, -1); - if (dxml) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); - return -1; - } - - if ((fd = open(path, O_RDONLY)) < 0) { - virReportSystemError(errno, - _("cannot read domain image '%s'"), - path); - goto cleanup; - } - if (saferead(fd, magic, sizeof(magic)) != sizeof(magic)) { - virReportSystemError(errno, - _("incomplete save header in '%s'"), - path); - goto cleanup; - } - if (memcmp(magic, TEST_SAVE_MAGIC, sizeof(magic))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("mismatched header magic")); - goto cleanup; - } - if (saferead(fd, (char*)&len, sizeof(len)) != sizeof(len)) { - virReportSystemError(errno, - _("failed to read metadata length in '%s'"), - path); - goto cleanup; - } - if (len < 1 || len > 8192) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("length of metadata out of range")); - goto cleanup; - } - if (VIR_ALLOC_N(xml, len+1) < 0) - goto cleanup; - if (saferead(fd, xml, len) != len) { - virReportSystemError(errno, - _("incomplete metadata in '%s'"), path); - goto cleanup; - } - xml[len] = '\0'; - - def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); - if (!def) - goto cleanup; - - if (testDomainGenerateIfnames(def) < 0) - goto cleanup; - if (!(dom = virDomainObjListAdd(privconn->domains, - def, - privconn->xmlopt, - VIR_DOMAIN_OBJ_LIST_ADD_LIVE | - VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, - NULL))) - goto cleanup; - def = NULL; - - if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_RESTORED) < 0) { - if (!dom->persistent) { - virDomainObjListRemove(privconn->domains, dom); - dom = NULL; - } - goto cleanup; - } - - event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_RESTORED); - ret = 0; - - cleanup: - virDomainDefFree(def); - VIR_FREE(xml); - VIR_FORCE_CLOSE(fd); - if (dom) - virObjectUnlock(dom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int -testDomainRestore(virConnectPtr conn, - const char *path) -{ - return testDomainRestoreFlags(conn, path, NULL, 0); -} - -static int testDomainCoreDumpWithFormat(virDomainPtr domain, - const char *to, - unsigned int dumpformat, - unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - int fd = -1; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - virCheckFlags(VIR_DUMP_CRASH, -1); - - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { - virReportSystemError(errno, - _("domain '%s' coredump: failed to open %s"), - domain->name, to); - goto cleanup; - } - if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { - virReportSystemError(errno, - _("domain '%s' coredump: failed to write header to %s"), - domain->name, to); - goto cleanup; - } - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, - _("domain '%s' coredump: write failed: %s"), - domain->name, to); - goto cleanup; - } - - /* we don't support non-raw formats in test driver */ - if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("kdump-compressed format is not supported here")); - goto cleanup; - } - - if (flags & VIR_DUMP_CRASH) { - testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_CRASHED); - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_CRASHED); - if (!privdom->persistent) - virDomainObjListRemove(privconn->domains, privdom); - } - - ret = 0; - cleanup: - VIR_FORCE_CLOSE(fd); - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - - -static int -testDomainCoreDump(virDomainPtr domain, - const char *to, - unsigned int flags) -{ - return testDomainCoreDumpWithFormat(domain, to, - VIR_DOMAIN_CORE_DUMP_FORMAT_RAW, flags); -} - - -static char * -testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) -{ - char *ret; - - ignore_value(VIR_STRDUP(ret, "linux")); - return ret; -} - - -static unsigned long long -testDomainGetMaxMemory(virDomainPtr domain) -{ - virDomainObjPtr privdom; - unsigned long long ret = 0; - - if (!(privdom = testDomObjFromDomain(domain))) - return 0; - - ret = virDomainDefGetMemoryTotal(privdom->def); - - virDomainObjEndAPI(&privdom); - return ret; -} - -static int testDomainSetMaxMemory(virDomainPtr domain, - unsigned long memory) -{ - virDomainObjPtr privdom; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - /* XXX validate not over host memory wrt to other domains */ - virDomainDefSetMemoryTotal(privdom->def, memory); - - virDomainObjEndAPI(&privdom); - return 0; -} - -static int testDomainSetMemory(virDomainPtr domain, - unsigned long memory) -{ - virDomainObjPtr privdom; - int ret = -1; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - if (memory > virDomainDefGetMemoryTotal(privdom->def)) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - privdom->def->mem.cur_balloon = memory; - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - return ret; -} - -static int -testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) -{ - virDomainObjPtr vm; - virDomainDefPtr def; - int ret = -1; - - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG | - VIR_DOMAIN_VCPU_MAXIMUM, -1); - - if (!(vm = testDomObjFromDomain(domain))) - return -1; - - if (!(def = virDomainObjGetOneDef(vm, flags))) - goto cleanup; - - if (flags & VIR_DOMAIN_VCPU_MAXIMUM) - ret = virDomainDefGetVcpusMax(def); - else - ret = virDomainDefGetVcpus(def); - - cleanup: - virDomainObjEndAPI(&vm); - return ret; -} - -static int -testDomainGetMaxVcpus(virDomainPtr domain) -{ - return testDomainGetVcpusFlags(domain, (VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_VCPU_MAXIMUM)); -} - -static int -testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, - unsigned int flags) -{ - testDriverPtr driver = domain->conn->privateData; - virDomainObjPtr privdom = NULL; - virDomainDefPtr def; - virDomainDefPtr persistentDef; - int ret = -1, maxvcpus; - - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG | - VIR_DOMAIN_VCPU_MAXIMUM, -1); - - if ((maxvcpus = testConnectGetMaxVcpus(domain->conn, NULL)) < 0) - return -1; - - if (nrCpus > maxvcpus) { - virReportError(VIR_ERR_INVALID_ARG, - _("requested cpu amount exceeds maximum supported amount " - "(%d > %d)"), nrCpus, maxvcpus); - return -1; - } - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - if (virDomainObjGetDefs(privdom, flags, &def, &persistentDef) < 0) - goto cleanup; - - if (def && virDomainDefGetVcpusMax(def) < nrCpus) { - virReportError(VIR_ERR_INVALID_ARG, - _("requested cpu amount exceeds maximum (%d > %d)"), - nrCpus, virDomainDefGetVcpusMax(def)); - goto cleanup; - } - - if (persistentDef && - !(flags & VIR_DOMAIN_VCPU_MAXIMUM) && - virDomainDefGetVcpusMax(persistentDef) < nrCpus) { - virReportError(VIR_ERR_INVALID_ARG, - _("requested cpu amount exceeds maximum (%d > %d)"), - nrCpus, virDomainDefGetVcpusMax(persistentDef)); - goto cleanup; - } - - if (def && - virDomainDefSetVcpus(def, nrCpus) < 0) - goto cleanup; - - if (persistentDef) { - if (flags & VIR_DOMAIN_VCPU_MAXIMUM) { - if (virDomainDefSetVcpusMax(persistentDef, nrCpus, - driver->xmlopt) < 0) - goto cleanup; - } else { - if (virDomainDefSetVcpus(persistentDef, nrCpus) < 0) - goto cleanup; - } - } - - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - return ret; -} - -static int -testDomainSetVcpus(virDomainPtr domain, unsigned int nrCpus) -{ - return testDomainSetVcpusFlags(domain, nrCpus, VIR_DOMAIN_AFFECT_LIVE); -} - -static int testDomainGetVcpus(virDomainPtr domain, - virVcpuInfoPtr info, - int maxinfo, - unsigned char *cpumaps, - int maplen) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virDomainDefPtr def; - size_t i; - int maxcpu, hostcpus; - int ret = -1; - struct timeval tv; - unsigned long long statbase; - virBitmapPtr allcpumap = NULL; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - if (!virDomainObjIsActive(privdom)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot list vcpus for an inactive domain")); - goto cleanup; - } - - def = privdom->def; - - if (gettimeofday(&tv, NULL) < 0) { - virReportSystemError(errno, - "%s", _("getting time of day")); - goto cleanup; - } - - statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; - - hostcpus = VIR_NODEINFO_MAXCPUS(privconn->nodeInfo); - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; - - if (!(allcpumap = virBitmapNew(hostcpus))) - goto cleanup; - - virBitmapSetAll(allcpumap); - - /* Clamp to actual number of vcpus */ - if (maxinfo > virDomainDefGetVcpus(privdom->def)) - maxinfo = virDomainDefGetVcpus(privdom->def); - - memset(info, 0, sizeof(*info) * maxinfo); - memset(cpumaps, 0, maxinfo * maplen); - - for (i = 0; i < maxinfo; i++) { - virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(def, i); - virBitmapPtr bitmap = NULL; - - if (!vcpu->online) - continue; - - if (vcpu->cpumask) - bitmap = vcpu->cpumask; - else if (def->cpumask) - bitmap = def->cpumask; - else - bitmap = allcpumap; - - if (cpumaps) - virBitmapToDataBuf(bitmap, VIR_GET_CPUMAP(cpumaps, maplen, i), maplen); - - info[i].number = i; - info[i].state = VIR_VCPU_RUNNING; - info[i].cpu = virBitmapLastSetBit(bitmap); - - /* Fake an increasing cpu time value */ - info[i].cpuTime = statbase / 10; - } - - ret = maxinfo; - cleanup: - virBitmapFree(allcpumap); - virDomainObjEndAPI(&privdom); - return ret; -} - -static int testDomainPinVcpu(virDomainPtr domain, - unsigned int vcpu, - unsigned char *cpumap, - int maplen) -{ - virDomainVcpuDefPtr vcpuinfo; - virDomainObjPtr privdom; - virDomainDefPtr def; - int ret = -1; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - def = privdom->def; - - if (!virDomainObjIsActive(privdom)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot pin vcpus on an inactive domain")); - goto cleanup; - } - - if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu)) || - !vcpuinfo->online) { - virReportError(VIR_ERR_INVALID_ARG, - _("requested vcpu '%d' is not present in the domain"), - vcpu); - goto cleanup; - } - - virBitmapFree(vcpuinfo->cpumask); - - if (!(vcpuinfo->cpumask = virBitmapNewData(cpumap, maplen))) - goto cleanup; - - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - return ret; -} - -static int -testDomainGetVcpuPinInfo(virDomainPtr dom, - int ncpumaps, - unsigned char *cpumaps, - int maplen, - unsigned int flags) -{ - testDriverPtr driver = dom->conn->privateData; - virDomainObjPtr privdom; - virDomainDefPtr def; - int ret = -1; - - if (!(privdom = testDomObjFromDomain(dom))) - return -1; - - if (!(def = virDomainObjGetOneDef(privdom, flags))) - goto cleanup; - - ret = virDomainDefGetVcpuPinInfoHelper(def, maplen, ncpumaps, cpumaps, - VIR_NODEINFO_MAXCPUS(driver->nodeInfo), - NULL); - - cleanup: - virDomainObjEndAPI(&privdom); - return ret; -} - -static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainDefPtr def; - virDomainObjPtr privdom; - char *ret = NULL; - - /* Flags checked by virDomainDefFormat */ - - if (!(privdom = testDomObjFromDomain(domain))) - return NULL; - - def = (flags & VIR_DOMAIN_XML_INACTIVE) && - privdom->newDef ? privdom->newDef : privdom->def; - - ret = virDomainDefFormat(def, privconn->caps, - virDomainDefFormatConvertXMLFlags(flags)); - - virDomainObjEndAPI(&privdom); - return ret; -} - -static int testConnectNumOfDefinedDomains(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - - return virDomainObjListNumOfDomains(privconn->domains, false, NULL, NULL); -} - -static int testConnectListDefinedDomains(virConnectPtr conn, - char **const names, - int maxnames) -{ - - testDriverPtr privconn = conn->privateData; - - memset(names, 0, sizeof(*names)*maxnames); - return virDomainObjListGetInactiveNames(privconn->domains, names, maxnames, - NULL, NULL); -} - -static virDomainPtr testDomainDefineXMLFlags(virConnectPtr conn, - const char *xml, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - virDomainPtr ret = NULL; - virDomainDefPtr def; - virDomainObjPtr dom = NULL; - virObjectEventPtr event = NULL; - virDomainDefPtr oldDef = NULL; - unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; - - virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); - - if (flags & VIR_DOMAIN_DEFINE_VALIDATE) - parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; - - if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, - parse_flags)) == NULL) - goto cleanup; - - if (testDomainGenerateIfnames(def) < 0) - goto cleanup; - if (!(dom = virDomainObjListAdd(privconn->domains, - def, - privconn->xmlopt, - 0, - &oldDef))) - goto cleanup; - def = NULL; - dom->persistent = 1; - - event = virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_DEFINED, - !oldDef ? - VIR_DOMAIN_EVENT_DEFINED_ADDED : - VIR_DOMAIN_EVENT_DEFINED_UPDATED); - - ret = virGetDomain(conn, dom->def->name, dom->def->uuid); - if (ret) - ret->id = dom->def->id; - - cleanup: - virDomainDefFree(def); - virDomainDefFree(oldDef); - if (dom) - virObjectUnlock(dom); - testObjectEventQueue(privconn, event); - return ret; -} - -static virDomainPtr -testDomainDefineXML(virConnectPtr conn, const char *xml) -{ - return testDomainDefineXMLFlags(conn, xml, 0); -} - -static char *testDomainGetMetadata(virDomainPtr dom, - int type, - const char *uri, - unsigned int flags) -{ - virDomainObjPtr privdom; - char *ret; - - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, NULL); - - if (!(privdom = testDomObjFromDomain(dom))) - return NULL; - - ret = virDomainObjGetMetadata(privdom, type, uri, flags); - - virDomainObjEndAPI(&privdom); - return ret; -} - -static int testDomainSetMetadata(virDomainPtr dom, - int type, - const char *metadata, - const char *key, - const char *uri, - unsigned int flags) -{ - testDriverPtr privconn = dom->conn->privateData; - virDomainObjPtr privdom; - int ret; - - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); - - if (!(privdom = testDomObjFromDomain(dom))) - return -1; - - ret = virDomainObjSetMetadata(privdom, type, metadata, key, uri, - privconn->caps, privconn->xmlopt, - NULL, NULL, flags); - - virDomainObjEndAPI(&privdom); - return ret; -} - - -static int testNodeGetCellsFreeMemory(virConnectPtr conn, - unsigned long long *freemems, - int startCell, int maxCells) -{ - testDriverPtr privconn = conn->privateData; - int cell; - size_t i; - int ret = -1; - - testDriverLock(privconn); - if (startCell > privconn->numCells) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("Range exceeds available cells")); - goto cleanup; - } - - for (cell = startCell, i = 0; - (cell < privconn->numCells && i < maxCells); - ++cell, ++i) { - freemems[i] = privconn->cells[cell].mem; - } - ret = i; - - cleanup: - testDriverUnlock(privconn); - return ret; -} - -#define TEST_NB_CPU_STATS 4 - -static int -testNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, - int cpuNum ATTRIBUTE_UNUSED, - virNodeCPUStatsPtr params, - int *nparams, - unsigned int flags) -{ - size_t i = 0; - - virCheckFlags(0, -1); - - if (params == NULL) { - *nparams = TEST_NB_CPU_STATS; - return 0; - } - - for (i = 0; i < *nparams && i < 4; i++) { - switch (i) { - case 0: - if (virHostCPUStatsAssign(&params[i], - VIR_NODE_CPU_STATS_USER, 9797400000) < 0) - return -1; - break; - case 1: - if (virHostCPUStatsAssign(&params[i], - VIR_NODE_CPU_STATS_KERNEL, 34678723400000) < 0) - return -1; - break; - case 2: - if (virHostCPUStatsAssign(&params[i], - VIR_NODE_CPU_STATS_IDLE, 87264900000) < 0) - return -1; - break; - case 3: - if (virHostCPUStatsAssign(&params[i], - VIR_NODE_CPU_STATS_IOWAIT, 763600000) < 0) - return -1; - break; - } - } - - *nparams = i; - return 0; -} - -static unsigned long long -testNodeGetFreeMemory(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - unsigned int freeMem = 0; - size_t i; - - testDriverLock(privconn); - - for (i = 0; i < privconn->numCells; i++) - freeMem += privconn->cells[i].freeMem; - - testDriverUnlock(privconn); - return freeMem; -} - -static int -testNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, - unsigned int npages, - unsigned int *pages ATTRIBUTE_UNUSED, - int startCell ATTRIBUTE_UNUSED, - unsigned int cellCount, - unsigned long long *counts, - unsigned int flags) -{ - size_t i = 0, j = 0; - int x = 6; - - virCheckFlags(0, -1); - - for (i = 0; i < cellCount; i++) { - for (j = 0; j < npages; j++) { - x = x * 2 + 7; - counts[(i * npages) + j] = x; - } - } - - return 0; -} - -static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - if (virDomainObjGetState(privdom, NULL) != VIR_DOMAIN_SHUTOFF) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain '%s' is already running"), domain->name); - goto cleanup; - } - - if (testDomainStartState(privconn, privdom, - VIR_DOMAIN_RUNNING_BOOTED) < 0) - goto cleanup; - domain->id = privdom->def->id; - - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - testDriverUnlock(privconn); - return ret; -} - -static int testDomainCreate(virDomainPtr domain) -{ - return testDomainCreateWithFlags(domain, 0); -} - -static int testDomainUndefineFlags(virDomainPtr domain, - unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr privdom; - virObjectEventPtr event = NULL; - int nsnapshots; - int ret = -1; - - virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | - VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, -1); - - - if (!(privdom = testDomObjFromDomain(domain))) - goto cleanup; - - if (privdom->hasManagedSave && - !(flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Refusing to undefine while domain managed " - "save image exists")); - goto cleanup; - } - - /* Requiring an inactive VM is part of the documented API for - * UNDEFINE_SNAPSHOTS_METADATA - */ - if (!virDomainObjIsActive(privdom) && - (nsnapshots = virDomainSnapshotObjListNum(privdom->snapshots, - NULL, 0))) { - if (!(flags & VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("cannot delete inactive domain with %d " - "snapshots"), - nsnapshots); - goto cleanup; - } - - /* There isn't actually anything to do, we are just emulating qemu - * behavior here. */ - } - - event = virDomainEventLifecycleNewFromObj(privdom, - VIR_DOMAIN_EVENT_UNDEFINED, - VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); - privdom->hasManagedSave = false; - - if (virDomainObjIsActive(privdom)) - privdom->persistent = 0; - else - virDomainObjListRemove(privconn->domains, privdom); - - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - testObjectEventQueue(privconn, event); - return ret; -} - -static int testDomainUndefine(virDomainPtr domain) -{ - return testDomainUndefineFlags(domain, 0); -} - -static int testDomainGetAutostart(virDomainPtr domain, - int *autostart) -{ - virDomainObjPtr privdom; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - *autostart = privdom->autostart; - - virDomainObjEndAPI(&privdom); - return 0; -} - - -static int testDomainSetAutostart(virDomainPtr domain, - int autostart) -{ - virDomainObjPtr privdom; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - privdom->autostart = autostart ? 1 : 0; - - virDomainObjEndAPI(&privdom); - return 0; -} - -static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, - int *nparams) -{ - char *type = NULL; - - if (nparams) - *nparams = 1; - - ignore_value(VIR_STRDUP(type, "fair")); - - return type; -} - -static int -testDomainGetSchedulerParametersFlags(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) -{ - virDomainObjPtr privdom; - int ret = -1; - - virCheckFlags(0, -1); - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - if (virTypedParameterAssign(params, VIR_DOMAIN_SCHEDULER_WEIGHT, - VIR_TYPED_PARAM_UINT, 50) < 0) - goto cleanup; - /* XXX */ - /*params[0].value.ui = privdom->weight;*/ - - *nparams = 1; - ret = 0; - - cleanup: - virDomainObjEndAPI(&privdom); - return ret; -} - -static int -testDomainGetSchedulerParameters(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams) -{ - return testDomainGetSchedulerParametersFlags(domain, params, nparams, 0); -} - -static int -testDomainSetSchedulerParametersFlags(virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags) -{ - virDomainObjPtr privdom; - int ret = -1; - size_t i; - - virCheckFlags(0, -1); - if (virTypedParamsValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_WEIGHT, - VIR_TYPED_PARAM_UINT, - NULL) < 0) - return -1; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - for (i = 0; i < nparams; i++) { - if (STREQ(params[i].field, VIR_DOMAIN_SCHEDULER_WEIGHT)) { - /* XXX */ - /*privdom->weight = params[i].value.ui;*/ - } - } - - ret = 0; - - virDomainObjEndAPI(&privdom); - return ret; -} - -static int -testDomainSetSchedulerParameters(virDomainPtr domain, - virTypedParameterPtr params, - int nparams) -{ - return testDomainSetSchedulerParametersFlags(domain, params, nparams, 0); -} - -static int testDomainBlockStats(virDomainPtr domain, - const char *path, - virDomainBlockStatsPtr stats) -{ - virDomainObjPtr privdom; - struct timeval tv; - unsigned long long statbase; - int ret = -1; - - if (!*path) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("summary statistics are not supported yet")); - return ret; - } - - if (!(privdom = testDomObjFromDomain(domain))) - return ret; - - if (virDomainDiskIndexByName(privdom->def, path, false) < 0) { - virReportError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); - goto error; - } - - if (gettimeofday(&tv, NULL) < 0) { - virReportSystemError(errno, - "%s", _("getting time of day")); - goto error; - } - - /* No significance to these numbers, just enough to mix it up*/ - statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; - stats->rd_req = statbase / 10; - stats->rd_bytes = statbase / 20; - stats->wr_req = statbase / 30; - stats->wr_bytes = statbase / 40; - stats->errs = tv.tv_sec / 2; - - ret = 0; - error: - virDomainObjEndAPI(&privdom); - return ret; -} - -static int testDomainInterfaceStats(virDomainPtr domain, - const char *path, - virDomainInterfaceStatsPtr stats) -{ - virDomainObjPtr privdom; - struct timeval tv; - unsigned long long statbase; - size_t i; - int found = 0, ret = -1; - - if (!(privdom = testDomObjFromDomain(domain))) - return -1; - - for (i = 0; i < privdom->def->nnets; i++) { - if (privdom->def->nets[i]->ifname && - STREQ(privdom->def->nets[i]->ifname, path)) { - found = 1; - break; - } - } - - if (!found) { - virReportError(VIR_ERR_INVALID_ARG, - _("invalid path, '%s' is not a known interface"), path); - goto error; - } - - if (gettimeofday(&tv, NULL) < 0) { - virReportSystemError(errno, - "%s", _("getting time of day")); - goto error; - } - - /* No significance to these numbers, just enough to mix it up*/ - statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; - stats->rx_bytes = statbase / 10; - stats->rx_packets = statbase / 100; - stats->rx_errs = tv.tv_sec / 1; - stats->rx_drop = tv.tv_sec / 2; - stats->tx_bytes = statbase / 20; - stats->tx_packets = statbase / 110; - stats->tx_errs = tv.tv_sec / 3; - stats->tx_drop = tv.tv_sec / 4; - - ret = 0; - error: - virDomainObjEndAPI(&privdom); - return ret; -} - - -static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) -{ - testDriverPtr privconn = conn->privateData; - virNetworkObjPtr net; - virNetworkPtr ret = NULL; - - net = virNetworkObjFindByUUID(privconn->networks, uuid); - if (net == NULL) { - virReportError(VIR_ERR_NO_NETWORK, NULL); - goto cleanup; - } - - ret = virGetNetwork(conn, net->def->name, net->def->uuid); - - cleanup: - virNetworkObjEndAPI(&net); - return ret; -} - -static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, - const char *name) -{ - testDriverPtr privconn = conn->privateData; - virNetworkObjPtr net; - virNetworkPtr ret = NULL; - - net = virNetworkObjFindByName(privconn->networks, name); - if (net == NULL) { - virReportError(VIR_ERR_NO_NETWORK, NULL); - goto cleanup; - } - - ret = virGetNetwork(conn, net->def->name, net->def->uuid); - - cleanup: - virNetworkObjEndAPI(&net); - return ret; -} - - -static int testConnectNumOfNetworks(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - int numActive; - - numActive = virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return numActive; -} - -static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { - testDriverPtr privconn = conn->privateData; - int n; - - n = virNetworkObjListGetNames(privconn->networks, - true, names, nnames, NULL, conn); - return n; -} - -static int testConnectNumOfDefinedNetworks(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - int numInactive; - - numInactive = virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return numInactive; -} - -static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { - testDriverPtr privconn = conn->privateData; - int n; - - n = virNetworkObjListGetNames(privconn->networks, - false, names, nnames, NULL, conn); - return n; -} - -static int -testConnectListAllNetworks(virConnectPtr conn, - virNetworkPtr **nets, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - - virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); - - return virNetworkObjListExport(conn, privconn->networks, nets, NULL, flags); -} - -static int testNetworkIsActive(virNetworkPtr net) -{ - testDriverPtr privconn = net->conn->privateData; - virNetworkObjPtr obj; - int ret = -1; - - obj = virNetworkObjFindByUUID(privconn->networks, net->uuid); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, NULL); - goto cleanup; - } - ret = virNetworkObjIsActive(obj); - - cleanup: - virNetworkObjEndAPI(&obj); - return ret; -} - -static int testNetworkIsPersistent(virNetworkPtr net) -{ - testDriverPtr privconn = net->conn->privateData; - virNetworkObjPtr obj; - int ret = -1; - - obj = virNetworkObjFindByUUID(privconn->networks, net->uuid); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, NULL); - goto cleanup; - } - ret = obj->persistent; - - cleanup: - virNetworkObjEndAPI(&obj); - return ret; -} - - -static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) -{ - testDriverPtr privconn = conn->privateData; - virNetworkDefPtr def; - virNetworkObjPtr net = NULL; - virNetworkPtr ret = NULL; - virObjectEventPtr event = NULL; - - if ((def = virNetworkDefParseString(xml)) == NULL) - goto cleanup; - - if (!(net = virNetworkAssignDef(privconn->networks, def, - VIR_NETWORK_OBJ_LIST_ADD_LIVE | - VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE))) - goto cleanup; - def = NULL; - net->active = 1; - - event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, - VIR_NETWORK_EVENT_STARTED, - 0); - - ret = virGetNetwork(conn, net->def->name, net->def->uuid); - - cleanup: - virNetworkDefFree(def); - testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&net); - return ret; -} - -static -virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml) -{ - testDriverPtr privconn = conn->privateData; - virNetworkDefPtr def; - virNetworkObjPtr net = NULL; - virNetworkPtr ret = NULL; - virObjectEventPtr event = NULL; - - if ((def = virNetworkDefParseString(xml)) == NULL) - goto cleanup; - - if (!(net = virNetworkAssignDef(privconn->networks, def, 0))) - goto cleanup; - def = NULL; - - event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, - VIR_NETWORK_EVENT_DEFINED, - 0); - - ret = virGetNetwork(conn, net->def->name, net->def->uuid); - - cleanup: - virNetworkDefFree(def); - testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&net); - return ret; -} - -static int testNetworkUndefine(virNetworkPtr network) -{ - testDriverPtr privconn = network->conn->privateData; - virNetworkObjPtr privnet; - int ret = -1; - virObjectEventPtr event = NULL; - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (virNetworkObjIsActive(privnet)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Network '%s' is still running"), network->name); - goto cleanup; - } - - event = virNetworkEventLifecycleNew(network->name, network->uuid, - VIR_NETWORK_EVENT_UNDEFINED, - 0); - - virNetworkRemoveInactive(privconn->networks, privnet); - ret = 0; - - cleanup: - testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&privnet); - return ret; -} - -static int -testNetworkUpdate(virNetworkPtr net, - unsigned int command, - unsigned int section, - int parentIndex, - const char *xml, - unsigned int flags) -{ - testDriverPtr privconn = net->conn->privateData; - virNetworkObjPtr network = NULL; - int isActive, ret = -1; - - virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | - VIR_NETWORK_UPDATE_AFFECT_CONFIG, - -1); - - network = virNetworkObjFindByUUID(privconn->networks, net->uuid); - if (!network) { - virReportError(VIR_ERR_NO_NETWORK, - "%s", _("no network with matching uuid")); - goto cleanup; - } - - /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network - * is active, else change CONFIG - */ - isActive = virNetworkObjIsActive(network); - if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE - | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == - VIR_NETWORK_UPDATE_AFFECT_CURRENT) { - if (isActive) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - else - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - } - - /* update the network config in memory/on disk */ - if (virNetworkObjUpdate(network, command, section, parentIndex, xml, flags) < 0) - goto cleanup; - - ret = 0; - cleanup: - virNetworkObjEndAPI(&network); - return ret; -} - -static int testNetworkCreate(virNetworkPtr network) -{ - testDriverPtr privconn = network->conn->privateData; - virNetworkObjPtr privnet; - int ret = -1; - virObjectEventPtr event = NULL; - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (virNetworkObjIsActive(privnet)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Network '%s' is already running"), network->name); - goto cleanup; - } - - privnet->active = 1; - event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, - VIR_NETWORK_EVENT_STARTED, - 0); - ret = 0; - - cleanup: - testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&privnet); - return ret; -} - -static int testNetworkDestroy(virNetworkPtr network) -{ - testDriverPtr privconn = network->conn->privateData; - virNetworkObjPtr privnet; - int ret = -1; - virObjectEventPtr event = NULL; - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - privnet->active = 0; - event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, - VIR_NETWORK_EVENT_STOPPED, - 0); - if (!privnet->persistent) - virNetworkRemoveInactive(privconn->networks, privnet); - - ret = 0; - - cleanup: - testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&privnet); - return ret; -} - -static char *testNetworkGetXMLDesc(virNetworkPtr network, - unsigned int flags) -{ - testDriverPtr privconn = network->conn->privateData; - virNetworkObjPtr privnet; - char *ret = NULL; - - virCheckFlags(0, NULL); - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - ret = virNetworkDefFormat(privnet->def, flags); - - cleanup: - virNetworkObjEndAPI(&privnet); - return ret; -} - -static char *testNetworkGetBridgeName(virNetworkPtr network) { - testDriverPtr privconn = network->conn->privateData; - char *bridge = NULL; - virNetworkObjPtr privnet; - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!(privnet->def->bridge)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' does not have a bridge name."), - privnet->def->name); - goto cleanup; - } - - ignore_value(VIR_STRDUP(bridge, privnet->def->bridge)); - - cleanup: - virNetworkObjEndAPI(&privnet); - return bridge; -} - -static int testNetworkGetAutostart(virNetworkPtr network, - int *autostart) -{ - testDriverPtr privconn = network->conn->privateData; - virNetworkObjPtr privnet; - int ret = -1; - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - *autostart = privnet->autostart; - ret = 0; - - cleanup: - virNetworkObjEndAPI(&privnet); - return ret; -} - -static int testNetworkSetAutostart(virNetworkPtr network, - int autostart) -{ - testDriverPtr privconn = network->conn->privateData; - virNetworkObjPtr privnet; - int ret = -1; - - privnet = virNetworkObjFindByName(privconn->networks, network->name); - if (privnet == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - privnet->autostart = autostart ? 1 : 0; - ret = 0; - - cleanup: - virNetworkObjEndAPI(&privnet); - return ret; -} - - -/* - * Physical host interface routines - */ - - -static int testConnectNumOfInterfaces(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - size_t i; - int count = 0; - - testDriverLock(privconn); - for (i = 0; (i < privconn->ifaces.count); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) - count++; - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } - testDriverUnlock(privconn); - return count; -} - -static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) -{ - testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; - - testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto error; - } - } - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } - testDriverUnlock(privconn); - - return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; -} - -static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - size_t i; - int count = 0; - - testDriverLock(privconn); - for (i = 0; i < privconn->ifaces.count; i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) - count++; - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } - testDriverUnlock(privconn); - return count; -} - -static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) -{ - testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; - - testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { - virInterfaceObjLock(privconn->ifaces.objs[i]); - if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) { - if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - goto error; - } - } - virInterfaceObjUnlock(privconn->ifaces.objs[i]); - } - testDriverUnlock(privconn); - - return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; -} - -static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, - const char *name) -{ - testDriverPtr privconn = conn->privateData; - virInterfaceObjPtr iface; - virInterfacePtr ret = NULL; - - testDriverLock(privconn); - iface = virInterfaceFindByName(&privconn->ifaces, name); - testDriverUnlock(privconn); - - if (iface == NULL) { - virReportError(VIR_ERR_NO_INTERFACE, NULL); - goto cleanup; - } - - ret = virGetInterface(conn, iface->def->name, iface->def->mac); - - cleanup: - if (iface) - virInterfaceObjUnlock(iface); - return ret; -} - -static virInterfacePtr testInterfaceLookupByMACString(virConnectPtr conn, - const char *mac) -{ - testDriverPtr privconn = conn->privateData; - virInterfaceObjPtr iface; - int ifacect; - virInterfacePtr ret = NULL; - - testDriverLock(privconn); - ifacect = virInterfaceFindByMACString(&privconn->ifaces, mac, &iface, 1); - testDriverUnlock(privconn); - - if (ifacect == 0) { - virReportError(VIR_ERR_NO_INTERFACE, NULL); - goto cleanup; - } - - if (ifacect > 1) { - virReportError(VIR_ERR_MULTIPLE_INTERFACES, NULL); - goto cleanup; - } - - ret = virGetInterface(conn, iface->def->name, iface->def->mac); - - cleanup: - if (iface) - virInterfaceObjUnlock(iface); - return ret; -} - -static int testInterfaceIsActive(virInterfacePtr iface) -{ - testDriverPtr privconn = iface->conn->privateData; - virInterfaceObjPtr obj; - int ret = -1; - - testDriverLock(privconn); - obj = virInterfaceFindByName(&privconn->ifaces, iface->name); - testDriverUnlock(privconn); - if (!obj) { - virReportError(VIR_ERR_NO_INTERFACE, NULL); - goto cleanup; - } - ret = virInterfaceObjIsActive(obj); - - cleanup: - if (obj) - virInterfaceObjUnlock(obj); - return ret; -} - -static int testInterfaceChangeBegin(virConnectPtr conn, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - if (privconn->transaction_running) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("there is another transaction running.")); - goto cleanup; - } - - privconn->transaction_running = true; - - if (virInterfaceObjListClone(&privconn->ifaces, - &privconn->backupIfaces) < 0) - goto cleanup; - - ret = 0; - cleanup: - testDriverUnlock(privconn); - return ret; -} - -static int testInterfaceChangeCommit(virConnectPtr conn, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - - if (!privconn->transaction_running) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("no transaction running, " - "nothing to be committed.")); - goto cleanup; - } - - virInterfaceObjListFree(&privconn->backupIfaces); - privconn->transaction_running = false; - - ret = 0; - - cleanup: - testDriverUnlock(privconn); - - return ret; -} - -static int testInterfaceChangeRollback(virConnectPtr conn, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - - if (!privconn->transaction_running) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("no transaction running, " - "nothing to rollback.")); - goto cleanup; - } - - virInterfaceObjListFree(&privconn->ifaces); - privconn->ifaces.count = privconn->backupIfaces.count; - privconn->ifaces.objs = privconn->backupIfaces.objs; - privconn->backupIfaces.count = 0; - privconn->backupIfaces.objs = NULL; - - privconn->transaction_running = false; - - ret = 0; - - cleanup: - testDriverUnlock(privconn); - return ret; -} - -static char *testInterfaceGetXMLDesc(virInterfacePtr iface, - unsigned int flags) -{ - testDriverPtr privconn = iface->conn->privateData; - virInterfaceObjPtr privinterface; - char *ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - privinterface = virInterfaceFindByName(&privconn->ifaces, - iface->name); - testDriverUnlock(privconn); - - if (privinterface == NULL) { - virReportError(VIR_ERR_NO_INTERFACE, __FUNCTION__); - goto cleanup; - } - - ret = virInterfaceDefFormat(privinterface->def); - - cleanup: - if (privinterface) - virInterfaceObjUnlock(privinterface); - return ret; -} - - -static virInterfacePtr testInterfaceDefineXML(virConnectPtr conn, const char *xmlStr, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - virInterfaceDefPtr def; - virInterfaceObjPtr iface = NULL; - virInterfacePtr ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - if ((def = virInterfaceDefParseString(xmlStr)) == NULL) - goto cleanup; - - if ((iface = virInterfaceAssignDef(&privconn->ifaces, def)) == NULL) - goto cleanup; - def = NULL; - - ret = virGetInterface(conn, iface->def->name, iface->def->mac); - - cleanup: - virInterfaceDefFree(def); - if (iface) - virInterfaceObjUnlock(iface); - testDriverUnlock(privconn); - return ret; -} - -static int testInterfaceUndefine(virInterfacePtr iface) -{ - testDriverPtr privconn = iface->conn->privateData; - virInterfaceObjPtr privinterface; - int ret = -1; - - testDriverLock(privconn); - privinterface = virInterfaceFindByName(&privconn->ifaces, - iface->name); - - if (privinterface == NULL) { - virReportError(VIR_ERR_NO_INTERFACE, NULL); - goto cleanup; - } - - virInterfaceRemove(&privconn->ifaces, - privinterface); - ret = 0; - - cleanup: - testDriverUnlock(privconn); - return ret; -} - -static int testInterfaceCreate(virInterfacePtr iface, - unsigned int flags) -{ - testDriverPtr privconn = iface->conn->privateData; - virInterfaceObjPtr privinterface; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privinterface = virInterfaceFindByName(&privconn->ifaces, - iface->name); - - if (privinterface == NULL) { - virReportError(VIR_ERR_NO_INTERFACE, NULL); - goto cleanup; - } - - if (privinterface->active != 0) { - virReportError(VIR_ERR_OPERATION_INVALID, NULL); - goto cleanup; - } - - privinterface->active = 1; - ret = 0; - - cleanup: - if (privinterface) - virInterfaceObjUnlock(privinterface); - testDriverUnlock(privconn); - return ret; -} - -static int testInterfaceDestroy(virInterfacePtr iface, - unsigned int flags) -{ - testDriverPtr privconn = iface->conn->privateData; - virInterfaceObjPtr privinterface; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privinterface = virInterfaceFindByName(&privconn->ifaces, - iface->name); - - if (privinterface == NULL) { - virReportError(VIR_ERR_NO_INTERFACE, NULL); - goto cleanup; - } - - if (privinterface->active == 0) { - virReportError(VIR_ERR_OPERATION_INVALID, NULL); - goto cleanup; - } - - privinterface->active = 0; - ret = 0; - - cleanup: - if (privinterface) - virInterfaceObjUnlock(privinterface); - testDriverUnlock(privconn); - return ret; -} - - - -/* - * Storage Driver routines - */ - - -static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) -{ - - pool->def->capacity = defaultPoolCap; - pool->def->allocation = defaultPoolAlloc; - pool->def->available = defaultPoolCap - defaultPoolAlloc; - - return VIR_STRDUP(pool->configFile, ""); -} - - -static virStoragePoolPtr -testStoragePoolLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) -{ - testDriverPtr privconn = conn->privateData; - virStoragePoolObjPtr pool; - virStoragePoolPtr ret = NULL; - - testDriverLock(privconn); - pool = virStoragePoolObjFindByUUID(&privconn->pools, uuid); - testDriverUnlock(privconn); - - if (pool == NULL) { - virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); - goto cleanup; - } - - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, - NULL, NULL); - - cleanup: - if (pool) - virStoragePoolObjUnlock(pool); - return ret; -} - -static virStoragePoolPtr -testStoragePoolLookupByName(virConnectPtr conn, - const char *name) -{ - testDriverPtr privconn = conn->privateData; - virStoragePoolObjPtr pool; - virStoragePoolPtr ret = NULL; - - testDriverLock(privconn); - pool = virStoragePoolObjFindByName(&privconn->pools, name); - testDriverUnlock(privconn); - - if (pool == NULL) { - virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); - goto cleanup; - } - - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, - NULL, NULL); - - cleanup: - if (pool) - virStoragePoolObjUnlock(pool); - return ret; -} - -static virStoragePoolPtr -testStoragePoolLookupByVolume(virStorageVolPtr vol) -{ - return testStoragePoolLookupByName(vol->conn, vol->pool); -} - -static int -testConnectNumOfStoragePools(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - int numActive = 0; - size_t i; - - testDriverLock(privconn); - for (i = 0; i < privconn->pools.count; i++) - if (virStoragePoolObjIsActive(privconn->pools.objs[i])) - numActive++; - testDriverUnlock(privconn); - - return numActive; -} - -static int -testConnectListStoragePools(virConnectPtr conn, - char **const names, - int nnames) -{ - testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; - - testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; i < privconn->pools.count && n < nnames; i++) { - virStoragePoolObjLock(privconn->pools.objs[i]); - if (virStoragePoolObjIsActive(privconn->pools.objs[i]) && - VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { - virStoragePoolObjUnlock(privconn->pools.objs[i]); - goto error; - } - virStoragePoolObjUnlock(privconn->pools.objs[i]); - } - testDriverUnlock(privconn); - - return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; -} - -static int -testConnectNumOfDefinedStoragePools(virConnectPtr conn) -{ - testDriverPtr privconn = conn->privateData; - int numInactive = 0; - size_t i; - - testDriverLock(privconn); - for (i = 0; i < privconn->pools.count; i++) { - virStoragePoolObjLock(privconn->pools.objs[i]); - if (!virStoragePoolObjIsActive(privconn->pools.objs[i])) - numInactive++; - virStoragePoolObjUnlock(privconn->pools.objs[i]); - } - testDriverUnlock(privconn); - - return numInactive; -} - -static int -testConnectListDefinedStoragePools(virConnectPtr conn, - char **const names, - int nnames) -{ - testDriverPtr privconn = conn->privateData; - int n = 0; - size_t i; - - testDriverLock(privconn); - memset(names, 0, sizeof(*names)*nnames); - for (i = 0; i < privconn->pools.count && n < nnames; i++) { - virStoragePoolObjLock(privconn->pools.objs[i]); - if (!virStoragePoolObjIsActive(privconn->pools.objs[i]) && - VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { - virStoragePoolObjUnlock(privconn->pools.objs[i]); - goto error; - } - virStoragePoolObjUnlock(privconn->pools.objs[i]); - } - testDriverUnlock(privconn); - - return n; - - error: - for (n = 0; n < nnames; n++) - VIR_FREE(names[n]); - testDriverUnlock(privconn); - return -1; -} - -static int -testConnectListAllStoragePools(virConnectPtr conn, - virStoragePoolPtr **pools, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - int ret = -1; - - virCheckFlags(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL, -1); - - testDriverLock(privconn); - ret = virStoragePoolObjListExport(conn, privconn->pools, pools, - NULL, flags); - testDriverUnlock(privconn); - - return ret; -} - -static int testStoragePoolIsActive(virStoragePoolPtr pool) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr obj; - int ret = -1; - - testDriverLock(privconn); - obj = virStoragePoolObjFindByUUID(&privconn->pools, pool->uuid); - testDriverUnlock(privconn); - if (!obj) { - virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); - goto cleanup; - } - ret = virStoragePoolObjIsActive(obj); - - cleanup: - if (obj) - virStoragePoolObjUnlock(obj); - return ret; -} - -static int testStoragePoolIsPersistent(virStoragePoolPtr pool) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr obj; - int ret = -1; - - testDriverLock(privconn); - obj = virStoragePoolObjFindByUUID(&privconn->pools, pool->uuid); - testDriverUnlock(privconn); - if (!obj) { - virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); - goto cleanup; - } - ret = obj->configFile ? 1 : 0; - - cleanup: - if (obj) - virStoragePoolObjUnlock(obj); - return ret; -} - - - -static int -testStoragePoolCreate(virStoragePoolPtr pool, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - virObjectEventPtr event = NULL; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); - goto cleanup; - } - - privpool->active = 1; - - event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, - VIR_STORAGE_POOL_EVENT_STARTED, - 0); - ret = 0; - - cleanup: - testObjectEventQueue(privconn, event); - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static char * -testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *type, - const char *srcSpec, - unsigned int flags) -{ - virStoragePoolSourcePtr source = NULL; - int pool_type; - char *ret = NULL; - - virCheckFlags(0, NULL); - - pool_type = virStoragePoolTypeFromString(type); - if (!pool_type) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown storage pool type %s"), type); - goto cleanup; - } - - if (srcSpec) { - source = virStoragePoolDefParseSourceString(srcSpec, pool_type); - if (!source) - goto cleanup; - } - - switch (pool_type) { - - case VIR_STORAGE_POOL_LOGICAL: - ignore_value(VIR_STRDUP(ret, defaultPoolSourcesLogicalXML)); - break; - - case VIR_STORAGE_POOL_NETFS: - if (!source || !source->hosts[0].name) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("hostname must be specified for netfs sources")); - goto cleanup; - } - - ignore_value(virAsprintf(&ret, defaultPoolSourcesNetFSXML, - source->hosts[0].name)); - break; - - default: - virReportError(VIR_ERR_NO_SUPPORT, - _("pool type '%s' does not support source discovery"), type); - } - - cleanup: - virStoragePoolSourceFree(source); - return ret; -} - - -static virStoragePoolPtr -testStoragePoolCreateXML(virConnectPtr conn, - const char *xml, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - virStoragePoolDefPtr def; - virStoragePoolObjPtr pool = NULL; - virStoragePoolPtr ret = NULL; - virObjectEventPtr event = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - if (!(def = virStoragePoolDefParseString(xml))) - goto cleanup; - - pool = virStoragePoolObjFindByUUID(&privconn->pools, def->uuid); - if (!pool) - pool = virStoragePoolObjFindByName(&privconn->pools, def->name); - if (pool) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("storage pool already exists")); - goto cleanup; - } - - if (!(pool = virStoragePoolObjAssignDef(&privconn->pools, def))) - goto cleanup; - def = NULL; - - if (testStoragePoolObjSetDefaults(pool) == -1) { - virStoragePoolObjRemove(&privconn->pools, pool); - pool = NULL; - goto cleanup; - } - pool->active = 1; - - event = virStoragePoolEventLifecycleNew(pool->def->name, pool->def->uuid, - VIR_STORAGE_POOL_EVENT_STARTED, - 0); - - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, - NULL, NULL); - - cleanup: - virStoragePoolDefFree(def); - testObjectEventQueue(privconn, event); - if (pool) - virStoragePoolObjUnlock(pool); - testDriverUnlock(privconn); - return ret; -} - -static virStoragePoolPtr -testStoragePoolDefineXML(virConnectPtr conn, - const char *xml, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - virStoragePoolDefPtr def; - virStoragePoolObjPtr pool = NULL; - virStoragePoolPtr ret = NULL; - virObjectEventPtr event = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - if (!(def = virStoragePoolDefParseString(xml))) - goto cleanup; - - def->capacity = defaultPoolCap; - def->allocation = defaultPoolAlloc; - def->available = defaultPoolCap - defaultPoolAlloc; - - if (!(pool = virStoragePoolObjAssignDef(&privconn->pools, def))) - goto cleanup; - def = NULL; - - event = virStoragePoolEventLifecycleNew(pool->def->name, pool->def->uuid, - VIR_STORAGE_POOL_EVENT_DEFINED, - 0); - - if (testStoragePoolObjSetDefaults(pool) == -1) { - virStoragePoolObjRemove(&privconn->pools, pool); - pool = NULL; - goto cleanup; - } - - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, - NULL, NULL); - - cleanup: - virStoragePoolDefFree(def); - testObjectEventQueue(privconn, event); - if (pool) - virStoragePoolObjUnlock(pool); - testDriverUnlock(privconn); - return ret; -} - -static int -testStoragePoolUndefine(virStoragePoolPtr pool) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - virObjectEventPtr event = NULL; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); - goto cleanup; - } - - event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, - VIR_STORAGE_POOL_EVENT_UNDEFINED, - 0); - - virStoragePoolObjRemove(&privconn->pools, privpool); - privpool = NULL; - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - testObjectEventQueue(privconn, event); - testDriverUnlock(privconn); - return ret; -} - -static int -testStoragePoolBuild(virStoragePoolPtr pool, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); - goto cleanup; - } - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -static int -testStoragePoolDestroy(virStoragePoolPtr pool) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - virObjectEventPtr event = NULL; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - privpool->active = 0; - event = virStoragePoolEventLifecycleNew(privpool->def->name, privpool->def->uuid, - VIR_STORAGE_POOL_EVENT_STOPPED, - 0); - - if (privpool->configFile == NULL) { - virStoragePoolObjRemove(&privconn->pools, privpool); - privpool = NULL; - } - ret = 0; - - cleanup: - testObjectEventQueue(privconn, event); - if (privpool) - virStoragePoolObjUnlock(privpool); - testDriverUnlock(privconn); - return ret; -} - - -static int -testStoragePoolDelete(virStoragePoolPtr pool, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); - goto cleanup; - } - - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -static int -testStoragePoolRefresh(virStoragePoolPtr pool, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - virObjectEventPtr event = NULL; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - event = virStoragePoolEventRefreshNew(pool->name, pool->uuid); - ret = 0; - - cleanup: - testObjectEventQueue(privconn, event); - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -static int -testStoragePoolGetInfo(virStoragePoolPtr pool, - virStoragePoolInfoPtr info) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - memset(info, 0, sizeof(virStoragePoolInfo)); - if (privpool->active) - info->state = VIR_STORAGE_POOL_RUNNING; - else - info->state = VIR_STORAGE_POOL_INACTIVE; - info->capacity = privpool->def->capacity; - info->allocation = privpool->def->allocation; - info->available = privpool->def->available; - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static char * -testStoragePoolGetXMLDesc(virStoragePoolPtr pool, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - char *ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - ret = virStoragePoolDefFormat(privpool->def); - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static int -testStoragePoolGetAutostart(virStoragePoolPtr pool, - int *autostart) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!privpool->configFile) { - *autostart = 0; - } else { - *autostart = privpool->autostart; - } - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static int -testStoragePoolSetAutostart(virStoragePoolPtr pool, - int autostart) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!privpool->configFile) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("pool has no config file")); - goto cleanup; - } - - autostart = (autostart != 0); - privpool->autostart = autostart; - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -static int -testStoragePoolNumOfVolumes(virStoragePoolPtr pool) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - int ret = -1; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - ret = privpool->volumes.count; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static int -testStoragePoolListVolumes(virStoragePoolPtr pool, - char **const names, - int maxnames) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - size_t i = 0; - int n = 0; - - memset(names, 0, maxnames * sizeof(*names)); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - for (i = 0; i < privpool->volumes.count && n < maxnames; i++) { - if (VIR_STRDUP(names[n++], privpool->volumes.objs[i]->name) < 0) - goto cleanup; - } - - virStoragePoolObjUnlock(privpool); - return n; - - cleanup: - for (n = 0; n < maxnames; n++) - VIR_FREE(names[i]); - - memset(names, 0, maxnames * sizeof(*names)); - if (privpool) - virStoragePoolObjUnlock(privpool); - return -1; -} - -static int -testStoragePoolListAllVolumes(virStoragePoolPtr obj, - virStorageVolPtr **vols, - unsigned int flags) -{ - testDriverPtr privconn = obj->conn->privateData; - virStoragePoolObjPtr pool; - size_t i; - virStorageVolPtr *tmp_vols = NULL; - virStorageVolPtr vol = NULL; - int nvols = 0; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - pool = virStoragePoolObjFindByUUID(&privconn->pools, obj->uuid); - testDriverUnlock(privconn); - - if (!pool) { - virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", - _("no storage pool with matching uuid")); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(pool)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("storage pool is not active")); - goto cleanup; - } - - /* Just returns the volumes count */ - if (!vols) { - ret = pool->volumes.count; - goto cleanup; - } - - if (VIR_ALLOC_N(tmp_vols, pool->volumes.count + 1) < 0) - goto cleanup; - - for (i = 0; i < pool->volumes.count; i++) { - if (!(vol = virGetStorageVol(obj->conn, pool->def->name, - pool->volumes.objs[i]->name, - pool->volumes.objs[i]->key, - NULL, NULL))) - goto cleanup; - tmp_vols[nvols++] = vol; - } - - *vols = tmp_vols; - tmp_vols = NULL; - ret = nvols; - - cleanup: - if (tmp_vols) { - for (i = 0; i < nvols; i++) { - if (tmp_vols[i]) - virStorageVolFree(tmp_vols[i]); - } - VIR_FREE(tmp_vols); - } - - if (pool) - virStoragePoolObjUnlock(pool); - - return ret; -} - -static virStorageVolPtr -testStorageVolLookupByName(virStoragePoolPtr pool, - const char *name ATTRIBUTE_UNUSED) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol; - virStorageVolPtr ret = NULL; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - privvol = virStorageVolDefFindByName(privpool, name); - - if (!privvol) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), name); - goto cleanup; - } - - ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key, - NULL, NULL); - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -static virStorageVolPtr -testStorageVolLookupByKey(virConnectPtr conn, - const char *key) -{ - testDriverPtr privconn = conn->privateData; - size_t i; - virStorageVolPtr ret = NULL; - - testDriverLock(privconn); - for (i = 0; i < privconn->pools.count; i++) { - virStoragePoolObjLock(privconn->pools.objs[i]); - if (virStoragePoolObjIsActive(privconn->pools.objs[i])) { - virStorageVolDefPtr privvol = - virStorageVolDefFindByKey(privconn->pools.objs[i], key); - - if (privvol) { - ret = virGetStorageVol(conn, - privconn->pools.objs[i]->def->name, - privvol->name, - privvol->key, - NULL, NULL); - virStoragePoolObjUnlock(privconn->pools.objs[i]); - break; - } - } - virStoragePoolObjUnlock(privconn->pools.objs[i]); - } - testDriverUnlock(privconn); - - if (!ret) - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching key '%s'"), key); - - return ret; -} - -static virStorageVolPtr -testStorageVolLookupByPath(virConnectPtr conn, - const char *path) -{ - testDriverPtr privconn = conn->privateData; - size_t i; - virStorageVolPtr ret = NULL; - - testDriverLock(privconn); - for (i = 0; i < privconn->pools.count; i++) { - virStoragePoolObjLock(privconn->pools.objs[i]); - if (virStoragePoolObjIsActive(privconn->pools.objs[i])) { - virStorageVolDefPtr privvol = - virStorageVolDefFindByPath(privconn->pools.objs[i], path); - - if (privvol) { - ret = virGetStorageVol(conn, - privconn->pools.objs[i]->def->name, - privvol->name, - privvol->key, - NULL, NULL); - virStoragePoolObjUnlock(privconn->pools.objs[i]); - break; - } - } - virStoragePoolObjUnlock(privconn->pools.objs[i]); - } - testDriverUnlock(privconn); - - if (!ret) - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching path '%s'"), path); - - return ret; -} - -static virStorageVolPtr -testStorageVolCreateXML(virStoragePoolPtr pool, - const char *xmldesc, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol = NULL; - virStorageVolPtr ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - privvol = virStorageVolDefParseString(privpool->def, xmldesc, 0); - if (privvol == NULL) - goto cleanup; - - if (virStorageVolDefFindByName(privpool, privvol->name)) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("storage vol already exists")); - goto cleanup; - } - - /* Make sure enough space */ - if ((privpool->def->allocation + privvol->target.allocation) > - privpool->def->capacity) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Not enough free space in pool for volume '%s'"), - privvol->name); - goto cleanup; - } - - if (virAsprintf(&privvol->target.path, "%s/%s", - privpool->def->target.path, - privvol->name) == -1) - goto cleanup; - - if (VIR_STRDUP(privvol->key, privvol->target.path) < 0 || - VIR_APPEND_ELEMENT_COPY(privpool->volumes.objs, - privpool->volumes.count, privvol) < 0) - goto cleanup; - - privpool->def->allocation += privvol->target.allocation; - privpool->def->available = (privpool->def->capacity - - privpool->def->allocation); - - ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key, - NULL, NULL); - privvol = NULL; - - cleanup: - virStorageVolDefFree(privvol); - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static virStorageVolPtr -testStorageVolCreateXMLFrom(virStoragePoolPtr pool, - const char *xmldesc, - virStorageVolPtr clonevol, - unsigned int flags) -{ - testDriverPtr privconn = pool->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol = NULL, origvol = NULL; - virStorageVolPtr ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - pool->name); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); - goto cleanup; - } - - privvol = virStorageVolDefParseString(privpool->def, xmldesc, 0); - if (privvol == NULL) - goto cleanup; - - if (virStorageVolDefFindByName(privpool, privvol->name)) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("storage vol already exists")); - goto cleanup; - } - - origvol = virStorageVolDefFindByName(privpool, clonevol->name); - if (!origvol) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - clonevol->name); - goto cleanup; - } - - /* Make sure enough space */ - if ((privpool->def->allocation + privvol->target.allocation) > - privpool->def->capacity) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Not enough free space in pool for volume '%s'"), - privvol->name); - goto cleanup; - } - privpool->def->available = (privpool->def->capacity - - privpool->def->allocation); - - if (virAsprintf(&privvol->target.path, "%s/%s", - privpool->def->target.path, - privvol->name) == -1) - goto cleanup; - - if (VIR_STRDUP(privvol->key, privvol->target.path) < 0 || - VIR_APPEND_ELEMENT_COPY(privpool->volumes.objs, - privpool->volumes.count, privvol) < 0) - goto cleanup; - - privpool->def->allocation += privvol->target.allocation; - privpool->def->available = (privpool->def->capacity - - privpool->def->allocation); - - ret = virGetStorageVol(pool->conn, privpool->def->name, - privvol->name, privvol->key, - NULL, NULL); - privvol = NULL; - - cleanup: - virStorageVolDefFree(privvol); - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static int -testStorageVolDelete(virStorageVolPtr vol, - unsigned int flags) -{ - testDriverPtr privconn = vol->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol; - size_t i; - int ret = -1; - - virCheckFlags(0, -1); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - vol->pool); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - - privvol = virStorageVolDefFindByName(privpool, vol->name); - - if (privvol == NULL) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); - goto cleanup; - } - - - privpool->def->allocation -= privvol->target.allocation; - privpool->def->available = (privpool->def->capacity - - privpool->def->allocation); - - for (i = 0; i < privpool->volumes.count; i++) { - if (privpool->volumes.objs[i] == privvol) { - virStorageVolDefFree(privvol); - - VIR_DELETE_ELEMENT(privpool->volumes.objs, i, privpool->volumes.count); - break; - } - } - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -static int testStorageVolumeTypeForPool(int pooltype) -{ - - switch (pooltype) { - case VIR_STORAGE_POOL_DIR: - case VIR_STORAGE_POOL_FS: - case VIR_STORAGE_POOL_NETFS: - return VIR_STORAGE_VOL_FILE; - default: - return VIR_STORAGE_VOL_BLOCK; - } -} - -static int -testStorageVolGetInfo(virStorageVolPtr vol, - virStorageVolInfoPtr info) -{ - testDriverPtr privconn = vol->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol; - int ret = -1; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - vol->pool); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - privvol = virStorageVolDefFindByName(privpool, vol->name); - - if (privvol == NULL) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); - goto cleanup; - } - - memset(info, 0, sizeof(*info)); - info->type = testStorageVolumeTypeForPool(privpool->def->type); - info->capacity = privvol->target.capacity; - info->allocation = privvol->target.allocation; - ret = 0; - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static char * -testStorageVolGetXMLDesc(virStorageVolPtr vol, - unsigned int flags) -{ - testDriverPtr privconn = vol->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol; - char *ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - vol->pool); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - privvol = virStorageVolDefFindByName(privpool, vol->name); - - if (privvol == NULL) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); - goto cleanup; - } - - ret = virStorageVolDefFormat(privpool->def, privvol); - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - -static char * -testStorageVolGetPath(virStorageVolPtr vol) -{ - testDriverPtr privconn = vol->conn->privateData; - virStoragePoolObjPtr privpool; - virStorageVolDefPtr privvol; - char *ret = NULL; - - testDriverLock(privconn); - privpool = virStoragePoolObjFindByName(&privconn->pools, - vol->pool); - testDriverUnlock(privconn); - - if (privpool == NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); - goto cleanup; - } - - privvol = virStorageVolDefFindByName(privpool, vol->name); - - if (privvol == NULL) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); - goto cleanup; - } - - if (!virStoragePoolObjIsActive(privpool)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); - goto cleanup; - } - - ignore_value(VIR_STRDUP(ret, privvol->target.path)); - - cleanup: - if (privpool) - virStoragePoolObjUnlock(privpool); - return ret; -} - - -/* Node device implementations */ - -static int -testNodeNumOfDevices(virConnectPtr conn, - const char *cap, - unsigned int flags) -{ - testDriverPtr driver = conn->privateData; - int ndevs = 0; - size_t i; - - virCheckFlags(0, -1); - - testDriverLock(driver); - for (i = 0; i < driver->devs.count; i++) - if ((cap == NULL) || - virNodeDeviceHasCap(driver->devs.objs[i], cap)) - ++ndevs; - testDriverUnlock(driver); - - return ndevs; -} - -static int -testNodeListDevices(virConnectPtr conn, - const char *cap, - char **const names, - int maxnames, - unsigned int flags) -{ - testDriverPtr driver = conn->privateData; - int ndevs = 0; - size_t i; - - virCheckFlags(0, -1); - - testDriverLock(driver); - for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) { - virNodeDeviceObjLock(driver->devs.objs[i]); - if (cap == NULL || - virNodeDeviceHasCap(driver->devs.objs[i], cap)) { - if (VIR_STRDUP(names[ndevs++], driver->devs.objs[i]->def->name) < 0) { - virNodeDeviceObjUnlock(driver->devs.objs[i]); - goto failure; - } - } - virNodeDeviceObjUnlock(driver->devs.objs[i]); - } - testDriverUnlock(driver); - - return ndevs; - - failure: - testDriverUnlock(driver); - --ndevs; - while (--ndevs >= 0) - VIR_FREE(names[ndevs]); - return -1; -} - -static virNodeDevicePtr -testNodeDeviceLookupByName(virConnectPtr conn, const char *name) -{ - testDriverPtr driver = conn->privateData; - virNodeDeviceObjPtr obj; - virNodeDevicePtr ret = NULL; - - testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, name); - testDriverUnlock(driver); - - if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - name); - goto cleanup; - } - - ret = virGetNodeDevice(conn, name); - - cleanup: - if (obj) - virNodeDeviceObjUnlock(obj); - return ret; -} - -static char * -testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, - unsigned int flags) -{ - testDriverPtr driver = dev->conn->privateData; - virNodeDeviceObjPtr obj; - char *ret = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); - testDriverUnlock(driver); - - if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); - goto cleanup; - } - - ret = virNodeDeviceDefFormat(obj->def); - - cleanup: - if (obj) - virNodeDeviceObjUnlock(obj); - return ret; -} - -static char * -testNodeDeviceGetParent(virNodeDevicePtr dev) -{ - testDriverPtr driver = dev->conn->privateData; - virNodeDeviceObjPtr obj; - char *ret = NULL; - - testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); - testDriverUnlock(driver); - - if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); - goto cleanup; - } - - if (obj->def->parent) { - ignore_value(VIR_STRDUP(ret, obj->def->parent)); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("no parent for this device")); - } - - cleanup: - if (obj) - virNodeDeviceObjUnlock(obj); - return ret; -} - - -static int -testNodeDeviceNumOfCaps(virNodeDevicePtr dev) -{ - testDriverPtr driver = dev->conn->privateData; - virNodeDeviceObjPtr obj; - virNodeDevCapsDefPtr caps; - int ncaps = 0; - int ret = -1; - - testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); - testDriverUnlock(driver); - - if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); - goto cleanup; - } - - for (caps = obj->def->caps; caps; caps = caps->next) - ++ncaps; - ret = ncaps; - - cleanup: - if (obj) - virNodeDeviceObjUnlock(obj); - return ret; -} - - -static int -testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) -{ - testDriverPtr driver = dev->conn->privateData; - virNodeDeviceObjPtr obj; - virNodeDevCapsDefPtr caps; - int ncaps = 0; - int ret = -1; - - testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); - testDriverUnlock(driver); - - if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); - goto cleanup; - } - - for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { - if (VIR_STRDUP(names[ncaps++], virNodeDevCapTypeToString(caps->data.type)) < 0) - goto cleanup; - } - ret = ncaps; - - cleanup: - if (obj) - virNodeDeviceObjUnlock(obj); - if (ret == -1) { - --ncaps; - while (--ncaps >= 0) - VIR_FREE(names[ncaps]); - } - return ret; -} - -static virNodeDevicePtr -testNodeDeviceCreateXML(virConnectPtr conn, - const char *xmlDesc, - unsigned int flags) -{ - testDriverPtr driver = conn->privateData; - virNodeDeviceDefPtr def = NULL; - virNodeDeviceObjPtr obj = NULL; - char *wwnn = NULL, *wwpn = NULL; - int parent_host = -1; - virNodeDevicePtr dev = NULL; - virNodeDevCapsDefPtr caps; - virObjectEventPtr event = NULL; - - virCheckFlags(0, NULL); - - testDriverLock(driver); - - def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, NULL); - if (def == NULL) - goto cleanup; - - /* We run these next two simply for validation */ - if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) - goto cleanup; - - if (virNodeDeviceGetParentHost(&driver->devs, - def->name, - def->parent, - &parent_host) == -1) { - goto cleanup; - } - - /* 'name' is supposed to be filled in by the node device backend, which - * we don't have. Use WWPN instead. */ - VIR_FREE(def->name); - if (VIR_STRDUP(def->name, wwpn) < 0) - goto cleanup; - - /* Fill in a random 'host' and 'unique_id' value, - * since this would also come from the backend */ - caps = def->caps; - while (caps) { - if (caps->data.type != VIR_NODE_DEV_CAP_SCSI_HOST) - continue; - - caps->data.scsi_host.host = virRandomBits(10); - caps->data.scsi_host.unique_id = 2; - caps = caps->next; - } - - - if (!(obj = virNodeDeviceAssignDef(&driver->devs, def))) - goto cleanup; - virNodeDeviceObjUnlock(obj); - - event = virNodeDeviceEventLifecycleNew(def->name, - VIR_NODE_DEVICE_EVENT_CREATED, - 0); - - dev = virGetNodeDevice(conn, def->name); - def = NULL; - cleanup: - testDriverUnlock(driver); - virNodeDeviceDefFree(def); - testObjectEventQueue(driver, event); - VIR_FREE(wwnn); - VIR_FREE(wwpn); - return dev; -} - -static int -testNodeDeviceDestroy(virNodeDevicePtr dev) -{ - int ret = 0; - testDriverPtr driver = dev->conn->privateData; - virNodeDeviceObjPtr obj = NULL; - char *parent_name = NULL, *wwnn = NULL, *wwpn = NULL; - int parent_host = -1; - virObjectEventPtr event = NULL; - - testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); - testDriverUnlock(driver); - - if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); - goto out; - } - - if (virNodeDeviceGetWWNs(obj->def, &wwnn, &wwpn) == -1) - goto out; - - if (VIR_STRDUP(parent_name, obj->def->parent) < 0) - goto out; - - /* virNodeDeviceGetParentHost will cause the device object's lock to be - * taken, so we have to dup the parent's name and drop the lock - * before calling it. We don't need the reference to the object - * any more once we have the parent's name. */ - virNodeDeviceObjUnlock(obj); - - /* We do this just for basic validation */ - if (virNodeDeviceGetParentHost(&driver->devs, - dev->name, - parent_name, - &parent_host) == -1) { - obj = NULL; - goto out; - } - - event = virNodeDeviceEventLifecycleNew(dev->name, - VIR_NODE_DEVICE_EVENT_DELETED, - 0); - - virNodeDeviceObjLock(obj); - virNodeDeviceObjRemove(&driver->devs, &obj); - - out: - if (obj) - virNodeDeviceObjUnlock(obj); - testObjectEventQueue(driver, event); - VIR_FREE(parent_name); - VIR_FREE(wwnn); - VIR_FREE(wwpn); - return ret; -} - - -/* Domain event implementations */ -static int -testConnectDomainEventRegister(virConnectPtr conn, - virConnectDomainEventCallback callback, - void *opaque, - virFreeCallback freecb) -{ - testDriverPtr driver = conn->privateData; - int ret = 0; - - if (virDomainEventStateRegister(conn, driver->eventState, - callback, opaque, freecb) < 0) - ret = -1; - - return ret; -} - - -static int -testConnectDomainEventDeregister(virConnectPtr conn, - virConnectDomainEventCallback callback) -{ - testDriverPtr driver = conn->privateData; - int ret = 0; - - if (virDomainEventStateDeregister(conn, driver->eventState, - callback) < 0) - ret = -1; - - return ret; -} - - -static int -testConnectDomainEventRegisterAny(virConnectPtr conn, - virDomainPtr dom, - int eventID, - virConnectDomainEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) -{ - testDriverPtr driver = conn->privateData; - int ret; - - if (virDomainEventStateRegisterID(conn, driver->eventState, - dom, eventID, - callback, opaque, freecb, &ret) < 0) - ret = -1; - - return ret; -} - -static int -testConnectDomainEventDeregisterAny(virConnectPtr conn, - int callbackID) -{ - testDriverPtr driver = conn->privateData; - int ret = 0; - - if (virObjectEventStateDeregisterID(conn, driver->eventState, - callbackID) < 0) - ret = -1; - - return ret; -} - - -static int -testConnectNetworkEventRegisterAny(virConnectPtr conn, - virNetworkPtr net, - int eventID, - virConnectNetworkEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) -{ - testDriverPtr driver = conn->privateData; - int ret; - - if (virNetworkEventStateRegisterID(conn, driver->eventState, - net, eventID, callback, - opaque, freecb, &ret) < 0) - ret = -1; - - return ret; -} - -static int -testConnectNetworkEventDeregisterAny(virConnectPtr conn, - int callbackID) -{ - testDriverPtr driver = conn->privateData; - int ret = 0; - - if (virObjectEventStateDeregisterID(conn, driver->eventState, - callbackID) < 0) - ret = -1; - - return ret; -} - -static int -testConnectStoragePoolEventRegisterAny(virConnectPtr conn, - virStoragePoolPtr pool, - int eventID, - virConnectStoragePoolEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) -{ - testDriverPtr driver = conn->privateData; - int ret; - - if (virStoragePoolEventStateRegisterID(conn, driver->eventState, - pool, eventID, callback, - opaque, freecb, &ret) < 0) - ret = -1; - - return ret; -} - -static int -testConnectStoragePoolEventDeregisterAny(virConnectPtr conn, - int callbackID) -{ - testDriverPtr driver = conn->privateData; - int ret = 0; - - if (virObjectEventStateDeregisterID(conn, driver->eventState, - callbackID) < 0) - ret = -1; - - return ret; -} - -static int -testConnectNodeDeviceEventRegisterAny(virConnectPtr conn, - virNodeDevicePtr dev, - int eventID, - virConnectNodeDeviceEventGenericCallback callback, - void *opaque, - virFreeCallback freecb) -{ - testDriverPtr driver = conn->privateData; - int ret; - - if (virNodeDeviceEventStateRegisterID(conn, driver->eventState, - dev, eventID, callback, - opaque, freecb, &ret) < 0) - ret = -1; - - return ret; -} - -static int -testConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, - int callbackID) -{ - testDriverPtr driver = conn->privateData; - int ret = 0; - - if (virObjectEventStateDeregisterID(conn, driver->eventState, - callbackID) < 0) - ret = -1; - - return ret; -} - -static int testConnectListAllDomains(virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags) -{ - testDriverPtr privconn = conn->privateData; - - virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); - - return virDomainObjListExport(privconn->domains, conn, domains, - NULL, flags); -} - -static int -testNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, - unsigned char **cpumap, - unsigned int *online, - unsigned int flags) -{ - virCheckFlags(0, -1); - - if (cpumap) { - if (VIR_ALLOC_N(*cpumap, 1) < 0) - return -1; - *cpumap[0] = 0x15; - } - - if (online) - *online = 3; - - return 8; -} - -static char * -testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, - virStreamPtr st, - unsigned int screen ATTRIBUTE_UNUSED, - unsigned int flags) -{ - char *ret = NULL; - - virCheckFlags(0, NULL); - - if (VIR_STRDUP(ret, "image/png") < 0) - return NULL; - - if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY) < 0) - VIR_FREE(ret); - - return ret; -} - -static int -testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *arch, - char ***models, - unsigned int flags) -{ - virCheckFlags(0, -1); - return cpuGetModels(arch, models); -} - -static int -testDomainManagedSave(virDomainPtr dom, unsigned int flags) -{ - testDriverPtr privconn = dom->conn->privateData; - virDomainObjPtr vm = NULL; - virObjectEventPtr event = NULL; - int ret = -1; - - virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | - VIR_DOMAIN_SAVE_RUNNING | - VIR_DOMAIN_SAVE_PAUSED, -1); - - if (!(vm = testDomObjFromDomain(dom))) - return -1; - - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - goto cleanup; - } - - if (!vm->persistent) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot do managed save for transient domain")); - goto cleanup; - } - - testDomainShutdownState(dom, vm, VIR_DOMAIN_SHUTOFF_SAVED); - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SAVED); - vm->hasManagedSave = true; - - ret = 0; - cleanup: - virDomainObjEndAPI(&vm); - testObjectEventQueue(privconn, event); - - return ret; -} - - -static int -testDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) -{ - virDomainObjPtr vm; - int ret; - - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromDomain(dom))) - return -1; - - ret = vm->hasManagedSave; - - virDomainObjEndAPI(&vm); - return ret; -} - -static int -testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) -{ - virDomainObjPtr vm; - - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromDomain(dom))) - return -1; - - vm->hasManagedSave = false; - - virDomainObjEndAPI(&vm); - return 0; -} - - -/* - * Snapshot APIs - */ - -static virDomainSnapshotObjPtr -testSnapObjFromName(virDomainObjPtr vm, - const char *name) -{ - virDomainSnapshotObjPtr snap = NULL; - snap = virDomainSnapshotFindByName(vm->snapshots, name); - if (!snap) - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), - name); - return snap; -} - -static virDomainSnapshotObjPtr -testSnapObjFromSnapshot(virDomainObjPtr vm, - virDomainSnapshotPtr snapshot) -{ - return testSnapObjFromName(vm, snapshot->name); -} - -static virDomainObjPtr -testDomObjFromSnapshot(virDomainSnapshotPtr snapshot) -{ - return testDomObjFromDomain(snapshot->domain); -} - -static int -testDomainSnapshotNum(virDomainPtr domain, unsigned int flags) -{ - virDomainObjPtr vm = NULL; - int n; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | - VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - - if (!(vm = testDomObjFromDomain(domain))) - return -1; - - n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); - - virDomainObjEndAPI(&vm); - return n; -} - -static int -testDomainSnapshotListNames(virDomainPtr domain, - char **names, - int nameslen, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - int n; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | - VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - - if (!(vm = testDomObjFromDomain(domain))) - return -1; - - n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, - flags); - - virDomainObjEndAPI(&vm); - return n; -} - -static int -testDomainListAllSnapshots(virDomainPtr domain, - virDomainSnapshotPtr **snaps, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - int n; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | - VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - - if (!(vm = testDomObjFromDomain(domain))) - return -1; - - n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); - - virDomainObjEndAPI(&vm); - return n; -} - -static int -testDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, - char **names, - int nameslen, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - virDomainSnapshotObjPtr snap = NULL; - int n = -1; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | - VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, - flags); - - cleanup: - virDomainObjEndAPI(&vm); - return n; -} - -static int -testDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - virDomainSnapshotObjPtr snap = NULL; - int n = -1; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | - VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); - - cleanup: - virDomainObjEndAPI(&vm); - return n; -} - -static int -testDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, - virDomainSnapshotPtr **snaps, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - virDomainSnapshotObjPtr snap = NULL; - int n = -1; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | - VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, - flags); - - cleanup: - virDomainObjEndAPI(&vm); - return n; -} - -static virDomainSnapshotPtr -testDomainSnapshotLookupByName(virDomainPtr domain, - const char *name, - unsigned int flags) -{ - virDomainObjPtr vm; - virDomainSnapshotObjPtr snap = NULL; - virDomainSnapshotPtr snapshot = NULL; - - virCheckFlags(0, NULL); - - if (!(vm = testDomObjFromDomain(domain))) - return NULL; - - if (!(snap = testSnapObjFromName(vm, name))) - goto cleanup; - - snapshot = virGetDomainSnapshot(domain, snap->def->name); - - cleanup: - virDomainObjEndAPI(&vm); - return snapshot; -} - -static int -testDomainHasCurrentSnapshot(virDomainPtr domain, - unsigned int flags) -{ - virDomainObjPtr vm; - int ret; - - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromDomain(domain))) - return -1; - - ret = (vm->current_snapshot != NULL); - - virDomainObjEndAPI(&vm); - return ret; -} - -static virDomainSnapshotPtr -testDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - virDomainObjPtr vm; - virDomainSnapshotObjPtr snap = NULL; - virDomainSnapshotPtr parent = NULL; - - virCheckFlags(0, NULL); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return NULL; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - if (!snap->def->parent) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("snapshot '%s' does not have a parent"), - snap->def->name); - goto cleanup; - } - - parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); - - cleanup: - virDomainObjEndAPI(&vm); - return parent; -} - -static virDomainSnapshotPtr -testDomainSnapshotCurrent(virDomainPtr domain, - unsigned int flags) -{ - virDomainObjPtr vm; - virDomainSnapshotPtr snapshot = NULL; - - virCheckFlags(0, NULL); - - if (!(vm = testDomObjFromDomain(domain))) - return NULL; - - if (!vm->current_snapshot) { - virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", - _("the domain does not have a current snapshot")); - goto cleanup; - } - - snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); - - cleanup: - virDomainObjEndAPI(&vm); - return snapshot; -} - -static char * -testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - char *xml = NULL; - virDomainSnapshotObjPtr snap = NULL; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - testDriverPtr privconn = snapshot->domain->conn->privateData; - - virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return NULL; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - virUUIDFormat(snapshot->domain->uuid, uuidstr); - - xml = virDomainSnapshotDefFormat(uuidstr, snap->def, privconn->caps, - virDomainDefFormatConvertXMLFlags(flags), - 0); - - cleanup: - virDomainObjEndAPI(&vm); - return xml; -} - -static int -testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - int ret; - - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - ret = (vm->current_snapshot && - STREQ(snapshot->name, vm->current_snapshot->def->name)); - - virDomainObjEndAPI(&vm); - return ret; -} - - -static int -testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - int ret = -1; - - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - if (!testSnapObjFromSnapshot(vm, snapshot)) - goto cleanup; - - ret = 1; - - cleanup: - virDomainObjEndAPI(&vm); - return ret; -} - -static int -testDomainSnapshotAlignDisks(virDomainObjPtr vm, - virDomainSnapshotDefPtr def, - unsigned int flags) -{ - int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; - bool align_match = true; - - if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { - align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; - align_match = false; - if (virDomainObjIsActive(vm)) - def->state = VIR_DOMAIN_DISK_SNAPSHOT; - else - def->state = VIR_DOMAIN_SHUTOFF; - def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; - } else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { - def->state = virDomainObjGetState(vm, NULL); - align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; - align_match = false; - } else { - def->state = virDomainObjGetState(vm, NULL); - def->memory = def->state == VIR_DOMAIN_SHUTOFF ? - VIR_DOMAIN_SNAPSHOT_LOCATION_NONE : - VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; - } - - return virDomainSnapshotAlignDisks(def, align_location, align_match); -} - -static virDomainSnapshotPtr -testDomainSnapshotCreateXML(virDomainPtr domain, - const char *xmlDesc, - unsigned int flags) -{ - testDriverPtr privconn = domain->conn->privateData; - virDomainObjPtr vm = NULL; - virDomainSnapshotDefPtr def = NULL; - virDomainSnapshotObjPtr snap = NULL; - virDomainSnapshotPtr snapshot = NULL; - virObjectEventPtr event = NULL; - char *xml = NULL; - bool update_current = true; - bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; - unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; - - /* - * DISK_ONLY: Not implemented yet - * REUSE_EXT: Not implemented yet - * - * NO_METADATA: Explicitly not implemented - * - * REDEFINE + CURRENT: Implemented - * HALT: Implemented - * QUIESCE: Nothing to do - * ATOMIC: Nothing to do - * LIVE: Nothing to do - */ - virCheckFlags( - VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | - VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | - VIR_DOMAIN_SNAPSHOT_CREATE_HALT | - VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE | - VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC | - VIR_DOMAIN_SNAPSHOT_CREATE_LIVE, NULL); - - if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT))) - update_current = false; - if (redefine) - parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; - - if (!(vm = testDomObjFromDomain(domain))) - goto cleanup; - - if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot halt after transient domain snapshot")); - goto cleanup; - } - - if (!(def = virDomainSnapshotDefParseString(xmlDesc, - privconn->caps, - privconn->xmlopt, - parse_flags))) - goto cleanup; - - if (redefine) { - if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, - &update_current, flags) < 0) - goto cleanup; - } else { - if (!(def->dom = virDomainDefCopy(vm->def, - privconn->caps, - privconn->xmlopt, - true))) - goto cleanup; - - if (testDomainSnapshotAlignDisks(vm, def, flags) < 0) - goto cleanup; - } - - if (!snap) { - if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, def))) - goto cleanup; - def = NULL; - } - - if (!redefine) { - if (vm->current_snapshot && - (VIR_STRDUP(snap->def->parent, - vm->current_snapshot->def->name) < 0)) - goto cleanup; - - if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) && - virDomainObjIsActive(vm)) { - testDomainShutdownState(domain, vm, - VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); - event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); - } - } - - snapshot = virGetDomainSnapshot(domain, snap->def->name); - cleanup: - VIR_FREE(xml); - if (vm) { - if (snapshot) { - virDomainSnapshotObjPtr other; - if (update_current) - vm->current_snapshot = snap; - other = virDomainSnapshotFindByName(vm->snapshots, - snap->def->parent); - snap->parent = other; - other->nchildren++; - snap->sibling = other->first_child; - other->first_child = snap; - } - virDomainObjEndAPI(&vm); - } - testObjectEventQueue(privconn, event); - virDomainSnapshotDefFree(def); - return snapshot; -} - - -typedef struct _testSnapRemoveData testSnapRemoveData; -typedef testSnapRemoveData *testSnapRemoveDataPtr; -struct _testSnapRemoveData { - virDomainObjPtr vm; - bool current; -}; - -static int -testDomainSnapshotDiscardAll(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *data) -{ - virDomainSnapshotObjPtr snap = payload; - testSnapRemoveDataPtr curr = data; - - if (snap->def->current) - curr->current = true; - virDomainSnapshotObjListRemove(curr->vm->snapshots, snap); - return 0; -} - -typedef struct _testSnapReparentData testSnapReparentData; -typedef testSnapReparentData *testSnapReparentDataPtr; -struct _testSnapReparentData { - virDomainSnapshotObjPtr parent; - virDomainObjPtr vm; - int err; - virDomainSnapshotObjPtr last; -}; - -static int -testDomainSnapshotReparentChildren(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *data) -{ - virDomainSnapshotObjPtr snap = payload; - testSnapReparentDataPtr rep = data; - - if (rep->err < 0) - return 0; - - VIR_FREE(snap->def->parent); - snap->parent = rep->parent; - - if (rep->parent->def && - VIR_STRDUP(snap->def->parent, rep->parent->def->name) < 0) { - rep->err = -1; - return 0; - } - - if (!snap->sibling) - rep->last = snap; - return 0; -} - -static int -testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - virDomainObjPtr vm = NULL; - virDomainSnapshotObjPtr snap = NULL; - virDomainSnapshotObjPtr parentsnap = NULL; - int ret = -1; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | - VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | - VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { - testSnapRemoveData rem; - rem.vm = vm; - rem.current = false; - virDomainSnapshotForEachDescendant(snap, - testDomainSnapshotDiscardAll, - &rem); - if (rem.current) { - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) - snap->def->current = true; - vm->current_snapshot = snap; - } - } else if (snap->nchildren) { - testSnapReparentData rep; - rep.parent = snap->parent; - rep.vm = vm; - rep.err = 0; - rep.last = NULL; - virDomainSnapshotForEachChild(snap, - testDomainSnapshotReparentChildren, - &rep); - if (rep.err < 0) - goto cleanup; - - /* Can't modify siblings during ForEachChild, so do it now. */ - snap->parent->nchildren += snap->nchildren; - rep.last->sibling = snap->parent->first_child; - snap->parent->first_child = snap->first_child; - } - - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) { - snap->nchildren = 0; - snap->first_child = NULL; - } else { - virDomainSnapshotDropParent(snap); - if (snap == vm->current_snapshot) { - if (snap->def->parent) { - parentsnap = virDomainSnapshotFindByName(vm->snapshots, - snap->def->parent); - if (!parentsnap) { - VIR_WARN("missing parent snapshot matching name '%s'", - snap->def->parent); - } else { - parentsnap->def->current = true; - } - } - vm->current_snapshot = parentsnap; - } - virDomainSnapshotObjListRemove(vm->snapshots, snap); - } - - ret = 0; - cleanup: - virDomainObjEndAPI(&vm); - return ret; -} - -static int -testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, - unsigned int flags) -{ - testDriverPtr privconn = snapshot->domain->conn->privateData; - virDomainObjPtr vm = NULL; - virDomainSnapshotObjPtr snap = NULL; - virObjectEventPtr event = NULL; - virObjectEventPtr event2 = NULL; - virDomainDefPtr config = NULL; - int ret = -1; - - virCheckFlags(VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | - VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED | - VIR_DOMAIN_SNAPSHOT_REVERT_FORCE, -1); - - /* We have the following transitions, which create the following events: - * 1. inactive -> inactive: none - * 2. inactive -> running: EVENT_STARTED - * 3. inactive -> paused: EVENT_STARTED, EVENT_PAUSED - * 4. running -> inactive: EVENT_STOPPED - * 5. running -> running: none - * 6. running -> paused: EVENT_PAUSED - * 7. paused -> inactive: EVENT_STOPPED - * 8. paused -> running: EVENT_RESUMED - * 9. paused -> paused: none - * Also, several transitions occur even if we fail partway through, - * and use of FORCE can cause multiple transitions. - */ - - if (!(vm = testDomObjFromSnapshot(snapshot))) - return -1; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - if (!vm->persistent && - snap->def->state != VIR_DOMAIN_RUNNING && - snap->def->state != VIR_DOMAIN_PAUSED && - (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | - VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) == 0) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("transient domain needs to request run or pause " - "to revert to inactive snapshot")); - goto cleanup; - } - - if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { - if (!snap->def->dom) { - virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, - _("snapshot '%s' lacks domain '%s' rollback info"), - snap->def->name, vm->def->name); - goto cleanup; - } - if (virDomainObjIsActive(vm) && - !(snap->def->state == VIR_DOMAIN_RUNNING - || snap->def->state == VIR_DOMAIN_PAUSED) && - (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | - VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED))) { - virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", - _("must respawn guest to start inactive snapshot")); - goto cleanup; - } - } - - - if (vm->current_snapshot) { - vm->current_snapshot->def->current = false; - vm->current_snapshot = NULL; - } - - snap->def->current = true; - config = virDomainDefCopy(snap->def->dom, - privconn->caps, privconn->xmlopt, true); - if (!config) - goto cleanup; - - if (snap->def->state == VIR_DOMAIN_RUNNING || - snap->def->state == VIR_DOMAIN_PAUSED) { - /* Transitions 2, 3, 5, 6, 8, 9 */ - bool was_running = false; - bool was_stopped = false; - - if (virDomainObjIsActive(vm)) { - /* Transitions 5, 6, 8, 9 */ - /* Check for ABI compatibility. */ - if (!virDomainDefCheckABIStability(vm->def, config)) { - virErrorPtr err = virGetLastError(); - - if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { - /* Re-spawn error using correct category. */ - if (err->code == VIR_ERR_CONFIG_UNSUPPORTED) - virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", - err->str2); - goto cleanup; - } - - virResetError(err); - testDomainShutdownState(snapshot->domain, vm, - VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); - testObjectEventQueue(privconn, event); - goto load; - } - - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { - /* Transitions 5, 6 */ - was_running = true; - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, - VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); - /* Create an event now in case the restore fails, so - * that user will be alerted that they are now paused. - * If restore later succeeds, we might replace this. */ - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); - } - virDomainObjAssignDef(vm, config, false, NULL); - - } else { - /* Transitions 2, 3 */ - load: - was_stopped = true; - virDomainObjAssignDef(vm, config, false, NULL); - if (testDomainStartState(privconn, vm, - VIR_DOMAIN_RUNNING_FROM_SNAPSHOT) < 0) - goto cleanup; - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); - } - - /* Touch up domain state. */ - if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) && - (snap->def->state == VIR_DOMAIN_PAUSED || - (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED))) { - /* Transitions 3, 6, 9 */ - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, - VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); - if (was_stopped) { - /* Transition 3, use event as-is and add event2 */ - event2 = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); - } /* else transition 6 and 9 use event as-is */ - } else { - /* Transitions 2, 5, 8 */ - virObjectUnref(event); - event = NULL; - - if (was_stopped) { - /* Transition 2 */ - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); - } else if (was_running) { - /* Transition 8 */ - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_RESUMED, - VIR_DOMAIN_EVENT_RESUMED); - } - } - } else { - /* Transitions 1, 4, 7 */ - virDomainObjAssignDef(vm, config, false, NULL); - - if (virDomainObjIsActive(vm)) { - /* Transitions 4, 7 */ - testDomainShutdownState(snapshot->domain, vm, - VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); - } - - if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | - VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { - /* Flush first event, now do transition 2 or 3 */ - bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0; - - testObjectEventQueue(privconn, event); - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); - if (paused) { - event2 = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); - } - } - } - - vm->current_snapshot = snap; - ret = 0; - cleanup: - if (event) { - testObjectEventQueue(privconn, event); - testObjectEventQueue(privconn, event2); - } else { - virObjectUnref(event2); - } - virDomainObjEndAPI(&vm); - - return ret; -} - - - -static virHypervisorDriver testHypervisorDriver = { - .name = "Test", - .connectOpen = testConnectOpen, /* 0.1.1 */ - .connectClose = testConnectClose, /* 0.1.1 */ - .connectGetVersion = testConnectGetVersion, /* 0.1.1 */ - .connectGetHostname = testConnectGetHostname, /* 0.6.3 */ - .connectGetMaxVcpus = testConnectGetMaxVcpus, /* 0.3.2 */ - .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ - .nodeGetCPUStats = testNodeGetCPUStats, /* 2.3.0 */ - .nodeGetFreeMemory = testNodeGetFreeMemory, /* 2.3.0 */ - .nodeGetFreePages = testNodeGetFreePages, /* 2.3.0 */ - .connectGetCapabilities = testConnectGetCapabilities, /* 0.2.1 */ - .connectGetSysinfo = testConnectGetSysinfo, /* 2.3.0 */ - .connectGetType = testConnectGetType, /* 2.3.0 */ - .connectListDomains = testConnectListDomains, /* 0.1.1 */ - .connectNumOfDomains = testConnectNumOfDomains, /* 0.1.1 */ - .connectListAllDomains = testConnectListAllDomains, /* 0.9.13 */ - .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ - .domainLookupByID = testDomainLookupByID, /* 0.1.1 */ - .domainLookupByUUID = testDomainLookupByUUID, /* 0.1.1 */ - .domainLookupByName = testDomainLookupByName, /* 0.1.1 */ - .domainSuspend = testDomainSuspend, /* 0.1.1 */ - .domainResume = testDomainResume, /* 0.1.1 */ - .domainShutdown = testDomainShutdown, /* 0.1.1 */ - .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ - .domainReboot = testDomainReboot, /* 0.1.1 */ - .domainDestroy = testDomainDestroy, /* 0.1.1 */ - .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ - .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ - .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ - .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ - .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ - .domainGetState = testDomainGetState, /* 0.9.2 */ - .domainSave = testDomainSave, /* 0.3.2 */ - .domainSaveFlags = testDomainSaveFlags, /* 0.9.4 */ - .domainRestore = testDomainRestore, /* 0.3.2 */ - .domainRestoreFlags = testDomainRestoreFlags, /* 0.9.4 */ - .domainCoreDump = testDomainCoreDump, /* 0.3.2 */ - .domainCoreDumpWithFormat = testDomainCoreDumpWithFormat, /* 1.2.3 */ - .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */ - .domainSetVcpusFlags = testDomainSetVcpusFlags, /* 0.8.5 */ - .domainGetVcpusFlags = testDomainGetVcpusFlags, /* 0.8.5 */ - .domainPinVcpu = testDomainPinVcpu, /* 0.7.3 */ - .domainGetVcpus = testDomainGetVcpus, /* 0.7.3 */ - .domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */ - .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ - .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ - .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ - .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ - .domainCreate = testDomainCreate, /* 0.1.11 */ - .domainCreateWithFlags = testDomainCreateWithFlags, /* 0.8.2 */ - .domainDefineXML = testDomainDefineXML, /* 0.1.11 */ - .domainDefineXMLFlags = testDomainDefineXMLFlags, /* 1.2.12 */ - .domainUndefine = testDomainUndefine, /* 0.1.11 */ - .domainUndefineFlags = testDomainUndefineFlags, /* 0.9.4 */ - .domainGetAutostart = testDomainGetAutostart, /* 0.3.2 */ - .domainSetAutostart = testDomainSetAutostart, /* 0.3.2 */ - .domainGetSchedulerType = testDomainGetSchedulerType, /* 0.3.2 */ - .domainGetSchedulerParameters = testDomainGetSchedulerParameters, /* 0.3.2 */ - .domainGetSchedulerParametersFlags = testDomainGetSchedulerParametersFlags, /* 0.9.2 */ - .domainSetSchedulerParameters = testDomainSetSchedulerParameters, /* 0.3.2 */ - .domainSetSchedulerParametersFlags = testDomainSetSchedulerParametersFlags, /* 0.9.2 */ - .domainBlockStats = testDomainBlockStats, /* 0.7.0 */ - .domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */ - .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */ - .connectDomainEventRegister = testConnectDomainEventRegister, /* 0.6.0 */ - .connectDomainEventDeregister = testConnectDomainEventDeregister, /* 0.6.0 */ - .connectIsEncrypted = testConnectIsEncrypted, /* 0.7.3 */ - .connectIsSecure = testConnectIsSecure, /* 0.7.3 */ - .domainIsActive = testDomainIsActive, /* 0.7.3 */ - .domainIsPersistent = testDomainIsPersistent, /* 0.7.3 */ - .domainIsUpdated = testDomainIsUpdated, /* 0.8.6 */ - .connectDomainEventRegisterAny = testConnectDomainEventRegisterAny, /* 0.8.0 */ - .connectDomainEventDeregisterAny = testConnectDomainEventDeregisterAny, /* 0.8.0 */ - .connectIsAlive = testConnectIsAlive, /* 0.9.8 */ - .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ - .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ - .domainGetMetadata = testDomainGetMetadata, /* 1.1.3 */ - .domainSetMetadata = testDomainSetMetadata, /* 1.1.3 */ - .connectGetCPUModelNames = testConnectGetCPUModelNames, /* 1.1.3 */ - .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ - .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ - .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ - - .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ - .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ - .domainListAllSnapshots = testDomainListAllSnapshots, /* 1.1.4 */ - .domainSnapshotGetXMLDesc = testDomainSnapshotGetXMLDesc, /* 1.1.4 */ - .domainSnapshotNumChildren = testDomainSnapshotNumChildren, /* 1.1.4 */ - .domainSnapshotListChildrenNames = testDomainSnapshotListChildrenNames, /* 1.1.4 */ - .domainSnapshotListAllChildren = testDomainSnapshotListAllChildren, /* 1.1.4 */ - .domainSnapshotLookupByName = testDomainSnapshotLookupByName, /* 1.1.4 */ - .domainHasCurrentSnapshot = testDomainHasCurrentSnapshot, /* 1.1.4 */ - .domainSnapshotGetParent = testDomainSnapshotGetParent, /* 1.1.4 */ - .domainSnapshotCurrent = testDomainSnapshotCurrent, /* 1.1.4 */ - .domainSnapshotIsCurrent = testDomainSnapshotIsCurrent, /* 1.1.4 */ - .domainSnapshotHasMetadata = testDomainSnapshotHasMetadata, /* 1.1.4 */ - .domainSnapshotCreateXML = testDomainSnapshotCreateXML, /* 1.1.4 */ - .domainRevertToSnapshot = testDomainRevertToSnapshot, /* 1.1.4 */ - .domainSnapshotDelete = testDomainSnapshotDelete, /* 1.1.4 */ - - .connectBaselineCPU = testConnectBaselineCPU, /* 1.2.0 */ -}; - -static virNetworkDriver testNetworkDriver = { - .connectNumOfNetworks = testConnectNumOfNetworks, /* 0.3.2 */ - .connectListNetworks = testConnectListNetworks, /* 0.3.2 */ - .connectNumOfDefinedNetworks = testConnectNumOfDefinedNetworks, /* 0.3.2 */ - .connectListDefinedNetworks = testConnectListDefinedNetworks, /* 0.3.2 */ - .connectListAllNetworks = testConnectListAllNetworks, /* 0.10.2 */ - .connectNetworkEventRegisterAny = testConnectNetworkEventRegisterAny, /* 1.2.1 */ - .connectNetworkEventDeregisterAny = testConnectNetworkEventDeregisterAny, /* 1.2.1 */ - .networkLookupByUUID = testNetworkLookupByUUID, /* 0.3.2 */ - .networkLookupByName = testNetworkLookupByName, /* 0.3.2 */ - .networkCreateXML = testNetworkCreateXML, /* 0.3.2 */ - .networkDefineXML = testNetworkDefineXML, /* 0.3.2 */ - .networkUndefine = testNetworkUndefine, /* 0.3.2 */ - .networkUpdate = testNetworkUpdate, /* 0.10.2 */ - .networkCreate = testNetworkCreate, /* 0.3.2 */ - .networkDestroy = testNetworkDestroy, /* 0.3.2 */ - .networkGetXMLDesc = testNetworkGetXMLDesc, /* 0.3.2 */ - .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ - .networkGetAutostart = testNetworkGetAutostart, /* 0.3.2 */ - .networkSetAutostart = testNetworkSetAutostart, /* 0.3.2 */ - .networkIsActive = testNetworkIsActive, /* 0.7.3 */ - .networkIsPersistent = testNetworkIsPersistent, /* 0.7.3 */ -}; - -static virInterfaceDriver testInterfaceDriver = { - .connectNumOfInterfaces = testConnectNumOfInterfaces, /* 0.7.0 */ - .connectListInterfaces = testConnectListInterfaces, /* 0.7.0 */ - .connectNumOfDefinedInterfaces = testConnectNumOfDefinedInterfaces, /* 0.7.0 */ - .connectListDefinedInterfaces = testConnectListDefinedInterfaces, /* 0.7.0 */ - .interfaceLookupByName = testInterfaceLookupByName, /* 0.7.0 */ - .interfaceLookupByMACString = testInterfaceLookupByMACString, /* 0.7.0 */ - .interfaceGetXMLDesc = testInterfaceGetXMLDesc, /* 0.7.0 */ - .interfaceDefineXML = testInterfaceDefineXML, /* 0.7.0 */ - .interfaceUndefine = testInterfaceUndefine, /* 0.7.0 */ - .interfaceCreate = testInterfaceCreate, /* 0.7.0 */ - .interfaceDestroy = testInterfaceDestroy, /* 0.7.0 */ - .interfaceIsActive = testInterfaceIsActive, /* 0.7.3 */ - .interfaceChangeBegin = testInterfaceChangeBegin, /* 0.9.2 */ - .interfaceChangeCommit = testInterfaceChangeCommit, /* 0.9.2 */ - .interfaceChangeRollback = testInterfaceChangeRollback, /* 0.9.2 */ -}; - - -static virStorageDriver testStorageDriver = { - .connectNumOfStoragePools = testConnectNumOfStoragePools, /* 0.5.0 */ - .connectListStoragePools = testConnectListStoragePools, /* 0.5.0 */ - .connectNumOfDefinedStoragePools = testConnectNumOfDefinedStoragePools, /* 0.5.0 */ - .connectListDefinedStoragePools = testConnectListDefinedStoragePools, /* 0.5.0 */ - .connectListAllStoragePools = testConnectListAllStoragePools, /* 0.10.2 */ - .connectFindStoragePoolSources = testConnectFindStoragePoolSources, /* 0.5.0 */ - .connectStoragePoolEventRegisterAny = testConnectStoragePoolEventRegisterAny, /* 2.0.0 */ - .connectStoragePoolEventDeregisterAny = testConnectStoragePoolEventDeregisterAny, /* 2.0.0 */ - .storagePoolLookupByName = testStoragePoolLookupByName, /* 0.5.0 */ - .storagePoolLookupByUUID = testStoragePoolLookupByUUID, /* 0.5.0 */ - .storagePoolLookupByVolume = testStoragePoolLookupByVolume, /* 0.5.0 */ - .storagePoolCreateXML = testStoragePoolCreateXML, /* 0.5.0 */ - .storagePoolDefineXML = testStoragePoolDefineXML, /* 0.5.0 */ - .storagePoolBuild = testStoragePoolBuild, /* 0.5.0 */ - .storagePoolUndefine = testStoragePoolUndefine, /* 0.5.0 */ - .storagePoolCreate = testStoragePoolCreate, /* 0.5.0 */ - .storagePoolDestroy = testStoragePoolDestroy, /* 0.5.0 */ - .storagePoolDelete = testStoragePoolDelete, /* 0.5.0 */ - .storagePoolRefresh = testStoragePoolRefresh, /* 0.5.0 */ - .storagePoolGetInfo = testStoragePoolGetInfo, /* 0.5.0 */ - .storagePoolGetXMLDesc = testStoragePoolGetXMLDesc, /* 0.5.0 */ - .storagePoolGetAutostart = testStoragePoolGetAutostart, /* 0.5.0 */ - .storagePoolSetAutostart = testStoragePoolSetAutostart, /* 0.5.0 */ - .storagePoolNumOfVolumes = testStoragePoolNumOfVolumes, /* 0.5.0 */ - .storagePoolListVolumes = testStoragePoolListVolumes, /* 0.5.0 */ - .storagePoolListAllVolumes = testStoragePoolListAllVolumes, /* 0.10.2 */ - - .storageVolLookupByName = testStorageVolLookupByName, /* 0.5.0 */ - .storageVolLookupByKey = testStorageVolLookupByKey, /* 0.5.0 */ - .storageVolLookupByPath = testStorageVolLookupByPath, /* 0.5.0 */ - .storageVolCreateXML = testStorageVolCreateXML, /* 0.5.0 */ - .storageVolCreateXMLFrom = testStorageVolCreateXMLFrom, /* 0.6.4 */ - .storageVolDelete = testStorageVolDelete, /* 0.5.0 */ - .storageVolGetInfo = testStorageVolGetInfo, /* 0.5.0 */ - .storageVolGetXMLDesc = testStorageVolGetXMLDesc, /* 0.5.0 */ - .storageVolGetPath = testStorageVolGetPath, /* 0.5.0 */ - .storagePoolIsActive = testStoragePoolIsActive, /* 0.7.3 */ - .storagePoolIsPersistent = testStoragePoolIsPersistent, /* 0.7.3 */ -}; - -static virNodeDeviceDriver testNodeDeviceDriver = { - .connectNodeDeviceEventRegisterAny = testConnectNodeDeviceEventRegisterAny, /* 2.2.0 */ - .connectNodeDeviceEventDeregisterAny = testConnectNodeDeviceEventDeregisterAny, /* 2.2.0 */ - .nodeNumOfDevices = testNodeNumOfDevices, /* 0.7.2 */ - .nodeListDevices = testNodeListDevices, /* 0.7.2 */ - .nodeDeviceLookupByName = testNodeDeviceLookupByName, /* 0.7.2 */ - .nodeDeviceGetXMLDesc = testNodeDeviceGetXMLDesc, /* 0.7.2 */ - .nodeDeviceGetParent = testNodeDeviceGetParent, /* 0.7.2 */ - .nodeDeviceNumOfCaps = testNodeDeviceNumOfCaps, /* 0.7.2 */ - .nodeDeviceListCaps = testNodeDeviceListCaps, /* 0.7.2 */ - .nodeDeviceCreateXML = testNodeDeviceCreateXML, /* 0.7.3 */ - .nodeDeviceDestroy = testNodeDeviceDestroy, /* 0.7.3 */ -}; static virConnectDriver testConnectDriver = { .hypervisorDriver = &testHypervisorDriver, diff --git a/src/test/test_hypervisor_driver.c b/src/test/test_hypervisor_driver.c new file mode 100644 index 0000000..96e04b6 --- /dev/null +++ b/src/test/test_hypervisor_driver.c @@ -0,0 +1,4152 @@ +/* + * test_hypervisor_driver.c: A "mock" hypervisor for use by application unit tests + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Daniel Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <string.h> +#include <sys/time.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <libxml/xmlsave.h> +#include <libxml/xpathInternals.h> + + +#include "virerror.h" +#include "datatypes.h" +#include "test_driver.h" +#include "virbuffer.h" +#include "viruuid.h" +#include "capabilities.h" +#include "configmake.h" +#include "viralloc.h" +#include "network_conf.h" +#include "interface_conf.h" +#include "domain_conf.h" +#include "domain_event.h" +#include "network_event.h" +#include "snapshot_conf.h" +#include "fdstream.h" +#include "storage_conf.h" +#include "storage_event.h" +#include "node_device_conf.h" +#include "node_device_event.h" +#include "virxml.h" +#include "virthread.h" +#include "virlog.h" +#include "virfile.h" +#include "virtypedparam.h" +#include "virrandom.h" +#include "virstring.h" +#include "cpu/cpu.h" +#include "virauth.h" +#include "viratomic.h" +#include "virdomainobjlist.h" +#include "virhostcpu.h" + +#include "test_hypervisor_driver.h" + +#include "test_private_driver.h" + +VIR_LOG_INIT("test.test_driver"); + +static int testNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info); + +static int +testConnectAuthenticate(virConnectPtr conn, + virConnectAuthPtr auth) +{ + testDriverPtr privconn = conn->privateData; + int ret = -1; + ssize_t i; + char *username = NULL, *password = NULL; + + if (privconn->numAuths == 0) + return 0; + + /* Authentication is required because the test XML contains a + * non-empty <auth/> section. First we must ask for a username. + */ + username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/); + if (!username) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for username")); + goto cleanup; + } + + /* Does the username exist? */ + for (i = 0; i < privconn->numAuths; ++i) { + if (STREQ(privconn->auths[i].username, username)) + goto found_user; + } + i = -1; + + found_user: + /* Even if we didn't find the user, we still ask for a password. */ + if (i == -1 || privconn->auths[i].password != NULL) { + password = virAuthGetPassword(conn, auth, "test", + username, "localhost"); + if (password == NULL) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed when asking for password")); + goto cleanup; + } + } + + if (i == -1 || + (password && STRNEQ(privconn->auths[i].password, password))) { + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed, see test XML for the correct username/password")); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(username); + VIR_FREE(password); + return ret; +} + +static int +testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) +{ + char *str; + long l; + int ret; + + ret = virXPathLong("string(/node/cpu/nodes[1])", ctxt, &l); + if (ret == 0) { + nodeInfo->nodes = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu nodes value")); + goto error; + } + + ret = virXPathLong("string(/node/cpu/sockets[1])", ctxt, &l); + if (ret == 0) { + nodeInfo->sockets = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu sockets value")); + goto error; + } + + ret = virXPathLong("string(/node/cpu/cores[1])", ctxt, &l); + if (ret == 0) { + nodeInfo->cores = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu cores value")); + goto error; + } + + ret = virXPathLong("string(/node/cpu/threads[1])", ctxt, &l); + if (ret == 0) { + nodeInfo->threads = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu threads value")); + goto error; + } + + nodeInfo->cpus = (nodeInfo->cores * nodeInfo->threads * + nodeInfo->sockets * nodeInfo->nodes); + ret = virXPathLong("string(/node/cpu/active[1])", ctxt, &l); + if (ret == 0) { + if (l < nodeInfo->cpus) + nodeInfo->cpus = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu active value")); + goto error; + } + ret = virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l); + if (ret == 0) { + nodeInfo->mhz = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu mhz value")); + goto error; + } + + str = virXPathString("string(/node/cpu/model[1])", ctxt); + if (str != NULL) { + if (virStrcpyStatic(nodeInfo->model, str) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Model %s too big for destination"), str); + VIR_FREE(str); + goto error; + } + VIR_FREE(str); + } + + ret = virXPathLong("string(/node/memory[1])", ctxt, &l); + if (ret == 0) { + nodeInfo->memory = l; + } else if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node memory value")); + goto error; + } + + return 0; + error: + return -1; +} + +static char *testBuildFilename(const char *relativeTo, + const char *filename) +{ + char *offset; + int baseLen; + char *ret; + + if (!filename || filename[0] == '\0') + return NULL; + if (filename[0] == '/') { + ignore_value(VIR_STRDUP(ret, filename)); + return ret; + } + + offset = strrchr(relativeTo, '/'); + if ((baseLen = (offset-relativeTo+1))) { + char *absFile; + int totalLen = baseLen + strlen(filename) + 1; + if (VIR_ALLOC_N(absFile, totalLen) < 0) + return NULL; + if (virStrncpy(absFile, relativeTo, baseLen, totalLen) == NULL) { + VIR_FREE(absFile); + return NULL; + } + strcat(absFile, filename); + return absFile; + } else { + ignore_value(VIR_STRDUP(ret, filename)); + return ret; + } +} + +static xmlNodePtr +testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type) +{ + xmlNodePtr ret = NULL; + xmlDocPtr doc = NULL; + char *absFile = NULL; + char *relFile = virXMLPropString(node, "file"); + + if (relFile != NULL) { + absFile = testBuildFilename(file, relFile); + VIR_FREE(relFile); + if (!absFile) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("resolving %s filename"), type); + return NULL; + } + + if (!(doc = virXMLParse(absFile, NULL, type))) + goto error; + + ret = xmlCopyNode(xmlDocGetRootElement(doc), 1); + if (!ret) { + virReportOOMError(); + goto error; + } + xmlReplaceNode(node, ret); + xmlFreeNode(node); + } else { + ret = node; + } + + error: + xmlFreeDoc(doc); + VIR_FREE(absFile); + return ret; +} + +#define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" + +typedef struct _testDomainNamespaceDef testDomainNamespaceDef; +typedef testDomainNamespaceDef *testDomainNamespaceDefPtr; +struct _testDomainNamespaceDef { + int runstate; + bool transient; + bool hasManagedSave; + + unsigned int num_snap_nodes; + xmlNodePtr *snap_nodes; +}; + +static void +testDomainDefNamespaceFree(void *data) +{ + testDomainNamespaceDefPtr nsdata = data; + size_t i; + + if (!nsdata) + return; + + for (i = 0; i < nsdata->num_snap_nodes; i++) + xmlFreeNode(nsdata->snap_nodes[i]); + + VIR_FREE(nsdata->snap_nodes); + VIR_FREE(nsdata); +} + +static int +testDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED, + xmlNodePtr root ATTRIBUTE_UNUSED, + xmlXPathContextPtr ctxt, + void **data) +{ + testDomainNamespaceDefPtr nsdata = NULL; + xmlNodePtr *nodes = NULL; + int tmp, n; + size_t i; + unsigned int tmpuint; + + if (xmlXPathRegisterNs(ctxt, BAD_CAST "test", + BAD_CAST TEST_NAMESPACE_HREF) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to register xml namespace '%s'"), + TEST_NAMESPACE_HREF); + return -1; + } + + if (VIR_ALLOC(nsdata) < 0) + return -1; + + n = virXPathNodeSet("./test:domainsnapshot", ctxt, &nodes); + if (n < 0) + goto error; + + if (n && VIR_ALLOC_N(nsdata->snap_nodes, n) < 0) + goto error; + + for (i = 0; i < n; i++) { + xmlNodePtr newnode = xmlCopyNode(nodes[i], 1); + if (!newnode) { + virReportOOMError(); + goto error; + } + + nsdata->snap_nodes[nsdata->num_snap_nodes] = newnode; + nsdata->num_snap_nodes++; + } + VIR_FREE(nodes); + + tmp = virXPathBoolean("boolean(./test:transient)", ctxt); + if (tmp == -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid transient")); + goto error; + } + nsdata->transient = tmp; + + tmp = virXPathBoolean("boolean(./test:hasmanagedsave)", ctxt); + if (tmp == -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid hasmanagedsave")); + goto error; + } + nsdata->hasManagedSave = tmp; + + tmp = virXPathUInt("string(./test:runstate)", ctxt, &tmpuint); + if (tmp == 0) { + if (tmpuint >= VIR_DOMAIN_LAST) { + virReportError(VIR_ERR_XML_ERROR, + _("runstate '%d' out of range'"), tmpuint); + goto error; + } + nsdata->runstate = tmpuint; + } else if (tmp == -1) { + nsdata->runstate = VIR_DOMAIN_RUNNING; + } else if (tmp == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid runstate")); + goto error; + } + + if (nsdata->transient && nsdata->runstate == VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("transient domain cannot have runstate 'shutoff'")); + goto error; + } + if (nsdata->hasManagedSave && nsdata->runstate != VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("domain with managedsave data can only have runstate 'shutoff'")); + goto error; + } + + *data = nsdata; + return 0; + + error: + VIR_FREE(nodes); + testDomainDefNamespaceFree(nsdata); + return -1; +} + +static int +testParseDomainSnapshots(testDriverPtr privconn, + virDomainObjPtr domobj, + const char *file, + xmlXPathContextPtr ctxt) +{ + size_t i; + int ret = -1; + testDomainNamespaceDefPtr nsdata = domobj->def->namespaceData; + xmlNodePtr *nodes = nsdata->snap_nodes; + + for (i = 0; i < nsdata->num_snap_nodes; i++) { + virDomainSnapshotObjPtr snap; + virDomainSnapshotDefPtr def; + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, + "domainsnapshot"); + if (!node) + goto error; + + def = virDomainSnapshotDefParseNode(ctxt->doc, node, + privconn->caps, + privconn->xmlopt, + VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | + VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL | + VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); + if (!def) + goto error; + + if (!(snap = virDomainSnapshotAssignDef(domobj->snapshots, def))) { + virDomainSnapshotDefFree(def); + goto error; + } + + if (def->current) { + if (domobj->current_snapshot) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("more than one snapshot claims to be active")); + goto error; + } + + domobj->current_snapshot = snap; + } + } + + if (virDomainSnapshotUpdateRelations(domobj->snapshots) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Snapshots have inconsistent relations for " + "domain %s"), domobj->def->name); + goto error; + } + + ret = 0; + error: + return ret; +} + +static void +testDomainShutdownState(virDomainPtr domain, + virDomainObjPtr privdom, + virDomainShutoffReason reason) +{ + virDomainObjRemoveTransientDef(privdom); + virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, reason); + + if (domain) + domain->id = -1; +} + +/* Set up domain runtime state */ +static int +testDomainStartState(testDriverPtr privconn, + virDomainObjPtr dom, + virDomainRunningReason reason) +{ + int ret = -1; + + virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, reason); + dom->def->id = virAtomicIntAdd(&privconn->nextDomID, 1); + + if (virDomainObjSetDefTransient(privconn->caps, + privconn->xmlopt, + dom) < 0) { + goto cleanup; + } + + dom->hasManagedSave = false; + ret = 0; + cleanup: + if (ret < 0) + testDomainShutdownState(NULL, dom, VIR_DOMAIN_SHUTOFF_FAILED); + return ret; +} + +static char * +testDomainGenerateIfname(virDomainDefPtr domdef) +{ + int maxif = 1024; + int ifctr; + size_t i; + + for (ifctr = 0; ifctr < maxif; ++ifctr) { + char *ifname; + int found = 0; + + if (virAsprintf(&ifname, "testnet%d", ifctr) < 0) + return NULL; + + /* Generate network interface names */ + for (i = 0; i < domdef->nnets; i++) { + if (domdef->nets[i]->ifname && + STREQ(domdef->nets[i]->ifname, ifname)) { + found = 1; + break; + } + } + + if (!found) + return ifname; + VIR_FREE(ifname); + } + + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Exceeded max iface limit %d"), maxif); + return NULL; +} + +static int +testDomainGenerateIfnames(virDomainDefPtr domdef) +{ + size_t i = 0; + + for (i = 0; i < domdef->nnets; i++) { + char *ifname; + if (domdef->nets[i]->ifname) + continue; + + ifname = testDomainGenerateIfname(domdef); + if (!ifname) + return -1; + + domdef->nets[i]->ifname = ifname; + } + + return 0; +} + +static int +testParseDomains(testDriverPtr privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + virDomainObjPtr obj; + + num = virXPathNodeSet("/node/domain", ctxt, &nodes); + if (num < 0) + goto error; + + for (i = 0; i < num; i++) { + virDomainDefPtr def; + testDomainNamespaceDefPtr nsdata; + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "domain"); + if (!node) + goto error; + + def = virDomainDefParseNode(ctxt->doc, node, + privconn->caps, privconn->xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE); + if (!def) + goto error; + + if (testDomainGenerateIfnames(def) < 0 || + !(obj = virDomainObjListAdd(privconn->domains, + def, + privconn->xmlopt, + 0, NULL))) { + virDomainDefFree(def); + goto error; + } + + if (testParseDomainSnapshots(privconn, obj, file, ctxt) < 0) { + virObjectUnlock(obj); + goto error; + } + + nsdata = def->namespaceData; + obj->persistent = !nsdata->transient; + obj->hasManagedSave = nsdata->hasManagedSave; + + if (nsdata->runstate != VIR_DOMAIN_SHUTOFF) { + if (testDomainStartState(privconn, obj, + VIR_DOMAIN_RUNNING_BOOTED) < 0) { + virObjectUnlock(obj); + goto error; + } + } else { + testDomainShutdownState(NULL, obj, 0); + } + virDomainObjSetState(obj, nsdata->runstate, 0); + + virObjectUnlock(obj); + } + + ret = 0; + error: + VIR_FREE(nodes); + return ret; +} + +static int +testParseNetworks(testDriverPtr privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + virNetworkObjPtr obj; + + num = virXPathNodeSet("/node/network", ctxt, &nodes); + if (num < 0) + goto error; + + for (i = 0; i < num; i++) { + virNetworkDefPtr def; + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "network"); + if (!node) + goto error; + + def = virNetworkDefParseNode(ctxt->doc, node); + if (!def) + goto error; + + if (!(obj = virNetworkAssignDef(privconn->networks, def, 0))) { + virNetworkDefFree(def); + goto error; + } + + obj->active = 1; + virNetworkObjEndAPI(&obj); + } + + ret = 0; + error: + VIR_FREE(nodes); + return ret; +} + +static int +testParseInterfaces(testDriverPtr privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + virInterfaceObjPtr obj; + + num = virXPathNodeSet("/node/interface", ctxt, &nodes); + if (num < 0) + goto error; + + for (i = 0; i < num; i++) { + virInterfaceDefPtr def; + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, + "interface"); + if (!node) + goto error; + + def = virInterfaceDefParseNode(ctxt->doc, node); + if (!def) + goto error; + + if (!(obj = virInterfaceAssignDef(&privconn->ifaces, def))) { + virInterfaceDefFree(def); + goto error; + } + + obj->active = 1; + virInterfaceObjUnlock(obj); + } + + ret = 0; + error: + VIR_FREE(nodes); + return ret; +} + +static int +testOpenVolumesForPool(const char *file, + xmlXPathContextPtr ctxt, + virStoragePoolObjPtr pool, + int poolidx) +{ + char *vol_xpath; + size_t i; + int num, ret = -1; + xmlNodePtr *nodes = NULL; + virStorageVolDefPtr def = NULL; + + /* Find storage volumes */ + if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0) + goto error; + + num = virXPathNodeSet(vol_xpath, ctxt, &nodes); + VIR_FREE(vol_xpath); + if (num < 0) + goto error; + + for (i = 0; i < num; i++) { + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, + "volume"); + if (!node) + goto error; + + def = virStorageVolDefParseNode(pool->def, ctxt->doc, node, 0); + if (!def) + goto error; + + if (def->target.path == NULL) { + if (virAsprintf(&def->target.path, "%s/%s", + pool->def->target.path, + def->name) == -1) + goto error; + } + + if (!def->key && VIR_STRDUP(def->key, def->target.path) < 0) + goto error; + if (VIR_APPEND_ELEMENT_COPY(pool->volumes.objs, pool->volumes.count, def) < 0) + goto error; + + pool->def->allocation += def->target.allocation; + pool->def->available = (pool->def->capacity - + pool->def->allocation); + def = NULL; + } + + ret = 0; + error: + virStorageVolDefFree(def); + VIR_FREE(nodes); + return ret; +} + +static int +testParseStorage(testDriverPtr privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + virStoragePoolObjPtr obj; + + num = virXPathNodeSet("/node/pool", ctxt, &nodes); + if (num < 0) + goto error; + + for (i = 0; i < num; i++) { + virStoragePoolDefPtr def; + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, + "pool"); + if (!node) + goto error; + + def = virStoragePoolDefParseNode(ctxt->doc, node); + if (!def) + goto error; + + if (!(obj = virStoragePoolObjAssignDef(&privconn->pools, + def))) { + virStoragePoolDefFree(def); + goto error; + } + + if (testStoragePoolObjSetDefaults(obj) == -1) { + virStoragePoolObjUnlock(obj); + goto error; + } + obj->active = 1; + + /* Find storage volumes */ + if (testOpenVolumesForPool(file, ctxt, obj, i+1) < 0) { + virStoragePoolObjUnlock(obj); + goto error; + } + + virStoragePoolObjUnlock(obj); + } + + ret = 0; + error: + VIR_FREE(nodes); + return ret; +} + +static int +testParseNodedevs(testDriverPtr privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + virNodeDeviceObjPtr obj; + + num = virXPathNodeSet("/node/device", ctxt, &nodes); + if (num < 0) + goto error; + + for (i = 0; i < num; i++) { + virNodeDeviceDefPtr def; + xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, + "nodedev"); + if (!node) + goto error; + + def = virNodeDeviceDefParseNode(ctxt->doc, node, 0, NULL); + if (!def) + goto error; + + if (!(obj = virNodeDeviceAssignDef(&privconn->devs, def))) { + virNodeDeviceDefFree(def); + goto error; + } + + virNodeDeviceObjUnlock(obj); + } + + ret = 0; + error: + VIR_FREE(nodes); + return ret; +} + +static int +testParseAuthUsers(testDriverPtr privconn, + xmlXPathContextPtr ctxt) +{ + int num, ret = -1; + size_t i; + xmlNodePtr *nodes = NULL; + + num = virXPathNodeSet("/node/auth/user", ctxt, &nodes); + if (num < 0) + goto error; + + privconn->numAuths = num; + if (num && VIR_ALLOC_N(privconn->auths, num) < 0) + goto error; + + for (i = 0; i < num; i++) { + char *username, *password; + + ctxt->node = nodes[i]; + username = virXPathString("string(.)", ctxt); + if (!username || STREQ(username, "")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing username in /node/auth/user field")); + VIR_FREE(username); + goto error; + } + /* This field is optional. */ + password = virXMLPropString(nodes[i], "password"); + + privconn->auths[i].username = username; + privconn->auths[i].password = password; + } + + ret = 0; + error: + VIR_FREE(nodes); + return ret; +} + +static int +testOpenParse(testDriverPtr privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + if (!xmlStrEqual(ctxt->node->name, BAD_CAST "node")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Root element is not 'node'")); + goto error; + } + + if (testParseNodeInfo(&privconn->nodeInfo, ctxt) < 0) + goto error; + if (testParseDomains(privconn, file, ctxt) < 0) + goto error; + if (testParseNetworks(privconn, file, ctxt) < 0) + goto error; + if (testParseInterfaces(privconn, file, ctxt) < 0) + goto error; + if (testParseStorage(privconn, file, ctxt) < 0) + goto error; + if (testParseNodedevs(privconn, file, ctxt) < 0) + goto error; + if (testParseAuthUsers(privconn, ctxt) < 0) + goto error; + + return 0; + error: + return -1; +} + +static const char *defaultConnXML = +"<node>" +"<domain type='test'>" +" <name>test</name>" +" <uuid>6695eb01-f6a4-8304-79aa-97f2502e193f</uuid>" +" <memory>8388608</memory>" +" <currentMemory>2097152</currentMemory>" +" <vcpu>2</vcpu>" +" <os>" +" <type>hvm</type>" +" </os>" +"</domain>" +"" +"<network>" +" <name>default</name>" +" <uuid>dd8fe884-6c02-601e-7551-cca97df1c5df</uuid>" +" <bridge name='virbr0'/>" +" <forward/>" +" <ip address='192.168.122.1' netmask='255.255.255.0'>" +" <dhcp>" +" <range start='192.168.122.2' end='192.168.122.254'/>" +" </dhcp>" +" </ip>" +"</network>" +"" +"<interface type=\"ethernet\" name=\"eth1\">" +" <start mode=\"onboot\"/>" +" <mac address=\"aa:bb:cc:dd:ee:ff\"/>" +" <mtu size=\"1492\"/>" +" <protocol family=\"ipv4\">" +" <ip address=\"192.168.0.5\" prefix=\"24\"/>" +" <route gateway=\"192.168.0.1\"/>" +" </protocol>" +"</interface>" +"" +"<pool type='dir'>" +" <name>default-pool</name>" +" <uuid>dfe224cb-28fb-8dd0-c4b2-64eb3f0f4566</uuid>" +" <target>" +" <path>/default-pool</path>" +" </target>" +"</pool>" +"" +"<device>" +" <name>computer</name>" +" <capability type='system'>" +" <hardware>" +" <vendor>Libvirt</vendor>" +" <version>Test driver</version>" +" <serial>123456</serial>" +" <uuid>11111111-2222-3333-4444-555555555555</uuid>" +" </hardware>" +" <firmware>" +" <vendor>Libvirt</vendor>" +" <version>Test Driver</version>" +" <release_date>01/22/2007</release_date>" +" </firmware>" +" </capability>" +"</device>" +"<device>" +" <name>test-scsi-host-vport</name>" +" <parent>computer</parent>" +" <capability type='scsi_host'>" +" <host>1</host>" +" <capability type='fc_host'>" +" <wwnn>2000000012341234</wwnn>" +" <wwpn>1000000012341234</wwpn>" +" </capability>" +" <capability type='vport_ops'/>" +" </capability>" +"</device>" +"</node>"; + +static void +testDriverFree(testDriverPtr driver) +{ + if (!driver) + return; + + virObjectUnref(driver->caps); + virObjectUnref(driver->xmlopt); + virObjectUnref(driver->domains); + virNodeDeviceObjListFree(&driver->devs); + virObjectUnref(driver->networks); + virInterfaceObjListFree(&driver->ifaces); + virStoragePoolObjListFree(&driver->pools); + virObjectEventStateFree(driver->eventState); + virMutexUnlock(&driver->lock); + virMutexDestroy(&driver->lock); + + VIR_FREE(driver); +} + +static testDriverPtr +testDriverNew(void) +{ + virDomainXMLNamespace ns = { + .parse = testDomainDefNamespaceParse, + .free = testDomainDefNamespaceFree, + }; + testDriverPtr ret; + + if (VIR_ALLOC(ret) < 0) + return NULL; + + if (virMutexInit(&ret->lock) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialize mutex")); + goto error; + } + + if (!(ret->xmlopt = virDomainXMLOptionNew(NULL, NULL, &ns)) || + !(ret->eventState = virObjectEventStateNew()) || + !(ret->domains = virDomainObjListNew()) || + !(ret->networks = virNetworkObjListNew())) + goto error; + + virAtomicIntSet(&ret->nextDomID, 1); + + return ret; + + error: + testDriverFree(ret); + return NULL; +} + +#define TEST_EMULATOR "/usr/bin/test-hv" + +static virCapsPtr +testBuildCapabilities(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + virCapsPtr caps; + virCapsGuestPtr guest; + int guest_types[] = { VIR_DOMAIN_OSTYPE_HVM, + VIR_DOMAIN_OSTYPE_XEN }; + size_t i, j; + + if ((caps = virCapabilitiesNew(VIR_ARCH_I686, false, false)) == NULL) + goto error; + + if (virCapabilitiesAddHostFeature(caps, "pae") < 0) + goto error; + if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) + goto error; + + if (VIR_ALLOC_N(caps->host.pagesSize, 2) < 0) + goto error; + + caps->host.pagesSize[caps->host.nPagesSize++] = 4; + caps->host.pagesSize[caps->host.nPagesSize++] = 2048; + + for (i = 0; i < privconn->numCells; i++) { + virCapsHostNUMACellCPUPtr cpu_cells; + virCapsHostNUMACellPageInfoPtr pages; + size_t nPages; + + if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 || + VIR_ALLOC_N(pages, caps->host.nPagesSize) < 0) { + VIR_FREE(cpu_cells); + goto error; + } + + nPages = caps->host.nPagesSize; + + memcpy(cpu_cells, privconn->cells[i].cpus, + sizeof(*cpu_cells) * privconn->cells[i].numCpus); + + for (j = 0; j < nPages; j++) + pages[j].size = caps->host.pagesSize[j]; + + pages[0].avail = privconn->cells[i].mem / pages[0].size; + + if (virCapabilitiesAddHostNUMACell(caps, i, privconn->cells[i].mem, + privconn->cells[i].numCpus, + cpu_cells, 0, NULL, nPages, pages) < 0) + goto error; + } + + for (i = 0; i < ARRAY_CARDINALITY(guest_types); i++) { + if ((guest = virCapabilitiesAddGuest(caps, + guest_types[i], + VIR_ARCH_I686, + TEST_EMULATOR, + NULL, + 0, + NULL)) == NULL) + goto error; + + if (virCapabilitiesAddGuestDomain(guest, + VIR_DOMAIN_VIRT_TEST, + NULL, + NULL, + 0, + NULL) == NULL) + goto error; + + if (virCapabilitiesAddGuestFeature(guest, "pae", true, true) == NULL) + goto error; + if (virCapabilitiesAddGuestFeature(guest, "nonpae", true, true) == NULL) + goto error; + } + + caps->host.nsecModels = 1; + if (VIR_ALLOC_N(caps->host.secModels, caps->host.nsecModels) < 0) + goto error; + if (VIR_STRDUP(caps->host.secModels[0].model, "testSecurity") < 0) + goto error; + + if (VIR_STRDUP(caps->host.secModels[0].doi, "") < 0) + goto error; + + return caps; + + error: + virObjectUnref(caps); + return NULL; +} + +#define TEST_MODEL "i686" + +static const virNodeInfo defaultNodeInfo = { + TEST_MODEL, + 1024*1024*3, /* 3 GB */ + 16, + 1400, + 2, + 2, + 2, + 2, +}; + +static virMutex defaultLock = VIR_MUTEX_INITIALIZER; + +static testDriverPtr defaultConn; +static int defaultConnections; + +/* Simultaneous test:///default connections should share the same + * common state (among other things, this allows testing event + * detection in one connection for an action caused in another). */ +static int +testOpenDefault(virConnectPtr conn) +{ + int u; + testDriverPtr privconn = NULL; + xmlDocPtr doc = NULL; + xmlXPathContextPtr ctxt = NULL; + + virMutexLock(&defaultLock); + if (defaultConnections++) { + conn->privateData = defaultConn; + virMutexUnlock(&defaultLock); + return VIR_DRV_OPEN_SUCCESS; + } + + if (!(privconn = testDriverNew())) + goto error; + + conn->privateData = privconn; + + memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo)); + + /* Numa setup */ + privconn->numCells = 2; + for (u = 0; u < privconn->numCells; ++u) { + privconn->cells[u].numCpus = 8; + privconn->cells[u].mem = (u + 1) * 2048 * 1024; + privconn->cells[u].freeMem = (u + 1) * 1024 * 1024; + } + for (u = 0; u < 16; u++) { + virBitmapPtr siblings = virBitmapNew(16); + if (!siblings) + goto error; + ignore_value(virBitmapSetBit(siblings, u)); + privconn->cells[u / 8].cpus[(u % 8)].id = u; + privconn->cells[u / 8].cpus[(u % 8)].socket_id = u / 8; + privconn->cells[u / 8].cpus[(u % 8)].core_id = u % 8; + privconn->cells[u / 8].cpus[(u % 8)].siblings = siblings; + } + + if (!(privconn->caps = testBuildCapabilities(conn))) + goto error; + + if (!(doc = virXMLParseStringCtxt(defaultConnXML, + _("(test driver)"), &ctxt))) + goto error; + + if (testOpenParse(privconn, NULL, ctxt) < 0) + goto error; + + defaultConn = privconn; + + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + virMutexUnlock(&defaultLock); + + return VIR_DRV_OPEN_SUCCESS; + + error: + testDriverFree(privconn); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + conn->privateData = NULL; + defaultConnections--; + virMutexUnlock(&defaultLock); + return VIR_DRV_OPEN_ERROR; +} + +static int +testOpenFromFile(virConnectPtr conn, const char *file) +{ + xmlDocPtr doc = NULL; + xmlXPathContextPtr ctxt = NULL; + testDriverPtr privconn; + + if (!(privconn = testDriverNew())) + return VIR_DRV_OPEN_ERROR; + + testDriverLock(privconn); + conn->privateData = privconn; + + if (!(privconn->caps = testBuildCapabilities(conn))) + goto error; + + if (!(doc = virXMLParseFileCtxt(file, &ctxt))) + goto error; + + privconn->numCells = 0; + memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo)); + + if (testOpenParse(privconn, file, ctxt) < 0) + goto error; + + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + testDriverUnlock(privconn); + + return 0; + + error: + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + testDriverFree(privconn); + conn->privateData = NULL; + return VIR_DRV_OPEN_ERROR; +} + +static virDrvOpenStatus testConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth, + virConfPtr conf ATTRIBUTE_UNUSED, + unsigned int flags) +{ + int ret; + + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + + if (!conn->uri) + return VIR_DRV_OPEN_DECLINED; + + if (!conn->uri->scheme || STRNEQ(conn->uri->scheme, "test")) + return VIR_DRV_OPEN_DECLINED; + + /* Remote driver should handle these. */ + if (conn->uri->server) + return VIR_DRV_OPEN_DECLINED; + + /* From this point on, the connection is for us. */ + if (!conn->uri->path + || conn->uri->path[0] == '\0' + || (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) { + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("testOpen: supply a path or use test:///default")); + return VIR_DRV_OPEN_ERROR; + } + + if (STREQ(conn->uri->path, "/default")) + ret = testOpenDefault(conn); + else + ret = testOpenFromFile(conn, + conn->uri->path); + + if (ret != VIR_DRV_OPEN_SUCCESS) + return ret; + + /* Fake authentication. */ + if (testConnectAuthenticate(conn, auth) < 0) + return VIR_DRV_OPEN_ERROR; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int testConnectClose(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + bool dflt = false; + + if (privconn == defaultConn) { + dflt = true; + virMutexLock(&defaultLock); + if (--defaultConnections) { + virMutexUnlock(&defaultLock); + return 0; + } + } + + testDriverLock(privconn); + testDriverFree(privconn); + + if (dflt) { + defaultConn = NULL; + virMutexUnlock(&defaultLock); + } + + conn->privateData = NULL; + return 0; +} + +static int testConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned long *hvVer) +{ + *hvVer = 2; + return 0; +} + +static char *testConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return virGetHostname(); +} + +static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type ATTRIBUTE_UNUSED) +{ + return 32; +} + +int testNodeGetInfo(virConnectPtr conn, + virNodeInfoPtr info) +{ + testDriverPtr privconn = conn->privateData; + testDriverLock(privconn); + memcpy(info, &privconn->nodeInfo, sizeof(virNodeInfo)); + testDriverUnlock(privconn); + return 0; +} + +#define TEST_NB_CPU_STATS 4 + +static int +testNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, + int cpuNum ATTRIBUTE_UNUSED, + virNodeCPUStatsPtr params, + int *nparams, + unsigned int flags) +{ + size_t i = 0; + + virCheckFlags(0, -1); + + if (params == NULL) { + *nparams = TEST_NB_CPU_STATS; + return 0; + } + + for (i = 0; i < *nparams && i < 4; i++) { + switch (i) { + case 0: + if (virHostCPUStatsAssign(&params[i], + VIR_NODE_CPU_STATS_USER, 9797400000) < 0) + return -1; + break; + case 1: + if (virHostCPUStatsAssign(&params[i], + VIR_NODE_CPU_STATS_KERNEL, 34678723400000) < 0) + return -1; + break; + case 2: + if (virHostCPUStatsAssign(&params[i], + VIR_NODE_CPU_STATS_IDLE, 87264900000) < 0) + return -1; + break; + case 3: + if (virHostCPUStatsAssign(&params[i], + VIR_NODE_CPU_STATS_IOWAIT, 763600000) < 0) + return -1; + break; + } + } + + *nparams = i; + return 0; +} + +static unsigned long long +testNodeGetFreeMemory(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + unsigned int freeMem = 0; + size_t i; + + testDriverLock(privconn); + + for (i = 0; i < privconn->numCells; i++) + freeMem += privconn->cells[i].freeMem; + + testDriverUnlock(privconn); + return freeMem; +} + +static int +testNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned int npages, + unsigned int *pages ATTRIBUTE_UNUSED, + int startCell ATTRIBUTE_UNUSED, + unsigned int cellCount, + unsigned long long *counts, + unsigned int flags) +{ + size_t i = 0, j = 0; + int x = 6; + + virCheckFlags(0, -1); + + for (i = 0; i < cellCount; i++) { + for (j = 0; j < npages; j++) { + x = x * 2 + 7; + counts[(i * npages) + j] = x; + } + } + + return 0; +} + +static char *testConnectGetCapabilities(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + char *xml; + testDriverLock(privconn); + xml = virCapabilitiesFormatXML(privconn->caps); + testDriverUnlock(privconn); + return xml; +} + +static char * +testConnectGetSysinfo(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *ret; + const char *sysinfo = "<sysinfo type='smbios'>\n" + " <bios>\n" + " <entry name='vendor'>LENOVO</entry>\n" + " <entry name='version'>G4ETA1WW (2.61 )</entry>\n" + " <entry name='date'>05/07/2014</entry>\n" + " <entry name='release'>2.61</entry>\n" + " </bios>\n" + "</sysinfo>\n"; + + virCheckFlags(0, NULL); + + ignore_value(VIR_STRDUP(ret, sysinfo)); + return ret; +} + +static const char * +testConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return "TEST"; +} + +static int testConnectListDomains(virConnectPtr conn, + int *ids, + int maxids) +{ + testDriverPtr privconn = conn->privateData; + + return virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, + NULL, NULL); +} + +static int testConnectNumOfDomains(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + int count; + + testDriverLock(privconn); + count = virDomainObjListNumOfDomains(privconn->domains, true, NULL, NULL); + testDriverUnlock(privconn); + + return count; +} + +static int testConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); + + return virDomainObjListExport(privconn->domains, conn, domains, + NULL, flags); +} + +static virDomainPtr +testDomainCreateXML(virConnectPtr conn, const char *xml, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + virDomainPtr ret = NULL; + virDomainDefPtr def; + virDomainObjPtr dom = NULL; + virObjectEventPtr event = NULL; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; + + virCheckFlags(VIR_DOMAIN_START_VALIDATE, NULL); + + if (flags & VIR_DOMAIN_START_VALIDATE) + parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; + + testDriverLock(privconn); + if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, + parse_flags)) == NULL) + goto cleanup; + + if (testDomainGenerateIfnames(def) < 0) + goto cleanup; + if (!(dom = virDomainObjListAdd(privconn->domains, + def, + privconn->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto cleanup; + def = NULL; + + if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_BOOTED) < 0) { + if (!dom->persistent) { + virDomainObjListRemove(privconn->domains, dom); + dom = NULL; + } + goto cleanup; + } + + event = virDomainEventLifecycleNewFromObj(dom, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); + + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); + if (ret) + ret->id = dom->def->id; + + cleanup: + if (dom) + virObjectUnlock(dom); + testObjectEventQueue(privconn, event); + virDomainDefFree(def); + testDriverUnlock(privconn); + return ret; +} + + +static virDomainPtr testDomainLookupByID(virConnectPtr conn, + int id) +{ + testDriverPtr privconn = conn->privateData; + virDomainPtr ret = NULL; + virDomainObjPtr dom; + + if (!(dom = virDomainObjListFindByID(privconn->domains, id))) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); + if (ret) + ret->id = dom->def->id; + + cleanup: + if (dom) + virObjectUnlock(dom); + return ret; +} + +static virDomainPtr testDomainLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + testDriverPtr privconn = conn->privateData; + virDomainPtr ret = NULL; + virDomainObjPtr dom; + + if (!(dom = virDomainObjListFindByUUID(privconn->domains, uuid))) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); + if (ret) + ret->id = dom->def->id; + + cleanup: + if (dom) + virObjectUnlock(dom); + return ret; +} + +static virDomainPtr testDomainLookupByName(virConnectPtr conn, + const char *name) +{ + testDriverPtr privconn = conn->privateData; + virDomainPtr ret = NULL; + virDomainObjPtr dom; + + if (!(dom = virDomainObjListFindByName(privconn->domains, name))) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); + if (ret) + ret->id = dom->def->id; + + cleanup: + virDomainObjEndAPI(&dom); + return ret; +} + +static virDomainObjPtr +testDomObjFromDomain(virDomainPtr domain) +{ + virDomainObjPtr vm; + testDriverPtr driver = domain->conn->privateData; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + vm = virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, domain->name); + } + + return vm; +} + +static int testDomainSuspend(virDomainPtr domain) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + int state; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + state = virDomainObjGetState(privdom, NULL); + if (state == VIR_DOMAIN_SHUTOFF || state == VIR_DOMAIN_PAUSED) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not running"), + domain->name); + goto cleanup; + } + + virDomainObjSetState(privdom, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int testDomainResume(virDomainPtr domain) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + if (virDomainObjGetState(privdom, NULL) != VIR_DOMAIN_PAUSED) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not paused"), + domain->name); + goto cleanup; + } + + virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_UNPAUSED); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int testDomainShutdownFlags(virDomainPtr domain, + unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("domain '%s' not running"), domain->name); + goto cleanup; + } + + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + + ret = 0; + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int testDomainShutdown(virDomainPtr domain) +{ + return testDomainShutdownFlags(domain, 0); +} + +/* Similar behaviour as shutdown */ +static int testDomainReboot(virDomainPtr domain, + unsigned int action ATTRIBUTE_UNUSED) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, + VIR_DOMAIN_SHUTDOWN_USER); + + switch (privdom->def->onReboot) { + case VIR_DOMAIN_LIFECYCLE_DESTROY: + virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_RESTART: + virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + case VIR_DOMAIN_LIFECYCLE_PRESERVE: + virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + + case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME: + virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_BOOTED); + break; + + default: + virDomainObjSetState(privdom, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + break; + } + + if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); + + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + } + + ret = 0; + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int testDomainDestroy(virDomainPtr domain) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_DESTROYED); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + + ret = 0; + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static char * +testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + char *ret; + + ignore_value(VIR_STRDUP(ret, "linux")); + return ret; +} + +static unsigned long long +testDomainGetMaxMemory(virDomainPtr domain) +{ + virDomainObjPtr privdom; + unsigned long long ret = 0; + + if (!(privdom = testDomObjFromDomain(domain))) + return 0; + + ret = virDomainDefGetMemoryTotal(privdom->def); + + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testDomainSetMaxMemory(virDomainPtr domain, + unsigned long memory) +{ + virDomainObjPtr privdom; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + /* XXX validate not over host memory wrt to other domains */ + virDomainDefSetMemoryTotal(privdom->def, memory); + + virDomainObjEndAPI(&privdom); + return 0; +} + +static int testDomainSetMemory(virDomainPtr domain, + unsigned long memory) +{ + virDomainObjPtr privdom; + int ret = -1; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + if (memory > virDomainDefGetMemoryTotal(privdom->def)) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + privdom->def->mem.cur_balloon = memory; + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testDomainGetInfo(virDomainPtr domain, + virDomainInfoPtr info) +{ + struct timeval tv; + virDomainObjPtr privdom; + int ret = -1; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + if (gettimeofday(&tv, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("getting time of day")); + goto cleanup; + } + + info->state = virDomainObjGetState(privdom, NULL); + info->memory = privdom->def->mem.cur_balloon; + info->maxMem = virDomainDefGetMemoryTotal(privdom->def); + info->nrVirtCpu = virDomainDefGetVcpus(privdom->def); + info->cpuTime = ((tv.tv_sec * 1000ll * 1000ll * 1000ll) + (tv.tv_usec * 1000ll)); + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testDomainGetState(virDomainPtr domain, + int *state, + int *reason, + unsigned int flags) +{ + virDomainObjPtr privdom; + + virCheckFlags(0, -1); + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + *state = virDomainObjGetState(privdom, reason); + + virDomainObjEndAPI(&privdom); + + return 0; +} + +#define TEST_SAVE_MAGIC "TestGuestMagic" + +static int +testDomainSaveFlags(virDomainPtr domain, const char *path, + const char *dxml, unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + char *xml = NULL; + int fd = -1; + int len; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + virCheckFlags(0, -1); + if (dxml) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("xml modification unsupported")); + return -1; + } + + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + xml = virDomainDefFormat(privdom->def, privconn->caps, + VIR_DOMAIN_DEF_FORMAT_SECURE); + + if (xml == NULL) { + virReportSystemError(errno, + _("saving domain '%s' failed to allocate space for metadata"), + domain->name); + goto cleanup; + } + + if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { + virReportSystemError(errno, + _("saving domain '%s' to '%s': open failed"), + domain->name, path); + goto cleanup; + } + len = strlen(xml); + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { + virReportSystemError(errno, + _("saving domain '%s' to '%s': write failed"), + domain->name, path); + goto cleanup; + } + if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { + virReportSystemError(errno, + _("saving domain '%s' to '%s': write failed"), + domain->name, path); + goto cleanup; + } + if (safewrite(fd, xml, len) < 0) { + virReportSystemError(errno, + _("saving domain '%s' to '%s': write failed"), + domain->name, path); + goto cleanup; + } + + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, + _("saving domain '%s' to '%s': write failed"), + domain->name, path); + goto cleanup; + } + fd = -1; + + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SAVED); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SAVED); + + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + + ret = 0; + cleanup: + VIR_FREE(xml); + + /* Don't report failure in close or unlink, because + * in either case we're already in a failure scenario + * and have reported a earlier error */ + if (ret != 0) { + VIR_FORCE_CLOSE(fd); + unlink(path); + } + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int +testDomainSave(virDomainPtr domain, + const char *path) +{ + return testDomainSaveFlags(domain, path, NULL, 0); +} + +static int +testDomainRestoreFlags(virConnectPtr conn, + const char *path, + const char *dxml, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + char *xml = NULL; + char magic[15]; + int fd = -1; + int len; + virDomainDefPtr def = NULL; + virDomainObjPtr dom = NULL; + virObjectEventPtr event = NULL; + int ret = -1; + + virCheckFlags(0, -1); + if (dxml) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("xml modification unsupported")); + return -1; + } + + if ((fd = open(path, O_RDONLY)) < 0) { + virReportSystemError(errno, + _("cannot read domain image '%s'"), + path); + goto cleanup; + } + if (saferead(fd, magic, sizeof(magic)) != sizeof(magic)) { + virReportSystemError(errno, + _("incomplete save header in '%s'"), + path); + goto cleanup; + } + if (memcmp(magic, TEST_SAVE_MAGIC, sizeof(magic))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("mismatched header magic")); + goto cleanup; + } + if (saferead(fd, (char*)&len, sizeof(len)) != sizeof(len)) { + virReportSystemError(errno, + _("failed to read metadata length in '%s'"), + path); + goto cleanup; + } + if (len < 1 || len > 8192) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("length of metadata out of range")); + goto cleanup; + } + if (VIR_ALLOC_N(xml, len+1) < 0) + goto cleanup; + if (saferead(fd, xml, len) != len) { + virReportSystemError(errno, + _("incomplete metadata in '%s'"), path); + goto cleanup; + } + xml[len] = '\0'; + + def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE); + if (!def) + goto cleanup; + + if (testDomainGenerateIfnames(def) < 0) + goto cleanup; + if (!(dom = virDomainObjListAdd(privconn->domains, + def, + privconn->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto cleanup; + def = NULL; + + if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_RESTORED) < 0) { + if (!dom->persistent) { + virDomainObjListRemove(privconn->domains, dom); + dom = NULL; + } + goto cleanup; + } + + event = virDomainEventLifecycleNewFromObj(dom, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_RESTORED); + ret = 0; + + cleanup: + virDomainDefFree(def); + VIR_FREE(xml); + VIR_FORCE_CLOSE(fd); + if (dom) + virObjectUnlock(dom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int +testDomainRestore(virConnectPtr conn, + const char *path) +{ + return testDomainRestoreFlags(conn, path, NULL, 0); +} + +static int testDomainCoreDumpWithFormat(virDomainPtr domain, + const char *to, + unsigned int dumpformat, + unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + int fd = -1; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + virCheckFlags(VIR_DUMP_CRASH, -1); + + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { + virReportSystemError(errno, + _("domain '%s' coredump: failed to open %s"), + domain->name, to); + goto cleanup; + } + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { + virReportSystemError(errno, + _("domain '%s' coredump: failed to write header to %s"), + domain->name, to); + goto cleanup; + } + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, + _("domain '%s' coredump: write failed: %s"), + domain->name, to); + goto cleanup; + } + + /* we don't support non-raw formats in test driver */ + if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("kdump-compressed format is not supported here")); + goto cleanup; + } + + if (flags & VIR_DUMP_CRASH) { + testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_CRASHED); + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_CRASHED); + if (!privdom->persistent) + virDomainObjListRemove(privconn->domains, privdom); + } + + ret = 0; + cleanup: + VIR_FORCE_CLOSE(fd); + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + + +static int +testDomainCoreDump(virDomainPtr domain, + const char *to, + unsigned int flags) +{ + return testDomainCoreDumpWithFormat(domain, to, + VIR_DOMAIN_CORE_DUMP_FORMAT_RAW, flags); +} + +static int +testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, + unsigned int flags) +{ + testDriverPtr driver = domain->conn->privateData; + virDomainObjPtr privdom = NULL; + virDomainDefPtr def; + virDomainDefPtr persistentDef; + int ret = -1, maxvcpus; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_MAXIMUM, -1); + + if ((maxvcpus = testConnectGetMaxVcpus(domain->conn, NULL)) < 0) + return -1; + + if (nrCpus > maxvcpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested cpu amount exceeds maximum supported amount " + "(%d > %d)"), nrCpus, maxvcpus); + return -1; + } + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + if (virDomainObjGetDefs(privdom, flags, &def, &persistentDef) < 0) + goto cleanup; + + if (def && virDomainDefGetVcpusMax(def) < nrCpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested cpu amount exceeds maximum (%d > %d)"), + nrCpus, virDomainDefGetVcpusMax(def)); + goto cleanup; + } + + if (persistentDef && + !(flags & VIR_DOMAIN_VCPU_MAXIMUM) && + virDomainDefGetVcpusMax(persistentDef) < nrCpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested cpu amount exceeds maximum (%d > %d)"), + nrCpus, virDomainDefGetVcpusMax(persistentDef)); + goto cleanup; + } + + if (def && + virDomainDefSetVcpus(def, nrCpus) < 0) + goto cleanup; + + if (persistentDef) { + if (flags & VIR_DOMAIN_VCPU_MAXIMUM) { + if (virDomainDefSetVcpusMax(persistentDef, nrCpus, + driver->xmlopt) < 0) + goto cleanup; + } else { + if (virDomainDefSetVcpus(persistentDef, nrCpus) < 0) + goto cleanup; + } + } + + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testDomainSetVcpus(virDomainPtr domain, unsigned int nrCpus) +{ + return testDomainSetVcpusFlags(domain, nrCpus, VIR_DOMAIN_AFFECT_LIVE); +} + +static int testDomainGetVcpus(virDomainPtr domain, + virVcpuInfoPtr info, + int maxinfo, + unsigned char *cpumaps, + int maplen) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virDomainDefPtr def; + size_t i; + int maxcpu, hostcpus; + int ret = -1; + struct timeval tv; + unsigned long long statbase; + virBitmapPtr allcpumap = NULL; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot list vcpus for an inactive domain")); + goto cleanup; + } + + def = privdom->def; + + if (gettimeofday(&tv, NULL) < 0) { + virReportSystemError(errno, + "%s", _("getting time of day")); + goto cleanup; + } + + statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; + + hostcpus = VIR_NODEINFO_MAXCPUS(privconn->nodeInfo); + maxcpu = maplen * 8; + if (maxcpu > hostcpus) + maxcpu = hostcpus; + + if (!(allcpumap = virBitmapNew(hostcpus))) + goto cleanup; + + virBitmapSetAll(allcpumap); + + /* Clamp to actual number of vcpus */ + if (maxinfo > virDomainDefGetVcpus(privdom->def)) + maxinfo = virDomainDefGetVcpus(privdom->def); + + memset(info, 0, sizeof(*info) * maxinfo); + memset(cpumaps, 0, maxinfo * maplen); + + for (i = 0; i < maxinfo; i++) { + virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(def, i); + virBitmapPtr bitmap = NULL; + + if (!vcpu->online) + continue; + + if (vcpu->cpumask) + bitmap = vcpu->cpumask; + else if (def->cpumask) + bitmap = def->cpumask; + else + bitmap = allcpumap; + + if (cpumaps) + virBitmapToDataBuf(bitmap, VIR_GET_CPUMAP(cpumaps, maplen, i), maplen); + + info[i].number = i; + info[i].state = VIR_VCPU_RUNNING; + info[i].cpu = virBitmapLastSetBit(bitmap); + + /* Fake an increasing cpu time value */ + info[i].cpuTime = statbase / 10; + } + + ret = maxinfo; + cleanup: + virBitmapFree(allcpumap); + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testDomainPinVcpu(virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen) +{ + virDomainVcpuDefPtr vcpuinfo; + virDomainObjPtr privdom; + virDomainDefPtr def; + int ret = -1; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + def = privdom->def; + + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot pin vcpus on an inactive domain")); + goto cleanup; + } + + if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu)) || + !vcpuinfo->online) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested vcpu '%d' is not present in the domain"), + vcpu); + goto cleanup; + } + + virBitmapFree(vcpuinfo->cpumask); + + if (!(vcpuinfo->cpumask = virBitmapNewData(cpumap, maplen))) + goto cleanup; + + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testDomainGetVcpuPinInfo(virDomainPtr dom, + int ncpumaps, + unsigned char *cpumaps, + int maplen, + unsigned int flags) +{ + testDriverPtr driver = dom->conn->privateData; + virDomainObjPtr privdom; + virDomainDefPtr def; + int ret = -1; + + if (!(privdom = testDomObjFromDomain(dom))) + return -1; + + if (!(def = virDomainObjGetOneDef(privdom, flags))) + goto cleanup; + + ret = virDomainDefGetVcpuPinInfoHelper(def, maplen, ncpumaps, cpumaps, + VIR_NODEINFO_MAXCPUS(driver->nodeInfo), + NULL); + + cleanup: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) +{ + virDomainObjPtr vm; + virDomainDefPtr def; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_MAXIMUM, -1); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (flags & VIR_DOMAIN_VCPU_MAXIMUM) + ret = virDomainDefGetVcpusMax(def); + else + ret = virDomainDefGetVcpus(def); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + +static int +testDomainGetMaxVcpus(virDomainPtr domain) +{ + return testDomainGetVcpusFlags(domain, (VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_VCPU_MAXIMUM)); +} + +static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainDefPtr def; + virDomainObjPtr privdom; + char *ret = NULL; + + /* Flags checked by virDomainDefFormat */ + + if (!(privdom = testDomObjFromDomain(domain))) + return NULL; + + def = (flags & VIR_DOMAIN_XML_INACTIVE) && + privdom->newDef ? privdom->newDef : privdom->def; + + ret = virDomainDefFormat(def, privconn->caps, + virDomainDefFormatConvertXMLFlags(flags)); + + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testConnectNumOfDefinedDomains(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + + return virDomainObjListNumOfDomains(privconn->domains, false, NULL, NULL); +} + +static int testConnectListDefinedDomains(virConnectPtr conn, + char **const names, + int maxnames) +{ + + testDriverPtr privconn = conn->privateData; + + memset(names, 0, sizeof(*names)*maxnames); + return virDomainObjListGetInactiveNames(privconn->domains, names, maxnames, + NULL, NULL); +} + +static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainObjGetState(privdom, NULL) != VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Domain '%s' is already running"), domain->name); + goto cleanup; + } + + if (testDomainStartState(privconn, privdom, + VIR_DOMAIN_RUNNING_BOOTED) < 0) + goto cleanup; + domain->id = privdom->def->id; + + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + testDriverUnlock(privconn); + return ret; +} + +static int testDomainCreate(virDomainPtr domain) +{ + return testDomainCreateWithFlags(domain, 0); +} + +static virDomainPtr testDomainDefineXMLFlags(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + virDomainPtr ret = NULL; + virDomainDefPtr def; + virDomainObjPtr dom = NULL; + virObjectEventPtr event = NULL; + virDomainDefPtr oldDef = NULL; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; + + virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); + + if (flags & VIR_DOMAIN_DEFINE_VALIDATE) + parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; + + if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, + parse_flags)) == NULL) + goto cleanup; + + if (testDomainGenerateIfnames(def) < 0) + goto cleanup; + if (!(dom = virDomainObjListAdd(privconn->domains, + def, + privconn->xmlopt, + 0, + &oldDef))) + goto cleanup; + def = NULL; + dom->persistent = 1; + + event = virDomainEventLifecycleNewFromObj(dom, + VIR_DOMAIN_EVENT_DEFINED, + !oldDef ? + VIR_DOMAIN_EVENT_DEFINED_ADDED : + VIR_DOMAIN_EVENT_DEFINED_UPDATED); + + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); + if (ret) + ret->id = dom->def->id; + + cleanup: + virDomainDefFree(def); + virDomainDefFree(oldDef); + if (dom) + virObjectUnlock(dom); + testObjectEventQueue(privconn, event); + return ret; +} + +static virDomainPtr +testDomainDefineXML(virConnectPtr conn, const char *xml) +{ + return testDomainDefineXMLFlags(conn, xml, 0); +} + +static int testDomainUndefineFlags(virDomainPtr domain, + unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + virObjectEventPtr event = NULL; + int nsnapshots; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | + VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, -1); + + + if (!(privdom = testDomObjFromDomain(domain))) + goto cleanup; + + if (privdom->hasManagedSave && + !(flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Refusing to undefine while domain managed " + "save image exists")); + goto cleanup; + } + + /* Requiring an inactive VM is part of the documented API for + * UNDEFINE_SNAPSHOTS_METADATA + */ + if (!virDomainObjIsActive(privdom) && + (nsnapshots = virDomainSnapshotObjListNum(privdom->snapshots, + NULL, 0))) { + if (!(flags & VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("cannot delete inactive domain with %d " + "snapshots"), + nsnapshots); + goto cleanup; + } + + /* There isn't actually anything to do, we are just emulating qemu + * behavior here. */ + } + + event = virDomainEventLifecycleNewFromObj(privdom, + VIR_DOMAIN_EVENT_UNDEFINED, + VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); + privdom->hasManagedSave = false; + + if (virDomainObjIsActive(privdom)) + privdom->persistent = 0; + else + virDomainObjListRemove(privconn->domains, privdom); + + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + testObjectEventQueue(privconn, event); + return ret; +} + +static int testDomainUndefine(virDomainPtr domain) +{ + return testDomainUndefineFlags(domain, 0); +} + +static int testDomainGetAutostart(virDomainPtr domain, + int *autostart) +{ + virDomainObjPtr privdom; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + *autostart = privdom->autostart; + + virDomainObjEndAPI(&privdom); + return 0; +} + + +static int testDomainSetAutostart(virDomainPtr domain, + int autostart) +{ + virDomainObjPtr privdom; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + privdom->autostart = autostart ? 1 : 0; + + virDomainObjEndAPI(&privdom); + return 0; +} + +static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, + int *nparams) +{ + char *type = NULL; + + if (nparams) + *nparams = 1; + + ignore_value(VIR_STRDUP(type, "fair")); + + return type; +} + +static int +testDomainGetSchedulerParametersFlags(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + virDomainObjPtr privdom; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + if (virTypedParameterAssign(params, VIR_DOMAIN_SCHEDULER_WEIGHT, + VIR_TYPED_PARAM_UINT, 50) < 0) + goto cleanup; + /* XXX */ + /*params[0].value.ui = privdom->weight;*/ + + *nparams = 1; + ret = 0; + + cleanup: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testDomainGetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams) +{ + return testDomainGetSchedulerParametersFlags(domain, params, nparams, 0); +} + +static int +testDomainSetSchedulerParametersFlags(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + virDomainObjPtr privdom; + int ret = -1; + size_t i; + + virCheckFlags(0, -1); + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_WEIGHT, + VIR_TYPED_PARAM_UINT, + NULL) < 0) + return -1; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + for (i = 0; i < nparams; i++) { + if (STREQ(params[i].field, VIR_DOMAIN_SCHEDULER_WEIGHT)) { + /* XXX */ + /*privdom->weight = params[i].value.ui;*/ + } + } + + ret = 0; + + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testDomainSetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams) +{ + return testDomainSetSchedulerParametersFlags(domain, params, nparams, 0); +} + +static int testDomainBlockStats(virDomainPtr domain, + const char *path, + virDomainBlockStatsPtr stats) +{ + virDomainObjPtr privdom; + struct timeval tv; + unsigned long long statbase; + int ret = -1; + + if (!*path) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("summary statistics are not supported yet")); + return ret; + } + + if (!(privdom = testDomObjFromDomain(domain))) + return ret; + + if (virDomainDiskIndexByName(privdom->def, path, false) < 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path: %s"), path); + goto error; + } + + if (gettimeofday(&tv, NULL) < 0) { + virReportSystemError(errno, + "%s", _("getting time of day")); + goto error; + } + + /* No significance to these numbers, just enough to mix it up*/ + statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; + stats->rd_req = statbase / 10; + stats->rd_bytes = statbase / 20; + stats->wr_req = statbase / 30; + stats->wr_bytes = statbase / 40; + stats->errs = tv.tv_sec / 2; + + ret = 0; + error: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testDomainInterfaceStats(virDomainPtr domain, + const char *path, + virDomainInterfaceStatsPtr stats) +{ + virDomainObjPtr privdom; + struct timeval tv; + unsigned long long statbase; + size_t i; + int found = 0, ret = -1; + + if (!(privdom = testDomObjFromDomain(domain))) + return -1; + + for (i = 0; i < privdom->def->nnets; i++) { + if (privdom->def->nets[i]->ifname && + STREQ(privdom->def->nets[i]->ifname, path)) { + found = 1; + break; + } + } + + if (!found) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path, '%s' is not a known interface"), path); + goto error; + } + + if (gettimeofday(&tv, NULL) < 0) { + virReportSystemError(errno, + "%s", _("getting time of day")); + goto error; + } + + /* No significance to these numbers, just enough to mix it up*/ + statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; + stats->rx_bytes = statbase / 10; + stats->rx_packets = statbase / 100; + stats->rx_errs = tv.tv_sec / 1; + stats->rx_drop = tv.tv_sec / 2; + stats->tx_bytes = statbase / 20; + stats->tx_packets = statbase / 110; + stats->tx_errs = tv.tv_sec / 3; + stats->tx_drop = tv.tv_sec / 4; + + ret = 0; + error: + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testNodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freemems, + int startCell, int maxCells) +{ + testDriverPtr privconn = conn->privateData; + int cell; + size_t i; + int ret = -1; + + testDriverLock(privconn); + if (startCell > privconn->numCells) { + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("Range exceeds available cells")); + goto cleanup; + } + + for (cell = startCell, i = 0; + (cell < privconn->numCells && i < maxCells); + ++cell, ++i) { + freemems[i] = privconn->cells[cell].mem; + } + ret = i; + + cleanup: + testDriverUnlock(privconn); + return ret; +} + +/* Domain event implementations */ +static int +testConnectDomainEventRegister(virConnectPtr conn, + virConnectDomainEventCallback callback, + void *opaque, + virFreeCallback freecb) +{ + testDriverPtr driver = conn->privateData; + int ret = 0; + + if (virDomainEventStateRegister(conn, driver->eventState, + callback, opaque, freecb) < 0) + ret = -1; + + return ret; +} + + +static int +testConnectDomainEventDeregister(virConnectPtr conn, + virConnectDomainEventCallback callback) +{ + testDriverPtr driver = conn->privateData; + int ret = 0; + + if (virDomainEventStateDeregister(conn, driver->eventState, + callback) < 0) + ret = -1; + + return ret; +} + + +static int +testConnectDomainEventRegisterAny(virConnectPtr conn, + virDomainPtr dom, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + testDriverPtr driver = conn->privateData; + int ret; + + if (virDomainEventStateRegisterID(conn, driver->eventState, + dom, eventID, + callback, opaque, freecb, &ret) < 0) + ret = -1; + + return ret; +} + +static int +testConnectDomainEventDeregisterAny(virConnectPtr conn, + int callbackID) +{ + testDriverPtr driver = conn->privateData; + int ret = 0; + + if (virObjectEventStateDeregisterID(conn, driver->eventState, + callbackID) < 0) + ret = -1; + + return ret; +} + +static int testConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int testConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 1; +} + +static int testConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 1; +} + +static int testDomainIsActive(virDomainPtr dom) +{ + virDomainObjPtr obj; + int ret; + + if (!(obj = testDomObjFromDomain(dom))) + return -1; + + ret = virDomainObjIsActive(obj); + virDomainObjEndAPI(&obj); + return ret; +} + +static int testDomainIsPersistent(virDomainPtr dom) +{ + virDomainObjPtr obj; + int ret; + + if (!(obj = testDomObjFromDomain(dom))) + return -1; + + ret = obj->persistent; + + virDomainObjEndAPI(&obj); + return ret; +} + +static int testDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + return 0; +} +static int +testNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned char **cpumap, + unsigned int *online, + unsigned int flags) +{ + virCheckFlags(0, -1); + + if (cpumap) { + if (VIR_ALLOC_N(*cpumap, 1) < 0) + return -1; + *cpumap[0] = 0x15; + } + + if (online) + *online = 3; + + return 8; +} + +static char * +testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, + virStreamPtr st, + unsigned int screen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *ret = NULL; + + virCheckFlags(0, NULL); + + if (VIR_STRDUP(ret, "image/png") < 0) + return NULL; + + if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY) < 0) + VIR_FREE(ret); + + return ret; +} + +static char *testDomainGetMetadata(virDomainPtr dom, + int type, + const char *uri, + unsigned int flags) +{ + virDomainObjPtr privdom; + char *ret; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, NULL); + + if (!(privdom = testDomObjFromDomain(dom))) + return NULL; + + ret = virDomainObjGetMetadata(privdom, type, uri, flags); + + virDomainObjEndAPI(&privdom); + return ret; +} + +static int testDomainSetMetadata(virDomainPtr dom, + int type, + const char *metadata, + const char *key, + const char *uri, + unsigned int flags) +{ + testDriverPtr privconn = dom->conn->privateData; + virDomainObjPtr privdom; + int ret; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!(privdom = testDomObjFromDomain(dom))) + return -1; + + ret = virDomainObjSetMetadata(privdom, type, metadata, key, uri, + privconn->caps, privconn->xmlopt, + NULL, NULL, flags); + + virDomainObjEndAPI(&privdom); + return ret; +} + +static int +testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *arch, + char ***models, + unsigned int flags) +{ + virCheckFlags(0, -1); + return cpuGetModels(arch, models); +} + +static int +testDomainManagedSave(virDomainPtr dom, unsigned int flags) +{ + testDriverPtr privconn = dom->conn->privateData; + virDomainObjPtr vm = NULL; + virObjectEventPtr event = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | + VIR_DOMAIN_SAVE_RUNNING | + VIR_DOMAIN_SAVE_PAUSED, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot do managed save for transient domain")); + goto cleanup; + } + + testDomainShutdownState(dom, vm, VIR_DOMAIN_SHUTOFF_SAVED); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SAVED); + vm->hasManagedSave = true; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + testObjectEventQueue(privconn, event); + + return ret; +} + +static int +testDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + virDomainObjPtr vm; + int ret; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + ret = vm->hasManagedSave; + + virDomainObjEndAPI(&vm); + return ret; +} + +static int +testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) +{ + virDomainObjPtr vm; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + vm->hasManagedSave = false; + + virDomainObjEndAPI(&vm); + return 0; +} + +/* + * Snapshot APIs + */ + +static virDomainSnapshotObjPtr +testSnapObjFromName(virDomainObjPtr vm, + const char *name) +{ + virDomainSnapshotObjPtr snap = NULL; + snap = virDomainSnapshotFindByName(vm->snapshots, name); + if (!snap) + virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, + _("no domain snapshot with matching name '%s'"), + name); + return snap; +} + +static virDomainSnapshotObjPtr +testSnapObjFromSnapshot(virDomainObjPtr vm, + virDomainSnapshotPtr snapshot) +{ + return testSnapObjFromName(vm, snapshot->name); +} + +static virDomainObjPtr +testDomObjFromSnapshot(virDomainSnapshotPtr snapshot) +{ + return testDomObjFromDomain(snapshot->domain); +} + +static int +testDomainSnapshotNum(virDomainPtr domain, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int n; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | + VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); + + virDomainObjEndAPI(&vm); + return n; +} + +static int +testDomainSnapshotListNames(virDomainPtr domain, + char **names, + int nameslen, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int n; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | + VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, + flags); + + virDomainObjEndAPI(&vm); + return n; +} + +static int +testDomainListAllSnapshots(virDomainPtr domain, + virDomainSnapshotPtr **snaps, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int n; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | + VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); + + virDomainObjEndAPI(&vm); + return n; +} + +static int +testDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, + char **names, + int nameslen, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainSnapshotObjPtr snap = NULL; + int n = -1; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | + VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, + flags); + + cleanup: + virDomainObjEndAPI(&vm); + return n; +} + +static int +testDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainSnapshotObjPtr snap = NULL; + int n = -1; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | + VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); + + cleanup: + virDomainObjEndAPI(&vm); + return n; +} + +static int +testDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, + virDomainSnapshotPtr **snaps, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainSnapshotObjPtr snap = NULL; + int n = -1; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | + VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, + flags); + + cleanup: + virDomainObjEndAPI(&vm); + return n; +} + +static virDomainSnapshotPtr +testDomainSnapshotLookupByName(virDomainPtr domain, + const char *name, + unsigned int flags) +{ + virDomainObjPtr vm; + virDomainSnapshotObjPtr snap = NULL; + virDomainSnapshotPtr snapshot = NULL; + + virCheckFlags(0, NULL); + + if (!(vm = testDomObjFromDomain(domain))) + return NULL; + + if (!(snap = testSnapObjFromName(vm, name))) + goto cleanup; + + snapshot = virGetDomainSnapshot(domain, snap->def->name); + + cleanup: + virDomainObjEndAPI(&vm); + return snapshot; +} + +static int +testDomainHasCurrentSnapshot(virDomainPtr domain, + unsigned int flags) +{ + virDomainObjPtr vm; + int ret; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + ret = (vm->current_snapshot != NULL); + + virDomainObjEndAPI(&vm); + return ret; +} + +static virDomainSnapshotPtr +testDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainObjPtr vm; + virDomainSnapshotObjPtr snap = NULL; + virDomainSnapshotPtr parent = NULL; + + virCheckFlags(0, NULL); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return NULL; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + if (!snap->def->parent) { + virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, + _("snapshot '%s' does not have a parent"), + snap->def->name); + goto cleanup; + } + + parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); + + cleanup: + virDomainObjEndAPI(&vm); + return parent; +} + +static virDomainSnapshotPtr +testDomainSnapshotCurrent(virDomainPtr domain, + unsigned int flags) +{ + virDomainObjPtr vm; + virDomainSnapshotPtr snapshot = NULL; + + virCheckFlags(0, NULL); + + if (!(vm = testDomObjFromDomain(domain))) + return NULL; + + if (!vm->current_snapshot) { + virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", + _("the domain does not have a current snapshot")); + goto cleanup; + } + + snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); + + cleanup: + virDomainObjEndAPI(&vm); + return snapshot; +} + +static char * +testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + char *xml = NULL; + virDomainSnapshotObjPtr snap = NULL; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + testDriverPtr privconn = snapshot->domain->conn->privateData; + + virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return NULL; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + virUUIDFormat(snapshot->domain->uuid, uuidstr); + + xml = virDomainSnapshotDefFormat(uuidstr, snap->def, privconn->caps, + virDomainDefFormatConvertXMLFlags(flags), + 0); + + cleanup: + virDomainObjEndAPI(&vm); + return xml; +} + +static int +testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + ret = (vm->current_snapshot && + STREQ(snapshot->name, vm->current_snapshot->def->name)); + + virDomainObjEndAPI(&vm); + return ret; +} + + +static int +testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + if (!testSnapObjFromSnapshot(vm, snapshot)) + goto cleanup; + + ret = 1; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + +static int +testDomainSnapshotAlignDisks(virDomainObjPtr vm, + virDomainSnapshotDefPtr def, + unsigned int flags) +{ + int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; + bool align_match = true; + + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { + align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; + align_match = false; + if (virDomainObjIsActive(vm)) + def->state = VIR_DOMAIN_DISK_SNAPSHOT; + else + def->state = VIR_DOMAIN_SHUTOFF; + def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; + } else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { + def->state = virDomainObjGetState(vm, NULL); + align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; + align_match = false; + } else { + def->state = virDomainObjGetState(vm, NULL); + def->memory = def->state == VIR_DOMAIN_SHUTOFF ? + VIR_DOMAIN_SNAPSHOT_LOCATION_NONE : + VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; + } + + return virDomainSnapshotAlignDisks(def, align_location, align_match); +} + +static virDomainSnapshotPtr +testDomainSnapshotCreateXML(virDomainPtr domain, + const char *xmlDesc, + unsigned int flags) +{ + testDriverPtr privconn = domain->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainSnapshotDefPtr def = NULL; + virDomainSnapshotObjPtr snap = NULL; + virDomainSnapshotPtr snapshot = NULL; + virObjectEventPtr event = NULL; + char *xml = NULL; + bool update_current = true; + bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; + unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; + + /* + * DISK_ONLY: Not implemented yet + * REUSE_EXT: Not implemented yet + * + * NO_METADATA: Explicitly not implemented + * + * REDEFINE + CURRENT: Implemented + * HALT: Implemented + * QUIESCE: Nothing to do + * ATOMIC: Nothing to do + * LIVE: Nothing to do + */ + virCheckFlags( + VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | + VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | + VIR_DOMAIN_SNAPSHOT_CREATE_HALT | + VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE | + VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC | + VIR_DOMAIN_SNAPSHOT_CREATE_LIVE, NULL); + + if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT))) + update_current = false; + if (redefine) + parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; + + if (!(vm = testDomObjFromDomain(domain))) + goto cleanup; + + if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot halt after transient domain snapshot")); + goto cleanup; + } + + if (!(def = virDomainSnapshotDefParseString(xmlDesc, + privconn->caps, + privconn->xmlopt, + parse_flags))) + goto cleanup; + + if (redefine) { + if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, + &update_current, flags) < 0) + goto cleanup; + } else { + if (!(def->dom = virDomainDefCopy(vm->def, + privconn->caps, + privconn->xmlopt, + true))) + goto cleanup; + + if (testDomainSnapshotAlignDisks(vm, def, flags) < 0) + goto cleanup; + } + + if (!snap) { + if (!(snap = virDomainSnapshotAssignDef(vm->snapshots, def))) + goto cleanup; + def = NULL; + } + + if (!redefine) { + if (vm->current_snapshot && + (VIR_STRDUP(snap->def->parent, + vm->current_snapshot->def->name) < 0)) + goto cleanup; + + if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) && + virDomainObjIsActive(vm)) { + testDomainShutdownState(domain, vm, + VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); + } + } + + snapshot = virGetDomainSnapshot(domain, snap->def->name); + cleanup: + VIR_FREE(xml); + if (vm) { + if (snapshot) { + virDomainSnapshotObjPtr other; + if (update_current) + vm->current_snapshot = snap; + other = virDomainSnapshotFindByName(vm->snapshots, + snap->def->parent); + snap->parent = other; + other->nchildren++; + snap->sibling = other->first_child; + other->first_child = snap; + } + virDomainObjEndAPI(&vm); + } + testObjectEventQueue(privconn, event); + virDomainSnapshotDefFree(def); + return snapshot; +} + + +typedef struct _testSnapRemoveData testSnapRemoveData; +typedef testSnapRemoveData *testSnapRemoveDataPtr; +struct _testSnapRemoveData { + virDomainObjPtr vm; + bool current; +}; + +static int +testDomainSnapshotDiscardAll(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *data) +{ + virDomainSnapshotObjPtr snap = payload; + testSnapRemoveDataPtr curr = data; + + if (snap->def->current) + curr->current = true; + virDomainSnapshotObjListRemove(curr->vm->snapshots, snap); + return 0; +} + +typedef struct _testSnapReparentData testSnapReparentData; +typedef testSnapReparentData *testSnapReparentDataPtr; +struct _testSnapReparentData { + virDomainSnapshotObjPtr parent; + virDomainObjPtr vm; + int err; + virDomainSnapshotObjPtr last; +}; + +static int +testDomainSnapshotReparentChildren(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *data) +{ + virDomainSnapshotObjPtr snap = payload; + testSnapReparentDataPtr rep = data; + + if (rep->err < 0) + return 0; + + VIR_FREE(snap->def->parent); + snap->parent = rep->parent; + + if (rep->parent->def && + VIR_STRDUP(snap->def->parent, rep->parent->def->name) < 0) { + rep->err = -1; + return 0; + } + + if (!snap->sibling) + rep->last = snap; + return 0; +} + +static int +testDomainSnapshotDelete(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainSnapshotObjPtr snap = NULL; + virDomainSnapshotObjPtr parentsnap = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | + VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY, -1); + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | + VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { + testSnapRemoveData rem; + rem.vm = vm; + rem.current = false; + virDomainSnapshotForEachDescendant(snap, + testDomainSnapshotDiscardAll, + &rem); + if (rem.current) { + if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) + snap->def->current = true; + vm->current_snapshot = snap; + } + } else if (snap->nchildren) { + testSnapReparentData rep; + rep.parent = snap->parent; + rep.vm = vm; + rep.err = 0; + rep.last = NULL; + virDomainSnapshotForEachChild(snap, + testDomainSnapshotReparentChildren, + &rep); + if (rep.err < 0) + goto cleanup; + + /* Can't modify siblings during ForEachChild, so do it now. */ + snap->parent->nchildren += snap->nchildren; + rep.last->sibling = snap->parent->first_child; + snap->parent->first_child = snap->first_child; + } + + if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) { + snap->nchildren = 0; + snap->first_child = NULL; + } else { + virDomainSnapshotDropParent(snap); + if (snap == vm->current_snapshot) { + if (snap->def->parent) { + parentsnap = virDomainSnapshotFindByName(vm->snapshots, + snap->def->parent); + if (!parentsnap) { + VIR_WARN("missing parent snapshot matching name '%s'", + snap->def->parent); + } else { + parentsnap->def->current = true; + } + } + vm->current_snapshot = parentsnap; + } + virDomainSnapshotObjListRemove(vm->snapshots, snap); + } + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + +static int +testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + testDriverPtr privconn = snapshot->domain->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainSnapshotObjPtr snap = NULL; + virObjectEventPtr event = NULL; + virObjectEventPtr event2 = NULL; + virDomainDefPtr config = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | + VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED | + VIR_DOMAIN_SNAPSHOT_REVERT_FORCE, -1); + + /* We have the following transitions, which create the following events: + * 1. inactive -> inactive: none + * 2. inactive -> running: EVENT_STARTED + * 3. inactive -> paused: EVENT_STARTED, EVENT_PAUSED + * 4. running -> inactive: EVENT_STOPPED + * 5. running -> running: none + * 6. running -> paused: EVENT_PAUSED + * 7. paused -> inactive: EVENT_STOPPED + * 8. paused -> running: EVENT_RESUMED + * 9. paused -> paused: none + * Also, several transitions occur even if we fail partway through, + * and use of FORCE can cause multiple transitions. + */ + + if (!(vm = testDomObjFromSnapshot(snapshot))) + return -1; + + if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + goto cleanup; + + if (!vm->persistent && + snap->def->state != VIR_DOMAIN_RUNNING && + snap->def->state != VIR_DOMAIN_PAUSED && + (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | + VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) == 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("transient domain needs to request run or pause " + "to revert to inactive snapshot")); + goto cleanup; + } + + if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { + if (!snap->def->dom) { + virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, + _("snapshot '%s' lacks domain '%s' rollback info"), + snap->def->name, vm->def->name); + goto cleanup; + } + if (virDomainObjIsActive(vm) && + !(snap->def->state == VIR_DOMAIN_RUNNING + || snap->def->state == VIR_DOMAIN_PAUSED) && + (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | + VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED))) { + virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", + _("must respawn guest to start inactive snapshot")); + goto cleanup; + } + } + + + if (vm->current_snapshot) { + vm->current_snapshot->def->current = false; + vm->current_snapshot = NULL; + } + + snap->def->current = true; + config = virDomainDefCopy(snap->def->dom, + privconn->caps, privconn->xmlopt, true); + if (!config) + goto cleanup; + + if (snap->def->state == VIR_DOMAIN_RUNNING || + snap->def->state == VIR_DOMAIN_PAUSED) { + /* Transitions 2, 3, 5, 6, 8, 9 */ + bool was_running = false; + bool was_stopped = false; + + if (virDomainObjIsActive(vm)) { + /* Transitions 5, 6, 8, 9 */ + /* Check for ABI compatibility. */ + if (!virDomainDefCheckABIStability(vm->def, config)) { + virErrorPtr err = virGetLastError(); + + if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { + /* Re-spawn error using correct category. */ + if (err->code == VIR_ERR_CONFIG_UNSUPPORTED) + virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", + err->str2); + goto cleanup; + } + + virResetError(err); + testDomainShutdownState(snapshot->domain, vm, + VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); + testObjectEventQueue(privconn, event); + goto load; + } + + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { + /* Transitions 5, 6 */ + was_running = true; + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); + /* Create an event now in case the restore fails, so + * that user will be alerted that they are now paused. + * If restore later succeeds, we might replace this. */ + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); + } + virDomainObjAssignDef(vm, config, false, NULL); + + } else { + /* Transitions 2, 3 */ + load: + was_stopped = true; + virDomainObjAssignDef(vm, config, false, NULL); + if (testDomainStartState(privconn, vm, + VIR_DOMAIN_RUNNING_FROM_SNAPSHOT) < 0) + goto cleanup; + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); + } + + /* Touch up domain state. */ + if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) && + (snap->def->state == VIR_DOMAIN_PAUSED || + (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED))) { + /* Transitions 3, 6, 9 */ + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); + if (was_stopped) { + /* Transition 3, use event as-is and add event2 */ + event2 = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); + } /* else transition 6 and 9 use event as-is */ + } else { + /* Transitions 2, 5, 8 */ + virObjectUnref(event); + event = NULL; + + if (was_stopped) { + /* Transition 2 */ + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); + } else if (was_running) { + /* Transition 8 */ + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED); + } + } + } else { + /* Transitions 1, 4, 7 */ + virDomainObjAssignDef(vm, config, false, NULL); + + if (virDomainObjIsActive(vm)) { + /* Transitions 4, 7 */ + testDomainShutdownState(snapshot->domain, vm, + VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); + } + + if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | + VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { + /* Flush first event, now do transition 2 or 3 */ + bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0; + + testObjectEventQueue(privconn, event); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); + if (paused) { + event2 = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); + } + } + } + + vm->current_snapshot = snap; + ret = 0; + cleanup: + if (event) { + testObjectEventQueue(privconn, event); + testObjectEventQueue(privconn, event2); + } else { + virObjectUnref(event2); + } + virDomainObjEndAPI(&vm); + + return ret; +} + +static char * +testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags) +{ + char *cpu; + + virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL); + + cpu = cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); + + return cpu; +} + +virHypervisorDriver testHypervisorDriver = { + .name = "Test", + .connectOpen = testConnectOpen, /* 0.1.1 */ + .connectClose = testConnectClose, /* 0.1.1 */ + .connectGetVersion = testConnectGetVersion, /* 0.1.1 */ + .connectGetHostname = testConnectGetHostname, /* 0.6.3 */ + .connectGetMaxVcpus = testConnectGetMaxVcpus, /* 0.3.2 */ + .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ + .nodeGetCPUStats = testNodeGetCPUStats, /* 2.3.0 */ + .nodeGetFreeMemory = testNodeGetFreeMemory, /* 2.3.0 */ + .nodeGetFreePages = testNodeGetFreePages, /* 2.3.0 */ + .connectGetCapabilities = testConnectGetCapabilities, /* 0.2.1 */ + .connectGetSysinfo = testConnectGetSysinfo, /* 2.3.0 */ + .connectGetType = testConnectGetType, /* 2.3.0 */ + .connectListDomains = testConnectListDomains, /* 0.1.1 */ + .connectNumOfDomains = testConnectNumOfDomains, /* 0.1.1 */ + .connectListAllDomains = testConnectListAllDomains, /* 0.9.13 */ + .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ + .domainLookupByID = testDomainLookupByID, /* 0.1.1 */ + .domainLookupByUUID = testDomainLookupByUUID, /* 0.1.1 */ + .domainLookupByName = testDomainLookupByName, /* 0.1.1 */ + .domainSuspend = testDomainSuspend, /* 0.1.1 */ + .domainResume = testDomainResume, /* 0.1.1 */ + .domainShutdown = testDomainShutdown, /* 0.1.1 */ + .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ + .domainReboot = testDomainReboot, /* 0.1.1 */ + .domainDestroy = testDomainDestroy, /* 0.1.1 */ + .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ + .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ + .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ + .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ + .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ + .domainGetState = testDomainGetState, /* 0.9.2 */ + .domainSave = testDomainSave, /* 0.3.2 */ + .domainSaveFlags = testDomainSaveFlags, /* 0.9.4 */ + .domainRestore = testDomainRestore, /* 0.3.2 */ + .domainRestoreFlags = testDomainRestoreFlags, /* 0.9.4 */ + .domainCoreDump = testDomainCoreDump, /* 0.3.2 */ + .domainCoreDumpWithFormat = testDomainCoreDumpWithFormat, /* 1.2.3 */ + .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */ + .domainSetVcpusFlags = testDomainSetVcpusFlags, /* 0.8.5 */ + .domainGetVcpusFlags = testDomainGetVcpusFlags, /* 0.8.5 */ + .domainPinVcpu = testDomainPinVcpu, /* 0.7.3 */ + .domainGetVcpus = testDomainGetVcpus, /* 0.7.3 */ + .domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */ + .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ + .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ + .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ + .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ + .domainCreate = testDomainCreate, /* 0.1.11 */ + .domainCreateWithFlags = testDomainCreateWithFlags, /* 0.8.2 */ + .domainDefineXML = testDomainDefineXML, /* 0.1.11 */ + .domainDefineXMLFlags = testDomainDefineXMLFlags, /* 1.2.12 */ + .domainUndefine = testDomainUndefine, /* 0.1.11 */ + .domainUndefineFlags = testDomainUndefineFlags, /* 0.9.4 */ + .domainGetAutostart = testDomainGetAutostart, /* 0.3.2 */ + .domainSetAutostart = testDomainSetAutostart, /* 0.3.2 */ + .domainGetSchedulerType = testDomainGetSchedulerType, /* 0.3.2 */ + .domainGetSchedulerParameters = testDomainGetSchedulerParameters, /* 0.3.2 */ + .domainGetSchedulerParametersFlags = testDomainGetSchedulerParametersFlags, /* 0.9.2 */ + .domainSetSchedulerParameters = testDomainSetSchedulerParameters, /* 0.3.2 */ + .domainSetSchedulerParametersFlags = testDomainSetSchedulerParametersFlags, /* 0.9.2 */ + .domainBlockStats = testDomainBlockStats, /* 0.7.0 */ + .domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */ + .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */ + .connectDomainEventRegister = testConnectDomainEventRegister, /* 0.6.0 */ + .connectDomainEventDeregister = testConnectDomainEventDeregister, /* 0.6.0 */ + .connectIsEncrypted = testConnectIsEncrypted, /* 0.7.3 */ + .connectIsSecure = testConnectIsSecure, /* 0.7.3 */ + .domainIsActive = testDomainIsActive, /* 0.7.3 */ + .domainIsPersistent = testDomainIsPersistent, /* 0.7.3 */ + .domainIsUpdated = testDomainIsUpdated, /* 0.8.6 */ + .connectDomainEventRegisterAny = testConnectDomainEventRegisterAny, /* 0.8.0 */ + .connectDomainEventDeregisterAny = testConnectDomainEventDeregisterAny, /* 0.8.0 */ + .connectIsAlive = testConnectIsAlive, /* 0.9.8 */ + .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ + .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ + .domainGetMetadata = testDomainGetMetadata, /* 1.1.3 */ + .domainSetMetadata = testDomainSetMetadata, /* 1.1.3 */ + .connectGetCPUModelNames = testConnectGetCPUModelNames, /* 1.1.3 */ + .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ + .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ + .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ + + .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ + .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ + .domainListAllSnapshots = testDomainListAllSnapshots, /* 1.1.4 */ + .domainSnapshotGetXMLDesc = testDomainSnapshotGetXMLDesc, /* 1.1.4 */ + .domainSnapshotNumChildren = testDomainSnapshotNumChildren, /* 1.1.4 */ + .domainSnapshotListChildrenNames = testDomainSnapshotListChildrenNames, /* 1.1.4 */ + .domainSnapshotListAllChildren = testDomainSnapshotListAllChildren, /* 1.1.4 */ + .domainSnapshotLookupByName = testDomainSnapshotLookupByName, /* 1.1.4 */ + .domainHasCurrentSnapshot = testDomainHasCurrentSnapshot, /* 1.1.4 */ + .domainSnapshotGetParent = testDomainSnapshotGetParent, /* 1.1.4 */ + .domainSnapshotCurrent = testDomainSnapshotCurrent, /* 1.1.4 */ + .domainSnapshotIsCurrent = testDomainSnapshotIsCurrent, /* 1.1.4 */ + .domainSnapshotHasMetadata = testDomainSnapshotHasMetadata, /* 1.1.4 */ + .domainSnapshotCreateXML = testDomainSnapshotCreateXML, /* 1.1.4 */ + .domainRevertToSnapshot = testDomainRevertToSnapshot, /* 1.1.4 */ + .domainSnapshotDelete = testDomainSnapshotDelete, /* 1.1.4 */ + + .connectBaselineCPU = testConnectBaselineCPU, /* 1.2.0 */ +}; diff --git a/src/test/test_hypervisor_driver.h b/src/test/test_hypervisor_driver.h new file mode 100644 index 0000000..ffca9c2 --- /dev/null +++ b/src/test/test_hypervisor_driver.h @@ -0,0 +1 @@ +extern virHypervisorDriver testHypervisorDriver; diff --git a/src/test/test_interface_driver.c b/src/test/test_interface_driver.c new file mode 100644 index 0000000..a749b9f --- /dev/null +++ b/src/test/test_interface_driver.c @@ -0,0 +1,487 @@ +/* + * test_interface_driver.c: A "mock" hypervisor for use by application unit tests + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Daniel Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <string.h> +#include <sys/time.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <libxml/xmlsave.h> +#include <libxml/xpathInternals.h> + + +#include "virerror.h" +#include "datatypes.h" +#include "test_driver.h" +#include "virbuffer.h" +#include "viruuid.h" +#include "capabilities.h" +#include "configmake.h" +#include "viralloc.h" +#include "network_conf.h" +#include "interface_conf.h" +#include "domain_conf.h" +#include "domain_event.h" +#include "network_event.h" +#include "snapshot_conf.h" +#include "fdstream.h" +#include "storage_conf.h" +#include "storage_event.h" +#include "node_device_conf.h" +#include "node_device_event.h" +#include "virxml.h" +#include "virthread.h" +#include "virlog.h" +#include "virfile.h" +#include "virtypedparam.h" +#include "virrandom.h" +#include "virstring.h" +#include "cpu/cpu.h" +#include "virauth.h" +#include "viratomic.h" +#include "virdomainobjlist.h" +#include "virhostcpu.h" + +#include "test_interface_driver.h" + +#include "test_private_driver.h" + +static int testConnectNumOfInterfaces(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + size_t i; + int count = 0; + + testDriverLock(privconn); + for (i = 0; (i < privconn->ifaces.count); i++) { + virInterfaceObjLock(privconn->ifaces.objs[i]); + if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) + count++; + virInterfaceObjUnlock(privconn->ifaces.objs[i]); + } + testDriverUnlock(privconn); + return count; +} + +static int testConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) +{ + testDriverPtr privconn = conn->privateData; + int n = 0; + size_t i; + + testDriverLock(privconn); + memset(names, 0, sizeof(*names)*nnames); + for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { + virInterfaceObjLock(privconn->ifaces.objs[i]); + if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) { + if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { + virInterfaceObjUnlock(privconn->ifaces.objs[i]); + goto error; + } + } + virInterfaceObjUnlock(privconn->ifaces.objs[i]); + } + testDriverUnlock(privconn); + + return n; + + error: + for (n = 0; n < nnames; n++) + VIR_FREE(names[n]); + testDriverUnlock(privconn); + return -1; +} + +static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + size_t i; + int count = 0; + + testDriverLock(privconn); + for (i = 0; i < privconn->ifaces.count; i++) { + virInterfaceObjLock(privconn->ifaces.objs[i]); + if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) + count++; + virInterfaceObjUnlock(privconn->ifaces.objs[i]); + } + testDriverUnlock(privconn); + return count; +} + +static int testConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) +{ + testDriverPtr privconn = conn->privateData; + int n = 0; + size_t i; + + testDriverLock(privconn); + memset(names, 0, sizeof(*names)*nnames); + for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) { + virInterfaceObjLock(privconn->ifaces.objs[i]); + if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) { + if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) < 0) { + virInterfaceObjUnlock(privconn->ifaces.objs[i]); + goto error; + } + } + virInterfaceObjUnlock(privconn->ifaces.objs[i]); + } + testDriverUnlock(privconn); + + return n; + + error: + for (n = 0; n < nnames; n++) + VIR_FREE(names[n]); + testDriverUnlock(privconn); + return -1; +} + +static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, + const char *name) +{ + testDriverPtr privconn = conn->privateData; + virInterfaceObjPtr iface; + virInterfacePtr ret = NULL; + + testDriverLock(privconn); + iface = virInterfaceFindByName(&privconn->ifaces, name); + testDriverUnlock(privconn); + + if (iface == NULL) { + virReportError(VIR_ERR_NO_INTERFACE, NULL); + goto cleanup; + } + + ret = virGetInterface(conn, iface->def->name, iface->def->mac); + + cleanup: + if (iface) + virInterfaceObjUnlock(iface); + return ret; +} + +static virInterfacePtr testInterfaceLookupByMACString(virConnectPtr conn, + const char *mac) +{ + testDriverPtr privconn = conn->privateData; + virInterfaceObjPtr iface; + int ifacect; + virInterfacePtr ret = NULL; + + testDriverLock(privconn); + ifacect = virInterfaceFindByMACString(&privconn->ifaces, mac, &iface, 1); + testDriverUnlock(privconn); + + if (ifacect == 0) { + virReportError(VIR_ERR_NO_INTERFACE, NULL); + goto cleanup; + } + + if (ifacect > 1) { + virReportError(VIR_ERR_MULTIPLE_INTERFACES, NULL); + goto cleanup; + } + + ret = virGetInterface(conn, iface->def->name, iface->def->mac); + + cleanup: + if (iface) + virInterfaceObjUnlock(iface); + return ret; +} + +static char *testInterfaceGetXMLDesc(virInterfacePtr iface, + unsigned int flags) +{ + testDriverPtr privconn = iface->conn->privateData; + virInterfaceObjPtr privinterface; + char *ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + privinterface = virInterfaceFindByName(&privconn->ifaces, + iface->name); + testDriverUnlock(privconn); + + if (privinterface == NULL) { + virReportError(VIR_ERR_NO_INTERFACE, __FUNCTION__); + goto cleanup; + } + + ret = virInterfaceDefFormat(privinterface->def); + + cleanup: + if (privinterface) + virInterfaceObjUnlock(privinterface); + return ret; +} + +static virInterfacePtr testInterfaceDefineXML(virConnectPtr conn, const char *xmlStr, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + virInterfaceDefPtr def; + virInterfaceObjPtr iface = NULL; + virInterfacePtr ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + if ((def = virInterfaceDefParseString(xmlStr)) == NULL) + goto cleanup; + + if ((iface = virInterfaceAssignDef(&privconn->ifaces, def)) == NULL) + goto cleanup; + def = NULL; + + ret = virGetInterface(conn, iface->def->name, iface->def->mac); + + cleanup: + virInterfaceDefFree(def); + if (iface) + virInterfaceObjUnlock(iface); + testDriverUnlock(privconn); + return ret; +} + +static int testInterfaceUndefine(virInterfacePtr iface) +{ + testDriverPtr privconn = iface->conn->privateData; + virInterfaceObjPtr privinterface; + int ret = -1; + + testDriverLock(privconn); + privinterface = virInterfaceFindByName(&privconn->ifaces, + iface->name); + + if (privinterface == NULL) { + virReportError(VIR_ERR_NO_INTERFACE, NULL); + goto cleanup; + } + + virInterfaceRemove(&privconn->ifaces, + privinterface); + ret = 0; + + cleanup: + testDriverUnlock(privconn); + return ret; +} + +static int testInterfaceCreate(virInterfacePtr iface, + unsigned int flags) +{ + testDriverPtr privconn = iface->conn->privateData; + virInterfaceObjPtr privinterface; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privinterface = virInterfaceFindByName(&privconn->ifaces, + iface->name); + + if (privinterface == NULL) { + virReportError(VIR_ERR_NO_INTERFACE, NULL); + goto cleanup; + } + + if (privinterface->active != 0) { + virReportError(VIR_ERR_OPERATION_INVALID, NULL); + goto cleanup; + } + + privinterface->active = 1; + ret = 0; + + cleanup: + if (privinterface) + virInterfaceObjUnlock(privinterface); + testDriverUnlock(privconn); + return ret; +} + +static int testInterfaceDestroy(virInterfacePtr iface, + unsigned int flags) +{ + testDriverPtr privconn = iface->conn->privateData; + virInterfaceObjPtr privinterface; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privinterface = virInterfaceFindByName(&privconn->ifaces, + iface->name); + + if (privinterface == NULL) { + virReportError(VIR_ERR_NO_INTERFACE, NULL); + goto cleanup; + } + + if (privinterface->active == 0) { + virReportError(VIR_ERR_OPERATION_INVALID, NULL); + goto cleanup; + } + + privinterface->active = 0; + ret = 0; + + cleanup: + if (privinterface) + virInterfaceObjUnlock(privinterface); + testDriverUnlock(privconn); + return ret; +} + +static int testInterfaceIsActive(virInterfacePtr iface) +{ + testDriverPtr privconn = iface->conn->privateData; + virInterfaceObjPtr obj; + int ret = -1; + + testDriverLock(privconn); + obj = virInterfaceFindByName(&privconn->ifaces, iface->name); + testDriverUnlock(privconn); + if (!obj) { + virReportError(VIR_ERR_NO_INTERFACE, NULL); + goto cleanup; + } + ret = virInterfaceObjIsActive(obj); + + cleanup: + if (obj) + virInterfaceObjUnlock(obj); + return ret; +} + +static int testInterfaceChangeBegin(virConnectPtr conn, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + if (privconn->transaction_running) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("there is another transaction running.")); + goto cleanup; + } + + privconn->transaction_running = true; + + if (virInterfaceObjListClone(&privconn->ifaces, + &privconn->backupIfaces) < 0) + goto cleanup; + + ret = 0; + cleanup: + testDriverUnlock(privconn); + return ret; +} + +static int testInterfaceChangeCommit(virConnectPtr conn, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + + if (!privconn->transaction_running) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("no transaction running, " + "nothing to be committed.")); + goto cleanup; + } + + virInterfaceObjListFree(&privconn->backupIfaces); + privconn->transaction_running = false; + + ret = 0; + + cleanup: + testDriverUnlock(privconn); + + return ret; +} + +static int testInterfaceChangeRollback(virConnectPtr conn, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + + if (!privconn->transaction_running) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("no transaction running, " + "nothing to rollback.")); + goto cleanup; + } + + virInterfaceObjListFree(&privconn->ifaces); + privconn->ifaces.count = privconn->backupIfaces.count; + privconn->ifaces.objs = privconn->backupIfaces.objs; + privconn->backupIfaces.count = 0; + privconn->backupIfaces.objs = NULL; + + privconn->transaction_running = false; + + ret = 0; + + cleanup: + testDriverUnlock(privconn); + return ret; +} + +virInterfaceDriver testInterfaceDriver = { + .connectNumOfInterfaces = testConnectNumOfInterfaces, /* 0.7.0 */ + .connectListInterfaces = testConnectListInterfaces, /* 0.7.0 */ + .connectNumOfDefinedInterfaces = testConnectNumOfDefinedInterfaces, /* 0.7.0 */ + .connectListDefinedInterfaces = testConnectListDefinedInterfaces, /* 0.7.0 */ + .interfaceLookupByName = testInterfaceLookupByName, /* 0.7.0 */ + .interfaceLookupByMACString = testInterfaceLookupByMACString, /* 0.7.0 */ + .interfaceGetXMLDesc = testInterfaceGetXMLDesc, /* 0.7.0 */ + .interfaceDefineXML = testInterfaceDefineXML, /* 0.7.0 */ + .interfaceUndefine = testInterfaceUndefine, /* 0.7.0 */ + .interfaceCreate = testInterfaceCreate, /* 0.7.0 */ + .interfaceDestroy = testInterfaceDestroy, /* 0.7.0 */ + .interfaceIsActive = testInterfaceIsActive, /* 0.7.3 */ + .interfaceChangeBegin = testInterfaceChangeBegin, /* 0.9.2 */ + .interfaceChangeCommit = testInterfaceChangeCommit, /* 0.9.2 */ + .interfaceChangeRollback = testInterfaceChangeRollback, /* 0.9.2 */ +}; diff --git a/src/test/test_interface_driver.h b/src/test/test_interface_driver.h new file mode 100644 index 0000000..34cdc43 --- /dev/null +++ b/src/test/test_interface_driver.h @@ -0,0 +1 @@ +extern virInterfaceDriver testInterfaceDriver; diff --git a/src/test/test_network_driver.c b/src/test/test_network_driver.c new file mode 100644 index 0000000..34b30fb --- /dev/null +++ b/src/test/test_network_driver.c @@ -0,0 +1,540 @@ +/* + * test_network_driver.c: A "mock" hypervisor for use by application unit tests + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Daniel Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <string.h> +#include <sys/time.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <libxml/xmlsave.h> +#include <libxml/xpathInternals.h> + + +#include "virerror.h" +#include "datatypes.h" +#include "test_driver.h" +#include "virbuffer.h" +#include "viruuid.h" +#include "capabilities.h" +#include "configmake.h" +#include "viralloc.h" +#include "network_conf.h" +#include "interface_conf.h" +#include "domain_conf.h" +#include "domain_event.h" +#include "network_event.h" +#include "snapshot_conf.h" +#include "fdstream.h" +#include "storage_conf.h" +#include "storage_event.h" +#include "node_device_conf.h" +#include "node_device_event.h" +#include "virxml.h" +#include "virthread.h" +#include "virlog.h" +#include "virfile.h" +#include "virtypedparam.h" +#include "virrandom.h" +#include "virstring.h" +#include "cpu/cpu.h" +#include "virauth.h" +#include "viratomic.h" +#include "virdomainobjlist.h" +#include "virhostcpu.h" +#include "test_network_driver.h" + +#include "test_private_driver.h" + +static int testConnectNumOfNetworks(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + int numActive; + + numActive = virNetworkObjListNumOfNetworks(privconn->networks, + true, NULL, conn); + return numActive; +} + +static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { + testDriverPtr privconn = conn->privateData; + int n; + + n = virNetworkObjListGetNames(privconn->networks, + true, names, nnames, NULL, conn); + return n; +} + +static int testConnectNumOfDefinedNetworks(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + int numInactive; + + numInactive = virNetworkObjListNumOfNetworks(privconn->networks, + false, NULL, conn); + return numInactive; +} + +static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { + testDriverPtr privconn = conn->privateData; + int n; + + n = virNetworkObjListGetNames(privconn->networks, + false, names, nnames, NULL, conn); + return n; +} + +static int +testConnectListAllNetworks(virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + + virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); + + return virNetworkObjListExport(conn, privconn->networks, nets, NULL, flags); +} + +static int testNetworkIsActive(virNetworkPtr net) +{ + testDriverPtr privconn = net->conn->privateData; + virNetworkObjPtr obj; + int ret = -1; + + obj = virNetworkObjFindByUUID(privconn->networks, net->uuid); + if (!obj) { + virReportError(VIR_ERR_NO_NETWORK, NULL); + goto cleanup; + } + ret = virNetworkObjIsActive(obj); + + cleanup: + virNetworkObjEndAPI(&obj); + return ret; +} + +static int testNetworkIsPersistent(virNetworkPtr net) +{ + testDriverPtr privconn = net->conn->privateData; + virNetworkObjPtr obj; + int ret = -1; + + obj = virNetworkObjFindByUUID(privconn->networks, net->uuid); + if (!obj) { + virReportError(VIR_ERR_NO_NETWORK, NULL); + goto cleanup; + } + ret = obj->persistent; + + cleanup: + virNetworkObjEndAPI(&obj); + return ret; +} + + +static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) +{ + testDriverPtr privconn = conn->privateData; + virNetworkDefPtr def; + virNetworkObjPtr net = NULL; + virNetworkPtr ret = NULL; + virObjectEventPtr event = NULL; + + if ((def = virNetworkDefParseString(xml)) == NULL) + goto cleanup; + + if (!(net = virNetworkAssignDef(privconn->networks, def, + VIR_NETWORK_OBJ_LIST_ADD_LIVE | + VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE))) + goto cleanup; + def = NULL; + net->active = 1; + + event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, + VIR_NETWORK_EVENT_STARTED, + 0); + + ret = virGetNetwork(conn, net->def->name, net->def->uuid); + + cleanup: + virNetworkDefFree(def); + testObjectEventQueue(privconn, event); + virNetworkObjEndAPI(&net); + return ret; +} + +static +virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml) +{ + testDriverPtr privconn = conn->privateData; + virNetworkDefPtr def; + virNetworkObjPtr net = NULL; + virNetworkPtr ret = NULL; + virObjectEventPtr event = NULL; + + if ((def = virNetworkDefParseString(xml)) == NULL) + goto cleanup; + + if (!(net = virNetworkAssignDef(privconn->networks, def, 0))) + goto cleanup; + def = NULL; + + event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, + VIR_NETWORK_EVENT_DEFINED, + 0); + + ret = virGetNetwork(conn, net->def->name, net->def->uuid); + + cleanup: + virNetworkDefFree(def); + testObjectEventQueue(privconn, event); + virNetworkObjEndAPI(&net); + return ret; +} + +static int testNetworkUndefine(virNetworkPtr network) +{ + testDriverPtr privconn = network->conn->privateData; + virNetworkObjPtr privnet; + int ret = -1; + virObjectEventPtr event = NULL; + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (virNetworkObjIsActive(privnet)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Network '%s' is still running"), network->name); + goto cleanup; + } + + event = virNetworkEventLifecycleNew(network->name, network->uuid, + VIR_NETWORK_EVENT_UNDEFINED, + 0); + + virNetworkRemoveInactive(privconn->networks, privnet); + ret = 0; + + cleanup: + testObjectEventQueue(privconn, event); + virNetworkObjEndAPI(&privnet); + return ret; +} + +static int +testNetworkUpdate(virNetworkPtr net, + unsigned int command, + unsigned int section, + int parentIndex, + const char *xml, + unsigned int flags) +{ + testDriverPtr privconn = net->conn->privateData; + virNetworkObjPtr network = NULL; + int isActive, ret = -1; + + virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | + VIR_NETWORK_UPDATE_AFFECT_CONFIG, + -1); + + network = virNetworkObjFindByUUID(privconn->networks, net->uuid); + if (!network) { + virReportError(VIR_ERR_NO_NETWORK, + "%s", _("no network with matching uuid")); + goto cleanup; + } + + /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network + * is active, else change CONFIG + */ + isActive = virNetworkObjIsActive(network); + if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE + | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == + VIR_NETWORK_UPDATE_AFFECT_CURRENT) { + if (isActive) + flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; + else + flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; + } + + /* update the network config in memory/on disk */ + if (virNetworkObjUpdate(network, command, section, parentIndex, xml, flags) < 0) + goto cleanup; + + ret = 0; + cleanup: + virNetworkObjEndAPI(&network); + return ret; +} + +static int testNetworkCreate(virNetworkPtr network) +{ + testDriverPtr privconn = network->conn->privateData; + virNetworkObjPtr privnet; + int ret = -1; + virObjectEventPtr event = NULL; + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (virNetworkObjIsActive(privnet)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Network '%s' is already running"), network->name); + goto cleanup; + } + + privnet->active = 1; + event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, + VIR_NETWORK_EVENT_STARTED, + 0); + ret = 0; + + cleanup: + testObjectEventQueue(privconn, event); + virNetworkObjEndAPI(&privnet); + return ret; +} + +static int testNetworkDestroy(virNetworkPtr network) +{ + testDriverPtr privconn = network->conn->privateData; + virNetworkObjPtr privnet; + int ret = -1; + virObjectEventPtr event = NULL; + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + privnet->active = 0; + event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, + VIR_NETWORK_EVENT_STOPPED, + 0); + if (!privnet->persistent) + virNetworkRemoveInactive(privconn->networks, privnet); + + ret = 0; + + cleanup: + testObjectEventQueue(privconn, event); + virNetworkObjEndAPI(&privnet); + return ret; +} + +static char *testNetworkGetXMLDesc(virNetworkPtr network, + unsigned int flags) +{ + testDriverPtr privconn = network->conn->privateData; + virNetworkObjPtr privnet; + char *ret = NULL; + + virCheckFlags(0, NULL); + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + ret = virNetworkDefFormat(privnet->def, flags); + + cleanup: + virNetworkObjEndAPI(&privnet); + return ret; +} + +static char *testNetworkGetBridgeName(virNetworkPtr network) { + testDriverPtr privconn = network->conn->privateData; + char *bridge = NULL; + virNetworkObjPtr privnet; + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!(privnet->def->bridge)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' does not have a bridge name."), + privnet->def->name); + goto cleanup; + } + + ignore_value(VIR_STRDUP(bridge, privnet->def->bridge)); + + cleanup: + virNetworkObjEndAPI(&privnet); + return bridge; +} + +static int testNetworkGetAutostart(virNetworkPtr network, + int *autostart) +{ + testDriverPtr privconn = network->conn->privateData; + virNetworkObjPtr privnet; + int ret = -1; + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + *autostart = privnet->autostart; + ret = 0; + + cleanup: + virNetworkObjEndAPI(&privnet); + return ret; +} + +static int testNetworkSetAutostart(virNetworkPtr network, + int autostart) +{ + testDriverPtr privconn = network->conn->privateData; + virNetworkObjPtr privnet; + int ret = -1; + + privnet = virNetworkObjFindByName(privconn->networks, network->name); + if (privnet == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + privnet->autostart = autostart ? 1 : 0; + ret = 0; + + cleanup: + virNetworkObjEndAPI(&privnet); + return ret; +} + +static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + testDriverPtr privconn = conn->privateData; + virNetworkObjPtr net; + virNetworkPtr ret = NULL; + + net = virNetworkObjFindByUUID(privconn->networks, uuid); + if (net == NULL) { + virReportError(VIR_ERR_NO_NETWORK, NULL); + goto cleanup; + } + + ret = virGetNetwork(conn, net->def->name, net->def->uuid); + + cleanup: + virNetworkObjEndAPI(&net); + return ret; +} + +static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, + const char *name) +{ + testDriverPtr privconn = conn->privateData; + virNetworkObjPtr net; + virNetworkPtr ret = NULL; + + net = virNetworkObjFindByName(privconn->networks, name); + if (net == NULL) { + virReportError(VIR_ERR_NO_NETWORK, NULL); + goto cleanup; + } + + ret = virGetNetwork(conn, net->def->name, net->def->uuid); + + cleanup: + virNetworkObjEndAPI(&net); + return ret; +} + +static int +testConnectNetworkEventRegisterAny(virConnectPtr conn, + virNetworkPtr net, + int eventID, + virConnectNetworkEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + testDriverPtr driver = conn->privateData; + int ret; + + if (virNetworkEventStateRegisterID(conn, driver->eventState, + net, eventID, callback, + opaque, freecb, &ret) < 0) + ret = -1; + + return ret; +} + +static int +testConnectNetworkEventDeregisterAny(virConnectPtr conn, + int callbackID) +{ + testDriverPtr driver = conn->privateData; + int ret = 0; + + if (virObjectEventStateDeregisterID(conn, driver->eventState, + callbackID) < 0) + ret = -1; + + return ret; +} + +virNetworkDriver testNetworkDriver = { + .connectNumOfNetworks = testConnectNumOfNetworks, /* 0.3.2 */ + .connectListNetworks = testConnectListNetworks, /* 0.3.2 */ + .connectNumOfDefinedNetworks = testConnectNumOfDefinedNetworks, /* 0.3.2 */ + .connectListDefinedNetworks = testConnectListDefinedNetworks, /* 0.3.2 */ + .connectListAllNetworks = testConnectListAllNetworks, /* 0.10.2 */ + .connectNetworkEventRegisterAny = testConnectNetworkEventRegisterAny, /* 1.2.1 */ + .connectNetworkEventDeregisterAny = testConnectNetworkEventDeregisterAny, /* 1.2.1 */ + .networkLookupByUUID = testNetworkLookupByUUID, /* 0.3.2 */ + .networkLookupByName = testNetworkLookupByName, /* 0.3.2 */ + .networkCreateXML = testNetworkCreateXML, /* 0.3.2 */ + .networkDefineXML = testNetworkDefineXML, /* 0.3.2 */ + .networkUndefine = testNetworkUndefine, /* 0.3.2 */ + .networkUpdate = testNetworkUpdate, /* 0.10.2 */ + .networkCreate = testNetworkCreate, /* 0.3.2 */ + .networkDestroy = testNetworkDestroy, /* 0.3.2 */ + .networkGetXMLDesc = testNetworkGetXMLDesc, /* 0.3.2 */ + .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ + .networkGetAutostart = testNetworkGetAutostart, /* 0.3.2 */ + .networkSetAutostart = testNetworkSetAutostart, /* 0.3.2 */ + .networkIsActive = testNetworkIsActive, /* 0.7.3 */ + .networkIsPersistent = testNetworkIsPersistent, /* 0.7.3 */ +}; diff --git a/src/test/test_network_driver.h b/src/test/test_network_driver.h new file mode 100644 index 0000000..a87b7a4 --- /dev/null +++ b/src/test/test_network_driver.h @@ -0,0 +1 @@ +extern virNetworkDriver testNetworkDriver; diff --git a/src/test/test_private_driver.h b/src/test/test_private_driver.h new file mode 100644 index 0000000..751933c --- /dev/null +++ b/src/test/test_private_driver.h @@ -0,0 +1,70 @@ +#ifndef __TEST_DRIVER_H__ +# define __TEST_DRIVER_H__ + +# define MAX_CPUS 128 + +struct _testCell { + unsigned long mem; + unsigned long freeMem; + int numCpus; + virCapsHostNUMACellCPU cpus[MAX_CPUS]; +}; +typedef struct _testCell testCell; +typedef struct _testCell *testCellPtr; + +# define MAX_CELLS 128 + +struct _testAuth { + char *username; + char *password; +}; +typedef struct _testAuth testAuth; +typedef struct _testAuth *testAuthPtr; + +struct _testDriver { + virMutex lock; + + virNodeInfo nodeInfo; + virInterfaceObjList ifaces; + bool transaction_running; + virInterfaceObjList backupIfaces; + virStoragePoolObjList pools; + virNodeDeviceObjList devs; + int numCells; + testCell cells[MAX_CELLS]; + size_t numAuths; + testAuthPtr auths; + + /* virAtomic access only */ + volatile int nextDomID; + + /* immutable pointer, immutable object after being initialized with + * testBuildCapabilities */ + virCapsPtr caps; + + /* immutable pointer, immutable object */ + virDomainXMLOptionPtr xmlopt; + + /* immutable pointer, self-locking APIs */ + virDomainObjListPtr domains; + virNetworkObjListPtr networks; + virObjectEventStatePtr eventState; +}; +typedef struct _testDriver testDriver; +typedef testDriver *testDriverPtr; + +# define VIR_FROM_THIS VIR_FROM_TEST + +extern unsigned long long defaultPoolAlloc; + +extern unsigned long long defaultPoolCap; + +void testDriverLock(testDriverPtr driver); +void testDriverUnlock(testDriverPtr driver); + +int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool); + +void testObjectEventQueue(testDriverPtr driver, + virObjectEventPtr event); + +#endif /* __TEST_DRIVER_H__ */ diff --git a/src/test/test_storage_driver.c b/src/test/test_storage_driver.c new file mode 100644 index 0000000..bda43c1 --- /dev/null +++ b/src/test/test_storage_driver.c @@ -0,0 +1,1517 @@ +/* + * test_storage_driver.c: A "mock" hypervisor for use by application unit tests + * + * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Daniel Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <string.h> +#include <sys/time.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <libxml/xmlsave.h> +#include <libxml/xpathInternals.h> + + +#include "virerror.h" +#include "datatypes.h" +#include "test_driver.h" +#include "virbuffer.h" +#include "viruuid.h" +#include "capabilities.h" +#include "configmake.h" +#include "viralloc.h" +#include "network_conf.h" +#include "interface_conf.h" +#include "domain_conf.h" +#include "domain_event.h" +#include "network_event.h" +#include "snapshot_conf.h" +#include "fdstream.h" +#include "storage_conf.h" +#include "storage_event.h" +#include "node_device_conf.h" +#include "node_device_event.h" +#include "virxml.h" +#include "virthread.h" +#include "virlog.h" +#include "virfile.h" +#include "virtypedparam.h" +#include "virrandom.h" +#include "virstring.h" +#include "cpu/cpu.h" +#include "virauth.h" +#include "viratomic.h" +#include "virdomainobjlist.h" +#include "virhostcpu.h" + +#include "test_storage_driver.h" + +#include "test_private_driver.h" + +static int +testConnectNumOfStoragePools(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + int numActive = 0; + size_t i; + + testDriverLock(privconn); + for (i = 0; i < privconn->pools.count; i++) + if (virStoragePoolObjIsActive(privconn->pools.objs[i])) + numActive++; + testDriverUnlock(privconn); + + return numActive; +} + +static int +testConnectListStoragePools(virConnectPtr conn, + char **const names, + int nnames) +{ + testDriverPtr privconn = conn->privateData; + int n = 0; + size_t i; + + testDriverLock(privconn); + memset(names, 0, sizeof(*names)*nnames); + for (i = 0; i < privconn->pools.count && n < nnames; i++) { + virStoragePoolObjLock(privconn->pools.objs[i]); + if (virStoragePoolObjIsActive(privconn->pools.objs[i]) && + VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { + virStoragePoolObjUnlock(privconn->pools.objs[i]); + goto error; + } + virStoragePoolObjUnlock(privconn->pools.objs[i]); + } + testDriverUnlock(privconn); + + return n; + + error: + for (n = 0; n < nnames; n++) + VIR_FREE(names[n]); + testDriverUnlock(privconn); + return -1; +} + +static int +testConnectNumOfDefinedStoragePools(virConnectPtr conn) +{ + testDriverPtr privconn = conn->privateData; + int numInactive = 0; + size_t i; + + testDriverLock(privconn); + for (i = 0; i < privconn->pools.count; i++) { + virStoragePoolObjLock(privconn->pools.objs[i]); + if (!virStoragePoolObjIsActive(privconn->pools.objs[i])) + numInactive++; + virStoragePoolObjUnlock(privconn->pools.objs[i]); + } + testDriverUnlock(privconn); + + return numInactive; +} + +static int +testConnectListDefinedStoragePools(virConnectPtr conn, + char **const names, + int nnames) +{ + testDriverPtr privconn = conn->privateData; + int n = 0; + size_t i; + + testDriverLock(privconn); + memset(names, 0, sizeof(*names)*nnames); + for (i = 0; i < privconn->pools.count && n < nnames; i++) { + virStoragePoolObjLock(privconn->pools.objs[i]); + if (!virStoragePoolObjIsActive(privconn->pools.objs[i]) && + VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0) { + virStoragePoolObjUnlock(privconn->pools.objs[i]); + goto error; + } + virStoragePoolObjUnlock(privconn->pools.objs[i]); + } + testDriverUnlock(privconn); + + return n; + + error: + for (n = 0; n < nnames; n++) + VIR_FREE(names[n]); + testDriverUnlock(privconn); + return -1; +} + +static int +testConnectListAllStoragePools(virConnectPtr conn, + virStoragePoolPtr **pools, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + int ret = -1; + + virCheckFlags(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL, -1); + + testDriverLock(privconn); + ret = virStoragePoolObjListExport(conn, privconn->pools, pools, + NULL, flags); + testDriverUnlock(privconn); + + return ret; +} + +static const char *defaultPoolSourcesLogicalXML = +"<sources>\n" +" <source>\n" +" <device path='/dev/sda20'/>\n" +" <name>testvg1</name>\n" +" <format type='lvm2'/>\n" +" </source>\n" +" <source>\n" +" <device path='/dev/sda21'/>\n" +" <name>testvg2</name>\n" +" <format type='lvm2'/>\n" +" </source>\n" +"</sources>\n"; + +static const char *defaultPoolSourcesNetFSXML = +"<sources>\n" +" <source>\n" +" <host name='%s'/>\n" +" <dir path='/testshare'/>\n" +" <format type='nfs'/>\n" +" </source>\n" +"</sources>\n"; + +static char * +testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type, + const char *srcSpec, + unsigned int flags) +{ + virStoragePoolSourcePtr source = NULL; + int pool_type; + char *ret = NULL; + + virCheckFlags(0, NULL); + + pool_type = virStoragePoolTypeFromString(type); + if (!pool_type) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown storage pool type %s"), type); + goto cleanup; + } + + if (srcSpec) { + source = virStoragePoolDefParseSourceString(srcSpec, pool_type); + if (!source) + goto cleanup; + } + + switch (pool_type) { + + case VIR_STORAGE_POOL_LOGICAL: + ignore_value(VIR_STRDUP(ret, defaultPoolSourcesLogicalXML)); + break; + + case VIR_STORAGE_POOL_NETFS: + if (!source || !source->hosts[0].name) { + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("hostname must be specified for netfs sources")); + goto cleanup; + } + + ignore_value(virAsprintf(&ret, defaultPoolSourcesNetFSXML, + source->hosts[0].name)); + break; + + default: + virReportError(VIR_ERR_NO_SUPPORT, + _("pool type '%s' does not support source discovery"), type); + } + + cleanup: + virStoragePoolSourceFree(source); + return ret; +} + +static int +testConnectStoragePoolEventRegisterAny(virConnectPtr conn, + virStoragePoolPtr pool, + int eventID, + virConnectStoragePoolEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + testDriverPtr driver = conn->privateData; + int ret; + + if (virStoragePoolEventStateRegisterID(conn, driver->eventState, + pool, eventID, callback, + opaque, freecb, &ret) < 0) + ret = -1; + + return ret; +} + +static int +testConnectStoragePoolEventDeregisterAny(virConnectPtr conn, + int callbackID) +{ + testDriverPtr driver = conn->privateData; + int ret = 0; + + if (virObjectEventStateDeregisterID(conn, driver->eventState, + callbackID) < 0) + ret = -1; + + return ret; +} + +static virStoragePoolPtr +testStoragePoolLookupByName(virConnectPtr conn, + const char *name) +{ + testDriverPtr privconn = conn->privateData; + virStoragePoolObjPtr pool; + virStoragePoolPtr ret = NULL; + + testDriverLock(privconn); + pool = virStoragePoolObjFindByName(&privconn->pools, name); + testDriverUnlock(privconn); + + if (pool == NULL) { + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); + goto cleanup; + } + + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); + + cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} + +static virStoragePoolPtr +testStoragePoolLookupByVolume(virStorageVolPtr vol) +{ + return testStoragePoolLookupByName(vol->conn, vol->pool); +} + +static virStoragePoolPtr +testStoragePoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + testDriverPtr privconn = conn->privateData; + virStoragePoolObjPtr pool; + virStoragePoolPtr ret = NULL; + + testDriverLock(privconn); + pool = virStoragePoolObjFindByUUID(&privconn->pools, uuid); + testDriverUnlock(privconn); + + if (pool == NULL) { + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); + goto cleanup; + } + + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); + + cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + return ret; +} + +static virStoragePoolPtr +testStoragePoolCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + virStoragePoolDefPtr def; + virStoragePoolObjPtr pool = NULL; + virStoragePoolPtr ret = NULL; + virObjectEventPtr event = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + if (!(def = virStoragePoolDefParseString(xml))) + goto cleanup; + + pool = virStoragePoolObjFindByUUID(&privconn->pools, def->uuid); + if (!pool) + pool = virStoragePoolObjFindByName(&privconn->pools, def->name); + if (pool) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("storage pool already exists")); + goto cleanup; + } + + if (!(pool = virStoragePoolObjAssignDef(&privconn->pools, def))) + goto cleanup; + def = NULL; + + if (testStoragePoolObjSetDefaults(pool) == -1) { + virStoragePoolObjRemove(&privconn->pools, pool); + pool = NULL; + goto cleanup; + } + pool->active = 1; + + event = virStoragePoolEventLifecycleNew(pool->def->name, pool->def->uuid, + VIR_STORAGE_POOL_EVENT_STARTED, + 0); + + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); + + cleanup: + virStoragePoolDefFree(def); + testObjectEventQueue(privconn, event); + if (pool) + virStoragePoolObjUnlock(pool); + testDriverUnlock(privconn); + return ret; +} + +static virStoragePoolPtr +testStoragePoolDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + virStoragePoolDefPtr def; + virStoragePoolObjPtr pool = NULL; + virStoragePoolPtr ret = NULL; + virObjectEventPtr event = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + if (!(def = virStoragePoolDefParseString(xml))) + goto cleanup; + + def->capacity = defaultPoolCap; + def->allocation = defaultPoolAlloc; + def->available = defaultPoolCap - defaultPoolAlloc; + + if (!(pool = virStoragePoolObjAssignDef(&privconn->pools, def))) + goto cleanup; + def = NULL; + + event = virStoragePoolEventLifecycleNew(pool->def->name, pool->def->uuid, + VIR_STORAGE_POOL_EVENT_DEFINED, + 0); + + if (testStoragePoolObjSetDefaults(pool) == -1) { + virStoragePoolObjRemove(&privconn->pools, pool); + pool = NULL; + goto cleanup; + } + + ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + NULL, NULL); + + cleanup: + virStoragePoolDefFree(def); + testObjectEventQueue(privconn, event); + if (pool) + virStoragePoolObjUnlock(pool); + testDriverUnlock(privconn); + return ret; +} + +static int +testStoragePoolUndefine(virStoragePoolPtr pool) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + virObjectEventPtr event = NULL; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); + goto cleanup; + } + + event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, + VIR_STORAGE_POOL_EVENT_UNDEFINED, + 0); + + virStoragePoolObjRemove(&privconn->pools, privpool); + privpool = NULL; + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + testObjectEventQueue(privconn, event); + testDriverUnlock(privconn); + return ret; +} + +static int +testStoragePoolBuild(virStoragePoolPtr pool, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); + goto cleanup; + } + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolDestroy(virStoragePoolPtr pool) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + virObjectEventPtr event = NULL; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + privpool->active = 0; + event = virStoragePoolEventLifecycleNew(privpool->def->name, privpool->def->uuid, + VIR_STORAGE_POOL_EVENT_STOPPED, + 0); + + if (privpool->configFile == NULL) { + virStoragePoolObjRemove(&privconn->pools, privpool); + privpool = NULL; + } + ret = 0; + + cleanup: + testObjectEventQueue(privconn, event); + if (privpool) + virStoragePoolObjUnlock(privpool); + testDriverUnlock(privconn); + return ret; +} + +static int +testStoragePoolDelete(virStoragePoolPtr pool, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); + goto cleanup; + } + + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolRefresh(virStoragePoolPtr pool, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + virObjectEventPtr event = NULL; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + event = virStoragePoolEventRefreshNew(pool->name, pool->uuid); + ret = 0; + + cleanup: + testObjectEventQueue(privconn, event); + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolGetInfo(virStoragePoolPtr pool, + virStoragePoolInfoPtr info) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + memset(info, 0, sizeof(virStoragePoolInfo)); + if (privpool->active) + info->state = VIR_STORAGE_POOL_RUNNING; + else + info->state = VIR_STORAGE_POOL_INACTIVE; + info->capacity = privpool->def->capacity; + info->allocation = privpool->def->allocation; + info->available = privpool->def->available; + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static char * +testStoragePoolGetXMLDesc(virStoragePoolPtr pool, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + char *ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + ret = virStoragePoolDefFormat(privpool->def); + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolGetAutostart(virStoragePoolPtr pool, + int *autostart) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!privpool->configFile) { + *autostart = 0; + } else { + *autostart = privpool->autostart; + } + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolSetAutostart(virStoragePoolPtr pool, + int autostart) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!privpool->configFile) { + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("pool has no config file")); + goto cleanup; + } + + autostart = (autostart != 0); + privpool->autostart = autostart; + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolNumOfVolumes(virStoragePoolPtr pool) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + ret = privpool->volumes.count; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStoragePoolListVolumes(virStoragePoolPtr pool, + char **const names, + int maxnames) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + size_t i = 0; + int n = 0; + + memset(names, 0, maxnames * sizeof(*names)); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + for (i = 0; i < privpool->volumes.count && n < maxnames; i++) { + if (VIR_STRDUP(names[n++], privpool->volumes.objs[i]->name) < 0) + goto cleanup; + } + + virStoragePoolObjUnlock(privpool); + return n; + + cleanup: + for (n = 0; n < maxnames; n++) + VIR_FREE(names[i]); + + memset(names, 0, maxnames * sizeof(*names)); + if (privpool) + virStoragePoolObjUnlock(privpool); + return -1; +} + +static int +testStoragePoolListAllVolumes(virStoragePoolPtr obj, + virStorageVolPtr **vols, + unsigned int flags) +{ + testDriverPtr privconn = obj->conn->privateData; + virStoragePoolObjPtr pool; + size_t i; + virStorageVolPtr *tmp_vols = NULL; + virStorageVolPtr vol = NULL; + int nvols = 0; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + pool = virStoragePoolObjFindByUUID(&privconn->pools, obj->uuid); + testDriverUnlock(privconn); + + if (!pool) { + virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", + _("no storage pool with matching uuid")); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(pool)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("storage pool is not active")); + goto cleanup; + } + + /* Just returns the volumes count */ + if (!vols) { + ret = pool->volumes.count; + goto cleanup; + } + + if (VIR_ALLOC_N(tmp_vols, pool->volumes.count + 1) < 0) + goto cleanup; + + for (i = 0; i < pool->volumes.count; i++) { + if (!(vol = virGetStorageVol(obj->conn, pool->def->name, + pool->volumes.objs[i]->name, + pool->volumes.objs[i]->key, + NULL, NULL))) + goto cleanup; + tmp_vols[nvols++] = vol; + } + + *vols = tmp_vols; + tmp_vols = NULL; + ret = nvols; + + cleanup: + if (tmp_vols) { + for (i = 0; i < nvols; i++) + virObjectUnref(tmp_vols[i]); + VIR_FREE(tmp_vols); + } + + if (pool) + virStoragePoolObjUnlock(pool); + + return ret; +} + +static virStorageVolPtr +testStorageVolLookupByName(virStoragePoolPtr pool, + const char *name ATTRIBUTE_UNUSED) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol; + virStorageVolPtr ret = NULL; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + privvol = virStorageVolDefFindByName(privpool, name); + + if (!privvol) { + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), name); + goto cleanup; + } + + ret = virGetStorageVol(pool->conn, privpool->def->name, + privvol->name, privvol->key, + NULL, NULL); + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static virStorageVolPtr +testStorageVolLookupByKey(virConnectPtr conn, + const char *key) +{ + testDriverPtr privconn = conn->privateData; + size_t i; + virStorageVolPtr ret = NULL; + + testDriverLock(privconn); + for (i = 0; i < privconn->pools.count; i++) { + virStoragePoolObjLock(privconn->pools.objs[i]); + if (virStoragePoolObjIsActive(privconn->pools.objs[i])) { + virStorageVolDefPtr privvol = + virStorageVolDefFindByKey(privconn->pools.objs[i], key); + + if (privvol) { + ret = virGetStorageVol(conn, + privconn->pools.objs[i]->def->name, + privvol->name, + privvol->key, + NULL, NULL); + virStoragePoolObjUnlock(privconn->pools.objs[i]); + break; + } + } + virStoragePoolObjUnlock(privconn->pools.objs[i]); + } + testDriverUnlock(privconn); + + if (!ret) + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching key '%s'"), key); + + return ret; +} + +static virStorageVolPtr +testStorageVolLookupByPath(virConnectPtr conn, + const char *path) +{ + testDriverPtr privconn = conn->privateData; + size_t i; + virStorageVolPtr ret = NULL; + + testDriverLock(privconn); + for (i = 0; i < privconn->pools.count; i++) { + virStoragePoolObjLock(privconn->pools.objs[i]); + if (virStoragePoolObjIsActive(privconn->pools.objs[i])) { + virStorageVolDefPtr privvol = + virStorageVolDefFindByPath(privconn->pools.objs[i], path); + + if (privvol) { + ret = virGetStorageVol(conn, + privconn->pools.objs[i]->def->name, + privvol->name, + privvol->key, + NULL, NULL); + virStoragePoolObjUnlock(privconn->pools.objs[i]); + break; + } + } + virStoragePoolObjUnlock(privconn->pools.objs[i]); + } + testDriverUnlock(privconn); + + if (!ret) + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching path '%s'"), path); + + return ret; +} + +static virStorageVolPtr +testStorageVolCreateXML(virStoragePoolPtr pool, + const char *xmldesc, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol = NULL; + virStorageVolPtr ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + privvol = virStorageVolDefParseString(privpool->def, xmldesc, 0); + if (privvol == NULL) + goto cleanup; + + if (virStorageVolDefFindByName(privpool, privvol->name)) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("storage vol already exists")); + goto cleanup; + } + + /* Make sure enough space */ + if ((privpool->def->allocation + privvol->target.allocation) > + privpool->def->capacity) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Not enough free space in pool for volume '%s'"), + privvol->name); + goto cleanup; + } + + if (virAsprintf(&privvol->target.path, "%s/%s", + privpool->def->target.path, + privvol->name) == -1) + goto cleanup; + + if (VIR_STRDUP(privvol->key, privvol->target.path) < 0 || + VIR_APPEND_ELEMENT_COPY(privpool->volumes.objs, + privpool->volumes.count, privvol) < 0) + goto cleanup; + + privpool->def->allocation += privvol->target.allocation; + privpool->def->available = (privpool->def->capacity - + privpool->def->allocation); + + ret = virGetStorageVol(pool->conn, privpool->def->name, + privvol->name, privvol->key, + NULL, NULL); + privvol = NULL; + + cleanup: + virStorageVolDefFree(privvol); + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static virStorageVolPtr +testStorageVolCreateXMLFrom(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr clonevol, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol = NULL, origvol = NULL; + virStorageVolPtr ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); + goto cleanup; + } + + privvol = virStorageVolDefParseString(privpool->def, xmldesc, 0); + if (privvol == NULL) + goto cleanup; + + if (virStorageVolDefFindByName(privpool, privvol->name)) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("storage vol already exists")); + goto cleanup; + } + + origvol = virStorageVolDefFindByName(privpool, clonevol->name); + if (!origvol) { + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + clonevol->name); + goto cleanup; + } + + /* Make sure enough space */ + if ((privpool->def->allocation + privvol->target.allocation) > + privpool->def->capacity) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Not enough free space in pool for volume '%s'"), + privvol->name); + goto cleanup; + } + privpool->def->available = (privpool->def->capacity - + privpool->def->allocation); + + if (virAsprintf(&privvol->target.path, "%s/%s", + privpool->def->target.path, + privvol->name) == -1) + goto cleanup; + + if (VIR_STRDUP(privvol->key, privvol->target.path) < 0 || + VIR_APPEND_ELEMENT_COPY(privpool->volumes.objs, + privpool->volumes.count, privvol) < 0) + goto cleanup; + + privpool->def->allocation += privvol->target.allocation; + privpool->def->available = (privpool->def->capacity - + privpool->def->allocation); + + ret = virGetStorageVol(pool->conn, privpool->def->name, + privvol->name, privvol->key, + NULL, NULL); + privvol = NULL; + + cleanup: + virStorageVolDefFree(privvol); + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int +testStorageVolDelete(virStorageVolPtr vol, + unsigned int flags) +{ + testDriverPtr privconn = vol->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol; + size_t i; + int ret = -1; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + vol->pool); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + + privvol = virStorageVolDefFindByName(privpool, vol->name); + + if (privvol == NULL) { + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); + goto cleanup; + } + + + privpool->def->allocation -= privvol->target.allocation; + privpool->def->available = (privpool->def->capacity - + privpool->def->allocation); + + for (i = 0; i < privpool->volumes.count; i++) { + if (privpool->volumes.objs[i] == privvol) { + virStorageVolDefFree(privvol); + + VIR_DELETE_ELEMENT(privpool->volumes.objs, i, privpool->volumes.count); + break; + } + } + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static int testStorageVolumeTypeForPool(int pooltype) +{ + + switch (pooltype) { + case VIR_STORAGE_POOL_DIR: + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_NETFS: + return VIR_STORAGE_VOL_FILE; + default: + return VIR_STORAGE_VOL_BLOCK; + } +} + +static int +testStorageVolGetInfo(virStorageVolPtr vol, + virStorageVolInfoPtr info) +{ + testDriverPtr privconn = vol->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol; + int ret = -1; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + vol->pool); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + privvol = virStorageVolDefFindByName(privpool, vol->name); + + if (privvol == NULL) { + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); + goto cleanup; + } + + memset(info, 0, sizeof(*info)); + info->type = testStorageVolumeTypeForPool(privpool->def->type); + info->capacity = privvol->target.capacity; + info->allocation = privvol->target.allocation; + ret = 0; + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static char * +testStorageVolGetXMLDesc(virStorageVolPtr vol, + unsigned int flags) +{ + testDriverPtr privconn = vol->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol; + char *ret = NULL; + + virCheckFlags(0, NULL); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + vol->pool); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + privvol = virStorageVolDefFindByName(privpool, vol->name); + + if (privvol == NULL) { + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); + goto cleanup; + } + + ret = virStorageVolDefFormat(privpool->def, privvol); + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +static char * +testStorageVolGetPath(virStorageVolPtr vol) +{ + testDriverPtr privconn = vol->conn->privateData; + virStoragePoolObjPtr privpool; + virStorageVolDefPtr privvol; + char *ret = NULL; + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + vol->pool); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + privvol = virStorageVolDefFindByName(privpool, vol->name); + + if (privvol == NULL) { + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); + goto cleanup; + } + + if (!virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); + goto cleanup; + } + + ignore_value(VIR_STRDUP(ret, privvol->target.path)); + + cleanup: + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) +{ + + pool->def->capacity = defaultPoolCap; + pool->def->allocation = defaultPoolAlloc; + pool->def->available = defaultPoolCap - defaultPoolAlloc; + + return VIR_STRDUP(pool->configFile, ""); +} + +static int testStoragePoolIsActive(virStoragePoolPtr pool) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr obj; + int ret = -1; + + testDriverLock(privconn); + obj = virStoragePoolObjFindByUUID(&privconn->pools, pool->uuid); + testDriverUnlock(privconn); + if (!obj) { + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); + goto cleanup; + } + ret = virStoragePoolObjIsActive(obj); + + cleanup: + if (obj) + virStoragePoolObjUnlock(obj); + return ret; +} + +static int testStoragePoolIsPersistent(virStoragePoolPtr pool) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr obj; + int ret = -1; + + testDriverLock(privconn); + obj = virStoragePoolObjFindByUUID(&privconn->pools, pool->uuid); + testDriverUnlock(privconn); + if (!obj) { + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); + goto cleanup; + } + ret = obj->configFile ? 1 : 0; + + cleanup: + if (obj) + virStoragePoolObjUnlock(obj); + return ret; +} + +static int +testStoragePoolCreate(virStoragePoolPtr pool, + unsigned int flags) +{ + testDriverPtr privconn = pool->conn->privateData; + virStoragePoolObjPtr privpool; + int ret = -1; + virObjectEventPtr event = NULL; + + virCheckFlags(0, -1); + + testDriverLock(privconn); + privpool = virStoragePoolObjFindByName(&privconn->pools, + pool->name); + testDriverUnlock(privconn); + + if (privpool == NULL) { + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto cleanup; + } + + if (virStoragePoolObjIsActive(privpool)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); + goto cleanup; + } + + privpool->active = 1; + + event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, + VIR_STORAGE_POOL_EVENT_STARTED, + 0); + ret = 0; + + cleanup: + testObjectEventQueue(privconn, event); + if (privpool) + virStoragePoolObjUnlock(privpool); + return ret; +} + +virStorageDriver testStorageDriver = { + .connectNumOfStoragePools = testConnectNumOfStoragePools, /* 0.5.0 */ + .connectListStoragePools = testConnectListStoragePools, /* 0.5.0 */ + .connectNumOfDefinedStoragePools = testConnectNumOfDefinedStoragePools, /* 0.5.0 */ + .connectListDefinedStoragePools = testConnectListDefinedStoragePools, /* 0.5.0 */ + .connectListAllStoragePools = testConnectListAllStoragePools, /* 0.10.2 */ + .connectFindStoragePoolSources = testConnectFindStoragePoolSources, /* 0.5.0 */ + .connectStoragePoolEventRegisterAny = testConnectStoragePoolEventRegisterAny, /* 2.0.0 */ + .connectStoragePoolEventDeregisterAny = testConnectStoragePoolEventDeregisterAny, /* 2.0.0 */ + .storagePoolLookupByName = testStoragePoolLookupByName, /* 0.5.0 */ + .storagePoolLookupByUUID = testStoragePoolLookupByUUID, /* 0.5.0 */ + .storagePoolLookupByVolume = testStoragePoolLookupByVolume, /* 0.5.0 */ + .storagePoolCreateXML = testStoragePoolCreateXML, /* 0.5.0 */ + .storagePoolDefineXML = testStoragePoolDefineXML, /* 0.5.0 */ + .storagePoolBuild = testStoragePoolBuild, /* 0.5.0 */ + .storagePoolUndefine = testStoragePoolUndefine, /* 0.5.0 */ + .storagePoolCreate = testStoragePoolCreate, /* 0.5.0 */ + .storagePoolDestroy = testStoragePoolDestroy, /* 0.5.0 */ + .storagePoolDelete = testStoragePoolDelete, /* 0.5.0 */ + .storagePoolRefresh = testStoragePoolRefresh, /* 0.5.0 */ + .storagePoolGetInfo = testStoragePoolGetInfo, /* 0.5.0 */ + .storagePoolGetXMLDesc = testStoragePoolGetXMLDesc, /* 0.5.0 */ + .storagePoolGetAutostart = testStoragePoolGetAutostart, /* 0.5.0 */ + .storagePoolSetAutostart = testStoragePoolSetAutostart, /* 0.5.0 */ + .storagePoolNumOfVolumes = testStoragePoolNumOfVolumes, /* 0.5.0 */ + .storagePoolListVolumes = testStoragePoolListVolumes, /* 0.5.0 */ + .storagePoolListAllVolumes = testStoragePoolListAllVolumes, /* 0.10.2 */ + + .storageVolLookupByName = testStorageVolLookupByName, /* 0.5.0 */ + .storageVolLookupByKey = testStorageVolLookupByKey, /* 0.5.0 */ + .storageVolLookupByPath = testStorageVolLookupByPath, /* 0.5.0 */ + .storageVolCreateXML = testStorageVolCreateXML, /* 0.5.0 */ + .storageVolCreateXMLFrom = testStorageVolCreateXMLFrom, /* 0.6.4 */ + .storageVolDelete = testStorageVolDelete, /* 0.5.0 */ + .storageVolGetInfo = testStorageVolGetInfo, /* 0.5.0 */ + .storageVolGetXMLDesc = testStorageVolGetXMLDesc, /* 0.5.0 */ + .storageVolGetPath = testStorageVolGetPath, /* 0.5.0 */ + .storagePoolIsActive = testStoragePoolIsActive, /* 0.7.3 */ + .storagePoolIsPersistent = testStoragePoolIsPersistent, /* 0.7.3 */ +}; diff --git a/src/test/test_storage_driver.h b/src/test/test_storage_driver.h new file mode 100644 index 0000000..fd29eda --- /dev/null +++ b/src/test/test_storage_driver.h @@ -0,0 +1 @@ +extern virStorageDriver testStorageDriver; -- 2.9.3

4 3

[libvirt] [PATCH 0/3] docs/Makefile.am cleanups
by Ján Tomko 16 Sep '16

16 Sep '16

The effect of 2/3 will be more apparent after apibuild.py speedups (to be written). Ján Tomko (3): docs/Makefile.am: remove redundant variables docs/Makefile.am: build hvsupport.html earlier docs: drop todo.html .gitignore | 1 - docs/Makefile.am | 44 +++--------------- docs/sitemap.html.in | 4 -- docs/todo.cfg-example | 26 ----------- docs/todo.pl | 125 -------------------------------------------------- 5 files changed, 7 insertions(+), 193 deletions(-) delete mode 100644 docs/todo.cfg-example delete mode 100755 docs/todo.pl -- 2.7.3

3 7

[libvirt] [PATCH] qemu: map "virtio" video model to "virt" machtype correctly (arm/aarch64)
by Laszlo Ersek 16 Sep '16

16 Sep '16

Most of QEMU's PCI display device models, such as: libvirt video/model/@type QEMU -device ------------------------- ------------ cirrus cirrus-vga vga VGA qxl qxl-vga virtio virtio-vga come with a linear framebuffer (sometimes called "VGA compatibility framebuffer"). This linear framebuffer lives in one of the PCI device's MMIO BARs, and allows guest code (primarily: firmware drivers, and non-accelerated OS drivers) to display graphics with direct memory access. Due to architectural reasons on aarch64/KVM hosts, this kind of framebuffer doesn't / can't work in qemu-system-(arm|aarch64) -M virt machines. Cache coherency issues guarantee a corrupted / unusable display. The problem has been researched by several people, including kvm-arm maintainers, and it's been decided that the best way (practically the only way) to have boot time graphics for such guests is to consolidate on QEMU's "virtio-gpu-pci" device. >From <https://bugzilla.redhat.com/show_bug.cgi?id=1195176>, libvirt supports <devices> <video> <model type='virtio'/> </video> </devices> but libvirt unconditionally maps @type='virtio' to QEMU's "virtio-vga" device model. (See the qemuBuildDeviceVideoStr() function and the "qemuDeviceVideo" enum impl.) According to the above, this is not right for the "virt" machine type; the qemu-system-(arm|aarch64) binaries don't even recognize the "virtio-vga" device model (justifiedly). Whereas "virtio-gpu-pci", which is a pure virtio device without a compatibility framebuffer, is available, and works fine. (The ArmVirtQemu ("AAVMF") platform of edk2 -- that is, the UEFI firmware for "virt" -- supports "virtio-gpu-pci", as of upstream commit 3ef3209d3028. See <https://tianocore.acgmultimedia.com/show_bug.cgi?id=66>.) Override the default mapping of "virtio", from "virtio-vga" to "virtio-gpu-pci", if qemuDomainMachineIsVirt() evaluates to true. Cc: Andrea Bolognani <abologna(a)redhat.com> Cc: Drew Jones <drjones(a)redhat.com> Cc: Marc-André Lureau <marcandre.lureau(a)redhat.com> Suggested-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1372901 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++ tests/qemuxml2argvtest.c | 5 +++ tests/qemuxml2xmltest.c | 5 +++ tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args | 26 +++++++++++ tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml | 36 ++++++++++++++++ tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml | 45 ++++++++++++++++++++ 6 files changed, 121 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a61863b9abb..038c38f2217c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4325,6 +4325,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virDomainVideoTypeToString(video->type)); goto error; } + if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO && + qemuDomainMachineIsVirt(def)) { + model = "virtio-gpu-pci"; + } } else { if (video->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dbb0e4d56142..e8540779a4b5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1872,6 +1872,11 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("aarch64-video-virtio-gpu-pci", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 14c2b0ccf2ce..fb05c8571411 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -831,6 +831,11 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("aarch64-video-virtio-gpu-pci", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH, GIC_NONE, NONE); DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, NONE); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args new file mode 100644 index 000000000000..56dbdfb66fa2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args @@ -0,0 +1,26 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/opt/qemu-installed/bin/qemu-system-aarch64 \ +-name aarch64-vgpu \ +-S \ +-M virt \ +-cpu cortex-a57 \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid f3197c89-6457-44fe-b26d-897090ba6541 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \ +-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ +addr=0x1 \ +-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,multifunction=on,\ +addr=0x1.0x1 \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:73:34:53,bus=pci.1,\ +addr=0x0,bootindex=1 \ +-net user,vlan=0,name=hostnet0 \ +-device virtio-gpu-pci,id=video0,bus=pci.2,addr=0x0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml new file mode 100644 index 000000000000..4b52a731b043 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>aarch64-vgpu</name> + <uuid>f3197c89-6457-44fe-b26d-897090ba6541</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <features> + <acpi/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a57</model> + </cpu> + <devices> + <emulator>/opt/qemu-installed/bin/qemu-system-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1' multifunction='on'/> + </controller> + <interface type='user'> + <mac address='52:54:00:73:34:53'/> + <model type='virtio'/> + <boot order='1'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <video> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml new file mode 100644 index 000000000000..26f6a51622ef --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>aarch64-vgpu</name> + <uuid>f3197c89-6457-44fe-b26d-897090ba6541</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <features> + <acpi/> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a57</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/opt/qemu-installed/bin/qemu-system-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='ioh3420'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='ioh3420'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1' multifunction='on'/> + </controller> + <interface type='user'> + <mac address='52:54:00:73:34:53'/> + <model type='virtio'/> + <boot order='1'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <video> + <model type='virtio' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + </video> + </devices> +</domain> -- 2.9.2

2 3

[libvirt] [PATCH] util: Expose virHostCPUStatsAssign on non-Linux
by Martin Kletzander 16 Sep '16

16 Sep '16

There is nothing Linux-specific in that function. Also since commit 8c3b5bf48123783b812b97360db7ac51f1889e17 mingw build is broken due to the fact that this function is not compiled in the library. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial build-breaker fix. src/util/virhostcpu.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 856d83c3e49b..f68176f387ec 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -781,21 +781,6 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, return ret; } -int -virHostCPUStatsAssign(virNodeCPUStatsPtr param, - const char *name, - unsigned long long value) -{ - if (virStrcpyStatic(param->field, name) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("kernel cpu time field is too long" - " for the destination")); - return -1; - } - param->value = value; - return 0; -} - # define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / sysconf(_SC_CLK_TCK)) int @@ -953,6 +938,22 @@ virHostCPUParseMapLinux(int max_cpuid, const char *path) int +virHostCPUStatsAssign(virNodeCPUStatsPtr param, + const char *name, + unsigned long long value) +{ + if (virStrcpyStatic(param->field, name) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("kernel cpu time field is too long" + " for the destination")); + return -1; + } + param->value = value; + return 0; +} + + +int virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, unsigned int *cpus ATTRIBUTE_UNUSED, unsigned int *mhz ATTRIBUTE_UNUSED, -- 2.10.0

1 0

[libvirt] [PATCH v1 1/1] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 16 Sep '16

16 Sep '16

This helps in selecting log level of the gluster gfapi, output to stderr. The option is 'qemu_gfapi_debuglevel', can be tuned by editing '/etc/libvirt/qemu.conf' Debug levels ranges 0-9, with 9 being the most verbose, and 0 representing no debugging output. The default is the same as it was before, which is a level of 4. The current logging levels defined in the gluster gfapi are: 0 - None 1 - Emergency 2 - Alert 3 - Critical 4 - Error 5 - Warning 6 - Notice 7 - Info 8 - Debug 9 - Trace Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> -- v1: Initial post --- src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_command.c | 12 +++++++++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index e4c2aae..c6c8f3a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -621,3 +621,23 @@ # rollover when a size limit is hit. # #stdio_handler = "logd" + +# Qemu gluster libgfapi log level, debug levels are 0-9, with 9 being the +# most verbose, and 0 representing no debugging output. +# +# The current logging levels defined in the gluster GFAPI are: +# +# 0 - None +# 1 - Emergency +# 2 - Alert +# 3 - Critical +# 4 - Error +# 5 - Warning +# 6 - Notice +# 7 - Info +# 8 - Debug +# 9 - Trace +# +# Defaults to 4 +# +# qemu_gfapi_debuglevel = 9 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a61863..650eedc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -859,6 +859,7 @@ qemuBuildGlusterDriveJSON(virStorageSourcePtr src) /* { driver:"gluster", * volume:"testvol", * path:"/a.img", + * debug:9, * server :[{type:"tcp", host:"1.2.3.4", port:24007}, * {type:"unix", socket:"/tmp/glusterd.socket"}, ...]} */ @@ -866,6 +867,7 @@ qemuBuildGlusterDriveJSON(virStorageSourcePtr src) "s:driver", protocol, "s:volume", src->volume, "s:path", src->path, + "u:debug", src->debug_level, "a:server", servers, NULL) < 0) virJSONValueFree(servers); @@ -2177,6 +2179,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, static int qemuBuildDiskDriveCommandLine(virCommandPtr cmd, + virQEMUDriverConfigPtr cfg, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { @@ -2255,6 +2258,13 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-drive"); + if (disk->src && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + if(cfg->qemuGfapiDebugLevel) { + disk->src->debug_level = cfg->qemuGfapiDebugLevel; + } + } + if (!(optstr = qemuBuildDriveStr(disk, driveBoot, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); @@ -9613,7 +9623,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildDiskDriveCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildDiskDriveCommandLine(cmd, cfg, def, qemuCaps) < 0) goto error; if (qemuBuildFSDevCommandLine(cmd, def, qemuCaps) < 0) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dad8334..d245cec 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -311,6 +311,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->seccompSandbox = -1; cfg->logTimestamp = true; + cfg->qemuGfapiDebugLevel = 4; cfg->stdioLogD = true; #ifdef DEFAULT_LOADER_NVRAM @@ -780,6 +781,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } } + if (virConfGetValueUInt(conf, "qemu_gfapi_debuglevel", &cfg->qemuGfapiDebugLevel) < 0) + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d8232cc..fe70d9b 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,7 @@ struct _virQEMUDriverConfig { virFirmwarePtr *firmwares; size_t nfirmwares; + unsigned int qemuGfapiDebugLevel; }; /* Main driver state */ diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 3d09468..9f3add3 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -237,6 +237,8 @@ struct _virStorageSource { virStorageAuthDefPtr auth; virStorageEncryptionPtr encryption; + unsigned int debug_level; + char *driverName; int format; /* virStorageFileFormat in domain backing chains, but * pool-specific enum for storage volumes */ -- 2.7.4

4 5

[libvirt] [PATCH v2 1/1] [WIP] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 15 Sep '16

15 Sep '16

This helps in selecting log level of the gluster gfapi, output to stderr. The option is 'qemu_gfapi_debuglevel', can be tuned by editing '/etc/libvirt/qemu.conf' Debug levels ranges 0-9, with 9 being the most verbose, and 0 representing no debugging output. The default is the same as it was before, which is a level of 4. The current logging levels defined in the gluster gfapi are: 0 - None 1 - Emergency 2 - Alert 3 - Critical 4 - Error 5 - Warning 6 - Notice 7 - Info 8 - Debug 9 - Trace Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> -- v2: Modify test cases and syntax check changes as suggested by Peter in v1. Rename qemu_gfapi_debuglevel to glusterfs_debug_level as per Daniel comments. Fix to make debug_level changes effects on URI along with JSON. TODO: * changes in libvirtd_qemu.aug Which I don't understand for now * comment on debug_level variable in storage source Not sure what is the right place * Capablities check v1: Initial post --- src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_command.c | 14 +++++++++++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 7 ++++--- .../qemuxml2argv-disk-drive-network-gluster.args | 12 ++++++------ 7 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index e4c2aae..a6cdcf3 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -621,3 +621,23 @@ # rollover when a size limit is hit. # #stdio_handler = "logd" + +# Qemu gluster libgfapi log level, debug levels are 0-9, with 9 being the +# most verbose, and 0 representing no debugging output. +# +# The current logging levels defined in the gluster GFAPI are: +# +# 0 - None +# 1 - Emergency +# 2 - Alert +# 3 - Critical +# 4 - Error +# 5 - Warning +# 6 - Notice +# 7 - Info +# 8 - Debug +# 9 - Trace +# +# Defaults to 4 +# +# glusterfs_debug_level = 9 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a61863..c333795 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1383,6 +1383,11 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, } virBufferAddLit(buf, ","); + if (disk->src && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + virBufferAsprintf(buf, "file.debug=%d,", disk->src->debug_level); + } + if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) { /* NB: If libvirt starts using the more modern option based * syntax to build the command line (e.g., "-drive driver=rbd, @@ -2177,6 +2182,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, static int qemuBuildDiskDriveCommandLine(virCommandPtr cmd, + virQEMUDriverConfigPtr cfg, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { @@ -2255,6 +2261,12 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-drive"); + if (disk->src && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + if (cfg->glusterfsDebugLevel) + disk->src->debug_level = cfg->glusterfsDebugLevel; + } + if (!(optstr = qemuBuildDriveStr(disk, driveBoot, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); @@ -9613,7 +9625,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildDiskDriveCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildDiskDriveCommandLine(cmd, cfg, def, qemuCaps) < 0) goto error; if (qemuBuildFSDevCommandLine(cmd, def, qemuCaps) < 0) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dad8334..ff2b58e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -311,6 +311,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->seccompSandbox = -1; cfg->logTimestamp = true; + cfg->glusterfsDebugLevel = 4; cfg->stdioLogD = true; #ifdef DEFAULT_LOADER_NVRAM @@ -780,6 +781,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } } + if (virConfGetValueUInt(conf, "glusterfs_debug_level", &cfg->glusterfsDebugLevel) < 0) + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d8232cc..89d046d 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,7 @@ struct _virQEMUDriverConfig { virFirmwarePtr *firmwares; size_t nfirmwares; + unsigned int glusterfsDebugLevel; }; /* Main driver state */ diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 3d09468..9f3add3 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -237,6 +237,8 @@ struct _virStorageSource { virStorageAuthDefPtr auth; virStorageEncryptionPtr encryption; + unsigned int debug_level; + char *driverName; int format; /* virStorageFileFormat in domain backing chains, but * pool-specific enum for storage volumes */ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args index f560308..deec7a7 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args @@ -16,9 +16,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=gluster://example.org:6000/Volume1/Image,format=raw,if=virtio \ --drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,format=raw,\ -if=virtio' \ +-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\ +if=virtio \ +-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\ +format=raw,if=virtio' \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args index 634ed75..cd5294e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args @@ -17,18 +17,18 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=gluster://example.org:6000/Volume1/Image,format=raw,if=none,\ -id=drive-virtio-disk0 \ +-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\ +if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,format=raw,\ -if=none,id=drive-virtio-disk1' \ +-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\ +format=raw,if=none,id=drive-virtio-disk1' \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -drive file.driver=gluster,file.volume=Volume3,file.path=/Image.qcow2,\ file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,\ file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,\ -file.server.2.type=unix,file.server.2.socket=/path/to/sock,format=qcow2,\ -if=none,id=drive-virtio-disk2 \ +file.server.2.type=unix,file.server.2.socket=/path/to/sock,file.debug=4,\ +format=qcow2,if=none,id=drive-virtio-disk2 \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ id=virtio-disk2 -- 2.7.4

1 0

[libvirt] [PATCH 0/8] test driver: Added new functions.
by Tomáš Ryšavý 15 Sep '16

15 Sep '16

Added few functions into test driver. Tomáš Ryšavý (8): virhostcpu: Expose virHostCPUStatsAssign test driver: Replaced num by a constant. test driver: Implement virConnectGetSysinfo. test driver: Implement virConnectGetType. test driver: Implement testNodeGetCPUStats test driver: Implement testNodeGetFreeMemory test driver: added pages sizes into XML into test driver. test driver: Implement testNodeGetFreePages. src/libvirt_private.syms | 1 + src/test/test_driver.c | 148 +++++++++++++++++++++++++++++++++++++++++++++-- src/util/virhostcpu.c | 2 +- src/util/virhostcpu.h | 4 ++ 4 files changed, 148 insertions(+), 7 deletions(-) -- 2.9.3

3 15

[libvirt] [PATCH v4] virsh: use virConnectGetDomainCapabilities with maxvcpus
by Shivaprasad G Bhat 15 Sep '16

15 Sep '16

virsh maxvcpus --type kvm output is useless on PPC. Also, in commit e6806d79 we documented not rely on virConnectGetMaxVcpus output. Fix the maxvcpus to use virConnectGetDomainCapabilities now to make it useful. The call is made to use the default emulator binary and to check for the host machine and arch which is what the command intends to show anyway. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- tools/virsh-host.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 57f0c0e..dbdf23d 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -606,18 +606,46 @@ static bool cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { const char *type = NULL; - int vcpus; + int vcpus = -1; + char *caps = NULL; + const unsigned int flags = 0; /* No flags so far */ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; virshControlPtr priv = ctl->privData; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) return false; - if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) + caps = virConnectGetDomainCapabilities(priv->conn, NULL, NULL, NULL, type, flags); + if (!caps) { + if (last_error && last_error->code != VIR_ERR_NO_SUPPORT) + return false; + + vshResetLibvirtError(); + goto fallback; + } + + xml = virXMLParseStringCtxt(caps, _("(domainCapabilities)"), &ctxt); + if (!xml) { + VIR_FREE(caps); return false; + } - vshPrint(ctl, "%d\n", vcpus); + virXPathInt("string(./vcpu[1]/@max)", ctxt, &vcpus); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(caps); + if (vcpus < 0) + goto fallback; + + exit: + vshPrint(ctl, "%d\n", vcpus); return true; + fallback: + if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) + return false; + goto exit; } /*

2 3

[libvirt] [PATCH] tests: Use fixedcontent variable
by Martin Kletzander 15 Sep '16

15 Sep '16

Commit ca32929908bbc94116493ad8915e7cd7ae0f57d5 added function virTestCompareToFile(), but forgot to use a fixedcontent value for the actual comparison. That lead to VIR_TEST_DEBUG=1 showing (for some tests) all the actual output from the first error to the end of the string due to the difference being an endline in the end. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as 'trivial'. tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 8ea6ab82ad5a..f87628edee68 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -709,7 +709,7 @@ virTestCompareToFile(const char *strcontent, filecontent)) { virTestDifferenceFull(stderr, filecontent, filename, - strcontent, NULL); + fixedcontent, NULL); goto failure; } -- 2.10.0

1 0

Re: [libvirt] [PATCH 8/8] fspools: docs and tests for fspool directory backend
by Olga Krishtal 15 Sep '16

15 Sep '16

Hello again. Please, drop the commit message for this patch. Use the following one: Added XML 2 XML tests for fspool and item. ________________________________ From: Olga Krishtal Sent: Thursday, September 15, 2016 10:39:01 AM To: openstack-devel Cc: Maxim Nestratov; Nikolay Shirokovskiy Subject: Re: [PATCH 8/8] fspools: docs and tests for fspool directory backend On 26/08/16 17:17, Olga Krishtal wrote: Pleas, drop the commit message, test is present for both: item and fspool. > At the moment only pool test is implemented. > You need to inplement item test. > > Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> > --- > docs/schemas/fsitem.rng | 69 ++++++++++++++ > docs/schemas/fspool.rng | 83 ++++++++++++++++ > tests/fsitemxml2xmltest.c | 105 +++++++++++++++++++++ > .../dir-missing-target-path-invalid.xml | 12 +++ > tests/fspoolxml2xmlin/fspool-dir.xml | 17 ++++ > tests/fspoolxml2xmlout/fspool-dir.xml | 17 ++++ > tests/fspoolxml2xmltest.c | 82 ++++++++++++++++ > 7 files changed, 385 insertions(+) > create mode 100644 docs/schemas/fsitem.rng > create mode 100644 docs/schemas/fspool.rng > create mode 100644 tests/fsitemxml2xmltest.c > create mode 100644 tests/fspoolschemadata/dir-missing-target-path-invalid.xml > create mode 100644 tests/fspoolxml2xmlin/fspool-dir.xml > create mode 100644 tests/fspoolxml2xmlout/fspool-dir.xml > create mode 100644 tests/fspoolxml2xmltest.c > > diff --git a/docs/schemas/fsitem.rng b/docs/schemas/fsitem.rng > new file mode 100644 > index 0000000..a41659c > --- /dev/null > +++ b/docs/schemas/fsitem.rng > @@ -0,0 +1,69 @@ > +<?xml version="1.0"?> > + > +<grammar xmlns="http://relaxng.org/ns/structure/1.0" > + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> > + <include href='basictypes.rng'/> > + <start> > + <ref name='vol'/> > + </start> > + > + <include href='storagecommon.rng'/> > + > + > + <define name='item'> > + <element name='fsitem'> > + <optional> > + <attribute name='type'> > + <value>dir</value> > + </attribute> > + </optional> > + <interleave> > + <element name='name'> > + <ref name='volName'/> > + </element> > + <optional> > + <element name='key'> > + <text/> > + </element> > + </optional> > + <ref name='sizing'/> > + <ref name='target'/> > + </interleave> > + </element> > + </define> > + > + <define name='sizing'> > + <interleave> > + <optional> > + <element name='capacity'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + <optional> > + <element name='allocation'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + </interleave> > + </define> > + > + <define name='target'> > + <element name='target'> > + <interleave> > + <optional> > + <element name='path'> > + <choice> > + <data type='anyURI'/> > + <ref name='absFilePath'/> > + </choice> > + </element> > + </optional> > + <ref name='permissions'/> > + <optional> > + <ref name='fileFormatFeatures'/> > + </optional> > + </interleave> > + </element> > + </define> > + > +</grammar> > diff --git a/docs/schemas/fspool.rng b/docs/schemas/fspool.rng > new file mode 100644 > index 0000000..132b65c > --- /dev/null > +++ b/docs/schemas/fspool.rng > @@ -0,0 +1,83 @@ > +<?xml version="1.0"?> > + > +<grammar xmlns="http://relaxng.org/ns/structure/1.0" > + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> > + <include href='basictypes.rng'/> > + <include href='storagecommon.rng'/> > + <start> > + <ref name='pool'/> > + </start> > + > + > + <define name='fspool'> > + <element name='fspool'> > + <choice> > + <ref name='fspooldir'/> > + </choice> > + </element> > + </define> > + > + <define name='fspooldir'> > + <attribute name='type'> > + <value>dir</value> > + </attribute> > + <interleave> > + <ref name='commonmetadata'/> > + <ref name='sizing'/> > + <ref name='sourcedir'/> > + <ref name='target'/> > + </interleave> > + </define> > + > + <define name='commonmetadata'> > + <interleave> > + <element name='name'> > + <ref name='genericName'/> > + </element> > + <optional> > + <element name='uuid'> > + <ref name='UUID'/> > + </element> > + </optional> > + </interleave> > + </define> > + > + <define name='sizing'> > + <interleave> > + <optional> > + <element name='capacity'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + <optional> > + <element name='allocation'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + <optional> > + <element name='available'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + </interleave> > + </define> > + > + <define name='target'> > + <element name='target'> > + <interleave> > + <element name='path'> > + <ref name='absFilePath'/> > + </element> > + <ref name='permissions'/> > + </interleave> > + </element> > + </define> > + > + <define name='sourcedir'> > + <optional> > + <element name='source'> > + </element> > + </optional> > + </define> > + > +</grammar> > diff --git a/tests/fsitemxml2xmltest.c b/tests/fsitemxml2xmltest.c > new file mode 100644 > index 0000000..87a24e3 > --- /dev/null > +++ b/tests/fsitemxml2xmltest.c > @@ -0,0 +1,105 @@ > +#include <config.h> > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <unistd.h> > +#include <string.h> > + > +#include <sys/types.h> > +#include <fcntl.h> > + > +#include "internal.h" > +#include "testutils.h" > +#include "storage_conf.h" > +#include "testutilsqemu.h" > +#include "virstring.h" > + > +#define VIR_FROM_THIS VIR_FROM_NONE > + > +static int > +testCompareXMLToXMLFiles(const char *poolxml, const char *inxml, > + const char *outxml, unsigned int flags) > +{ > + char *actual = NULL; > + int ret = -1; > + virFSPoolDefPtr pool = NULL; > + virFSItemDefPtr dev = NULL; > + > + if (!(pool = virFSPoolDefParseFile(poolxml))) > + goto fail; > + > + if (!(dev = virFSItemDefParseFile(pool, inxml, flags))) > + goto fail; > + > + if (!(actual = virFSItemDefFormat(pool, dev))) > + goto fail; > + > + if (virTestCompareToFile(actual, outxml) < 0) > + goto fail; > + > + ret = 0; > + > + fail: > + VIR_FREE(actual); > + virFSPoolDefFree(pool); > + virFSItemDefFree(dev); > + return ret; > +} > + > +struct testInfo { > + const char *pool; > + const char *name; > + unsigned int flags; > +}; > + > +static int > +testCompareXMLToXMLHelper(const void *data) > +{ > + int result = -1; > + const struct testInfo *info = data; > + char *poolxml = NULL; > + char *inxml = NULL; > + char *outxml = NULL; > + > + if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", > + abs_srcdir, info->pool) < 0 || > + virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", > + abs_srcdir, info->name) < 0 || > + virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", > + abs_srcdir, info->name) < 0) { > + goto cleanup; > + } > + > + result = testCompareXMLToXMLFiles(poolxml, inxml, outxml, info->flags); > + > + cleanup: > + VIR_FREE(poolxml); > + VIR_FREE(inxml); > + VIR_FREE(outxml); > + > + return result; > +} > + > + > +static int > +mymain(void) > +{ > + int ret = 0; > + > +#define DO_TEST_FULL(pool, name, flags) \ > + do { \ > + struct testInfo info = { pool, name, flags }; \ > + if (virTestRun("FS Item XML-2-XML " name, \ > + testCompareXMLToXMLHelper, &info) < 0) \ > + ret = -1; \ > + } \ > + while (0); > + > +#define DO_TEST(pool, name) DO_TEST_FULL(pool, name, 0) > + > + DO_TEST("pool-dir", "vol-file"); > + > + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; > +} > + > +VIRT_TEST_MAIN(mymain) > diff --git a/tests/fspoolschemadata/dir-missing-target-path-invalid.xml b/tests/fspoolschemadata/dir-missing-target-path-invalid.xml > new file mode 100644 > index 0000000..a52bf49 > --- /dev/null > +++ b/tests/fspoolschemadata/dir-missing-target-path-invalid.xml > @@ -0,0 +1,12 @@ > +<fspool type='dir'> > + <name>test</name> > + <source> > + </source> > + <target> > + <permissions> > + <mode>0700</mode> > + <owner>-1</owner> > + <group>-1</group> > + </permissions> > + </target> > +</fspool> > diff --git a/tests/fspoolxml2xmlin/fspool-dir.xml b/tests/fspoolxml2xmlin/fspool-dir.xml > new file mode 100644 > index 0000000..a3a1639 > --- /dev/null > +++ b/tests/fspoolxml2xmlin/fspool-dir.xml > @@ -0,0 +1,17 @@ > +<fspool type='dir'> > + <name>virtfs</name> > + <uuid>5584ee21-db40-4e98-980e-44802c47b62f</uuid> > + <capacity unit='bytes'>0</capacity> > + <allocation unit='bytes'>0</allocation> > + <available unit='bytes'>0</available> > + <source> > + </source> > + <target> > + <path>///var/////lib/libvirt/fs//</path> > + <permissions> > + <mode>0700</mode> > + <owner>-1</owner> > + <group>-1</group> > + </permissions> > + </target> > +</fspool> > diff --git a/tests/fspoolxml2xmlout/fspool-dir.xml b/tests/fspoolxml2xmlout/fspool-dir.xml > new file mode 100644 > index 0000000..30aca89 > --- /dev/null > +++ b/tests/fspoolxml2xmlout/fspool-dir.xml > @@ -0,0 +1,17 @@ > +<fspool type='dir'> > + <name>virtfs</name> > + <uuid> 5584ee21-db40-4e98-980e-44802c47b62f</uuid> > + <capacity unit='bytes'>0</capacity> > + <allocation unit='bytes'>0</allocation> > + <available unit='bytes'>0</available> > + <source> > + </source> > + <target> > + <path>/var/lib/libvirt/fs</path> > + <permissions> > + <mode>0700</mode> > + <owner>-1</owner> > + <group>-1</group> > + </permissions> > + </target> > +</fspool> > diff --git a/tests/fspoolxml2xmltest.c b/tests/fspoolxml2xmltest.c > new file mode 100644 > index 0000000..b66e959 > --- /dev/null > +++ b/tests/fspoolxml2xmltest.c > @@ -0,0 +1,82 @@ > +#include <config.h> > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <unistd.h> > +#include <string.h> > + > +#include <sys/types.h> > +#include <fcntl.h> > + > +#include "internal.h" > +#include "testutils.h" > +#include "fs_conf.h" > +#include "testutilsqemu.h" > +#include "virstring.h" > + > +#define VIR_FROM_THIS VIR_FROM_NONE > + > +static int > +testCompareXMLToXMLFiles(const char *inxml, const char *outxml) > +{ > + char *actual = NULL; > + int ret = -1; > + virFSPoolDefPtr dev = NULL; > + > + if (!(dev = virFSPoolDefParseFile(inxml))) > + goto fail; > + > + if (!(actual = virFSPoolDefFormat(dev))) > + goto fail; > + > + if (virTestCompareToFile(actual, outxml) < 0) > + goto fail; > + > + ret = 0; > + > + fail: > + VIR_FREE(actual); > + virFSPoolDefFree(dev); > + return ret; > +} > + > +static int > +testCompareXMLToXMLHelper(const void *data) > +{ > + int result = -1; > + char *inxml = NULL; > + char *outxml = NULL; > + > + if (virAsprintf(&inxml, "%s/fspoolxml2xmlin/%s.xml", > + abs_srcdir, (const char*)data) < 0 || > + virAsprintf(&outxml, "%s/fspoolxml2xmlout/%s.xml", > + abs_srcdir, (const char*)data) < 0) { > + goto cleanup; > + } > + > + result = testCompareXMLToXMLFiles(inxml, outxml); > + > + cleanup: > + VIR_FREE(inxml); > + VIR_FREE(outxml); > + > + return result; > +} > + > +static int > +mymain(void) > +{ > + int ret = 0; > + > +#define DO_TEST(name) \ > + if (virTestRun("FS Pool XML-2-XML " name, \ > + testCompareXMLToXMLHelper, (name)) < 0) \ > + ret = -1 > + > + DO_TEST("pool-dir"); > +#endif > + > + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; > +} > + > +VIRT_TEST_MAIN(mymain)

1 0

[libvirt] [gnulib PATCH 0/2] Work around glibc 2.25 deprecation warnings
by Eric Blake 15 Sep '16

15 Sep '16

Fedora rawhide builds of libvirt.git at commit d53fa838^ failed due to the new glibc 2.25 deprecation warning for use of major() from just <sys/types.h>; I also found that the same warning is provoked by gnulib's mountlist module. Libvirt commit d53fa838 was a temporary hack to work around the problem, and I will be reverting that and updating to newer gnulib once this goes in. I've tested that libvirt on Fedora rawhide with d53fa838 reverted and gnulib updated to this commit was once again able to build. Comments welcome, particularly for my choice of wording in documentation changes. The final push will differ slightly from this, especially if the autoconf patch going in first changes slightly due to review there, but this should give a good idea of the fix. Eric Blake (2): mountlist: include sysmacros.h for glibc sys_types: avoid glibc 2.25 warnings about major() ChangeLog | 15 +++++++++++++++ doc/glibc-functions/gnu_dev_major.texi | 4 ++++ doc/glibc-functions/gnu_dev_makedev.texi | 4 ++++ doc/glibc-functions/gnu_dev_minor.texi | 4 ++++ doc/posix-headers/sys_types.texi | 6 ++++++ lib/mountlist.c | 6 ++++++ m4/mountlist.m4 | 3 ++- m4/sys_types_h.m4 | 27 ++++++++++++++++++++++++++- 8 files changed, 67 insertions(+), 2 deletions(-) -- 2.7.4

1 2

[libvirt] [PATCH] qemu_driver: pass path of compress prog directly
by Chen Hanxiao 15 Sep '16

15 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We check compress prog in qemuCompressProgramAvailable, then check it again in virExec. This path will pass compress prog's path directly. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_driver.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97e2ffc..9f4e593 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3037,6 +3037,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, const char *path, const char *domXML, int compressed, + const char *compressed_path, bool was_running, unsigned int flags, qemuDomainAsyncJob asyncJob) @@ -3084,7 +3085,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; /* Perform the migration */ - if (qemuMigrationToFile(driver, vm, fd, qemuCompressProgramName(compressed), + if (qemuMigrationToFile(driver, vm, fd, compressed_path, asyncJob) < 0) goto cleanup; @@ -3137,7 +3138,8 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, static int qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, virDomainObjPtr vm, const char *path, - int compressed, const char *xmlin, unsigned int flags) + int compressed, const char *compressed_path, + const char *xmlin, unsigned int flags) { char *xml = NULL; bool was_running = false; @@ -3209,7 +3211,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, goto endjob; } - ret = qemuDomainSaveMemory(driver, vm, path, xml, compressed, + ret = qemuDomainSaveMemory(driver, vm, path, xml, compressed, compressed_path, was_running, flags, QEMU_ASYNC_JOB_SAVE); if (ret < 0) goto endjob; @@ -3250,17 +3252,16 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, /* Returns true if a compression program is available in PATH */ static bool -qemuCompressProgramAvailable(virQEMUSaveFormat compress) +qemuCompressProgramAvailable(virQEMUSaveFormat compress, char **compressed_path) { - char *path; - - if (compress == QEMU_SAVE_FORMAT_RAW) + if (compress == QEMU_SAVE_FORMAT_RAW) { + *compressed_path = NULL; return true; + } - if (!(path = virFindFileInPath(qemuSaveCompressionTypeToString(compress)))) + if (!(*compressed_path = virFindFileInPath(qemuSaveCompressionTypeToString(compress)))) return false; - VIR_FREE(path); return true; } @@ -3270,6 +3271,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, { virQEMUDriverPtr driver = dom->conn->privateData; int compressed = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; int ret = -1; virDomainObjPtr vm = NULL; virQEMUDriverConfigPtr cfg = NULL; @@ -3287,7 +3289,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, "in configuration file")); goto cleanup; } - if (!qemuCompressProgramAvailable(compressed)) { + if (!qemuCompressProgramAvailable(compressed, &compressed_path)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); @@ -3308,11 +3310,12 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, } ret = qemuDomainSaveInternal(driver, dom, vm, path, compressed, - dxml, flags); + compressed_path, dxml, flags); cleanup: virDomainObjEndAPI(&vm); virObjectUnref(cfg); + VIR_FREE(compressed_path); return ret; } @@ -3343,6 +3346,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverConfigPtr cfg = NULL; int compressed = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; virDomainObjPtr vm; char *name = NULL; int ret = -1; @@ -3377,7 +3381,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) "in configuration file")); goto cleanup; } - if (!qemuCompressProgramAvailable(compressed)) { + if (!qemuCompressProgramAvailable(compressed, &compressed_path)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); @@ -3391,13 +3395,14 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state of domain '%s' to '%s'", vm->def->name, name); ret = qemuDomainSaveInternal(driver, dom, vm, name, - compressed, NULL, flags); + compressed, compressed_path, NULL, flags); if (ret == 0) vm->hasManagedSave = true; cleanup: virDomainObjEndAPI(&vm); VIR_FREE(name); + VIR_FREE(compressed_path); virObjectUnref(cfg); return ret; @@ -3617,6 +3622,7 @@ static virQEMUSaveFormat getCompressionType(virQEMUDriverPtr driver) { int ret = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); /* @@ -3634,7 +3640,7 @@ getCompressionType(virQEMUDriverPtr driver) ret = QEMU_SAVE_FORMAT_RAW; goto cleanup; } - if (!qemuCompressProgramAvailable(ret)) { + if (!qemuCompressProgramAvailable(ret, &compressed_path)) { VIR_WARN("%s", _("Compression program for dump image format " "in configuration file isn't available, " "using raw")); @@ -3644,6 +3650,7 @@ getCompressionType(virQEMUDriverPtr driver) } cleanup: virObjectUnref(cfg); + VIR_FREE(compressed_path); return ret; } @@ -14308,6 +14315,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. @@ -14377,7 +14385,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, goto cleanup; } - if (!qemuCompressProgramAvailable(compressed)) { + if (!qemuCompressProgramAvailable(compressed, &compressed_path)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); @@ -14389,7 +14397,8 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, goto cleanup; if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, - xml, compressed, resume, 0, + xml, compressed, compressed_path, + resume, 0, QEMU_ASYNC_JOB_SNAPSHOT)) < 0) goto cleanup; @@ -14459,6 +14468,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, } VIR_FREE(xml); + VIR_FREE(compressed_path); virObjectUnref(cfg); if (memory_unlink && ret < 0) unlink(snap->def->file); -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] Introduce basic virt-admin-self-test
by Michal Privoznik 14 Sep '16

14 Sep '16

I've realized we do no testing of virt-admin yet while reviewing Erik's patches. Michal Privoznik (2): virsh: Move cmdSelfTest to vsh tests: Self test virt-admin .gitignore | 1 + tests/Makefile.am | 1 + tests/virsh-self-test | 21 ++++++++++++++++----- tests/virt-admin-self-test | 1 + tools/virsh.c | 45 +-------------------------------------------- tools/virt-admin.c | 1 + tools/vsh.c | 38 ++++++++++++++++++++++++++++++++++++++ tools/vsh.h | 11 +++++++++++ 8 files changed, 70 insertions(+), 49 deletions(-) create mode 120000 tests/virt-admin-self-test -- 2.8.4

2 7

[libvirt] [libvirt-perl PATCH 0/2] Updates to support recent upstream changes
by John Ferlan 14 Sep '16

14 Sep '16

Couple of patches to allow build/test to work with upstream top John Ferlan (2): Add support for VIR_SECRET_USAGE_TYPE_TLS Add support for ERR_AGENT_UNSYNCED Changes | 2 ++ Virt.xs | 2 ++ lib/Sys/Virt/Error.pm | 4 ++++ lib/Sys/Virt/Secret.pm | 7 +++++++ 4 files changed, 15 insertions(+) -- 2.7.4

2 4

[libvirt] [PATCH 0/2] Report block jobs more wisely
by Michal Privoznik 14 Sep '16

14 Sep '16

There's been a discussion recently (even here on the list [1]) that Nova is sometimes unable to fetch block job stats properly. Basically, we may report job.cur == job.end == 0 in some cases tricking Nova into thinking job is done when in fact it hasn't even started yet. Michal Privoznik (2): qemuDomainGetBlockJobInfo: Move info translation into separate func virDomainGetBlockJobInfo: Fix corner case when qemu reports no info src/libvirt-domain.c | 7 ++++++ src/qemu/qemu_driver.c | 58 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 16 deletions(-) -- 2.8.4

4 11

[libvirt] [PATCH 0/4] Fix incorrect vcpu data refresh on daemon restart after vcpu hotplug
by Peter Krempa 14 Sep '16

14 Sep '16

See patches 3 and 4 for explanation. Peter Krempa (4): qemu: monitor: Use a more obvious iterator name qemu: monitor: qemuMonitorGetCPUInfoHotplug: Add iterator 'anycpu' qemu: monitor: Add vcpu state information to monitor data qemu: domain: Don't infer vcpu state src/qemu/qemu_domain.c | 14 +++--- src/qemu/qemu_monitor.c | 51 ++++++++++++++-------- src/qemu/qemu_monitor.h | 4 ++ .../qemumonitorjson-cpuinfo-ppc64-basic.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-hotplug-1.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-hotplug-2.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-hotplug-4.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-no-threads.data | 32 ++++++++++++++ ...emumonitorjson-cpuinfo-x86-basic-pluggable.data | 16 +++++++ .../qemumonitorjson-cpuinfo-x86-full.data | 22 ++++++++++ tests/qemumonitorjsontest.c | 3 ++ 11 files changed, 306 insertions(+), 28 deletions(-) -- 2.10.0

3 11

[libvirt] [PATCH v2 0/3] Introduce aliases for virt-admin's srv-* commands
by Erik Skultety 14 Sep '16

14 Sep '16

the original version: https://www.redhat.com/archives/libvir-list/2016-September/msg00312.html since v1: - tweaked the virsh-self-test so that it also checks the aliased commands instead of skipping them (since there was a good reason for that before the changes this series introduces) - patches 2-3 remained untouched Erik Skultety (3): virt-admin: Tweak command parsing logic so that aliases point to new commands virt-admin: Add some command aliases to provide syntax sugar over ugly commands virt-admin: Replace the (now) aliases with new command names in the man page tools/virsh-nodedev.c | 6 ++---- tools/virsh.c | 10 ++++++---- tools/virsh.pod | 2 -- tools/virt-admin.c | 24 ++++++++++++++++++++++++ tools/virt-admin.pod | 30 +++++++++++++++--------------- tools/vsh.c | 6 ++++++ tools/vsh.h | 1 + 7 files changed, 54 insertions(+), 25 deletions(-) -- 2.5.5

1 4

[libvirt] [PATCH 0/2] Fix vcpu hotplug with memoryless NUMA nodes
by Peter Krempa 14 Sep '16

14 Sep '16

See patch 2. Peter Krempa (2): util: numa: Remove impossible error handling numa: Rename virNumaGetHostNodeset and make it return only nodes with memory src/libvirt_private.syms | 2 +- src/qemu/qemu_cgroup.c | 4 ++-- src/util/virnuma.c | 18 +++++++++++------- src/util/virnuma.h | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) -- 2.10.0

2 3

Re: [libvirt] AC_HEADER_MAJOR vs. glibc 2.25(-to-be)
by Eric Blake 14 Sep '16

14 Sep '16

[adding libvirt list, as this is what sparked my investigations so far today] On 09/13/2016 04:36 PM, Eric Blake wrote: > One other possibility that distros can do is to prime a config.site > file, with $ac_cv_header_sys_types_h_makedev=no, to forcefully bypass > the configure check that is normally done where <sys/types.h> would > warn. It has to be in config.site, because non-glibc systems do not > want to do that. Okay, I have confirmed that this prime-the-cache idea DOES work, using libvirt.git commit 419bc8cf (one commit prior to d53fa838 which installed a hack into libvirt to force the use of -Werror for the duration of AC_HEADER_MAJOR [1]). By itself, './configure' succeeds but leaves MAJOR_IN_SYSMACROS undefined, which results in a build failure later in libvirt; but when run as './configure ac_cv_header_sys_types_h_makedev=no', MAJOR_IN_SYSMACROS gets defined and the build succeeds. I want to remove the libvirt hack (not all compilers understand -Werror, even if libvirt is only ever built by gcc or clang), and my experiment was enough to prove that: 1. distros that provide a config.site file can use this file to avoid the problem, even for packages that have not yet rebuilt with a new-enough autoconf to fix the issue 2. autoconf and gnulib should indeed be fixed to probe for <sys/sysmacros.h> _prior_ to probing for whether makedev() exists in <sys/type.h>, rather than the 2.69 logic of only checking for <sys/sysmacros.h> if makedev() was not found earlier. Of course, the libvirt hack should not be reverted until autoconf and gnulib have the final solution in place. > > Meanwhile, even without an autoconf release scheduled, I am currently > working on patching the existing autoconf macro and documentation to > match the current situation. It sounds to me like we want the following > logic: > > If <sys/sysmacros.h> exists and defines major(), use that, > else if <sys/mkdev.h> exists, use that, > else if <sys/types.h> defines major(), use that, > else not available The current autoconf code assumes that if <sys/sysmacros.h> exists, then it defines major()/minor()/makedev(); I think that assumption is still safe. Where autoconf was wrong was that it was not even probing for the existence of <sys/sysmacros.h> if it found that <sys/types.h> was enough to pollute the namespace with the three macros. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] [PATCH] storage_backend_rbd: continue searching when failing in rbd_diff_iterate
by Chen Hanxiao 13 Sep '16

13 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We try to find a snapshot that had no different between the current state of RBD image. If we failed in rbd_diff_iterate, just continue for the next search iteration. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4dd4b24..2756c83 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -831,9 +831,10 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image, #endif if (r < 0) { - virReportSystemError(-r, _("failed to iterate RBD snapshot %s@%s"), - imgname, snaps[i].name); - goto cleanup; + VIR_DEBUG("failed to iterate RBD snapshot %s@%s," + " rbd_diff return %d", + imgname, snaps[i].name, r); + continue; } /* If diff is still set to zero we found a snapshot without deltas */ -- 1.8.3.1

2 2

[libvirt] [PATCH 0/4] Introduce aliases for virt-admin's srv-* commands
by Erik Skultety 13 Sep '16

13 Sep '16

So, as suggested by Martin in [1], this series tweaks the command alias handling logic, so that when creating alias, it is not necessary to duplicate the original command's structure, thus creating a bit more noise. Instead, the new format for an alias structure hints very clearly that it's just an alias for a different command, while linking the alias with the original command's data by using new element '.alias'. [1] https://www.redhat.com/archives/libvir-list/2016-September/msg00129.html Erik Skultety (4): tests: fix incorrect status handling by virsh-self-test virt-admin: Tweak command parsing logic so that aliases point to new commands virt-admin: Add some command aliases to provide syntax sugar over ugly commands virt-admin: Replace the (now) aliases with new command names in the man page tests/virsh-self-test | 2 +- tools/virsh-nodedev.c | 6 ++---- tools/virsh.c | 3 ++- tools/virt-admin.c | 24 ++++++++++++++++++++++++ tools/virt-admin.pod | 30 +++++++++++++++--------------- tools/vsh.c | 6 ++++++ tools/vsh.h | 1 + 7 files changed, 51 insertions(+), 21 deletions(-) -- 2.5.5

2 9

[libvirt] [PATCH] configure: Check for major() more strictly
by Michal Privoznik 13 Sep '16

13 Sep '16

Thing is, in f3f15cc24 I'm trying to adapt libvirt to the newest glibc where major()/minor()/makedev() are moved from sys/types.h to sys/sysmacros.h. However, my commit back then expect autoconf to be fixed too as we already use AC_HEADER_MAJOR to determine which header file the functions are in, but because the header files just trigger a warning and not a compile error, the autoconf macro detects the bad header file. This is just a workaround until autoconf macro is fixed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index f6076bd..f322c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -144,7 +144,10 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL +old_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -Werror" AC_HEADER_MAJOR +CFLAGS=$old_CFLAGS m4_ifndef([LT_INIT], [ AM_PROG_LIBTOOL -- 2.8.4

2 1

[libvirt] qemu: migration: shall we abort migration while the guest is rebooting？
by Zhangbo (Oscar) 13 Sep '16

13 Sep '16

Hi all: Here's the steps we produce the problem: 1 reboot guest with the flag of VIR_DOMAIN_REBOOT_ACPI_POWER_BTN 2 sleep 1 second (so that the guest is still rebooting, although the API already returned.) 3 migrate the guest The problem is that : the guest failed to migrate to the dest, and crashed on source side. We don't bother to dig further into the problem, the root cause we think is that we migrate a guest while it's rebooting. So, shall we 1 make the reboot JOB LOCK longer enough until the guest has already rebooted(got monitor message from qemu)? 2 let openstack do the mutex work ? (has openstack already done this?) (I checked openstack codes, and found that openstack uses shutdown and create APIs rather than REBOOT to do the reboot work. So it seems that openstack doesn't take care of this problem nowadays. Am I right? --- see: nova/virt/libvirt/driver.py: _soft_reboot) Thanks in advance. Zhang Bo (Oscar)

2 4

[libvirt] [PATCH] qemu: Add missing 'p' to qemuCgrouEmulatorAllNodesRestore
by Peter Krempa 13 Sep '16

13 Sep '16

--- Pushed as trivial. src/qemu/qemu_cgroup.c | 6 +++--- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e2b5bab..fe94613 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1149,7 +1149,7 @@ qemuCgroupEmulatorAllNodesDataFree(qemuCgroupEmulatorAllNodesDataPtr data) * Allows all NUMA nodes for the qemu emulator thread temporarily. This is * necessary when hotplugging cpus since it requires memory allocated in the * DMA region. Afterwards the operation can be reverted by - * qemuCgrouEmulatorAllNodesRestore. + * qemuCgroupEmulatorAllNodesRestore. * * Returns 0 on success -1 on error */ @@ -1196,14 +1196,14 @@ qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, /** - * qemuCgrouEmulatorAllNodesRestore: + * qemuCgroupEmulatorAllNodesRestore: * @data: data structure created by qemuCgroupEmulatorAllNodesAllow * * Rolls back the setting done by qemuCgroupEmulatorAllNodesAllow and frees the * associated data. */ void -qemuCgrouEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data) +qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data) { virErrorPtr err; diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index e6ebae0..623823e 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -66,6 +66,6 @@ struct _qemuCgroupEmulatorAllNodesData { int qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, qemuCgroupEmulatorAllNodesDataPtr *data); -void qemuCgrouEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data); +void qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data); #endif /* __QEMU_CGROUP_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 12b84c4..dda82d3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4891,7 +4891,7 @@ qemuDomainSetVcpusLive(virQEMUDriverPtr driver, ret = 0; cleanup: - qemuCgrouEmulatorAllNodesRestore(emulatorCgroup); + qemuCgroupEmulatorAllNodesRestore(emulatorCgroup); virBitmapFree(vcpumap); return ret; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7596579..cecd321 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4925,7 +4925,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr driver, ret = 0; cleanup: - qemuCgrouEmulatorAllNodesRestore(emulatorCgroup); + qemuCgroupEmulatorAllNodesRestore(emulatorCgroup); VIR_FREE(bootHotplug); virJSONValueFree(vcpuprops); return ret; -- 2.10.0

1 0

[libvirt] [PATCH] Make sure sys/types.h is included after sys/sysmacros.h
by Michal Privoznik 13 Sep '16

13 Sep '16

In the latest glibc, major() and minor() functions are marked as deprecated (glibc commit dbab6577): CC util/libvirt_util_la-vircgroup.lo util/vircgroup.c: In function 'virCgroupGetBlockDevString': util/vircgroup.c:768:5: error: '__major_from_sys_types' is deprecated: In the GNU C Library, `major' is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use `major', include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro `major', you should #undef it after including <sys/types.h>. [-Werror=deprecated-declarations] if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) ^~ In file included from /usr/include/features.h:397:0, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:28, from ../gnulib/lib/stdio.h:43, from util/vircgroup.c:26: /usr/include/sys/sysmacros.h:87:1: note: declared here __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_FST_IMPL_TEMPL) ^ Moreover, in the glibc commit, there's suggestion to keep ordering of including of header files as implemented here. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This still won't solve the build issue completely as AC_HEADER_MAJOR still reports that major() is defined by sys/types.h instead of sys/sysmacros.h. But once they fix it, we are good too. Or we can use the following workaround in configure.ac: +old_CFLAGS=$CFLAGS +CFLAGS+=" -Werror " AC_HEADER_MAJOR +CFLAGS=$old_CFLAGS src/conf/domain_audit.c | 3 ++- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/util/vircgroup.c | 2 +- src/util/virutil.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac..52dea02 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -24,7 +24,6 @@ #include <config.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -32,6 +31,8 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> + #include "domain_audit.h" #include "viraudit.h" #include "viruuid.h" diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 825b4d4..8c581df 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -27,7 +27,6 @@ #include <sys/epoll.h> #include <sys/wait.h> #include <sys/socket.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -35,6 +34,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <sys/un.h> #include <sys/personality.h> #include <unistd.h> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index da98b38..24025d1 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -28,7 +28,6 @@ #include <sched.h> #include <sys/utsname.h> #include <string.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -36,6 +35,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f2477d5..8b52816 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -34,7 +34,6 @@ #include <errno.h> #include <stdlib.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -42,6 +41,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <signal.h> #include <dirent.h> #include <unistd.h> diff --git a/src/util/virutil.c b/src/util/virutil.c index 170dd59..b57a195 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -35,7 +35,6 @@ #include <errno.h> #include <poll.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -43,6 +42,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <sys/ioctl.h> #include <string.h> #include <termios.h> -- 2.8.4

3 5

[libvirt] [PATCH 0/3] qemu: fix startup of NUMA pinned VM with hotpluggable vcpus
by Peter Krempa 13 Sep '16

13 Sep '16

See patch 2 for explanation. Peter Krempa (3): qemu: cgroup: Extract temporary relaxing of cgroup setting for vcpu hotplug qemu: process: Fix start with unpluggable vcpus with NUMA pinning qemu: driver: Remove unnecessary condition src/qemu/qemu_cgroup.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_cgroup.h | 11 ++++++ src/qemu/qemu_driver.c | 38 +++------------------ src/qemu/qemu_process.c | 6 ++++ 4 files changed, 112 insertions(+), 33 deletions(-) -- 2.10.0

3 5

[libvirt] [PATCH 0/3] add option to keep nvram file on undefine
by Nikolay Shirokovskiy 13 Sep '16

13 Sep '16

There is already a patch [1] on this topic with a different approach - keep nvram file by default. There is also some discussion there. To sum up keeping nvram on undefine could be useful in some usecases so there should be an option to do it. On the other hand there is a danger of leaving domain assets after its undefine and unsing them unintentionally on defining domain with the same name. AFAIU keeping nvram by default was motivated by domain disks behaviour. I think there is a difference as libvirt never create disks for domain as opposed to nvram and managed save and without disks domain will not start so user is quite aware of disks files. On the other hand one can start using nvram file solely putting <nvram> in config and managed save is created on daemon shutdown. So user is much less aware of nvram and managed save existence. Thus one can easily mess up by unaware define $name/using/undefine/define $name again usecase. Thus I vote for keeping said assets only if it is specified explicitly so user knows what he is doing. Adding option to undefine is best solution I come up with. The other options are add checks on define or start and both are impossible. Such a check should be done without any extra flags for it to be useful but this way we break existing users. As this a proof of concept this series does not add extra flag for managed save. [1] https://www.redhat.com/archives/libvir-list/2015-February/msg00915.html Nikolay Shirokovskiy (3): api: add VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag qemu: add VIR_DOMAIN_UNDEFINE_KEEP_NVRAM support virsh: add --keep-nvram option to undefine command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 26 +++++++++++++++++--------- tools/virsh-domain.c | 8 ++++++++ tools/virsh.pod | 6 +++--- 4 files changed, 29 insertions(+), 12 deletions(-) -- 1.8.3.1

5 10

[libvirt] [PATCH] conf: allow hotplugging "legacy PCI" device to manually addressed PCIe slot
by Laine Stump 12 Sep '16

12 Sep '16

In a full domain config, libvirt allows overriding the normal PCI vs. PCI Express rules when a device address is explicitly provided (so, e.g., you can force a legacy PCI device to plug into a PCIe port, although libvirt would never do that on its own). However, due to a bug libvirt doesn't give this same leeway when hotplugging devices. On top of that, current libvirt assumes that *all* devices are legacy PCI. The result of all this is that it's impossible to hotplug a device into a PCIe port, even if you manually add the PCI address. This can all be traced to the function virDomainPCIAddressEnsureAddr(), and the fact that it calls virDomainPCIaddressReserveSlot() for manually set addresses, and that function hardcodes the argument "fromConfig" to false (meaning "this address was auto-assigned, so it should be subject to stricter validation"). Since virDomainPCIAddressReserveSlot() is just a one line simple wrapper around virDomainPCIAddressReserveAddr() (adding in a hardcoded reserveEntireSlot = true and fromConfig = false), all that's needed to solve the problem with no unwanted side effects is to replace that call for virDomainPCIAddressReserveSlot() with a direct call to virDomainPCIAddressReserveAddr(), but with reserveEntireSlot = true, fromConfig = true. That's what this patch does. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1337490 --- src/conf/domain_addr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 79c024f..93026c2 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -507,7 +507,8 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, addrStr, flags, true)) goto cleanup; - ret = virDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci, flags, + true, true); } else { ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags); } -- 2.7.4

2 2

[libvirt] [PATCH] audit: Audit information about shmem devices
by Martin Kletzander 12 Sep '16

12 Sep '16

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1218603 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/auditlog.html.in | 19 +++++++++++++++++++ src/conf/domain_audit.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_audit.h | 4 ++++ src/libvirt_private.syms | 1 + 4 files changed, 67 insertions(+) diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index 012d0680a87b..7348948feb7a 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -352,5 +352,24 @@ <dd>The name of the cgroup controller</dd> </dl> + + <h4><a name="typeresourceshmem">console/serial/parallel/channel</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt><code>resrc</code></dt> + <dd>The type of resource assigned. Set to <code>shmem</code></dd> + <dt><code>reason</code></dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt><code>size</code></dt> + <dd>The size of the shared memory region</dd> + <dt><code>shmem</code></dt> + <dd>Name of the shared memory region</dd> + <dt><code>source</code></dt> + <dd>Path of the backing character device for given emulated device</dd> + </dl> + </body> </html> diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac4c88c..cf9c03dee749 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -889,6 +889,9 @@ virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool success) if (vm->def->tpm) virDomainAuditTPM(vm, vm->def->tpm, "start", true); + for (i = 0; i < vm->def->nshmems; i++) + virDomainAuditShmem(vm, vm->def->shmems[i], "start", true); + virDomainAuditMemory(vm, 0, virDomainDefGetMemoryTotal(vm->def), "start", true); virDomainAuditVcpu(vm, 0, virDomainDefGetVcpus(vm->def), "start", true); @@ -963,3 +966,43 @@ virDomainAuditSecurityLabel(virDomainObjPtr vm, bool success) VIR_FREE(vmname); } + +void +virDomainAuditShmem(virDomainObjPtr vm, + virDomainShmemDefPtr def, + const char *reason, bool success) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + char *vmname = virAuditEncode("vm", vm->def->name); + const char *srcpath = virDomainAuditChardevPath(&def->server.chr); + char *src = virAuditEncode("server", VIR_AUDIT_STR(srcpath)); + char *shmem = virAuditEncode("shmem", VIR_AUDIT_STR(def->name)); + const char *virt = virDomainVirtTypeToString(vm->def->virtType); + char *size = NULL; + + ignore_value(virAsprintfQuiet(&size, "%llu", def->size)); + virUUIDFormat(vm->def->uuid, uuidstr); + if (!vmname || !src || !size || !shmem || !size) + goto no_memory; + + if (!virt) { + VIR_WARN("Unexpected virt type %d while encoding audit message", + vm->def->virtType); + virt = "?"; + } + + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=%s resrc=shmem reason=%s %s uuid=%s size=%s %s %s", + virt, reason, vmname, uuidstr, size ?: "?", shmem, src); + + cleanup: + VIR_FREE(vmname); + VIR_FREE(src); + VIR_FREE(size); + VIR_FREE(shmem); + return; + + no_memory: + VIR_WARN("OOM while encoding audit message"); + goto cleanup; +} diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index 97dadca5aae7..8cb585dc7d96 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -129,6 +129,10 @@ void virDomainAuditRNG(virDomainObjPtr vm, const char *reason, bool success) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); +void virDomainAuditShmem(virDomainObjPtr vm, + virDomainShmemDefPtr def, + const char *reason, bool success) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); #endif /* __VIR_DOMAIN_AUDIT_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a5fa30562f0c..1555f60ffda4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -146,6 +146,7 @@ virDomainAuditNetDevice; virDomainAuditRedirdev; virDomainAuditRNG; virDomainAuditSecurityLabel; +virDomainAuditShmem; virDomainAuditStart; virDomainAuditStop; virDomainAuditVcpu; -- 2.10.0

2 2

[libvirt] [PATCH] qemu: fix improper initialization of cgroupControllers bitmap
by Laine Stump 12 Sep '16

12 Sep '16

virQEMUDriverConfigNew() always initializes the bitmap in its cgroupControllers member to -1 (i.e. all 1's). Prior to commit a9331394, if qemu.conf had a line with "cgroup_controllers", cgroupControllers would get reset to 0 before going through a loop setting a bit for each named cgroup controller. commit a9331394 left out the "reset to 0" part, so cgroupControllers would always be -1; if you didn't want a controller included, there was no longer a way to make that happen. This was discovered by users who were using qemu commandline passthrough to use the "input-linux" method of directing keyboard/mouse input to a virtual machine: https://www.redhat.com/archives/vfio-users/2016-April/msg00105.html Here's the first report I found of the problem encountered after upgrading libvirt beyond v2.0.0: https://www.redhat.com/archives/vfio-users/2016-August/msg00053.html Thanks to sL1pKn07 SpinFlo <sl1pkn07(a)gmail.com> for bringing the problem up in IRC, and then taking the time to do a git bisect and find the patch that started the problem. --- src/qemu/qemu_conf.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e7b2d8d..dad8334 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -613,15 +613,18 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, &controllers) < 0) goto cleanup; - for (i = 0; controllers != NULL && controllers[i] != NULL; i++) { - int ctl; - if ((ctl = virCgroupControllerTypeFromString(controllers[i])) < 0) { - virReportError(VIR_ERR_CONF_SYNTAX, - _("Unknown cgroup controller '%s'"), - controllers[i]); - goto cleanup; + if (controllers) { + cfg-> cgroupControllers = 0; + for (i = 0; controllers[i] != NULL; i++) { + int ctl; + if ((ctl = virCgroupControllerTypeFromString(controllers[i])) < 0) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("Unknown cgroup controller '%s'"), + controllers[i]); + goto cleanup; + } + cfg->cgroupControllers |= (1 << ctl); } - cfg->cgroupControllers |= (1 << ctl); } if (virConfGetValueStringList(conf, "cgroup_device_acl", false, -- 2.7.4

2 1

[libvirt] [PATCH] qemu: avoid parameter named 'listen'
by Daniel P. Berrange 12 Sep '16

12 Sep '16

previous commit: commit 2c3223785c121eafbdd503f11549d7964461934f Author: John Ferlan <jferlan(a)redhat.com> Date: Mon Jun 13 12:30:34 2016 -0400 qemu: Add the ability to hotplug the TLS X.509 environment added a parameter "bool listen" in some methods. This unfortunately clashes with the listen() method, causing compile failures on certain platforms (RHEL-6 for example) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a CI build fix src/qemu/qemu_command.c | 8 ++++---- src/qemu/qemu_command.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e0b0401..3a61863 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -692,7 +692,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, */ int qemuBuildTLSx509BackendProps(const char *tlspath, - bool listen, + bool isListen, bool verifypeer, virQEMUCapsPtr qemuCaps, virJSONValuePtr *propsret) @@ -714,7 +714,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, if (virJSONValueObjectCreate(propsret, "s:dir", path, - "s:endpoint", (listen ? "server": "client"), + "s:endpoint", (isListen ? "server": "client"), "b:verify-peer", verifypeer, NULL) < 0) goto cleanup; @@ -743,7 +743,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, static int qemuBuildTLSx509CommandLine(virCommandPtr cmd, const char *tlspath, - bool listen, + bool isListen, bool verifypeer, const char *inalias, virQEMUCapsPtr qemuCaps) @@ -753,7 +753,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, virJSONValuePtr props = NULL; char *tmp = NULL; - if (qemuBuildTLSx509BackendProps(tlspath, listen, verifypeer, + if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, qemuCaps, &props) < 0) return -1; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b7c59bb..0c0b8f1 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -67,7 +67,7 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo, /* Generate the object properties for a tls-creds-x509 */ int qemuBuildTLSx509BackendProps(const char *tlspath, - bool listen, + bool isListen, bool verifypeer, virQEMUCapsPtr qemuCaps, virJSONValuePtr *propsret); -- 2.7.4

1 0

[libvirt] [PATCH] log: fix false oom error message
by Nikolay Shirokovskiy 12 Sep '16

12 Sep '16

In case filter is new one an oom error message is reported. This bug is introduced in 51b2606f. However this error does not get into the log in the default configuration. To trigger it one need to specify log outputs in LIBVIRT_LOG_OUTPUTS variable. --- src/util/virlog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 06f9a60..f5b88b6 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -335,11 +335,12 @@ virLogDefineFilter(const char *match, goto cleanup; virLogFiltersSerial++; + ret = virLogNbFilters - 1; cleanup: virLogUnlock(); if (ret < 0) virReportOOMError(); - return virLogNbFilters; + return ret; } /** -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: Don't use query-migrate on destination
by Jiri Denemark 12 Sep '16

12 Sep '16

When migration fails, we need to poke QEMU monitor to check for a reason of the failure. We did this using query-migrate QMP command, which is not supposed to return any meaningful result on the destination side. Thus if the monitor was still functional when we detected the migration failure, parsing the answer from query-migrate always failed with the following error message: "info migration reply was missing return status" This irrelevant message was then used as the reason for the migration failure replacing any message we might have had. Let's use harmless query-status for poking the monitor to make sure we only get an error if the monitor connection is broken. https://bugzilla.redhat.com/show_bug.cgi?id=1374613 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 20 ++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_migration.c | 6 +----- src/qemu/qemu_monitor.c | 8 ++++++++ src/qemu/qemu_monitor.h | 1 + 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fd79390..fb766d0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6127,3 +6127,23 @@ qemuDomainVcpuPersistOrder(virDomainDefPtr def) } } } + + +int +qemuDomainCheckMonitor(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + int ret; + + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + + ret = qemuMonitorCheck(priv->mon); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + return -1; + + return ret; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 13c0372..a1404d0 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -728,4 +728,8 @@ bool qemuDomainVcpuHotplugIsInOrder(virDomainDefPtr def) void qemuDomainVcpuPersistOrder(virDomainDefPtr def) ATTRIBUTE_NONNULL(1); +int qemuDomainCheckMonitor(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob); + #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 07f18db..e734816 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6208,14 +6208,10 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (retcode != 0) { - qemuDomainJobInfo info; - /* Check for a possible error on the monitor in case Finish was called * earlier than monitor EOF handler got a chance to process the error */ - qemuMigrationFetchJobStatus(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_IN, - &info); + qemuDomainCheckMonitor(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN); goto endjob; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4171914..1fdee3a 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1617,6 +1617,14 @@ qemuMonitorStopCPUs(qemuMonitorPtr mon) int +qemuMonitorCheck(qemuMonitorPtr mon) +{ + bool running; + return qemuMonitorGetStatus(mon, &running, NULL); +} + + +int qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running, virDomainPausedReason *reason) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b838725..255fff2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -382,6 +382,7 @@ typedef enum { VIR_ENUM_DECL(qemuMonitorVMStatus) int qemuMonitorVMStatusToPausedReason(const char *status); +int qemuMonitorCheck(qemuMonitorPtr mon); int qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running, virDomainPausedReason *reason) -- 2.10.0

2 1

[libvirt] [PATCH 0/2] A couple of volume encryption patches
by John Ferlan 12 Sep '16

12 Sep '16

I'm assume there will be a couple of bz's on these... Patch 1 fixes a problem where the vol-dumpxml would not list the <secret> element from a volume in a pool after the initial creation and a pool refresh (or libvirtd restart). This issue was missed due to rewriting the LUKS support to not use it's own "new" secret type (key), but rather use the existing "volume" secret type. Patch 2 fixes a problem where QCOW2 (or QCOW1) encrypted volume would lose the <encryption> and <secret> after a volume refresh. Details are in the patch. The issue is rooted in proper detection of the volume type during the virStorageFileGetMetadataFromBuf call. John Ferlan (2): storage: Need to refresh secret for luks volume after volume refresh storage: Need to properly read the crypt offset value src/storage/storage_backend_fs.c | 16 ++++++++++------ src/util/virstoragefile.c | 7 +++++-- 2 files changed, 15 insertions(+), 8 deletions(-) -- 2.7.4

2 3

[libvirt] [PATCH 0/2] try harder to get dest qemu errors on migation
by Nikolay Shirokovskiy 12 Sep '16

12 Sep '16

Hi, all. In case migration fails due to destination qemu exits unexpectedly user recevies the qemu log in the error message. Unfortunately log is truncated and the most interesting part is missed (below is the example of such a log [1]). Actually for the most cases the first patch will be enough to fix the issue. Originally I thought the problem is qemu logging and reading the log are not in sync (which is true) so I tried to fix it as well in the second patch. [1] log example: CPU Reset (CPU 0) EAX=00000000 EBX=00000000 ECX=00000000 EDX=00000000 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00000000 EIP=00000000 EFL=00000000 [-------] CPL=0 II=0 A20=0 SMM=0 HLT=0 ES =0000 00000000 00000000 00000000 CS =0000 00000000 00000000 00000000 SS =0000 00000000 00000000 00000000 DS =0000 00000000 00000000 00000000 FS =0000 00000000 00000000 00000000 GS =0000 00000000 00000000 00000000 LDT=0000 00000000 00000000 00000000 TR =0000 00000000 00000000 00000000 GDT= 00000000 00000000 IDT= 00000000 00000000 CR0=00000000 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=0000000000000000 DR7=0000000000000000 CCS=00000000 CCD=00000000 CCO=DYNAMIC EFER=0000000000000000 FCW=0000 FSW=0000 [ST=0] FTW=ff MXCSR=00000000 FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 XMM06=00000000000000000000000000000000 XMM07=00000000000000000000000000000000 CPU Reset (CPU 1) EAX=00000000 EBX=00000000 ECX=00000000 EDX=000206a1 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00000000 EIP=0000fff0 EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =0000 00000000 0000ffff 00009300 CS =f000 ffff0000 0000ffff 00009b00 SS =0000 00000000 0000ffff 00009300 DS =0000 00000000 0000ffff 00009300 FS =0000 00000000 0000ffff 00009300 GS =0000 00000000 0000ffff 00009300 LDT=0000 00000000 0000ffff 00008200 TR =0000 00000000 0000ffff 00008b00 GDT= 00000000 0000ffff IDT= 00000000 0000ffff CR0=60000010 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=00000000ffff0ff0 DR7=0000000000000400 CCS=00000000 CCD=00000000 CCO=DYNAMIC EFER=0000000000000000 FCW=037f FSW=0000 [ST=0] FTW=00 MXCSR=00001f80 FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 XMM06=00000000000000000000000000000000 XMM07=000 qemu: terminating on signal 15 from pid 168133 Nikolay Shirokovskiy (2): log: remove 1k limit for error messages log: drain log of exiting qemu process carefully src/logging/log_handler.c | 39 +++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_domain.c | 4 ++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 2 ++ src/util/virerror.c | 9 ++++----- 5 files changed, 48 insertions(+), 7 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH v6 0/5] Add native TLS encrypted chardev TCP support
by John Ferlan 12 Sep '16

12 Sep '16

v5: http://www.redhat.com/archives/libvir-list/2016-August/msg00282.html Patches 1-5 from that series already pushed Patch 6 from that series is removed Patch 7 is untouched and is patch 3 in this series Patches 8-9 modified for new paradigm (patches 4-5 of this series) Patch 1 [NEW] From patch 6 review comment - provide a way to allow disabling the TLS for a specific guest and serial TCP chardev. A new test was added which shows that the xml2argv output does not add the TLS object within the same "frame" as the test that would add it. Patch 2 [NEW] Rather than use a <secret> object for the serial TCP chardev, create a qemu.conf option as a host wide setting. The patch implements a 'chardev_tls_x509_secret_uuid' value which will be used by patches 4-5 rather than the serial TCP specific setting. Patch 3 is unchanged Patches 4-5 were adjusted in order to use the chardevTCPtlsx509secretUUID rather than the chardev TCP specific 'chardev->source.data.tcp.seclookupdef' value sourced from a <secret>. John Ferlan (5): domain: Add optional 'disableTLS' attribute for TCP chardev conf: Introduce {default|chardev}_tls_x509_secret_uuid qemu: Introduce qemuDomainChardevPrivatePtr qemu: Add a secret object to/for a chardev tcp with secret qemu: Add the ability to hotplug a secret object for TCP chardev TLS docs/formatdomain.html.in | 20 +++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 51 ++++++-- src/conf/domain_conf.h | 5 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 24 ++++ src/qemu/qemu_command.c | 34 ++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_conf.c | 22 ++++ src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 143 ++++++++++++++++++++- src/qemu/qemu_domain.h | 30 ++++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 63 ++++++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 6 +- src/qemu/test_libvirtd_qemu.aug.in | 2 + src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/qemuhotplugtest.c | 2 +- ...argv-serial-tcp-tlsx509-chardev-disableTLS.args | 30 +++++ ...2argv-serial-tcp-tlsx509-chardev-disableTLS.xml | 50 +++++++ ...xml2argv-serial-tcp-tlsx509-secret-chardev.args | 38 ++++++ ...uxml2argv-serial-tcp-tlsx509-secret-chardev.xml | 50 +++++++ tests/qemuxml2argvtest.c | 22 ++++ ...mlout-serial-tcp-tlsx509-chardev-disableTLS.xml | 1 + tests/qemuxml2xmltest.c | 1 + 30 files changed, 588 insertions(+), 34 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-disableTLS.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-disableTLS.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-disableTLS.xml -- 2.7.4

2 7

[libvirt] [PATCH 0/2] try harder to get dest qemu errors on migation
by Nikolay Shirokovskiy 12 Sep '16

12 Sep '16

Hi, all. In case migration fails due to destination qemu exits unexpectedly user recevies the qemu log in the error message. Unfortunately log is truncated and the most interesting part is missed (below is the example of such a log [1]). Actually for the most cases the first patch will be enough to fix the issue. Originally I thought the problem is qemu logging and reading the log are not in sync (which is true) so I tried to fix it as well in the second patch. [1] log example: CPU Reset (CPU 0) EAX=00000000 EBX=00000000 ECX=00000000 EDX=00000000 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00000000 EIP=00000000 EFL=00000000 [-------] CPL=0 II=0 A20=0 SMM=0 HLT=0 ES =0000 00000000 00000000 00000000 CS =0000 00000000 00000000 00000000 SS =0000 00000000 00000000 00000000 DS =0000 00000000 00000000 00000000 FS =0000 00000000 00000000 00000000 GS =0000 00000000 00000000 00000000 LDT=0000 00000000 00000000 00000000 TR =0000 00000000 00000000 00000000 GDT= 00000000 00000000 IDT= 00000000 00000000 CR0=00000000 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=0000000000000000 DR7=0000000000000000 CCS=00000000 CCD=00000000 CCO=DYNAMIC EFER=0000000000000000 FCW=0000 FSW=0000 [ST=0] FTW=ff MXCSR=00000000 FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 XMM06=00000000000000000000000000000000 XMM07=00000000000000000000000000000000 CPU Reset (CPU 1) EAX=00000000 EBX=00000000 ECX=00000000 EDX=000206a1 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00000000 EIP=0000fff0 EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =0000 00000000 0000ffff 00009300 CS =f000 ffff0000 0000ffff 00009b00 SS =0000 00000000 0000ffff 00009300 DS =0000 00000000 0000ffff 00009300 FS =0000 00000000 0000ffff 00009300 GS =0000 00000000 0000ffff 00009300 LDT=0000 00000000 0000ffff 00008200 TR =0000 00000000 0000ffff 00008b00 GDT= 00000000 0000ffff IDT= 00000000 0000ffff CR0=60000010 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=00000000ffff0ff0 DR7=0000000000000400 CCS=00000000 CCD=00000000 CCO=DYNAMIC EFER=0000000000000000 FCW=037f FSW=0000 [ST=0] FTW=00 MXCSR=00001f80 FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 XMM06=00000000000000000000000000000000 XMM07=000 qemu: terminating on signal 15 from pid 168133 Nikolay Shirokovskiy (2): log: remove 1k limit for error messages log: drain log of exiting qemu process carefully src/logging/log_handler.c | 39 +++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_domain.c | 4 ++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 2 ++ src/util/virerror.c | 9 ++++----- 5 files changed, 48 insertions(+), 7 deletions(-) -- 1.8.3.1

1 0

[libvirt] [gconfig v2 0/6] Add support for changing listen address
by Visarion Alexandru 12 Sep '16

12 Sep '16

From: Visarion Alexandru <viorel.visarion(a)gmail.com> libvirt-domain-graphics-listen defines an abstract class used to represent one listen node. libvirt-domain-graphics-liste-address defines a class that represents a listen node of type 'address', for the graphics device. We have to first remove the 'listen' attribute of the graphics device before adding child 'listen' nodes, to avoid inconsistencies check. I added a test for the new API which uses a SPICE graphics (I noticed that generally APIs aren't tested on both SPICE and VNC) Visarion Alexandru (6): libvirt-gconfig: Include GIO dependency Introduce libvirt-domain-graphics-listen Introduce libvirt-gconfig-domain-graphics-listen-address config: Add vnc listen getter/setter config: Add spice listen getter/setter tests: Add test for GVirConfigDomainGraphicsListenAddress configure.ac | 2 + libvirt-gconfig-1.0.pc.in | 2 +- libvirt-gconfig/Makefile.am | 10 +- ...ibvirt-gconfig-domain-graphics-listen-address.c | 128 +++++++++++++++++++++ ...ibvirt-gconfig-domain-graphics-listen-address.h | 78 +++++++++++++ .../libvirt-gconfig-domain-graphics-listen.c | 49 ++++++++ .../libvirt-gconfig-domain-graphics-listen.h | 65 +++++++++++ .../libvirt-gconfig-domain-graphics-spice.c | 84 ++++++++++++++ .../libvirt-gconfig-domain-graphics-spice.h | 4 + .../libvirt-gconfig-domain-graphics-vnc.c | 84 ++++++++++++++ .../libvirt-gconfig-domain-graphics-vnc.h | 4 + libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 12 ++ tests/test-gconfig.c | 36 ++++++ .../xml/gconfig-domain-device-graphics-listen.xml | 7 ++ vapi/Makefile.am | 1 + 16 files changed, 565 insertions(+), 3 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-listen.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-listen.h create mode 100644 tests/xml/gconfig-domain-device-graphics-listen.xml -- 2.7.4

3 14

[libvirt] [PATCH] util: Quiet the logging if perf file doesn't exist
by John Ferlan 12 Sep '16

12 Sep '16

Commit id 'b00d7f29' shifted the opening of the /sys/devices/intel_cqm/type file from event enable to perf event initialization. If the file did not exist, then an error would be written to the domain log: 2016-09-06 20:51:21.677+0000: 7310: error : virFileReadAll:1360 : Failed to open file '/sys/devices/intel_cqm/type': No such file or directory Since the error is now handled in virPerfEventEnable by checking if the event_attr->attrType == 0 for CMT, MBML, and MBMT events - we can just use the Quiet API in order to not log the error we're going to throw away. Additionally, rather than using virReportSystemError, use virReportError and VIR_ERR_ARGUMENT_UNSUPPORTED in order to signify that support isn't there for that type of perf event - adjust the error message as well. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virperf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virperf.c b/src/util/virperf.c index cd66b05..a65a4bf 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -116,7 +116,7 @@ virPerfRdtAttrInit(void) char *tmp = NULL; unsigned int attr_type = 0; - if (virFileReadAll("/sys/devices/intel_cqm/type", 10, &buf) < 0) + if (virFileReadAllQuiet("/sys/devices/intel_cqm/type", 10, &buf) < 0) goto error; if ((tmp = strchr(buf, '\n'))) @@ -174,9 +174,9 @@ virPerfEventEnable(virPerfPtr perf, if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT || type == VIR_PERF_EVENT_MBMT || type == VIR_PERF_EVENT_MBML)) { - virReportSystemError(errno, - _("Unable to open perf event for %s"), - virPerfEventTypeToString(event->type)); + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("unable to enable perf event for %s"), + virPerfEventTypeToString(event->type)); return -1; } -- 2.7.4

2 1

[libvirt] [PATCH 0/2] qemu: hotplug: Fix two issues with drives made empty by using starup policy
by Peter Krempa 12 Sep '16

12 Sep '16

If a cdrom drive is emptied by 'requisite' startup policy the policy setting would not be cleared and due to a bug in qemu the cdrom image could not be changed. The first patch clears the startup policy setting and the second one fixes ejection of cdroms if --force is specified. Also I've reported the issue in qemu https://bugzilla.redhat.com/show_bug.cgi?id=1373264 Peter Krempa (2): qemu: domain: Clear startup policy for dropped removable media qemu: hotplug: Don't wait if cdrom tray is opened forcibly src/qemu/qemu_domain.c | 2 ++ src/qemu/qemu_hotplug.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) -- 2.9.2

2 3

[libvirt] [PATCH v2 00/10] Introduce NVDIMM support
by Michal Privoznik 09 Sep '16

09 Sep '16

This is v2 of: https://www.redhat.com/archives/libvir-list/2016-August/msg00055.html diff to v1: - Rebase to the latest HEAD - Introduced relabeling for host side of NVDIMM Michal Privoznik (10): Introduce NVDIMM memory model qemu: Introduce QEMU_CAPS_DEVICE_NVDIMM qemu: Implement NVDIMM conf: Introduce memAccess to <memory/> qemu: Implement memAccess for <memory/> banks security_dac: Label host side of NVDIMM security_selinux: Label host side of NVDIMM security: Introduce internal APIs for memdev labelling secdrivers: Implement memdev relabel APIs qemu_hotplug: Relabel memdev docs/formatdomain.html.in | 41 ++++++-- docs/schemas/domaincommon.rng | 51 ++++++---- src/conf/domain_conf.c | 112 ++++++++++++++++----- src/conf/domain_conf.h | 4 + src/libvirt_private.syms | 4 + src/qemu/qemu_alias.c | 12 ++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 87 +++++++++++----- src/qemu/qemu_command.h | 2 + src/qemu/qemu_domain.c | 29 ++++-- src/qemu/qemu_hotplug.c | 17 +++- src/security/security_dac.c | 76 ++++++++++++++ src/security/security_driver.h | 9 ++ src/security/security_manager.c | 56 +++++++++++ src/security/security_manager.h | 7 ++ src/security/security_nop.c | 19 ++++ src/security/security_selinux.c | 69 +++++++++++++ src/security/security_stack.c | 38 +++++++ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + .../qemuxml2argv-hugepages-numa.args | 5 +- .../qemuxml2argv-hugepages-pages.args | 24 ++--- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 4 +- .../qemuxml2argv-hugepages-shared.args | 22 ++-- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 5 +- .../qemuxml2argv-memory-hotplug-dimm.args | 5 +- ...muxml2argv-memory-hotplug-nvdimm-memAccess.args | 26 +++++ ...emuxml2argv-memory-hotplug-nvdimm-memAccess.xml | 49 +++++++++ .../qemuxml2argv-memory-hotplug-nvdimm.args | 25 +++++ .../qemuxml2argv-memory-hotplug-nvdimm.xml | 49 +++++++++ tests/qemuxml2argvtest.c | 6 +- 33 files changed, 743 insertions(+), 123 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-memAccess.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-memAccess.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.xml -- 2.8.4

4 22

[libvirt] [PATCH v5 0/9] Add native TLS encrypted chardev TCP support
by John Ferlan 09 Sep '16

09 Sep '16

v4: http://www.redhat.com/archives/libvir-list/2016-June/msg01709.html Since I have it on a branch and have been updating, I figured I'd post the most recent stuff. Patches 1-4 were "partially" ACK'd in v2 of this series, but there's been changes to the conf handling upstream. Patch 5 adds a new secret type 'tls'. Previous incarnations of these changes borrowed a common secret type, but this one is specific. It's more or less what got removed for LUKS with the names changed to protect the innocent (reference Dragnet). Patches 6-9 is what was mostly missing in the earlier series. Differences to v4... mostly updates/merges with the numerous changes to master since that time. I lost track of whether the desire was to have /etc/pki/libvirt-%s or /etc/pki/qemu-%s directories... I think we've been using the libvirt-%s for vnc/spice so far, so I just followed that for chardev although there was a comment at one time to use qemu-chardev during review of patch 2 of the v2 series: http://www.redhat.com/archives/libvir-list/2016-June/msg01072.html John Ferlan (9): conf: Add new default TLS X.509 certificate default directory conf: Introduce chartcp_tls_x509_cert_dir qemu: Add support for TLS X.509 path to TCP chardev backend qemu: Add the ability to hotplug the TLS X.509 environment conf: Add new secret type "tls" conf: Add new secret element for tcp chardev qemu: Introduce qemuDomainChardevPrivatePtr qemu: Add a secret object to/for a chardev tcp with secret qemu: Add the ability to hotplug a secret object for TCP chardev TLS docs/aclpolkit.html.in | 4 + docs/formatdomain.html.in | 29 +++++ docs/formatsecret.html.in | 59 ++++++++- docs/schemas/domaincommon.rng | 21 +++ docs/schemas/secret.rng | 10 ++ include/libvirt/libvirt-secret.h | 1 + src/access/viraccessdriverpolkit.c | 13 ++ src/conf/domain_conf.c | 64 ++++++++-- src/conf/domain_conf.h | 8 +- src/conf/secret_conf.c | 23 +++- src/conf/secret_conf.h | 1 + src/conf/virsecretobj.c | 5 + src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/libvirtd_qemu.aug | 11 +- src/qemu/qemu.conf | 83 +++++++++--- src/qemu/qemu_alias.c | 16 +++ src/qemu/qemu_alias.h | 3 + src/qemu/qemu_command.c | 141 ++++++++++++++++++++- src/qemu/qemu_command.h | 9 ++ src/qemu/qemu_conf.c | 57 ++++++++- src/qemu/qemu_conf.h | 7 + src/qemu/qemu_domain.c | 124 +++++++++++++++++- src/qemu/qemu_domain.h | 22 ++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 104 ++++++++++++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_monitor_json.c | 9 ++ src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 5 + src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/qemuhotplugtest.c | 2 +- .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 33 +++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 41 ++++++ ...xml2argv-serial-tcp-tlsx509-secret-chardev.args | 38 ++++++ ...uxml2argv-serial-tcp-tlsx509-secret-chardev.xml | 51 ++++++++ tests/qemuxml2argvtest.c | 21 +++ .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 50 ++++++++ ...ml2xmlout-serial-tcp-tlsx509-secret-chardev.xml | 1 + tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-tls.xml | 7 + tests/secretxml2xmltest.c | 1 + 44 files changed, 1038 insertions(+), 57 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-secret-chardev.xml create mode 100644 tests/secretxml2xmlin/usage-tls.xml -- 2.7.4

2 18

Re: [libvirt] [PATCH v7 0/4] Add Mediated device support
by Alex Williamson 08 Sep '16

08 Sep '16

Hi folks, At KVM Forum we had a BoF session primarily around the mediated device sysfs interface. I'd like to share what I think we agreed on and the "problem areas" that still need some work so we can get the thoughts and ideas from those who weren't able to attend. DanPB expressed some concern about the mdev_supported_types sysfs interface, which exposes a flat csv file with fields like "type", "number of instance", "vendor string", and then a bunch of type specific fields like "framebuffer size", "resolution", "frame rate limit", etc. This is not entirely machine parsing friendly and sort of abuses the sysfs concept of one value per file. Example output taken from Neo's libvirt RFC: cat /sys/bus/pci/devices/0000:86:00.0/mdev_supported_types # vgpu_type_id, vgpu_type, max_instance, num_heads, frl_config, framebuffer, max_resolution 11 ,"GRID M60-0B", 16, 2, 45, 512M, 2560x1600 12 ,"GRID M60-0Q", 16, 2, 60, 512M, 2560x1600 13 ,"GRID M60-1B", 8, 2, 45, 1024M, 2560x1600 14 ,"GRID M60-1Q", 8, 2, 60, 1024M, 2560x1600 15 ,"GRID M60-2B", 4, 2, 45, 2048M, 2560x1600 16 ,"GRID M60-2Q", 4, 4, 60, 2048M, 2560x1600 17 ,"GRID M60-4Q", 2, 4, 60, 4096M, 3840x2160 18 ,"GRID M60-8Q", 1, 4, 60, 8192M, 3840x2160 The create/destroy then looks like this: echo "$mdev_UUID:vendor_specific_argument_list" > /sys/bus/pci/devices/.../mdev_create echo "$mdev_UUID:vendor_specific_argument_list" > /sys/bus/pci/devices/.../mdev_destroy "vendor_specific_argument_list" is nebulous. So the idea to fix this is to explode this into a directory structure, something like: ├── mdev_destroy └── mdev_supported_types ├── 11 │ ├── create │ ├── description │ └── max_instances ├── 12 │ ├── create │ ├── description │ └── max_instances └── 13 ├── create ├── description └── max_instances Note that I'm only exposing the minimal attributes here for simplicity, the other attributes would be included in separate files and we would require vendors to create standard attributes for common device classes. For vGPUs like NVIDIA where we don't support multiple types concurrently, this directory structure would update as mdev devices are created, removing no longer available types. I carried forward max_instances here, but perhaps we really want to copy SR-IOV and report a max and current allocation. Creation and deletion is simplified as we can simply "echo $UUID > create" per type. I don't understand why destroy had a parameter list, so here I imagine we can simply do the same... in fact, I'd actually rather see a "remove" sysfs entry under each mdev device, so we remove it at the device rather than in some central location (any objections?). We discussed how this might look with Intel devices which do allow mixed vGPU types concurrently. We believe, but need confirmation, that the vendor driver could still make a finite set of supported types, perhaps with additional module options to the vendor driver to enable more "exotic" types. So for instance if IGD vGPUs are based on power-of-2 portions of the framebuffer size, then the vendor driver could list types with 32MB, 64MB, 128MB, etc in useful and popular sizes. As vGPUs are allocated, the larger sizes may become unavailable. We still don't have any way for the admin to learn in advance how the available supported types will change once mdev devices start to be created. I'm not sure how we can create a specification for this, so probing by creating devices may be the most flexible model. The other issue is the start/stop requirement, which was revealed to setup peer-to-peer resources between vGPUs which is a limited hardware resource. We'd really like to have these happen automatically on the first open of a vfio mdev device file and final release. So we brainstormed how the open/release callbacks could know the other mdev devices for a given user. This is where the instance number came into play previously. This is an area that needs work. There was a thought that perhaps on open() the vendor driver could look at the user pid and use that to associate with other devices, but the problem here is that we open and begin access to each device, so devices do this discovery serially rather than in parallel as desired. (we might not fault in mmio space yet though, so I wonder if open() could set the association of mdev to pid, then the first mmio fault would trigger the resource allocation? Then all the "magic" would live in the vendor driver. open() could fail if the pid already has running mdev devices and the vendor driver chooses not to support hotplug) One comment was that for a GPU that only supports homogeneous vGPUs, libvirt may choose to create all the vGPUs in advance and handle them as we do SR-IOV VFs. The UUID+instance model would preclude such a use case. We also considered whether iommu groups could be (ab)used for this use case, peer-to-peer would in fact be an iommu grouping constraint afterall. This would have the same UUID+instance constraint as above though and would require some sort of sysfs interface for the user to be able to create multiple mdevs within a group. Everyone was given homework to think about this on their flights home, so I expect plenty of ideas by now ;) Overall I think mediated devices were well received by the community, so let's keep up the development and discussion to bring it to fruition. Thanks, Alex

11 48

[libvirt] [PATCH] usb: allow host devices to be specified by port
by Thomas Hebb 08 Sep '16

08 Sep '16

Previously, only VID/PID and bus/device matching were supported. Neither of these provide a stable and persistent way of assigning a guest a specific host device out of several with the same VID and PID, as device numbers change on every enumeration. Add a third method of matching, bus/port, which allows a specific port on the host to be specified using the dotted notation found in Linux's "devpath" sysfs attribute. --- src/conf/domain_conf.c | 36 ++++- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 2 - src/util/virhostdev.c | 126 ++++++++-------- src/util/virusb.c | 160 ++++++++------------- src/util/virusb.h | 23 ++- tests/virusbtest.c | 124 ++++++++++------ .../sys_bus_usb/devices/1-1.5.3.1/devpath | 1 + .../sys_bus_usb/devices/1-1.5.3.3/devpath | 1 + .../sys_bus_usb/devices/1-1.5.3/devpath | 1 + .../sys_bus_usb/devices/1-1.5.4/devpath | 1 + .../sys_bus_usb/devices/1-1.5.5/devpath | 1 + .../sys_bus_usb/devices/1-1.5.6/devpath | 1 + .../sys_bus_usb/devices/1-1.5/devpath | 1 + .../sys_bus_usb/devices/1-1.6/devpath | 1 + .../virusbtestdata/sys_bus_usb/devices/1-1/devpath | 1 + .../sys_bus_usb/devices/2-1.2/devpath | 1 + .../virusbtestdata/sys_bus_usb/devices/2-1/devpath | 1 + .../sys_bus_usb/devices/usb1/devpath | 1 + .../sys_bus_usb/devices/usb2/devpath | 1 + .../sys_bus_usb/devices/usb3/devpath | 1 + .../sys_bus_usb/devices/usb4/devpath | 1 + 22 files changed, 266 insertions(+), 222 deletions(-) create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f7b906..a587cc2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5531,7 +5531,8 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, goto out; } } else if (xmlStrEqual(cur->name, BAD_CAST "address")) { - char *bus, *device; + char *bus, *device, *port; + bool dev_or_port = false; bus = virXMLPropString(cur, "bus"); if (bus) { @@ -5557,10 +5558,24 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, VIR_FREE(device); goto out; } + dev_or_port = true; VIR_FREE(device); - } else { + } + + port = virXMLPropString(cur, "port"); + if (port) { + if (*port) { + usbsrc->port = port; + dev_or_port = true; + } else { + VIR_FREE(port); + } + } + + if (!dev_or_port) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("usb address needs device id")); + _("usb address needs either device id " + "or port")); goto out; } } else { @@ -20326,10 +20341,17 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf, virBufferAsprintf(buf, "<vendor id='0x%.4x'/>\n", usbsrc->vendor); virBufferAsprintf(buf, "<product id='0x%.4x'/>\n", usbsrc->product); } - if (usbsrc->bus || usbsrc->device) { - virBufferAsprintf(buf, "<address %sbus='%d' device='%d'/>\n", - includeTypeInAddr ? "type='usb' " : "", - usbsrc->bus, usbsrc->device); + if (usbsrc->bus || usbsrc->device || usbsrc->port) { + virBufferAddLit(buf, "<address"); + if (includeTypeInAddr) + virBufferAddLit(buf, " type='usb'"); + if (usbsrc->bus) + virBufferAsprintf(buf, " bus='%u'", usbsrc->bus); + if (usbsrc->device) + virBufferAsprintf(buf, " device='%u'", usbsrc->device); + if (usbsrc->port) + virBufferAsprintf(buf, " port='%s'", usbsrc->port); + virBufferAddLit(buf, "/>\n"); } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ba0ad5f..91bd621 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -317,6 +317,8 @@ VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol) typedef struct _virDomainHostdevSubsysUSB virDomainHostdevSubsysUSB; typedef virDomainHostdevSubsysUSB *virDomainHostdevSubsysUSBPtr; struct _virDomainHostdevSubsysUSB { + char *port; + bool autoAddress; /* bus/device were filled automatically based on vendor/product */ unsigned bus; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ccb4c5e..d412eac 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2511,8 +2511,6 @@ virURIResolveAlias; # util/virusb.h virUSBDeviceFileIterate; virUSBDeviceFind; -virUSBDeviceFindByBus; -virUSBDeviceFindByVendor; virUSBDeviceFree; virUSBDeviceGetBus; virUSBDeviceGetDevno; diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9b5ca6f..e809c97 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1179,89 +1179,95 @@ virHostdevMarkUSBDevices(virHostdevManagerPtr mgr, static int +virHostdevFindUSBDeviceWithFlags(virDomainHostdevDefPtr hostdev, + bool mandatory, + unsigned int flags, + virUSBDevicePtr *usb) +{ + virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb; + unsigned vendor = usbsrc->vendor; + unsigned product = usbsrc->product; + unsigned bus = usbsrc->bus; + char *port = usbsrc->port; + unsigned device = usbsrc->device; + virUSBDeviceListPtr devs; + int rc; + + rc = virUSBDeviceFind(vendor, product, bus, device, port, NULL, + mandatory, flags, &devs); + if (rc < 0) + return -1; + + if (rc == 1) { + *usb = virUSBDeviceListGet(devs, 0); + virUSBDeviceListSteal(devs, *usb); + } + virObjectUnref(devs); + + if (rc > 1) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Multiple USB devices for %x:%x, " + "use <address> to specify one"), + vendor, product); + return -1; + } + + return rc; +} + +static int virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, bool mandatory, virUSBDevicePtr *usb) { virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb; unsigned vendor = usbsrc->vendor; - unsigned product = usbsrc->product; unsigned bus = usbsrc->bus; unsigned device = usbsrc->device; + char *port = usbsrc->port; bool autoAddress = usbsrc->autoAddress; + unsigned int flags = 0; int rc; *usb = NULL; - if (vendor && bus) { - rc = virUSBDeviceFind(vendor, product, bus, device, - NULL, - autoAddress ? false : mandatory, - usb); - if (rc < 0) { - return -1; - } else if (!autoAddress) { - goto out; - } else { - VIR_INFO("USB device %x:%x could not be found at previous" - " address (bus:%u device:%u)", - vendor, product, bus, device); - } - } + /* First attempt, matching on all known fields. */ + if (vendor) + flags |= USB_DEVICE_FIND_BY_VENDOR; + if (device) + flags |= USB_DEVICE_FIND_BY_DEVICE; + if (port) + flags |= USB_DEVICE_FIND_BY_PORT; + + rc = virHostdevFindUSBDeviceWithFlags(hostdev, + autoAddress ? false : mandatory, + flags, usb); + if (rc < 0) + return -1; - /* When vendor is specified, its USB address is either unspecified or the - * device could not be found at the USB device where it had been - * automatically found before. - */ - if (vendor) { - virUSBDeviceListPtr devs; + if (rc != 1 && autoAddress) { + VIR_INFO("USB device could not be found at previous address " + "(bus:%u device:%u)", bus, device); - rc = virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, &devs); - if (rc < 0) - return -1; + /* Second attempt, for when the device number has changed. */ + flags &= ~((unsigned int) USB_DEVICE_FIND_BY_DEVICE); + usbsrc->device = 0; - if (rc == 1) { - *usb = virUSBDeviceListGet(devs, 0); - virUSBDeviceListSteal(devs, *usb); - } - virObjectUnref(devs); - - if (rc == 0) { - goto out; - } else if (rc > 1) { - if (autoAddress) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x were found," - " but none of them is at bus:%u device:%u"), - vendor, product, bus, device); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x, " - "use <address> to specify one"), - vendor, product); - } + rc = virHostdevFindUSBDeviceWithFlags(hostdev, mandatory, + flags, usb); + + if (rc < 0) return -1; - } + } + if (!*usb) { + hostdev->missing = true; + } else if (!usbsrc->bus || !usbsrc->device) { usbsrc->bus = virUSBDeviceGetBus(*usb); usbsrc->device = virUSBDeviceGetDevno(*usb); usbsrc->autoAddress = true; - - if (autoAddress) { - VIR_INFO("USB device %x:%x found at bus:%u device:%u (moved" - " from bus:%u device:%u)", - vendor, product, - usbsrc->bus, usbsrc->device, - bus, device); - } - } else if (!vendor && bus) { - if (virUSBDeviceFindByBus(bus, device, NULL, mandatory, usb) < 0) - return -1; } - out: - if (!*usb) - hostdev->missing = true; return 0; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 6a001a7..2e15849 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -68,12 +68,6 @@ struct _virUSBDeviceList { virUSBDevicePtr *devs; }; -typedef enum { - USB_DEVICE_ALL = 0, - USB_DEVICE_FIND_BY_VENDOR = 1 << 0, - USB_DEVICE_FIND_BY_BUS = 1 << 1, -} virUSBDeviceFindFlags; - static virClassPtr virUSBDeviceListClass; static void virUSBDeviceListDispose(void *obj); @@ -119,11 +113,33 @@ static int virUSBSysReadFile(const char *f_name, const char *d_name, return ret; } +static int virUSBSysReadFileStr(const char *f_name, const char *d_name, + char **value) +{ + int ret = -1, tmp; + char *buf = NULL; + char *filename = NULL; + + tmp = virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); + if (tmp < 0) + goto cleanup; + + if (virFileReadAll(filename, 1024, &buf) < 0) + goto cleanup; + + *value = buf; + ret = 0; + cleanup: + VIR_FREE(filename); + return ret; +} + static virUSBDeviceListPtr virUSBDeviceSearch(unsigned int vendor, unsigned int product, unsigned int bus, unsigned int devno, + const char *port, const char *vroot, unsigned int flags) { @@ -143,6 +159,8 @@ virUSBDeviceSearch(unsigned int vendor, while ((direrr = virDirRead(dir, &de, USB_SYSFS "/devices")) > 0) { unsigned int found_prod, found_vend, found_bus, found_devno; + char *found_port; + bool port_matches; char *tmpstr = de->d_name; if (strchr(de->d_name, ':')) @@ -170,16 +188,31 @@ virUSBDeviceSearch(unsigned int vendor, 10, &found_devno) < 0) goto cleanup; + if (virUSBSysReadFileStr("devpath", de->d_name, + &found_port) < 0) { + goto cleanup; + } else { + found_port[strlen(found_port) - 1] = '\0'; /* remove newline */ + port_matches = STREQ_NULLABLE(found_port, port); + VIR_FREE(found_port); + } + if ((flags & USB_DEVICE_FIND_BY_VENDOR) && (found_prod != product || found_vend != vendor)) continue; - if (flags & USB_DEVICE_FIND_BY_BUS) { + if (flags & USB_DEVICE_FIND_BY_DEVICE) { if (found_bus != bus || found_devno != devno) continue; found = true; } + if (flags & USB_DEVICE_FIND_BY_PORT) { + if (found_bus != bus || !port_matches) + continue; + found = true; + } + usb = virUSBDeviceNew(found_bus, found_devno, vroot); if (!usb) goto cleanup; @@ -204,36 +237,43 @@ virUSBDeviceSearch(unsigned int vendor, } int -virUSBDeviceFindByVendor(unsigned int vendor, - unsigned int product, - const char *vroot, - bool mandatory, - virUSBDeviceListPtr *devices) +virUSBDeviceFind(unsigned int vendor, + unsigned int product, + unsigned int bus, + unsigned int devno, + const char *port, + const char *vroot, + bool mandatory, + unsigned int flags, + virUSBDeviceListPtr *devices) { virUSBDeviceListPtr list; int count; - if (!(list = virUSBDeviceSearch(vendor, product, 0, 0, - vroot, - USB_DEVICE_FIND_BY_VENDOR))) + if (!(list = virUSBDeviceSearch(vendor, product, bus, devno, port, + vroot, flags))) return -1; - if (list->count == 0) { + count = list->count; + if (count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %x:%x", - vendor, product); if (devices) *devices = NULL; return 0; } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %x:%x"), vendor, product); + _("Did not find a matching USB device (matching " + "on%s%s%s all others ignored): vid:%04x, pid:%04x, " + "bus:%u, device:%u, port:%s"), + flags & USB_DEVICE_FIND_BY_VENDOR ? " vid/pid," : "", + flags & USB_DEVICE_FIND_BY_DEVICE ? " bus/device," : "", + flags & USB_DEVICE_FIND_BY_PORT ? " bus/port," : "", + vendor, product, bus, devno, port ? port : "(null)"); return -1; } - count = list->count; if (devices) *devices = list; else @@ -242,86 +282,6 @@ virUSBDeviceFindByVendor(unsigned int vendor, return count; } -int -virUSBDeviceFindByBus(unsigned int bus, - unsigned int devno, - const char *vroot, - bool mandatory, - virUSBDevicePtr *usb) -{ - virUSBDeviceListPtr list; - - if (!(list = virUSBDeviceSearch(0, 0, bus, devno, - vroot, - USB_DEVICE_FIND_BY_BUS))) - return -1; - - if (list->count == 0) { - virObjectUnref(list); - if (!mandatory) { - VIR_DEBUG("Did not find USB device bus:%u device:%u", - bus, devno); - if (usb) - *usb = NULL; - return 0; - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device bus:%u device:%u"), - bus, devno); - return -1; - } - - if (usb) { - *usb = virUSBDeviceListGet(list, 0); - virUSBDeviceListSteal(list, *usb); - } - virObjectUnref(list); - - return 0; -} - -int -virUSBDeviceFind(unsigned int vendor, - unsigned int product, - unsigned int bus, - unsigned int devno, - const char *vroot, - bool mandatory, - virUSBDevicePtr *usb) -{ - virUSBDeviceListPtr list; - - unsigned int flags = USB_DEVICE_FIND_BY_VENDOR|USB_DEVICE_FIND_BY_BUS; - if (!(list = virUSBDeviceSearch(vendor, product, bus, devno, - vroot, flags))) - return -1; - - if (list->count == 0) { - virObjectUnref(list); - if (!mandatory) { - VIR_DEBUG("Did not find USB device %x:%x bus:%u device:%u", - vendor, product, bus, devno); - if (usb) - *usb = NULL; - return 0; - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %x:%x bus:%u device:%u"), - vendor, product, bus, devno); - return -1; - } - - if (usb) { - *usb = virUSBDeviceListGet(list, 0); - virUSBDeviceListSteal(list, *usb); - } - virObjectUnref(list); - - return 0; -} - virUSBDevicePtr virUSBDeviceNew(unsigned int bus, unsigned int devno, diff --git a/src/util/virusb.h b/src/util/virusb.h index f98ea21..0834cd4 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -35,29 +35,26 @@ typedef virUSBDevice *virUSBDevicePtr; typedef struct _virUSBDeviceList virUSBDeviceList; typedef virUSBDeviceList *virUSBDeviceListPtr; +typedef enum { + USB_DEVICE_ALL = 0, + USB_DEVICE_FIND_BY_VENDOR = 1 << 0, + USB_DEVICE_FIND_BY_DEVICE = 1 << 1, + USB_DEVICE_FIND_BY_PORT = 1 << 2, +} virUSBDeviceFindFlags; + virUSBDevicePtr virUSBDeviceNew(unsigned int bus, unsigned int devno, const char *vroot); -int virUSBDeviceFindByBus(unsigned int bus, - unsigned int devno, - const char *vroot, - bool mandatory, - virUSBDevicePtr *usb); - -int virUSBDeviceFindByVendor(unsigned int vendor, - unsigned int product, - const char *vroot, - bool mandatory, - virUSBDeviceListPtr *devices); - int virUSBDeviceFind(unsigned int vendor, unsigned int product, unsigned int bus, unsigned int devno, + const char *port, const char *vroot, bool mandatory, - virUSBDevicePtr *usb); + unsigned int flags, + virUSBDeviceListPtr *devices); void virUSBDeviceFree(virUSBDevicePtr dev); int virUSBDeviceSetUsedBy(virUSBDevicePtr dev, diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 4bbfe4a..0782b73 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -33,7 +33,8 @@ typedef enum { FIND_BY_ALL, FIND_BY_VENDOR, - FIND_BY_BUS + FIND_BY_DEVICE, + FIND_BY_PORT } testUSBFindFlags; struct findTestInfo { @@ -42,6 +43,7 @@ struct findTestInfo { unsigned int product; unsigned int bus; unsigned int devno; + const char *port; const char *vroot; bool mandatory; int how; @@ -78,25 +80,31 @@ static int testDeviceFind(const void *opaque) virUSBDeviceListPtr devs = NULL; int rv = 0; size_t i, ndevs = 0; + unsigned int flags = 0; switch (info->how) { case FIND_BY_ALL: - rv = virUSBDeviceFind(info->vendor, info->product, - info->bus, info->devno, - info->vroot, info->mandatory, &dev); + flags = USB_DEVICE_FIND_BY_VENDOR | + USB_DEVICE_FIND_BY_DEVICE | + USB_DEVICE_FIND_BY_PORT; break; case FIND_BY_VENDOR: - rv = virUSBDeviceFindByVendor(info->vendor, info->product, - info->vroot, info->mandatory, &devs); + flags = USB_DEVICE_FIND_BY_VENDOR; break; - case FIND_BY_BUS: - rv = virUSBDeviceFindByBus(info->bus, info->devno, - info->vroot, info->mandatory, &dev); + case FIND_BY_DEVICE: + flags = USB_DEVICE_FIND_BY_DEVICE; + break; + case FIND_BY_PORT: + flags = USB_DEVICE_FIND_BY_PORT; break; } + rv = virUSBDeviceFind(info->vendor, info->product, + info->bus, info->devno, info->port, + info->vroot, info->mandatory, flags, &devs); + if (info->expectFailure) { - if (rv == 0) { + if (rv >= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "unexpected success"); } else { @@ -107,9 +115,18 @@ static int testDeviceFind(const void *opaque) goto cleanup; } + if (info->how != FIND_BY_VENDOR) { + if (rv == 1) { + dev = virUSBDeviceListGet(devs, 0); + virUSBDeviceListSteal(devs, dev); + } else { + goto cleanup; + } + } + switch (info->how) { case FIND_BY_ALL: - case FIND_BY_BUS: + case FIND_BY_DEVICE: if (virUSBDeviceFileIterate(dev, testDeviceFileActor, NULL) < 0) goto cleanup; break; @@ -155,14 +172,17 @@ testUSBList(const void *opaque ATTRIBUTE_UNUSED) virUSBDeviceListPtr list = NULL; virUSBDeviceListPtr devlist = NULL; virUSBDevicePtr dev = NULL; + virUSBDeviceListPtr devs = NULL; int ret = -1; + int rv; size_t i, ndevs; if (!(list = virUSBDeviceListNew())) goto cleanup; #define EXPECTED_NDEVS_ONE 3 - if (virUSBDeviceFindByVendor(0x1d6b, 0x0002, NULL, true, &devlist) < 0) + if (virUSBDeviceFind(0x1d6b, 0x0002, 0, 0, NULL, NULL, true, + USB_DEVICE_FIND_BY_VENDOR, &devlist) < 0) goto cleanup; ndevs = virUSBDeviceListCount(devlist); @@ -186,7 +206,8 @@ testUSBList(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; #define EXPECTED_NDEVS_TWO 3 - if (virUSBDeviceFindByVendor(0x18d1, 0x4e22, NULL, true, &devlist) < 0) + if (virUSBDeviceFind(0x18d1, 0x4e22, 0, 0, NULL, NULL, true, + USB_DEVICE_FIND_BY_VENDOR, &devlist) < 0) goto cleanup; ndevs = virUSBDeviceListCount(devlist); @@ -206,8 +227,17 @@ testUSBList(const void *opaque ATTRIBUTE_UNUSED) EXPECTED_NDEVS_ONE + EXPECTED_NDEVS_TWO) < 0) goto cleanup; - if (virUSBDeviceFind(0x18d1, 0x4e22, 1, 20, NULL, true, &dev) < 0) + rv = virUSBDeviceFind(0x18d1, 0x4e22, 1, 20, "1.5.6", NULL, true, + USB_DEVICE_FIND_BY_VENDOR | + USB_DEVICE_FIND_BY_DEVICE | + USB_DEVICE_FIND_BY_PORT, &devs); + if (rv != 1) { goto cleanup; + } else { + dev = virUSBDeviceListGet(devs, 0); + virUSBDeviceListSteal(devs, dev); + } + virObjectUnref(devs); if (!virUSBDeviceListFind(list, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -239,49 +269,63 @@ mymain(void) { int rv = 0; -#define DO_TEST_FIND_FULL(name, vend, prod, bus, devno, vroot, mand, how, fail) \ - do { \ - struct findTestInfo data = { name, vend, prod, bus, \ - devno, vroot, mand, how, fail \ - }; \ - if (virTestRun("USBDeviceFind " name, testDeviceFind, &data) < 0) \ - rv = -1; \ +#define DO_TEST_FIND_FULL(name, vend, prod, bus, devno, \ + port, vroot, mand, how, fail) \ + do { \ + struct findTestInfo data = { name, vend, prod, bus, \ + devno, port, vroot, mand, how, fail \ + }; \ + if (virTestRun("USBDeviceFind " name, testDeviceFind, &data) < 0) \ + rv = -1; \ } while (0) -#define DO_TEST_FIND(name, vend, prod, bus, devno) \ - DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \ +#define DO_TEST_FIND(name, vend, prod, bus, devno, port) \ + DO_TEST_FIND_FULL(name, vend, prod, bus, devno, port, NULL, true, \ FIND_BY_ALL, false) -#define DO_TEST_FIND_FAIL(name, vend, prod, bus, devno) \ - DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \ +#define DO_TEST_FIND_FAIL(name, vend, prod, bus, devno, port) \ + DO_TEST_FIND_FULL(name, vend, prod, bus, devno, port, NULL, true, \ FIND_BY_ALL, true) -#define DO_TEST_FIND_BY_BUS(name, bus, devno) \ - DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \ - FIND_BY_BUS, false) -#define DO_TEST_FIND_BY_BUS_FAIL(name, bus, devno) \ - DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \ - FIND_BY_BUS, true) +#define DO_TEST_FIND_BY_DEVICE(name, bus, devno) \ + DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, NULL, true, \ + FIND_BY_DEVICE, false) +#define DO_TEST_FIND_BY_DEVICE_FAIL(name, bus, devno) \ + DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, NULL, true, \ + FIND_BY_DEVICE, true) #define DO_TEST_FIND_BY_VENDOR(name, vend, prod) \ - DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \ + DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, NULL, true, \ FIND_BY_VENDOR, false) #define DO_TEST_FIND_BY_VENDOR_FAIL(name, vend, prod) \ - DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \ + DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, NULL, true, \ FIND_BY_VENDOR, true) - DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, 1, 20); - DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, 1, 25); - DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, 1024, 768); +#define DO_TEST_FIND_BY_PORT(name, bus, port) \ + DO_TEST_FIND_FULL(name, 101, 202, bus, 456, port, NULL, true, \ + FIND_BY_PORT, false) +#define DO_TEST_FIND_BY_PORT_FAIL(name, bus, port) \ + DO_TEST_FIND_FULL(name, 101, 202, bus, 456, port, NULL, true, \ + FIND_BY_PORT, true) + + DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, 1, 20, "1.5.6"); + DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, 1, 25, "1.5.6"); + DO_TEST_FIND_FAIL("Nexus wrong port", 0x18d1, 0x4e22, 1, 25, "1.5.4"); + DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, 1024, 768, "1.2.3.4"); - DO_TEST_FIND_BY_BUS("integrated camera", 1, 5); - DO_TEST_FIND_BY_BUS_FAIL("wrong bus/devno combination", 2, 20); - DO_TEST_FIND_BY_BUS_FAIL("missing bus", 5, 20); - DO_TEST_FIND_BY_BUS_FAIL("missing devnum", 1, 158); + DO_TEST_FIND_BY_DEVICE("integrated camera", 1, 5); + DO_TEST_FIND_BY_DEVICE_FAIL("wrong bus/devno combination", 2, 20); + DO_TEST_FIND_BY_DEVICE_FAIL("missing bus", 5, 20); + DO_TEST_FIND_BY_DEVICE_FAIL("missing devnum", 1, 158); DO_TEST_FIND_BY_VENDOR("Nexus (multiple results)", 0x18d1, 0x4e22); DO_TEST_FIND_BY_VENDOR_FAIL("Bogus vendor and product", 0xf00d, 0xbeef); DO_TEST_FIND_BY_VENDOR_FAIL("Valid vendor", 0x1d6b, 0xbeef); + DO_TEST_FIND_BY_PORT("Logitech mouse", 1, "1.5.3.3"); + DO_TEST_FIND_BY_PORT_FAIL("wrong bus/port combination", 2, "1.5.3.3"); + DO_TEST_FIND_BY_PORT_FAIL("missing bus", 5, "1.5.3.3"); + DO_TEST_FIND_BY_PORT_FAIL("missing port", 1, "8.2.5"); + if (virTestRun("USB List test", testUSBList, NULL) < 0) rv = -1; diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath new file mode 100644 index 0000000..02a7fbe --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath @@ -0,0 +1 @@ +1.5.3.1 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath new file mode 100644 index 0000000..23ca863 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath @@ -0,0 +1 @@ +1.5.3.3 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath new file mode 100644 index 0000000..8af85be --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath @@ -0,0 +1 @@ +1.5.3 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath new file mode 100644 index 0000000..94fe62c --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath @@ -0,0 +1 @@ +1.5.4 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath new file mode 100644 index 0000000..9075be4 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath @@ -0,0 +1 @@ +1.5.5 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath new file mode 100644 index 0000000..eac1e0a --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath @@ -0,0 +1 @@ +1.5.6 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath new file mode 100644 index 0000000..c239c60 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath @@ -0,0 +1 @@ +1.5 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath new file mode 100644 index 0000000..810ee4e --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath @@ -0,0 +1 @@ +1.6 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath b/tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath @@ -0,0 +1 @@ +1 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath b/tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath new file mode 100644 index 0000000..5625e59 --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath @@ -0,0 +1 @@ +1.2 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath b/tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath @@ -0,0 +1 @@ +1 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath b/tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath @@ -0,0 +1 @@ +0 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath b/tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath @@ -0,0 +1 @@ +0 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath b/tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath @@ -0,0 +1 @@ +0 diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath b/tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath @@ -0,0 +1 @@ +0 -- 2.7.4

2 1

Re: [libvirt] [PATCH 00/16] Hyper-V: Improve 2008, Introduce 2012
by Fernando Casas Schössow 08 Sep '16

08 Sep '16

Hi there, I was wondering if any of these patches actually made it into libvirt code. I'm really looking forward hyper-v support improvement and features like shutdown VM (not destroy/turn off but clean shutdown) implemented. Especially interested in 2012/2012 R2 since 2008 is getting old and 2016 is right around the corner. I'm already using libvirt 2.1.0 with some patches I found in https://github.com/vikhyath/libvirt-hyperv-r2-2012 but it would be great to have the code reviewed and merged into libvirt releases. Thanks. Fer > The following patches include work originally done by Yves Vinter back > in 2014. The last patch introduces support for Hyper-V 2012, while > still > supporting 2008. I am not sure that the method I used to include the > 2012 > support is the best approach, mainly due to code duplication, but I am > open to suggestions on how to do this better. > > Jason Miesionczek (16): > hyperv: additional server 2008 wmi classes > hyperv: add cim types support to code generator > hyperv: add get capabilities > hyperv: implement connectGetVersion > hyperv: implement vcpu functions > hyperv: implement nodeGetFreeMemory > hyperv: implement ability to send xml soap requests > hyperv: introduce basic network driver > hyperv: add domain shutdown function > hyperv: add get scheduler functions > hyperv: add set memory functions > hyperv: set vpcu functions > hyperv: domain undefine functions > hyperv: domain define and associated functions > hyperv: network list functions > hyperv: introduce 2012 support > > src/Makefile.am | 2 + > src/hyperv/hyperv_driver.c | 1989 ++++++++++++++++++++++++++++++++- > src/hyperv/hyperv_driver_2012.c | 299 +++++ > src/hyperv/hyperv_driver_2012.h | 55 + > src/hyperv/hyperv_network_driver.c | 280 +++++ > src/hyperv/hyperv_network_driver.h | 30 + > src/hyperv/hyperv_private.h | 8 + > src/hyperv/hyperv_wmi.c | 709 +++++++++++- > src/hyperv/hyperv_wmi.h | 78 ++ > src/hyperv/hyperv_wmi_generator.input | 518 ++++++++- > src/hyperv/hyperv_wmi_generator.py | 68 +- > src/hyperv/openwsman.h | 4 + > 12 files changed, 3989 insertions(+), 51 deletions(-) > create mode 100644 src/hyperv/hyperv_driver_2012.c > create mode 100644 src/hyperv/hyperv_driver_2012.h > create mode 100644 src/hyperv/hyperv_network_driver.c > create mode 100644 src/hyperv/hyperv_network_driver.h

3 7

[libvirt] [PATCH] security: Fixing wrong label in virt-aa-helper.c.
by Julio Faracco 08 Sep '16

08 Sep '16

There is an issue with a wrong label inside vah_add_path(). The compilation fails with the error: make[3]: Entering directory '/tmp/libvirt/src' CC security/virt_aa_helper-virt-aa-helper.o security/virt-aa-helper.c: In function 'vah_add_path': security/virt-aa-helper.c:769:9: error: label 'clean' used but not defined goto clean; This patch moves 'clean' label to 'cleanup' label. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2aa6e28..fc01076 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -766,7 +766,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi } if (VIR_STRDUP_QUIET(perms_new, perms) < 0) - goto clean; + goto cleanup; if (strchr(perms_new, 'w') != NULL) { readonly = false; -- 2.7.4

2 2

[libvirt] [PATCH 0/2] qemu: Remove stale transient def when migration fails
by Jiri Denemark 08 Sep '16

08 Sep '16

If a migration of a domain which is already defined on the destination host failed early (before we tried to start QEMU), we would forget to remove the incoming transient definition. Later on when someone starts the domain on the destination host, we will use the stale incoming definition and the persistent definition will just be ignored. https://bugzilla.redhat.com/show_bug.cgi?id=1368774 Jiri Denemark (2): Add helper for removing transient definition qemu: Remove stale transient def when migration fails src/conf/domain_conf.c | 19 +++++++++++++++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/libxl/libxl_domain.c | 8 +------- src/lxc/lxc_process.c | 7 +------ src/qemu/qemu_migration.c | 4 ++++ src/qemu/qemu_process.c | 7 +------ src/test/test_driver.c | 9 ++------- src/uml/uml_driver.c | 14 ++------------ 9 files changed, 32 insertions(+), 38 deletions(-) -- 2.10.0

2 4

[libvirt] Opening a read-only connection - with SASL auth.
by Yaniv Kaul 08 Sep '16

08 Sep '16

Looking at the collectd virt plugin, it opens a read only connection with libvirt[1]. We'd like to use it with SASL auth. (which oVirt configures libvirt to use by default, with a simple username/password) - is that possible? TIA, Y. [1] https://github.com/collectd/collectd/blob/d782a871aca61ac966ee8d928930719bd…

1 0

[libvirt] [PATCH] Allow address lease query with inactive domain
by Amador Pahim 08 Sep '16

08 Sep '16

The <drive>DomainInterfaceAddresses, when using the source type LEASE, does not need the domain to be running. It only checks the dhcp lease file and gets the address information from a valid lease, if any. This patch removes the virDomainObjIsActive(vm) check from the LEASE query type on both qemu and lxc drivers, keeping it only for query type AGENT on qemu driver (since lxc does not support AGENT type). Signed-off-by: Amador Pahim <amador(a)pahim.org> --- src/libxl/libxl_driver.c | 6 ------ src/qemu/qemu_driver.c | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 480fef9..9f8c36a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6251,12 +6251,6 @@ libxlDomainInterfaceAddresses(virDomainPtr dom, if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - goto cleanup; - } - switch (source) { case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: ret = libxlGetDHCPInterfaces(dom, vm, ifaces); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 807e06d..a8dfa2f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19600,18 +19600,18 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - goto cleanup; - } - switch (source) { case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: ret = qemuGetDHCPInterfaces(dom, vm, ifaces); break; case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT: + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; -- 2.7.4

3 4

[libvirt] [PATCH] virt-admin: Document srv-list command in virt-admin's man page
by Erik Skultety 08 Sep '16

08 Sep '16

srv-list command was missing in the man page. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- tools/virt-admin.pod | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/virt-admin.pod b/tools/virt-admin.pod index 2199038..c74707a 100644 --- a/tools/virt-admin.pod +++ b/tools/virt-admin.pod @@ -143,6 +143,20 @@ libvirtd:///system is used. =back +=head1 DAEMON COMMANDS + +Following commands allow to monitor daemon's state as well as directly change +its internal configuration. + +=over 4 + +=item B<srv-list> + +Lists all manageable servers on daemon the client is currently connected to +through administration interface. + +=back + =head1 SERVER COMMANDS Following commands manipulate daemon's server internal configuration. -- 2.5.5

2 2

[libvirt] [PATCH] virt-admin: Fix some English grammar in the manpage
by Erik Skultety 08 Sep '16

08 Sep '16

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- tools/virt-admin.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Pushed as trivial. diff --git a/tools/virt-admin.pod b/tools/virt-admin.pod index 0195001..020eb51 100644 --- a/tools/virt-admin.pod +++ b/tools/virt-admin.pod @@ -159,7 +159,7 @@ currently connected to. =head1 SERVER COMMANDS -Following commands manipulate daemon's server internal configuration. +The following commands manipulate daemon's server internal configuration. The I<server> is specified by its name. =over 4 @@ -281,7 +281,7 @@ I<--max-clients>. =head1 CLIENT COMMANDS -Following commands provide management and monitoring of clients connected to +The following commands provide management and monitoring of clients connected to one of daemon's available servers. Clients are specified by their numeric ID which is obtained by listing all clients connected to a specified server (see command B<srv-clients-list>). -- 2.5.5

1 0

[libvirt] [libvirt-php][PATCH 0/8] Couple of php fixes
by Michal Privoznik 08 Sep '16

08 Sep '16

Pushed under php-autopush rule. Michal Privoznik (8): libvirt_domain_get_network_info: Don't overwrite retval libvirt_storagepool_get_autostart: Rework translate_counter_type: Rework libvirt_domain_block_commit: Reindent libvirt_domain_qemu_agent_command: Reindent libvirt_domain_disk_add: Reindent libvirt_domain_disk_remove: Reindent libvirt_list_storagepools: Reindent src/libvirt-php.c | 129 ++++++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 68 deletions(-) -- 2.8.4

1 8

[libvirt] [libvirt-php][PATCH] Don't leak @mime in libvirt_domain_get_screenshot_api
by Michal Privoznik 08 Sep '16

08 Sep '16

When getting a screenshot of a domain via virDomainScreenshot() the MIME type of a image is returned as a string which needs to be freed by caller. However, we are not doing that anywhere. ==24748== 48 bytes in 2 blocks are definitely lost in loss record 123 of 171 ==24748== at 0x4C29F80: malloc (vg_replace_malloc.c:296) ==24748== by 0x90674AB: xdr_string (xdr.c:790) ==24748== by 0xCD3AF1D: xdr_remote_nonnull_string (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0x9067B34: xdr_reference (xdr_ref.c:84) ==24748== by 0x9067C50: xdr_pointer (xdr_ref.c:135) ==24748== by 0xCD3B284: xdr_remote_string (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0xCD3D288: xdr_remote_domain_screenshot_ret (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0xCD5168E: virNetMessageDecodePayload (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0xCD47E91: virNetClientProgramCall (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0xCD1EBD3: callFull.isra.3 (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0xCD29973: remoteDomainScreenshot (in /usr/lib64/libvirt.so.0.2003.0) ==24748== by 0xCCDC24C: virDomainScreenshot (in /usr/lib64/libvirt.so.0.2003.0) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under php-autopush rule. src/libvirt-php.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 8edcb10..57ef1a0 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -4767,8 +4767,10 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) } #ifndef EXTWIN - if (mkstemp(file) == 0) + if (mkstemp(file) == 0) { + free(mime); RETURN_FALSE; + } #endif if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { @@ -4776,6 +4778,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) (fd = open(file, O_WRONLY|O_TRUNC, 0666)) < 0) { virStreamFree(st); set_error_if_unset("Cannot get create file to save domain screenshot" TSRMLS_CC); + free(mime); RETURN_FALSE; } } @@ -4783,6 +4786,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) if (virStreamRecvAll(st, streamSink, &fd) < 0) { virStreamFree(st); set_error_if_unset("Cannot receive screenshot data" TSRMLS_CC); + free(mime); RETURN_FALSE; } @@ -4791,6 +4795,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) if (virStreamFinish(st) < 0) { virStreamFree(st); set_error_if_unset("Cannot close stream for domain" TSRMLS_CC); + free(mime); RETURN_FALSE; } @@ -4816,6 +4821,8 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) VIRT_ADD_ASSOC_STRING(return_value, "file", file); VIRT_ADD_ASSOC_STRING(return_value, "mime", mime); } + + free(mime); } /* -- 2.8.4

1 0

[libvirt] [PATCH] Avoid segfault in virt-aa-helper when handling read-only mount filesystems
by rufo 07 Sep '16

07 Sep '16

This patch fixes a segfault in virt-aa-helper caused by attempting to modify a string literal in situ. It is triggered when a domain has a <filesystem> with type='mount' configured readonly, and libvirt is using the AppArmor security driver for sVirt confinement. --- src/security/virt-aa-helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 49e12b9..c22aa66 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -740,6 +740,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi bool readonly = true; bool explicit_deny_rule = true; char *sub = NULL; + char *perms_new = strdup(perms); if (path == NULL) return rc; @@ -764,12 +765,12 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi return rc; } - if (strchr(perms, 'w') != NULL) { + if (strchr(perms_new, 'w') != NULL) { readonly = false; explicit_deny_rule = false; } - if ((sub = strchr(perms, 'R')) != NULL) { + if ((sub = strchr(perms_new, 'R')) != NULL) { /* Don't write the invalid R permission, replace it with 'r' */ sub[0] = 'r'; explicit_deny_rule = false; @@ -787,7 +788,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi if (tmp[strlen(tmp) - 1] == '/') tmp[strlen(tmp) - 1] = '\0'; - virBufferAsprintf(buf, " \"%s%s\" %s,\n", tmp, recursive ? "/**" : "", perms); + virBufferAsprintf(buf, " \"%s%s\" %s,\n", tmp, recursive ? "/**" : "", perms_new); if (explicit_deny_rule) { virBufferAddLit(buf, " # don't audit writes to readonly files\n"); virBufferAsprintf(buf, " deny \"%s%s\" w,\n", tmp, recursive ? "/**" : ""); -- 2.9.3

4 5

[libvirt] [PATCH] Delete extra wrap after vol-reisize error
by Yanqiu Zhang 07 Sep '16

07 Sep '16

This patch is to delete the extra wrap "\n" after failed vol-reisize error, both "Failed to change size of volume to" and "Failed to change size of volume by". For error with wrap, there will be an extra wrap between two errors, such as: (1)# virsh vol-resize --pool default --vol vol-test 5M error: Failed to change size of volume 'vol-test' to 5M error: invalid argument: Can't shrink capacity below current capacity unless shrink flag explicitly specified (2)# virsh vol-resize /var/lib/libvirt/images/volds --shrink --delta 10M error: Failed to change size of volume 'volds' by 10M error: invalid argument: can't shrink capacity below existing allocation --- tools/virsh-volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index d35fee1..4b3b4d7 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1128,8 +1128,8 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) ret = true; } else { vshError(ctl, - delta ? _("Failed to change size of volume '%s' by %s\n") - : _("Failed to change size of volume '%s' to %s\n"), + delta ? _("Failed to change size of volume '%s' by %s") + : _("Failed to change size of volume '%s' to %s"), virStorageVolGetName(vol), capacityStr); ret = false; } -- 1.8.3.1

2 1

[libvirt] [libvirt-php][PATCH] libvirt_list_active_domains: Don't free domain before strduping its name
by Michal Privoznik 07 Sep '16

07 Sep '16

There's a bug in the implementation of libvirt_list_active_domains(). We try to return an array of names of active domains. So we iterate over array of domains as returned by libvirt and get each domain's name. But we don't obtain a duplicate of that name rather just a pointer into virDomain object. The very next thing we do is we free the virDomain object and then try to copy what's now invalid pointer. Reverse the order of those two actions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-php.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 2045c59..8edcb10 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -9128,18 +9128,15 @@ PHP_FUNCTION(libvirt_list_active_domains) domain=virDomainLookupByID(conn->conn,ids[i]); if (domain!=NULL) { - name=virDomainGetName(domain); - - if (virDomainFree (domain)) - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); - - if (name==NULL) - { - efree (ids); + if (!(name = virDomainGetName(domain))) { + efree(ids); RETURN_FALSE; } VIRT_ADD_NEXT_INDEX_STRING(return_value, name); + + if (virDomainFree(domain)) + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); } } efree(ids); -- 2.8.4

2 1

[libvirt] [libvirt-php] libvirt_list_active_domains returns garbage querying a Hyper-V host
by Fernando Casas Schössow 07 Sep '16

07 Sep '16

Hi all, I'm using libvirt-php to manage a Hyper-V 2012 R2 host. When trying to retrieve the active VMs using the function libvirt_list_active_domains() I get an array with the correct amount of items but with garbage instead of the domain names: Array ( [0] => P’*µ [1] => +µ [2] => `„*µ [3] => °Ø*µ [4] => Ð„*µ [5] => `†*µ [6] => [7] => `†*µ [8] => [9] => p+µ [10] => p"+µ [11] => P#+µ [12] => ß*µ ) On the other hand libvirt_list_inactive_domains() and libvirt_list_domains() work as expected returning the right amount of items and the domain names correctly: libvirt_list_inactive_domains() output: Array ( [0] => DCHOMELAB01 [1] => VMFCSW7 [2] => REMOTEAPP01 [3] => MPSSD01 [4] => CS16SVR ) Sofware versions: OS: CentOS Linux release 7.2.1511 (Core) Kernel: 3.10.0-327.28.2.el7.x86_64 PHP: 5.4.16-36.3 libvirt: 2.1.0 libvirt-php: 0.5.2 Node: Hyper-V 2012 R2 Thanks in advance for your replies. Fer

3 5

[libvirt] [PATCH] qemu_driver: protect existed save image
by Chen Hanxiao 07 Sep '16

07 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We may overwrite existed save image by 'virsh save' command. This patch will check qemu save headers before trying to rewrite it. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_driver.c | 141 +++++++++++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0ac2ef..56aa079 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2806,6 +2806,73 @@ bswap_header(virQEMUSaveHeaderPtr hdr) } +static int +qemuSaveHeaderCheck(int fd, + virQEMUSaveHeaderPtr header, + const char *path, + bool unlink_corrupt) +{ + int ret = -1; + + if (saferead(fd, header, sizeof(*header)) != sizeof(*header)) { + if (unlink_corrupt) { + if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { + virReportSystemError(errno, + _("cannot remove corrupt file: %s"), + path); + goto error; + } + return -3; + } + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("failed to read qemu header")); + goto error; + } + + if (memcmp((*header).magic, QEMU_SAVE_MAGIC, sizeof((*header).magic)) != 0) { + const char *msg = _("image magic is incorrect"); + + if (memcmp((*header).magic, QEMU_SAVE_PARTIAL, + sizeof((*header).magic)) == 0) { + msg = _("save image is incomplete"); + if (unlink_corrupt) { + if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { + virReportSystemError(errno, + _("cannot remove corrupt file: %s"), + path); + goto error; + } + return -3; + } + } + virReportError(VIR_ERR_OPERATION_FAILED, "%s", msg); + goto error; + } + + if ((*header).version > QEMU_SAVE_VERSION) { + /* convert endianess and try again */ + bswap_header(header); + } + + if ((*header).version > QEMU_SAVE_VERSION) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("image version is not supported (%d > %d)"), + (*header).version, QEMU_SAVE_VERSION); + goto error; + } + + if ((*header).xml_len <= 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("invalid XML length: %d"), (*header).xml_len); + goto error; + } + + ret = 0; + + error: + return ret; +} + /* return -errno on failure, or 0 on success */ static int qemuDomainSaveHeader(int fd, const char *path, const char *xml, @@ -2827,6 +2894,7 @@ qemuDomainSaveHeader(int fd, const char *path, const char *xml, _("failed to write xml to '%s'"), path); goto endjob; } + endjob: return ret; } @@ -3067,6 +3135,24 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; } } + + /* don't overwrite exsited save files */ + if (virFileExists(path)) { + virQEMUSaveHeader header_tmp; + fd = qemuOpenFile(driver, NULL, path, O_RDONLY, NULL, NULL); + if (fd < 0) + goto cleanup; + + if (qemuSaveHeaderCheck(fd, &header_tmp, path, false) >= 0) { + ret = -EEXIST; + virReportError(VIR_ERR_OPERATION_FAILED, + _("failed to write existed image file '%s'"), + path); + goto cleanup; + } + VIR_FORCE_CLOSE(fd); + } + fd = qemuOpenFile(driver, vm, path, O_WRONLY | O_TRUNC | O_CREAT | directFlag, &needUnlink, &bypassSecurityDriver); @@ -6327,6 +6413,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, bool unlink_corrupt) { int fd = -1; + int ret = -1; virQEMUSaveHeader header; char *xml = NULL; virDomainDefPtr def = NULL; @@ -6353,58 +6440,8 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, VIR_FILE_WRAPPER_BYPASS_CACHE))) goto error; - if (saferead(fd, &header, sizeof(header)) != sizeof(header)) { - if (unlink_corrupt) { - if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { - virReportSystemError(errno, - _("cannot remove corrupt file: %s"), - path); - goto error; - } - return -3; - } - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("failed to read qemu header")); + if ((ret = qemuSaveHeaderCheck(fd, &header, path, unlink_corrupt)) < 0) goto error; - } - - if (memcmp(header.magic, QEMU_SAVE_MAGIC, sizeof(header.magic)) != 0) { - const char *msg = _("image magic is incorrect"); - - if (memcmp(header.magic, QEMU_SAVE_PARTIAL, - sizeof(header.magic)) == 0) { - msg = _("save image is incomplete"); - if (unlink_corrupt) { - if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { - virReportSystemError(errno, - _("cannot remove corrupt file: %s"), - path); - goto error; - } - return -3; - } - } - virReportError(VIR_ERR_OPERATION_FAILED, "%s", msg); - goto error; - } - - if (header.version > QEMU_SAVE_VERSION) { - /* convert endianess and try again */ - bswap_header(&header); - } - - if (header.version > QEMU_SAVE_VERSION) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("image version is not supported (%d > %d)"), - header.version, QEMU_SAVE_VERSION); - goto error; - } - - if (header.xml_len <= 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("invalid XML length: %d"), header.xml_len); - goto error; - } if (VIR_ALLOC_N(xml, header.xml_len) < 0) goto error; @@ -6439,7 +6476,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, VIR_FORCE_CLOSE(fd); virObjectUnref(caps); - return -1; + return ret; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) -- 1.8.3.1

2 2

[libvirt] NPIV storage pools do not map to same LUN units across hosts.
by Nitesh Konkar 07 Sep '16

07 Sep '16

Link: http://wiki.libvirt.org/page/NPIV_in_libvirt Topic: Virtual machine configuration change to use vHBA LUN There is a NPIV storage pool defined on two hosts and pool contains a total of 8 volumes, allocated from a storage device. Source: # virsh vol-list poolvhba0 Name Path ------------------------------------------------------------------------------ unit:0:0:0 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000366 unit:0:0:1 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000367 unit:0:0:2 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000368 unit:0:0:3 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000369 unit:0:0:4 /dev/disk/by-id/wwn-0x6005076802818bda300000000000036a unit:0:0:5 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000380 unit:0:0:6 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000381 unit:0:0:7 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000382 -------------------------------------------------------------------- Destination: -------------------------------------------------------------------- # virsh vol-list poolvhba0 Name Path ------------------------------------------------------------------------------ unit:0:0:0 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000380 unit:0:0:1 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000381 unit:0:0:2 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000382 unit:0:0:3 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000367 unit:0:0:4 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000368 unit:0:0:5 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000366 unit:0:0:6 /dev/disk/by-id/wwn-0x6005076802818bda300000000000036a unit:0:0:7 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000369 -------------------------------------------------------------------- As you can see in the above output,the same set of eight LUNs from the storage server have been mapped, but the order that the LUNs are probed on each host is different, resulting in different unit names on the two different hosts . If the the guest XMLs is referencing its storage by "unit" number then is it safe to migrate such guests because the "unit number" is assigned by the driver according to the specific way it probes the storage and hence when you migrate these guests , it results in different unit names on the destination hosts. Thus the migrated guest gets mapped to the wrong LUNs and is given the wrong disks. The problem is that the LUN numbers on the destination host and source host do not agree. Example, LUN 0 on source_host, for example, may be LUN 5 on destination_host. When the guest is given the wrong disk, it suffers a fatal I/O error. (This is manifested as fatal I/O errors since the guest has no idea that its disks just changed out under it.)The migration does not take into account that the unit numbers do match on on the source and destination sides. So, should libvirt make sure that the guest domains reference NPIV pool volumes by their globally-unique wwn instead of by "unit" numbers? The guest XML references its storage by "unit" number. Eg:- <disk type='volume' device='lun'> <driver name='qemu' type='raw' cache='none'/> <source pool='poolvhba0' volume='unit:0:0:0'/> <backingStore/> <target dev='vdb' bus='virtio'/> <alias name='virtio-disk1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </disk> I am planning to write a patch for it. Any comments on the above observation/approach would be appreciated. Thanks, Nitesh.

2 1

[libvirt] [PATCH] virt-admin: Output srv-clients-set data as unsigned int rather than signed
by Erik Skultety 07 Sep '16

07 Sep '16

Unfortunately, commit a8962f70 only fixed first half of the reported issue of virt-admin outputting negative values where unsigned int is expected by BZ below, so this commit represents the other missing half of the fix. resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1356769 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under trivial rule. Erik tools/virt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 513054b..12ec057 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -857,7 +857,7 @@ cmdSrvClientsInfo(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < nparams; i++) - vshPrint(ctl, "%-20s: %d\n", params[i].field, params[i].value.ui); + vshPrint(ctl, "%-20s: %u\n", params[i].field, params[i].value.ui); ret = true; -- 2.5.5

1 0

[libvirt] [libvirt-php] libvirt_connect not reading out credential info on 0.5.2
by Fernando Casas Schössow 07 Sep '16

07 Sep '16

I'm running libvirt-php 0.5.2 on CentOS 7 with libvirt 2.1.0. Using virsh I'm able to connect to hyper-v hosts correctly but using libvirt-php it fails during authentication since it seems that the credentials are not being passed along. This is the php code I'm using: <?php $logfile = 'test.log'; unlink($logfile); if (!libvirt_logfile_set($logfile)) die('Cannot set the log file'); $connstr = 'hyperv://user@hyperv-host/?transport=http'; $credentials = array(VIR_CRED_AUTHNAME=>'Administrator',VIR_CRED_PASSPHRASE=>'somepass'); $conn = libvirt_connect($connstr, false, $credentials); echo libvirt_get_last_error(); unset($conn); $fp = fopen($logfile, 'r'); $str = fread($fp, filesize($logfile)); fclose($fp); echo '<pre>'; echo $str; print_r($credentials); echo '</pre>'; ?> And this is the output: authentication failed: Password request failed [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_connect: Found 0 elements for credentials [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_virConnectAuthCallback: cred 0, type 5, prompt Enter Administrator's password for hyperv-host challenge hyperv-host [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_virConnectAuthCallback: result (null) (0) [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_connect: Cannot establish connection to hyperv://Administrator@hyperv-host/?transport=http Array ( [2] => Administrator [5] => somepass ) Note the "Found 0 elements for credentials". After doing some googling I found an email thread "[libvirt] [libvirt-php PATCH 0/3] Fix PHP5 compatibilty issues." that I think is related to my problem, especially patch 2/3. I also checked github project and saw that those patches are already merged in the code so I went ahead and apply them to 0.5.2 source code and rebuild: use VIRT_FOREACH macros everywhere - Commit: f4b760d libvirt_connect: use loop macros to read cred info - Commit: d704106 Define macros for looping php hash tables - Commit: 673a0bf The build went fine but now when I'm trying to connect to the hyper-v host using libvirt-php I get an internal server error (500) so it seems PHP is crashing. From the system log I see: kernel: traps: php-cgi[43452] general protection ip:7f63907f74a0 sp:7fff12d61f68 error:0 in libvirt.so.0.2001.0[7f6390735000+385000] Is there any other patch that I'm missing? Any ideas on how to fix the libvirt_connect credentials issue without applying the patches above? Sofware versions: OS: CentOS Linux release 7.2.1511 (Core) Kernel: 3.10.0-327.28.2.el7.x86_64 PHP: 5.4.16-36.3.el7_2.x86_64 libvirt: 2.1.0-4.1.x86_64 libvirt-php: 0.5.2 Thanks in advance for your replies. Fer

2 12

[libvirt] [PATCH] util: fix crash in virClassIsDerivedFrom for CloseCallbacks objects
by Maxim Nestratov 07 Sep '16

07 Sep '16

There is a possibility that qemu driver frees by unreferencing its closeCallbacks pointer as it has the only reference to the object, while in fact not all users of CloseCallbacks called thier virCloseCallbacksUnset. Backtrace is the following: Thread #1: 0 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 1 in virCondWait (c=<optimized out>, m=<optimized out>) at util/virthread.c:154 2 in virThreadPoolFree (pool=0x7f0810110b50) at util/virthreadpool.c:266 3 in qemuStateCleanup () at qemu/qemu_driver.c:1116 4 in virStateCleanup () at libvirt.c:808 5 in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1660 Thread #2: 0 in virClassIsDerivedFrom (klass=0xdeadbeef, parent=0x7f0837c694d0) at util/virobject.c:169 1 in virObjectIsClass (anyobj=anyobj@entry=0x7f08101d4760, klass=<optimized out>) at util/virobject.c:365 2 in virObjectLock (anyobj=0x7f08101d4760) at util/virobject.c:317 3 in virCloseCallbacksUnset (closeCallbacks=0x7f08101d4760, vm=vm@entry=0x7f08101d47b0, cb=cb@entry=0x7f081d078fc0 <qemuProcessAutoDestroy>) at util/virclosecallbacks.c:163 4 in qemuProcessAutoDestroyRemove (driver=driver@entry=0x7f081018be50, vm=vm@entry=0x7f08101d47b0) at qemu/qemu_process.c:6368 5 in qemuProcessStop (driver=driver@entry=0x7f081018be50, vm=vm@entry=0x7f08101d47b0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=flags@entry=0) at qemu/qemu_process.c:5854 6 in processMonitorEOFEvent (vm=0x7f08101d47b0, driver=0x7f081018be50) at qemu/qemu_driver.c:4585 7 qemuProcessEventHandler (data=<optimized out>, opaque=0x7f081018be50) at qemu/qemu_driver.c:4629 8 in virThreadPoolWorker (opaque=opaque@entry=0x7f0837c4f820) at util/virthreadpool.c:145 9 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 10 in start_thread () from /lib64/libpthread.so.0 Let's reference CloseCallbacks object in virCloseCallbacksSet and unreference in virCloseCallbacksUnset. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/util/virclosecallbacks.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 82d4071..891a92b 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -141,6 +141,7 @@ virCloseCallbacksSet(virCloseCallbacksPtr closeCallbacks, virObjectRef(vm); } + virObjectRef(closeCallbacks); ret = 0; cleanup: virObjectUnlock(closeCallbacks); @@ -180,6 +181,8 @@ virCloseCallbacksUnset(virCloseCallbacksPtr closeCallbacks, ret = 0; cleanup: virObjectUnlock(closeCallbacks); + if (!ret) + virObjectUnref(closeCallbacks); return ret; } -- 2.4.11

2 4

[libvirt] [PATCH] qemu: guest agent: introduce new error code VIR_ERR_AGENT_UNSYNCED
by Maxim Nestratov 07 Sep '16

07 Sep '16

From: Yuri Pudgorodskiy <yur(a)virtuozzo.com> A separate error code will help recognize real failures from necessity to try again Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- include/libvirt/virterror.h | 2 ++ src/qemu/qemu_agent.c | 6 +++--- src/util/virerror.c | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 2ec560e..efe83aa 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -315,6 +315,8 @@ typedef enum { VIR_ERR_AUTH_UNAVAILABLE = 94, /* authentication unavailable */ VIR_ERR_NO_SERVER = 95, /* Server was not found */ VIR_ERR_NO_CLIENT = 96, /* Client was not found */ + VIR_ERR_AGENT_UNSYNCED = 97, /* guest agent replies with wrong id + to guest-sync command */ } virErrorNumber; /** diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index eeede6b..fdc4fed 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -966,21 +966,21 @@ qemuAgentGuestSync(qemuAgentPtr mon) goto cleanup; if (!sync_msg.rxObject) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNSYNCED, "%s", _("Missing monitor reply object")); goto cleanup; } if (virJSONValueObjectGetNumberUlong(sync_msg.rxObject, "return", &id_ret) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNSYNCED, "%s", _("Malformed return value")); goto cleanup; } VIR_DEBUG("Guest returned ID: %llu", id_ret); if (id_ret != id) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_AGENT_UNSYNCED, _("Guest agent returned ID: %llu instead of %llu"), id_ret, id); goto cleanup; diff --git a/src/util/virerror.c b/src/util/virerror.c index 1177570..2958308 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1394,6 +1394,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("Client not found: %s"); break; + case VIR_ERR_AGENT_UNSYNCED: + if (info == NULL) + errmsg = _("guest agent replied with wrong id to guest-sync command"); + else + errmsg = _("guest agent replied with wrong id to guest-sync command: %s"); + break; } return errmsg; } -- 2.4.11

3 4

[libvirt] [PATCH] virsh: use virConnectGetDomainCapabilities with maxvcpus
by Shivaprasad G Bhat 07 Sep '16

07 Sep '16

virsh maxvcpus --type kvm output is useless on PPC. Also, in commit e6806d79 we documented not rely on virConnectGetMaxVcpus output. Fix the maxvcpus to use virConnectGetDomainCapabilities now to make it useful. The call is made to use the default emulator binary and to check for the host machine and arch which is what the command intends to show anyway. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- tools/virsh-host.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 57f0c0e..505cfbb 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -607,16 +607,38 @@ cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { const char *type = NULL; int vcpus; + char *caps = NULL; + const unsigned int flags = 0; /* No flags so far */ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; virshControlPtr priv = ctl->privData; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) return false; - if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) - return false; + caps = virConnectGetDomainCapabilities(priv->conn, NULL, NULL, NULL, type, flags); + if (caps) { + xml = virXMLParseStringCtxt(caps, _("(domainCapabilities)"), &ctxt); + if (!xml) { + VIR_FREE(caps); + return false; + } - vshPrint(ctl, "%d\n", vcpus); + virXPathInt("string(./vcpu[1]/@max)", ctxt, &vcpus); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(caps); + } else { + if (last_error && last_error->code != VIR_ERR_NO_SUPPORT) + return false; + + vshResetLibvirtError(); + if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) + return false; + } + + vshPrint(ctl, "%d\n", vcpus); return true; }

2 2

[libvirt] [PATCH] tools: Pass opaque data in vshCompleter and introduce autoCompleteOpaque
by Nishith Shah 06 Sep '16

06 Sep '16

This patch changes the signature of vshCompleters, allowing to pass along some data that we might want to along with the completers; for example, we might want to pass the autocomplete vshControl along with the completer, in case the completer requires a connection to libvirtd. Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com> --- tools/vsh.c | 10 +++++++++- tools/vsh.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 3157922..3cc03ec 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -64,6 +64,11 @@ # define SA_SIGINFO 0 #endif +#ifdef WITH_READLINE +/* For autocompletion */ +void *autoCompleteOpaque; +#endif + /* NOTE: It would be much nicer to have these two as part of vshControl * structure, unfortunately readline doesn't support passing opaque data * and only relies on static data accessible from the user-side callback @@ -2808,7 +2813,8 @@ vshReadlineParse(const char *text, int state) res = vshReadlineOptionsGenerator(sanitized_text, state, cmd); } else if (non_bool_opt_exists && data_complete && opt->completer) { if (!completed_list) - completed_list = opt->completer(opt->completer_flags); + completed_list = opt->completer(autoCompleteOpaque, + opt->completer_flags); if (completed_list) { while ((completed_name = completed_list[completed_list_index])) { completed_list_index++; @@ -2858,6 +2864,8 @@ vshReadlineInit(vshControl *ctl) char *histsize_env = NULL; const char *histsize_str = NULL; + /* Opaque data for autocomplete callbacks and connections to libvirtd */ + autoCompleteOpaque = ctl; /* Allow conditional parsing of the ~/.inputrc file. * Work around ancient readline 4.1 (hello Mac OS X), * which declared it as 'char *' instead of 'const char *'. diff --git a/tools/vsh.h b/tools/vsh.h index 7f43055..e53910f 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -123,7 +123,7 @@ typedef struct _vshCmdOpt vshCmdOpt; typedef struct _vshCmdOptDef vshCmdOptDef; typedef struct _vshControl vshControl; -typedef char **(*vshCompleter)(unsigned int flags); +typedef char **(*vshCompleter)(void *opaque, unsigned int flags); /* * vshCmdInfo -- name/value pair for information about command -- 2.1.4

2 1

[libvirt] [PATCH] util: hostcpu: improve CPU freq code for FreeBSD
by Roman Bogorodskiy 06 Sep '16

06 Sep '16

Current implementation uses the dev.cpu.0.freq sysctl that is provided by the cpufreq(4) framework and returns the actual CPU frequency. However, there are environment where it's not available, e.g. when running nested in KVM. In this case fall back to hw.clockrate that reports CPU frequency at the boot time. Resolves (hopefully): https://bugzilla.redhat.com/show_bug.cgi?id=1369964 --- src/util/virhostcpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 0f03ff8..b5a37a8 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -994,9 +994,16 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, *threads = 1; # ifdef __FreeBSD__ + /* dev.cpu.%d.freq reports current active CPU frequency. It is provided by + * the cpufreq(4) framework. However, it might be disabled or no driver + * available. In this case fallback to "hw.clockrate" which reports boot time + * CPU frequency. */ + if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { - virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); - return -1; + if (sysctlbyname("hw.clockrate", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { + virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); + return -1; + } } *mhz = cpu_freq; -- 2.7.4

2 2

[libvirt] [PATCH] virsh: Fix *-event error string
by Christophe Fergeau 06 Sep '16

06 Sep '16

When using virsh net-event non-existing-net the error message says that 'either --list or event type is required' This is misleading as 'virsh net-event $valid-event-type' is not going to work either. What is expected is 'virsh net-event --event $valid-event-type' This commit fixes the string in pool-event, nodedev-event, event, and net-event. --- tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a614512..702a8bd8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12694,7 +12694,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) } } else if (!all) { vshError(ctl, "%s", - _("one of --list, --all, or event type is required")); + _("one of --list, --all, or --event type is required")); return false; } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index eec7faf..c6bd132 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1238,7 +1238,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } if ((event = virshNetworkEventIdTypeFromString(eventName)) < 0) { diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 805c0ff..0e695b9 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -903,7 +903,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index d25851e..70b2bdd 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -2057,7 +2057,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } -- 2.7.4

2 2

[libvirt] qapi DEVICE_DELETED event issued *before* instance_finalize?!
by Alex Williamson 06 Sep '16

06 Sep '16

Hey, I'm out of my QOM depth, so I'll just beg for help in advance. I noticed in testing vfio-pci hotunplug that the host seems to be trying to reclaim the device before QEMU is actually done with it, there's a very short race where libvirt has seen the DEVICE_DELETED event and tries to unbind the physical device from vfio-pci, the use count is clearly non-zero because the host driver tries to send a device request, but that event channel has already been torn down. Nearly immediately after, QEMU finally releases the device, but we can't do a proper reset due to some issues with device references in the kernel. When I run gdb on QEMU with breakpoints at qapi_event_send_device_deleted() and vfio_instance_finalize(), the QAPI even happens first. Clearly this is horribly wrong, right? I can't unmap my references to the vfio device file until my instance_finalize is called, so I'm always going to have that open when libvirt takes the DEVICE_DELETED event as a cue to return the device to host drivers. The call chains look like this: #0 qapi_event_send_device_deleted (has_device=true, device=0x7f5ca3e36fb0 "hostdev0", path=0x7f5c89e84fe0 "/machine/peripheral/hostdev0", errp=0x7f5ca241f9e8 <error_abort>) at qapi-event.c:412 #1 0x00007f5ca1701608 in device_unparent (obj=0x7f5ca43ffc00) at hw/core/qdev.c:1115 #2 0x00007f5ca18b7891 in object_finalize_child_property (obj=0x7f5ca380f500, name=0x7f5ca3f21da0 "hostdev0", opaque=0x7f5ca43ffc00) at qom/object.c:1362 #3 0x00007f5ca18b56b2 in object_property_del_child (obj=0x7f5ca380f500, child=0x7f5ca43ffc00, errp=0x0) at qom/object.c:422 #4 0x00007f5ca18b5790 in object_unparent (obj=0x7f5ca43ffc00) at qom/object.c:441 #5 0x00007f5ca16c1f31 in acpi_pcihp_eject_slot (s=0x7f5ca4c41268, bsel=0, slots=4) at hw/acpi/pcihp.c:139 #0 vfio_instance_finalize (obj=0x7f5ca43ffc00) at /net/gimli/home/alwillia/Work/qemu.git/hw/vfio/pci.c:2731 #1 0x00007f5ca18b57c0 in object_deinit (obj=0x7f5ca43ffc00, type=0x7f5ca376f490) at qom/object.c:448 #2 0x00007f5ca18b5831 in object_finalize (data=0x7f5ca43ffc00) at qom/object.c:462 #3 0x00007f5ca18b6782 in object_unref (obj=0x7f5ca43ffc00) at qom/object.c:896 #4 0x00007f5ca1550cc0 in memory_region_unref (mr=0x7f5ca43fff00) at /net/gimli/home/alwillia/Work/qemu.git/memory.c:1476 #5 0x00007f5ca1553886 in do_address_space_destroy (as=0x7f5ca43ffe10) at /net/gimli/home/alwillia/Work/qemu.git/memory.c:2272 It appears that DEVICE_DELETED only means the VM is done with the device but libvirt is interpreting it as QEMU is done with the device. Which is correct? Do we need a new event or do we need to fix the ordering of this event? An ordering fix would be more compatible with existing libvirt. Thanks, Alex

5 8

[libvirt] virt-admin commands aliases
by Erik Skultety 06 Sep '16

06 Sep '16

Hi there, after my presentation at KVM Forum, it was pointed out from the audience that we might think about doing something about the naming of the virt-admin's comands, since there is some sort of inconsistency: srv- vs. client- vs. dmn- (not merged yet). When I sent patches to upstream I already knew that the naming was not optimal, but I didn't come up with anything better so I hoped that the reviewer might think of something better which unfortunately did not happen. Anyway, there are multiple options how this can be approached but I'm not 100% satisfied with neither of them: 1) rename the commands completely Although clean, obviously this is the non-preferred option because this would break any backwards compatibility however, I think there is a fair chance that people haven't actually started using it yet (although that might change between 7.3 and 7.4). 2) create aliases for non-abbreviated forms of the commands That way, srv- would become server- and dmn- would become daemon-. However, by doing this we'll end up with 6 almost identical entries in the commands structure which might be error-prone once we decide to add/create&add a flag to the command primitive, since the flag would have to be added both to the alias and to the original (unlikely, but possible that someone might forget about that) 3) abbreviate client- to something like clnt- Identical to the above except for the amount of duplicate entries which would be reduced to 2 4) leave it as is if such a consensus is reached and accepted I guess this does no need any additional comments. Thanks for any ideas. Erik

4 6

[libvirt] [PATCH] qemu: Don't warn about missing device in DEVICE_DELETED event
by Jiri Denemark 06 Sep '16

06 Sep '16

Debug priority is good enough for this. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3d0a120..8384314 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -941,7 +941,7 @@ qemuMonitorJSONHandleDeviceDeleted(qemuMonitorPtr mon, virJSONValuePtr data) const char *device; if (!(device = virJSONValueObjectGetString(data, "device"))) { - VIR_WARN("missing device in device deleted event"); + VIR_DEBUG("missing device in device deleted event"); return; } -- 2.10.0

2 1

[libvirt] [PATCH 0/2] util: storage: Fixes for the JSON pseudo protocol parser
by Peter Krempa 06 Sep '16

06 Sep '16

Gluster protocol type was not set properly and the RBD protocol was missing. Peter Krempa (2): util: storage: Properly set protocol type when parsing gluster json string util: storage: Add json pseudo protocol support for legacy RBD strings src/util/virstoragefile.c | 26 ++++++++++++++++++++++++++ tests/virstoragetest.c | 10 ++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) -- 2.9.2

2 3

[libvirt] [PATCH] docs: Add libvirt-go Go bindings to binding page
by Roman Mohr 06 Sep '16

06 Sep '16

Signed-off-by: Roman Mohr <rmohr(a)redhat.com> --- docs/bindings.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 95cfe25..7fe26df 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -14,6 +14,10 @@ <strong>C#</strong>: Arnaud Champion develops <a href="csharp.html">C# bindings</a>. </li> + <li> + <strong>Go</strong>: Kyle Kelley et al. are developing + <a href="https://github.com/rgbkrk/libvirt-go">Go bindings</a>. + </li> <li> <strong>Java</strong>: Daniel Veillard develops <a href="java.html">Java bindings</a>. -- 2.5.5

2 1

[libvirt] [PATCH 0/2] Improve handling of QEMU core dumping
by Daniel P. Berrange 06 Sep '16

06 Sep '16

Daniel P. Berrange (2): qemu: add a max_core setting to qemu.conf for core dump size qemu: allow turning off QEMU guest RAM dump globally src/libvirt_private.syms | 2 ++ src/qemu/libvirtd_qemu.aug | 5 +++++ src/qemu/qemu.conf | 31 +++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 18 ++++++++++++------ src/qemu/qemu_conf.c | 20 ++++++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_process.c | 1 + src/qemu/test_libvirtd_qemu.aug.in | 2 ++ src/util/vircommand.c | 14 ++++++++++++++ src/util/vircommand.h | 1 + src/util/virprocess.c | 36 ++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 1 + tests/qemuxml2argvtest.c | 4 ++++ 13 files changed, 131 insertions(+), 6 deletions(-) -- 2.7.4

3 6

[libvirt] [PATCH] Prefix major/minor with gnu_dev_
by Michal Privoznik 06 Sep '16

06 Sep '16

In the latest glibc, major() and minor() functions are marked as deprecated (glibc commit dbab6577): CC util/libvirt_util_la-vircgroup.lo util/vircgroup.c: In function 'virCgroupGetBlockDevString': util/vircgroup.c:768:5: error: '__major_from_sys_types' is deprecated: In the GNU C Library, `major' is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use `major', include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro `major', you should #undef it after including <sys/types.h>. [-Werror=deprecated-declarations] if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) ^~ In file included from /usr/include/features.h:397:0, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:28, from ../gnulib/lib/stdio.h:43, from util/vircgroup.c:26: /usr/include/sys/sysmacros.h:87:1: note: declared here __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_FST_IMPL_TEMPL) ^ Applications are supposed to use gnu_dev_major() or gnu_dev_minor() respectively. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_audit.c | 4 ++-- src/lxc/lxc_controller.c | 10 +++++----- src/lxc/lxc_driver.c | 26 +++++++++++++------------- src/util/vircgroup.c | 10 +++++----- src/util/virutil.c | 6 +++--- tests/vircgroupmock.c | 16 ++++++++-------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac..d0bfa58 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -52,8 +52,8 @@ virDomainAuditGetRdev(const char *path) if (stat(path, &sb) == 0 && (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { - int maj = major(sb.st_rdev); - int min = minor(sb.st_rdev); + int maj = gnu_dev_major(sb.st_rdev); + int min = gnu_dev_minor(sb.st_rdev); ignore_value(virAsprintfQuiet(&ret, "%02X:%02X", maj, min)); } return ret; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 825b4d4..3bf7eb2 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1520,7 +1520,7 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) LXC_STATE_DIR, ctrl->def->name, devs[i].path) < 0) goto cleanup; - dev_t dev = makedev(devs[i].maj, devs[i].min); + dev_t dev = gnu_dev_makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || chmod(path, devs[i].mode)) { virReportSystemError(errno, @@ -1592,7 +1592,7 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, } VIR_DEBUG("Creating dev %s (%d,%d)", - dstfile, major(sb.st_rdev), minor(sb.st_rdev)); + dstfile, gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dstfile, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1672,7 +1672,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, mode = 0700 | S_IFBLK; VIR_DEBUG("Creating dev %s (%d,%d)", dst, - major(sb.st_rdev), minor(sb.st_rdev)); + gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1751,7 +1751,7 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, mode = 0700 | S_IFCHR; VIR_DEBUG("Creating dev %s (%d,%d)", dst, - major(sb.st_rdev), minor(sb.st_rdev)); + gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1911,7 +1911,7 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl, * to that normally implied by the device name */ VIR_DEBUG("Creating dev %s (%d,%d) from %s", - dst, major(sb.st_rdev), minor(sb.st_rdev), tmpsrc); + dst, gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev), tmpsrc); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index da98b38..3fe79fd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3714,7 +3714,7 @@ lxcDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, * to that normally implied by the device name */ VIR_DEBUG("Creating dev %s (%d,%d)", - data->file, major(data->dev), minor(data->dev)); + data->file, gnu_dev_major(data->dev), gnu_dev_minor(data->dev)); if (mknod(data->file, data->mode, data->dev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -3895,8 +3895,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms) < 0) goto cleanup; @@ -3915,8 +3915,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, file) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms) < 0) VIR_WARN("cannot deny device %s for domain %s", src, vm->def->name); @@ -4152,8 +4152,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) goto cleanup; @@ -4165,8 +4165,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, def->source.caps.u.storage.block) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); @@ -4221,8 +4221,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'c', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) goto cleanup; @@ -4237,8 +4237,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, def->source.caps.u.misc.chardev) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'c', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f2477d5..f4f6a01 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -765,7 +765,7 @@ virCgroupGetBlockDevString(const char *path) /* Automatically append space after the string since all callers * use it anyway */ - if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) + if (virAsprintf(&ret, "%d:%d ", gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)) < 0) return NULL; return ret; @@ -2941,8 +2941,8 @@ virCgroupAllowDevicePath(virCgroupPtr group, return virCgroupAllowDevice(group, S_ISCHR(sb.st_mode) ? 'c' : 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms); } @@ -3032,8 +3032,8 @@ virCgroupDenyDevicePath(virCgroupPtr group, return virCgroupDenyDevice(group, S_ISCHR(sb.st_mode) ? 'c' : 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms); } diff --git a/src/util/virutil.c b/src/util/virutil.c index 170dd59..b0770bc 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1616,7 +1616,7 @@ virIsDevMapperDevice(const char *dev_name) if (!stat(dev_name, &buf) && S_ISBLK(buf.st_mode) && - dm_is_dm_major(major(buf.st_rdev))) + dm_is_dm_major(gnu_dev_major(buf.st_rdev))) return true; return false; @@ -1664,9 +1664,9 @@ virGetDeviceID(const char *path, int *maj, int *min) return -EINVAL; if (maj) - *maj = major(sb.st_rdev); + *maj = gnu_dev_major(sb.st_rdev); if (min) - *min = minor(sb.st_rdev); + *min = gnu_dev_minor(sb.st_rdev); return 0; } diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index ce6fd46..8f69047 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -562,11 +562,11 @@ int __lxstat(int ver, const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real___lxstat(ver, path, sb); @@ -593,11 +593,11 @@ int lstat(const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real_lstat(path, sb); @@ -624,11 +624,11 @@ int __xstat(int ver, const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real___xstat(ver, path, sb); @@ -661,11 +661,11 @@ int stat(const char *path, struct stat *sb) } } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { if (!(newpath = strdup(path))) -- 2.8.4

3 2

[libvirt] Nice golang bindings for libvirt
by Roman Mohr 06 Sep '16

06 Sep '16

Hi all, I have been using these pretty nice libvirt-binding library for golang [1]. It is under active development, pretty well maintained and has a very nice travis setup to run tests against libvirt [2]. I was wondering if the bindings could be added to [3] on libvirt.org. Best Regards, Roman [1] https://github.com/rgbkrk [2] https://github.com/rgbkrk/libvirt-go/blob/master/.travis.yml [3] https://libvirt.org/bindings.html

2 2

[libvirt] [libvirt-glib/libvirt-gconfig 00/17] Graphics: Introduce the new Remote and Local classes (and also implement a few missing methods).
by Fabiano Fidêncio 06 Sep '16

06 Sep '16

While trying to use libvirt-gobject and libvirt-gconfig for accessing VMs and looking at their config, instead of using libvirt and parsing XML directly, I found out that a few methods have been missing and that libvirt-gconfig is not exactly thought for the "reading their config" use case (see more explanations on the 10th and 14th commits. This series, unfortunately, introduces an ABI breakage. Fabiano Fidêncio (17): gconfig: Implement gvir_config_domain_graphics_vnc_get_autoport() gconfig: Implement gvir_config_domain_graphics_spice_get_autoport() gconfig: Implement gvir_config_domain_graphics_rdp_get_autoport() gconfig: Implement gvir_config_domain_graphics_sdl_get_display() gconfig: Implement gvir_config_domain_graphics_sdl_get_fullscreen() gconfig: Implement gvir_config_domain_graphics_spice_get_tls_port() gconfig: Implement gvir_config_domain_graphics_spice_{get,set}_host() gconfig: Implement gvir_config_domain_graphics_vnc_{get,set}_host() gconfig: Implement gvir_config_domain_graphics_rdp_{get,set}_host() gconfig: Add GVirCofigDomainGraphicsRemote class gconfig: Adapt GVirConfigDomainGraphicsSpice to GVirConfigDomainGraphicsRemote gconfig: Adapt GVirConfigDomainGraphicsRdp to GVirConfigDomainGraphicsRemote gconfig: Adapt GVirConfigDomainGraphicsVnc to GVirConfigDomainGraphicsRemote gconfig: Add GVirCofigDomainGraphicsLocal class gconfig: Adapt GVirConfigDomainGraphicsSdl to GVirConfigDomainGraphicsLocal gconfig: Adapt GVirConfigDomainGraphicsDesktop to GVirConfigDomainGraphicsLocal gconfig,graphics: Avoid crash when gvir_config_object_new_from_xml() returns NULL libvirt-gconfig/Makefile.am | 4 + .../libvirt-gconfig-domain-graphics-desktop.c | 14 ++- .../libvirt-gconfig-domain-graphics-desktop.h | 4 +- .../libvirt-gconfig-domain-graphics-local.c | 97 +++++++++++++++++++ .../libvirt-gconfig-domain-graphics-local.h | 68 ++++++++++++++ .../libvirt-gconfig-domain-graphics-rdp.c | 32 ++++++- .../libvirt-gconfig-domain-graphics-rdp.h | 9 +- .../libvirt-gconfig-domain-graphics-remote.c | 103 +++++++++++++++++++++ .../libvirt-gconfig-domain-graphics-remote.h | 70 ++++++++++++++ .../libvirt-gconfig-domain-graphics-sdl.c | 19 +++- .../libvirt-gconfig-domain-graphics-sdl.h | 6 +- .../libvirt-gconfig-domain-graphics-spice.c | 40 +++++++- .../libvirt-gconfig-domain-graphics-spice.h | 10 +- .../libvirt-gconfig-domain-graphics-vnc.c | 32 ++++++- .../libvirt-gconfig-domain-graphics-vnc.h | 9 +- libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 20 ++++ po/POTFILES.in | 2 + 18 files changed, 513 insertions(+), 28 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-local.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-local.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-remote.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-remote.h -- 2.5.0

2 30

[libvirt] virsh blockcopy or virDomainBlockCopy auto converge
by Vasiliy Tolstov 06 Sep '16

06 Sep '16

Does it possible to add something like auto converge in live migration to blockcopy ? In my case i'm try to do virsh blockcopy --pivot and sometime it fails because domain write more data and it needs to be copied. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH v2 0/3] virsh: Option completers and small improvements/fixes for autocomplete
by Nishith Shah 05 Sep '16

05 Sep '16

This series introduces option completers and adds some minor improvements and fixes(not bugs per se, just better/sane behavior) in vshReadlineParse. The first patch introduces the usage of option completers to auto-complete arguments for a particular option. The second and third patches provide small improvements like completing the options of type VSH_OT_ARGV or VSH_OT_DATA, and to complete multiple options as well, if a previous option requires an argument, and that argument has been provided. --- v2: Fix an infinite while loop bug v1: https://www.redhat.com/archives/libvir-list/2016-August/msg01009.html Nishith Shah (3): virsh: Introduce usage of option completers to auto-complete arguments virsh: Allow data or argument options to be completed as well virsh: Complete multiple options when any one option requires data tools/vsh.c | 75 ++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 26 deletions(-) -- 2.1.4

2 4

[libvirt] Call for mentors: Outreachy December - March
by Stefan Hajnoczi 05 Sep '16

05 Sep '16

The Outreachy open source internship programme is running a December - March round. Outreachy promotes participation of underrepresented groups in open source. If you would like to be a mentor please reply. What is a mentor? Mentors help interns with their project and evaluate their progress. The mentor is the point of contact for the intern and advises them on the development process, technical challenges, etc. Mentors propose a list of project ideas which they are willing to mentor at the start of the application phase. What are the requirements for mentors? You must be a regular contributor to QEMU, KVM, or libvirt. You must be willing to spend ~5 hours/week between 6 Dec - 6 Mar. Timeline: Internship candidates apply: 12 Sep - 17 Oct Coding period: 6 Dec - 6 Mar Outreachy website: https://www.gnome.org/outreachy/ Overview of open source internship programmes: http://vmsplice.net/~stefan/stefanha-kvm-forum-2016.pdf Please let me know if you have any questions. Stefan

1 1

[libvirt] [libvirt-perl][PATCH 0/2] Add more PERF_PARAM_* constants
by Michal Privoznik 05 Sep '16

05 Sep '16

Now that libvirt-2.2.0 is out, we should: a) do the libvirt-perl release too b) adapt to new constants pushed to 2.3.0 Michal Privoznik (2): Bump version to 2.3.0 Add more PERF_PARAM_* constants Changes | 5 +++++ Makefile.PL | 2 +- README | 2 +- Virt.xs | 4 ++++ lib/Sys/Virt.pm | 2 +- lib/Sys/Virt/Domain.pm | 27 +++++++++++++++++++++++++++ 6 files changed, 39 insertions(+), 3 deletions(-) -- 2.8.4

2 3

[libvirt] [PATCH] conf: Fix initialization value of 'multi' in PCI address
by Xian Han Yu 05 Sep '16

05 Sep '16

The 'multi' element in PCI address struct used as 'virTristateSwitch', and its default value is 'VIR_TRISTATE_SWITCH_ABSENT'. Current PCI process use 'false' to initialization 'multi', which is ambiguously for assignment or comparison. This patch use '{0}' to initialize the whole PCI address struct, which fix the 'multi' initialization and makes code more simplify and explicitly. Signed-off-by: Xian Han Yu <xhyubj(a)linux.vnet.ibm.com> --- src/conf/domain_addr.c | 2 +- src/conf/node_device_conf.c | 2 +- src/qemu/qemu_domain_address.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index a0c2f88..cf6b73d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -569,7 +569,7 @@ virDomainPCIAddressGetNextSlot(virDomainPCIAddressSetPtr addrs, /* default to starting the search for a free slot from * the first slot of domain 0 bus 0... */ - virPCIDeviceAddress a = { 0, 0, 0, 0, false }; + virPCIDeviceAddress a = {0}; char *addrStr = NULL; if (addrs->nbuses == 0) { diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index a23d8ef..c8e30d9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1163,7 +1163,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, goto cleanup; for (i = 0; i < nAddrNodes; i++) { - virPCIDeviceAddress addr = { 0, 0, 0, 0, 0 }; + virPCIDeviceAddress addr = {0}; if (virPCIDeviceAddressParseXML(addrNodes[i], &addr) < 0) goto cleanup; if (VIR_ALLOC(pciAddr) < 0) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 3d52d72..bb16738 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1096,7 +1096,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* USB2 needs special handling to put all companions in the same slot */ if (IS_USB2_CONTROLLER(def->controllers[i])) { - virPCIDeviceAddress addr = { 0, 0, 0, 0, false }; + virPCIDeviceAddress addr = {0}; bool foundAddr = false; memset(&tmp_addr, 0, sizeof(tmp_addr)); -- 2.5.5

2 4

[libvirt] <interface type='direct'>
by Moshe Levi 04 Sep '16

04 Sep '16

Hi, In OpenStack we have a port type macvtap. Mavtap port is just a tap device connected to VF. In Libvirt the guest xml look like <interface type='direct'> <mac address='fa:16:3e:b1:06:4e'/> <source dev='p1p6' mode='passthrough'/> <target dev='macvtap1'/> <model type='virtio'/> <driver name='vhost'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> In the hypervisor we can see that the mac of the VF which is fa:16:3e:f3:9b:e8 - is set by OpenStack see [1] 9: ens3f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq master ovs-system state UP mode DEFAULT group default qlen 1000 link/ether 7c:fe:90:29:24:4e brd ff:ff:ff:ff:ff:ff vf 0 MAC 00:00:00:00:00:00, spoof checking off, link-state disable vf 1 MAC 00:00:00:00:00:00, spoof checking off, link-state disable vf 2 MAC fa:16:3e:f3:9b:e8, vlan 48, spoof checking on, link-state enable vf 3 MAC fa:16:3e:f6:02:c8, vlan 48, spoof checking on, link-state enable 41: ens3f4: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000 link/ether fa:16:3e:f6:02:c8 brd ff:ff:ff:ff:ff:ff 42: macvtap0@ens3f4: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP mode DEFAULT group default qlen 500 link/ether fa:16:3e:f6:02:c8, brd ff:ff:ff:ff:ff:ff The netdevice of the VF which is ens3f4 has also the same mac. This mac is set when using Libvirt 1.2.2 (Ubuntu 14.04), But when we tested with new Libvirt versions >= 1.2.17 (Fedora 23/Ubuntu 16.04) the mac netdevice of the VF (ens3f4) is not set. This change in Libvirt breaks the guest from getting DHCP in OpenStack. Do you know why the behavior change in newer releases? We have a WIP patch in OpenStack for setting also the mac for the netdevice of the VF [2]. Just wanted to know that this is the correct approach. [1] - https://github.com/openstack/nova/blob/master/nova/virt/libvirt/vif.py#L616… [2] - https://review.openstack.org/#/c/364121/ Thanks, Moshe Levi

2 4

[libvirt] [PATCH v3 1/4] libxl: support serial list
by Bob Liu 02 Sep '16

02 Sep '16

Add support for multi serial devices, after this patch virsh can be used to connect different serial devices of running domains. E.g. vish # console <xxx> --devname serial<xxx> Note: This depends on a xen/libxl bug fix to have libxl_console_get_tty(...) correctly returning the tty path (as opposed to always returning the first one). [0] https://lists.xen.org/archives/html/xen-devel/2016-08/msg00438.html Signed-off-by: Bob Liu <bob.liu(a)oracle.com> --- v3: Comments from Jim. v2: Add #ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST. --- src/libxl/libxl_conf.c | 23 ++++++++++++++++++++--- src/libxl/libxl_domain.c | 29 ++++++++++++++++++++++++++--- src/libxl/libxl_driver.c | 17 +++++++++-------- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 146e08a..32db975 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -431,14 +431,31 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } if (def->nserials) { - if (def->nserials > 1) { + if (def->nserials == 1) { + if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) < + 0) + return -1; + } else { +#ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST + if (VIR_ALLOC_N(b_info->u.hvm.serial_list, def->nserials + 1) < + 0) + return -1; + for (i = 0; i < def->nserials; i++) { + if (libxlMakeChrdevStr(def->serials[i], + &b_info->u.hvm.serial_list[i]) < 0) + { + libxl_string_list_dispose(&b_info->u.hvm.serial_list); + return -1; + } + } + b_info->u.hvm.serial_list[i] = NULL; +#else virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only one serial device is supported by libxl")); return -1; +#endif } - if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) < 0) - return -1; } if (def->nparallels) { diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 0e26b91..f529a2e 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -960,18 +960,20 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) { virDomainObjPtr vm = for_callback; size_t i; + virDomainChrDefPtr chr; + char *console = NULL; + int ret; virObjectLock(vm); for (i = 0; i < vm->def->nconsoles; i++) { - virDomainChrDefPtr chr = vm->def->consoles[i]; + chr = vm->def->consoles[i]; + if (i == 0 && chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) chr = vm->def->serials[0]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { libxl_console_type console_type; - char *console = NULL; - int ret; console_type = (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL ? @@ -989,6 +991,27 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) VIR_FREE(console); } } + for (i = 0; i < vm->def->nserials; i++) { + chr = vm->def->serials[i]; + + ignore_value(virAsprintf(&chr->info.alias, "serial%zd", i)); + if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { + if (chr->source.data.file.path) + continue; + ret = libxl_console_get_tty(ctx, ev->domid, + chr->target.port, + LIBXL_CONSOLE_TYPE_SERIAL, + &console); + if (!ret) { + VIR_FREE(chr->source.data.file.path); + if (console && console[0] != '\0') { + ignore_value(VIR_STRDUP(chr->source.data.file.path, + console)); + } + } + VIR_FREE(console); + } + } virObjectUnlock(vm); libxl_event_free(ctx, ev); } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f153f69..a34eb02 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4450,13 +4450,6 @@ libxlDomainOpenConsole(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_CONSOLE_FORCE, -1); - if (dev_name) { - /* XXX support device aliases in future */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Named device aliases are not supported")); - goto cleanup; - } - if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -4472,8 +4465,16 @@ libxlDomainOpenConsole(virDomainPtr dom, } priv = vm->privateData; + if (dev_name) { + size_t i; - if (vm->def->nconsoles) { + for (i = 0; !chr && i < vm->def->nserials; i++) { + if (STREQ(dev_name, vm->def->serials[i]->info.alias)) { + chr = vm->def->serials[i]; + break; + } + } + } else if (vm->def->nconsoles) { chr = vm->def->consoles[0]; if (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) chr = vm->def->serials[0]; -- 2.6.5

2 6

[libvirt] [PATCH V2] virpci: support driver_override sysfs interface
by Jim Fehlig 02 Sep '16

02 Sep '16

libvirt uses the new_id PCI sysfs interface to bind a PCI stub driver to a PCI device. The new_id interface is known to be buggy and racey, hence a more deterministic interface was introduced in the 3.12 kernel: driver_override. For more details see https://www.redhat.com/archives/libvir-list/2016-June/msg02124.html This patch adds support for the driver_override interface by - adding new virPCIDevice{BindTo,UnbindFrom}StubWithOverride functions that use the driver_override interface - renames the existing virPCIDevice{BindTo,UnbindFrom}Stub functions to virPCIDevice{BindTo,UnbindFrom}StubWithNewid to perserve existing behavior on new_id interface - changes virPCIDevice{BindTo,UnbindFrom}Stub function to call one of the above depending on availability of driver_override The patch includes a bit of duplicate code, but allows for easily dropping the new_id code once support for older kernels is no longer desired. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V1: https://www.redhat.com/archives/libvir-list/2016-July/msg00370.html Changes since V1: - drop patch1 - change patch2 to preserve the existing new_id code and add new functions to implement the driver_override interface src/util/virpci.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 2 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 132948d..6c8174a 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1089,8 +1089,54 @@ virPCIDeviceUnbind(virPCIDevicePtr dev) return ret; } +/* + * Bind a PCI device to a driver using driver_override sysfs interface. + * E.g. + * + * echo driver-name > /sys/bus/pci/devices/0000:03:00.0/driver_override + * echo 0000:03:00.0 > /sys/bus/pci/devices/0000:03:00.0/driver/unbind + * echo 0000:03:00.0 > /sys/bus/pci/drivers_probe + * + * An empty driverName will cause the device to be bound to its + * preferred driver. + */ static int -virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) +virPCIDeviceBindWithDriverOverride(virPCIDevicePtr dev, + const char *driverName) +{ + int ret = -1; + char *path; + + if (!(path = virPCIFile(dev->name, "driver_override"))) + return -1; + + if (virFileWriteStr(path, driverName, 0) < 0) { + virReportSystemError(errno, + _("Failed to add driver '%s' to driver_override " + " interface of PCI device '%s'"), + driverName, dev->name); + goto cleanup; + } + + if (virPCIDeviceUnbind(dev) < 0) + goto cleanup; + + if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) { + virReportSystemError(errno, + _("Failed to trigger a probe for PCI device '%s'"), + dev->name); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(path); + return ret; +} + +static int +virPCIDeviceUnbindFromStubWithNewid(virPCIDevicePtr dev) { int result = -1; char *drvdir = NULL; @@ -1191,9 +1237,41 @@ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) return result; } +static int +virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) +{ + if (!dev->unbind_from_stub) { + VIR_DEBUG("Unbind from stub skipped for PCI device %s", dev->name); + return 0; + } + + return virPCIDeviceBindWithDriverOverride(dev, "\n"); +} + +static int +virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) +{ + int ret; + char *path; + + /* + * Prefer using the device's driver_override interface, falling back + * to the unpleasant new_id interface. + */ + if (!(path = virPCIFile(dev->name, "driver_override"))) + return -1; + + if (virFileExists(path)) + ret = virPCIDeviceUnbindFromStubWithOverride(dev); + else + ret = virPCIDeviceUnbindFromStubWithNewid(dev); + + VIR_FREE(path); + return ret; +} static int -virPCIDeviceBindToStub(virPCIDevicePtr dev) +virPCIDeviceBindToStubWithNewid(virPCIDevicePtr dev) { int result = -1; bool reprobe = false; @@ -1345,6 +1423,75 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev) return result; } +static int +virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev) +{ + int ret = -1; + const char *stubDriverName; + char *stubDriverPath = NULL; + char *driverLink = NULL; + + /* Check the device is configured to use one of the known stub drivers */ + if (dev->stubDriver == VIR_PCI_STUB_DRIVER_NONE) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("No stub driver configured for PCI device %s"), + dev->name); + return -1; + } else if (!(stubDriverName = virPCIStubDriverTypeToString(dev->stubDriver))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown stub driver configured for PCI device %s"), + dev->name); + return -1; + } + + if (!(stubDriverPath = virPCIDriverDir(stubDriverName)) || + !(driverLink = virPCIFile(dev->name, "driver"))) + goto cleanup; + + if (virFileExists(driverLink)) { + if (virFileLinkPointsTo(driverLink, stubDriverPath)) { + /* The device is already bound to the correct driver */ + VIR_DEBUG("Device %s is already bound to %s", + dev->name, stubDriverName); + ret = 0; + goto cleanup; + } + } + + if (virPCIDeviceBindWithDriverOverride(dev, stubDriverName) < 0) + goto cleanup; + + dev->unbind_from_stub = true; + ret = 0; + + cleanup: + VIR_FREE(stubDriverPath); + VIR_FREE(driverLink); + return ret; +} + +static int +virPCIDeviceBindToStub(virPCIDevicePtr dev) +{ + int ret; + char *path; + + /* + * Prefer using the device's driver_override interface, falling back + * to the unpleasant new_id interface. + */ + if (!(path = virPCIFile(dev->name, "driver_override"))) + return -1; + + if (virFileExists(path)) + ret = virPCIDeviceBindToStubWithOverride(dev); + else + ret = virPCIDeviceBindToStubWithNewid(dev); + + VIR_FREE(path); + return ret; +} + /* virPCIDeviceDetach: * * Detach this device from the host driver, attach it to the stub -- 2.1.4

2 4

[libvirt] firewalld transaction model
by Thomas Woerner 02 Sep '16

02 Sep '16

Hello, the transaction model that has been introduced with firewalld-0.4.2 makes it possible to group rules together and to apply them at once and quick. For this the restore commands of iptables, ip6tables and ebtables are used as long as they are available. At the moment the transaction model is only used inside of firewalld. It applies all the generated and provided rules in a small amount of transactions. This speeds up load and reload times of firewalld drastically. There is no external interface to add transaction by services or applications right now. Because of this I'd like to get feedback from the D-Bus interface and command line consumers: Is there interest in using transactions at all? What are the needs and wishes? With this information it should then be possible to get to a good and stable interface. This will most likely an iterative process with some test and proof of concept implementations. Please provide information about your needs and wishes. Regards, Thomas

1 0

[libvirt] [PATCH V2 0/2] libxl USB vendor/product support
by Jim Fehlig 02 Sep '16

02 Sep '16

V2 of Cedric's patches to allow specifying USB hostdevs by vendor/product in the libxl driver https://www.redhat.com/archives/libvir-list/2016-August/msg00305.html Cédric Bosdonnat (2): Add virHostdevFindUSBDevice to private symbols libxl: allow vendor/product addressing for USB hostdevs src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 33 +++++++++++++++++++++++---------- src/util/virhostdev.c | 2 +- src/util/virhostdev.h | 6 ++++++ 4 files changed, 31 insertions(+), 11 deletions(-) -- 2.1.4

3 6

[libvirt] wiki accounts for GSOC submissions
by Cole Robinson 02 Sep '16

02 Sep '16

Next week is the time for GSOC students to submit their Final Evaluations. Work needs to be hosted/linked from a public URL. Cedric suggested using the libvirt wiki for these pages, so something like: http://wiki.libvirt.org/page/Google_Summer_of_Code_2016/My_Page_Title And then we can link it from the top level Google_Summer_of_Code_2016 as well. But this means GSOC students will need wiki accounts which needs admin intervention. GSOC students: if you don't already have libvirt wiki accounts, please respond here with your desired username and email and one of the wiki admins will set you up. Thanks, Cole

7 10

[libvirt] Release of libvirt-2.2.0
by Daniel Veillard 02 Sep '16

02 Sep '16

Since the issue I had with rc2 was apparently just on my setup, I just pushed the release. It is available as usual as signed tarball and rpms from : ftp://libvirt.org/libvirt/ I also pushed 2.2.0 for the python bindings which you can find at: ftp://libvirt.org/libvirt/python/ This is not a very big release, around 220 commits, august sounds like vacations, plus a number of the developpers travelled to KVM forun so development took a bit of a hit. As a result we have a release more inclined toward bug fixes though there is some features and notable improvements: Features: - Sparse vCPU topologies support and assorted vCPU improvements (Peter Krempa) - Various improvements and fixes for vz driver (Olga Krishtal, Nikolay Shirokovskiy, Maxim Nestratov, Pavel Glushchak, Mikhail Feoktistov) - Various improvements and fixes for libxl driver (Cédric Bosdonnat, Jim Fehlig, Chunyan Liu, Roman Bogorodskiy) Documentation: - docs: Add missing / to closing tag (Christophe Fergeau) - doc: clarify documentation for vcpu order (Peter Krempa) - storage_backend_rbd: fix typos (Chen Hanxiao) - qemu_driver: update comments for qemuDomainSaveInternal (Chen Hanxiao) - virsh: clarify snapshot --live (Chen Hanxiao) Portability: - conf: Fix build with picky GCC (Peter Krempa) - tests: fix domaincapstest linking for libxl (Roman Bogorodskiy) - libxl: fix unused functions (Roman Bogorodskiy) - docs: Distribute subsite.xsl (Michal Privoznik) - nsslinktest: also build virAtomic.h (Kai Kang) - build: centralize use of extra Cygwin LDFLAGS (Eric Blake) - build: use XDR_CFLAGS for Cygwin build (Eric Blake) Bug Fixes: - tests: fix segfault in objecteventtest (Roman Bogorodskiy) - bhyve: fix disks address allocation (Roman Bogorodskiy) - Check for --live flag for postcopy-after-precopy migration (Kothapally Madhu Pavan) - qemu: driver: Validate configuration when setting maximum vcpu count (Peter Krempa) - conf: Don't validate vcpu count in XML parser (Peter Krempa) - qemu: driver: Fix qemuDomainHelperGetVcpus for sparse vcpu topologies (Peter Krempa) - vz: fixed race in vzDomainAttach/DettachDevice (Olga Krishtal) - qemu: fix ethernet network type ip/route assign (Vasiliy Tolstov) - Fix remote_protocol-structs after recent commit (Peter Krempa) - network: Need to free formatted addr in networkDnsmasqConfContents (John Ferlan) - remove the dead code this patch is to remove the dead code Signed-off-by: JieWang <wangjie88(a)huawei.com> (JieWang) - qemu: Fix crash hot plugging luks volume (John Ferlan) - networkxml2conftest: Don't leak dnsmasq capabilities (Michal Privoznik) - vz: fixed race in vzDomainAttach/DettachDevice (Olga Krishtal) - qemu: Fix the command line generation for rbd auth using aes secrets (John Ferlan) - qemu_process: graphics: setup listen types before ports are reserved/allocated (Pavel Hrdina) - conf: Provide error on undefined iothreadsched entry (John Ferlan) - utils: storage: Fix JSON field name for uri based storage (Peter Krempa) - conf: free the ports array of a USB hub (Ján Tomko) - lxc: don't try to reference NULL when mounting filesystems (Daniel P. Berrange) - lxc: don't try to resolve a NULL path for filesystems (Daniel P. Berrange) - virsh: Fix core for cmdSecretGetValue (John Ferlan) - virschematest: Make sure that validator is initialized (Michal Privoznik) - cpu_x86: fix libvirtd crash when host cpu vendor is not available (Jim Fehlig) - virschematest: Initialize @data (Michal Privoznik) - schema: Don't validate paths (Michal Privoznik) - virNetDevMacVLanCreateWithVPortProfile: Don't mask virNetDevMacVLanTapOpen error (Michal Privoznik) - qemu: fix qemu.conf security_driver (Cole Robinson) - conf: restrict expander buses to connect only to a root bus (Laine Stump) - conf: restrict where dmi-to-pci-bridge can be connected (Laine Stump) - conf: don't allow connecting upstream-port directly to pce-expander-bus (Laine Stump) - conf: improve error log when PCI devices don't match requested controller (Laine Stump) - virt-admin: Fix the error when an invalid URI has been provided (Erik Skultety) - cpu_x86: Fix host-model CPUs on hosts with CMT (Jiri Denemark) - virt-admin: Properly fix the default session daemon URI to admin server (Erik Skultety) - admin: Fix the default uri for session daemon to libvirtd:///session (Erik Skultety) - virsystemd: Fix error check (Marc Hartmayer) - lxcDomainCreateXMLWithFiles: Avoid crash (Michal Privoznik) - storage: Don't remove the pool for buildPool failure in storagePoolCreate (John Ferlan) - storage: Fix a NULL ptr dereference in virStorageBackendCreateQemuImg (Erik Skultety) - tests: Fix broken build (John Ferlan) - qemu: fix capability counting (Boris Fiuczynski) - virObjectEventNew: Use virObjectUnref() to free virObjectEvent (Michal Privoznik) - virshConnect: Don't leak polkit agent (Michal Privoznik) - conf: events: Fix coverity warning (Cole Robinson) - Don't error when attaching security label of model "none" (Daniel P. Berrange) - qemu: only report errno in trace message on failure (Daniel P. Berrange) - qemu: Set fake reboot flag to false when mode=agent (Nikolay Shirokovskiy) - libxl: Fix broken build attach/detach controller device (John Ferlan) - libxl: Fix broken build from libxlDomainCleanup (John Ferlan) - admin: rpc: virnetserver: Fix updating of the client limits (Erik Skultety) - libxl: fix segfault in libxlReconnectDomain (Cédric Bosdonnat) - qemu: Fix domain state after reset (Martin Kletzander) - virsh: Report error when explicit connection fails (Martin Kletzander) - qemu: Fix support for startupPolicy with volume/pool disks (Martin Kletzander) Improvements: - tools: Don't list virsh-* under EXTRA_DIST (Michal Privoznik) - libxl: advertise support for migration V3 (Jim Fehlig) - virsh: vcpuinfo: Report vcpu number from the structure rather than it's position (Peter Krempa) - vz: getting bus type for containers (Mikhail Feoktistov) - vz: update domain cache after device updates (Nikolay Shirokovskiy) - vz: added VIR_MIGRATE_PARAM_BANDWIDTH param handling (Pavel Glushchak) - vz: implicitly support additional migration flags (Pavel Glushchak) - qemu: set tap device online for type='ethernet' (Laine Stump) - qemu: remove unnecessary setting of tap device online state (Laine Stump) - qemu: hotplug: Add support for VCPU unplug (Peter Krempa) - qemu: hotplug: Allow marking unplugged devices by alias (Peter Krempa) - qemu: Use modern vcpu hotplug approach if possible (Peter Krempa) - qemu: command: Add support for sparse vcpu topologies (Peter Krempa) - qemu: process: Copy final vcpu order information into the vcpu definition (Peter Krempa) - qemu: command: Add helper to convert vcpu definition to JSON props (Peter Krempa) - qemu: migration: Prepare for non-contiguous vcpu configurations (Peter Krempa) - conf: Add XML for individual vCPU hotplug (Peter Krempa) - util: Extract and rename qemuDomainDelCgroupForThread to virCgroupDelThread (Peter Krempa) - qemu: domain: Prepare for VCPUs vanishing while libvirt is not running (Peter Krempa) - qemu: domain: Extract cpu-hotplug related data (Peter Krempa) - tests: cpu-hotplug: Add data for ppc64 without threads enabled (Peter Krempa) - tests: cpu-hotplug: Add data for ppc64 out-of-order hotplug (Peter Krempa) - tests: cpu-hotplug: Add data for ppc64 platform including hotplug (Peter Krempa) - tests: cpu-hotplug: Add data for x86 hotplug with 11+ vcpus (Peter Krempa) - tests: Add test infrastructure for qemuMonitorGetCPUInfo (Peter Krempa) - qemu: monitor: Add algorithm for combining query-(hotpluggable-)-cpus data (Peter Krempa) - qemu: monitor: Add support for calling query-hotpluggable-cpus (Peter Krempa) - qemu: monitor: Extract QOM path from query-cpus reply (Peter Krempa) - qemu: capabilities: Extract availability of new cpu hotplug for machine types (Peter Krempa) - qemu: Forbid config when topology based cpu count doesn't match the config (Peter Krempa) - qemu: Add capability for query-hotpluggable-cpus command (Peter Krempa) - qemu: monitor: Return struct from qemuMonitor(Text|Json)QueryCPUs (Peter Krempa) - qemu: monitor: Return structures from qemuMonitorGetCPUInfo (Peter Krempa) - virsh: use vshError consistently after virBufferError checks (Pino Toscano) - virsh: avoid i18n puzzle (Pino Toscano) - virsh: respect -q/--quiet more (Pino Toscano) - vz: add ACL checks to API calls (Nikolay Shirokovskiy) - remote: rename protocol names for close callbacks (Nikolay Shirokovskiy) - vz: prepare migration for ACL checks (Nikolay Shirokovskiy) - vz: expand setting memory API calls (Nikolay Shirokovskiy) - vz: add missing flagged versions of API functions (Nikolay Shirokovskiy) - vz: factor out converting block stats to params (Nikolay Shirokovskiy) - vz: factor out block stats impl (Nikolay Shirokovskiy) - vz: implement plain create API thru createFlags instead of visa versa (Nikolay Shirokovskiy) - vz: expand start/stop/... APIs for ACL checks (Nikolay Shirokovskiy) - network: allow limiting a <forwarder> element to certain domains (Laine Stump) - network: allow disabling dnsmasq's DNS server (Laine Stump) - network: new network forward mode 'open' (Laine Stump) - vz: add validation callbacks (Mikhail Feoktistov) - vz: specify VIR_DOMAIN_NET_TYPE_NETWORK for routed networks (Maxim Nestratov) - vz: reset errors after ignoring return values (Maxim Nestratov) - vz: don't fail query domain info in case we don't have valid stats handle (Maxim Nestratov) - vz: get additional error information from job correctly (Maxim Nestratov) - cfg.mk: join not_streq and not_strneq tests (Ján Tomko) - cfg.mk: drop redundant sc_prohibit_gethostby (Ján Tomko) - cfg.mk: use subst instead of tr (Ján Tomko) - tests: fix the return value of test-wrap-argv (Ján Tomko) - maint: update to latest gnulib (Ján Tomko) - Introduce QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY (Ján Tomko) - conf: Provide error on undefined vcpusched entry (John Ferlan) - qemu_process: graphics: reserve port only if listen type is address or network (Pavel Hrdina) - qemu_process: graphics: extract for loop out of qemuProcessGraphicsReservePorts (Pavel Hrdina) - qemu_process: graphics: extract port allocation into function (Pavel Hrdina) - qemu_process: graphics: ref driver config only in function where it is used (Pavel Hrdina) - util: Make virStringArrayHasString() const-correct (Andrea Bolognani) - qemu: driver: Split out regular vcpu hotplug code into a function (Peter Krempa) - qemu: driver: Extract setting of live vcpu count (Peter Krempa) - qemu: setvcpus: Extract setting of maximum vcpu count (Peter Krempa) - conf: report an error message for non-existing USB hubs (Ján Tomko) - qemu: setcpus: Report better errors (Peter Krempa) - libxl_driver: Indent LIBXL_VBD_SECTOR_SIZE macro correctly (Michal Privoznik) - Introduce node device update event as top level event (Jovanka Gulicoska) - qemu_command: don't modify heads for graphics device (Pavel Hrdina) - qemu: command: Simplify USB controller model selection (Andrea Bolognani) - qemu: domain: Drop piix3-ohci controller for migration (Andrea Bolognani) - qemu: domain: Reflect USB controller model in guest XML (Andrea Bolognani) - virNetDevMacVLanCreateWithVPortProfile: Drop @ret (Michal Privoznik) - virNetDevMacVLanCreateWithVPortProfile: Drop @rc (Michal Privoznik) - tests: Add a test for host-model CPU with CMT feature (Jiri Denemark) - cpu_x86: Properly drop non-migratable features (Jiri Denemark) - cpu_x86: Introduce x86FeatureIsMigratable (Jiri Denemark) - virsh: Introduce nodedev-event command (Jovanka Gulicoska) - vz: add vzDomainGetJobStats (Nikolay Shirokovskiy) - vz: add getting job info for migration (Nikolay Shirokovskiy) - Fix indentation (Ján Tomko) - qemu: Add tests for virQEMUCapsNewCopy (Jiri Denemark) - qemu: Copy missing QEMU caps elements (Jiri Denemark) - qemu: Copy QEMU caps elements in order of definition (Jiri Denemark) - tests: qemucapabilities: Add data for qemu 2.7.0 (Peter Krempa) - internal: Introduce macro for stealing pointers (Peter Krempa) - qemu: Advertise OVMF_CODE.secboot.fd (Michal Privoznik) - qemu: Enable secure boot (Michal Privoznik) - Introduce @secure attribute to os loader element (Michal Privoznik) - Introduce SMM feature (Michal Privoznik) - qemuBuildMachineCommandLine: Follow our pattern (Michal Privoznik) - rpm: set TLS priority to @LIBVIRT,SYSTEM on Fedora >= 25 (Daniel P. Berrange) - tests: qemuxml2xml: Add some USB test cases (Andrea Bolognani) - tests: qemuxml2xml: Use DO_TEST() for most tests (Andrea Bolognani) - tests: qemuxml2xml: Pass capabilities to DO_TEST() (Andrea Bolognani) - tests: qemuxml2xml: Use WHEN_BOTH for most tests (Andrea Bolognani) - tests: qemuxml2xml: Clean up disk-mirror (Andrea Bolognani) - tests: qemuxml2argv: Fix usb-too-long-port-path-invalid (Andrea Bolognani) - tests: qemuxml2argv: Remove useless GIC flags (Andrea Bolognani) - libxlDoMigrateReceive: Drop useless check for !vm (Michal Privoznik) - securityselinuxlabeltest: Prefer virGetLastErrorMessage() over virGetLastError (Michal Privoznik) - virqemu: Reflect return type of virJSONValueArraySize() (Michal Privoznik) - qemu: domain: Simplify return values of qemuDomainRefreshVcpuInfo (Peter Krempa) - qemu: domain: Improve vCPU data checking in qemuDomainRefreshVcpu (Peter Krempa) - qemu: monitor: Rename qemuMonitor(JSON|Text)GetCPUInfo (Peter Krempa) - qemu: domain: Rename qemuDomainDetectVcpuPids to qemuDomainRefreshVcpuInfo (Peter Krempa) - qemu: Improve error message in virDomainGetVcpus (Peter Krempa) - qemu: monitor: Add do-while block to QEMU_CHECK_MONITOR_FULL (Peter Krempa) - qemu: monitor: Add monitor API for device_add supporting JSON objects (Peter Krempa) - libxl: allow libxl to calculate shadow mem requirements (Jim Fehlig) - qemu: Add support to get/set IOThread period and quota cgroup values (John Ferlan) - conf: Add IOThread quota and period scheduler/cputune defs (John Ferlan) - virsh: qemu-monitor-command: Don't print extra newline with --pretty (Peter Krempa) - tests: Make schema test fail on XML schema errors (Peter Krempa) - remote: Fix indentation of the remote protocol structs check file (Peter Krempa) - qemu: Use the hostdev alias in qemuDomainAttachHostSCSIDevice error path (John Ferlan) - qemu: Use qemuAliasFromHostdev (John Ferlan) - qemu: Introduce qemuAliasFromHostdev (John Ferlan) - qemu: Add attempt to call qemuMonitorDriveDel for AttachSCSI failure path (John Ferlan) - qemu: Add attempt to call qemuMonitorDriveDel for USB failure path (John Ferlan) - qemu: Make QEMU_DRIVE_HOST_PREFIX more private (John Ferlan) - qemu: Use qemuAliasFromDisk to generate drive alias (John Ferlan) - qemu: Use qemuAliasFromDisk instead of qemuDeviceDriveHostAlias (John Ferlan) - qemu: Use qemuAliasFromDisk to generate drive alias (John Ferlan) - qemu: Remove generation of drive alias from qcow passphrase backends (John Ferlan) - qemu: Reorder qemuDomainAttachUSBMassStorageDevice failure path (John Ferlan) - event-test: support node device lifecycle event APIs (Jovanka Gulicoska) - node_device: Implement event queue in udev (Jovanka Gulicoska) - node_device: implement node device lifecycle event APIs (Jovanka Gulicoska) - remote: implement node device lifecycle event APIs (Jovanka Gulicoska) - test: implement node device lifecycle event APIs (Jovanka Gulicoska) - conf: add node_device_event handling (Jovanka Gulicoska) - Introduce node device lifecycle event APIs (Jovanka Gulicoska) - qemu: Set fake reboot flag only in acpi mode for shutdown (Nikolay Shirokovskiy) - rpc: virnetserver: Remove dead code checking the client limits (Erik Skultety) - rpc: virnetserver: Add code to CheckLimits to handle suspending of services (Erik Skultety) - rpc: virnetserver: Move virNetServerCheckLimits which is static up in the file (Erik Skultety) - rpc: virnetserver: Rename ClientSetProcessingControls to ClientSetLimits (Erik Skultety) - libxl: add hooks support (Cédric Bosdonnat) - libxl: add a flag to mark guests as tainted by a hook (Cédric Bosdonnat) - qemuDomainDeviceDefPostParse: add USB controller model check (Chunyan Liu) - xenconfig: add conversion of usb controller config to and from xml (Chunyan Liu) - libxl: check available controller and port when hotplugging USB device (Chunyan Liu) - libxl: support usb controller hotplug (Chunyan Liu) - libxl: support USB controllers in creation time (Chunyan Liu) - extend usb controller model to support xen pvusb (Chunyan Liu) - virsh: qemu-monitor-command: Simplify control flow (Peter Krempa) - virsh: qemu-monitor-command: Use macro for exclusive options (Peter Krempa) - qemu: cap: Refactor access to array in virQEMUCapsProbeQMPMachineTypes (Peter Krempa) - qemu: caps: Sanitize storage of machine type related data (Peter Krempa) - qemu: capabilities: Drop unused function virQEMUCapsGetMachineTypes (Peter Krempa) - storage: Clean up volume wiping (Martin Kletzander) - storage: Use path instead of volume as an argument (Martin Kletzander) - storage: Move functions around (Martin Kletzander) - qemu: Remove unnecessary label and its only reference (Martin Kletzander) - qemu: Make qemuDomainCheckDiskStartupPolicy self-contained (Martin Kletzander) - Post-release version bump to 2.2.0 (Michal Privoznik) - Fix unbalanced quotation marks (Yuri Chornoivan) thanks everybody who helped putting this release out, be it with ideas, code, reviews, bug reports, localization, docs, etc... Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0