- Devel - libvirt List Archives

Various issues when using multiple graphic outputs
by Christian Ehrhardt 07 Sep '20

07 Sep '20

Hi, I've had continuous issues with this and wanted to reach out if that is a common issue everyone has or just me lacking a little detail on my setup. Setup: - tried qemu up to 4.2 - tried libvirt up to 6.0 - virt-viewer up to 7.0-2build1 - virt-manager up to 2.2.1 - I plan to retry with qemu 5.0, libvirt 6.6 and virt-viewer 9.0 but I don't have all pieces ready yet. - get a Desktop Guest (I've seen it with Ubuntu and Windows, therefore I'm rather sure it will affect all desktops) - configure your guest-xml to use multiple graphic adapters and start it - connect with virt-viewer to your guest which will open both screens The exact issue depends on the kind of graphic device I configure. The following list is ordered in terms of increasing confusion :-): - QXL with multiple heads - works fine (so multi display in general seems fine for the involved components) - VGA + QXL, QXL + Virtio, Virtio + QXL: - Guest only detects primary display - Can't convince X in the guest to use the second device as well - lspci lists both devices just fine - dmesg shows the kernel is initializing them, e.g. drm for virtio - 2*QXL - X has issues to initialize on user login - no error in the log, just hung - QXL + Mdev - mouse handling seems broken - in gnome I see no mouse pointer at all - in windows it is just strange - has offsets relative to mouse pointer entering - and can't move in one random direction (e.g. not up) - keyboard works just fine - I have played with adding/removing different input devices without much success. - I disabled the qxl display via xorg conf without the case getting any better The last case is what I initially tried and totally confused me at first. And to be clear, each of those graphics adapter types works fine if being attached "alone" on the guest (Except mdev alone, as I'm unable to convince libvirt to only attach the mdev without adding back a qxl graphics adapter). The Guest XML is the default that virt-manager gives me plus adding the second graphics adapter (example 2*QXL: https://paste.ubuntu.com/p/cVw8GVZ9dD/) If this is known in some way or even "yeah try version XY of component Foo" I'm happy about any hint/pointer you can give me. But if there is a chance that I'm the only one seeing it I'd like to understand why. Thanks in advance for thinking into this with me, Christian P.S. to avoid cross-posting I'll start with libvirt as it is in the middle of all involved components.

3 5

[PATCH] Fix linkage to libutil and libkvm on FreeBSD 11
by Daniel P. Berrangé 07 Sep '20

07 Sep '20

We are currently adding -lutil and -lkvm to the linker using the add_project_link_arguments method. On FreeBSD 11.4, this results in build errors because the args appear too early in the command line. We need to pass the libraries as dependencies so that they get placed at the same point in the linker args as other dependencies. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 16 +++++++--------- src/bhyve/meson.build | 15 +++++++++++---- src/util/meson.build | 26 +++++++++++++++++--------- 3 files changed, 35 insertions(+), 22 deletions(-) Using the CI patch I posted earlier to add FreeBSD 11: https://gitlab.com/berrange/libvirt/-/pipelines/185834799 diff --git a/meson.build b/meson.build index 1eadea33bf..c30ff187aa 100644 --- a/meson.build +++ b/meson.build @@ -1086,7 +1086,8 @@ endif # Check for BSD kvm (kernel memory interface) if host_machine.system() == 'freebsd' kvm_dep = cc.find_library('kvm') - add_project_link_arguments('-lkvm', language: 'c') +else + kvm_dep = disabler() endif libiscsi_version = '1.18.0' @@ -1203,11 +1204,9 @@ have_gnu_gettext_tools = false if not get_option('nls').disabled() have_gettext = cc.has_function('gettext') if not have_gettext - intl_lib = cc.find_library('intl', required: false) - have_gettext = intl_lib.found() - if have_gettext - add_project_link_arguments('-lintl', language: 'c') - endif + intl_dep = cc.find_library('intl', required: false) + else + intl_dep = disabler() endif if not have_gettext and get_option('nls').enabled() error('gettext() is required to build libvirt') @@ -1235,6 +1234,8 @@ if not get_option('nls').disabled() have_gnu_gettext_tools = true endif endif +else + intl_dep = disabler() endif numactl_dep = cc.find_library('numa', required: get_option('numactl')) @@ -1402,9 +1403,6 @@ if udev_dep.found() endif util_dep = cc.find_library('util', required: false) -if util_dep.found() - add_project_link_arguments('-lutil', language: 'c') -endif if not get_option('virtualport').disabled() if cc.has_header_symbol('linux/if_link.h', 'IFLA_PORT_MAX') diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 7d54718820..c382f64aee 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -14,15 +14,22 @@ driver_source_files += bhyve_sources stateful_driver_source_files += bhyve_sources if conf.has('WITH_BHYVE') + bhyve_driver_deps = [ + access_dep, + src_dep, + ] + if kvm_dep.found() + bhyve_driver_deps += kvm_dep + endif + if util_dep.found() + bhyve_driver_deps += util_dep + endif bhyve_driver_impl = static_library( 'virt_driver_bhyve_impl', [ bhyve_sources, ], - dependencies: [ - access_dep, - src_dep, - ], + dependencies: bhyve_driver_deps, include_directories: [ conf_inc_dir, hypervisor_inc_dir, diff --git a/src/util/meson.build b/src/util/meson.build index f7092cc3f1..c899f232e6 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -172,15 +172,7 @@ io_helper_sources = [ 'iohelper.c', ] -virt_util_lib = static_library( - 'virt_util', - [ - util_sources, - util_public_sources, - keycode_gen_sources, - dtrace_gen_headers, - ], - dependencies: [ +virt_util_deps = [ acl_dep, audit_dep, capng_dep, @@ -195,7 +187,23 @@ virt_util_lib = static_library( thread_dep, win32_dep, yajl_dep, + ] +if util_dep.found() + virt_util_deps += util_dep +endif +if intl_dep.found() + virt_util_deps += intl_dep +endif + +virt_util_lib = static_library( + 'virt_util', + [ + util_sources, + util_public_sources, + keycode_gen_sources, + dtrace_gen_headers, ], + dependencies: virt_util_deps, ) libvirt_libs += virt_util_lib -- 2.26.2

4 3

[PATCH v2 00/13] resolve hangs/crashes on libvirtd shutdown
by Nikolay Shirokovskiy 07 Sep '20

07 Sep '20

I keep qemu VM event loop exiting synchronously but add code to avoid deadlock that can be caused by this approach. I guess it is worth having synchronous exiting of threads in this case to avoid crashes. Patches that are already positively reviewed has appropriate 'Reviewed-by' lines. Changes from v1: - rename stateShutdown to state stateShutdownPrepare - introduce net daemon shutdown callbacks - make some adjustments in terms of qemu per VM's event loop thread finishing - factor out net server shutdown facilities into distinct patch - increase shutdown timeout from 15s to 30s Nikolay Shirokovskiy (13): libvirt: add stateShutdownPrepare/stateShutdownWait to drivers util: always initialize priority condition util: add stop/drain functions to thread pool rpc: don't unref service ref on socket behalf twice rpc: add virNetDaemonSetShutdownCallbacks rpc: add shutdown facilities to netserver rpc: finish all threads before exiting main loop qemu: don't shutdown event thread in monitor EOF callback vireventthread: exit thread synchronously on finalize qemu: avoid deadlock in qemuDomainObjStopWorker qemu: implement driver's shutdown/shutdown wait methods rpc: cleanup virNetDaemonClose method util: remove unused virThreadPoolNew macro scripts/check-drivername.py | 2 + src/driver-state.h | 8 ++++ src/libvirt.c | 42 ++++++++++++++++ src/libvirt_internal.h | 2 + src/libvirt_private.syms | 4 ++ src/libvirt_remote.syms | 2 +- src/qemu/qemu_domain.c | 18 +++++-- src/qemu/qemu_driver.c | 32 +++++++++++++ src/qemu/qemu_process.c | 3 -- src/remote/remote_daemon.c | 6 +-- src/rpc/virnetdaemon.c | 109 ++++++++++++++++++++++++++++++++++++------ src/rpc/virnetdaemon.h | 8 +++- src/rpc/virnetserver.c | 8 ++++ src/rpc/virnetserver.h | 1 + src/rpc/virnetserverservice.c | 1 - src/util/vireventthread.c | 1 + src/util/virthreadpool.c | 65 +++++++++++++++++-------- src/util/virthreadpool.h | 6 +-- 18 files changed, 267 insertions(+), 51 deletions(-) -- 1.8.3.1

3 29

[libvirt PATCH] qemu: migration: remove unused variable
by Ján Tomko 07 Sep '20

07 Sep '20

../src/qemu/qemu_migration.c:4091:36: error: unused variable 'cfg' [-Werror,-Wunused-variable] g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: d92c2bbc6597fcb951b303a9122ec1ca71514d10 --- Pushed. src/qemu/qemu_migration.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 03d6a522e7..a530c17582 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4088,7 +4088,6 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver, { int ret = -1; qemuMigrationSpec spec; - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); int fds[2] = { -1, -1 }; VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " -- 2.26.2

1 0

[PATCH] qemu: Do not error out when setting affinity failed
by Martin Kletzander 06 Sep '20

06 Sep '20

At least in a particular scenario described in the code. Basically when libvirtd is running without CAP_SYS_NICE (e.g. in a container) and it is trying to set QEMU affinity to all CPUs (because there is no setting requested in the XML) it fails. But if we ignore the failure in this particular case than you can limit the CPUs used by controlling the affinity for libvirtd itself. In any other case (anything requested in the XML, pinning a live domain, etc.) the call is still considered fatal and the action errors out. Resolves: https://bugzilla.redhat.com/1819801 Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_process.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cfe09d632633..270bb37d3682 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2528,6 +2528,7 @@ qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet) static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { + bool settingAll = false; g_autoptr(virBitmap) cpumapToSet = NULL; virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2566,13 +2567,30 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) if (!(cpumapToSet = virBitmapNewCopy(vm->def->cputune.emulatorpin))) return -1; } else { + settingAll = true; if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0) return -1; } if (cpumapToSet && virProcessSetAffinity(vm->pid, cpumapToSet) < 0) { - return -1; + /* + * We only want to error out if we failed to set the affinity to + * user-requested mapping. If we are just trying to reset the affinity + * to all CPUs and this fails it can only be an issue if: + * 1) libvirtd does not have CAP_SYS_NICE + * 2) libvirtd does not run on all CPUs + * + * However since this scenario is very improbable, we rather skip + * reporting the error because it helps running libvirtd in a a scenario + * where pinning is handled by someone else. + * + * See also: https://bugzilla.redhat.com/1819801#c2 + */ + if (settingAll) + virResetLastError(); + else + return -1; } return 0; @@ -2726,8 +2744,25 @@ qemuProcessSetupPid(virDomainObjPtr vm, affinity_cpumask = use_cpumask; /* Setup legacy affinity. */ - if (affinity_cpumask && virProcessSetAffinity(pid, affinity_cpumask) < 0) - goto cleanup; + if (affinity_cpumask && virProcessSetAffinity(pid, affinity_cpumask) < 0) { + /* + * We only want to error out if we failed to set the affinity to + * user-requested mapping. If we are just trying to reset the affinity + * to all CPUs and this fails it can only be an issue if: + * 1) libvirtd does not have CAP_SYS_NICE + * 2) libvirtd does not run on all CPUs + * + * However since this scenario is very improbable, we rather skip + * reporting the error because it helps running libvirtd in a a scenario + * where pinning is handled by someone else. + * + * See also: https://bugzilla.redhat.com/1819801#c2 + */ + if (affinity_cpumask == hostcpumap) + virResetLastError(); + else + goto cleanup; + } /* Set scheduler type and priority, but not for the main thread. */ if (sched && -- 2.28.0

3 4

[PATCH] qemu: Fix comment in qemuProcessSetupPid
by Martin Kletzander 06 Sep '20

06 Sep '20

This was supposed to be done in commit 3791f29b085c, but I missed a spot. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial, also suggested here: https://www.redhat.com/archives/libvir-list/2020-September/msg00275.html src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 17d083d192a5..934fab98bc42 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2751,9 +2751,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, * 1) libvirtd does not have CAP_SYS_NICE * 2) libvirtd does not run on all CPUs * - * However since this scenario is very improbable, we rather skip - * reporting the error because it helps running libvirtd in a a scenario - * where pinning is handled by someone else. + * This scenario can easily occurr when libvirtd is run inside a + * container with restrictive permissions and CPU pinning. * * See also: https://bugzilla.redhat.com/1819801#c2 */ -- 2.28.0

1 0

[PATCH v3 0/2] qemu: Allow migration over UNIX sockets
by Martin Kletzander 06 Sep '20

06 Sep '20

v3: - Forbid listen-address with unix: desturi v2: - Allow TLS and parallel migration as well - Use simpler unix socket URIs Resolves: https://bugzilla.redhat.com/1638889 Martin Kletzander (2): qemu: Allow migration over UNIX socket news: qemu: Allow migration over UNIX sockets NEWS.rst | 6 ++ docs/manpages/virsh.rst | 13 ++- docs/migration.html.in | 33 ++++++++ src/qemu/qemu_driver.c | 22 ++++- src/qemu/qemu_migration.c | 138 +++++++++++++++++++++++-------- src/qemu/qemu_migration_params.c | 9 ++ src/qemu/qemu_migration_params.h | 3 + src/qemu/qemu_monitor.c | 15 ++++ src/qemu/qemu_monitor.h | 4 + 9 files changed, 204 insertions(+), 39 deletions(-) -- 2.28.0

3 4

Re: [GSoC]: Libvirt driver for Jailhouse-Problem in sending initial patches(0-2)
by Prakhar Bansal 06 Sep '20

06 Sep '20

Hello Libvirt community, I want to apologize for my attempts to send the same patches multiple times, but for some reason I am not able to send Patch 1-2 along with cover letter with this patch set through git send-email. I even tried sending them separately but it didn’t help. When I’m trying sending Patch set(0-9), only Patches 3-9 are being successfully sent to mailing list and I’m getting the message on my gmail account that your message to libvir-list(a)redhat.com has been blocked. I’m still trying to solve this issue but I would appreciate any suggestion on this matter. Thanks, Prakhar Bansal On Sat, Sep 5, 2020 at 2:31 PM <libvir-list-request(a)redhat.com> wrote: > Send libvir-list mailing list submissions to > > libvir-list(a)redhat.com > > > > To subscribe or unsubscribe via the World Wide Web, visit > > https://www.redhat.com/mailman/listinfo/libvir-list > > or, via email, send a message with subject or body 'help' to > > libvir-list-request(a)redhat.com > > > > You can reach the person managing the list at > > libvir-list-owner(a)redhat.com > > > > When replying, please edit your Subject line so it is more specific > > than "Re: Contents of libvir-list digest..." > > > > > > Today's Topics: > > > > 1. [GSoC PATCH 6/9] Jailhouse driver: Implementation of > > DomainLookup* callbacks (Prakhar Bansal) > > 2. [GSoC PATCH 5/9] Jailhouse driver: Implementation of > > DomainInfo/State/List (Prakhar Bansal) > > 3. [GSoC PATCH 7/9] Jailhouse driver: Implementation of > > DomainShutdown/Destroy callbacks (Prakhar Bansal) > > > > > > ---------------------------------------------------------------------- > > > > Message: 1 > > Date: Sat, 5 Sep 2020 16:30:00 -0500 > > From: Prakhar Bansal <prakharbansal0910(a)gmail.com> > > To: libvir-list(a)redhat.com > > Subject: [GSoC PATCH 6/9] Jailhouse driver: Implementation of > > DomainLookup* callbacks > > Message-ID: <20200905213003.10682-7-prakharbansal0910(a)gmail.com> > > Content-Type: text/plain; charset=US-ASCII > > > > Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> > > --- > > src/jailhouse/jailhouse_driver.c | 70 ++++++++++++++++++++++++++++---- > > 1 file changed, 61 insertions(+), 9 deletions(-) > > > > diff --git a/src/jailhouse/jailhouse_driver.c > b/src/jailhouse/jailhouse_driver.c > > index 2bb249f996..8c84a23388 100644 > > --- a/src/jailhouse/jailhouse_driver.c > > +++ b/src/jailhouse/jailhouse_driver.c > > @@ -292,25 +292,77 @@ jailhouseConnectListAllDomains(virConnectPtr conn, > > static virDomainPtr > > jailhouseDomainLookupByID(virConnectPtr conn, int id) > > { > > - UNUSED(conn); > > - UNUSED(id); > > - return NULL; > > +virJailhouseDriverPtr driver = conn->privateData; > > + virDomainObjPtr cell; > > + virDomainPtr dom = NULL; > > + > > + cell = virDomainObjListFindByID(driver->domains, id); > > + > > + if (!cell) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("No domain with matching ID '%d'"), id); > > + goto cleanup; > > + } > > + > > + if (virDomainLookupByIDEnsureACL(conn, cell->def) < 0) > > + goto cleanup; > > + > > + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, > cell->def->id); > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return dom; > > } > > > > static virDomainPtr > > jailhouseDomainLookupByName(virConnectPtr conn, const char *name) > > { > > - UNUSED(conn); > > - UNUSED(name); > > - return NULL; > > + virJailhouseDriverPtr driver = conn->privateData; > > + virDomainObjPtr cell; > > + virDomainPtr dom = NULL; > > + > > + cell = virDomainObjListFindByName(driver->domains, name); > > + > > + if (!cell) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("No domain with matching name '%s'"), name); > > + goto cleanup; > > + } > > + > > + if (virDomainLookupByNameEnsureACL(conn, cell->def) < 0) > > + goto cleanup; > > + > > + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, > cell->def->id); > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return dom; > > } > > > > static virDomainPtr > > jailhouseDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) > > { > > - UNUSED(conn); > > - UNUSED(uuid); > > - return NULL; > > + virJailhouseDriverPtr driver = conn->privateData; > > + virDomainObjPtr cell; > > + virDomainPtr dom = NULL; > > + > > + cell = virDomainObjListFindByUUID(driver->domains, uuid); > > + > > + if (!cell) { > > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > > + virUUIDFormat(uuid, uuidstr); > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("No domain with matching UUID '%s'"), uuidstr); > > + goto cleanup; > > + } > > + > > + if (virDomainLookupByUUIDEnsureACL(conn, cell->def) < 0) > > + goto cleanup; > > + > > + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, > cell->def->id); > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return dom; > > } > > > > static virDomainObjPtr > > -- > > 2.17.1 > > > > > > > > ------------------------------ > > > > Message: 2 > > Date: Sat, 5 Sep 2020 16:29:59 -0500 > > From: Prakhar Bansal <prakharbansal0910(a)gmail.com> > > To: libvir-list(a)redhat.com > > Subject: [GSoC PATCH 5/9] Jailhouse driver: Implementation of > > DomainInfo/State/List > > Message-ID: <20200905213003.10682-6-prakharbansal0910(a)gmail.com> > > Content-Type: text/plain; charset=US-ASCII > > > > Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> > > --- > > src/jailhouse/jailhouse_driver.c | 102 +++++++++++++++++++++++++------ > > 1 file changed, 83 insertions(+), 19 deletions(-) > > > > diff --git a/src/jailhouse/jailhouse_driver.c > b/src/jailhouse/jailhouse_driver.c > > index 5b7bdc92d8..2bb249f996 100644 > > --- a/src/jailhouse/jailhouse_driver.c > > +++ b/src/jailhouse/jailhouse_driver.c > > @@ -267,19 +267,26 @@ static int > > jailhouseNodeGetInfo(virConnectPtr conn, > > virNodeInfoPtr nodeinfo) > > { > > - UNUSED(conn); > > - UNUSED(nodeinfo); > > - return -1; > > + if (virNodeGetInfoEnsureACL(conn) < 0) > > + return -1; > > + > > + return virCapabilitiesGetNodeInfo(nodeinfo); > > } > > > > static int > > jailhouseConnectListAllDomains(virConnectPtr conn, > > - virDomainPtr **domain, unsigned int flags) > > + virDomainPtr **domains, > > + unsigned int flags) > > { > > - UNUSED(conn); > > - UNUSED(domain); > > - UNUSED(flags); > > - return -1; > > + virJailhouseDriverPtr driver = conn->privateData; > > + > > + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); > > + > > + if (virConnectListAllDomainsEnsureACL(conn) < 0) > > + return -1; > > + > > + return virDomainObjListExport(driver->domains, conn, domains, > > + virConnectListAllDomainsCheckACL, > flags); > > } > > > > static virDomainPtr > > @@ -522,30 +529,87 @@ jailhouseDomainDestroy(virDomainPtr domain) > > } > > > > static int > > -jailhouseDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) > > +virjailhouseGetDomainTotalCpuStats(virDomainObjPtr cell, > > + unsigned long long *cpustats) > > { > > - UNUSED(domain); > > - UNUSED(info); > > + // TODO(Prakhar): Not implemented yet. > > + UNUSED(cell); > > + UNUSED(cpustats); > > return -1; > > } > > > > +static int > > +jailhouseDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) > > +{ > > + virDomainObjPtr cell; > > + int ret = -1; > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainGetInfoEnsureACL(domain->conn, cell->def) < 0) > > + goto cleanup; > > + > > + if (virDomainObjIsActive(cell)) { > > + if (virjailhouseGetDomainTotalCpuStats(cell, &(info->cpuTime)) < > 0) > > + goto cleanup; > > + } else { > > + info->cpuTime = 0; > > + } > > + > > + info->state = virDomainObjGetState(cell, NULL); > > + info->maxMem = virDomainDefGetMemoryTotal(cell->def); > > + info->nrVirtCpu = virDomainDefGetVcpus(cell->def); > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > +} > > + > > static int > > jailhouseDomainGetState(virDomainPtr domain, > > int *state, int *reason, unsigned int flags) > > { > > - UNUSED(domain); > > - UNUSED(state); > > - UNUSED(reason); > > - UNUSED(flags); > > - return -1; > > + virDomainObjPtr cell; > > + int ret = -1; > > + > > + virCheckFlags(0, -1); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainGetStateEnsureACL(domain->conn, cell->def) < 0) > > + goto cleanup; > > + > > + *state = virDomainObjGetState(cell, reason); > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > } > > > > static char * > > jailhouseDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) > > { > > - UNUSED(domain); > > - UNUSED(flags); > > - return NULL; > > + virDomainObjPtr cell; > > + char *ret = NULL; > > + > > + virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainGetXMLDescEnsureACL(domain->conn, cell->def, flags) < 0) > > + goto cleanup; > > + > > + ret = virDomainDefFormat(cell->def, NULL /* xmlopt */, > > + virDomainDefFormatConvertXMLFlags(flags)); > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > } > > > > static virHypervisorDriver jailhouseHypervisorDriver = { > > -- > > 2.17.1 > > > > > > > > ------------------------------ > > > > Message: 3 > > Date: Sat, 5 Sep 2020 16:30:01 -0500 > > From: Prakhar Bansal <prakharbansal0910(a)gmail.com> > > To: libvir-list(a)redhat.com > > Subject: [GSoC PATCH 7/9] Jailhouse driver: Implementation of > > DomainShutdown/Destroy callbacks > > Message-ID: <20200905213003.10682-8-prakharbansal0910(a)gmail.com> > > Content-Type: text/plain; charset=US-ASCII > > > > Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> > > --- > > src/jailhouse/jailhouse_api.c | 8 +++ > > src/jailhouse/jailhouse_driver.c | 101 +++++++++++++++++++++++++++++-- > > 2 files changed, 104 insertions(+), 5 deletions(-) > > > > diff --git a/src/jailhouse/jailhouse_api.c b/src/jailhouse/jailhouse_api.c > > index 783903e939..510e2f5f66 100644 > > --- a/src/jailhouse/jailhouse_api.c > > +++ b/src/jailhouse/jailhouse_api.c > > @@ -71,6 +71,14 @@ int cell_match(const struct dirent *dirent); > > > > int createCell(const char *conf_file); > > > > +int loadImagesInCell(virJailhouseCellId cell_id, char *images, int > num_images); > > + > > +int shutdownCell(virJailhouseCellId cell_id); > > + > > +int startCell(virJailhouseCellId cell_id); > > + > > +int destroyCell(virJailhouseCellId cell_id); > > + > > int getCellInfo(const unsigned int id, > > virJailhouseCellInfoPtr * cell_info); > > > > diff --git a/src/jailhouse/jailhouse_driver.c > b/src/jailhouse/jailhouse_driver.c > > index 8c84a23388..46c7759cb8 100644 > > --- a/src/jailhouse/jailhouse_driver.c > > +++ b/src/jailhouse/jailhouse_driver.c > > @@ -406,8 +406,8 @@ jailhouseDomainCreateWithFlags(virDomainPtr domain, > > unsigned int flags) > > { > > virJailhouseDriverPtr driver = domain->conn->privateData; > > - virDomainObjPtr cell; > > virJailhouseCellInfoPtr cell_info; > > + virDomainObjPtr cell; > > int ret = -1; > > > > virCheckFlags(VIR_DOMAIN_NONE, -1); > > @@ -566,18 +566,107 @@ jailhouseDomainCreateXML(virConnectPtr conn, > > return dom; > > } > > > > +static int > > +jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) > > +{ > > + virJailhouseDriverPtr driver = domain->conn->privateData; > > + virJailhouseCellInfoPtr cell_info; > > + virDomainObjPtr cell; > > + virJailhouseCellId cell_id; > > + int ret = -1; > > + > > + virCheckFlags(0, -1); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainShutdownFlagsEnsureACL(domain->conn, cell->def, flags) < > 0) > > + goto cleanup; > > + > > + if (virDomainObjGetState(cell, NULL) != VIR_DOMAIN_RUNNING) > > + goto cleanup; > > + > > + if (!(cell_info = virJailhouseFindCellByName(driver, > cell->def->name))) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("no domain with matching name %s and ID %d)"), > > + cell->def->name, cell->def->id); > > + virDomainObjListRemove(driver->domains, cell); > > + goto cleanup; > > + } > > + > > + // Initialize the cell_id. > > + cell_id.id = cell->def->id; > > + cell_id.padding = 0; > > + if (virStrcpy(cell_id.name, cell->def->name, > JAILHOUSE_CELL_ID_NAMELEN) < 0) { > > + virReportError(VIR_ERR_INTERNAL_ERROR, > > + _("Cell name %s length exceeded the limit"), > > + cell->def->name); > > + goto cleanup; > > + } > > + > > + if (shutdownCell(cell_id) < 0) > > + goto cleanup; > > + > > + virDomainObjSetState(cell, VIR_DOMAIN_SHUTOFF, > VIR_DOMAIN_SHUTOFF_SHUTDOWN); > > + > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > +} > > + > > static int > > jailhouseDomainShutdown(virDomainPtr domain) > > { > > - UNUSED(domain); > > - return -1; > > + return jailhouseDomainShutdownFlags(domain, 0); > > +} > > + > > +static int > > +jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) > > +{ > > + virJailhouseDriverPtr driver = domain->conn->privateData; > > + virJailhouseCellInfoPtr cell_info; > > + virDomainObjPtr cell; > > + int ret = -1; > > + > > + virCheckFlags(0, -1); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainDestroyFlagsEnsureACL(domain->conn, cell->def) < 0) > > + goto cleanup; > > + > > + if (virDomainObjGetState(cell, NULL) != VIR_DOMAIN_SHUTOFF) { > > + virReportError(VIR_ERR_OPERATION_INVALID, > > + _("Domain %s is still running."), > > + cell->def->name); > > + goto cleanup; > > + } > > + > > + if (!(cell_info = virJailhouseFindCellByName(driver, > cell->def->name))) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("no domain with matching name %s and ID %d)"), > > + cell->def->name, cell->def->id); > > + virDomainObjListRemove(driver->domains, cell); > > + goto cleanup; > > + } > > + > > + // Remove the cell from the domain list. > > + virDomainObjListRemove(driver->domains, cell); > > + > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > } > > > > static int > > jailhouseDomainDestroy(virDomainPtr domain) > > { > > - UNUSED(domain); > > - return -1; > > + return jailhouseDomainDestroyFlags(domain, 0); > > } > > > > static int > > @@ -675,7 +764,9 @@ static virHypervisorDriver jailhouseHypervisorDriver = > { > > .domainCreateWithFlags = jailhouseDomainCreateWithFlags, /* 6.3.0 > */ > > .domainCreateXML = jailhouseDomainCreateXML, /* 6.3.0 */ > > .domainShutdown = jailhouseDomainShutdown, /* 6.3.0 */ > > + .domainShutdownFlags = jailhouseDomainShutdownFlags, /* 6.3.0 */ > > .domainDestroy = jailhouseDomainDestroy, /* 6.3.0 */ > > + .domainDestroyFlags = jailhouseDomainDestroyFlags, /* 6.3.0 */ > > .domainGetInfo = jailhouseDomainGetInfo, /* 6.3.0 */ > > .domainGetState = jailhouseDomainGetState, /* 6.3.0 */ > > .domainLookupByID = jailhouseDomainLookupByID, /* 6.3.0 */ > > -- > > 2.17.1 > > > > > > > > End of libvir-list Digest, Vol 178, Issue 70 > > ******************************************** > > > >

1 0

[GSoC PATCH 9/9] Jailhouse driver: Add events to events queue in DomainCreate/Shutdown/Destroy
by Prakhar Bansal 05 Sep '20

05 Sep '20

Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_driver.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 45b1f35896..70f0f365cb 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -122,6 +122,7 @@ jailhouseCreateAndLoadCells(virJailhouseDriverPtr driver) // Create all cells in the hypervisor. if (createJailhouseCells(driver->config->cell_config_dir) < 0) return -1; + // Get all cells created above. driver->cell_info_list = getJailhouseCellsInfo(); @@ -137,6 +138,7 @@ jailhouseFreeDriver(virJailhouseDriverPtr driver) virMutexDestroy(&driver->lock); virObjectUnref(driver->xmlopt); virObjectUnref(driver->domains); + virObjectUnref(driver->domainEventState); virObjectUnref(driver->config); VIR_FREE(driver); } @@ -222,6 +224,9 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, if (!(jailhouse_driver->domains = virDomainObjListNew())) goto error; + if (!(jailhouse_driver->domainEventState = virObjectEventStateNew())) + goto error; + if (!(cfg = virJailhouseDriverConfigNew())) goto error; @@ -476,6 +481,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, virDomainDefPtr def = NULL; virDomainObjPtr cell = NULL; virJailhouseCellId cell_id; + virObjectEventPtr event = NULL; char **images = NULL; int num_images = 0, i = 0; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -573,12 +579,16 @@ jailhouseDomainCreateXML(virConnectPtr conn, dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); + event = virDomainEventLifecycleNewFromObj(cell, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); cleanup: if (!dom && removeInactive && !cell->persistent) virDomainObjListRemove(driver->domains, cell); virDomainDefFree(def); virDomainObjEndAPI(&cell); + virObjectEventStateQueue(driver->domainEventState, event); return dom; } @@ -589,6 +599,7 @@ jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) virJailhouseCellInfoPtr cell_info; virDomainObjPtr cell; virJailhouseCellId cell_id; + virObjectEventPtr event = NULL; int ret = -1; virCheckFlags(0, -1); @@ -627,8 +638,12 @@ jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) ret = 0; + event = virDomainEventLifecycleNewFromObj(cell, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); cleanup: virDomainObjEndAPI(&cell); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } @@ -644,6 +659,7 @@ jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) virJailhouseDriverPtr driver = domain->conn->privateData; virJailhouseCellInfoPtr cell_info; virDomainObjPtr cell; + virObjectEventPtr event = NULL; int ret = -1; virCheckFlags(0, -1); @@ -674,8 +690,12 @@ jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) ret = 0; + event = virDomainEventLifecycleNewFromObj(cell, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); cleanup: virDomainObjEndAPI(&cell); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } -- 2.17.1

1 0

[GSoC PATCH 8/9] Jailhouse driver: Fixes for creation of cells, fetching cell info, disabling jailhouse hypervisor
by Prakhar Bansal 05 Sep '20

05 Sep '20

- Added xmlopt to the Jailhouse driver - Added ACL check in ConnectOpen Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_api.c | 48 +++++++++++++------------- src/jailhouse/jailhouse_driver.c | 58 ++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/src/jailhouse/jailhouse_api.c b/src/jailhouse/jailhouse_api.c index 510e2f5f66..bb82b5a31e 100644 --- a/src/jailhouse/jailhouse_api.c +++ b/src/jailhouse/jailhouse_api.c @@ -69,15 +69,9 @@ char *readSysfsCellString(const unsigned int id, const char *entry); int cell_match(const struct dirent *dirent); -int createCell(const char *conf_file); - -int loadImagesInCell(virJailhouseCellId cell_id, char *images, int num_images); - -int shutdownCell(virJailhouseCellId cell_id); +int cell_match_info(const struct dirent *dirent); -int startCell(virJailhouseCellId cell_id); - -int destroyCell(virJailhouseCellId cell_id); +int createCell(const char *conf_file); int getCellInfo(const unsigned int id, virJailhouseCellInfoPtr * cell_info); @@ -121,25 +115,31 @@ jailhouseDisable(void) fd = openDev(); err = ioctl(fd, JAILHOUSE_DISABLE); - if (err) + if (err) { virReportSystemError(errno, "%s", _("Failed to disable jailhouse: %s")); + return -1; + } VIR_DEBUG("Jailhouse hypervisor is disabled"); - return err; + return 0; } int cell_match(const struct dirent *dirent) { char *ext = strrchr(dirent->d_name, '.'); - return dirent->d_name[0] != '.' - && (STREQ(ext, JAILHOUSE_CELL_FILE_EXTENSION) == 0); + && STREQ(ext, JAILHOUSE_CELL_FILE_EXTENSION); } +int +cell_match_info(const struct dirent *dirent) +{ + return dirent->d_name[0] != '.'; +} int createJailhouseCells(const char *dir_path) { @@ -150,7 +150,6 @@ createJailhouseCells(const char *dir_path) if (strlen(dir_path) == 0) return ret; - num_entries = scandir(dir_path, &namelist, cell_match, alphasort); if (num_entries == -1) { if (errno == ENOENT) { @@ -170,7 +169,8 @@ createJailhouseCells(const char *dir_path) for (i = 0; i < num_entries; i++) { g_autofree char *file_path = g_strdup_printf("%s/%s", dir_path, namelist[i]->d_name); - if (createCell(file_path) != 0) { + + if (createCell(file_path) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Cell creation failed with conf found in %s."), namelist[i]->d_name); @@ -208,13 +208,13 @@ createCell(const char *conf_file) VIR_AUTOCLOSE fd = -1; if (strlen(conf_file) == 0) - return err; + return -1; len = virFileReadAll(conf_file, MAX_JAILHOUSE_CELL_CONFIG_FILE_SIZE, &buffer); if (len < 0 || !buffer) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Failed to read the system configuration file")); - return err; + return -1; } cell_create.config_address = (unsigned long) buffer; @@ -223,12 +223,14 @@ createCell(const char *conf_file) fd = openDev(); err = ioctl(fd, JAILHOUSE_CELL_CREATE, &cell_create); - if (err) + if (err) { virReportSystemError(errno, "%s", _("Cell creation failed: %s")); + return -1; + } - return err; + return 0; } void @@ -243,11 +245,11 @@ cellInfoFree(virJailhouseCellInfoPtr cell_info) char * readSysfsCellString(const unsigned int id, const char *entry) { - g_autofree char *buffer = NULL; + char *buffer = NULL; g_autofree char *file_path = NULL; int len = -1; - file_path = g_strdup_printf(JAILHOUSE_CELLS "%u/%s", id, entry); + file_path = g_strdup_printf(JAILHOUSE_CELLS "/%u/%s", id, entry); len = virFileReadAll(file_path, 1024, &buffer); if (len < 0 || !buffer) { @@ -277,13 +279,12 @@ getCellInfo(const unsigned int id, virJailhouseCellInfoPtr *cell_info_ptr) /* get cell name */ tmp = readSysfsCellString(id, "name"); - if (virStrncpy(cell_info->id.name, tmp, JAILHOUSE_CELL_ID_NAMELEN, JAILHOUSE_CELL_ID_NAMELEN) < 0) { + if (virStrcpy(cell_info->id.name, tmp, JAILHOUSE_CELL_ID_NAMELEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cell ID %s too long to be copied to the cell info"), tmp); return -1; } - cell_info->id.name[JAILHOUSE_CELL_ID_NAMELEN] = 0; VIR_FREE(tmp); @@ -310,8 +311,7 @@ getJailhouseCellsInfo(void) int num_entries; size_t i; - num_entries = - scandir(JAILHOUSE_CELLS, &namelist, cell_match, alphasort); + num_entries = scandir(JAILHOUSE_CELLS, &namelist, cell_match_info, alphasort); if (num_entries == -1) { if (errno == ENOENT) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 46c7759cb8..45b1f35896 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -122,7 +122,6 @@ jailhouseCreateAndLoadCells(virJailhouseDriverPtr driver) // Create all cells in the hypervisor. if (createJailhouseCells(driver->config->cell_config_dir) < 0) return -1; - // Get all cells created above. driver->cell_info_list = getJailhouseCellsInfo(); @@ -136,6 +135,7 @@ jailhouseFreeDriver(virJailhouseDriverPtr driver) return; virMutexDestroy(&driver->lock); + virObjectUnref(driver->xmlopt); virObjectUnref(driver->domains); virObjectUnref(driver->config); VIR_FREE(driver); @@ -147,7 +147,6 @@ jailhouseConnectOpen(virConnectPtr conn, virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { uid_t uid = geteuid(); - virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); if (!virConnectValidateURIPath(conn->uri->path, "jailhouse", uid == 0)) @@ -159,8 +158,10 @@ jailhouseConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - conn->privateData = jailhouse_driver; + if (virConnectOpenEnsureACL(conn) < 0) + return VIR_DRV_OPEN_ERROR; + conn->privateData = jailhouse_driver; return VIR_DRV_OPEN_SUCCESS; } @@ -169,16 +170,19 @@ jailhouseConnectOpen(virConnectPtr conn, static int jailhouseConnectClose(virConnectPtr conn) { - conn->privateData = NULL; + conn->privateData = NULL; - return 0; + return 0; } static int jailhouseStateCleanup(void) { if (!jailhouse_driver) - return -1; + return -1; + + if (jailhouseDisable() < 0) + return -1; if (jailhouse_driver->lockFD != -1) virPidFileRelease(jailhouse_driver->config->stateDir, @@ -187,6 +191,9 @@ jailhouseStateCleanup(void) virMutexDestroy(&jailhouse_driver->lock); jailhouseFreeDriver(jailhouse_driver); + + jailhouse_driver = NULL; + return 0; } @@ -199,6 +206,9 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, virJailhouseDriverConfigPtr cfg = NULL; int rc; + if (jailhouse_driver) + return VIR_DRV_STATE_INIT_COMPLETE; + jailhouse_driver = g_new0(virJailhouseDriver, 1); jailhouse_driver->lockFD = -1; @@ -220,6 +230,10 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, if (jailhouseLoadConf(cfg) < 0) goto error; + if (!(jailhouse_driver->xmlopt = virDomainXMLOptionNew(NULL, NULL, + NULL, NULL, NULL))) + goto error; + if (virFileMakePath(cfg->stateDir) < 0) { virReportSystemError(errno, _("Failed to create state dir %s"), cfg->stateDir); @@ -292,7 +306,7 @@ jailhouseConnectListAllDomains(virConnectPtr conn, static virDomainPtr jailhouseDomainLookupByID(virConnectPtr conn, int id) { -virJailhouseDriverPtr driver = conn->privateData; + virJailhouseDriverPtr driver = conn->privateData; virDomainObjPtr cell; virDomainPtr dom = NULL; @@ -409,7 +423,6 @@ jailhouseDomainCreateWithFlags(virDomainPtr domain, virJailhouseCellInfoPtr cell_info; virDomainObjPtr cell; int ret = -1; - virCheckFlags(VIR_DOMAIN_NONE, -1); if (!domain->name) { @@ -462,23 +475,23 @@ jailhouseDomainCreateXML(virConnectPtr conn, virDomainPtr dom = NULL; virDomainDefPtr def = NULL; virDomainObjPtr cell = NULL; - virDomainDiskDefPtr disk = NULL; virJailhouseCellId cell_id; char **images = NULL; int num_images = 0, i = 0; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; + bool removeInactive = false; if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; - if ((def = virDomainDefParseString(xml, NULL, - NULL, parse_flags)) == NULL) + if (!(def = virDomainDefParseString(xml, driver->xmlopt, + NULL, parse_flags))) goto cleanup; - if ((cell = virDomainObjListFindByUUID(driver->domains, def->uuid))) + if (virDomainCreateXMLEnsureACL(conn, def) < 0) goto cleanup; - if (virDomainCreateXMLEnsureACL(conn, def) < 0) + if ((cell = virDomainObjListFindByUUID(driver->domains, def->uuid))) goto cleanup; if (!(cell_info = virJailhouseFindCellByName(driver, def->name))) { @@ -492,13 +505,13 @@ jailhouseDomainCreateXML(virConnectPtr conn, def->id = cell_info->id.id; if (!(cell = virDomainObjListAdd(driver->domains, def, - NULL, - VIR_DOMAIN_OBJ_LIST_ADD_LIVE | - VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) + driver->xmlopt, 0, NULL))) goto cleanup; def = NULL; + removeInactive = true; + if (cell->def->ndisks < 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Domain XML doesn't contain any disk images")); @@ -513,7 +526,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, if (cell->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && virDomainDiskGetType(cell->def->disks[i]) == VIR_STORAGE_TYPE_FILE) { - disk = cell->def->disks[i]; + virDomainDiskDefPtr disk = cell->def->disks[i]; const char *src = virDomainDiskGetSource(disk); if (!src) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -525,7 +538,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, num_images++; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("A Jailhouse doamin(cell) can ONLY have FILE type disks")); + _("A Jailhouse domain(cell) can ONLY have FILE type disks")); goto cleanup; } } @@ -533,7 +546,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, // Initialize the cell_id. cell_id.id = cell->def->id; cell_id.padding = 0; - if (virStrncpy(cell_id.name, cell->def->name, JAILHOUSE_CELL_ID_NAMELEN, JAILHOUSE_CELL_ID_NAMELEN) < 0) { + if (virStrcpy(cell_id.name, cell->def->name, JAILHOUSE_CELL_ID_NAMELEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cell name %s length exceeded the limit"), cell->def->name); @@ -561,6 +574,9 @@ jailhouseDomainCreateXML(virConnectPtr conn, dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); cleanup: + if (!dom && removeInactive && !cell->persistent) + virDomainObjListRemove(driver->domains, cell); + virDomainDefFree(def); virDomainObjEndAPI(&cell); return dom; @@ -671,7 +687,7 @@ jailhouseDomainDestroy(virDomainPtr domain) static int virjailhouseGetDomainTotalCpuStats(virDomainObjPtr cell, - unsigned long long *cpustats) + unsigned long long *cpustats) { // TODO(Prakhar): Not implemented yet. UNUSED(cell); @@ -721,7 +737,7 @@ jailhouseDomainGetState(virDomainPtr domain, goto cleanup; if (virDomainGetStateEnsureACL(domain->conn, cell->def) < 0) - goto cleanup; + goto cleanup; *state = virDomainObjGetState(cell, reason); ret = 0; -- 2.17.1

1 0