- Devel - libvirt List Archives

[libvirt] strange problem only if /usr/sbin/libvirtd is named
by Shi Jin 29 Nov '09

29 Nov '09

Hi there, I am having a very strange problem. I have built a git libvirt for our servers running ubuntu 9.10. The same built works on all servers but one, which gives error information: 21:08:58.827: error : qemudStartup:926 : unable to set ownership of '/var/lib/libvirt/qemu' to user 400:400: Operation not permitted 21:08:58.827: error : qemudStartup:932 : unable to set ownership of '/var/cache/libvirt/qemu' to 400:400: This is because I used the --with-qemu-user and --with-qemu-group options in building libvirt. After hours of debugging, I figured out the problem: as long as the service binary is not named /usr/sbin/libvirtd, I don't have the above errors. For example, I can rename the binary as /usr/sbin/libvirtd.1 or copy it to anywhere else and it works. I am wondering if there is anything so special about this /usr/sbin/libvirtd file name. Also, it is so strange that it works for all other almost identical servers but this particular one. I appreciate your help. -- Shi Jin, PhD

1 0

[libvirt] saving domains causes stucks all other commands
by Nikola Ciprich 28 Nov '09

28 Nov '09

Hi, I noticed that using libvirt to save running KVM domain (ie using virsh save ...) causes all other attempts to connect to libvirt and do something to hang till the save finishes. Seems like the issue has been already reported once: http://www.mail-archive.com/libvir-list@redhat.com/msg11431.html but without any resoulution. I've tried libvirt-0.7.4 + also applied bb8d57c68a5d9601058692813c7bdaf83c3d3aff (Fix threading problems in python bindings) which seemed to me might be related but still the problem persists. here's the debug log of trying to list domains while saving some domain: [root@vbox3 ~]# virsh list 16:30:31.718: debug : virInitialize:278 : register drivers 16:30:31.718: debug : virRegisterDriver:779 : registering Test as driver 0 16:30:31.718: debug : virRegisterNetworkDriver:617 : registering Test as network driver 0 16:30:31.718: debug : virRegisterInterfaceDriver:648 : registering Test as interface driver 0 16:30:31.718: debug : virRegisterStorageDriver:679 : registering Test as storage driver 0 16:30:31.718: debug : virRegisterDeviceMonitor:710 : registering Test as device driver 0 16:30:31.718: debug : virRegisterSecretDriver:741 : registering Test as secret driver 0 16:30:31.718: debug : vboxRegister:101 : VBoxCGlueInit failed, using dummy driver 16:30:31.718: debug : virRegisterDriver:779 : registering VBOX as driver 1 16:30:31.718: debug : virRegisterNetworkDriver:617 : registering VBOX as network driver 1 16:30:31.718: debug : virRegisterStorageDriver:679 : registering VBOX as storage driver 1 16:30:31.718: debug : virRegisterDriver:779 : registering remote as driver 2 16:30:31.718: debug : virRegisterNetworkDriver:617 : registering remote as network driver 2 16:30:31.718: debug : virRegisterInterfaceDriver:648 : registering remote as interface driver 1 16:30:31.718: debug : virRegisterStorageDriver:679 : registering remote as storage driver 2 16:30:31.718: debug : virRegisterDeviceMonitor:710 : registering remote as device driver 1 16:30:31.718: debug : virRegisterSecretDriver:741 : registering remote as secret driver 1 16:30:31.718: debug : virConnectOpenAuth:1279 : name=(null), auth=0x7f89bc41b8a0, flags=0 16:30:31.718: debug : do_open:1050 : no name, allowing driver auto-select 16:30:31.718: debug : do_open:1058 : trying driver 0 (Test) ... 16:30:31.718: debug : do_open:1064 : driver 0 Test returned DECLINED 16:30:31.718: debug : do_open:1058 : trying driver 1 (VBOX) ... 16:30:31.718: debug : do_open:1064 : driver 1 VBOX returned DECLINED 16:30:31.718: debug : do_open:1058 : trying driver 2 (remote) ... 16:30:31.718: debug : remoteOpen:1064 : Auto-probe remote URI 16:30:31.718: debug : doRemoteOpen:564 : proceeding with name = 16:30:31.719: debug : remoteIO:8359 : Do proc=66 serial=0 length=28 wait=(nil) 16:30:31.719: debug : remoteIO:8421 : We have the buck 66 0x7f89bc5b5010 0x7f89bc5b5010 16:30:31.720: debug : remoteIODecodeMessageLength:7843 : Got length, now need 64 total (60 more) 16:30:31.720: debug : remoteIOEventLoop:8285 : Giving up the buck 66 0x7f89bc5b5010 (nil) 16:30:31.720: debug : remoteIO:8452 : All done with our call 66 (nil) 0x7f89bc5b5010 16:30:31.720: debug : remoteIO:8359 : Do proc=1 serial=1 length=40 wait=(nil) 16:30:31.720: debug : remoteIO:8421 : We have the buck 1 0x256ce90 0x256ce90 16:30:31.721: debug : remoteIODecodeMessageLength:7843 : Got length, now need 56 total (52 more) 16:30:31.722: debug : remoteIOEventLoop:8285 : Giving up the buck 1 0x256ce90 (nil) 16:30:31.722: debug : remoteIO:8452 : All done with our call 1 (nil) 0x256ce90 16:30:31.722: debug : remoteIO:8359 : Do proc=110 serial=2 length=28 wait=(nil) 16:30:31.722: debug : remoteIO:8421 : We have the buck 110 0x256ce90 0x256ce90 16:30:31.723: debug : remoteIODecodeMessageLength:7843 : Got length, now need 76 total (72 more) 16:30:31.723: debug : remoteIOEventLoop:8285 : Giving up the buck 110 0x256ce90 (nil) 16:30:31.723: debug : remoteIO:8452 : All done with our call 110 (nil) 0x256ce90 16:30:31.723: debug : doRemoteOpen:872 : Auto-probed URI is qemu:///system 16:30:31.723: debug : doRemoteOpen:891 : Adding Handler for remote events 16:30:31.723: debug : doRemoteOpen:898 : virEventAddHandle failed: No addHandleImpl defined. continuing without events. 16:30:31.723: debug : do_open:1064 : driver 2 remote returned SUCCESS 16:30:31.723: debug : do_open:1084 : network driver 0 Test returned DECLINED 16:30:31.723: debug : do_open:1084 : network driver 1 VBOX returned DECLINED 16:30:31.723: debug : do_open:1084 : network driver 2 remote returned SUCCESS 16:30:31.723: debug : do_open:1103 : interface driver 0 Test returned DECLINED 16:30:31.723: debug : do_open:1103 : interface driver 1 remote returned SUCCESS 16:30:31.723: debug : do_open:1123 : storage driver 0 Test returned DECLINED 16:30:31.723: debug : do_open:1123 : storage driver 1 VBOX returned DECLINED 16:30:31.723: debug : do_open:1123 : storage driver 2 remote returned SUCCESS 16:30:31.723: debug : do_open:1143 : node driver 0 Test returned DECLINED 16:30:31.723: debug : do_open:1143 : node driver 1 remote returned SUCCESS 16:30:31.723: debug : do_open:1170 : secret driver 0 Test returned DECLINED 16:30:31.723: debug : do_open:1170 : secret driver 1 remote returned SUCCESS 16:30:31.723: debug : virConnectNumOfDomains:1656 : conn=0x2569c30 16:30:31.723: debug : remoteIO:8359 : Do proc=51 serial=3 length=28 wait=(nil) 16:30:31.723: debug : remoteIO:8421 : We have the buck 51 0x256ced0 0x256ced0 .. (here's the long wait till save finishes).. 16:31:11.077: debug : remoteIODecodeMessageLength:7843 : Got length, now need 60 total (56 more) 16:31:11.077: debug : remoteIOEventLoop:8285 : Giving up the buck 51 0x256ced0 (nil) 16:31:11.077: debug : remoteIO:8452 : All done with our call 51 (nil) 0x256ced0 Id Name State ---------------------------------- 16:31:11.077: debug : virConnectClose:1297 : conn=0x2569c30 16:31:11.077: debug : virUnrefConnect:259 : unref connection 0x2569c30 1 16:31:11.077: debug : remoteIO:8359 : Do proc=2 serial=4 length=28 wait=(nil) 16:31:11.077: debug : remoteIO:8421 : We have the buck 2 0x256d0e0 0x256d0e0 16:31:11.079: debug : remoteIODecodeMessageLength:7843 : Got length, now need 56 total (52 more) 16:31:11.079: debug : remoteIOEventLoop:8285 : Giving up the buck 2 0x256d0e0 (nil) 16:31:11.079: debug : remoteIO:8452 : All done with our call 2 (nil) 0x256d0e0 16:31:11.079: debug : virReleaseConnect:216 : release connection 0x2569c30 Could somebody please have a look on this issue? I'll gladly provide any help if I'll be able. thanks a lot in advance! with best regards nik -- ------------------------------------- Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

1 0

[libvirt] Howto store schedinfo in the domain definition
by Ralf Nyren 27 Nov '09

27 Nov '09

Hi, Is there support for storing the values accessible with eg virsh schedinfo <domain> --set param=value in the domain definition xml file? Tried to find the syntax definition for this but didn't find anything. Many thanks, Ralf

2 1

[libvirt] Problem in handling fast prints from QEMU to stderr
by Saul Tamari 26 Nov '09

26 Nov '09

Hi, I think I spotted a bug in the way libvirtd handles stderr output from QEMU VMs. When starting a VM and QEMU outputs too much output data to stderr (during a given time period), libvirtd will fail and report the following error to /var/log/messages: libvirtd: 13:44:40.695: error : internal error Out of space while reading console log output I looked at the libvirt code a bit and it seems like the stderr-handling code (I think its in qemudReadLogOutput()) is time-dependent and if a 4K buffer overflows it will stop running this VM. As a workaround I added some usleep(250000) near the fprintf() calls (inside QEMU) and I now manage to get the VM running. Is this the way libvirtd is supposed to behave? Thanks, Saul p.s. This was tested on FC11 and libvirtd is version 0.6.2

3 4

[libvirt] [PATCH] Xen: Add support for interface model='xenpv'
by Jiri Denemark 26 Nov '09

26 Nov '09

Xen HVM guests with PV drivers end up with two network interfaces for each configured interface. One of them being emulated by qemu and the other one paravirtual. As this might not be desirable, the attached patch provides a way for users to specify that only paravirtual network interface should be presented to the guest. The configuration was inspired by qemu/kvm driver, for which users can specify model='virtio' to use paravirtual network interface. The patch adds support for model='xenpv' which results in type=xenpv instead of type=ioemu (or nothing for newer xen versions) in guests native configuration. Xen's qemu ignores interfaces with type != ioemu and only paravirtual network device will be seen in the guest. A possible addition to this would be to force type=ioemu for all other models which would result in only emulated network device to be provided for an HVM guest on xen newer then XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU. No type would be configured when model is missing in domains XML. If you think this is a good idea, I'll prepare a second version of the patch. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/xen/xend_internal.c | 25 +++++++++++++++++-------- src/xen/xm_internal.c | 19 ++++++++++++++----- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index e370eb8..9ea59c7 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -5427,6 +5427,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn, int isAttach) { const char *script = DEFAULT_VIF_SCRIPT; + int pv_only = 0; if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && def->type != VIR_DOMAIN_NET_TYPE_NETWORK && @@ -5495,15 +5496,23 @@ xenDaemonFormatSxprNet(virConnectPtr conn, !STRPREFIX(def->ifname, "vif")) virBufferVSprintf(buf, "(vifname '%s')", def->ifname); - if (def->model != NULL) - virBufferVSprintf(buf, "(model '%s')", def->model); + if (def->model != NULL) { + if (hvm && STREQ(def->model, "xenpv")) + pv_only = 1; + else + virBufferVSprintf(buf, "(model '%s')", def->model); + } - /* - * apparently (type ioemu) breaks paravirt drivers on HVM so skip this - * from Xen 3.1.0 - */ - if (hvm && xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) - virBufferAddLit(buf, "(type ioemu)"); + if (pv_only) + virBufferAddLit(buf, "(type xenpv)"); + else { + /* + * apparently (type ioemu) breaks paravirt drivers on HVM so skip this + * from Xen 3.1.0 + */ + if (hvm && xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(buf, "(type ioemu)"); + } if (!isAttach) virBufferAddLit(buf, ")"); diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 40c1996..fe4bcbd 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -2041,6 +2041,7 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn, virConfValuePtr val, tmp; char *str; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; + int pv_only = 0; virBufferVSprintf(&buf, "mac=%02x:%02x:%02x:%02x:%02x:%02x", net->mac[0], net->mac[1], @@ -2092,12 +2093,20 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn, goto cleanup; } - if (hvm && priv->xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) - virBufferAddLit(&buf, ",type=ioemu"); + if (net->model) { + if (hvm && STREQ(net->model, "xenpv")) + pv_only = 1; + else + virBufferVSprintf(&buf, ",model=%s", + net->model); + } - if (net->model) - virBufferVSprintf(&buf, ",model=%s", - net->model); + if (pv_only) + virBufferAddLit(&buf, ",type=xenpv"); + else { + if (hvm && priv->xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(&buf, ",type=ioemu"); + } if (net->ifname) virBufferVSprintf(&buf, ",vifname=%s", -- 1.6.5.3

2 2

[libvirt] [PATCH] Fix threading problems in python bindings
by Daniel P. Berrange 26 Nov '09

26 Nov '09

* libvirt-override.c: Add many missing calls to allow threading when entering C code, otherwise python blocks & then deadlocks when we have an async event to dispatch back into python code --- python/libvirt-override.c | 106 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 96 insertions(+), 10 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index b885190..0f7db9c 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -67,7 +67,10 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainBlockStats(domain, path, &stats, sizeof(stats)); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -96,7 +99,10 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainInterfaceStats(domain, path, &stats, sizeof(stats)); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -128,7 +134,9 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSchedulerType(domain, &nparams); + LIBVIRT_END_ALLOW_THREADS; if (c_retval == NULL) return VIR_PY_NONE; @@ -150,6 +158,7 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr domain; PyObject *pyobj_domain, *info; char *c_retval; + int i_retval; int nparams, i; virSchedParameterPtr params; @@ -158,7 +167,10 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSchedulerType(domain, &nparams); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval == NULL) return VIR_PY_NONE; free(c_retval); @@ -166,7 +178,11 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, if ((params = malloc(sizeof(*params)*nparams)) == NULL) return VIR_PY_NONE; - if (virDomainGetSchedulerParameters(domain, params, &nparams) < 0) { + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetSchedulerParameters(domain, params, &nparams); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { free(params); return VIR_PY_NONE; } @@ -223,6 +239,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr domain; PyObject *pyobj_domain, *info; char *c_retval; + int i_retval; int nparams, i; virSchedParameterPtr params; @@ -231,7 +248,10 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSchedulerType(domain, &nparams); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval == NULL) return VIR_PY_INT_FAIL; free(c_retval); @@ -239,7 +259,11 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, if ((params = malloc(sizeof(*params)*nparams)) == NULL) return VIR_PY_INT_FAIL; - if (virDomainGetSchedulerParameters(domain, params, &nparams) < 0) { + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetSchedulerParameters(domain, params, &nparams); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { free(params); return VIR_PY_INT_FAIL; } @@ -292,7 +316,10 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, } } - if (virDomainSetSchedulerParameters(domain, params, nparams) < 0) { + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetSchedulerParameters(domain, params, nparams); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { free(params); return VIR_PY_INT_FAIL; } @@ -311,13 +338,17 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, virVcpuInfoPtr cpuinfo = NULL; unsigned char *cpumap = NULL; int cpumaplen, i; + int i_retval; if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetVcpus", &pyobj_domain)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - if (virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo) != 0) + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) return VIR_PY_NONE; if (virDomainGetInfo(domain, &dominfo) != 0) @@ -330,9 +361,12 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, if ((cpumap = malloc(dominfo.nrVirtCpu * cpumaplen)) == NULL) goto cleanup; - if (virDomainGetVcpus(domain, - cpuinfo, dominfo.nrVirtCpu, - cpumap, cpumaplen) < 0) + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetVcpus(domain, + cpuinfo, dominfo.nrVirtCpu, + cpumap, cpumaplen); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) goto cleanup; /* convert to a Python tuple of long objects */ @@ -395,13 +429,17 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, virNodeInfo nodeinfo; unsigned char *cpumap; int cpumaplen, i, vcpu; + int i_retval; if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu", &pyobj_domain, &vcpu, &pycpumap)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - if (virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo) != 0) + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) return VIR_PY_INT_FAIL; cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); @@ -418,10 +456,15 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, VIR_UNUSE_CPU(cpumap, i); } - virDomainPinVcpu(domain, vcpu, cpumap, cpumaplen); + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainPinVcpu(domain, vcpu, cpumap, cpumaplen); + LIBVIRT_END_ALLOW_THREADS; Py_DECREF(truth); free(cpumap); + if (i_retval < 0) + return VIR_PY_INT_FAIL; + return VIR_PY_INT_SUCCESS; } @@ -471,7 +514,10 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - if ((err = virConnGetLastError(conn)) == NULL) + LIBVIRT_BEGIN_ALLOW_THREADS; + err = virConnGetLastError(conn); + LIBVIRT_END_ALLOW_THREADS; + if (err == NULL) return VIR_PY_NONE; if ((info = PyTuple_New(9)) == NULL) @@ -793,7 +839,9 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedDomains(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -801,7 +849,9 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedDomains(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -966,7 +1016,9 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfNetworks(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -974,7 +1026,9 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListNetworks(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1008,7 +1062,9 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedNetworks(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1016,7 +1072,9 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedNetworks(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1211,7 +1269,9 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfStoragePools(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1219,7 +1279,9 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListStoragePools(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1261,7 +1323,9 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedStoragePools(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1269,7 +1333,9 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedStoragePools(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1311,7 +1377,9 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, return(NULL); pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolNumOfVolumes(pool); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1319,7 +1387,9 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolListVolumes(pool, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1520,7 +1590,9 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeNumOfDevices(conn, cap, flags); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1528,7 +1600,9 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeListDevices(conn, cap, names, c_retval, flags); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1560,7 +1634,9 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, return(NULL); dev = (virNodeDevicePtr) PyvirNodeDevice_Get(pyobj_dev); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeDeviceNumOfCaps(dev); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1568,7 +1644,9 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeDeviceListCaps(dev, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1775,7 +1853,9 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfInterfaces(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1783,7 +1863,9 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListInterfaces(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; @@ -1826,7 +1908,9 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedInterfaces(conn); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; @@ -1834,7 +1918,9 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, names = malloc(sizeof(*names) * c_retval); if (!names) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedInterfaces(conn, names, c_retval); + LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { free(names); return VIR_PY_NONE; -- 1.6.5.2

4 4

[libvirt] [PATCH] Put libraries in $LIBS, not $LDFLAGS, during configure tests.
by Nix 25 Nov '09

25 Nov '09

If libraries go in $LDFLAGS while AC_CHECK_LIBbing, they'll end up in front of the object file name, which rarely works well. They belong in $LIBS. --- configure.in | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index f735bba..5308364 100644 --- a/configure.in +++ b/configure.in @@ -542,14 +542,14 @@ AC_SUBST([LIBXML_LIBS]) dnl xmlURI structure has query_raw? old_cflags="$CFLAGS" -old_ldflags="$LDFLAGS" +old_libs="$LIBS" CFLAGS="$CFLAGS $LIBXML_CFLAGS" -LDFLAGS="$LDFLAGS $LIBXML_LIBS" +LIBS="$LIBS $LIBXML_LIBS" AC_CHECK_MEMBER([struct _xmlURI.query_raw], [AC_DEFINE([HAVE_XMLURI_QUERY_RAW], [], [Have query_raw field in libxml2 xmlURI structure])],, [#include <libxml/uri.h>]) CFLAGS="$old_cflags" -LDFLAGS="$old_ldflags" +LIBS="$old_libs" dnl GnuTLS library GNUTLS_CFLAGS= @@ -579,15 +579,15 @@ dnl Old versions of GnuTLS uses types like 'gnutls_session' instead dnl of 'gnutls_session_t'. Try to detect this type if defined so dnl that we can offer backwards compatibility. old_cflags="$CFLAGS" -old_ldflags="$LDFLAGS" +old_libs="$LIBS" CFLAGS="$CFLAGS $GNUTLS_CFLAGS" -LDFLAGS="$LDFLAGS $GNUTLS_LIBS" +LIBS="$LIBS $GNUTLS_LIBS" AC_CHECK_TYPE([gnutls_session], AC_DEFINE([GNUTLS_1_0_COMPAT],[], [enable GnuTLS 1.0 compatibility macros]),, [#include <gnutls/gnutls.h>]) CFLAGS="$old_cflags" -LDFLAGS="$old_ldflags" +LIBS="$old_libs" dnl Cyrus SASL @@ -685,12 +685,12 @@ if test "x$with_polkit" = "xyes" -o "x$with_polkit" = "xcheck"; then [use PolicyKit for UNIX socket access checks]) old_CFLAGS=$CFLAGS - old_LDFLAGS=$LDFLAGS + old_LIBS=$LIBS CFLAGS="$CFLAGS $POLKIT_CFLAGS" - LDFLAGS="$LDFLAGS $POLKIT_LIBS" + LIBS="$LIBS $POLKIT_LIBS" AC_CHECK_FUNCS([polkit_context_is_caller_authorized]) CFLAGS="$old_CFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" AC_PATH_PROG([POLKIT_AUTH], [polkit-auth]) if test "x$POLKIT_AUTH" != "x"; then @@ -1682,20 +1682,19 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then [use HAL for host device enumeration]) old_CFLAGS=$CFLAGS - old_LDFLAGS=$LDFLAGS + old_LIBS=$LIBS CFLAGS="$CFLAGS $HAL_CFLAGS" - LDFLAGS="$LDFLAGS $HAL_LIBS" + LIBS="$LIBS $HAL_LIBS" AC_CHECK_FUNCS([libhal_get_all_devices],,[with_hal=no]) AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) CFLAGS="$old_CFLAGS" - LDFLAGS="$old_LDFLAGS" + LIBS="$old_LIBS" fi fi AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AC_SUBST([HAL_CFLAGS]) AC_SUBST([HAL_LIBS]) - dnl udev/libpciaccess library check for alternate host device enumeration UDEV_CFLAGS= UDEV_LIBS= -- 1.6.5.3.100.g75959

2 2

[libvirt] How do I import an old VM image to a new Install
by Michael N. Moran 25 Nov '09

25 Nov '09

First, I am a casual VM user. I have been using Fedora Core 7 on my Dell laptop for a couple of years with a single QEMU/KVM guest running Windoze XP. I recently installed Fedora 12 on a new hard disk and would like to use my old Windows VM image on the new install. Is there an easy way to do this? I tried copying the image itself (WindozeXpDisk.raw) to the new install and then (naively) looked for an import on the Virtual Machine Manager GUI. The closest that I found was the File->Restore saved machine. I tried that on my WindozeXpDisk.raw image and it failed as follows: Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/manager.py", line 461, in restore_saved_callback newconn.restore(file_to_load) File "/usr/share/virt-manager/virtManager/connection.py", line 649, in restore self.vmm.restore(frm) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 1420, in restore if ret == -1: raise libvirtError ('virDomainRestore() failed', conn=self) libvirtError: operation failed: image magic is incorrect I *can* mount the image using kpartx et. al like this; sudo kpartx -av /var/virt/WindozeXpDisk.raw add map loop1p1 (253:2): 0 31101777 linear /dev/loop1 63 sudo mount -t ntfs /dev/mapper/loop0p1 ./mnt Any clues would be helpful. thank you, mike

2 3

[libvirt] crash in libvirtd when assigning PCI device (storage controller)
by Terje Marthinussen 25 Nov '09

25 Nov '09

Compiled libvirt and friends from todays sources on ubuntu 9.10. Was playing around with vt-d and while my MB works fine with ESXi 4, I got some permission issues when I tried the KVM and virt-manager included from ubuntu so I just gambled and compiled everything from latest sources. Things seems to work fine in a normal use case, but if I a PCI device such as a storage controller, libvirtd will get a sigsev. I got the onboard Intel Sata, a PCI Sil Sata card as well as an Areca Raid controller in this machine. I have not tried the Intel Sata device as I am booting from that, but both the other devices causes sigsev. I am sure assigned an intel network card a bit earlier and it actually worked (well, the VM started to boot at least and entered win7 installation without libvirtd crashing), but when I tested that again now, seems like the ethernet card causes the same problem. It is 6AM so will not do a serious attempt at debugging this, just wanted to check if anyone had an idea before I spent more time potentially debugging stuff that is know to not work. >From dmesg: [ 986.341633] device vnet0 entered promiscuous mode [ 986.342897] virbr0: topology change detected, propagating [ 986.342902] virbr0: port 1(vnet0) entering forwarding state [ 986.380733] pci-stub 0000:09:01.0: enabling device (0000 -> 0003) [ 986.380786] pci-stub 0000:09:01.0: PCI INT A -> GSI 22 (level, low) -> IRQ 22 [ 986.422128] pci-stub 0000:09:01.0: restoring config space at offset 0x9 (was 0x0, writing 0xe3c04000) [ 986.422141] pci-stub 0000:09:01.0: restoring config space at offset 0x8 (was 0x1, writing 0x1041) [ 986.422152] pci-stub 0000:09:01.0: restoring config space at offset 0x7 (was 0x1, writing 0x1061) [ 986.422163] pci-stub 0000:09:01.0: restoring config space at offset 0x6 (was 0x1, writing 0x1051) [ 986.422174] pci-stub 0000:09:01.0: restoring config space at offset 0x5 (was 0x1, writing 0x1065) [ 986.422185] pci-stub 0000:09:01.0: restoring config space at offset 0x4 (was 0x1, writing 0x1059) [ 986.422199] pci-stub 0000:09:01.0: restoring config space at offset 0x1 (was 0x2b00000, writing 0x2b00003) [ 987.172975] assign device: host bdf = 9:1:0 [ 987.173054] deassign device: host bdf = 9:1:0 [ 987.206121] pci-stub 0000:09:01.0: restoring config space at offset 0x9 (was 0x0, writing 0xe3c04000) [ 987.206134] pci-stub 0000:09:01.0: restoring config space at offset 0x8 (was 0x1, writing 0x1041) [ 987.206146] pci-stub 0000:09:01.0: restoring config space at offset 0x7 (was 0x1, writing 0x1061) [ 987.206157] pci-stub 0000:09:01.0: restoring config space at offset 0x6 (was 0x1, writing 0x1051) [ 987.206167] pci-stub 0000:09:01.0: restoring config space at offset 0x5 (was 0x1, writing 0x1065) [ 987.206178] pci-stub 0000:09:01.0: restoring config space at offset 0x4 (was 0x1, writing 0x1059) [ 987.206192] pci-stub 0000:09:01.0: restoring config space at offset 0x1 (was 0x2b00000, writing 0x2b00003) [ 987.206225] pci-stub 0000:09:01.0: PCI INT A disabled [ 987.286791] libvirtd[3193]: segfault at 10 ip 00007f921b4546b4 sp 00007f9216e165e0 error 4 in libpthread-2.10.1.so[7f921b44a000+17000] >From GDB 06:45:32.434: error : qemuMonitorCommandWithHandler:290 : cannot send monitor command 'info cpus': Connection reset by peer 06:45:32.434: error : qemuMonitorTextGetCPUInfo:436 : internal error cannot run monitor command to fetch CPU thread info Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7f485bfff910 (LWP 18120)] 0x00007f48657fb6b4 in pthread_mutex_unlock () from /lib/libpthread.so.0 (gdb) bt #0 0x00007f48657fb6b4 in pthread_mutex_unlock () from /lib/libpthread.so.0 #1 0x0000000000431101 in qemuDomainObjExitMonitorWithDriver (driver=0x11f0110, obj=0x12114f0) at qemu/qemu_driver.c:318 #2 0x000000000043f436 in qemudStartVMDaemon (conn=<value optimized out>, driver=0x11f0110, vm=0x12114f0, migrateFrom=<value optimized out>, stdin_fd=<value optimized out>) at qemu/qemu_driver.c:2320 #3 0x00000000004407c4 in qemudDomainStart (dom=0x11f0330) at qemu/qemu_driver.c:4370 #4 0x00007f4865a621e7 in virDomainCreate (domain=0x11f0330) at libvirt.c:4509 #5 0x0000000000420d68 in remoteDispatchDomainCreate (server=<value optimized out>, client=<value optimized out>, conn=0x1219da0, hdr=<value optimized out>, rerr=0x7f485bffedf0, args=<value optimized out>, ret=0x7f485bffeed0) at remote.c:853 #6 0x00000000004228e1 in remoteDispatchClientCall (server=<value optimized out>, client=0x7f485c000d30, msg=0x7f485c080f00) at dispatch.c:506 #7 0x0000000000422c93 in remoteDispatchClientRequest (server=0x11e2790, client=0x7f485c000d30, msg=0x7f485c080f00) at dispatch.c:388 #8 0x000000000041625c in qemudWorker (data=<value optimized out>) at libvirtd.c:1518 #9 0x00007f48657f7a04 in start_thread () from /lib/libpthread.so.0 #10 0x00007f48655617bd in clone () from /lib/libc.so.6 #11 0x0000000000000000 in ?? () (gdb) select 2 (gdb) info locals argv = 0x0 tmp = <value optimized out> progenv = 0x0 i = 1 ret = 1 sb = {st_dev = 64512, st_ino = 140307, st_nlink = 1, st_mode = 33261, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 2293664, st_blksize = 4096, st_blocks = 4480, st_atim = {tv_sec = 1258937087, tv_nsec = 967226499}, st_mtim = { tv_sec = 1257180462, tv_nsec = 0}, st_ctim = {tv_sec = 1258886336, tv_nsec = 104908677}, __unused = {0, 0, 0}} tapfds = 0x0 ntapfds = 1 qemuCmdFlags = 9436542 keepfd = {fds_bits = {262144, 0 <repeats 15 times>}} emulator = <value optimized out> child = 18145 pos = <value optimized out> ebuf = "\220v\036\001\000\000\000\000\060|WeH\177\000\000(\000\000\000\060\000\000\000\000\354\377[H\177\000\000@\353\377[H\177\000\000`\351\377[H\177\000\000\377\377\377\377H\177\000\000\233\017\037\001\000\000\000\000\326\063G\000\000\000\000\000@\247~eH\177\000\000\200\307OeH\177\000\000\240\306OeH\177\000\000JST\000\071\000\000\000\300\352\377[H\177\000\000\342\000\000\000\000\000\000\000\342\000\000\000\000\000\000\000\273\340G\000\000\000\000\000\300\352\377[H\177\000\000K\000\000\000\000\000\000\000`\351\377[H\177\000\000@\354\377[H\177\000\000P\352\377[H\177\000\000\001\000\000\000\000\000\000\000\320\352\377[H\177\000\000$\000\000\000\000\000\000\000py\255eH\177\000\000@\354\377[H\177\000\000\060|WeH\177\000\000\001\200\255\373\000\000\000\000\260\351\377[H\177\000\000\220\354\377[H\177\000\000\240\352\377["... pidfile = 0x0 logfile = 15 hookData = {conn = 0x1219da0, vm = 0x12114f0, driver = 0x11f0110} __FUNCTION__ = "qemudStartVMDaemon" __func__ = "qemudStartVMDaemon" line 318 is static void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; qemuMonitorUnlock(priv->mon); <---- 318 qemuDriverLock(driver); virDomainObjLock(obj); } Yep, not a very good attempt at debugging, but this is the first time I look at this code and I am overdue for Zzzzz :) Regards, Terje _________________________________________________________________ Windows Live: Keep your friends up to date with what you do online. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/so…

2 2

[libvirt] [PATCH] Add test for legacy <console ... tty=""> syntax
by Matthew Booth 25 Nov '09

25 Nov '09

* tests/qemuxml2argvtest.c: Test legacy syntax for QEMU argument generation * tests/qemuxml2argvdata/qemuxml2argv-console-legacy.(xml|args): Add test data --- .../qemuxml2argv-console-legacy.args | 1 + .../qemuxml2argv-console-legacy.xml | 29 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args new file mode 100644 index 0000000..fd42462 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml new file mode 100644 index 0000000..68d86ba --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty' tty='/dev/pts/8'> + <source path='/dev/pts/8'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c948379..233b3ae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -268,6 +268,7 @@ mymain(int argc, char **argv) DO_TEST("serial-many", 0); DO_TEST("parallel-tcp", 0); DO_TEST("console-compat", 0); + DO_TEST("console-legacy", 0); DO_TEST("channel-guestfwd", QEMUD_CMD_FLAG_CHARDEV); -- 1.6.5.2

2 3

[libvirt] [PATCH] remove ebtables rules at qemud shutdown
by Gerhard Stenzel 25 Nov '09

25 Nov '09

This patch removes ebtables rules at qemud shutdown time Signed-off-by: Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> Index: libvirt/src/qemu/qemu_bridge_filter.c =================================================================== --- libvirt.orig/src/qemu/qemu_bridge_filter.c +++ libvirt/src/qemu/qemu_bridge_filter.c @@ -48,6 +48,35 @@ networkAddEbtablesRules(struct qemud_dri return 0; } +int +networkRemoveEbtablesRules(struct qemud_driver *driver) { + int err; + + /* Set forward policy to DROP */ + if ((err = ebtablesRemoveForwardPolicyReject(driver->ebtables))) { + virReportSystemError(NULL, err, + _("failed to remove ebtables rule to set default policy to drop on '%s'"), + __FILE__); + return err; + } + + return 0; +} + +int +networkEnableAllFrames(struct qemud_driver *driver) { + int err; + + /* add default rules */ + if ((err = networkRemoveEbtablesRules(driver))) { + virReportSystemError(NULL, err, + _("cannot remove filter on bridge '%s'"), + __FILE__); + return err; + } + return 0; +} + int networkDisableAllFrames(struct qemud_driver *driver) { Index: libvirt/src/util/ebtables.c =================================================================== --- libvirt.orig/src/util/ebtables.c +++ libvirt/src/util/ebtables.c @@ -60,6 +60,7 @@ enum { ADD = 0, REMOVE, CREATE, + DELETE, POLICY, INSERT }; @@ -336,12 +337,28 @@ ebtablesForwardPolicyReject(ebtablesCont INSERT, "--insert", "FORWARD", "--jump", ctx->forward_filter->chain, NULL); - } - - return ebtablesAddRemoveRule(ctx->forward_filter, + return ebtablesAddRemoveRule(ctx->forward_filter, POLICY, "-P", ctx->forward_filter->chain, "DROP", NULL); + } + if (action == REMOVE) { + ebtablesAddRemoveRule(ctx->forward_filter, + POLICY, + "-P", ctx->forward_filter->chain, "ACCEPT", + NULL); + + ebtablesAddRemoveRule(ctx->forward_filter, + INSERT, + "--delete", "FORWARD", "--jump", + ctx->forward_filter->chain, NULL); + + return ebtablesAddRemoveRule(ctx->forward_filter, + DELETE, + "--delete-chain", ctx->forward_filter->chain, NULL, + NULL); + } + } /* Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms +++ libvirt/src/libvirt_private.syms @@ -179,6 +179,7 @@ virDomainEventQueueDispatch; # ebtables.h ebtablesAddForwardAllowIn; ebtablesAddForwardPolicyReject; +ebtablesRemoveForwardPolicyReject; ebtablesContextNew; ebtablesRemoveForwardAllowIn; Index: libvirt/src/qemu/qemu_driver.c =================================================================== --- libvirt.orig/src/qemu/qemu_driver.c +++ libvirt/src/qemu/qemu_driver.c @@ -1081,6 +1081,14 @@ qemudShutdown(void) { virDomainObjListDeinit(&qemu_driver->domains); + if (qemu_driver->macFilter) { + if ((errno = networkEnableAllFrames(qemu_driver))) { + virReportSystemError(NULL, errno, + _("failed to add rule to allow all frames in '%s'"), + __FILE__); + } + } + VIR_FREE(qemu_driver->securityDriverName); VIR_FREE(qemu_driver->logDir); VIR_FREE(qemu_driver->configDir); -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

2 1

[libvirt] libvir: QEMU error : remoteDomainProcessEvent: unmarshalling msg
by ajia 25 Nov '09

25 Nov '09

Hi all, I create successfully a vm, then opening one terminal to run example event-python.py from libvirt-0.7.4 source code package with qemu:///system parameter.in another opening terminal,running basic domain operation, such as undefine/define/start/destroy.but original terminal display information "libvir: QEMU error : remoteDomainProcessEvent: unmarshalling msg" . test environment details is as following: [root@localhost events-python]# uname -a Linux localhost.localdomain 2.6.31.5-127.fc12.i686.PAE #1 SMP Sat Nov 7 21:25:57 EST 2009 i686 i686 i386 GNU/Linux [root@localhost events-python]# lsmod|grep kvm kvm_intel 39856 0 kvm 140260 1 kvm_intel [root@localhost events-python]# rpm -qa|grep virt virt-v2v-0.2.0-1.fc12.noarch virtuoso-opensource-conductor-5.0.12-1.fc12.noarch libvirt-python-0.7.1-15.fc12.i686 virtuoso-opensource-apps-5.0.12-1.fc12.i686 virtuoso-opensource-doc-5.0.12-1.fc12.noarch virtuoso-opensource-5.0.12-1.fc12.i686 virt-manager-0.8.0-7.fc12.noarch virtuoso-opensource-utils-5.0.12-1.fc12.i686 virt-ctrl-1.0.1-4.fc12.i686 virt-top-1.0.4-1.fc12.1.i686 virt-viewer-0.2.0-1.fc12.i686 virtaal-0.4.1-1.fc12.noarch libvirt-client-0.7.1-15.fc12.i686 python-virtinst-0.500.0-5.fc12.noarch virt-mem-0.3.1-9.fc12.i686 libvirt-0.7.1-15.fc12.i686 1. open one terminal and run event-test.py [root@localhost events-python]# python event-test.py qemu:///system Using uri:qemu:///system libvir: QEMU error : remoteDomainProcessEvent: unmarshalling msg libvir: Remote error : unknown program (received 77696e78, expected 20008086) libvir: Remote error : unknown program (received 77696e78, expected 20008086) libvir: Remote error : unknown program (received 77696e78, expected 20008086) 2.open another termial and run basic domain operation [root@localhost ajia]# virsh list --all Id Name State ---------------------------------- - winxp shut off [root@localhost ajia]# virsh undefine winxp Domain winxp has been undefined [root@localhost ajia]# virsh define winxp.xml Domain winxp defined from winxp.xml [root@localhost ajia]# virsh start winxp Domain winxp started [root@localhost ajia]# virsh destroy winxp Domain winxp destroyed I am puzzled to domain event handler,and I don't clear if is libvirt version different problem or I miss some stuff. I would be most grateful for any response . Best Regards, Alex Jia

2 1

[libvirt] [PATCH] fix xenDaemonListDefinedDomains
by Jim Fehlig 25 Nov '09

25 Nov '09

Commit 790f0b3057787bb64da8c46c111ff8d3eff7b2af causes contents of names array to be freed even on success, resulting in no listing of defined but inactive Xen domains. Patch below fixes it. Regards, Jim

3 3

[libvirt] libvirt-java has been released
by Bryan Kearney 24 Nov '09

24 Nov '09

I have updated the libvirt-java bindings with most APIS up through version 0.7.0. I have made 2 releases of the code: 0.3.2 - This release contains the APIS up through 0.6.1 0.4.0 - This release contains the APIs up through 0.7.0 You can access the latest version of the APIs through the following means: Source Code: http://www.libvirt.org/git/?p=libvirt-java.git;a=summary Bundled Source (tarball and SRPM): http://libvirt.org/sources/java/ Maven: http://libvirt.org/maven2/ RPMS are making their way through F-11 and F12 build systems. -- bk

1 0

[libvirt] [PATCH 0/2] Add MAC filtering to qemu
by Gerhard Stenzel 24 Nov '09

24 Nov '09

The following series of patches is a prototype implementation of a ebtables based MAC address filter. I hope to have addressed all the previous comments. At the moment, some defaults are set when libvirtd starts and when a domain is started or destroyed. The plan is to extend this filter capability to the API level and virsh command level. The plan is also to add more filtering features like VLAN filtering and QoS filtering. Thanks, Gerhard --- Gerhard Stenzel (2): add MAC address based port filtering to qemu add ebtables wrapper configure.in | 3 po/POTFILES.in | 1 src/Makefile.am | 5 src/libvirt_private.syms | 7 + src/qemu/qemu.conf | 2 src/qemu/qemu_bridge_filter.c | 108 ++++++++++ src/qemu/qemu_bridge_filter.h | 39 ++++ src/qemu/qemu_conf.c | 25 ++ src/qemu/qemu_conf.h | 4 src/qemu/qemu_driver.c | 16 + src/util/ebtables.c | 441 +++++++++++++++++++++++++++++++++++++++++ src/util/ebtables.h | 65 ++++++ 12 files changed, 715 insertions(+), 1 deletions(-) create mode 100644 src/qemu/qemu_bridge_filter.c create mode 100644 src/qemu/qemu_bridge_filter.h create mode 100644 src/util/ebtables.c create mode 100644 src/util/ebtables.h -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Erich Baier Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

4 16

[libvirt] virt-manager and messages in /var/log/messages
by Chandru 23 Nov '09

23 Nov '09

Apologies if this has been already discussed. While using virt-manager to create a vm-guest we see the following errors being logged in /var/log/messages. libvirtd: 22:40:57.675: error : Domain not found: no domain with matching name 'guest1' libvirtd: 22:42:22.039: error : invalid storage volume pointer in no storage vol with matching path libvirtd: 22:44:55.530: error : Domain not found: no domain with matching uuid While these errors are indeed harmless and we are able to create and use a vm-guest, why log them as error messages. Could we convert them into informational messages. Though they could mean errors in other scenarios, but could we tweak or change them in a way that they could be logged in as informational messages and not as error messages. A end user would not know what to do with them. Thanks, Chandru

1 1

[libvirt] [PATCH] fix html validation
by Dan Kenigsberg 22 Nov '09

22 Nov '09

--- docs/news.html.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index d69348c..83f0461 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -21,11 +21,11 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> Fix typo in error message (Matthew Booth) esx: Add documentation to the website (Matthias Bolte) AppArmor updates of examples (Jamie Strandboge) - Add documentation for <channel> domain element (Matthew Booth) + Add documentation for <channel> domain element (Matthew Booth) Separate character device doc guest and host parts (Matthew Booth) Add a Python example that lists active ESX domains (Matthias Bolte) LXC fix wrong or out-of-date function descriptions (Ryota Ozaki) - docs: <clock> property is 'offset', not 'sync' (Cole Robinson) + docs: <clock> property is 'offset', not 'sync' (Cole Robinson) Update the documentation for virDomainMigrateToURI (Chris Lalancette) fix virDomainMigrateToURI doc (Dan Kenigsberg) </li> @@ -118,7 +118,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> test: Add testDomainShutdownState helper (Cole Robinson) Properly convert port numbers to/from network byte order (Matthew Booth) phyp add create() and destroy() support (Eduardo Otubo) - Support for <channel> in domain and QEmu backend (Matthew Booth) + Support for <channel> in domain and QEmu backend (Matthew Booth) Detect availability of QEMU -chardev CLI option (Matthew Booth) Allow character devices to have different target types (Matthew Booth) LXC allow container to have ethN interfaces (Ryota Ozaki) -- 1.6.5.2

2 1

[libvirt] Re: [virt-tools-list] Guests and Server Reboots
by Cole Robinson 22 Nov '09

22 Nov '09

On 11/20/2009 08:16 AM, Thomas Baker wrote: cc-ing libvirt-list, since that's where this functionality would live. > > I'm running virt-manager 0.7 on Fedora 11 and I recently converted a parallels win2003 server over to run there. I've been running Xen paravirt guests under CentOS 5 and when I reboot that server, the guests are paused, the reboot occurs, and then the guests are unpaused. > > My question is what happens under F11 on a server reboot? It appears that the guests are just shut off instead of being paused? Is there a way to pause them before a reboot automatically? > This behavior has been requested before: https://bugzilla.redhat.com/show_bug.cgi?id=444273 No patches yet though. - Cole

1 0

[libvirt] [PATCH 0/2] Disallow attach/detach device on inactive domains
by Jim Fehlig 20 Nov '09

20 Nov '09

This small patch series improves virDomain{Attach,Detach}Device documentation and disallows these operation on inactive domains in Xen driver as discussed here http://www.redhat.com/archives/libvir-list/2009-November/msg00513.html Jim Fehlig (2): Improve virDomain{Attach,Detach}Device documentation Disallow attach/detach device in Xen driver src/libvirt.c | 6 ++++-- src/xen/xend_internal.c | 22 ++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-)

3 6

[libvirt] Release of libvirt-0.7.4
by Daniel Veillard 20 Nov '09

20 Nov '09

Nearly as expected, but the 0.7.3 release had a missing file and some broken dependancies, so I rolled out a new release immediately. Available as usual at ftp://libvirt.org/libvirt/ The rate of changes doesn't seems to slow down, though this release is more about incremental improvements, bug fixes and cleanups than major new features: Features: - Implement a node device backend using libudev (David Allan) - New APIs for checking some object properties (Daniel P. Berrange) - Fully asynchronous monitor I/O processing (Daniel P. Berrange) - add MAC address based port filtering to qemu (Gerhard Stenzel) - Support for IPv6 / multiple addresses per interfaces (Laine Stump) Documentation: - Document overriding domain interface target (Cole Robinson) - 514532 Fix man page, most operation are synchronous (Daniel Veillard) - Fix typo in error message (Matthew Booth) - esx: Add documentation to the website (Matthias Bolte) - AppArmor updates of examples (Jamie Strandboge) - Add documentation for <channel> domain element (Matthew Booth) - Separate character device doc guest and host parts (Matthew Booth) - Add a Python example that lists active ESX domains (Matthias Bolte) - LXC fix wrong or out-of-date function descriptions (Ryota Ozaki) - docs: <clock> property is 'offset', not 'sync' (Cole Robinson) - Update the documentation for virDomainMigrateToURI (Chris Lalancette) - fix virDomainMigrateToURI doc (Dan Kenigsberg) Bug fixes: - 504262 Check for duplicated UUID in XM Xen defines (Daniel Veillard) - 512069 fix domain XML schemas for backward compatibility (Daniel Veillard) - qemu-kvm needs -enable-kvm flag for VT optimization (Steve Yarmie) - fix deprecated iptables command syntax (Steve Yarmie) - Ensure driver lock is released when entering QEMU monitor (Daniel P. Berrange) - only remove masquerade roles for VIR_NETWORK_FORWARD_NAT (Guido Günther) - esx: Fix CPU clock Hz to MHz conversion (Matthias Bolte) - esx: Fix memory leak in esxVI_HostCpuIdInfo_Free() (Matthias Bolte) - esx: Fix MAC address formatting (Matthias Bolte) - Fix compilation of libvirt against xen-unstable (Jim Fehlig) - Fix probing for libpciaccess (Daniel P. Berrange) - Fix incorrect reference counting logic in qemu monitor open (Daniel P. Berrange) - Don't return fatal error in HAL driver init if HAL isn't running (Daniel P. Berrange) - Fix cleanup when state driver init fails (Daniel P. Berrange) - AppArmor handling of accesses to readonly files (Jamie Strandboge) - AppArmor require absolute paths (Jamie Strandboge) - Check that domain is running when starting console (Daniel P. Berrange) - Fix incorrect variable passed to LXC event callback (Daniel P. Berrange) - Fix race condition in HAL driver startup (Daniel P. Berrange) - Remove capng_lock() call when spawning LXC container init process (Daniel P. Berrange) - Fix initscript to check daemon pidfile (Daniel P. Berrange) - Filter out stale domains from xenstore listing (Daniel P. Berrange) - Fix logic in xenUnifiedNumOfDomains to match xenUnifiedListDomains (Jonas Eriksson) - Disable IPv6 socket auto-binding to IPv4 socket (Daniel P. Berrange) - Fix save and restore with non-privileged guests and SELinux (Daniel P. Berrange) - Prevent initializing ebtables if disabled in qemu.conf (Ryota Ozaki) - phyp: too much timeout when polling socket (Eduardo Otubo) - phyp: ssh authentication with public key fixed (Eduardo Otubo) - opennebula: Fix potential memory/mutex leak in state driver startup (Matthias Bolte) - phyp: Break potential infinite loops (Matthias Bolte) - phyp: Fix memory/session leaks and potential invalid frees (Matthias Bolte) - storage: conf: Fix memory leak in encryption parsing (Cole Robinson) - Fix improper error return in virInterfaceDefParseProtoIPvX (Laine Stump) - Fix virInterfaceIpDefPtr leak during virInterfaceIpDefFree (Laine Stump) - give up python interpreter lock before calling cb (Dan Kenigsberg) - ESX: Fix memory leak in list handling functions. (Matthias Bolte) - Fix --with-init-script configure option (Matthew Booth) - Don't let parent of daemon exit until basic initialization is done (Daniel P. Berrange) - Fix configure detection of device mapper (Pritesh Kothari) - Remote code caught EINTR making it ininterruptable (Daniel Veillard) - virterror: Add a missing 'break' for VIR_ERR_INVALID_SECRET (Cole Robinson) - Fix p2p migration without a passed uri. (Cole Robinson) - Fix problems in the Xen inotify driver. (Matthias Bolte) - Remove a completely bogus reference increment in the Xen driver. (Chris Lalancette) - 528575 avoid libvirtd crash on LCX domain autostart (Daniel Veillard) - Fix SELinux linking issues (Jim Fehlig) - node device: Fix locking issue in virNodeDeviceDestroy (Cole Robinson) - LXC fix virCgroupGetValueStr problem with \n (Ryota Ozaki) - Avoid crash in virBufferEscapeString (Laine Stump) - LXC complement PATH environment variable (Ryota Ozaki) Improvements: - Enable udev instead of hal on F12 / RHEL-6 or later (Daniel P. Berrange) - python: Actually implement list*Interfaces bindings (Cole Robinson) - esx: Handle 'vmxnet3' in esxVMX_FormatEthernet() (Matthias Bolte) - Fix check for existance of cgroups at creation (Daniel P. Berrange) - Fix virt-aa-helper when host and os.type arch differ (Jamie Strandboge) - Add translation of PCI vendor and product IDs (David Allan) - Add scsi_target device type (David Allan) - Add several fields to node device capabilities (David Allan) - Add virConnectGetLibvirtVersion API (Cole Robinson) - Implement finer grained migration control for Xen (Maximilian Wilhelm) - Support for SATA Disks in virDomainDiskBus (pritesh) - LXC implement missing DomainInterfaceStats API (Ryota Ozaki) - disable mac_filter config switch by default (Gerhard Stenzel) - phyp: Reorder keyboard_interactive label in openSSHSession() (Eduardo Otubo) - Implmentation of new APIs to checking state/persistence of objects (Daniel P. Berrange) - Allow timeouts waiting for QEMU job lock (Daniel P. Berrange) - Release driver and domain lock when running monitor commands (Daniel P. Berrange) - Add reference counting on virDomainObjPtr objects (Daniel P. Berrange) - Locking of the qemuMonitorPtr object (Daniel P. Berrange) - Wrap text mode monitor APIs, pass qemuMonitorPtr directly to APIs (Daniel P. Berrange) - Move encryption lookup back into qemu driver file (Daniel P. Berrange) - Make use of private data structure for monitor state (Daniel P. Berrange) - Add a new timed condition variable wait API (Daniel P. Berrange) - Fix errno handling for pthreads wrappers (Daniel P. Berrange) - 524280 pass max lease option to dnsmasq (Daniel Veillard) - Store the range size when adding a DHCP range (Daniel Veillard) - qemu: Allow cpu pinning for all logical CPUs, not just physical (Cole Robinson) - qemu: Use same create/define overwrite logic for migration prepare. (Cole Robinson) - qemu: Break out function to check if we can create/define/restore (Cole Robinson) - Add sentinel attribute for NULL terminated arg lists (Paolo Bonzini) - test: Update inactive guest config on shutdown (Cole Robinson) - test: Add testDomainShutdownState helper (Cole Robinson) - Properly convert port numbers to/from network byte order (Matthew Booth) - phyp add create() and destroy() support (Eduardo Otubo) - Support for <channel> in domain and QEmu backend (Matthew Booth) - Detect availability of QEMU -chardev CLI option (Matthew Booth) - Allow character devices to have different target types (Matthew Booth) - LXC allow container to have ethN interfaces (Ryota Ozaki) - New ebtables module wrapper (Gerhard Stenzel) - test: Implement virDomainPinVcpu (Cole Robinson) - test: Implement virDomainGetVcpus (Cole Robinson) - test: Update vcpu runtime info in SetVcpus (Cole Robinson) - test: Use privateData to track running VM vcpu state (Cole Robinson) - test: Break out wrapper for setting up started domain state. (Cole Robinson) - test: Fixes for SetVcpus (Cole Robinson) - Make monitor type (miimon/arpmon) optional in bond xml (Laine Stump) - Support reporting live interface IP/netmask (Laine Stump) - Make startmode optional in toplevel interface definition (Laine Stump) - Move libvirtd event loop into background thread (Daniel P. Berrange) - Allow NULL mac address in virGetInterface (Laine Stump) - ESX: Don't automatically follow redirects. (Matthias Bolte) - ESX: Change disk selection for datastore detection. (Matthias Bolte) - ESX: Fallback to the preliminary name if the datastore cannot be found. (Matthias Bolte) - Set KMEMSIZE for OpenVZ domains being defined (Yuji NISHIDA) - Allow for a driver specific private data blob in virDomainObjPtr (Daniel P. Berrange) - More network utility functions (Matthew Booth) - Add symbols from new network.h module (Daniel Veillard) - Set of new network related utilities (Daniel Veillard) - Convert virDomainObjListPtr to use a hash of domain objects (Daniel P. Berrange) - qemu: migrate: Don't require manual URI to specify a port (Cole Robinson) - test: Support virStorageFindPoolSources (Cole Robinson) - storage: Add ParseSourceString function for use with FindPoolSources. (Cole Robinson) - Add support for an external TFTP boot server (Paolo Bonzini) - test: Support virNodeDeviceCreate and virNodeDeviceDestroy (Cole Robinson) - Consolidate virXPathNodeSet() (Daniel Veillard) - Support QEMU watchdog device. (Richard Jones) - Do not log rotate very small logs (Dan Kenigsberg) - LXC implement missing macaddr assignment feature (Ryota Ozaki) - tests: Initialize virRandom in for test suite. (Cole Robinson) - tests: Add storage volume XML 2 XML tests. (Cole Robinson) - tests: Add network XML to XML tests. (Cole Robinson) - schema: Update network schema. (Cole Robinson) - tests: Add XML 2 XML tests for storage pools. (Cole Robinson) - tests: Break out duplicate schema verification functionality. (Cole Robinson) - tests: Fix text output for interface XML 2 XML (Cole Robinson) - Add ocfs2 to list of fs pool types (Jim Fehlig) - Finer grained migration control (Chris Lalancette) Cleanups: - remove sysfs_path and parent_sysfs_path from XML (Dave Allan) - Removing devicePath member from dev struct (Dave Allan) - report OOM in two places in node_device_driver.c (Dave Allan) - Whitespace cleanup for pre-tags on the website (Matthias Bolte) - Fix type in configure output summary (Daniel P. Berrange) - Remove a compilation warning on uninitialized var (Daniel Veillard) - Change DTD references to use public instead of system identifier (Matthias Bolte) - Remove obsolete devicekit checks (Daniel P. Berrange) - Small guestfwd code cleanup (Matthew Booth) - Small indentation cleanup of domain schema (Matthew Booth) - AppArmor code cleanups (Jamie Strandboge) - Fix formatting of XML for an inactive guest (Daniel P. Berrange) - Remove DevKit node device backend (David Allan) - Exclude numactl on s390[x] (Daniel P. Berrange) - Fix error handling in qemuMonitorOpen (Ryota Ozaki) - Fix warning on make due to missing cast (int) (Ryota Ozaki) - Various fixes following a code review part 2 (Daniel Veillard) - Various fixes following a code review (Daniel Veillard) - Move code for low level QEMU monitor interaction into separate file (Daniel P. Berrange) - Make pciDeviceList struct opaque (Daniel P. Berrange) - Add missing OOM error checks, reports and cleanups (Matthias Bolte) - Removes the ebtablesSaveRules() function (Gerhard Stenzel) - phyp: Use actual error code instead of 0 (Matthias Bolte) - phyp: Don't use VIR_ALLOC if a stack variable is good enough (Matthias Bolte) - phyp: Fix several UUID table related problems (Matthias Bolte) - phyp: Check for exit_status < 0 before parsing the result (Matthias Bolte) - phyp: memcpy/memmove/memset can't fail, so don't check for error (Matthias Bolte) - phyp: Make generic domain listing functions return -1 in case of error (Matthias Bolte) - Fix configure check for libssh2 (Matthias Bolte) - Repair getIPv4Addr after the ntohl conversion (Daniel Veillard) - Cleanup whitespace in docs (Matthew Booth) - Use virBuffer when building QEMU char dev command line (Matthew Booth) - Cleanup virBuffer usage in qemdBuildCommandLine (Matthew Booth) - Fix some cut-and-paste error in migration code (Paolo Bonzini) - Ensure guestfwd address is IPv4 and various cleanups (Matthew Booth) - LXC cleanup deep indentation in lxcDomainSetAutostart (Ryota Ozaki) - LXC messages cleanup and fix lxcError (Ryota Ozaki) - qemu: Remove compiled out localhost migration support (Cole Robinson) - Various error reporting fixes (Cole Robinson) - Improve error reporting for virConnectGetHostname calls (Cole Robinson) - Fix up NLS warnings. (Chris Lalancette) - Remove redundant virFileDeletePID() call (Chris Lalancette) - Fix return value in virStateInitialize impl for LXC (Daniel P. Berrange) - ESX: Unify naming of VI API utility and convenience functions. (Matthias Bolte) - Rename internal APis (Daniel P. Berrange) - Pull signal setup code out into separate method (Daniel P. Berrange) - Fix duplicating logging of errors in libvirtd (Daniel P. Berrange) - Fix initialization order bugs (Daniel P. Berrange) - Misc cleanup to network socket init (Daniel P. Berrange) - Annotate many methods with ATTRIBUTE_RETURN_CHECK & fix problems (Daniel P. Berrange) - Don't use private struct member names of in6_addr (Matthias Bolte) - Fix typo in network.c function comments (Matthew Booth) - libvirt-devel should only require libvirt-client (Mark McLoughlin) - qemu: Fix an error message in GetVcpus (Cole Robinson) - storage: Break out function to add pool source to a SourceList. (Cole Robinson) - storage: Break out pool source parsing to a separate function. (Cole Robinson) - Fix some typos in comments (Dan Kenigsberg) - Fix error message in qemudLoadDriverConfig() (Matthias Bolte) - Add a new syntax-check rule for gethostname. (Chris Lalancette) - Various syntax-check fixes. (Chris Lalancette) - Tighten up nonreentrant syntax-check. (Chris Lalancette) - Replace a gethostname by virGetHostname in libvirtd.c (Chris Lalancette) - Replace two strcmp() by STREQ() in qemu_driver.c (Chris Lalancette) - Replace gethostname by virGetHostname in xend_internal.c (Chris Lalancette) - Add a default log_level to qemudSetLogging to remove a build warning. (Chris Lalancette) - Better error message when libvirtd fails to start. (Chris Lalancette) - Fix potential false-positive OOM error reporting. (Matthias Bolte) - Fix virsh.c compilation warning (Jim Fehlig) - Fix a make dist error due to wrong EXTRA_DIST paths (Daniel Veillard) - node device: Break out get_wwns and get_parent_node helpers (Cole Robinson) - tests: Centralize VIR_TEST_DEBUG lookup, and document it (Cole Robinson) - Remove bogus const annotations to hash iterator (Daniel P. Berrange) - Remove bashisms from schema tests. (Matthias Bolte) - Don't copy old machines from a domain which has none (Mark McLoughlin) Thanks everybody for your contributions ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Enable udev instead of hal on F12 / RHEL-6 or later
by Daniel P. Berrange 20 Nov '09

20 Nov '09

HAL has been deprecated since F12 and RHEL-6, so if building on these platforms, switch on the udev driver instead * libvirt.spec.in: Activate udev on F12/RHEL6 --- libvirt.spec.in | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f2933ad..a2ace2c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -53,12 +53,13 @@ %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} -%define with_hal 0%{!?_without_hal:%{server_drivers}} # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} %define with_netcf 0%{!?_without_netcf:0} +%define with_udev 0%{!?_without_udev:0} +%define with_hal 0%{!?_without_hal:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -133,6 +134,13 @@ %define with_netcf 0%{!?_without_netcf:%{server_drivers}} %endif +# udev is used to manage host devices in Fedora 12 / RHEL-6 or newer +%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%define with_udev 0%{!?_without_udev:%{server_drivers}} +%else +%define with_hal 0%{!?_without_hal:%{server_drivers}} +%endif + # Force QEMU to run as non-root %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define qemu_user qemu @@ -179,6 +187,9 @@ Requires: iptables %if %{with_hal} Requires: hal %endif +%if %{with_udev} +Requires: udev >= 145 +%endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 @@ -242,6 +253,10 @@ BuildRequires: gnutls-devel %if %{with_hal} BuildRequires: hal-devel %endif +%if %{with_udev} +BuildRequires: libudev-devel >= 145 +BuildRequires: libpciaccess-devel >= 0.10.9 +%endif %if %{with_avahi} BuildRequires: avahi-devel %endif @@ -476,6 +491,10 @@ of recent versions of Linux (and other OSes). %define _without_hal --without-hal %endif +%if ! %{with_udev} +%define _without_udev --without-udev +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -502,6 +521,7 @@ of recent versions of Linux (and other OSes). %{?_without_netcf} \ %{?_without_selinux} \ %{?_without_hal} \ + %{?_without_udev} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ -- 1.6.5.2

2 1

[libvirt] [PATCH] docs: Document overriding domain interface target
by Cole Robinson 20 Nov '09

20 Nov '09

People have been confused about this in the past, so document that vnet and vif are reserved names and will be ignored if manually specified. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html.in | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 05047d3..5b7aa10 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -484,7 +484,8 @@ of the box which does NAT'ing to the default route and has an IP range of <code>192.168.22.0/255.255.255.0</code>. Each guest will have an associated tun device created with a name of vnetN, which can also be - overridden with the <target> element. + overridden with the <target> element (see + <a href="#elementsNICSTargetOverride">overriding the target element</a>). </p> <pre> @@ -514,10 +515,11 @@ there is a bridge device on the host which has one or more of the hosts physical NICs enslaved. The guest VM will have an associated tun device created with a name of vnetN, which can also be overridden with the - <target> element. The tun device will be enslaved to the bridge. - The IP range / network configuration is whatever is used on the LAN. This - provides the guest VM full incoming & outgoing net access just like a - physical machine. + <target> element (see + <a href="#elementsNICSTargetOverride">overriding the target element</a>). + The tun device will be enslaved to the bridge. The IP range / network + configuration is whatever is used on the LAN. This provides the guest VM + full incoming & outgoing net access just like a physical machine. </p> <pre> @@ -652,6 +654,25 @@ qemu-kvm -net nic,model=? /dev/null ne2k_isa i82551 i82557b i82559er ne2k_pci pcnet rtl8139 e1000 virtio </p> + <h5><a name="elementsNICSTargetOverride">Overriding the target element</a></h5> + + <pre> + ... + <interface type='network'> + <source network='default'/> + <b><target dev='vnet1'/></b> + </interface> + ...</pre> + + <p> + If no target is specified, certain hypervisors will automatically + generate a name for the created tun device. This name can be manually + specifed, however the name <i>must not start with either 'vnet' or + 'vif'</i>, which are prefixes reserved by libvirt and certain + hypervisors. Manually specified targets using these prefixes will be + ignored. + </p> + <h4><a name="elementsInput">Input devices</a></h4> <p> -- 1.6.5.2

2 1

[libvirt] [PATCH] python: Actually implement list*Interfaces
by Cole Robinson 20 Nov '09

20 Nov '09

These have never worked. Would be nice to get this in the pending release! Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- python/generator.py | 4 +- python/libvirt-override-api.xml | 10 ++++ python/libvirt-override.c | 102 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 0b32116..3fd7f90 100755 --- a/python/generator.py +++ b/python/generator.py @@ -260,13 +260,13 @@ skip_impl = ( 'virConnectListDefinedDomains', 'virConnectListNetworks', 'virConnectListDefinedNetworks', - 'virConnectListInterfaces', - 'virConnectListDefinedInterfaces', 'virConnectListSecrets', + 'virConnectListInterfaces', 'virConnectListStoragePools', 'virConnectListDefinedStoragePools', 'virConnectListStorageVols', 'virConnectListDefinedStorageVols', + 'virConnectListDefinedInterfaces', 'virConnGetLastError', 'virGetLastError', 'virDomainGetInfo', diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 4e55182..96958b5 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -211,5 +211,15 @@ <return type='char *' info='the UUID string or None in case of error'/> <arg name='secret' type='virSecretPtr' info='a secret object'/> </function> + <function name='virConnectListInterfaces' file='python'> + <info>list the running interfaces, stores the pointers to the names in @names</info> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <return type='str *' info='the list of Names of None in case of error'/> + </function> + <function name='virConnectListDefinedInterfaces' file='python'> + <info>list the defined interfaces, stores the pointers to the names in @names</info> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <return type='str *' info='the list of Names of None in case of error'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 20037ef..b885190 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1761,6 +1761,106 @@ libvirt_virSecretSetValue(PyObject *self ATTRIBUTE_UNUSED, return py_retval; } +static PyObject * +libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char **names = NULL; + int c_retval, i; + virConnectPtr conn; + PyObject *pyobj_conn; + + + if (!PyArg_ParseTuple(args, (char *)"O:virConnectListInterfaces", &pyobj_conn)) + return(NULL); + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + c_retval = virConnectNumOfInterfaces(conn); + if (c_retval < 0) + return VIR_PY_NONE; + + if (c_retval) { + names = malloc(sizeof(*names) * c_retval); + if (!names) + return VIR_PY_NONE; + c_retval = virConnectListInterfaces(conn, names, c_retval); + if (c_retval < 0) { + free(names); + return VIR_PY_NONE; + } + } + py_retval = PyList_New(c_retval); + if (py_retval == NULL) { + if (names) { + for (i = 0;i < c_retval;i++) + free(names[i]); + free(names); + } + return VIR_PY_NONE; + } + + if (names) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + free(names[i]); + } + free(names); + } + + return(py_retval); +} + + +static PyObject * +libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char **names = NULL; + int c_retval, i; + virConnectPtr conn; + PyObject *pyobj_conn; + + + if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDefinedInterfaces", + &pyobj_conn)) + return(NULL); + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + c_retval = virConnectNumOfDefinedInterfaces(conn); + if (c_retval < 0) + return VIR_PY_NONE; + + if (c_retval) { + names = malloc(sizeof(*names) * c_retval); + if (!names) + return VIR_PY_NONE; + c_retval = virConnectListDefinedInterfaces(conn, names, c_retval); + if (c_retval < 0) { + free(names); + return VIR_PY_NONE; + } + } + py_retval = PyList_New(c_retval); + if (py_retval == NULL) { + if (names) { + for (i = 0;i < c_retval;i++) + free(names[i]); + free(names); + } + return VIR_PY_NONE; + } + + if (names) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + free(names[i]); + } + free(names); + } + + return(py_retval); +} + /******************************************* * Helper functions to avoid importing modules * for every callback @@ -2472,6 +2572,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListSecrets", libvirt_virConnectListSecrets, METH_VARARGS, NULL}, {(char *) "virSecretGetValue", libvirt_virSecretGetValue, METH_VARARGS, NULL}, {(char *) "virSecretSetValue", libvirt_virSecretSetValue, METH_VARARGS, NULL}, + {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL}, + {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.6.5.2

2 1

[libvirt] [PATCH] 514532 Fix man page, most operation are synchronous
by Daniel Veillard 20 Nov '09

20 Nov '09

As pointed in https://bugzilla.redhat.com/show_bug.cgi?id=514532 we were historically warning about operation being asynchronous in the man page but actually most operations are synchronous. I still kept a warning about domain creation and shutdown, maybe we should add a few more, but as is this is mostly correct and better than the current description IMHO Maybe we should flag formally in the description all APIs which have an asynchronous behaviour. 514532 Fix man page, most operation are synchronous * tools/virsh.pod: the man page was stating that most operations are asynchronous while in fact most of them are synchronous except domain creation and shutdown diff --git a/tools/virsh.pod b/tools/virsh.pod index 55ec64a..2986c34 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -40,12 +40,11 @@ Most B<virsh> commands require root privileges to run due to the communications channels used to talk to the hypervisor. Running as non root will return an error. -Most B<virsh> commands act asynchronously, so just because the B<virsh> -program returned, doesn't mean the action is complete. This is -important, as many operations on domains, like create and shutdown, -can take considerable time (30 seconds or more) to bring the machine -into a fully compliant state. If you want to know when one of these -actions has finished you must poll through virsh list periodically. +Most B<virsh> commands act synchronously, except maybe shutdown +and domain creation. In those case the fact that the B<virsh> +program returned, may not mean the action is complete and you +must poll through virsh list periodically to detect that the +operation completed. =head1 GENERIC COMMANDS -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] Check for duplicated UUID in XM Xen defines
by Daniel Veillard 20 Nov '09

20 Nov '09

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=504262 where the xen drivers happily allows to define domains with conflicting UUID. This is similar to the virDomainObjIsDuplicate check done in other drivers but the internal structures are different so this need to be done in a special way Author: Daniel Veillard <veillard(a)redhat.com> Date: Tue Nov 17 12:06:46 2009 +0100 504262 Check for duplicated UUID in XM Xen defines * src/xen/xm_internal.c: the XM driver was not checking for previously defined UUID on new defines. Similar to virDomainObjIsDuplicate() behaviour. diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index f833ce7..47bcc11 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -2623,6 +2623,26 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { return (NULL); } + /* + * check that if there is another domain defined with the same uuid + * it has the same name + */ + if ((entry = virHashSearch(priv->configCache, xenXMDomainSearchForUUID, + (const void *)&(def->uuid))) != NULL) { + if ((entry->def != NULL) && (entry->def->name != NULL) && + (STRNEQ(def->name, entry->def->name))) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(entry->def->uuid, uuidstr); + xenXMError(conn, VIR_ERR_OPERATION_FAILED, + _("domain '%s' is already defined with uuid %s"), + entry->def->name, uuidstr); + entry = NULL; + goto error; + } + entry = NULL; + } + if (virHashLookup(priv->nameConfigMap, def->name)) { /* domain exists, we will overwrite it */ -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] 512069 fix domain XML schemas for backward compatibility
by Daniel Veillard 20 Nov '09

20 Nov '09

https://bugzilla.redhat.com/show_bug.cgi?id=512069 512069 fix domain XML schemas for backward compatibility For backward compatibility we used to add the tty path as a tty attribute on console of type pty, duplicating the value now found in source/@path, but the Relax-NG grammar wasn't extended for this <console type='pty' tty='/dev/pts/8'> <source path='/dev/pts/8'/> <target port='0'/> </console> * docs/schemas/domain.rng: allow an optional tty attribute containing a devicePath diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 1bf44fd..e726801 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -931,6 +931,11 @@ --> <define name="qemucdev"> <ref name="qemucdevSrcType"/> + <optional> + <attribute name="tty"> + <ref name="devicePath"/> + </attribute> + </optional> <interleave> <ref name="qemucdevSrcDef"/> <optional> -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] PATCH: recent qemu-kvm requires -enable-kvm flag to activate VT optimization
by Steve Yarmie 20 Nov '09

20 Nov '09

Hello, Recent qemu releases require command option '-enable-qemu' in order for the kvm functionality be activated. Libvirt needs to pass this flag to qemu when starting a domain. Note that without the option, even if both the kernel and qemu support KVM, KVM will not be activated and VMs will be slow as molasses ;) I added a check in qemu_conf.c to see if `qemu -help` emits the -enable-kvm flag, and if so, use the flag accordingly. There exists a check in src/qemu/qemu_conf.c to check for the -no-kvm flag. This check works the same way. Adding the included code will not break systems where qemu does not have the option. See 'qemu -help': ... -enable-kvm enable KVM full virtualization support ... included patch against src/qemu/qemu_conf.{c,h} -Steve diff -ur libvirt/src/qemu/qemu_conf.c libvirt-qemu-enable-kvm/src/qemu/qemu_conf.c --- libvirt/src/qemu/qemu_conf.c 2009-11-08 20:57:08.438908134 -0800 +++ libvirt-qemu-enable-kvm/src/qemu/qemu_conf.c 2009-11-08 22:36:04.299921427 -0800 @@ -1602,6 +1602,7 @@ struct utsname ut; int disableKQEMU = 0; int disableKVM = 0; + int enableKVM = 0; int qargc = 0, qarga = 0; const char **qargv = NULL; int qenvc = 0, qenva = 0; @@ -1660,6 +1661,15 @@ def->virtType == VIR_DOMAIN_VIRT_QEMU) disableKVM = 1; + /* Should explicitly enable KVM if + * 1. Guest domain is 'qemu' + * 2. The qemu binary has the -enable-kvm flag + * NOTE: user must be responsible to load the kvm modules + */ + if ((qemuCmdFlags & QEMUD_CMD_FLAG_ENABLE_KVM) && + def->virtType == VIR_DOMAIN_VIRT_QEMU) + enableKVM = 1; + /* * Need to force a 32-bit guest CPU type if * @@ -1787,6 +1797,8 @@ ADD_ARG_LIT("-no-kqemu"); if (disableKVM) ADD_ARG_LIT("-no-kvm"); + if (enableKVM) + ADD_ARG_LIT("-enable-kvm"); ADD_ARG_LIT("-m"); ADD_ARG_LIT(memory); if (def->hugepage_backed) { diff -ur libvirt/src/qemu/qemu_conf.h libvirt-qemu-enable-kvm/src/qemu/qemu_conf.h --- libvirt/src/qemu/qemu_conf.h 2009-11-08 20:57:08.438908134 -0800 +++ libvirt-qemu-enable-kvm/src/qemu/qemu_conf.h 2009-11-08 14:57:39.000000000 -0800 @@ -73,6 +73,7 @@ QEMUD_CMD_FLAG_XEN_DOMID = (1 << 20), /* -xen-domid (new style xen integration) */ QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX = (1 << 21), /* Does qemu support unix domain sockets for migration? */ QEMUD_CMD_FLAG_CHARDEV = (1 << 22), /* Is the new -chardev arg available */ + QEMUD_CMD_FLAG_ENABLE_KVM = (1 << 23), /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */ }; /* Main driver state */

3 7

[libvirt] PATCH: iptables.c: fix deprecated cmd syntax
by Steve Yarmie 20 Nov '09

20 Nov '09

default iptables rules uses deprecated cmdline syntax When using iptables-1.4.5 with libvirt warnings appear: debug : virRun:827 : Command stderr: Using intrapositioned negation (`--option ! this`) is deprecated in favor of extrapositioned (`! --option this`). simple patch against src/util/iptables.c fixes it.. Reference Bugzilla ID: 533775 -Steve diff -ur libvirt/src/util/iptables.c libvirt-ipt/src/util/iptables.c --- libvirt/src/util/iptables.c 2009-11-08 20:57:08.458909225 -0800 +++ libvirt-ipt/src/util/iptables.c 2009-11-08 21:19:48.554615398 -0800 @@ -1067,7 +1067,7 @@ return iptablesAddRemoveRule(ctx->nat_postrouting, action, "--source", network, - "--destination", "!", network, + "!", "--destination", network, "--out-interface", physdev, "--jump", "MASQUERADE", NULL); @@ -1075,7 +1075,7 @@ return iptablesAddRemoveRule(ctx->nat_postrouting, action, "--source", network, - "--destination", "!", network, + "!", "--destination", network, "--jump", "MASQUERADE", NULL); }

3 2

[libvirt] [PATCH] remove sysfs_path and parent_sysfs_path from XML
by Dave Allan 19 Nov '09

19 Nov '09

I erroneously included the sysfs_path and parent_sysfs_path elements in the node device xml. The attached patch removes them. Dave >From d848b0c5d9c92546e95c081eb7ca185101d71507 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Wed, 18 Nov 2009 17:29:35 -0500 Subject: [PATCH 1/1] Remove sysfs_path and parent_sysfs_path from XML * These two elements were included erroneously in the udev backend commit --- src/conf/node_device_conf.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index add9d2b..4a15644 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -251,17 +251,9 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, virBufferAddLit(&buf, "<device>\n"); virBufferEscapeString(&buf, " <name>%s</name>\n", def->name); - if (def->sysfs_path != NULL) { - virBufferEscapeString(&buf, " <sysfs_path>%s</sysfs_path>\n", - def->sysfs_path); - } if (def->parent) { virBufferEscapeString(&buf, " <parent>%s</parent>\n", def->parent); } - if (def->parent_sysfs_path != NULL) { - virBufferEscapeString(&buf, " <parent_sysfs_path>%s</parent_sysfs_path>\n", - def->parent_sysfs_path); - } if (def->driver) { virBufferAddLit(&buf, " <driver>\n"); virBufferEscapeString(&buf, " <name>%s</name>\n", def->driver); -- 1.6.5.2

3 2

[libvirt] [PATCH] make qemu monitor timeout configurable
by Dan Kenigsberg 19 Nov '09

19 Nov '09

we've experience cases where waiting 30 seconds for a qemu monitor to finish was not enough (slow and busy server with slow storage). that was with managing qemu processes directly, btw, not with libvirt. however those case where not common. how about making the timeout configurable on-site? --- src/qemu/qemu.conf | 5 +++++ src/qemu/qemu_conf.c | 10 ++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_driver.c | 29 ++++++++++++++--------------- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 2129bae..bca858a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -157,3 +157,8 @@ # This currently requires ebtables to be installed. # # mac_filter = 1 + +# job_wait_time specifies how many seconds should a qemu monitor query wait for +# the monitor mutex. +# +# job_wait_time = 30 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 225a760..bcbe80d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -340,6 +340,16 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, } } + p = virConfGetValue (conf, "job_wait_time"); + CHECK_TYPE ("job_wait_time", VIR_CONF_LONG); + if (p && p->l) { + driver->job_wait_time = 1000ull * p->l; + } else { + driver->job_wait_time = 1000ull * 30; + } + if (driver->job_wait_time <= 0) + driver->job_wait_time = 1; + virConfFree (conf); return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 1931aef..0d816e2 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -134,6 +134,8 @@ struct qemud_driver { char *saveImageFormat; pciDeviceList *activePciHostdevs; + + int job_wait_time; }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a4a87ac..2f273eb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -160,11 +160,10 @@ static void qemuDomainObjPrivateFree(void *data) * successful calls must be followed by EndJob eventually */ -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - -static int qemuDomainObjBeginJob(virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; -static int qemuDomainObjBeginJob(virDomainObjPtr obj) +static int qemuDomainObjBeginJob(struct qemud_driver *driver, + virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; +static int qemuDomainObjBeginJob(struct qemud_driver *driver, + virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; struct timeval now; @@ -176,7 +175,7 @@ static int qemuDomainObjBeginJob(virDomainObjPtr obj) return -1; } then = (now.tv_sec * 1000ull) + (now.tv_usec / 1000); - then += QEMU_JOB_WAIT_TIME; + then += driver->job_wait_time; virDomainObjRef(obj); @@ -218,7 +217,7 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, return -1; } then = (now.tv_sec * 1000ull) + (now.tv_usec / 1000); - then += QEMU_JOB_WAIT_TIME; + then += driver->job_wait_time; virDomainObjRef(obj); qemuDriverUnlock(driver); @@ -3022,7 +3021,7 @@ static int qemudDomainShutdown(virDomainPtr dom) { goto cleanup; } - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -3203,7 +3202,7 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) { goto cleanup; } - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; if (virDomainObjIsActive(vm)) { @@ -3269,7 +3268,7 @@ static int qemudDomainGetInfo(virDomainPtr dom, if (virDomainObjIsActive(vm)) { qemuDomainObjPrivatePtr priv = vm->privateData; if (!priv->jobActive) { - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; qemuDomainObjEnterMonitor(vm); @@ -3544,7 +3543,7 @@ static int qemudDomainCoreDump(virDomainPtr dom, goto cleanup; } - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -3618,7 +3617,7 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { goto cleanup; } - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; if (virDomainObjIsActive(vm)) { @@ -4145,7 +4144,7 @@ static char *qemudDomainDumpXML(virDomainPtr dom, /* Don't delay if someone's using the monitor, just use * existing most recent data instead */ if (!priv->jobActive) { - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; qemuDomainObjEnterMonitor(vm); @@ -5777,7 +5776,7 @@ qemudDomainBlockStats (virDomainPtr dom, goto cleanup; } - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; if (!virDomainObjIsActive (vm)) { @@ -5986,7 +5985,7 @@ qemudDomainMemoryPeek (virDomainPtr dom, goto cleanup; } - if (qemuDomainObjBeginJob(vm) < 0) + if (qemuDomainObjBeginJob(driver, vm) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { -- 1.6.5.2

2 1

[libvirt] [PATCH] Removing devicePath member from dev struct
by Dave Allan 19 Nov '09

19 Nov '09

I realized that I inadvertently added a member to the def struct to contain each device's sysfs path when there was an existing member in the dev struct for "OS specific path to device metadat, eg sysfs" Since the udev backend needs to record the sysfs path while it's in the process of creating the device, before the dev struct gets allocated, I chose to remove the member from the dev struct. I've attached a patch. An alternative would be to store the information twice, but that seems crufty to me. Dave >From 74b97811c298653924b10ce29c26e4282c3786a3 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Wed, 18 Nov 2009 16:10:32 -0500 Subject: [PATCH 1/1] Remove devicePath member from dev struct to avoid redundancy --- src/conf/node_device_conf.c | 1 - src/conf/node_device_conf.h | 1 - src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 7 ------- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index f55c9c7..f2faeec 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -156,7 +156,6 @@ void virNodeDeviceObjFree(virNodeDeviceObjPtr dev) if (!dev) return; - VIR_FREE(dev->devicePath); virNodeDeviceDefFree(dev->def); if (dev->privateFree) (*dev->privateFree)(dev->privateData); diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 639a7e7..7a20bd6 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -178,7 +178,6 @@ typedef virNodeDeviceObj *virNodeDeviceObjPtr; struct _virNodeDeviceObj { virMutex lock; - char *devicePath; /* OS specific path to device metadat, eg sysfs */ virNodeDeviceDefPtr def; /* device definition */ void *privateData; /* driver-specific private data */ void (*privateFree)(void *data); /* destructor for private data */ diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index cddd994..7aed916 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -85,7 +85,7 @@ static int update_driver_name(virConnectPtr conn, VIR_FREE(dev->def->driver); - if (virAsprintf(&driver_link, "%s/driver", dev->devicePath) < 0) { + if (virAsprintf(&driver_link, "%s/driver", dev->def->sysfs_path) < 0) { virReportOOMError(conn); goto cleanup; } diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 1e1d872..31c1764 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -470,7 +470,7 @@ static void dev_create(const char *udi) dev->privateData = privData; dev->privateFree = free_udi; - dev->devicePath = devicePath; + dev->def->sysfs_path = devicePath; virNodeDeviceObjUnlock(dev); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4ddf360..9b48052 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1230,13 +1230,6 @@ static int udevAddOneDevice(struct udev_device *device) goto out; } - dev->devicePath = strdup(udev_device_get_devpath(device)); - if (dev->devicePath == NULL) { - virReportOOMError(NULL); - virNodeDeviceObjRemove(&driverState->devs, dev); - goto out; - } - virNodeDeviceObjUnlock(dev); ret = 0; -- 1.6.5.2

2 2

[libvirt] report OOM in two places in node_device_driver.c
by Dave Allan 19 Nov '09

19 Nov '09

I noticed that there are two places in node_device_driver.c in which we don't call virReportOOMError after strdup failure. The attached small patch adds the two calls. Dave diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index cddd994..b474d43 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -175,6 +175,7 @@ nodeListDevices(virConnectPtr conn, virNodeDeviceHasCap(driver->devs.objs[i], cap)) { if ((names[ndevs++] = strdup(driver->devs.objs[i]->def->name)) == NULL) { virNodeDeviceObjUnlock(driver->devs.objs[i]); + virReportOOMError(conn); goto failure; } } @@ -379,8 +380,10 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) for (caps = obj->def->caps; caps && ncaps < maxnames; caps = caps->next) { names[ncaps] = strdup(virNodeDevCapTypeToString(caps->type)); - if (names[ncaps++] == NULL) + if (names[ncaps++] == NULL) { + virReportOOMError(dev->conn); goto cleanup; + } } ret = ncaps;

2 2

[libvirt] [PATCH] Fix labelling on QEMU restore images
by Daniel P. Berrange 19 Nov '09

19 Nov '09

Even though QEMU does not directly open the saved image when restoring, it must be correctly labelled to allow QEMU to read from it because labelling is passed around with open file descriptors. The labelling should not allow writing to the saved image again, only reading. * src/qemu/qemu_driver.c: Label the save image when restoring * src/security/security_driver.h: Add a virSecurityDomainSetSavedStateLabelRO method for labelling a saved image for restore * src/security/security_selinux.c: Implement labelling of RO save images for restore --- src/qemu/qemu_driver.c | 31 ++++++++++++++++++++----------- src/security/security_driver.h | 5 +++++ src/security/security_selinux.c | 11 +++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a4a87ac..d500e14 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3484,7 +3484,7 @@ static int qemudDomainSave(virDomainPtr dom, if (driver->securityDriver && driver->securityDriver->domainRestoreSavedStateLabel && - driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, path) == -1) + driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, vm, path) == -1) goto endjob; ret = 0; @@ -4036,6 +4036,11 @@ static int qemudDomainRestore(virConnectPtr conn, if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) goto cleanup; + if (driver->securityDriver && + driver->securityDriver->domainSetSavedStateLabelRO && + driver->securityDriver->domainSetSavedStateLabelRO(conn, vm, path) == -1) + goto endjob; + if (header.version == 2) { const char *intermediate_argv[3] = { NULL, "-dc", NULL }; const char *prog = qemudSaveCompressionTypeToString(header.compressed); @@ -4070,15 +4075,8 @@ static int qemudDomainRestore(virConnectPtr conn, close(intermediatefd); close(fd); fd = -1; - if (ret < 0) { - if (!vm->persistent) { - qemuDomainObjEndJob(vm); - virDomainRemoveInactive(&driver->domains, - vm); - vm = NULL; - } + if (ret < 0) goto endjob; - } event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, @@ -4102,8 +4100,19 @@ static int qemudDomainRestore(virConnectPtr conn, ret = 0; endjob: - if (vm) - qemuDomainObjEndJob(vm); + qemuDomainObjEndJob(vm); + if (driver->securityDriver && + driver->securityDriver->domainRestoreSavedStateLabel && + driver->securityDriver->domainRestoreSavedStateLabel(conn, vm, path) == -1) + VIR_WARN("Unable to restore labelling on %s", path); + + if (ret < 0) { + if (!vm->persistent) { + virDomainRemoveInactive(&driver->domains, + vm); + vm = NULL; + } + } cleanup: virDomainDefFree(def); diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 5514962..5144976 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -45,7 +45,11 @@ typedef int (*virSecurityDomainSetHostdevLabel) (virConnectPtr conn, typedef int (*virSecurityDomainSetSavedStateLabel) (virConnectPtr conn, virDomainObjPtr vm, const char *savefile); +typedef int (*virSecurityDomainSetSavedStateLabelRO) (virConnectPtr conn, + virDomainObjPtr vm, + const char *savefile); typedef int (*virSecurityDomainRestoreSavedStateLabel) (virConnectPtr conn, + virDomainObjPtr vm, const char *savefile); typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn, virDomainObjPtr sec); @@ -77,6 +81,7 @@ struct _virSecurityDriver { virSecurityDomainRestoreHostdevLabel domainRestoreSecurityHostdevLabel; virSecurityDomainSetHostdevLabel domainSetSecurityHostdevLabel; virSecurityDomainSetSavedStateLabel domainSetSavedStateLabel; + virSecurityDomainSetSavedStateLabelRO domainSetSavedStateLabelRO; virSecurityDomainRestoreSavedStateLabel domainRestoreSavedStateLabel; /* diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index bd838e6..49f6746 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -637,7 +637,17 @@ SELinuxSetSavedStateLabel(virConnectPtr conn, static int +SELinuxSetSavedStateLabelRO(virConnectPtr conn, + virDomainObjPtr vm ATTRIBUTE_UNUSED, + const char *savefile) +{ + return SELinuxSetFilecon(conn, savefile, default_content_context); +} + + +static int SELinuxRestoreSavedStateLabel(virConnectPtr conn, + virDomainObjPtr vm ATTRIBUTE_UNUSED, const char *savefile) { return SELinuxRestoreSecurityFileLabel(conn, savefile); @@ -714,5 +724,6 @@ virSecurityDriver virSELinuxSecurityDriver = { .domainSetSecurityHostdevLabel = SELinuxSetSecurityHostdevLabel, .domainRestoreSecurityHostdevLabel = SELinuxRestoreSecurityHostdevLabel, .domainSetSavedStateLabel = SELinuxSetSavedStateLabel, + .domainSetSavedStateLabelRO = SELinuxSetSavedStateLabelRO, .domainRestoreSavedStateLabel = SELinuxRestoreSavedStateLabel, }; -- 1.6.5.2

2 1

[libvirt] race between qemu monitor startup and blocking migrate -incoming
by Charles Duffy 19 Nov '09

19 Nov '09

Howdy, 'yall. I'm having issues with virDomainRestore failing, particularly under load -- even in 0.7.0, when there's no need to parse through qemu's output to find the monitor PTY. Digging through strace output of libvirtd and the qemu processes it spawns, this is happening when qemu blocks on the migrate -incoming and ceases to respond to the monitor socket -- though some versions of qemu can go into this state before the monitor socket is even opened, leading to libvirt timing out either while attempting to open the monitor socket or while trying to read therefrom, and subsequently killing the qemu instance it spawned while that instance is still attempting to migrate in its old saved state. Both of qemu-0.11.0-rc1 and qemu-kvm master have some form of blocking in -incoming exec: which can prevent libvirt from successfully carrying through a resume; I have reproduced the issue (and maintain logs from strace, available on request) irrespective of the state of Chris Lalancette's "Fix detached migration with exec" and "Allow monitor interaction when using migrate -exec" patches. The qemu binaries being used _appear_ to correctly allow monitor interaction prior to -incoming exec:... completion when interactively invoked in the trivial case shown below: $ qemu-system-x86_64 \ -monitor stdio \ -nographic \ -serial file:/dev/null \ -incoming 'exec:sleep 5; echo DONE >&2; kill $PPID' \ /dev/null QEMU 0.10.91 monitor - type 'help' for more information (qemu) DONE $ ...however, whether these same binaries work as-expected when invoked from libvirt by our automated test system under load is nondeterministic. (I have yet to reproduce the issue in a low-load environment using "virsh restore"). Is someone else working on this? Is a known-good (or believed-good) libvirt/qemu pair available? What can I do to help in getting this issue resolved? Thanks! --- libvirt-0.7.0 + qemu-kvm-0.11.0-rc1 qemudReadMonitorOutput:728 : internal error Timed out while reading monitor startup output libvirt-0.6.5 + qemu-kvm-0.11.0-rc1 error : qemudReadMonitorOutput:705 : internal error Timed out while reading monitor startup output error : qemudWaitForMonitor:1003 : internal error unable to start guest: char device redirected to /dev/pts/9 libvir: QEMU error : internal error unable to start guest: char device redirected to /dev/pts/9 ^^ particularly interesting, as the above line should have been eaten by qemudExtractMonitorPath rather than emitted as error text --- <aliguori> -incoming is blocking <aliguori> you cannot interact with the monitor during -incoming <mDuff> ...shouldn't we always be opening the monitor before starting the blocking -incoming bits, though? I don't always see that happening (and have an strace handy where it certainly doesn't). <aliguori> no <aliguori> well, i think they added some patches for that <aliguori> but originally, that's not how it worked <aliguori> and i think it's silly to work that way <aliguori> -incoming should mean, wait patiently for an incoming migration <aliguori> there's no point in interfacing with the monitor in the interim <mDuff> I agree that interacting may not be called for, but at least connect()ing -- if it's a UNIX socket, the other side won't be able to connect at all until qemu goes first... <aliguori> heh, well.... <aliguori> that particular race condition is addressed by -daemonize <aliguori> because that's generally true <aliguori> you don't know how long qemu will take to open the monitor <aliguori> but -daemonize makes gives you notification because it doesn't daemonize the process until you've gotten to the point where all sockets are open <aliguori> but IIRC, libvirt doesn't use -daemonize

3 2

[libvirt] iSCSI Multi-IQN (Libvirt Support)
by Shyam_Iyer＠Dell.com 18 Nov '09

18 Nov '09

The following patch set realizes the multi-IQN concept discussed in an earlier thread http://www.mail-archive.com/libvir-list@redhat.com/msg16706.html The patch realizes an XML schema like the one below and allows libvirt to read through it to create storage pools. These XMLs when created using a virtualization manager realize unique VM to storage LUN mappings through a single console and thus opening up possibilities for the following scenarios - * possibility of multiple IQNs for a single Guest * option for hypervisor's initiator to use these IQNs on behalf of the guest Example Usages: Usage 1: VM1 - > <Init iqn1> <------------------------> <Target iqn1> <Init iqn2> <------------------------> <Target iqn1> <Init iqn3> <------------------------> <Target iqn1> <Init iqn4> <------------------------> <Target iqn1> Usage 2: VM1 - > <Init iqn1> <------------------------> <Target iqn1> <Init iqn2> <------------------------> <Target iqn2> <Init iqn3> <------------------------> <Target iqn3> <Init iqn4> <------------------------> <Target iqn4> Usage 3: VM1 - > <Init iqn1> <------------------------> <Target iqn1> VM2 - > <Init iqn2> <------------------------> <Target iqn1> Usage 4: VM1 - > <Init iqn1> <------------------------> <Target iqn1> VM2 - > <Init iqn2> <------------------------> <Target iqn2> Example XML schema for an iSCSI storage pool created -- <pool type="iscsi"> <name>dell</name> <uuid>cf354733-b01b-8870-2040-94888640e24d</uuid> <capacity>0</capacity> <allocation>0</allocation> <available>0</available> - <source> <initiator> iqnname = "<initiator IQN1>"> iqnname = "<initiator IQN2>"> </initiator> ........................................ ........................................ <host name="<iSCSI target hostname or Target IP address>" /> <device path="<iSCSI Target IQN name>" /> </source> - <target> <path>/dev/disk/by-path</path> - <permissions> <mode>0700</mode> <owner>0</owner> <group>0</group> </permissions> </target> </pool> Each initiator iqn name can be parsed to create the unique sessions. TODO: 1) Virt Manager GUI support to allow a visual mapping of iqn->storage pool -> VM and thus creating the XML for consumption by libvirt. Libvirt support added above can realize the same using virsh options. 2) option for Guest's own BIOS & initiator to use the initiator IQNs (iSCSI in Guest) a) Libvirt support to allow iqn as an attribute for a VM's XML. b) Qemu Support to allow Guest's bios & initiator to use these IQNs. Signed-off-by: Sudhir Bellad <sudhir_bellad(a)dell.com> Signed-off-by: Shyam Iyer <shyam_iyer(a)dell.com> diff --git a/src/storage_backend_iscsi.c b/src/storage_backend_iscsi.c index b516add..3f2a79d 100644 --- a/src/storage_backend_iscsi.c +++ b/src/storage_backend_iscsi.c @@ -39,6 +39,10 @@ #include "storage_backend_iscsi.h" #include "util.h" #include "memory.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -159,13 +163,57 @@ virStorageBackendISCSIConnection(virConnectPtr conn, const char *portal, const char *action) { - const char *const cmdargv[] = { - ISCSIADM, "--mode", "node", "--portal", portal, - "--targetname", pool->def->source.devices[0].path, action, NULL - }; - - if (virRun(conn, cmdargv, NULL) < 0) - return -1; + DIR *dir; + struct dirent *entry; + + + if (pool->def->source.initiator[0].iqnname != NULL) { + int i = 0; + while(pool->def->source.initiator[i].iqnname != NULL){ + if (!(dir = opendir(IFACES_DIR))) { + if (errno == ENOENT) + return 0; + virReportSystemError(conn, errno, _("Failed to open dir '%s'"), + IFACES_DIR); + return -1; + } + while ((entry = readdir(dir))) { + FILE *fp; + char path[PATH_MAX]; + + if (entry->d_name[0] == '.') + continue; + + sprintf(path,"%s", IFACES_DIR); + strcat(path,(const char *)entry->d_name); + + if ((fp = fopen(path, "r"))){ + char buff[256]; + while (fp != NULL && fgets(buff, sizeof(buff), fp) != NULL) { + if (strstr(buff, pool->def->source.initiator[i].iqnname) != NULL) { + const char *const cmdargv[] = { + ISCSIADM, "--mode", "node", "--portal", portal, + "--targetname", pool->def->source.devices[0].path, "-I", entry->d_name, action, NULL + }; + + if (virRun(conn, cmdargv, NULL) < 0) + return -1; + } + } + } + fclose(fp); + } + i++; + } + } + else{ + const char *const cmdargv[] = { + ISCSIADM, "--mode", "node", "--portal", portal, + "--targetname", pool->def->source.devices[0].path, action, NULL + }; + if (virRun(conn, cmdargv, NULL) < 0) + return -1; + } return 0; } diff --git a/src/storage_backend_iscsi.h b/src/storage_backend_iscsi.h index 665ed13..14c2c5c 100644 --- a/src/storage_backend_iscsi.h +++ b/src/storage_backend_iscsi.h @@ -25,7 +25,7 @@ #define __VIR_STORAGE_BACKEND_ISCSI_H__ #include "storage_backend.h" - extern virStorageBackend virStorageBackendISCSI; +#define IFACES_DIR "/var/lib/iscsi/ifaces/" #endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */ diff --git a/src/storage_conf.c b/src/storage_conf.c index 788de15..0f2ace9 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -106,12 +106,13 @@ struct _virStorageVolOptions { /* Flags to indicate mandatory components in the pool source */ enum { - VIR_STORAGE_POOL_SOURCE_HOST = (1<<0), - VIR_STORAGE_POOL_SOURCE_DEVICE = (1<<1), - VIR_STORAGE_POOL_SOURCE_DIR = (1<<2), - VIR_STORAGE_POOL_SOURCE_ADAPTER = (1<<3), - VIR_STORAGE_POOL_SOURCE_NAME = (1<<4), -}; + VIR_STORAGE_POOL_SOURCE_HOST = (1<<0), + VIR_STORAGE_POOL_SOURCE_DEVICE = (1<<1), + VIR_STORAGE_POOL_SOURCE_DIR = (1<<2), + VIR_STORAGE_POOL_SOURCE_ADAPTER = (1<<3), + VIR_STORAGE_POOL_SOURCE_NAME = (1<<4), + VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN = (1<<5), + }; @@ -179,7 +180,8 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { { .poolType = VIR_STORAGE_POOL_ISCSI, .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_HOST | - VIR_STORAGE_POOL_SOURCE_DEVICE), + VIR_STORAGE_POOL_SOURCE_DEVICE | + VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN), }, .volOptions = { .formatToString = virStoragePoolFormatDiskTypeToString, @@ -532,6 +534,34 @@ virStoragePoolDefParseXML(virConnectPtr conn, goto cleanup; } } + + if(options->flags & VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN) { + xmlNodePtr *nodeset = NULL; + int niqn, i; + + if((niqn = virXPathNodeSet(conn, "./initiator/iqnname", ctxt, &nodeset)) < 0) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("cannot extract storage pool source devices")); + goto cleanup; + } + if (VIR_ALLOC_N(ret->source.initiator, niqn) < 0) { + VIR_FREE(nodeset); + virReportOOMError(conn); + goto cleanup; + } + for (i = 0 ; i < niqn ; i++) { + xmlChar *name = xmlGetProp(nodeset[i], BAD_CAST "name"); + if (name == NULL) { + VIR_FREE(nodeset); + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("missing storage pool source device path")); + goto cleanup; + } + ret->source.initiator[i].iqnname = (char *)name; + } + VIR_FREE(nodeset); + } + if (options->flags & VIR_STORAGE_POOL_SOURCE_DEVICE) { xmlNodePtr *nodeset = NULL; int nsource, i; diff --git a/src/storage_conf.h b/src/storage_conf.h index 9fedb12..c77d6ae 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -182,6 +182,13 @@ struct _virStoragePoolSourceDeviceExtent { int type; /* free space type */ }; +typedef struct _virStoragePoolSourceInitiatorAttr virStoragePoolSourceInitiatorAttr; +typedef virStoragePoolSourceInitiatorAttr *virStoragePoolSourceInitiatorAttrPtr; +struct _virStoragePoolSourceInitiatorAttr { + /* Initiator iqn name */ + char *iqnname; +}; + /* * Pools can be backed by one or more devices, and some * allow us to track free space on underlying devices. @@ -223,6 +230,9 @@ struct _virStoragePoolSource { /* Or a name */ char *name; + /* One or more initiator names */ + virStoragePoolSourceInitiatorAttrPtr initiator; + int authType; /* virStoragePoolAuthType */ union { virStoragePoolAuthChap chap;

7 27

[libvirt] [PATCH] Ensure driver lock is released when entering QEMU monitor
by Daniel P. Berrange 18 Nov '09

18 Nov '09

The qemudStartVMDaemon() and several functions it calls use the QEMU monitor. The QEMU driver is locked while this function is executing, so it is rquired to release the driver lock and reacquire it either side of issuing a monitor command. It failed todo so, leading to deadlock * qemu/qemu_driver.c: Release driver when in qemudStartVMDaemon and things it calls --- src/qemu/qemu_driver.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 968118e..a4a87ac 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -118,6 +118,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn, static int qemudDomainGetMaxVcpus(virDomainPtr dom); static int qemuDetectVcpuPIDs(virConnectPtr conn, + struct qemud_driver *driver, virDomainObjPtr vm); static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, @@ -1314,6 +1315,7 @@ qemudWaitForMonitor(virConnectPtr conn, static int qemuDetectVcpuPIDs(virConnectPtr conn, + struct qemud_driver *driver, virDomainObjPtr vm) { pid_t *cpupids = NULL; int ncpupids; @@ -1331,12 +1333,12 @@ qemuDetectVcpuPIDs(virConnectPtr conn, /* What follows is now all KVM specific */ - qemuDomainObjEnterMonitor(vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); if ((ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids)) < 0) { - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); return -1; } - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); /* Treat failure to get VCPU<->PID mapping as non-fatal */ if (ncpupids == 0) @@ -1357,6 +1359,7 @@ qemuDetectVcpuPIDs(virConnectPtr conn, static int qemudInitCpus(virConnectPtr conn, + struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom) { #if HAVE_SCHED_GETAFFINITY @@ -1397,15 +1400,15 @@ qemudInitCpus(virConnectPtr conn, /* XXX This resume doesn't really belong here. Move it up to caller */ if (migrateFrom == NULL) { /* Allow the CPUS to start executing */ - qemuDomainObjEnterMonitor(vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorStartCPUs(priv->mon, conn) < 0) { if (virGetLastError() == NULL) qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("resume operation failed")); - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); return -1; } - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); } return 0; @@ -1422,12 +1425,12 @@ qemuInitPasswords(struct qemud_driver *driver, vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && (vm->def->graphics[0]->data.vnc.passwd || driver->vncPassword)) { - qemuDomainObjEnterMonitor(vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetVNCPassword(priv->mon, vm->def->graphics[0]->data.vnc.passwd ? vm->def->graphics[0]->data.vnc.passwd : driver->vncPassword); - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); } return ret; @@ -2294,21 +2297,21 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (qemudWaitForMonitor(conn, driver, vm, pos) < 0) goto abort; - if (qemuDetectVcpuPIDs(conn, vm) < 0) + if (qemuDetectVcpuPIDs(conn, driver, vm) < 0) goto abort; - if (qemudInitCpus(conn, vm, migrateFrom) < 0) + if (qemudInitCpus(conn, driver, vm, migrateFrom) < 0) goto abort; if (qemuInitPasswords(driver, vm) < 0) goto abort; - qemuDomainObjEnterMonitor(vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) { - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); goto abort; } - qemuDomainObjExitMonitor(vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (virDomainSaveStatus(conn, driver->stateDir, vm) < 0) goto abort; -- 1.6.5.2

2 1

Re: [libvirt] migration: qemu vs. qemu+tcp at virsh vs. libvirt-java
by Thomas Treutner 18 Nov '09

18 Nov '09

On Wednesday 18 November 2009 14:05:03 Bryan Kearney wrote: > thanks.. I am in the code right now.. what would have been better in the > javadoc for you? I will put it in. ... "If uri is NULL, then libvirt will try to find the best method. Uri may specify the hostname or IP address of the destination host as seen from the source, or uri may be a URI giving transport, hostname, user, port, etc. in the usual form. Uri should only be specified if you want to migrate over a specific interface on the remote host. For Qemu/KVM, the uri should be of the form "tcp://hostname[:port]". This does not require TCP auth to be setup between the connections, since migrate uses a straight TCP connection (unless using the PEER2PEER flag, in which case URI should be a full fledged libvirt URI). Refer also to driver documentation for the particular URIs supported." ... @Cole: I've merged your comment - could you please (N)ACK that? I assume the "tcp://.." form is a special case for Qemu/KVM, as with Xen, an IP was enough. kr tom

2 1

[libvirt] migration: qemu vs. qemu+tcp at virsh vs. libvirt-java
by Thomas Treutner 18 Nov '09

18 Nov '09

Hi, I'm having a little problem when triggering (live) migration from libvirt-java (libvirt.so at client is approx. 0.7.1), I get an error that the qemu:// driver for migration URIs is not supported, only qemu+tcp:// Strange thing is, with virsh at the same client (same libvirt.so), qemu:// works. Interestingly, the error message seems to come from libvirt.so and not libvirt-java. I'd like to avoid maintaining two different URIs/drivers for normal connections and migration destinations, especially as it works flawlessly (and fast!) with virsh? Has anyone clues where this twisted-mind behaviour could come from? kr, tom

3 4

[libvirt] RFC exposing SRIOV PF<->VF relationships
by Dave Allan 17 Nov '09

17 Nov '09

It would be helpful to have an API that exposes the relationship between SR IOV physical functions (PFs) and virtual functions (VFs). I'm thinking of implementing three new API calls and adding a small amount of additional information in the node device pci device capability, as in the attached patch. Let me know what you think. Dave >From 6ad5d2d6f06647295cde128a6c309e645e283146 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Mon, 16 Nov 2009 16:06:00 -0500 Subject: [PATCH 1/1] Added basis of SR IOV PF<->VF relationship support * Added three functions to node device API * Added a little additional information to the node device PCI device capabilities to track the PF<->VFs relationships. --- src/conf/node_device_conf.h | 3 +++ src/driver.h | 11 +++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 639a7e7..a130dd9 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -105,6 +105,9 @@ struct _virNodeDevCapsDef { unsigned class; char *product_name; char *vendor_name; + char *physical_function; + char **virtual_functions; + unsigned num_virtual_functions; } pci_dev; struct { unsigned bus; diff --git a/src/driver.h b/src/driver.h index 09ce8e2..c818ced 100644 --- a/src/driver.h +++ b/src/driver.h @@ -805,6 +805,14 @@ typedef int (*virDevMonDeviceListCaps)(virNodeDevicePtr dev, char **const names, int maxnames); +typedef int (*virDevMonDeviceNumOfVFs)(virNodeDevicePtr dev); + +typedef int (*virDevMonDeviceListVFs)(virNodeDevicePtr dev, + char **const names, + int maxnames); + +typedef int (*virDevMonDeviceGetPF)(virNodeDevicePtr dev); + typedef virNodeDevicePtr (*virDrvNodeDeviceCreateXML)(virConnectPtr conn, const char *xmlDesc, unsigned int flags); @@ -828,6 +836,9 @@ struct _virDeviceMonitor { virDevMonDeviceGetParent deviceGetParent; virDevMonDeviceNumOfCaps deviceNumOfCaps; virDevMonDeviceListCaps deviceListCaps; + virDevMonDeviceNumOfVFs deviceNumOfVFs; + virDevMonDeviceListVFs deviceListVFs; + virDevMonDeviceGetPF deviceGetPF; virDrvNodeDeviceCreateXML deviceCreateXML; virDrvNodeDeviceDestroy deviceDestroy; }; -- 1.6.5.1

2 2

[libvirt] PATCH 0/2]: Fix CPU affinity management for NR_CPUS > 1024
by Daniel P. Berrange 17 Nov '09

17 Nov '09

The RHEL-6 Alpha kernels have defined NR_CPUS=4096 The glibc static cpu_set_t data type used with sched_[gs]etaffinity() has been sized with # define __CPU_SETSIZE 1024 So any attempt to use sched_[gs]etaffinity() with a static cpu_set_t on a RHEL-6 kernel ends up with -EINVAL, even if the machine does not physically have > 1024 CPUs. The syscall mandates that the cpu set arg is large enough to hold entire of NR_CPUS. Fairly recent gLibc's now provide an alternative dynamically allocated cpu_set_t data type, where the app tells glibc how many CPUs it has to be able to hold. Great, except, the kernel does not tell userspace what NR_CPUS it has been compiled with. So apps have to a pick a starting size, try the sched_[gs]etaffinity() call, catch EINVAL, enlarge the cpuset, repeat, repeat, repeat until it works. This was going to be horrible to put into the qemu driver code, so I've introduced a new util/processinfo.[h,c] file providing APis for getting/setting CPU affinity that use the dynamically allocate mask libvirt defines in its public API. Daniel

2 6

[libvirt] PATCH: configure.in should use 'ld' from $PATH for checking version-script syntax, not hardcode /usr/bin/ld
by Steve Yarmie 17 Nov '09

17 Nov '09

Hi, I had a few minor patches which I had sent by using Bugzilla. I believe I should have sent them to this list instead... Here's the first (reference 531496 https://bugzilla.redhat.com/show_bug.cgi?id=531496) configure.in should use 'ld' from $PATH for checking version-script syntax, not hard-coded in /usr/bin/ld -Steve --- libvirt/configure.in 2009-11-08 20:57:08.194911693 -0800 +++ libvirt-ld/configure.in 2009-11-08 22:12:57.524840188 -0800 @@ -66,7 +66,7 @@ AM_PROG_CC_C_O VERSION_SCRIPT_FLAGS=-Wl,--version-script= -`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \ +`ld --help 2>&1 | grep -- --version-script >/dev/null` || \ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," AC_SUBST(VERSION_SCRIPT_FLAGS)

4 8

[libvirt] [PATCH] Support QEMU's virtual FAT block device driver
by Daniel P. Berrange 17 Nov '09

17 Nov '09

Introduce a new type="dir" mode for <disks> that allows use of QEMU's virtual FAT block device driver. eg <disk type='dir' device='floppy'> <source dir='/tmp/test'/> <target dev='fda' bus='fdc'/> <readonly/> </disk> gets turned into -drive file=fat:floppy:/tmp/test,if=floppy,index=0 Only read-only disks are supported with virtual FAT mode * src/conf/domain_conf.c, src/conf/domain_conf.h: Add type="dir" * docs/schemas/domain.rng: Document new disk type * src/xen/xend_internal.c, src/xen/xm_internal.c: Raise error for unsupported disk types * tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args: Fix empty disk file handling * tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args, tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml, tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args, tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml tests/qemuxml2argvtest.c: Test QEMU vitual FAT driver * src/qemu/qemu_conf.c: Support generating fat:/some/dir type disk args * src/security/security_selinux.c: Temporarily skip labelling of directory based disks --- docs/schemas/domain.rng | 16 ++++++ src/conf/domain_conf.c | 36 ++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_conf.c | 49 ++++++++++++++++++- src/security/security_selinux.c | 3 + src/xen/xend_internal.c | 7 ++- src/xen/xm_internal.c | 16 +++++- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-drive-fat.args | 1 + .../qemuxml2argv-disk-drive-fat.xml | 24 ++++++++++ .../qemuxml2argv-floppy-drive-fat.args | 1 + .../qemuxml2argv-floppy-drive-fat.xml | 24 ++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 2 + 14 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 1bf44fd..7a3ef97 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -434,6 +434,22 @@ <ref name="diskspec"/> </interleave> </group> + <group> + <attribute name="type"> + <value>dir</value> + </attribute> + <interleave> + <optional> + <element name="source"> + <attribute name="dir"> + <ref name="absFilePath"/> + </attribute> + <empty/> + </element> + </optional> + <ref name="diskspec"/> + </interleave> + </group> <ref name="diskspec"/> </choice> </element> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0a7eef7..42820a7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -90,7 +90,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST, "block", - "file") + "file", + "dir") VIR_ENUM_IMPL(virDomainDiskDevice, VIR_DOMAIN_DISK_DEVICE_LAST, "disk", @@ -777,10 +778,22 @@ virDomainDiskDefParseXML(virConnectPtr conn, if ((source == NULL) && (xmlStrEqual(cur->name, BAD_CAST "source"))) { - if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) + switch (def->type) { + case VIR_DOMAIN_DISK_TYPE_FILE: source = virXMLPropString(cur, "file"); - else + break; + case VIR_DOMAIN_DISK_TYPE_BLOCK: source = virXMLPropString(cur, "dev"); + break; + case VIR_DOMAIN_DISK_TYPE_DIR: + source = virXMLPropString(cur, "dir"); + break; + default: + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected disk type %s"), + virDomainDiskTypeToString(def->type)); + goto error; + } /* People sometimes pass a bogus '' source path when they mean to omit the source element @@ -3951,12 +3964,25 @@ virDomainDiskDefFormat(virConnectPtr conn, } if (def->src) { - if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) + switch (def->type) { + case VIR_DOMAIN_DISK_TYPE_FILE: virBufferEscapeString(buf, " <source file='%s'/>\n", def->src); - else + break; + case VIR_DOMAIN_DISK_TYPE_BLOCK: virBufferEscapeString(buf, " <source dev='%s'/>\n", def->src); + break; + case VIR_DOMAIN_DISK_TYPE_DIR: + virBufferEscapeString(buf, " <source dir='%s'/>\n", + def->src); + break; + default: + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected disk type %s"), + virDomainDiskTypeToString(def->type)); + return -1; + } } virBufferVSprintf(buf, " <target dev='%s' bus='%s'/>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1fdb4fa..6201463 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -67,6 +67,7 @@ enum virDomainVirtType { enum virDomainDiskType { VIR_DOMAIN_DISK_TYPE_BLOCK, VIR_DOMAIN_DISK_TYPE_FILE, + VIR_DOMAIN_DISK_TYPE_DIR, VIR_DOMAIN_DISK_TYPE_LAST }; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c807688..2d72b4b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1980,8 +1980,30 @@ int qemudBuildCommandLine(virConnectPtr conn, break; } - virBufferVSprintf(&opt, "file=%s", disk->src ? disk->src : ""); - virBufferVSprintf(&opt, ",if=%s", bus); + if (disk->src) { + if (disk->type == VIR_DOMAIN_DISK_TYPE_DIR) { + /* QEMU only supports magic FAT format for now */ + if (disk->driverType && + STRNEQ(disk->driverType, "fat")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unsupported disk driver type for '%s'"), + disk->driverType); + goto error; + } + if (!disk->readonly) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create virtual FAT disks in read-write mode")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) + virBufferVSprintf(&opt, "file=fat:floppy:%s,", disk->src); + else + virBufferVSprintf(&opt, "file=fat:%s,", disk->src); + } else { + virBufferVSprintf(&opt, "file=%s,", disk->src); + } + } + virBufferVSprintf(&opt, "if=%s", bus); if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) virBufferAddLit(&opt, ",media=cdrom"); virBufferVSprintf(&opt, ",index=%d", idx); @@ -1989,6 +2011,7 @@ int qemudBuildCommandLine(virConnectPtr conn, disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) virBufferAddLit(&opt, ",boot=on"); if (disk->driverType && + disk->type != VIR_DOMAIN_DISK_TYPE_DIR && qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_FORMAT) virBufferVSprintf(&opt, ",format=%s", disk->driverType); if (disk->serial && @@ -2057,7 +2080,27 @@ int qemudBuildCommandLine(virConnectPtr conn, } } - snprintf(file, PATH_MAX, "%s", disk->src); + if (disk->type == VIR_DOMAIN_DISK_TYPE_DIR) { + /* QEMU only supports magic FAT format for now */ + if (disk->driverType && + STRNEQ(disk->driverType, "fat")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unsupported disk driver type for '%s'"), + disk->driverType); + goto error; + } + if (!disk->readonly) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create virtual FAT disks in read-write mode")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) + snprintf(file, PATH_MAX, "fat:floppy:%s", disk->src); + else + snprintf(file, PATH_MAX, "fat:%s", disk->src); + } else { + snprintf(file, PATH_MAX, "%s", disk->src); + } ADD_ARG_LIT(dev); ADD_ARG_LIT(file); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index bd838e6..255ba53 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -687,6 +687,9 @@ SELinuxSetSecurityLabel(virConnectPtr conn, if (secdef->imagelabel) { for (i = 0 ; i < vm->def->ndisks ; i++) { + /* XXX fixme - we need to recursively label the entriy tree :-( */ + if (vm->def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) + continue; if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0) return -1; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d61e9e6..e370eb8 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -5375,11 +5375,16 @@ xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED, } else { if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) { virBufferVSprintf(buf, "(uname 'file:%s')", def->src); - } else { + } else if (def->type == VIR_DOMAIN_DISK_TYPE_BLOCK) { if (def->src[0] == '/') virBufferVSprintf(buf, "(uname 'phy:%s')", def->src); else virBufferVSprintf(buf, "(uname 'phy:/dev/%s')", def->src); + } else { + virXendError(conn, VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported disk type %s"), + virDomainDiskTypeToString(def->type)); + return -1; } } } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index f833ce7..31cff12 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1973,9 +1973,19 @@ static int xenXMDomainConfigFormatDisk(virConnectPtr conn, if (STREQ(disk->driverName, "tap")) virBufferVSprintf(&buf, "%s:", disk->driverType ? disk->driverType : "aio"); } else { - virBufferVSprintf(&buf, "%s:", - disk->type == VIR_DOMAIN_DISK_TYPE_FILE ? - "file" : "phy"); + switch (disk->type) { + case VIR_DOMAIN_DISK_TYPE_FILE: + virBufferAddLit(&buf, "file:"); + break; + case VIR_DOMAIN_DISK_TYPE_BLOCK: + virBufferAddLit(&buf, "phy:"); + break; + default: + xenXMError(conn, VIR_ERR_INTERNAL_ERROR, + _("unsupported disk type %s"), + virDomainDiskTypeToString(disk->type)); + goto cleanup; + } } virBufferVSprintf(&buf, "%s", disk->src); } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args index 1ef2602..1dd90d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args new file mode 100644 index 0000000..da1163b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive file=fat:/var/somefiles,if=ide,index=0,boot=on -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml new file mode 100644 index 0000000..818ca93 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='dir' device='disk'> + <driver name='qemu' type='fat'/> + <source dir='/var/somefiles'/> + <target dev='hda' bus='ide'/> + <readonly/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args new file mode 100644 index 0000000..4b4e3f4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot a -drive file=fat:floppy:/var/somefiles,if=floppy,index=0 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml new file mode 100644 index 0000000..9e32b68 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='fd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='dir' device='floppy'> + <driver name='qemu' type='fat'/> + <source dir='/var/somefiles'/> + <target dev='fda' bus='fdc'/> + <readonly/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c948379..677c5b4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -211,6 +211,10 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("floppy-drive-fat", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT); + DO_TEST("disk-drive-fat", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT); DO_TEST("disk-drive-fmt-qcow", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT); DO_TEST("disk-drive-shared", QEMUD_CMD_FLAG_DRIVE | diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 25ef2ce..793900c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,6 +98,8 @@ mymain(int argc, char **argv) DO_TEST("disk-many"); DO_TEST("disk-xenvbd"); DO_TEST("disk-usb"); + DO_TEST("floppy-drive-fat"); + DO_TEST("disk-drive-fat"); DO_TEST("disk-drive-fmt-qcow"); DO_TEST("disk-drive-cache-v1-wt"); DO_TEST("disk-drive-cache-v1-wb"); -- 1.6.5.2

2 2

[libvirt] [PATCH] 504914 Xen scheduler setting problems
by Daniel Veillard 17 Nov '09

17 Nov '09

504914 Xen scheduler setting problems https://bugzilla.redhat.com/show_bug.cgi?id=504914 Doing virsh schedinfo rhel5u3 --cap 65535 the hypervisor does the call, but does not change the value nor raise an error. Best is just to consider it's not in the allowed values The problem is that the error won't be ouput since the xend driver will then be called and raise an error error: this function is not supported by the hypervisor: unsupported in xendConfigVersion < 4 which will override the useful information from xenUnifiedDomainSetSchedulerParameters() So best is to also invert the order in which the xen sub-drivers are called * src/xen/xen_hypervisor.c: mark 65535 cap value as out of bound * src/xen/xen_hypervisor.c: reverse the order of the calls to the xen sub drivers to get the error message if needed diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 4bfcce4..a7da2ec 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1524,7 +1524,8 @@ xenUnifiedDomainSetSchedulerParameters (virDomainPtr dom, GET_PRIVATE(dom->conn); int i, ret; - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) { + /* do the hypervisor call last to get better error */ + for (i = XEN_UNIFIED_NR_DRIVERS - 1; i >= 0; i--) { if (priv->opened[i] && drivers[i]->domainSetSchedulerParameters) { ret = drivers[i]->domainSetSchedulerParameters(dom, params, nparams); if (ret == 0) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 843102a..4254bcd 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1345,8 +1345,8 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, } else if (STREQ (params[i].field, str_cap) && params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { val = params[i].value.ui; - if (val > USHRT_MAX) { - snprintf(buf, sizeof(buf), _("Credit scheduler cap parameter (%d) is out of range (0-65535)"), val); + if (val >= USHRT_MAX) { + snprintf(buf, sizeof(buf), _("Credit scheduler cap parameter (%d) is out of range (0-65534)"), val); virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, buf, val); return(-1); } -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] vCenter behaviour
by Glenn Bailey 17 Nov '09

17 Nov '09

Howdy, I was taking a look at libvirt for controlling a couple of vCenter clusters and noticed it will only let you login directly to an ESX host and not the vCenter server itself. You can pass the "vcenter=" command but this seems to just tell what vcenter server to use and doesn't directly access it. If you do a "list" it still just lists the devices on the given ESX host. For a quick test I modified the esx_driver.c and added the following (I am no c programmer BTW): if (STRCASEEQ(conn->uri->scheme, "esx")) { if (priv->host->productVersion != esxVI_ProductVersion_VPX25 && priv->host->productVersion != esxVI_ProductVersion_VPX40 && priv->host->productVersion != esxVI_ProductVersion_ESX35 && priv->host->productVersion != esxVI_ProductVersion_ESX40) { Which would then let me connect directly to the vCenter server and list all the vm's on it. Am I missing something? I'm new to libvirt, but all management of a ESX cluster is always done through vCenter, and not the host. Sorry if this message is redundant as I didn't see anything blaring in the archives ;-) glenn terremark

2 2

[libvirt] [PATCH] Fix typo in error message
by Matthew Booth 17 Nov '09

17 Nov '09

* src/qemu/qemu_monitor_text.c: Fix typo * po/*.po: Update typo in translations --- po/af.po | 2 +- po/am.po | 2 +- po/ar.po | 2 +- po/as.po | 2 +- po/be.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/bn_IN.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu_ES.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/gu.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/hy.po | 2 +- po/id.po | 2 +- po/is.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/kn.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lo.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mr.po | 2 +- po/ms.po | 2 +- po/my.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/nso.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- po/zu.po | 2 +- src/qemu/qemu_monitor_text.c | 2 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/po/af.po b/po/af.po index c64deda..c4711be 100644 --- a/po/af.po +++ b/po/af.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/am.po b/po/am.po index c64deda..c4711be 100644 --- a/po/am.po +++ b/po/am.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/ar.po b/po/ar.po index c64deda..c4711be 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/as.po b/po/as.po index b84d53b..3598e5b 100644 --- a/po/as.po +++ b/po/as.po @@ -5085,7 +5085,7 @@ msgstr "%s বিনেস নথিপত্ৰ পঢ়োঁতে বিফল # c-format #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' সহযোগে নেটওয়ার্কের ব্যাক-এন্ড মুছে ফেলতে ব্যর্থ\n" #: src/remote/remote_driver.c:328 diff --git a/po/be.po b/po/be.po index c64deda..c4711be 100644 --- a/po/be.po +++ b/po/be.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/bg.po b/po/bg.po index d34dccb..38e94b8 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4931,7 +4931,7 @@ msgstr "грешка при четене на конфигурационния #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Неуспех при създаване на мрежа от %s" #: src/remote/remote_driver.c:328 diff --git a/po/bn.po b/po/bn.po index c64deda..c4711be 100644 --- a/po/bn.po +++ b/po/bn.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/bn_IN.po b/po/bn_IN.po index 8ca9c26..3b647cb 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -4755,7 +4755,7 @@ msgstr "কনফিগ ফাইলের হ্যান্ডেল সংর #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' সহযোগে নেটওয়ার্কের ব্যাক-এন্ড মুছে ফেলতে ব্যর্থ\n" #: src/remote/remote_driver.c:328 diff --git a/po/bs.po b/po/bs.po index 73cd22b..e68f2c8 100644 --- a/po/bs.po +++ b/po/bs.po @@ -4924,7 +4924,7 @@ msgstr "čitanje konfiguracijske datoteke %s nije uspjelo" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Izrada domene iz %s nije uspjela" #: src/remote/remote_driver.c:328 diff --git a/po/ca.po b/po/ca.po index 50ec19b..768b5f4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5012,7 +5012,7 @@ msgstr "no s'ha pogut llegir el fitxer de configuració %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "No s'ha pogut crear la xarxa des de %s" #: src/remote/remote_driver.c:328 diff --git a/po/cs.po b/po/cs.po index 924c663..4ddfa65 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4931,7 +4931,7 @@ msgstr "nepodařilo se načíst konfigurační soubor %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Nepodařilo se vytvořit síť z %s" #: src/remote/remote_driver.c:328 diff --git a/po/cy.po b/po/cy.po index c64deda..c4711be 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/da.po b/po/da.po index eb4d820..e5ec702 100644 --- a/po/da.po +++ b/po/da.po @@ -4930,7 +4930,7 @@ msgstr "kunne ikke læse konfigurationsfilen %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Kunne ikke oprette netværk fra %s" #: src/remote/remote_driver.c:328 diff --git a/po/de.po b/po/de.po index a08bfa4..e863e2e 100644 --- a/po/de.po +++ b/po/de.po @@ -4854,7 +4854,7 @@ msgstr "Konfigurationsdatei %s konnte nicht gelesen werden" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Fehler beim Erstellen des Netzwerks von %s" #: src/remote/remote_driver.c:328 diff --git a/po/el.po b/po/el.po index c64deda..c4711be 100644 --- a/po/el.po +++ b/po/el.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/en_GB.po b/po/en_GB.po index 691f4ed..6c5dbee 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4925,7 +4925,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create network from %s" #: src/remote/remote_driver.c:328 diff --git a/po/es.po b/po/es.po index df0cfed..97ba10c 100644 --- a/po/es.po +++ b/po/es.po @@ -4854,7 +4854,7 @@ msgstr "no es posible guardar el ide del archivo de configuración" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Falló al eliminar backend de red con '%s'\n" #: src/remote/remote_driver.c:328 diff --git a/po/et.po b/po/et.po index c64deda..c4711be 100644 --- a/po/et.po +++ b/po/et.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/eu_ES.po b/po/eu_ES.po index c64deda..c4711be 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/fa.po b/po/fa.po index c64deda..c4711be 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/fi.po b/po/fi.po index 36abbd3..2956d51 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4932,7 +4932,7 @@ msgstr "asetustiedoston %s lukeminen epäonnistui" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Verkon luominen tiedostosta %s epäonnistui" #: src/remote/remote_driver.c:328 diff --git a/po/fr.po b/po/fr.po index e73de19..fcc7f23 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5018,7 +5018,7 @@ msgstr "impossible de lire le fichier de configuration %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Impossible de créer le réseau depuis %s" #: src/remote/remote_driver.c:328 diff --git a/po/gl.po b/po/gl.po index c64deda..c4711be 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/gu.po b/po/gu.po index 4d666c4..5779a06 100644 --- a/po/gu.po +++ b/po/gu.po @@ -4734,7 +4734,7 @@ msgstr "રૂપરેખાંકન ફાઇલ સંભાળવાનુ #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' સાથે નેટવર્ક બેકએન્ડને દૂર કરવામાં નિષ્ફળ\n" #: src/remote/remote_driver.c:328 diff --git a/po/he.po b/po/he.po index c64deda..c4711be 100644 --- a/po/he.po +++ b/po/he.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/hi.po b/po/hi.po index c46172d..f49aea2 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4797,7 +4797,7 @@ msgstr "विन्यास फाइल नियंत्रण जमा #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' के साथ संजाल बैकेंड हटाने में विफल\n" # done by Ravi diff --git a/po/hr.po b/po/hr.po index 0243657..32f5228 100644 --- a/po/hr.po +++ b/po/hr.po @@ -4924,7 +4924,7 @@ msgstr "čitanje konfiguracijske datoteke %s nije uspjelo" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Izrada mreže iz %s nije uspjela" #: src/remote/remote_driver.c:328 diff --git a/po/hu.po b/po/hu.po index 55adc9c..1387cfb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4928,7 +4928,7 @@ msgstr "nem sikerült olvasni a(z) %s beállítási fájlt" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Nem sikerült létrehozni hálózatot ebből: %s" #: src/remote/remote_driver.c:328 diff --git a/po/hy.po b/po/hy.po index c64deda..c4711be 100644 --- a/po/hy.po +++ b/po/hy.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/id.po b/po/id.po index b2af1a9..6a0fdd3 100644 --- a/po/id.po +++ b/po/id.po @@ -4900,7 +4900,7 @@ msgstr "gagal membaca berkas konfigurasi %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Gagal membuat jaringan dari %s" #: src/remote/remote_driver.c:328 diff --git a/po/is.po b/po/is.po index c64deda..c4711be 100644 --- a/po/is.po +++ b/po/is.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/it.po b/po/it.po index dcd17d2..99aeb24 100644 --- a/po/it.po +++ b/po/it.po @@ -4850,7 +4850,7 @@ msgstr "impossibile conservare la gestione del file di configurazione" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Impossibile creare la rete da %s" #: src/remote/remote_driver.c:328 diff --git a/po/ja.po b/po/ja.po index f6533da..b8ae3e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4824,7 +4824,7 @@ msgstr "設定ファイルハンドルの格納に失敗しました" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' を持つネットワークバックエンドの削除に失敗 \n" #: src/remote/remote_driver.c:328 diff --git a/po/ka.po b/po/ka.po index c64deda..c4711be 100644 --- a/po/ka.po +++ b/po/ka.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/kn.po b/po/kn.po index b2b69c2..c46c31f 100644 --- a/po/kn.po +++ b/po/kn.po @@ -4754,7 +4754,7 @@ msgstr "ಸಂರಚನಾ ಕಡತದ ಹ್ಯಾಂಡಲ್‌ ಅನ್ನ #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' ನೊಂದಿಗೆ ಜಾಲಬಂಧ ಬ್ಯಾಕೆಂಡ್ ಅನ್ನು ತೆಗೆದುಹಾಕುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ\n" #: src/remote/remote_driver.c:328 diff --git a/po/ko.po b/po/ko.po index 430bfbf..45fed98 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4872,7 +4872,7 @@ msgstr "%s 설정 파일 읽기 실패" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "%s에서 네트워크 생성하기 실패" #: src/remote/remote_driver.c:328 diff --git a/po/ku.po b/po/ku.po index c64deda..c4711be 100644 --- a/po/ku.po +++ b/po/ku.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/lo.po b/po/lo.po index c64deda..c4711be 100644 --- a/po/lo.po +++ b/po/lo.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/lt.po b/po/lt.po index c64deda..c4711be 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/lv.po b/po/lv.po index c64deda..c4711be 100644 --- a/po/lv.po +++ b/po/lv.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/mk.po b/po/mk.po index 1f46c6e..ec6c8c8 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4931,7 +4931,7 @@ msgstr "не успеав да ја прочитам конфиг. датоте #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Не успеав да ја креирам мрежата од %s" #: src/remote/remote_driver.c:328 diff --git a/po/ml.po b/po/ml.po index 901fec6..7db8686 100644 --- a/po/ml.po +++ b/po/ml.po @@ -4737,7 +4737,7 @@ msgstr "കോണ്‍ഫിഗ് ഫയല്‍ ഹാഡില്‍ സൂ #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s'-നൊപ്പം നെറ്റ്‌വര്‍ക്ക് ബാക്കെന്‍ഡ് നീക്കം ചെയ്യുന്നതില്‍ പരാജയം\n" #: src/remote/remote_driver.c:328 diff --git a/po/mr.po b/po/mr.po index d7fab05..25fbb3b 100644 --- a/po/mr.po +++ b/po/mr.po @@ -4726,7 +4726,7 @@ msgstr "संयोजना फाइल हॅन्डल् साठवण #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' सह नेटवर्क बॅकएंड काढून टाकण्यास अपयशी\n" #: src/remote/remote_driver.c:328 diff --git a/po/ms.po b/po/ms.po index ea33fd8..1f34704 100644 --- a/po/ms.po +++ b/po/ms.po @@ -4928,7 +4928,7 @@ msgstr "tidak dapat membaca fail tetapan `%s': %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Gagal untuk memuatkan cakera pemandu daripada fail." #: src/remote/remote_driver.c:328 diff --git a/po/my.po b/po/my.po index c64deda..c4711be 100644 --- a/po/my.po +++ b/po/my.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/nb.po b/po/nb.po index ba4bc5d..b3109c9 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4905,7 +4905,7 @@ msgstr "feil ved lesing av konfigurasjonsfil %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Kunne ikke opprette domenet fra %s" #: src/remote/remote_driver.c:328 diff --git a/po/nl.po b/po/nl.po index b2e006f..fa5721d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4841,7 +4841,7 @@ msgstr "" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "openen van bestand is mislukt" #: src/remote/remote_driver.c:328 diff --git a/po/nn.po b/po/nn.po index c64deda..c4711be 100644 --- a/po/nn.po +++ b/po/nn.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/nso.po b/po/nso.po index c64deda..c4711be 100644 --- a/po/nso.po +++ b/po/nso.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/or.po b/po/or.po index ce1b48d..1612351 100644 --- a/po/or.po +++ b/po/or.po @@ -4751,7 +4751,7 @@ msgstr "ବିନ୍ଯାସ ଫାଇଲ ନିୟନ୍ତ୍ରକକୁ ସ #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' ସହିତ ନେଟୱାର୍କ ପୃଷ୍ଠଭୂମିକୁ କାଢ଼ିବାରେ ବିଫଳ\n" #: src/remote/remote_driver.c:328 diff --git a/po/pa.po b/po/pa.po index f45797a..a298f3b 100644 --- a/po/pa.po +++ b/po/pa.po @@ -4726,7 +4726,7 @@ msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਹੈਂਡਲ ਸੰਭਾਲਣ ਲ #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "ਨੈੱਟਵਰਕ ਬੈਕਐਂਡ ਨੂੰ '%s' ਨਾਲ ਹਟਾਉਣ ਤੋਂ ਫੇਲ\n" #: src/remote/remote_driver.c:328 diff --git a/po/pl.po b/po/pl.po index 62176cc..3b09e0d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4794,7 +4794,7 @@ msgstr "nie można przechować obsługi pliku konfiguracji" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Usunięcie zaplecza sieciowego za pomocą \"%s\" nie powiodło się\n" #: src/remote/remote_driver.c:328 diff --git a/po/pt.po b/po/pt.po index a6ff159..80d7a71 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4931,7 +4931,7 @@ msgstr "não foi possível ler o ficheiro de configuração %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Não foi possível criar a rede a partir do %s" #: src/remote/remote_driver.c:328 diff --git a/po/pt_BR.po b/po/pt_BR.po index 70b6ea2..957d8e9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4876,7 +4876,7 @@ msgstr "não foi possível armazenar o identificador do arquivo de configuraçã #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Falha ao criar uma rede a partir de %s" #: src/remote/remote_driver.c:328 diff --git a/po/ro.po b/po/ro.po index c64deda..c4711be 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/ru.po b/po/ru.po index ebf74d8..9458fcc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4893,7 +4893,7 @@ msgstr "ошибка чтения файла конфигурации %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Ошибка создания сети из %s" #: src/remote/remote_driver.c:328 diff --git a/po/si.po b/po/si.po index c64deda..c4711be 100644 --- a/po/si.po +++ b/po/si.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/sk.po b/po/sk.po index c64deda..c4711be 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/sl.po b/po/sl.po index c64deda..c4711be 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/sq.po b/po/sq.po index c64deda..c4711be 100644 --- a/po/sq.po +++ b/po/sq.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/sr.po b/po/sr.po index 1b7a52c..ff21548 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4954,7 +4954,7 @@ msgstr "неуспело руковање складиштењем датоте #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Неуспело прављење мреже из %s" #: src/remote/remote_driver.c:328 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 66f7852..e786da9 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -4963,7 +4963,7 @@ msgstr "neuspelo rukovanje skladištenjem datoteke podešavanja" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Neuspelo pravljenje mreže iz %s" #: src/remote/remote_driver.c:328 diff --git a/po/sv.po b/po/sv.po index 7556a3a..4e87fb6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4930,7 +4930,7 @@ msgstr "kunde inte läsa konfigurationsfilen %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Misslyckades att skapa nätverk från %s" #: src/remote/remote_driver.c:328 diff --git a/po/ta.po b/po/ta.po index 70c78d6..ce08280 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4783,7 +4783,7 @@ msgstr "கட்டமைப்பு கோப்பு கையாளுத #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "'%s' லிருந்து பிணைய பின்முனையை நீக்க முடியவில்லை\n" #: src/remote/remote_driver.c:328 diff --git a/po/te.po b/po/te.po index b0448d2..4f2c5d6 100644 --- a/po/te.po +++ b/po/te.po @@ -4729,7 +4729,7 @@ msgstr "ఆకృతీకరణ ఫైలు సంభాలికను ని #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "నెట్వర్కు బ్యాకెండ్‌ను '%s'తో తీసివేయుటలో విఫలమైంది\n" #: src/remote/remote_driver.c:328 diff --git a/po/th.po b/po/th.po index c64deda..c4711be 100644 --- a/po/th.po +++ b/po/th.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/tr.po b/po/tr.po index c64deda..c4711be 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/uk.po b/po/uk.po index 1f5af50..1278153 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4929,7 +4929,7 @@ msgstr "помилка читання конфігураційного файл #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Помилка створення мережі з %s" #: src/remote/remote_driver.c:328 diff --git a/po/ur.po b/po/ur.po index c64deda..c4711be 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/vi.po b/po/vi.po index c64deda..c4711be 100644 --- a/po/vi.po +++ b/po/vi.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/po/zh_CN.po b/po/zh_CN.po index f080362..2b45692 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4784,7 +4784,7 @@ msgstr "无法保存配置文件软件" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "从 %s 创建网络失败" #: src/remote/remote_driver.c:328 diff --git a/po/zh_TW.po b/po/zh_TW.po index 04276f0..a2e513f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4927,7 +4927,7 @@ msgstr "無法讀取設定檔 %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "無法從 %s 建立網路" #: src/remote/remote_driver.c:328 diff --git a/po/zu.po b/po/zu.po index c64deda..c4711be 100644 --- a/po/zu.po +++ b/po/zu.po @@ -4957,7 +4957,7 @@ msgstr "failed to read configuration file %s" #: src/qemu/qemu_monitor_text.c:1828 #, fuzzy, c-format -msgid "failed to remove host metnwork in qemu with '%s'" +msgid "failed to remove host network in qemu with '%s'" msgstr "Failed to create domain from %s" #: src/remote/remote_driver.c:328 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index ee234a1..d39a417 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1635,7 +1635,7 @@ int qemuMonitorTextRemoveHostNetwork(qemuMonitorPtr mon, if (qemuMonitorCommand(mon, cmd, &reply) < 0) { qemudReportError(NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED, - _("failed to remove host metnwork in qemu with '%s'"), cmd); + _("failed to remove host network in qemu with '%s'"), cmd); goto cleanup; } -- 1.6.2.5

2 3

[libvirt] amjed gabteni wants to connect on LinkedIn
by amjed gabteni 17 Nov '09

17 Nov '09

LinkedIn ------------ I'd like to add you to my professional network on LinkedIn. - amjed gabteni Confirm that you know amjed gabteni https://www.linkedin.com/e/isd/866420023/uEfaTRJs/ Every day, millions of professionals like amjed gabteni use LinkedIn to connect with colleagues, find experts, and explore opportunities. ------ (c) 2009, LinkedIn Corporation

2 1

[libvirt] [PATCH] Make QEMU driver use -chardev everywhere when it's available
by Matthew Booth 17 Nov '09

17 Nov '09

Change -monitor, -serial and -parallel output to use -chardev if it is available. * src/qemu/qemu_conf.c: Update qemudBuildCommandLine to use -chardev where available. * tests/qemuxml2argvtest.c tests/qemuxml2argvdata/: Add -chardev equivalents for all current serial and parallel tests. --- src/qemu/qemu_conf.c | 102 +++++++++++++++++--- .../qemuxml2argv-channel-guestfwd.args | 2 +- .../qemuxml2argv-console-compat-chardev.args | 1 + .../qemuxml2argv-console-compat-chardev.xml | 28 ++++++ .../qemuxml2argv-parallel-tcp-chardev.args | 1 + .../qemuxml2argv-parallel-tcp-chardev.xml | 27 +++++ .../qemuxml2argv-serial-dev-chardev.args | 1 + .../qemuxml2argv-serial-dev-chardev.xml | 30 ++++++ .../qemuxml2argv-serial-file-chardev.args | 1 + .../qemuxml2argv-serial-file-chardev.xml | 30 ++++++ .../qemuxml2argv-serial-many-chardev.args | 1 + .../qemuxml2argv-serial-many-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-pty-chardev.args | 1 + .../qemuxml2argv-serial-pty-chardev.xml | 28 ++++++ .../qemuxml2argv-serial-tcp-chardev.args | 1 + .../qemuxml2argv-serial-tcp-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-tcp-telnet-chardev.args | 1 + .../qemuxml2argv-serial-tcp-telnet-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-udp-chardev.args | 1 + .../qemuxml2argv-serial-udp-chardev.xml | 32 ++++++ .../qemuxml2argv-serial-unix-chardev.args | 1 + .../qemuxml2argv-serial-unix-chardev.xml | 30 ++++++ .../qemuxml2argv-serial-vc-chardev.args | 1 + .../qemuxml2argv-serial-vc-chardev.xml | 28 ++++++ tests/qemuxml2argvtest.c | 12 +++ 25 files changed, 440 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c807688..4f4b3db 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1844,12 +1844,36 @@ int qemudBuildCommandLine(virConnectPtr conn, if (monitor_chr) { virBuffer buf = VIR_BUFFER_INITIALIZER; - qemudBuildCommandLineChrDevStr(monitor_chr, &buf); - if (virBufferError(&buf)) - goto error; + /* Use -chardev if it's available */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) { + char id[16]; + + if (snprintf(id, sizeof(id), "monitor%i", i) > sizeof(id)) + goto error; - ADD_ARG_LIT("-monitor"); - ADD_ARG(virBufferContentAndReset(&buf)); + qemudBuildCommandLineChrDevChardevStr(monitor_chr, id, &buf); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-chardev"); + ADD_ARG(virBufferContentAndReset(&buf)); + + virBufferVSprintf(&buf, "chardev:%s", id); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-monitor"); + ADD_ARG(virBufferContentAndReset(&buf)); + } + + else { + qemudBuildCommandLineChrDevStr(monitor_chr, &buf); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-monitor"); + ADD_ARG(virBufferContentAndReset(&buf)); + } } if (def->localtime) @@ -2132,12 +2156,36 @@ int qemudBuildCommandLine(virConnectPtr conn, virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr serial = def->serials[i]; - qemudBuildCommandLineChrDevStr(serial, &buf); - if (virBufferError(&buf)) - goto error; + /* Use -chardev if it's available */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) { + char id[16]; - ADD_ARG_LIT("-serial"); - ADD_ARG(virBufferContentAndReset(&buf)); + if (snprintf(id, sizeof(id), "serial%i", i) > sizeof(id)) + goto error; + + qemudBuildCommandLineChrDevChardevStr(serial, id, &buf); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-chardev"); + ADD_ARG(virBufferContentAndReset(&buf)); + + virBufferVSprintf(&buf, "chardev:%s", id); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-serial"); + ADD_ARG(virBufferContentAndReset(&buf)); + } + + else { + qemudBuildCommandLineChrDevStr(serial, &buf); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-serial"); + ADD_ARG(virBufferContentAndReset(&buf)); + } } } @@ -2149,12 +2197,36 @@ int qemudBuildCommandLine(virConnectPtr conn, virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr parallel = def->parallels[i]; - qemudBuildCommandLineChrDevStr(parallel, &buf); - if (virBufferError(&buf)) - goto error; + /* Use -chardev if it's available */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) { + char id[16]; - ADD_ARG_LIT("-parallel"); - ADD_ARG(virBufferContentAndReset(&buf)); + if (snprintf(id, sizeof(id), "parallel%i", i) > sizeof(id)) + goto error; + + qemudBuildCommandLineChrDevChardevStr(parallel, id, &buf); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-chardev"); + ADD_ARG(virBufferContentAndReset(&buf)); + + virBufferVSprintf(&buf, "chardev:%s", id); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-parallel"); + ADD_ARG(virBufferContentAndReset(&buf)); + } + + else { + qemudBuildCommandLineChrDevStr(parallel, &buf); + if (virBufferError(&buf)) + goto error; + + ADD_ARG_LIT("-parallel"); + ADD_ARG(virBufferContentAndReset(&buf)); + } } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args index b5bb46d..f3b0c30 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -chardev pipe,id=channel0,path=/tmp/guestfwd -net user,guestfwd=tcp:10.0.2.1:4600-chardev:channel0 -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -chardev pipe,id=channel0,path=/tmp/guestfwd -net user,guestfwd=tcp:10.0.2.1:4600-chardev:channel0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args new file mode 100644 index 0000000..1237250 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev pty,id=serial0 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml new file mode 100644 index 0000000..c16ae07 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args new file mode 100644 index 0000000..65783fb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -chardev socket,id=parallel0,host=127.0.0.1,port=9999,server,nowait -parallel chardev:parallel0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml new file mode 100644 index 0000000..08176f1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <parallel type='tcp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <protocol type='raw'/> + <target port='0'/> + </parallel> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args new file mode 100644 index 0000000..7ecb3e8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev tty,id=serial0,path=/dev/ttyS2 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml new file mode 100644 index 0000000..2b8ef5a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='dev'> + <source path='/dev/ttyS2'/> + <target port='0'/> + </serial> + <console type='dev'> + <source path='/dev/ttyS2'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args new file mode 100644 index 0000000..fd3cc4e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev file,id=serial0,path=/tmp/serial.log -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml new file mode 100644 index 0000000..3726816 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='file'> + <source path='/tmp/serial.log'/> + <target port='0'/> + </serial> + <console type='file'> + <source path='/tmp/serial.log'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args new file mode 100644 index 0000000..46113fc --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev pty,id=serial0 -serial chardev:serial0 -chardev file,id=serial1,path=/tmp/serial.log -serial chardev:serial1 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml new file mode 100644 index 0000000..444e85b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <serial type='file'> + <source path='/tmp/serial.log'/> + <target port='1'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args new file mode 100644 index 0000000..1237250 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev pty,id=serial0 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml new file mode 100644 index 0000000..c16ae07 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args new file mode 100644 index 0000000..6255103 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev socket,id=serial0,host=127.0.0.1,port=9999 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml new file mode 100644 index 0000000..3bcf62d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='tcp'> + <source mode='connect' host='127.0.0.1' service='9999'/> + <protocol type='raw'/> + <target port='0'/> + </serial> + <console type='tcp'> + <source mode='connect' host='127.0.0.1' service='9999'/> + <protocol type='raw'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args new file mode 100644 index 0000000..c807e64 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev socket,id=serial0,host=127.0.0.1,port=9999,telnet,server,nowait -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml new file mode 100644 index 0000000..bea4306 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='tcp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <protocol type='telnet'/> + <target port='0'/> + </serial> + <console type='tcp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <protocol type='telnet'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args new file mode 100644 index 0000000..088c461 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev udp,id=serial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml new file mode 100644 index 0000000..115166d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='udp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <source mode='connect' host='127.0.0.1' service='9998'/> + <target port='0'/> + </serial> + <console type='udp'> + <source mode='bind' host='127.0.0.1' service='9999'/> + <source mode='connect' host='127.0.0.1' service='9998'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args new file mode 100644 index 0000000..92a7efc --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev socket,id=serial0,path=/tmp/serial.sock -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml new file mode 100644 index 0000000..4236b4c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'/> + <target port='0'/> + </serial> + <console type='unix'> + <source mode='connect' path='/tmp/serial.sock'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args new file mode 100644 index 0000000..c427c0e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -chardev socket,id=monitor0,path=/tmp/test-monitor,server,nowait -monitor chardev:monitor0 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -chardev vc,id=serial0 -serial chardev:serial0 -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml new file mode 100644 index 0000000..1e5de8f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='vc'> + <target port='0'/> + </serial> + <console type='vc'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c948379..da6b761 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -269,6 +269,18 @@ mymain(int argc, char **argv) DO_TEST("parallel-tcp", 0); DO_TEST("console-compat", 0); + DO_TEST("serial-vc-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-pty-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-dev-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-file-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-unix-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-tcp-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-udp-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-tcp-telnet-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("serial-many-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("parallel-tcp-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("console-compat-chardev", QEMUD_CMD_FLAG_CHARDEV); + DO_TEST("channel-guestfwd", QEMUD_CMD_FLAG_CHARDEV); DO_TEST("sound", 0); -- 1.6.2.5

2 2

[libvirt] ESXi: libvirt python bindings
by Federico Fortini 16 Nov '09

16 Nov '09

Hi to all. I was reading a recent post titled "ESX with Python binding", and tried to test the code posted by Matthias Bolte. I was wondering if ESXi should be considered different from ESX, because as soon as i tried to connect to esxi host I've got a traceback. The exception is raised from libvirt.py line 25 and is: libvirt.libvirtError: virConnectOpenAuth() failed Any tips to go on? My purpose is to write a simple python/django web app to "manage" esxi virtual machine. Tia, Federico Fortini

2 1

[libvirt] stat() vs. access()
by Maximilian Wilhelm 16 Nov '09

16 Nov '09

Hi! While discussing some code with Matthias, we stumbled across many occurances of stat() calls within the libVirt code (virFileExists() for example) which could be implemented in a cheaper way when using access() instead of stat(), when the only purpose is to check for the existance of a file. The one thing I'm concerned about, is the question if access() does the right thing in all situations. As the manpages didn't tell anything about directories it might be worth to clarify this in advance. A simple practical test showed that access ("/path/to/dir", F_OK) seems to work as expected. Any comments on these (optimization) thoughs? Ciao Matthias and Max -- Gib Dein Bestes. Dann übertriff Dich selbst!

2 2

[libvirt] Fedora MinGW - need for *.def files
by Richard W.M. Jones 16 Nov '09

16 Nov '09

[This is just a FYI ...] Upstream binutils or gcc changed the default way that symbols are exported for cross-compiled (Fedora MinGW) DLLs. Previously all symbols were exported. Now they are only exported if they are explicitly listed in a *.def file. There are two ways that libvirt could be changed to do the right thing here. Either (probably simplest) add '-export-all-symbols' to the libtool command line. This would have to be done conditionally based on Win32 being the compilation target. Or create a *.def file. It looks like: LIBRARY libvirt.dll DESCRIPTION "libvirt foo blah" EXPORTS <<list of symbol names, one per line>> http://msdn.microsoft.com/en-us/library/d91k01sh%28VS.80%29.aspx http://msdn.microsoft.com/en-us/library/28d6s79h%28VS.80%29.aspx The LIBRARY and DESCRIPTION lines are optional. You have to add '-export-symbols libvirt.def' to the libtool command line. (It's not clear to me at the moment if you only do this for Windows or if it's safe to pass this on all platforms -- the documentation for this is very sparse). There is a third method: you can munge all the code by adding __declspec(dllexport) to all exported symbols in the header files, conditionally of course. I'm pretty sure that's the worst of all worlds. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

5 13