- Devel - libvirt List Archives

[libvirt] [PATCH] Fix typo in error message
by Ján Tomko 23 Mar '15

23 Mar '15

by rewriting it completely from: error: unsupported configuration: virtio only support device address type 'PCI' to: error: unsupported configuration: virtio disk cannot have an address of type drive Since we now support CCW addresses as well. --- src/qemu/qemu_command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63d43d4..a747eb4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2423,8 +2423,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, continue; if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio only support device address type 'PCI'")); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("virtio disk cannot have an address of type %s"), + virDomainDeviceAddressTypeToString(def->disks[i]->info.type)); goto error; } -- 2.0.5

3 2

[libvirt] [PATCH] qemu: Set default SCSI controller model for S390 arch
by Boris Fiuczynski 23 Mar '15

23 Mar '15

When no model is specified in the domain definition for a scsi controller and the architectur is s390 than virtio-scsi is set as default model. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 41d1263..949bf8b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1148,6 +1148,13 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ARCH_IS_S390(def->os.arch)) dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; + /* set the default SCSI controller model for S390 arches */ + if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER && + dev->data.controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + dev->data.controller->model == -1 && + ARCH_IS_S390(def->os.arch)) + dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; + /* auto generate unix socket path */ if (dev->type == VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && -- 2.3.0

3 2

[libvirt] lifecycle: shutdown: should it have timeout when using qemu-agent?
by zhang bo 23 Mar '15

23 Mar '15

The problem we encountered is: 1) use qemu-agent to shutdown a domain. 2) libvirt will block in "qemuAgentShutdown()", if the domain itself got stucked when it powers-off. It's the *guest domain*'s fault that it stucks when shutdown. However, we could not handle the domain in libvirt anymore, except for the jobs such as DESTROY or QUERY. So, here comes the question: What's the normal solution to this problem? shall we: 1) use DESTROY to forcelly poweroff the domain, in openstack or other applications that uses libvirt. or 2) leave it to the administrator users, if they find this problem, let them manually DESTROY the domain. or 3) let SHUTDOWN timeout in libvirt when the guest domain got stucked. Looking forward to your reply, thanks in advance.

2 1

[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