- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] docs: move locations of 'send-key' and 'echo' command descriptions in virsh(1)
by Satoru SATOH 26 Dec '11

26 Dec '11

It seems that both 'send-key' and 'echo' command descriptions in virsh man page are put in wrong sections and the following patches fix these. -- Thanks, Satoru SATOH

2 4

[libvirt] [PATCH] qemu: Keep list of USB devices attached to domains
by Michal Privoznik 24 Dec '11

24 Dec '11

In order to avoid situation where a USB device is in use by two domains, we must keep a list of already attached devices like we do for PCI. --- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 4 + src/qemu/qemu_hostdev.c | 92 ++++++++++++++++++++++++++++-- src/qemu/qemu_hostdev.h | 4 + src/qemu/qemu_hotplug.c | 17 +++++- src/util/hostusb.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/hostusb.h | 18 ++++++ 7 files changed, 269 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index f5a0f60..d8d7915 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -36,6 +36,7 @@ # include "security/security_manager.h" # include "cgroup.h" # include "pci.h" +# include "hostusb.h" # include "cpu_conf.h" # include "driver.h" # include "bitmap.h" @@ -125,6 +126,7 @@ struct qemud_driver { bool autoStartBypassCache; pciDeviceList *activePciHostdevs; + usbDeviceList *activeUsbHostdevs; virBitmapPtr reservedVNCPorts; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c908135..eeeb935 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -583,6 +583,9 @@ qemudStartup(int privileged) { if ((qemu_driver->activePciHostdevs = pciDeviceListNew()) == NULL) goto error; + if ((qemu_driver->activeUsbHostdevs = usbDeviceListNew()) == NULL) + goto error; + if (privileged) { if (chown(qemu_driver->libDir, qemu_driver->user, qemu_driver->group) < 0) { virReportSystemError(errno, @@ -773,6 +776,7 @@ qemudShutdown(void) { qemuDriverLock(qemu_driver); pciDeviceListFree(qemu_driver->activePciHostdevs); + usbDeviceListFree(qemu_driver->activeUsbHostdevs); virCapabilitiesFree(qemu_driver->caps); virDomainObjListDeinit(&qemu_driver->domains); diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 60401f0..c7adb1d 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -314,13 +314,30 @@ qemuPrepareHostPCIDevices(struct qemud_driver *driver, } -static int -qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED, - virDomainDefPtr def) +int +qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, + const char *name, + virDomainHostdevDefPtr *hostdevs, + int nhostdevs) { + int ret = -1; int i; - for (i = 0 ; i < def->nhostdevs ; i++) { - virDomainHostdevDefPtr hostdev = def->hostdevs[i]; + usbDeviceList *list; + usbDevice *tmp; + + /* To prevent situation where USB device is assigned to two domains + * we need to keep a list of currently assigned USB devices. + * This is done in several loops which cannot be joined into one big + * loop. See qemuPrepareHostdevPCIDevices() + */ + if (!(list = usbDeviceListNew())) + goto cleanup; + + /* Loop 1: build temporary list and validate no usb device + * is already taken + */ + for (i = 0 ; i < nhostdevs ; i++) { + virDomainHostdevDefPtr hostdev = hostdevs[i]; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) continue; @@ -339,13 +356,74 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED, hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb); hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb); - usbFreeDevice(usb); + if ((tmp = usbDeviceListFind(driver->activeUsbHostdevs, usb))) { + const char *other_name = usbDeviceGetUsedBy(tmp); + + if (other_name) + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("USB device %s is in use by domain %s"), + usbDeviceGetName(tmp), other_name); + else + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("USB device %s is already in use"), + usbDeviceGetName(tmp)); + usbFreeDevice(usb); + goto cleanup; + } + + if (usbDeviceListAdd(list, usb) < 0) { + usbFreeDevice(usb); + goto cleanup; + } + } } - return 0; + /* Loop 2: Mark devices in temporary list as used by @name + * and add them do driver list. However, if something goes + * wrong, perform rollback. + */ + for (i = 0; i < usbDeviceListCount(list); i++) { + tmp = usbDeviceListGet(list, i); + usbDeviceSetUsedBy(tmp, name); + if (usbDeviceListAdd(driver->activeUsbHostdevs, tmp) < 0) { + usbFreeDevice(tmp); + goto inactivedevs; + } + } + + /* Loop 3: Temporary list was successfully merged with + * driver list, so steal all items to avoid freeing them + * in cleanup label. + */ + while (usbDeviceListCount(list) > 0) { + tmp = usbDeviceListGet(list, 0); + usbDeviceListSteal(list, tmp); + } + + ret = 0; + goto cleanup; + +inactivedevs: + /* Steal devices from driver->activeUsbHostdevs. + * We will free them later. + */ + for (i = 0; i < usbDeviceListCount(list); i++) { + tmp = usbDeviceListGet(list, i); + usbDeviceListSteal(driver->activeUsbHostdevs, tmp); + } + +cleanup: + usbDeviceListFree(list); + return ret; } +static int +qemuPrepareHostUSBDevices(struct qemud_driver *driver, + virDomainDefPtr def) +{ + return qemuPrepareHostdevUSBDevices(driver, def->name, def->hostdevs, def->nhostdevs); +} int qemuPrepareHostDevices(struct qemud_driver *driver, virDomainDefPtr def) diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 07d7de2..d852f5b 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -33,6 +33,10 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); +int qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, + const char *name, + virDomainHostdevDefPtr *hostdevs, + int nhostdevs); int qemuPrepareHostDevices(struct qemud_driver *driver, virDomainDefPtr def); void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4067bb0..f3597a1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1097,6 +1097,9 @@ int qemuDomainAttachHostDevice(struct qemud_driver *driver, /* Resolve USB product/vendor to bus/device */ if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && hostdev->source.subsys.u.usb.vendor) { + if (qemuPrepareHostdevUSBDevices(driver, vm->def->name, &hostdev, 1) < 0) + goto error; + usbDevice *usb = usbFindDevice(hostdev->source.subsys.u.usb.vendor, hostdev->source.subsys.u.usb.product); @@ -2068,6 +2071,7 @@ qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, { virDomainHostdevDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; + usbDevice *usb; int i, ret; for (i = 0 ; i < vm->def->nhostdevs ; i++) { @@ -2123,6 +2127,17 @@ qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, if (ret < 0) return -1; + usb = usbGetDevice(detach->source.subsys.u.usb.bus, + detach->source.subsys.u.usb.device); + if (usb) { + usbDeviceListDel(driver->activeUsbHostdevs, usb); + usbFreeDevice(usb); + } else { + VIR_WARN("Unable to find device %03d.%03d in list of used USB devices", + detach->source.subsys.u.usb.bus, + detach->source.subsys.u.usb.device); + } + if (vm->def->nhostdevs > 1) { memmove(vm->def->hostdevs + i, vm->def->hostdevs + i + 1, @@ -2162,7 +2177,7 @@ int qemuDomainDetachHostDevice(struct qemud_driver *driver, switch (hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: ret = qemuDomainDetachHostPciDevice(driver, vm, dev, &detach); - break; + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: ret = qemuDomainDetachHostUsbDevice(driver, vm, dev, &detach); break; diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 1669e2f..92f52a2 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -49,6 +49,12 @@ struct _usbDevice { char name[USB_ADDR_LEN]; /* domain:bus:slot.function */ char id[USB_ID_LEN]; /* product vendor */ char *path; + const char *used_by; /* name of the domain using this dev */ +}; + +struct _usbDeviceList { + unsigned int count; + usbDevice **devs; }; /* For virReportOOMError() and virReportSystemError() */ @@ -225,6 +231,22 @@ usbFreeDevice(usbDevice *dev) } +void usbDeviceSetUsedBy(usbDevice *dev, + const char *name) +{ + dev->used_by = name; +} + +const char * usbDeviceGetUsedBy(usbDevice *dev) +{ + return dev->used_by; +} + +const char *usbDeviceGetName(usbDevice *dev) +{ + return dev->name; +} + unsigned usbDeviceGetBus(usbDevice *dev) { return dev->bus; @@ -243,3 +265,121 @@ int usbDeviceFileIterate(usbDevice *dev, { return (actor)(dev, dev->path, opaque); } + +usbDeviceList * +usbDeviceListNew(void) +{ + usbDeviceList *list; + + if (VIR_ALLOC(list) < 0) { + virReportOOMError(); + return NULL; + } + + return list; +} + +void +usbDeviceListFree(usbDeviceList *list) +{ + int i; + + if (!list) + return; + + for (i = 0; i < list->count; i++) + usbFreeDevice(list->devs[i]); + + VIR_FREE(list->devs); + VIR_FREE(list); +} + +int +usbDeviceListAdd(usbDeviceList *list, + usbDevice *dev) +{ + if (usbDeviceListFind(list, dev)) { + usbReportError(VIR_ERR_INTERNAL_ERROR, + _("Device %s is already in use"), + dev->name); + return -1; + } + + if (VIR_REALLOC_N(list->devs, list->count+1) < 0) { + virReportOOMError(); + return -1; + } + + list->devs[list->count++] = dev; + + return 0; +} + +usbDevice * +usbDeviceListGet(usbDeviceList *list, + int idx) +{ + if (idx >= list->count || + idx < 0) + return NULL; + + return list->devs[idx]; +} + +int +usbDeviceListCount(usbDeviceList *list) +{ + return list->count; +} + +usbDevice * +usbDeviceListSteal(usbDeviceList *list, + usbDevice *dev) +{ + usbDevice *ret = NULL; + int i; + + for (i = 0; i < list->count; i++) { + if (list->devs[i]->bus != dev->bus || + list->devs[i]->dev != dev->dev) + continue; + + ret = list->devs[i]; + + if (i != list->count--) + memmove(&list->devs[i], + &list->devs[i+1], + sizeof(*list->devs) * (list->count - i)); + + if (VIR_REALLOC_N(list->devs, list->count) < 0) { + ; /* not fatal */ + } + + break; + } + return ret; +} + +void +usbDeviceListDel(usbDeviceList *list, + usbDevice *dev) +{ + usbDevice *ret = usbDeviceListSteal(list, dev); + if (ret) + usbFreeDevice(ret); +} + +usbDevice * +usbDeviceListFind(usbDeviceList *list, + usbDevice *dev) +{ + int i; + + for (i = 0; i < list->count; i++) { + if (list->devs[i]->bus == dev->bus && + list->devs[i]->dev == dev->dev) + return list->devs[i]; + } + + return NULL; +} diff --git a/src/util/hostusb.h b/src/util/hostusb.h index f4a13ca..afaa32f 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -17,6 +17,7 @@ * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> + * Michal Privoznik <mprivozn(a)redhat.com> */ #ifndef __VIR_USB_H__ @@ -25,12 +26,16 @@ # include "internal.h" typedef struct _usbDevice usbDevice; +typedef struct _usbDeviceList usbDeviceList; usbDevice *usbGetDevice(unsigned bus, unsigned devno); usbDevice *usbFindDevice(unsigned vendor, unsigned product); void usbFreeDevice (usbDevice *dev); +void usbDeviceSetUsedBy(usbDevice *dev, const char *name); +const char *usbDeviceGetUsedBy(usbDevice *dev); +const char *usbDeviceGetName(usbDevice *dev); unsigned usbDeviceGetBus(usbDevice *dev); unsigned usbDeviceGetDevno(usbDevice *dev); @@ -49,5 +54,18 @@ int usbDeviceFileIterate(usbDevice *dev, usbDeviceFileActor actor, void *opaque); +usbDeviceList *usbDeviceListNew(void); +void usbDeviceListFree(usbDeviceList *list); +int usbDeviceListAdd(usbDeviceList *list, + usbDevice *dev); +usbDevice * usbDeviceListGet(usbDeviceList *list, + int idx); +int usbDeviceListCount(usbDeviceList *list); +usbDevice * usbDeviceListSteal(usbDeviceList *list, + usbDevice *dev); +void usbDeviceListDel(usbDeviceList *list, + usbDevice *dev); +usbDevice * usbDeviceListFind(usbDeviceList *list, + usbDevice *dev); #endif /* __VIR_USB_H__ */ -- 1.7.3.4

2 2

[libvirt] [PATCH] docs: fix missing / in xml examples
by Eric Blake 23 Dec '11

23 Dec '11

* docs/formatdomain.html.in: Fix typos in examples. --- Pushing under the trivial rule. docs/formatdomain.html.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9cf0f12..06181b1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -947,7 +947,7 @@ <devices> <disk type='file' snapshot='external'> <driver name="tap" type="aio" cache="default"/> - <source file='/var/lib/xen/images/fv0'/ startupPolicy='optional'> + <source file='/var/lib/xen/images/fv0'/ startupPolicy='optional'/> <target dev='hda' bus='ide'/> <iotune> <total_bytes_sec>10000000</total_bytes_sec> @@ -2980,7 +2980,7 @@ qemu-kvm -net nic,model=? /dev/null ... <devices> <console type='stdio'> - <target port='1'> + <target port='1'/> </console> </devices> ...</pre> -- 1.7.7.4

1 1

[libvirt] [libvirt-glib] API to suspend a domain
by Zeeshan Ali (Khattak) 23 Dec '11

23 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 30 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 3 +++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 4301b14..0b52538 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -678,3 +678,33 @@ gboolean gvir_domain_open_graphics(GVirDomain *dom, cleanup: return ret; } + +/** + * gir_domain_suspend: + * @dom: the domain to suspend + * @err: Place-holder for possible errors + * + * Suspends an active domain, the process is frozen without further access to + * CPU resources and I/O but the memory used by the domain at the hypervisor + * level will stay allocated. Use gvir_domain_resume() to reactivate the domain. + * + * Returns: TRUE if domain was saved successfully, FALSE otherwise. + */ +gboolean gvir_domain_suspend (GVirDomain *dom, + GError **err) +{ + gboolean ret = FALSE; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + + if (virDomainSuspend(dom->priv->handle) < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to suspend domain"); + goto cleanup; + } + + ret = TRUE; +cleanup: + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 6fcec8d..a5923f4 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -153,6 +153,9 @@ gboolean gvir_domain_open_graphics(GVirDomain *dom, unsigned int flags, GError **err); +gboolean gvir_domain_suspend (GVirDomain *dom, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a523adc..526098d 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -51,6 +51,7 @@ LIBVIRT_GOBJECT_0.0.3 { gvir_domain_start; gvir_domain_resume; gvir_domain_stop; + gvir_domain_suspend; gvir_domain_delete; gvir_domain_open_console; gvir_domain_open_graphics; -- 1.7.7.4

1 0

[libvirt] [libvirt-glib] Distribute and install forgotten qemu-usb.xml
by Zeeshan Ali (Khattak) 23 Dec '11

23 Dec '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- data/devices/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/devices/Makefile.am b/data/devices/Makefile.am index 17fbf17..f36cd8f 100644 --- a/data/devices/Makefile.am +++ b/data/devices/Makefile.am @@ -1,5 +1,5 @@ databasedir = $(pkgdatadir)/data/devices/ -database_DATA = xen.xml qemu-pci.xml virtio-pci.xml +database_DATA = xen.xml qemu-pci.xml qemu-usb.xml qemu-ps2.xml virtio-pci.xml EXTRA_DIST = $(database_DATA) -- 1.7.7.4

1 0

[libvirt] [libvirt-glib] Fix gvir_config_domain_sound_set_model
by Christophe Fergeau 23 Dec '11

23 Dec '11

It's creating an unwanted extra <sound> XML node: <sound> <sound model="xxx"> </sound> instead of the correct <sound model="xxx"> --- libvirt-gconfig/libvirt-gconfig-domain-sound.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-sound.c b/libvirt-gconfig/libvirt-gconfig-domain-sound.c index 0812d06..abf9a14 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-sound.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-sound.c @@ -72,15 +72,9 @@ GVirConfigDomainSound *gvir_config_domain_sound_new_from_xml(const gchar *xml, void gvir_config_domain_sound_set_model(GVirConfigDomainSound *sound, GVirConfigDomainSoundModel model) { - GVirConfigObject *node; - g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_SOUND(sound)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(sound), - "sound"); - g_return_if_fail(GVIR_IS_CONFIG_OBJECT(node)); - gvir_config_object_set_attribute_with_type(node, "model", + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(sound), "model", GVIR_TYPE_CONFIG_DOMAIN_SOUND_MODEL, model, NULL); - g_object_unref(G_OBJECT(node)); } -- 1.7.7.4

2 1

[libvirt] [test-API][PATCH] Update 2 functions for wrapped libs
by Nan Zhang 23 Dec '11

23 Dec '11

* lib/nodedevAPI.py: remove non-existent function ref() * lib/secretAPI.py: fix case sensitive error on function name UUID() --- lib/nodedevAPI.py | 9 --------- lib/secretAPI.py | 2 +- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/lib/nodedevAPI.py b/lib/nodedevAPI.py index cc96909..64fc4b8 100644 --- a/lib/nodedevAPI.py +++ b/lib/nodedevAPI.py @@ -137,15 +137,6 @@ class NodedevAPI: code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def ref(self, name): - try: - obj = self.lookup_by_name(name) - obj.ref() - except libvirt.libvirtError, e: - message = e.get_error_message() - code = e.get_error_code() - raise exception.LibvirtAPI(message, code) - def get_name(self, obj): try: device_name = obj.name() diff --git a/lib/secretAPI.py b/lib/secretAPI.py index 876d22d..4aac27f 100644 --- a/lib/secretAPI.py +++ b/lib/secretAPI.py @@ -84,7 +84,7 @@ class SecretAPI(object): def get_uuid(self, uuidstr): try: secret_obj = self.get_secret_by_uuid_string(uuidstr) - return secret_obj.uuid() + return secret_obj.UUID() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() -- 1.7.4.4

2 1

[libvirt] question on kvm
by hero 23 Dec '11

23 Dec '11

hello everyone: during the days I use kvm,I have got some questions I want to know,please read the following questions. 1.When a kvm VM is running, I use 'virsh setvcpus <domain> <count>' to change the cpu numbers of the VM, and when I use 'virsh dumpxml <domain>',there is a change from '<vcpus>count</vcpus>' to '<vcpus current="currentcount">count</vcpus>', just because of this I can't start the VM after I shutdown it. could you help me about this. 2. when I use "virsh setmaxmem <domain> <value>" to change the max memory of the kvm VM, it says "error: Unable to change MaxMemorySize error: this function is not supported by the connection driver: virDomainSetMaxMemory", I want to know if libvirt has bugs or not. 3.It works fine except I reboot the VM after I use "virsh setmem <domain> <value>" to change the kvm VM boot memory, for example, I change the memory 3000000k, but it can not save the value the next time to reboot. Best wishes and Merry Christmas! SunYongGang

2 1

[libvirt] [PATCH] tests: run schema checks in sorted order
by Eric Blake 22 Dec '11

22 Dec '11

Having a test that depends on file system timestamps and/or inode allocation order is non-deterministic in its output. * tests/schematestutils.sh: Run test in deterministic order. --- Pushing under the trivial rule. Evidence of the non-determinism can be found at the location of the three failures reported here: https://www.redhat.com/archives/libvir-list/2011-December/msg00908.html tests/schematestutils.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/schematestutils.sh b/tests/schematestutils.sh index f2b3b50..ec6452a 100644 --- a/tests/schematestutils.sh +++ b/tests/schematestutils.sh @@ -13,7 +13,7 @@ for dir in $DIRS do XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 - for xml in $XML + for xml in `echo $XML | sort` do n=`expr $n + 1` cmd="xmllint --relaxng $SCHEMA --noout $xml" -- 1.7.7.4

1 1

[libvirt] [PATCH] qemu: Support for overriding NOFILE limit
by Michal Privoznik 22 Dec '11

22 Dec '11

This patch adds max_files option to qemu.conf which can be used to override system default limit on number of opened files that are allowed for qemu user. --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 +++- src/qemu/qemu_conf.c | 4 ++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_process.c | 16 ++++++++++++++-- src/qemu/test_libvirtd_qemu.aug | 4 ++++ 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ad34e42..078e9c4 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -50,6 +50,7 @@ module Libvirtd_qemu = | bool_entry "allow_disk_format_probing" | bool_entry "set_process_name" | int_entry "max_processes" + | int_entry "max_files" | str_entry "lock_manager" | int_entry "max_queued" | int_entry "keepalive_interval" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c3f264f..6125d3b 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -301,9 +301,11 @@ # If max_processes is set to a positive integer, libvirt will use it to set # maximum number of processes that can be run by qemu user. This can be used to -# override default value set by host OS. +# override default value set by host OS. The same apply to max_files which +# set limit to maximum number of opened files. # # max_processes = 0 +# max_files = 0 # To enable 'Sanlock' project based locking of the file # content (to prevent two VMs writing to the same diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3766119..bc0a646 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -443,6 +443,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, CHECK_TYPE("max_processes", VIR_CONF_LONG); if (p) driver->maxProcesses = p->l; + p = virConfGetValue(conf, "max_files"); + CHECK_TYPE("max_files", VIR_CONF_LONG); + if (p) driver->maxFiles = p->l; + p = virConfGetValue (conf, "lock_manager"); CHECK_TYPE ("lock_manager", VIR_CONF_STRING); if (p && p->str) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 8161269..f5a0f60 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -105,6 +105,7 @@ struct qemud_driver { unsigned int setProcessName : 1; int maxProcesses; + int maxFiles; int max_queued; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9123f4c..105b895 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2166,9 +2166,9 @@ qemuProcessPrepareChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, static int qemuProcessLimits(struct qemud_driver *driver) { - if (driver->maxProcesses > 0) { - struct rlimit rlim; + struct rlimit rlim; + if (driver->maxProcesses > 0) { rlim.rlim_cur = rlim.rlim_max = driver->maxProcesses; if (setrlimit(RLIMIT_NPROC, &rlim) < 0) { virReportSystemError(errno, @@ -2178,6 +2178,18 @@ qemuProcessLimits(struct qemud_driver *driver) } } + if (driver->maxFiles > 0) { + /* Max number of opened files is one greater than + * actual limit. See man setrlimit */ + rlim.rlim_cur = rlim.rlim_max = driver->maxFiles + 1; + if (setrlimit(RLIMIT_NOFILE, &rlim) < 0) { + virReportSystemError(errno, + _("cannot set max opened files to %d"), + driver->maxFiles); + return -1; + } + } + return 0; } diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug index f7476ae..f841936 100644 --- a/src/qemu/test_libvirtd_qemu.aug +++ b/src/qemu/test_libvirtd_qemu.aug @@ -114,6 +114,8 @@ vnc_auto_unix_socket = 1 max_processes = 12345 +max_files = 67890 + lock_manager = \"fcntl\" keepalive_interval = 1 @@ -242,6 +244,8 @@ keepalive_count = 42 { "#empty" } { "max_processes" = "12345" } { "#empty" } +{ "max_files" = "67890" } +{ "#empty" } { "lock_manager" = "fcntl" } { "#empty" } { "keepalive_interval" = "1" } -- 1.7.3.4

2 2