- Devel - libvirt List Archives

[libvirt] [PATCH] tests: fix use of fixedcontent variable
by Laine Stump 19 Sep '16

19 Sep '16

Commit 8563560026d192c2cf047b550ffd468692245ed6 switched from hardcoded use of strcontent to hardcoded use of fixedcontent (fixedcontent is *sometimes* a copy of strcontent with a \n appended). This was a problem because sometimes fixedcontent is *not* a copy of strcontent, but is instead NULL, leading to the regenerated test case output being a 0 length file. This patch creates a new const char *cmpcontent initialized to strcontent, but changed to fixedcontent if/when fixedcontent is created, then always uses cmpcontent instead of (str|fixed)content. --- tests/testutils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index f87628e..c934785 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -694,6 +694,7 @@ virTestCompareToFile(const char *strcontent, int ret = -1; char *filecontent = NULL; char *fixedcontent = NULL; + const char *cmpcontent = strcontent; if (virTestLoadFile(filename, &filecontent) < 0 && !virTestGetRegenerate()) goto failure; @@ -703,13 +704,13 @@ virTestCompareToFile(const char *strcontent, strcontent[strlen(strcontent) - 1] != '\n') { if (virAsprintf(&fixedcontent, "%s\n", strcontent) < 0) goto failure; + cmpcontent = fixedcontent; } - if (STRNEQ_NULLABLE(fixedcontent ? fixedcontent : strcontent, - filecontent)) { + if (STRNEQ_NULLABLE(cmpcontent, filecontent)) { virTestDifferenceFull(stderr, filecontent, filename, - fixedcontent, NULL); + cmpcontent, NULL); goto failure; } -- 2.7.4

2 1

[libvirt] [PATCH 0/2] Rawhide fix for major() in sys/types.h
by Eric Blake 19 Sep '16

19 Sep '16

Now that autoconf and gnulib have worked around the glibc 2.25 issue, we don't need our hack any more. I'll probably push in 24 hours under the gnulib-maintenance rule, if I don't get a review first. Eric Blake (2): build: update to latest gnulib Revert "configure: Check for major() more strictly" .gnulib | 2 +- configure.ac | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) -- 2.7.4

1 3

[libvirt] [python PATCH] override: Properly override wrapper for virDomainGetGuestVcpus
by Peter Krempa 19 Sep '16

19 Sep '16

Without the change to libvirt-override-api.xml generator.py would generate the following function header: def guestVcpus(self, params, nparams, flags=0): Since @params and @nparams are output-only in C and the python C implementation actualy creates a dict from them we should not need to pass them. Add the API definition to drop the two unnecessary args: def guestVcpus(self, flags=0): The code did not work at all until this change as the C impl expects only two arguments but the python required use of four. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1377071 --- libvirt-override-api.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 49de122..50250bc 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -698,5 +698,11 @@ <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> <return type='char *' info="dictionary of domain interfaces along with their MAC and IP addresses"/> </function> + <function name='virDomainGetGuestVcpus' file='python'> + <info>returns a dictionary containing information regarding guest vcpus</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> + <return type='int' info="dictionary of vcpu data returned by the guest agent"/> + </function> </symbols> </api> -- 2.10.0

2 1

[libvirt] [PATCH 0/2] Fix a migration crasher
by Michal Privoznik 19 Sep '16

19 Sep '16

So I've tried to migrate a guest recently (to answer a needinfo for some bug of mine). Meanwhile, I've ran into many problems and bugs we have (apparently nobody tried migrations lately). Here's the first round of patches. Second round will require proper deep copy function for virDomainDef struct. Michal Privoznik (2): qemuBuildMemoryBackendStr: Don't crash if no hugetlbfs is mounted qemu: Introduce qemuGetHupageMemPath src/qemu/qemu_command.c | 57 +++++-------------------------------------------- src/qemu/qemu_conf.c | 50 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 4 ++++ 3 files changed, 59 insertions(+), 52 deletions(-) -- 2.8.4

2 8

[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