February 2012 - Devel - libvirt List Archives

[libvirt] Horrible performance of virDomainGetInfo()
by Daniel P. Berrange 06 Apr '12

06 Apr '12

While investigating the RPC problems I've noticed that we have had a huge performance regression for virDomainGetInfo() due to the change which makes virDomainEndJob() save the XML status file every time it is called. Previous to this change, 2000 calls to virDomainGetInfo() took ~2.5 seconds After this change, 2000 calls to virDomainGetInfo() take 2 *minutes* 45 secs I don't have an answer right now and it shouldnt block the release, but we have todo something to avoid this overhead. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 3

[libvirt] I need help for use virDomainInterfaceStats
by Фёдор Пранович 03 Apr '12

03 Apr '12

Hi I want use the virDomainInterfaceStats for get statistic of domain, but I don't now how get path parametr. Please help me! Thanks.

4 3

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

31 Mar '12

I fixed the patch and added it to https://bugzilla.redhat.com/show_bug.cgi?id=784767.

4 13

[libvirt] Modern CPU models cannot be used with libvirt
by Jiri Denemark 28 Mar '12

28 Mar '12

Hi, Recently I realized that all modern CPU models defined in /etc/qemu/target-x86_64.conf are useless when qemu is used through libvirt. That's because we start qemu with -nodefconfig which results in qemu ignoring that file with CPU model definitions. We have a very good reason for using -nodefconfig because we need to control the ABI presented to a guest OS and we don't want any configuration file that can contain lots of things including device definitions to be read by qemu. However, we would really like the new CPU models to be understood by qemu even if used through libvirt. What would be the best way to solve this? I suspect this could have been already discussed in the past but obviously a workable solution was either not found or just not implemented. Jirka

15 103

[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] [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 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 v2 0/3] Use guest agent to quiesce disks
by Michal Privoznik 16 Mar '12

16 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] qemu: Copy console definition from serial
by Michal Privoznik 13 Mar '12

13 Mar '12

Now, when we support multiple consoles per domain, the vm->def->console[0] can still remain an alias for vm->def->serial[0]; However, we need to copy it's source definition as well otherwise we'll regress on virDomainOpenConsole. --- src/conf/domain_conf.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 19 +++++++++-- 4 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6b78d97..9b2eb86 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -956,6 +956,78 @@ virDomainChrSourceDefClear(virDomainChrSourceDefPtr def) } } +int +virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, + virDomainChrSourceDefPtr src) +{ + if (!dest || !src) + return -1; + + switch (src->type) { + case VIR_DOMAIN_CHR_TYPE_PTY: + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_PIPE: + if (src->data.file.path && + !(dest->data.file.path = strdup(src->data.file.path))) { + virReportOOMError(); + return -1; + } + break; + + case VIR_DOMAIN_CHR_TYPE_UDP: + if (src->data.udp.bindHost && + !(dest->data.udp.bindHost = strdup(src->data.udp.bindHost))) { + virReportOOMError(); + return -1; + } + + if (src->data.udp.bindService && + !(dest->data.udp.bindService = strdup(src->data.udp.bindService))) { + virReportOOMError(); + return -1; + } + + if (src->data.udp.connectHost && + !(dest->data.udp.connectHost = strdup(src->data.udp.connectHost))) { + virReportOOMError(); + return -1; + } + + + if (src->data.udp.connectService && + !(dest->data.udp.connectService = strdup(src->data.udp.connectService))) { + virReportOOMError(); + return -1; + } + break; + + case VIR_DOMAIN_CHR_TYPE_TCP: + if (src->data.tcp.host && + !(dest->data.tcp.host = strdup(src->data.tcp.host))) { + virReportOOMError(); + return -1; + } + + if (src->data.tcp.service && + !(dest->data.tcp.service = strdup(src->data.tcp.service))) { + virReportOOMError(); + return -1; + } + break; + + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (src->data.nix.path && + !(dest->data.nix.path = strdup(src->data.nix.path))) { + virReportOOMError(); + return -1; + } + break; + } + + return 0; +} + void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def) { if (!def) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c360674..76a8dd7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1662,6 +1662,8 @@ void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def); +int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, + virDomainChrSourceDefPtr dest); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b9d537e..e6ccf9d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -242,6 +242,7 @@ virDomainChrConsoleTargetTypeToString; virDomainChrDefForeach; virDomainChrDefFree; virDomainChrDefNew; +virDomainChrSourceDefCopy; virDomainChrSourceDefFree; virDomainChrSpicevmcTypeFromString; virDomainChrSpicevmcTypeToString; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2882ef8..e0b1824 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1163,11 +1163,22 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, for (i = 0 ; i < vm->def->nconsoles ; i++) { virDomainChrDefPtr chr = vm->def->consoles[i]; - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { - if ((ret = qemuProcessExtractTTYPath(output, &offset, - &chr->source.data.file.path)) != 0) + /* For historical reasons, console[0] can be just an alias + * for serial[0]; That's why we need to update it as well */ + if (i == 0 && vm->def->nserials && + chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) { + if ((ret = virDomainChrSourceDefCopy(&chr->source, + &((vm->def->serials[0])->source))) != 0) return ret; + chr->source.type = VIR_DOMAIN_CHR_TYPE_PTY; + } else { + if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { + if ((ret = qemuProcessExtractTTYPath(output, &offset, + &chr->source.data.file.path)) != 0) + return ret; + } } } -- 1.7.3.4

5 12