- Devel - libvirt List Archives

[libvirt] FreeBSD Port update, 0.9.2
by Jason Helfman 13 Jun '11

13 Jun '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hello All, Here is a link to the update for FreeBSD, if you are interested: http://www.freebsd.org/cgi/query-pr.cgi?pr=157712 This patch is to update the version available in the FreeBSD portstree. Thanks, Jason - -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iF4EAREIAAYFAk3vurQACgkQXpKtZoyM+6VfCgD/XWsjgX0p6iTmvI6CiIyQkzzH bjA7QEdMfF+GOZt5idgA/2/yUlbU/s986u96LlS+0J6iZyFhKaAGfBCxmNgSUBbP =nIJ+ -----END PGP SIGNATURE-----

2 1

[libvirt] [PATCH V2 0/7] support multi function PCI device
by Wen Congyang 13 Jun '11

13 Jun '11

We want to use more than 200+ device. Libvirt does not use multi function PCI device and PCI-to-PCI bridge. So we can not use more than 200+ device if it's a PCI device or it's controller is a PCI device. This patchset adds the support of multi function PCI device. It does not support to hot plug/unplug multi function PCI device. Change log: v1 -> v2: 1. split the patch, and it will be easily to review 2. Auto assign a slot not a function if user does not specify the address. Wen Congyang (7): check whether qemu supports multi function PCI device prevent hot unplugging multi function PCI device the key of hash table should include the function value Reimplement qemuDomainPCIAddressReserveSlot(): reserve all functions in the slot assign the whole slot to the PCI device that has no address the hotplugged PCI device should use the whole slot support multifunction PCI device src/conf/domain_conf.c | 3 + src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 151 +++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_command.h | 5 ++ src/qemu/qemu_hotplug.c | 76 +++++++++++++++++++-- tests/qemuhelptest.c | 3 +- 7 files changed, 218 insertions(+), 26 deletions(-)

4 23

[libvirt] [PATCH] Fix autostart flag when loading running domains
by Michael Chapman 13 Jun '11

13 Jun '11

Drivers load running persistent and transient domain configs before inactive persistent domain configs, however only the latter would set a domain's autostart flag. This mismatch between the loaded and on-disk state could later cause problems with "virsh autostart": # virsh autostart example error: Failed to mark domain example as autostarted error: Failed to create symlink '/etc/libvirt/qemu/autostart/example.xml to '/etc/libvirt/qemu/example.xml': File exists This patch ensures the autostart flag is set correctly even when the domain is already defined. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=632100 https://bugzilla.redhat.com/show_bug.cgi?id=675319 Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/conf/domain_conf.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d9fef4..5a6ff8b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9859,21 +9859,22 @@ static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps, VIR_DOMAIN_XML_INACTIVE))) goto error; + if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) + goto error; + + if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) + goto error; + /* if the domain is already in our hashtable, we don't need to do * anything further */ if ((dom = virDomainFindByUUID(doms, def->uuid))) { VIR_FREE(configFile); virDomainDefFree(def); + dom->autostart = autostart; return dom; } - if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) - goto error; - - if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) - goto error; - if (!(dom = virDomainAssignDef(caps, doms, def, false))) goto error; -- 1.7.4.4

2 1

[libvirt] [RFC] OpenVSwitch datapath support (was: Driver development)
by Carlos N. A. Corrêa 13 Jun '11

13 Jun '11

Hi, Cole! As I said, I gone through the list archives and got some insight on how to present my ideas. I tried to use the thread started by Laine Stump ( https://www.redhat.com/archives/libvir-list/2011-April/msg00591.html) as a model. Please, forgive me if my RFC is too verbose: I tried to produce something good. In time: I'm willing to implement this idea as part of my postgraduate work. Index ===== 1. Incorporating Open vSwitch support to libvirt 2. Background 3. Architecture 3.1. Option 1 3.2. Option 2 4. Implementation 1. Incorporating Open vSwitch support to libvirt ================================================ OpenFlow (http://www.openflow.org/) is a technology from the Software Defined Networks (SDN) fame. Switches supporting it export a software interface that allows special programs (Controllers) to dictate how the forwarding of ethernet frames should be done. That decision can not only be based on traditional layer-2 information (physical address 00:01:02:03:04:aa maps to port 1, address 05:06:07:08:09:bb maps to port 2, and so on) but also on information from a mix of network layers, like VLAN tags, IP addresses and/or TCP ports. Controllers may take network flexibility and efficiency to a new level, slicing switches' capacity transparently to run concurrent, isolated networks (FlowVisor, https://openflow.stanford.edu/display/flowvisor/Home) They can also incorporate logic to make the connectivity layer play a greater role in areas like IP routing (RouteFlow, http://sites.google.com/site/routeflow/) network access control (SMAC, http://www.openflowhub.org/display/Snac/SNAC+Home) hosts load-balancing ( http://www.cs.princeton.edu/~jrex/papers/loadwild10.pdf) and live migration (http://conferences.sigcomm.org/sigcomm/2008/papers/p513-ericksonA.pdf) In a very practical view, as libvirt supports a programmatic definition of network nodes, OpenFlow allows for a programmatic definition of traffic forwarding. An IaaS/cloud environment composed of many physical hosts and extensive use of libvirt for hypervisor management could use OpenFlow for virtualized switches management. Even tough its current libvirt enables one to define and instantiate virtual networks, those networks are, basically, Linux kernel bridges which configuration (device IP addresses, naming, connections) is stored into network XML files. Linux bridges doesn't offer a programmatic interface, and depend on not-so-easily-customizable approaches (VLANs, tunnels) to properly isolate traffic. Open vSwitch (or OVS, http://www.openvswitch.org/) is a full software implementation of a network switch. It supports standard management interfaces and protocols (e.g. NetFlow, sFlow) and is being used in a multitude of virtual and cloud-based computing (e.g. XenServer, OpenNebula). Even more, OVS can operate in "OpenFlow-mode". When operating in a traditional ("full switch") fashion, an OVS instance is similar to a Linux bridge - just supporting features that makes them work more like a "real" switch. In this scenario, OVS kernel driver even includes a compatibility layer that allows bridge-utils (and libvirt) to act upon OVS instances just as if they were Linux bridges! When operating in OpenFlow mode, the OVS instance is called a _datapath_. Host interfaces can be bound to and send traffic through it, but forwarding logic is provided by the Controller process. In this scenario, OpenFlow-based solutions could be leveraged to virtual networks. Even more, OpenFlow-based solutions which use virtual facilities (like VMs and OVS) could use libvirt as part of its frameworks! I'm proposing changes to libvirt's network XML format. It would allow for "datapath" elements, and it's attributes would allow libvirt to instantiate a OVS datapath, specifying it's controller address and hardware description, for example. 2. Background ============= To instantiate an OVS datapath (DP), one must call the ovs-openflowd daemon. Some relevant aspects of its syntax are covered below: ------------------------------- 8< ------------------------------- usage: ovs-openflowd [OPTIONS] DATAPATH [CONTROLLER...] Active OpenFlow connection methods: tcp:IP[:PORT] PORT (default: 6633) at remote IP ssl:IP[:PORT] SSL PORT (default: 6633) at remote IP unix:FILE Unix domain socket named FILE Passive OpenFlow connection methods: ptcp:[PORT][:IP] listen to TCP PORT (default: 6633) on IP pssl:[PORT][:IP] listen for SSL on PORT (default: 6633) on IP punix:FILE listen on Unix domain socket FILE OpenFlow options: -d, --datapath-id=ID Use ID as the OpenFlow switch ID (ID must consist of 16 hex digits) --mfr-desc=MFR Identify manufacturer as MFR --hw-desc=HW Identify hardware as HW --sw-desc=SW Identify software as SW Networking options: --out-of-band controller connection is out-of-band Daemon options: --detach run in background as daemon --pidfile[=FILE] create pidfile (default: /usr/local/var/run/openvswitch/ovs-openflowd.pid) ------------------------------- 8< ------------------------------- An execution example can be seen below: # ovs-openflowd --hw-desc=rfovs dp0 tcp:127.0.0.1:6633 --out-of-band --detach This instantiates an OVS datapath with hardware description "rfovs". The datapath name (and Linux virtual interface name) is "dp0". The controller software is running in the same machine as the OVS instance (IP address 127.0.0.1), and can be reached through port 6633/TCP. The connection to the controller must not be done through the datapath itself (out-of-band), and the ovs-openflowd will run as a background daemon. 3. Architecture =============== libvirt documentation available on http://www.libvirt.org/formatnetwork.htmldescribes the following format to network definition: <network>    </network> Based solely in that documentation, the format is somewhat bound to Linux bridges. This is not a problem most of the time, as OVS includes a compatibility module (brcompat_mod) that allows bridge-utils to configure an OVS "full switch" just as if it was a traditional Linux bridge. The syscalls offered also permit libvirt to manage these instances transparently. However, this format doesn't provide sufficient information to configure a OVS datapath. Next, I propose some options of how the libvirt network format could be changed to provide this facility (and, off course, to implement those changes). 3.1. Option 1: network type --------------------------- I saw this in an e-mail from Laine Stump in last April ( https://www.redhat.com/archives/libvir-list/2011-April/msg00640.html) It seems like my preferred ideas about how the change could be accomplished. The network opening element would be extended to include an optional "type" attribute. It could be defined as "bridge" (the default behaviour, for backwards compatibility) or "ovs-datapath" (the case for which I would like to work): <network type="bridge"> (THE DEFAULT) or <network type="ovs-datapath"> As the "General metadata" from the network format is instrumental to libvirt, it would be necessary to a "ovs-datapath" network. As the control layer of an OVS datapath lie outside itself, the "Bridging, naming..." section of the network format would be replaced by the following elements/attributes: <datapath name="" id="" mfrdesc="" hwdesc="" swdesc=""> - Mandatory, this element would allow for datapath and OpenFlow general configuration. - The name attribute would be used to designate the datapath virtual interface. (Mandatory) - The id, mfrdesc, hwdesc and swdesc attributes would be mapped 1:1 to ovs-openflowd parameters presented before. (Optional) <controller protocol="" address="" port="" outofband=""> OR <controller protocol="" path=""> - Protocol. Would be one of "tcp" or "unix", by now. (Mandatory) - Address. Would be an IP address. (Mandatory, if protocol="tcp") - Path. Would be the path to a UNIX socket to which the controller process is listening. (Mandatory, if protocol="unix") - Port. Would be the port to which the controller is listening to. (Optional, default = 6633) - Outofband. If connection to the controller must be done "in" or "out" of band. (Optional, default = "NO"). - The controller element itself would be optional, as OVS includes a "controller discovery" process by default. If specified, however, it's mandatory attributes should be respected. For the sake of a proof-of-concept implementation, this would be the entire (!) scope of the initial change/implementation. After this step, things such as this could be added: - An "ssl" option for the "protocol=" attribute, to allow for SSL-encrypted connections between datapaths and its controllers. - An element to pass SSL connection data (private key, ca cert, etc.) to ovs-openflowd. E.g.: <pki privatekey...> - Elements to control networking operation (e.g. max-idle, max-backoff) and rate-limiting of the datapath. 3.2. Option 2: datapath element ------------------------------- In place of a network type definition, just a new "datapath" element would be added. The network_conf code should test if a "bridge" element is specified in a network definition, and look for a datapath if it can't find one. Addressing data found in a network using the "datapath" element would be ignored. The datapath element here could be overly long, including description, controller and ssl-related attributes - but the format change would be very minimal: <network>  <datapath name="" descriptions="..." controller_data="..."> </network> Other option would be set those properties as sub-elements of <datapath...>, merging this option with the first: <network>  <datapath name="" id="" mfrdesc="" hwdesc="" swdesc=""> <controller protocol="" address="" port="" outofband=""> <pki privatekey...> <networking...> </datapath> </network> Besides being and option, this scenario (in fact, the entire option 2) seems somewhat unclean to me. 4. Implementation ================= 1. I can hack through the network_conf code to make it parse the XML. That's an easy part. 2. I can use the bridge driver as a model + your command execution infrastructure (which is very cool, IMHO) to implement an OVS driver. 3. It's not yet very clear to me where is the code that instantiates each network after it's "def" get parsed. Well, after the first two steps, I think that I would need to just hook the parsing and driver functions together in instantiating/virsh/command-line code. That's all, folks! Best regards, Carlos "Bill" Nilton CISSP, RHCE, ITIL Foundations http://carlosnilton.com.br/ Em 8 de junho de 2011 17:34, Carlos N. A. Corrêa <carlos.nilton(a)gmail.com>escreveu: > Hi, > > I gathered information about that and I'll produce relevant documentation > of my point tonight. > > I'll be glad to do an informed and well structured work. Thanks! > > > Best regards, > Carlos "Bill" Nilton > CISSP, RHCE, ITIL Foundations > http://carlosnilton.com.br/ > > > > Em 8 de junho de 2011 15:41, Cole Robinson <crobinso(a)redhat.com> escreveu: > > On 06/08/2011 07:10 AM, Carlos N. A. Corręa wrote: >> > Hi, >> > >> > I'm interested in developing a new network driver for libvirt (one for >> the >> > definition and management of OpenVSwitch datapaths). >> > >> > I've read some of the code already, and by now my general directions >> are: >> > >> > - Change the function virNetworkDefParseXML in src/conf/network_conf.c >> to >> > define and parse new configuration directives needed by my driver >> > - Use src/network/bridge_driver.c as a template for my new driver, >> replacing >> > code from the services provided by the driver (listed on >> "virNetworkDriver" >> > type) with my own code, for my own net type. >> > >> > Have you any other directions in this matter? Any tips? If it works, >> would >> > be this code of any use to you? >> > >> >> For a starting point I'd recommend proposing your XML changes to the >> list, and describe exactly what the new functionality will enable, and a >> few use cases. Probably best to do this before starting any code so you >> don't head in a wrong direction. >> >> Check the past few month ML archives to see how some other developers >> have proposed RFCs or XML changes. >> >> - Cole >> > >

2 1

[libvirt] [PATCH 00/16] More virCommand conversions and cleanups
by Cole Robinson 11 Jun '11

11 Jun '11

The following series converts all users of several older command wrappers (virRunWithHook, virExecDaemonize, and virExec) to use virCommand. The remaining functionality is then moved out of util.c and into command.c Cole Robinson (16): remote_driver: Convert virExecDaemonize usage to virCommand util: Combine __virExec and virExecWithHook command: Allow setting a NULL hook function storage_backend: Convert virRunWithHook usage to virCommand apparmor: Convert virExec usage to virCommand storage: Convert qemu-img -help parsing to virCommand storage: Covert regex helpers to virCommand storage: iscsi: Convert virExec to virCommand qemu: Convert virExec usage to virCommand openvz: Convert virExec usage to virCommand remote: Convert SSH tunnel to virCommand util: Remove unused virExec wrapper util: Implement virRun as a wrapper around virCommand Move virRun, virExec*, virFork to util/command storage_backend: Fix error reporting with regex helper command: Report stdout/stderr if command fails cfg.mk | 2 +- src/libvirt_private.syms | 8 +- src/lxc/veth.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 1 + src/openvz/openvz_conf.c | 37 +- src/openvz/openvz_driver.c | 52 ++- src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 83 +-- src/security/security_apparmor.c | 70 +--- src/storage/storage_backend.c | 292 ++++-------- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 7 +- src/storage/storage_backend_iscsi.c | 40 +- src/storage/storage_backend_logical.c | 32 +- src/util/command.c | 621 +++++++++++++++++++++++- src/util/command.h | 16 +- src/util/ebtables.c | 2 +- src/util/pci.c | 2 +- src/util/util.c | 764 +---------------------------- src/util/util.h | 44 -- src/vmware/vmware_driver.c | 1 + 22 files changed, 854 insertions(+), 1241 deletions(-) -- 1.7.4.4

4 40

[libvirt] Fwd: cvs commit: ports/devel/libvirt Makefile distinfo pkg-plist ports/devel/libvirt/files patch-docs__apibuild.py patch-src__util__command.c
by Jason Helfman 10 Jun '11

10 Jun '11

libvirt has been updated in the FreeBSD portstree. Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

1 0

[libvirt] does libvirt get disk->info.alias, when attaching a disk by virDomainAttachDevice?
by 李敬伟 10 Jun '11

10 Jun '11

Hi, I am using libvirt 0.9.1 on CentOS 5.5 64bit , Created a vm :virsh create libvirt.xml Attached a disk ,virsh attach-disk 3 /opt/vms/test.img vdb When getting blosk stats ,virsh domblkstats 3 vdb ,it showed error: Failed to get block stats 3 vdb error: internal error missing disk device alias name for vdb while virsh domblkstat 3 vda, it showed vda rd_req 6667 vda rd_bytes 154084864 vda wr_req 9530 vda wr_bytes 57196544 I guess libvirt does not get disk->info.alias when attaching a disk,so it can not get block status. # virsh version Compiled against library: libvir 0.9.1 Using library: libvir 0.9.1 Using API: QEMU 0.9.1 Running hypervisor: QEMU 0.9.1 # rpm -qa|grep kvm kmod-kvm-83-224.el5.centos.1 kvm-qemu-img-83-224.el5.centos.1 etherboot-zroms-kvm-5.4.4-13.el5.centos kvm-83-224.el5.centos.1 Jingwei Li (lijingwei9060(a)gmail.com<mailto:lijingwei9060@gmail.com> or lijw(a)bingosoft.net<mailto:lijw@bingosoft.net>)

3 2

[libvirt] [PATCH] xenapi: Improve error message on session failure
by Matthew Booth 10 Jun '11

10 Jun '11

XenAPI session login can fail for a number of reasons, but currently no specific reason is displayed to the user, e.g.: virsh -c XenAPI://citrix-xen.example.com/ Enter username for citrix-xen.example.com: root Enter root's password for citrix-xen.example.com: error: authentication failed: (null) error: failed to connect to the hypervisor This patch displays the session error description on failure. --- src/xenapi/xenapi_driver.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 6f64208..3fc35c6 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -166,7 +166,22 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUS privP->session = xen_session_login_with_password(call_func, privP, username, password, xen_api_latest_version); - if (privP->session != NULL && privP->session->ok) { + if (privP->session == NULL) { + /* From inspection of xen_session_login_with_password in + * libxenserver(Version 5.6.100-1), this appears not to be currently + * possible. The only way for this to be NULL would be on malloc + * failure, except that the code doesn't check for this and would + * segfault before returning. + * + * We don't assume the reason here for a failure in an external library. + */ + xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, + _("Failed to allocate xen session")); + + goto error; + } + + if (privP->session->ok) { conn->privateData = privP; VIR_FREE(username); @@ -175,7 +190,8 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUS return VIR_DRV_OPEN_SUCCESS; } - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, NULL); + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, + *privP->session->error_description); error: VIR_FREE(username); -- 1.7.4.4

3 2

[libvirt] [PATCH] qemu: Fix one type in the error prompt string
by Osier Yang 10 Jun '11

10 Jun '11

Pushed in trivial rule. --- src/qemu/qemu_command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ef2d002..4e68241 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -553,7 +553,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev int thisidx; if ((thisidx = qemuDomainDeviceAliasIndex(&def->hostdevs[i]->info, "hostdev")) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to determine device index for hostdevwork device")); + _("Unable to determine device index for hostdev device")); return -1; } if (thisidx >= idx) -- 1.7.4

1 0

[libvirt] Make check on current git fails when building --with-vbox
by Ruben Kerkhof 09 Jun '11

09 Jun '11

Hi all, ./configure --without-vbox make make check produces on my F-13 and F-15 machines. make[1]: Entering directory `/home/ruben/src/libvirt/tests' make virshtest conftest sockettest nodeinfotest qparamtest virbuftest commandtest commandhelper seclabeltest hashtest qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest openvzutilstest vmx2xmltest xml2vmxtest networkxml2xmltest nwfilterxml2xmltest storagevolxml2xmltest storagepoolxml2xmltest nodedevxml2xmltest interfacexml2xmltest cputest eventtest make[2]: Entering directory `/home/ruben/src/libvirt/tests' CC virshtest.o CC testutils.o CCLD virshtest CC conftest.o CCLD conftest CC sockettest.o CCLD sockettest CC nodeinfotest.o CCLD nodeinfotest CC qparamtest.o CCLD qparamtest CC virbuftest.o CCLD virbuftest CC commandtest-commandtest.o CC commandtest-testutils.o CCLD commandtest CC commandhelper-commandhelper.o CCLD commandhelper CC seclabeltest.o CCLD seclabeltest CC hashtest.o CCLD hashtest CC qemuxml2argvtest.o CC testutilsqemu.o CCLD qemuxml2argvtest /usr/bin/ld: ../src/.libs/libvirt_test.a(libvirt_driver_la-lock_manager.o): undefined reference to symbol 'dlclose@@GLIBC_2.2.5' /usr/bin/ld: note: 'dlclose@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line /lib64/libdl.so.2: could not read symbols: Invalid operation collect2: ld returned 1 exit status make[2]: *** [qemuxml2argvtest] Error 1 make[2]: Leaving directory `/home/ruben/src/libvirt/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/ruben/src/libvirt/tests' make: *** [check-recursive] Error 1 Kind regards, Ruben

2 3

[libvirt] [PATCH] Move VMware Workstation/Player driver to correct spec file section
by Matthias Bolte 09 Jun '11

09 Jun '11

The VMware driver works like the OpenVZ driver by using a commandline tool for management. It dosen't use it's own remote protocol. --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c7ef8d0..97ebd65 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -46,11 +46,11 @@ %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_xenapi 0%{!?_without_xenapi:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} +%define with_vmware 0%{!?_without_vmware:%{server_drivers}} # Then the hypervisor drivers that talk a native remote protocol %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} -%define with_vmware 0%{!?_without_vmware:1} # Then the secondary host drivers %define with_network 0%{!?_without_network:%{server_drivers}} -- 1.7.0.4

2 2

[libvirt] [PATCH v3] graphics: add support for action_if_connected in qemu
by Michal Prívozník 09 Jun '11

09 Jun '11

From: Michal Privoznik <mprivozn(a)redhat.com> This option accepts 3 values: -keep, to keep current client connected (Spice+VNC) -disconnect, to disconnect client (Spice) -fail, to fail setting password if there is a client connected (Spice) --- diff to v2: -fixed typo -added test. However, functionality provided by this patch will show up only when talking to qemu monitor (set_password command). diff to v1: -Eric's review suggestions included -update 'Since' docs/formatdomain.html.in | 13 +++++- docs/schemas/domain.rng | 16 +++++++ src/conf/domain_conf.c | 44 ++++++++++++++++++- src/conf/domain_conf.h | 11 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_hotplug.c | 15 +++++- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- 7 files changed, 94 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 98fb2b4..2ed16ff 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1801,7 +1801,11 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. VNC accepts <code>keep</code> value only. + since 0.9.3 + NB, this may not be supported by all hypervisors. Rather than using listen/port, QEMU supports a <code>socket</code> attribute for listening on a unix domain socket path. @@ -1820,7 +1824,12 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. SPICE accepts <code>keep</code> to keep client + connected, <code>disconnect</code> to disconnect client and + <code>fail</code> to fail changing password. Since 0.9.3 + NB, this may not be supported by all hypervisors. "spice" since 0.8.6. diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 0be0371..e71b683 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1250,6 +1250,13 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>keep</value> + </choice> + </attribute> + </optional> </group> <group> <attribute name="type"> @@ -1293,6 +1300,15 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>fail</value> + <value>disconnect</value> + <value>keep</value> + </choice> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="channel"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d9fef4..19f22e0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -311,6 +311,13 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "desktop", "spice") +VIR_ENUM_IMPL(virDomainGraphicsAuthConnected, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST, + "default", + "fail", + "disconnect", + "keep") + VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST, "main", @@ -3892,9 +3899,12 @@ error: static int -virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr def) +virDomainGraphicsAuthDefParseXML(xmlNodePtr node, + virDomainGraphicsAuthDefPtr def, + int type) { char *validTo = NULL; + char *connected = virXMLPropString(node, "connected"); def->passwd = virXMLPropString(node, "passwd"); @@ -3935,6 +3945,28 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr de def->expires = 1; } + if (connected) { + int action = virDomainGraphicsAuthConnectedTypeFromString(connected); + if (action <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown connected value %s"), + connected); + VIR_FREE(connected); + return -1; + } + VIR_FREE(connected); + + /* VNC supports connected='keep' only */ + if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + action != VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VNC supports connected='keep' only")); + return -1; + } + + def->connected = action; + } + return 0; } @@ -4004,7 +4036,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.vnc.listenAddr[0]) VIR_FREE(def->data.vnc.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, + def->type) < 0) goto error; } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *fullscreen = virXMLPropString(node, "fullscreen"); @@ -4140,7 +4173,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.spice.listenAddr[0]) VIR_FREE(def->data.spice.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth, + def->type) < 0) goto error; cur = node->children; @@ -9075,6 +9109,10 @@ virDomainGraphicsAuthDefFormatAttr(virBufferPtr buf, strftime(strbuf, sizeof(strbuf), "%Y-%m-%dT%H:%M:%S", tm); virBufferAsprintf(buf, " passwdValidTo='%s'", strbuf); } + + if (def->connected) + virBufferEscapeString(buf, " connected='%s'", + virDomainGraphicsAuthConnectedTypeToString(def->connected)); } static int diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 41c8136..6bfc337 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -640,12 +640,22 @@ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_LAST, }; +enum virDomainGraphicsAuthConnectedType { + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DEFAULT = 0, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DISCONNECT, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP, + + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST +}; + typedef struct _virDomainGraphicsAuthDef virDomainGraphicsAuthDef; typedef virDomainGraphicsAuthDef *virDomainGraphicsAuthDefPtr; struct _virDomainGraphicsAuthDef { char *passwd; unsigned int expires: 1; /* Whether there is an expiry time set */ time_t validTo; /* seconds since epoch */ + int connected; /* action if connected */ }; enum virDomainGraphicsSpiceChannelName { @@ -1546,6 +1556,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) +VIR_ENUM_DECL(virDomainGraphicsAuthConnected) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9d4e163..c43da44 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -269,6 +269,8 @@ virDomainFindByID; virDomainFindByName; virDomainFindByUUID; virDomainGetRootFilesystem; +virDomainGraphicsAuthConnectedTypeFromString; +virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d33fc87..da6629b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1061,10 +1061,12 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, return -1; } - /* If a password lifetime was, or is set, then we must always run, - * even if new password matches old password */ + /* If a password lifetime was, or is set, or action if connected has + * changed, then we must always run, even if new password matches + * old password */ if (olddev->data.vnc.auth.expires || dev->data.vnc.auth.expires || + olddev->data.vnc.auth.connected != dev->data.vnc.auth.connected || STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd, dev->data.vnc.auth.passwd)) { VIR_DEBUG("Updating password on VNC server %p %p", @@ -1080,6 +1082,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.vnc.auth.passwd = NULL; olddev->data.vnc.auth.validTo = dev->data.vnc.auth.validTo; olddev->data.vnc.auth.expires = dev->data.vnc.auth.expires; + olddev->data.vnc.auth.connected = dev->data.vnc.auth.connected; } else { ret = 0; } @@ -1112,6 +1115,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, * even if new password matches old password */ if (olddev->data.spice.auth.expires || dev->data.spice.auth.expires || + olddev->data.spice.auth.connected != dev->data.spice.auth.connected || STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", @@ -1127,6 +1131,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.spice.auth.passwd = NULL; olddev->data.spice.auth.validTo = dev->data.spice.auth.validTo; olddev->data.spice.auth.expires = dev->data.spice.auth.expires; + olddev->data.spice.auth.connected = dev->data.spice.auth.connected; } else { VIR_DEBUG("Not updating since password didn't change"); ret = 0; @@ -1812,16 +1817,20 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; time_t now = time(NULL); char expire_time [64]; + const char *connected = NULL; int ret; if (!auth->passwd && !driver->vncPassword) return 0; + if (auth->connected) + connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected); + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetPassword(priv->mon, type, auth->passwd ? auth->passwd : defaultPasswd, - NULL); + connected); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml index 4c0c57e..6389de5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml @@ -71,7 +71,7 @@ </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> - <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22'/> + <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/> <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </sound> -- 1.7.5.rc3

1 0

[libvirt] [PATCH v4 2/4] vcpupin: implement the code to address the new API in the qemu driver
by Taku Izumi 09 Jun '11

09 Jun '11

This patch implements the code to address the new API (virDomainPinVcpuFlags) in the qemu driver. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- src/qemu/qemu_driver.c | 99 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 23 deletions(-) Index: libvirt/src/qemu/qemu_driver.c =================================================================== --- libvirt.orig/src/qemu/qemu_driver.c +++ libvirt/src/qemu/qemu_driver.c @@ -2880,17 +2880,24 @@ qemudDomainSetVcpus(virDomainPtr dom, un static int -qemudDomainPinVcpu(virDomainPtr dom, - unsigned int vcpu, - unsigned char *cpumap, - int maplen) { +qemudDomainPinVcpuFlags(virDomainPtr dom, + unsigned int vcpu, + unsigned char *cpumap, + int maplen, + unsigned int flags) { + struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; + virDomainDefPtr persistentDef = NULL; int maxcpu, hostcpus; virNodeInfo nodeinfo; int ret = -1; + bool isActive; qemuDomainObjPrivatePtr priv; + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); @@ -2903,9 +2910,18 @@ qemudDomainPinVcpu(virDomainPtr dom, goto cleanup; } - if (!virDomainObjIsActive(vm)) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s",_("cannot pin vcpus on an inactive domain")); + isActive = virDomainObjIsActive(vm); + if (flags == VIR_DOMAIN_AFFECT_CURRENT) { + if (isActive) + flags = VIR_DOMAIN_AFFECT_LIVE; + else + flags = VIR_DOMAIN_AFFECT_CONFIG; + } + + if (!isActive && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("a domain is inactive; can change only " + "persistent config")); goto cleanup; } @@ -2918,27 +2934,54 @@ qemudDomainPinVcpu(virDomainPtr dom, goto cleanup; } - if (nodeGetInfo(dom->conn, &nodeinfo) < 0) - goto cleanup; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (!vm->persistent) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot change persistent config of a transient domain")); + goto cleanup; + } + if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm))) + goto cleanup; + } - hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; + if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (priv->vcpupids != NULL) { - if (virProcessInfoSetAffinity(priv->vcpupids[vcpu], - cpumap, maplen, maxcpu) < 0) + if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; - } else { - qemuReportError(VIR_ERR_NO_SUPPORT, - "%s", _("cpu affinity is not supported")); - goto cleanup; + + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + maxcpu = maplen * 8; + if (maxcpu > hostcpus) + maxcpu = hostcpus; + + if (priv->vcpupids != NULL) { + if (virProcessInfoSetAffinity(priv->vcpupids[vcpu], + cpumap, maplen, maxcpu) < 0) + goto cleanup; + } else { + qemuReportError(VIR_ERR_NO_SUPPORT, + "%s", _("cpu affinity is not supported")); + goto cleanup; + } + + if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to update or add vcpupin xml of " + "a running domain")); + goto cleanup; + } + } - if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to update or add vcpupin xml")); + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + + if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to update or add vcpupin xml of " + "a persistent domain")); + goto cleanup; + } + ret = virDomainSaveConfig(driver->configDir, persistentDef); goto cleanup; } @@ -2951,6 +2994,15 @@ cleanup: } static int +qemudDomainPinVcpu(virDomainPtr dom, + unsigned int vcpu, + unsigned char *cpumap, + int maplen) { + return qemudDomainPinVcpuFlags(dom, vcpu, cpumap, maplen, + VIR_DOMAIN_AFFECT_LIVE); +} + +static int qemudDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, @@ -8014,6 +8066,7 @@ static virDriver qemuDriver = { .domainSetVcpusFlags = qemudDomainSetVcpusFlags, /* 0.8.5 */ .domainGetVcpusFlags = qemudDomainGetVcpusFlags, /* 0.8.5 */ .domainPinVcpu = qemudDomainPinVcpu, /* 0.4.4 */ + .domainPinVcpuFlags = qemudDomainPinVcpuFlags, /* 0.9.2 */ .domainGetVcpus = qemudDomainGetVcpus, /* 0.4.4 */ .domainGetMaxVcpus = qemudDomainGetMaxVcpus, /* 0.4.4 */ .domainGetSecurityLabel = qemudDomainGetSecurityLabel, /* 0.6.1 */

2 1

Re: [libvirt] 答复: does libvirt get disk->info.alias, when attaching a disk by virDomainAttachDevice?
by Wen Congyang 09 Jun '11

09 Jun '11

At 06/09/2011 05:26 PM, 李敬伟 Write: > Thank you ,Wen Congyang. > Do you know any rpm repository of libvirt 0.9.2 for Centos 5? > You are using libvirt 0.9.2 on Centos 5? I use the newest libvirt on RHEL6. And I build rpm by hand. You can use git to clone the tree from libvirt.org. The steps to build a rpm package: 1. ./autogen.sh 2. make dist 3. rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec > > -----邮件原件----- > 发件人: Wen Congyang [mailto:wency@cn.fujitsu.com] > 发送时间: 2011年6月9日 16:25 > 收件人: 李敬伟; libvir-list(a)redhat.com > 主题: Re: [libvirt] does libvirt get disk->info.alias, when attaching a disk by virDomainAttachDevice? > > At 06/09/2011 01:26 PM, 李敬伟 Write: >> Hi, >> I am using libvirt 0.9.1 on CentOS 5.5 64bit , >> Created a vm :virsh create libvirt.xml >> Attached a disk ,virsh attach-disk 3 /opt/vms/test.img vdb >> When getting blosk stats ,virsh domblkstats 3 vdb ,it showed >> error: Failed to get block stats 3 vdb >> error: internal error missing disk device alias name for vdb > > I use the newest libvirt, and can not reproduce this problem. > Please try the newest libvirt again. > >> while virsh domblkstat 3 vda, it showed >> vda rd_req 6667 >> vda rd_bytes 154084864 >> vda wr_req 9530 >> vda wr_bytes 57196544 >> >> I guess libvirt does not get disk->info.alias when attaching a disk,so it can not get block status. >> >> # virsh version >> Compiled against library: libvir 0.9.1 Using library: libvir 0.9.1 >> Using API: QEMU 0.9.1 Running hypervisor: QEMU 0.9.1 # rpm -qa|grep >> kvm >> kmod-kvm-83-224.el5.centos.1 >> kvm-qemu-img-83-224.el5.centos.1 >> etherboot-zroms-kvm-5.4.4-13.el5.centos >> kvm-83-224.el5.centos.1 >> >> >> Jingwei Li (lijingwei9060(a)gmail.com<mailto:lijingwei9060@gmail.com> or >> lijw(a)bingosoft.net<mailto:lijw@bingosoft.net>) >> >> >> >> >> -- >> libvir-list mailing list >> libvir-list(a)redhat.com >> https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] [PATCH v4 3/4] vcpupin: implement the remote protocol to address the new API
by Taku Izumi 09 Jun '11

09 Jun '11

This patch implements the remote protocol to address the new API (virDomainPinVcpuFlags). Signd-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- daemon/remote.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 10 +++++++++- src/remote_protocol-structs | 9 +++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) Index: libvirt/src/remote/remote_protocol.x =================================================================== --- libvirt.orig/src/remote/remote_protocol.x +++ libvirt/src/remote/remote_protocol.x @@ -837,6 +837,13 @@ struct remote_domain_pin_vcpu_args { opaque cpumap<REMOTE_CPUMAP_MAX>; }; +struct remote_domain_pin_vcpu_flags_args { + remote_nonnull_domain dom; + int vcpu; + opaque cpumap<REMOTE_CPUMAP_MAX>; + unsigned int flags; +}; + struct remote_domain_get_vcpus_args { remote_nonnull_domain dom; int maxinfo; @@ -2297,7 +2304,8 @@ enum remote_procedure { REMOTE_PROC_INTERFACE_CHANGE_COMMIT = 221, /* autogen autogen */ REMOTE_PROC_INTERFACE_CHANGE_ROLLBACK = 222, /* autogen autogen */ REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS_FLAGS = 223, /* skipgen autogen */ - REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224 /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224, /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_PIN_VCPU_FLAGS = 225 /* skipgen autogen */ /* * Notice how the entries are grouped in sets of 10 ? Index: libvirt/src/remote_protocol-structs =================================================================== --- libvirt.orig/src/remote_protocol-structs +++ libvirt/src/remote_protocol-structs @@ -529,6 +529,15 @@ struct remote_domain_pin_vcpu_args { char * cpumap_val; } cpumap; }; +struct remote_domain_pin_vcpu_flags_args { + remote_nonnull_domain dom; + int vcpu; + struct { + u_int cpumap_len; + char * cpumap_val; + } cpumap; + u_int flags; +}; struct remote_domain_get_vcpus_args { remote_nonnull_domain dom; int maxinfo; Index: libvirt/src/remote/remote_driver.c =================================================================== --- libvirt.orig/src/remote/remote_driver.c +++ libvirt/src/remote/remote_driver.c @@ -6259,6 +6259,7 @@ static virDriver remote_driver = { .domainSetVcpusFlags = remoteDomainSetVcpusFlags, /* 0.8.5 */ .domainGetVcpusFlags = remoteDomainGetVcpusFlags, /* 0.8.5 */ .domainPinVcpu = remoteDomainPinVcpu, /* 0.3.0 */ + .domainPinVcpuFlags = remoteDomainPinVcpuFlags, /* 0.9.2 */ .domainGetVcpus = remoteDomainGetVcpus, /* 0.3.0 */ .domainGetMaxVcpus = remoteDomainGetMaxVcpus, /* 0.3.0 */ .domainGetSecurityLabel = remoteDomainGetSecurityLabel, /* 0.6.1 */ Index: libvirt/daemon/remote.c =================================================================== --- libvirt.orig/daemon/remote.c +++ libvirt/daemon/remote.c @@ -1277,6 +1277,48 @@ cleanup: } static int +remoteDispatchDomainPinVcpuFlags(struct qemud_server *server ATTRIBUTE_UNUSED, + struct qemud_client *client ATTRIBUTE_UNUSED, + virConnectPtr conn, + remote_message_header *hdr ATTRIBUTE_UNUSED, + remote_error *rerr, + remote_domain_pin_vcpu_flags_args *args, + void *ret ATTRIBUTE_UNUSED) +{ + virDomainPtr dom = NULL; + int rv = -1; + + if (!conn) { + virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); + goto cleanup; + } + + if (!(dom = get_nonnull_domain(conn, args->dom))) + goto cleanup; + + if (args->cpumap.cpumap_len > REMOTE_CPUMAP_MAX) { + virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("cpumap_len > REMOTE_CPUMAP_MAX")); + goto cleanup; + } + + if (virDomainPinVcpuFlags(dom, + args->vcpu, + (unsigned char *) args->cpumap.cpumap_val, + args->cpumap.cpumap_len, + args->flags) < 0) + goto cleanup; + + rv = 0; + +cleanup: + if (rv < 0) + remoteDispatchError(rerr); + if (dom) + virDomainFree(dom); + return rv; +} + +static int remoteDispatchDomainGetMemoryParameters(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client

2 2

[libvirt] [PATCH v4 4/4] vcpupin: add the new option to "virsh vcpupin" command
by Taku Izumi 09 Jun '11

09 Jun '11

This patch adds the new option (--live, --config and --current) to "virsh vcpupin" command. The behavior of above aption is the same as that of "virsh setmem", "virsh setvcpus", and whatnot. When the --config option is specified, the command affects a persistent domain, while --live option is specified, it affects a running (live) domain. The --current option cannot be used with --config or --live at the same time, and when --current is specified, it affects a "current" domain. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 33 +++++++++++++++++++++++++++++++-- tools/virsh.pod | 8 +++++++- 2 files changed, 38 insertions(+), 3 deletions(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -2929,6 +2929,9 @@ static const vshCmdOptDef opts_vcpupin[] {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"vcpu", VSH_OT_INT, VSH_OFLAG_REQ, N_("vcpu number")}, {"cpulist", VSH_OT_DATA, VSH_OFLAG_REQ, N_("host cpu number(s) (comma separated)")}, + {"config", VSH_OT_BOOL, 0, N_("affect next boot")}, + {"live", VSH_OT_BOOL, 0, N_("affect running domain")}, + {"current", VSH_OT_BOOL, 0, N_("affect current domain")}, {NULL, 0, 0, NULL} }; @@ -2945,6 +2948,26 @@ cmdVcpupin(vshControl *ctl, const vshCmd int cpumaplen; int i; enum { expect_num, expect_num_or_comma } state; + int config = vshCommandOptBool(cmd, "config"); + int live = vshCommandOptBool(cmd, "live"); + int current = vshCommandOptBool(cmd, "current"); + int flags = 0; + + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified exclusively")); + return false; + } + flags = VIR_DOMAIN_AFFECT_CURRENT; + } else { + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + /* neither option is specified */ + if (!live && !config) + flags = -1; + } if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -3041,8 +3064,14 @@ cmdVcpupin(vshControl *ctl, const vshCmd cpulist++; } while (cpulist); - if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) { - ret = false; + if (flags == -1) { + if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) { + ret = false; + } + } else { + if (virDomainPinVcpuFlags(dom, vcpu, cpumap, cpumaplen, flags) != 0) { + ret = false; + } } VIR_FREE(cpumap); Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -790,10 +790,16 @@ values; these two flags cannot both be s Returns basic information about the domain virtual CPUs, like the number of vCPUs, the running time, the affinity to physical processors. -=item B<vcpupin> I<domain-id> I<vcpu> I<cpulist> +=item B<vcpupin> I<domain-id> I<vcpu> I<cpulist> optional I<--live> I<--config> +I<--current> Pin domain VCPUs to host physical CPUs. The I<vcpu> number must be provided and I<cpulist> is a comma separated list of physical CPU numbers. +If I<--live> is specified, affect a running guest. +If I<--config> is specified, affect the next boot of a persistent guest. +If I<--current> is specified, affect the current guest state. +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. +If no flag is specified, behavior is different depending on hypervisor. =item B<vncdisplay> I<domain-id>

2 1

[libvirt] [PATCH v4 1/4] vcpupin: introduce a new libvirt API
by Taku Izumi 09 Jun '11

09 Jun '11

This patch introduces a new libvirt API (virDomainPinVcpuFlags). Signd-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- include/libvirt/libvirt.h.in | 5 ++ src/driver.h | 7 +++ src/libvirt.c | 76 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 4 files changed, 89 insertions(+) Index: libvirt/include/libvirt/libvirt.h.in =================================================================== --- libvirt.orig/include/libvirt/libvirt.h.in +++ libvirt/include/libvirt/libvirt.h.in @@ -1049,6 +1049,11 @@ int virDomainPinVcpu unsigned int vcpu, unsigned char *cpumap, int maplen); +int virDomainPinVcpuFlags (virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen, + unsigned int flags); /** * VIR_USE_CPU: Index: libvirt/src/driver.h =================================================================== --- libvirt.orig/src/driver.h +++ libvirt/src/driver.h @@ -230,6 +230,12 @@ typedef int unsigned char *cpumap, int maplen); typedef int + (*virDrvDomainPinVcpuFlags) (virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen, + unsigned int flags); +typedef int (*virDrvDomainGetVcpus) (virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, @@ -671,6 +677,7 @@ struct _virDriver { virDrvDomainSetVcpusFlags domainSetVcpusFlags; virDrvDomainGetVcpusFlags domainGetVcpusFlags; virDrvDomainPinVcpu domainPinVcpu; + virDrvDomainPinVcpuFlags domainPinVcpuFlags; virDrvDomainGetVcpus domainGetVcpus; virDrvDomainGetMaxVcpus domainGetMaxVcpus; virDrvDomainGetSecurityLabel domainGetSecurityLabel; Index: libvirt/src/libvirt.c =================================================================== --- libvirt.orig/src/libvirt.c +++ libvirt/src/libvirt.c @@ -6709,6 +6709,82 @@ error: } /** + * virDomainPinVcpuFlags: + * @domain: pointer to domain object, or NULL for Domain0 + * @vcpu: virtual CPU number + * @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN) + * Each bit set to 1 means that corresponding CPU is usable. + * Bytes are stored in little-endian order: CPU0-7, 8-15... + * In each byte, lowest CPU number is least significant bit. + * @maplen: number of bytes in cpumap, from 1 up to size of CPU map in + * underlying virtualization system (Xen...). + * If maplen < size, missing bytes are set to zero. + * If maplen > size, failure code is returned. + * @flags: bitwise-OR of virDomainModificationImpac + * + * Dynamically change the real CPUs which can be allocated to a virtual CPU. + * This function requires privileged access to the hypervisor. + * + * @flags may include VIR_DOMAIN_PIN_VCPU_LIVE or VIR_DOMAIN_PIN_VCPU_CONFIG. + * Both flags may be set. + * If VIR_DOMAIN_PIN_VCPU_LIVE is set, the change affects a running domain + * and may fail if domain is not alive. + * If VIR_DOMAIN_PIN_VCPU_CONFIG is set, the change affects persistent state, + * and will fail for transient domains. If neither flag is specified (that is, + * @flags is VIR_DOMAIN_PIN_VCPU_CURRENT), then an inactive domain modifies + * persistent setup, while an active domain is hypervisor-dependent on whether + * just live or both live and persistent state is changed. + * Not all hypervisors can support all flag combinations. + * + * Returns 0 in case of success, -1 in case of failure. + * + */ +int +virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu, + unsigned char *cpumap, int maplen, unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "vcpu=%u, cpumap=%p, maplen=%d, flags=%u", + vcpu, cpumap, maplen, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if ((vcpu > 32000) || (cpumap == NULL) || (maplen < 1)) { + virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainPinVcpuFlags) { + int ret; + ret = conn->driver->domainPinVcpuFlags (domain, vcpu, cpumap, maplen, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; + +} + +/** * virDomainGetVcpus: * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) Index: libvirt/src/libvirt_public.syms =================================================================== --- libvirt.orig/src/libvirt_public.syms +++ libvirt/src/libvirt_public.syms @@ -448,6 +448,7 @@ LIBVIRT_0.9.2 { virInterfaceChangeBegin; virInterfaceChangeCommit; virInterfaceChangeRollback; + virDomainPinVcpuFlags; } LIBVIRT_0.9.0; # .... define new API here using predicted next version number ....

2 1

[libvirt] [PATCH 4/4] vcpupin: add vcpupin resetting feature to qemu driver
by Taku Izumi 09 Jun '11

09 Jun '11

Pinning to all physical cpus means resetting, hence it is preferable to delete vcpupin setting of XML. This patch changes qemu driver to delete vcpupin setting by invoking virDomainVcpupinDel API when pinning the specified virtual cpu to all host physical cpus. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- src/qemu/qemu_driver.c | 64 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 18 deletions(-) Index: libvirt/src/qemu/qemu_driver.c =================================================================== --- libvirt.orig/src/qemu/qemu_driver.c +++ libvirt/src/qemu/qemu_driver.c @@ -2894,6 +2894,7 @@ qemudDomainPinVcpuFlags(virDomainPtr dom int ret = -1; bool isActive; qemuDomainObjPrivatePtr priv; + bool canResetting = true; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2944,15 +2945,23 @@ qemudDomainPinVcpuFlags(virDomainPtr dom goto cleanup; } - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - - if (nodeGetInfo(dom->conn, &nodeinfo) < 0) - goto cleanup; + if (nodeGetInfo(dom->conn, &nodeinfo) < 0) + goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + maxcpu = maplen * 8; + if (maxcpu > hostcpus) + maxcpu = hostcpus; + /* pinning to all physical cpus means resetting, + * so check if we can reset setting. + */ + for (int pcpu = 0; pcpu < hostcpus; pcpu++) { + if ((cpumap[pcpu/8] & (1 << (pcpu % 8))) == 0) { + canResetting = false; + break; + } + } - hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); - maxcpu = maplen * 8; - if (maxcpu > hostcpus) - maxcpu = hostcpus; + if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (priv->vcpupids != NULL) { if (virProcessInfoSetAffinity(priv->vcpupids[vcpu], @@ -2964,23 +2973,42 @@ qemudDomainPinVcpuFlags(virDomainPtr dom goto cleanup; } - if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to update or add vcpupin xml of " - "a running domain")); - goto cleanup; + if (canResetting) { + if (virDomainVcpupinDel(vm->def, vcpu) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to delete vcpupin xml of " + "a running domain")); + goto cleanup; + } + } else { + if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to update or add vcpupin xml of " + "a running domain")); + goto cleanup; + } } } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to update or add vcpupin xml of " - "a persistent domain")); - goto cleanup; + if (canResetting) { + if (virDomainVcpupinDel(persistentDef, vcpu) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to delete vcpupin xml of " + "a persistent domain")); + goto cleanup; + } + } else { + if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to update or add vcpupin xml of " + "a persistent domain")); + goto cleanup; + } } + ret = virDomainSaveConfig(driver->configDir, persistentDef); goto cleanup; }

1 0

[libvirt] [PATCH 3/4] vcpupin: add virDomainVcpupinDel function
by Taku Izumi 09 Jun '11

09 Jun '11

This patch add the private API (virDomainVcpupinDel). This API can delete the vcpupin setting of a specified virtual cpu. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- src/conf/domain_conf.c | 39 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + 3 files changed, 42 insertions(+) Index: libvirt/src/conf/domain_conf.c =================================================================== --- libvirt.orig/src/conf/domain_conf.c +++ libvirt/src/conf/domain_conf.c @@ -8126,6 +8126,45 @@ cleanup: return -1; } +int +virDomainVcpupinDel(virDomainDefPtr def, int vcpu) +{ + int n; + bool deleted = false; + virDomainVcpupinDefPtr *vcpupin_list = def->cputune.vcpupin; + + /* No vcpupin exists yet */ + if (!def->cputune.nvcpupin) { + return 0; + } + + for (n = 0; n < def->cputune.nvcpupin; n++) { + if (vcpupin_list[n]->vcpuid == vcpu) { + VIR_FREE(vcpupin_list[n]->cpumask); + VIR_FREE(vcpupin_list[n]); + memmove(&vcpupin_list[n], + &vcpupin_list[n+1], + (def->cputune.nvcpupin - n - 1) * sizeof(virDomainVcpupinDef *)); + deleted = true; + break; + } + } + + if (!deleted) + return 0; + + if (--def->cputune.nvcpupin == 0) { + virDomainVcpupinDefFree(def->cputune.vcpupin, 0); + } else { + if (VIR_REALLOC_N(def->cputune.vcpupin, def->cputune.nvcpupin) < 0) { + virReportOOMError(); + return -1; + } + } + + return 0; +} + static int virDomainLifecycleDefFormat(virBufferPtr buf, int type, Index: libvirt/src/conf/domain_conf.h =================================================================== --- libvirt.orig/src/conf/domain_conf.h +++ libvirt/src/conf/domain_conf.h @@ -1381,6 +1381,8 @@ int virDomainVcpupinAdd(virDomainDefPtr int maplen, int vcpu); +int virDomainVcpupinDel(virDomainDefPtr def, int vcpu); + int virDomainDiskIndexByName(virDomainDefPtr def, const char *name); int virDomainDiskInsert(virDomainDefPtr def, virDomainDiskDefPtr disk); Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms +++ libvirt/src/libvirt_private.syms @@ -360,6 +360,7 @@ virDomainTimerTickpolicyTypeToString; virDomainTimerTrackTypeFromString; virDomainTimerTrackTypeToString; virDomainVcpupinAdd; +virDomainVcpupinDel; virDomainVcpupinFindByVcpu; virDomainVcpupinIsDuplicate; virDomainVideoDefFree;

1 0

[libvirt] [PATCH 2/4] vcpupin: add reset option to virsh vcpupin command
by Taku Izumi 09 Jun '11

09 Jun '11

When resetting vcpupin setting, we have to specify all host physical cpus as a cpulist parameter of virsh vcpupin command. It's a little tedious. This patch changes to allow to receive the special keyword 'r' as a cpulist parameter of virsh vcpupin command when resetting vcpupin setting. If you set the following: # virsh vcpupin VM 0 r the vcpu0 will be pinned to all physical cpus. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 7 ++++++- tools/virsh.pod | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -3010,8 +3010,13 @@ cmdVcpupin(vshControl *ctl, const vshCmd /* Parse cpulist */ cur = cpulist; - if (*cur == 0) + if (*cur == 0) { goto parse_error; + } else if (*cur == 'r') { + for (cpu = 0; cpu < maxcpu; cpu++) + VIR_USE_CPU(cpumap, cpu); + *cur = 0; + } while (*cur != 0) { Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -797,6 +797,8 @@ Pin domain VCPUs to host physical CPUs. and I<cpulist> is a list of physical CPU numbers. Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and the '^' denotes exclusive. +If you want to reset vcpupin setting, that is, to pin vcpu all physical cpus, +simply specify 'r' as a cpulist. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state.

1 0

[libvirt] [PATCH 1/4] vcpupin: improve vcpupin definition of virsh vcpupin
by Taku Izumi 09 Jun '11

09 Jun '11

When using vcpupin command, we have to speficy comma-separated list as cpulist, but this is tedious in case the number of phsycal cpus is large. This patch improves this by introducing special markup "-" and "^" which are similar to XML schema of "cpuset" attribute. That is: # virsh vcpupin Guest 0 0-15,^8 is identical to # virsh vcpupin Guest 0 0,1,2,3,4,5,6,7,9,10,11,12,13,14,15 NOTE: The expression is sequencially evaluated, so "0-15,^8" is not identical to "^8,0-15". Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 125 +++++++++++++++++++++++++++++++------------------------- tools/virsh.pod | 4 + 2 files changed, 73 insertions(+), 56 deletions(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -2946,8 +2946,9 @@ cmdVcpupin(vshControl *ctl, const vshCmd bool ret = true; unsigned char *cpumap; int cpumaplen; - int i; - enum { expect_num, expect_num_or_comma } state; + int i, cpu, lastcpu, maxcpu; + bool unuse = false; + char *cur; int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); @@ -3003,66 +3004,74 @@ cmdVcpupin(vshControl *ctl, const vshCmd return false; } - /* Check that the cpulist parameter is a comma-separated list of - * numbers and give an intelligent error message if not. - */ - if (cpulist[0] == '\0') { - vshError(ctl, "%s", _("cpulist: Invalid format. Empty string.")); - virDomainFree (dom); - return false; - } + maxcpu = VIR_NODEINFO_MAXCPUS(nodeinfo); + cpumaplen = VIR_CPU_MAPLEN(maxcpu); + cpumap = vshCalloc(ctl, 0, cpumaplen); + + /* Parse cpulist */ + cur = cpulist; + if (*cur == 0) + goto parse_error; + + while (*cur != 0) { + + /* the char '^' denotes exclusive */ + if (*cur == '^') { + cur++; + unuse = true; + } + + /* parse physical CPU number */ + if (!c_isdigit(*cur)) + goto parse_error; + cpu = virParseNumber(&cur); + if (cpu < 0) { + goto parse_error; + } + if (cpu >= maxcpu) { + vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); + goto parse_error; + } + virSkipSpaces(&cur); - state = expect_num; - for (i = 0; cpulist[i]; i++) { - switch (state) { - case expect_num: - if (!c_isdigit (cpulist[i])) { - vshError(ctl, _("cpulist: %s: Invalid format. Expecting " - "digit at position %d (near '%c')."), - cpulist, i, cpulist[i]); - virDomainFree (dom); - return false; + if ((*cur == ',') || (*cur == 0)) { + if (unuse) { + VIR_UNUSE_CPU(cpumap, cpu); + } else { + VIR_USE_CPU(cpumap, cpu); } - state = expect_num_or_comma; - break; - case expect_num_or_comma: - if (cpulist[i] == ',') - state = expect_num; - else if (!c_isdigit (cpulist[i])) { - vshError(ctl, _("cpulist: %s: Invalid format. Expecting " - "digit or comma at position %d (near '%c')."), - cpulist, i, cpulist[i]); - virDomainFree (dom); - return false; + } else if (*cur == '-') { + /* the char '-' denotes range */ + if (unuse) { + goto parse_error; + } + cur++; + virSkipSpaces(&cur); + /* parse the end of range */ + lastcpu = virParseNumber(&cur); + if (lastcpu < cpu) { + goto parse_error; + } + if (lastcpu >= maxcpu) { + vshError(ctl, _("Physical CPU %d doesn't exist."), maxcpu); + goto parse_error; + } + for (i = cpu; i <= lastcpu; i++) { + VIR_USE_CPU(cpumap, i); } + virSkipSpaces(&cur); } - } - if (state == expect_num) { - vshError(ctl, _("cpulist: %s: Invalid format. Trailing comma " - "at position %d."), - cpulist, i); - virDomainFree (dom); - return false; - } - cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); - cpumap = vshCalloc(ctl, 1, cpumaplen); - - do { - unsigned int cpu = atoi(cpulist); - - if (cpu < VIR_NODEINFO_MAXCPUS(nodeinfo)) { - VIR_USE_CPU(cpumap, cpu); + if (*cur == ',') { + cur++; + virSkipSpaces(&cur); + unuse = false; + } else if (*cur == 0) { + break; } else { - vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); - VIR_FREE(cpumap); - virDomainFree(dom); - return false; + goto parse_error; } - cpulist = strchr(cpulist, ','); - if (cpulist) - cpulist++; - } while (cpulist); + } if (flags == -1) { if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) { @@ -3074,9 +3083,15 @@ cmdVcpupin(vshControl *ctl, const vshCmd } } +cleanup: VIR_FREE(cpumap); virDomainFree(dom); return ret; + +parse_error: + vshError(ctl, "%s", _("cpulist: Invalid format.")); + ret = false; + goto cleanup; } /* Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -794,7 +794,9 @@ vCPUs, the running time, the affinity to I<--current> Pin domain VCPUs to host physical CPUs. The I<vcpu> number must be provided -and I<cpulist> is a comma separated list of physical CPU numbers. +and I<cpulist> is a list of physical CPU numbers. Its syntax is a comma +separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can +also be allowed. The '-' denotes the range and the '^' denotes exclusive. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state.

1 0

[libvirt] [PATCH 0/4] RFC: vcpupin: some improvements of virsh vcpupin command
by Taku Izumi 09 Jun '11

09 Jun '11

Hi all, This patchset improves virsh vcpupin command like the following: (i) introduce special markup "-" and "^" which are similar to XML schema of "cpuset" attribute # virsh vcpupin VM 0 0-8,^4 --config # virsh dumpxml VM ... <vcpu>4</vcpu> <cputune> <vcpupin vcpu='0' cpuset='0-3,5-8'/> </cputune> ... (ii) allow to receive the special keyword 'r' as a cpulist parameter when resetting vcpupin setting. # virsh vcpupin VM 0 r --config (iii) when resetting, that is, pinning the specified virtual cpu to all host physical cpus, vcpupin setting will be deleted # virsh dumpxml VM ... <vcpu>4</vcpu> <cputune> </cputune> ... The following my patchset is the prerequisite of this: http://www.redhat.com/archives/libvir-list/2011-June/msg00390.html *[PATCH 1/4] vcpupin: improve vcpupin definition of virsh vcpupin *[PATCH 2/4] vcpupin: add reset option to virsh vcpupin command *[PATCH 3/4] vcpupin: add virDomainVcpupinDel function *[PATCH 4/4] vcpupin: add vcpupin resetting feature to qemu driver Best regards, Taku Izumi

1 0

[libvirt] [PATCH v4 0/4] vcpupin: configure inactive domain's CPU affinity setting
by Taku Izumi 09 Jun '11

09 Jun '11

Hi all, This patchset enables us to configure inactive domains' CPU affinity setting. This is the rebased version, but retains the version number. *[PATCH v4 1/4] vcpupin: introduce a new libvirt API (virDomainPinVcpuFlags) *[PATCH v4 2/4] vcpupin: implement the code to address the new API in the qemu driver *[PATCH v4 3/4] vcpupin: implement the remote protocol to address the new API *[PATCH v4 4/4] vcpupin: add the new option to "virsh vcpupin" command Best regards, Taku Izumi

1 0

[libvirt] Driver development
by Carlos N. A. Corrêa 08 Jun '11

08 Jun '11

Hi, I'm interested in developing a new network driver for libvirt (one for the definition and management of OpenVSwitch datapaths). I've read some of the code already, and by now my general directions are: - Change the function virNetworkDefParseXML in src/conf/network_conf.c to define and parse new configuration directives needed by my driver - Use src/network/bridge_driver.c as a template for my new driver, replacing code from the services provided by the driver (listed on "virNetworkDriver" type) with my own code, for my own net type. Have you any other directions in this matter? Any tips? If it works, would be this code of any use to you? Best regards, Carlos "Bill" Nilton CISSP, RHCE, ITIL Foundations http://carlosnilton.com.br/

2 2

[libvirt] [RFC PATCH] Set and reset MAC for PASSTHROUGH mode
by D. Herrendoerfer 08 Jun '11

08 Jun '11

Hi to all, there is a problem present in libvirt that when a PASSTHROUGH mode DIRECT NIC connection is made the MAC address of the NIC is not automatically set and reset to the configured VM MAC and back again. The attached patch fixes this problem by setting and resetting the MAC while remembering the previous setting while the VM is running. This also works if libvirtd is restarted while the VM is running. The storing of the previous MAC address is done in a link ( currently in /tmp, but should probably go into /var/run somewhere ). Why a link ? It only uses one inode, no need to waste a whole data block for 16 bytes or less. It's also more readable by simply looking at it with 'ls -l'. Best regards Dirk Signed-off-by: Dirk Herrendoerfer <d.herrendoerfer at herrendoerfer.name> diff --git a/src/libvirt_macvtap.syms b/src/libvirt_macvtap.syms index b48565b..0520cb5 100644 --- a/src/libvirt_macvtap.syms +++ b/src/libvirt_macvtap.syms @@ -6,5 +6,7 @@ # macvtap.h delMacvtap; openMacvtapTap; +get_macaddr; +set_macaddr; vpAssociatePortProfileId; vpDisassociatePortProfileId; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ef2d002..4cddbba 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -118,6 +118,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def, int rc; #if WITH_MACVTAP char *res_ifname = NULL; + unsigned char old_macaddr[6]; int vnet_hdr = 0; int err; @@ -125,6 +126,53 @@ qemuPhysIfaceConnect(virDomainDefPtr def, net->model && STREQ(net->model, "virtio")) vnet_hdr = 1; + /** Note: When using PASSTHROUGH mode with MACVTAP devices the link + * devices's MAC address must be set to the VMs MAC address. In + * order to not confuse the first switch or bridge in line this MAC + * address must be reset when the VM is shut down. + * This is especially important when using SRIOV capable cards that + * emulate their switch in firmware. + */ + if ( net->data.direct.mode == VIR_DOMAIN_NETDEV_MACVTAP_MODE_PASSTHRU ) { + rc = get_macaddr(&old_macaddr, 6, net->data.direct.linkdev); + if (rc) { + virReportSystemError(rc, + _("Getting MAC address from '%s' " + "to '%02x:%02x:%02x:%02x:%02x:%02x' failed."), + net->data.direct.linkdev, + old_macaddr[0],old_macaddr[1],old_macaddr[2], + old_macaddr[3],old_macaddr[4],old_macaddr[5]); + } else { + char oldmacname[256], newmacname[256]; + + sprintf(oldmacname,"%02x:%02x:%02x:%02x:%02x:%02x", + old_macaddr[0],old_macaddr[1],old_macaddr[2], + old_macaddr[3],old_macaddr[4],old_macaddr[5]); + + sprintf(newmacname,"/tmp/%s@%02x:%02x:%02x:%02x:%02x:%02x", + net->data.direct.linkdev, + net->mac[0],net->mac[1],net->mac[2], + net->mac[3],net->mac[4],net->mac[5]); + + rc = symlink (oldmacname, newmacname); + if (rc) { + virReportSystemError(rc, + _("MAC link file creation failed for %s."), + net->data.direct.linkdev); + } + } + + rc = set_macaddr(net->mac, 6, net->data.direct.linkdev); + if (rc) { + virReportSystemError(rc, + _("Setting MAC address on '%s' to " + "'%02x:%02x:%02x:%02x:%02x:%02x' failed."), + net->data.direct.linkdev, + net->mac[0],net->mac[1],net->mac[2], + net->mac[3],net->mac[4],net->mac[5]); + } + } + rc = openMacvtapTap(net->ifname, net->mac, net- >data.direct.linkdev, net->data.direct.mode, vnet_hdr, def->uuid, &net->data.direct.virtPortProfile, &res_ifname, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1efe024..127acb8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2663,6 +2663,51 @@ void qemuProcessStop(struct qemud_driver *driver, if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { delMacvtap(net->ifname, net->mac, net- >data.direct.linkdev, &net->data.direct.virtPortProfile); + + if ( net->data.direct.mode == VIR_DOMAIN_NETDEV_MACVTAP_MODE_PASSTHRU ) { + char newmacname[256], linkdata[64]; + unsigned int old_macaddr[6]; + + sprintf(newmacname,"/tmp/%s@%02x:%02x:%02x:%02x:%02x: %02x", + net->data.direct.linkdev, + net->mac[0],net->mac[1],net->mac[2], + net->mac[3],net->mac[4],net->mac[5]); + + ret = readlink (newmacname, linkdata, 64); + if ( ret == 17 ) { + linkdata[17] = 0; + + ret = sscanf(linkdata,"%x:%x:%x:%x:%x:%x", + &old_macaddr[0],&old_macaddr[1],&old_macaddr[2], + &old_macaddr[3],&old_macaddr[4],&old_macaddr[5]); + if ( ret == 6 ) { + unsigned char oldmac[6]; + oldmac[0] = (unsigned char)(old_macaddr[0] & 0xFF) ; + oldmac[1] = (unsigned char)(old_macaddr[1] & 0xFF) ; + oldmac[2] = (unsigned char)(old_macaddr[2] & 0xFF) ; + oldmac[3] = (unsigned char)(old_macaddr[3] & 0xFF) ; + oldmac[4] = (unsigned char)(old_macaddr[4] & 0xFF) ; + oldmac[5] = (unsigned char)(old_macaddr[5] & 0xFF) ; + + VIR_WARN(("Resetting MAC address on '%s' " + "to '%02x:%02x:%02x:%02x:%02x: %02x'."), + net->data.direct.linkdev, + oldmac[0],oldmac[1],oldmac[2], + oldmac[3],oldmac[4],oldmac[5]); + /*reset mac and remove link file-ignore restults*/ + ret = set_macaddr(oldmac, 6, net- >data.direct.linkdev); + ret = unlink(newmacname); + } else { + VIR_WARN(("Scanning MAC address from '%s' " + "failed ! Got %i values."), + linkdata, ret); + } + } else { + VIR_WARN(("Reading MAC address from '%s' failed ! " + "Got %i bytes."), + newmacname, ret); + } + } VIR_FREE(net->ifname); } } diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 068638e..1026a84 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -191,6 +191,155 @@ err_exit: # if WITH_MACVTAP +/** + * get_macaddr: + * Get the MAC address of a network device + * + * @macaddress: Pointer where the MAC address will be stored + * @macaddrsize: Size of the MAC address. + * @srcdev: The interface name of the NIC to get the MAC from + * + * Returns zero in case of success, + * negative value otherwise with error reported. + * + */ +int +get_macaddr(const unsigned char *macaddress, int macaddrsize, + const char *srcdev ) +{ + int sockfd; + int io; + char buffer[1024]; + struct ifreq ifr; + + strcpy(ifr.ifr_name, srcdev); + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if(sockfd < 0){ + return -1; + } + + io = ioctl(sockfd, SIOCGIFHWADDR, (char *)&ifr); + if(io < 0){ + return -1; + } + + bcopy( ifr.ifr_ifru.ifru_hwaddr.sa_data, macaddress, macaddrsize); + + return 0; +} + +/** + * Set_macaddr: + * Set the MAC address of a network device + * + * @macaddress: MAC address to assign to the NIC + * @macaddrsize: Size of the MAC address. + * @srcdev: The interface name of the NIC + * + * Returns zero in case of success, + * negative value otherwise with error reported. + * + */ +int +set_macaddr(const unsigned char *macaddress, int macaddrsize, + const char *srcdev ) +{ + int rc = 0; + struct nlmsghdr *resp; + struct nlmsgerr *err; + struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; + int ifindex; + unsigned char *recvbuf = NULL; + unsigned int recvbuflen; + struct nl_msg *nl_msg; + struct nlattr *linkinfo; + + if (ifaceGetIndex(true, srcdev, &ifindex) != 0) + return -1; + + nl_msg = nlmsg_alloc_simple(RTM_SETLINK, NLM_F_REQUEST); + + if (!nl_msg) { + virReportOOMError(); + return -1; + } + + if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (nla_put_u32(nl_msg, IFLA_LINK, ifindex) < 0) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_ADDRESS, macaddrsize, macaddress) < 0) + goto buffer_too_small; + + if (srcdev && + nla_put(nl_msg, IFLA_IFNAME, strlen(srcdev)+1, srcdev) < 0) + goto buffer_too_small; + + if (nlComm(nl_msg, &recvbuf, &recvbuflen, 0) < 0) { + rc = -1; + goto err_exit; + } + + if (recvbuflen < NLMSG_LENGTH(0) || recvbuf == NULL) + goto malformed_resp; + + resp = (struct nlmsghdr *)recvbuf; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + switch (err->error) { + + case 0: + break; + + case -EEXIST: + rc = -1; + break; + + default: + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("error setting device mac address")); + rc = -1; + } + break; + + case NLMSG_DONE: + break; + + default: + goto malformed_resp; + } + +err_exit: + nlmsg_free(nl_msg); + + VIR_FREE(recvbuf); + + return rc; + +malformed_resp: + nlmsg_free(nl_msg); + + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + VIR_FREE(recvbuf); + return -1; + +buffer_too_small: + nlmsg_free(nl_msg); + + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + static int link_add(const char *type, const unsigned char *macaddress, int macaddrsize, diff --git a/src/util/macvtap.h b/src/util/macvtap.h index a1383c4..d71546a 100644 --- a/src/util/macvtap.h +++ b/src/util/macvtap.h @@ -75,6 +75,12 @@ enum virVMOperationType { # include "internal.h" +int get_macaddr(const unsigned char *macaddress, int macaddrsize, + const char *srcdev ); + +int set_macaddr(const unsigned char *macaddress, int macaddrsize, + const char *srcdev ); + int openMacvtapTap(const char *ifname, const unsigned char *macaddress, const char *linkdev,

2 1

[libvirt] [PATCH] virt-aa-helper: add missing include
by Eric Blake 08 Jun '11

08 Jun '11

Regression introduced in commit 02e8691. * src/security/virt-aa-helper.c (includes): Reflect move of virRun. --- Pushing under the build-breaker rule, for Ubuntu. src/security/virt-aa-helper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 41ba4a3..afc0d33 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -31,6 +31,7 @@ #include "buf.h" #include "util.h" #include "memory.h" +#include "command.h" #include "security_driver.h" #include "security_apparmor.h" -- 1.7.4.4

1 0

[libvirt] [libvirt-php][PATCH] screenshot of remote host is available
by warp.kawada＠gmail.com 08 Jun '11

08 Jun '11

screenshot of remote host is available. get_domain_object make so many error to message log, so you had better not use . diff --git a/examples/libvirt.php b/examples/libvirt.php index 1ca71b6..bf903f6 100644 --- a/examples/libvirt.php +++ b/examples/libvirt.php @@ -29,9 +29,9 @@ } function domain_get_screenshot($domain) { - $dom = $this->get_domain_object($domain); - - $tmp = libvirt_domain_get_screenshot($dom); + $dom = libvirt_domain_lookup_by_uuid_string($this->conn, $domain); + $hostname = $this->get_hostname(); + $tmp = libvirt_domain_get_screenshot($dom, $hostname); return ($tmp) ? $tmp : $this->_set_last_error(); } diff --git a/src/libvirt-php.cb/src/libvirt-php.c index 87e0467..4a53e33 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -1880,6 +1880,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) int port = -1; int scancode = 10; char *path; + char *hostname; path = get_feature_binary("screenshot"); if (access(path, X_OK) != 0) { @@ -1887,7 +1888,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) RETURN_FALSE; } - GET_DOMAIN_FROM_ARGS("r|l",&zdomain, &scancode); + GET_DOMAIN_FROM_ARGS("rs|l",&zdomain, &hostname, &scancode); xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { @@ -1912,10 +1913,16 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) RETURN_FALSE; if (childpid == 0) { + char *prm = NULL; char tmpp[8] = { 0 }; - + snprintf(tmpp, sizeof(tmpp), ":%d", port); - retval = execlp(path, basename(path), tmpp, file, NULL); + prm = emalloc((sizeof(tmpp) + sizeof(hostname)) * sizeof(char)); + sprintf(prm, "%s%s", hostname, tmpp); + + retval = execlp(path, basename(path), prm, file, NULL); + + free(prm); _exit( retval ); } else {

3 3

[libvirt] [libvirt-php] Work on ./example
by David Streibl 08 Jun '11

08 Jun '11

Hello, as part of my student project I am working on simple web interface which would support multiple virtualisation platforms. This of course led me to libvirt and libvirt-php more specificly. Right now I'm using modfied code of exapme Libvirt class and the plan is: - add phpdoc - refactor it to match libvirt convetion (get_domain_someting -> dmain_get_something) - split Libvirt to subclasses for domain, connection, network, storage (not completly sure if it is good idea) - add few unit tests (dont know about time and usefulness of this) Would it be welcomed if I send to whole think or even parts of it as patches to libvirt-php/example? Thanks for any reply and sorry for my english, David

2 1

[libvirt] [PATCH] build: Fix typos in configure.ac
by Osier Yang 08 Jun '11

08 Jun '11

--- configure.ac | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5307a1d..7982e21 100644 --- a/configure.ac +++ b/configure.ac @@ -1705,9 +1705,9 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then AC_DEFINE_UNQUOTED([PVCREATE],["$PVCREATE"],[Location of pvcreate program]) AC_DEFINE_UNQUOTED([VGCREATE],["$VGCREATE"],[Location of vgcreate program]) AC_DEFINE_UNQUOTED([LVCREATE],["$LVCREATE"],[Location of lvcreate program]) - AC_DEFINE_UNQUOTED([PVREMOVE],["$PVREMOVE"],[Location of pvcreate program]) - AC_DEFINE_UNQUOTED([VGREMOVE],["$VGREMOVE"],[Location of vgcreate program]) - AC_DEFINE_UNQUOTED([LVREMOVE],["$LVREMOVE"],[Location of lvcreate program]) + AC_DEFINE_UNQUOTED([PVREMOVE],["$PVREMOVE"],[Location of pvremove program]) + AC_DEFINE_UNQUOTED([VGREMOVE],["$VGREMOVE"],[Location of vgremove program]) + AC_DEFINE_UNQUOTED([LVREMOVE],["$LVREMOVE"],[Location of lvremove program]) AC_DEFINE_UNQUOTED([VGCHANGE],["$VGCHANGE"],[Location of vgchange program]) AC_DEFINE_UNQUOTED([VGSCAN],["$VGSCAN"],[Location of vgscan program]) AC_DEFINE_UNQUOTED([PVS],["$PVS"],[Location of pvs program]) -- 1.7.4

1 1

[libvirt] [PATCH] virsh: Expose virDomainMigrateSetMaxSpeed API to virsh
by Osier Yang 08 Jun '11

08 Jun '11

API virDomainMigrateSetMaxSpeed was introduced since 0.9.0, but no command in virsh yet. --- tools/virsh.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 5 +++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d98be1c..ab83ba9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4301,6 +4301,50 @@ done: } /* + * "migrate-setspeed" command + */ +static const vshCmdInfo info_migrate_setspeed[] = { + {"help", N_("Set the maximum migration bandwidth")}, + {"desc", N_("Set the maximum migration bandwidth (in Mbps) for a domain " + "which is being migrated to another host.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_migrate_setspeed[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"bandwidth", VSH_OT_INT, VSH_OFLAG_REQ, N_("migration bandwidth limit in Mbps")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + unsigned long bandwidth = 0; + bool ret = false; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptUL(cmd, "bandwidth", &bandwidth) < 0) { + vshError(ctl, "%s", _("migrate: Invalid bandwidth")); + goto done; + } + + if (virDomainMigrateSetMaxSpeed(dom, bandwidth, 0) < 0) + goto done; + + ret = true; + +done: + virDomainFree(dom); + return ret; +} + +/* * "net-autostart" command */ static const vshCmdInfo info_network_autostart[] = { @@ -11080,6 +11124,8 @@ static const vshCmdDef domManagementCmds[] = { {"migrate", cmdMigrate, opts_migrate, info_migrate, 0}, {"migrate-setmaxdowntime", cmdMigrateSetMaxDowntime, opts_migrate_setmaxdowntime, info_migrate_setmaxdowntime, 0}, + {"migrate-setspeed", cmdMigrateSetMaxSpeed, + opts_migrate_setspeed, info_migrate_setspeed, 0}, {"reboot", cmdReboot, opts_reboot, info_reboot, 0}, {"restore", cmdRestore, opts_restore, info_restore, 0}, {"resume", cmdResume, opts_resume, info_resume, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index 7ed3003..98adc90 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -542,6 +542,11 @@ Set maximum tolerable downtime for a domain which is being live-migrated to another host. The I<downtime> is a number of milliseconds the guest is allowed to be down at the end of live migration. +=item B<migrate-setspeed> I<domain-id> I<bandwidth> + +Set the maximum migration bandwidth (in Mbps) for a domain which is being +migrated to another host. + =item B<reboot> I<domain-id> Reboot a domain. This acts just as if the domain had the B<reboot> -- 1.7.4

2 2

Re: [libvirt] [Qemu-devel] [PATCH 6/9] net: Improve layout of 'info network'
by Anthony Liguori 07 Jun '11

07 Jun '11

On 06/07/2011 11:45 AM, Jan Kiszka wrote: > Improve the layout when listing non-vlan clients via 'info network'. The > result looks like this: > > (qemu) info network > Devices not on any VLAN: > orphan: net=10.0.2.0, restricted=n > virtio-net-pci.0: model=virtio-net-pci,macaddr=52:54:00:12:34:56 > \ network2: fd=5 > e1000.0: model=e1000,macaddr=52:54:00:12:34:57 > \ network1: net=10.0.2.0, restricted=n > rtl8139.0: model=rtl8139,macaddr=52:54:00:12:34:58 > > ie. peers are grouped, orphans are listed as before. > > CC: Markus Armbruster<armbru(a)redhat.com> > Signed-off-by: Jan Kiszka<jan.kiszka(a)siemens.com> There isn't a query-network yet in QMP so libvirt is probably still using the HMP version. Can someone on the libvirt side Ack/Nack about whether this patch will break libvirt? Regards, Anthony Liguori > --- > net.c | 14 +++++++++----- > 1 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/net.c b/net.c > index 4f777c3..606ce70 100644 > --- a/net.c > +++ b/net.c > @@ -1224,7 +1224,8 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) > void do_info_network(Monitor *mon) > { > VLANState *vlan; > - VLANClientState *vc; > + VLANClientState *vc, *peer; > + net_client_type type; > > QTAILQ_FOREACH(vlan,&vlans, next) { > monitor_printf(mon, "VLAN %d devices:\n", vlan->id); > @@ -1235,11 +1236,14 @@ void do_info_network(Monitor *mon) > } > monitor_printf(mon, "Devices not on any VLAN:\n"); > QTAILQ_FOREACH(vc,&non_vlan_clients, next) { > - monitor_printf(mon, " %s: %s", vc->name, vc->info_str); > - if (vc->peer) { > - monitor_printf(mon, " peer=%s", vc->peer->name); > + peer = vc->peer; > + type = vc->info->type; > + if (!peer || type == NET_CLIENT_TYPE_NIC) { > + monitor_printf(mon, " %s: %s\n", vc->name, vc->info_str); > + } > + if (peer&& type == NET_CLIENT_TYPE_NIC) { > + monitor_printf(mon, " \\ %s: %s\n", peer->name, peer->info_str); > } > - monitor_printf(mon, "\n"); > } > } >

2 1

[libvirt] [PATCH 0/7] lxc: Improve container startup error reporting
by Cole Robinson 07 Jun '11

07 Jun '11

Currently most LXC container startup failures result in a reported success followed immediately by a guest shutoff. This patch series tries to improve the situation by adding a basic handshake from driver<->controller and controller<->container. If the handshake fails, the driver will return the output from the guest logfile, similar to how we do for qemu guests. A few additional error reporting improvements are also included. Cole Robinson (7): lxc: Drop container stdio as late as possible lxc: Don't report error in Wait/SendContinue lxc: Refactor controller command building lxc: Improve guest startup error reporting lxc: controller: Improve container error reporting lxc: Verify root fs exists before mounting lxc: Ensure container <init> actually exists src/lxc/lxc_container.c | 67 +++++++++++------- src/lxc/lxc_container.h | 2 + src/lxc/lxc_controller.c | 63 ++++++++++++++++- src/lxc/lxc_driver.c | 173 +++++++++++++++++++++++++++++++++++++--------- 4 files changed, 243 insertions(+), 62 deletions(-) -- 1.7.4.4

2 15

[libvirt] [PATCH 0/4 v3] More virCommand conversions and cleanups
by Cole Robinson 07 Jun '11

07 Jun '11

The following series converts the last user of virExec to use virCommand. The remaining functionality is then moved out of util.c and into command.c v2: Committed some patches Dropped final patch, can be submitted seperately Addressed Eric's comments v3: Commited some patches Addressed Eric's v2 comments Cole Robinson (4): qemu: Convert virExec usage to virCommand util: Remove unused virExec wrapper util: Implement virRun as a wrapper around virCommand Move virRun, virExec*, virFork to util/command cfg.mk | 3 +- src/libvirt_private.syms | 6 +- src/lxc/veth.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 1 + src/qemu/qemu_driver.c | 26 +- src/qemu/qemu_process.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/util/command.c | 565 ++++++++++++++++++++++++- src/util/command.h | 14 + src/util/ebtables.c | 2 +- src/util/pci.c | 2 +- src/util/util.c | 661 +---------------------------- src/util/util.h | 32 -- src/vmware/vmware_driver.c | 1 + 15 files changed, 608 insertions(+), 713 deletions(-) -- 1.7.4.4

2 10

[libvirt] [PATCH] Fix allocation of veth's to not skip an index
by Daniel P. Berrange 07 Jun '11

07 Jun '11

The algorithm for autoassigning vethXXX devices, was always skipping over the starting dev index when finding a free name for the guest device. This should only be done if the host device was autoallocated. * src/lxc/veth.c: Don't skip over veth indexes --- src/lxc/veth.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lxc/veth.c b/src/lxc/veth.c index a00aa23..22dbed5 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -46,6 +46,7 @@ static int getFreeVethName(char **veth, int startDev) int devNum = startDev-1; char *path = NULL; + VIR_DEBUG("Find free from veth%d", startDev); do { VIR_FREE(path); ++devNum; @@ -53,6 +54,7 @@ static int getFreeVethName(char **veth, int startDev) virReportOOMError(); return -1; } + VIR_DEBUG("Probe %s", path); } while (virFileExists(path)); VIR_FREE(path); @@ -60,6 +62,7 @@ static int getFreeVethName(char **veth, int startDev) virReportOOMError(); return -1; } + return devNum; } @@ -98,18 +101,19 @@ int vethCreate(char** veth1, char** veth2) bool veth1_alloc = false; bool veth2_alloc = false; - VIR_DEBUG("veth1: %s veth2: %s", NULLSTR(*veth1), NULLSTR(*veth2)); + VIR_DEBUG("Host: %s guest: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { if ((vethDev = getFreeVethName(veth1, vethDev)) < 0) goto cleanup; - VIR_DEBUG("Assigned veth1: %s", *veth1); + VIR_DEBUG("Assigned host: %s", *veth1); veth1_alloc = true; + vethDev++; } argv[3] = *veth1; while (*veth2 == NULL) { - if ((vethDev = getFreeVethName(veth2, vethDev + 1)) < 0) { + if ((vethDev = getFreeVethName(veth2, vethDev)) < 0) { if (veth1_alloc) VIR_FREE(*veth1); goto cleanup; @@ -122,12 +126,12 @@ int vethCreate(char** veth1, char** veth2) continue; } - VIR_DEBUG("Assigned veth2: %s", *veth2); + VIR_DEBUG("Assigned guest: %s", *veth2); veth2_alloc = true; } argv[8] = *veth2; - VIR_DEBUG("veth1: %s veth2: %s", *veth1, *veth2); + VIR_DEBUG("Create Host: %s guest: %s", *veth1, *veth2); if (virRun(argv, NULL) < 0) { if (veth1_alloc) VIR_FREE(*veth1); -- 1.7.4.4

2 1

[libvirt] [PATCH] esx: Remove duplicated invalid-argument checks
by Matthias Bolte 07 Jun '11

07 Jun '11

Those checks are already performed at the public API level. --- src/esx/esx_driver.c | 10 ---------- src/esx/esx_storage_driver.c | 5 ----- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 500dc52..a5b96a9 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1479,11 +1479,6 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) esxVI_VirtualMachinePowerState powerState; int count = 0; - if (ids == NULL || maxids < 0) { - ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); - return -1; - } - if (maxids == 0) { return 0; } @@ -2895,11 +2890,6 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) int count = 0; int i; - if (names == NULL || maxnames < 0) { - ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); - return -1; - } - if (maxnames == 0) { return 0; } diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 6461917..c7fc992 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -167,11 +167,6 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) int count = 0; int i; - if (names == NULL || maxnames < 0) { - ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); - return -1; - } - if (maxnames == 0) { return 0; } -- 1.7.0.4

2 2

[libvirt] vcpupin: fix cpu affinity setting bug of qemu driver
by Taku Izumi 07 Jun '11

07 Jun '11

There is the case where cpu affinites for vcpu of qemu doesn't work correctly. For example, if only one vcpupin setting entry is provided and its setting is not for vcpu0, it doesn't work. # virsh dumpxml VM ... <vcpu>4</vcpu> <cputune> <vcpupin vcpu='3' cpuset='9-11'/> </cputune> ... # virsh start VM Domain VM started # virsh vcpuinfo VM VCPU: 0 CPU: 31 State: running CPU time: 2.5s CPU Affinity: yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy VCPU: 1 CPU: 12 State: running CPU time: 0.9s CPU Affinity: yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy VCPU: 2 CPU: 30 State: running CPU time: 1.5s CPU Affinity: yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy VCPU: 3 CPU: 13 State: running CPU time: 1.7s CPU Affinity: yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy This patch fixes this problem. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- src/qemu/qemu_process.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) Index: libvirt/src/qemu/qemu_process.c =================================================================== --- libvirt.orig/src/qemu/qemu_process.c +++ libvirt/src/qemu/qemu_process.c @@ -1194,7 +1194,7 @@ qemuProcessSetVcpuAffinites(virConnectPt virNodeInfo nodeinfo; pid_t vcpupid; unsigned char *cpumask; - int vcpu, cpumaplen, hostcpus, maxcpu; + int vcpu, cpumaplen, hostcpus, maxcpu, n; unsigned char *cpumap = NULL; int ret = -1; @@ -1223,14 +1223,12 @@ qemuProcessSetVcpuAffinites(virConnectPt return -1; } - for (vcpu = 0; vcpu < def->cputune.nvcpupin; vcpu++) { - if (vcpu != def->cputune.vcpupin[vcpu]->vcpuid) - continue; - + for (n = 0; n < def->cputune.nvcpupin; n++) { int i; + vcpu = def->cputune.vcpupin[n]->vcpuid; memset(cpumap, 0, cpumaplen); - cpumask = (unsigned char *)def->cputune.vcpupin[vcpu]->cpumask; + cpumask = (unsigned char *)def->cputune.vcpupin[n]->cpumask; vcpupid = priv->vcpupids[vcpu]; /* Convert cpumask to bitmap here. */

2 1

[libvirt] USB 2.0 support in qemu
by Gerd Hoffmann 07 Jun '11

07 Jun '11

Hi, Recently USB 2.0 support was merged into upstream qemu, I guess libvirt and virt-manager needs some bits to support this ... The docs/usb2.txt file in the qemu source tree carries some information on how to use it, and also some hints for USB pass-through. The most recent version (not yet merged upstream) can be found here: http://www.kraxel.org/cgit/qemu/tree/docs/usb2.txt?h=usb.15 If there are any questions feel free to ask. cheers, Gerd

2 1

[libvirt] [PATCH] docs: Add doc for video element
by Osier Yang 07 Jun '11

07 Jun '11

For backwards compatability, if no <video> is set but there is a <graphics> tag, then we add a default <video> according to the guest type. Add docs to tell the user about this to not make them confused. Especially if they remove the video (such as via "virsh edit"), it will be surprised for them to see the video element is still in domain XML. --- docs/formatdomain.html.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8baffd..455f4dd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1868,7 +1868,12 @@ qemu-kvm -net nic,model=? /dev/null <dt><code>video</code></dt> <dd> The <code>video</code> element is the a container for describing - video devices. + video devices. NB, for backwards compatability, if no <code>video</code> + is set but there is a <code>graphics</code> in domain xml, then libvirt + will add a default <code>video</code> according to the guest type, e.g. + For a guest of type "kvm", the default <code>video</code> for it is: + <code>type</code> with value "cirrus", <code>vram</code> with value "9216", + and <code>heads</code> with value "1". </dd> <dt><code>model</code></dt> -- 1.7.4

2 5

[libvirt] [PATCH] Avoid virGetVersion failure on specific driver support configurations
by Matthias Bolte 07 Jun '11

07 Jun '11

virGetVersion itself doesn't take a virConnectPtr, but in order to obtain the hypervisor version against which libvirt was compiled it is used in combination with virConnectGetType like this: hvType = virConnectGetType(conn) virGetVersion(&libVer, hvType, &typeVer) When virConnectGetType is called on a remote connection then the remote driver returns the type of the underlying driver on the server side, for example QEMU. Then virGetVersion compares hvType to a set of strings that depend on configure options and returns LIBVIR_VERSION_NUMBER in most cases. Now this fails in case libvirt on the client side is just compiled with the remote driver enabled only and the server side has the actual driver such as the QEMU driver. It just happens to work when the actual driver is enabled on client and server side. But that's not always true. I noticed this on FreeBSD: freebsd# virsh -c qemu+tcp://192.168.178.22/system version Compiled against library: libvir 0.9.2 error: failed to get the library version error: this function is not supported by the connection driver: virGetVersion This is not FreeBSD specific, happens on Windows as well due to the similar driver support configuration. The problem is that virConnectGetType returns QEMU, but virGetVersion on the client side only accepts Remote as hvType due to all other drivers being disabled on the client side. Daniel P. Berrange suggested to get rid of all the conditional code in virGetVersion, ignoring the hvType and always setting typeVer to LIBVIR_VERSION_NUMBER. virConnectGetVersion is supposed to be used to obtain the hypervisor version. --- src/libvirt.c | 86 ++++++-------------------------------------------------- 1 files changed, 10 insertions(+), 76 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index cbe1926..5a96625 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -894,21 +894,24 @@ int virStateActive(void) { /** * virGetVersion: * @libVer: return value for the library version (OUT) - * @type: the type of connection/driver looked at, if @typeVer is not NULL + * @type: the type of the connection driver, ignored, just pass NULL * @typeVer: optional return value for the version of the hypervisor (OUT) * * Provides information on up to two versions: @libVer is the version of the * library and will always be set unless an error occurs, in which case an - * error code will be returned. If @typeVer is not NULL it will be set to the - * version of the hypervisor @type against which the library was compiled. - * If @type is NULL, "Xen" is assumed, if @type is unknown or not - * available, an error code will be returned and @typeVer will be 0. + * error code will be returned. If @typeVer is not NULL it should have been be + * set to the version of the hypervisor @type against which the library was + * compiled. Due to a design problem this doesn't work as intented. Therefore, + * this function is only usefull to obtain the local library version number via + * @libVer. To get the version of the running hypervisor use the + * virConnectGetVersion function instead. To get the libvirt library version + * used by a connection use the virConnectGetLibVersion instead. * * Returns -1 in case of failure, 0 otherwise, and values for @libVer and * @typeVer have the format major * 1,000,000 + minor * 1,000 + release. */ int -virGetVersion(unsigned long *libVer, const char *type, +virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, unsigned long *typeVer) { VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); @@ -921,78 +924,9 @@ virGetVersion(unsigned long *libVer, const char *type, goto error; *libVer = LIBVIR_VERSION_NUMBER; - if (typeVer != NULL) { - if (type == NULL) - type = "Xen"; - -/* FIXME: Add _proper_ type version handling for loadable driver modules... */ -#ifdef WITH_DRIVER_MODULES + if (typeVer != NULL) *typeVer = LIBVIR_VERSION_NUMBER; -#else - *typeVer = 0; -# if WITH_XEN - if (STRCASEEQ(type, "Xen")) - *typeVer = xenUnifiedVersion(); -# endif -# if WITH_TEST - if (STRCASEEQ(type, "Test")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_QEMU - if (STRCASEEQ(type, "QEMU")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_LXC - if (STRCASEEQ(type, "LXC")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_LIBXL - if (STRCASEEQ(type, "xenlight")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_PHYP - if (STRCASEEQ(type, "phyp")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_OPENVZ - if (STRCASEEQ(type, "OpenVZ")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_VMWARE - if (STRCASEEQ(type, "VMware")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_VBOX - if (STRCASEEQ(type, "VBox")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_UML - if (STRCASEEQ(type, "UML")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_ONE - if (STRCASEEQ(type, "ONE")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_ESX - if (STRCASEEQ(type, "ESX")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_XENAPI - if (STRCASEEQ(type, "XenAPI")) - *typeVer = LIBVIR_VERSION_NUMBER; -# endif -# if WITH_REMOTE - if (STRCASEEQ(type, "Remote")) - *typeVer = remoteVersion(); -# endif - if (*typeVer == 0) { - virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); - goto error; - } -#endif /* WITH_DRIVER_MODULES */ - } return 0; error: -- 1.7.0.4

2 2

[libvirt] [PATCH v2 0/3] add support for changing blkio parameters for inactive domains
by Hu Tao 07 Jun '11

07 Jun '11

This series enables user to change blkio parameters for inactive domains from virsh command line. CHANGES: v1-v2: - unify PARAM_CONFIG/PARAM_LIVE/PARAM_CURRENT Hu Tao (3): unify PARAM_CURRENT/PARAM_LIVE/PARAM_CONFIG flags update qemuDomainGetBlkioParameters to use flags Update qemuDomainSetBlkioParameters to use flags include/libvirt/libvirt.h.in | 58 ++---- src/esx/esx_driver.c | 10 +- src/libvirt.c | 4 +- src/openvz/openvz_driver.c | 10 +- src/qemu/qemu_driver.c | 442 ++++++++++++++++++++++++++---------------- src/test/test_driver.c | 42 ++-- src/uml/uml_driver.c | 4 +- src/vbox/vbox_tmpl.c | 22 +- tools/virsh.c | 74 ++++---- 9 files changed, 371 insertions(+), 295 deletions(-) -- 1.7.3.1

3 9

[libvirt] [PATCH v2] graphics: add support for action_if_connected in qemu
by Michal Prívozník 06 Jun '11

06 Jun '11

From: Michal Privoznik <mprivozn(a)redhat.com> This option accepts 3 values: -keep, to keep current client connected (Spice+VNC) -disconnect, to disconnect client (Spice) -fail, to fail setting password if there is a client connected (Spice) --- diff to v1: -Eric's review suggestions included -update 'Since' docs/formatdomain.html.in | 13 +++++++++++-- docs/schemas/domain.rng | 16 ++++++++++++++++ src/conf/domain_conf.c | 44 +++++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_hotplug.c | 15 ++++++++++++--- 6 files changed, 93 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 225e0c8..5dd54ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1801,7 +1801,11 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. VNC accepts <code>keep</code> value only. + since 0.9.3 + NB, this may not be supported by all hypervisors. Rather than using listen/port, QEMU supports a <code>socket</code> attribute for listening on a unix domain socket path. @@ -1820,7 +1824,12 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. SPICE accepts <code>keep</code> to keep client + connected, <code>disconnect</code> to disconnect client and + <code>fail</code> to fail changing password. Since 0.9.3 + NB, this may not be supported by all hypervisors. "spice" since 0.8.6. diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 0be0371..e71b683 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1250,6 +1250,13 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>keep</value> + </choice> + </attribute> + </optional> </group> <group> <attribute name="type"> @@ -1293,6 +1300,15 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>fail</value> + <value>disconnect</value> + <value>keep</value> + </choice> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="channel"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d9fef4..19f22e0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -311,6 +311,13 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "desktop", "spice") +VIR_ENUM_IMPL(virDomainGraphicsAuthConnected, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST, + "default", + "fail", + "disconnect", + "keep") + VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST, "main", @@ -3892,9 +3899,12 @@ error: static int -virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr def) +virDomainGraphicsAuthDefParseXML(xmlNodePtr node, + virDomainGraphicsAuthDefPtr def, + int type) { char *validTo = NULL; + char *connected = virXMLPropString(node, "connected"); def->passwd = virXMLPropString(node, "passwd"); @@ -3935,6 +3945,28 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr de def->expires = 1; } + if (connected) { + int action = virDomainGraphicsAuthConnectedTypeFromString(connected); + if (action <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown connected value %s"), + connected); + VIR_FREE(connected); + return -1; + } + VIR_FREE(connected); + + /* VNC supports connected='keep' only */ + if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + action != VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VNC supports connected='keep' only")); + return -1; + } + + def->connected = action; + } + return 0; } @@ -4004,7 +4036,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.vnc.listenAddr[0]) VIR_FREE(def->data.vnc.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, + def->type) < 0) goto error; } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *fullscreen = virXMLPropString(node, "fullscreen"); @@ -4140,7 +4173,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.spice.listenAddr[0]) VIR_FREE(def->data.spice.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth, + def->type) < 0) goto error; cur = node->children; @@ -9075,6 +9109,10 @@ virDomainGraphicsAuthDefFormatAttr(virBufferPtr buf, strftime(strbuf, sizeof(strbuf), "%Y-%m-%dT%H:%M:%S", tm); virBufferAsprintf(buf, " passwdValidTo='%s'", strbuf); } + + if (def->connected) + virBufferEscapeString(buf, " connected='%s'", + virDomainGraphicsAuthConnectedTypeToString(def->connected)); } static int diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 41c8136..6bfc337 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -640,12 +640,22 @@ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_LAST, }; +enum virDomainGraphicsAuthConnectedType { + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DEFAULT = 0, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DISCONNECT, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP, + + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST +}; + typedef struct _virDomainGraphicsAuthDef virDomainGraphicsAuthDef; typedef virDomainGraphicsAuthDef *virDomainGraphicsAuthDefPtr; struct _virDomainGraphicsAuthDef { char *passwd; unsigned int expires: 1; /* Whether there is an expiry time set */ time_t validTo; /* seconds since epoch */ + int connected; /* action if connected */ }; enum virDomainGraphicsSpiceChannelName { @@ -1546,6 +1556,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) +VIR_ENUM_DECL(virDomainGraphicsAuthConnected) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e6ab870..c3ce412 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -267,6 +267,8 @@ virDomainFindByID; virDomainFindByName; virDomainFindByUUID; virDomainGetRootFilesystem; +virDomainGraphicsAuthConnectedTypeFromString; +virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fe47896..ead2cfc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1059,10 +1059,12 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, return -1; } - /* If a password lifetime was, or is set, then we must always run, - * even if new password matches old password */ + /* If a password lifetime was, or is set, or action if connected has + * changed, then we must always run, even if new password matches + * old password */ if (olddev->data.vnc.auth.expires || dev->data.vnc.auth.expires || + olddev->data.vnc.auth.connected != dev->data.vnc.auth.connected || STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd, dev->data.vnc.auth.passwd)) { VIR_DEBUG("Updating password on VNC server %p %p", dev->data.vnc.auth.passwd, driver->vncPassword); ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_VNC, @@ -1074,6 +1076,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.vnc.auth.passwd = NULL; olddev->data.vnc.auth.validTo = dev->data.vnc.auth.validTo; olddev->data.vnc.auth.expires = dev->data.vnc.auth.expires; + olddev->data.vnc.auth.connected = dev->data.vnc.auth.connected; } else { ret = 0; } @@ -1102,6 +1105,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, * even if new password matches old password */ if (olddev->data.spice.auth.expires || dev->data.spice.auth.expires || + olddev->data.spice.auth.connected != dev->data.spice.auth.connected || STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", dev->data.spice.auth.passwd, driver->spicePassword); ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, @@ -1113,6 +1117,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.spice.auth.passwd = NULL; olddev->data.spice.auth.validTo = dev->data.spice.auth.validTo; olddev->data.spice.auth.expires = dev->data.spice.auth.expires; + olddev->data.spice.auth.connected = dev->data.spice.auth.connected; } else { VIR_DEBUG("Not updating since password didn't change"); ret = 0; @@ -1797,16 +1802,20 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; time_t now = time(NULL); char expire_time [64]; + const char *connected; int ret; if (!auth->passwd && !driver->vncPassword) return 0; + if (auth->connected) + connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected)l + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetPassword(priv->mon, type, auth->passwd ? auth->passwd : defaultPasswd, - NULL); + connected); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { -- 1.7.5.rc3

2 1

[libvirt] (how much) support for kqemu domain
by John Lumby 06 Jun '11

06 Jun '11

I am wondering about the extent to which "old" qemu-0.11.1 and kqemu-1.4.0 are supported by virt-manager. I see I can specify --virt-type=kqemu on virt-install and it remembers domain type='kqemu', and does things such as refusing to start the vm if the kqemu kernel mod not loaded, but it seems it does not tack on the -enable-kqemu -kernel-kqemu options on to the qemu command line. There is really not much point in trying to start a qemu-based vm with neither hardware kvm nor kqemu ... I can work around it with an override script to intercept the qemu command, but does anyone think virt-manager ought to do this for me? John Lumby _________________________________________________________________

3 6

[libvirt] [PATCH] virsh: Add daemon version reporting
by Michal Prívozník 06 Jun '11

06 Jun '11

From: Michal Privoznik <mprivozn(a)redhat.com> 'virsh version' might report against which version of libvirtd is running. --- tools/virsh.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d98be1c..d3c3ce3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8620,6 +8620,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) unsigned long libVersion; unsigned long includeVersion; unsigned long apiVersion; + unsigned long daemonVersion; int ret; unsigned int major; unsigned int minor; @@ -8678,6 +8679,19 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, _("Running hypervisor: %s %d.%d.%d\n"), hvType, major, minor, rel); } + + ret = virConnectGetLibVersion(ctl->conn, &daemonVersion); + if (ret < 0) { + vshError(ctl, "%s", _("failed to get the daemon version")); + return false; + } + major = daemonVersion / 1000000; + daemonVersion %= 1000000; + minor = daemonVersion / 1000; + rel = daemonVersion % 1000; + vshPrint(ctl, _("Running against daemon: %d.%d.%d\n"), + major, minor, rel); + return true; } -- 1.7.5.rc3

3 2

[libvirt] [PATCH] docs: Make hvsupport.pl pick up the host device drivers
by Matthias Bolte 06 Jun '11

06 Jun '11

Annotate the ESX device driver dummy. Refactor the udev and hal device driver strcuts to match the common annotation pattern. --- This is post-0.9.2. docs/hvsupport.pl | 22 +++++++++++++---- src/esx/esx_device_monitor.c | 15 ++--------- src/node_device/node_device_driver.c | 45 +++++++++++++--------------------- src/node_device/node_device_driver.h | 14 +++++++++- src/node_device/node_device_hal.c | 22 +++++++++++----- src/node_device/node_device_udev.c | 22 +++++++++++----- 6 files changed, 79 insertions(+), 61 deletions(-) diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 8a0fa7a..b0d1f0f 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -27,7 +27,7 @@ my %groupheaders = ( my @srcs; find({ wanted => sub { - if (m!$srcdir/.*/\w+_(driver|tmpl)\.c$!) { + if (m!$srcdir/.*/\w+_(driver|tmpl|monitor|hal|udev)\.c$!) { push @srcs, $_ if $_ !~ /vbox_driver\.c/; } }, no_chdir => 1}, $srcdir); @@ -142,7 +142,7 @@ open FILE, "<$drivertable" my %groups; my $ingrp; while (defined($line = <FILE>)) { - if ($line =~ /struct _(vir\w*Driver)/) { + if ($line =~ /struct _(vir\w*(?:Driver|Monitor))/) { my $grp = $1; if ($grp ne "virStateDriver" && $grp ne "virStreamDriver") { @@ -150,7 +150,7 @@ while (defined($line = <FILE>)) { $groups{$ingrp} = { apis => {}, drivers => {} }; } } elsif ($ingrp) { - if ($line =~ /^\s*virDrv(\w+)\s+(\w+);\s*$/) { + if ($line =~ /^\s*vir(?:Drv|DevMon)(\w+)\s+(\w+);\s*$/) { my $field = $2; my $name = $1; @@ -159,6 +159,8 @@ while (defined($line = <FILE>)) { $api = "vir$name"; } elsif (exists $apis{"virConnect$name"}) { $api = "virConnect$name"; + } elsif (exists $apis{"virNode$name"}) { + $api = "virNode$name"; } else { die "driver $name does not have a public API"; } @@ -188,7 +190,17 @@ foreach my $src (@srcs) { $line =~ /^\s*(?:static\s+)?$grp\s+NAME$\w+$\s*=\s*{/) { $ingrp = $grp; $impl = $src; - $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; + + if ($impl =~ m,.*/node_device_(\w+)\.c,) { + $impl = $1; + } else { + $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; + } + + if ($groups{$ingrp}->{drivers}->{$impl}) { + die "Group $ingrp already contains $impl"; + } + $groups{$ingrp}->{drivers}->{$impl} = {}; } } @@ -206,7 +218,7 @@ foreach my $src (@srcs) { die "Driver method for $api is NULL in $src" if $meth eq "NULL"; if (!exists($groups{$ingrp}->{apis}->{$api})) { - die "Found unexpected driver $api in $ingrp\n"; + die "Found unexpected method $api in $ingrp\n"; } $groups{$ingrp}->{drivers}->{$impl}->{$api} = $vers; diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 3fa63d5..4bc8e7f 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -66,18 +66,9 @@ esxDeviceClose(virConnectPtr conn) static virDeviceMonitor esxDeviceMonitor = { - "ESX", /* name */ - esxDeviceOpen, /* open */ - esxDeviceClose, /* close */ - NULL, /* numOfDevices */ - NULL, /* listDevices */ - NULL, /* deviceLookupByName */ - NULL, /* deviceGetXMLDesc */ - NULL, /* deviceGetParent */ - NULL, /* deviceNumOfCaps */ - NULL, /* deviceListCaps */ - NULL, /* deviceCreateXML */ - NULL, /* deviceDestroy */ + .name = "ESX", + .open = esxDeviceOpen, /* 0.7.6 */ + .close = esxDeviceClose, /* 0.7.6 */ }; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 8ec3e44..842f903 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -122,9 +122,10 @@ void nodeDeviceUnlock(virDeviceMonitorStatePtr driver) virMutexUnlock(&driver->lock); } -static int nodeNumOfDevices(virConnectPtr conn, - const char *cap, - unsigned int flags ATTRIBUTE_UNUSED) +int +nodeNumOfDevices(virConnectPtr conn, + const char *cap, + unsigned int flags ATTRIBUTE_UNUSED) { virDeviceMonitorStatePtr driver = conn->devMonPrivateData; int ndevs = 0; @@ -143,7 +144,7 @@ static int nodeNumOfDevices(virConnectPtr conn, return ndevs; } -static int +int nodeListDevices(virConnectPtr conn, const char *cap, char **const names, int maxnames, @@ -179,8 +180,8 @@ nodeListDevices(virConnectPtr conn, } -static virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, - const char *name) +virNodeDevicePtr +nodeDeviceLookupByName(virConnectPtr conn, const char *name) { virDeviceMonitorStatePtr driver = conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -251,8 +252,9 @@ out: } -static char *nodeDeviceGetXMLDesc(virNodeDevicePtr dev, - unsigned int flags ATTRIBUTE_UNUSED) +char * +nodeDeviceGetXMLDesc(virNodeDevicePtr dev, + unsigned int flags ATTRIBUTE_UNUSED) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -281,7 +283,8 @@ cleanup: } -static char *nodeDeviceGetParent(virNodeDevicePtr dev) +char * +nodeDeviceGetParent(virNodeDevicePtr dev) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -314,7 +317,8 @@ cleanup: } -static int nodeDeviceNumOfCaps(virNodeDevicePtr dev) +int +nodeDeviceNumOfCaps(virNodeDevicePtr dev) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virNodeDeviceObjPtr obj; @@ -344,7 +348,7 @@ cleanup: } -static int +int nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) { virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; @@ -538,7 +542,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) return dev; } -static virNodeDevicePtr +virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags ATTRIBUTE_UNUSED) @@ -591,7 +595,7 @@ cleanup: } -static int +int nodeDeviceDestroy(virNodeDevicePtr dev) { int ret = -1; @@ -651,21 +655,6 @@ out: return ret; } - -void registerCommonNodeFuncs(virDeviceMonitorPtr driver) -{ - driver->numOfDevices = nodeNumOfDevices; - driver->listDevices = nodeListDevices; - driver->deviceLookupByName = nodeDeviceLookupByName; - driver->deviceGetXMLDesc = nodeDeviceGetXMLDesc; - driver->deviceGetParent = nodeDeviceGetParent; - driver->deviceNumOfCaps = nodeDeviceNumOfCaps; - driver->deviceListCaps = nodeDeviceListCaps; - driver->deviceCreateXML = nodeDeviceCreateXML; - driver->deviceDestroy = nodeDeviceDestroy; -} - - int nodedevRegister(void) { #if defined(HAVE_HAL) && defined(HAVE_UDEV) /* Register only one of these two - they conflict */ diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index e583c2b..08779b1 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -53,8 +53,6 @@ int udevNodeRegister(void); void nodeDeviceLock(virDeviceMonitorStatePtr driver); void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); -void registerCommonNodeFuncs(virDeviceMonitorPtr mon); - int nodedevRegister(void); # ifdef __linux__ @@ -86,4 +84,16 @@ int read_wwn_linux(int host, const char *file, char **wwn); # endif /* __linux__ */ +int nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags); +int nodeListDevices(virConnectPtr conn, const char *cap, char **const names, + int maxnames, unsigned int flags); +virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, const char *name); +char *nodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags); +char *nodeDeviceGetParent(virNodeDevicePtr dev); +int nodeDeviceNumOfCaps(virNodeDevicePtr dev); +int nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames); +virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn, + const char *xmlDesc, unsigned int flags); +int nodeDeviceDestroy(virNodeDevicePtr dev); + #endif /* __VIR_NODE_DEVICE_H__ */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 8df2875..a90e777 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -881,22 +881,30 @@ static int halNodeDrvClose(virConnectPtr conn ATTRIBUTE_UNUSED) static virDeviceMonitor halDeviceMonitor = { .name = "halDeviceMonitor", - .open = halNodeDrvOpen, - .close = halNodeDrvClose, + .open = halNodeDrvOpen, /* 0.5.0 */ + .close = halNodeDrvClose, /* 0.5.0 */ + .numOfDevices = nodeNumOfDevices, /* 0.5.0 */ + .listDevices = nodeListDevices, /* 0.5.0 */ + .deviceLookupByName = nodeDeviceLookupByName, /* 0.5.0 */ + .deviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.5.0 */ + .deviceGetParent = nodeDeviceGetParent, /* 0.5.0 */ + .deviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.5.0 */ + .deviceListCaps = nodeDeviceListCaps, /* 0.5.0 */ + .deviceCreateXML = nodeDeviceCreateXML, /* 0.6.5 */ + .deviceDestroy = nodeDeviceDestroy, /* 0.6.5 */ }; static virStateDriver halStateDriver = { .name = "HAL", - .initialize = halDeviceMonitorStartup, - .cleanup = halDeviceMonitorShutdown, - .reload = halDeviceMonitorReload, - .active = halDeviceMonitorActive, + .initialize = halDeviceMonitorStartup, /* 0.5.0 */ + .cleanup = halDeviceMonitorShutdown, /* 0.5.0 */ + .reload = halDeviceMonitorReload, /* 0.5.0 */ + .active = halDeviceMonitorActive, /* 0.5.0 */ }; int halNodeRegister(void) { - registerCommonNodeFuncs(&halDeviceMonitor); if (virRegisterDeviceMonitor(&halDeviceMonitor) < 0) return -1; return virRegisterStateDriver(&halStateDriver); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 29e4bac..8b9694e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1741,23 +1741,31 @@ static int udevNodeDrvClose(virConnectPtr conn) static virDeviceMonitor udevDeviceMonitor = { .name = "udevDeviceMonitor", - .open = udevNodeDrvOpen, - .close = udevNodeDrvClose, + .open = udevNodeDrvOpen, /* 0.7.3 */ + .close = udevNodeDrvClose, /* 0.7.3 */ + .numOfDevices = nodeNumOfDevices, /* 0.7.3 */ + .listDevices = nodeListDevices, /* 0.7.3 */ + .deviceLookupByName = nodeDeviceLookupByName, /* 0.7.3 */ + .deviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.7.3 */ + .deviceGetParent = nodeDeviceGetParent, /* 0.7.3 */ + .deviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.7.3 */ + .deviceListCaps = nodeDeviceListCaps, /* 0.7.3 */ + .deviceCreateXML = nodeDeviceCreateXML, /* 0.7.3 */ + .deviceDestroy = nodeDeviceDestroy, /* 0.7.3 */ }; static virStateDriver udevStateDriver = { .name = "udev", - .initialize = udevDeviceMonitorStartup, - .cleanup = udevDeviceMonitorShutdown, - .reload = udevDeviceMonitorReload, - .active = udevDeviceMonitorActive, + .initialize = udevDeviceMonitorStartup, /* 0.7.3 */ + .cleanup = udevDeviceMonitorShutdown, /* 0.7.3 */ + .reload = udevDeviceMonitorReload, /* 0.7.3 */ + .active = udevDeviceMonitorActive, /* 0.7.3 */ }; int udevNodeRegister(void) { VIR_DEBUG("Registering udev node device backend"); - registerCommonNodeFuncs(&udevDeviceMonitor); if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { return -1; } -- 1.7.0.4

3 3

Re: [libvirt] Operation forbidden for read only access
by Daniel Veillard 06 Jun '11

06 Jun '11

On Mon, Jun 06, 2011 at 01:27:47PM +0530, PREETHI RAMESH wrote: > Sorry for my ignorance, but how do you do that? > > On Mon, Jun 6, 2011 at 11:12 AM, Daniel Veillard <veillard(a)redhat.com>wrote: > > > On Mon, Jun 06, 2011 at 08:41:51AM +0530, PREETHI RAMESH wrote: > > > I'm using libvirt's Java API bindingsa and i've opened a connection : > > [...] > > > BUILD SUCCESSFUL (total time: 23 minutes 38 seconds) > > > > > > I've used qemu:///system but why is my operation being denied? > > > > On a read-only connection any operation which may modify the state of > > the system will get denied. You need a read-write connection for > > destroying a domain. You do that by not asking for a read-only connection ! /** * Constructs a Connect object from the supplied URI. * * @param uri * The connection URI * @param readOnly * Whether the connection is read-only * @throws LibvirtException * @see <a href="http://libvirt.org/uri.html">The URI * documentation</a> */ public Connect(String uri, boolean readOnly) throws LibvirtException since your code does conn = new Connect("qemu:///system", true); you asked for it. Please read the docs/code ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Operation forbidden for read only access
by PREETHI RAMESH 06 Jun '11

06 Jun '11

I'm using libvirt's Java API bindingsa and i've opened a connection : Connect conn=null; Connect conn1=null; Connect conn2=null; Domain testDomain1 = null; //connect to host vm try{ conn = new Connect("qemu:///system", true); System.out.println("exception ONE:"); } catch (LibvirtException e){ System.out.println("exception ONE caught:"+e); System.out.println(e.getError()); } //get the domain in host vm try { testDomain1 = conn.domainLookupByName("hda1"); System.out.println("exception TWO:"); } catch (LibvirtException ex) { System.out.println("exception TWO CAUGHT"); //Logger.getLogger(Migrate.class.getName()).log(Level.SEVERE, null, ex); } //check if domain is running try{ System.out.println("Domain:" + testDomain1.getName() + " id " + testDomain1.getID() + " running " + testDomain1.getOSType()); System.out.println("exception THREE:"); } catch (LibvirtException e1){ System.out.println("exception THREE caught: "+e1); System.out.println(e1.getError()); } /*try{ conn1 = new Connect("qemu+ssh://root@10.129.54.254/system", true); //conn2 = new Connect("qemu+ssh://root@10.129.54.254/system", true); Domain migrate1; System.out.println("done with ssh"); String uri="tcp://root@10.129.54.254:49166"; migrate1 = testDomain1.migrate(conn1,1,null,"tcp:// root(a)10.129.54.254",0); //int ret=testDomain1.migrateToURI("tcp:// root@10.129.54.254:49155",1,null,0); System.out.println("exception FOUR:"); }catch (LibvirtException e2){ System.out.println("exception FOUR caught:"+e2); System.out.println(e2.getError()); }*/ try{ testDomain1.destroy(); System.out.println("Destroyed"+testDomain1); } catch(LibvirtException e4){ System.out.println("exception FOUR caught: "+e4); System.out.println(e4.getError()); } The output I'm getting is: exception ONE: exception TWO: Domain:test id 1 running linux exception THREE: libvir: Domain error : operation virDomainDestroy forbidden for read only access exception FOUR caught: org.libvirt.LibvirtException: operation virDomainDestroy forbidden for read only access level:VIR_ERR_ERROR code:VIR_ERR_OPERATION_DENIED domain:VIR_FROM_DOM hasConn:false hasDom:false hasNet:false message:operation virDomainDestroy forbidden for read only access str1:operation %s forbidden for read only access str2:virDomainDestroy str3:null int1:-1 int2:-1 BUILD SUCCESSFUL (total time: 23 minutes 38 seconds) I've used qemu:///system but why is my operation being denied? Thanks!

2 1

[libvirt] [libvirt-users] Release of libvirt-0.9.2
by Daniel Veillard 06 Jun '11

06 Jun '11

As planned the new release is available at: ftp://libvirt.org/libvirt/ It is a rather large release with near 400 commits included. From an user point of view the main improvement is likely to be when using migration as various work has been done to extend the protocol and to avoid having the migration command stop other concurrent operations (like virsh list). See below for a number of new features, improvement and bug fixes: Features: - Framework for lock manager plugins (Daniel P. Berrange) - API for network config change transactions (Michal Privoznik) - flags for setting memory parameters (Hu Tao) - virDomainGetState public API (Jiri Denemark) - qemu: allow blkstat/blkinfo calls during migration (Federico Simoncelli) - Introduce migration v3 API (Daniel P. Berrange) - Defining the Screenshot public API (Michal Privoznik) - public API for NMI injection (Lai Jiangshan) Documentation: - esx: Fix driver method version annotations (Matthias Bolte) - vbox: Fix typo in error message (Matthias Bolte) - virsh: Document nodeinfo output (Jiri Denemark) - Correct 'cputune' documentation example. (Neil Wilson) - document iface-* commands (Eric Blake) - Add initial docs about the lock managers (Daniel P. Berrange) - maint: use consistent file name for threading notes (Eric Blake) - Fix virTypedParameter alias comments (Matthias Bolte) - Fix error syntax of vcpupin example XML (Osier Yang) - Automatically generate the hvsupport.html.in file from source files (Daniel P. Berrange) - Fix documentation for cputune parameters (Osier Yang) - avoid double 'the' (Eric Blake) - Add documentation about test suites (Daniel Veillard) - updates to CA cert and client cert/key info (Doug Goldstein) - node filesystem attr is 'accessmode', not 'mode' (Cole Robinson) Portability: - vbox: Fix version extraction on Windows for newer VirtualBox versions (Matthias Bolte) - Make dlopen usage in lock manager conditional (Matthias Bolte) - build: fix VPATH build break from previous patch (Eric Blake) - Remove call to deprecated gnutls_certificate_type_set_priority (Daniel P. Berrange) - Fix sysinfo/virsh build problems on Win32 (Daniel P. Berrange) - Fix build with --with-driver-modules enabled (Matthias Bolte) - build: fix 'make dist' for ./configure --without-remote (Eric Blake) - virsh: time_t is not a long on FreeBSD (Matthias Bolte) - time_t is not a long on FreeBSD, switch internal type to long long (Matthias Bolte) - build: avoid strerror_r pitfalls (Eric Blake) - build: fix VIR_DEBUG on mingw (Eric Blake) - build: generate files when building without libvirtd (Wen Congyang) - build: drop unused sys/syslimits.h header (Eric Blake) - Fix prototype of virRun for Win32 targets (Daniel P. Berrange) - build: tolerate unlimited group size (Eric Blake) - Disable virCommandExec on Win32 (Daniel P. Berrange) - command: Fix compilation on FreeBSD (Matthias Bolte) - apparmor: Fix compilation by removing remains from virCommand conversion (Matthias Bolte) - configure: Fix mpath check on non-Linux systems (Matthias Bolte) - fix xdr detection and use with recent glibc (Christophe Fergeau) - build: avoid gcc preprocessor extensions (Eric Blake) - build: fix VPATH build with distributed generated files (Eric Blake) - build: fix VPATH builds (Eric Blake) Bug fixes: - Fix QEMU p2p v2 migration when run from a v3 client (Daniel P. Berrange) - Don't raise an error if the migration cookie is NULL (Daniel P. Berrange) - Fix check of virKillProcess return status (Daniel P. Berrange) - qemu: Avoid use after free in qemuCaps parsing (Jiri Denemark) - security driver: ignore EINVAL when chowning an image file (Laine Stump) - migrate: detect xml incompatibility (Eric Blake) - event: avoid memory leak on cleanup (Eric Blake) - qemu: avoid memory leak on vcpupin (Eric Blake) - remote: avoid leak on failure (Eric Blake) - lock: avoid leak on failure (Eric Blake) - storage: avoid memory leak on stat failure (Eric Blake) - storage: avoid memory leak (Eric Blake) - libvirtd: avoid leak on failure (Eric Blake) - command: avoid leak on failure (Eric Blake) - Explicitly set VM state to paused after migration completes (Daniel P. Berrange) - Fix regressions BlockStats/Info APIs in QEMU driver (Daniel P. Berrange) - Fix minor issues in libxenlight managed save (Jim Fehlig) - Fix auditing of disk hotunplug operations (Daniel P. Berrange) - Avoid crash on NULL pointer in lock driver impls during hotplug (Daniel P. Berrange) - Fix return value in lock manager hotplug methods (Daniel P. Berrange) - Make sure virDomainSave/virDomainManagedSave reset id to -1 (Daniel P. Berrange) - Fix handling of VIR_EVENT_HANDLE_ERROR in QEMU monitor (Daniel P. Berrange) - security: plug regression introduced in disk probe logic (Eric Blake) - Fix order of disks and controllers (Jiri Denemark) - util: Fix incorrect error in PCI functions (Osier Yang) - openvz: Restore original EOF handling in openvzGetProcessInfo (Matthias Bolte) - openvz: Handle getline failures in openvzReadConfigParam properly (Matthias Bolte) - conf: Fix incorrect spice graphic XML format on compression options (Michal Privoznik) - nwfilter: reorder locks (Stefan Berger) - openvz: Fix regression in openvzGetVPSUUID (Matthias Bolte) - esx: Fix regression in absolute file name handling (Matthias Bolte) - openvz: Fix regression in config file parsing (Taisuke Yamada) - audit: fix minor off-by-one (Eric Blake) - Fix libxl vm def handling on domU cleanup (Markus Groß) - Fix modifying disk devices in qemu driver (Markus Groß) - json: Avoid passing large positive 64 bit integers to QMP. (Richard W.M. Jones) - Fix initialization of current vcpus in libxl driver (Jim Fehlig) - qemu: Don't change ownership of file when appending to it (Michal Privoznik) - qemu: fix typo in name - should be VHOST_NET, not VNET_HOST (Laine Stump) - Fix QEMU -vnc arg generation with raw IPv6 addresses (Daniel P. Berrange) - Fix peer2peer migration with transient VMs (Daniel P. Berrange) - python: Don't free must-not-free variables (Michal Privoznik) - python: Fix typo in bindings (Michal Privoznik) - libvirt.spec: /var/cache/libvirt should be 0711. (Richard W.M. Jones) - remote: remove bogus virDomainFree. (Richard W.M. Jones) - qemudDomainMemoryPeek: change ownership/selinux label on temporary file. (Richard W.M. Jones) - Fix QEMU migration cookie crash for guests with no graphics (Daniel P. Berrange) - Blank out the 'listenAddr' parameter if empty string (Daniel P. Berrange) - Improve invalid argument checks for the public API (Matthias Bolte) - qemu: fix typo in spice migration code (Michal Privoznik) - openvz: fix logic bug in previous patch (Eric Blake) - Fix error reporting in stream creation code (Matthias Bolte) - virsh: Correctly initialize libvirt (Jiri Denemark) - Fix leak of mime type string in screenshot dispatcher (Daniel P. Berrange) - Fix remote dispatcher for screenshot command (Daniel P. Berrange) - Add missing initialization to 'ret' in qemu migration (Daniel P. Berrange) - Close all sockets before cancelling QEMU migration (Daniel P. Berrange) - Ensure we always read a full buffer in tunnelled migration (Daniel P. Berrange) - phyp: avoid a crash (Eric Blake) - stream: avoid use-after-free (Eric Blake) - virsh: Fix uninitialized variable warning (Matthias Bolte) - libxl: fix typos in previous patch (Eric Blake) - node_device: avoid null dereference on error (Eric Blake) - tests: avoid crash when run under gcov (Eric Blake) - Fix two uninitialized variable warnings (Matthias Bolte) - apparmor: Fix uninitalized variable warning in virt-aa-helper (Matthias Bolte) - Fix qemuMigrationToFile nonull annotation (Daniel P. Berrange) Improvements: - API: consolidate common unreleased enums (Eric Blake) - uml: correct command line networking parameters (Heath Petersen) - Add call to sanlock_restrict() in QEMU lock driver (Daniel P. Berrange) - screenshot: Expose the new API in virsh (Michal Privoznik) - libxl: adds managed save and restore support (Markus Groß) - libxl: get maximum memory of running domain (Markus Groß) - Add a plugin for the 'sanlock' project (Daniel P. Berrange) - Allow leases to be hotpluged with QEMU guests (Daniel P. Berrange) - Support passing QEMU lock state to dest during migration (Daniel P. Berrange) - Integrate the QEMU driver with the lock manager infrastructure (Daniel P. Berrange) - Add higher level lock API for domain objects (Daniel P. Berrange) - Add a 'nop' lock driver implementation. (Daniel P. Berrange) - Support leases in guest XML and lock manager (Daniel P. Berrange) - Allow handshake with child process during startup (Daniel P. Berrange) - tests: really fix QEMU XML-2-ARGV graphics-spice-timeout test (Eric Blake) - build: avoid corrupting / in RHEL 5 (Eric Blake) - tests: Add a test for correct disk device ordering (Jiri Denemark) - Fix QEMU XML-2-ARGV graphics-spice-timeout test (Matthias Bolte) - remote generator: Handle some virTypedParameterPtr using functions (Matthias Bolte) - apibuild: Restrict long usage to existing functions and structs (Matthias Bolte) - remote generator: Legacy support for hyper to long mappings (Matthias Bolte) - Use common parameter order for remote(De)SerializeTypedParameters (Matthias Bolte) - openvz: Add simple test for openvzReadNetworkConf (Matthias Bolte) - openvz: Set virtType to openvz in openvzLoadDomains (Matthias Bolte) - storage: List directory volumes for dir/fs/netfs pools (Cole Robinson) - tests: Add more complex domain scheme test data (Michal Privoznik) - tests: Test for SPICE compression options (Michal Privoznik) - Ignore backward compatibility macros in apibuild.py (Matthias Bolte) - openvz: fix bridge devices parsing in openvzReadNetworkConf() (Jean-Baptiste Rouault) - Allow custom XML to be passed in during migration (Daniel P. Berrange) - Allow virsh to pass in a custom XML document for migration (Daniel P. Berrange) - Add an API for comparing the ABI of two guest configurations (Daniel P. Berrange) - Remove unused 'target' field in virDomainHostdevDef (Daniel P. Berrange) - lxc: Seperate domain config loading (Osier Yang) - openvz: Automatically disable on non-Linux systems (Matthias Bolte) - Support maximum and current memory flags in libxl driver (Markus Groß) - Add domainSave/Restore to libxl driver (Markus Groß) - Add domainCoreDump to libxl driver (Markus Groß) - Populate domid field of devices for libxenlight (Markus Groß) - Issue full error messages when processing QEMU monitor I/O (Daniel P. Berrange) - Don't kill QEMU process when a monitor I/O parsing error occurs (Daniel P. Berrange) - Introduce a new event emitted when a virtualization failure occurs (Daniel P. Berrange) - sched: provide new API shims for remaining drivers (Eric Blake) - virsh: improve schedinfo querying ability (Eric Blake) - remote: introduce remoteGetSchedulerParametersFlags (Eric Blake) - qemu: introduce qemuGetSchedulerParametersFlags (Eric Blake) - sched: introduce virDomainGetSchedulerParametersFlags (Eric Blake) - remote: consolidate typed parameter handling (Eric Blake) - maint: prefer newer API names internally (Eric Blake) - libvirt.h: avoid regression, and document preferred name (Eric Blake) - Fix virExecWithHook Prototype (Richard Laager) - interface: reformat error logs (Laine Stump) - interface: implement a test driver for network config transaction API. (Michal Privoznik) - interface: Implement driver methods for network config transaction API (Michal Privoznik) - interface: expose network config transaction API to virsh (Michal Privoznik) - interface: implement remote protocol for network config transaction API (Michal Privoznik) - interface: implement public APIs for libvirt transactional network changes (Michal Privoznik) - interface: define internal driver API for network config transactions (Michal Privoznik) - sexpr: Improve serialization error reporting (Matthias Bolte) - qemu: implement the new flags for setting memory parameters (Hu Tao) - qemu: implement the new flags for getting memory parameters (Hu Tao) - qemu : support persistent add/delete network interface (KAMEZAWA Hiroyuki) - openvz: Add simple testcase for config file parsing function (Matthias Bolte) - Add disk attach/detach support to libxl driver (Markus Groß) - Refactored libxl datastructure instantiation (Markus Groß) - schema: Add graphics element passwdValidTo attribute to schema (Michal Privoznik) - Fix sign mismatches between public API, driver API and XDR protocol (Matthias Bolte) - remote generator: Fix XDR sign mismatch for virNodeGet(Cells)FreeMemory (Matthias Bolte) - remote generator: Handle stream-using functions (Matthias Bolte) - remote generator: Make call-by-reference handling stricter (Matthias Bolte) - remote generator: Rename virNodeGetCellsFreeMemory parameters to common pattern (Matthias Bolte) - remote generator: Handle virDomainCreateWithFlags (Matthias Bolte) - Allow to explicitly disable the secrets a directory storage driver (Matthias Bolte) - Fix the signature of virDomainMigrateFinish3 for error reporting (Daniel P. Berrange) - Fix preservation of errors across migration steps (Daniel P. Berrange) - Improve debug logging of migration APIs (Daniel P. Berrange) - Fix error propagation in finish method for v3 migration (Daniel P. Berrange) - Fix SPICE seamless migration hostname (Daniel P. Berrange) - Fix resume on destination when doing non-live tunnelled migration (Daniel P. Berrange) - Introduce two method migration APIs (Daniel P. Berrange) - Add a second URI parameter to virDomainMigratePerform3 method (Daniel P. Berrange) - Extend v3 migration protocol to allow app supplied XML for target (Daniel P. Berrange) - esx: Report an error when auth pointer is missing instead of declining (Matthias Bolte) - Perform feature flag compat checking in QEMU migration cookies (Daniel P. Berrange) - Replace all remaining setgid/setuid calls with virSetUIDGID (Jiri Denemark) - util: Keep errno set to the root error after when returning from virSetUIDGID (Jiri Denemark) - storage: Add comment to picking return value of qemu-img (Michal Privoznik) - spice: support streaming-video parameter (Alon Levy) - nwfilter: enable filtering of gratuitous ARP packets (Stefan Berger) - qemu: don't require is_kvm for vhost-net support (Laine Stump) - Use per-user TLS certificates when possible (Doug Goldstein) - storage: pick return value of qemu-img (Michal Privoznik) - remote generator: Add special case for virConnectGetType (Matthias Bolte) - remote generator: Don't rely on $_ being stable over a large function (Matthias Bolte) - build: require newer gettext (Eric Blake) - virsh: Use Env variables for debug level and logfile (Supriya Kannery) - Don't generate cookies with v2 migration protocol. (Daniel P. Berrange) - Ensure p2p and direct migration use the new v3 protocol if available (Daniel P. Berrange) - remote: remove special case for getting version (Eric Blake) - virsh: optimize creation of default connection (Eric Blake) - Clarify that virDomainGet(Memory|Blkio)Parameters doesn't support subsets (Matthias Bolte) - Clarify that virDomainSet(Memory|Blkio)Parameters can take parameter subsets (Matthias Bolte) - Clarify that virDomainSetSchedulerParameters(Flags) can take subsets (Matthias Bolte) - Clarify the semantic of virDomainGetSchedulerParameters arguments (Matthias Bolte) - Clarify semantic of nparams argument of virDomainGetSchedulerType (Matthias Bolte) - Fix messages using VIR_ERR_XML_ERROR (Cole Robinson) - libvirt.h: consolidate typed parameter handling (Eric Blake) - build: update to latest gnulib (Eric Blake) - Add support for 'passthru' mode for direct network interfaces (Dirk Herrendorefer) - virsh: add parameters --live, --config and --current to cmd schedinfo (Hu Tao) - remote: introduce remoteSetSchedulerParametersFlags (Hu Tao) - qemu: introduce qemuSetSchedulerParametersFlags (Hu Tao) - sched: adjust parameter values to make current = 0 (Eric Blake) - introduce virDomainSetSchedulerParametersFlags (Hu Tao) - storage_backend: Convert virRunWithHook usage to virCommand (Cole Robinson) - storage_backend: Fix error reporting with regex helper (Cole Robinson) - storage: Covert regex helpers to virCommand (Cole Robinson) - openvz: Convert virExec usage to virCommand (Cole Robinson) - storage: iscsi: Convert virExec to virCommand (Cole Robinson) - remote generator, client: Add more special case handling (Matthias Bolte) - remote generator, client: Handle functions that return an optional string (Matthias Bolte) - esx: Simplify some esxVI_Boolean to bool (Matthias Bolte) - esx: Convert autoAnswer from esxVI_Boolean to a simple bool (Matthias Bolte) - esx: Fix race condition in esxVI_EnsureSession (Matthias Bolte) - esx: Whitespace cleanup in the generator (Matthias Bolte) - esx: Change some alignments in the input file (Matthias Bolte) - esx: Change generated method parameter autobinding (Matthias Bolte) - virsh: Report an error when virGetUserDirectory fails (Matthias Bolte) - maint: mark more perl scripts executable (Eric Blake) - maint: mark perl script executable (Eric Blake) - maint: ignore generated file (Eric Blake) - Improve error message when XDR marshalling fails (Daniel P. Berrange) - Run tunnelled migration IO in separate thread (Daniel P. Berrange) - Don't overwrite error when stream send fails (Daniel P. Berrange) - Make tunnelled migration honour resource restriction (Daniel P. Berrange) - Refactor migration completion loop to allow code reuse (Daniel P. Berrange) - Implement migration v3 protocol in QEMU driver (Daniel P. Berrange) - Merge tunnel and non-tunnel migration impl into one (Daniel P. Berrange) - Fix VM teardown if prepare returns invalid URI in v2 migration (Daniel P. Berrange) - Refactor tunnelled migration methods (Daniel P. Berrange) - Wire up SPICE client relocation with QEMU migration (Daniel P. Berrange) - Pass graphics setup from dst back to src via migration cookies (Daniel P. Berrange) - Introduce migration cookies to QEMU driver (Daniel P. Berrange) - Fix locking with qemuMigrationPrepareTunnel method (Daniel P. Berrange) - Remote driver implementation of new migration API (Daniel P. Berrange) - Add many version number annotations to drivers (Daniel P. Berrange) - Convert all driver struct intializers to C99 style (Daniel P. Berrange) - Tweak driver naming for consistency with public API (Daniel P. Berrange) - qemu: Update domain state when reconnecting monitor (Jiri Denemark) - Implement domain state reason (Jiri Denemark) - Implement basic virDomainGetState in all drivers (Jiri Denemark) - virsh: Prefer virDomainGetState over virDomainGetInfo (Jiri Denemark) - Wire protocol format and remote driver for virDomainGetState (Jiri Denemark) - virDomainGetState public API implementation (Jiri Denemark) - Internal driver API for virDomainGetState (Jiri Denemark) - esx: Refactor common code in the generator (Matthias Bolte) - esx: Improve dynamic cast detection in the generator (Matthias Bolte) - esx: Improve list usage detection in the generator (Matthias Bolte) - esx: Remove 1000 lines of generated but unused code (Matthias Bolte) - esx: Generate implicit _this macros (Matthias Bolte) - esx: Move the Event type from the VI generator to manually written code (Matthias Bolte) - test: all test_scripts should be part of tarball when building without libvirtd (Wen Congyang) - build: probes.d and libvirtd.stp should be part of tarball (Wen Congyang) - remote: Convert SSH tunnel to virCommand (Cole Robinson) - storage: Convert qemu-img -help parsing to virCommand (Cole Robinson) - apparmor: Convert virExec usage to virCommand (Cole Robinson) - util: Combine __virExec and virExecWithHook (Cole Robinson) - remote_driver: Convert virExecDaemonize usage to virCommand (Cole Robinson) - remote: Use virDomainEventState helpers (Cole Robinson) - libxl: Convert to virDomainEventState (Cole Robinson) - test: Use virDomainEventState helpers (Cole Robinson) - lxc: Use virDomainEventState helpers (Cole Robinson) - qemu: Use virDomainEventState helpers (Cole Robinson) - domain_event: Add common domain event queue/flush helpers (Cole Robinson) - domain_event: Add virDomainEventState structure (Cole Robinson) - xml: Use virXMLParse* helpers everywhere (Cole Robinson) - domain: Require init node for container guests (Cole Robinson) - xml: Make sure virXpathNodeSet always sets an error (Cole Robinson) - vbox: Implement the Screenshot driver methods (Michal Privoznik) - qemu: Implement the Screenshot driver methods (Michal Privoznik) - virFDStream: Add option for delete file after it's opening (Michal Privoznik) - Implementing the Screenshot remote protocol (Michal Privoznik) - Implementing the Screenshot public API (Michal Privoznik) - Defining the Screenshot internal API (Michal Privoznik) - remote generator: Add skipgen/autogen flags to .x files (Matthias Bolte) - nwfilter: drop unused flag argument (Eric Blake) - maint: omit translation for all VIR_INFO (Eric Blake) - build: wrap macro body in one-shot do-while loop (Eric Blake) - build: drop need for VIR_DOMAIN_DEBUG0() (Eric Blake) - libvirt,logging: cleanup VIR_XXX0() (Lai Jiangshan) - maint: avoid a couple of gnulib regressions (Eric Blake) - build: remove some dead assignments (Eric Blake) - Allow destroying QEMU VM even if a job is active (Daniel P. Berrange) - Add support for YAJL version 2 API/ABI (Daniel P. Berrange) - libxl: support enabling the HPET (Paolo Bonzini) - libxl: support enabling the HPET (Paolo Bonzini) - xen: parse and generate hpet item in sxpr (Paolo Bonzini) - virsh: flexibility in CA cert and user cert/key (Doug Goldstein) - remote generator: Make parsing stricter (Matthias Bolte) - remote generator: Unify unsigned int notation in .x files (Matthias Bolte) - remote generator: Fix comment ignoring regex (Matthias Bolte) - Rename internal DumpXML functions to GetXMLDesc (Matthias Bolte) - qemu,inject-nmi: Implement the driver methods (Lai Jiangshan) - inject-nmi: Expose the new API in virsh (Lai Jiangshan) - inject-nmi: Implementing the remote protocol (Lai Jiangshan) - inject-nmi: Implementing the public API (Lai Jiangshan) - inject-nmi: Defining the internal API (Lai Jiangshan) - lxc: container: Build init cmd before we close stdout (Cole Robinson) - lxc: container: Convert init node exec to virCommand (Cole Robinson) - command: Add virCommandExec helper (Cole Robinson) - lxc: driver: Improve logging when launching emulator (Cole Robinson) - lxc: driver: Convert emulator launching to virCommand (Cole Robinson) - command: Add virCommandEnvAddFormat (Cole Robinson) - build: translate generated strings (Eric Blake) - Pull in gnulib fnmatch module (Daniel P. Berrange) - json: Fix *GetBoolean functions (Jiri Denemark) - build: rebuild generated files after rpcgen_fix.pl tweak (Eric Blake) - Re-add libvirt.spec to tarball to allwo "make rpm" (Daniel Veillard) - build: Remove all generated RPC files from GIT (Daniel P. Berrange) - build: refactor generated RPC files (Daniel P. Berrange) - build: rename generated files to .h, for automake's sake (Eric Blake) - remote generator, client: Handle arguments with limited length (Matthias Bolte) - remote generator, client: Handle functions that return lists (Matthias Bolte) - remote: Refactor remote*Open and remote*Close functions (Matthias Bolte) - remote generator, client: Handle functions with optional return values (Matthias Bolte) - remote generator, client: Handle functions with multiple return values (Matthias Bolte) - remote generator, client: Handle functions with wrapped return values (Matthias Bolte) - remote generator, client: Handle functions with simple return values (Matthias Bolte) - remote generator, client: Handle simple remote driver functions (Matthias Bolte) - remote generator: Reorder into prepare and print section (Matthias Bolte) - remote generator, daemon: Handle functions with multiple return values (Matthias Bolte) - remote generator, daemon: Combine multiple ifs in the generated code (Matthias Bolte) - remote generator, daemon: Handle the CPU functions (Matthias Bolte) - remote generator: Refactor duplicate code (Matthias Bolte) - remote generator, daemon: Handle functions that return lists (Matthias Bolte) - remote: Rename 'nameslen' to the common 'maxnames' (Matthias Bolte) - remote generator, daemon: Handle functions with optional arguments (Matthias Bolte) - remote generator, daemon: Handle more functions (Matthias Bolte) - remote generator, daemon: Handle simple-return-value functions (Matthias Bolte) - remote generator, daemon: Change capitalization of some words (Matthias Bolte) - remote: Replace 'domain' with 'dom' in the XDR protocol (Matthias Bolte) - remote generator, daemon: Output function bodies too (Matthias Bolte) - remote generator: Replace tabs with spaces and rename file (Matthias Bolte) - Balloon dom0 in libxl driver (Markus Groß) - remote: check actual access to the cert (Doug Goldstein) - maint: avoid comparisons to bool constants (Eric Blake) - Add warning message to XML definition files stored on disk (Michal Privoznik) - Fix security driver handling of FIFOs with QEMU (Daniel P. Berrange) - Make taint warnings also go into the domain logfile (Daniel P. Berrange) - Add a qemuDomainAppendLog method for writing to the domain logfile (Daniel P. Berrange) - Move qemuProcessLogReadFD and qemuProcessLogFD methods (Daniel P. Berrange) - Log taint warnings in QEMU driver (Daniel P. Berrange) - Add field to virDomainObjPtr to track "tainting" (Daniel P. Berrange) - virsh: improve TLS certificate error messages (Doug Goldstein) - virsh: use new method for easier log to file (Eric Blake) - buf: add virBufferVasprintf (Eric Blake) - maint: rename virBufferVSprintf to virBufferAsprintf (Eric Blake) - Make QEMU migration use cached qemu capabilities data (Daniel P. Berrange) - Make QEMU hotplug use cached qemu capabilities data (Daniel P. Berrange) - Persist qemu capabilities in the domain status file (Daniel P. Berrange) Cleanups: - build: silence coverity false positive (Eric Blake) - build: silence coverity false positive (Eric Blake) - .gitignore: Exempt a new test binary. (Eric Blake) - Ensure hvsupport.html.in is built before HTML validation (Daniel P. Berrange) - Fix a make check error (Daniel Veillard) - Add sexpr.c to the list of file with translatable messages (Matthias Bolte) - don't check flags in virDomainSetSchedulerParametersFlags (Hu Tao) - build: silence clang false positive (Eric Blake) - Remove obsolete remoteDispatchOOMError method (Daniel P. Berrange) - remote: keep 'make check' happy (Eric Blake) - build: avoid compiler warning during configure (Wen Congyang) - Remove bogus assert() from migration code (Daniel P. Berrange) - build: drop files generated by config.status from tarball (Eric Blake) Thanks everybody for contributing to the release, with documentation, ideas, feedback or patches ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] esx: Fix driver method version annotations
by Matthias Bolte 06 Jun '11

06 Jun '11

--- src/esx/esx_interface_driver.c | 6 +++--- src/esx/esx_network_driver.c | 6 +++--- src/esx/esx_nwfilter_driver.c | 6 +++--- src/esx/esx_secret_driver.c | 6 +++--- src/esx/esx_storage_driver.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 3f9c175..a468976 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -66,9 +66,9 @@ esxInterfaceClose(virConnectPtr conn) static virInterfaceDriver esxInterfaceDriver = { - "ESX", /* name */ - .open = esxInterfaceOpen, /* 0.7.0 */ - .close = esxInterfaceClose, /* 0.7.0 */ + .name = "ESX", + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 9385a26..3c76fae 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -66,9 +66,9 @@ esxNetworkClose(virConnectPtr conn) static virNetworkDriver esxNetworkDriver = { - "ESX", /* name */ - .open = esxNetworkOpen, /* 0.7.0 */ - .close = esxNetworkClose, /* 0.7.0 */ + .name = "ESX", + .open = esxNetworkOpen, /* 0.7.6 */ + .close = esxNetworkClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index ee85abc..13cacd4 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -65,9 +65,9 @@ esxNWFilterClose(virConnectPtr conn) static virNWFilterDriver esxNWFilterDriver = { - "ESX", /* name */ - .open = esxNWFilterOpen, /* 0.8.0 */ - .close = esxNWFilterClose, /* 0.8.0 */ + .name = "ESX", + .open = esxNWFilterOpen, /* 0.8.1 */ + .close = esxNWFilterClose, /* 0.8.1 */ }; diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index dff2290..656224e 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -64,9 +64,9 @@ esxSecretClose(virConnectPtr conn) static virSecretDriver esxSecretDriver = { - "ESX", /* name */ - .open = esxSecretOpen, /* 0.7.1 */ - .close = esxSecretClose, /* 0.7.1 */ + .name = "ESX", + .open = esxSecretOpen, /* 0.7.6 */ + .close = esxSecretClose, /* 0.7.6 */ }; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 5ee0cf4..6461917 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1645,7 +1645,7 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static virStorageDriver esxStorageDriver = { - "ESX", /* name */ + .name = "ESX", .open = esxStorageOpen, /* 0.7.6 */ .close = esxStorageClose, /* 0.7.6 */ .numOfPools = esxNumberOfStoragePools, /* 0.8.2 */ -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix QEMU p2p v2 migration when run from a v3 client
by Daniel P. Berrange 06 Jun '11

06 Jun '11

When peer-2-peer migration was invoked by a client supporting v3, but where the target server only supported v2, we'd not correctly shutdown the guest. * src/qemu/qemu_migration.c: Ensure guest is shutdown in v2 peer 2 peer migration --- src/qemu/qemu_migration.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fa506e2..f7eaa1c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2199,12 +2199,12 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, const char *uri, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long resource, + bool *v3proto) { int ret = -1; virConnectPtr dconn = NULL; bool p2p; - bool v3; VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, flags=%lu, dname=%s, resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), @@ -2226,8 +2226,12 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, qemuDomainObjEnterRemoteWithDriver(driver, vm); p2p = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, VIR_DRV_FEATURE_MIGRATION_P2P); - v3 = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V3); + /* v3proto reflects whether the caller used Perform3, but with + * p2p migrate, regardless of whether Perform3 or Perform3 + * were used, we decide protocol based on what target supports + */ + *v3proto = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V3); qemuDomainObjExitRemoteWithDriver(driver, vm); if (!p2p) { @@ -2243,7 +2247,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, goto cleanup; } - if (v3) + if (*v3proto) ret = doPeer2PeerMigrate3(driver, sconn, dconn, vm, xmlin, dconnuri, uri, flags, dname, resource); else @@ -2310,7 +2314,8 @@ int qemuMigrationPerform(struct qemud_driver *driver, } if (doPeer2PeerMigrate(driver, conn, vm, xmlin, - dconnuri, uri, flags, dname, resource) < 0) + dconnuri, uri, flags, dname, + resource, &v3proto) < 0) /* doPeer2PeerMigrate already set the error, so just get out */ goto endjob; } else { -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: Parse current balloon value returned by query_balloon.
by Osier Yang 06 Jun '11

06 Jun '11

Qemu once supported following memory stats which will returned by "query_balloon": stat_put(dict, "actual", actual); stat_put(dict, "mem_swapped_in", dev->stats[VIRTIO_BALLOON_S_SWAP_IN]); stat_put(dict, "mem_swapped_out", dev->stats[VIRTIO_BALLOON_S_SWAP_OUT]); stat_put(dict, "major_page_faults", dev->stats[VIRTIO_BALLOON_S_MAJFLT]); stat_put(dict, "minor_page_faults", dev->stats[VIRTIO_BALLOON_S_MINFLT]); stat_put(dict, "free_mem", dev->stats[VIRTIO_BALLOON_S_MEMFREE]); stat_put(dict, "total_mem", dev->stats[VIRTIO_BALLOON_S_MEMTOT]); But it later disabled all the stats except "actual" by commit 07b0403dfc2b2ac179ae5b48105096cc2d03375a. libvirt doesn't parse "actual", so user will always see a empty result with "virsh dommemstat $domain". Even qemu haven't disabled the stats, we should support parsing "actual". --- include/libvirt/libvirt.h.in | 4 +++- src/libvirt.c | 2 ++ src/qemu/qemu_monitor_json.c | 12 ++++++++++++ tools/virsh.c | 2 ++ 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 8058229..864852b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -456,11 +456,13 @@ typedef enum { */ VIR_DOMAIN_MEMORY_STAT_AVAILABLE = 5, + /* Current balloon value (in KB). */ + VIR_DOMAIN_MEMORY_STAT_ACTUAL = 6, /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 6, + VIR_DOMAIN_MEMORY_STAT_NR = 7, } virDomainMemoryStatTags; typedef struct _virDomainMemoryStat virDomainMemoryStatStruct; diff --git a/src/libvirt.c b/src/libvirt.c index eaae0ec..c635ff5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5802,6 +5802,8 @@ error: * The amount of memory which is not being used for any purpose (in kb). * VIR_DOMAIN_MEMORY_STAT_AVAILABLE: * The total amount of memory available to the domain's OS (in kb). + * VIR_DOMAIN_MEMORY_STAT_ACTUAL: + * Current balloon value (in kb). * * Returns: The number of stats provided or -1 in case of failure. */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 75adf66..9f16403 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1119,6 +1119,18 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; } + if (virJSONValueObjectHasKey(data, "actual") && (got < nr_stats)) { + if (virJSONValueObjectGetNumberUlong(data, "actual", &mem) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("info balloon reply was missing balloon actual")); + ret = -1; + goto cleanup; + } + stats[got].tag = VIR_DOMAIN_MEMORY_STAT_ACTUAL; + stats[got].val = (mem/1024); + got++; + } + if (virJSONValueObjectHasKey(data, "mem_swapped_in") && (got < nr_stats)) { if (virJSONValueObjectGetNumberUlong(data, "mem_swapped_in", &mem) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/tools/virsh.c b/tools/virsh.c index 5679a2d..a358b73 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1147,6 +1147,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) vshPrint (ctl, "unused %llu\n", stats[i].val); if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_AVAILABLE) vshPrint (ctl, "available %llu\n", stats[i].val); + if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ACTUAL) + vshPrint (ctl, "actual %llu\n", stats[i].val); } virDomainFree(dom); -- 1.7.4

3 3