- Devel - libvirt List Archives

[libvirt] [PATCH v4 0/9] A bunch of extensions to libxl driver
by Marek Marczykowski-Górecki 23 Mar '15

23 Mar '15

This are some additional features to libxl driver. Some of them require change in domain config structures/syntax. Details described with each patch. I've dropped patches already applied in this version. Patches for stubdom support in xenconfig and some more tests will be later. Marek Marczykowski-Górecki (8): libxl: add tablet/mouse input device support xenconfig: add support for multiple USB devices syntax tests: xenconfig: test for multiple USB devices and other HVM options conf: add virDomainHasNet libxl: prevent attaching multiple netdevs with the same MAC libxl: support domain config modification in virDomainRestoreFlags libxl: Stubdom emulator type libxl: pass cmdline to HVM guests tests: add some simple libxl XML->XML tests docs/formatdomain.html.in | 13 ++ docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 35 ++++ src/conf/domain_conf.h | 4 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 60 +++++++ src/libxl/libxl_driver.c | 32 +++- src/xenconfig/xen_common.c | 66 ------- src/xenconfig/xen_xl.c | 127 ++++++++++++++ src/xenconfig/xen_xm.c | 72 ++++++++ tests/Makefile.am | 9 +- tests/domainschematest | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 29 ++++ tests/xlconfigdata/test-fullvirt-multiusb.xml | 48 ++++++ tests/xlconfigtest.c | 1 + tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml | 42 +++++ tests/xlxml2xmldata/xlxml2xml-hvm.xml | 40 +++++ tests/xlxml2xmldata/xlxml2xml-network-bridged.xml | 38 +++++ .../xlxml2xml-network-driver-domain.xml | 39 +++++ tests/xlxml2xmldata/xlxml2xml-network-routed.xml | 39 +++++ tests/xlxml2xmldata/xlxml2xml-pv.xml | 38 +++++ tests/xlxml2xmltest.c | 189 +++++++++++++++++++++ tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 4 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 4 +- 24 files changed, 863 insertions(+), 79 deletions(-) create mode 100755 tests/xlconfigdata/test-fullvirt-multiusb.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-multiusb.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-bridged.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-routed.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-pv.xml create mode 100644 tests/xlxml2xmltest.c -- 2.1.0

4 26

[libvirt] [PATCH] Fix underlinking of libvirt_driver_interface.so
by Natanael Copa 23 Mar '15

23 Mar '15

Always add udev linker flags when WITH_UDEV is enabled to avoid underlinking. See commit 43dbcb15 (interface: always build all available backends) Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 956d9ce..00b47e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1457,12 +1457,11 @@ libvirt_driver_interface_la_LIBADD = if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) -else ! WITH_NETCF +endif WITH_NETCF if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) endif WITH_UDEV -endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version -- 2.3.3

2 1

[libvirt] [PATCH] qemu: skip precreation of network disks
by Michael Chapman 23 Mar '15

23 Mar '15

Commit cf54c60699833b3791a5d0eb3eb5a1948c267f6b introduced the ability to create missing storage volumes during migration. For network disks, however, we may not necessarily be able to detect whether they already exist -- there is no straight-forward way to map the disk to a storage volume, and even if there were it's possible no configured storage pool actually contains the disk. It is better to assume the network disk exists in this case, rather than aborting the migration completely. If the volume really is missing, QEMU will generate an appropriate error later in the migration. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 83be435..ebe8af5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1507,9 +1507,13 @@ qemuMigrationPrecreateDisk(virConnectPtr conn, flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; break; + case VIR_STORAGE_TYPE_NETWORK: + VIR_DEBUG("Skipping creation of network disk '%s'", + disk->dst); + return 0; + case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_DIR: - case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.1.0

2 2

[libvirt] [PATCH 0/3] Yet a couple of network cleanups
by Michal Privoznik 23 Mar '15

23 Mar '15

I've noticed these while testing the code. Michal Privoznik (3): networkStateInitialize: Don't lock network driver objecteventtest: Check for virNetwork* return values network_conf: Drop virNetworkObjIsDuplicate src/conf/network_conf.c | 171 ++++++++++++++++++-------------------- src/conf/network_conf.h | 10 +-- src/libvirt_private.syms | 1 - src/network/bridge_driver.c | 20 ++--- src/parallels/parallels_network.c | 4 +- src/test/test_driver.c | 10 ++- tests/objecteventtest.c | 29 ++++--- 7 files changed, 117 insertions(+), 128 deletions(-) -- 2.0.5

2 7

[libvirt] [libvirt-designer][PATCH] Changes for code consistency
by Jayashree Deshpande 23 Mar '15

23 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 194 ++++++++++++++++----------- libvirt-designer/libvirt-designer-domain.h | 41 ++++-- libvirt-designer/libvirt-designer-internal.c | 3 +- libvirt-designer/libvirt-designer-internal.h | 4 +- libvirt-designer/libvirt-designer-main.c | 21 +-- libvirt-designer/libvirt-designer-main.h | 7 +- 6 files changed, 168 insertions(+), 102 deletions(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..adca733 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -66,7 +66,8 @@ gvir_designer_domain_error_quark(void) return g_quark_from_static_string("gvir-designer-domain"); } -static gboolean error_is_set(GError **error) +static gboolean +error_is_set(GError **error) { return ((error != NULL) && (*error != NULL)); } @@ -84,10 +85,11 @@ enum { PROP_OSINFO_DB, }; -static void gvir_designer_domain_get_property(GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +static void +gvir_designer_domain_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { g_return_if_fail(GVIR_DESIGNER_IS_DOMAIN(object)); @@ -121,10 +123,11 @@ static void gvir_designer_domain_get_property(GObject *object, } -static void gvir_designer_domain_set_property(GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +static void +gvir_designer_domain_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { g_return_if_fail(GVIR_DESIGNER_IS_DOMAIN(object)); @@ -161,7 +164,8 @@ static void gvir_designer_domain_set_property(GObject *object, } -static void gvir_designer_domain_finalize(GObject *object) +static void +gvir_designer_domain_finalize(GObject *object) { GVirDesignerDomain *conn = GVIR_DESIGNER_DOMAIN(object); GVirDesignerDomainPrivate *priv = conn->priv; @@ -181,7 +185,8 @@ static void gvir_designer_domain_finalize(GObject *object) } -static void gvir_designer_domain_class_init(GVirDesignerDomainClass *klass) +static void +gvir_designer_domain_class_init(GVirDesignerDomainClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); @@ -319,7 +324,8 @@ end: static GList * -gvir_designer_domain_get_device_by_type(GVirDesignerDomain *design, GType type) +gvir_designer_domain_get_device_by_type(GVirDesignerDomain *design, + GType type) { GList *devices; GList *it; @@ -341,7 +347,8 @@ gvir_designer_domain_get_device_by_type(GVirDesignerDomain *design, GType type) } -static void gvir_designer_domain_add_clock(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_clock(GVirDesignerDomain *design) { GVirConfigDomainClock *clock; GVirConfigDomainTimer *timer; @@ -441,8 +448,9 @@ gvir_designer_domain_supports_spice_channel(GVirDesignerDomain *design) } -static gboolean gvir_designer_domain_add_spice_channel(GVirDesignerDomain *design, - GError **error) +static gboolean +gvir_designer_domain_add_spice_channel(GVirDesignerDomain *design, + GError **error) { GVirConfigDomainChannel *channel; GVirConfigDomainChardevSourceSpiceVmc *vmc; @@ -674,7 +682,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used @@ -717,7 +726,8 @@ gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) * Returns: (transfer full): the pointer to the new smartcard device */ GVirConfigDomainSmartcard * -gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support smartcard, might need * libosinfo improvements @@ -742,7 +752,8 @@ gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, GError **error) } -static void gvir_designer_domain_add_power_management(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_power_management(GVirDesignerDomain *design) { GVirConfigDomainPowerManagement *pm; @@ -754,7 +765,8 @@ static void gvir_designer_domain_add_power_management(GVirDesignerDomain *design g_object_unref(G_OBJECT(pm)); } -static void gvir_designer_domain_set_lifecycle(GVirDesignerDomain *design) +static void +gvir_designer_domain_set_lifecycle(GVirDesignerDomain *design) { gvir_config_domain_set_lifecycle(design->priv->config, GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_POWEROFF, @@ -767,7 +779,8 @@ static void gvir_designer_domain_set_lifecycle(GVirDesignerDomain *design) GVIR_CONFIG_DOMAIN_LIFECYCLE_DESTROY); } -static void gvir_designer_domain_add_console(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_console(GVirDesignerDomain *design) { GVirConfigDomainConsole *console; GVirConfigDomainChardevSourcePty *pty; @@ -784,7 +797,8 @@ static void gvir_designer_domain_add_console(GVirDesignerDomain *design) } -static void gvir_designer_domain_add_input(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_input(GVirDesignerDomain *design) { GVirConfigDomainInput *input; @@ -798,7 +812,8 @@ static void gvir_designer_domain_add_input(GVirDesignerDomain *design) } -static void gvir_designer_domain_init(GVirDesignerDomain *design) +static void +gvir_designer_domain_init(GVirDesignerDomain *design) { GVirDesignerDomainPrivate *priv; g_debug("Init GVirDesignerDomain=%p", design); @@ -809,10 +824,11 @@ static void gvir_designer_domain_init(GVirDesignerDomain *design) } -GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *db, - OsinfoOs *os, - OsinfoPlatform *platform, - GVirConfigCapabilities *caps) +GVirDesignerDomain * +gvir_designer_domain_new(OsinfoDb *db, + OsinfoOs *os, + OsinfoPlatform *platform, + GVirConfigCapabilities *caps) { return GVIR_DESIGNER_DOMAIN(g_object_new(GVIR_DESIGNER_TYPE_DOMAIN, "osinfo-db", db, @@ -832,7 +848,8 @@ GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *db, * * Returns: (transfer none): the operating system */ -OsinfoOs *gvir_designer_domain_get_os(GVirDesignerDomain *design) +OsinfoOs * +gvir_designer_domain_get_os(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -850,7 +867,8 @@ OsinfoOs *gvir_designer_domain_get_os(GVirDesignerDomain *design) * * Returns: (transfer none): the virtualization platform */ -OsinfoPlatform *gvir_designer_domain_get_platform(GVirDesignerDomain *design) +OsinfoPlatform * +gvir_designer_domain_get_platform(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -868,7 +886,8 @@ OsinfoPlatform *gvir_designer_domain_get_platform(GVirDesignerDomain *design) * * Returns: (transfer none): the capabilities */ -GVirConfigCapabilities *gvir_designer_domain_get_capabilities(GVirDesignerDomain *design) +GVirConfigCapabilities * +gvir_designer_domain_get_capabilities(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -887,7 +906,8 @@ GVirConfigCapabilities *gvir_designer_domain_get_capabilities(GVirDesignerDomain * * Returns: (transfer none): the domain config */ -GVirConfigDomain *gvir_designer_domain_get_config(GVirDesignerDomain *design) +GVirConfigDomain * +gvir_designer_domain_get_config(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1015,7 +1035,8 @@ cleanup: } -gboolean gvir_designer_domain_supports_machine(GVirDesignerDomain *design) +gboolean +gvir_designer_domain_supports_machine(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1033,9 +1054,10 @@ gboolean gvir_designer_domain_supports_machine(GVirDesignerDomain *design) } -gboolean gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, - const char *arch, - GVirConfigDomainOsType ostype) +gboolean +gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, + const char *arch, + GVirConfigDomainOsType ostype) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1050,7 +1072,8 @@ gboolean gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, return FALSE; } -gboolean gvir_designer_domain_supports_container(GVirDesignerDomain *design) +gboolean +gvir_designer_domain_supports_container(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1068,8 +1091,9 @@ gboolean gvir_designer_domain_supports_container(GVirDesignerDomain *design) return FALSE; } -gboolean gvir_designer_domain_supports_container_full(GVirDesignerDomain *design, - const char *arch) +gboolean +gvir_designer_domain_supports_container_full(GVirDesignerDomain *design, + const char *arch) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1174,8 +1198,9 @@ cleanup: } -gboolean gvir_designer_domain_setup_machine(GVirDesignerDomain *design, - GError **error) +gboolean +gvir_designer_domain_setup_machine(GVirDesignerDomain *design, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1203,10 +1228,11 @@ cleanup: } -gboolean gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, - const char *arch, - GVirConfigDomainOsType ostype, - GError **error) +gboolean +gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, + const char *arch, + GVirConfigDomainOsType ostype, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1232,8 +1258,9 @@ cleanup: } -gboolean gvir_designer_domain_setup_container(GVirDesignerDomain *design, - GError **error) +gboolean +gvir_designer_domain_setup_container(GVirDesignerDomain *design, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1262,9 +1289,10 @@ cleanup: } -gboolean gvir_designer_domain_setup_container_full(GVirDesignerDomain *design, - const char *arch, - GError **error) +gboolean +gvir_designer_domain_setup_container_full(GVirDesignerDomain *design, + const char *arch, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1682,10 +1710,11 @@ error: * Returns: (transfer full): the pointer to new disk. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_disk_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_disk_file(GVirDesignerDomain *design, + const char *filepath, + const char *format, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1713,9 +1742,10 @@ GVirConfigDomainDisk *gvir_designer_domain_add_disk_file(GVirDesignerDomain *des * Returns: (transfer full): the pointer to the new disk. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *design, - const char *devpath, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_disk_device(GVirDesignerDomain *design, + const char *devpath, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1743,10 +1773,11 @@ GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *d * Returns: (transfer full): the pointer to new cdrom. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *design, + const char *filepath, + const char *format, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1774,9 +1805,10 @@ GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *de * Returns: (transfer full): the pointer to the new cdrom. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_device(GVirDesignerDomain *design, - const char *devpath, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_cdrom_device(GVirDesignerDomain *design, + const char *devpath, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1805,10 +1837,11 @@ GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_device(GVirDesignerDomain * * Returns: (transfer full): the pointer to new floppy. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_floppy_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_floppy_file(GVirDesignerDomain *design, + const char *filepath, + const char *format, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1836,9 +1869,10 @@ GVirConfigDomainDisk *gvir_designer_domain_add_floppy_file(GVirDesignerDomain *d * Returns: (transfer full): the pointer to the new floppy. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_floppy_device(GVirDesignerDomain *design, - const char *devpath, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_floppy_device(GVirDesignerDomain *design, + const char *devpath, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -2146,7 +2180,8 @@ end: * Returns: (transfer full): the pointer to the new video device. */ GVirConfigDomainVideo * -gvir_designer_domain_add_video(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_video(GVirDesignerDomain *design, + GError **error) { GVirConfigDomainVideo *video; const gchar *model_str = NULL; @@ -2221,9 +2256,10 @@ gvir_designer_domain_get_resources(OsinfoResourcesList *res_list, * * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. */ -gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, - GVirDesignerDomainResources req, - GError **error) +gboolean +gvir_designer_domain_setup_resources(GVirDesignerDomain *design, + GVirDesignerDomainResources req, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); gboolean ret = FALSE; @@ -2285,9 +2321,10 @@ cleanup: * * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. */ -gboolean gvir_designer_domain_add_driver(GVirDesignerDomain *design, - const char *driver_id, - GError **error) +gboolean +gvir_designer_domain_add_driver(GVirDesignerDomain *design, + const char *driver_id, + GError **error) { OsinfoEntity *driver; OsinfoDeviceDriverList *drivers; @@ -2330,8 +2367,9 @@ end: * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. * @see_also gvir_designer_domain_add_driver() */ -gboolean gvir_designer_domain_remove_all_drivers(GVirDesignerDomain *design, - GError **error) +gboolean +gvir_designer_domain_remove_all_drivers(GVirDesignerDomain *design, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); g_return_val_if_fail(!error_is_set(error), FALSE); diff --git a/libvirt-designer/libvirt-designer-domain.h b/libvirt-designer/libvirt-designer-domain.h index 41aae66..e645f92 100644 --- a/libvirt-designer/libvirt-designer-domain.h +++ b/libvirt-designer/libvirt-designer-domain.h @@ -79,22 +79,27 @@ GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *osinfo_db, GVirConfigCapabilities *caps); OsinfoOs *gvir_designer_domain_get_os(GVirDesignerDomain *design); + OsinfoPlatform *gvir_designer_domain_get_platform(GVirDesignerDomain *design); + GVirConfigCapabilities *gvir_designer_domain_get_capabilities(GVirDesignerDomain *design); -GVirConfigDomain *gvir_designer_domain_get_config(GVirDesignerDomain *design); +GVirConfigDomain *gvir_designer_domain_get_config(GVirDesignerDomain *design); gboolean gvir_designer_domain_supports_machine(GVirDesignerDomain *design); + gboolean gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, const char *arch, GVirConfigDomainOsType ostype); + gboolean gvir_designer_domain_supports_container(GVirDesignerDomain *design); + gboolean gvir_designer_domain_supports_container_full(GVirDesignerDomain *design, const char *arch); - gboolean gvir_designer_domain_setup_machine(GVirDesignerDomain *design, GError **error); + gboolean gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, const char *arch, GVirConfigDomainOsType ostype, @@ -102,28 +107,34 @@ gboolean gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, gboolean gvir_designer_domain_setup_container(GVirDesignerDomain *design, GError **error); + gboolean gvir_designer_domain_setup_container_full(GVirDesignerDomain *design, const char *arch, GError **error); GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error); + const char *filepath, + const char *format, + GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_device(GVirDesignerDomain *design, - const char *devpath, - GError **error); + const char *devpath, + GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_disk_file(GVirDesignerDomain *design, const char *filepath, const char *format, GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *design, const char *devpath, GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_floppy_file(GVirDesignerDomain *design, const char *filepath, const char *format, GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_floppy_device(GVirDesignerDomain *design, const char *devpath, GError **error); @@ -131,18 +142,27 @@ GVirConfigDomainDisk *gvir_designer_domain_add_floppy_device(GVirDesignerDomain GVirConfigDomainInterface *gvir_designer_domain_add_interface_bridge(GVirDesignerDomain *design, const char *bridge, GError **error); + GVirConfigDomainInterface *gvir_designer_domain_add_interface_network(GVirDesignerDomain *design, const char *network, GError **error); + GVirConfigDomainInterface *gvir_designer_domain_add_interface_user(GVirDesignerDomain *design, GError **error); GVirConfigDomainGraphics *gvir_designer_domain_add_graphics(GVirDesignerDomain *design, GVirDesignerDomainGraphics type, GError **error); -GVirConfigDomainSmartcard *gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, GError **error); -GVirConfigDomainSound *gvir_designer_domain_add_sound(GVirDesignerDomain *design, GError **error); -GVirConfigDomainRedirdev *gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error); + +GVirConfigDomainSmartcard *gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, + GError **error); + +GVirConfigDomainSound *gvir_designer_domain_add_sound(GVirDesignerDomain *design, + GError **error); + +GVirConfigDomainRedirdev *gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error); + GVirConfigDomainVideo *gvir_designer_domain_add_video(GVirDesignerDomain *design, GError **error); @@ -152,6 +172,7 @@ gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, gboolean gvir_designer_domain_remove_all_drivers(GVirDesignerDomain *design, GError **error); + gboolean gvir_designer_domain_add_driver(GVirDesignerDomain *design, const char *driver_id, GError **error); diff --git a/libvirt-designer/libvirt-designer-internal.c b/libvirt-designer/libvirt-designer-internal.c index bdfa5d1..89e8d1e 100644 --- a/libvirt-designer/libvirt-designer-internal.c +++ b/libvirt-designer/libvirt-designer-internal.c @@ -26,7 +26,8 @@ #include "libvirt-designer/libvirt-designer-internal.h" G_GNUC_INTERNAL int -gvir_designer_genum_get_value(GType enum_type, const char *nick, +gvir_designer_genum_get_value(GType enum_type, + const char *nick, gint default_value) { GEnumClass *enum_class; diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index fd3db2c..92c27a6 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,6 +24,8 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ -int gvir_designer_genum_get_value(GType enum_type, const char *nick, gint default_value); +int gvir_designer_genum_get_value(GType enum_type, + const char *nick, + gint default_value); #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ diff --git a/libvirt-designer/libvirt-designer-main.c b/libvirt-designer/libvirt-designer-main.c index 07de8c1..0ef1bab 100644 --- a/libvirt-designer/libvirt-designer-main.c +++ b/libvirt-designer/libvirt-designer-main.c @@ -37,8 +37,9 @@ * <parameter>argv</parameter> parameter of main(), or %NULL. Any options * understood by GTK+ are stripped before return. */ -void gvir_designer_init(int *argc, - char ***argv) +void +gvir_designer_init(int *argc, + char ***argv) { GError *err = NULL; if (!gvir_designer_init_check(argc, argv, &err)) { @@ -47,10 +48,11 @@ void gvir_designer_init(int *argc, } } -static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, - GLogLevelFlags log_level G_GNUC_UNUSED, - const gchar *message, - gpointer user_data) +static void +gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, + GLogLevelFlags log_level G_GNUC_UNUSED, + const gchar *message, + gpointer user_data) { if (user_data) fprintf(stderr, "%s\n", message); @@ -64,9 +66,10 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, * understood by GTK+ are stripped before return. * @err: pointer to a #GError to which a message will be posted on error */ -gboolean gvir_designer_init_check(int *argc, - char ***argv, - GError **err) +gboolean +gvir_designer_init_check(int *argc, + char ***argv, + GError **err) { if (!gvir_config_init_check(argc, argv, err)) return FALSE; diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 9341754..3e904bc 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -32,10 +32,11 @@ G_BEGIN_DECLS void gvir_designer_init(int *argc, - char ***argv); + char ***argv); + gboolean gvir_designer_init_check(int *argc, - char ***argv, - GError **err); + char ***argv, + GError **err); G_END_DECLS -- 1.9.1

2 1

[libvirt] [PATCH] LXC: make sure netns been enabled when trying to enable userns
by Chen Hanxiao 23 Mar '15

23 Mar '15

This patch revert commit: 7dc5dbc879bd0779924b5132a48b731a0bc04a1e Discussed at: http://www.redhat.com/archives/libvir-list/2015-March/msg01023.html Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index cc20b6d..69a8f2f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -934,8 +934,6 @@ static int lxcContainerMountBasicFS(bool userns_enabled, { size_t i; int rc = -1; - char* mnt_src = NULL; - int mnt_mflags; VIR_DEBUG("Mounting basic filesystems"); @@ -944,22 +942,17 @@ static int lxcContainerMountBasicFS(bool userns_enabled, virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; /* When enable userns but disable netns, kernel will - * forbid us doing a new fresh mount for sysfs. - * So we had to do a bind mount for sysfs instead. + * forbid us doing a new fresh mount for sysfs for security reason. + * So we should not allow this. */ - if (userns_enabled && netns_disabled && - STREQ(mnt->src, "sysfs")) { - if (VIR_STRDUP(mnt_src, "/sys") < 0) - goto cleanup; - mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; - } else { - if (VIR_STRDUP(mnt_src, mnt->src) < 0) - goto cleanup; - mnt_mflags = mnt->mflags; + if (userns_enabled && netns_disabled) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Userns could not be enabled without netns")); + goto cleanup; } VIR_DEBUG("Processing %s -> %s", - mnt_src, mnt->dst); + mnt->src, mnt->dst); if (mnt->skipUnmounted) { char *hostdir; @@ -976,28 +969,24 @@ static int lxcContainerMountBasicFS(bool userns_enabled, if (ret == 0) { VIR_DEBUG("Skipping '%s' which isn't mounted in host", mnt->dst); - VIR_FREE(mnt_src); continue; } } if (mnt->skipUserNS && userns_enabled) { VIR_DEBUG("Skipping due to user ns enablement"); - VIR_FREE(mnt_src); continue; } /* Skip mounts with missing source without shouting: it may be a * missing folder in /proc due to the absence of a kernel feature */ - if (STRPREFIX(mnt_src, "/") && !virFileExists(mnt_src)) { - VIR_DEBUG("Skipping due to missing source: %s", mnt_src); - VIR_FREE(mnt_src); + if (STRPREFIX(mnt->src, "/") && !virFileExists(mnt->src)) { + VIR_DEBUG("Skipping due to missing source: %s", mnt->src); continue; } if (mnt->skipNoNetns && netns_disabled) { VIR_DEBUG("Skipping due to absence of network namespace"); - VIR_FREE(mnt_src); continue; } @@ -1015,35 +1004,33 @@ static int lxcContainerMountBasicFS(bool userns_enabled, * we mount the filesystem in read-write mode initially, and then do a * separate read-only bind mount on top of that. */ - bindOverReadonly = !!(mnt_mflags & MS_RDONLY); + bindOverReadonly = !!(mnt->mflags & MS_RDONLY); VIR_DEBUG("Mount %s on %s type=%s flags=%x", - mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); - if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { + mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY); + if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), - mnt_src, mnt->dst, NULLSTR(mnt->type), - mnt_mflags & ~MS_RDONLY); + mnt->src, mnt->dst, NULLSTR(mnt->type), + mnt->mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && - mount(mnt_src, mnt->dst, NULL, + mount(mnt->src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), - mnt_src, mnt->dst, + mnt->src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } - VIR_FREE(mnt_src); } rc = 0; cleanup: - VIR_FREE(mnt_src); VIR_DEBUG("rc=%d", rc); return rc; } -- 2.1.0

3 2

[libvirt] [PATCH v2] util: don't fail if no PortData is found while getting migrateData
by zhang bo 23 Mar '15

23 Mar '15

--- V1 here: https://www.redhat.com/archives/libvir-list/2015-February/msg00388.html V2: Add "--if-exists" option to ovs-vsctl cmd, making ovs-vsctl not raise error if there's no portData available. Suggested by Martin. We Tested the patch, it works. --- Introduced by f6a2f97e Problem description: After multiple times of migrating a domain, which has an ovs interface with no portData set, with non-shared disk, nbd ports got overflowed. The steps to reproduce the problem: 1 define and start a domain with its network configured as: <interface type='bridge'> <source bridge='br0'/> <virtualport type='openvswitch'> </virtualport> <model type='virtio'/> <driver name='vhost' queues='4'/> </interface> 2 do not set the network's portData. 3 migrate(ToURI2) it with flag 91(1011011), which means: VIR_MIGRATE_LIVE VIR_MIGRATE_PEER2PEER VIR_MIGRATE_PERSIST_DEST VIR_MIGRATE_UNDEFINE_SOURCE VIR_MIGRATE_NON_SHARED_DISK 4 migrate success, but we got an error log in libvirtd.log: error : virCommandWait:2423 : internal error: Child process (ovs-vsctl --timeout=5 get Interface vnet1 external_ids:PortData) unexpected exit status 1: ovs-vsctl: no key "PortData" in Interface record "vnet1" column external_ids 5 migrate it back, migrate it , migrate it back, ....... 6 nbd port got overflowed. The reasons for the problem is : 1 virNetDevOpenvswitchGetMigrateData() takes it as wrong if no portData is available for the ovs interface of a domain. (We think it's not appropriate, as portData is just OPTIONAL) 2 in func qemuMigrationBakeCookie(), it fails in qemuMigrationCookieAddNetwork(), and returns with -1. qemuMigrationCookieAddNBD() is not called thereafter, and mig->nbd is still NULL. 3 However, qemuMigrationRun() just *WARN* if qemuMigrationBakeCookie() fails, migration still successes. cookie is NULL, it's not baked on the src side. 4 On the destination side, it would alloc a port first and then free the nbd port in COOKIE. But the cookie is NULL due to qemuMigrationCookieAddNetwork() failure at src side. thus the nbd port is not freed. In this patch, we add "--if-exists" option to make ovs-vsctl not raise error if there's no portData available. Further more, because portData may be NULL in the cookie at the dest side, check it before setting portData. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/virnetdevopenvswitch.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index e5c87bb..722d0dd 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -30,9 +30,12 @@ #include "virerror.h" #include "virmacaddr.h" #include "virstring.h" +#include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("util.netdevopenvswitch"); + /** * virNetDevOpenvswitchAddPort: * @brname: the bridge name @@ -206,7 +209,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) virCommandPtr cmd = NULL; int ret = -1; - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface", + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); virCommandSetOutputBuffer(cmd, migrate); @@ -241,6 +244,12 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) virCommandPtr cmd = NULL; int ret = -1; + if (!migrate) { + VIR_DEBUG("No port data for interface %s", ifname); + return 0; + } + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); -- 1.7.12.4

2 2

[libvirt] [PATCH] qemu: check if domain is really active when do setvcpus with --live
by Luyao Huang 23 Mar '15

23 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1204006 Commit e105dc9 fix setting vcpus for offline domain, but forget check if vm is active when pass VIR_DOMAIN_AFFECT_LIVE flags. # virsh setvcpus test3 4 --live error: Failed to create controller cpu for group: No such file or directory add a check if we pass VIR_DOMAIN_AFFECT_LIVE flags. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d9217b..40d2776 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4888,6 +4888,12 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto cleanup; if (flags & VIR_DOMAIN_AFFECT_LIVE && !(flags & VIR_DOMAIN_VCPU_GUEST)) { + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0) goto endjob; -- 1.8.3.1

3 2

[libvirt] [PATCH] tools: fix the wrong check when use virsh setvcpus --maximum
by Luyao Huang 23 Mar '15

23 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1204033 We will ignore --maximum option when only use setvcpus with this option, like this (this error is another issue): # virsh setvcpus test3 --maximum 10 error: Failed to create controller cpu for group: No such file or directory this is because we do not set it in flags before we check if there is a flags set. Refactor these code and fix the logic. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1d8225c..6ab7b05 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6742,9 +6742,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; - /* none of the options were specified */ - if (!current && flags == 0) - flags = -1; + if (maximum) + flags |= VIR_DOMAIN_VCPU_MAXIMUM; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -6754,27 +6753,19 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (flags == -1) { + /* none of the options were specified */ + if (!current && flags == 0) { if (virDomainSetVcpus(dom, count) != 0) goto cleanup; } else { - /* If the --maximum flag was given, we need to ensure only the - --config flag is in effect as well */ - if (maximum) { - vshDebug(ctl, VSH_ERR_DEBUG, "--maximum flag was given\n"); - - flags |= VIR_DOMAIN_VCPU_MAXIMUM; - - /* If neither the --config nor --live flags were given, OR - if just the --live flag was given, we need to error out - warning the user that the --maximum flag can only be used - with the --config flag */ - if (live || !config) { - - /* Warn the user about the invalid flag combination */ - vshError(ctl, _("--maximum must be used with --config only")); - goto cleanup; - } + /* If neither the --config nor --live flags were given, OR + if just the --live flag was given, we need to error out + warning the user that the --maximum flag can only be used + with the --config flag */ + if (maximum && (live || !config)) { + /* Warn the user about the invalid flag combination */ + vshError(ctl, _("--maximum must be used with --config only")); + goto cleanup; } /* Apply the virtual cpu changes */ -- 1.8.3.1

3 2

[libvirt] [libvirt-designer][PATCH 1/2] trivial changes for code consistency
by Jayashree Deshpande 20 Mar '15

20 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..8703884 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -674,7 +674,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used -- 1.9.1

2 2

Re: [libvirt] [Qemu-devel] [PATCH RFC for-2.3 1/1] block: New command line option --no-format-probing
by Eric Blake 20 Mar '15

20 Mar '15

On 03/20/2015 08:19 AM, Markus Armbruster wrote: >> If (a working version of) this makes it in 2.3, libvirt WILL use it in >> the next release. It will take me less than 5 minutes to write up the >> libvirt patch, as long as the new option is advertised via >> query-command-line-options (which means that QMP introspection of the >> new option is a must for v2 :) The real libvirt requirement is that the new option is accessible via _some_ QMP command (doesn't have to be query-command-line-options, but that is the most obvious). > > query-command-line-options covers only options using QemuOpts. Fixing > that defect isn't in the cards for 2.3, which means I'll have to > implement it with QemuOpts. Makes sense, and is certainly easier than figuring out an alternative QMP probing mechanism. > > Ways to do that: > > * Stick it into an existing QemuOpts option. Is there one that fits? > --machine doesn't really fit. Mostly agree; --machine is more for what the guest sees, while this has no impact on the guest ABI. On the other hand, things like -machine accel=[tcg|kvm] aren't necessarily guest visible either, so -machine has tended to be a catch-all for other things. But that doesn't mean it should continue to be one. > > * Create a new QemuOpts option for miscellaneous settings. Would --misc > format-probing=off be too ugly? Got a better name than --misc? The only clients using the new option will be machine generated, so I don't think ugly appearance is a show-stopper. And -misc really does sound like it is the most amenable to adding other random flags in the future, so I can live with that name. Unless anyone else has a better idea, '-misc format-probing=off' has my vote and works for libvirt; it is only a two-line change to my libvirt RFC patch: diff --git i/src/qemu/qemu_capabilities.c w/src/qemu/qemu_capabilities.c index b452a75..f7a46c1 100644 --- i/src/qemu/qemu_capabilities.c +++ w/src/qemu/qemu_capabilities.c @@ -2517,7 +2517,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, { "numa", NULL, QEMU_CAPS_NUMA }, { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX }, - { "no-format-probing", NULL, QEMU_CAPS_NO_FORMAT_PROBING }, + { "misc", "format-probing", QEMU_CAPS_NO_FORMAT_PROBING }, }; static int diff --git i/src/qemu/qemu_command.c w/src/qemu/qemu_command.c index 1085639..08f6560 100644 --- i/src/qemu/qemu_command.c +++ w/src/qemu/qemu_command.c @@ -8674,7 +8674,7 @@ qemuBuildCommandLine(virConnectPtr conn, } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_FORMAT_PROBING) && !cfg->allowDiskFormatProbing) - virCommandAddArg(cmd, "-no-format-probing"); + virCommandAddArgList(cmd, "-misc", "format-probing=off", NULL); /* Serial graphics adapter */ if (def->os.bios.useserial == VIR_TRISTATE_BOOL_YES) { > > Existing miscellaneous non-QemeOpts options could then (in 2.4!) > become sugar for something in this option group, thus become available > with -readconfig. Nice way to plan for future cleanups. I also agree that while this one option about format-probing is reasonable to get into 2.3, that any other sugar cleanups are better deferred until after the freeze. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [RFC PATCH] qemu: enforce no format probing when possible
by Eric Blake 20 Mar '15

20 Mar '15

qemu 2.3 added an option, with this documentation: | Probing is convenient, but probing untrusted raw images is insecure | (CVE-2008-2004). To avoid it, users should always specify raw format | explicitly. This isn't trivial, and even sophisticated users have | gotten it wrong (libvirt CVE-2010-2237, CVE-2010-2238, CVE-2010-2239, | plus more recent variations of the theme that didn't get CVEs because | they were caught before they could hurt users). | | Disabling probing entirely is a (hamfisted) way to ensure you always | specify the format. Use it when libvirt is configured to avoid probing, to ensure we catch libvirt failures on avoiding probing before such bugs can escalate into another CVE. * src/qemu/qemu_capabilities.h (QEMU_CAPS_NO_FORMAT_PROBING): New capability bit. * src/qemu/qemu_capabilities.c (virQEMUCapsCommandLine): Set it. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. Signed-off-by: Eric Blake <eblake(a)redhat.com> CC: qemu-devel(a)nongnu.org --- RFC because I need to enhance the libvirt testsuite to prove we set the option, and because the qemu side has not been committed yet (and may therefore change the final spelling for the new option). src/qemu/qemu_capabilities.c | 7 +++++-- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_command.c | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ccf22f0..b452a75 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1,7 +1,7 @@ /* * qemu_capabilities.c: QEMU capabilities generation * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -279,6 +279,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "qxl.vgamem_mb", "qxl-vga.vgamem_mb", "pc-dimm", + + "no-format-probing", /* 185 */ ); @@ -2514,7 +2516,8 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, { "numa", NULL, QEMU_CAPS_NUMA }, - { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, + { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX }, + { "no-format-probing", NULL, QEMU_CAPS_NO_FORMAT_PROBING }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c7b1ac7..2cdcd81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -1,7 +1,7 @@ /* * qemu_capabilities.h: QEMU capabilities generation * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -224,6 +224,7 @@ typedef enum { QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ + QEMU_CAPS_NO_FORMAT_PROBING = 185, /* -no-format-probing */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63d43d4..1085639 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8672,6 +8672,9 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-nodefconfig"); virCommandAddArg(cmd, "-nodefaults"); } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_FORMAT_PROBING) && + !cfg->allowDiskFormatProbing) + virCommandAddArg(cmd, "-no-format-probing"); /* Serial graphics adapter */ if (def->os.bios.useserial == VIR_TRISTATE_BOOL_YES) { -- 2.1.0

1 0

[libvirt] [libvirt-designer][PATCH] trivial changes for code consistency
by Jayashree Deshpande 20 Mar '15

20 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..8703884 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -674,7 +674,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used -- 1.9.1

2 1

[libvirt] [PATCH v4] Automaticly create tap device for VIR_DOMAIN_NET_TYPE_ETHERNET
by Vasiliy Tolstov 20 Mar '15

20 Mar '15

If a user specify ehernet device create it via libvirt and run script if it provided. After this commit user does not need to run external script to create tap device or add root to qemu process. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_command.c | 135 +++++++++++++++++++++++++++++------------------- src/qemu/qemu_hotplug.c | 13 ++--- src/qemu/qemu_process.c | 6 +++ 3 files changed, 93 insertions(+), 61 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24b2ad9..284a97c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -278,10 +278,41 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, return *tapfd < 0 ? -1 : 0; } +/** + * qemuExecuteEthernetScript: + * @ifname: the interface name + * @script: the script name + * This function executes script for new tap device created by libvirt. + * Returns 0 in case of success or -1 on failure + */ +static int qemuExecuteEthernetScript(const char *ifname, const char *script) +{ + virCommandPtr cmd; + int ret; + + cmd = virCommandNew(script); + virCommandAddArgFormat(cmd, "%s", ifname); + virCommandClearCaps(cmd); +#ifdef CAP_NET_ADMIN + virCommandAllowCap(cmd, CAP_NET_ADMIN); +#endif + virCommandAddEnvPassCommon(cmd); + + if (virCommandRun(cmd, NULL) < 0) { + ret = -1; + } else { + ret = 0; + } + + virCommandFree(cmd); + return ret; +} + /* qemuNetworkIfaceConnect - *only* called if actualType is - * VIR_DOMAIN_NET_TYPE_NETWORK or VIR_DOMAIN_NET_TYPE_BRIDGE (i.e. if - * the connection is made with a tap device connecting to a bridge - * device) + * VIR_DOMAIN_NET_TYPE_NETWORK, VIR_DOMAIN_NET_TYPE_BRIDGE or + * VIR_DOMAIN_NET_TYPE_ETHERNET (i.e. if the connection is + * made with a tap device connecting to a bridge device or + * used ethernet tap device) */ int qemuNetworkIfaceConnect(virDomainDefPtr def, @@ -307,11 +338,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } } - if (!(brname = virDomainNetGetActualBridgeName(net))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); - goto cleanup; - } - if (!net->ifname || STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { @@ -327,45 +353,61 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; } - if (cfg->privileged) { - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tunpath, tapfd, *tapfdSize, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - tap_create_flags) < 0) { + if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, *tapfdSize, + tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - if (virDomainNetGetActualBridgeMACTableManager(net) - == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { - /* libvirt is managing the FDB of the bridge this device - * is attaching to, so we need to turn off learning and - * unicast_flood on the device to prevent the kernel from - * adding any FDB entries for it. We will add add an fdb - * entry ourselves (during qemuInterfaceStartDevices(), - * using the MAC address from the interface config. - */ - if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) - goto cleanup; - if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + if (net->script) { + if (qemuExecuteEthernetScript(net->ifname, net->script) < 0) goto cleanup; } } else { - if (qemuCreateInBridgePortWithHelper(cfg, brname, - &net->ifname, - tapfd, tap_create_flags) < 0) { - virDomainAuditNetDevice(def, net, tunpath, false); + if (!(brname = virDomainNetGetActualBridgeName(net))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); goto cleanup; } - /* qemuCreateInBridgePortWithHelper can only create a single FD */ - if (*tapfdSize > 1) { - VIR_WARN("Ignoring multiqueue network request"); - *tapfdSize = 1; + + if (cfg->privileged) { + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tunpath, tapfd, *tapfdSize, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + if (virDomainNetGetActualBridgeMACTableManager(net) + == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { + /* libvirt is managing the FDB of the bridge this device + * is attaching to, so we need to turn off learning and + * unicast_flood on the device to prevent the kernel from + * adding any FDB entries for it. We will add add an fdb + * entry ourselves (during qemuInterfaceStartDevices(), + * using the MAC address from the interface config. + */ + if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) + goto cleanup; + if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + goto cleanup; + } + } else { + if (qemuCreateInBridgePortWithHelper(cfg, brname, + &net->ifname, + tapfd, tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + /* qemuCreateInBridgePortWithHelper can only create a single FD */ + if (*tapfdSize > 1) { + VIR_WARN("Ignoring multiqueue network request"); + *tapfdSize = 1; + } } + virDomainAuditNetDevice(def, net, tunpath, true); } - virDomainAuditNetDevice(def, net, tunpath, true); - if (cfg->macFilter && ebtablesAddForwardAllowIn(driver->ebtables, net->ifname, @@ -4959,6 +5001,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: virBufferAsprintf(&buf, "tap%c", type_sep); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ @@ -4976,20 +5019,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, is_tap = true; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; - } - is_tap = true; - break; - case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", type_sep, @@ -7785,7 +7814,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -7802,7 +7832,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, } if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = 1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 08047ce..c34486a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -896,7 +896,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -904,7 +905,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { + actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -935,13 +937,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; - } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) - goto cleanup; - *vhostfd = -1; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) - goto cleanup; } /* Set device online immediately */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 515402e..468e509 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5288,6 +5288,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, cfg->stateDir)); VIR_FREE(net->ifname); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (net->ifname) { + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + } + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP -- 2.2.2

2 3

[libvirt] [PATCH 0/2] qemu/cgroup: Make live numatune setting usable
by Martin Kletzander 20 Mar '15

20 Mar '15

We didn't set the migrating memory flag to 1 and consequently any changes to numa memory tuning didn't take effect. Let's fix that. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1198497 Martin Kletzander (2): cgroup: Add accessors for cpuset.memory_migrate qemu: Migrate memory on numatune change src/libvirt_private.syms | 2 ++ src/qemu/qemu_cgroup.c | 36 +++++++++++++++++++++++++++++++++++- src/util/vircgroup.c | 42 +++++++++++++++++++++++++++++++++++++++++- src/util/vircgroup.h | 5 ++++- 4 files changed, 82 insertions(+), 3 deletions(-) -- 2.3.1

3 10

[libvirt] [PATCH] PowerPC : Do not allow an empty model spec for 'host-model'
by Prerna Saxena 20 Mar '15

20 Mar '15

[PATCH] PowerPC : Do not allow an empty model spec for 'host-model' On PowerPC, a guest VM having CPU mode as 'host-model' represents a 'compat' mode VM. This cannot have a NULL CPU model. This commit forbids such a guest definition. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index c77374c..62ad92b 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -549,12 +549,12 @@ ppcUpdate(virCPUDefPtr guest, const virCPUDef *host) { switch ((virCPUMode) guest->mode) { - case VIR_CPU_MODE_HOST_MODEL: case VIR_CPU_MODE_HOST_PASSTHROUGH: guest->match = VIR_CPU_MATCH_EXACT; virCPUDefFreeModel(guest); return virCPUDefCopyModel(guest, host, true); + case VIR_CPU_MODE_HOST_MODEL: case VIR_CPU_MODE_CUSTOM: return 0; -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 3

[libvirt] [PATCH] LXC: create a bind mount for sysfs when enable userns but disable netns
by Chen Hanxiao 20 Mar '15

20 Mar '15

kernel commit 7dc5dbc879bd0779924b5132a48b731a0bc04a1e forbid us doing a fresh mount for sysfs when enable userns but disable netns. This patch will create a bind mount in this senario. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4d89677..8a27215 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -815,10 +815,13 @@ static int lxcContainerSetReadOnly(void) } -static int lxcContainerMountBasicFS(bool userns_enabled) +static int lxcContainerMountBasicFS(bool userns_enabled, + bool netns_disabled) { size_t i; int rc = -1; + char* mnt_src = NULL; + int mnt_mflags; VIR_DEBUG("Mounting basic filesystems"); @@ -826,8 +829,25 @@ static int lxcContainerMountBasicFS(bool userns_enabled) bool bindOverReadonly; virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; + /* When enable userns but disable netns, kernel will + * forbid us doing a new fresh mount for sysfs. + * So we had to do a bind mount for sysfs instead. + */ + if (userns_enabled && netns_disabled && + STREQ(mnt->src, "sysfs")) { + if (VIR_STRDUP(mnt_src, "/sys") < 0) { + goto cleanup; + } + mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; + } else { + if (VIR_STRDUP(mnt_src, mnt->src) < 0) { + goto cleanup; + } + mnt_mflags = mnt->mflags; + } + VIR_DEBUG("Processing %s -> %s", - mnt->src, mnt->dst); + mnt_src, mnt->dst); if (mnt->skipUnmounted) { char *hostdir; @@ -856,7 +876,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled) if (virFileMakePath(mnt->dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), - mnt->src); + mnt_src); goto cleanup; } @@ -867,24 +887,24 @@ static int lxcContainerMountBasicFS(bool userns_enabled) * we mount the filesystem in read-write mode initially, and then do a * separate read-only bind mount on top of that. */ - bindOverReadonly = !!(mnt->mflags & MS_RDONLY); + bindOverReadonly = !!(mnt_mflags & MS_RDONLY); VIR_DEBUG("Mount %s on %s type=%s flags=%x", - mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY); - if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY, NULL) < 0) { + mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); + if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), - mnt->src, mnt->dst, NULLSTR(mnt->type), - mnt->mflags & ~MS_RDONLY); + mnt_src, mnt->dst, NULLSTR(mnt->type), + mnt_mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && - mount(mnt->src, mnt->dst, NULL, + mount(mnt_src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), - mnt->src, mnt->dst, + mnt_src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } @@ -893,6 +913,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled) rc = 0; cleanup: + VIR_FREE(mnt_src); VIR_DEBUG("rc=%d", rc); return rc; } @@ -1643,7 +1664,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) + if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap, + !vmDef->nnets) < 0) goto cleanup; /* Ensure entire root filesystem (except /.oldroot) is readonly */ -- 1.9.0

7 13

[libvirt] [PATCH][libvirt-ruby] Rakefile: Build on Mac OS-X cleanly
by Michal Privoznik 20 Mar '15

20 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1161338 There's this bug report, which suggests using '-arch x86_64' on Macs. Otherwise one gets unclear error messages when building. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Rakefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Rakefile b/Rakefile index 5ea1f41..e73eaee 100644 --- a/Rakefile +++ b/Rakefile @@ -148,6 +148,10 @@ SPEC = Gem::Specification.new do |s| s.license = "LGPLv2" end +if RUBY_PLATFORM =~ /universal.x86_64-darwin/ + ENV['ARCHFLAGS'] = '-arch x86_64' +end + Gem::PackageTask.new(SPEC) do |pkg| pkg.need_tar = true pkg.need_zip = true -- 2.0.5

2 2

[libvirt] [PATCH] trivial changes for code consistency
by Jayashree Deshpande 20 Mar '15

20 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..8703884 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -674,7 +674,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used -- 1.9.1

1 0

[libvirt] [PATCH] qemu_command.c: allow hostdev to be attached to PCIe bus
by Steven Walter 20 Mar '15

20 Mar '15

Presently attaching a host device to the pcie-root controller fails, even if the host device is actually a PCIe device. With this change, the attachment succeeds, QEMU is happy, and the guest correctly sees the host device as a child of the PCIe root. --- src/qemu/qemu_command.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d1590c..1de89e3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1377,6 +1377,13 @@ qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, */ flags = VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE; break; + + case VIR_DOMAIN_DEVICE_HOSTDEV: + /* hostdev aren't hot-plugged, and can be put in either a + * PCI or PCIe slot + */ + flags = VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE; + break; } /* Ignore implicit controllers on slot 0:0:1.0: -- 2.1.0

2 1

[libvirt] [PATCH] libxl: use xenlight pkgconfig file if present
by Jim Fehlig 20 Mar '15

20 Mar '15

xen.git commit babeca32 added a pkgconfig file for libxenlight, allowing libxl apps to determine the location of Xen binaries such as firmware blobs, device emulator, etc. This patch adds support for xenlight.pc in the libxl driver, falling back to the previous configure logic if not found. It introduces LIBXL_FIRMWARE_DIR and LIBXL_EXECBIN_DIR to define the firmware and libexec_bin locations. If xenlight.pc does not exist, the defines are set to the current hardcoded paths. The capabilities' <emulator> and <loader> elements are updated to use the paths. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- configure.ac | 47 +++++++++++++++++++++++++++++++++-------------- src/libxl/libxl_conf.c | 7 ++----- src/libxl/libxl_conf.h | 8 ++++++++ 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 412a23d..b1193a6 100644 --- a/configure.ac +++ b/configure.ac @@ -873,24 +873,37 @@ old_LIBS="$LIBS" old_CFLAGS="$CFLAGS" LIBXL_LIBS="" LIBXL_CFLAGS="" +LIBXL_FIRMWARE_DIR="" +LIBXL_EXECBIN_DIR="" + dnl search for libxl, aka libxenlight +dnl Xen > 4.5 introduced a pkgconfig file, check for it first fail=0 if test "$with_libxl" != "no" ; then - if test "$with_libxl" != "yes" && test "$with_libxl" != "check" ; then - LIBXL_CFLAGS="-I$with_libxl/include" - LIBXL_LIBS="-L$with_libxl" - fi - CFLAGS="$CFLAGS $LIBXL_CFLAGS" - LIBS="$LIBS $LIBXL_LIBS" - AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ - with_libxl=yes - LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl" - ],[ - if test "$with_libxl" = "yes"; then - fail=1 + PKG_CHECK_MODULES([LIBXL], [xenlight], [ + LIBXL_FIRMWARE_DIR=`$PKG_CONFIG --variable xenfirmwaredir xenlight` + LIBXL_EXECBIN_DIR=`$PKG_CONFIG --variable libexec_bin xenlight` + LIBXL_LIBS="$LIBXL_LIBS -lxenctrl" + with_libxl=yes + ], [LIBXL_FOUND=no]) + if test "$LIBXL_FOUND" = "no"; then + dnl No xenlight pkg-config file + if test "$with_libxl" != "yes" && test "$with_libxl" != "check" ; then + LIBXL_CFLAGS="-I$with_libxl/include" + LIBXL_LIBS="-L$with_libxl" fi - with_libxl=no - ]) + CFLAGS="$CFLAGS $LIBXL_CFLAGS" + LIBS="$LIBS $LIBXL_LIBS" + AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ + with_libxl=yes + LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl" + ],[ + if test "$with_libxl" = "yes"; then + fail=1 + fi + with_libxl=no + ]) + fi fi LIBS="$old_LIBS" @@ -905,6 +918,12 @@ if test "$with_libxl" = "yes"; then AC_CHECK_HEADERS([libxlutil.h]) LIBXL_LIBS="$LIBXL_LIBS -lxlutil" AC_DEFINE_UNQUOTED([WITH_LIBXL], 1, [whether libxenlight driver is enabled]) + if test "x$LIBXL_FIRMWARE_DIR" != "x"; then + AC_DEFINE_UNQUOTED([LIBXL_FIRMWARE_DIR], ["$LIBXL_FIRMWARE_DIR"], [directory containing Xen firmware blobs]) + fi + if test "x$LIBXL_EXECBIN_DIR" != "x"; then + AC_DEFINE_UNQUOTED([LIBXL_EXECBIN_DIR], ["$LIBXL_EXECBIN_DIR"], [directory containing Xen libexec binaries]) + fi fi AM_CONDITIONAL([WITH_LIBXL], [test "$with_libxl" = "yes"]) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 80dd5a8..9b3c949 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -305,7 +305,6 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) regmatch_t subs[4]; char *saveptr = NULL; size_t i; - virArch hostarch = caps->host.arch; struct guest_arch guest_archs[32]; int nr_guest_archs = 0; @@ -428,11 +427,9 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) if ((guest = virCapabilitiesAddGuest(caps, guest_archs[i].hvm ? "hvm" : "xen", guest_archs[i].arch, - ((hostarch == VIR_ARCH_X86_64) ? - "/usr/lib64/xen/bin/qemu-dm" : - "/usr/lib/xen/bin/qemu-dm"), + LIBXL_EXECBIN_DIR "/qemu-system-i386", (guest_archs[i].hvm ? - "/usr/lib/xen/boot/hvmloader" : + LIBXL_FIRMWARE_DIR "/hvmloader" : NULL), 1, machines)) == NULL) { diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 5d6f87d..59389d1 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -55,6 +55,14 @@ # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" # define LIBXL_BOOTLOADER_PATH "pygrub" +# ifndef LIBXL_FIRMWARE_DIR +# define LIBXL_FIRMWARE_DIR "/usr/lib/xen/boot" +# endif +# ifndef LIBXL_EXECBIN_DIR +# define LIBXL_EXECBIN_DIR "/usr/lib/xen/bin" +# endif + + /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one * does not care about it (and that's libvirt case), passing NULL is the -- 1.8.4.5

3 3

[libvirt] [PATCH 0/2] target-i386: Haswell-noTSX and Broadwell-noTSX CPU models
by Eduardo Habkost 20 Mar '15

20 Mar '15

With the Intel microcode update that removed HLE and RTM, there will be different kinds of Haswell and Broadwell CPUs out there: some that still have the HLE and RTM features, and some that don't have the HLE and RTM features. On both cases people may be willing to use the pc-*-2.3 machine-types. So instead of making the CPU model results confusing by making it depend on the machine-type, keep HLE and RTM on the existing Haswell and Broadwell CPU models, and introduce "Haswell-noTSX" and "Broadwell-noTSX" CPU models later, for people who have CPUs that don't have TSX feature available. Eduardo Habkost (2): Revert "target-i386: Disable HLE and RTM on Haswell & Broadwell" target-i386: Haswell-noTSX and Broadwell-noTSX hw/i386/pc_piix.c | 4 --- hw/i386/pc_q35.c | 4 --- target-i386/cpu.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 72 insertions(+), 10 deletions(-) -- 2.1.0

3 9

[libvirt] [PATCH] parallels: fix libvirt crash if parallelsNetworkClose fails
by Maxim Nestratov 19 Mar '15

19 Mar '15

If, by any reason, parallelsNetworkClose fails it dereferences newly allocated privconn->networks via virObjectUnref, which in turn deallocates its memory. Subsequent call of parallelsNetworkClose calls virObjectUnref that leads to double memory free. To prevent this we should zero privconn->networks to make all subsequent virObjectUnref be safe. Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- src/parallels/parallels_network.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 8cc0582..8caad4a 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -348,6 +348,7 @@ parallelsNetworkOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; error: virObjectUnref(privconn->networks); + privconn->networks = NULL; return VIR_DRV_OPEN_DECLINED; } -- 1.7.1

2 2

[libvirt] [PATCH] parallels: fix libvirt crash if parallelsNetworkOpen fails
by Maxim Nestratov 19 Mar '15

19 Mar '15

If, by any reason, parallelsNetworkOpen fails it dereferences newly allocated privconn->networks via virObjectUnref, which in turn deallocates its memory. Subsequent call of parallelsNetworkClose calls virObjectUnref that leads to double memory free. To prevent this we should zero privconn->networks to make all subsequent virObjectUnref be safe. Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- src/parallels/parallels_network.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 8cc0582..8caad4a 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -348,6 +348,7 @@ parallelsNetworkOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; error: virObjectUnref(privconn->networks); + privconn->networks = NULL; return VIR_DRV_OPEN_DECLINED; } -- 1.7.1

2 1

[libvirt] [PATCH v11] Expose virDomainInterfacesAddresses to python binding
by Daniel P. Berrange 19 Mar '15

19 Mar '15

From: Nehal J Wani <nehaljw.kkd1(a)gmail.com> examples/Makefile.am: * Add new file domipaddrs.py examples/README: * Add documentation for the python example libvirt-override-api.xml: * Add new symbol for virDomainInterfacesAddresses libvirt-override.c: * Hand written python api Example: $ python examples/domipaddrs.py qemu:///system f18 Interface MAC address Protocol Address vnet0 52:54:00:20:70:3d ipv4 192.168.105.240/16 In v11: - Cope with hwaddr being NULL by filling in PY_NONE --- MANIFEST.in | 1 + examples/README | 1 + examples/domipaddrs.py | 57 ++++++++++++++++++++++++ generator.py | 2 + libvirt-override-api.xml | 9 +++- libvirt-override.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 3 ++ 7 files changed, 182 insertions(+), 1 deletion(-) create mode 100755 examples/domipaddrs.py diff --git a/MANIFEST.in b/MANIFEST.in index d7bc545..dd05221 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,7 @@ include COPYING include COPYING.LESSER include ChangeLog include examples/consolecallback.py +include examples/domipaddrs.py include examples/dominfo.py include examples/domrestore.py include examples/domsave.py diff --git a/examples/README b/examples/README index 5b5d405..1d4b425 100644 --- a/examples/README +++ b/examples/README @@ -11,6 +11,7 @@ domrestore.py - restore domU's from their saved files in a directory esxlist.py - list active domains of an VMware ESX host and print some info. also demonstrates how to use the libvirt.openAuth() method dhcpleases.py - list dhcp leases for a given virtual network +domipaddrs.py - list IP addresses for guest domains The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed diff --git a/examples/domipaddrs.py b/examples/domipaddrs.py new file mode 100755 index 0000000..d6d5cac --- /dev/null +++ b/examples/domipaddrs.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# domipaddrs - print domain interfaces along with their MAC and IP addresses + +import libvirt +import sys + +def usage(): + print "Usage: %s [URI] DOMAIN" % sys.argv[0] + print " Print domain interfaces along with their MAC and IP addresses" + +uri = None +name = None +args = len(sys.argv) + +if args == 2: + name = sys.argv[1] +elif args == 3: + uri = sys.argv[1] + name = sys.argv[2] +else: + usage() + sys.exit(2) + +conn = libvirt.open(uri) +if conn == None: + print "Unable to open connection to libvirt" + sys.exit(1) + +try: + dom = conn.lookupByName(name) +except libvirt.libvirtError: + print "Domain %s not found" % name + sys.exit(0) + +ifaces = dom.interfaceAddresses(libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE); +if (ifaces == None): + print "Failed to get domain interfaces" + sys.exit(0) + +print " {0:10} {1:20} {2:12} {3}".format("Interface", "MAC address", "Protocol", "Address") + +def toIPAddrType(addrType): + if addrType == libvirt.VIR_IP_ADDR_TYPE_IPV4: + return "ipv4" + elif addrType == libvirt.VIR_IP_ADDR_TYPE_IPV6: + return "ipv6" + +for (name, val) in ifaces.iteritems(): + if val['addrs']: + for addr in val['addrs']: + print " {0:10} {1:19}".format(name, val['hwaddr']), + print " {0:12} {1}/{2} ".format(toIPAddrType(addr['type']), addr['addr'], addr['prefix']), + print + else: + print " {0:10} {1:19}".format(name, val['hwaddr']), + print " {0:12} {1}".format("N/A", "N/A"), + print diff --git a/generator.py b/generator.py index df7a74d..8c1c48e 100755 --- a/generator.py +++ b/generator.py @@ -483,6 +483,7 @@ skip_impl = ( 'virDomainBlockCopy', 'virNodeAllocPages', 'virDomainGetFSInfo', + 'virDomainInterfaceAddresses', ) lxc_skip_impl = ( @@ -595,6 +596,7 @@ skip_function = ( 'virDomainStatsRecordListFree', # only useful in C, python uses dict 'virDomainFSInfoFree', # only useful in C, python code uses list 'virDomainIOThreadsInfoFree', # only useful in C, python code uses list + 'virDomainInterfaceFree', # only useful in C, python code uses list ) lxc_skip_function = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 4660c9f..b197639 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -678,5 +678,12 @@ <arg name='flags' type='unsigned int' info='unused, pass 0'/> <return type='char *' info="list of mounted filesystems information"/> </function> - </symbols> + <function name='virDomainInterfaceAddresses' file='python'> + <info>returns a dictionary of domain interfaces along with their MAC and IP addresses</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='source' type='unsigned int' info='the data source'/> + <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> +</symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 1241305..548be24 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -5120,6 +5120,113 @@ cleanup: return py_retval; } + +static PyObject * +libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = VIR_PY_NONE; + virDomainPtr domain; + PyObject *pyobj_domain; + unsigned int source; + unsigned int flags; + virDomainInterfacePtr *ifaces = NULL; + int ifaces_count = 0; + size_t i, j; + int ret; + bool full_free = true; + + if (!PyArg_ParseTuple(args, (char *) "Oii:virDomainInterfacePtr", + &pyobj_domain, &source, &flags)) + return NULL; + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ifaces_count = virDomainInterfaceAddresses(domain, &ifaces, source, flags); + ret = ifaces_count; + LIBVIRT_END_ALLOW_THREADS; + if (ret < 0) + goto cleanup; + + if (!(py_retval = PyDict_New())) + goto no_memory; + + for (i = 0; i < ifaces_count; i++) { + virDomainInterfacePtr iface = ifaces[i]; + PyObject *py_addrs = NULL; + PyObject *py_iface = NULL; + + if (!(py_iface = PyDict_New())) + goto no_memory; + + if (iface->naddrs) { + if (!(py_addrs = PyList_New(iface->naddrs))) { + Py_DECREF(py_iface); + goto no_memory; + } + } else { + py_addrs = VIR_PY_NONE; + } + + for (j = 0; j < iface->naddrs; j++) { + virDomainIPAddressPtr addr = &(iface->addrs[j]); + PyObject *py_addr = PyDict_New(); + int type = addr->type; + + if (!addr) { + Py_DECREF(py_iface); + Py_DECREF(py_addrs); + goto no_memory; + } + + PyDict_SetItem(py_addr, libvirt_constcharPtrWrap("addr"), + libvirt_constcharPtrWrap(addr->addr)); + PyDict_SetItem(py_addr, libvirt_constcharPtrWrap("prefix"), + libvirt_intWrap(addr->prefix)); + PyDict_SetItem(py_addr, libvirt_constcharPtrWrap("type"), + libvirt_intWrap(type)); + + PyList_SetItem(py_addrs, j, py_addr); + } + + PyDict_SetItem(py_iface, libvirt_constcharPtrWrap("addrs"), + py_addrs); + if (iface->hwaddr) { + PyDict_SetItem(py_iface, libvirt_constcharPtrWrap("hwaddr"), + libvirt_constcharPtrWrap(iface->hwaddr)); + } else { + PyDict_SetItem(py_iface, libvirt_constcharPtrWrap("hwaddr"), + VIR_PY_NONE); + } + + PyDict_SetItem(py_retval, libvirt_charPtrWrap(iface->name), + py_iface); + } + + full_free = false; + +cleanup: + if (ifaces && ifaces_count > 0) { + for (i = 0; full_free && i < ifaces_count; i++) { + /* + * We don't want to free values we've just shared with python variables unless + * there was an error and hence we are returning PY_NONE or equivalent + */ + virDomainInterfaceFree(ifaces[i]); + } + } + VIR_FREE(ifaces); + + return py_retval; + +no_memory: + Py_XDECREF(py_retval); + py_retval = PyErr_NoMemory(); + goto cleanup; +} + + /******************************************* * Helper functions to avoid importing modules * for every callback @@ -8750,6 +8857,9 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(1, 2, 11) {(char *) "virDomainGetFSInfo", libvirt_virDomainGetFSInfo, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ +#if LIBVIR_CHECK_VERSION(1, 2, 14) + {(char *) "virDomainInterfaceAddresses", libvirt_virDomainInterfaceAddresses, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ {NULL, NULL, 0, NULL} }; diff --git a/sanitytest.py b/sanitytest.py index 0e6e0e5..2b609a9 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -145,6 +145,9 @@ for cname in wantfunctions: if name[0:26] == "virDomainIOThreadsInfoFree": continue + if name[0:33] == "virDomainInterfaceFree": + continue + if name[0:21] == "virDomainListGetStats": name = "virConnectDomainListGetStats" -- 2.1.0

2 1

[libvirt] LXC container with user namespace and root fs on loop device - how it's supposed to work?
by Dmitry Guryanov 19 Mar '15

19 Mar '15

Hello, It's not possible to start LXC container inside user namespace with root filesystem on loop device, because it tries to mount root FS from container's user namespace (lxcContainerSetupPivotRoot) and gets EPERM: 2015-03-19 12:48:18.545+0000: 1: debug : lxcContainerChild:2278 : Tearing down container Failed to mount device /dev/loop0 to /var/run/libvirt/lxc/instance-0000000b.root: Operation not permitted So I wonder, if someone tried to run LXC container with such configuration with success. Here is my config: <domain type='lxc'> <name>instance-0000000b</name> <uuid>d918c415-0a00-4c12-896e-19e4711111d3</uuid> <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> <cputune> <shares>1024</shares> </cputune> <os> <type arch='x86_64'>exe</type> <init>/sbin/init</init> <cmdline>console=tty0 console=ttyS0</cmdline> </os> <idmap> <uid start='0' target='10000' count='1000'/> <gid start='0' target='10000' count='1000'/> </idmap> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='file' accessmode='passthrough'> <driver type='loop' format='raw'/> <source file='/root/2.img'/> <target dir='/'/> </filesystem> <console type='pty'> <target type='lxc' port='0'/> </console> </devices> </domain> -- Dmitry Guryanov

1 0

[libvirt] [PATCH v2 0/6] parallels: implement managed save
by Dmitry Guryanov 19 Mar '15

19 Mar '15

This patch series is intended to implement all needed code, so that suspend/resume in openstack nova will work. It implements .domainHasManagedSaveImage, .domainManagedSave and .domainManagedSaveRemove functions. Also it adds workaround to parallelsDomainDefineXMLFlags to skip applying configuration, if VM is in managed save state and config hasn't been changed, because it's not possible to change VM config in suspended state in PCS. Changes in v2: * rebased Dmitry Guryanov (6): parallels: fix headers in parallels_sdk.h parallels: split prlsdkDomainChangeState function parallels: implement virDomainManagedSave parallels: report, that cdroms are readonly parallels: add controllers in prlsdkLoadDomain parallels: fix virDomainDefineXML for domain in saved state src/parallels/parallels_driver.c | 101 +++++++++++++++++++++++++++++++++++++-- src/parallels/parallels_sdk.c | 65 ++++++++++++++++++------- src/parallels/parallels_sdk.h | 17 +++++-- 3 files changed, 157 insertions(+), 26 deletions(-) -- 2.1.0

1 6

[libvirt] USB hostdev de/reattaching
by Martin Polednik 19 Mar '15

19 Mar '15

Hello, according to libvirt documentation, when using hostdev with USB device "...the user is responsible to call virNodeDeviceDettach (or virsh nodedev-detach) before starting the guest...". In libvirt-1.2.13-1.el7.x86_64, this leads to virsh nodedev-detach usb_usb1 error: Failed to detach device usb_usb1 error: invalid argument: device usb_usb1 is not a PCI device The failure is most probably caused in qemuNodeDeviceDeta where qemuNodeDeviceGetPCIInfo is called. Is it a bug, or usb hostdev can be done without detaching/reattaching? Thanks, mpolednik

2 1

Re: [libvirt] [SOLVED] Domain XML isn't dumping full backing chain
by Deepak Shetty 19 Mar '15

19 Mar '15

On Wed, Mar 18, 2015 at 5:33 PM, Shanzhi Yu <shyu(a)redhat.com> wrote: > > > ------------------------------ > > *From: *"Deepak Shetty" <dpkshetty(a)gmail.com> > *To: *libvir-list(a)redhat.com > *Sent: *Wednesday, March 18, 2015 7:19:05 PM > *Subject: *[libvirt] Domain XML isn't dumping full backing chain > > > Hi, > I am using libvirt version 1.2.9.2 on F21 and i am unable to get the > complete backing chain info in the virsh dumpxml output. Details below : > > *My backing chain per qemu-img :* > > [stack@devstack-f21 test]$ qemu-img info --backing-chain snap4.qcow2 > image: snap4.qcow2 > file format: qcow2 > virtual size: 1.0G (1073741824 bytes) > disk size: 196K > cluster_size: 65536 > backing file: ./snap3.qcow2 > Format specific information: > compat: 1.1 > lazy refcounts: false > > image: ./snap3.qcow2 > file format: qcow2 > virtual size: 1.0G (1073741824 bytes) > disk size: 196K > cluster_size: 65536 > backing file: ./snap2.qcow2 (actual path: ././snap2.qcow2) > Format specific information: > compat: 1.1 > lazy refcounts: false > > image: ././snap2.qcow2 > file format: qcow2 > virtual size: 1.0G (1073741824 bytes) > disk size: 196K > cluster_size: 65536 > backing file: ./snap1.qcow2 (actual path: ./././snap1.qcow2) > Format specific information: > compat: 1.1 > lazy refcounts: false > > image: ./././snap1.qcow2 > file format: qcow2 > virtual size: 1.0G (1073741824 bytes) > disk size: 196K > cluster_size: 65536 > backing file: ./base.qcow2 (actual path: ././././base.qcow2) > Format specific information: > compat: 1.1 > lazy refcounts: false > > image: ././././base.qcow2 > file format: qcow2 > virtual size: 1.0G (1073741824 bytes) > disk size: 196K > cluster_size: 65536 > Format specific information: > compat: 1.1 > lazy refcounts: false > > If you want prepare the backing chain yourself, you should add "-o > backing_fmt=$farmat" options, > like "qemu-img create -f qcow2 base.s1 -b base.qcow2 -o backing_fmt=qcow2" > Thanks, it works after I did the above thanx, deepak

1 0

[libvirt] [PATCH] qemu: fix sometimes error overwrite when we fail to start/migrate/restore
by Luyao Huang 19 Mar '15

19 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1196934 When start/migrate/restore a vm failed, libvirt will try to catch the log in /var/log/libvirt/qemu/vm.log and output them before. However we add a check in qemuDomainObjExitMonitor after commit dc2fd51f, this will overwrite the error set in priv->mon which has set by qemuMonitorIO (a qemu monitor I/O event callback function). Add a check in qemuDomainObjExitMonitor, if there is an error have been set by other function, we won't overwrite it. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2eacef2..41d1263 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1609,8 +1609,9 @@ int qemuDomainObjExitMonitor(virQEMUDriverPtr driver, { qemuDomainObjExitMonitorInternal(driver, obj); if (!virDomainObjIsActive(obj)) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("domain is no longer running")); + if (!virGetLastError()) + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("domain is no longer running")); return -1; } return 0; -- 1.8.3.1

3 2

[libvirt] [PATCH v2 0/2] network_conf: check if bridge exists on host for user created bridges
by Shivaprasad G Bhat 19 Mar '15

19 Mar '15

The patch fixes the below problem. ============================== If the bridge name is not mentioned in the <network> xml, the bridge name is auto generated from virNetworkAllocateBridge(). If the default template named bridge is created manually by a user, the bridge start will fail with "File exists". bash-4.3$ sudo brctl addbr virbr1 bash-4.3$ brctl show bridge name bridge id STP enabled interfaces br0 8000.000000000000 no virbr0 8000.525400a91d03 yes virbr0-nic virbr1 8000.000000000000 no bash-4.3$ sudo virsh net-list --all Name State Autostart Persistent ---------------------------------------------------------- default active no yes bash-4.3$ cat /tmp/isolated # Notice that the <bridge> intentionally not given. <network> <name>isolated</name> <forward/> <ip address="192.168.123.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.123.2" end="192.168.123.254"/> </dhcp> </ip> </network> bash-4.3$ sudo virsh net-create /tmp/isolated error: Failed to create network from isolated error: Unable to create bridge virbr1: File exists =============================== --- Shivaprasad G Bhat (2): cleanup conf/device_conf.h reference from util/virnetdev.h network_conf: check if bridge exists on host for user created bridges src/Makefile.am | 3 +-- src/conf/device_conf.h | 21 +-------------------- src/conf/network_conf.c | 11 +++++++++-- src/util/virnetdev.h | 21 ++++++++++++++++++++- 4 files changed, 31 insertions(+), 25 deletions(-) -- Signature

2 3

[libvirt] [PATCH v2] doc: Fix doc for backingStore
by Deepak Shetty 19 Mar '15

19 Mar '15

I spent quite some time figuring that backingStore info isn't included in the dom xml, unless guest is up and running. Hopefully putting that in the doc should help. This patch adds that info to the doc. Signed-off-by: Deepak C Shetty <deepakcs(a)redhat.com> --- docs/formatdomain.html.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ab51982..a41c2c6 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2113,7 +2113,12 @@ and only used for output to describe the detected backing chains. <span class="since">Since 1.2.4</span>. An empty <code>backingStore</code> element means the sibling source is - self-contained and is not based on any backing store. The following + self-contained and is not based on any backing store. Note that + <code>backingStore</code> info is included in the output only when + the guest is up and running, otherwise it's not included. For accurate + <code>backingStore</code> info, when using external snapshot with the + destination of a existing file, the snapshot must be created with + backing file format specified in the metadata. The following attributes and sub-elements are supported in <code>backingStore</code>: <dl> -- 1.9.3

2 2

[libvirt] [PATCH] libxl: Don't overwrite errors from xenconfig
by Jim Fehlig 19 Mar '15

19 Mar '15

When converting domXML from native, the libxl driver was overwriting useful errors from the xenconfig parsing code with a useless, generic error. E.g. "internal error: parsing xm config failed" vs "internal error: config value usbdevice was malformed". Remove the redundant (and useless) error reporting in the libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e555ca4..1c1af79 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2222,22 +2222,16 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, goto cleanup; if (!(def = xenParseXL(conf, cfg->caps, - cfg->verInfo->xen_version_major))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("parsing xl config failed")); + cfg->verInfo->xen_version_major))) goto cleanup; - } } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) { if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0))) goto cleanup; if (!(def = xenParseXM(conf, cfg->verInfo->xen_version_major, - cfg->caps))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("parsing xm config failed")); + cfg->caps))) goto cleanup; - } } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_SEXPR)) { /* only support latest xend config format */ if (!(def = xenParseSxprString(nativeConfig, -- 1.8.4.5

2 2

[libvirt] [PATCH] Add vircgroupdata dir to tests/Makefile.am
by Nehal J Wani 19 Mar '15

19 Mar '15

The folder vircgroupdata was introduced in commit 2dbfa716 as part of the test suite for virCgroupDetectMounts --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9277c13..27cee63 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -128,6 +128,7 @@ EXTRA_DIST = \ storagevolxml2xmlout \ sysinfodata \ test-lib.sh \ + vircgroupdata \ vircaps2xmldata \ vboxsnapshotxmldata \ virsh-uriprecedence \ -- 2.1.0

2 1

[libvirt] [PATCH v3 4/4] migration: Expose 'cancelling' status to user
by zhanghailiang 19 Mar '15

19 Mar '15

'cancelling' status is introduced by commit 51cf4c1a, which is mainly avoid possible starting a new migration process while the previous one still exist. But we don't expose this status to user, instead by return a 'active' state. Here, we expose it to the user (such as libvirt), 'cancelling' status only occurs for a short window before the migration aborts, so for users, if they cancell a migration process, it will observe 'cancelling' status occasionally. Signed-off-by: zhanghailiang <zhang.zhanghailiang(a)huawei.com> Cc: libvir-list(a)redhat.com --- migration/migration.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 035e005..a57928d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -179,13 +179,11 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_SETUP: info->has_status = true; - info->status = MIGRATION_STATUS_SETUP; info->has_total_time = false; break; case MIGRATION_STATUS_ACTIVE: case MIGRATION_STATUS_CANCELLING: info->has_status = true; - info->status = MIGRATION_STATUS_ACTIVE; info->has_total_time = true; info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - s->total_time; @@ -221,7 +219,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) get_xbzrle_cache_stats(info); info->has_status = true; - info->status = MIGRATION_STATUS_COMPLETED; info->has_total_time = true; info->total_time = s->total_time; info->has_downtime = true; @@ -243,13 +240,12 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_FAILED: info->has_status = true; - info->status = MIGRATION_STATUS_FAILED; break; case MIGRATION_STATUS_CANCELLED: info->has_status = true; - info->status = MIGRATION_STATUS_CANCELLED; break; } + info->status = s->state; return info; } -- 1.7.12.4

3 5

[libvirt] [PATCH] util: more verbose error when failing to create macvtap device
by Laine Stump 19 Mar '15

19 Mar '15

Investigation of a problem with creating passthrough macvtap devices (https://bugzilla.redhat.com/show_bug.cgi?id=1185501) has shown that this slightly more verbose failure message is useful. In particular, the mac address can be used to determine the domain. You could also figure this out by looking at preceding messages in a debug log, but this gets it in a single place. --- src/util/virnetdevmacvlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index dd66955..5fd2097 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -107,6 +107,7 @@ virNetDevMacVLanCreate(const char *ifname, unsigned int recvbuflen; struct nl_msg *nl_msg; struct nlattr *linkinfo, *info_data; + char macstr[VIR_MAC_STRING_BUFLEN]; if (virNetDevGetIndex(srcdev, &ifindex) < 0) return -1; @@ -177,8 +178,9 @@ virNetDevMacVLanCreate(const char *ifname, default: virReportSystemError(-err->error, - _("error creating %s type of interface attach to %s"), - type, srcdev); + _("error creating %s interface %s@%s (%s)"), + type, ifname, srcdev, + virMacAddrFormat(macaddress, macstr)); goto cleanup; } break; -- 2.1.0

2 1

[libvirt] [PATCH v4 0/7] bridge network support enhancement and other network fixes
by Maxim Nestratov 19 Mar '15

19 Mar '15

v2-v4 change: Addressed Michal Privoznik's comments Maxim Nestratov (7): parallels: introduce and use string constants for network types and names parallels: fix parallelsLoadNetworks parallels: better bridge network interface support parallels: set correct network adapter device state parallels: make E1000 network adapter model default parallels: switch off offline management feature parallels: don't prevent domain define if VIR_DOMAIN_NET_TYPE_BRIDGE

2 13

[libvirt] [PATCH] util: vhost user: support for bootindex
by zhang bo 19 Mar '15

19 Mar '15

Problem Description: When we set boot order for a vhost-user network interface, we found the boot index doesn't work. Cause of the Problem: In the function qemuBuildVhostuserCommandLine(), it forcely set the arg bootindex of function qemuBuildNicDevStr() to 0. Thus, the bootindex parameter got missing. Solution: Trans the arg bootindex down. Signed-off-by: Gao Haifeng <gaohaifeng.gao(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/qemu/qemu_command.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5303de5..2f37812 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7767,7 +7767,8 @@ static int qemuBuildVhostuserCommandLine(virCommandPtr cmd, virDomainDefPtr def, virDomainNetDefPtr net, - virQEMUCapsPtr qemuCaps) + virQEMUCapsPtr qemuCaps, + int bootindex) { virBuffer chardev_buf = VIR_BUFFER_INITIALIZER; virBuffer netdev_buf = VIR_BUFFER_INITIALIZER; @@ -7814,7 +7815,7 @@ qemuBuildVhostuserCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-netdev"); virCommandAddArgBuffer(cmd, &netdev_buf); - if (!(nic = qemuBuildNicDevStr(def, net, -1, 0, 0, qemuCaps))) { + if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, 0, qemuCaps))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error generating NIC -device string")); goto error; @@ -7859,8 +7860,12 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virNetDevBandwidthPtr actualBandwidth; size_t i; + + if (!bootindex) + bootindex = net->info.bootIndex; + if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) - return qemuBuildVhostuserCommandLine(cmd, def, net, qemuCaps); + return qemuBuildVhostuserCommandLine(cmd, def, net, qemuCaps, bootindex); if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* NET_TYPE_HOSTDEV devices are really hostdev devices, so @@ -7869,9 +7874,6 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, return 0; } - if (!bootindex) - bootindex = net->info.bootIndex; - /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || -- 1.7.12.4

2 2

[libvirt] Domain XML isn't dumping full backing chain
by Deepak Shetty 18 Mar '15

18 Mar '15

Hi, I am using libvirt version 1.2.9.2 on F21 and i am unable to get the complete backing chain info in the virsh dumpxml output. Details below : *My backing chain per qemu-img :* [stack@devstack-f21 test]$ qemu-img info --backing-chain snap4.qcow2 image: snap4.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 196K cluster_size: 65536 backing file: ./snap3.qcow2 Format specific information: compat: 1.1 lazy refcounts: false image: ./snap3.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 196K cluster_size: 65536 backing file: ./snap2.qcow2 (actual path: ././snap2.qcow2) Format specific information: compat: 1.1 lazy refcounts: false image: ././snap2.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 196K cluster_size: 65536 backing file: ./snap1.qcow2 (actual path: ./././snap1.qcow2) Format specific information: compat: 1.1 lazy refcounts: false image: ./././snap1.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 196K cluster_size: 65536 backing file: ./base.qcow2 (actual path: ././././base.qcow2) Format specific information: compat: 1.1 lazy refcounts: false image: ././././base.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 196K cluster_size: 65536 Format specific information: compat: 1.1 lazy refcounts: false I created 4 snapshots using commands (similar to the below, just dumping the last one here ): [stack@devstack-f21 test]$ virsh snapshot-create-as test-domain on-test-snap4 --disk-only --reuse-external --diskspec hda,snapshot=external,file=/home/stack/test/snap4.qcow2 Domain snapshot on-test-snap4 created [stack@devstack-f21 test]$ virsh domblklist test-domain Target Source ------------------------------------------------ hda /home/stack/test/snap4.qcow2 virsh dumpxml test-domain|more .... <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/home/stack/test/snap4.qcow2'/> <backingStore type='file' index='1'> <format type='raw'/> <source file='/home/stack/test/./snap3.qcow2'/> <backingStore/> </backingStore> <target dev='hda' bus='ide'/> <alias name='ide0-0-0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> ..... I think thats happening beccause the backingStore format is coming as 'raw' What am i missing ? thanx, deepak

4 4

[libvirt] [PATCH] maint: Distribute tests/vircgroupdata
by Jiri Denemark 18 Mar '15

18 Mar '15

My commit 2dbfa71 added test data for vircgrouptest but forgot to distribute the new directory. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build-breaker. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9277c13..bd2ea16 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -131,6 +131,7 @@ EXTRA_DIST = \ vircaps2xmldata \ vboxsnapshotxmldata \ virsh-uriprecedence \ + vircgroupdata \ virfiledata \ virpcitestdata \ virscsidata \ -- 2.3.3

1 0

[libvirt] [PATCH] doc: Fix doc for backingStore
by Deepak Shetty 18 Mar '15

18 Mar '15

I spent quite some time figuring that backingStore info isn't included in the dom xml, unless guest is up and running. Hopefully putting that in the doc should help. This patch adds that info to the doc. Signed-off-by: Deepak C Shetty <deepakcs(a)redhat.com> --- docs/formatdomain.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ab51982..dfd4f3a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2113,7 +2113,9 @@ and only used for output to describe the detected backing chains. <span class="since">Since 1.2.4</span>. An empty <code>backingStore</code> element means the sibling source is - self-contained and is not based on any backing store. The following + self-contained and is not based on any backing store. Note that + <code>backingStore</code> info is included in the output only when + the guest is up and running, otherwise its not included. The following attributes and sub-elements are supported in <code>backingStore</code>: <dl> -- 1.9.3

2 2

[libvirt] [PATCH v2 0/7] bridge network support enhancement and other network fixes
by Maxim Nestratov 18 Mar '15

18 Mar '15

From: Maxim Nestratov <mnestratov(a)parallels.com> v2 change: - rebased on recent network rework Maxim Nestratov (7): parallels: introduce and use string constants for network types and names parallels: fix parallelsLoadNetworks parallels: better bridge network interface support parallels: set network adapter device status to connected parallels: make E1000 network adapter type default parallels: switch off offline management feature parallels: don't prevent domain define if VIR_DOMAIN_NET_TYPE_BRIDGE

3 18

[libvirt] [PATCH] qemu: Fix two issues in qemuDomainSetVcpus error handling
by John Ferlan 18 Mar '15

18 Mar '15

Issue #1 - A call to virBitmapNew did not check if the allocation failed which could lead to a NULL dereference Issue #2 - When deleting the pin entries from the config file, the code loops from the number of elements down to the "new" vcpu count; however, the pin id values are numbered 0..n-1 not 1..n, so the "first" pin attempt would never work. Luckily the check was for whether the incoming 'n' (vcpu id) matched the entry in the array from 0..arraysize rather than a dereference of the 'n' entry Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: These were found on inspection while working/debugging the a IOThreads series which borrows from the SetVcpus code. I can separate the two if desired, but I think the second issue is mostly an optimization. src/qemu/qemu_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ed6764d..6d9217b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4752,7 +4752,11 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, if (VIR_ALLOC(vcpupin) < 0) goto cleanup; - vcpupin->cpumask = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN); + if (!(vcpupin->cpumask = + virBitmapNew(VIR_DOMAIN_CPUMASK_LEN))) { + VIR_FREE(vcpupin); + goto cleanup; + } virBitmapCopy(vcpupin->cpumask, vm->def->cpumask); vcpupin->id = i; if (VIR_APPEND_ELEMENT_COPY(vm->def->cputune.vcpupin, @@ -4987,7 +4991,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* remove vcpupin entries for vcpus that were unplugged */ if (nvcpus < persistentDef->vcpus) { - for (i = persistentDef->vcpus; i >= nvcpus; i--) + for (i = persistentDef->vcpus - 1; i >= nvcpus; i--) virDomainPinDel(&persistentDef->cputune.vcpupin, &persistentDef->cputune.nvcpupin, i); -- 2.1.0

2 1

[libvirt] [PATCH] libvirt: move default nwfilters to datadir.
by Dimitri John Ledkov 18 Mar '15

18 Mar '15

libvirt runs correctly without any configuration files, as sensible defaults are used throughout. This commit introduces a layer for nwfilter configuration. This means that default filters are shipped in /usr/share/libvirt/nwfilter/ directory, which can be overridden by things in /etc/libvirt/nwfilter. This is similar to configuration splits as observed in udev, systemd, XDG Base Directory Specification and so on. This will make a distinction and make it obvious if any of the nwfilters are modified by the administrator. --- examples/xml/nwfilter/Makefile.am | 2 +- src/conf/nwfilter_conf.h | 1 + src/nwfilter/nwfilter_driver.c | 18 +++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index ec1e7ee..61f328a 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST=$(FILTERS) confdir = $(sysconfdir)/libvirt -NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" +NWFILTER_DIR = "$(DESTDIR)$(datadir)/libvirt/nwfilter" if WITH_NWFILTER install-data-local: diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 6e68ecc..ee427b1 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -577,6 +577,7 @@ struct _virNWFilterDriverState { virNWFilterObjList nwfilters; char *configDir; + char *defaultsDir; bool watchingFirewallD; }; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 8e3db43..2e81dbf 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -173,7 +173,6 @@ nwfilterStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { - char *base = NULL; DBusConnection *sysbus = NULL; if (!privileged) @@ -228,17 +227,20 @@ nwfilterStateInitialize(bool privileged, goto error; } - if (VIR_STRDUP(base, SYSCONFDIR "/libvirt") < 0) + if (virAsprintf(&driver->configDir, + SYSCONFDIR "/libvirt/nwfilter") == -1) goto error; - if (virAsprintf(&driver->configDir, - "%s/nwfilter", base) == -1) + if (virNWFilterLoadAllConfigs(&driver->nwfilters, + driver->configDir) < 0) goto error; - VIR_FREE(base); + if (virAsprintf(&driver->defaultsDir, + PKGDATADIR "/nwfilter") == -1) + goto error; if (virNWFilterLoadAllConfigs(&driver->nwfilters, - driver->configDir) < 0) + driver->defaultsDir) < 0) goto error; nwfilterDriverUnlock(); @@ -246,7 +248,6 @@ nwfilterStateInitialize(bool privileged, return 0; error: - VIR_FREE(base); nwfilterDriverUnlock(); nwfilterStateCleanup(); @@ -292,6 +293,8 @@ nwfilterStateReload(void) virNWFilterLoadAllConfigs(&driver->nwfilters, driver->configDir); + virNWFilterLoadAllConfigs(&driver->nwfilters, + driver->defaultsDir); virNWFilterCallbackDriversUnlock(); virNWFilterUnlockFilterUpdates(); @@ -345,6 +348,7 @@ nwfilterStateCleanup(void) virNWFilterObjListFree(&driver->nwfilters); VIR_FREE(driver->configDir); + VIR_FREE(driver->defaultsDir); nwfilterDriverUnlock(); } -- 2.1.0

2 3

[libvirt] [PATCH] Use PAUSED state for domains that are starting up
by Jiri Denemark 18 Mar '15

18 Mar '15

When libvirt is starting a domain, it reports the state as SHUTOFF until it's RUNNING. This is not ideal because domain startup may take a long time (usually because of some configuration issues, firewalls blocking access to network disks, etc.) and domain lists provided by libvirt look awkward. One can see weird shutoff domains with IDs in a list of active domains or even shutoff transient domains. In any case, it looks more like a bug in libvirt than a normal state a domain goes through. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- After going through all hypervisor drivers it seems none of them needs to be updated. That is, this patch matches the one I sent as RFC for design discussions. include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 3 ++- src/qemu/qemu_process.c | 22 ++++++++++++++-------- tools/virsh-domain-monitor.c | 3 ++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 9487b80..d5c148b 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -116,6 +116,7 @@ typedef enum { VIR_DOMAIN_PAUSED_SHUTTING_DOWN = 8, /* paused during shutdown process */ VIR_DOMAIN_PAUSED_SNAPSHOT = 9, /* paused while creating a snapshot */ VIR_DOMAIN_PAUSED_CRASHED = 10, /* paused due to a guest crash */ + VIR_DOMAIN_PAUSED_STARTING_UP = 11, /* the domain is being started */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_PAUSED_LAST diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc8616b..783c382 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -661,7 +661,8 @@ VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, "from snapshot", "shutdown", "snapshot", - "panicked") + "panicked", + "starting up") VIR_ENUM_IMPL(virDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, "unknown", diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d1f089d..649b3df 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3418,6 +3418,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) virDomainState state; virDomainPausedReason reason; virDomainState newState = VIR_DOMAIN_NOSTATE; + int oldReason; int newReason; bool running; char *msg = NULL; @@ -3431,9 +3432,16 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) if (ret < 0) return -1; - state = virDomainObjGetState(vm, NULL); + state = virDomainObjGetState(vm, &oldReason); - if (state == VIR_DOMAIN_PAUSED && running) { + if (running && + (state == VIR_DOMAIN_SHUTOFF || + (state == VIR_DOMAIN_PAUSED && + oldReason == VIR_DOMAIN_PAUSED_STARTING_UP))) { + newState = VIR_DOMAIN_RUNNING; + newReason = VIR_DOMAIN_RUNNING_BOOTED; + ignore_value(VIR_STRDUP_QUIET(msg, "finished booting")); + } else if (state == VIR_DOMAIN_PAUSED && running) { newState = VIR_DOMAIN_RUNNING; newReason = VIR_DOMAIN_RUNNING_UNPAUSED; ignore_value(VIR_STRDUP_QUIET(msg, "was unpaused")); @@ -3452,10 +3460,6 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) ignore_value(virAsprintf(&msg, "was paused (%s)", virDomainPausedReasonTypeToString(reason))); } - } else if (state == VIR_DOMAIN_SHUTOFF && running) { - newState = VIR_DOMAIN_RUNNING; - newReason = VIR_DOMAIN_RUNNING_BOOTED; - ignore_value(VIR_STRDUP_QUIET(msg, "finished booting")); } if (newState != VIR_DOMAIN_NOSTATE) { @@ -3828,7 +3832,9 @@ qemuProcessReconnect(void *opaque) goto error; state = virDomainObjGetState(obj, &reason); - if (state == VIR_DOMAIN_SHUTOFF) { + if (state == VIR_DOMAIN_SHUTOFF || + (state == VIR_DOMAIN_PAUSED && + reason == VIR_DOMAIN_PAUSED_STARTING_UP)) { VIR_DEBUG("Domain '%s' wasn't fully started yet, killing it", obj->def->name); goto error; @@ -4459,7 +4465,7 @@ int qemuProcessStart(virConnectPtr conn, vm->def->id = qemuDriverAllocateID(driver); qemuDomainSetFakeReboot(driver, vm, false); - virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STARTING_UP); if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 464ac11..30ddae4 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -199,7 +199,8 @@ VIR_ENUM_IMPL(vshDomainPausedReason, N_("from snapshot"), N_("shutting down"), N_("creating snapshot"), - N_("crashed")) + N_("crashed"), + N_("starting up")) VIR_ENUM_DECL(vshDomainShutdownReason) VIR_ENUM_IMPL(vshDomainShutdownReason, -- 2.3.1

2 2

[libvirt] [PATCH] update documentation for command cd
by swat 18 Mar '15

18 Mar '15

Updated the documentation for command cd The documentation for command cd did not have information about the command. Added the required information. --- source/cd.xml | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/source/cd.xml b/source/cd.xml index 78a13df..d4afbc9 100644 --- a/source/cd.xml +++ b/source/cd.xml @@ -9,16 +9,46 @@ </text> </description> - <options /> + <options> + <parameter requirement="optional"> + <keyword requirement="optional">--dir</keyword> + <value type="string" requirement="optional">path</value> + <description> + <text> + directory to switch to (default: home or else root) + </text> + <text> + --dir itself is optional + </text> + </description> + </parameter> + </options> <availability from="0.7.0" /> <notes /> - <examples type="usage" /> + <examples type="usage" > + <example> + <terminal> +virsh # <bold> cd </bold> <value>/tmp</value> </terminal> + <text> + Changes the current working directory to <value> /tmp </tmp> + </text> + </example> + </examples> <examples type="fullcontext" /> <reference type="seealso" /> - + <item> + <link type="internal" href="pwd"/> + <name> + pwd + </name> + <description> + Displays the current directory + </description> + </item> + </reference> </command> -- 1.9.1

3 2

[libvirt] [test-API][PATCH] Add connection_security_model test case
by lcheng 18 Mar '15

18 Mar '15

The connection_security_model.py uses getSecurityModel() to validate new API virNodeGetSecurityModel of libvirt. --- cases/linux_domain.conf | 4 ++ repos/virconn/connection_security_model.py | 101 +++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 repos/virconn/connection_security_model.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 903fdb5..a7015f0 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -233,6 +233,10 @@ domain:domain_fsthaw guestname $defaultname +virconn:connection_security_model + guestname + $defaultname + domain:destroy guestname $defaultname diff --git a/repos/virconn/connection_security_model.py b/repos/virconn/connection_security_model.py new file mode 100644 index 0000000..b44d78c --- /dev/null +++ b/repos/virconn/connection_security_model.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python +# To test "getSecurityModel" + +import libvirt + +from xml.dom import minidom +from libvirt import libvirtError +from src import sharedmod +from utils import utils + +required_params = ('guestname',) +optional_params = {} + +def get_security_driver(logger): + """get security driver from /etc/libvirt/qemu.conf""" + + cmds = "grep \"^security_driver\" /etc/libvirt/qemu.conf" + (ret, conf) = utils.exec_cmd(cmds, shell=True) + if ret: + cmds = "getenforce" + (ret, policy) = utils.exec_cmd(cmds, shell=True) + + if policy[0] == "Disabled": + return "none" + else: + return "selinux" + + tmp = conf[0].split(' = ') + if len(tmp[1].split(', ')) > 1: + driver = tmp[1].split(', ') + return (filter(str.isalpha, driver[0])) + else: + cmds = "echo '%s' | awk -F '\"' '{print $2}'" % conf[0] + (ret, driver) = utils.exec_cmd(cmds, shell=True) + + if driver[0] == "selinux": + return "selinux" + elif driver[0] == "none": + return "none" + elif driver[0] == "apparmor": + return "apparmor" + elif driver[0] == "stack": + return "stack" + else: + return "" + +def get_security_model(logger, domname): + """get security model from process""" + + PID = "ps aux | grep -v grep | grep %s | awk '{print $2}'" % domname + ret, pid = utils.exec_cmd(PID, shell=True) + if ret: + logger.error("get domain pid failed.") + return "" + + LABEL = "ls -nZd /proc/%s" % pid[0] + ret, label = utils.exec_cmd(LABEL, shell=True) + if ret: + logger.error("get domain process's label failed.") + return "" + + if "system_u:system_r:svirt_t:s0" in label[0]: + return "selinux" + else: + return "none" + +def check_security_model(logger, domname, model): + """ check security model""" + + dommodel = get_security_model(logger, domname) + driver = get_security_driver(logger) + + logger.info("domain security model is %s." % dommodel) + logger.info("get security driver is %s." % driver) + logger.info("get security model is %s." % model) + + if driver == dommodel and dommodel == model: + return True + else: + return False + +def connection_security_model(params): + """test API for getSecurityModel""" + + logger = params['logger'] + domname = params['guestname'] + conn = sharedmod.libvirtobj['conn'] + + try: + model = conn.getSecurityModel() + + if not check_security_model(logger, domname, model[0]): + logger.error("Fail : get a error security model.") + return 1 + else: + logger.info("Pass : get security model successful.") + return 0 + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + -- 1.8.3.1

2 1

[libvirt] [PATCH] tests: Add tests for virCgroupDetectMounts
by Jiri Denemark 18 Mar '15

18 Mar '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/vircgroup.c | 19 ++-- src/util/vircgrouppriv.h | 4 + tests/vircgroupdata/all-in-one.mounts | 7 ++ tests/vircgroupdata/all-in-one.parsed | 10 +++ tests/vircgroupdata/cgroups1.mounts | 30 +++++++ tests/vircgroupdata/cgroups1.parsed | 10 +++ tests/vircgroupdata/cgroups2.mounts | 22 +++++ tests/vircgroupdata/cgroups2.parsed | 10 +++ tests/vircgroupdata/cgroups3.mounts | 28 ++++++ tests/vircgroupdata/cgroups3.parsed | 10 +++ tests/vircgroupdata/fedora-18.mounts | 30 +++++++ tests/vircgroupdata/fedora-18.parsed | 10 +++ tests/vircgroupdata/fedora-21.mounts | 33 +++++++ tests/vircgroupdata/fedora-21.parsed | 10 +++ tests/vircgroupdata/no-cgroups.mounts | 10 +++ tests/vircgroupdata/no-cgroups.parsed | 10 +++ tests/vircgroupdata/ovirt-node-6.6.mounts | 144 ++++++++++++++++++++++++++++++ tests/vircgroupdata/ovirt-node-6.6.parsed | 10 +++ tests/vircgroupdata/ovirt-node-7.1.mounts | 142 +++++++++++++++++++++++++++++ tests/vircgroupdata/ovirt-node-7.1.parsed | 10 +++ tests/vircgroupdata/rhel-7.1.mounts | 31 +++++++ tests/vircgroupdata/rhel-7.1.parsed | 10 +++ tests/vircgrouptest.c | 71 +++++++++++++++ 24 files changed, 666 insertions(+), 6 deletions(-) create mode 100644 tests/vircgroupdata/all-in-one.mounts create mode 100644 tests/vircgroupdata/all-in-one.parsed create mode 100644 tests/vircgroupdata/cgroups1.mounts create mode 100644 tests/vircgroupdata/cgroups1.parsed create mode 100644 tests/vircgroupdata/cgroups2.mounts create mode 100644 tests/vircgroupdata/cgroups2.parsed create mode 100644 tests/vircgroupdata/cgroups3.mounts create mode 100644 tests/vircgroupdata/cgroups3.parsed create mode 100644 tests/vircgroupdata/fedora-18.mounts create mode 100644 tests/vircgroupdata/fedora-18.parsed create mode 100644 tests/vircgroupdata/fedora-21.mounts create mode 100644 tests/vircgroupdata/fedora-21.parsed create mode 100644 tests/vircgroupdata/no-cgroups.mounts create mode 100644 tests/vircgroupdata/no-cgroups.parsed create mode 100644 tests/vircgroupdata/ovirt-node-6.6.mounts create mode 100644 tests/vircgroupdata/ovirt-node-6.6.parsed create mode 100644 tests/vircgroupdata/ovirt-node-7.1.mounts create mode 100644 tests/vircgroupdata/ovirt-node-7.1.parsed create mode 100644 tests/vircgroupdata/rhel-7.1.mounts create mode 100644 tests/vircgroupdata/rhel-7.1.parsed diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1fb42ac..ca27af4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1126,6 +1126,7 @@ virCgroupDenyAllDevices; virCgroupDenyDevice; virCgroupDenyDeviceMajor; virCgroupDenyDevicePath; +virCgroupDetectMountsFromFile; virCgroupFree; virCgroupGetBlkioIoDeviceServiced; virCgroupGetBlkioIoServiced; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e54a079..5c392ac 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -338,18 +338,19 @@ virCgroupCopyMounts(virCgroupPtr group, * Process /proc/mounts figuring out what controllers are * mounted and where */ -static int -virCgroupDetectMounts(virCgroupPtr group) +int +virCgroupDetectMountsFromFile(virCgroupPtr group, + const char *path, + bool checkLinks) { size_t i; FILE *mounts = NULL; struct mntent entry; char buf[CGROUP_MAX_VAL]; - mounts = fopen("/proc/mounts", "r"); + mounts = fopen(path, "r"); if (mounts == NULL) { - virReportSystemError(errno, "%s", - _("Unable to open /proc/mounts")); + virReportSystemError(errno, _("Unable to open %s"), path); return -1; } @@ -394,7 +395,7 @@ virCgroupDetectMounts(virCgroupPtr group) /* If it is a co-mount it has a filename like "cpu,cpuacct" * and we must identify the symlink path */ - if (strchr(tmp2 + 1, ',')) { + if (checkLinks && strchr(tmp2 + 1, ',')) { *tmp2 = '\0'; if (virAsprintf(&linksrc, "%s/%s", entry.mnt_dir, typestr) < 0) @@ -436,6 +437,12 @@ virCgroupDetectMounts(virCgroupPtr group) return -1; } +static int +virCgroupDetectMounts(virCgroupPtr group) +{ + return virCgroupDetectMountsFromFile(group, "/proc/mounts", true); +} + static int virCgroupCopyPlacement(virCgroupPtr group, diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index 582be79..722863e 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -48,4 +48,8 @@ struct virCgroup { struct virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST]; }; +int virCgroupDetectMountsFromFile(virCgroupPtr group, + const char *path, + bool checkLinks); + #endif /* __VIR_CGROUP_PRIV_H__ */ diff --git a/tests/vircgroupdata/all-in-one.mounts b/tests/vircgroupdata/all-in-one.mounts new file mode 100644 index 0000000..14093b9 --- /dev/null +++ b/tests/vircgroupdata/all-in-one.mounts @@ -0,0 +1,7 @@ +rootfs / rootfs rw 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +udev /dev devtmpfs rw,relatime,size=16458560k,nr_inodes=4114640,mode=755 0 0 +devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0 +nfsd /proc/fs/nfsd nfsd rw,relatime 0 0 +cgroup /sys/fs/cgroup cgroup rw,relatime,blkio,devices,memory,cpuacct,cpu,cpuset 0 0 diff --git a/tests/vircgroupdata/all-in-one.parsed b/tests/vircgroupdata/all-in-one.parsed new file mode 100644 index 0000000..2701778 --- /dev/null +++ b/tests/vircgroupdata/all-in-one.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup +cpuacct /sys/fs/cgroup +cpuset /sys/fs/cgroup +memory /sys/fs/cgroup +devices /sys/fs/cgroup +freezer <null> +blkio /sys/fs/cgroup +net_cls <null> +perf_event <null> +name=systemd <null> diff --git a/tests/vircgroupdata/cgroups1.mounts b/tests/vircgroupdata/cgroups1.mounts new file mode 100644 index 0000000..881463a --- /dev/null +++ b/tests/vircgroupdata/cgroups1.mounts @@ -0,0 +1,30 @@ +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=1494868,mode=755 0 0 +devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0 +/dev/mapper/root / ext4 rw,noatime,nodiratime,data=ordered 0 0 +tmpfs /run tmpfs rw,nodev,relatime,size=1202892k,mode=755 0 0 +mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0 +shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0 +cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0 +fusectl /sys/fs/fuse/connections fusectl rw,nosuid,nodev,noexec,relatime 0 0 +openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0 +cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0 +cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0 +memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +net_cls /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0 +blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +net_prio /sys/fs/cgroup/net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio 0 0 +hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +/dev/sda1 /boot ext4 ro,noatime,nodiratime 0 0 +/dev/mapper/home /home ext4 rw,noatime,nodiratime,data=ordered 0 0 +/dev/mapper/logs /var/log ext4 rw,noatime,nodiratime,data=ordered 0 0 +/dev/mapper/tmp /tmp ext4 rw,noatime,nodiratime 0 0 +/dev/mapper/images /var/lib/libvirt/images ext4 rw,noatime,nodiratime,data=ordered 0 0 +binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0 +/home/encrypted /home/decrypted ecryptfs rw,nosuid,nodev,noexec,relatime,ecryptfs_fnek_sig=abcdefabcdefabcd,ecryptfs_sig=efabcdefabcdefab,ecryptfs_cipher=aes,ecryptfs_key_bytes=32,ecryptfs_unlink_sigs 0 0 +/etc/autofs/auto.remote /mnt/remote autofs rw,relatime,fd=7,pgrp=511017,timeout=300,minproto=5,maxproto=5,indirect 0 0 diff --git a/tests/vircgroupdata/cgroups1.parsed b/tests/vircgroupdata/cgroups1.parsed new file mode 100644 index 0000000..b6916f1 --- /dev/null +++ b/tests/vircgroupdata/cgroups1.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu +cpuacct /sys/fs/cgroup/cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls +perf_event <null> +name=systemd <null> diff --git a/tests/vircgroupdata/cgroups2.mounts b/tests/vircgroupdata/cgroups2.mounts new file mode 100644 index 0000000..21ab867 --- /dev/null +++ b/tests/vircgroupdata/cgroups2.mounts @@ -0,0 +1,22 @@ +rootfs / rootfs rw 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=1006404,mode=755 0 0 +devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0 +/dev/sda1 / ext4 rw,noatime,data=ordered 0 0 +tmpfs /run tmpfs rw,nodev,relatime,size=812296k,mode=755 0 0 +mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0 +shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0 +cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0 +openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0 +cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0 +cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0 +memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0 diff --git a/tests/vircgroupdata/cgroups2.parsed b/tests/vircgroupdata/cgroups2.parsed new file mode 100644 index 0000000..5eb2bc7 --- /dev/null +++ b/tests/vircgroupdata/cgroups2.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu +cpuacct /sys/fs/cgroup/cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls <null> +perf_event /sys/fs/cgroup/perf_event +name=systemd <null> diff --git a/tests/vircgroupdata/cgroups3.mounts b/tests/vircgroupdata/cgroups3.mounts new file mode 100644 index 0000000..6d80e04 --- /dev/null +++ b/tests/vircgroupdata/cgroups3.mounts @@ -0,0 +1,28 @@ +/dev/rootvg/root / ext4 rw,noatime,data=ordered 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +tmpfs /run tmpfs rw,nosuid,nodev,noexec,relatime,mode=755 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0 +dev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=2039630,mode=755 0 0 +securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0 +mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0 +configfs /sys/kernel/config configfs rw,nosuid,nodev,noexec,relatime 0 0 +devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0 +cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0 +tmpfs /dev/shm tmpfs rw,relatime 0 0 +fusectl /sys/fs/fuse/connections fusectl rw,nosuid,nodev,noexec,relatime 0 0 +efivarfs /sys/firmware/efi/efivars efivarfs rw,nosuid,nodev,noexec,relatime 0 0 +openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0 +cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0 +cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0 +memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +net_cls /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0 +blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +net_prio /sys/fs/cgroup/net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio 0 0 +hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +tmpfs /tmp tmpfs rw,nosuid,noexec,relatime,size=3278448k 0 0 +binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0 diff --git a/tests/vircgroupdata/cgroups3.parsed b/tests/vircgroupdata/cgroups3.parsed new file mode 100644 index 0000000..2b1f382 --- /dev/null +++ b/tests/vircgroupdata/cgroups3.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu +cpuacct /sys/fs/cgroup/cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls +perf_event /sys/fs/cgroup/perf_event +name=systemd <null> diff --git a/tests/vircgroupdata/fedora-18.mounts b/tests/vircgroupdata/fedora-18.mounts new file mode 100644 index 0000000..dfe2852 --- /dev/null +++ b/tests/vircgroupdata/fedora-18.mounts @@ -0,0 +1,30 @@ +rootfs / rootfs rw 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0 +devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=2006080k,nr_inodes=501520,mode=755 0 0 +securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0 +selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0 +tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0 +devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0 +tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0 +tmpfs /sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,mode=755 0 0 +cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0 +cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 +cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0 +cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +/dev/vda1 / ext4 rw,seclabel,relatime,data=ordered 0 0 +rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 +systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=27,pgrp=1,timeout=300,minproto=5,maxproto=5,direct 0 0 +mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0 +tmpfs /tmp tmpfs rw,seclabel 0 0 +debugfs /sys/kernel/debug debugfs rw,relatime 0 0 +hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0 +configfs /sys/kernel/config configfs rw,relatime 0 0 +192.168.122.1:/home/qemu /home/qemu nfs rw,relatime,vers=3,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,timeo=600,retrans=2,sec=sys,mountaddr=192.168.122.1,mountvers=3,mountport=20048,mountproto=udp,local_lock=none,addr=192.168.122.1 0 0 +192.168.122.1:/var/lib/libvirt/images /var/lib/libvirt/images nfs rw,relatime,vers=3,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,timeo=600,retrans=2,sec=sys,mountaddr=192.168.122.1,mountvers=3,mountport=20048,mountproto=udp,local_lock=none,addr=192.168.122.1 0 0 diff --git a/tests/vircgroupdata/fedora-18.parsed b/tests/vircgroupdata/fedora-18.parsed new file mode 100644 index 0000000..8d5ba75 --- /dev/null +++ b/tests/vircgroupdata/fedora-18.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu,cpuacct +cpuacct /sys/fs/cgroup/cpu,cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls +perf_event /sys/fs/cgroup/perf_event +name=systemd /sys/fs/cgroup/systemd diff --git a/tests/vircgroupdata/fedora-21.mounts b/tests/vircgroupdata/fedora-21.mounts new file mode 100644 index 0000000..dfa0a0f --- /dev/null +++ b/tests/vircgroupdata/fedora-21.mounts @@ -0,0 +1,33 @@ +rootfs / rootfs rw,seclabel 0 0 +sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=2013724k,nr_inodes=503431,mode=755 0 0 +securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0 +tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0 +devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0 +tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0 +tmpfs /sys/fs/cgroup tmpfs ro,seclabel,nosuid,nodev,noexec,mode=755 0 0 +cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0 +cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpu,cpuacct 0 0 +cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /sys/fs/cgroup/net_cls,net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_cls,net_prio 0 0 +cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +configfs /sys/kernel/config configfs rw,relatime 0 0 +/dev/vda2 / ext4 rw,seclabel,relatime,data=ordered 0 0 +selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0 +systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=28,pgrp=1,timeout=300,minproto=5,maxproto=5,direct 0 0 +hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0 +mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,relatime 0 0 +tmpfs /tmp tmpfs rw,seclabel 0 0 +sunrpc /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 +nfsd /proc/fs/nfsd nfsd rw,relatime 0 0 +/dev/vda1 /boot ext4 rw,seclabel,relatime,data=ordered 0 0 +tmpfs /run/user/1000 tmpfs rw,seclabel,nosuid,nodev,relatime,size=404756k,mode=700,uid=1000,gid=1000 0 0 +tmpfs /run/user/0 tmpfs rw,seclabel,nosuid,nodev,relatime,size=404756k,mode=700 0 0 diff --git a/tests/vircgroupdata/fedora-21.parsed b/tests/vircgroupdata/fedora-21.parsed new file mode 100644 index 0000000..3377af0 --- /dev/null +++ b/tests/vircgroupdata/fedora-21.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu,cpuacct +cpuacct /sys/fs/cgroup/cpu,cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls,net_prio +perf_event /sys/fs/cgroup/perf_event +name=systemd /sys/fs/cgroup/systemd diff --git a/tests/vircgroupdata/no-cgroups.mounts b/tests/vircgroupdata/no-cgroups.mounts new file mode 100644 index 0000000..8173e41 --- /dev/null +++ b/tests/vircgroupdata/no-cgroups.mounts @@ -0,0 +1,10 @@ +rootfs / rootfs rw 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +udev /dev devtmpfs rw,relatime,size=10240k,nr_inodes=256016,mode=755 0 0 +devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0 +tmpfs /run tmpfs rw,nosuid,noexec,relatime,size=206096k,mode=755 0 0 +/dev/disk/by-uuid/e5690604-413c-4782-ab67-b3678cea9f80 / ext4 rw,relatime,errors=remount-ro,user_xattr,barrier=1,data=ordered 0 0 +tmpfs /run/lock tmpfs rw,nosuid,nodev,noexec,relatime,size=5120k 0 0 +tmpfs /run/shm tmpfs rw,nosuid,nodev,noexec,relatime,size=549800k 0 0 +rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 diff --git a/tests/vircgroupdata/no-cgroups.parsed b/tests/vircgroupdata/no-cgroups.parsed new file mode 100644 index 0000000..bf4eea0 --- /dev/null +++ b/tests/vircgroupdata/no-cgroups.parsed @@ -0,0 +1,10 @@ +cpu <null> +cpuacct <null> +cpuset <null> +memory <null> +devices <null> +freezer <null> +blkio <null> +net_cls <null> +perf_event <null> +name=systemd <null> diff --git a/tests/vircgroupdata/ovirt-node-6.6.mounts b/tests/vircgroupdata/ovirt-node-6.6.mounts new file mode 100644 index 0000000..ef07f4f --- /dev/null +++ b/tests/vircgroupdata/ovirt-node-6.6.mounts @@ -0,0 +1,144 @@ +rootfs / rootfs rw 0 0 +proc /proc proc rw,relatime 0 0 +sysfs /sys sysfs rw,seclabel,relatime 0 0 +devtmpfs /dev devtmpfs rw,seclabel,relatime,size=132240744k,nr_inodes=33060186,mode=755 0 0 +devpts /dev/pts devpts rw,seclabel,relatime,gid=5,mode=620,ptmxmode=000 0 0 +tmpfs /dev/shm tmpfs rw,seclabel,relatime 0 0 +/dev/sdi2 /dev/.initramfs/live ext2 ro,seclabel,relatime,errors=continue 0 0 +/dev/mapper/live-rw / ext2 ro,seclabel,relatime,errors=continue,user_xattr,acl 0 0 +none /selinux selinuxfs rw,relatime 0 0 +devtmpfs /dev devtmpfs rw,seclabel,relatime,size=132240744k,nr_inodes=33060186,mode=755 0 0 +/proc/bus/usb /proc/bus/usb usbfs rw,relatime 0 0 +none /var/lib/stateless/writable tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/man tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lock tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/log tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/run tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/dbus tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/nfs tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /tmp tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/hald tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/dhclient tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/tmp tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /media tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/iscsi tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/logrotate.status tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/ntp tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/random-seed tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/spool tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /etc tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/net-snmp tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/dnsmasq tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /root/.ssh tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /root/.uml tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/libvirt tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/libvirt tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/multipathd tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /mnt tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /boot tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /boot-kdump tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /cgroup tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/yum tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/yum tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /usr/share/snmp/mibs tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/lldpad tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/rpcbind tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /usr/share/snmp/mibs tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/lldpad tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/rpcbind tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/cache/rhn tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/db tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /usr/libexec/vdsm/hooks tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /var/lib/vdsm tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +none /rhev/data-center tmpfs rw,rootcontext=system_u:object_r:var_lib_t:s0,seclabel,relatime 0 0 +/dev/mapper/HostVG-Config /config ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/fstab ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/shadow ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/default/ovirt ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/rsyslog.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/passwd.db ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/passwd ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/qemu/networks ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/sshd_config ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/pki ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/iscsi/initiatorname.iscsi ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/random-seed ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/keyboard ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/iptables ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/resolv.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ntp.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/hosts ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/shadow ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/vdsm/vdsm.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/vdsm-reg/vdsm-reg.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-lo ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/multipath.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/shadow ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/virt-who ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/vdsm/persistence ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +tmpfs /dev/shm tmpfs rw,rootcontext=system_u:object_r:tmpfs_t:s0,seclabel,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,relatime 0 0 +/dev/mapper/HostVG-Logging /var/log ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +/dev/mapper/HostVG-Data /data ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/lib/libvirt/images ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/log/core ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +none /proc/sys/fs/binfmt_misc binfmt_misc rw,relatime 0 0 +/dev/mapper/HostVG-Logging /tmp/early-logs ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_key ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_key.pub ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_dsa_key ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_dsa_key.pub ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_rsa_key ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_rsa_key.pub ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/udev/rules.d/71-persistent-node-net.rules ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/vdsm/vdsm.id ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/udev/rules.d/12-ovirt-iosched.rules ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /root/.ssh/authorized_keys ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/vdsm/upgrade/upgrade-unified-persistence ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.11 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.100 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.200 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.21 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.3 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.31 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.4 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.41 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.5 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.51 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.6 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-eth0 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-eth1 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-eth2 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-eth3 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-rhevm ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_info ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_migration ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_servers ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_test ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_views ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_vms_ant ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_vms_lim ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_vms_ovl ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_vms_vlb ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_vms_wvl ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-bond0.10 ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-vnet_personeel ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +tmpfs /dev/shm tmpfs rw,rootcontext=system_u:object_r:tmpfs_t:s0,seclabel,relatime 0 0 +/dev/mapper/HostVG-Data /var/lib/libvirt/images ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/log/core ext4 rw,seclabel,noatime,barrier=0,stripe=64,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/libvirtd.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/libvirtd ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/qemu.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/qemu-sanlock.conf ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/logrotate.d/libvirtd ext4 rw,seclabel,noatime,barrier=0,stripe=256,data=ordered 0 0 +cgroup /cgroup/cpuset cgroup rw,relatime,cpuset 0 0 +cgroup /cgroup/cpu cgroup rw,relatime,cpu 0 0 +cgroup /cgroup/cpuacct cgroup rw,relatime,cpuacct 0 0 +cgroup /cgroup/memory cgroup rw,relatime,memory 0 0 +cgroup /cgroup/devices cgroup rw,relatime,devices 0 0 +cgroup /cgroup/freezer cgroup rw,relatime,freezer 0 0 +cgroup /cgroup/net_cls cgroup rw,relatime,net_cls 0 0 +cgroup /cgroup/blkio cgroup rw,relatime,blkio 0 0 +sunrpc /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 diff --git a/tests/vircgroupdata/ovirt-node-6.6.parsed b/tests/vircgroupdata/ovirt-node-6.6.parsed new file mode 100644 index 0000000..01bf466 --- /dev/null +++ b/tests/vircgroupdata/ovirt-node-6.6.parsed @@ -0,0 +1,10 @@ +cpu /cgroup/cpu +cpuacct /cgroup/cpuacct +cpuset /cgroup/cpuset +memory /cgroup/memory +devices /cgroup/devices +freezer /cgroup/freezer +blkio /cgroup/blkio +net_cls /cgroup/net_cls +perf_event <null> +name=systemd <null> diff --git a/tests/vircgroupdata/ovirt-node-7.1.mounts b/tests/vircgroupdata/ovirt-node-7.1.mounts new file mode 100644 index 0000000..74f7db9 --- /dev/null +++ b/tests/vircgroupdata/ovirt-node-7.1.mounts @@ -0,0 +1,142 @@ +rootfs / rootfs rw 0 0 +proc /proc proc rw,relatime 0 0 +sysfs /sys sysfs rw,seclabel,relatime 0 0 +devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=3922156k,nr_inodes=980539,mode=755 0 0 +securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0 +tmpfs /dev/shm tmpfs rw,seclabel,relatime 0 0 +devpts /dev/pts devpts rw,seclabel,relatime,gid=5,mode=620,ptmxmode=000 0 0 +tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0 +tmpfs /sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,mode=755 0 0 +cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0 +cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 +cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0 +cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +configfs /sys/kernel/config configfs rw,relatime 0 0 +/dev/sda3 /run/initramfs/live ext2 ro,seclabel,relatime 0 0 +/dev/mapper/live-rw / ext2 ro,seclabel,noatime 0 0 +rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 +selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0 +systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=33,pgrp=1,timeout=300,minproto=5,maxproto=5,direct 0 0 +mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0 +hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,relatime 0 0 +none /var/lib/stateless/writable tmpfs rw,seclabel,relatime 0 0 +none /var/cache/man tmpfs rw,seclabel,relatime 0 0 +none /var/log tmpfs rw,seclabel,relatime 0 0 +none /var/lib/dbus tmpfs rw,seclabel,relatime 0 0 +none /tmp tmpfs rw,seclabel,relatime 0 0 +none /var/lib/dhclient tmpfs rw,seclabel,relatime 0 0 +none /var/tmp tmpfs rw,seclabel,relatime 0 0 +none /var/lib/iscsi tmpfs rw,seclabel,relatime 0 0 +none /var/lib/logrotate.status tmpfs rw,seclabel,relatime 0 0 +none /var/lib/ntp tmpfs rw,seclabel,relatime 0 0 +none /var/lib/random-seed tmpfs rw,seclabel,relatime 0 0 +none /var/spool tmpfs rw,seclabel,relatime 0 0 +none /var/lib/nfs tmpfs rw,seclabel,relatime 0 0 +none /var/lib/ovirt-hosted-engine-setup tmpfs rw,seclabel,relatime 0 0 +none /etc tmpfs rw,seclabel,relatime 0 0 +none /var/lib/net-snmp tmpfs rw,seclabel,relatime 0 0 +none /var/lib/dnsmasq tmpfs rw,seclabel,relatime 0 0 +none /root/.ssh tmpfs rw,seclabel,relatime 0 0 +none /root/.uml tmpfs rw,seclabel,relatime 0 0 +none /var/cache/libvirt tmpfs rw,seclabel,relatime 0 0 +none /var/lib/libvirt tmpfs rw,seclabel,relatime 0 0 +none /var/cache/multipathd tmpfs rw,seclabel,relatime 0 0 +none /mnt tmpfs rw,seclabel,relatime 0 0 +none /boot tmpfs rw,seclabel,relatime 0 0 +none /boot-kdump tmpfs rw,seclabel,relatime 0 0 +none /var/lib/yum tmpfs rw,seclabel,relatime 0 0 +none /var/cache/yum tmpfs rw,seclabel,relatime 0 0 +none /usr/share/snmp/mibs tmpfs rw,seclabel,relatime 0 0 +none /var/lib/lldpad tmpfs rw,seclabel,relatime 0 0 +none /usr/share/snmp/mibs tmpfs rw,seclabel,relatime 0 0 +none /var/lib/stateless/writable/usr/share/snmp/mibs tmpfs rw,seclabel,relatime 0 0 +none /var/lib/lldpad tmpfs rw,seclabel,relatime 0 0 +none /var/lib/stateless/writable/var/lib/lldpad tmpfs rw,seclabel,relatime 0 0 +none /var/cache/rhn tmpfs rw,seclabel,relatime 0 0 +none /var/db tmpfs rw,seclabel,relatime 0 0 +none /usr/libexec/vdsm/hooks tmpfs rw,seclabel,relatime 0 0 +none /var/lib/vdsm tmpfs rw,seclabel,relatime 0 0 +none /rhev/data-center tmpfs rw,seclabel,relatime 0 0 +none /var/lib/dhclient tmpfs rw,seclabel,relatime 0 0 +none /var/lib/stateless/writable/var/lib/dhclient tmpfs rw,seclabel,relatime 0 0 +/dev/mapper/HostVG-Config /config ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/fstab ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/fstab ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/hosts ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/hosts ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/sysconfig/network ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-lo ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/sysconfig/network-scripts/ifcfg-lo ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/resolv.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/resolv.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ntp.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ntp.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/sshd_config ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/sshd_config ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/kdump.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/kdump.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/default/ovirt ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/default/ovirt ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/rsyslog.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/rsyslog.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/passwd.db ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/libvirt/passwd.db ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/qemu ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/libvirt/qemu ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/pki ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/pki ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/iscsi/initiatorname.iscsi ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/iscsi/initiatorname.iscsi ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/random-seed ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/var/lib/random-seed ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/glusterd ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/virt-who ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/sysconfig/virt-who ext4 rw,seclabel,noatime,data=ordered 0 0 +sunrpc /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 +sunrpc /var/lib/stateless/writable/var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 +none /tmp/early-logs tmpfs rw,seclabel,relatime 0 0 +none /var/lib/stateless/writable/tmp/early-logs tmpfs rw,seclabel,relatime 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/network-scripts/ifcfg-em1 ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/sysconfig/network-scripts/ifcfg-em1 ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_rsa_key ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/ssh_host_rsa_key ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_rsa_key.pub ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/ssh_host_rsa_key.pub ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_ecdsa_key ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/ssh_host_ecdsa_key ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_ecdsa_key.pub ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/ssh_host_ecdsa_key.pub ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_ed25519_key ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/ssh_host_ed25519_key ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/ssh/ssh_host_ed25519_key.pub ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/ssh/ssh_host_ed25519_key.pub ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Logging /var/log ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Logging /var/lib/stateless/writable/tmp/early-logs ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Logging /var/lib/stateless/writable/var/log ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Data /data ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/lib/libvirt/images ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/lib/stateless/writable/var/lib/libvirt/images ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/log/core ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/lib/stateless/writable/tmp/early-logs/core ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Data /var/lib/stateless/writable/var/log/core ext4 rw,seclabel,noatime,data=ordered 0 0 +tmpfs /dev/.initramfs tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0 +/dev/sda3 /dev/.initramfs/live ext2 ro,seclabel,relatime 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/libvirtd.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/libvirt/libvirtd.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/sysconfig/libvirtd ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/sysconfig/libvirtd ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/qemu.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/libvirt/qemu.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/libvirt/qemu-sanlock.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/libvirt/qemu-sanlock.conf ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /etc/logrotate.d/libvirtd ext4 rw,seclabel,noatime,data=ordered 0 0 +/dev/mapper/HostVG-Config /var/lib/stateless/writable/etc/logrotate.d/libvirtd ext4 rw,seclabel,noatime,data=ordered 0 0 diff --git a/tests/vircgroupdata/ovirt-node-7.1.parsed b/tests/vircgroupdata/ovirt-node-7.1.parsed new file mode 100644 index 0000000..8d5ba75 --- /dev/null +++ b/tests/vircgroupdata/ovirt-node-7.1.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu,cpuacct +cpuacct /sys/fs/cgroup/cpu,cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls +perf_event /sys/fs/cgroup/perf_event +name=systemd /sys/fs/cgroup/systemd diff --git a/tests/vircgroupdata/rhel-7.1.mounts b/tests/vircgroupdata/rhel-7.1.mounts new file mode 100644 index 0000000..1d6aaea --- /dev/null +++ b/tests/vircgroupdata/rhel-7.1.mounts @@ -0,0 +1,31 @@ +rootfs / rootfs rw 0 0 +proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0 +sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0 +devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=3038192k,nr_inodes=759548,mode=755 0 0 +securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0 +tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0 +devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0 +tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0 +tmpfs /sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,mode=755 0 0 +cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0 +cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 +cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0 +cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +configfs /sys/kernel/config configfs rw,relatime 0 0 +/dev/sda7 / ext4 rw,seclabel,relatime,data=ordered 0 0 +selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0 +systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=36,pgrp=1,timeout=300,minproto=5,maxproto=5,direct 0 0 +mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0 +debugfs /sys/kernel/debug debugfs rw,relatime 0 0 +hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0 +sunrpc /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0 +nfsd /proc/fs/nfsd nfsd rw,relatime 0 0 +/dev/sda4 /home ext4 rw,seclabel,relatime,data=ordered 0 0 +colossus:/data/nfsroot /virt-nfs nfs4 rw,relatime,vers=4.0,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=1.2.3.4,local_lock=none,addr=1.2.3.5 0 0 diff --git a/tests/vircgroupdata/rhel-7.1.parsed b/tests/vircgroupdata/rhel-7.1.parsed new file mode 100644 index 0000000..8d5ba75 --- /dev/null +++ b/tests/vircgroupdata/rhel-7.1.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu,cpuacct +cpuacct /sys/fs/cgroup/cpu,cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls +perf_event /sys/fs/cgroup/perf_event +name=systemd /sys/fs/cgroup/systemd diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index cc1825b..efad77d 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -158,6 +158,58 @@ const char *linksLogind[VIR_CGROUP_CONTROLLER_LAST] = { }; +static int +testCgroupDetectMounts(const void *args) +{ + int result = -1; + const char *file = args; + char *mounts = NULL; + char *parsed = NULL; + char *expected = NULL; + const char *actual; + virCgroupPtr group = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + if (virAsprintf(&mounts, "%s/vircgroupdata/%s.mounts", + abs_srcdir, file) < 0 || + virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", + abs_srcdir, file) < 0 || + VIR_ALLOC(group) < 0) + goto cleanup; + + if (virCgroupDetectMountsFromFile(group, mounts, false) < 0) + goto cleanup; + + if (virtTestLoadFile(parsed, &expected) < 0) + goto cleanup; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + virBufferAsprintf(&buf, "%-12s %s\n", + virCgroupControllerTypeToString(i), + NULLSTR(group->controllers[i].mountPoint)); + } + if (virBufferCheckError(&buf) < 0) + goto cleanup; + + actual = virBufferCurrentContent(&buf); + if (STRNEQ(expected, actual)) { + virtTestDifference(stderr, expected, actual); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(mounts); + VIR_FREE(parsed); + VIR_FREE(expected); + virCgroupFree(&group); + virBufferFreeAndReset(&buf); + return result; +} + + static int testCgroupNewForSelf(const void *args ATTRIBUTE_UNUSED) { virCgroupPtr cgroup = NULL; @@ -793,6 +845,25 @@ mymain(void) setenv("LIBVIRT_FAKE_SYSFS_DIR", fakesysfsdir, 1); +# define DETECT_MOUNTS(file) \ + do { \ + if (virtTestRun("Detect cgroup mounts for " file, \ + testCgroupDetectMounts, \ + file) < 0) \ + ret = -1; \ + } while (0) + + DETECT_MOUNTS("ovirt-node-6.6"); + DETECT_MOUNTS("ovirt-node-7.1"); + DETECT_MOUNTS("fedora-18"); + DETECT_MOUNTS("fedora-21"); + DETECT_MOUNTS("rhel-7.1"); + DETECT_MOUNTS("cgroups1"); + DETECT_MOUNTS("cgroups2"); + DETECT_MOUNTS("cgroups3"); + DETECT_MOUNTS("all-in-one"); + DETECT_MOUNTS("no-cgroups"); + if (virtTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0) ret = -1; -- 2.3.3

2 2

[libvirt] [PATCH v3 0/7] bridge network support enhancement and other network fixes
by Maxim Nestratov 18 Mar '15

18 Mar '15

v3 change: Addressed Michal Privoznik's comments Maxim Nestratov (7): parallels: introduce and use string constants for network types and names parallels: fix parallelsLoadNetworks parallels: better bridge network interface support parallels: set correct network adapter device state parallels: make E1000 network adapter model default parallels: switch off offline management feature parallels: don't prevent domain define if VIR_DOMAIN_NET_TYPE_BRIDGE

1 9

[libvirt] [libvirt-test-API][PATCH v2 0/2] Add test cases for setTime and getTime
by Jincheng Miao 18 Mar '15

18 Mar '15

create some test cases for libvirt-python API setTime and getTime v2: user should pass 'seconds' to set_guest_time, and 'nseconds' is optional. Jincheng Miao (2): Add guest setTime and getTime testing Add test cases for linux_domain cases/linux_domain.conf | 30 ++++++++++ repos/domain/guest_time.py | 98 ++++++++++++++++++++++++++++++++ repos/domain/set_guest_time.py | 122 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 250 insertions(+), 0 deletions(-) create mode 100644 repos/domain/guest_time.py create mode 100644 repos/domain/set_guest_time.py

3 5