- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: fix comment in qemuSecurityChownCallback
by Ján Tomko 04 Oct '18

04 Oct '18

s/chmod/chown/ Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b238309852..ef87a6ef05 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -287,7 +287,7 @@ qemuSecurityChownCallback(const virStorageSource *src, return rv; if (virStorageSourceIsLocalStorage(src)) { - /* use direct chmod for local files so that the file doesn't + /* use direct chown for local files so that the file doesn't * need to be initialized */ if (!src->path) return 0; -- 2.16.4

1 0

[libvirt] domain XML for tracking libosinfo ID
by Cole Robinson 04 Oct '18

04 Oct '18

Right now in virt-manager we only track a VM's OS name (win10, fedora28, etc.) during the VM install phase. This piece of data is important post-install though: if the user adds a new disk to the VM later, we want to be able to ask libosinfo about what devices the installed OS supports, so we can set optimal defaults, like enabling virtio. There isn't any standard libvirt XML field to track this kind of info though, so apps have to invent their own schema. nova and rhev do it indirectly AFAICT. gnome-boxes does it directly with XML like this: <metadata> <boxes:gnome-boxes xmlns:boxes="https://wiki.gnome.org/Apps/Boxes"> <os-id>http://fedoraproject.org/fedora/28</os-id> .... </boxes:gnome-boxes> </metadata> I want to add something similar to virt-manager but it seems a shame to invent our own private schema for something that most non-trivial virt apps will want to know about. I was thinking a schema we could document with libosinfo, something like <metadata> <libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> <os-id>http://fedoraproject.org/fedora/28</os-id> </libosinfo> </metadata> FWIW there's an oooold bug about possible tracking something like this in the domain XML as a first class citizen: https://bugzilla.redhat.com/show_bug.cgi?id=509164 But I think nowadays that's a bad fit and is likely off the table Thoughts? - Cole

3 8

[libvirt] [PATCH v3 0/6] BaselineHypervisorCPU using QEMU QMP exchanges
by Chris Venteicher 04 Oct '18

04 Oct '18

Some architectures (S390) depend on QEMU to compute baseline CPU model and expand a models feature set. Interacting with QEMU requires starting the QEMU process and completing one or more query-cpu-model-baseline QMP exchanges with QEMU in addition to a query-cpu-model-expansion QMP exchange to expand all features in the model. See "s390x CPU models: exposing features" patch set on Qemu-devel for discussion of QEMU aspects. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Version 3 attempts to address all issues from V1 and V2 including making the QEMU process activation for QMP Queries generic (not specific to capabilities) and moving that code from qemu_capabilities to qemu_process. I attempted to make the new qemu_process functions consistent with the functions but mostly ended up reusing the guts of the previous functions from qemu_capabilities. Of interest may be the choice to reuse a domain structure to hold the Qmp Query process state and connection information. Also, pay attention to the use of a large random number to uniquely identify decoupled processes in terms of sockets and file system footprint. If you believe it's worth the effort I think there are some pre-existing library functions to establish files with unique identifiers in a thread safe way. The last patch may also be interesting and is based on past discussion of QEMU cpu expansion only returning migratable features except for one x86 case where non-migratable features are explicitly requested. The patch records that features are migratable based on QEMU only returning migratable features. The main result is the CPU xml for S390 CPU's contains the same migratability info the X86 currently does. The testcases were updated to reflect the change. Is this ok? Unlike the previous versions every patch should compile independently if applied in sequence. Thanks, Chris Chris Venteicher (6): qemu_monitor: Introduce qemuMonitorCPUModelInfoNew qemu_monitor: Introduce qemuMonitorCPUModelInfo / JSON conversion qemu_monitor: qemuMonitorGetCPUModelExpansion inputs and outputs CPUModelInfo qemu_process: Use common processes mgmt funcs for all QMP query types qemu_driver: BaselineHypervisorCPU support for S390 qemu_monitor: Default props to migratable when expanding cpu model src/qemu/qemu_capabilities.c | 559 ++++++++---------- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_driver.c | 143 ++++- src/qemu/qemu_monitor.c | 199 ++++++- src/qemu/qemu_monitor.h | 29 +- src/qemu/qemu_monitor_json.c | 210 +++++-- src/qemu/qemu_monitor_json.h | 13 +- src/qemu/qemu_process.c | 398 +++++++++++++ src/qemu/qemu_process.h | 35 ++ tests/cputest.c | 11 +- .../caps_2.10.0.s390x.xml | 60 +- .../caps_2.11.0.s390x.xml | 58 +- .../caps_2.12.0.s390x.xml | 56 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 32 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 34 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 64 +- tests/qemucapabilitiestest.c | 7 + 17 files changed, 1375 insertions(+), 537 deletions(-) -- 2.17.1

2 12

[libvirt] [PATCH v3 0/5] libxl: PVHv2 support
by Marek Marczykowski-Górecki 03 Oct '18

03 Oct '18

This is a respin of my old PVHv1 patch[1], converted to PVHv2. Should the code use "PVH" name (as libxl does internally), or "PVHv2" as in many places in Xen documentation? I've chosen the former, but want to confirm it. Also, not sure about VIR_DOMAIN_OSTYPE_XENPVH (as discussed on PVHv1 patch) - while it will be messy in many cases, there is libxl_domain_build_info.u.{hvm,pv,pvh} which would be good to not mess up. Also, PVHv2 needs different kernel features than PV (CONFIG_XEN_PVH vs CONFIG_XEN_PV), so keeping the same VIR_DOMAIN_OSTYPE_XEN could be confusing. On the other hand, libxl_domain_build_info.u.pv is used in very few places (one section of libxlMakeDomBuildInfo), so guarding u.hvm access with VIR_DOMAIN_OSTYPE_HVM may be enough. For now I've reused VIR_DOMAIN_OSTYPE_XEN - in the driver itself, most of the code is the same as for PV. Since PVHv2 relies on features in newer Xen versions, I needed to convert also some older code. For example b_info->u.hvm.nested_hvm was deprecated in favor of b_info->nested_hvm. While the code do handle both old and new versions (obviously refusing PVHv2 if Xen is too old), this isn't the case for tests. How it should be handled, if at all? First few preparatory patches can be applied independently. [1] https://www.redhat.com/archives/libvir-list/2016-August/msg00376.html Changes in v2: - drop "docs: don't refer to deprecated 'linux' ostype in example" patch - migrating further away from "linux" os type is offtopic to this series and apparently is a controversial thing - drop "docs: update domain schema for machine attribute" patch - already applied - apply review comments from Jim - rebase on master Changes in v3: - rebase on master, drop already applied patches - use #ifdef LIBXL_DOMAIN_TYPE_PVH to detect PVH support, fix compilation failure on older Xen - exclude PVH from VIR_DOMAIN_OSTYPE_XEN <-> VIR_DOMAIN_OSTYPE_LINUX conversion - fix reported capabilities for PVH Marek Marczykowski-Górecki (5): libxl: reorder libxlMakeDomBuildInfo for upcoming PVH support libxl: add support for PVH tests: add basic Xen PVH test xenconfig: add support for parsing type= xl config entry xenconfig: add support for type="pvh" docs/formatcaps.html.in | 4 +- docs/schemas/domaincommon.rng | 1 +- src/conf/domain_conf.c | 6 +- src/libxl/libxl_capabilities.c | 47 +++++++++++--- src/libxl/libxl_conf.c | 76 ++++++++++++++++------ src/libxl/libxl_driver.c | 6 +- src/xenconfig/xen_common.c | 27 ++++++-- src/xenconfig/xen_xl.c | 5 +- tests/libxlxml2domconfigdata/basic-pvh.json | 49 ++++++++++++++- tests/libxlxml2domconfigdata/basic-pvh.xml | 28 ++++++++- tests/libxlxml2domconfigtest.c | 3 +- tests/testutilsxen.c | 3 +- tests/xlconfigdata/test-fullvirt-type.cfg | 21 ++++++- tests/xlconfigdata/test-fullvirt-type.xml | 27 ++++++++- tests/xlconfigdata/test-paravirt-type.cfg | 13 ++++- tests/xlconfigdata/test-paravirt-type.xml | 25 +++++++- tests/xlconfigdata/test-pvh-type.cfg | 13 ++++- tests/xlconfigdata/test-pvh-type.xml | 25 +++++++- tests/xlconfigtest.c | 3 +- 19 files changed, 346 insertions(+), 36 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/basic-pvh.json create mode 100644 tests/libxlxml2domconfigdata/basic-pvh.xml create mode 100644 tests/xlconfigdata/test-fullvirt-type.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-type.xml create mode 100644 tests/xlconfigdata/test-paravirt-type.cfg create mode 100644 tests/xlconfigdata/test-paravirt-type.xml create mode 100644 tests/xlconfigdata/test-pvh-type.cfg create mode 100644 tests/xlconfigdata/test-pvh-type.xml base-commit: 199eee6aae7af3d813fbe98660c7e0fa1a8ae7b7 -- git-series 0.9.1

2 16

[libvirt] [RFC] cgroup settings and systemd daemon-reload conflict
by Nikolay Shirokovskiy 03 Oct '18

03 Oct '18

Hi, all. It turns out that systemd daemon-reload reset settings that are managable thru 'systemctl set-property' interface. > virsh schedinfo tst3 | grep global_quota global_quota : -1 > virsh schedinfo tst3 --set global_quota=50000 | grep global_quota global_quota : 50000 > systemctl daemon-reload > virsh schedinfo tst3 | grep global_quota global_quota : -1 This behaviour does not limited to cpu controller, same for blkio for example. I checked different versions of systemd (219 - Feb 15, and quite recent 236 - Dec 17) to make sure it is not kind of bug of old version. So systemd does not play well with direct writes to cgroup parameters that managable thru systemd. Looks like libvirtd needs to use systemd's dbus interface to change all such parameters. I only wonder how this can be unnoticed for such long time (creating cgroup for domain thru systemd - Jul 2013) as daemon-reload is called upon libvirtd package update. May be I miss something? Nikolay

2 4

[libvirt] [glib PATCH 0/2] Add ns to the node's children when setting a custom XML
by Fabiano Fidêncio 03 Oct '18

03 Oct '18

This work is preparing the field for adding and using metadata.libosinfo in GNOME Boxes (in a similar way that's already done for virt-manager) so we can have a cross-app schema for tracking libosinfo OS ID in the domain <metadata> XML. The tests added are from real cases as: - current Boxes' metadata (so, we ensure we won't break anything there); - the new Boxes' metadata.libosinfo; - Nova's XML example; Fabiano Fidêncio (2): object: Also add the ns to the node's children domain: Introduce gvir_config_domain_set_custom_xml_ns_children() libvirt-gconfig/libvirt-gconfig-domain.c | 41 ++++++++++++--- libvirt-gconfig/libvirt-gconfig-domain.h | 5 ++ .../libvirt-gconfig-object-private.h | 3 +- libvirt-gconfig/libvirt-gconfig-object.c | 51 +++++++++++++++---- libvirt-gconfig/libvirt-gconfig.sym | 5 ++ tests/test-gconfig.c | 3 ++ tests/xml/gconfig-domain.xml | 12 +++++ 7 files changed, 103 insertions(+), 17 deletions(-) -- 2.19.0

2 3

[libvirt] [PATCH] qemu: fix up permissions for pre-created UNIX sockets
by Ján Tomko 03 Oct '18

03 Oct '18

My commit d6b8838 fixed the uid:gid for the pre-created UNIX sockets but did not account for the different umask of libvirtd and QEMU. Since commit 0e1a1a8c we set umask to '0002' for the QEMU process. Manually tune-up the permissions to match what we would have gotten if QEMU had created the socket. https://bugzilla.redhat.com/show_bug.cgi?id=1633389 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 887947dc11..d77cf8c2d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5034,6 +5034,12 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) goto error; } + /* We run QEMU with umask 0002. Compensate for the umask + * libvirtd might be running under to get the same permission + * QEMU would have. */ + if (virFileUpdatePerm(dev->data.nix.path, 0002, 0664) < 0) + goto error; + return fd; error: -- 2.17.1

2 1

[libvirt] [glib PATCH] gconfig, gobject: Use G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE
by Fabiano Fidêncio 03 Oct '18

03 Oct '18

Commit 7190c5024d introduced the usage of new GObject define macros with private. However as the conversion hasn't been done for abstract types (G_DEFINE_ABSTRACT_TYPE) and the addition of the private classes for the abstract types has been removed as part of the commit, crashes can be seen in Apps consuming libvirt-glib, as this one from GNOME Boxes: Thread 1 "gnome-boxes" received signal SIGSEGV, Segmentation fault. 0x00007ffff7ef2b35 in g_type_check_instance_is_fundamentally_a () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 (gdb) bt #0 0x00007ffff7ef2b35 in g_type_check_instance_is_fundamentally_a () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 #1 0x00007ffff7ed2e75 in g_object_unref () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 #2 0x00007ffff6ef094e in gvir_domain_device_set_property (object=0x555556680950, prop_id=2, value=0x7fffffffcbe0, pspec=0x555556772540) at libvirt-gobject-domain-device.c:89 #3 0x00007ffff7ed3b19 in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 #4 0x00007ffff7ed5624 in g_object_new_valist () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 #5 0x00007ffff7ed5959 in g_object_new () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 #6 0x00005555555d8257 in boxes_libvirt_machine_get_domain_disk (self=0x5555560e6790, error=0x55555615a630) at /run/build/gnome-boxes/src/libvirt-machine.vala:547 #7 0x00005555555d0e7e in boxes_libvirt_machine_update_io_stat_co (_data_=0x55555615a320) at /run/build/gnome-boxes/src/libvirt-machine.vala:280 #8 0x00005555555d09b2 in boxes_libvirt_machine_update_io_stat (self=0x5555560e6790, info=0x555555f25990, stat=0x555556736a90, _callback_=0x5555555d2992 <boxes_libvirt_machine_update_stats_ready>, _user_data_=0x555556736a50) at /run/build/gnome-boxes/src/libvirt-machine.vala:5 #9 0x00005555555d3120 in boxes_libvirt_machine_update_stats_co (_data_=0x555556736a50) at /run/build/gnome-boxes/src/libvirt-machine.vala:332 #10 0x00005555555d29dd in boxes_libvirt_machine_update_stats_ready (source_object=0x5555567bb840, _res_=0x55555677ae00, _user_data_=0x555556736a50) at /run/build/gnome-boxes/src/libvirt-machine.vala:328 #11 0x00007ffff72adc89 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0 #12 0x00007ffff72adcc9 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0 #13 0x00007ffff7dec948 in g_main_context_dispatch () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #14 0x00007ffff7decd38 in ?? () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #15 0x00007ffff7decdcc in g_main_context_iteration () from /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 #16 0x00007ffff72c2dbd in g_application_run () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0 #17 0x00005555556004b6 in _vala_main (args=0x7fffffffd4f8, args_length1=1) at /run/build/gnome-boxes/src/main.vala:84 #18 0x0000555555600517 in main (argc=1, argv=0x7fffffffd4f8) at /run/build/gnome-boxes/src/main.vala:68 In order to solve the issue, let's just replace G_DEFINE_ABSTRACT_TYPE by G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-domain-address.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-chardev.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-controller.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-hostdev.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-smartcard.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 2 +- libvirt-gobject/libvirt-gobject-domain-device.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address.c b/libvirt-gconfig/libvirt-gconfig-domain-address.c index b070a1f..a9eefd8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address.c @@ -33,7 +33,7 @@ struct _GVirConfigDomainAddressPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainAddress, gvir_config_domain_address, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainAddress, gvir_config_domain_address, GVIR_CONFIG_TYPE_OBJECT); static void gvir_config_domain_address_class_init(GVirConfigDomainAddressClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c index 50d4030..fe22290 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c @@ -34,7 +34,7 @@ struct _GVirConfigDomainChardevSourcePrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardevSource, gvir_config_domain_chardev_source, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSource, gvir_config_domain_chardev_source, GVIR_CONFIG_TYPE_OBJECT); static void gvir_config_domain_chardev_source_class_init(GVirConfigDomainChardevSourceClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c index a5ebc9c..aa7e3e9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c @@ -34,7 +34,7 @@ struct _GVirConfigDomainChardevPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardev, gvir_config_domain_chardev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE) +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainChardev, gvir_config_domain_chardev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE) static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass *klass G_GNUC_UNUSED) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller.c b/libvirt-gconfig/libvirt-gconfig-domain-controller.c index a2d40c3..0c880f8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller.c @@ -33,7 +33,7 @@ struct _GVirConfigDomainControllerPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainController, gvir_config_domain_controller, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainController, gvir_config_domain_controller, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); static void gvir_config_domain_controller_class_init(GVirConfigDomainControllerClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index e35976f..8c24adc 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -33,7 +33,7 @@ struct _GVirConfigDomainGraphicsPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainGraphics, gvir_config_domain_graphics, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainGraphics, gvir_config_domain_graphics, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c b/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c index ade2dc3..465490e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c @@ -34,7 +34,7 @@ struct _GVirConfigDomainHostdevPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainHostdev, gvir_config_domain_hostdev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainHostdev, gvir_config_domain_hostdev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); static void gvir_config_domain_hostdev_class_init(GVirConfigDomainHostdevClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 2b841b3..7c5c8e4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -35,7 +35,7 @@ struct _GVirConfigDomainInterfacePrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainInterface, gvir_config_domain_interface, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainInterface, gvir_config_domain_interface, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c index f7c65f0..0d000e7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c @@ -33,7 +33,7 @@ struct _GVirConfigDomainSmartcardPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainSmartcard, gvir_config_domain_smartcard, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcard, gvir_config_domain_smartcard, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index f33a56f..d6d98dd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -33,7 +33,7 @@ struct _GVirConfigDomainTimerPrivate gboolean unused; }; -G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainTimer, gvir_config_domain_timer, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirConfigDomainTimer, gvir_config_domain_timer, GVIR_CONFIG_TYPE_OBJECT); static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klass G_GNUC_UNUSED) diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index 4ed846c..ce199c5 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -40,7 +40,7 @@ struct _GVirDomainDevicePrivate GVirConfigDomainDevice *config; }; -G_DEFINE_ABSTRACT_TYPE(GVirDomainDevice, gvir_domain_device, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirDomainDevice, gvir_domain_device, G_TYPE_OBJECT); enum { PROP_0, -- 2.19.0

2 1

[libvirt] [PATCH v2] virFileIsSharedFSType: Check for fuse.glusterfs too
by Michal Privoznik 03 Oct '18

03 Oct '18

https://bugzilla.redhat.com/show_bug.cgi?id=1632711 GlusterFS is typically safe when it comes to migration. It's a network FS after all. However, it can be mounted via FUSE driver they provide. If that is the case we fail to identify it and think migration is not safe and require VIR_MIGRATE_UNSAFE flag. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - fixed the function name - switched from for() loop into virStringListHasString - ignoring retval of the function in the caller src/util/virfile.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index f8ae07fe4a..2a7e87102a 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3458,6 +3458,76 @@ int virFilePrintf(FILE *fp, const char *msg, ...) # ifndef HUGETLBFS_MAGIC # define HUGETLBFS_MAGIC 0x958458f6 # endif +# ifndef FUSE_SUPER_MAGIC +# define FUSE_SUPER_MAGIC 0x65735546 +# endif + +# define PROC_MOUNTS "/proc/mounts" + +static int +virFileIsSharedFixFUSE(const char *path, + long *f_type) +{ + char *dirpath = NULL; + const char **mounts = NULL; + size_t nmounts = 0; + char *p; + FILE *f = NULL; + struct mntent mb; + char mntbuf[1024]; + int ret = -1; + + if (VIR_STRDUP(dirpath, path) < 0) + return -1; + + if (!(f = setmntent(PROC_MOUNTS, "r"))) { + virReportSystemError(errno, + _("Unable to open %s"), + PROC_MOUNTS); + goto cleanup; + } + + while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) { + if (STRNEQ("fuse.glusterfs", mb.mnt_type)) + continue; + + if (VIR_APPEND_ELEMENT_COPY(mounts, nmounts, mb.mnt_dir) < 0) + goto cleanup; + } + + /* Add NULL sentinel so that this is a virStringList */ + if (VIR_REALLOC_N(mounts, nmounts + 1) < 0) + goto cleanup; + mounts[nmounts] = NULL; + + do { + if ((p = strrchr(dirpath, '/')) == NULL) { + virReportSystemError(EINVAL, + _("Invalid relative path '%s'"), path); + goto cleanup; + } + + if (p == dirpath) + *(p+1) = '\0'; + else + *p = '\0'; + + if (virStringListHasString(mounts, dirpath)) { + VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. " + "Fixing shared FS type", dirpath, path); + *f_type = GFS2_MAGIC; + break; + } + } while (p != dirpath); + + ret = 0; + cleanup: + endmntent(f); + VIR_FREE(mounts); + VIR_FREE(dirpath); + return ret; +} + int virFileIsSharedFSType(const char *path, @@ -3503,6 +3573,11 @@ virFileIsSharedFSType(const char *path, return -1; } + if (sb.f_type == FUSE_SUPER_MAGIC) { + VIR_DEBUG("Found FUSE mount for path=%s. Trying to fix it", path); + virFileIsSharedFixFUSE(path, (long *) &sb.f_type); + } + VIR_DEBUG("Check if path %s with FS magic %lld is shared", path, (long long int)sb.f_type); @@ -3594,8 +3669,6 @@ virFileGetDefaultHugepageSize(unsigned long long *size) return 0; } -# define PROC_MOUNTS "/proc/mounts" - int virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, size_t *ret_nfs) -- 2.16.4

2 1

[libvirt] [PATCH] cpu_map: Use and install Icelake model definitions
by Jiri Denemark 03 Oct '18

03 Oct '18

In commit v4.7.0-168-g993d85ae5e I introduced two Icelake CPU models, but failed to actually include them in the CPU map index. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/Makefile.inc.am | 2 ++ src/cpu_map/index.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index 76bcfbc703..9eeb33e4be 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -27,6 +27,8 @@ cpumap_DATA = \ cpu_map/x86_Haswell-IBRS.xml \ cpu_map/x86_Haswell-noTSX.xml \ cpu_map/x86_Haswell-noTSX-IBRS.xml \ + cpu_map/x86_Icelake-Client.xml \ + cpu_map/x86_Icelake-Server.xml \ cpu_map/x86_IvyBridge.xml \ cpu_map/x86_IvyBridge-IBRS.xml \ cpu_map/x86_kvm32.xml \ diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index db82980dd4..dccda3919d 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -46,6 +46,8 @@ <include filename="x86_Skylake-Client-IBRS.xml"/> <include filename="x86_Skylake-Server.xml"/> <include filename="x86_Skylake-Server-IBRS.xml"/> + <include filename="x86_Icelake-Client.xml"/> + <include filename="x86_Icelake-Server.xml"/>  <include filename="x86_athlon.xml"/> -- 2.19.0

2 1