- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Use unlimited speed when migrating to file
by Jiri Denemark 21 Mar '12

21 Mar '12

This reverts commit 61f2b6ba5fdef0613d6351b99913b5ef468144ce and most of commit d8916dc8e2f612ab3ce46f32c4bfeb0bd73f6007, which effectively brings back commit ef1065cf5acad13767c054758cbe7f4e8af5d241 written by Jim Fehlig: The qemu migration speed default is 32MiB/s as defined in migration.c /* Migration speed throttling */ static int64_t max_throttle = (32 << 20); There's no need to throttle migration when targeting a file, so set migration speed to unlimited prior to migration, and restore to libvirt default value after migration. Default units is MB for migrate_set_speed monitor command, so (INT64_MAX / (1024 * 1024)) is used for unlimited migration speed. This was reverted because migration to file could not be canceled and even monitored since qemu were not processing any monitor commands until the migration finished. This is now different as we make sure the file descriptor we pass to qemu is able to properly report EAGAIN. Recent qemu changes might have helped as well. I tested managedsave with this patch in and indeed, it is 10x faster while I can still monitor its progress. --- src/qemu/qemu_domain.h | 7 +++++++ src/qemu/qemu_migration.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f8e943f..be9e34d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -39,6 +39,13 @@ (1 << VIR_DOMAIN_VIRT_XEN)) # define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX 32 +# if ULONG_MAX == 4294967295 +/* Qemu has a 64-bit limit, but we are limited by our historical choice of + * representing bandwidth in a long instead of a 64-bit int. */ +# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX ULONG_MAX +# else +# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) +# endif # define JOB_MASK(job) (1 << (job - 1)) # define DEFAULT_JOB_MASK \ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 81b2d5b..c0cf636 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2943,6 +2943,16 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, bool restoreLabel = false; virCommandPtr cmd = NULL; int pipeFD[2] = { -1, -1 }; + unsigned long saveMigBandwidth = priv->migMaxBandwidth; + + /* Increase migration bandwidth to unlimited since target is a file. + * Failure to change migration speed is not fatal. */ + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { + qemuMonitorSetMigrationSpeed(priv->mon, + QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX); + priv->migMaxBandwidth = QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX; + qemuDomainObjExitMonitorWithDriver(driver, vm); + } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && (!compressor || pipe(pipeFD) == 0)) { @@ -3054,6 +3064,13 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, ret = 0; cleanup: + /* Restore max migration bandwidth */ + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { + qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); + priv->migMaxBandwidth = saveMigBandwidth; + qemuDomainObjExitMonitorWithDriver(driver, vm); + } + VIR_FORCE_CLOSE(pipeFD[0]); VIR_FORCE_CLOSE(pipeFD[1]); virCommandFree(cmd); -- 1.7.8.5

2 2

[libvirt] MCS labelling not working as expected
by Onkar N Mahajan 21 Mar '12

21 Mar '12

Started two VMs with following security configurations: vm1: <seclabel type='dynamic' model='selinux' relabel='yes'> <label>system_u:system_r:svirt_t:s0:c219,c564</label> <imagelabel>system_u:object_r:svirt_image_t:s0:c219,c564</imagelabel> </seclabel> vm2 : <seclabel type='dynamic' model='selinux' relabel='yes'> <label>system_u:system_r:svirt_t:s0:c122,c658</label> <imagelabel>system_u:object_r:svirt_image_t:s0:c122,c658</imagelabel> </seclabel> # virsh list --all Id Name State ---------------------------------- 28 vm1 running 29 vm2 running # ls -lZ /var/lib/libvirt/images/ -rw-------. qemu qemu system_u:object_r:svirt_image_t:s0:c219,c564 vm1.img -rw-------. qemu qemu system_u:object_r:svirt_image_t:s0:c122,c658 vm2.img # ps auxZ | grep qemu-kvm | grep -v grep system_u:system_r:svirt_t:s0:c219,c564 qemu 15744 47.2 5.8 2757852 472224 ? Sl 11:47 0:18 /usr/libexec/qemu-kvm -S -M rhel6.2.0 -enable-kvm -m 2048 -smp 4,sockets=4,cores=1,threads=1 -name vm1 -uuid d3d3a3ee-4edf-a3d3-8dab-a77740266270 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/vm1.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -drive file=/var/lib/libvirt/images/vm1.img,if=none,id=drive-virtio-disk0,format=raw,cache=none -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,format=raw -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev tap,fd=26,id=hostnet0,vhost=on,vhostfd=27 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:a1:29:45,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 -vga cirrus -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 system_u:system_r:svirt_t:s0:c122,c658 qemu 15780 58.4 6.5 3063496 524048 ? Sl 11:47 0:20 /usr/libexec/qemu-kvm -S -M rhel6.2.0 -enable-kvm -m 2048 -smp 4,sockets=4,cores=1,threads=1 -name vm2 -uuid b07607f8-2d03-cc1f-272b-22863667d1a4 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/vm2.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -drive file=/var/lib/libvirt/images/vm2.img,if=none,id=drive-virtio-disk0,format=raw,cache=none -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,format=raw -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev tap,fd=28,id=hostnet0,vhost=on,vhostfd=29 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:e0:76:d1,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:1 -vga cirrus -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 Now, try to add vm1's disk image into vm2 - this must not be allowed - since for virtualized guest images. Only svirt_t processes with the same MCS fields can read/write these images. i.e., for vm2 to access vm1's disk image it's MCS label must be 's0:c660,c689'. Hot addition of vm1's image i.e., /var/lib/libvirt/images/vm1.img is successful ( which must not be allowed ) moreover , MCS label for vm1's image has changed to that of vm2 # ls -lZ /var/lib/libvirt/images/ -rw-------. qemu qemu system_u:object_r:svirt_image_t:s0:c122,c658 vm1.img -rw-------. qemu qemu system_u:object_r:svirt_image_t:s0:c122,c658 vm2.img Trying to read/write on vm1 will generate AVC messages Seen following message in /var/log/audit/audit.log : type=VIRT_RESOURCE msg=audit(1332310867.790:10312): user pid=5114 uid=0 auid=0 ses=3 subj=unconfined_u:system_r:virtd_t:s0-s0:c0.c1023 msg='virt=kvm resrc=disk reason=attach vm="vm2" uuid=b07607f8-2d03-cc1f-272b-22863667d1a4 old-disk="?" new-disk="/var/lib/libvirt/images/vm1.img": exe=2F7573722F7362696E2F6C69627669727464202864656C6574656429 hostname=? addr=? terminal=? res=success' type=AVC msg=audit(1332310963.333:10313): avc: denied { write } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310963.333:10313): arch=c000003e syscall=18 success=no exit=-13 a0=9 a1=7fd3bc59d000 a2=1000 a3=10891b000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310963.337:10314): avc: denied { read } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310963.337:10314): arch=c000003e syscall=295 success=no exit=-13 a0=9 a1=2d24368 a2=4 a3=88664000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310963.338:10315): avc: denied { read } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310963.338:10315): arch=c000003e syscall=17 success=no exit=-13 a0=9 a1=7fd3bce4f000 a2=1000 a3=88664000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310967.954:10316): avc: denied { read } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310967.954:10316): arch=c000003e syscall=295 success=no exit=-13 a0=9 a1=2d43768 a2=3 a3=1907c8000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310967.955:10317): avc: denied { read } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310967.955:10317): arch=c000003e syscall=17 success=no exit=-13 a0=9 a1=7fd3bac95000 a2=1000 a3=1907c8000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310968.594:10318): avc: denied { write } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310968.594:10318): arch=c000003e syscall=18 success=no exit=-13 a0=9 a1=7fd3bded9000 a2=1000 a3=2c3f000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310968.594:10319): avc: denied { write } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310968.594:10319): arch=c000003e syscall=18 success=no exit=-13 a0=9 a1=7fd3b7947000 a2=1000 a3=9db2d000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310968.594:10320): avc: denied { write } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310968.594:10320): arch=c000003e syscall=296 success=no exit=-13 a0=9 a1=2d6c0f8 a2=b a3=18851e000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) type=AVC msg=audit(1332310968.598:10321): avc: denied { write } for pid=16241 comm="qemu-kvm" path="/var/lib/libvirt/images/vm1.img" dev=sda1 ino=6431944 scontext=system_u:system_r:svirt_t:s0:c219,c564 tcontext=system_u:object_r:svirt_image_t:s0:c122,c658 tclass=file type=SYSCALL msg=audit(1332310968.598:10321): arch=c000003e syscall=18 success=no exit=-13 a0=9 a1=7fd383b0f000 a2=1000 a3=18842e000 items=0 ppid=1 pid=16241 auid=0 uid=107 gid=107 euid=107 suid=107 fsuid=107 egid=107 sgid=107 fsgid=107 tty=(none) ses=3 comm="qemu-kvm" exe="/usr/libexec/qemu-kvm" subj=system_u:system_r:svirt_t:s0:c219,c564 key=(null) restricting vm1 read/write it's own image. Changing seclabels with virsh/virt-manager is not supported so defined a new XML with <seclabel type='dynamic' model='selinux' relabel='no'> <label>system_u:system_r:svirt_t:s0:c110,c401</label> <imagelabel>system_u:object_r:svirt_image_t:s0:c110,c401</imagelabel> </seclabel> but when I try to define it , gives me error : # virsh define vm3.xml error: Failed to define domain from vm3.xml error: unsupported configuration: dynamic label type must use resource relabeling looks like it's not possible to assign relabel='no' with dynamic labelling. libvirt/src/conf/domain_conf.c : if (def->type == VIR_DOMAIN_SECLABEL_DYNAMIC && def->norelabel) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("dynamic label type must use resource relabeling")); goto error; } -- Onkar N Mahajan System Software Engineer, IBM Linux Technology Center, Bangalore,India

1 0

[libvirt] [PATCHv4] python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
by Alex Jia 21 Mar '12

21 Mar '12

Detected by valgrind. Leaks are introduced in commit 17c7795. * python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..634e8bb 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2550,7 +2550,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *ret = NULL; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2559,7 +2561,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) virNodeMemoryStatsPtr stats = NULL; if (!PyArg_ParseTuple(args, (char *)"Oii:virNodeGetMemoryStats", &pyobj_conn, &cellNum, &flags)) - return(NULL); + return ret; conn = (virConnectPtr)(PyvirConnect_Get(pyobj_conn)); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -2570,7 +2572,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); @@ -2580,18 +2582,37 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return VIR_PY_NONE; } } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; - } + + if (!(ret = PyDict_New())) + goto error; + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) { + ret = NULL; + goto error; + } + + if (PyDict_SetItem(ret, key, val) < 0) { + Py_DECREF(ret); + ret = NULL; + goto error; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); return ret; + +error: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; } static PyObject * -- 1.7.1

2 2

[libvirt] [PATCH v2] python: add virDomainGetCPUStats python binding API
by Guannan Ren 21 Mar '12

21 Mar '12

dom.getCPUStats(True, 0) [{'cpu_time': 92913537401L, 'system_time': 5470000000L, 'user_time': 310000000L}] dom.getCPUStats(False, 0) [{'cpu_time': 39476858499L}, {'cpu_time': 10627048370L}, {'cpu_time': 21270945682L}, {'cpu_time': 21556420641L}] *generator.py Add a new naming rule *libvirt-override-api.xml The API function description *libvirt-override.c Implement it. --- python/generator.py | 5 +- python/libvirt-override-api.xml | 10 +++ python/libvirt-override.c | 164 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index 98072f0..4f95cc9 100755 --- a/python/generator.py +++ b/python/generator.py @@ -423,7 +423,7 @@ skip_impl = ( 'virDomainGetBlockIoTune', 'virDomainSetInterfaceParameters', 'virDomainGetInterfaceParameters', - 'virDomainGetCPUStats', # not implemented now. + 'virDomainGetCPUStats', 'virDomainGetDiskErrors', ) @@ -966,6 +966,9 @@ def nameFixup(name, classe, type, file): elif name[0:19] == "virStorageVolLookup": func = name[3:] func = string.lower(func[0:1]) + func[1:] + elif name[0:20] == "virDomainGetCPUStats": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] elif name[0:12] == "virDomainGet": func = name[12:] func = string.lower(func[0:1]) + func[1:] diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ab8f33a..c906cc3 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -149,6 +149,16 @@ <arg name='path' type='char *' info='the path for the block device'/> <arg name='flags' type='int' info='flags (unused; pass 0)'/> </function> + <function name='virDomainGetCPUStats' file='python'> + <info>Extracts CPU statistics for a running domain, On success it will return a list of data of dictionary type. + If boolean total is True, the first element of the list refers to CPU0 on the host, second element is CPU1, and so on. + The format of data struct is like [{cpu_time:xxx},{cpu_time:xxx}, ...] + If it is False, it returns total domain CPU statistics like [{cpu_time:xxx, user_time:xxx, system_time:xxx}]</info> + <return type='str *' info='returns a list of dictionary in case of success, None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='total' type='bool' info='on true, return total domain CPU statistics, false return per-cpu info'/> + <arg name='flags' type='int' info='flags (unused; pass 0)'/> + </function> <function name='virDomainInterfaceStats' file='python'> <info>Extracts interface device statistics for a domain</info> <return type='virDomainInterfaceStats' info='a tuple of statistics'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..eb24c60 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -378,6 +378,169 @@ cleanup: } static PyObject * +libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *totalbool; + PyObject *ret = NULL; + PyObject *cpu, *total; + PyObject *error; + int i, i_retval; + int ncpus = -1; + int sumparams, nparams = -1; + unsigned int flags; + virTypedParameterPtr params, cpuparams; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainGetNumaParameters", + &pyobj_domain, &totalbool, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (!PyBool_Check(totalbool)) { + PyErr_Format(PyExc_TypeError, + "The \"total\" attribute must be bool"); + return NULL; + } + + if ((ret = PyList_New(0)) == NULL) + return NULL; + + if (totalbool == Py_False) { + LIBVIRT_BEGIN_ALLOW_THREADS; + ncpus = virDomainGetCPUStats(domain, NULL, 0, 0, 0, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (ncpus < 0) { + error = VIR_PY_NONE; + goto failed; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + nparams = virDomainGetCPUStats(domain, NULL, 0, 0, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nparams < 0) { + error = VIR_PY_NONE; + goto failed; + } + + if (!nparams) { + if ((cpu = PyDict_New()) == NULL) { + error = NULL; + goto failed; + } + + if (PyList_Append(ret, cpu) < 0) { + Py_DECREF(cpu); + error = NULL; + goto failed; + } + + Py_DECREF(cpu); + return ret; + } + sumparams = nparams * ncpus; + + if (VIR_ALLOC_N(params, sumparams) < 0) { + error = PyErr_NoMemory(); + goto failed; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetCPUStats(domain, params, nparams, 0, ncpus, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + error = VIR_PY_NONE; + goto cleanup; + } + + for (i = 0; i < ncpus; i++) { + if (params[i * nparams].type == 0) + continue; + + cpuparams = &params[i * nparams]; + if ((cpu = getPyVirTypedParameter(cpuparams, nparams)) == NULL) { + error = NULL; + goto cleanup; + } + if (PyList_Append(ret, cpu) < 0) { + Py_DECREF(cpu); + error = NULL; + goto cleanup; + } + Py_DECREF(cpu); + } + + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + return ret; + } else { + LIBVIRT_BEGIN_ALLOW_THREADS; + nparams = virDomainGetCPUStats(domain, NULL, 0, -1, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nparams < 0) { + error = VIR_PY_NONE; + goto failed; + } + + if (!nparams) { + if ((total = PyDict_New()) == NULL) { + error = NULL; + goto failed; + } + if (PyList_Append(ret, total) < 0) { + Py_DECREF(total); + error = NULL; + goto failed; + } + + Py_DECREF(total); + return ret; + } + sumparams = nparams; + + if (VIR_ALLOC_N(params, nparams) < 0) { + error = PyErr_NoMemory(); + goto failed; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetCPUStats(domain, params, nparams, -1, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + error = VIR_PY_NONE; + goto cleanup; + } + + if ((total = getPyVirTypedParameter(params, nparams)) == NULL) { + error = NULL; + goto cleanup; + } + if (PyList_Append(ret, total) < 0) { + Py_DECREF(total); + error = NULL; + goto cleanup; + } + Py_DECREF(total); + + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + return ret; + } + +cleanup: + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + +failed: + Py_DECREF(ret); + return error; +} + +static PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; @@ -5366,6 +5529,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNetworkGetAutostart", libvirt_virNetworkGetAutostart, METH_VARARGS, NULL}, {(char *) "virDomainBlockStats", libvirt_virDomainBlockStats, METH_VARARGS, NULL}, {(char *) "virDomainBlockStatsFlags", libvirt_virDomainBlockStatsFlags, METH_VARARGS, NULL}, + {(char *) "virDomainGetCPUStats", libvirt_virDomainGetCPUStats, METH_VARARGS, NULL}, {(char *) "virDomainInterfaceStats", libvirt_virDomainInterfaceStats, METH_VARARGS, NULL}, {(char *) "virDomainMemoryStats", libvirt_virDomainMemoryStats, METH_VARARGS, NULL}, {(char *) "virNodeGetCellsFreeMemory", libvirt_virNodeGetCellsFreeMemory, METH_VARARGS, NULL}, -- 1.7.7.5

2 13

[libvirt] [PATCHv4 0/3] Xen: Fix <clock> handling
by Philipp Hahn 21 Mar '12

21 Mar '12

Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Since v2: (on feedback by Eric) + add the adjustment='reset' attribute to force the old behaviour + handle adjustment='$timeDelta' as a short-cut for the conversion to variable. + simplify error path handling + update version numbers to 0.9.11 Since v3: + Add missing offset=VARIALE for adjustment='$timeDelta' conversion. Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 18 ++- docs/schemas/domaincommon.rng | 30 +++- src/conf/domain_conf.c | 61 +++++++- src/conf/domain_conf.h | 17 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 167 +++++++++++++++----- src/xenxs/xen_xm.c | 123 ++++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 157 files changed, 526 insertions(+), 200 deletions(-)

2 6

[libvirt] [PATCH] libvirt: xen: do not use ioemu type for any emulated NIC
by Stefan Bader 21 Mar '12

21 Mar '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 When using the xm/xend stack to manage instances there is a bug that causes the emulated interfaces to be unusable when the vif config contains type=ioemu. The current code already has a special quirk to not use this keyword if no specific model is given for the emulated NIC (defaulting to rtl8139). Essentially it works because regardless of the type argument, the Xen stack always creates emulated and paravirt interfaces and lets the guest decide which one to use. So neither xl nor xm stack actually require the type keyword for emulated NICs. - --- /* * apparently type ioemu breaks paravirt drivers on HVM so skip this * from XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU */ if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) virBufferAddLit(&buf, ",type=ioemu"); - --- This is still broken when a different emulated NIC (eg. e1000 is enforced), but the same fix solves that problem. Which is what the attached patch does. I have been testing with this change applied and was able to change between various emulated NIC models successfully. I believe it would be applicable to libvirt upstream, too. - -Stefan PS: Please cc: me directly on replies as I am not subscribed to this list. Thanks. diff -Nurp libvirt.old/src/xenxs/xen_sxpr.c libvirt-0.9.8/src/xenxs/xen_sxpr.c - --- libvirt.old/src/xenxs/xen_sxpr.c 2012-03-16 11:17:02.685042296 +0100 +++ libvirt-0.9.8/src/xenxs/xen_sxpr.c 2012-03-15 18:43:32.000000000 +0100 @@ -1873,7 +1873,9 @@ xenFormatSxprNet(virConnectPtr conn, } else { virBufferEscapeSexpr(buf, "(model '%s')", def->model); - - virBufferAddLit(buf, "(type ioemu)"); + /* See above. Also needed when model is specified. */ + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(buf, "(type ioemu)"); } if (!isAttach) diff -Nurp libvirt.old/src/xenxs/xen_xm.c libvirt-0.9.8/src/xenxs/xen_xm.c - --- libvirt.old/src/xenxs/xen_xm.c 2012-03-16 11:17:02.645042103 +0100 +++ libvirt-0.9.8/src/xenxs/xen_xm.c 2012-03-15 18:43:32.000000000 +0100 @@ -1335,7 +1335,9 @@ static int xenFormatXMNet(virConnectPtr } else { virBufferAsprintf(&buf, ",model=%s", net->model); - - virBufferAddLit(&buf, ",type=ioemu"); + /* See above. Also needed if model is specified. */ + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(&buf, ",type=ioemu"); } if (net->ifname) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCgAGBQJPYxc9AAoJEOhnXe7L7s6j3f8P/3nyZUh5dY8vVcGsRX9mkoX5 DwioJfLit8wjNUX3iJciPnTCUprJeiOpev/dKuuIaUfSEOP+xzHKcAbSVdyXhlME R5n+EbBI6WBDbVT/rbV+Mp52bVoe3vb8LgT2dc1KzYYpcMjlzAzUd56IdJ64YQaS r9o6ps279jY6AeDEEnz0TTajKdNbMBt578kwmsES/1rHMVLT2wLrnQp6Kc9ECQ5o YjpOAU55Bl8OP+1DK0SFSyRl1gesrUXCN1g6QsWiiaeq0OpO8TDxfpxoBKwV19cO kFHoZ8UR4XyaDosVg0S2+WaOn7o8B7r1k+biD23L4QaADcsN+l4uuDHaHYX4nd/L PpbUpZY8+KjTny6H/khqYYJR/G9Wl7L6GMlGLJLihlue3/iIfrHJZdF1+dFgo9uZ vaYgjZWe1ak9vQIUfxa4enxdadBYS7Xy1JP9egA87DACnpzOEWgZ6Qadhcj0cewm MHfEmFWnaHHLI+TqaLSwN3XeTsbZ2GP8ixlW+ewNyAPd76g3uYFVTxDOd9a+r301 C+jtgwDcG1aciXR/diR/Dnr7JZ3Y9Fgu/gt/n0Pr4tIgiYF8+T4WG0osXssiiqbc 3p92VzkEl3P/g5QRdeB/+XxGz9IfAikALyNO4ztFSxk4JIh1ix/OIoaucNSc7XFl boPeTDnZLrdIVncDmJ5c =RhMW -----END PGP SIGNATURE-----

2 3

[libvirt] booting a snapshot
by Pankaj Rawat 21 Mar '12

21 Mar '12

Hi all I have created a snapshot of qcow2 image as qemu-img create -f qcow2 -b guestqcow2 snapshot1 now I want to boot from this snapshot but I don't know how can any one tell me ? DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] [PATCH libvirt-glib] Fix generation of docs in a VPATH builder
by Daniel P. Berrange 21 Mar '12

21 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The DOC_SOURCE_DIR variable was missing the $(top_srcdir) variable so it could not find the source files when run from a VPATH build. Empirically the previous comment saying that $(top_srcdir) was not needed is wrong. --- docs/libvirt-gconfig/Makefile.am | 4 +--- docs/libvirt-glib/Makefile.am | 4 +--- docs/libvirt-gobject/Makefile.am | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/libvirt-gconfig/Makefile.am b/docs/libvirt-gconfig/Makefile.am index 2af0d90..6a3df37 100644 --- a/docs/libvirt-gconfig/Makefile.am +++ b/docs/libvirt-gconfig/Makefile.am @@ -3,9 +3,7 @@ DOC_MODULE=Libvirt-gconfig DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml -# Must not use $(top_srcdir) since gtkdoc-scan runs -# from the srcdir already, not the builddir -DOC_SOURCE_DIR=../../libvirt-gconfig +DOC_SOURCE_DIR=$(top_srcdir)/libvirt-gconfig SCANGOBJ_OPTIONS= diff --git a/docs/libvirt-glib/Makefile.am b/docs/libvirt-glib/Makefile.am index 81e9671..e45f4e2 100644 --- a/docs/libvirt-glib/Makefile.am +++ b/docs/libvirt-glib/Makefile.am @@ -3,9 +3,7 @@ DOC_MODULE=Libvirt-glib DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml -# Must not use $(top_srcdir) since gtkdoc-scan runs -# from the srcdir already, not the builddir -DOC_SOURCE_DIR=../../libvirt-glib +DOC_SOURCE_DIR=$(top_srcdir)/libvirt-glib SCANGOBJ_OPTIONS= diff --git a/docs/libvirt-gobject/Makefile.am b/docs/libvirt-gobject/Makefile.am index 6eb3553..c068a96 100644 --- a/docs/libvirt-gobject/Makefile.am +++ b/docs/libvirt-gobject/Makefile.am @@ -3,9 +3,7 @@ DOC_MODULE=Libvirt-gobject DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml -# Must not use $(top_srcdir) since gtkdoc-scan runs -# from the srcdir already, not the builddir -DOC_SOURCE_DIR=../../libvirt-gobject +DOC_SOURCE_DIR=$(top_srcdir)/libvirt-gobject SCANGOBJ_OPTIONS= -- 1.7.7.6

2 1

[libvirt] [libvirt-glib] Remove unneeded call in libvirt-gconfig test
by Christophe Fergeau 21 Mar '12

21 Mar '12

Because of a copy and paste error, the test program is making an unneeded call to gvir_config_domain_channel_set_target_type when setting up its USB redirection device. --- libvirt-gconfig/tests/test-domain-create.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 88c887d..4ee33aa 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -204,8 +204,6 @@ int main(int argc, char **argv) redirdev = gvir_config_domain_redirdev_new(); gvir_config_domain_redirdev_set_bus(redirdev, GVIR_CONFIG_DOMAIN_REDIRDEV_BUS_USB); - gvir_config_domain_channel_set_target_type(channel, - GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_VIRTIO); spicevmc = gvir_config_domain_chardev_source_spicevmc_new(); gvir_config_domain_chardev_set_source(GVIR_CONFIG_DOMAIN_CHARDEV(redirdev), GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE(spicevmc)); -- 1.7.7.6

2 1

[libvirt] [PATCH] python: always include config.h first
by Eric Blake 20 Mar '12

20 Mar '12

On RHEL 5.7, I got this compilation failure: In file included from /usr/include/python2.4/pyport.h:98, from /usr/include/python2.4/Python.h:55, from libvirt.c:3: ../gnulib/lib/time.h:468: error: expected ';', ',' or ')' before '__timer' Turns out that our '#define restrict __restrict' from config.h wasn't being picked up. Gnulib _requires_ that all .c files include <config.h> first, otherwise the gnulib header overrides tend to misbehave. * python/generator.py (buildStubs): Include <config.h> first. --- Pushing under the build-breaker rule. python/generator.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index 98072f0..e641c31 100755 --- a/python/generator.py +++ b/python/generator.py @@ -757,7 +757,8 @@ def buildStubs(module): export.write("/* Generated */\n\n") wrapper = open(wrapper_file, "w") - wrapper.write("/* Generated */\n\n") + wrapper.write("/* Generated by generator.py */\n\n") + wrapper.write("#include <config.h>\n") wrapper.write("#include <Python.h>\n") wrapper.write("#include <libvirt/" + module + ".h>\n") wrapper.write("#include \"typewrappers.h\"\n") -- 1.7.7.6

1 0

Re: [libvirt] Unknown KVM internal error on 3.2.1
by Doug Goldstein 20 Mar '12

20 Mar '12

On Wed, Mar 7, 2012 at 8:19 AM, Avi Kivity <avi(a)redhat.com> wrote: > On 03/07/2012 01:00 PM, Gleb Natapov wrote: >> > >> > > KVM internal error. Suberror: 1 >> > > emulation failure >> > > EAX=8004003b EBX=38d54633 ECX=c0460a7e EDX=8005003b >> > > ESI=e49329a8 EDI=f7c98d60 EBP=00000286 ESP=f7fecf68 >> > > EIP=f91d1778 EFL=00000282 [--S----] CPL=0 II=0 A20=1 SMM=0 HLT=0 >> > > ES =007b 00000000 ffffffff 00c0f300 DPL=3 DS [-WA] >> > > CS =0060 00000000 ffffffff 00c09b00 DPL=0 CS32 [-RA] >> > > SS =0068 00000000 ffffffff 00c09300 DPL=0 DS [-WA] >> > > DS =007b 00000000 ffffffff 00c0f300 DPL=3 DS [-WA] >> > > FS =0000 00000000 ffffffff 00000000 >> > > GS =0000 b7f526c0 ffffffff 00000000 >> > > LDT=0088 c074a020 00000027 00008200 DPL=0 LDT >> > > TR =0080 c180a7c4 00002073 00008b00 DPL=0 TSS32-busy >> > > GDT= f7c9f000 000000ff >> > > IDT= c06fa000 000007ff >> > > CR0=8005003b CR2=0046b044 CR3=3100d000 CR4=000006d0 >> > > DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 >> > > DR3=0000000000000000 >> > > DR6=00000000ffff0ff0 DR7=0000000000000400 >> > > EFER=0000000000000000 >> > > Code=?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? <??> >> > > ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? >> > > ?? ?? ?? ?? ?? ?? >> > >> > What are all these ?? doing here? Usually they indicate the bad code, >> > but here they don't, this is strange. >> > >> I think it tries to execute code from mmio. >> > > Likely. But let's be sure. > > When it happens again, please keep the guest alive so we can examine it > via qemu monitor commands. > > -- > error compiling committee.c: too many arguments to function > Shortly after I sent the original e-mail I told libvirt to use the host CPU. As discussed in another thread since libvirt uses -nodefconfig, it doesn't really have the correct CPU. I believe the original issue is from the fact that I had an AMD K10 based processor with the errata that was previously causing some issues when it wasn't respected. The default qemu64 processor that libvirt had the guest use did not take into account this errata and causes this issue. I have reverted these CPU settings and will get the monitor information as soon as it occurs again. Providing all the background just to be sure. The host is: processor : 63 vendor_id : AuthenticAMD cpu family : 21 model : 1 model name : AMD Opteron(TM) Processor 6272 stepping : 2 microcode : 0x6000613 cpu MHz : 2099.875 cache size : 2048 KB physical id : 2 siblings : 16 core id : 7 cpu cores : 8 apicid : 79 initial apicid : 79 fpu : yes fpu_exception : yes cpuid level : 13 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm aperfmperf pni pclmulqdq monitor ssse3 cx16 sse4_1 sse4_2 popcnt aes xsave avx lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs xop skinit wdt lwp fma4 nodeid_msr topoext perfctr_core arat cpb npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold bogomips : 4200.08 TLB size : 1536 4K pages clflush size : 64 cache_alignment : 64 address sizes : 48 bits physical, 48 bits virtual power management: ts ttp tm 100mhzsteps hwpstate [9] The guest is: processor : 1 vendor_id : AuthenticAMD cpu family : 6 model : 15 model name : Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz stepping : 11 cpu MHz : 2100.397 cache size : 512 KB fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx mmxext fxsr_opt pdpe1gb lm pni cx16 popcnt lahf_lm cmp_legacy svm cr8legacy abm sse4a misalignsse 3dnowprefetch bogomips : 4200.01 The QEMU command line contains the following: -cpu core2duo,+wdt,+skinit,+osvw,+3dnowprefetch,+misalignsse,+sse4a,+abm,+cr8legacy,+extapic,+svm,+cmp_legacy,+lahf_lm,+rdtscp,+pdpe1gb,+fxsr_opt,+mmxext,+aes,+popcnt,+sse4.2,+sse4.1,+cx16,+ht While libvirt's XML contains: <cpu match='exact'> <model>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='aes'/> <feature policy='require' name='skinit'/> <feature policy='require' name='vme'/> <feature policy='require' name='mmxext'/> <feature policy='require' name='fxsr_opt'/> <feature policy='require' name='cr8legacy'/> <feature policy='require' name='ht'/> <feature policy='require' name='3dnowprefetch'/> <feature policy='require' name='ssse3'/> <feature policy='require' name='wdt'/> <feature policy='require' name='extapic'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='osvw'/> <feature policy='require' name='sse4.1'/> <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='sse4.2'/> </cpu> What the guest used to be with qemu64 CPU: processor : 1 vendor_id : AuthenticAMD cpu family : 6 model : 3 model name : QEMU Virtual CPU version 0.15.1 stepping : 3 cpu MHz : 2100.026 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 4 wp : yes flags : fpu de pse tsc msr pae mce cx8 apic pge cmov pat mmx fxsr sse sse2 pni popcnt bogomips : 4199.33 I also find it odd that the CPU says its 0.15.1 when -M pc-0.13 is explicitly passed in via the command line. -- Doug Goldstein

1 0

[libvirt] [RFC][PATCH] nwfilter: Add support for ipset
by Stefan Berger 20 Mar '12

20 Mar '12

Sending this as an RFC for now... This patch adds support for the recent ipset iptables extension to libvirt's nwfilter subsystem. Ipset allows to maintain 'sets' of IP addresses, ports and other packet parameters and allows for faster lookup and ('chunked') rule evaluation to achieve higher throughput than what can be achieved with individual iptables rules. On the command line iptables supports ipset using iptables ... -m set --match-set <ipset name> <flags> -j ... where 'ipset name' is the name of a previously created ipset and flags is a comma-separated list of up to 6 flags. Flags use 'src' and 'dst' for selecting IP addresses, ports etc. from the source or destination part of a packet. So a concrete example may look like this: iptables -A INPUT -m set --match-set test src,src -j ACCEPT Since ipset management is quite complex, the idea was to leave ipset management outside of libvirt but still allow users to reference an ipset. The user would have to make sure the ipset is available once the VM is started so that the iptables rules can be created. Using XML to describe an ipset in an nwfilter rule would then look as follows: <rule action='accept' direction='in'> <all ipset='test:src,src'/> </rule> The two parameters on the command line become one parameter in the XML attribute 'ipset' and are separated by a colon (':'). FYI: Here is the man page for ipset: https://ipset.netfilter.org/ipset.man.html If you have any comments, please let me know. Regards, Stefan --- docs/formatnwfilter.html.in | 34 ++++++++++ docs/schemas/nwfilter.rng | 11 +++ src/conf/nwfilter_conf.c | 98 ++++++++++++++++++++++++++++++ src/conf/nwfilter_conf.h | 11 +++ src/nwfilter/nwfilter_ebiptables_driver.c | 64 ++++++++++++++++++- tests/nwfilterxml2xmlin/ipset-test.xml | 12 +++ tests/nwfilterxml2xmlout/ipset-test.xml | 12 +++ tests/nwfilterxml2xmltest.c | 2 8 files changed, 240 insertions(+), 4 deletions(-) Index: libvirt/src/conf/nwfilter_conf.c =================================================================== --- libvirt.orig/src/conf/nwfilter_conf.c +++ libvirt/src/conf/nwfilter_conf.c @@ -183,6 +183,7 @@ static const char dstportstart_str[] = " static const char dstportend_str[] = "dstportend"; static const char dscp_str[] = "dscp"; static const char state_str[] = "state"; +static const char ipset_str[] = "ipset"; #define SRCMACADDR srcmacaddr_str #define SRCMACMASK srcmacmask_str @@ -206,6 +207,7 @@ static const char state_str[] = " #define DSTPORTEND dstportend_str #define DSCP dscp_str #define STATE state_str +#define IPSET ipset_str /** @@ -980,6 +982,94 @@ tcpFlagsFormatter(virBufferPtr buf, return true; } +static bool +ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + unsigned int idx; + const char *errmsg = NULL; + char *col = strrchr(val->c, ':'); + size_t pos = col - val->c; + + if (!col || pos == 0) { + errmsg = _("malformed ipset description"); + goto arg_err_exit; + } + + if (pos > sizeof(item->u.ipset.setname) - 1) { + errmsg = _("ipset name exceeds 31 characters"); + goto arg_err_exit; + } + + if (virStrncpy(item->u.ipset.setname, val->c, pos, + sizeof(item->u.ipset.setname)) == NULL) { + errmsg = _("could not copy ipset name"); + goto err_exit; + } + + if (item->u.ipset.setname[strspn(item->u.ipset.setname, + VALID_IPSETNAME)] != 0) { + errmsg = _("ipset name contains invalid characters"); + goto arg_err_exit; + } + + idx = pos + 1; + item->u.ipset.numFlags = 0; + item->u.ipset.flags = 0; + + errmsg = _("malformed ipset flags"); + + while (item->u.ipset.numFlags < 6) { + if (STRCASEEQLEN(&val->c[idx], "src", 3)) { + item->u.ipset.flags |= (1 << item->u.ipset.numFlags); + } else if (!STRCASEEQLEN(&val->c[idx], "dst", 3)) { + goto arg_err_exit; + } + item->u.ipset.numFlags++; + idx += 3; + if (val->c[idx] != ',') + break; + idx++; + } + + if (val->c[idx] != '\0') + goto arg_err_exit; + + return true; + +arg_err_exit: + virNWFilterReportError(VIR_ERR_INVALID_ARG, + "%s", errmsg); + return false; + +err_exit: + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + "%s", errmsg); + return false; +} + +static bool +ipsetFormatter(virBufferPtr buf, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + uint8_t ctr; + + virBufferAdd(buf, item->u.ipset.setname, -1); + virBufferAddLit(buf, ":"); + + for (ctr = 0; ctr < item->u.ipset.numFlags; ctr++) { + if (ctr != 0) + virBufferAddLit(buf, ","); + if ((item->u.ipset.flags & (1 << ctr))) + virBufferAddLit(buf, "src"); + else + virBufferAddLit(buf, "dst"); + } + + return true; +} #define COMMON_MAC_PROPS(STRUCT) \ {\ @@ -1411,6 +1501,13 @@ static const virXMLAttr2Struct ipv6Attri .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataState),\ .validator = stateValidator,\ .formatter = stateFormatter,\ + },\ + {\ + .name = IPSET,\ + .datatype = DATATYPE_IPSET,\ + .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataIPSet),\ + .validator = ipsetValidator,\ + .formatter = ipsetFormatter,\ } #define COMMON_PORT_PROPS(STRUCT) \ @@ -1853,6 +1950,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr n break; case DATATYPE_STRING: + case DATATYPE_IPSET: if (!validator) { /* not supported */ rc = -1; Index: libvirt/src/conf/nwfilter_conf.h =================================================================== --- libvirt.orig/src/conf/nwfilter_conf.h +++ libvirt/src/conf/nwfilter_conf.h @@ -103,8 +103,9 @@ enum attrDatatype { DATATYPE_BOOLEAN = (1 << 12), DATATYPE_UINT32 = (1 << 13), DATATYPE_UINT32_HEX = (1 << 14), + DATATYPE_IPSET = (1 << 15), - DATATYPE_LAST = (1 << 15), + DATATYPE_LAST = (1 << 16), }; # define NWFILTER_MAC_BGA "01:80:c2:00:00:00" @@ -136,9 +137,16 @@ struct _nwItemDesc { uint8_t mask; uint8_t flags; } tcpFlags; + struct { + char setname[32]; + uint8_t numFlags; + uint8_t flags; + } ipset; } u; }; +# define VALID_IPSETNAME \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:-+ " typedef struct _ethHdrDataDef ethHdrDataDef; typedef ethHdrDataDef *ethHdrDataDefPtr; @@ -232,6 +240,7 @@ struct _ipHdrDataDef { nwItemDesc dataState; nwItemDesc dataConnlimitAbove; nwItemDesc dataComment; + nwItemDesc dataIPSet; }; Index: libvirt/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt/src/nwfilter/nwfilter_ebiptables_driver.c @@ -256,10 +256,13 @@ static int _printDataType(virNWFilterVarCombIterPtr vars, char *buf, int bufsize, nwItemDescPtr item, - bool asHex) + bool asHex, bool directionIn) { int done; char *data; + uint8_t ctr; + virBuffer vb = VIR_BUFFER_INITIALIZER; + char *flags; if (printVar(vars, buf, bufsize, item, &done) < 0) return -1; @@ -346,6 +349,41 @@ _printDataType(virNWFilterVarCombIterPtr } break; + case DATATYPE_IPSET: + for (ctr = 0; ctr < item->u.ipset.numFlags; ctr++) { + if (ctr != 0) + virBufferAddLit(&vb, ","); + if ((item->u.ipset.flags & (1 << ctr))) { + if (directionIn) + virBufferAddLit(&vb, "dst"); + else + virBufferAddLit(&vb, "src"); + } else { + if (directionIn) + virBufferAddLit(&vb, "src"); + else + virBufferAddLit(&vb, "dst"); + } + } + + if (virBufferError(&vb)) { + virReportOOMError(); + virBufferFreeAndReset(&vb); + return -1; + } + + flags = virBufferContentAndReset(&vb); + + if (snprintf(buf, bufsize, "\"%s\" %s", + item->u.ipset.setname, flags) >= bufsize) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Buffer too small for stringcopy type")); + VIR_FREE(flags); + return -1; + } + VIR_FREE(flags); + break; + default: virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Unhandled datatype %x"), item->datatype); @@ -362,16 +400,23 @@ printDataType(virNWFilterVarCombIterPtr char *buf, int bufsize, nwItemDescPtr item) { - return _printDataType(vars, buf, bufsize, item, 0); + return _printDataType(vars, buf, bufsize, item, 0, 0); } +static int +printDataTypeDirection(virNWFilterVarCombIterPtr vars, + char *buf, int bufsize, + nwItemDescPtr item, bool directionIn) +{ + return _printDataType(vars, buf, bufsize, item, 0, directionIn); +} static int printDataTypeAsHex(virNWFilterVarCombIterPtr vars, char *buf, int bufsize, nwItemDescPtr item) { - return _printDataType(vars, buf, bufsize, item, 1); + return _printDataType(vars, buf, bufsize, item, 1, 0); } @@ -927,6 +972,7 @@ iptablesHandleIpHdr(virBufferPtr buf, char ipaddr[INET6_ADDRSTRLEN], number[MAX(INT_BUFSIZE_BOUND(uint32_t), INT_BUFSIZE_BOUND(int))]; + char str[200]; const char *src = "--source"; const char *dst = "--destination"; const char *srcrange = "--src-range"; @@ -938,6 +984,18 @@ iptablesHandleIpHdr(virBufferPtr buf, dstrange = "--src-range"; } + if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet)) { + + if (printDataTypeDirection(vars, + str, sizeof(str), + &ipHdr->dataIPSet, directionIn) < 0) + goto err_exit; + + virBufferAsprintf(afterStateMatch, + " -m set --match-set %s", + str); + } + if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPAddr)) { if (printDataType(vars, Index: libvirt/docs/schemas/nwfilter.rng =================================================================== --- libvirt.orig/docs/schemas/nwfilter.rng +++ libvirt/docs/schemas/nwfilter.rng @@ -485,6 +485,11 @@ <ref name="stateflags-type"/> </attribute> </optional> + <optional> + <attribute name="ipset"> + <ref name="ipset-type"/> + </attribute> + </optional> </interleave> </define> @@ -1060,4 +1065,10 @@ <param name="pattern">((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)/((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)</param> </data> </define> + + <define name='ipset-type'> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.:\-\+]{1,31}:(src|dst)(,(src|dst)){0,5}</param> + </data> + </define> </grammar> Index: libvirt/tests/nwfilterxml2xmlin/ipset-test.xml =================================================================== --- /dev/null +++ libvirt/tests/nwfilterxml2xmlin/ipset-test.xml @@ -0,0 +1,12 @@ +<filter name='testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out'> + <all ipset='test:src,dst' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='test:SRC,DST,SRC' /> + </rule> + <rule action='accept' direction='in'> + <all ipset='test:_.-+:SRC,dSt,SRC' /> + </rule> +</filter> Index: libvirt/tests/nwfilterxml2xmlout/ipset-test.xml =================================================================== --- /dev/null +++ libvirt/tests/nwfilterxml2xmlout/ipset-test.xml @@ -0,0 +1,12 @@ +<filter name='testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out' priority='500'> + <all ipset='test:src,dst'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <all ipset='test:src,dst,src'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <all ipset='test:_.-+:src,dst,src'/> + </rule> +</filter> Index: libvirt/tests/nwfilterxml2xmltest.c =================================================================== --- libvirt.orig/tests/nwfilterxml2xmltest.c +++ libvirt/tests/nwfilterxml2xmltest.c @@ -157,6 +157,8 @@ mymain(void) DO_TEST("iter-test2", false); DO_TEST("iter-test3", false); + DO_TEST("ipset-test", false); + return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } Index: libvirt/docs/formatnwfilter.html.in =================================================================== --- libvirt.orig/docs/formatnwfilter.html.in +++ libvirt/docs/formatnwfilter.html.in @@ -528,6 +528,10 @@ <li>IPV6_MASK: IPv6 mask in numbers format (FFFF:FFFF:FC00::) or CIDR mask (0-128)</li> <li>STRING: A string</li> <li>BOOLEAN: 'true', 'yes', '1' or 'false', 'no', '0'</li> + <li>IPSET: The name of the ipset followed by a colon (':') followed + by up to 6 'src' or 'dst' elements selecting features from either + the source or destination part of the packet header; example: + myipset:src,src,dst</li> </ul> <p> <br/><br/> @@ -1169,6 +1173,11 @@ <td>STRING</td> <td>TCP-only: format of mask/flags with mask and flags each being a comma separated list of SYN,ACK,URG,PSH,FIN,RST or NONE or ALL</td> </tr> + <tr> + <td>ipset <span class="since">(Since 0.9.10)</span></td> + <td>IPSET</td> + <td>References an IPset managed outside of libvirt</td> + </tr> </table> <p> <br/><br/> @@ -1269,6 +1278,11 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset <span class="since">(Since 0.9.10)</span></td> + <td>IPSET</td> + <td>References an IP set managed outside of libvirt</td> + </tr> </table> <p> <br/><br/> @@ -1358,6 +1372,11 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset <span class="since">(Since 0.9.10)</span></td> + <td>IPSET</td> + <td>References an IP set managed outside of libvirt</td> + </tr> </table> <p> <br/><br/> @@ -1459,6 +1478,11 @@ <td>STRING</td> <td>TCP-only: format of mask/flags with mask and flags each being a comma separated list of SYN,ACK,URG,PSH,FIN,RST or NONE or ALL</td> </tr> + <tr> + <td>ipset <span class="since">(Since 0.9.10)</span></td> + <td>IPSET</td> + <td>References an IP set managed outside of libvirt</td> + </tr> </table> <p> <br/><br/> @@ -1545,6 +1569,11 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset <span class="since">(Since 0.9.10)</span></td> + <td>IPSET</td> + <td>References an IP set managed outside of libvirt</td> + </tr> </table> <p> <br/><br/> @@ -1619,6 +1648,11 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>ipset <span class="since">(Since 0.9.10)</span></td> + <td>IPSET</td> + <td>References an IP set managed outside of libvirt</td> + </tr> </table> <p> <br/><br/>

1 0

[libvirt] [PATCH v3] python: add virDomainGetCPUStats python binding API
by Guannan Ren 20 Mar '12

20 Mar '12

dom.getCPUStats(True, 0) [{'cpu_time': 24699446159L, 'system_time': 10870000000L, 'user_time': 950000000L}] dom.getCPUStats(False, 0) [{'cpu_time': 8535292289L}, {'cpu_time': 1005395355L}, {'cpu_time': 9351766377L}, {'cpu_time': 5813545649L}] *generator.py Add a new naming rule *libvirt-override-api.xml The API function description *libvirt-override.c Implement it. --- python/generator.py | 5 +- python/libvirt-override-api.xml | 13 ++++ python/libvirt-override.c | 147 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index 98072f0..4f95cc9 100755 --- a/python/generator.py +++ b/python/generator.py @@ -423,7 +423,7 @@ skip_impl = ( 'virDomainGetBlockIoTune', 'virDomainSetInterfaceParameters', 'virDomainGetInterfaceParameters', - 'virDomainGetCPUStats', # not implemented now. + 'virDomainGetCPUStats', 'virDomainGetDiskErrors', ) @@ -966,6 +966,9 @@ def nameFixup(name, classe, type, file): elif name[0:19] == "virStorageVolLookup": func = name[3:] func = string.lower(func[0:1]) + func[1:] + elif name[0:20] == "virDomainGetCPUStats": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] elif name[0:12] == "virDomainGet": func = name[12:] func = string.lower(func[0:1]) + func[1:] diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ab8f33a..26d9902 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -149,6 +149,19 @@ <arg name='path' type='char *' info='the path for the block device'/> <arg name='flags' type='int' info='flags (unused; pass 0)'/> </function> + <function name='virDomainGetCPUStats' file='python'> + <info>Extracts CPU statistics for a running domain. On success it will + return a list of data of dictionary type. If boolean total is False, the + first element of the list refers to CPU0 on the host, second element is + CPU1, and so on. The format of data struct is as follows: + [{cpu_time:xxx}, {cpu_time:xxx}, ...] + If it is True, it returns total domain CPU statistics in the format of + [{cpu_time:xxx, user_time:xxx, system_time:xxx}]</info> + <return type='str *' info='returns a list of dictionary in case of success, None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='total' type='bool' info='on true, return total domain CPU statistics, false return per-cpu info'/> + <arg name='flags' type='int' info='flags (unused; pass 0)'/> + </function> <function name='virDomainInterfaceStats' file='python'> <info>Extracts interface device statistics for a domain</info> <return type='virDomainInterfaceStats' info='a tuple of statistics'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..5920456 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -378,6 +378,152 @@ cleanup: } static PyObject * +libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *totalbool; + PyObject *cpu, *total; + PyObject *ret = NULL; + PyObject *error = NULL; + int ncpus = -1, start_cpu = 0; + int sumparams = 0, nparams = -1; + int i, i_retval; + unsigned int flags, totalflag; + virTypedParameterPtr params = NULL, cpuparams; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainGetCPUStats", + &pyobj_domain, &totalbool, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (!PyBool_Check(totalbool)) { + PyErr_Format(PyExc_TypeError, + "The \"total\" attribute must be bool"); + return NULL; + } else { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + PyObject *hacktrue = PyBool_FromLong(1); + totalflag = hacktrue == totalbool ? 1 : 0; + Py_DECREF(hacktrue); + } + + if ((ret = PyList_New(0)) == NULL) + return NULL; + + if (!totalflag) { + LIBVIRT_BEGIN_ALLOW_THREADS; + ncpus = virDomainGetCPUStats(domain, NULL, 0, 0, 0, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (ncpus < 0) { + error = VIR_PY_NONE; + goto error; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + nparams = virDomainGetCPUStats(domain, NULL, 0, 0, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nparams < 0) { + error = VIR_PY_NONE; + goto error; + } + + sumparams = nparams * MIN(ncpus, 128); + + if (VIR_ALLOC_N(params, sumparams) < 0) { + error = PyErr_NoMemory(); + goto error; + } + + while (ncpus) { + int queried_ncpus = MIN(ncpus, 128); + if (nparams) { + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetCPUStats(domain, params, + nparams, start_cpu, queried_ncpus, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + error = VIR_PY_NONE; + goto error; + } + } else { + i_retval = 0; + } + + for (i = 0; i < queried_ncpus; i++) { + cpuparams = &params[i * i_retval]; + if ((cpu = getPyVirTypedParameter(cpuparams, i_retval)) == NULL) { + goto error; + } + + if (PyList_Append(ret, cpu) < 0) { + Py_DECREF(cpu); + goto error; + } + Py_DECREF(cpu); + } + + start_cpu += queried_ncpus; + ncpus -= queried_ncpus; + virTypedParameterArrayClear(params, sumparams); + } + } else { + LIBVIRT_BEGIN_ALLOW_THREADS; + nparams = virDomainGetCPUStats(domain, NULL, 0, -1, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nparams < 0) { + error = VIR_PY_NONE; + goto error; + } + + if (nparams) { + sumparams = nparams; + + if (VIR_ALLOC_N(params, nparams) < 0) { + error = PyErr_NoMemory(); + goto error; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetCPUStats(domain, params, nparams, -1, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + error = VIR_PY_NONE; + goto error; + } + } else { + i_retval = 0; + } + + if ((total = getPyVirTypedParameter(params, i_retval)) == NULL) { + goto error; + } + if (PyList_Append(ret, total) < 0) { + Py_DECREF(total); + goto error; + } + Py_DECREF(total); + } + + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + return ret; + +error: + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + Py_DECREF(ret); + return error; +} + +static PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; @@ -5366,6 +5512,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNetworkGetAutostart", libvirt_virNetworkGetAutostart, METH_VARARGS, NULL}, {(char *) "virDomainBlockStats", libvirt_virDomainBlockStats, METH_VARARGS, NULL}, {(char *) "virDomainBlockStatsFlags", libvirt_virDomainBlockStatsFlags, METH_VARARGS, NULL}, + {(char *) "virDomainGetCPUStats", libvirt_virDomainGetCPUStats, METH_VARARGS, NULL}, {(char *) "virDomainInterfaceStats", libvirt_virDomainInterfaceStats, METH_VARARGS, NULL}, {(char *) "virDomainMemoryStats", libvirt_virDomainMemoryStats, METH_VARARGS, NULL}, {(char *) "virNodeGetCellsFreeMemory", libvirt_virNodeGetCellsFreeMemory, METH_VARARGS, NULL}, -- 1.7.7.5

2 4

[libvirt] [PATCH] python: make virDomainSetSchedulerParameters accpet integer argument
by Guannan Ren 20 Mar '12

20 Mar '12

When sending a Python integer as an argument to PyLong_AsUnsignedLong or PyLong_AsUnsignedLongLong, the following error occurs SystemError: Objects/longobject.c:980: bad argument to internal function This error comes from the fact that PyLong_AsUnsignedLong and PyLong_AsUnsignedLongLong, unlike PyLong_AsLong or PyLong_AsLongLong, does not check to see if the number is a long or integer, but only a long. The regression is introduced by 9c8466daac19379c41be39ec8f18db36c9573c02 >>> dom.setSchedulerParameters({'cpu_shares': 1024}) 0 dom.schedulerParameters() {'cpu_shares': 1024L} >>> dom.setSchedulerParameters({'cpu_shares': 1024L}) 0 >>> dom.schedulerParameters() {'cpu_shares': 1024L} --- python/libvirt-override.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..aec8f5a 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -233,7 +233,14 @@ setPyVirTypedParameter(PyObject *info, break; case VIR_TYPED_PARAM_ULLONG: { - unsigned long long ullong_val = PyLong_AsUnsignedLongLong(value); + unsigned long long ullong_val; + if (PyInt_Check(value)) + ullong_val = (unsigned long long)PyInt_AsLong(value); + else if (PyLong_Check(value)) + ullong_val = PyLong_AsUnsignedLongLong(value); + else + PyErr_SetString(PyExc_TypeError, "an integer is required"); + if ((ullong_val == -1) && PyErr_Occurred()) goto cleanup; temp->value.ul = ullong_val; -- 1.7.7.5

2 3

[libvirt] [PATCH] conf: forbid use of multicast mac addresses
by Laine Stump 20 Mar '12

20 Mar '12

A few times libvirt users manually setting mac addresses have complained of networking failure that ends up being due to a multicast mac address being used for a guest interface. This patch prevents that by loggin an error and failing if a multicast mac address is encountered in each of the three following cases: 1) domain xml <interface> mac address. 2) network xml bridge mac address. 3) network xml dhcp/host mac address. There are several other places where a mac address cna be input that aren't controlled in this manner because failure to do so has no consequences (e.g., if the address will be used to search through existing interfaces for a match). The RNG has been updated to add multiMacAddr and uniMacAddr along with the existing macAddr, and macAddr was switched to uniMacAddr where appropriate. --- docs/schemas/basictypes.rng | 17 ++++++++++++++++- docs/schemas/domaincommon.rng | 6 +++--- docs/schemas/network.rng | 4 ++-- src/conf/domain_conf.c | 8 +++++++- src/conf/network_conf.c | 33 ++++++++++++++++++++++++--------- src/libvirt_private.syms | 2 ++ src/util/virmacaddr.c | 13 +++++++++++++ src/util/virmacaddr.h | 3 ++- 8 files changed, 69 insertions(+), 17 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 7d7911d..9dbda4a 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -55,9 +55,24 @@ </define>  +  +  +  +  +  + <define name="uniMacAddr"> + <data type="string"> + <param name="pattern">[a-fA-F0-9][02468aAcCeE](:[a-fA-F0-9]{2}){5}</param> + </data> + </define> + <define name="multiMacAddr"> + <data type="string"> + <param name="pattern">[a-fA-F0-9][13579bBdDfF](:[a-fA-F0-9]{2}){5}</param> + </data> + </define> <define name="macAddr"> <data type="string"> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> + <param name="pattern">[a-fA-F0-9]{2}(:[a-fA-F0-9]{2}){5}</param> </data> </define> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5b3e5fa..f629691 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1391,7 +1391,7 @@ <optional> <element name="mac"> <attribute name="address"> - <ref name="macAddr"/> + <ref name="uniMacAddr"/> </attribute> <empty/> </element> @@ -1417,7 +1417,7 @@ <optional> <element name="mac"> <attribute name="address"> - <ref name="macAddr"/> + <ref name="uniMacAddr"/> </attribute> <empty/> </element> @@ -1498,7 +1498,7 @@ <optional> <element name="mac"> <attribute name="address"> - <ref name="macAddr"/> + <ref name="uniMacAddr"/> </attribute> <empty/> </element> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6e1002f..2ae879e 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -57,7 +57,7 @@  <optional> <element name="mac"> - <attribute name="address"><ref name="macAddr"/></attribute> + <attribute name="address"><ref name="uniMacAddr"/></attribute> <empty/> </element> </optional> @@ -218,7 +218,7 @@ </zeroOrMore> <zeroOrMore> <element name="host"> - <attribute name="mac"><ref name="macAddr"/></attribute> + <attribute name="mac"><ref name="uniMacAddr"/></attribute> <attribute name="name"><text/></attribute> <attribute name="ip"><ref name="ipv4Addr"/></attribute> </element> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e6d0f4b..d5def1c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4416,11 +4416,17 @@ virDomainNetDefParseXML(virCapsPtr caps, if (macaddr) { if (virMacAddrParse((const char *)macaddr, def->mac) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, + virDomainReportError(VIR_ERR_XML_ERROR, _("unable to parse mac address '%s'"), (const char *)macaddr); goto error; } + if (virMacAddrIsMulticast(def->mac)) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("expected unicast mac address, found multicast '%s'"), + (const char *)macaddr); + goto error; + } } else { virCapabilitiesGenerateMac(caps, def->mac); } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0fa58f8..87796b5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -419,22 +419,30 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, def->nranges++; } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "host")) { - char *mac, *name, *ip; + char *mac = NULL, *name = NULL, *ip; unsigned char addr[6]; virSocketAddr inaddr; mac = virXMLPropString(cur, "mac"); - if ((mac != NULL) && - (virMacAddrParse(mac, &addr[0]) != 0)) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse MAC address '%s' in network '%s'"), - mac, networkName); - VIR_FREE(mac); - return -1; + if (mac != NULL) { + if (virMacAddrParse(mac, &addr[0]) < 0) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("Cannot parse MAC address '%s' in network '%s'"), + mac, networkName); + VIR_FREE(mac); + return -1; + } + if (virMacAddrIsMulticast(addr)) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("expected unicast mac address, found multicast '%s' in network '%s'"), + (const char *)mac, networkName); + VIR_FREE(mac); + return -1; + } } name = virXMLPropString(cur, "name"); if ((name != NULL) && (!c_isalpha(name[0]))) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, + virNetworkReportError(VIR_ERR_XML_ERROR, _("Cannot use name address '%s' in network '%s'"), name, networkName); VIR_FREE(name); @@ -990,6 +998,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(tmp); goto error; } + if (virMacAddrIsMulticast(def->mac)) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("Invalid multicast bridge mac address '%s' in network '%s'"), + tmp, def->name); + VIR_FREE(tmp); + goto error; + } VIR_FREE(tmp); def->mac_specified = true; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e40c80e..9a718b4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1208,6 +1208,8 @@ virKeycodeValueTranslate; virMacAddrCompare; virMacAddrFormat; virMacAddrGenerate; +virMacAddrIsMulticast; +virMacAddrIsUnicast; virMacAddrParse; diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 70aef56..7b40397 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -126,3 +126,16 @@ void virMacAddrGenerate(const unsigned char *prefix, addr[4] = virRandomBits(8); addr[5] = virRandomBits(8); } + +/* The low order bit of the first byte is the "multicast" bit. */ +bool +virMacAddrIsMulticast(const unsigned char *addr) +{ + return !!(addr[0] & 1); +} + +bool +virMacAddrIsUnicast(const unsigned char *addr) +{ + return !(addr[0] & 1); +} diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 278f41e..f8d3e0c 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -37,5 +37,6 @@ void virMacAddrGenerate(const unsigned char *prefix, unsigned char *addr); int virMacAddrParse(const char* str, unsigned char *addr) ATTRIBUTE_RETURN_CHECK; - +bool virMacAddrIsUnicast(const unsigned char *addr); +bool virMacAddrIsMulticast(const unsigned char *addr); #endif /* __VIR_MACADDR_H__ */ -- 1.7.7.6

2 2

[libvirt] [PATCH] conf: return immediately on error in dhcp host element
by Laine Stump 20 Mar '12

20 Mar '12

If and error was encountered parsing a dhcp host entry mac address or name, parsing would continue and log a less descriptive error that might make it more difficult to notice the true nature of the problem. This patch returns immediately on logging the first error. --- src/conf/network_conf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0333141..0fa58f8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -430,6 +430,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, _("Cannot parse MAC address '%s' in network '%s'"), mac, networkName); VIR_FREE(mac); + return -1; } name = virXMLPropString(cur, "name"); if ((name != NULL) && (!c_isalpha(name[0]))) { @@ -437,6 +438,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, _("Cannot use name address '%s' in network '%s'"), name, networkName); VIR_FREE(name); + return -1; } /* * You need at least one MAC address or one host name -- 1.7.7.6

2 4

[libvirt] [PATCH] Minor docs fix
by Martin Kletzander 20 Mar '12

20 Mar '12

End tag for "host" element was missing in example configuration --- docs/formatnetwork.html.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 907c046..7e8e991 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -363,6 +363,7 @@ <host ip='192.168.122.2'> <hostname>myhost</hostname> <hostname>myhostalias</hostname> + </host> </dns> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> -- 1.7.3.4

2 1

[libvirt] [PATCH] Cpu mapping cleanup
by Martin Kletzander 19 Mar '12

19 Mar '12

Using inheritance, this patch cleans up the cpu_map.xml file and also sorts all CPU features according to the feature and registry values. Model features are sorted the same way as foeatures in the specification. Also few models that are related were organized together and parts of the XML are marked with comments --- src/cpu/cpu_map.xml | 455 +++++++++----------------------------------------- 1 files changed, 82 insertions(+), 373 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 6af9c40..9a89e2e 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -268,6 +268,7 @@ <feature name='pse'/> </model> +  <model name='pentium'> <model name='486'/> <feature name='de'/> @@ -302,482 +303,190 @@ <feature name='pse'/> <feature name='tsc'/> <feature name='msr'/> + <feature name='pae'/> <feature name='mce'/> <feature name='cx8'/> + <feature name='apic'/> + <feature name='sep'/> <feature name='pge'/> <feature name='cmov'/> <feature name='pat'/> - <feature name='fxsr'/> <feature name='mmx'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='pae'/> - <feature name='sep'/> - <feature name='apic'/> - </model> - - <model name='qemu32'> - <model name='pentiumpro'/> - <feature name='pni'/> - </model> - - <model name='cpu64-rhel5'> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='fxsr'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='pni'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='cpu64-rhel6'> - <feature name='apic'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> - <feature name='pge'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='pni'/> - <feature name='syscall'/> - <feature name='tsc'/> - </model> - - <model name='kvm32'> - <model name='pentiumpro'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='pse36'/> - <feature name='pni'/> </model> <model name='coreduo'> <model name='pentiumpro'/> + <vendor name='Intel'/> <feature name='vme'/> <feature name='mtrr'/> - <feature name='clflush'/> <feature name='mca'/> + <feature name='clflush'/> <feature name='pni'/> <feature name='monitor'/> <feature name='nx'/> </model> - <model name='qemu64'> - <model name='pentiumpro'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='pse36'/> - <feature name='pni'/> - <feature name='cx16'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> - <feature name='svm'/> -  + <model name='n270'> + <model name='coreduo'/> + <feature name='ssse3'/> </model> - <model name='kvm64'> - <model name='pentiumpro'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> + <model name='core2duo'> + <model name='n270'/> <feature name='pse36'/> - <feature name='pni'/> - <feature name='cx16'/> - <feature name='lm'/> <feature name='syscall'/> - <feature name='nx'/> + <feature name='lm'/> </model> - <model name='core2duo'> +  + <model name='qemu32'> <model name='pentiumpro'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='vme'/> - <feature name='pse36'/> <feature name='pni'/> - <feature name='monitor'/> - <feature name='ssse3'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> </model> - <model name='phenom'> - <model name='pentiumpro'/> - <vendor name='AMD'/> + <model name='kvm32'> + <model name='qemu32'/> <feature name='mtrr'/> - <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> - <feature name='pni'/> - <feature name='monitor'/> - <feature name='lm'/> + <feature name='clflush'/> + </model> + + <model name='cpu64-rhel5'> + <model name='kvm32'/> <feature name='syscall'/> <feature name='nx'/> - <feature name='3dnow'/> - <feature name='3dnowext'/> - <feature name='mmxext'/> - <feature name='fxsr_opt'/> - <feature name='svm'/> + <feature name='lm'/> </model> - <model name='athlon'> - <model name='pentiumpro'/> - <vendor name='AMD'/> - <feature name='pse36'/> - <feature name='vme'/> - <feature name='mtrr'/> - <feature name='mmxext'/> - <feature name='3dnow'/> - <feature name='3dnowext'/> + <model name='cpu64-rhel6'> + <model name='cpu64-rhel5'/> + <feature name='cx16'/> + <feature name='lahf_lm'/> </model> - <model name='n270'> - <model name='pentiumpro'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='vme'/> - <feature name='monitor'/> - <feature name='pni'/> - <feature name='ssse3'/> - <feature name='nx'/> + <model name='kvm64'> + <model name='cpu64-rhel5'/> + <feature name='cx16'/> </model> + <model name='qemu64'> + <model name='kvm64'/> +  + <feature name='svm'/> + </model> + +  <model name='Conroe'> + <model name='pentiumpro'/> <vendor name='Intel'/> - <feature name='sse2'/> - <feature name='sse'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='sep'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='mtrr'/> - <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> + <feature name='clflush'/> <feature name='pni'/> <feature name='ssse3'/> - <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> + <feature name='lm'/> <feature name='lahf_lm'/> </model> <model name='Penryn'> - <vendor name='Intel'/> - <feature name='sse2'/> - <feature name='sse'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='sep'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='pse36'/> - <feature name='pni'/> + <model name='Conroe'/> <feature name='cx16'/> - <feature name='ssse3'/> <feature name='sse4.1'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> - <feature name='lahf_lm'/> </model> <model name='Nehalem'> - <vendor name='Intel'/> - <feature name='sse2'/> - <feature name='sse'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='sep'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='pse36'/> - <feature name='pni'/> - <feature name='cx16'/> - <feature name='ssse3'/> - <feature name='sse4.1'/> + <model name='Penryn'/> <feature name='sse4.2'/> <feature name='popcnt'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> - <feature name='lahf_lm'/> </model> <model name='Westmere'> - <vendor name='Intel'/> <model name='Nehalem'/> <feature name='aes'/> </model> <model name='SandyBridge'> - <vendor name='Intel'/> - <feature name='aes'/> - <feature name='apic'/> - <feature name='avx'/> - <feature name='clflush'/> - <feature name='cmov'/> - <feature name='cx16'/> - <feature name='cx8'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='fxsr'/> - <feature name='lahf_lm'/> - <feature name='lm'/> - <feature name='mca'/> - <feature name='mce'/> - <feature name='mmx'/> - <feature name='msr'/> - <feature name='mtrr'/> - <feature name='nx'/> - <feature name='pae'/> - <feature name='pat'/> + <model name='Westmere'/> <feature name='pclmuldq'/> - <feature name='pge'/> - <feature name='pni'/> - <feature name='popcnt'/> - <feature name='pse'/> - <feature name='pse36'/> - <feature name='rdtscp'/> - <feature name='sep'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='sse4.1'/> - <feature name='sse4.2'/> - <feature name='ssse3'/> - <feature name='syscall'/> - <feature name='tsc'/> - <feature name='tsc-deadline'/> <feature name='x2apic'/> + <feature name='tsc-deadline'/> <feature name='xsave'/> + <feature name='avx'/> + <feature name='rdtscp'/> </model> - <model name='Opteron_G1'> +  + <model name='athlon'> + <model name='pentiumpro'/> <vendor name='AMD'/> - <feature name='sse2'/> - <feature name='sse'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='sep'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> + <feature name='vme'/> <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> <feature name='pse36'/> - <feature name='pni'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> + <feature name='mmxext'/> + <feature name='3dnowext'/> + <feature name='3dnow'/> </model> - <model name='Opteron_G2'> + <model name='phenom'> + <model name='cpu64-rhel5'/> <vendor name='AMD'/> - <feature name='sse2'/> - <feature name='sse'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='sep'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='pse36'/> - <feature name='pni'/> + <feature name='monitor'/> + <feature name='mmxext'/> + <feature name='fxsr_opt'/> + <feature name='3dnowext'/> + <feature name='3dnow'/> + <feature name='svm'/> + </model> + + <model name='Opteron_G1'> + <model name='cpu64-rhel5'/> + <vendor name='AMD'/> + </model> + + <model name='Opteron_G2'> + <model name='Opteron_G1'/> <feature name='cx16'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> <feature name='rdtscp'/> - <feature name='svm'/> <feature name='lahf_lm'/> + <feature name='svm'/> </model> <model name='Opteron_G3'> - <vendor name='AMD'/> - <feature name='sse2'/> - <feature name='sse'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='sep'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> - <feature name='mtrr'/> - <feature name='clflush'/> - <feature name='mca'/> - <feature name='pse36'/> - <feature name='pni'/> - <feature name='cx16'/> + <model name='Opteron_G2'/> <feature name='monitor'/> <feature name='popcnt'/> - <feature name='lm'/> - <feature name='syscall'/> - <feature name='nx'/> - <feature name='rdtscp'/> - <feature name='svm'/> - <feature name='sse4a'/> <feature name='abm'/> + <feature name='sse4a'/> <feature name='misalignsse'/> - <feature name='lahf_lm'/> </model> <model name='Opteron_G4'> - <vendor name='AMD'/> - <feature name='fpu'/> - <feature name='de'/> - <feature name='pse'/> - <feature name='tsc'/> - <feature name='msr'/> - <feature name='pae'/> - <feature name='mce'/> - <feature name='cx8'/> - <feature name='apic'/> - <feature name='sep'/> - <feature name='mtrr'/> - <feature name='pge'/> - <feature name='mca'/> - <feature name='cmov'/> - <feature name='pat'/> - <feature name='pse36'/> - <feature name='clflush'/> - <feature name='mmx'/> - <feature name='fxsr'/> - <feature name='sse'/> - <feature name='sse2'/> - <feature name='pni'/> + <model name='Opteron_G2'/> +  <feature name='pclmuldq'/> <feature name='ssse3'/> - <feature name='cx16'/> <feature name='sse4.1'/> <feature name='sse4.2'/> <feature name='popcnt'/> <feature name='aes'/> <feature name='xsave'/> <feature name='avx'/> - <feature name='syscall'/> - <feature name='nx'/> <feature name='pdpe1gb'/> - <feature name='rdtscp'/> - <feature name='lm'/> - <feature name='lahf_lm'/> - <feature name='svm'/> <feature name='abm'/> <feature name='sse4a'/> <feature name='misalignsse'/> -- 1.7.3.4

2 2

[libvirt] [PATCH] snapshot: make quiesce a bit safer
by Eric Blake 19 Mar '12

19 Mar '12

If a guest is paused, we were silently ignoring the quiesce flag, which results in unclean snapshots, contrary to the intent of the flag. Since we can't quiesce without guest agent support, we should instead fail if the guest is not running. Meanwhile, if we attempt a quiesce command, but the guest agent doesn't respond, and we time out, we may have left the command pending on the guest's queue, and when the guest resumes parsing commands, it will freeze even though our command is no longer around to issue a thaw. To be safe, we must _always_ pair every quiesce call with a counterpart thaw, even if the quiesce call failed due to a timeout, so that if a guest wakes up and starts processing a command backlog, it will not get stuck in a frozen state. * src/qemu/qemu_driver.c (qemuDomainSnapshotCreateDiskActive): Always issue thaw after a quiesce, even if quiesce failed. (qemuDomainSnapshotFSThaw): Add a parameter. --- See also: https://bugzilla.redhat.com/show_bug.cgi?id=804210 https://www.redhat.com/archives/libvir-list/2012-March/msg00708.html src/qemu/qemu_driver.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2c467ab..13ca92f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9584,24 +9584,36 @@ qemuDomainSnapshotFSFreeze(struct qemud_driver *driver, static int qemuDomainSnapshotFSThaw(struct qemud_driver *driver, - virDomainObjPtr vm) { + virDomainObjPtr vm, bool report) +{ qemuDomainObjPrivatePtr priv = vm->privateData; int thawed; + virErrorPtr err = NULL; if (priv->agentError) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QEMU guest agent is not " - "available due to an error")); + if (report) + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU guest agent is not " + "available due to an error")); return -1; } if (!priv->agent) { - qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (report) + qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); return -1; } qemuDomainObjEnterAgent(driver, vm); + if (!report) + err = virGetLastError(); thawed = qemuAgentFSThaw(priv->agent); + if (!report) { + if (err) + virResetError(err); + else + virResetLastError(); + } qemuDomainObjExitAgent(driver, vm); return thawed; @@ -9907,6 +9919,7 @@ qemuDomainSnapshotCreateDiskActive(virConnectPtr conn, int ret = -1; int i; bool persist = false; + int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) return -1; @@ -9917,14 +9930,21 @@ qemuDomainSnapshotCreateDiskActive(virConnectPtr conn, goto endjob; } - - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { - if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) && - (qemuDomainSnapshotFSFreeze(driver, vm) < 0)) { + /* If quiesce was requested, then issue a freeze command, and a + * counterpart thaw command, no matter what. The command will + * fail if the guest is paused or the guest agent is not + * running. */ + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) { + if (qemuDomainSnapshotFSFreeze(driver, vm) < 0) { /* helper reported the error */ + thaw = -1; goto endjob; + } else { + thaw = 1; } + } + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { /* In qemu, snapshot_blkdev on a single disk will pause cpus, * but this confuses libvirt since notifications are not given * when qemu resumes. And for multiple disks, libvirt must @@ -10001,11 +10021,6 @@ cleanup: _("resuming after snapshot failed")); goto endjob; } - - if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) && - qemuDomainSnapshotFSThaw(driver, vm) < 0) { - /* helper reported the error */ - } } if (vm) { @@ -10016,6 +10031,12 @@ cleanup: } endjob: + if (vm && thaw != 0 && + qemuDomainSnapshotFSThaw(driver, vm, thaw > 0) < 0) { + /* helper reported the error, if it was needed */ + if (thaw > 0) + ret = -1; + } if (vm && (qemuDomainObjEndJob(driver, vm) == 0)) { /* Only possible if a transient vm quit while our locks were down, * in which case we don't want to save snapshot metadata. */ -- 1.7.7.6

2 3

[libvirt] [PATCHv3] python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
by ajia＠redhat.com 19 Mar '12

19 Mar '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit 17c7795. * python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 46 ++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..fb98627 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2550,7 +2550,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *ret = NULL; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2559,39 +2561,53 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) virNodeMemoryStatsPtr stats = NULL; if (!PyArg_ParseTuple(args, (char *)"Oii:virNodeGetMemoryStats", &pyobj_conn, &cellNum, &flags)) - return(NULL); + return ret; conn = (virConnectPtr)(PyvirConnect_Get(pyobj_conn)); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) - return VIR_PY_NONE; + return ret; if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - VIR_FREE(stats); - return VIR_PY_NONE; - } - } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; + if (c_retval < 0) + goto error; } + + if (!(ret = PyDict_New())) + goto error; + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) + goto error; + + if (PyDict_SetItem(ret, key, val) < 0) { + Py_DECREF(ret); + goto error; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); return ret; + +error: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; } static PyObject * -- 1.7.1

3 2

[libvirt] [PATCH] Fixed NULL pointer check
by Martin Kletzander 19 Mar '12

19 Mar '12

This patch fixes a NULL pointer check that was causing SegFault on some specific configurations. --- src/util/conf.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/util/conf.c b/src/util/conf.c index 8ad60e0..e76362c 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -1,7 +1,7 @@ /** * conf.c: parser for a subset of the Python encoded Xen configuration files * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -836,6 +836,9 @@ virConfGetValue(virConfPtr conf, const char *setting) { virConfEntryPtr cur; + if (conf == NULL) + return(NULL); + cur = conf->entries; while (cur != NULL) { if ((cur->name != NULL) && -- 1.7.3.4

4 8

[libvirt] [PATCH v3] Fixed NULL pointer check
by Martin Kletzander 19 Mar '12

19 Mar '12

This patch fixes a NULL pointer check that was causing SegFault on some specific configurations. It also reverts commit 59d0c9801c1ab that was checking for this value in one place. --- v3: - added revert of 59d0c9801c1ab that's not needed anymore - (comment) ATTRIBUTE_RETURN_CHECK not added as it is not used with other functions defined in this file and the commit could be confusing modifying all of them together. However, there should be one patch to fix all these at once if possible v2: - removed parenthesis around return value src/libvirt.c | 3 +-- src/util/conf.c | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 7f8d42c..99b263e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1085,8 +1085,7 @@ virConnectOpenResolveURIAlias(virConfPtr conf, *uri = NULL; - if (conf && - (value = virConfGetValue(conf, "uri_aliases"))) + if ((value = virConfGetValue(conf, "uri_aliases"))) ret = virConnectOpenFindURIAliasMatch(value, alias, uri); else ret = 0; diff --git a/src/util/conf.c b/src/util/conf.c index 8ad60e0..3370337 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -1,7 +1,7 @@ /** * conf.c: parser for a subset of the Python encoded Xen configuration files * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -836,6 +836,9 @@ virConfGetValue(virConfPtr conf, const char *setting) { virConfEntryPtr cur; + if (conf == NULL) + return NULL; + cur = conf->entries; while (cur != NULL) { if ((cur->name != NULL) && -- 1.7.3.4

3 2

[libvirt] heisenbug in command.c
by Serge Hallyn 19 Mar '12

19 Mar '12

Hi, It seems I've run into quite the heisenbug, reported at https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/922628 It manifests itself as virPidWait returning status=4 for iptables (which should never exit with status=4). But it's only been seen on two (very different) machines, and the slightest shifting of the winds makes it go away. Given how sneaky this bug appears to be, there's a slight temptation to have iptablesAddRemoveRule pass in a int* for status and better deal with the -EINTR. But I fear that might be papering over a worse race. Does anyone have any ideas on this? Has anyone else ever seen this? -serge

4 5

[libvirt] [PATCH v2] Fixed NULL pointer check
by Martin Kletzander 19 Mar '12

19 Mar '12

This patch fixes a NULL pointer check that was causing SegFault on some specific configurations. --- src/util/conf.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/util/conf.c b/src/util/conf.c index 8ad60e0..3370337 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -1,7 +1,7 @@ /** * conf.c: parser for a subset of the Python encoded Xen configuration files * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -836,6 +836,9 @@ virConfGetValue(virConfPtr conf, const char *setting) { virConfEntryPtr cur; + if (conf == NULL) + return NULL; + cur = conf->entries; while (cur != NULL) { if ((cur->name != NULL) && -- 1.7.3.4

4 3

[libvirt] [PATCH] virsh: trim aliases from -h output
by Eric Blake 17 Mar '12

17 Mar '12

Commit af3f9aab taught 'virsh help' to ignore command aliases, but forgot 'virsh -h'. * tools/virsh.c (vshUsage): Handle aliases. --- tools/virsh.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 19f9bbe..e48c56a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -19721,8 +19721,11 @@ vshUsage(void) fprintf(stdout, _(" %s (help keyword '%s')\n"), grp->name, grp->keyword); for (cmd = grp->commands; cmd->name; cmd++) + if (cmd->flags & VSH_CMD_FLAG_ALIAS) + continue; fprintf(stdout, - " %-30s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); + " %-30s %s\n", cmd->name, + _(vshCmddefGetInfo(cmd, "help"))); fprintf(stdout, "\n"); } -- 1.7.7.6

2 2

[libvirt] QEMU was not selected for Google Summer of Code this year
by Stefan Hajnoczi 17 Mar '12

17 Mar '12

Sad news - QEMU was not accepted for Google Summer of Code 2012. Students can consider other organizations in the accepted organizations list here: http://www.google-melange.com/gsoc/accepted_orgs/google/gsoc2012 The list is currently not complete but should be finalized over the next few days as organizations complete their profiles. Students and mentors who wanted to participate with QEMU will be disappointed. I am too but there are many factors that organizations are considered against, we have not received information why QEMU was rejected this year. QEMU will try again for sure next year because Google Summer of Code is a great program both for students and for QEMU. Stefan

3 4

[libvirt] Storage pool support for large scale deployments
by Jesse J. Cook 16 Mar '12

16 Mar '12

I am using libvirt for large scale deployment of virtual machines. I ran into an issue where virConnectListStoragePools and virConnectListDefinedStoragePools return an error if there are more than 256 pools. The following patch increases this limitation. Currently, I am only using in the neighborhood of 500 pools, but this is likely to grow into the tens of thousands. This patch did not cause any test failures. I wrote some test code to verify the fix worked. The test code and the results follow. TEST CODE: /* pool-test src code */ #include <libvirt.h> #include <stdlib.h> #include <stdio.h> static int get_active_pools(virConnectPtr vir_conn) { int ret_code = -1; int rc = -1; int num_pools = -1; char** pools = NULL; printf("Before virConnectNumOfStoragePools\n"); num_pools = virConnectNumOfStoragePools(vir_conn); printf("After virConnectNumOfStoragePools\n"); if(0 >= num_pools) goto cleanup; pools = malloc(sizeof(*pools) * num_pools); printf("Before virConnectListStoragePools\n"); rc = virConnectListStoragePools(vir_conn, pools, num_pools); printf("After virConnectListStoragePools\n"); if(-1 == rc) goto cleanup; for(int i = 0; i < num_pools; ++i) { if(NULL != pools[i]) free(pools[i]); } ret_code = num_pools; cleanup: if(NULL != pools) free(pools); return ret_code; } static int get_inactive_pools(virConnectPtr vir_conn) { int ret_code = -1; int rc = -1; int num_pools = -1; char** pools = NULL; printf("Before virConnectNumOfDefinedStoragePools\n"); num_pools = virConnectNumOfDefinedStoragePools(vir_conn); printf("After virConnectNumOfDefinedStoragePools\n"); if(0 >= num_pools) goto cleanup; pools = malloc(sizeof(*pools) * num_pools); printf("Before virConnectListDefinedStoragePools\n"); rc = virConnectListDefinedStoragePools(vir_conn, pools, num_pools); printf("After virConnectListDefinedStoragePools\n"); if(-1 == rc) goto cleanup; for(int i = 0; i < num_pools; ++i) { if(NULL != pools[i]) free(pools[i]); } ret_code = num_pools; cleanup: if(NULL != pools) free(pools); return ret_code; } int main(int argc, char** argv) { virConnectPtr conn = virConnectOpen("qemu:///system"); printf("Active: %d\n" , get_active_pools(conn )); printf("Inactive: %d\n", get_inactive_pools(conn)); virConnectClose(conn); return 0; } TEST RESULTS PRE-PATCH: # for i in `ls -1 /etc/libvirt/storage/*`; do virsh pool-start $(basename $i .xml); done &>/dev/null # ~/pool-test Before virConnectNumOfStoragePools After virConnectNumOfStoragePools Before virConnectListStoragePools libvir: Remote error : too many remote undefineds: 407 > 256 After virConnectListStoragePools Active: -1 Before virConnectNumOfDefinedStoragePools After virConnectNumOfDefinedStoragePools Inactive: -1 # for i in `ls -1 /etc/libvirt/storage/*`; do virsh pool-destroy $(basename $i .xml); done &>/dev/null # ~/pool-test Before virConnectNumOfStoragePools After virConnectNumOfStoragePools Active: -1 Before virConnectNumOfDefinedStoragePools After virConnectNumOfDefinedStoragePools Before virConnectListDefinedStoragePools libvir: Remote error : too many remote undefineds: 407 > 256 After virConnectListDefinedStoragePools Inactive: -1 TEST RESULTS POST-PATCH: # for i in `ls -1 /etc/libvirt/storage/*`; do virsh pool-start $(basename $i .xml); done &>/dev/null # ~/pool-test Before virConnectNumOfStoragePools After virConnectNumOfStoragePools Before virConnectListStoragePools After virConnectListStoragePools Active: 407 Before virConnectNumOfDefinedStoragePools After virConnectNumOfDefinedStoragePools Inactive: -1 # for i in `ls -1 /etc/libvirt/storage/*`; do virsh pool-destroy $(basename $i .xml); done &>/dev/null # ~/pool-test Before virConnectNumOfStoragePools After virConnectNumOfStoragePools Active: -1 Before virConnectNumOfDefinedStoragePools After virConnectNumOfDefinedStoragePools Before virConnectListDefinedStoragePools After virConnectListDefinedStoragePools Inactive: 407

6 20

[libvirt] [PATCH] Add migration APIs for libxl driver
by Chunyan Liu 16 Mar '12

16 Mar '12

Add migration APIs for libxl driver. Implemented in migration version 3. Based on xen 4.1. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_driver.c | 617 ++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.h | 17 ++- 2 files changed, 632 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d5fa64a..4037635 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -30,6 +30,12 @@ #include <math.h> #include <libxl.h> #include <fcntl.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <netdb.h> #include "internal.h" #include "logging.h" @@ -60,6 +66,13 @@ #define XEN_SCHED_CREDIT_NPARAM 2 static libxlDriverPrivatePtr libxl_driver = NULL; +static virThread migrate_receive_thread; + +typedef struct migrate_receive_args { + virConnectPtr conn; + virDomainObjPtr vm; + int sockfd; +} migrate_receive_args; /* Function declarations */ static int @@ -1095,6 +1108,17 @@ libxlClose(virConnectPtr conn ATTRIBUTE_UNUSED) return 0; } +static int +libxlSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +{ + switch (feature) { + case VIR_DRV_FEATURE_MIGRATION_V3: + return 1; + default: + return 0; + } +} + static const char * libxlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { @@ -3842,12 +3866,600 @@ libxlIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) return 1; } +static int libxlReadFixedMessage(int fd, const void *msg, int msgsz) +{ + char buf[msgsz]; + + if (saferead(fd, buf, msgsz) != msgsz || memcmp(buf, msg, msgsz)) { + return -1; + } + + return 0; +} + +static int doParseURI(const char *uri, char **p_hostname, int *p_port) +{ + char *p, *hostname; + char port[16] = "0"; + + if (strstr (uri, "//")) { /* Full URI. */ + virURIPtr uriptr = virURIParse(uri); + if (!uriptr) { + libxlError(VIR_ERR_INVALID_ARG, + _("Invalid URI")); + return -1; + } + if (uriptr->scheme && STRCASENEQ(uriptr->scheme, "xlmigr")) { + libxlError(VIR_ERR_INVALID_ARG, + _("Only xlmigr://" + " migrations are supported by Xen")); + xmlFreeURI(uriptr); + return -1; + } + if (!uriptr->server) { + libxlError(VIR_ERR_INVALID_ARG, + _("A hostname must be" + " specified in the URI")); + xmlFreeURI(uriptr); + return -1; + } + hostname = strdup(uriptr->server); + if (!hostname) { + virReportOOMError(); + xmlFreeURI(uriptr); + return -1; + } + if (uriptr->port) + snprintf(port, sizeof(port), "%d", uriptr->port); + xmlFreeURI(uriptr); + } + else if ((p = strrchr(uri, ':')) != NULL) { /* "hostname:port" */ + int port_nr, n; + + if (virStrToLong_i(p+1, NULL, 10, &port_nr) < 0) { + libxlError(VIR_ERR_INVALID_ARG, + _("Invalid port number")); + return -1; + } + snprintf(port, sizeof(port), "%d", port_nr); + + /* Get the hostname. */ + n = p - uri; /* n = Length of hostname in bytes. */ + hostname = strdup(uri); + if (!hostname) { + virReportOOMError(); + return -1; + } + hostname[n] = '\0'; + } + else {/* "hostname" (or IP address) */ + hostname = strdup(uri); + if (!hostname) { + virReportOOMError(); + return -1; + } + } + *p_hostname = hostname; + *p_port = atoi(port); + return 0; +} + +static bool libxlMigrationFromIsAllowed(libxlDriverPrivatePtr driver, virDomainObjPtr vm) +{ + /* to be extended */ + VIR_DEBUG("driver=%p, vm=%p", driver, vm); + return true; +} + +static bool libxlMigrationToIsAllowed(libxlDriverPrivatePtr driver, virDomainDefPtr def) +{ + /* to be extended */ + VIR_DEBUG("driver=%p, def=%p", driver, def); + return true; +} + +static char * +libxlDomainMigrateBegin3(virDomainPtr domain, + const char *xmlin, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned long flags, + const char *dname ATTRIBUTE_UNUSED, + unsigned long resource ATTRIBUTE_UNUSED) +{ + libxlDriverPrivatePtr driver = domain->conn->privateData; + virDomainObjPtr vm; + virDomainDefPtr def = NULL; + char *xml = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, domain->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(domain->uuid, uuidstr); + libxlError(VIR_ERR_OPERATION_INVALID, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + _("domain is not running")); + goto cleanup; + } + + if (!libxlMigrationFromIsAllowed(driver, vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + _("domain cannot do migration")); + goto cleanup; + } + + if (xmlin) { + if (!(def = virDomainDefParseString(driver->caps, xml, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); + } else { + xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); + } + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return xml; +} + +static void doMigrateReceive(void *opaque) +{ + migrate_receive_args *data = opaque; + virConnectPtr conn = data->conn; + int sockfd = data->sockfd; + virDomainObjPtr vm = data->vm; + libxlDriverPrivatePtr driver = conn->privateData; + int recv_fd; + struct sockaddr_in new_addr; + socklen_t socklen = sizeof(new_addr); + int len; + + do { + recv_fd = accept(sockfd, (struct sockaddr *)&new_addr, &socklen); + } while(recv_fd < 0 && errno == EINTR); + + VIR_DEBUG("Accepted migration\n"); + if (recv_fd < 0) { + VIR_DEBUG("Could not accept migration connection\n"); + goto cleanup; + } + + len = sizeof(migrate_receiver_banner); + if (safewrite(recv_fd, migrate_receiver_banner, len) != len) { + libxlError(VIR_ERR_OPERATION_FAILED, + _("Failed to write migrate_receiver_banner")); + goto cleanup; + } + + if (libxlVmStart(driver, vm, false, recv_fd) < 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to restore domain with libxenlight")); + if (!vm->persistent) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + } + goto cleanup; + } + + len = sizeof(migrate_receiver_ready); + if (safewrite(recv_fd, migrate_receiver_ready, len) != len) { + libxlError(VIR_ERR_OPERATION_FAILED, + _("Failed to write migrate_receiver_ready")); + } + +cleanup: + if (VIR_CLOSE(recv_fd) < 0) + virReportSystemError(errno, "%s", _("cannot close recv_fd")); + if (VIR_CLOSE(sockfd) < 0) + virReportSystemError(errno, "%s", _("cannot close sockfd")); + if (vm) + virDomainObjUnlock(vm); + VIR_FREE(opaque); + return; +} + +static int doMigrateSend(virDomainPtr dom, unsigned long flags, int sockfd) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + libxlDomainObjPrivatePtr priv; + libxl_domain_suspend_info suspinfo; + virDomainEventPtr event = NULL; + int live = 0; + int ret = -1; + + if (flags & VIR_MIGRATE_LIVE) + live = 1; + + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_OPERATION_INVALID, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + priv = vm->privateData; + + /* read fixed message from dest (ready to receive) */ + if (libxlReadFixedMessage(sockfd, migrate_receiver_banner, + sizeof(migrate_receiver_banner))) { + goto cleanup; + } + + /* send suspend data */ + memset(&suspinfo, 0, sizeof(suspinfo)); + if (live == 1) + suspinfo.flags |= XL_SUSPEND_LIVE; + if (libxl_domain_suspend(&priv->ctx, &suspinfo, vm->def->id, sockfd) != 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to save domain '%d' with libxenlight"), + vm->def->id); + goto cleanup; + } + + /* read fixed message from dest (receive completed) */ + if (libxlReadFixedMessage(sockfd, migrate_receiver_ready, + sizeof(migrate_receiver_ready))) { + /* Src side should be resumed, but for ret < 0, virsh won't call Src side + * Confirm3, handle it here. + */ + libxl_domain_resume(&priv->ctx, vm->def->id); + goto cleanup; + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + if (event) + libxlDomainEventQueue(driver, event); + return ret; +} + +static int +libxlDomainMigratePrepare3(virConnectPtr dconn, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + const char *uri_in, + char **uri_out, + unsigned long flags, + const char *dname, + unsigned long resource ATTRIBUTE_UNUSED, + const char *dom_xml) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainDefPtr def = NULL; + virDomainObjPtr vm = NULL; + int port = 0; + int sockfd = -1; + struct sockaddr_in addr; + migrate_receive_args *args; + int ret = -1; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + + libxlDriverLock(driver); + if (!dom_xml) { + libxlError(VIR_ERR_OPERATION_INVALID, + _("no domain XML passed")); + goto cleanup; + } + + def = virDomainDefParseString(driver->caps, dom_xml, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE); + + if (!libxlMigrationToIsAllowed(driver, def)) { + libxlError(VIR_ERR_OPERATION_INVALID, + _("cannot migrate domain to this host")); + goto cleanup; + } + + /* Target domain name, maybe renamed. */ + if (dname) { + def->name = strdup(dname); + if (def->name == NULL) + goto cleanup; + } + + if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) + goto cleanup; + + if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, def, true))) + goto cleanup; + + def = NULL; + + /* Create socket connection to receive migration data */ + if (!uri_in) { + *uri_out = virGetHostname(dconn); + if (*uri_out == NULL) + goto cleanup; + } else { + char *hostname = NULL; + doParseURI(uri_in, &hostname, &port); + VIR_FREE (hostname); + } + + if (port <= 0) + port = DEFAULT_MIGRATION_PORT; + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd == -1) { + libxlError(VIR_ERR_OPERATION_INVALID, + _("Failed to create socket")); + goto cleanup; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(INADDR_ANY); + + if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + libxlError(VIR_ERR_OPERATION_FAILED, + _("Bind error")); + goto cleanup; + } + + if (listen(sockfd, MAXCONN_NUM) < 0){ + libxlError(VIR_ERR_OPERATION_FAILED, + _("Listen error")); + goto cleanup; + } + + if (VIR_ALLOC(args) < 0) { + virReportOOMError(); + goto cleanup; + } + + args->conn = dconn; + args->vm = vm; + args->sockfd = sockfd; + if (virThreadCreate(&migrate_receive_thread, + true, + doMigrateReceive, args) < 0 ) { + virReportSystemError(errno, "%s", + _("Unable to create migration thread")); + VIR_FREE(args); + goto cleanup; + } + + ret = 0; + goto end; + +cleanup: + if (VIR_CLOSE(sockfd) < 0) + virReportSystemError(errno, "%s", _("cannot close sockfd")); + if (vm) + virDomainObjUnlock(vm); + +end: + libxlDriverUnlock(driver); + return ret; +} + +static int +libxlDomainMigratePerform3(virDomainPtr dom, + const char *xmlin ATTRIBUTE_UNUSED, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri, + unsigned long flags, + const char *dname ATTRIBUTE_UNUSED, + unsigned long resource ATTRIBUTE_UNUSED) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + char *hostname = NULL; + int port; + char *servname = NULL; + struct addrinfo hints, *res; + int sockfd = -1; + int ret = -1; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + + libxlDriverLock(driver); + + if (doParseURI(uri, &hostname, &port)) + goto cleanup; + + VIR_DEBUG("hostname = %s, port = %d", hostname, port); + + if (virAsprintf(&servname, "%d", port ? port : DEFAULT_MIGRATION_PORT) < 0) { + virReportOOMError(); + goto cleanup; + } + + if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0 ){ + libxlError(VIR_ERR_OPERATION_FAILED, + _("Failed to create socket")); + goto cleanup; + } + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_STREAM; + if (getaddrinfo(hostname, servname, &hints, &res) || res == NULL) { + libxlError(VIR_ERR_OPERATION_FAILED, + _("IP address lookup failed")); + goto cleanup; + } + + if (connect(sockfd, res->ai_addr, res->ai_addrlen) < 0) { + libxlError(VIR_ERR_OPERATION_FAILED, + _("Connect error")); + goto cleanup; + } + + ret = doMigrateSend(dom, flags, sockfd); + +cleanup: + if (VIR_CLOSE(sockfd) < 0) + virReportSystemError(errno, "%s", _("cannot close sockfd")); + VIR_FREE (hostname); + VIR_FREE(servname); + freeaddrinfo(res); + libxlDriverUnlock(driver); + return ret; +} + +static virDomainPtr +libxlDomainMigrateFinish3(virConnectPtr dconn, + const char *dname, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri ATTRIBUTE_UNUSED, + unsigned long flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + virDomainPtr dom = NULL; + libxlDomainObjPrivatePtr priv; + virDomainEventPtr event = NULL; + int rc; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + virThreadJoin(&migrate_receive_thread); + + libxlDriverLock(driver); + vm = virDomainFindByName(&driver->domains, dname); + if (!vm) + goto cleanup; + + if (!cancelled) { + if (!(flags & VIR_MIGRATE_PAUSED)) { + priv = vm->privateData; + rc = libxl_domain_unpause(&priv->ctx, vm->def->id); + if (rc) { + libxlError(VIR_ERR_OPERATION_FAILED, + _("Failed to unpause domain")); + goto error; + } + + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) + goto error; + } + + dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); + goto cleanup; + } + +error: + if (libxlVmReap(driver, vm, 1, VIR_DOMAIN_SHUTOFF_SAVED)) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to destroy domain '%d'"), vm->def->id); + goto cleanup; + } + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SAVED); + if (!vm->persistent) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + } + +cleanup: + if (vm) + virDomainObjUnlock(vm); + if (event) + libxlDomainEventQueue(driver, event); + libxlDriverUnlock(driver); + return dom; +} + +static int +libxlDomainMigrateConfirm3(virDomainPtr domain, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + unsigned long flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = domain->conn->privateData; + virDomainObjPtr vm; + libxlDomainObjPrivatePtr priv; + virDomainEventPtr event = NULL; + int ret = -1; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, domain->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(domain->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (cancelled) { + priv = vm->privateData; + libxlError(VIR_ERR_INTERNAL_ERROR, + _("migration failed, try to resume on our end")); + if (!libxl_domain_resume(&priv->ctx, vm->def->id)) + ret = 0; + + goto cleanup; + } + + if (libxlVmReap(driver, vm, 1, VIR_DOMAIN_SHUTOFF_SAVED)) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to destroy domain '%d'"), vm->def->id); + goto cleanup; + } + + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SAVED); + + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + virDomainDeleteConfig(driver->configDir, driver->autostartDir, vm); + + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + } + + VIR_DEBUG("Migration successful.\n"); + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} static virDriver libxlDriver = { .no = VIR_DRV_LIBXL, .name = "xenlight", .open = libxlOpen, /* 0.9.0 */ .close = libxlClose, /* 0.9.0 */ + .supports_feature = libxlSupportsFeature, /* 0.9.9 */ .type = libxlGetType, /* 0.9.0 */ .version = libxlGetVersion, /* 0.9.0 */ .getHostname = virGetHostname, /* 0.9.0 */ @@ -3906,6 +4518,11 @@ static virDriver libxlDriver = { .domainGetSchedulerParametersFlags = libxlDomainGetSchedulerParametersFlags, /* 0.9.2 */ .domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */ .domainSetSchedulerParametersFlags = libxlDomainSetSchedulerParametersFlags, /* 0.9.2 */ + .domainMigrateBegin3 = libxlDomainMigrateBegin3, /* 0.9.9 */ + .domainMigratePrepare3 = libxlDomainMigratePrepare3, /* 0.9.0 */ + .domainMigratePerform3 = libxlDomainMigratePerform3, /* 0.9.9 */ + .domainMigrateFinish3 = libxlDomainMigrateFinish3, /* 0.9.9 */ + .domainMigrateConfirm3 = libxlDomainMigrateConfirm3, /* 0.9.9 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .domainEventRegister = libxlDomainEventRegister, /* 0.9.0 */ .domainEventDeregister = libxlDomainEventDeregister, /* 0.9.0 */ diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h index 4632d33..8a5fa6b 100644 --- a/src/libxl/libxl_driver.h +++ b/src/libxl/libxl_driver.h @@ -21,9 +21,22 @@ /*---------------------------------------------------------------------------*/ #ifndef LIBXL_DRIVER_H -# define LIBXL_DRIVER_H +#define LIBXL_DRIVER_H -# include <config.h> +#include <config.h> + +#define LIBXL_MIGRATION_FLAGS \ + (VIR_MIGRATE_LIVE | \ + VIR_MIGRATE_UNDEFINE_SOURCE | \ + VIR_MIGRATE_PAUSED) + +#define DEFAULT_MIGRATION_PORT 8002 +#define MAXCONN_NUM 10 + +static const char migrate_receiver_banner[]= + "xl migration receiver ready, send binary domain data"; +static const char migrate_receiver_ready[]= + "domain received, ready to unpause"; int libxlRegister(void); -- 1.7.3.4

3 3

[libvirt] [PATCH] Fix handling of blkio deviceWeight empty string
by Daniel P. Berrange 16 Mar '12

16 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> A common coding pattern for changing blkio parameters is 1. virDomainGetBlkioParameters 2. change one or more params 3. virDomainSetBlkioParameters For this to work, it must be possible to roundtrip through the methods without error. Unforuntelty virDomainGetBlkioParameters will return "" for the deviceWeight parameter for guests by default, which virDomainSetBlkioParameters will then reject as invalid. This fixes the handling of "" to be a no-op, and also improves the error message to tell you what was invalid --- src/qemu/qemu_driver.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b20b3e9..2c467ab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5959,6 +5959,12 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, int i; virBlkioDeviceWeightPtr result = NULL; + *dw = NULL; + *size = 0; + + if (STREQ(deviceWeightStr, "")) + return 0; + temp = deviceWeightStr; while (temp) { temp = strchr(temp, ','); @@ -6021,7 +6027,7 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, error: qemuReportError(VIR_ERR_INVALID_ARG, - _("unable to parse %s"), deviceWeightStr); + _("unable to parse device weight '%s'"), deviceWeightStr); cleanup: virBlkioDeviceWeightArrayClear(result, ndevices); VIR_FREE(result); -- 1.7.7.6

2 1

[libvirt] [PATCH] remote: Fix migration leaks
by Osier Yang 16 Mar '12

16 Mar '12

How to reproduce: % valgrind -v --leak-check=full virsh migrate mig \ qemu+ssh://$dest/system --unsafe == 8 bytes in 1 blocks are definitely lost in loss record 1 of 28 == at 0x4A04A28: calloc (vg_replace_malloc.c:467) == by 0x3EB7115FB8: xdr_reference (in /lib64/libc-2.12.so) == by 0x3EB7115F10: xdr_pointer (in /lib64/libc-2.12.so) == by 0x4D1EA84: xdr_remote_string (remote_protocol.c:40) == by 0x4D1EAD8: xdr_remote_domain_migrate_prepare3_ret (remote_protocol.c:4772) == by 0x4D2FFD2: virNetMessageDecodePayload (virnetmessage.c:382) == by 0x4D2789C: virNetClientProgramCall (virnetclientprogram.c:382) == by 0x4D0707D: callWithFD (remote_driver.c:4549) == by 0x4D070FB: call (remote_driver.c:4570) == by 0x4D12AEE: remoteDomainMigratePrepare3 (remote_driver.c:4138) == by 0x4CF7BE9: virDomainMigrateVersion3 (libvirt.c:4815) == by 0x4CF9432: virDomainMigrate2 (libvirt.c:5454) == == LEAK SUMMARY: == definitely lost: 8 bytes in 1 blocks == indirectly lost: 0 bytes in 0 blocks == possibly lost: 0 bytes in 0 blocks == still reachable: 126,995 bytes in 1,343 blocks == suppressed: 0 bytes in 0 blocks This patch also fixes the leaks in remoteDomainMigratePrepare and remoteDomainMigratePrepare2. --- src/remote/remote_driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 031167a..4ddebcb 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1963,6 +1963,7 @@ remoteDomainMigratePrepare (virConnectPtr dconn, if (ret.uri_out) *uri_out = *ret.uri_out; /* Caller frees. */ + VIR_FREE(ret.uri_out); rv = 0; done: @@ -2018,6 +2019,7 @@ remoteDomainMigratePrepare2 (virConnectPtr dconn, rv = 0; done: + VIR_FREE(ret.uri_out); remoteDriverUnlock(priv); return rv; error: @@ -4161,6 +4163,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, rv = 0; done: + VIR_FREE(ret.uri_out); remoteDriverUnlock(priv); return rv; error: -- 1.7.1

2 2

[libvirt] Modified version of the libvirt-test-api wrapper
by Lucas Meneghel Rodrigues 16 Mar '12

16 Mar '12

Hi Guannan: I've worked on your first version of the libvirt-test-api wrapper for autotest. Could you please check if you like the modified version? https://github.com/autotest/autotest/pull/230 If you do think it's fine, you can ack it, or you might take it, modify and resend it. On a git branch, you can do the following: curl https://github.com/autotest/autotest/pull/230.patch | git am And then modify and resend. Cheers, Lucas

3 4

[libvirt] [PATCH] libvirt: fix comment typo
by Alex Jia 16 Mar '12

16 Mar '12

* src/libvirt.c (virStorageVolResize): correct comment typo according to virStorageVolResizeFlags enum define. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/libvirt.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index d0b1b28..7f8d42c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13324,15 +13324,15 @@ error: * capacity; this may make the operation take noticeably longer. * * Normally, the operation treats @capacity as the new size in bytes; - * but if @flags contains VIR_STORAGE_RESIZE_DELTA, then @capacity + * but if @flags contains VIR_STORAGE_VOL_RESIZE_DELTA, then @capacity * represents the size difference to add to the current size. It is * up to the storage pool implementation whether unaligned requests are * rounded up to the next valid boundary, or rejected. * * Normally, this operation should only be used to enlarge capacity; - * but if @flags contains VIR_STORAGE_RESIZE_SHRINK, it is possible to + * but if @flags contains VIR_STORAGE_VOL_RESIZE_SHRINK, it is possible to * attempt a reduction in capacity even though it might cause data loss. - * If VIR_STORAGE_RESIZE_DELTA is also present, then @capacity is + * If VIR_STORAGE_VOL_RESIZE_DELTA is also present, then @capacity is * subtracted from the current size; without it, @capacity represents * the absolute new size regardless of whether it is larger or smaller * than the current size. -- 1.7.1

2 2

[libvirt] [PATCH v2 0/5] Allow hibernation on guests
by Michal Privoznik 16 Mar '12

16 Mar '12

As we've added guest agent recently, the whole world of new functionality has opened. As this patch set, which allows domains to enter S4 state. What is needed for this? Patched qemu. As this is not in qemu git, but patches are await to be pushed in very short future. They can be found here: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03261.html Despite that, if anybody is willing to give me review if I am going the right way, I'd appreciate it. One thing, that you'll probably notice is this 'set-support-level' command. Basically, it tells GA what qemu version is it running on. Ideally, this should be done as soon as GA starts up. However, that cannot be determined from outside world as GA doesn't emit any events yet. Ideally^2 this command should be left out as it should be qemu who tells its own agent this kind of information. Anyway, I was going to call this command in qemuProcess{Startup, Reconnect,Attach}, but it won't work. We need to un-pause guest CPUs so guest can boot and start GA, but that implies returning from qemuProcess*. So I am setting this just before 'guest-suspend' command, as there is one more thing about GA. It is unable to remember anything upon its restart (GA process). Which has BTW show flaw in our current code with FS freeze & thaw. If we freeze guest FS, and somebody restart GA, the simple FS Thaw will not succeed as GA thinks FS are not frozen. But that's a different cup of tea. Because of what written above, we need to call set-level on every suspend. diff to v1: -move from misusing virDomainSuspend to brand new virDomainSuspendForDuration API Michal Privoznik (5): qemu-agent: Allow setting supported level qemu-agent: Create suspend function Introduce virDomainSuspendForDuration API qemu: Wire up virDomainSuspendForDuration API virsh: Expose new virDomainSuspendForDuration API include/libvirt/libvirt.h.in | 5 ++- src/driver.h | 6 ++ src/libvirt.c | 58 +++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 105 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 13 +++++ src/qemu/qemu_driver.c | 93 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 45 +++++++++++++++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 11 ++++- src/remote_protocol-structs | 7 +++ tools/virsh.c | 67 +++++++++++++++++++++++++++ tools/virsh.pod | 8 +++ 13 files changed, 415 insertions(+), 5 deletions(-) -- 1.7.3.4

4 17

Re: [libvirt] Using Libvirt to change the bridge a virtual network card of a running vm is connected to
by Hendrik Schwartke 16 Mar '12

16 Mar '12

I wrote a patch to change the mapping between a virtual bridge interface and the host bridge while the host is up. It's based on commit 6fba577e505611e6c25c68e322942eab7754de7e. The host and the interface definition I used for testing are also attached. I would be glad if the patch could be added to the repo. Patch: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4b60839..f791795 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -40,6 +40,7 @@ #include "qemu_cgroup.h" #include "locking/domain_lock.h" #include "network/bridge_driver.h" +#include "util/virnetdevbridge.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -1163,6 +1164,28 @@ static virDomainNetDefPtr qemuDomainFindNet(virDomainObjPtr vm, return NULL; } +int qemuDomainChangeNetBridge(virDomainNetDefPtr olddev, + virDomainNetDefPtr newdev) +{ + const char *oldbridge=olddev->data.bridge.brname; + const char *newbridge=newdev->data.bridge.brname; + VIR_DEBUG("Change bridge for interface %s: %s -> %s", olddev->ifname, oldbridge, newbridge); + if(virNetDevBridgeRemovePort(oldbridge, olddev->ifname)<0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("unable to remove port from bridge")); + return -1; + } + if(virNetDevBridgeAddPort(newbridge, newdev->ifname)<0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("unable to add port to bridge")); + return -1; + } + VIR_FREE(olddev->data.bridge.brname); + olddev->data.bridge.brname=strdup(newbridge); + return 0; +} + + int qemuDomainChangeNetLinkState(struct qemud_driver *driver, virDomainObjPtr vm, virDomainNetDefPtr dev, @@ -1293,6 +1316,12 @@ int qemuDomainChangeNet(struct qemud_driver *driver, return -1; } + if(olddev->type==VIR_DOMAIN_NET_TYPE_BRIDGE + && dev->type==VIR_DOMAIN_NET_TYPE_BRIDGE + && STRNEQ(olddev->data.bridge.brname, dev->data.bridge.brname)) { + qemuDomainChangeNetBridge(olddev, dev); + } + if (olddev->linkstate != dev->linkstate) { if ((ret = qemuDomainChangeNetLinkState(driver, vm, olddev, dev->linkstate)) < 0) return ret; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 0310361..1e1f75c 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -80,6 +80,8 @@ int qemuDomainChangeNetLinkState(struct qemud_driver *driver, virDomainObjPtr vm, virDomainNetDefPtr dev, int linkstate); +int qemuDomainChangeNetBridge(virDomainNetDefPtr olddev, + virDomainNetDefPtr newdev); int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev); Host definition: <domain type='kvm'> <name>test</name> <memory>32768</memory> <currentMemory>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.12'>hvm</type> <boot dev='cdrom'/> <bootmenu enable='no'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='bridge'> <mac address='52:54:00:ab:cd:02'/> <source bridge='br0'/> <target dev='testif'/> <link state='up'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> </domain> Interface definition: <interface type="bridge"> <mac address="52:54:00:ab:cd:02"/> <source bridge="br1"/> <target dev="testif"/> <link state="up"/> <alias name="net0"/> <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x0"/> </interface> Best regards Hendrik Schwartke

3 3

[libvirt] [PATCH v3] qemu: Support numad
by Osier Yang 16 Mar '12

16 Mar '12

numad is an user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource alignment of applications/virtual machines to improve performance and minimize cost of remote memory latencies. It provides a pre-placement advisory interface, so significant processes can be pre-bound to nodes with sufficient available resources. More details: http://fedoraproject.org/wiki/Features/numad "numad -w ncpus:memory_amount" is the advisory interface numad provides currently. This patch add the support by introducing a new XML attribute for <vcpu>. e.g. <vcpu placement="auto">4</vcpu> <vcpu placement="static" cpuset="1-10^6">4</vcpu> The returned advisory nodeset from numad will be printed in domain's dumped XML. e.g. <vcpu placement="auto" cpuset="1-10^6">4</vcpu> If placement is "auto", the number of vcpus and the current memory amount specified in domain XML will be used for numad command line (numad uses MB for memory amount): numad -w $num_of_vcpus:$current_memory_amount / 1024 The advisory nodeset returned from numad will be used to set domain process CPU affinity then. (e.g. qemuProcessInitCpuAffinity). If the user specifies both CPU affinity policy (e.g. (<vcpu cpuset="1-10,^7,^8">4</vcpu>) and placement == "auto" the specified CPU affinity will be overridden. Only QEMU/KVM drivers support it now. See docs update in patch for more details. v2 - v3: * XML schema is changed to <vcpu placement="static|auto">4</vcpu> * Affected tests are updated * LXC driver's support is dropped, let's see what's the real performance on qemu driver first. v1 - v2: * Since Bill Gray says it doesn't matter to use the number of vcpus and current memory amount as numad cmd line argument, though from sementics point of view, what numad expects are physical CPU numbers, let's go this way. v2 dropped XML <cpu required_cpu='4' required_memory='512000'/>, and just a new boolean XML element <autonuma>. Codes are refactored accordingly. * v1 overrides the cpuset specified by <vcpu cpuset='1-10,^7'>2</vcpu>, v2 doesn't do that, but just silently ignored. * xml2xml test is added --- configure.ac | 8 ++ docs/formatdomain.html.in | 17 +++- docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 119 ++++++++++++++------ src/conf/domain_conf.h | 10 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_process.c | 96 ++++++++++++++-- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 2 +- tests/domainsnapshotxml2xmlout/full_domain.xml | 2 +- tests/domainsnapshotxml2xmlout/metadata.xml | 2 +- .../qemuxml2argv-channel-guestfwd.xml | 2 +- .../qemuxml2argv-channel-spicevmc-old.xml | 2 +- .../qemuxml2argv-channel-spicevmc.xml | 2 +- .../qemuxml2argv-channel-virtio-auto.xml | 2 +- .../qemuxml2argv-channel-virtio.xml | 2 +- .../qemuxml2argv-console-virtio-many.xml | 2 +- .../qemuxml2argv-console-virtio.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 2 +- .../qemuxml2argv-seclabel-dynamic.xml | 2 +- .../qemuxml2argv-seclabel-none.xml | 2 +- .../qemuxml2argv-seclabel-static-relabel.xml | 2 +- .../qemuxml2argv-seclabel-static.xml | 2 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 2 +- .../qemuxml2xmlout-console-virtio.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 +- 28 files changed, 232 insertions(+), 70 deletions(-) diff --git a/configure.ac b/configure.ac index c9cdd7b..31f0835 100644 --- a/configure.ac +++ b/configure.ac @@ -1445,6 +1445,14 @@ AM_CONDITIONAL([HAVE_NUMACTL], [test "$with_numactl" != "no"]) AC_SUBST([NUMACTL_CFLAGS]) AC_SUBST([NUMACTL_LIBS]) +dnl Do we have numad? +if test "$with_qemu" = "yes"; then + AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin:/usr/local/bin:$PATH]) + + if test -n "$NUMAD"; then + AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad program]) + fi +fi dnl pcap lib LIBPCAP_CONFIG="pcap-config" diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7710c5b..ad7f591 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -318,7 +318,7 @@ <pre> <domain> ... - <vcpu cpuset="1-4,^3,6" current="1">2</vcpu> + <vcpu placement='static' cpuset="1-4,^3,6" current="1">2</vcpu> ... </domain> </pre> @@ -336,7 +336,18 @@ be excluded from a previous range. <span class="since">Since 0.8.5</span>, the optional attribute <code>current</code> can be used to specify whether fewer than the maximum number of - virtual CPUs should be enabled. + virtual CPUs should be enabled. <span class="since">Since + 0.9.11 (QEMU and KVM only), the optional attribute + <code>placement</code> can be used to indicate the CPU placement + mode for domain process, its value can be either "static" or + "auto", defaults to "static" if <code>cpuset</code> is specified, + "auto" indicates the domain process will be pinned to the advisory + nodeset from querying numad, and the value of attribute + <code>cpuset</code> will be overridden by the advisory nodeset + from numad if it's specified. If both <code>cpuset</code> and + <code>placement</code> are not specified, or if <code>placement</code> + is "static", but no <code>cpuset</code> is specified, the domain + process will be pinned to all the available physical CPUs. </dd> </dl> @@ -544,7 +555,7 @@ <span class='since'>Since 0.9.3</span> <dt><code>memory</code></dt> <dd> - The optional <code>memory</code> element specify how to allocate memory + The optional <code>memory</code> element specifies how to allocate memory for the domain process on a NUMA host. It contains two attributes, attribute <code>mode</code> is either 'interleave', 'strict', or 'preferred', diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 073ad37..451a629 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -488,6 +488,14 @@ <optional> <element name="vcpu"> <optional> + <attribute name="placement"> + <choice> + <value>static</value> + <value>auto</value> + </choice> + </attribute> + </optional> + <optional> <attribute name="cpuset"> <ref name="cpuset"/> </attribute> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 601dc8b..353469d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -618,6 +618,11 @@ VIR_ENUM_IMPL(virDomainStartupPolicy, VIR_DOMAIN_STARTUP_POLICY_LAST, "requisite", "optional"); +VIR_ENUM_IMPL(virDomainCpuPlacementMode, VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST, + "default", + "static", + "auto"); + #define virDomainReportError(code, ...) \ virReportErrorHelper(VIR_FROM_DOMAIN, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) @@ -7447,7 +7452,6 @@ error: goto cleanup; } - static int virDomainDefMaybeAddController(virDomainDefPtr def, int type, int idx) @@ -7561,6 +7565,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, bool uuid_generated = false; virBitmapPtr bootMap = NULL; unsigned long bootMapSize = 0; + xmlNodePtr cur; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -7789,6 +7794,22 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, VIR_FREE(tmp); } + tmp = virXPathString("string(./vcpu[1]/@placement)", ctxt); + if (tmp) { + if ((def->placement_mode = + virDomainCpuPlacementModeTypeFromString(tmp)) < 0) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("Unsupported CPU placement mode '%s'"), + tmp); + VIR_FREE(tmp); + goto error; + } + VIR_FREE(tmp); + } else { + if (def->cpumasklen) + def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC; + } + /* Extract cpu tunables. */ if (virXPathULong("string(./cputune/shares[1])", ctxt, &def->cputune.shares) < 0) @@ -7836,47 +7857,74 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, VIR_FREE(nodes); /* Extract numatune if exists. */ - if ((n = virXPathNodeSet("./numatune", ctxt, NULL)) < 0) { + if ((n = virXPathNodeSet("./numatune", ctxt, &nodes)) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot extract numatune nodes")); goto error; } + if (n > 1) { + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("only one numatune is supported")); + VIR_FREE(nodes); + goto error; + } + if (n) { - tmp = virXPathString("string(./numatune/memory/@nodeset)", ctxt); - if (tmp) { - char *set = tmp; - int nodemasklen = VIR_DOMAIN_CPUMASK_LEN; + cur = nodes[0]->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if ((xmlStrEqual(cur->name, BAD_CAST "memory"))) { + tmp = virXMLPropString(cur, "nodeset"); - if (VIR_ALLOC_N(def->numatune.memory.nodemask, nodemasklen) < 0) { - goto no_memory; - } + if (tmp) { + char *set = tmp; + int nodemasklen = VIR_DOMAIN_CPUMASK_LEN; - /* "nodeset" leads same syntax with "cpuset". */ - if (virDomainCpuSetParse(set, 0, def->numatune.memory.nodemask, - nodemasklen) < 0) - goto error; - VIR_FREE(tmp); - } else { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("nodeset for NUMA memory tuning must be set")); - goto error; - } + if (VIR_ALLOC_N(def->numatune.memory.nodemask, + nodemasklen) < 0) { + virReportOOMError(); + goto error; + } - tmp = virXPathString("string(./numatune/memory/@mode)", ctxt); - if (tmp) { - if ((def->numatune.memory.mode = - virDomainNumatuneMemModeTypeFromString(tmp)) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - _("Unsupported NUMA memory tuning mode '%s'"), - tmp); - goto error; + /* "nodeset" leads same syntax with "cpuset". */ + if (virDomainCpuSetParse(set, 0, + def->numatune.memory.nodemask, + nodemasklen) < 0) + goto error; + VIR_FREE(tmp); + } else { + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("nodeset for NUMA memory " + "tuning must be set")); + goto error; + } + + tmp = virXMLPropString(cur, "mode"); + if (tmp) { + if ((def->numatune.memory.mode = + virDomainNumatuneMemModeTypeFromString(tmp)) < 0) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("Unsupported NUMA memory " + "tuning mode '%s'"), + tmp); + goto error; + } + VIR_FREE(tmp); + } else { + def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + } + } else { + virDomainReportError(VIR_ERR_XML_ERROR, + _("unsupported XML element %s"), + (const char *)cur->name); + goto error; + } } - VIR_FREE(tmp); - } else { - def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + cur = cur->next; } } + VIR_FREE(nodes); n = virXPathNodeSet("./features/*", ctxt, &nodes); if (n < 0) @@ -12160,6 +12208,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, allones = 0; virBufferAddLit(buf, " <vcpu"); + if (def->placement_mode) + virBufferAsprintf(buf, " placement='%s'", + virDomainCpuPlacementModeTypeToString(def->placement_mode)); if (!allones) { char *cpumask = NULL; if ((cpumask = @@ -12211,22 +12262,24 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAddLit(buf, " </cputune>\n"); if (def->numatune.memory.nodemask) { + virBufferAddLit(buf, " <numatune>\n"); const char *mode; char *nodemask = NULL; - virBufferAddLit(buf, " <numatune>\n"); nodemask = virDomainCpuSetFormat(def->numatune.memory.nodemask, VIR_DOMAIN_CPUMASK_LEN); if (nodemask == NULL) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to format nodeset for NUMA memory tuning")); + _("failed to format nodeset for " + "NUMA memory tuning")); goto cleanup; } mode = virDomainNumatuneMemModeTypeToString(def->numatune.memory.mode); virBufferAsprintf(buf, " <memory mode='%s' nodeset='%s'/>\n", - mode, nodemask); + mode, nodemask); VIR_FREE(nodemask); + virBufferAddLit(buf, " </numatune>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 23c1947..4914d69 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1380,6 +1380,14 @@ enum virDomainTimerModeType { VIR_DOMAIN_TIMER_MODE_LAST, }; +enum virDomainCpuPlacementMode { + VIR_DOMAIN_CPU_PLACEMENT_MODE_DEFAULT = 0, + VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC, + VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO, + + VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST, +}; + typedef struct _virDomainTimerCatchupDef virDomainTimerCatchupDef; typedef virDomainTimerCatchupDef *virDomainTimerCatchupDefPtr; struct _virDomainTimerCatchupDef { @@ -1506,6 +1514,7 @@ struct _virDomainDef { } mem; unsigned short vcpus; unsigned short maxvcpus; + int placement_mode; int cpumasklen; char *cpumask; @@ -2135,6 +2144,7 @@ VIR_ENUM_DECL(virDomainTimerName) VIR_ENUM_DECL(virDomainTimerTrack) VIR_ENUM_DECL(virDomainTimerTickpolicy) VIR_ENUM_DECL(virDomainTimerMode) +VIR_ENUM_DECL(virDomainCpuPlacementMode) VIR_ENUM_DECL(virDomainStartupPolicy) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1439d3b..68f5c94 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -270,6 +270,8 @@ virDomainControllerModelSCSITypeToString; virDomainControllerModelUSBTypeFromString; virDomainControllerModelUSBTypeToString; virDomainControllerTypeToString; +virDomainCpuPlacementTypeFromString; +virDomainCpuPlacementTypeToString; virDomainCpuSetFormat; virDomainCpuSetParse; virDomainDefAddImplicitControllers; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bea354b..6ba4713 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1633,11 +1633,47 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) } #endif +#if defined(NUMAD) +static char * +qemuGetNumadAdvice(virDomainDefPtr def) +{ + virCommandPtr cmd = NULL; + char *args = NULL; + char *output = NULL; + + if (virAsprintf(&args, "%d:%lu", def->vcpus, def->mem.cur_balloon) < 0) { + virReportOOMError(); + goto out; + } + cmd = virCommandNewArgList(NUMAD, "-w", args, NULL); + + virCommandSetOutputBuffer(cmd, &output); + + if (virCommandRun(cmd, NULL) < 0) + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to query numad for the advisory nodeset")); + +out: + VIR_FREE(args); + virCommandFree(cmd); + return output; +} +#else +static char * +qemuGetNumadAdvice(virDomainDefPtr def ATTRIBUTE_UNUSED) +{ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("numad is not available on this host")); + return NULL; +} +#endif + /* * To be run between fork/exec of QEMU only */ static int -qemuProcessInitCpuAffinity(virDomainObjPtr vm) +qemuProcessInitCpuAffinity(struct qemud_driver *driver, + virDomainObjPtr vm) { int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; virNodeInfo nodeinfo; @@ -1661,19 +1697,53 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) return -1; } - if (vm->def->cpumask) { - /* XXX why don't we keep 'cpumask' in the libvirt cpumap - * format to start with ?!?! */ - for (i = 0 ; i < maxcpu && i < vm->def->cpumasklen ; i++) - if (vm->def->cpumask[i]) + if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { + char *tmp_cpumask = NULL; + char *nodeset = NULL; + + nodeset = qemuGetNumadAdvice(vm->def); + if (!nodeset) + return -1; + + if (VIR_ALLOC_N(tmp_cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) { + virReportOOMError(); + return -1; + } + + if (virDomainCpuSetParse(nodeset, 0, tmp_cpumask, + VIR_DOMAIN_CPUMASK_LEN) < 0) { + VIR_FREE(tmp_cpumask); + VIR_FREE(nodeset); + return -1; + } + + for (i = 0; i < maxcpu && i < VIR_DOMAIN_CPUMASK_LEN; i++) { + if (tmp_cpumask[i]) VIR_USE_CPU(cpumap, i); + } + + VIR_FREE(vm->def->cpumask); + vm->def->cpumask = tmp_cpumask; + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + VIR_FREE(nodeset); } else { - /* You may think this is redundant, but we can't assume libvirtd - * itself is running on all pCPUs, so we need to explicitly set - * the spawned QEMU instance to all pCPUs if no map is given in - * its config file */ - for (i = 0 ; i < maxcpu ; i++) - VIR_USE_CPU(cpumap, i); + if (vm->def->cpumask) { + /* XXX why don't we keep 'cpumask' in the libvirt cpumap + * format to start with ?!?! */ + for (i = 0 ; i < maxcpu && i < vm->def->cpumasklen ; i++) + if (vm->def->cpumask[i]) + VIR_USE_CPU(cpumap, i); + } else { + /* You may think this is redundant, but we can't assume libvirtd + * itself is running on all pCPUs, so we need to explicitly set + * the spawned QEMU instance to all pCPUs if no map is given in + * its config file */ + for (i = 0 ; i < maxcpu ; i++) + VIR_USE_CPU(cpumap, i); + } } /* We are pressuming we are running between fork/exec of QEMU @@ -2404,7 +2474,7 @@ static int qemuProcessHook(void *data) /* This must be done after cgroup placement to avoid resetting CPU * affinity */ VIR_DEBUG("Setup CPU affinity"); - if (qemuProcessInitCpuAffinity(h->vm) < 0) + if (qemuProcessInitCpuAffinity(h->driver, h->vm) < 0) goto cleanup; if (qemuProcessInitNumaMemoryPolicy(h->vm) < 0) diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot.xml index 29f60be..0a4b179 100644 --- a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml +++ b/tests/domainsnapshotxml2xmlout/disk_snapshot.xml @@ -28,7 +28,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml index f77d6b0..27cf41d 100644 --- a/tests/domainsnapshotxml2xmlout/full_domain.xml +++ b/tests/domainsnapshotxml2xmlout/full_domain.xml @@ -11,7 +11,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml index 1a27773..93c9f39 100644 --- a/tests/domainsnapshotxml2xmlout/metadata.xml +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -15,7 +15,7 @@ </metadata> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml index 7de7245..60e853c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml index e4945e9..3269793 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml @@ -2,7 +2,7 @@ <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml index e4945e9..3269793 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml @@ -2,7 +2,7 @@ <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml index 91a973a..a94084c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml index 960442a..a280842 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml index 626250c..6028a2c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml index 0eb026e..812e5dd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml index e3c2b10..c741f0d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml index 26790b1..26fdf0d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml @@ -8,7 +8,7 @@ </description> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml index f27dc2e..98362a7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml index 233501f..4de435b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml index d9fa37c..78a6b6a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml index ec8e8c7..1a6878c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml index d1ea841..70f9e11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml index a792d9b..31d5f58 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index cb345aa..c257292 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml index 93255a9..031f821 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml index 772ad17..c3a55cf 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml @@ -7,7 +7,7 @@ </metadata> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> - <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> -- 1.7.1

3 4

[libvirt] [PATCH v2 0/3] Use guest agent to quiesce disks
by Michal Privoznik 15 Mar '12

15 Mar '12

Since we have qemu guest agent support in libvirt, we can start wiring up some things that GA already knows how to do. One of them is file system freeze and thaw. Domain snapshots can profit from this functionality. Michal Privoznik (3): qemu_agent: Create file system freeze and thaw functions snapshots: Introduce VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag virsh: Expose new VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag include/libvirt/libvirt.h.in | 4 ++ src/libvirt.c | 6 +++ src/qemu/qemu_agent.c | 74 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++++++++++++++++++++++---- tools/virsh.c | 6 +++ tools/virsh.pod | 16 +++++++- 7 files changed, 186 insertions(+), 10 deletions(-) -- 1.7.3.4

4 8

[libvirt] [PATCH] Add support for forcing a private network namespace for LXC guests
by Daniel P. Berrange 15 Mar '12

15 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If no <interface> elements are included in an LXC guest XML description, then the LXC guest will just see the host's network interfaces. It is desirable to be able to hide the host interfaces, without having to define any guest interfaces. This patch introduces a new feature flag <privnet/> to allow forcing of a private network namespace for LXC. In the future I also anticipate that we will add <privuser/> to force a private user ID namespace. * src/conf/domain_conf.c, src/conf/domain_conf.h: Add support for <privnet/> feature. Auto-set <privnet> if any <interface> devices are defined * src/lxc/lxc_container.c: Honour request for private network namespace NB: this was ACKed way back in January, but I forgot to push it then. Pushing it now - this re-post is just to remind folks where it came from https://www.redhat.com/archives/libvir-list/2012-January/msg01018.html --- docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 12 ++++++++---- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 624c6b2..4edada3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -897,6 +897,7 @@ <acpi/> <apic/> <hap/> + <privnet/> </features> ...</pre> @@ -924,6 +925,12 @@ <dd>Enable Viridian hypervisor extensions for paravirtualizing guest operating systems </dd> + <dt><code>privnet</code></dt> + <dd>Always create a private network namespace. This is + automatically set if any interface devices are defined. + This feature is only relevant for container based + virtualization drivers, such as LXC. + </dd> </dl> <h3><a name="elementsTime">Time keeping</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b804a70..5b3e5fa 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2632,6 +2632,11 @@ <empty/> </element> </optional> + <optional> + <element name="privnet"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f6f8b8c..e6d0f4b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -106,7 +106,8 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "apic", "pae", "hap", - "viridian") + "viridian", + "privnet") VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0ab3b81..f471e35 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1298,6 +1298,7 @@ enum virDomainFeature { VIR_DOMAIN_FEATURE_PAE, VIR_DOMAIN_FEATURE_HAP, VIR_DOMAIN_FEATURE_VIRIDIAN, + VIR_DOMAIN_FEATURE_PRIVNET, VIR_DOMAIN_FEATURE_LAST }; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d827b35..267fbfb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -261,7 +261,8 @@ int lxcContainerWaitForContinue(int control) * * Returns 0 on success or nonzero in case of error */ -static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, +static int lxcContainerRenameAndEnableInterfaces(bool privNet, + unsigned int nveths, char **veths) { int rc = 0; @@ -289,7 +290,7 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, } /* enable lo device only if there were other net devices */ - if (veths) + if (veths || privNet) rc = virNetDevSetOnline("lo", true); error_out: @@ -1343,7 +1344,9 @@ static int lxcContainerChild( void *data ) VIR_DEBUG("Received container continue message"); /* rename and enable interfaces */ - if (lxcContainerRenameAndEnableInterfaces(argv->nveths, + if (lxcContainerRenameAndEnableInterfaces(!!(vmDef->features & + (1 << VIR_DOMAIN_FEATURE_PRIVNET)), + argv->nveths, argv->veths) < 0) { goto cleanup; } @@ -1458,7 +1461,8 @@ int lxcContainerStart(virDomainDefPtr def, cflags |= CLONE_NEWUSER; } - if (def->nets != NULL) { + if (def->nets != NULL || + (def->features & (1 << VIR_DOMAIN_FEATURE_PRIVNET))) { VIR_DEBUG("Enable network namespaces"); cflags |= CLONE_NEWNET; } -- 1.7.7.6

1 0

[libvirt] [PATCH] sanlock: Enhance error message to point to possible problem with selinux
by Peter Krempa 15 Mar '12

15 Mar '12

If the connection to the sanlock daemon is forbidden by selinux the error message was not clear enough. This patch adds a check if proper configuration for selinux is used while trying to connect to sanlock. *src/locking/lock_driver_sanlock.c: - add macro virLockSystemError that checks for selinux and reports an improved error message - modify calls of virReportSystemError to the new macro in apropriate places Background: https://bugzilla.redhat.com/show_bug.cgi?id=770488 --- src/locking/lock_driver_sanlock.c | 83 +++++++++++++++++++++++-------------- 1 files changed, 52 insertions(+), 31 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index d344d6a..d5634f9 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -35,6 +35,10 @@ #include <sanlock_resource.h> #include <sanlock_admin.h> +#if HAVE_SELINUX +# include <selinux/selinux.h> +#endif + #include "lock_driver.h" #include "logging.h" #include "virterror_internal.h" @@ -51,7 +55,23 @@ #define virLockError(code, ...) \ virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) - +#if HAVE_SELINUX +# define virLockSystemError(theerrno, format, ...) \ + do { \ + if ((theerrno)==EACCES && \ + security_get_boolean_active("virt_use_sanlock") == 0) { \ + char errbuff[1024]; \ + snprintf(errbuff, sizeof(errbuff), "%s %s", (format), \ + _("(Consider setting virt_use_sanlock selinux variable)"));\ + virReportSystemError((theerrno), errbuff, __VA_ARGS__); \ + } else { \ + virReportSystemError((theerrno), (format), __VA_ARGS__); \ + } \ + } while(0); +#else +# define virLockSystemError(...) \ + virReportSystemError(__VA_ARGS__); +#endif #define VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE "__LIBVIRT__DISKS__" @@ -186,9 +206,9 @@ static int virLockManagerSanlockSetupLockspace(void) _("Unable to query sector size %s: error %d"), path, rv); else - virReportSystemError(-rv, - _("Unable to query sector size %s"), - path); + virLockSystemError(-rv, + _("Unable to query sector size %s"), + path); goto error_unlink; } @@ -215,9 +235,9 @@ static int virLockManagerSanlockSetupLockspace(void) _("Unable to initialize lockspace %s: error %d"), path, rv); else - virReportSystemError(-rv, - _("Unable to initialize lockspace %s"), - path); + virLockSystemError(-rv, + _("Unable to initialize lockspace %s"), + path); goto error_unlink; } VIR_DEBUG("Lockspace %s has been initialized", path); @@ -236,9 +256,9 @@ static int virLockManagerSanlockSetupLockspace(void) _("Unable to add lockspace %s: error %d"), path, rv); else - virReportSystemError(-rv, - _("Unable to add lockspace %s"), - path); + virLockSystemError(-rv, + _("Unable to add lockspace %s"), + path); goto error_unlink; } else { VIR_DEBUG("Lockspace %s is already registered", path); @@ -559,9 +579,9 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) _("Unable to query sector size %s: error %d"), res->disks[0].path, rv); else - virReportSystemError(-rv, - _("Unable to query sector size %s"), - res->disks[0].path); + virLockSystemError(-rv, + _("Unable to query sector size %s"), + res->disks[0].path); goto error_unlink; } @@ -588,9 +608,9 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) _("Unable to initialize lease %s: error %d"), res->disks[0].path, rv); else - virReportSystemError(-rv, - _("Unable to initialize lease %s"), - res->disks[0].path); + virLockSystemError(-rv, + _("Unable to initialize lease %s"), + res->disks[0].path); goto error_unlink; } VIR_DEBUG("Lease %s has been initialized", res->disks[0].path); @@ -711,9 +731,9 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, _("Unable to parse lock state %s: error %d"), state, rv); else - virReportSystemError(-rv, - _("Unable to parse lock state %s"), - state); + virLockSystemError(-rv, + _("Unable to parse lock state %s"), + state); goto error; } res_free = true; @@ -736,8 +756,9 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, _("Failed to open socket to sanlock daemon: error %d"), sock); else - virReportSystemError(-sock, "%s", - _("Failed to open socket to sanlock daemon")); + virLockSystemError(-sock, "%s", + _("Failed to open socket to sanlock daemon")); + goto error; } @@ -750,8 +771,8 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, virLockError(VIR_ERR_INTERNAL_ERROR, _("Failed to acquire lock: error %d"), rv); else - virReportSystemError(-rv, "%s", - _("Failed to acquire lock")); + virLockSystemError(-rv, "%s", + _("Failed to acquire lock")); goto error; } } @@ -774,8 +795,8 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, virLockError(VIR_ERR_INTERNAL_ERROR, _("Failed to restrict process: error %d"), rv); else - virReportSystemError(-rv, "%s", - _("Failed to restrict process")); + virLockSystemError(-rv, "%s", + _("Failed to restrict process")); goto error; } } @@ -823,8 +844,8 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, virLockError(VIR_ERR_INTERNAL_ERROR, _("Failed to inquire lock: error %d"), rv); else - virReportSystemError(-rv, "%s", - _("Failed to inquire lock")); + virLockSystemError(-rv, "%s", + _("Failed to inquire lock")); return -1; } @@ -837,8 +858,8 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, virLockError(VIR_ERR_INTERNAL_ERROR, _("Failed to release lock: error %d"), rv); else - virReportSystemError(-rv, "%s", - _("Failed to release lock")); + virLockSystemError(-rv, "%s", + _("Failed to release lock")); return -1; } @@ -866,8 +887,8 @@ static int virLockManagerSanlockInquire(virLockManagerPtr lock, virLockError(VIR_ERR_INTERNAL_ERROR, _("Failed to inquire lock: error %d"), rv); else - virReportSystemError(-rv, "%s", - _("Failed to inquire lock")); + virLockSystemError(-rv, "%s", + _("Failed to inquire lock")); return -1; } -- 1.7.3.4

3 3

[libvirt] [PATCH] lib: Don't access configuration if none is present
by Peter Krempa 15 Mar '12

15 Mar '12

Commit e457d5ef2015e6106094b85f8bbd1582002edc4d adds ability to pass the default URI using the client configuration file. If the file is not present, it still accesses the NULL config object causing a segfault. Caught running "make check". --- src/libvirt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 1c0cdf7..d0b1b28 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1085,7 +1085,8 @@ virConnectOpenResolveURIAlias(virConfPtr conf, *uri = NULL; - if ((value = virConfGetValue(conf, "uri_aliases"))) + if (conf && + (value = virConfGetValue(conf, "uri_aliases"))) ret = virConnectOpenFindURIAliasMatch(value, alias, uri); else ret = 0; -- 1.7.3.4

2 2

[libvirt] [PATCH] Emit graphics events when a SPICE client connects/disconnects
by Laine Stump 15 Mar '12

15 Mar '12

Wire up the domain graphics event notifications for SPICE. Adapted from a RHEL-only patch written by Dan Berrange that used custom __com.redhat_SPICE events - equivalent events are now available in upstream QEMU (including a SPICE_CONNECTED event, which was missing in the __COM.redhat_SPICE version). * src/qemu/qemu_monitor_json.c: Wire up SPICE graphics events --- src/qemu/qemu_monitor_json.c | 56 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1a0ee94..a5ef1d4 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -59,6 +59,9 @@ static void qemuMonitorJSONHandleVNCConnect(qemuMonitorPtr mon, virJSONValuePtr static void qemuMonitorJSONHandleVNCInitialize(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleSPICEConnect(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleSPICEInitialize(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleSPICEDisconnect(qemuMonitorPtr mon, virJSONValuePtr data); static struct { const char *type; @@ -75,6 +78,9 @@ static struct { { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJob, }, + { "SPICE_CONNECTED", qemuMonitorJSONHandleSPICEConnect, }, + { "SPICE_INITIALIZED", qemuMonitorJSONHandleSPICEInitialize, }, + { "SPICE_DISCONNECTED", qemuMonitorJSONHandleSPICEDisconnect, }, }; @@ -624,7 +630,7 @@ VIR_ENUM_IMPL(qemuMonitorGraphicsAddressFamily, VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_LAST, "ipv4", "ipv6", "unix"); -static void qemuMonitorJSONHandleVNC(qemuMonitorPtr mon, virJSONValuePtr data, int phase) +static void qemuMonitorJSONHandleGraphics(qemuMonitorPtr mon, virJSONValuePtr data, int phase) { const char *localNode, *localService, *localFamily; const char *remoteNode, *remoteService, *remoteFamily; @@ -643,14 +649,38 @@ static void qemuMonitorJSONHandleVNC(qemuMonitorPtr mon, virJSONValuePtr data, i } authScheme = virJSONValueObjectGetString(server, "auth"); + if (!authScheme) { + VIR_WARN("missing auth scheme in graphics event"); + return; + } localFamily = virJSONValueObjectGetString(server, "family"); + if (!authScheme) { + VIR_WARN("missing local address family in graphics event"); + return; + } localNode = virJSONValueObjectGetString(server, "host"); + if (!authScheme) { + VIR_WARN("missing local hostname in graphics event"); + return; + } localService = virJSONValueObjectGetString(server, "service"); + if (!localService) + localService = ""; /* Spice has multiple ports, so this isn't provided */ remoteFamily = virJSONValueObjectGetString(client, "family"); + if (!authScheme) { + VIR_WARN("missing remote address family in graphics event"); + return; + } remoteNode = virJSONValueObjectGetString(client, "host"); + if (!authScheme) { + VIR_WARN("missing remote hostname in graphics event"); + return; + } remoteService = virJSONValueObjectGetString(client, "service"); + if (!remoteService) + remoteService = ""; /* Spice has multiple ports, so this isn't provided */ saslUsername = virJSONValueObjectGetString(client, "sasl_username"); x509dname = virJSONValueObjectGetString(client, "x509_dname"); @@ -672,19 +702,37 @@ static void qemuMonitorJSONHandleVNC(qemuMonitorPtr mon, virJSONValuePtr data, i static void qemuMonitorJSONHandleVNCConnect(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorJSONHandleVNC(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_CONNECT); + qemuMonitorJSONHandleGraphics(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_CONNECT); } static void qemuMonitorJSONHandleVNCInitialize(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorJSONHandleVNC(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_INITIALIZE); + qemuMonitorJSONHandleGraphics(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_INITIALIZE); } static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorJSONHandleVNC(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_DISCONNECT); + qemuMonitorJSONHandleGraphics(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_DISCONNECT); +} + + +static void qemuMonitorJSONHandleSPICEConnect(qemuMonitorPtr mon, virJSONValuePtr data) +{ + qemuMonitorJSONHandleGraphics(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_CONNECT); +} + + +static void qemuMonitorJSONHandleSPICEInitialize(qemuMonitorPtr mon, virJSONValuePtr data) +{ + qemuMonitorJSONHandleGraphics(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_INITIALIZE); +} + + +static void qemuMonitorJSONHandleSPICEDisconnect(qemuMonitorPtr mon, virJSONValuePtr data) +{ + qemuMonitorJSONHandleGraphics(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_DISCONNECT); } static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr data) -- 1.7.7.6

3 6

[libvirt] [PATCH] qemuDomainDetachPciDiskDevice: Free allocated cgroup
by Michal Privoznik 15 Mar '12

15 Mar '12

This function potentially allocates new virCgroup but never frees it. --- src/qemu/qemu_hotplug.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e088a49..f1c1283 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1621,6 +1621,7 @@ int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver, ret = 0; cleanup: + virCgroupFree(&cgroup); VIR_FREE(drivestr); return ret; } -- 1.7.8.5

2 2

[libvirt] [PATCH] qemu: Split ide-drive into ide-cd and ide-hd
by Osier Yang 15 Mar '12

15 Mar '12

A "ide-drive" device can be either a hard disk or a CD-ROM, if there is ",media=cdrom" specified for the backend, it's a CD-ROM, otherwise it's a hard disk. Upstream qemu splitted "ide-drive" into "ide-hd" and "ide-cd" since commit 1f56e32, and ",media=cdrom" is not required for ide-cd anymore. "ide-drive" is still supported for backwards compatibility, but no doubt we should go foward. --- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 26 +++++++++++++++- tests/qemuhelptest.c | 3 +- .../qemuxml2argv-disk-ide-drive-split.args | 8 +++++ .../qemuxml2argv-disk-ide-drive-split.xml | 32 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 7 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c4b04ae..1f999a7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -156,6 +156,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "scsi-disk.channel", "scsi-block", "scsi-cd", + + "ide-cd", /* 90 */ ); struct qemu_feature_flags { @@ -1450,6 +1452,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); if (strstr(str, "scsi-cd")) qemuCapsSet(flags, QEMU_CAPS_SCSI_CD); + if (strstr(str, "ide-cd")) + qemuCapsSet(flags, QEMU_CAPS_IDE_CD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5ebffdc..e664f29 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -124,6 +124,7 @@ enum qemuCapsFlags { QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ QEMU_CAPS_SCSI_CD = 89, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD = 90, /* -device ide-cd */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index afe5db8..9a02a80 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1971,6 +1971,9 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) virBufferAddLit(&opt, ",media=cdrom"); + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) + virBufferAddLit(&opt, ",media=cdrom"); } else { virBufferAddLit(&opt, ",media=cdrom"); } @@ -2194,7 +2197,16 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("target must be 0 for ide controller")); goto error; } - virBufferAddLit(&opt, "ide-drive"); + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); + } else { + virBufferAddLit(&opt, "ide-drive"); + } + virBufferAsprintf(&opt, ",bus=ide.%d,unit=%d", disk->info.addr.drive.bus, disk->info.addr.drive.unit); @@ -2285,12 +2297,22 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("bus must be 0 for ide controller")); goto error; } + if (disk->info.addr.drive.target != 0) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for ide controller")); goto error; } - virBufferAddLit(&opt, "ide-drive"); + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); + } else { + virBufferAddLit(&opt, "ide-drive"); + } + virBufferAsprintf(&opt, ",bus=ahci%d.%d", disk->info.addr.drive.controller, disk->info.addr.drive.unit); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a01c389..d23b35a 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -676,7 +676,8 @@ mymain(void) QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_SCSI_BLOCK, - QEMU_CAPS_SCSI_CD); + QEMU_CAPS_SCSI_CD, + QEMU_CAPS_IDE_CD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args new file mode 100644 index 0000000..e24490d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ +-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml new file mode 100644 index 0000000..b965677 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</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='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='ide' index='1'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 97e2bac..b503ddc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -753,6 +753,9 @@ mymain(void) DO_TEST("pseries-vio-address-clash", true, QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-ide-drive-split", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_IDE_CD); VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); VIR_FREE(map); -- 1.7.1

1 0

[libvirt] [PATCH] qemu: Split scsi-disk into into scsi-hd and scsi-cd
by Osier Yang 15 Mar '12

15 Mar '12

A "scsi-disk" device can be either a hard disk or a CD-ROM, if there is ",media=cdrom" specified for the backend, it's a CD-ROM, otherwise it's a hard disk. But upstream qemu splitted "scsi-disk" into "scsi-hd" and "scsi-cd" since commit b443ae, and ",media=cdrom" is not required for scsi-cd anymore. "scsi-disk" is still supported for backwards compatibility, but no doubt we should go foward. --- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 39 ++++++++++++++---- tests/qemuhelptest.c | 6 ++- .../qemuxml2argv-disk-scsi-disk-split.args | 16 +++++++ .../qemuxml2argv-disk-scsi-disk-split.xml | 44 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 + 7 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ace5011..c4b04ae 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -155,6 +155,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "system_wakeup", "scsi-disk.channel", "scsi-block", + "scsi-cd", ); struct qemu_feature_flags { @@ -1447,6 +1448,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_SCSI_DISK_CHANNEL); if (strstr(str, "scsi-block")) qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); + if (strstr(str, "scsi-cd")) + qemuCapsSet(flags, QEMU_CAPS_SCSI_CD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 62b4270..5ebffdc 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -123,6 +123,7 @@ enum qemuCapsFlags { QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ + QEMU_CAPS_SCSI_CD = 89, /* -device scsi-cd */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3b9eec8..afe5db8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1967,8 +1967,14 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, else virBufferAsprintf(&opt, "if=%s", bus); - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, ",media=cdrom"); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) + virBufferAddLit(&opt, ",media=cdrom"); + } else { + virBufferAddLit(&opt, ",media=cdrom"); + } + } if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { virBufferAsprintf(&opt, ",id=%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); @@ -2218,10 +2224,19 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } - if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); - else - virBufferAddLit(&opt, "scsi-disk"); + } else { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); + } else { + virBufferAddLit(&opt, "scsi-disk"); + } + } + virBufferAsprintf(&opt, ",bus=scsi%d.%d,scsi-id=%d", disk->info.addr.drive.controller, disk->info.addr.drive.bus, @@ -2244,10 +2259,18 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } - if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) - virBufferAddLit(&opt, "scsi-disk"); - else + if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); + } else { + virBufferAddLit(&opt, "scsi-disk"); + } + } else { virBufferAddLit(&opt, "scsi-block"); + } virBufferAsprintf(&opt, ",bus=scsi%d.0,channel=%d,scsi-id=%d,lun=%d", disk->info.addr.drive.controller, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 05fdc4d..a01c389 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -605,7 +605,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_DRIVE_COPY_ON_READ, - QEMU_CAPS_CPU_HOST); + QEMU_CAPS_CPU_HOST, + QEMU_CAPS_SCSI_CD); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -674,7 +675,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_SCSI_BLOCK); + QEMU_CAPS_SCSI_BLOCK, + QEMU_CAPS_SCSI_CD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args new file mode 100644 index 0000000..a79299a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -0,0 +1,16 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-device lsi,id=scsi2,bus=pci.0,addr=0x5 \ +-device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x6 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0-1 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-1-1 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.xml new file mode 100644 index 0000000..02181fd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</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='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='1' unit='0'/> + </disk> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sdc' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='1' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <controller type='scsi' index='2' model='lsilogic'/> + <controller type='scsi' index='3' model='virtio-scsi'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d0affc7..97e2bac 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -457,6 +457,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-device-auto", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-scsi-disk-split", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD); DO_TEST("disk-scsi-vscsi", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", false, -- 1.7.1

1 0

[libvirt] [PATCH] numad: Fix typo and warning
by Osier Yang 15 Mar '12

15 Mar '12

src/libvirt_private.syms: s/virDomainCpuPlacement/virDomainCpuPlacementMode/ src/qemu/qemu_process.c def->mem.cur_balloon expects "llu" -- pushed under build-breaker rule --- src/libvirt_private.syms | 4 ++-- src/qemu/qemu_process.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d58082a..e40c80e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -271,8 +271,8 @@ virDomainControllerModelSCSITypeToString; virDomainControllerModelUSBTypeFromString; virDomainControllerModelUSBTypeToString; virDomainControllerTypeToString; -virDomainCpuPlacementTypeFromString; -virDomainCpuPlacementTypeToString; +virDomainCpuPlacementModeTypeFromString; +virDomainCpuPlacementModeTypeToString; virDomainCpuSetFormat; virDomainCpuSetParse; virDomainDefAddImplicitControllers; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 56cb531..0af3751 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1641,7 +1641,7 @@ qemuGetNumadAdvice(virDomainDefPtr def) char *args = NULL; char *output = NULL; - if (virAsprintf(&args, "%d:%lu", def->vcpus, def->mem.cur_balloon) < 0) { + if (virAsprintf(&args, "%d:%llu", def->vcpus, def->mem.cur_balloon) < 0) { virReportOOMError(); goto out; } -- 1.7.1

1 0

[libvirt] [PATCH] virsh: A bit smarter attach-disk
by Osier Yang 15 Mar '12

15 Mar '12

Detects the file type of source path if no "--sourcetype" and "driver" is specified, instead of always set the disk type as "block". And previous "virCommandOptString" ensures "source" is not NULL, remove the conditional checking. --- tools/virsh.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d45a4c9..3b845ac 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -14428,6 +14428,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) const char *stype = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xml; + struct stat st; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -14458,8 +14459,12 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) } if (!stype) { - if (driver && (STREQ(driver, "file") || STREQ(driver, "tap"))) + if (driver && (STREQ(driver, "file") || STREQ(driver, "tap"))) { isFile = true; + } else { + if (!stat(source, &st)) + isFile = S_ISREG(st.st_mode) ? true : false; + } } else if (STREQ(stype, "file")) { isFile = true; } else if (STRNEQ(stype, "block")) { @@ -14497,10 +14502,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (driver || subdriver || cache) virBufferAddLit(&buf, "/>\n"); - if (source) - virBufferAsprintf(&buf, " <source %s='%s'/>\n", - (isFile) ? "file" : "dev", - source); + virBufferAsprintf(&buf, " <source %s='%s'/>\n", + (isFile) ? "file" : "dev", + source); virBufferAsprintf(&buf, " <target dev='%s'/>\n", target); if (mode) virBufferAsprintf(&buf, " <%s/>\n", mode); -- 1.7.1

2 5

[libvirt] [Resending][PATCH v2 0/2] Sysinfo improvements for PowerPC & x86.
by Prerna Saxena 15 Mar '12

15 Mar '12

Rebasing and resending the sysinfo fixes. This series of patches implements the following: Patch 1/2 : Implement sysinfo for PowerPC. OnPowerPC, sysinfo is obtained by reading /proc/cpuinfo since dmidecode is not available. Patch 2/2 : Based on Eric's suggestion (http://www.redhat.com/archives/libvir-list/2012-February/msg00509.html) Allow x86 to read host system's processor information from /proc/cpuinfo in the event dmidecode is not available. Changelog from v1: ------------------ * Rebased and cleanups done. -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 8

Re: [libvirt] [Qemu-trivial] do_spice_init error on Ubuntu11.10
by Stefan Hajnoczi 15 Mar '12

15 Mar '12

On Thu, Mar 08, 2012 at 11:29:48AM +0800, suyi wang wrote: > Hi all: Hi Suyi, qemu-trivial is a mailing list for QEMU patches, questions should be directed at the regular QEMU mailing list. I have CCed qemu-devel and libvirt-list so your question will go to the QEMU and libvirt communities. Are you sure your libvirt configuration allows the QEMU process to access /dev/shm? You may have SELinux enabled. Stefan > I tried kvm on my ubuntu with the libvirt.xml file as follows: > <domain type='kvm'> > <name>instance-00000011</ > name> > <memory>2097152</memory> > <os> > <type>hvm</type> > <boot dev="hd" /> > </os> > <features> > <acpi/> > </features> > <vcpu>1</vcpu> > <devices> > <sound model='ac97'/> > <input type='tablet' bus='usb'/> > <disk type='file'> > <driver type='qcow2'/> > <source > file='/opt/stack/nova/nova/../ > /instances/instance-00000011/disk'/> > <target dev='vda' bus='ide'/> > </disk> > <disk type='file'> > <driver type='qcow2'/> > <source > > - Ignored: > file='/opt/stack/nova/nova/..//instances/instance-00000011/disk.local'/> > <target dev='vdb' bus='ide'/> > </disk> > > <interface type='bridge'> > <source bridge='br100'/> > <mac address='02:16:3e:44:a1:dd'/> > <filterref > filter="nova-instance-instance-00000011-02163e44a1dd"> > <parameter name="IP" value="10.0.0.2" /> > <parameter name="DHCPSERVER" value="10.0.0.1" /> > </filterref> > </interface> > >  > <serial type="file"> > <source > path='/opt/stack/nova/nova/..//instances/instance-00000011/console.log'/> > <target port='1'/> > </serial> > > <console type='pty' tty='/dev/pts/2'> > <source path='/dev/pts/2'/> > <target port='0'/> > </console> > > <serial type='pty'> > <source path='/dev/pts/2'/> > <target port='0'/> > </serial> > > > <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' > listen='0.0.0.0'/> > > </devices> > </domain> > > So it works well. > > Howerver, I want change the remote access method by spice, I simply > changed > the libvirt.xml as follows: > <domain type='kvm'> > <name>instance-00000011</name> > <memory>2097152</memory> > <os> > <type>hvm</type> > <boot dev="hd" /> > </os> > <features> > <acpi/> > </features> > <vcpu>1</vcpu> > <devices> > <sound model='ac97'/> > <input type='tablet' bus='usb'/> > <disk type='file'> > <driver type='qcow2'/> > <source > file='/opt/stack/nova/nova/..//instances/instance-00000011/disk'/> > <target dev='vda' bus='ide'/> > </disk> > <disk type='file'> > <driver type='qcow2'/> > <source > file='/opt/stack/nova/nova/..//instances/instance-00000011/disk.local'/> > <target dev='vdb' bus='ide'/> > </disk> > > <interface type='bridge'> > <source bridge='br100'/> > <mac address='02:16:3e:44:a1:dd'/> > <filterref > filter="nova-instance-instance-00000011-02163e44a1dd"> > <parameter name="IP" value="10.0.0.2" /> > <parameter name="DHCPSERVER" value="10.0.0.1" /> > </filterref> > </interface> > >  > <serial type="file"> > <source > path='/opt/stack/nova/nova/..//instances/instance-00000011/console.log'/> > <target port='1'/> > </serial> > > <console type='pty' tty='/dev/pts/2'> > <source path='/dev/pts/2'/> > <target port='0'/> > </console> > > <serial type='pty'> > <source path='/dev/pts/2'/> > <target port='0'/> > </serial> > > > <graphics type='spice' port='-1' autoport='yes' keymap='en-us' > listen='0.0.0.0'/> > > </devices> > </domain> > > As you can see, I just change <graphics type='vnc' port='-1' > autoport='yes' > keymap='en-us' listen='0.0.0.0'/> to <graphics type='spice' port='-1' > autoport='yes' keymap='en-us' listen='0.0.0.0'/> , But it called the > error as follows: > > libvirtError: internal error Process exited while reading console log > output: char device redirected to /dev/pts/12 > TRACE: do_spice_init: starting 0.8.1 > TRACE: do_spice_init: statistics shm_open failed, Permission denied" > > > Then I also tried "ls -ld /dev/shm" , yes, it is already 777. > then my problem remained: > libvirtError: internal error Process exited while reading console log > output: char device redirected to /dev/pts/12 > TRACE: do_spice_init: starting 0.8.1 > TRACE: do_spice_init: statistics shm_open failed, Permission denied" > > > I wish someone can give me some help! Thanks! > > -- > Yours. > suyi

1 0

[libvirt] [PATCH] virsh: fix invalid free
by Alex Jia 15 Mar '12

15 Mar '12

* tools/virsh.c (cmdDetachDisk): fix invalid free due to using uninitialised value. * How to reproduce? # virsh detach-disk a b error: failed to get domain 'a' *** glibc detected *** virsh: double free or corruption (out): 0x00007fff410ed1a0 *** ======= Backtrace: ========= /lib64/libc.so.6[0x39cf0750c6] /usr/lib/libvirt.so.0(virFree+0x39)[0x7f045938a239] virsh[0x41c768] virsh[0x415075] virsh[0x425d64] /lib64/libc.so.6(__libc_start_main+0xfd)[0x39cf01ecdd] virsh[0x40a419] ======= Memory map: ======== 00400000-0044e000 r-xp 00000000 08:0e 760441 /usr/bin/virsh 0064e000-00650000 rw-p 0004e000 08:0e 760441 /usr/bin/virsh ...... 39d7229000-39d722b000 r--p 00029000 08:0e 2183477 /lib64/libk5crypto.so.3.1 39d722b000-39d722c000 rw-p 0002b000 08:0e 2183477 /lib64/lAborted (core dumped) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 630b77f..d45a4c9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -14826,7 +14826,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) char *disk_xml = NULL; virDomainPtr dom = NULL; const char *target = NULL; - char *doc; + char *doc = NULL; int ret; bool functionReturn = false; unsigned int flags; -- 1.7.1

2 2

[libvirt] [PATCH 1/1] conf, util: on restart of libvirt restart vepa callbacks
by D. Herrendoerfer 14 Mar '12

14 Mar '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> When libvirtd is restarted, also restart the netlink event message callbacks for existing VEPA connections and send a message to lldpad for these existing links, so it learns the new libvirtd pid. Note: This Patch provides fixes to a number of scenarios where lldpad, switch, and libvirt would loose syncronization. 1. Crash/Reboot of a switch. 2. lldpad crash. 3. Clearing of the local switch database. (cleanvms) 4. libvirtd crash or restart. In any of the above events restarting libvirtd will restore normal operations of the VMs on their virtual network. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/conf/domain_conf.c | 18 ++++++ src/util/virnetdevmacvlan.c | 128 +++++++++++++++++++++++++++++++++--------- src/util/virnetdevmacvlan.h | 9 +++ 3 files changed, 127 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b994718..2ea3ea7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -52,6 +52,7 @@ #include "secret_conf.h" #include "netdev_vport_profile_conf.h" #include "netdev_bandwidth_conf.h" +#include "virnetdevmacvlan.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -4545,6 +4546,23 @@ virDomainNetDefParseXML(virCapsPtr caps, if ((flags & VIR_DOMAIN_XML_INACTIVE)) VIR_FREE(ifname); + else { + char *tmp; + VIR_DEBUG("Device already active on %s in VEPA mode.",ifname); + + tmp = virXPathString("string(../../uuid[1])", ctxt); + + if (tmp) { + VIR_DEBUG("Active VM UUID: %s. Restarting association and callback handler.",tmp); + ignore_value(virNetDevMacVLanRestartWithVPortProfile(ifname, + def->mac, + def->data.direct.linkdev, + tmp, + def->data.direct.virtPortProfile, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); + VIR_FREE(tmp); + } + } break; diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 647679f..19daf57 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -769,6 +769,49 @@ virNetDevMacVLanVPortProfileDestroyCallback(int watch ATTRIBUTE_UNUSED, virNetlinkCallbackDataFree((virNetlinkCallbackDataPtr)opaque); } +static int +virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +{ + virNetlinkCallbackDataPtr calld = NULL; + + if (virtPortProfile && virNetlinkEventServiceIsRunning()) { + if (VIR_ALLOC(calld) < 0) + goto memory_error; + if ((calld->cr_ifname = strdup(ifname)) == NULL) + goto memory_error; + if (VIR_ALLOC(calld->virtPortProfile) < 0) + goto memory_error; + memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); + if (VIR_ALLOC_N(calld->macaddress, VIR_MAC_BUFLEN) < 0) + goto memory_error; + memcpy(calld->macaddress, macaddress, VIR_MAC_BUFLEN); + if ((calld->linkdev = strdup(linkdev)) == NULL) + goto memory_error; + if (VIR_ALLOC_N(calld->vmuuid, VIR_UUID_BUFLEN) < 0) + goto memory_error; + memcpy(calld->vmuuid, vmuuid, VIR_UUID_BUFLEN); + + calld->vmOp = vmOp; + + virNetlinkEventAddClient(virNetDevMacVLanVPortProfileCallback, + virNetDevMacVLanVPortProfileDestroyCallback, + calld, macaddress); + } + + return 0; + + memory_error: + virReportOOMError(); + virNetlinkCallbackDataFree(calld); + + return -1; +} + /** * virNetDevMacVLanCreateWithVPortProfile: @@ -810,7 +853,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, int retries, do_retry = 0; uint32_t macvtapMode; const char *cr_ifname; - virNetlinkCallbackDataPtr calld = NULL; int ret; int vf = -1; @@ -917,36 +959,12 @@ create_name: goto disassociate_exit; } - if (virtPortProfile && virNetlinkEventServiceIsRunning()) { - if (VIR_ALLOC(calld) < 0) - goto memory_error; - if ((calld->cr_ifname = strdup(cr_ifname)) == NULL) - goto memory_error; - if (VIR_ALLOC(calld->virtPortProfile) < 0) - goto memory_error; - memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); - if (VIR_ALLOC_N(calld->macaddress, VIR_MAC_BUFLEN) < 0) - goto memory_error; - memcpy(calld->macaddress, macaddress, VIR_MAC_BUFLEN); - if ((calld->linkdev = strdup(linkdev)) == NULL) - goto memory_error; - if (VIR_ALLOC_N(calld->vmuuid, VIR_UUID_BUFLEN) < 0) - goto memory_error; - memcpy(calld->vmuuid, vmuuid, VIR_UUID_BUFLEN); - - calld->vmOp = vmOp; - - virNetlinkEventAddClient(virNetDevMacVLanVPortProfileCallback, - virNetDevMacVLanVPortProfileDestroyCallback, - calld, macaddress); - } + if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) + goto disassociate_exit; return rc; - memory_error: - virReportOOMError(); - virNetlinkCallbackDataFree(calld); - disassociate_exit: ignore_value(virNetDevVPortProfileDisassociate(cr_ifname, virtPortProfile, @@ -1003,6 +1021,48 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, return ret; } +/** + * virNetDevMacVLanRestartWithVPortProfile: + * Register a port profile callback handler for a VM that + * is already running + * . + * @cr_ifname: Interface name that the macvtap has. + * @macaddress: The MAC address for the macvtap device + * @linkdev: The interface name of the NIC to connect to the external bridge + * @vmuuid: The UUID of the VM the macvtap belongs to + * @virtPortProfile: pointer to object holding the virtual port profile data + * @vmOp: Operation to use during setup of the association + * + * Returns 0; returns -1 on error. + */ +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +{ + int rc = 0; + + rc = virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, + virtPortProfile, vmOp); + if (rc < 0) + goto error; + + ignore_value(virNetDevVPortProfileAssociate(cr_ifname, + virtPortProfile, + macaddress, + linkdev, + -1, + vmuuid, + vmOp, true)); + +error: + return rc; + +} + #else /* ! WITH_MACVTAP */ int virNetDevMacVLanCreate(const char *ifname ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED, @@ -1052,4 +1112,16 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, _("Cannot create macvlan devices on this platform")); return -1; } + +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 130ecea..14640cf 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -75,4 +75,13 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + #endif /* __UTIL_MACVTAP_H__ */ -- 1.7.7.6

2 1

[libvirt] [PATCH] Split contents of <cmdline>...</cmdline> and set LXC init argv
by Daniel P. Berrange 14 Mar '12

14 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently for LXC we set LIBVIRT_LXC_CMDLINE to contain the contents of <cmdline>...</cmdline>. It is more convenient if we just set the argv[] of the init binary directly though. * lxc/lxc_container.c: Set init argv from cmdline --- src/lxc/lxc_container.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d827b35..93dfb86 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -117,11 +117,19 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virCommandPtr cmd; + char **args = NULL; + size_t i; + + if (vmDef->os.cmdline && + !(args = virStrSplitQuoted(vmDef->os.cmdline, " \t"))) + return NULL; virUUIDFormat(vmDef->uuid, uuidstr); cmd = virCommandNew(vmDef->os.init); + virCommandAddArgSet(cmd, (const char **)args); + virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); virCommandAddEnvString(cmd, "container=lxc-libvirt"); @@ -131,6 +139,10 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) if (vmDef->os.cmdline) virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline); + for (i = 0 ; args[i] ; i++) + VIR_FREE(args[i]); + VIR_FREE(args); + return cmd; } -- 1.7.7.6

2 4